Merge git://git.alpinelinux.org/fab/aports

some new aports and plenty of updates

25 files changed, 154 insertions, 138 deletions

diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index 19f202cb0f..91a6d63b88 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -2,10 +2,10 @@
 pkgname=git
 pkgver=1.7.10.2
 pkgrel=0
-pkgdesc="GIT - the stupid content tracker"
+pkgdesc="A distributed version control system"
 url="http://git.or.cz/"
 arch="all"
-license="GPL2"
+license="GPL2+"
 depends=
 replaces="git-perl"
 subpackages="$pkgname-doc $pkgname-svn $pkgname-perl"
@@ -30,12 +30,12 @@ build() {
 
 package() {
 	cd "$srcdir"/$pkgname-$pkgver
-	make prefix=/usr DESTDIR="$pkgdir" $_makeopts install
+	make prefix=/usr DESTDIR="$pkgdir" $_makeopts install || return 1
 	mkdir -p "$pkgdir"/var/git
 	install -Dm755 "$srcdir"/git-daemon.initd \
-		"$pkgdir"/etc/init.d/git-daemon
+		"$pkgdir"/etc/init.d/git-daemon || return 1
 	install -Dm644 "$srcdir"/git-daemon.confd \
-		"$pkgdir"/etc/conf.d/git-daemon
+		"$pkgdir"/etc/conf.d/git-daemon || return 1
 }
 
 perl() {
diff --git a/main/iperf/APKBUILD b/main/iperf/APKBUILD
index fea017fa2a..248abcb0b3 100644
--- a/main/iperf/APKBUILD
+++ b/main/iperf/APKBUILD
@@ -6,26 +6,28 @@ pkgrel=1
 pkgdesc="tool to measure IP bandwidth using UDP or TCP"
 url="http://iperf.sourceforge.net/"
 arch="all"
-license="GPL"
-depends=
-makedepends=
-install=
+license="BSD"
+depends=""
+makedepends=""
+install=""
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
 
+_builddir="$srcdir/$pkgname-$pkgver"
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
-
-	./configure --prefix=/usr \
+	cd "$_builddir"
+	./configure \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
 }
 
 md5sums="44b5536b67719f4250faed632a3cd016  iperf-2.0.5.tar.gz"
diff --git a/main/knock/APKBUILD b/main/knock/APKBUILD
index 9e3aeede26..5ae1bd5814 100644
--- a/main/knock/APKBUILD
+++ b/main/knock/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
 pkgdesc="A simple port-knocking daemon"
 url="http://www.zeroflux.org/projects/knock"
 arch="all"
-license="GPL"
+license="GPL2+"
 depends="iptables"
 makedepends="libpcap-dev"
 install=
diff --git a/main/lame/APKBUILD b/main/lame/APKBUILD
index 7240e15911..0b4d4e5b45 100644
--- a/main/lame/APKBUILD
+++ b/main/lame/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An MP3 encoder and graphical frame analyzer"
 url="http://lame.sourceforge.net/"
 arch="all"
-license="LGPL"
+license="LGPL2+"
 subpackages="$pkgname-dev $pkgname-doc"
 depends=
 makedepends="nasm ncurses-dev autoconf automake libtool"
diff --git a/main/make/APKBUILD b/main/make/APKBUILD
index 9f4f452fb4..e474de7248 100644
--- a/main/make/APKBUILD
+++ b/main/make/APKBUILD
@@ -5,10 +5,10 @@ pkgrel=4
 pkgdesc="GNU make utility to maintain groups of programs"
 url="http://www.gnu.org/software/make"
 arch="all"
-license=GPL
-depends=
+license="GPL3+"
+depends=""
 subpackages="$pkgname-doc"
-source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
+source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2
 	make-3.82-savannah-bugs-30612-30723.patch
 	make-3.82-copy-on-expand.patch
 	make-3.82-memory-corruption.patch
@@ -35,14 +35,15 @@ build() {
 		--infodir=/usr/share/info \
 		--disable-nls
 	make || return 1
+	make check || return 1
 }
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="7f7c000e3b30c6840f2e9cf86b254fac  make-3.82.tar.gz
+md5sums="1a11100f3c63fcf5753818e59d63088f  make-3.82.tar.bz2
 74e598a2052f7d98e3495ea9d917ecf4  make-3.82-savannah-bugs-30612-30723.patch
 9545e667ab5eafdef5b658941290cc26  make-3.82-copy-on-expand.patch
 0436e740edbc81cf27fd598241b8dcf0  make-3.82-memory-corruption.patch
diff --git a/main/makedepend/APKBUILD b/main/makedepend/APKBUILD
index 17cc40fe4a..414ca56a98 100644
--- a/main/makedepend/APKBUILD
+++ b/main/makedepend/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=makedepend
-pkgver=1.0.3
+pkgver=1.0.4
 pkgrel=0
 pkgdesc="utility for making makefile dependencies"
 url="http://www.freedesktop.org/"
@@ -37,4 +37,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="4e6cb97bbecfbb34f3f644a75e513093  makedepend-1.0.3.tar.bz2"
+md5sums="7acb9a831817fdd11ba7f7aaa3c74fd8  makedepend-1.0.4.tar.bz2"
diff --git a/main/mc/APKBUILD b/main/mc/APKBUILD
index 1056fca866..b36c3f7c08 100644
--- a/main/mc/APKBUILD
+++ b/main/mc/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A filemanager/shell that emulates Norton Commander"
 url="http://www.ibiblio.org/mc/"
 arch="all"
-license="GPL"
+license="GPL3+"
 depends=""
 subpackages="$pkgname-doc $pkgname-lang"
 makedepends="e2fsprogs-dev glib-dev pcre-dev slang-dev"
diff --git a/main/memcached/APKBUILD b/main/memcached/APKBUILD
index b7f0176c8d..c3cb36f579 100644
--- a/main/memcached/APKBUILD
+++ b/main/memcached/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Distributed memory object caching system"
 url="http://memcached.org"
 arch="all"
-license="GPL"
+license="BSD"
 depends="perl"
 depends_dev="libevent-dev"
 makedepends="$depends_dev"
@@ -30,7 +30,8 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr
+	./configure --prefix=/usr\
+		|| return 1
 	make || return 1
 }
 
diff --git a/main/mercurial/APKBUILD b/main/mercurial/APKBUILD
index 3bce6d13cf..358eee4bdf 100644
--- a/main/mercurial/APKBUILD
+++ b/main/mercurial/APKBUILD
@@ -5,19 +5,20 @@ pkgrel=0
 pkgdesc="A scalable distributed SCM tool"
 url="http://www.selenic.com/mercurial"
 arch="all"
-license="GPL"
-depends="python"
+license="GPL2+"
+depends=""
 makedepends="python-dev"
 subpackages="$pkgname-doc"
 source="http://www.selenic.com/$pkgname/release/$pkgname-$pkgver.tar.gz"
 
+_builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	python setup.py build
+	cd "$_builddir"
+	python setup.py build || return 1
 }
 
 package() { 
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	python setup.py install --root="$pkgdir" || return 1
 	install -d "$pkgdir"/usr/share/man/man1 "$pkgdir"/usr/share/man/man5
 	install -m644 doc/hg.1 ""$pkgdir"/usr/share/man/man1" || return 1
diff --git a/main/midori/APKBUILD b/main/midori/APKBUILD
index f9d80af39b..45d1b06c2c 100644
--- a/main/midori/APKBUILD
+++ b/main/midori/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="A lightweight web browser based on Gtk WebKit"
 url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
 arch="all"
-license="GPL"
+license="LGPL2+"
 depends="
 	desktop-file-utils
 	hicolor-icon-theme
diff --git a/main/minicom/APKBUILD b/main/minicom/APKBUILD
index 57e3a48ec9..75faf520a6 100644
--- a/main/minicom/APKBUILD
+++ b/main/minicom/APKBUILD
@@ -6,27 +6,28 @@ pkgrel=0
 pkgdesc="menu driven communications program for terminals"
 url="http://alioth.debian.org/projects/minicom"
 arch="all"
-license="GPL"
-depends=
+license="GPL2+"
+depends=""
 makedepends="ncurses-dev libiconv-dev gettext-dev"
-install=
+install=""
 subpackages="$pkgname-doc $pkgname-lang"
 source="http://alioth.debian.org/frs/download.php/3700/minicom-2.6.1.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info 
-		#--without-libintl-prefix 
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install || return 1
 }
 
 md5sums="435fb410a5bfa9bb20d4248b3ca53529  minicom-2.6.1.tar.gz"
diff --git a/main/py-boto/APKBUILD b/main/py-boto/APKBUILD
index a1c0a4ca19..e5e31b3b25 100644
--- a/main/py-boto/APKBUILD
+++ b/main/py-boto/APKBUILD
@@ -2,20 +2,19 @@
 # Maintainer:  Matt Smith <mcs@darkregion.net>
 pkgname=py-boto
 _pkgname=boto
-pkgver=1.9b
-pkgrel=2
-pkgdesc="An integrated interface to current and future infrastructural services offered by Amazon Web Services."
-url="http://code.google.com/p/boto/"
+pkgver=2.4.1
+pkgrel=0
+pkgdesc="An interface to infrastructural services offered by Amazon Web Services"
+url="http://docs.pythonboto.org/en/latest/index.html"
 arch="noarch"
 license="MIT"
 depends="python"
 makedepends="python-dev py-setuptools"
-install=
+install=""
 subpackages="$pkgname-doc"
-source="http://$_pkgname.googlecode.com/files/$_pkgname-$pkgver.tar.gz"
+source="https://github.com/downloads/$_pkgname/$_pkgname/$_pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$_pkgname-$pkgver
-
 prepare() {
 	cd "$_builddir"
 	# apply patches here
@@ -28,14 +27,14 @@ build() {
 
 package() {
 	cd "$_builddir"
-	python setup.py install --root "$pkgdir"
+	python setup.py install --root "$pkgdir" || return 1
 }
 
 doc() {
 	cd "$_builddir"
 
 	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname
-	install -Dm644 README "$subpkgdir"/usr/share/doc/$pkgname/README
+	install -Dm644 README.rst "$subpkgdir"/usr/share/doc/$pkgname/README
 
 	# Note: The documentation in the 'docs' directory can only be generated
 	# (via sphinx-build from the py-sphinx package) once this package has
@@ -48,4 +47,4 @@ doc() {
 	find "$subpkgdir"/usr/share/doc/$pkgname/ -type d -exec chmod 755 '{}' \;
 }
 
-md5sums="4fc2fd7b70a971b1363f8465aafe7091  boto-1.9b.tar.gz"
+md5sums="6fb90c1aa8c8ce6d967f2b0e06deda5b  boto-2.4.1.tar.gz"
diff --git a/main/py-cairo/APKBUILD b/main/py-cairo/APKBUILD
index c375476109..83ce38403c 100644
--- a/main/py-cairo/APKBUILD
+++ b/main/py-cairo/APKBUILD
@@ -1,37 +1,40 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py-cairo
-pkgver=1.8.10
-pkgrel=4
+_pkgname=py2cairo
+pkgver=1.10.0
+pkgrel=0
 pkgdesc="Python bindings for the cairo graphics library"
 url="http://cairographics.org/pycairo/"
 arch="all"
-license="GPL"
-depends=
+license="LGPL2+"
+depends=""
 makedepends="python-dev cairo-dev"
-install=
+install=""
 subpackages="$pkgname-dev"
-source="http://cairographics.org/releases/py2cairo-$pkgver.tar.gz"
-
-
-_builddir="$srcdir"/pycairo-$pkgver
+source="http://cairographics.org/releases/$_pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir"/$_pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
 }
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make || return 1
+	./waf configure --prefix=/usr || return 1
+#	./configure --prefix=/usr \
+#		--sysconfdir=/etc \
+#		--mandir=/usr/share/man \
+#		--infodir=/usr/share/info \
+#		|| return 1
+#	make || return 1
+	./waf build || return 1
 }
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
-	rm -f "$pkgdir"/usr/lib/python*/site-packages/cairo/_cairo.la
+	./waf install --destdir="${pkgdir}" || return 1
+#	make DESTDIR="$pkgdir" install || return 1
+#	rm -f "$pkgdir"/usr/lib/python*/site-packages/cairo/_cairo.la
 }
 
-md5sums="87421a6a70304120555ba7ba238f3dc3  py2cairo-1.8.10.tar.gz"
+md5sums="20337132c4ab06c1146ad384d55372c5  py2cairo-1.10.0.tar.bz2"
diff --git a/main/py-dbus/APKBUILD b/main/py-dbus/APKBUILD
index abec67d48b..cdac37d8a9 100644
--- a/main/py-dbus/APKBUILD
+++ b/main/py-dbus/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py-dbus
-pkgver=0.84.0
-pkgrel=1
+pkgver=1.1.0
+pkgrel=0
 pkgdesc="Python bindings for DBUS"
 url="http://www.freedesktop.org/wiki/Software/DBusBindings"
 arch="all"
@@ -14,8 +14,10 @@ source="http://dbus.freedesktop.org/releases/dbus-python/dbus-python-$pkgver.tar
 _builddir="$srcdir"/dbus-python-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr || return 1
+	./configure --prefix=/usr \
+		|| return 1
 	make || return 1
+	make test || return 1
 }
 
 package() {
@@ -24,4 +26,4 @@ package() {
 	find $pkgdir -iname *.la -delete
 }
 
-md5sums="fe69a2613e824463e74f10913708c88a  dbus-python-0.84.0.tar.gz"
+md5sums="41a459bbbb5fd92eeebd632623af0bd7  dbus-python-1.1.0.tar.gz"
diff --git a/main/py-genshi/APKBUILD b/main/py-genshi/APKBUILD
index 5ca4543873..7169ef7112 100644
--- a/main/py-genshi/APKBUILD
+++ b/main/py-genshi/APKBUILD
@@ -6,22 +6,23 @@ pkgver=0.6
 pkgrel=2
 pkgdesc="Python toolkit for stream-based generation of output for the web."
 url="http://genshi.edgewall.org/"
-arch="all"
+arch="noarch"
 license="BSD"
 depends="python"
 makedepends="py-setuptools python-dev"
-install=
+install=""
+subpackages=""
 source="http://ftp.edgewall.com/pub/genshi/$_realname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$_realname-$pkgver
-
 build() {
-	return 0
+	cd "$_builddir"
+	python setup.py build || return 1
 }
 
 package() {
 	cd "$_builddir"
-	python setup.py install --root="$pkgdir"
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
 md5sums="604e8b23b4697655d36a69c2d8ef7187  Genshi-0.6.tar.gz"
diff --git a/main/py-gst/APKBUILD b/main/py-gst/APKBUILD
index f714b00176..9382a08074 100644
--- a/main/py-gst/APKBUILD
+++ b/main/py-gst/APKBUILD
@@ -1,19 +1,20 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=py-gst
-pkgver=0.10.21
-pkgrel=3
+_pkgname=gst-python
+pkgver=0.10.22
+pkgrel=0
 pkgdesc="python bindings for gstreamer"
 url="http://gstreamer.freedesktop.org/"
 arch="all"
-license="LGPL"
+license="LGPL2+"
 depends="py-gtk py-gobject"
 makedepends="gstreamer-dev gst-plugins-base-dev py-gtk-dev py-gobject-dev"
 install=""
 subpackages=""
-source="http://gstreamer.freedesktop.org/src/gst-python/gst-python-$pkgver.tar.gz"
+source="http://gstreamer.freedesktop.org/src/$_pkgname/$_pkgname-$pkgver.tar.gz"
 
-_builddir="$srcdir"/gst-python-$pkgver
+_builddir="$srcdir"/$_pkgname-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
@@ -43,4 +44,4 @@ package() {
 		"$pkgdir"/usr/lib/python*/site-packages/*.la || return 1
 }
 
-md5sums="aa4f428c2e8d3664dca118b12d872429  gst-python-0.10.21.tar.gz"
+md5sums="83cfa59d596bb876b6b576027f2d2b0e  gst-python-0.10.22.tar.gz"
diff --git a/main/py-jinja2/APKBUILD b/main/py-jinja2/APKBUILD
index 2c20fb00e3..ba82ec6a13 100644
--- a/main/py-jinja2/APKBUILD
+++ b/main/py-jinja2/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer:  Matt Smith <mcs@darkregion.net>
 pkgname=py-jinja2
 _pkgname=Jinja2
-pkgver=2.5.5
-pkgrel=3
+pkgver=2.6
+pkgrel=0
 pkgdesc="A small but fast and easy to use stand-alone template engine written in pure python."
 url="http://jinja.pocoo.org/"
 arch="noarch"
@@ -63,4 +63,4 @@ doc() {
 		-exec chmod 755 '{}' \; || return 1
 }
 
-md5sums="83b20c1eeb31f49d8e6392efae91b7d5  Jinja2-2.5.5.tar.gz"
+md5sums="1c49a8825c993bfdcf55bb36897d28a2  Jinja2-2.6.tar.gz"
diff --git a/main/py-pygments/APKBUILD b/main/py-pygments/APKBUILD
index 0003e5e3fd..09802290c6 100644
--- a/main/py-pygments/APKBUILD
+++ b/main/py-pygments/APKBUILD
@@ -2,15 +2,15 @@
 # Maintainer:  Matt Smith <mcs@darkregion.net>
 pkgname=py-pygments
 _pkgname=Pygments
-pkgver=1.4
-pkgrel=2
-pkgdesc="Pygments is a syntax highlighting package written in Python."
+pkgver=1.5
+pkgrel=0
+pkgdesc="A syntax highlighting package written in Python."
 url="http://pygments.org/"
 arch="noarch"
 license="BSD"
 depends="python"
 makedepends="python-dev py-setuptools"
-install=
+install=""
 subpackages="$pkgname-doc"
 source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 
@@ -57,4 +57,4 @@ doc() {
 		-exec chmod 755 '{}' \; || return 1
 }
 
-md5sums="d77ac8c93a7fb27545f2522abe9cc462  Pygments-1.4.tar.gz"
+md5sums="ef997066cc9ee7a47d01fb4f3da0b5ff  Pygments-1.5.tar.gz"
diff --git a/main/py-sphinx/APKBUILD b/main/py-sphinx/APKBUILD
index f475b27c77..d3aa688057 100644
--- a/main/py-sphinx/APKBUILD
+++ b/main/py-sphinx/APKBUILD
@@ -2,20 +2,19 @@
 # Maintainer:  Matt Smith <mcs@darkregion.net>
 pkgname=py-sphinx
 _pkgname=Sphinx
-pkgver=1.0.7
-pkgrel=1
+pkgver=1.1.3
+pkgrel=0
 pkgdesc="Python Documentation Generator"
 url="http://sphinx.pocoo.org/"
 arch="noarch"
 license="BSD"
-depends="python py-docutils py-jinja2 py-pygments"
+depends="py-docutils py-jinja2 py-pygments"
 makedepends="python-dev py-setuptools"
-install=
+install=""
 subpackages="$pkgname-doc"
 source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$_pkgname-$pkgver
-
 prepare() {
 	cd "$_builddir"
 	# apply patches here
@@ -28,7 +27,7 @@ build() {
 
 package() {
 	cd "$_builddir"
-	python setup.py install --root "$pkgdir" || return 1
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
 doc() {
@@ -53,4 +52,4 @@ doc() {
 		-exec chmod 755 '{}' \; || return 1
 }
 
-md5sums="42c722d48e52d4888193965dd473adb5  Sphinx-1.0.7.tar.gz"
+md5sums="8f55a6d4f87fc6d528120c5d1f983e98  Sphinx-1.1.3.tar.gz"
diff --git a/main/py-urwid/APKBUILD b/main/py-urwid/APKBUILD
index 4703f37d70..6fb342198b 100644
--- a/main/py-urwid/APKBUILD
+++ b/main/py-urwid/APKBUILD
@@ -2,20 +2,19 @@
 # Maintainer: Matt Smith <mcs@darkregion.net>
 pkgname=py-urwid
 _pkgname=urwid
-pkgver=0.9.9.1
-pkgrel=3
+pkgver=1.0.1
+pkgrel=0
 pkgdesc="Urwid is a console user interface library for Python"
 url="http://excess.org/urwid/"
 arch="all"
-license="LGPL"
-depends="python"
+license="LGPL2+"
+depends=""
 makedepends="python-dev py-setuptools py-templayer"
-install=
+install=""
 subpackages="$pkgname-doc"
 source="http://excess.org/$_pkgname/$_pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$_pkgname-$pkgver
-
 prepare() {
 	cd "$_builddir"
 	# apply patches here
@@ -28,7 +27,7 @@ build() {
 
 package() {
 	cd "$_builddir"
-	python setup.py install --root "$pkgdir"
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
 doc() {
@@ -47,4 +46,4 @@ doc() {
 	find "$subpkgdir"/usr/share/doc/$pkgname/ -type d -exec chmod 755 '{}' \;
 }
 
-md5sums="4722cdf898f711dcae1121aa80920152  urwid-0.9.9.1.tar.gz"
+md5sums="828f7144b94920205e755c249d2e297f  urwid-1.0.1.tar.gz"
diff --git a/main/python/APKBUILD b/main/python/APKBUILD
index 95b241da9b..6a5c56c61e 100644
--- a/main/python/APKBUILD
+++ b/main/python/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=python
-pkgver=2.7.2
+pkgver=2.7.3
 _verbase=${pkgver%.*}
 pkgrel=3
 pkgdesc="A high-level scripting language"
@@ -11,7 +11,7 @@ replaces="python-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tests
 	py-gdbm:gdbm
 	"
-depends=
+depends=""
 makedepends="expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev
 	gdbm-dev sqlite-dev libffi-dev readline-dev"
 source="http://www.$pkgname.org/ftp/$pkgname/$pkgver/Python-$pkgver.tar.bz2
@@ -35,7 +35,6 @@ build() {
 		--with-system-expat \
 		--enable-unicode=ucs4 \
 		|| return 1
-
 	make || return 1
 }
 
@@ -75,4 +74,4 @@ gdbm() {
 	_mv_files $(find usr/lib -name '*gdbm*')
 }
 
-md5sums="ba7b2f11ffdbf195ee0d111b9455a5bd  Python-2.7.2.tar.bz2"
+md5sums="c57477edd6d18bd9eeca2f21add73919  Python-2.7.3.tar.bz2"
diff --git a/main/rrdcollect/APKBUILD b/main/rrdcollect/APKBUILD
index 56e6499aa1..5cebb462ed 100644
--- a/main/rrdcollect/APKBUILD
+++ b/main/rrdcollect/APKBUILD
@@ -1,19 +1,19 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=rrdcollect
-pkgver=0.2.9
-pkgrel=2
+pkgver=0.2.10
+pkgrel=0
 pkgdesc="Read system statistical data and feed it to RRDtool"
 url="http://rrdcollect.sourceforge.net/"
 arch="all"
-license="GPL"
+license="GPL2+"
 depends="rrdtool"
 makedepends="libpcap-dev"
-install=
+install=""
 subpackages="$pkgname-doc" 
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-	rrdcollect.conf.patch
-	rrdcollect.initd"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+		rrdcollect.conf.patch
+		rrdcollect.initd"
 
 _builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
@@ -30,24 +30,23 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-
 	./configure --prefix=/usr \
 		--localstatedir=/var \
 		--sysconfdir=/etc/rrdcollect \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		|| return 1
 	make || return 1
 }
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
-
+	make DESTDIR="$pkgdir" install || return 1
 	install -m755 -D "$srcdir"/rrdcollect.initd \
 		"$pkgdir"/etc/init.d/rrdcollect || return 1
 	install -m755 -d "$pkgdir"/var/lib/rrdtool || return 1
 }
 
-md5sums="1e94eb0f8d55ebf0f042c10baebc2d3d  rrdcollect-0.2.9.tar.gz
+md5sums="138e21fc9f2de0b8b6c89f1506394ef8  rrdcollect-0.2.10.tar.bz2
 e09d7a588e31c9ecfc44fd1747ad732b  rrdcollect.conf.patch
 d5a892939ee11351f6bbbf9218694f8b  rrdcollect.initd"
diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD
index b722d325df..c86605d7ee 100644
--- a/main/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
@@ -1,18 +1,20 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=ruby
-pkgver=1.8.7_p352
+pkgver=1.8.7_p358
 _pkgver=${pkgver/_/-}
 pkgrel=1
 pkgdesc="An object-oriented language for quick and easy programming"
 url="http://www.ruby-lang.org/en/"
 arch="all"
 license="Ruby"
-depends=
-makedepends="zlib-dev openssl-dev libiconv-dev gdbm-dev db-dev readline-dev"
+depends=""
+makedepends="zlib-dev openssl-dev libiconv-dev gdbm-dev db-dev readline-dev
+		valgrind-dev"
 subpackages="$pkgname-doc $pkgname-dev"
-source="ftp://ftp.ruby-lang.org/pub/ruby/1.8/${pkgname}-${_pkgver}.tar.bz2"
+source="ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/${pkgname}-${_pkgver}.tar.bz2"
 options="!fhs"
+
 #
 # maybe its a good idea to split dep libs to seperate pkg's.
 #
@@ -37,21 +39,27 @@ build() {
 	# ruby saves path to install. we want use $PATH
 	export INSTALL=install
 
-	./configure --build=${CHOST:-i486-alpine-linux-uclibc} \
+	./configure \
+		--build=${CHOST:-i486-alpine-linux-uclibc} \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--enable-pthread \
 		--with-sitedir='/usr/local/lib/site_ruby' \
-		--with-extra-site-search-path='/usr/lib/site_ruby/$(ruby_ver)/i686-linux' \
-		--enable-shared
+		--with-search-path='/usr/lib/site_ruby/$(ruby_ver)/i686-linux' \
+		--enable-pthread \
+        --disable-rpath \
+        --disable-versioned-paths \
+		--enable-shared \
+		--with-mantype=man \
+		|| return 1
 	make || return 1
+	make test || return 1
 }
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install || return 1
 	if [ -d "$pkgdir"/usr/local ]; then
 		local f=$(cd "$pkgdir" ; find usr/local -type f)
 		if [ -n "$f" ]; then
@@ -60,8 +68,8 @@ package() {
 			return 1
 		fi
 	fi
-	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}"/COPYING || return 1
-
+	install -Dm644 COPYING \
+		"${pkgdir}/usr/share/licenses/${pkgname}"/COPYING || return 1
 }
 
-md5sums="0c61ea41d1b1183b219b9afe97f18f52  ruby-1.8.7-p352.tar.bz2"
+md5sums="de35f00997f4ccee3e22dff0f2d01b8a  ruby-1.8.7-p358.tar.bz2"
diff --git a/main/spice-protocol/APKBUILD b/main/spice-protocol/APKBUILD
index fa6f70233e..57f818d0f0 100644
--- a/main/spice-protocol/APKBUILD
+++ b/main/spice-protocol/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=spice-protocol
-pkgver=0.10.0
+pkgver=0.10.1
 pkgrel=0
 pkgdesc="Spice protocol header files"
 url="http://www.spice-space.org/"
@@ -38,4 +38,4 @@ package() {
 	rm -f "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="888d8a50d36a09a1c479cadddce244ae  spice-protocol-0.10.0.tar.bz2"
+md5sums="7147ef0d9295dbe44510870f8d047e9c  spice-protocol-0.10.1.tar.bz2"
diff --git a/main/spice/APKBUILD b/main/spice/APKBUILD
index 1fbad306ca..8b7166ffa1 100644
--- a/main/spice/APKBUILD
+++ b/main/spice/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=spice
-pkgver=0.10.0
-pkgrel=2
+pkgver=0.10.1
+pkgrel=0
 pkgdesc="Implements the SPICE protocol"
 url="http://www.spice-space.org/"
 arch="all"
@@ -59,5 +59,5 @@ client() {
 	mv "$pkgdir"/usr/bin/spicec "$subpkgdir"/usr/bin/
 }
 
-md5sums="d9f0b0280c9e2291623c9560e156be26  spice-0.10.0.tar.bz2
+md5sums="70060129e274241b4a08e23e86de29a3  spice-0.10.1.tar.bz2
 3e61fdc18bf201a2b54b332fdbe2912e  cstdarg.patch"