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

6 files changed, 15 insertions, 6 deletions

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* \