Merge branch 'master' of ssh://git.alpinelinux.org/gitroot/aports

15 files changed, 177 insertions, 60 deletions

diff --git a/testing/audacious-plugins/APKBUILD b/testing/audacious-plugins/APKBUILD
index 9dc18b6c9f..84e8910c88 100644
--- a/testing/audacious-plugins/APKBUILD
+++ b/testing/audacious-plugins/APKBUILD
@@ -2,12 +2,13 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=audacious-plugins
 pkgver=2.4.2
-pkgrel=1
+pkgrel=3
 pkgdesc="playlist-oriented media player with multiple interfaces (plugins)"
 url="http://audacious-media-player.org/"
 arch="all"
 license="ISC"
 depends=audacious
+#_want_ffmpeg="ffmpeg-dev"
 makedepends="libmowgli-dev
 	     libmcs-dev
              libguess-dev
@@ -20,9 +21,13 @@ makedepends="libmowgli-dev
 	     libsamplerate-dev
 	     libcue-dev
 	     libmms-dev
+	     libsndfile-dev
 
+	     libogg-dev
              libvorbis-dev
-             ffmpeg-dev
+
+	     $_want_ffmpeg
+
              alsa-lib-dev
 	     faad2-dev
              neon-dev
diff --git a/testing/bluez/APKBUILD b/testing/bluez/APKBUILD
index 70aa179df6..746762d207 100644
--- a/testing/bluez/APKBUILD
+++ b/testing/bluez/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bluez
-pkgver=4.72
+pkgver=4.81
 pkgrel=0
 pkgdesc="Tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
@@ -10,7 +10,7 @@ depends=
 makedepends="dbus-dev gst-plugins-base-dev alsa-lib-dev libusb-compat-dev
 	libnl-dev"
 subpackages="$pkgname-dev $pkgname-doc libbluetooth $pkgname-alsa $pkgname-cups
-	$pkgname-netlink $pkgname-gstreamer"
+	$pkgname-gstreamer"
 source="http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.bz2
 	bluetooth.initd
 	bluetooth.confd
@@ -27,7 +27,6 @@ build() {
 		--enable-gstreamer \
 		--enable-alsa \
 		--enable-usb \
-		--enable-netlink \
 		--enable-tools \
 		--enable-bccmd \
 		--enable-hid2hci \
@@ -57,8 +56,8 @@ libbluetooth() {
 
 alsa() {
 	pkgdesc="Bluez plugin for ALSA"
-	mkdir -p "$subpkgdir"/etc "$subpkgdir"/usr/lib
-	mv "$pkgdir"/etc/alsa* "$subpkgdir"/etc/
+	mkdir -p "$subpkgdir"/usr/share "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/share/alsa* "$subpkgdir"/usr/share/ || return 1
 	mv "$pkgdir"/usr/lib/alsa* "$subpkgdir"/usr/lib/
 }
 
@@ -68,19 +67,12 @@ cups() {
 	mv "$pkgdir"/usr/lib/cups "$subpkgdir"/usr/lib/
 }
 
-netlink() {
-	pkgdesc="Bluez netlink plugin"
-	mkdir -p "$subpkgdir"/usr/lib/bluetooth/plugins
-	mv "$pkgdir"/usr/lib/bluetooth/plugins/netlink.so \
-		"$subpkgdir"/usr/lib/bluetooth/plugins
-}
-
 gstreamer() {
 	pkgdesc="Bluez plugin for gstreamer"
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/gstreamer* \
 		"$subpkgdir"/usr/lib/
 }
-md5sums="1e7e4261954275076479a08dbeae26ca  bluez-4.72.tar.bz2
-66408fb89b05e7ce7e61c4c3c356d2c6  bluetooth.initd
+md5sums="75fbc768bf626fc8f4cf466006767723  bluez-4.81.tar.bz2
+c511078403d7d27673581a8bb468b90b  bluetooth.initd
 a159d897a057f4675548327329c4cc22  bluetooth.confd"
diff --git a/testing/bluez/bluetooth.initd b/testing/bluez/bluetooth.initd
index 9ec58e97c4..ef25720bf6 100644
--- a/testing/bluez/bluetooth.initd
+++ b/testing/bluez/bluetooth.initd
@@ -12,7 +12,7 @@ start() {
    	ebegin "Starting Bluetooth"
 
 	if [ -x /sbin/udevadm ]; then
-		udevadm trigger --subsystem-match=bluetooth
+		udevadm trigger --subsystem-match=bluetooth --action=add
 		eend $?
 	fi
 
diff --git a/testing/faenza-icon-theme/APKBUILD b/testing/faenza-icon-theme/APKBUILD
new file mode 100644
index 0000000000..a74e17290a
--- /dev/null
+++ b/testing/faenza-icon-theme/APKBUILD
@@ -0,0 +1,25 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=faenza-icon-theme
+pkgver=0.8
+pkgrel=0
+pkgdesc="icons designed to go in tandem with equinox themes"
+arch="noarch"
+url="http://tiheum.deviantart.com/art/Faenza-Icons-173323228"
+license="GPL"
+depends=
+makedepends="wget"
+install=
+subpackages=
+source="https://launchpad.net/~tiheum/+archive/equinox/+files/faenza-icon-theme_$pkgver.tar.gz"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+package() {
+	cd "$_builddir"
+
+	mkdir -p "$pkgdir"/usr/share/icons
+	cp -dpRf Faenza* "$pkgdir"/usr/share/icons
+}
+
+md5sums="c4f87cf4105d2330a259296f8e73e709  faenza-icon-theme_0.8.tar.gz"
diff --git a/testing/gtk-equinox-engine/APKBUILD b/testing/gtk-equinox-engine/APKBUILD
new file mode 100644
index 0000000000..b6b8ec214a
--- /dev/null
+++ b/testing/gtk-equinox-engine/APKBUILD
@@ -0,0 +1,47 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=gtk-equinox-engine
+pkgver=1.30.2
+pkgrel=1
+pkgdesc="enhanced cairo-based GTK+ engine"
+url="http://gnome-look.org/content/show.php/Equinox+GTK+Engine"
+license="GPL"
+arch="all"
+depends=
+makedepends="gtk+-dev"
+install=
+subpackages=
+source="http://gnome-look.org/CONTENT/content-files/121881-equinox-1.30.tar.bz2"
+
+_builddir="$srcdir"/equinox-${pkgver%.*}
+
+prepare() {
+	cd "$srcdir"
+
+	msg "Unpacking GTK+ engine"
+	tar zxf equinox-gtk-engine.tar.gz
+
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+
+	mkdir -p "$pkgdir"/usr/share/themes
+	cd "$pkgdir"/usr/share/themes
+
+	msg "Unpacking themes"
+	tar zxf "$srcdir"/equinox-themes.tar.gz
+}
+
+md5sums="07d43dede6bdc17ba74f1740a3743601  121881-equinox-1.30.tar.bz2"
diff --git a/testing/libamz/APKBUILD b/testing/libamz/APKBUILD
new file mode 100644
index 0000000000..67a0343cdb
--- /dev/null
+++ b/testing/libamz/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=libamz
+pkgver=0.0.2
+pkgrel=0
+pkgdesc="library and tools for accessing amazon mp3 download queues"
+url="http://nenolod.net/projects/libamz"
+arch="all"
+license="ISC"
+depends=
+makedepends="libgcrypt-dev libsoup-dev libxml2-dev gtk+-dev"
+install=
+subpackages="$pkgname-dev"
+source="http://nenolod.net/~nenolod/distfiles/$pkgname-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	# workaround bug in busybox
+	sed -e "/touch/s/0001010000/200001010000/g" \
+		-i configure
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+md5sums="fcecea69be7b62aa6d31b80b23e8f0db  libamz-0.0.2.tar.bz2"
diff --git a/testing/py-boto/APKBUILD b/testing/py-boto/APKBUILD
index 00b3fe9d99..8663a6de0c 100644
--- a/testing/py-boto/APKBUILD
+++ b/testing/py-boto/APKBUILD
@@ -3,10 +3,10 @@
 pkgname=py-boto
 _pkgname=boto
 pkgver=1.9b
-pkgrel=0
+pkgrel=1
 pkgdesc="An integrated interface to current and future infrastructural services offered by Amazon Web Services."
 url="http://code.google.com/p/boto/"
-arch="x86 x86_64"
+arch="noarch"
 license="MIT"
 depends="python"
 makedepends="python-dev py-setuptools"
diff --git a/testing/py-docutils/APKBUILD b/testing/py-docutils/APKBUILD
index 33154afe7f..1206517d4a 100644
--- a/testing/py-docutils/APKBUILD
+++ b/testing/py-docutils/APKBUILD
@@ -3,10 +3,10 @@
 pkgname=py-docutils
 _pkgname=docutils
 pkgver=0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Documentation Utilities for Python"
 url="http://docutils.sourceforge.net/"
-arch="x86 x86_64"
+arch="noarch"
 license="PublicDomain"
 depends="python py-imaging py-roman"
 makedepends="python-dev py-setuptools"
diff --git a/testing/py-jinja2/APKBUILD b/testing/py-jinja2/APKBUILD
index 31aa7dcf03..b5d4ffc962 100644
--- a/testing/py-jinja2/APKBUILD
+++ b/testing/py-jinja2/APKBUILD
@@ -3,10 +3,10 @@
 pkgname=py-jinja2
 _pkgname=Jinja2
 pkgver=2.5.5
-pkgrel=0
+pkgrel=1
 pkgdesc="A small but fast and easy to use stand-alone template engine written in pure python."
 url="http://jinja.pocoo.org/"
-arch="x86 x86_64"
+arch="noarch"
 license="BSD"
 depends="python"
 makedepends="python-dev py-setuptools"
diff --git a/testing/py-pygments/APKBUILD b/testing/py-pygments/APKBUILD
index ac6da6e105..bf65a2bfdd 100644
--- a/testing/py-pygments/APKBUILD
+++ b/testing/py-pygments/APKBUILD
@@ -3,10 +3,10 @@
 pkgname=py-pygments
 _pkgname=Pygments
 pkgver=1.3.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Pygments is a syntax highlighting package written in Python."
 url="http://pygments.org/"
-arch="x86 x86_64"
+arch="noarch"
 license="BSD"
 depends="python"
 makedepends="python-dev py-setuptools"
diff --git a/testing/py-roman/APKBUILD b/testing/py-roman/APKBUILD
index 79b3894239..1caffb1d67 100644
--- a/testing/py-roman/APKBUILD
+++ b/testing/py-roman/APKBUILD
@@ -3,10 +3,10 @@
 pkgname=py-roman
 _pkgname=roman
 pkgver=1.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Integer to Roman numerals converter"
 url="http://pypi.python.org/pypi/roman"
-arch="x86 x86_64"
+arch="noarch"
 license="Python2.1.1"
 depends="python"
 makedepends="python-dev py-setuptools"
diff --git a/testing/py-sphinx/APKBUILD b/testing/py-sphinx/APKBUILD
index 3b43e52d2b..6bdfd90535 100644
--- a/testing/py-sphinx/APKBUILD
+++ b/testing/py-sphinx/APKBUILD
@@ -3,10 +3,10 @@
 pkgname=py-sphinx
 _pkgname=Sphinx
 pkgver=1.0.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Python Documentation Generator"
 url="http://sphinx.pocoo.org/"
-arch="x86 x86_64"
+arch="noarch"
 license="BSD"
 depends="python py-docutils py-jinja2 py-pygments"
 makedepends="python-dev py-setuptools"
diff --git a/testing/py-templayer/APKBUILD b/testing/py-templayer/APKBUILD
index 776fdfbc2b..eeefd4bb53 100644
--- a/testing/py-templayer/APKBUILD
+++ b/testing/py-templayer/APKBUILD
@@ -1,41 +1,43 @@
 # Contributor: Matt Smith <mcs@darkregion.net>
 # Maintainer: Matt Smith <mcs@darkregion.net>
 pkgname=py-templayer
-_name=templayer
+_pkgname=templayer
 pkgver=1.5.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Templayer is a layered template library for Python and Django"
 url="http://excess.org/templayer/"
-arch="x86 x86_64"
+arch="noarch"
 license="LGPL"
 depends="python"
-makedepends="python-dev"
+makedepends="python-dev py-setuptools"
 install=
 subpackages="$pkgname-doc"
-source="http://excess.org/$pkgname/$_name-$pkgver.tar.gz"
+source="http://excess.org/$_pkgname/$_pkgname-$pkgver.tar.gz"
 
-_builddir="$srcdir"/$_name-$pkgver
+_builddir="$srcdir"/$_pkgname-$pkgver
 
 prepare() {
-	cd "$_builddir"
-	# apply patches here
+        cd "$_builddir"
+        # apply patches here
 }
 
 build() {
-	return 0
+        cd "$_builddir"
+        python setup.py build || return 1
 }
 
 package() {
-	cd "$_builddir"
-	python setup.py install --root "$pkgdir"
+        cd "$_builddir"
+        python setup.py install --root "$pkgdir"
 }
 
 doc() {
-	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname
-	cd "$_builddir"
-	install -Dm644 docs/reference.html "$subpkgdir"/usr/share/doc/$pkgname/reference.html
-	install -Dm644 docs/tutorial.html "$subpkgdir"/usr/share/doc/$pkgname/tutorial.html
-	install -Dm644 docs/tutorial_examples.tar.gz "$subpkgdir"/usr/share/doc/$pkgname/tutorial_examples.tar.gz
+        cd "$_builddir"
+
+        mkdir -p "$subpkgdir"/usr/share/doc/$pkgname
+        for doc in reference.html tutorial.html tutorial_examples.tar.gz; do
+                install -Dm644 ./docs/$doc "$subpkgdir"/usr/share/doc/$pkgname/$doc
+        done
 }
 
 md5sums="9d1a3aa0cece34a2492792278aad406d  templayer-1.5.1.tar.gz"
diff --git a/testing/py-urwid/APKBUILD b/testing/py-urwid/APKBUILD
index 64ad1403fa..4fe9074477 100644
--- a/testing/py-urwid/APKBUILD
+++ b/testing/py-urwid/APKBUILD
@@ -1,21 +1,20 @@
 # Contributor: Matt Smith <mcs@darkregion.net>
 # Maintainer: Matt Smith <mcs@darkregion.net>
 pkgname=py-urwid
-_name=urwid
+_pkgname=urwid
 pkgver=0.9.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Urwid is a console user interface library for Python"
 url="http://excess.org/urwid/"
 arch="x86 x86_64"
 license="LGPL"
 depends="python"
-makedepends="python-dev py-templayer"
+makedepends="python-dev py-setuptools py-templayer"
 install=
 subpackages="$pkgname-doc"
-source="http://excess.org/$pkgname/$_name-$pkgver.tar.gz
-	"
+source="http://excess.org/$_pkgname/$_pkgname-$pkgver.tar.gz"
 
-_builddir="$srcdir"/$_name-$pkgver
+_builddir="$srcdir"/$_pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
@@ -24,20 +23,28 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	python setup.py build
-	return 0
+	python setup.py build || return 1
 }
 
 package() {
 	cd "$_builddir"
 	python setup.py install --root "$pkgdir"
+}
+
+doc() {
+	cd "$_builddir"
 
-	# generate tutorial examples, and copy documentation 
+	# generate tutorial examples, and copy documentation
 	python docgen_tutorial.py -s
-	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/tutorial_examples
-	cp -a example*.py "$pkgdir"/usr/share/doc/$pkgname/tutorial_examples/
-	install -Dm644 reference.html "$pkgdir"/usr/share/doc/$pkgname/reference.html
-	install -Dm644 tutorial.html "$pkgdir"/usr/share/doc/$pkgname/tutorial.html
+	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/tutorial_examples
+	cp -a example*.py "$subpkgdir"/usr/share/doc/$pkgname/tutorial_examples/
+
+	for doc in CHANGELOG reference.html tutorial.html; do
+		install -Dm644 $doc "$subpkgdir"/usr/share/doc/$pkgname/$doc
+	done
+
+	# Fix subdir perms
+	find "$subpkgdir"/usr/share/doc/$pkgname/ -type d -exec chmod 755 '{}' \;
 }
 
 md5sums="4722cdf898f711dcae1121aa80920152  urwid-0.9.9.1.tar.gz"
diff --git a/testing/speedometer/APKBUILD b/testing/speedometer/APKBUILD
index 2f009c5473..bafa602727 100644
--- a/testing/speedometer/APKBUILD
+++ b/testing/speedometer/APKBUILD
@@ -2,10 +2,10 @@
 # Maintainer: Matt Smith <mcs@darkregion.net>
 pkgname=speedometer
 pkgver=2.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Measure and display the rate of data across a network connection or data being stored in a file"
 url="http://excess.org/speedometer/"
-arch="x86 x86_64"
+arch="noarch"
 license="LGPL"
 depends="python py-urwid"
 makedepends=