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

Conflicts:
	testing/py-lxml/APKBUILD

20 files changed, 167 insertions, 108 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"