Merge git://git.alpinelinux.org/amanison/aports into amanison

26 files changed, 51 insertions, 446 deletions

diff --git a/.gitignore b/.gitignore
index 9d9743a234..5a02c25b75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,10 +4,14 @@
 *.bz2
 *.tbz2
 *.zip
+*.tags
+*.xz
 src
 pkg
 pkg-*
 main/vim/7.2.*
+main/bash/bash42-0*
+main/busybox/busybox-*.patch
 main_*.txt
 testing_*.txt
 unstable_*.txt
diff --git a/Makefile b/Makefile
deleted file mode 100644
index a85a3ff569..0000000000
--- a/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-.PHONY: main testing non-free unstable
-
-rootdir := $(shell pwd)
-
-all: main testing non-free unstable
-
-apkbuilds := $(shell find . -maxdepth 3 -name APKBUILD -print)
-
-all-pkgs := $(sort $(subst ./,,$(patsubst %/,%,$(dir $(apkbuilds)))))
-
-main-pkgs :=  $(shell ./aport.lua deplist $(rootdir) main)
-
-testing-pkgs :=  $(shell ./aport.lua deplist $(rootdir) testing)
-
-non-free-pkgs :=  $(shell ./aport.lua deplist $(rootdir) non-free)
-
-unstable-pkgs :=  $(shell ./aport.lua deplist $(rootdir) unstable)
-
-main:
-	for p in $(main-pkgs) ; \
-	do \
-		cd $(rootdir)/$@/$$p; \
-		abuild -r; \
-	done
-
-testing:
-	for p in $(testing-pkgs) ; \
-	do \
-		cd $(rootdir)/$@/$$p; \
-		abuild -r; \
-	done
-
-non-free:
-	for p in $(non-free-pkgs) ; \
-	do \
-		cd $(rootdir)/$@/$$p; \
-		abuild -r; \
-	done
-
-unstable:
-	for p in $(unstable-pkgs) ; \
-	do \
-		cd $(rootdir)/$@/$$p; \
-		abuild -r; \
-	done
-
-clean:
-	for p in $(all-pkgs) ; do \
-		cd $(rootdir)/$$p; \
-		abuild clean; \
-		abuild cleanpkg; \
-	done
-
-cleanold:
-	for p in $(all-pkgs) ; do \
-		cd $(rootdir)/$$p; \
-		abuild cleanoldpkg; \
-	done
-
-fetch:
-	for p in $(all-pkgs) ; do \
-		cd $(rootdir)/$$p; \
-		abuild fetch; \
-	done
-
-distclean:
-	for p in $(all-pkgs) ; \
-	do \
-		cd $(rootdir)/$$p; \
-		abuild clean; \
-		abuild cleanoldpkg; \
-		abuild cleanpkg; \
-		abuild cleancache; \
-	done
-
diff --git a/aport.lua b/aport.lua
deleted file mode 100755
index 71113475af..0000000000
--- a/aport.lua
+++ /dev/null
@@ -1,244 +0,0 @@
-#!/usr/bin/lua
-
-
--- those should be read from some config file
-aportsdir = "~/aports"
-repos = { "main", "testing" }
-
-
-function split(str)
-	local t = {}
-	if (str == nil) then
-		return nil
-	end
-	for e in string.gmatch(str, "%S+") do
-		table.insert(t, e)
-	end
-	return t
-end
-
-function split_apkbuild(line)
-	local r = {}
-	local dir, pkgname, pkgver, pkgrel, depends, makedepends, subpackages, source = string.match(line, "([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)")
-	r.dir = dir
-	r.pkgname = pkgname
-	r.pkgver = pkgver
-	r.pkgrel = pkgrel
-	r.depends = split(depends)
-	r.makedepends = split(makedepends)
-	r.subpackages = split(subpackages)
-	r.source = split(source)
-	return r
-end
-
--- parse the APKBUILDs and return a list
-function parse_apkbuilds(dir, repos)
-	local i,v, p
-	local str=""
-	if repos == nil then
-		return
-	end
-	--expand repos
-	for i,v in ipairs(repos) do
-		str = str..dir.."/"..v.."/*/APKBUILD "
-	end
-
-	local p = io.popen([[
-		for i in ]]..str..[[; do
-			pkgname=
-			pkgver=
-			pkgrel=
-			depends=
-			makedepends=
-			subpackages=
-			source=
-			dir="${i%/APKBUILD}"
-			cd "$dir"
-			. ./APKBUILD
-			echo $dir\|$pkgname\|$pkgver\|$pkgrel\|$depends\|$makedepends\|$subpackages\|$source
-		done
-	]])
-	return function()
-		local line = p:read("*line")
-		if line == nil then
-			p:close()
-			return nil
-		end
-		return split_apkbuild(line)
-	end
-end
-
-function target_packages(pkgdb, pkgname)
-	local i,v
-	local t = {}
-	for i,v in ipairs(pkgdb[pkgname]) do
-		table.insert(t, pkgname.."-"..v.pkgver.."-r"..v.pkgrel..".apk")
-	end
-	return t
-end
-
-function list_depends( pkg, pkgdb )
-	local dl = {}
-	local s
-	if pkg and not pkg.added then
-		pkg.added = true
-
-		if pkg.depends then
-			for i,v in ipairs(pkg.depends) do
-				--print("v = <"..v..">")
-				s = list_depends( pkgdb[v], pkgdb )
-				if #s > 0 then
-					dl[#dl + 1] = s
-				end
-			end
-		end
-		if pkg.makedepends then
-			for i,v in ipairs(pkg.makedepends) do
-				--print("v = {"..v.."}")
-				s = list_depends( pkgdb[v], pkgdb )
-				if #s > 0 then
-					dl[#dl + 1] = s
-				end
-			end
-		end
-		dl[#dl + 1] = pkg.pkgname
-	end
-
-	s = table.concat(dl," ")
-	--print("s = ["..s.."]")
-	return s
-end
-
-function init_apkdb(aportsdir, repos)
-	local pkgdb = {}
-	local revdeps = {}
-	local a
-
-	for a in parse_apkbuilds(aportsdir, repos) do
-	--	io.write(a.pkgname.." "..a.pkgver.."\t"..a.dir.."\n")
-		if pkgdb[a.pkgname] == nil then
-			pkgdb[a.pkgname] = {}
-		end
-		--table.insert(pkgdb[a.pkgname], a)
-		pkgdb[a.pkgname] = a
-		--print("pk "..a.pkgname.." is a "..type(a).." ("..pkgdb[a.pkgname].pkgname..")")
-		-- add subpackages to package db
-		local k,v
-		for k,v in ipairs(a.subpackages) do
-			if pkgdb[v] == nil then
-				pkgdb[v] = {}
-			end
-			--table.insert(pkgdb[v], a)
-			pkgdb[v] = a
-		end
-		-- add to reverse dependencies
-		for k,v in ipairs(a.makedepends) do
-			if revdeps[v] == nil then
-				revdeps[v] = {}
-			end
-			table.insert(revdeps[v], a)
-		end
-	end
-	return pkgdb, revdeps
-end
-
--- PKGBUILD import
-function split_pkgbuild(line)
-	local r = {}
-	local pkgname, pkgver = string.match(line, "([^|]*)|([^|]*)")
-	r.pkgname = pkgname
-	r.pkgver = pkgver
-	return r
-end
-
-function parse_pkgbuilds(dir, repos)
-	local i,v, p
-	local str=""
-	if repos == nil then
-		return
-	end
-	--expand repos
-	for i,v in ipairs(repos) do
-		str = str..dir.."/"..v.."/*/PKGBUILD "
-	end
-
-	local p = io.popen([[/bin/bash -c '
-		for i in ]]..str..[[; do
-			pkgname=
-			pkgver=
-			source $i
-			echo $pkgname\|$pkgver
-		done
-		' 2>/dev/null
-	]])
-	return function()
-		local line = p:read("*line")
-		if line == nil then
-			p:close()
-			return nil
-		end
-		return split_pkgbuild(line)
-	end
-end
-
-function init_absdb(dir, repos)
-	local p
-	local db = {}
-	for p in parse_pkgbuilds(dir, repos) do
-		if db[p.pkgname] == nil then
-			db[p.pkgname] = {}
-		end
-		table.insert(db[p.pkgname], p.pkgver)
-	end
-	return db
-end
-
-
--- Applets -----------------------
-applet = {}
-function applet.revdep(arg)
-	local pkg = arg[2]
-	if pkg == nil then
-		-- usage?
-		return nil
-	end
-	local apkdb, rev = init_apkdb(aportsdir, repos)
-	local _,p
-	for _,p in ipairs(rev[pkg] or {}) do
-		print(p.pkgname)
-	end
-end
---absdb = init_absdb("/var/abs", { "core", "extra", "community" })
-
-function applet.deplist(arg)
-	local apkdb, rev = init_apkdb(arg[2],{ arg[3] })
-
-	local deplist = {}
-	local nm,pk
-	for nm,pk in pairs(apkdb) do
-		local dl
-		--print("pk "..nm.." is a "..type(pk).." ("..apkdb[nm].pkgname..")")
-		--deplist[#deplist + 1] = "***"
-		dl = list_depends(pk,apkdb)
-		-- print("deplist for "..nm..": "..deplist)
-		if #dl > 0 then
-			deplist[#deplist + 1] = dl
-		end
-	end
-	print(table.concat(deplist," "))
-end
-
-cmd = arg[1]
-
-if cmd == nil then
-	-- usage
-	io.stderr:write( "no command given\n" );
-	return
-end
-
-if type(applet[cmd]) == "function" then
-	applet[cmd](arg)
-else
-	io.stderr:write(cmd..": invalid applet\n")
-end
-
diff --git a/main/avahi/APKBUILD b/main/avahi/APKBUILD
index 0ffbd2075e..dd21a53119 100644
--- a/main/avahi/APKBUILD
+++ b/main/avahi/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=avahi
 pkgver=0.6.30
-pkgrel=3
+pkgrel=4
 pkgdesc="A multicast/unicast DNS-SD framework"
 url="http://www.avahi.org/"
 arch="all"
@@ -50,6 +50,7 @@ package() {
 	ln -s avahi-compat-libdns_sd.pc \
 		"$pkgdir"/usr/lib/pkgconfig/libdns_sd.pc
 	ln -s avahi-compat-libdns_sd/dns_sd.h "$pkgdir"/usr/include/
+	rm -f "$pkgdir"/usr/lib/*.la
 }
 
 dev() {
diff --git a/main/gnokii/APKBUILD b/main/gnokii/APKBUILD
index 8691b7a138..e0630ae5fe 100644
--- a/main/gnokii/APKBUILD
+++ b/main/gnokii/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gnokii
 pkgver=0.6.30
-pkgrel=3
+pkgrel=4
 pkgdesc="Tools and user space driver for use with mobile phones"
 url="http://www.gnokii.org/"
 arch="all"
@@ -76,6 +76,7 @@ mysql() {
 sqlite() {
 	pkgdesc="SMSD plugin for SQLite storage backend"
 	depends="gnokii-smsd"
+	rm "$pkgdir"/usr/lib/smsd/*.la
 	mkdir -p "$subpkgdir"/usr/lib/smsd
 	mv "$pkgdir"/usr/lib/smsd/*sqlite*.so "$subpkgdir"/usr/lib/smsd/
 }
diff --git a/main/libnih/APKBUILD b/main/libnih/APKBUILD
index 18de63cf31..2d6c0c26d8 100644
--- a/main/libnih/APKBUILD
+++ b/main/libnih/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=libnih
 pkgver=1.0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="glib-like library for embedded use"
 url="http://launchpad.net/libnih"
 arch="all"
@@ -37,6 +37,7 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/lib/*.la
 }
 
 md5sums="db7990ce55e01daffe19006524a1ccb0  libnih-1.0.3.tar.gz"
diff --git a/main/lua-bitlib/APKBUILD b/main/lua-bitlib/APKBUILD
index 709eaf0768..4610091dec 100644
--- a/main/lua-bitlib/APKBUILD
+++ b/main/lua-bitlib/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=lua-bitlib
 _name=bitlib
 pkgver=26
-pkgrel=2
+pkgrel=3
 pkgdesc="A lua library providing bitwise operations"
 url="http://luaforge.net/projects/bitlib"
 arch="all"
@@ -24,6 +24,7 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
+	rm -f "$pkgdir"/usr/lib/lua/5.1/*.la
 }
 
 md5sums="b76cb74aef951250f8fa7a65f39bb3d8  bitlib-26.tar.gz"
diff --git a/main/py-gst/APKBUILD b/main/py-gst/APKBUILD
index 4a6d644fb7..589e44ffba 100644
--- a/main/py-gst/APKBUILD
+++ b/main/py-gst/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=py-gst
 pkgver=0.10.21
-pkgrel=1
+pkgrel=2
 pkgdesc="python bindings for gstreamer"
 url="http://gstreamer.freedesktop.org/"
 arch="all"
@@ -38,6 +38,9 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
+	rm "$pkgdir"/usr/lib/gstreamer-0.10/*.la
+	rm "$pkgdir"/usr/lib/python2.7/site-packages/gst-0.10/gst/*.la
+	rm "$pkgdir"/usr/lib/python2.7/site-packages/*.la
 }
 
 md5sums="aa4f428c2e8d3664dca118b12d872429  gst-python-0.10.21.tar.gz"
diff --git a/main/py-gtk/APKBUILD b/main/py-gtk/APKBUILD
index ffa498bb56..674074000c 100644
--- a/main/py-gtk/APKBUILD
+++ b/main/py-gtk/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py-gtk
 pkgver=2.24.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Python bindings for the GTK widget set"
 url="http://www.pygtk.org/"
 arch="all"
@@ -28,11 +28,13 @@ package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	install -m644 gtk/gtk-extrafuncs.defs ""$pkgdir"/usr/share/pygtk/2.0/defs/" || return 1
+	rm "$pkgdir"/usr/lib/python2.7/site-packages/gtk-2.0/gtk/*.la
 }
 
 demo() {
 	pkgdesc="Demonstration of pygtk"
 	depends="py-gtk"
+	rm "$pkgdir"/usr/lib/python2.7/site-packages/gtk-2.0/*.la
 	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib/pygtk/2.0
 	mv "$pkgdir"/usr/bin/pygtk-demo "$subpkgdir"/usr/bin/
 	mv "$pkgdir"/usr/lib/pygtk/2.0/*demo* \
diff --git a/makeall.sh b/makeall.sh
deleted file mode 100755
index 10966c3fdf..0000000000
--- a/makeall.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-for p in 1 2 3
-do
-    echo "============>>> ERROR: Pass $p <<<============"
-    make main 2>&1 | tee makelog-pass-$p-main.txt | grep ">>> ERROR:"
-    make testing 2>&1 | tee makelog-pass-$p-testing.txt | grep ">>> ERROR:"
-done
diff --git a/rebuild-alpine.sh b/rebuild-alpine.sh
deleted file mode 100755
index 24ce9d47b5..0000000000
--- a/rebuild-alpine.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-rootdir=$(pwd -P)
-
-distclean () {
-    echo "Removing traces of previous builds from $rootdir"
-    local allpkgs=$(find $rootdir -maxdepth 3 -name APKBUILD -print | sed -e 's/\/APKBUILD//g' | sort)
-    for p in $allpkgs ; do
-        cd $p
-        pwd
-        abuild clean            2>&1
-        abuild cleanoldpkg      2>&1
-        abuild cleanpkg         2>&1
-        abuild cleancache       2>&1
-    done
-}
-
-build () {
-    local pkgs
-    local maintainer
-    local pkgno
-    local failed
-    pkgs=$($rootdir/aport.lua deplist $rootdir $1)
-    pktcnt=$(echo $pkgs | wc -w)
-    pkgno=0
-    failed=0
-    for p in $pkgs ; do
-        pkgno=$(expr "$pkgno" + 1)
-        echo "Building $p ($pkgno of $pktcnt in $1 - $failed failed)"
-        cd $rootdir/$1/$p
-        if [ -n "$debug" ] ; then
-            apk info | sort > $rootdir/packages.$1.$pkgno.$p.before
-        fi
-        abuild -rm > $rootdir/$1_$p.txt 2>&1
-        if [ "$?" = "0" ] ; then
-    	    if [ -z "$debug" ] ; then
-                rm $rootdir/$1_$p.txt
-            fi
-        else
-            echo "Package $1/$p failed to build (output in $rootdir/$1_$p.txt)"
-            if [ -n "$mail" ] ; then
-                maintainer=$(grep Maintainer APKBUILD | cut -d " " -f 3-)
-                if [ -n "$maintainer" ] ; then
-                    recipients="$maintainer -cc dev@lists.alpinelinux.org"
-                else
-                    recipients="dev@lists.alpinelinux.org"
-                fi
-    	        if [ -n "$mail" ] ; then
-                    echo "Package $1/$p failed to build. Build output is attached" | \
-                        email -s "NOT SPAM $p build report" -a $rootdir/$1_$p.txt \
-                              -n AlpineBuildBot -f buildbot@alpinelinux.org $recipients
-                fi
-            fi
-            failed=$(expr "$failed" + 1)
-        fi
-        if [ -n "$debug" ] ; then
-            apk info | sort > $rootdir/packages.$1.$pkgno.$p.after
-        fi
-    done
-    cd $rootdir
-}
-
-touch START_OF_BUILD.txt
-
-unset clean
-unset mail
-while getopts "cmd" opt; do
-	case $opt in
-		'c') clean="--clean";;
-		'm') mail="--mail";;
-		'd') debug="--debug";;
-	esac
-done
-
-if [ -n "$clean" ] ; then
-    echo "Invoked with 'clean' option. This will take a while ..."
-    tmp=$(distclean)
-    echo "Done"
-fi
-
-echo "Refresh aports tree"
-git pull
-
-#cd main/build-base
-#abuild -Ru
-#cd $rootdir
-
-for s in main testing unstable ; do
-    echo "Building packages in $s"
-    build $s
-done
-
-touch END_OF_BUILD.txt
-
-echo "Done"
-
diff --git a/test.txt b/test.txt
deleted file mode 100644
index 038d718da6..0000000000
--- a/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-testing
diff --git a/testing/compiz/APKBUILD b/testing/compiz/APKBUILD
index 37333da6af..bb6687604a 100644
--- a/testing/compiz/APKBUILD
+++ b/testing/compiz/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=compiz
 pkgver=0.8.8
-pkgrel=1
+pkgrel=2
 pkgdesc="opengl window and composition manager"
 url="http://www.compiz.org/"
 arch="all"
@@ -50,6 +50,8 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
+	rm "$pkgdir"/usr/lib/*.la
+	rm "$pkgdir"/usr/lib/compiz/*.la
 }
 
 md5sums="d7e96f839b7cb0901470d5da04be4db2  compiz-0.8.8.tar.gz"
diff --git a/testing/dspam/APKBUILD b/testing/dspam/APKBUILD
index abd1835583..2b17cacb3f 100644
--- a/testing/dspam/APKBUILD
+++ b/testing/dspam/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=dspam
 pkgver=3.9.1_rc1
 _ver=3.9.1-RC1
-pkgrel=0
+pkgrel=1
 pkgdesc="A statistical-algorithmic hybrid anti-spam filter"
 url="http://dspam.nuclearelephant.com/"
 pkgusers="dspam"
@@ -51,7 +51,8 @@ package() {
 	make install DESTDIR="$pkgdir"
 	install -Dm755 "$srcdir"/dspam.initd "$pkgdir"/etc/init.d/dspam
 	install -Dm644 "$srcdir"/dspam.logrotate "$pkgdir"/etc/logrotate.d/dspam
-
+	rm "$pkgdir"/usr/lib/*.la
+	rm "$pkgdir"/usr/lib/dspam/*.la
 }
 
 pgsql() {
diff --git a/testing/evas/APKBUILD b/testing/evas/APKBUILD
index 3f0d575a35..ad3ce12c38 100644
--- a/testing/evas/APKBUILD
+++ b/testing/evas/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=evas
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="hardware-accelerated retained canvas API"
 url="http://trac.enlightenment.org/e/wiki/Evas"
 arch="all"
@@ -37,7 +37,7 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
-	rm "$pkgdir"/usr/lib/*.la
+	find "$pkgdir" -name *.la -print | xargs rm
 }
 
 md5sums="528debc5e5c75dbc8c5aa7ce5560cdd5  evas-1.0.1.tar.gz"
diff --git a/testing/freetype-infinality/APKBUILD b/testing/freetype-infinality/APKBUILD
index 2ba23842e6..d1a9b7a671 100644
--- a/testing/freetype-infinality/APKBUILD
+++ b/testing/freetype-infinality/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=freetype-infinality
 pkgver=2.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc="TrueType font rendering library with infinality patch"
 url="http://www.infinality.net"
 arch="all"
@@ -45,6 +45,7 @@ package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm755 "$srcdir/infinality-settings" "$pkgdir/etc/profile.d/infinality-settings.sh"
+	find "$pkgdir" -name *.la -print | xargs rm
 }
 
 md5sums="b3e2b6e2f1c3e0dffa1fd2a0f848b671  freetype-2.4.4.tar.bz2
diff --git a/testing/gtk-equinox-engine/APKBUILD b/testing/gtk-equinox-engine/APKBUILD
index 0a78bcf746..c6c84db3c7 100644
--- a/testing/gtk-equinox-engine/APKBUILD
+++ b/testing/gtk-equinox-engine/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=gtk-equinox-engine
 pkgver=1.30.2
-pkgrel=2
+pkgrel=3
 pkgdesc="enhanced cairo-based GTK+ engine"
 url="http://gnome-look.org/content/show.php/Equinox+GTK+Engine"
 license="GPL"
@@ -42,6 +42,8 @@ package() {
 
 	msg "Unpacking themes"
 	tar zxf "$srcdir"/equinox-themes.tar.gz
+
+	find "$pkgdir" -name *.la -print | xargs rm
 }
 
 md5sums="07d43dede6bdc17ba74f1740a3743601  121881-equinox-1.30.tar.bz2"
diff --git a/testing/gtk-murrine-engine/APKBUILD b/testing/gtk-murrine-engine/APKBUILD
index 1cc48e2a31..7f5f2f1952 100644
--- a/testing/gtk-murrine-engine/APKBUILD
+++ b/testing/gtk-murrine-engine/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=gtk-murrine-engine
 pkgver=0.98.1
-pkgrel=1
+pkgrel=2
 pkgdesc="cairo-based gtk engine"
 url="http://www.cimitan.com/murrine/"
 arch="all"
@@ -35,6 +35,7 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
+	find "$pkgdir" -name *.la -print | xargs rm
 }
 
 md5sums="fb8481dd068e27425acf7e91a1250107  murrine-0.98.1.tar.bz2"
diff --git a/testing/libiodbc/APKBUILD b/testing/libiodbc/APKBUILD
index 07a79ee377..0165b727f4 100644
--- a/testing/libiodbc/APKBUILD
+++ b/testing/libiodbc/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=libiodbc
 pkgver=3.52.7
-pkgrel=0
+pkgrel=1
 pkgdesc="iODBC ODBC implementation"
 url="http://www.iodbc.org/"
 arch="all"
@@ -40,6 +40,7 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
+	find "$pkgdir" -name *.la -print | xargs rm
 }
 
 md5sums="ddbd274cb31d65be6a78da58fc09079a  libiodbc-3.52.7.tar.gz"
diff --git a/testing/libupnp/APKBUILD b/testing/libupnp/APKBUILD
index 4964dd5110..ce0ced74e3 100644
--- a/testing/libupnp/APKBUILD
+++ b/testing/libupnp/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=libupnp
 pkgver=1.6.13
-pkgrel=0
+pkgrel=1
 pkgdesc="Portable Open Source UPnP Development Kit"
 url="http://pupnp.sourceforge.net/"
 arch="all"
@@ -24,6 +24,7 @@ package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/custom/${pkgname}/LICENSE
+	find "$pkgdir" -name *.la -print | xargs rm
 }
 
 md5sums="71476b1781ad179bfc9bead640be5f54  libupnp-1.6.13.tar.bz2"
diff --git a/testing/liburiparser/APKBUILD b/testing/liburiparser/APKBUILD
index 05da3c0324..7130338bae 100644
--- a/testing/liburiparser/APKBUILD
+++ b/testing/liburiparser/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=liburiparser
 pkgver=0.7.5
-pkgrel=0
+pkgrel=1
 pkgdesc="A strictly RFC 3986 compliant URI parsing and handling library"
 url="http://uriparser.sourceforge.net/"
 arch="all"
@@ -34,6 +34,7 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
+	find "$pkgdir" -name *.la -print | xargs rm
 }
 
 md5sums="459c2786758929b92bfbd0cee25b5aa0  uriparser-0.7.5.tar.gz"
diff --git a/testing/linux-pam/APKBUILD b/testing/linux-pam/APKBUILD
index 3ab15a20fd..dbfb97f19f 100644
--- a/testing/linux-pam/APKBUILD
+++ b/testing/linux-pam/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=linux-pam
 pkgver=1.1.3
-pkgrel=3
+pkgrel=4
 pkgdesc="pluggable authentication modules for linux"
 url="http://www.kernel.org/pub/linux/libs/pam"
 arch="all"
@@ -64,7 +64,7 @@ package() {
 	done
 
 	# delete pointless libtool archives.
-	rm -rf "$pkgdir"/lib/security/*.la
+	find "$pkgdir" -name *.la -print | xargs rm
 }
 
 md5sums="6db7fcb5db6253350e3a4648ceac40e7  Linux-PAM-1.1.3.tar.bz2
diff --git a/testing/moodbar/APKBUILD b/testing/moodbar/APKBUILD
index a1f2d38415..5e13eb16cd 100644
--- a/testing/moodbar/APKBUILD
+++ b/testing/moodbar/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=moodbar
 pkgver=0.1.2
-pkgrel=0
+pkgrel=1
 pkgdesc="analysis tool for building .mood files"
 url="http://amarok.kde.org/wiki/Moodbar"
 license="GPL"
@@ -32,6 +32,7 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name *.la -print | xargs rm
 }
 
 md5sums="28c8eb65e83b30f71b84be4fab949360  moodbar-0.1.2.tar.gz"
diff --git a/testing/totem/APKBUILD b/testing/totem/APKBUILD
index 7edde166e3..34523a5fe3 100644
--- a/testing/totem/APKBUILD
+++ b/testing/totem/APKBUILD
@@ -2,12 +2,12 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=totem
 pkgver=2.32.0
-pkgrel=2
+pkgrel=3
 pkgdesc="media player for gnome"
 url="http://projects.gnome.org/totem"
 arch="all"
 license="GPL"
-depends="gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-plugins-base-gnome gst-plugins-good-gnome gst-ffmpeg"
+depends="gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-plugins-base-gnome gst-plugins-good-gnome gst-ffmpeg"
 depends_dev="gtk+-dev gstreamer-dev gst-plugins-base-dev gconf-dev totem-pl-parser-dev libunique-dev python-dev libsm-dev libice-dev"
 makedepends="$depends_dev gnome-doc-utils intltool"
 install="$pkgname.pre-deinstall $pkgname.post-install $pkgname.post-upgrade"
@@ -36,6 +36,7 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
+	find "$pkgdir" -name *.la -print | xargs rm
 }
 
 mozilla() {
diff --git a/testing/varnish/APKBUILD b/testing/varnish/APKBUILD
index 60dc55243c..cc7285b0c4 100644
--- a/testing/varnish/APKBUILD
+++ b/testing/varnish/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=varnish
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="High-performance HTTP accelerator"
 url="http://www.varnish-cache.org/"
 arch="all"
@@ -49,6 +49,7 @@ package() {
 		|| return 1
 	install -Dm644 "$srcdir"/varnishd.logrotate \
 		"$pkgdir"/etc/logrotate.d/varnishd || return 1
+	find "$pkgdir" -name *.la -print | xargs rm
 }
 
 libs() {
diff --git a/testing/xmlrpc-epi/APKBUILD b/testing/xmlrpc-epi/APKBUILD
index 593dbe1717..118a215bc0 100644
--- a/testing/xmlrpc-epi/APKBUILD
+++ b/testing/xmlrpc-epi/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=xmlrpc-epi
 pkgver=0.54.1
-pkgrel=1
+pkgrel=2
 pkgdesc="versatile xmlrpc and soap implementation"
 url="http://xmlrpc-epi.sourceforge.net/"
 arch="all"
@@ -45,6 +45,7 @@ package() {
 
 	mkdir "$pkgdir"/usr/include/xmlrpc-epi
 	cp -R "$pkgdir"/usr/include/*.h "$pkgdir"/usr/include/xmlrpc-epi
+	find "$pkgdir" -name *.la -print | xargs rm
 }
 
 md5sums="546ce341e7d79691371344449cb9e484  xmlrpc-epi-0.54.1.tar.gz"