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

Conflicts: testing/py-lxml/APKBUILD
author: Natanael Copa <ncopa@alpinelinux.org> 2013-03-13 07:16:38 +0000
committer: Natanael Copa <ncopa@alpinelinux.org> 2013-03-13 07:17:29 +0000
commit: 2f9f2948ad63a4beac262b48cbe61bcbaa9afaf0 (patch)
tree: 59d30e210c5fb6438f0234fb9ca35ff44e06ab07
parent: 38cbbfaeafb21f57533ff98a232ffd99bd81d415 (diff)
parent: 00a90f770df3088a33fa8df2676943bbee6a22c3 (diff)
download: aports-fcolista-2f9f2948ad63a4beac262b48cbe61bcbaa9afaf0.tar.bz2
aports-fcolista-2f9f2948ad63a4beac262b48cbe61bcbaa9afaf0.tar.xz
56 files changed, 677 insertions, 351 deletions
diff --git a/main/augeas/APKBUILD b/main/augeas/APKBUILD
index fd4f1203bd..3536fbae88 100644
--- a/main/augeas/APKBUILD
+++ b/main/augeas/APKBUILD
@@ -2,17 +2,16 @@
 pkgname=augeas
 pkgver=1.0.0
 pkgrel=1
-pkgdesc="a configuration editing tool"
+pkgdesc="A configuration editing tool"
 url="http://augeas.net"
 arch="all"
-license="LGPL"
-depends=
+license="LGPL2+"
+depends=""
 depends_dev="libxml2-dev"
 makedepends="$depends_dev readline-dev"
-install=
+install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tests $pkgname-libs"
-source="http://download.augeas.net/augeas-$pkgver.tar.gz
-	"
+source="http://download.augeas.net/augeas-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -35,6 +34,7 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
 	make || return 1
+	make tests || return 1
 }
 
 package() {
@@ -45,6 +45,7 @@ package() {
 
 tests() {
 	pkgdesc="Tests for Augeas lenses"
+	arch="noarch"
 	mkdir -p "$subpkgdir"/usr/share/augeas/lenses/dist/
 	mv "$pkgdir"/usr/share/augeas/lenses/dist/tests \
 		"$subpkgdir"/usr/share/augeas/lenses/dist/
diff --git a/main/cvechecker/APKBUILD b/main/cvechecker/APKBUILD
index 61548efcfe..75021efe80 100644
--- a/main/cvechecker/APKBUILD
+++ b/main/cvechecker/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A local CVE checker tool"
 url="http://cvechecker.sourceforge.net/"
 arch="all"
-license="GPL"
+license="GPL3"
 depends="gawk wget libxslt"
 depends_dev="libconfig-dev sqlite-dev openssl-dev mysql-dev"
 [ "$ALPINE_LIBC" != "eglibc" ] && depends_dev="$depends_dev argp-standalone"
@@ -33,12 +33,13 @@ build() {
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--enable-sqlite3 \
-		--enable-mysql
+		--enable-mysql \
+		|| return 1
 	make || return 1
 }
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install || return 1
 	mkdir -p "$pkgdir"/var/cvechecker &>/dev/null
 	chgrp -R cvechecker "$pkgdir"/var/cvechecker/* &>/dev/null
 	chmod -R g+w "$pkgdir"/var/cvechecker &>/dev/null
diff --git a/main/libusb/APKBUILD b/main/libusb/APKBUILD
index fc809759d9..4de038b5ee 100644
--- a/main/libusb/APKBUILD
+++ b/main/libusb/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Library to enable user space application programs to communicate with USB devices"
 url="http://libusb.sourceforge.net/"
 arch="all"
-license="LGPL"
+license="LGPL2+"
 subpackages="$pkgname-dev"
 depends=""
 makedepends=""
diff --git a/main/pgpool/APKBUILD b/main/pgpool/APKBUILD
index 8eb19a59b2..a601022322 100644
--- a/main/pgpool/APKBUILD
+++ b/main/pgpool/APKBUILD
@@ -2,35 +2,40 @@
 # Maintainer: Cameron <cbanta@gmail.com>
 pkgname=pgpool
 _opkgname=pgpool-II
-pkgver=3.0.1
-pkgrel=2
-pkgdesc="Pgpool II is a connection pooling/replication server for PostgreSQL."
-url="http://pgfoundry.org/projects/pgpool/"
+pkgver=3.2.2
+pkgrel=0
+pkgdesc="A connection pooling/replication server for PostgreSQL"
+url="http://www.pgpool.net"
 arch="all"
 license="BSD"
 makedepends="postgresql-dev"
 subpackages="$pkgname-doc $pkgname-dev"
-source="http://pgfoundry.org/frs/download.php/2841/$_opkgname-$pkgver.tar.gz
-	$pkgname.initd"
+source="$_opkgname-$pkgver.tar.gz::http://www.pgpool.net/download.php?f=$_opkgname-$pkgver.tar.gz
+		$pkgname.initd"
 
+_builddir="$srcdir"/$_opkgname-$pkgver
 build() {
-	cd "$srcdir/$_opkgname-$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/$_opkgname-$pkgver"
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la || return 1
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 }
 
-md5sums="86d8beff0396d11b6753dd2be31bcad7  pgpool-II-3.0.1.tar.gz
+md5sums="707f0f6328b669cb643b936c21365440  pgpool-II-3.2.2.tar.gz
 6317aee51feaf9c5facb7765cddeec6b  pgpool.initd"
+sha256sums="307bab80dcefdcc5c1a2a7b2f294d5734d9c258985503e550b3cbf8d1858cfb0  pgpool-II-3.2.2.tar.gz
+19c4652755913c53c209b0f6c81074a4ef430dd19a196fe22779f991a8cb8d66  pgpool.initd"
+sha512sums="e02091ab5aa336d01e3a0d314b856868452880c4f86aa92e4f73105d4e9aa0c21914e18587f06a2f67282e30e3a50ffff0c0b3825efc5f91529de06206dbdfb8  pgpool-II-3.2.2.tar.gz
+b8efd7b90e0bb74a5d099cd6929ea7a8342803dea4eed3410d210bfce4074a773a4f11caabb59dd4e85f049c5168537ebc504eb4d83236d2fa68b03725fa9aff  pgpool.initd"
diff --git a/main/py-boto/APKBUILD b/main/py-boto/APKBUILD
index e5e31b3b25..261b8c88bf 100644
--- a/main/py-boto/APKBUILD
+++ b/main/py-boto/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Matt Smith <mcs@darkregion.net>
-# Maintainer:  Matt Smith <mcs@darkregion.net>
+# Maintainer: Matt Smith <mcs@darkregion.net>
 pkgname=py-boto
 _pkgname=boto
-pkgver=2.4.1
+pkgver=2.8.0
 pkgrel=0
 pkgdesc="An interface to infrastructural services offered by Amazon Web Services"
 url="http://docs.pythonboto.org/en/latest/index.html"
@@ -12,7 +12,7 @@ depends="python"
 makedepends="python-dev py-setuptools"
 install=""
 subpackages="$pkgname-doc"
-source="https://github.com/downloads/$_pkgname/$_pkgname/$_pkgname-$pkgver.tar.gz"
+source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$_pkgname-$pkgver
 prepare() {
@@ -47,4 +47,6 @@ doc() {
 	find "$subpkgdir"/usr/share/doc/$pkgname/ -type d -exec chmod 755 '{}' \;
 }
 
-md5sums="6fb90c1aa8c8ce6d967f2b0e06deda5b  boto-2.4.1.tar.gz"
+md5sums="d86d23a357f4c527c51b1ea02bbae8e3  boto-2.8.0.tar.gz"
+sha256sums="f520cec579a11c99b510e06d16f484ce877f5b75eeae850c7e165753092939db  boto-2.8.0.tar.gz"
+sha512sums="12853813ae78243ea025fb2e7d0d1dca71b655d977da5d9d28071f52a78708eebf16a42d8763b315246e7ebb681f5ec111e779d710286293175d38ac165a69f1  boto-2.8.0.tar.gz"
diff --git a/main/py-configshell/APKBUILD b/main/py-configshell/APKBUILD
index e504979c76..a5d9992d8a 100644
--- a/main/py-configshell/APKBUILD
+++ b/main/py-configshell/APKBUILD
@@ -14,7 +14,7 @@ depends_dev="python-dev py-simpleparse py-urwid"
 makedepends="$depends_dev"
 install=""
 subpackages=""
-source="https://github.com/agrover/configshell-fb/archive/v$_ver.tar.gz"
+source="$_realname-fb-$_ver.tar.gz::https://github.com/agrover/configshell-fb/archive/v$_ver.tar.gz"
 
 _builddir="$srcdir"/$_realname-fb-$_ver
 prepare() {
@@ -37,6 +37,6 @@ package() {
 	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="c14768baf1216f2ce272d7a9e261909c  v1.1.fb7.tar.gz"
-sha256sums="ab5576b7c4ff91390aea0b1edb7de5eada209da054022a10e8eab71252e2dc55  v1.1.fb7.tar.gz"
-sha512sums="1fa8eed68c3bfa261dcb1ad7d724844bf1845f11fe8fa1587972e2cd6aa91750504e3438cc9b349c382b590bfe54e1ffbc616aa76927e32c4651123f6f756e37  v1.1.fb7.tar.gz"
+md5sums="c14768baf1216f2ce272d7a9e261909c  configshell-fb-1.1.fb7.tar.gz"
+sha256sums="ab5576b7c4ff91390aea0b1edb7de5eada209da054022a10e8eab71252e2dc55  configshell-fb-1.1.fb7.tar.gz"
+sha512sums="1fa8eed68c3bfa261dcb1ad7d724844bf1845f11fe8fa1587972e2cd6aa91750504e3438cc9b349c382b590bfe54e1ffbc616aa76927e32c4651123f6f756e37  configshell-fb-1.1.fb7.tar.gz"
diff --git a/main/py-jinja2/APKBUILD b/main/py-jinja2/APKBUILD
index ba82ec6a13..72470ba30f 100644
--- a/main/py-jinja2/APKBUILD
+++ b/main/py-jinja2/APKBUILD
@@ -1,21 +1,20 @@
 # Contributor: Matt Smith <mcs@darkregion.net>
-# Maintainer:  Matt Smith <mcs@darkregion.net>
+# Maintainer: Matt Smith <mcs@darkregion.net>
 pkgname=py-jinja2
 _pkgname=Jinja2
 pkgver=2.6
 pkgrel=0
-pkgdesc="A small but fast and easy to use stand-alone template engine written in pure python."
+pkgdesc="A small but fast and easy to use stand-alone python template engine"
 url="http://jinja.pocoo.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"
 
 _builddir="$srcdir"/$_pkgname-$pkgver
-
 prepare() {
 	cd "$_builddir"
 	# apply patches here
@@ -64,3 +63,5 @@ doc() {
 }
 
 md5sums="1c49a8825c993bfdcf55bb36897d28a2  Jinja2-2.6.tar.gz"
+sha256sums="a85e185375db75c109f99ecde3d55415f035e7068a82252cf4f16c667ac38f49  Jinja2-2.6.tar.gz"
+sha512sums="6603bd6a7e4956433746da15b18b1206b67c901262337aab8352ddff154efca9eb6d652c244c63e8ffad492d204c724db3e86222ae371e75e3f5f2011244554e  Jinja2-2.6.tar.gz"
diff --git a/main/py-parsing/APKBUILD b/main/py-parsing/APKBUILD
index ec76e0aa23..962609b986 100644
--- a/main/py-parsing/APKBUILD
+++ b/main/py-parsing/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py-parsing
-pkgver=1.5.6
+pkgver=1.5.7
 pkgrel=0
 pkgdesc="An object-oriented approach to text processing"
 url="http://pyparsing.wikispaces.com/"
@@ -9,7 +9,7 @@ arch="noarch"
 license="MIT"
 depends="python"
 depends_dev=""
-makedepends="$depends_dev"
+makedepends="python-dev py-setuptools"
 install=""
 subpackages=""
 source="http://downloads.sourceforge.net/pyparsing/pyparsing-$pkgver.tar.gz"
@@ -35,4 +35,6 @@ package() {
 	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="1e41cb219dae9fc353bd4cd47636b283  pyparsing-1.5.6.tar.gz"
+md5sums="b610eee4da882f0c9d063eaf83dc8fbf  pyparsing-1.5.7.tar.gz"
+sha256sums="2b3a013582cbff858e71ff23129e01acc5e99f511578d106ffb1e74bde15e893  pyparsing-1.5.7.tar.gz"
+sha512sums="051efdc899b23981595c9661688b089bf973c45624099ebcbbe208e8e75bcbfacd0149b39ffda4d53622dd385f1c31751eed94a04239ba8baa2fceb0707c7207  pyparsing-1.5.7.tar.gz"
diff --git a/main/py-pygments/APKBUILD b/main/py-pygments/APKBUILD
index 09802290c6..79d942f87d 100644
--- a/main/py-pygments/APKBUILD
+++ b/main/py-pygments/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Matt Smith <mcs@darkregion.net>
-# Maintainer:  Matt Smith <mcs@darkregion.net>
+# Maintainer: Matt Smith <mcs@darkregion.net>
 pkgname=py-pygments
 _pkgname=Pygments
-pkgver=1.5
+pkgver=1.6
 pkgrel=0
 pkgdesc="A syntax highlighting package written in Python."
 url="http://pygments.org/"
@@ -57,4 +57,6 @@ doc() {
 		-exec chmod 755 '{}' \; || return 1
 }
 
-md5sums="ef997066cc9ee7a47d01fb4f3da0b5ff  Pygments-1.5.tar.gz"
+md5sums="a18feedf6ffd0b0cc8c8b0fbdb2027b1  Pygments-1.6.tar.gz"
+sha256sums="799ed4caf77516e54440806d8d9cd82a7607dfdf4e4fb643815171a4b5c921c0  Pygments-1.6.tar.gz"
+sha512sums="552d0c2a1296773a5482122bd5cbec0ce91a497cd86ee105e1c5ddf2bfa9c206fcc7de504c6da480344c6e1bee30d7b26012fd061dcb2091d8b2b21bcd163bf0  Pygments-1.6.tar.gz"
diff --git a/main/py-roman/APKBUILD b/main/py-roman/APKBUILD
index 1c48cbed28..43280f1da4 100644
--- a/main/py-roman/APKBUILD
+++ b/main/py-roman/APKBUILD
@@ -1,21 +1,20 @@
 # Contributor: Matt Smith <mcs@darkregion.net>
-# Maintainer:  Matt Smith <mcs@darkregion.net>
+# Maintainer: Matt Smith <mcs@darkregion.net>
 pkgname=py-roman
 _pkgname=roman
-pkgver=1.4.0
-pkgrel=3
+pkgver=2.0.0
+pkgrel=0
 pkgdesc="Integer to Roman numerals converter"
 url="http://pypi.python.org/pypi/roman"
 arch="noarch"
 license="Python2.1.1"
 depends="python"
 makedepends="python-dev py-setuptools"
-install=
-subpackages=
-source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+install=""
+subpackages=""
+source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.zip"
 
 _builddir="$srcdir"/$_pkgname-$pkgver
-
 prepare() {
 	cd "$_builddir"
 	# apply patches here
@@ -31,4 +30,6 @@ package() {
 	python setup.py install --root "$pkgdir" || return 1
 }
 
-md5sums="4f8832ed4108174b159c2afb4bd1d1dd  roman-1.4.0.tar.gz"
+md5sums="aa71d131eec16d45c030fd06a27c9d17  roman-2.0.0.zip"
+sha256sums="90e83b512b44dd7fc83d67eb45aa5eb707df623e6fc6e66e7f273abd4b2613ae  roman-2.0.0.zip"
+sha512sums="d62a95e835232821dbf7a81d0c6b7df63f18c4116cfc7eee0c691a0b31d3d7b69d2dc2e4ea26e0a169a8e24bf080e8bb1e195b853be4adf1491335a5b4d5702c  roman-2.0.0.zip"
diff --git a/main/py-setuptools/APKBUILD b/main/py-setuptools/APKBUILD
index 6f23307c14..490e15f5c2 100644
--- a/main/py-setuptools/APKBUILD
+++ b/main/py-setuptools/APKBUILD
@@ -4,27 +4,30 @@ pkgname=py-setuptools
 _pkgname=${pkgname#py-}
 pkgver=0.6c11
 pkgrel=3
-pkgdesc="setuptools is a collection of enhancements to the Python distutils"
+pkgdesc="A collection of enhancements to the Python distutils"
 url="http://pypi.python.org/pypi/setuptools"
 arch="noarch"
 license="PSF"
 depends="python"
 makedepends="python-dev"
-install=
+install=""
 subpackages=""
-source="http://pypi.python.org/packages/source/s/$_pkgname/$_pkgname-$pkgver.tar.gz"
+source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 
+_builddir="$srcdir"/$_pkgname-$pkgver
 build() {
-	cd "$srcdir"/$_pkgname-$pkgver
+	cd "$_builddir"
 	python setup.py build || return 1
 }
 
 package() {
-	cd "$srcdir"/$_pkgname-$pkgver
-	python setup.py install --root="$pkgdir"
+	cd "$_builddir"
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 	# we don't provide a non-suffixed easy_install
 	echo "Removing non-suffixed easy_install ( $pkgdir/usr/bin/easy_install)"
 	rm "$pkgdir"/usr/bin/easy_install
 }
 
 md5sums="7df2a529a074f613b509fb44feefe74e  setuptools-0.6c11.tar.gz"
+sha256sums="630fea9b726320b73ee3ca6ff61732cb32675b0389be658080fe46383b87a1d3  setuptools-0.6c11.tar.gz"
+sha512sums="5eaaa46af97fdf8ebca9b8768a8c6aa65e6c5028df44ccc141310989659f6e92069679ba160ac42eef9751cf89867a58035eac6cf4225a712bd0176fb685786e  setuptools-0.6c11.tar.gz"
diff --git a/main/py-sqlite/APKBUILD b/main/py-sqlite/APKBUILD
index ee41216e6e..9dc1d91ce3 100644
--- a/main/py-sqlite/APKBUILD
+++ b/main/py-sqlite/APKBUILD
@@ -1,27 +1,29 @@
 # Contributor: Mika Havela <mika.havela@gmail.com>
 # Maintainer: Mika Havela <mika.havela@gmail.com>
 pkgname=py-sqlite
-_realname=pysqlite
+_pkgname=pysqlite
 pkgver=2.6.3
 pkgrel=2
 pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine"
 url="http://code.google.com/p/pysqlite/"
 arch="all"
 license="MIT"
-depends="python sqlite"
-makedepends="sqlite-dev python-dev"
-install=
-source="http://pysqlite.googlecode.com/files/${_realname}-${pkgver}.tar.gz"
-
-_builddir="$srcdir"/$_realname-$pkgver
+depends="sqlite"
+makedepends="sqlite-dev python-dev py-setuptools"
+install=""
+source="http://pysqlite.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz"
 
+_builddir="$srcdir"/$_pkgname-$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="711afa1062a1d2c4a67acdf02a33d86e  pysqlite-2.6.3.tar.gz"
+sha256sums="0d538880717f6347bb83f9ce11e9b171caf9d76e1980a0e9c22f8b03aec3585b  pysqlite-2.6.3.tar.gz"
+sha512sums="fe7618b9b4b764a32be94dc8abd97445e33009c8489d2b417c9677382452a5c2d176feffe8b3167eb543f89d5ed3b9b717ceef63bfb2157b3f24a539cfb89a51  pysqlite-2.6.3.tar.gz"
diff --git a/main/py-twisted-mail/APKBUILD b/main/py-twisted-mail/APKBUILD
index 43cfc399bd..814712f307 100644
--- a/main/py-twisted-mail/APKBUILD
+++ b/main/py-twisted-mail/APKBUILD
@@ -1,9 +1,8 @@
 # Contributor: Jeff Bilyk <jbilyk@alpinelinux.org>
 # Maintainer:
-
 pkgname=py-twisted-mail
 _pkgname=TwistedMail
-pkgver=12.0.0
+pkgver=12.3.0
 pkgrel=0
 pkgdesc="Python Twisted Mail library"
 url="http://twistedmatrix.com/trac/wiki/TwistedMail"
@@ -11,12 +10,29 @@ arch="noarch"
 license="MIT"
 depends="py-twisted"
 makedepends="python-dev"
-source="http://twistedmatrix.com/Releases/Mail/12.0/$_pkgname-$pkgver.tar.bz2"
+source="http://twistedmatrix.com/Releases/Mail/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/$_pkgname-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
 
 build() {
-	cd "$srcdir"/$_pkgname-$pkgver/
-	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
+	cd "$_builddir"
+	python setup.py build || return 1
+}
 
+package() {
+	cd "$_builddir"
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="7c01bd6fecf5db26c241aa1c76d6567d  TwistedMail-12.0.0.tar.bz2"
+md5sums="c285ce7e7b2d8e606b3d35a26b025bad  TwistedMail-12.3.0.tar.bz2"
+sha256sums="339f04f9d49f9be2945086c7d1ffb530bcbc653ae0151d3fa0bd899ad82034b0  TwistedMail-12.3.0.tar.bz2"
+sha512sums="9e6b5eaddfe7ec460b702a9c376c5c4e98cc2e5ea2b1c2bde87ddb93fd49eb9be1d489e7a2d3f56b1e281c79acb3a7a02a7e41268c0c2844e4aaf29fbce5e251  TwistedMail-12.3.0.tar.bz2"
diff --git a/main/py-twisted-names/APKBUILD b/main/py-twisted-names/APKBUILD
index bfc31f569f..16468a9e6d 100644
--- a/main/py-twisted-names/APKBUILD
+++ b/main/py-twisted-names/APKBUILD
@@ -1,9 +1,8 @@
 # Contributor: Jeff Bilyk <jbilyk@alpinelinux.org>
 # Maintainer:
-
 pkgname=py-twisted-names
 _pkgname=TwistedNames
-pkgver=12.0.0
+pkgver=12.3.0
 pkgrel=0
 pkgdesc="Python Twisted Names DNS server and resolver library"
 url="http://twistedmatrix.com/trac/wiki/TwistedNames"
@@ -11,12 +10,19 @@ arch="noarch"
 license="MIT"
 depends="py-twisted"
 makedepends="python-dev"
-source="http://twistedmatrix.com/Releases/Names/12.0/$_pkgname-$pkgver.tar.bz2"
+source="http://twistedmatrix.com/Releases/Names/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir"/$_pkgname-$pkgver
 build() {
-	cd "$srcdir"/$_pkgname-$pkgver/
-	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
+	cd "$_builddir"
+	python setup.py build || return 1
+}
 
+package() {
+	cd "$_builddir"
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="1e7b0f1c60d550712245455080f85115  TwistedNames-12.0.0.tar.bz2"
+md5sums="946d0d16c06abac58479332cb8a9b006  TwistedNames-12.3.0.tar.bz2"
+sha256sums="0e125aee9ef0025527cd30fb91ba6b520b237402629bfabdbb40148aec31156a  TwistedNames-12.3.0.tar.bz2"
+sha512sums="c77c99fabaa1d778852a4310207b452a17b2aa3c3241c250055a0f56b4eaf4aaa72c2e005318d10792f2b1c563568f28efda62fa5ff14b5a2b82c05ce4d58143  TwistedNames-12.3.0.tar.bz2"
diff --git a/main/py-twisted-web/APKBUILD b/main/py-twisted-web/APKBUILD
index a96c93ffa0..a4feedcb2a 100644
--- a/main/py-twisted-web/APKBUILD
+++ b/main/py-twisted-web/APKBUILD
@@ -1,6 +1,5 @@
 # Contributor: Jeff Bilyk <jbilyk@alpinelinux.org>
 # Maintainer:
-
 pkgname=py-twisted-web
 _pkgname=TwistedWeb
 pkgver=12.0.0
@@ -11,12 +10,19 @@ arch="noarch"
 license="MIT"
 depends="py-twisted"
 makedepends="python-dev"
-source="http://twistedmatrix.com/Releases/Web/12.0/$_pkgname-$pkgver.tar.bz2"
+source="http://twistedmatrix.com/Releases/Web/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir"/$_pkgname-$pkgver
 build() {
-	cd "$srcdir"/$_pkgname-$pkgver/
-	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
+	cd "$_builddir"
+	python setup.py build || return 1
+}
 
+package() {
+	cd "$_builddir"
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
 md5sums="e253566d86305bd1335874e69803d4f6  TwistedWeb-12.0.0.tar.bz2"
+sha256sums="ff6d0dad12f1928deca23c8d05a0cb9a340abbb6e2cd8bc503e4092a0a873859  TwistedWeb-12.0.0.tar.bz2"
+sha512sums="8a3e39989efa179e08ce4e15287fe0f12315b296fa7216d8444f6470e5860fb57e95c5173c30bdf1afa25304b411358ff1516069d486fd72559adfb89892b742  TwistedWeb-12.0.0.tar.bz2"
diff --git a/main/py-twisted-words/APKBUILD b/main/py-twisted-words/APKBUILD
index c687dcc7fa..60ba0d7b3d 100644
--- a/main/py-twisted-words/APKBUILD
+++ b/main/py-twisted-words/APKBUILD
@@ -1,9 +1,8 @@
 # Contributor: Jeff Bilyk <jbilyk@alpinelinux.org>
 # Maintainer:
-
 pkgname=py-twisted-words
 _pkgname=TwistedWords
-pkgver=12.0.0
+pkgver=12.3.0
 pkgrel=0
 pkgdesc="Python Twisted Words library"
 url="http://twistedmatrix.com/trac/wiki/TwistedWords"
@@ -11,12 +10,19 @@ arch="noarch"
 license="MIT"
 depends="py-twisted"
 makedepends="python-dev"
-source="http://twistedmatrix.com/Releases/Words/12.0/$_pkgname-$pkgver.tar.bz2"
+source="http://twistedmatrix.com/Releases/Words/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2"
 
+_builddir="$srcdir"/$_pkgname-$pkgver
 build() {
-	cd "$srcdir"/$_pkgname-$pkgver/
-	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
+	cd "$_builddir"
+	python setup.py build || return 1
+}
 
+package() {
+	cd "$_builddir"
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="2d88f194022dcd243469460c86ad1b79  TwistedWords-12.0.0.tar.bz2"
+md5sums="3146f62e2d4252aa781c4a2fbcae6ea9  TwistedWords-12.3.0.tar.bz2"
+sha256sums="e6cd4f197aa698d95c80549d869a397299be2e69b148ac90c839b258b03c0980  TwistedWords-12.3.0.tar.bz2"
+sha512sums="270638482e452ed6287818b129b5e22963a29325b5b60aa8b257509e4d4a359ff0f6fa0cacd666d263de52ea9c2a8b33802b2c6ec7f5d50258e961169a2aec69  TwistedWords-12.3.0.tar.bz2"
diff --git a/main/py-twisted/APKBUILD b/main/py-twisted/APKBUILD
index e8c18293c1..6dd562eef0 100644
--- a/main/py-twisted/APKBUILD
+++ b/main/py-twisted/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py-twisted
 _pkgname=Twisted
-pkgver=12.0.0
+pkgver=12.3.0
 pkgrel=1
 pkgdesc="Asynchronous networking framework written in Python."
 url="http://twistedmatrix.com/"
@@ -30,4 +30,6 @@ package() {
 	done
 }
 
-md5sums="d231ae966799eedaab4c62e062e227e0  TwistedCore-12.0.0.tar.bz2"
+md5sums="95e3fa899250003c74b8995154cc7421  TwistedCore-12.3.0.tar.bz2"
+sha256sums="343dd7372b05d4aa0805406bcbee7db40514b6bb48aa2840e0e56d88a8970900  TwistedCore-12.3.0.tar.bz2"
+sha512sums="86e9bbd4b8b0b5f70b62757f9ce93fd03c2766b4cb9722028ec7863d1b9dd19e6d3771472a86f1373a8320a98f5081ac76400ac6bb25a950b6fc50fb241ebeb8  TwistedCore-12.3.0.tar.bz2"
diff --git a/main/py-urlgrabber/APKBUILD b/main/py-urlgrabber/APKBUILD
index 3d812a5b8a..583b5012d6 100644
--- a/main/py-urlgrabber/APKBUILD
+++ b/main/py-urlgrabber/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="python module for fetching files"
 url="http://urlgrabber.baseurl.org/"
 arch="noarch"
-license="LGPL"
+license="LGPL2+"
 depends="python py-curl"
 depends_dev=""
 makedepends="$depends_dev"
diff --git a/main/py-urwid/APKBUILD b/main/py-urwid/APKBUILD
index 6fb342198b..60c58e57e4 100644
--- a/main/py-urwid/APKBUILD
+++ b/main/py-urwid/APKBUILD
@@ -2,16 +2,16 @@
 # Maintainer: Matt Smith <mcs@darkregion.net>
 pkgname=py-urwid
 _pkgname=urwid
-pkgver=1.0.1
+pkgver=1.1.1
 pkgrel=0
-pkgdesc="Urwid is a console user interface library for Python"
+pkgdesc="A console user interface library for Python"
 url="http://excess.org/urwid/"
 arch="all"
 license="LGPL2+"
 depends=""
-makedepends="python-dev py-setuptools py-templayer"
+makedepends="python-dev py-setuptools py-templayer py-sphinx"
 install=""
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-examples"
 source="http://excess.org/$_pkgname/$_pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$_pkgname-$pkgver
@@ -23,6 +23,7 @@ prepare() {
 build() {
 	cd "$_builddir"
 	python setup.py build || return 1
+	sphinx-build -b html docs docs_tmp
 }
 
 package() {
@@ -30,20 +31,20 @@ package() {
 	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
+examples() {
+	arch="noarch"
+	# Put the examples into a seperate package
+	mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"/examples || return 1
+	mv "$_builddir"/examples "$subpkgdir"/usr/share/doc/"$pkgname"/examples || return 1
+}
+
 doc() {
+	arch="noarch"
 	cd "$_builddir"
-
-	# generate tutorial examples, and copy documentation
-	python docgen_tutorial.py -s
-	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 '{}' \;
+	mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"/ || return 1
+	mv "$_builddir"/docs_tmp "$subpkgdir"/usr/share/doc/"$pkgname"/manual || return 1
 }
 
-md5sums="828f7144b94920205e755c249d2e297f  urwid-1.0.1.tar.gz"
+md5sums="eca2e0413cf7216b01c84b99e0f2576d  urwid-1.1.1.tar.gz"
+sha256sums="b301b4e0c2cd1634390cda80149d8aa2a07365af81a281ecf258770e47d30e99  urwid-1.1.1.tar.gz"
+sha512sums="31a883998e1c91b46076a064b496c4c12fff972808d7d338b616251b29be2399caf5953ab8180d596f76260cd494f7ba09797886d637fce8d46cc1dfffe355ac  urwid-1.1.1.tar.gz"
diff --git a/main/scons/APKBUILD b/main/scons/APKBUILD
index 1e0e6184c3..ad33f1f3fe 100644
--- a/main/scons/APKBUILD
+++ b/main/scons/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=scons
-pkgver=2.2.0
+pkgver=2.3.0
 pkgrel=0
 pkgdesc="scons software construction system"
 url="http://www.scons.org/"
@@ -23,4 +23,6 @@ package() {
 	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="f737f474a02d08156c821bd2d4d4b632  scons-2.2.0.tar.gz"
+md5sums="083ce5624d6adcbdaf2526623f456ca9  scons-2.3.0.tar.gz"
+sha256sums="9442069999cf4b2caa94a5886ab4c2c71de1718ed5e9176c18e2b6dbca463b4b  scons-2.3.0.tar.gz"
+sha512sums="a7e88bb70b8b269337689fb4afd9563359f6ace37857bbd9824c9e40e43cac8b1e00468d8652bb9b46e410f6b161cb8c9006dd1fd9265756be153846a5e0fd65  scons-2.3.0.tar.gz"
diff --git a/testing/fakechroot/APKBUILD b/testing/fakechroot/APKBUILD
index bba493cf67..0ce2bc759a 100644
--- a/testing/fakechroot/APKBUILD
+++ b/testing/fakechroot/APKBUILD
@@ -12,7 +12,7 @@ depends_dev=""
 makedepends="$depends_dev autoconf automake libtool"
 install=""
 subpackages="$pkgname-doc"
-source="fakechroot-$pkgver.tar.gz::https://github.com/fakechroot/fakechroot/archive/${pkgver}.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/fakechroot/fakechroot/archive/${pkgver}.tar.gz"
 
 _builddir="${srcdir}/$pkgname-${pkgver}"
 prepare() {
diff --git a/testing/protobuf/APKBUILD b/testing/protobuf/APKBUILD
index f00f134b2d..1a9d9a737d 100644
--- a/testing/protobuf/APKBUILD
+++ b/testing/protobuf/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=protobuf
-pkgver=2.4.1
+pkgver=2.5.0
 pkgrel=0
 pkgdesc="Library for extensible, efficient structure packing"
 url="http://code.google.com/p/protobuf/"
@@ -12,9 +12,9 @@ depends_dev="zlib-dev"
 makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-dev"
-source="http://protobuf.googlecode.com/files/protobuf-$pkgver.tar.bz2"
+source="http://protobuf.googlecode.com/files/$pkgname-$pkgver.tar.bz2"
 
-_builddir="$srcdir"/protobuf-$pkgver
+_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
@@ -50,4 +50,6 @@ py() {
 	install -m644 google "$subpkgdir"/usr/lib/python2.6/site-packages
 }
 
-md5sums="ed436802019c9e1f40cc750eaf78f318  protobuf-2.4.1.tar.bz2"
+md5sums="a72001a9067a4c2c4e0e836d0f92ece4  protobuf-2.5.0.tar.bz2"
+sha256sums="13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677  protobuf-2.5.0.tar.bz2"
+sha512sums="5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee  protobuf-2.5.0.tar.bz2"
diff --git a/testing/psmisc/APKBUILD b/testing/psmisc/APKBUILD
index 79d6eee7be..49ab428edd 100644
--- a/testing/psmisc/APKBUILD
+++ b/testing/psmisc/APKBUILD
@@ -1,19 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=psmisc
-pkgver=22.14
+pkgver=22.20
 pkgrel=0
-pkgdesc="a set of some small useful utilities that use the proc filesystem"
+pkgdesc="A set of some small useful utilities that use the proc filesystem"
 url="http://psmisc.sourceforge.net/"
 arch="all"
 license="BSD GPL"
-depends=
+depends=""
 makedepends="ncurses-dev"
-install=
+install=""
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/psmisc/psmisc-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
-
 prepare() {
 	cd "$_builddir"
 	# apply patches here
@@ -24,13 +23,16 @@ build() {
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--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
 }
 
-md5sums="ba3f4e971895c92bba7770d81c981503  psmisc-22.14.tar.gz"
+md5sums="a25fc99a6dc7fa7ae6e4549be80b401f  psmisc-22.20.tar.gz"
+sha256sums="b17224e2385f6a799ffebba27eb7870771d42555e86814ef56b6d7e955765514  psmisc-22.20.tar.gz"
+sha512sums="5565163651c90afeb146c3305fddefc544bcd4cd5e98917fd57a9920e76c22e4bc0a197618539475a1410cfec9dd168b69983b2210a3ad9fc54368e9220503a6  psmisc-22.20.tar.gz"
diff --git a/testing/py-apache-libcloud/APKBUILD b/testing/py-apache-libcloud/APKBUILD
index 29b69e2147..f24d67dca8 100644
--- a/testing/py-apache-libcloud/APKBUILD
+++ b/testing/py-apache-libcloud/APKBUILD
@@ -2,29 +2,30 @@
 # Maintainer:
 pkgname=py-apache-libcloud
 _pkgname=apache-libcloud
-pkgver=0.11.4
+pkgver=0.12.1
 pkgrel=0
-pkgdesc="Apache Libcloud is a standard Python library that abstracts away differences among multiple cloud provider APIs"
+pkgdesc="A Python library that abstracts away differences among multiple cloud provider APIs"
 url="https://libcloud.apache.org"
 arch="noarch"
-license="APACHE"
+license="Apache2"
 depends=""
-depends_dev="python-dev"
-makedepends="$depends_dev"
+depends_dev=""
+makedepends="python-dev py-setuptools"
 install=""
 subpackages=""
 source="http://www.mirrorservice.org/sites/ftp.apache.org/libcloud/$_pkgname-$pkgver.tar.bz2"
+
 _builddir="$srcdir"/$_pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	python setup.py build
+	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="94b4bebbe500cf4747623e9503213a4a  apache-libcloud-0.11.4.tar.bz2"
-sha256sums="5987f20c256608ee757b1a097b6392afbd18058cfc21ce761c078b44da95c532  apache-libcloud-0.11.4.tar.bz2"
-sha512sums="b761e6b1d29f60c382602b552c48268f1cf0a27e2a51bdf6603179f085a160b10c51eaa2d089bc868ae2147dc246ada43d0142edf03a786de20ef3468e23db1e  apache-libcloud-0.11.4.tar.bz2"
+md5sums="293bcae58ed98e354756ef2166b5d281  apache-libcloud-0.12.1.tar.bz2"
+sha256sums="26cc9e13d627a58c78894e6982125ffb8418b94ab5854694e4c2f844bf1a2ca3  apache-libcloud-0.12.1.tar.bz2"
+sha512sums="fcb0555bf078bf3cf548d7903f8dc7d2d49b9aa08e00c36ccb3e1da710e3f3a1885a5db7612ceaeb658e1b126214342c0fde678b90e7052490ff0412e360d024  apache-libcloud-0.12.1.tar.bz2"
diff --git a/testing/py-application/APKBUILD b/testing/py-application/APKBUILD
index 2135f154ff..c480240811 100644
--- a/testing/py-application/APKBUILD
+++ b/testing/py-application/APKBUILD
@@ -1,22 +1,29 @@
 # Contributor: Francesco Colista <francesco.colista@gmail.com>
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=py-application
-_name=python-application
-pkgver=1.2.7
+_pkgname=python-application
+pkgver=1.4.0
 pkgrel=1
 pkgdesc="Basic building blocks for python applications"
 url="http://pypi.python.org/pypi/python-application"
-arch="all"
-license="PSF"
+arch="noarch"
+license="LGPL2+"
 depends="python"
-makedepends="python-dev"
-install=
+makedepends="python-dev py-setuptools"
+install=""
 subpackages=""
-source="http://pypi.python.org/packages/source/p/python-application/python-application-$pkgver.tar.gz"
+source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+
+_builddir="$srcdir"/$_pkgname-$pkgver
 build() {
-	cd "$srcdir"/$_name-$pkgver
-	mkdir -p "$pkgdir"/usr/lib/python2.6/site-packages
-	python setup.py install --root="$pkgdir"
-	echo "/usr/lib/python2.6/site-packages/$_name-$pkgver-py2.6.egg" > "$pkgdir"/usr/lib/python2.6/site-packages/$_name.pth
+	cd "$_builddir"
+	python setup.py build || return 1
 }
-md5sums="07b32e25d931c5e591278848f3fc9f20  python-application-1.2.7.tar.gz"
+
+package() {
+	cd "$_builddir"
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
+}
+md5sums="2c1ec745f512ffd5892b0dd415074834  python-application-1.4.0.tar.gz"
+sha256sums="0ed5cb64385c335b7b30093931d7965fec2c459f6f630c493491285e33378ea6  python-application-1.4.0.tar.gz"
+sha512sums="e97dc05381df68ff643501a7018b2f8ec350c80392080e7420f52b9db3b85148f304388fcf4fd085771e34bfe1e5bef7965f0210370657f194eed2f5ba06950f  python-application-1.4.0.tar.gz"
diff --git a/testing/py-cjson/APKBUILD b/testing/py-cjson/APKBUILD
index b11f796f52..2c1313a7b4 100644
--- a/testing/py-cjson/APKBUILD
+++ b/testing/py-cjson/APKBUILD
@@ -1,25 +1,30 @@
 # Contributor: Francesco Colista <francesco.colista@gmail.com>
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
-
 pkgname=py-cjson
-_name=python-cjson
+_pkgname=python-cjson
 pkgver=1.0.5
 pkgrel=2
 pkgdesc="Fast JSON encoder/decoder for Python"
-url="http://pypi.python.org/pypi/python-gnutls"
+url="https://pypi.python.org/pypi/python-cjson"
 arch="all"
-license="PSF"
-depends="python"
-makedepends="python-dev"
-install=
+license="LGPL2+"
+depends=""
+makedepends="python-dev py-setuptools"
+install=""
 subpackages=""
-source="http://pypi.python.org/packages/source/p/python-cjson/$_name-$pkgver.tar.gz"
+source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+
+_builddir="$srcdir"/$_pkgname-$pkgver
 build() {
-	cd "$srcdir"/$_name-$pkgver
-	mkdir -p "$pkgdir"/usr/lib/python2.6/site-packages
-	python setup.py install --root="$pkgdir"
-	echo "/usr/lib/python2.6/site-packages/$_name-$pkgver-py2.6.egg" > "$pkgdir"/usr/lib/python2.6/site-packages/$_name.pth
+	cd "$_builddir"
+	python setup.py build || return 1
+}
 
+package() {
+	cd "$_builddir"
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
 md5sums="4d55b66ecdf0300313af9d030d9644a3  python-cjson-1.0.5.tar.gz"
+sha256sums="85bbe7a9fb6617e24bb4dbef528af8ef6eae07f8809dcd05ec926142feca7714  python-cjson-1.0.5.tar.gz"
+sha512sums="ba47337df70e27a9d44daa96c1d4f8d1a846193486ad78279e29ae7016bb2adb9146c0926fb99c7312c6fe9fea63b6cf947ef2a8faea376e27e004bdd55fb0ed  python-cjson-1.0.5.tar.gz"
diff --git a/testing/py-django/APKBUILD b/testing/py-django/APKBUILD
index acdc18d265..0d5af7d7d9 100644
--- a/testing/py-django/APKBUILD
+++ b/testing/py-django/APKBUILD
@@ -2,28 +2,30 @@
 # Maintainer:
 pkgname=py-django
 _pkgname=Django
-pkgver=1.4.1
+pkgver=1.5
 pkgrel=0
-pkgdesc="A high-level Python Web framework that encourages rapid development and clean, pragmatic design."
+pkgdesc="A high-level Python Web framework"
 url="http://djangoproject.com/"
 arch="noarch"
-license="bsd"
-depends=python
-depends_dev=python-dev
-makedepends="$depends_dev"
+license="BSD"
+depends="python"
+depends_dev=""
+makedepends="python-dev"
 install=""
 subpackages=""
 source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$_pkgname-$pkgver
 build() {
-       cd "$_builddir"
-       python setup.py build
+	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" || return 1
 }
 
-md5sums="e345268dacff12876ae4e45de0a61b7d  Django-1.4.1.tar.gz"
+md5sums="fac09e1e0f11bb83bb187d652a9be967  Django-1.5.tar.gz"
+sha256sums="078bf8f8ab025ed79e41ed5cee145a64dffea638eb5c2928c8cd106720824416  Django-1.5.tar.gz"
+sha512sums="be2150b9c654bd4995af9acee70b49cefc18bd70f57dd1761e270202726374f2e4b0b6722bc39e03da110702ad2281bc098dc1ac89fa4c61849d882bf8f18786  Django-1.5.tar.gz"
diff --git a/testing/py-eventlet/APKBUILD b/testing/py-eventlet/APKBUILD
index aaacadaae8..6f46eea4b4 100644
--- a/testing/py-eventlet/APKBUILD
+++ b/testing/py-eventlet/APKBUILD
@@ -1,25 +1,28 @@
 # Maintainer: Elizabeth Jennifer Myers <elizabeth@sporksirc.net>
 # Contributor: Elizabeth Jennifer Myers <elizabeth@sporksirc.net>
 pkgname=py-eventlet
-pkgver=0.9.16
-pkgrel=1
+_pkgname=eventlet
+pkgver=0.12.0
+pkgrel=0
 pkgdesc="Python library for seamless coroutine-based concurrency"
 url="http://eventlet.net/"
 arch="noarch"
 license="MIT"
 depends="python py-greenlet"
 makedepends="python-dev py-setuptools"
-source="http://pypi.python.org/packages/source/e/eventlet/eventlet-${pkgver}.tar.gz"
+source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 
-_builddir="$srcdir"/eventlet-$pkgver
+_builddir="$srcdir"/$_pkgname-$pkgver
 build ()
 {
 	cd "$_builddir"
-	python setup.py build 
+	python setup.py build || return 1
 }
 
 package() {
 	cd "$_builddir"
-	python setup.py install --root="$pkgdir"
+	python setup.py install --root "$pkgdir" || return 1
 }
-md5sums="4728e3bd7f72763c1e5dccac0296f8ea  eventlet-0.9.16.tar.gz"
+md5sums="6cfd34f287f78d64a3c5c43c66c4bd33  eventlet-0.12.0.tar.gz"
+sha256sums="157316a57f5ff28825564f5b2463ce9e2827726f466613d5e5d639bc5aedfb86  eventlet-0.12.0.tar.gz"
+sha512sums="1c9f9dad59f3aed228b553c0310cf15c78066a52cc0cda7ea3e35d0d19c9a1d1992e3e0717755402e46c091e81d9cc200cf60093dffb480cf5d4aac4bc16837d  eventlet-0.12.0.tar.gz"
diff --git a/testing/py-greenlet/APKBUILD b/testing/py-greenlet/APKBUILD
index 2be1c61155..0cf668ddfb 100644
--- a/testing/py-greenlet/APKBUILD
+++ b/testing/py-greenlet/APKBUILD
@@ -1,25 +1,29 @@
 # Maintainer: Elizabeth Jennifer Myers <elizabeth@sporksirc.net>
 # Contributor: Elizabeth Jennifer Myers <elizabeth@sporksirc.net>
 pkgname=py-greenlet
-pkgver=0.3.1
-pkgrel=1
+_pkgname=greenlet
+pkgver=0.4.0
+pkgrel=0
 pkgdesc="Lightweight in-process concurrent programming"
 url="http://pypi.python.org/pypi/greenlet"
 arch="all"
 license="MIT"
-depends="python"
+depends=""
 makedepends="python-dev py-setuptools"
-source="http://pypi.python.org/packages/source/g/greenlet/greenlet-$pkgver.tar.gz"
+source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.zip"
 
-_builddir="$srcdir"/greenlet-$pkgver
+_builddir="$srcdir"/$_pkgname-$pkgver
 build ()
 {
 	cd "$_builddir"
-	python setup.py build 
+	python setup.py build || return 1
 }
 
 package() {
 	cd "$_builddir"
-	python setup.py install --root="$pkgdir"
+	python setup.py install --root="$pkgdir" || return 1
 }
-md5sums="8d75d7f3f659e915e286e1b0fa0e1c4d  greenlet-0.3.1.tar.gz"
+
+md5sums="87887570082caadc08fb1f8671dbed71  greenlet-0.4.0.zip"
+sha256sums="3f52af03bf8a89045fc159c6a76d5642349b30fb41c3df1a22b12bbd3920b1ee  greenlet-0.4.0.zip"
+sha512sums="c072ceb83b3040448f0f7c8596aa134837fcc2ada5513b12fbeada4f5ae2ca5e4d4c5814c317a9270e4a0a65a02e2525dce7edad678978782013da7caa188d19  greenlet-0.4.0.zip"
diff --git a/testing/py-lxml/APKBUILD b/testing/py-lxml/APKBUILD
index 22027ba92b..d3e50f06b7 100644
--- a/testing/py-lxml/APKBUILD
+++ b/testing/py-lxml/APKBUILD
@@ -5,7 +5,7 @@ _pkgname=lxml
 pkgver=3.1.0
 pkgrel=0
 pkgdesc="Python LXML Library"
-url="http://codespeak.net/lxml"
+url="http://lxml.de/"
 arch="all"
 license="BSD"
 depends=""
diff --git a/testing/py-mysql2pgsql/APKBUILD b/testing/py-mysql2pgsql/APKBUILD
new file mode 100644
index 0000000000..406d015ef9
--- /dev/null
+++ b/testing/py-mysql2pgsql/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+pkgname=py-mysql2pgsql
+pkgver=0.1.5
+pkgrel=0
+pkgdesc="A migrating/converting tool from mysql to postgresql"
+url="https://github.com/philipsoutham/py-mysql2pgsql"
+arch="noarch"
+license="MIT"
+depends="python py-yaml py-psycopg2 py-mysqldb"
+depends_dev=""
+makedepends="python-dev py-setuptools"
+install=""
+subpackages=""
+source="http://pypi.python.org/packages/source/${pkgname:0:1}/$pkgname/$pkgname-$pkgver.tar.gz"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	python setup.py build || return 1
+}
+
+package() {
+	cd "$_builddir"
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
+}
+
+md5sums="f9383fc558dff6f6c1e304465ff702da  py-mysql2pgsql-0.1.5.tar.gz"
+sha256sums="024d3f1d3994679421102a2cb70c1fde1306bdf8c70839db907a728324c65cdf  py-mysql2pgsql-0.1.5.tar.gz"
+sha512sums="291f754f6bdd186c7e61e3046af346c86edc514c52a1b3d081b7d5c335e911271be011af4abfc8442cdab54838408a10f0dd6a53d75f629f64fc6ffd9b140ab1  py-mysql2pgsql-0.1.5.tar.gz"
diff --git a/testing/py-paramiko/APKBUILD b/testing/py-paramiko/APKBUILD
index c09e6f2e14..c851936bf1 100644
--- a/testing/py-paramiko/APKBUILD
+++ b/testing/py-paramiko/APKBUILD
@@ -2,23 +2,24 @@
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py-paramiko
 _pkgname=paramiko
-pkgver=1.7.7.1
+pkgver=1.9.0
 pkgrel=0
 pkgdesc="SSH2 protocol library for Python"
-url="http://www.lag.net/paramiko/"
+url="https://github.com/paramiko/paramiko/"
 arch="noarch"
 license="LGPL2+"
 depends="py-crypto"
 depends_dev=""
-makedepends="python-dev"
+makedepends="python-dev py-setuptools"
 install=""
 subpackages="$pkgname-demos $pkgname-docs"
-source="http://www.lag.net/paramiko/download/$_pkgname-$pkgver.tar.gz"
-_builddir="$srcdir"/$_pkgname-$pkgver
+source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 
+_builddir="$srcdir"/$_pkgname-$pkgver
 build() {
 	cd "$_builddir"
 	python setup.py build || return 1
+    python ./test.py  || return 1
 }
 
 package() {
@@ -27,15 +28,17 @@ package() {
 }
 
 demos() {
-        # Put the demo files into a seperate package
-        mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"/demos || return 1
-        mv "$_builddir"/demos "$subpkgdir"/usr/share/doc/"$pkgname"/ || return 1
+	# Put the demo files into a seperate package
+	mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"/demos || return 1
+	mv "$_builddir"/demos "$subpkgdir"/usr/share/doc/"$pkgname"/ || return 1
 }
 
 docs() {
-        # Put the documentation files into a seperate package
-        mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"/docs || return 1
-        mv "$_builddir"/docs "$subpkgdir"/usr/share/doc/"$pkgname"/ || return 1
+	# Put the documentation files into a seperate package
+	mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"/docs || return 1
+	mv "$_builddir"/docs "$subpkgdir"/usr/share/doc/"$pkgname"/ || return 1
 }
 
-md5sums="ce8e2c254378312a264206f65c354d72  paramiko-1.7.7.1.tar.gz"
+md5sums="b78472021ff6586dd61ad6972032f54f  paramiko-1.9.0.tar.gz"
+sha256sums="cb99b74d9c53a23b92803c1c97fdb2bfdab7cd4fea888bd3b6438c127e3b29f5  paramiko-1.9.0.tar.gz"
+sha512sums="2f91b68b8a652aa773d14cded7a5f17cf6d758624f981c68510ee3b1302b64ee9290830440dca1a1000b7974ef9dca4f0acd13d01958433b6f35ae8a13e1c0a2  paramiko-1.9.0.tar.gz"
diff --git a/testing/py-psycopg2/APKBUILD b/testing/py-psycopg2/APKBUILD
index 1ffa2001f8..9d42f70ce9 100644
--- a/testing/py-psycopg2/APKBUILD
+++ b/testing/py-psycopg2/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py-psycopg2
 _pkgname=psycopg2
-pkgver=2.4.4
+pkgver=2.4.6
 pkgrel=1
 pkgdesc="Python-PostgreSQL Database Adapter"
 url="http://initd.org/psycopg/"
@@ -14,8 +14,8 @@ makedepends="python-dev postgresql-dev"
 install=""
 subpackages=""
 source="http://initd.org/psycopg/tarballs/PSYCOPG-2-4/$_pkgname-$pkgver.tar.gz"
-_builddir="$srcdir"/$_pkgname-$pkgver
 
+_builddir="$srcdir"/$_pkgname-$pkgver
 build() {
 	cd "$_builddir"
 	python setup.py build || return 1
@@ -26,4 +26,6 @@ package() {
 	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="331255d2d44018bcef2ea192aabc1d6a  psycopg2-2.4.4.tar.gz"
+md5sums="79d7f05e67bf70a0ecc6e9103ccece5f  psycopg2-2.4.6.tar.gz"
+sha256sums="4edcb40b0a039b4b559a6bc887b2155db8b6c53d0f55b00af8338c77b725621f  psycopg2-2.4.6.tar.gz"
+sha512sums="da23264f66b4054f26b7029b97856cdab91870e8a6c72cd5dabe37b36c96b3cb19a9adebf49844f5330ae3009f1ff4a81cc28eba1c4baf18e099ca7a10c808ad  psycopg2-2.4.6.tar.gz"
diff --git a/testing/py-pycountry/APKBUILD b/testing/py-pycountry/APKBUILD
index ae47d628d8..47cb7ed22f 100644
--- a/testing/py-pycountry/APKBUILD
+++ b/testing/py-pycountry/APKBUILD
@@ -2,15 +2,15 @@
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py-pycountry
 _pkgname=pycountry
-pkgver=0.14.5
-pkgrel=1
+pkgver=0.14.8
+pkgrel=0
 pkgdesc="ISO country, subdivision, language, currency and script definitions and their translations"
 url="http://pypi.python.org/pypi/pycountry"
 arch="noarch"
-license="LGPL2"
-depends=
-depends_dev="python-dev py-lxml py-setuptools"
-makedepends="$depends_dev"
+license="LGPL2+"
+depends=""
+depends_dev=""
+makedepends="python-dev py-lxml py-setuptools"
 install=""
 subpackages=""
 source="http://pypi.python.org/packages/source/p/${_pkgname}/${_pkgname}-$pkgver.zip"
@@ -26,9 +26,16 @@ prepare() {
 	done
 }
 
+build() {
+	cd "$_builddir"
+	python setup.py build || return 1
+}
+
 package() {
 	cd "$_builddir"
 	python setup.py install --root=$pkgdir/ || return 1
 }
 
-md5sums="1834b32f2b4ca3f1b6518388959f2bbc  pycountry-0.14.5.zip"
+md5sums="2c775e379ba5ca2363f4f595ac9304ba  pycountry-0.14.8.zip"
+sha256sums="5252b5378ba6f1971aa718248d797fb1e2a33d0bdb975400e4b801549102e2fa  pycountry-0.14.8.zip"
+sha512sums="99d8ded3addd3dbd03e15d6ed31bd53d3c369c4b516c03f3e7bfa7ed42feda769153f6df0a43fd9129f8123b8ebc22341722dc5883c885b0f4a42ba591b475cd  pycountry-0.14.8.zip"
diff --git a/testing/py-relatorio/APKBUILD b/testing/py-relatorio/APKBUILD
index e367411270..b9a4178241 100644
--- a/testing/py-relatorio/APKBUILD
+++ b/testing/py-relatorio/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py-relatorio
 _pkgname=relatorio
-pkgver=0.5.6
+pkgver=0.5.7
 pkgrel=0
 pkgdesc="A templating library able to output odt and pdf files"
 url="http://relatorio.openhex.org"
@@ -14,8 +14,8 @@ makedepends="python-dev py-setuptools"
 install=""
 subpackages=""
 source="http://pypi.python.org/packages/source/r/$_pkgname/$_pkgname-$pkgver.tar.gz"
-_builddir="$srcdir"/$_pkgname-$pkgver
 
+_builddir="$srcdir"/$_pkgname-$pkgver
 build() {
 	cd "$_builddir"
 	python setup.py build || return 1
@@ -26,4 +26,6 @@ package() {
 	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="944fb60fadaff451ab6ee8818de516ad  relatorio-0.5.6.tar.gz"
+md5sums="e093836cd3a8be996f95088e36c7bcf9  relatorio-0.5.7.tar.gz"
+sha256sums="b62dcb87ddf01197e2456a0c399b7499441e82991025a74b1f2be36ea1006fd1  relatorio-0.5.7.tar.gz"
+sha512sums="1216de6ef0aeec17b0ead0d4fd4e072c6c8c36da31a52c2b5eaf82d24d429d7f08009ab7b3201658cca163952ad53e5c9c8e144cb9253d85cbac2c0da3893055  relatorio-0.5.7.tar.gz"
diff --git a/testing/py-requests/APKBUILD b/testing/py-requests/APKBUILD
index ffc853449a..5aaae5edb0 100644
--- a/testing/py-requests/APKBUILD
+++ b/testing/py-requests/APKBUILD
@@ -1,15 +1,15 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=py-requests
-pkgver=1.0.4
+pkgver=1.1.0
 pkgrel=0
 pkgdesc="HTTP request library for Python"
 url="http://www.python-requests.org/"
 arch="noarch"
-license="Apache-2"
+license="Apache2"
 depends="python"
 depends_dev=""
-makedepends="python-dev"
+makedepends="python-dev py-setuptools"
 install=""
 subpackages=""
 source="http://pypi.python.org/packages/source/r/requests/requests-$pkgver.tar.gz"
@@ -35,4 +35,6 @@ package() {
 	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="0b7448f9e1a077a7218720575003a1b6  requests-1.0.4.tar.gz"
+md5sums="a0158815af244c32041a3147ee09abf3  requests-1.1.0.tar.gz"
+sha256sums="21a81ddf1a3c2f956524538966ae19c38cae251f5629821588cdc8246a1335f7  requests-1.1.0.tar.gz"
+sha512sums="5ab10ba43d492ab227d88b90c7b6db7840232fd7fe4638642f994e1721576bbcf7276515a918a059edf5ded14456eb57e06b76eec9d7f4b95b5489d498de52d4  requests-1.1.0.tar.gz"
diff --git a/testing/py-simplejson/APKBUILD b/testing/py-simplejson/APKBUILD
index dc357fafbc..477b898b90 100644
--- a/testing/py-simplejson/APKBUILD
+++ b/testing/py-simplejson/APKBUILD
@@ -1,20 +1,21 @@
 # Contributor: Francesco Colista <francesco.colista@gmail.com>
 # Maintainer:
 pkgname=py-simplejson
-_name=simplejson
-pkgver=2.6.2
+_pkgname=simplejson
+pkgver=3.1.0
 pkgrel=0
 pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python"
 url="http://pypi.python.org/pypi/simplejson/"
 arch="all"
 license="PSF"
 depends=""
-depends_dev="python-dev"
-makedepends="$depends_dev"
+depends_dev=""
+makedepends="python-dev py-setuptools"
 install=""
 subpackages=""
-source="http://pypi.python.org/packages/source/s/simplejson/simplejson-2.6.2.tar.gz"
-_builddir=${srcdir}/${_name}-${pkgver}
+source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+
+_builddir="$srcdir"/$_pkgname-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
@@ -27,12 +28,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	python setup.py build
+	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="9b41cd412dfac7c002aeca61ab0fdfe2  simplejson-2.6.2.tar.gz"
+md5sums="71df0076d4a35d29bfea530cb8226c26  simplejson-3.1.0.tar.gz"
+sha256sums="10c743fbec819e6ad77999c551f4b620ed498c2dd565c64365f0571b3a252523  simplejson-3.1.0.tar.gz"
+sha512sums="c456c689a72ea6d8bae5bd7cc6f41713faca8b4fdd5728694479b861c01d7191aa4e8e864773133093f1c591d2f5ac819b3ac2023bbe59c1793c37aa8e6e88b1  simplejson-3.1.0.tar.gz"
diff --git a/testing/py-sip/APKBUILD b/testing/py-sip/APKBUILD
index 5f979697db..bfc2edc123 100644
--- a/testing/py-sip/APKBUILD
+++ b/testing/py-sip/APKBUILD
@@ -2,18 +2,19 @@
 # Maintainer:
 pkgname=py-sip
 _pkgname=sip
-pkgver=4.14
+pkgver=4.14.4
 pkgrel=0
 pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries"
 url="http://www.riverbankcomputing.com/software/sip/"
 arch="all"
 license="custom:sip"
-depends=
-depends_dev="python-dev"
-makedepends="$depends_dev"
+depends=""
+depends_dev=""
+makedepends="python-dev"
 install=""
 subpackages="$pkgname-dev"
 source="http://sourceforge.net/projects/pyqt/files/sip/sip-$pkgver/sip-$pkgver.tar.gz"
+
 _builddir="$srcdir"/$_pkgname-$pkgver
 build() {
 	cd "$_builddir"
@@ -27,4 +28,6 @@ package() {
 	install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/custom/${pkgname}/LICENSE
 }
 
-md5sums="9a48ad975e04ac824188840ea498ac32  sip-4.14.tar.gz"
+md5sums="ae2d73ef43b8b0f7a9913561e9651706  sip-4.14.4.tar.gz"
+sha256sums="325f5933e8bac94e04c29a800f872073f8fcd20260477dca7039f45fb4935eb3  sip-4.14.4.tar.gz"
+sha512sums="e58c002c2e1e4895907230e63715931615e36d051e5f01f458c7e9ec9d872868b0ee6231b989630970924e40e321ee895f08d80bc8da289b9da7342dbc8aad59  sip-4.14.4.tar.gz"
diff --git a/testing/py-sqlalchemy/APKBUILD b/testing/py-sqlalchemy/APKBUILD
index 3673ccaf31..0e33231d5b 100644
--- a/testing/py-sqlalchemy/APKBUILD
+++ b/testing/py-sqlalchemy/APKBUILD
@@ -1,15 +1,15 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=py-sqlalchemy
-pkgver=0.7.9
+pkgver=0.7.10
 pkgrel=0
 pkgdesc="object relational mapper for python"
 url="http://pypi.python.org/pypi/SQLAlchemy"
 arch="all"
 license="MIT"
-depends="python"
+depends=""
 depends_dev=""
-makedepends="python-dev"
+makedepends="python-dev py-setuptools"
 install=""
 subpackages=""
 source="http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-$pkgver.tar.gz"
@@ -35,4 +35,6 @@ package() {
 	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="a0b58defc5ad0c7e1baeb932f62d08dd  SQLAlchemy-0.7.9.tar.gz"
+md5sums="ecc0cd1cd906d17818a5f08fe13ae19e  SQLAlchemy-0.7.10.tar.gz"
+sha256sums="77aa39d65c9d043eba6ba329b359ff867424fd6c403b7c0cb112b65e507e1d66  SQLAlchemy-0.7.10.tar.gz"
+sha512sums="631bc4ffb419defa531a66d82449fe48f93c88371ba0b8ab4217d900a0d1d90efe9699d8a9048d5c2ed33948c6d2f7cae46452ee45d442914018f3361e804367  SQLAlchemy-0.7.10.tar.gz"
diff --git a/testing/py-twisted-conch/APKBUILD b/testing/py-twisted-conch/APKBUILD
index 49503e740f..690aaad280 100644
--- a/testing/py-twisted-conch/APKBUILD
+++ b/testing/py-twisted-conch/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py-twisted-conch
-pkgver=12.2.0
+pkgver=12.3.0
 pkgrel=0
 pkgdesc="SSH and SFTP protocol implementation together with clients and servers"
 url="http://twistedmatrix.com/trac/wiki/TwistedConch"
@@ -31,6 +31,6 @@ package() {
 	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="a8f07749465eb7c514c9cce0ea4dcfb0  TwistedConch-12.2.0.tar.bz2"
-sha256sums="2d1d6d4dcf8a6c9fd7f7c03e74111049566618765f93fae1da999643caf13cd2  TwistedConch-12.2.0.tar.bz2"
-sha512sums="6b81ed588aeb568e14ad341530ebceabd34e3025da612aa54effe0ff96ff6c20c466b296795209b6ee761890d27f26075915de114459dbc84547587444520da9  TwistedConch-12.2.0.tar.bz2"
+md5sums="448f508394387c04492f5d29413a0a73  TwistedConch-12.3.0.tar.bz2"
+sha256sums="5d53e9c26c64e31168121565efbfeb117fc11de8d85cc94bee3fc0a1d189e49b  TwistedConch-12.3.0.tar.bz2"
+sha512sums="724820896e6ad7b407a5c89b81cc9f4950b12907e67eaf30bad040274215b2cb637731c78fd20b45f60d73f07e40acc74b7c1aa006378f39559c8b0ad22dff66  TwistedConch-12.3.0.tar.bz2"
diff --git a/testing/py-xmpppy/APKBUILD b/testing/py-xmpppy/APKBUILD
index fefe8e7cf1..e881e34eb5 100644
--- a/testing/py-xmpppy/APKBUILD
+++ b/testing/py-xmpppy/APKBUILD
@@ -8,20 +8,24 @@ pkgrel=1
 pkgdesc="A Python library to provide easy scripting with Jabber"
 url="http://xmpppy.sourceforge.net/"
 arch="noarch"
-license="GPL"
+license="GPL2+"
 depends="python"
 makedepends="py-setuptools python-dev"
 install=""
 subpackages=""
 source="http://downloads.sourceforge.net/sourceforge/xmpppy/$_pkgname-$_pkgver.tar.gz"
+
 _builddir=$srcdir/$_pkgname-$_pkgver
 build() {
 	cd "$_builddir"
-	python setup.py build
+	python setup.py build || return 1
 }
+
 package() {
 	cd "$_builddir"
-	mkdir -p "$pkgdir"/usr/lib/python2.6/site-packages
-	python setup.py install --root="$pkgdir"
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
+
 md5sums="e0d2b3f9e4a278c163431e64adb0c861  xmpppy-0.5.0rc1.tar.gz"
+sha256sums="519b025b3c9600c26c5805d0c612fe01e61330d2b9869f05c7c416c627820b9a  xmpppy-0.5.0rc1.tar.gz"
+sha512sums="7fe91ff313533a419e125bb69163dfb122723e67ca70feab00748b5deafc0c99aa002cbebf0f89b8bc7ce465bb2c775ab98509761af07d90295bc1e9c50eee23  xmpppy-0.5.0rc1.tar.gz"
diff --git a/testing/py-zmq/APKBUILD b/testing/py-zmq/APKBUILD
index 9d718f3890..af12a700d7 100644
--- a/testing/py-zmq/APKBUILD
+++ b/testing/py-zmq/APKBUILD
@@ -2,20 +2,20 @@
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py-zmq
 _pkgname=pyzmq
-pkgver=2.2.0.1
+pkgver=13.0.0
 pkgrel=0
 pkgdesc="Python bindings for ZeroMQ"
 url="http://pypi.python.org/pypi/pyzmq"
 arch="all"
-license="LGPL BSD"
+license="LGPL3+ BSD"
 depends=""
 depends_dev=""
 makedepends="python-dev py-setuptools zeromq-dev"
 install=""
 subpackages=""
 source="http://pypi.python.org/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz"
-_builddir="$srcdir"/$_pkgname-$pkgver
 
+_builddir="$srcdir"/$_pkgname-$pkgver
 build() {
 	cd "$_builddir"
 	python setup.py build || return 1
@@ -26,4 +26,6 @@ package() {
 	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="f2f80709e84c8ac72d6671eee645d804  pyzmq-2.2.0.1.tar.gz"
+md5sums="1325ab6819f7a087eee84aaa951b6f0c  pyzmq-13.0.0.tar.gz"
+sha256sums="31d8ededdb707f97ffe22963d3f9a721c2330e50904a647cb8d97ec38db43476  pyzmq-13.0.0.tar.gz"
+sha512sums="d8e56c5f488ac9d618661c23c714560af44a70705ad092843eb4e9d5ae8b737a65fb59eec91acd9f3dfafafac807c32bf815bd0a2f175649097a28dff308db8e  pyzmq-13.0.0.tar.gz"
diff --git a/testing/rinse/APKBUILD b/testing/rinse/APKBUILD
index d35d27d2f9..8b5e4fc0c4 100644
--- a/testing/rinse/APKBUILD
+++ b/testing/rinse/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=rinse
-pkgver=2.0
-pkgrel=3
-pkgdesc="RPM chroot bootstrapping tool"
+pkgver=2.0.1
+pkgrel=0
+pkgdesc="A RPM chroot bootstrapping tool"
 url="http://www.steve.org.uk/Software/rinse/"
 arch="noarch"
 license="Artistic"
@@ -36,6 +36,12 @@ package() {
 	make PREFIX="$pkgdir" install || return 1
 }
 
-md5sums="ccae96895b413bb1040a86d17bec4b06  rinse-2.0.tar.gz
+md5sums="1221942846f4caa6e621cfc85f759841  rinse-2.0.1.tar.gz
 6761f834b3f50bded544021ccb90c700  rinse-posix-cpio-use.patch
 6a6092323c1973832f5c050d37265d99  rinse-device-nodes.patch"
+sha256sums="74b1149cb6f12c1bd51e371e5decf4820489535afa9b93900780817cbae7f96b  rinse-2.0.1.tar.gz
+f869904261add72b2e6a50f910fc79fae44b68df617c8d0d1e1e02d99c77e165  rinse-posix-cpio-use.patch
+dfb972611d74889902d1f25edf6bd172aaa8ef62c352a5e966c2892c568171e8  rinse-device-nodes.patch"
+sha512sums="4d6284dfd5bdaac1c2578222203c5dd1bfcd325b756583238c45a064da2345ed75615461464845d721026d3ee1b2bab55f138c9fd5d911f7b41a4e7af5ab9cd8  rinse-2.0.1.tar.gz
+a8ff20b382fa05bf921d1a99fcf7f1e147a63ff7b2c1d04c312ac9d1148d8acb07c56a016176f081a6c2c6797d31a5bd3607b1d891517888931c42bde9a58465  rinse-posix-cpio-use.patch
+9bca1bbbe11453d80f06d330af5695a874240a274ea671f30fd3383f2a88e5e0c73a167aa4ac10f3fde6f9df0cda5678ef436de3ed111a16b008128aafb2a196  rinse-device-nodes.patch"
diff --git a/testing/rlwrap/APKBUILD b/testing/rlwrap/APKBUILD
index f1b95be204..afe628860c 100644
--- a/testing/rlwrap/APKBUILD
+++ b/testing/rlwrap/APKBUILD
@@ -6,10 +6,10 @@ pkgrel=0
 pkgdesc="GNU Readline wrapper"
 url="http://utopia.knoware.nl/~hlub/rlwrap/"
 arch="all"
-license="GPL"
+license="GPL2+"
 depends=""
-depends_dev="readline-dev ncurses-dev"
-makedepends="$depends_dev"
+depends_dev=""
+makedepends="readline-dev ncurses-dev"
 install=""
 subpackages="$pkgname-doc"
 source="http://utopia.knoware.nl/~hlub/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/testing/rpm/APKBUILD b/testing/rpm/APKBUILD
index d41bb7705f..08f1885dc4 100644
--- a/testing/rpm/APKBUILD
+++ b/testing/rpm/APKBUILD
@@ -1,20 +1,20 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=rpm
-pkgver=4.10.2
+pkgver=4.10.3.1
 pkgrel=0
 pkgdesc="The RPM package manager"
 url="http://www.rpm.org/"
 arch="all"
 license="GPL2 LGPL2+"
 depends=""
-depends_dev="nspr-dev nss-dev db-dev lua-dev zlib-dev bzip2-dev xz-dev libelf-dev file-dev popt-dev
-	     libcap-dev acl-dev"
+depends_dev="nspr-dev nss-dev db-dev lua-dev zlib-dev bzip2-dev xz-dev 
+	     libelf-dev file-dev popt-dev libcap-dev acl-dev"
 makedepends="$depends_dev graphviz gettext-dev python-dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py-rpm:py_rpm"
 source="http://rpm.org/releases/rpm-4.10.x/rpm-$pkgver.tar.bz2
-	rpm-uclibc.patch"
+		rpm-uclibc.patch"
 
 _builddir="$srcdir"/rpm-$pkgver
 prepare() {
@@ -58,5 +58,9 @@ py_rpm() {
 	done
 }
 
-md5sums="a644aea351c9b3889bbaded5d6a377c9  rpm-4.10.2.tar.bz2
+md5sums="7be152323885f6e558bd581f021e5add  rpm-4.10.3.1.tar.bz2
 5b52ad780c3ec753d1124d6d53697612  rpm-uclibc.patch"
+sha256sums="6260e765982936913ca877b042ed0ad863d656e06ec5badc94fa810d36b7368c  rpm-4.10.3.1.tar.bz2
+0b43737b018a089351db920f1a72a8984a8dbc11f3a0df4e9722e14bdcd8bec3  rpm-uclibc.patch"
+sha512sums="5abb38547c7126ef535dc988ca55f75d834277bcb37556c4da4234355774331f536c7b42e5f4c0dcb4258da30dd47119f208ee9c935c9b943a5d060c48cb7c29  rpm-4.10.3.1.tar.bz2
+0c4a03c1ea6cc3fef2ce25797ad5fbe7b22576fa6ff8d8f3424496e90e13d774e05785cbddf24ed07a7bdc3a25ac4d614537ec5ed1b14f2039c93a1a9077a9ff  rpm-uclibc.patch"
diff --git a/testing/ruby-daemon-controller/APKBUILD b/testing/ruby-daemon-controller/APKBUILD
index 9b1f8d6b76..7acd780215 100644
--- a/testing/ruby-daemon-controller/APKBUILD
+++ b/testing/ruby-daemon-controller/APKBUILD
@@ -1,30 +1,39 @@
 # Contributor: Matt Smith <mcs@darkregion.net>
 # Maintainer:  Matt Smith <mcs@darkregion.net>
 pkgname=ruby-daemon-controller
-_realname=daemon_controller
-pkgver=0.2.6
+_gemname=daemon_controller
+pkgver=1.1.1
 pkgrel=0
 pkgdesc="A library for robust daemon management."
 url="http://rubygems.org/gems/daemon_controller"
 arch="noarch"
 license="MIT"
 depends="ruby"
-depends_dev=
-makedepends="$depends_dev ruby-dev ruby rubygems"
+depends_dev=""
+makedepends="ruby-dev ruby-gems"
 install=""
 subpackages=""
-source=""
+source="http://rubygems.org/downloads/$_gemname-$pkgver.gem"
 
-_builddir="$srcdir"/$_realname-$pkgver
+_builddir="$srcdir"/$_gemname-$pkgver
 build() {
-        mkdir -p "$_builddir" || return 1
-        local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-        gem install $_realname -v $pkgver -i "$_builddir"$_gemdir \
-                --ignore-dependencies || return 1
-        rm -rf "$_builddir"$_gemdir/cache/
+	mkdir -p "$_builddir" || return 1
+	local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+	gem install $_gemname -v $pkgver -i "$_builddir"$_gemdir \
+		--ignore-dependencies \
+		--verbose \
+		--no-rdoc \
+		--no-ri \
+		|| return 1
+	rm -rf "$pkgdir"/$_gemdir/cache \
+		"$pkgdir"/$_geminstdir/ext \
+		"$pkgdir"/$_geminstdir/.require_paths
 }
 
 package() {
-        mkdir -p "$pkgdir" || return 1
-        cp -ra "$_builddir"/* "$pkgdir"/ || return 1
+	mkdir -p "$pkgdir" || return 1
+	cp -ra "$_builddir"/* "$pkgdir"/ || return 1
 }
+md5sums="d0208bf1e929276dc14665b2cd435535  daemon_controller-1.1.1.gem"
+sha256sums="c82bab2e6b6f9443aca51f7f429ac3eb877442f9062da9b28b1a6b329e344ca5  daemon_controller-1.1.1.gem"
+sha512sums="fc87dd6deb7db955dc8e75899ea8282cf5755dc76b4139624c6fc8c5caf1b8d995c0e76b3b8222592c4331fa99da890f420a09419ef5c66a680d4dcab0d140fe  daemon_controller-1.1.1.gem"
diff --git a/testing/ruby-file-tail/APKBUILD b/testing/ruby-file-tail/APKBUILD
index 300be82751..0089b56528 100644
--- a/testing/ruby-file-tail/APKBUILD
+++ b/testing/ruby-file-tail/APKBUILD
@@ -1,30 +1,40 @@
 # Contributor: Matt Smith <mcs@darkregion.net>
-# Maintainer:  Matt Smith <mcs@darkregion.net>
-pkgname=ruby-file-tail
-_realname=file-tail
-pkgver=1.0.5
+# Maintainer: Matt Smith <mcs@darkregion.net>
+_gemname=file-tail
+pkgname=ruby-$_gemname
+pkgver=1.0.12
 pkgrel=0
 pkgdesc="Small library that allows Ruby to tail files."
 url="http://flori.github.com/file-tail/"
 arch="noarch"
-license="GPL"
-depends="ruby"
-depends_dev=
-makedepends="$depends_dev ruby-dev ruby rubygems"
+license="GPL2"
+depends="ruby ruby-tins"
+depends_dev=""
+makedepends="ruby-dev ruby-gems"
 install=""
 subpackages=""
-source=""
+source="http://rubygems.org/downloads/$_gemname-$pkgver.gem"
 
-_builddir="$srcdir"/$_realname-$pkgver
+_builddir="$srcdir"/$_gemname-$pkgver
 build() {
 	mkdir -p "$_builddir" || return 1
 	local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-	gem install $_realname -v $pkgver -i "$_builddir"$_gemdir \
-		--ignore-dependencies || return 1
-	rm -rf "$_builddir"$_gemdir/cache/
+	gem install $_gemname -v $pkgver -i "$_builddir"$_gemdir \
+		--ignore-dependencies \
+		--verbose \
+		--no-rdoc \
+		--no-ri \
+		|| return 1
+	rm -rf "$pkgdir"/$_gemdir/cache \
+		"$pkgdir"/$_geminstdir/ext \
+		"$pkgdir"/$_geminstdir/.require_paths
 }
 
 package() {
 	mkdir -p "$pkgdir" || return 1
 	cp -ra "$_builddir"/* "$pkgdir"/ || return 1
 }
+
+md5sums="409f4b5868a747e8f89939eaf9970e81  file-tail-1.0.5.gem"
+sha256sums="6f9d986cb58e33ba31911dbc41d5e4baaf31552e9579fe9ed3f39beeafa8a86b  file-tail-1.0.5.gem"
+sha512sums="5fd42996d9856673960a3f927d6185d732f4d05948e7ef0cba10e986e2e53acc0ae74520994634cab549a2ad9e12f1f7a66b7fc7864e3ac73c7e3c7a6bf806ba  file-tail-1.0.5.gem"
diff --git a/testing/ruby-nokogiri/APKBUILD b/testing/ruby-nokogiri/APKBUILD
new file mode 100644
index 0000000000..9a3f8f7df7
--- /dev/null
+++ b/testing/ruby-nokogiri/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+_gemname=nokogiri
+pkgname=ruby-$_gemname
+pkgver=1.5.6
+pkgrel=0
+pkgdesc="An HTML, XML, SAX, and Reader parser"
+url="http://nokogiri.org/"
+arch="all"
+license="MIT"
+depends=""
+depends_dev=""
+makedepends="ruby-gems ruby-dev libxml2-dev libxslt-dev libiconv-dev"
+install=""
+subpackages=""
+source="http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem"
+
+_builddir="$srcdir"/$_gemname-$pkgver
+build() {
+	return 0
+}
+
+package() {
+	local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+	local _geminstdir=$_gemdir/gems/$_gemname-$pkgver
+	mkdir -p "$pkgdir" || return 1
+
+	gem install --local --install-dir "$pkgdir"/$_gemdir \
+		--ignore-dependencies --verbose --no-rdoc --no-ri \
+		"$srcdir"/$_gemname-$pkgver.gem || return 1
+	rm -rf "$pkgdir"/$_gemdir/cache \
+		"$pkgdir"/$_geminstdir/ext \
+		"$pkgdir"/$_geminstdir/.require_paths
+}
+
+md5sums="5ccf492f60fd9edc4f86aef3bb97145c  nokogiri-1.5.6.gem"
+sha256sums="28ab99eeba2270b336f8f9612e5b4aefdc673a7319ad874bf4c6092226826588  nokogiri-1.5.6.gem"
+sha512sums="14f4f23732d2f759379fb4cef9afaad790d9553ca7d171d405a3cbba86c458e9853ae20ba622e00327a6d89c0976e17d60f6406c34cf2c15a1effeac66a201d6  nokogiri-1.5.6.gem"
diff --git a/testing/ruby-require/APKBUILD b/testing/ruby-require/APKBUILD
new file mode 100644
index 0000000000..8998b32406
--- /dev/null
+++ b/testing/ruby-require/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+_gemname=require
+pkgname=ruby-$_gemname
+pkgver=0.2.7
+pkgrel=0
+pkgdesc="A dependencies manager"
+url="http://github.com/winton/require"
+arch="noarch"
+license="MIT"
+depends="ruby"
+depends_dev=""
+makedepends="ruby-dev ruby-gems"
+install=""
+subpackages=""
+source="http://rubygems.org/downloads/$_gemname-$pkgver.gem"
+
+_builddir="$srcdir"/$_gemname-$pkgver
+build() {
+	mkdir -p "$_builddir" || return 1
+	local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+	gem install $_gemname -v $pkgver -i "$_builddir"$_gemdir \
+		--ignore-dependencies \
+		--verbose \
+		--no-rdoc \
+		--no-ri \
+		|| return 1
+	rm -rf "$pkgdir"/$_gemdir/cache \
+		"$pkgdir"/$_geminstdir/ext \
+		"$pkgdir"/$_geminstdir/.require_paths
+}
+
+package() {
+	mkdir -p "$pkgdir" || return 1
+	cp -ra "$_builddir"/* "$pkgdir"/ || return 1
+}
+
+md5sums="9a1caf852bf72ebf251bc1ceb6a3dec0  require-0.2.7.gem"
+sha256sums="353fbb7f73faa1af266956999298e649e6ccd12a6d27397e813a9d6788ac1928  require-0.2.7.gem"
+sha512sums="f732967d21e2e834809b661bb69f7750e311fc833a4113481788d5410b3041f791161a25167181e89354d841893d57682273d4dfa8bf3b2643d1e141af83a66c  require-0.2.7.gem"
diff --git a/testing/ruby-shoulda-context/APKBUILD b/testing/ruby-shoulda-context/APKBUILD
index 4c4190990e..c561a828eb 100644
--- a/testing/ruby-shoulda-context/APKBUILD
+++ b/testing/ruby-shoulda-context/APKBUILD
@@ -1,35 +1,40 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: 
 _gemname=shoulda-context
 pkgname=ruby-shoulda-context
-pkgver=1.0.1
+pkgver=1.0.2
 pkgrel=0	
 pkgdesc="Context framework extracted from Shoulda"
 url="https://github.com/thoughtbot/shoulda"
 arch="noarch"
 license="MIT"
 depends="ruby"
-depends_dev=
-makedepends="$depends_dev ruby-gems"
+depends_dev=""
+makedepends="ruby-dev ruby-gems"
 install=""
 subpackages=""
-source="http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem"
+source="http://rubygems.org/downloads/$_gemname-$pkgver.gem"
 
-_builddir="$srcdir"/$_realname-$pkgver
+_builddir="$srcdir"/$_gemname-$pkgver
 build() {
-	return 0
-}
-
-package() {
+	mkdir -p "$_builddir" || return 1
 	local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-	local _geminstdir=$_gemdir/gems/$_gemname-$pkgver
-	mkdir -p "$pkgdir" || return 1
-
-	gem install --local --install-dir "$pkgdir"/$_gemdir \
-		--ignore-dependencies --verbose --no-rdoc --no-ri \
-		"$srcdir"/$_gemname-$pkgver.gem || return 1
+	gem install $_gemname -v $pkgver -i "$_builddir"$_gemdir \
+		--ignore-dependencies \
+		--verbose \
+		--no-rdoc \
+		--no-ri \
+		|| return 1
 	rm -rf "$pkgdir"/$_gemdir/cache \
 		"$pkgdir"/$_geminstdir/ext \
 		"$pkgdir"/$_geminstdir/.require_paths
 }
 
-md5sums="f7c0aaf97f462336cb0136635a679c4b  shoulda-context-1.0.1.gem"
+package() {
+	mkdir -p "$pkgdir" || return 1
+	cp -ra "$_builddir"/* "$pkgdir"/ || return 1
+}
+
+md5sums="01ad6b98a2644bda239037553ef2ccce  shoulda-context-1.0.2.gem"
+sha256sums="ee5559aa13248c70fdec6868a3c144adf7438c904c59d1a76b04a002e5151de5  shoulda-context-1.0.2.gem"
+sha512sums="557b85b4e4941bfa92595e8b5f1c1cd37c10f82c2f65a4f645a2f7c56043ef67f7a8ae67fc66aee4ce450261c38f595b455a711159789227cfce14a7e341e7df  shoulda-context-1.0.2.gem"
diff --git a/testing/ruby-shoulda-matchers/APKBUILD b/testing/ruby-shoulda-matchers/APKBUILD
index 7f33b124e7..c2edd24ffd 100644
--- a/testing/ruby-shoulda-matchers/APKBUILD
+++ b/testing/ruby-shoulda-matchers/APKBUILD
@@ -1,4 +1,5 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: 
 _gemname=shoulda-matchers
 pkgname=ruby-shoulda-matchers
 pkgver=1.4.1
@@ -8,28 +9,32 @@ url="https://github.com/thoughtbot/shoulda"
 arch="noarch"
 license="MIT"
 depends="ruby ruby-activesupport"
-depends_dev=
-makedepends="$depends_dev ruby-gems"
+depends_dev=""
+makedepends="ruby-dev ruby-gems"
 install=""
 subpackages=""
-source="http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem"
+source="http://rubygems.org/downloads/$_gemname-$pkgver.gem"
 
-_builddir="$srcdir"/$_realname-$pkgver
+_builddir="$srcdir"/$_gemname-$pkgver
 build() {
-	return 0
-}
-
-package() {
+	mkdir -p "$_builddir" || return 1
 	local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-	local _geminstdir=$_gemdir/gems/$_gemname-$pkgver
-	mkdir -p "$pkgdir" || return 1
-
-	gem install --local --install-dir "$pkgdir"/$_gemdir \
-		--ignore-dependencies --verbose --no-rdoc --no-ri \
-		"$srcdir"/$_gemname-$pkgver.gem || return 1
+	gem install $_gemname -v $pkgver -i "$_builddir"$_gemdir \
+		--ignore-dependencies \
+		--verbose \
+		--no-rdoc \
+		--no-ri \
+		|| return 1
 	rm -rf "$pkgdir"/$_gemdir/cache \
 		"$pkgdir"/$_geminstdir/ext \
 		"$pkgdir"/$_geminstdir/.require_paths
 }
 
+package() {
+	mkdir -p "$pkgdir" || return 1
+	cp -ra "$_builddir"/* "$pkgdir"/ || return 1
+}
+
 md5sums="03f66e5f1d2c76df58e1fd2dcc778454  shoulda-matchers-1.4.1.gem"
+sha256sums="c35693cbfa84213212dffbc2c87487427ef364927340151329a842f0a06086b9  shoulda-matchers-1.4.1.gem"
+sha512sums="8987e1ca8c91f504a32e3d46b33973f8f2001c31b931b5cd14089519dcf9391b064957424e03e6da5755aee0dd9688d0f6c1c8a2276af8e80369a89b83f9018f  shoulda-matchers-1.4.1.gem"
diff --git a/testing/ruby-shoulda/APKBUILD b/testing/ruby-shoulda/APKBUILD
index 97738c3549..d405c56f90 100644
--- a/testing/ruby-shoulda/APKBUILD
+++ b/testing/ruby-shoulda/APKBUILD
@@ -1,35 +1,40 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: 
 _gemname=shoulda
 pkgname=ruby-shoulda
-pkgver=2.11.0
+pkgver=3.3.2
 pkgrel=0
 pkgdesc="Making tests easy on the fingers and eyes"
 url="https://github.com/thoughtbot/shoulda"
 arch="noarch"
 license="MIT"
 depends="ruby"
-depends_dev=
-makedepends="$depends_dev ruby-gems"
+depends_dev=""
+makedepends="ruby-dev ruby-gems"
 install=""
 subpackages=""
-source="http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem"
+source="http://rubygems.org/downloads/$_gemname-$pkgver.gem"
 
-_builddir="$srcdir"/$_realname-$pkgver
+_builddir="$srcdir"/$_gemname-$pkgver
 build() {
-	return 0
-}
-
-package() {
+	mkdir -p "$_builddir" || return 1
 	local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-	local _geminstdir=$_gemdir/gems/$_gemname-$pkgver
-	mkdir -p "$pkgdir" || return 1
-
-	gem install --local --install-dir "$pkgdir"/$_gemdir \
-		--ignore-dependencies --verbose --no-rdoc --no-ri \
-		"$srcdir"/$_gemname-$pkgver.gem || return 1
+	gem install $_gemname -v $pkgver -i "$_builddir"$_gemdir \
+		--ignore-dependencies \
+		--verbose \
+		--no-rdoc \
+		--no-ri \
+		|| return 1
 	rm -rf "$pkgdir"/$_gemdir/cache \
 		"$pkgdir"/$_geminstdir/ext \
 		"$pkgdir"/$_geminstdir/.require_paths
 }
 
-md5sums="a2b7206209fca2d5397ed94ce36256bb  shoulda-2.11.0.gem"
+package() {
+	mkdir -p "$pkgdir" || return 1
+	cp -ra "$_builddir"/* "$pkgdir"/ || return 1
+}
+
+md5sums="a925abc6f2f556fd31615e217e52bdf1  shoulda-3.3.2.gem"
+sha256sums="52e70b71cbfb7c01dace14e268a62d86c21ddd1e5ec0116c8b1e632d8e04e412  shoulda-3.3.2.gem"
+sha512sums="31a5066a1e17e911fa1e0fce1ebc57fa343a5e57601002280fab3762212e5e6394a611a618ea27deb6ec28655b685fd1a77e84c31feb165fad43bdc010524b02  shoulda-3.3.2.gem"
diff --git a/testing/ruby-tins/APKBUILD b/testing/ruby-tins/APKBUILD
new file mode 100644
index 0000000000..ad8679bb46
--- /dev/null
+++ b/testing/ruby-tins/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+_gemname=tins
+pkgname=ruby-$_gemname
+pkgver=0.7.1
+pkgrel=0
+pkgdesc="Useful ruby library for tools"
+url="https://github.com/flori/tins"
+arch="noarch"
+license="MIT"
+depends="ruby"
+depends_dev=""
+makedepends="ruby-dev ruby-gems"
+install=""
+subpackages=""
+source="http://rubygems.org/downloads/$_gemname-$pkgver.gem"
+
+_builddir="$srcdir"/$_gemname-$pkgver
+build() {
+	mkdir -p "$_builddir" || return 1
+	local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+	gem install $_gemname -v $pkgver -i "$_builddir"$_gemdir \
+		--ignore-dependencies \
+		--verbose \
+		--no-rdoc \
+		--no-ri \
+		|| return 1
+	rm -rf "$pkgdir"/$_gemdir/cache \
+		"$pkgdir"/$_geminstdir/ext \
+		"$pkgdir"/$_geminstdir/.require_paths
+}
+
+package() {
+	mkdir -p "$pkgdir" || return 1
+	cp -ra "$_builddir"/* "$pkgdir"/ || return 1
+}
+
+md5sums="35df5408c410bee569202df12f9c48ee  tins-0.7.1.gem"
+sha256sums="71aeb5a2b997bda106a10d783fbebb5c43fc405b23eda7ef2db5d65be721c2c2  tins-0.7.1.gem"
+sha512sums="8f58264b2401bea3e218b03fe7df77968f0999941cce1bfeda451e34d42f376ed855a694938684f9c187ad6744b045c1609dd72b544b6bea041080b3af42b74a  tins-0.7.1.gem"
diff --git a/testing/ruby-yard/APKBUILD b/testing/ruby-yard/APKBUILD
index 8e6a322ad1..477fa53f13 100644
--- a/testing/ruby-yard/APKBUILD
+++ b/testing/ruby-yard/APKBUILD
@@ -1,35 +1,40 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: 
 _gemname=yard
 pkgname=ruby-yard
-pkgver=0.8.3
+pkgver=0.8.5.2
 pkgrel=0	
 pkgdesc="A documentation generation tool for Ruby"
 url="http://yardoc.org"
 arch="noarch"
 license="MIT"
 depends="ruby"
-depends_dev=
-makedepends="$depends_dev ruby-gems"
+depends_dev=""
+makedepends="ruby-dev ruby-gems"
 install=""
 subpackages=""
-source="http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem"
+source="http://rubygems.org/downloads/$_gemname-$pkgver.gem"
 
-_builddir="$srcdir"/$_realname-$pkgver
+_builddir="$srcdir"/$_gemname-$pkgver
 build() {
-	return 0
-}
-
-package() {
+	mkdir -p "$_builddir" || return 1
 	local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-	local _geminstdir=$_gemdir/gems/$_gemname-$pkgver
-	mkdir -p "$pkgdir" || return 1
-
-	gem install --local --install-dir "$pkgdir"/$_gemdir \
-		--ignore-dependencies --verbose --no-rdoc --no-ri \
-		"$srcdir"/$_gemname-$pkgver.gem || return 1
+	gem install $_gemname -v $pkgver -i "$_builddir"$_gemdir \
+		--ignore-dependencies \
+		--verbose \
+		--no-rdoc \
+		--no-ri \
+		|| return 1
 	rm -rf "$pkgdir"/$_gemdir/cache \
 		"$pkgdir"/$_geminstdir/ext \
 		"$pkgdir"/$_geminstdir/.require_paths
 }
 
-md5sums="1ecf6a24b7897f073e91067fc3124d6c  yard-0.8.3.gem"
+package() {
+	mkdir -p "$pkgdir" || return 1
+	cp -ra "$_builddir"/* "$pkgdir"/ || return 1
+}
+
+md5sums="3dd47e06fb17c7b7de88eb02bfbfb57b  yard-0.8.5.2.gem"
+sha256sums="6c69c6e488df57d268a8ad406420a28217286a531e15788ae08bbd5266d42a5f  yard-0.8.5.2.gem"
+sha512sums="a166971827b6692035dabb0e8f69b442e664403af79fc56f48184088f0ca5f1b198d0d81d4eb25042151968ef5f493b8146ab4e933700a8649c69cff99cbb649  yard-0.8.5.2.gem"
diff --git a/testing/sarg/APKBUILD b/testing/sarg/APKBUILD
index 96628569a5..f63413ff8e 100644
--- a/testing/sarg/APKBUILD
+++ b/testing/sarg/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer:
 pkgname=sarg
-pkgver=2.3.1
+pkgver=2.3.5
 pkgrel=0
 pkgdesc="SARG Squid Analysis Report Generator"
 url="http://sarg.sourceforge.net/"
 arch="all"
-license="GPL"
+license="GPL2+"
 depends=""
 depends_dev=""
 makedepends="$depends_dev"
@@ -52,4 +52,6 @@ php() {
 		"$subpkgdir"/usr/share/webapps
 }
 
-md5sums="bf637b8a820b81e2c55e815934151b4d  sarg-2.3.1.tar.gz"
+md5sums="a10545aa0571f73789d81dcfca5bfb3c  sarg-2.3.5.tar.gz"
+sha256sums="661560a3dfbf793ac02260adf8f457029b7cebf676d04a0ecb09b3ba06e0b0fb  sarg-2.3.5.tar.gz"
+sha512sums="db71db2212d5f4de7d39c0610f7ba0222618a698d5fa6e3a5f8243a0e0bb588d89319e1bca55a92991db01e506e0892e42a8dbd5d132ab6fba7e6421de743f1a  sarg-2.3.5.tar.gz"
diff --git a/testing/x2goserver/APKBUILD b/testing/x2goserver/APKBUILD
index c8d5d78aff..d3e790ae00 100644
--- a/testing/x2goserver/APKBUILD
+++ b/testing/x2goserver/APKBUILD
@@ -1,21 +1,21 @@
 # Contributor: Jeff Bilyk <jbilyk@gmail.com>
 # Maintainer:
 pkgname=x2goserver
-pkgver=3.1.0.1
+pkgver=4.0.0.0
 pkgrel=0
 pkgdesc="Terminal server"
 url="http://x2go.org"
 arch="all"
-license="GPL"
+license="GPL2+"
 depends=""
 makedepends="libssh2-dev perl-dbd-sqlite python-dev xauth bash man"
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc"
-source="http://code.x2go.org/releases/source/x2goserver/${pkgname}_${pkgver}.tar.gz"
+source="http://code.x2go.org/releases/source/$pkgname/$pkgname-$pkgver.tar.gz"
 pkgusers="x2gouser"
 pkggroups="x2gouser"
 
-_builddir="$srcdir"/${pkgname}_${pkgver}
+_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
@@ -31,12 +31,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	make
+	make || return 1
 }
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="ae484646e5bd16363a5d49204f5bdf0c  x2goserver_3.1.0.1.tar.gz"
+md5sums="1fc38566832c30897c6583e7ffa1fda3  x2goserver-4.0.0.0.tar.gz"
+sha256sums="32c7926edeecd8d9362711ba34f9795821e140bb8d10d056c4f4c2c98fb1778f  x2goserver-4.0.0.0.tar.gz"
+sha512sums="f951bfffb398a7ff9e2d59714a742d0c02180b8264a83292a88b10c7d08816c20f0d6ab2f3147717d0f6784153606814257cf5be7850bebb811340aafeaeb7db  x2goserver-4.0.0.0.tar.gz"
author	Natanael Copa <ncopa@alpinelinux.org>	2013-03-13 07:16:38 +0000
committer	Natanael Copa <ncopa@alpinelinux.org>	2013-03-13 07:17:29 +0000
commit	2f9f2948ad63a4beac262b48cbe61bcbaa9afaf0 (patch)
tree	59d30e210c5fb6438f0234fb9ca35ff44e06ab07
parent	38cbbfaeafb21f57533ff98a232ffd99bd81d415 (diff)
parent	00a90f770df3088a33fa8df2676943bbee6a22c3 (diff)
download	aports-fcolista-2f9f2948ad63a4beac262b48cbe61bcbaa9afaf0.tar.bz2 aports-fcolista-2f9f2948ad63a4beac262b48cbe61bcbaa9afaf0.tar.xz