testing/[various]: rebuild against python-2.7

32 files changed, 32 insertions, 55 deletions

diff --git a/testing/apache2-mod-wsgi/APKBUILD b/testing/apache2-mod-wsgi/APKBUILD
index 89c04f2c24..14b4a644fc 100644
--- a/testing/apache2-mod-wsgi/APKBUILD
+++ b/testing/apache2-mod-wsgi/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=apache2-mod-wsgi
 _realname=mod_wsgi
 pkgver=3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Python WSGI Module for Apache2"
 url="http://code.google.com/p/modwsgi/"
 arch="all"
diff --git a/testing/bcfg2/APKBUILD b/testing/bcfg2/APKBUILD
index 3d48d546eb..503d3308d9 100644
--- a/testing/bcfg2/APKBUILD
+++ b/testing/bcfg2/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Cameron Banta <cbanta@gmail.com>
 pkgname=bcfg2
 pkgver=1.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="configuration management tool"
 url="http://trac.mcs.anl.gov/projects/bcfg2"
 arch="all"
diff --git a/testing/ices/APKBUILD b/testing/ices/APKBUILD
index 5f6082840f..574954b3bd 100644
--- a/testing/ices/APKBUILD
+++ b/testing/ices/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=ices
 pkgver=0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Source client for broadcasting in MP3 format to an icecast2 server"
 url="http://icecast.org/ices.php"
 arch="all"
diff --git a/testing/libplist/APKBUILD b/testing/libplist/APKBUILD
index 633ff2547b..c4e2ff487d 100644
--- a/testing/libplist/APKBUILD
+++ b/testing/libplist/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libplist
 pkgver=1.4
-pkgrel=0
+pkgrel=1
 pkgdesc="A library to handle Apple Property List format whereas it's binary or XML"
 url="http://libimobiledevice.org/"
 arch="all"
diff --git a/testing/mediaproxy/APKBUILD b/testing/mediaproxy/APKBUILD
index 7b1a5bcf5a..169fc2e093 100644
--- a/testing/mediaproxy/APKBUILD
+++ b/testing/mediaproxy/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mediaproxy
 pkgver=2.4.4
-pkgrel=0
+pkgrel=1
 pkgdesc="MediaProxy"
 url="http://www.ag-projects.com/MediaProxy/"
 pkgusers="kamailio"
diff --git a/testing/moinmoin/APKBUILD b/testing/moinmoin/APKBUILD
index 886855721b..bab1a6f06b 100644
--- a/testing/moinmoin/APKBUILD
+++ b/testing/moinmoin/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname=moinmoin
 pkgver=1.9.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Python Wiki"
 url="http://moinmo.in/"
 arch="noarch"
diff --git a/testing/mutagen/APKBUILD b/testing/mutagen/APKBUILD
index 2f51bfff53..77463f297a 100644
--- a/testing/mutagen/APKBUILD
+++ b/testing/mutagen/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mutagen
 pkgver=1.20
-pkgrel=0
+pkgrel=1
 pkgdesc="An audio metadata tag reader and writer implemented in pure python"
 url="http://code.google.com/p/mutagen/"
 arch="noarch"
diff --git a/testing/mutter/APKBUILD b/testing/mutter/APKBUILD
index 6b3aefddd2..e328a4b477 100644
--- a/testing/mutter/APKBUILD
+++ b/testing/mutter/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=mutter
 pkgver=2.31.5
-pkgrel=2
+pkgrel=3
 pkgdesc="clutter-based window manager for GNOME"
 url="http://www.gnome.org/"
 arch="all"
diff --git a/testing/openxcap/APKBUILD b/testing/openxcap/APKBUILD
index 812c6d16de..4ee40c4019 100644
--- a/testing/openxcap/APKBUILD
+++ b/testing/openxcap/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=openxcap
 pkgver=2.0.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Open source fully featured XCAP server "
 url="http://openxcap.org"
 pkgusers="openxcap"
diff --git a/testing/py-application/APKBUILD b/testing/py-application/APKBUILD
index a2ff05fdd7..2135f154ff 100644
--- a/testing/py-application/APKBUILD
+++ b/testing/py-application/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py-application
 _name=python-application
 pkgver=1.2.7
-pkgrel=0
+pkgrel=1
 pkgdesc="Basic building blocks for python applications"
 url="http://pypi.python.org/pypi/python-application"
 arch="all"
diff --git a/testing/py-asn1/APKBUILD b/testing/py-asn1/APKBUILD
index d11b4d5378..eb519d3560 100644
--- a/testing/py-asn1/APKBUILD
+++ b/testing/py-asn1/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=py-asn1
 pkgver=0.0.13b
-pkgrel=0
+pkgrel=1
 pkgdesc="python ASN1 library"
 url="http://pyasn1.sourceforge.net/"
 arch="noarch"
diff --git a/testing/py-buildutils/APKBUILD b/testing/py-buildutils/APKBUILD
index dd1bcd8a8a..cbc08cc7a3 100644
--- a/testing/py-buildutils/APKBUILD
+++ b/testing/py-buildutils/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py-buildutils
 _pkgname=${pkgname#py-}
 pkgver=0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="buildutils is a collection of enhancements to the Python distutils"
 url="http://pypi.python.org/pypi/buildutils/0.3"
 arch="all"
diff --git a/testing/py-cjson/APKBUILD b/testing/py-cjson/APKBUILD
index 46f37fcc8a..b11f796f52 100644
--- a/testing/py-cjson/APKBUILD
+++ b/testing/py-cjson/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=py-cjson
 _name=python-cjson
 pkgver=1.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast JSON encoder/decoder for Python"
 url="http://pypi.python.org/pypi/python-gnutls"
 arch="all"
diff --git a/testing/py-crypto/APKBUILD b/testing/py-crypto/APKBUILD
index 5a1a6c4a99..bd58eeeb92 100644
--- a/testing/py-crypto/APKBUILD
+++ b/testing/py-crypto/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py-crypto
 pkgver=2.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A collection of cryptographic algorithms and protocols, implemented for use from Python."
 url="http://www.amk.ca/python/code/crypto.html"
 arch="all"
diff --git a/testing/py-dateutil/APKBUILD b/testing/py-dateutil/APKBUILD
index 4600e199d3..f1915d8166 100644
--- a/testing/py-dateutil/APKBUILD
+++ b/testing/py-dateutil/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py-dateutil
 _pkgname=python-dateutil
 pkgver=1.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Provides powerful extensions to the standard datetime module"
 url="http://labix.org/python-dateutil"
 arch="noarch"
diff --git a/testing/py-distutils-extra/APKBUILD b/testing/py-distutils-extra/APKBUILD
index c375966abe..250bd89858 100644
--- a/testing/py-distutils-extra/APKBUILD
+++ b/testing/py-distutils-extra/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=py-distutils-extra
 pkgver=2.26
-pkgrel=0
+pkgrel=1
 pkgdesc="enhanced distutils package for python"
 url="http://launchpad.net/python-distutils-extra"
 arch="noarch"
diff --git a/testing/py-django/APKBUILD b/testing/py-django/APKBUILD
index 847badf2c8..a48e7e5310 100644
--- a/testing/py-django/APKBUILD
+++ b/testing/py-django/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py-django
 _pkgname=Django
 pkgver=1.2.5
-pkgrel=0
+pkgrel=1
 pkgdesc="A high-level Python Web framework that encourages rapid development and clean, pragmatic design."
 url="http://djangoproject.com/"
 arch="noarch"
diff --git a/testing/py-eventlet/APKBUILD b/testing/py-eventlet/APKBUILD
index 4825f7dc9c..aaacadaae8 100644
--- a/testing/py-eventlet/APKBUILD
+++ b/testing/py-eventlet/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Elizabeth Jennifer Myers <elizabeth@sporksirc.net>
 pkgname=py-eventlet
 pkgver=0.9.16
-pkgrel=0
+pkgrel=1
 pkgdesc="Python library for seamless coroutine-based concurrency"
 url="http://eventlet.net/"
 arch="noarch"
diff --git a/testing/py-gevent/APKBUILD b/testing/py-gevent/APKBUILD
index 9c1eda790c..9bda980c0f 100644
--- a/testing/py-gevent/APKBUILD
+++ b/testing/py-gevent/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Michael Zhou <zhoumichaely@gmail.com>
 pkgname=py-gevent
 pkgver=0.13.6
-pkgrel=0
+pkgrel=1
 pkgdesc="Python library for seamless coroutine-based concurrency"
 url="http://gevent.org/"
 arch="x86 x86_64"
diff --git a/testing/py-gnutls/APKBUILD b/testing/py-gnutls/APKBUILD
index 1a1c67fc8c..c529342427 100644
--- a/testing/py-gnutls/APKBUILD
+++ b/testing/py-gnutls/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=py-gnutls
 _name=python-gnutls
 pkgver=1.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Python wrapper for the GNUTLS library"
 url="http://pypi.python.org/pypi/python-gnutls"
 arch="all"
diff --git a/testing/py-greenlet/APKBUILD b/testing/py-greenlet/APKBUILD
index 89cfd50547..2be1c61155 100644
--- a/testing/py-greenlet/APKBUILD
+++ b/testing/py-greenlet/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Elizabeth Jennifer Myers <elizabeth@sporksirc.net>
 pkgname=py-greenlet
 pkgver=0.3.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Lightweight in-process concurrent programming"
 url="http://pypi.python.org/pypi/greenlet"
 arch="all"
diff --git a/testing/py-importlib/APKBUILD b/testing/py-importlib/APKBUILD
deleted file mode 100644
index 6ca977817a..0000000000
--- a/testing/py-importlib/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer:
-pkgname=py-importlib
-_pkgname=importlib
-pkgver=1.0.1
-pkgrel=0
-pkgdesc="Backport of importlib module from Python 2.7 and up"
-url="http://pypi.python.org/pypi/importlib"
-arch="noarch"
-license="BSD"
-depends=
-depends_dev="python-dev py-setuptools"
-makedepends="$depends_dev"
-install=""
-subpackages=""
-source="http://pypi.python.org/packages/source/i/${_pkgname}/${_pkgname}-$pkgver.tar.gz"
-_builddir="$srcdir"/$_pkgname-$pkgver
-package() {
-	cd "$_builddir"
-	python setup.py install --root=$pkgdir/ --optimize=1 || return 1
-}
-
-md5sums="1ea851d370b029ed1bfaeb224da210fb  importlib-1.0.1.tar.gz"
diff --git a/testing/py-jabberbot/APKBUILD b/testing/py-jabberbot/APKBUILD
index 5a6aa32921..c13d562a4a 100644
--- a/testing/py-jabberbot/APKBUILD
+++ b/testing/py-jabberbot/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py-jabberbot
 _pkgname=python-jabberbot
 pkgver=0.13
-pkgrel=0
+pkgrel=1
 pkgdesc="A simple Jabber Bot for Python"
 url="http://pypi.python.org/pypi/jabberbot"
 arch="noarch"
diff --git a/testing/py-pycountry/APKBUILD b/testing/py-pycountry/APKBUILD
index a72eb2eb9b..e4ad4f3afe 100644
--- a/testing/py-pycountry/APKBUILD
+++ b/testing/py-pycountry/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py-pycountry
 _pkgname=pycountry
 pkgver=0.12.1
-pkgrel=0
+pkgrel=1
 pkgdesc="ISO country, subdivision, language, currency and script definitions and their translations"
 url="http://pypi.python.org/pypi/pycountry"
 arch="noarch"
diff --git a/testing/py-qt/APKBUILD b/testing/py-qt/APKBUILD
index 1d22951780..7f4d0faedc 100644
--- a/testing/py-qt/APKBUILD
+++ b/testing/py-qt/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py-qt
 _pkgname=PyQt
 pkgver=4.8.4
-pkgrel=0
+pkgrel=1
 pkgdesc="A set of Python bindings for the Qt toolkit"
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 arch="all"
diff --git a/testing/py-sip/APKBUILD b/testing/py-sip/APKBUILD
index db13577f22..188b594e32 100644
--- a/testing/py-sip/APKBUILD
+++ b/testing/py-sip/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py-sip
 _pkgname=sip
 pkgver=4.12.3
-pkgrel=0
+pkgrel=1
 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"
diff --git a/testing/py-twisted-web2/APKBUILD b/testing/py-twisted-web2/APKBUILD
index feba20ade1..dc80dcc04f 100644
--- a/testing/py-twisted-web2/APKBUILD
+++ b/testing/py-twisted-web2/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname=py-twisted-web2
 pkgver=8.1.0
-pkgrel=0
+pkgrel=1
 pkgdesc="The twisted.web2 package in Twisted."
 url="http://twistedmatrix.com/"
 arch="all"
diff --git a/testing/py-twisted/APKBUILD b/testing/py-twisted/APKBUILD
index a4df6f4deb..f1bbbb1017 100644
--- a/testing/py-twisted/APKBUILD
+++ b/testing/py-twisted/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py-twisted
 pkgver=10.0.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Asynchronous networking framework written in Python."
 url="http://twistedmatrix.com/"
 arch="all"
diff --git a/testing/py-xmpppy/APKBUILD b/testing/py-xmpppy/APKBUILD
index 48ccc2bb2c..fefe8e7cf1 100644
--- a/testing/py-xmpppy/APKBUILD
+++ b/testing/py-xmpppy/APKBUILD
@@ -4,7 +4,7 @@ pkgname=py-xmpppy
 _pkgname=xmpppy
 pkgver=0.5.0
 _pkgver=0.5.0rc1
-pkgrel=0
+pkgrel=1
 pkgdesc="A Python library to provide easy scripting with Jabber"
 url="http://xmpppy.sourceforge.net/"
 arch="noarch"
diff --git a/testing/py-zope-interface/APKBUILD b/testing/py-zope-interface/APKBUILD
index 5d06633614..fbc21c63ec 100644
--- a/testing/py-zope-interface/APKBUILD
+++ b/testing/py-zope-interface/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py-zope-interface
 pkgver=3.6.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Separate distribution of the zope.interface package used in Zope 3."
 url="http://www.zope.org/Products/ZopeInterface/"
 arch="all"
@@ -19,6 +19,6 @@ build() {
 package() {
 	cd "$_builddir"
 	python setup.py install --prefix=/usr --root="$pkgdir"
-	rm "$pkgdir"/usr/lib/python2.6/site-packages/zope/interface/README*.txt
+	rm "$pkgdir"/usr/lib/python*/site-packages/zope/interface/README*.txt
 }
 md5sums="7a895181b8d10be4a7e9a3afa13cd3be  zope.interface-3.6.1.tar.gz"
diff --git a/testing/scons/APKBUILD b/testing/scons/APKBUILD
index 636bdf1f82..ef188177bb 100644
--- a/testing/scons/APKBUILD
+++ b/testing/scons/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=scons
 pkgver=2.0.1
-pkgrel=0
+pkgrel=1
 pkgdesc="scons software construction system"
 url="http://www.scons.org/"
 license="MIT"
diff --git a/testing/totem/APKBUILD b/testing/totem/APKBUILD
index cd1a4bcdc7..7edde166e3 100644
--- a/testing/totem/APKBUILD
+++ b/testing/totem/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=totem
 pkgver=2.32.0
-pkgrel=1
+pkgrel=2
 pkgdesc="media player for gnome"
 url="http://projects.gnome.org/totem"
 arch="all"