67 files changed, 1605 insertions, 435 deletions

diff --git a/abs/core/dhcp/dhcp-4.1.0-missing-ipv6-not-fatal.patch b/abs/core/dhcp/dhcp-4.1.0-missing-ipv6-not-fatal.patch
deleted file mode 100644
index ebf3865..0000000
--- a/abs/core/dhcp/dhcp-4.1.0-missing-ipv6-not-fatal.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Naur dhcp-4.1.0a2/common/discover.c dhcp-4.1.0a2-mcn/common/discover.c
---- dhcp-4.1.0a2/common/discover.c	2008-08-29 18:48:57.000000000 +0100
-+++ dhcp-4.1.0a2-mcn/common/discover.c	2008-10-02 13:02:06.000000000 +0100
-@@ -443,15 +443,17 @@
- 	}
- 
- #ifdef DHCPv6
--	ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
--	if (ifaces->fp6 == NULL) {
--		log_error("Error opening '/proc/net/if_inet6' to "
--			  "list IPv6 interfaces; %m");
--		close(ifaces->sock);
--		ifaces->sock = -1;
--		fclose(ifaces->fp);
--		ifaces->fp = NULL;
--		return 0;
-+	if (local_family == AF_INET6) {
-+		ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
-+		if (ifaces->fp6 == NULL) {
-+			log_error("Error opening '/proc/net/if_inet6' to "
-+				  "list IPv6 interfaces; %m");
-+			close(ifaces->sock);
-+			ifaces->sock = -1;
-+			fclose(ifaces->fp);
-+			ifaces->fp = NULL;
-+			return 0;
-+		}
- 	}
- #endif
- 
-@@ -720,7 +722,8 @@
- 	}
- #ifdef DHCPv6
- 	if (!(*err)) {
--		return next_iface6(info, err, ifaces);
-+		if (local_family == AF_INET6)
-+			return next_iface6(info, err, ifaces);
- 	}
- #endif
- 	return 0;
-@@ -736,7 +739,8 @@
- 	close(ifaces->sock);
- 	ifaces->sock = -1;
- #ifdef DHCPv6
--	fclose(ifaces->fp6);
-+	if (local_family == AF_INET6)
-+		fclose(ifaces->fp6);
- 	ifaces->fp6 = NULL;
- #endif
- }
diff --git a/abs/core/filesystem/__CHANGELOG b/abs/core/filesystem/__CHANGELOG
deleted file mode 100644
index 87707ff..0000000
--- a/abs/core/filesystem/__CHANGELOG
+++ /dev/null
@@ -1,2 +0,0 @@
-removed /etc/issue
-added tty10 to securetty
diff --git a/abs/core/ipw2200-fw/ipw2200-fw.install b/abs/core/ipw2200-fw/ipw2200-fw.install
deleted file mode 100644
index 4720660..0000000
--- a/abs/core/ipw2200-fw/ipw2200-fw.install
+++ /dev/null
@@ -1,18 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-cat << EOF
-IMPORTANT
-==> In order to use the firmware you have to agree to Intel's license located in 
-==> /lib/firmware/LICENSE.ipw2200-fw else please remove this package.
-EOF
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-post_install $1 
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/core/python2-distribute/PKGBUILD b/abs/core/python2-distribute/PKGBUILD
new file mode 100644
index 0000000..f21be1d
--- /dev/null
+++ b/abs/core/python2-distribute/PKGBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Sebastien Binet <binet@farnsworth>
+pkgname=python2-distribute
+pkgver=0.6.14
+pkgrel=4
+pkgdesc="A collection of extensions to the Python 2 distutils"
+arch=('any')
+license=('PSF')
+url="http://packages.python.org/distribute"
+depends=('python2')
+conflicts=('setuptools')
+replaces=('setuptools')
+provides=('setuptools=0.6c11')
+source=(http://pypi.python.org/packages/source/d/distribute/distribute-${pkgver}.tar.gz
+        distribute-${pkgver}_python2_and_3.patch)
+sha1sums=('6bea50b97f36bf751548bb486a534204a690aa4d' 
+          'de635febfb11dc6878e5bdbac4a0e1d539c19d79')
+
+package() {
+   cd ${srcdir}/distribute-${pkgver}
+   patch -Np1 -i ../distribute-${pkgver}_python2_and_3.patch
+   python2 setup.py install --prefix=/usr --root=${pkgdir}
+}
+# vim: set noexpandtab tabstop=8 shiftwidth=8 textwidth=132 autoindent
diff --git a/abs/core/python2-distribute/distribute-0.6.14_python2_and_3.patch b/abs/core/python2-distribute/distribute-0.6.14_python2_and_3.patch
new file mode 100644
index 0000000..dc5da86
--- /dev/null
+++ b/abs/core/python2-distribute/distribute-0.6.14_python2_and_3.patch
@@ -0,0 +1,51 @@
+diff -Naur distribute-0.6.14.ori//distribute.egg-info/entry_points.txt distribute-0.6.14/distribute.egg-info/entry_points.txt
+--- distribute-0.6.14.ori//distribute.egg-info/entry_points.txt	2010-07-14 20:14:10.000000000 -0400
++++ distribute-0.6.14/distribute.egg-info/entry_points.txt	2010-10-21 09:26:43.386667396 -0400
+@@ -31,7 +31,8 @@
+ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+ 
+ [console_scripts]
+-easy_install = setuptools.command.easy_install:main
++easy_install-3.1 = setuptools.command.easy_install:main
++easy_install-2.7 = setuptools.command.easy_install:main
+ easy_install-2.6 = setuptools.command.easy_install:main
+ 
+ [setuptools.file_finders]
+diff -Naur distribute-0.6.14.ori//distribute_setup.py distribute-0.6.14/distribute_setup.py
+--- distribute-0.6.14.ori//distribute_setup.py	2010-07-14 19:53:38.000000000 -0400
++++ distribute-0.6.14/distribute_setup.py	2010-10-21 09:25:18.356667404 -0400
+@@ -299,8 +299,7 @@
+         log.warn('Could not find the install location')
+         return
+     pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
+-    setuptools_file = 'setuptools-%s-py%s.egg-info' % \
+-            (SETUPTOOLS_FAKED_VERSION, pyver)
++    setuptools_file = 'setuptools-%s.egg-info' % SETUPTOOLS_FAKED_VERSION
+     pkg_info = os.path.join(placeholder, setuptools_file)
+     if os.path.exists(pkg_info):
+         log.warn('%s already exists', pkg_info)
+diff -Naur distribute-0.6.14.ori//setup.py distribute-0.6.14/setup.py
+--- distribute-0.6.14.ori//setup.py	2010-07-14 19:53:38.000000000 -0400
++++ distribute-0.6.14/setup.py	2010-10-21 09:32:44.850000736 -0400
+@@ -96,6 +96,8 @@
+                 f.close()
+ 
+ 
++console_scripts = ["easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3]]
++
+ # if we are installing Distribute using "python setup.py install"
+ # we need to get setuptools out of the way
+ def _easy_install_marker():
+@@ -182,11 +184,7 @@
+             "dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
+         ],
+ 
+-        "console_scripts": [
+-             "easy_install = setuptools.command.easy_install:main",
+-             "easy_install-%s = setuptools.command.easy_install:main"
+-                % sys.version[:3]
+-        ],
++        "console_scripts": console_scripts,
+ 
+         "setuptools.file_finders":
+             ["svn_cvs = setuptools.command.sdist:_default_revctrl"],
diff --git a/abs/core/python2/PKGBUILD b/abs/core/python2/PKGBUILD
index 1760736..f780aa9 100644
--- a/abs/core/python2/PKGBUILD
+++ b/abs/core/python2/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=python2
 pkgver=2.6.6
-pkgrel=2
+pkgrel=3
 _pybasever=2.6
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
diff --git a/abs/core/python2/Python-2.4.4-gdbm-1.patch b/abs/core/python2/Python-2.4.4-gdbm-1.patch
deleted file mode 100644
index 4b6c7eb..0000000
--- a/abs/core/python2/Python-2.4.4-gdbm-1.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Python-2.4.4/setup.py.orig	2007-01-14 12:50:46.000000000 -0600
-+++ Python-2.4.4/setup.py	2007-01-14 12:54:02.000000000 -0600
-@@ -685,12 +685,12 @@
-                 if self.compiler.find_library_file(lib_dirs, 'ndbm'):
-                     ndbm_libs = ['ndbm']
-                 else:
--                    ndbm_libs = []
-+                    ndbm_libs = ['gdbm', 'gdbm_compat']
-                 exts.append( Extension('dbm', ['dbmmodule.c'],
-                                        define_macros=[('HAVE_NDBM_H',None)],
-                                        libraries = ndbm_libs ) )
-             elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
--                  and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
-+                  and find_file("ndbm.h", inc_dirs, []) is not None):
-                 exts.append( Extension('dbm', ['dbmmodule.c'],
-                                        define_macros=[('HAVE_GDBM_NDBM_H',None)],
-                                        libraries = ['gdbm'] ) )
diff --git a/abs/core/python2/Python-2.5.2-idlelib.patch b/abs/core/python2/Python-2.5.2-idlelib.patch
deleted file mode 100644
index 50c987a..0000000
--- a/abs/core/python2/Python-2.5.2-idlelib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Lib/idlelib/WidgetRedirector.py.orig	2008-04-23 23:39:57.000000000 -0700
-+++ Lib/idlelib/WidgetRedirector.py	2008-04-23 23:46:55.000000000 -0700
-@@ -53,7 +53,13 @@
-             if m:
-                 return m(*args)
-             else:
--                return self.tk.call((self.orig, cmd) + args)
-+                #return self.tk.call((self.orig, cmd) + args)
-+                r = self.tk.call((self.orig, cmd) + args)
-+                if isinstance(r, tuple):
-+                    # convert to string ourselves so we get a Tcl list
-+                    # that can be converted back into a tuple
-+                    r = ' '.join(map(str, r))
-+                return r
-         except TclError:
-             return ""
- 
diff --git a/abs/core/python2/db4.6-setup.py-detection.patch b/abs/core/python2/db4.6-setup.py-detection.patch
deleted file mode 100644
index 873f175..0000000
--- a/abs/core/python2/db4.6-setup.py-detection.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py	2008-02-23 20:58:52.000000000 +0000
-+++ setup.py.new	2008-02-23 21:04:18.000000000 +0000
-@@ -608,7 +608,7 @@
-         # a release.  Most open source OSes come with one or more
-         # versions of BerkeleyDB already installed.
- 
--        max_db_ver = (4, 5)
-+        max_db_ver = (4, 6)
-         # NOTE: while the _bsddb.c code links against BerkeleyDB 4.6.x
-         # we leave that version disabled by default as it has proven to be
-         # quite a buggy library release on many platforms.
diff --git a/abs/core/python2/python-2.5.CVE-2007-4965-int-overflow.patch b/abs/core/python2/python-2.5.CVE-2007-4965-int-overflow.patch
deleted file mode 100644
index 843acbf..0000000
--- a/abs/core/python2/python-2.5.CVE-2007-4965-int-overflow.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-diff -rup Python-2.5-orig/Modules/imageop.c Python-2.5/Modules/imageop.c
---- Python-2.5-orig/Modules/imageop.c	2006-01-19 01:09:39.000000000 -0500
-+++ Python-2.5/Modules/imageop.c	2007-09-19 16:42:44.000000000 -0400
-@@ -78,7 +78,7 @@ imageop_crop(PyObject *self, PyObject *a
- 	char *cp, *ncp;
- 	short *nsp;
- 	Py_Int32 *nlp;
--	int len, size, x, y, newx1, newx2, newy1, newy2;
-+	int len, size, x, y, newx1, newx2, newy1, newy2, nlen;
- 	int ix, iy, xstep, ystep;
- 	PyObject *rv;
- 
-@@ -90,13 +90,19 @@ imageop_crop(PyObject *self, PyObject *a
- 		PyErr_SetString(ImageopError, "Size should be 1, 2 or 4");
- 		return 0;
- 	}
--	if ( len != size*x*y ) {
-+	/* ( len != size*x*y ) */
-+	if ( size != ((len / x) / y) ) {
- 		PyErr_SetString(ImageopError, "String has incorrect length");
- 		return 0;
- 	}
- 	xstep = (newx1 < newx2)? 1 : -1;
- 	ystep = (newy1 < newy2)? 1 : -1;
-     
-+        nlen = (abs(newx2-newx1)+1)*(abs(newy2-newy1)+1)*size;
-+        if ( size != ((nlen / (abs(newx2-newx1)+1)) / (abs(newy2-newy1)+1)) ) {
-+		PyErr_SetString(ImageopError, "String has incorrect length");
-+		return 0;
-+	}
- 	rv = PyString_FromStringAndSize(NULL,
- 			     (abs(newx2-newx1)+1)*(abs(newy2-newy1)+1)*size);
- 	if ( rv == 0 )
-@@ -132,7 +138,7 @@ imageop_scale(PyObject *self, PyObject *
- 	char *cp, *ncp;
- 	short *nsp;
- 	Py_Int32 *nlp;
--	int len, size, x, y, newx, newy;
-+	int len, size, x, y, newx, newy, nlen;
- 	int ix, iy;
- 	int oix, oiy;
- 	PyObject *rv;
-@@ -145,12 +151,18 @@ imageop_scale(PyObject *self, PyObject *
- 		PyErr_SetString(ImageopError, "Size should be 1, 2 or 4");
- 		return 0;
- 	}
--	if ( len != size*x*y ) {
-+	/* ( len != size*x*y ) */
-+	if ( size != ((len / x) / y) ) {
-+		PyErr_SetString(ImageopError, "String has incorrect length");
-+		return 0;
-+	}
-+        nlen = newx*newy*size;
-+	if ( size != ((nlen / newx) / newy) ) {
- 		PyErr_SetString(ImageopError, "String has incorrect length");
- 		return 0;
- 	}
-     
--	rv = PyString_FromStringAndSize(NULL, newx*newy*size);
-+	rv = PyString_FromStringAndSize(NULL, nlen);
- 	if ( rv == 0 )
- 		return 0;
- 	ncp = (char *)PyString_AsString(rv);
-@@ -190,7 +202,8 @@ imageop_tovideo(PyObject *self, PyObject
- 		PyErr_SetString(ImageopError, "Size should be 1 or 4");
- 		return 0;
- 	}
--	if ( maxx*maxy*width != len ) {
-+	/* if ( maxx*maxy*width != len ) */
-+	if ( maxx != ((len / maxy) / maxz) ) {
- 		PyErr_SetString(ImageopError, "String has incorrect length");
- 		return 0;
- 	}
-@@ -240,7 +253,8 @@ imageop_grey2mono(PyObject *self, PyObje
- 	if ( !PyArg_ParseTuple(args, "s#iii", &cp, &len, &x, &y, &tres) )
- 		return 0;
- 
--	if ( x*y != len ) {
-+	/* ( x*y != len ) */
-+	if ( x != len / y ) {
- 		PyErr_SetString(ImageopError, "String has incorrect length");
- 		return 0;
- 	}
-@@ -281,7 +295,8 @@ imageop_grey2grey4(PyObject *self, PyObj
- 	if ( !PyArg_ParseTuple(args, "s#ii", &cp, &len, &x, &y) )
- 		return 0;
- 
--	if ( x*y != len ) {
-+	/* ( x*y != len ) */
-+	if ( x != len / y ) {
- 		PyErr_SetString(ImageopError, "String has incorrect length");
- 		return 0;
- 	}
-@@ -320,7 +335,8 @@ imageop_grey2grey2(PyObject *self, PyObj
- 	if ( !PyArg_ParseTuple(args, "s#ii", &cp, &len, &x, &y) )
- 		return 0;
- 
--	if ( x*y != len ) {
-+	/* ( x*y != len ) */
-+	if ( x != len / y ) {
- 		PyErr_SetString(ImageopError, "String has incorrect length");
- 		return 0;
- 	}
-@@ -358,7 +374,8 @@ imageop_dither2mono(PyObject *self, PyOb
- 	if ( !PyArg_ParseTuple(args, "s#ii", &cp, &len, &x, &y) )
- 		return 0;
- 
--	if ( x*y != len ) {
-+	/* ( x*y != len ) */
-+	if ( x != len / y ) {
- 		PyErr_SetString(ImageopError, "String has incorrect length");
- 		return 0;
- 	}
-@@ -404,7 +421,8 @@ imageop_dither2grey2(PyObject *self, PyO
- 	if ( !PyArg_ParseTuple(args, "s#ii", &cp, &len, &x, &y) )
- 		return 0;
- 
--	if ( x*y != len ) {
-+	/* ( x*y != len ) */
-+	if ( x != len / y ) {
- 		PyErr_SetString(ImageopError, "String has incorrect length");
- 		return 0;
- 	}
-@@ -443,7 +461,11 @@ imageop_mono2grey(PyObject *self, PyObje
- 	if ( !PyArg_ParseTuple(args, "s#iiii", &cp, &len, &x, &y, &v0, &v1) )
- 		return 0;
- 
--	nlen = x*y;
-+        nlen = x*y;
-+	if ( x != (nlen / y) ) {
-+		PyErr_SetString(ImageopError, "String has incorrect length");
-+		return 0;
-+	}
- 	if ( (nlen+7)/8 != len ) {
- 		PyErr_SetString(ImageopError, "String has incorrect length");
- 		return 0;
-@@ -481,6 +503,10 @@ imageop_grey22grey(PyObject *self, PyObj
- 		return 0;
- 
- 	nlen = x*y;
-+	if ( x != (nlen / y) ) {
-+		PyErr_SetString(ImageopError, "String has incorrect length");
-+		return 0;
-+	}
- 	if ( (nlen+3)/4 != len ) {
- 		PyErr_SetString(ImageopError, "String has incorrect length");
- 		return 0;
-@@ -517,6 +543,10 @@ imageop_grey42grey(PyObject *self, PyObj
- 		return 0;
- 
- 	nlen = x*y;
-+	if ( x != (nlen / y) ) {
-+		PyErr_SetString(ImageopError, "String has incorrect length");
-+		return 0;
-+	}
- 	if ( (nlen+1)/2 != len ) {
- 		PyErr_SetString(ImageopError, "String has incorrect length");
- 		return 0;
-@@ -554,6 +584,10 @@ imageop_rgb2rgb8(PyObject *self, PyObjec
- 		return 0;
- 
- 	nlen = x*y;
-+	if ( x != (nlen / y) ) {
-+		PyErr_SetString(ImageopError, "String has incorrect length");
-+		return 0;
-+	}
- 	if ( nlen*4 != len ) {
- 		PyErr_SetString(ImageopError, "String has incorrect length");
- 		return 0;
-@@ -598,6 +632,10 @@ imageop_rgb82rgb(PyObject *self, PyObjec
- 		return 0;
- 
- 	nlen = x*y;
-+	if ( x != (nlen / y) ) {
-+		PyErr_SetString(ImageopError, "String has incorrect length");
-+		return 0;
-+	}
- 	if ( nlen != len ) {
- 		PyErr_SetString(ImageopError, "String has incorrect length");
- 		return 0;
-@@ -648,6 +686,10 @@ imageop_rgb2grey(PyObject *self, PyObjec
- 		return 0;
- 
- 	nlen = x*y;
-+	if ( x != (nlen / y) ) {
-+		PyErr_SetString(ImageopError, "String has incorrect length");
-+		return 0;
-+	}
- 	if ( nlen*4 != len ) {
- 		PyErr_SetString(ImageopError, "String has incorrect length");
- 		return 0;
-@@ -693,6 +735,10 @@ imageop_grey2rgb(PyObject *self, PyObjec
- 		return 0;
- 
- 	nlen = x*y;
-+	if ( x != (nlen / y) ) {
-+		PyErr_SetString(ImageopError, "String has incorrect length");
-+		return 0;
-+	}
- 	if ( nlen != len ) {
- 		PyErr_SetString(ImageopError, "String has incorrect length");
- 		return 0;
-diff -rup Python-2.5-orig/Modules/rgbimgmodule.c Python-2.5/Modules/rgbimgmodule.c
---- Python-2.5-orig/Modules/rgbimgmodule.c	2006-08-11 23:18:50.000000000 -0400
-+++ Python-2.5/Modules/rgbimgmodule.c	2007-09-19 17:00:06.000000000 -0400
-@@ -299,6 +299,11 @@ longimagedata(PyObject *self, PyObject *
- 	xsize = image.xsize;
- 	ysize = image.ysize;
- 	zsize = image.zsize;
-+	tablen = xsize * ysize * zsize * sizeof(Py_Int32);
-+        if (xsize != (((tablen / ysize) / zsize) / sizeof(Py_Int32))) {
-+		PyErr_NoMemory();
-+		goto finally;
-+        }
- 	if (rle) {
- 		tablen = ysize * zsize * sizeof(Py_Int32);
- 		starttab = (Py_Int32 *)malloc(tablen);
diff --git a/abs/core/python2/python-2.6-gdbm.patch b/abs/core/python2/python-2.6-gdbm.patch
deleted file mode 100644
index 0f223f6..0000000
--- a/abs/core/python2/python-2.6-gdbm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur Python-2.6-old/setup.py Python-2.6/setup.py
---- Python-2.6-old/setup.py	2008-09-30 10:15:45.000000000 +1000
-+++ Python-2.6/setup.py	2008-12-07 16:04:01.000000000 +1000
-@@ -1013,7 +1013,7 @@
-                 if self.compiler.find_library_file(lib_dirs, 'ndbm'):
-                     ndbm_libs = ['ndbm']
-                 else:
--                    ndbm_libs = []
-+                    ndbm_libs = ['gdbm', 'gdbm_compat']
-                 exts.append( Extension('dbm', ['dbmmodule.c'],
-                                        define_macros=[('HAVE_NDBM_H',None)],
-                                        libraries = ndbm_libs ) )
diff --git a/abs/core/python2/python-2.7-db51.diff b/abs/core/python2/python-2.7-db51.diff
deleted file mode 100644
index 2da95c3..0000000
--- a/abs/core/python2/python-2.7-db51.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur Python-2.7-orig//Modules/_bsddb.c Python-2.7/Modules/_bsddb.c
---- Python-2.7-orig//Modules/_bsddb.c	2010-05-10 00:46:46.000000000 +1000
-+++ Python-2.7/Modules/_bsddb.c	2010-10-20 13:19:26.436669911 +1000
-@@ -9765,8 +9765,11 @@
- 
-     ADD_INT(d, DB_REP_PERMANENT);
- 
--#if (DBVER >= 44)
-+#if (DBVER >= 44) && (DBVER <= 48)
-     ADD_INT(d, DB_REP_CONF_NOAUTOINIT);
-+#endif
-+    
-+#if (DBVER >= 44)
-     ADD_INT(d, DB_REP_CONF_DELAYCLIENT);
-     ADD_INT(d, DB_REP_CONF_BULK);
-     ADD_INT(d, DB_REP_CONF_NOWAIT);
-diff -Naur Python-2.7-orig//setup.py Python-2.7/setup.py
---- Python-2.7-orig//setup.py	2010-06-27 22:36:16.000000000 +1000
-+++ Python-2.7/setup.py	2010-10-20 13:10:48.256670026 +1000
-@@ -765,7 +765,7 @@
-         # a release.  Most open source OSes come with one or more
-         # versions of BerkeleyDB already installed.
- 
--        max_db_ver = (4, 8)
-+        max_db_ver = (5, 1)
-         min_db_ver = (4, 1)
-         db_setup_debug = False   # verbose debug prints from this script?
- 
-@@ -787,8 +787,12 @@
-             return True
- 
-         def gen_db_minor_ver_nums(major):
--            if major == 4:
-+            if major == 5:
-                 for x in range(max_db_ver[1]+1):
-+                    if allow_db_ver((5, x)):
-+                        yield x
-+            if major == 4:
-+                for x in range(9):
-                     if allow_db_ver((4, x)):
-                         yield x
-             elif major == 3:
diff --git a/abs/core/python_modules/bluez-python/PKGBUILD b/abs/core/python_modules/bluez-python/PKGBUILD
new file mode 100644
index 0000000..4314206
--- /dev/null
+++ b/abs/core/python_modules/bluez-python/PKGBUILD
@@ -0,0 +1,20 @@
+# Contributor: Li Dongyang<Jerry87905@gmail.com>
+
+pkgname=bluez-python
+pkgver=0.1.4
+pkgrel=3
+pkgdesc="A BlueZ python binding on top of dbus-python"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/bluez-python"
+license=('LGPL')
+depends=('bluez>=4.30' 'dbus-python')
+source=(http://bluez-python.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
+md5sums=('013f283d3c32765e67c89ebf7f5470ea')
+
+build() {
+  /bin/true
+}
+package() {
+  cd ${srcdir}/${pkgname}
+  python2 setup.py install --root=${pkgdir}
+}
diff --git a/abs/core/python_modules/cddb-py/PKGBUILD b/abs/core/python_modules/cddb-py/PKGBUILD
new file mode 100755
index 0000000..3facc20
--- /dev/null
+++ b/abs/core/python_modules/cddb-py/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 26144 2010-09-13 19:36:37Z schuay $
+# Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: Hugo Ideler <hugoideler@dse.nl>
+# Contributor: David Keogh <davekeogh@shaw.ca>
+# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=cddb-py
+pkgver=1.4
+pkgrel=6
+pkgdesc="CDDB-Server access from Python"
+arch=('i686' 'x86_64')
+url="http://cddb-py.sourceforge.net"
+license=('GPL')
+depends=('python2')
+source=("http://downloads.sourceforge.net/sourceforge/cddb-py/CDDB-${pkgver}.tar.gz")
+md5sums=('254698082bafe3030d07d88fb7e13fe2')
+
+package() {
+    cd ${srcdir}/CDDB-${pkgver}
+
+    for file in CDDB.py DiscID.py; do
+        sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
+    done
+
+    python2 setup.py install --root=${pkgdir} --optimize=1
+}
diff --git a/abs/core/dbus-python/PKGBUILD b/abs/core/python_modules/dbus-python/PKGBUILD
index 6b328fd..91b80d3 100644
--- a/abs/core/dbus-python/PKGBUILD
+++ b/abs/core/python_modules/dbus-python/PKGBUILD
@@ -3,12 +3,12 @@
 
 pkgname=dbus-python
 pkgver=0.83.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Python bindings for DBUS"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
 url="http://www.freedesktop.org/wiki/Software/DBusBindings"
-depends=('dbus-glib>=0.82' 'python2>=2.7')
+depends=('dbus-glib>=0.82' 'python2>=2.6.6')
 makedepends=('pkg-config' 'docutils')
 options=('!libtool')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
diff --git a/abs/core/python_modules/gnome-python-extras/PKGBUILD b/abs/core/python_modules/gnome-python-extras/PKGBUILD
new file mode 100644
index 0000000..690ec2e
--- /dev/null
+++ b/abs/core/python_modules/gnome-python-extras/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 35285 2009-04-11 20:46:50Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-python-extras
+pkgver=2.25.3
+pkgrel=2
+pkgdesc="Gnome Python interfaces for libraries not part of the core platform"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL')
+depends=('gnome-python>=2.22.1')
+makedepends=('libgtkhtml' 'gtkspell' 'gdl' 'xulrunner>=1.9' 'libgksu' 'pkgconfig' 'libgnomeui' 'libgda')
+optdepends=('libgtkhtml' 'gtkspell' 'gdl' 'xulrunner' 'libgksu' 'libgnomeui' 'libgda')
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python-extras/2.25/gnome-python-extras-${pkgver}.tar.bz2)
+url="http://www.daa.com.au/~james/pygtk/"
+md5sums=('9f3b7ec5c57130b96061cb486b79c076')
+
+build() {
+  cd "${srcdir}/gnome-python-extras-${pkgver}"
+  ./configure --prefix=/usr || return 1
+  make MOZILLA_HOME=/usr/lib/xulrunner-1.9 || return 1
+}
+package() {
+  cd "${srcdir}/gnome-python-extras-${pkgver}"
+  make DESTDIR="${pkgdir}" install || return 1
+}
diff --git a/abs/core/python_modules/gnome-python-extras/gnome-python-extras-2.19.1-pkg-config.patch b/abs/core/python_modules/gnome-python-extras/gnome-python-extras-2.19.1-pkg-config.patch
new file mode 100644
index 0000000..77fd0a4
--- /dev/null
+++ b/abs/core/python_modules/gnome-python-extras/gnome-python-extras-2.19.1-pkg-config.patch
@@ -0,0 +1,61 @@
+diff -up gnome-python-extras-2.19.1/configure.pkg-config gnome-python-extras-2.19.1/configure
+--- gnome-python-extras-2.19.1/configure.pkg-config	2008-01-12 21:07:56.000000000 -0500
++++ gnome-python-extras-2.19.1/configure	2008-01-12 21:09:49.000000000 -0500
+@@ -22096,14 +22096,14 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$mozpackage-gtkmozembed >= \$mozpackage_required_version,
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\mozilla-gtkmozembed >= \$mozpackage_required_version,
+                                 gtk+-2.0                >= 2.4.0\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "$mozpackage-gtkmozembed >= $mozpackage_required_version,
++  ($PKG_CONFIG --exists --print-errors "mozilla-gtkmozembed >= $mozpackage_required_version,
+                                 gtk+-2.0                >= 2.4.0") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "$mozpackage-gtkmozembed >= $mozpackage_required_version,
++  pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "mozilla-gtkmozembed >= $mozpackage_required_version,
+                                 gtk+-2.0                >= 2.4.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -22117,14 +22117,14 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$mozpackage-gtkmozembed >= \$mozpackage_required_version,
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\mozilla-gtkmozembed >= \$mozpackage_required_version,
+                                 gtk+-2.0                >= 2.4.0\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "$mozpackage-gtkmozembed >= $mozpackage_required_version,
++  ($PKG_CONFIG --exists --print-errors "mozilla-gtkmozembed >= $mozpackage_required_version,
+                                 gtk+-2.0                >= 2.4.0") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "$mozpackage-gtkmozembed >= $mozpackage_required_version,
++  pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "mozilla-gtkmozembed >= $mozpackage_required_version,
+                                 gtk+-2.0                >= 2.4.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -22144,10 +22144,10 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$mozpackage-gtkmozembed >= $mozpackage_required_version,
++	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-gtkmozembed >= $mozpackage_required_version,
+                                 gtk+-2.0                >= 2.4.0"`
+         else
+-	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$mozpackage-gtkmozembed >= $mozpackage_required_version,
++	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-gtkmozembed >= $mozpackage_required_version,
+                                 gtk+-2.0                >= 2.4.0"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+@@ -22179,7 +22179,7 @@ fi
+ if test -n "$export_dynamic"; then
+   GTKMOZEMBED_LIBS=`echo $GTKMOZEMBED_LIBS | sed -e "s/$export_dynamic//"`
+ fi
+-MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
++MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
+ 
+ 
+ 
diff --git a/abs/core/python_modules/gnome-python-extras/gnome-python-extras-2.19.1-xulrunner.patch b/abs/core/python_modules/gnome-python-extras/gnome-python-extras-2.19.1-xulrunner.patch
new file mode 100644
index 0000000..d2fa26e
--- /dev/null
+++ b/abs/core/python_modules/gnome-python-extras/gnome-python-extras-2.19.1-xulrunner.patch
@@ -0,0 +1,22 @@
+diff -up gnome-python-extras-2.19.1/docs/gtkmozembed/html/class-gtkmozembed.html.old gnome-python-extras-2.19.1/docs/gtkmozembed/html/class-gtkmozembed.html
+diff -up gnome-python-extras-2.19.1/docs/gtkmozembed/html/pygtkmozembed.devhelp.old gnome-python-extras-2.19.1/docs/gtkmozembed/html/pygtkmozembed.devhelp
+diff -up gnome-python-extras-2.19.1/docs/gtkmozembed/gtkmozembed-gtkmozembed.xml.old gnome-python-extras-2.19.1/docs/gtkmozembed/gtkmozembed-gtkmozembed.xml
+diff -up gnome-python-extras-2.19.1/gtkmozembed/gtkmozembed.override.old gnome-python-extras-2.19.1/gtkmozembed/gtkmozembed.override
+diff -up gnome-python-extras-2.19.1/gtkmozembed/gtkmozembed.defs.old gnome-python-extras-2.19.1/gtkmozembed/gtkmozembed.defs
+--- gnome-python-extras-2.19.1/gtkmozembed/gtkmozembed.defs.old	2007-06-05 16:52:30.000000000 +0200
++++ gnome-python-extras-2.19.1/gtkmozembed/gtkmozembed.defs	2007-11-27 12:54:42.000000000 +0100
+@@ -123,6 +123,14 @@
+   )
+ )
+ 
++(define-function set_path
++  (c-name "gtk_moz_embed_set_path")
++  (return-type "none")
++  (parameters
++    '("char*" "aPath")
++  )
++)
++
+ (define-function gtk_moz_embed_set_profile_path
+   (c-name "gtk_moz_embed_set_profile_path_deprecated")
+   (return-type "none")
diff --git a/abs/core/python_modules/gnome-python/PKGBUILD b/abs/core/python_modules/gnome-python/PKGBUILD
new file mode 100644
index 0000000..0c4a0b6
--- /dev/null
+++ b/abs/core/python_modules/gnome-python/PKGBUILD
@@ -0,0 +1,70 @@
+# $Id: PKGBUILD 99639 2010-11-15 22:50:30Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Sarah Hay <sarah@archlinux.org>
+
+pkgbase=gnome-python
+pkgname=('python2-bonobo' 'python2-gconf' 'python2-libgnome' 'python2-gnomecanvas' 'python2-gnomevfs' 'gnome-python')
+pkgver=2.28.1
+pkgrel=5
+arch=('i686' 'x86_64')
+license=('LGPL')
+makedepends=('pygtk' 'pyorbit' 'libgnomeui')
+options=('!libtool')
+url="http://www.pygtk.org/"
+source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python/2.28/gnome-python-${pkgver}.tar.bz2)
+sha256sums=('759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8')
+
+build() {
+    cd "${srcdir}/gnome-python-${pkgver}"
+    ./configure --prefix=/usr
+    make
+}
+
+package_python2-bonobo(){
+    pkgdesc="Python bindings for interacting with Bonobo"
+    depends=('pygtk' 'libbonoboui' 'pyorbit')
+
+    cd "${srcdir}/gnome-python-${pkgver}"
+    make -C bonobo install DESTDIR="${pkgdir}"
+}
+
+package_python2-gconf(){
+    pkgdesc="Python bindings for interacting with GConf"
+    depends=('pygtk' 'gconf')
+
+    cd "${srcdir}/gnome-python-${pkgver}"
+    make -C gconf install DESTDIR="${pkgdir}"
+}
+
+package_python2-libgnome() {
+    pkgdesc="Python bindings for libgnome"
+    depends=('pygtk' 'libgnomeui')
+
+    cd "${srcdir}/gnome-python-${pkgver}"
+    make -C gnome install DESTDIR="${pkgdir}"
+}
+
+package_python2-gnomecanvas() {
+    pkgdesc="Python bindings for the GNOME Canvas"
+    depends=('pygtk' 'libgnomecanvas')
+
+    cd "${srcdir}/gnome-python-${pkgver}"
+    make -C gnomecanvas install DESTDIR="${pkgdir}"
+}
+
+package_python2-gnomevfs() {
+    pkgdesc="Python bindings for interacting with gnome-vfs"
+    depends=('python2' 'libbonobo' 'gnome-vfs')
+
+    cd "${srcdir}/gnome-python-${pkgver}"
+    make -C gnomevfs install DESTDIR="${pkgdir}"
+}
+
+package_gnome-python() {
+    pkgdesc="PyGNOME Python extension module"
+    depends=('python2-bonobo' 'python2-gconf' 'python2-libgnome' 'python2-gnomecanvas' 'python2-gnomevfs')
+
+    cd "${srcdir}/gnome-python-${pkgver}"
+    make install-pkgconfigDATA DESTDIR="${pkgdir}"
+}
+
diff --git a/abs/core/python_modules/imdbpy/PKGBUILD b/abs/core/python_modules/imdbpy/PKGBUILD
new file mode 100644
index 0000000..22efa94
--- /dev/null
+++ b/abs/core/python_modules/imdbpy/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 27018 2010-09-16 17:37:18Z schuay $
+# Maintainer: Ray Rashif <schivmeister@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
+# Contributor: lang2 <wenzhi.liang@gmail.com>
+
+pkgname=imdbpy
+_realname=IMDbPY
+pkgver=4.6
+pkgrel=3
+pkgdesc="Python bindings for imdb"
+url="http://imdbpy.sourceforge.net/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('python2')
+makedepends=('setuptools')
+optdepends=('python-lxml' 'python-sqlalchemy' 'python-sqlobject')
+source=(http://downloads.sourceforge.net/$pkgname/$_realname-$pkgver.tar.gz)
+
+build(){
+  cd "$srcdir/$_realname-$pkgver"
+
+  # python2 fix
+  for file in $(find . -name '*.py' -print); do
+    sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file
+    sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
+  done
+
+  python2 setup.py install --root="$pkgdir"
+
+  # fix directories path
+  mv "$pkgdir/usr/etc" "$pkgdir"
+  install -d "$pkgdir/usr/share"
+  mv "$pkgdir/usr/imdb" "$pkgdir/usr/share"
+  mv "$pkgdir/usr/doc" "$pkgdir/usr/share/imdb/"
+}
+md5sums=('876d4cd041fa23633e3637c22bf95622')
diff --git a/abs/core/mysql-python/PKGBUILD b/abs/core/python_modules/mysql-python/PKGBUILD
index 20c680c..590c2db 100644
--- a/abs/core/mysql-python/PKGBUILD
+++ b/abs/core/python_modules/mysql-python/PKGBUILD
@@ -3,13 +3,13 @@
 
 pkgname=mysql-python
 pkgver=1.2.3c1
-pkgrel=3
+pkgrel=4
 pkgdesc="MySQL support for Python"
 arch=("i686" "x86_64")
 url="http://sourceforge.net/projects/mysql-python"
 license=('GPL2')
 depends=('python2' 'libmysqlclient>=5.1.41-2')
-makedepends=('mysql>=5.1.41-2' 'python2-distribute')
+makedepends=('mysql>=5.1.41-2' 'setuptools')
 source=("http://downloads.sourceforge.net/${pkgname}/MySQL-python-${pkgver}.tar.gz")
 md5sums=('310dd856e439d070b59ece6dd7a0734d')
 
diff --git a/abs/core/pycairo/PKGBUILD b/abs/core/python_modules/pycairo/PKGBUILD
index 08d2db2..9adfcb5 100644
--- a/abs/core/pycairo/PKGBUILD
+++ b/abs/core/python_modules/pycairo/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=pycairo
 pkgver=1.8.10
-pkgrel=3
+pkgrel=4
 pkgdesc="Python bindings for the cairo graphics library"
 arch=('i686' 'x86_64')
 license=('LGPL' 'MPL')
diff --git a/abs/core/python_modules/pycrypto/PKGBUILD b/abs/core/python_modules/pycrypto/PKGBUILD
new file mode 100644
index 0000000..5ba87ac
--- /dev/null
+++ b/abs/core/python_modules/pycrypto/PKGBUILD
@@ -0,0 +1,23 @@
+# $Id: PKGBUILD 96778 2010-10-24 17:01:27Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Kritoke <kritoke@gamebox.net>
+
+pkgname=pycrypto
+pkgver=2.3
+pkgrel=2
+pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python."
+arch=('i686' 'x86_64')
+depends=('python2')
+url="http://www.dlitz.net/software/pycrypto/"
+license=(custom)
+source=(http://ftp.dlitz.net/pub/dlitz/crypto/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('4f11e85fbcf13960373650fc2dae8f088f9b001f07fb6d3efb2fcb5334987182')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  python2 setup.py build
+  python2 setup.py install --root="${pkgdir}" --optimize=1
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/"
+  cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/abs/core/pygobject/PKGBUILD b/abs/core/python_modules/pygobject/PKGBUILD
index 1bef435..09e4e6d 100644
--- a/abs/core/pygobject/PKGBUILD
+++ b/abs/core/python_modules/pygobject/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=pygobject
 pkgver=2.26.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Python bindings for GObject"
 arch=('i686' 'x86_64')
 license=('LGPL')
diff --git a/abs/core/pygtk/PKGBUILD b/abs/core/python_modules/pygtk/PKGBUILD
index b1e4c04..73e9fd5 100644
--- a/abs/core/pygtk/PKGBUILD
+++ b/abs/core/python_modules/pygtk/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=pygtk
 pkgver=2.22.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Python bindings for the GTK widget set"
 arch=('i686' 'x86_64')
 license=('LGPL')
diff --git a/abs/core/pygtk/python27.patch b/abs/core/python_modules/pygtk/python27.patch
index 9bbe2b5..9bbe2b5 100644
--- a/abs/core/pygtk/python27.patch
+++ b/abs/core/python_modules/pygtk/python27.patch
diff --git a/abs/core/python_modules/pyopenssl/PKGBUILD b/abs/core/python_modules/pyopenssl/PKGBUILD
new file mode 100644
index 0000000..a136830
--- /dev/null
+++ b/abs/core/python_modules/pyopenssl/PKGBUILD
@@ -0,0 +1,21 @@
+# $Id: PKGBUILD 87790 2010-08-18 10:10:07Z ibiru $
+# Maintainer : Ionut Biru<ibiru@archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=pyopenssl
+pkgver=0.10
+pkgrel=4
+pkgdesc="pyOpenSSL is a Python interface to the OpenSSL library"
+arch=('i686' 'x86_64')
+url="http://pyopenssl.sourceforge.net"
+license=('LGPL')
+depends=('python2' 'openssl')
+source=(http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${pkgver}.tar.gz)
+md5sums=('34db8056ec53ce80c7f5fc58bee9f093')
+
+build() {
+    cd "${srcdir}/pyOpenSSL-${pkgver}"
+    python2 setup.py build
+    python2 setup.py install --prefix="$pkgdir/usr" --optimize=1
+}
+
diff --git a/abs/core/python_modules/pyorbit/PKGBUILD b/abs/core/python_modules/pyorbit/PKGBUILD
new file mode 100644
index 0000000..4c94fb8
--- /dev/null
+++ b/abs/core/python_modules/pyorbit/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 89716 2010-09-03 12:01:46Z remy $
+# Mantainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=pyorbit
+pkgver=2.24.0
+pkgrel=5
+pkgdesc="Python bindings for ORBit2"
+arch=('i686' 'x86_64')
+license=('LGPL')
+url="http://www.pygtk.org"
+depends=('python2' 'orbit2>=2.14.16')
+makedepends=('pkgconfig')
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/GNOME/sources/pyorbit/2.24/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('574593815e75ee6e98062c75d6d1581f')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr || return 1
+  make || return 1
+}
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/abs/core/python_modules/pyqt/ChangeLog b/abs/core/python_modules/pyqt/ChangeLog
new file mode 100644
index 0000000..e20b55a
--- /dev/null
+++ b/abs/core/python_modules/pyqt/ChangeLog
@@ -0,0 +1,21 @@
+
+2009-04-11  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Fixing the rpath issue, thanks Gerardo
+
+2008-11-22  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updated for i686: 4.4.4
+
+2008-10-22  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Rebuilt for python 2.6
+
+2008-08-09  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updated for i686: 4.4.3
+
+2008-07-06  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updated for i686: 4.4.2
+
diff --git a/abs/core/python_modules/pyqt/PKGBUILD b/abs/core/python_modules/pyqt/PKGBUILD
new file mode 100644
index 0000000..b4083cd
--- /dev/null
+++ b/abs/core/python_modules/pyqt/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 97705 2010-11-01 13:35:29Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
+
+pkgname=pyqt
+pkgver=4.8.1
+pkgrel=2
+pkgdesc="A set of Python bindings for the Qt toolkit"
+arch=('i686' 'x86_64')
+url="http://riverbankcomputing.co.uk/software/pyqt/intro"
+license=('GPL')
+depends=('sip' 'qt' 'dbus-python')
+makedepends=('phonon' 'python-opengl' 'qt-assistant-compat')
+optdepends=('phonon: enable audio and video in PyQt applications'
+        'python-opengl: enable OpenGL 3D graphics in PyQt applications'
+        'qscintilla: QScintilla API'
+        'qt-assistant-compat: add PyQt online help in Qt Assistant')
+provides=('pyqt4')
+replaces=('pyqt4')
+conflicts=('pyqt4')
+source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
+md5sums=('1cac8f5d715c414f9cb2751b0e84cc07')
+
+build() {
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+
+  python2 configure.py \
+    --confirm-license \
+    -v /usr/share/sip \
+    --qsci-api
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+}
+
+package(){
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+}
diff --git a/abs/core/python_modules/pyrex/PKGBUILD b/abs/core/python_modules/pyrex/PKGBUILD
new file mode 100644
index 0000000..11a7344
--- /dev/null
+++ b/abs/core/python_modules/pyrex/PKGBUILD
@@ -0,0 +1,22 @@
+# $Id: PKGBUILD 89621 2010-09-02 16:28:29Z remy $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# Contributor: Arjan timmerman <arjan@soulfly.nl>
+# Contributor: Link Dupont <link@subpop.net>
+
+pkgname=pyrex
+pkgver=0.9.9
+pkgrel=3
+pkgdesc="Language for writing Python extension modules"
+arch=(any)
+url="http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/"
+license=('APACHE')
+depends=('python2')
+source=(http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-${pkgver}.tar.gz)
+md5sums=('515dee67d15d4393841e2d60e8341947')
+
+build() {
+  cd "${srcdir}/Pyrex-${pkgver}"
+  python2 setup.py install --root="${pkgdir}" --prefix=/usr || return 1
+}
+
diff --git a/abs/core/python_modules/python-beaker/PKGBUILD b/abs/core/python_modules/python-beaker/PKGBUILD
new file mode 100644
index 0000000..8780497
--- /dev/null
+++ b/abs/core/python_modules/python-beaker/PKGBUILD
@@ -0,0 +1,21 @@
+# $Id: PKGBUILD 87715 2010-08-18 03:37:40Z allan $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Massimiliano Torromeo < massimiliano DOT torromeo AT gmail DOT com >
+pkgname=python-beaker
+pkgver=1.5.4
+pkgrel=3
+arch=('any')
+license=('custom')
+pkgdesc="Caching and sessions WSGI middleware for use with web applications and stand-alone Python scripts and applications"
+url="http://beaker.groovie.org/"
+depends=('python2')
+makedepends=('setuptools')
+source=("http://cheeseshop.python.org/packages/source/B/Beaker/Beaker-$pkgver.tar.gz")
+md5sums=('de84e7511119dc0b8eb4ac177d3e2512')
+
+build() {
+    cd ${srcdir}/Beaker-${pkgver}
+    sed -i "s#/usr/bin/python#/usr/bin/python2#" beaker/crypto/pbkdf2.py
+    python2 setup.py install --root=${pkgdir} --optimize=1
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/abs/core/python_modules/python-chardet/PKGBUILD b/abs/core/python_modules/python-chardet/PKGBUILD
new file mode 100644
index 0000000..d3e67d0
--- /dev/null
+++ b/abs/core/python_modules/python-chardet/PKGBUILD
@@ -0,0 +1,20 @@
+# $Id: PKGBUILD 87872 2010-08-18 15:26:20Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: William Rea <sillywilly@gmail.com>
+pkgname=python-chardet
+_pkgnamebase=python2-chardet
+pkgver=2.0.1
+pkgrel=3
+pkgdesc="Python module for character encoding auto-detection"
+arch=('any')
+url="http://chardet.feedparser.org"
+license=('LGPL')
+depends=('python2')
+source=(http://chardet.feedparser.org/download/${_pkgnamebase}-${pkgver}.tgz)
+sha256sums=('56fa0c37189b0a5f082d064dec59d69a044aaa3eeb7acb9b3081e2ba306deaa4')
+
+build() {
+  cd "${srcdir}/${_pkgnamebase}-${pkgver}"
+  python2 setup.py install --root="${pkgdir}" --optimize=1
+}
+
diff --git a/abs/core/python-decorator/LICENSE.txt b/abs/core/python_modules/python-decorator/LICENSE.txt
index a6a4929..a6a4929 100644
--- a/abs/core/python-decorator/LICENSE.txt
+++ b/abs/core/python_modules/python-decorator/LICENSE.txt
diff --git a/abs/core/python-decorator/PKGBUILD b/abs/core/python_modules/python-decorator/PKGBUILD
index e933da0..5e2e8f5 100644
--- a/abs/core/python-decorator/PKGBUILD
+++ b/abs/core/python_modules/python-decorator/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=python-decorator
 pkgver=3.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Python Decorator module'
 arch=('any')
 url='http://pypi.python.org/pypi/decorator'
diff --git a/abs/core/python_modules/python-geoip/PKGBUILD b/abs/core/python_modules/python-geoip/PKGBUILD
new file mode 100644
index 0000000..7d69154
--- /dev/null
+++ b/abs/core/python_modules/python-geoip/PKGBUILD
@@ -0,0 +1,21 @@
+# $Id: PKGBUILD 89623 2010-09-02 16:32:29Z remy $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=python-geoip
+pkgver=1.2.4
+pkgrel=3
+pkgdesc="Python bindings for the GeoIP IP-to-country resolver library."
+arch=(i686 x86_64)
+url="http://www.maxmind.com/app/python"
+license=('LGPL')
+depends=('python2' 'geoip')
+source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-${pkgver}.tar.gz)
+replaces=('geoip-python')
+provides=('geoip-python')
+
+build() {
+  cd ${startdir}/src/GeoIP-Python-${pkgver}
+  python2 setup.py build install --root=${startdir}/pkg
+}
+md5sums=('50f820d854476efaf3b7af733ffe4236')
+
diff --git a/abs/core/python_modules/python-imaging/PKGBUILD b/abs/core/python_modules/python-imaging/PKGBUILD
new file mode 100644
index 0000000..f0b5f3a
--- /dev/null
+++ b/abs/core/python_modules/python-imaging/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 87626 2010-08-17 13:21:07Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: simo <simo@archlinux.org>
+
+pkgname=python-imaging
+pkgver=1.1.7
+pkgrel=5
+pkgdesc="PIL. Provides image processing capabilities for python"
+arch=('i686' 'x86_64')
+url="http://www.pythonware.com/products/pil/index.htm"
+license=('custom:"pil"')
+depends=('python2' 'libjpeg' 'freetype2') 
+makedepends=('tk')
+optdepends=('tk')
+provides=("pil=$pkgver")
+conflicts=('pil')
+replaces=('pil')
+source=(http://effbot.org/downloads/Imaging-$pkgver.tar.gz)
+md5sums=('fc14a54e1ce02a0225be8854bfba478e')
+
+build() {
+  cd $srcdir/Imaging-$pkgver
+  sed -i "s#JPEG_ROOT\ =\ None#JPEG_ROOT\ =\ \"/opt/libjpeg6/lib\",\ \"/opt/libjpeg6/include\"#" setup.py
+  python2 setup.py build_ext
+}
+
+package() {
+  cd $srcdir/Imaging-$pkgver
+  python2 setup.py install --root=$pkgdir
+  install -dm755 $pkgdir/usr/include/python2.7/
+  install -m644 -t $pkgdir/usr/include/python2.7/ libImaging/*.h 
+
+  # do not have files ending in .py in /usr/bin
+  for f in pildriver pilprint pilconvert pilfile pilfont; do
+    mv $pkgdir/usr/bin/$f{.py,}
+  done
+
+  # Install license
+  install -Dm644 $srcdir/Imaging-$pkgver/README \
+                 $pkgdir/usr/share/licenses/$pkgname/README
+}
+
diff --git a/abs/core/python_modules/python-imaging/__changelog b/abs/core/python_modules/python-imaging/__changelog
new file mode 100644
index 0000000..91214ed
--- /dev/null
+++ b/abs/core/python_modules/python-imaging/__changelog
@@ -0,0 +1,2 @@
+__change so that it builds against libjpeg6 and not libjpeg7
+  sed -i "s#JPEG_ROOT\ =\ None#JPEG_ROOT\ =\ \"/opt/libjpeg6\"#" setup.py
diff --git a/abs/core/python-iplib/PKGBUILD b/abs/core/python_modules/python-iplib/PKGBUILD
index b41278b..39d0b55 100755
--- a/abs/core/python-iplib/PKGBUILD
+++ b/abs/core/python_modules/python-iplib/PKGBUILD
@@ -1,7 +1,7 @@
 pkgname=python-iplib
 _libname=iplib
 pkgver=1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="IPlib is a Python module useful to convert amongst many different notations and to manage couples of address/netmask in the CIDR notation."
 url="http://www.pymedia.org"
 arch=('i686')
diff --git a/abs/core/python_modules/python-lxml/PKGBUILD b/abs/core/python_modules/python-lxml/PKGBUILD
new file mode 100644
index 0000000..606ec54
--- /dev/null
+++ b/abs/core/python_modules/python-lxml/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: William Rea <sillywilly@gmail.com>
+# Contributor: Guillem Rieu <guillemr@gmx.net>
+
+pkgname=python-lxml
+pkgver=2.2.6
+pkgrel=4
+pkgdesc="Python binding for the libxml2 and libxslt libraries"
+arch=('i686' 'x86_64')
+license=('BSD' 'GPL' 'custom')
+url="http://codespeak.net/lxml"
+depends=('python2' 'libxslt')
+optdepends=("beautiful-soup: support for parsing not well formed HTML")
+conflicts=('lxml')
+replaces=('lxml')
+source=(http://codespeak.net/lxml/lxml-$pkgver.tgz)
+md5sums=('b1f700fb22d7ee9b977ee3eceb65b20c')
+
+build() {
+  /bin/true
+}
+
+package() {
+  cd ${srcdir}/lxml-$pkgver
+
+  python2 setup.py install --root=${pkgdir} || return 1
+
+  install -D -m644 LICENSES.txt ${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1
+  install -D -m644 doc/licenses/BSD.txt ${pkgdir}/usr/share/licenses/$pkgname/BSD.txt || return 1
+  install -D -m644 doc/licenses/elementtree.txt ${pkgdir}/usr/share/licenses/$pkgname/elementtree.txt || return 1
+}
diff --git a/abs/core/python_modules/python-m2crypto/PKGBUILD b/abs/core/python_modules/python-m2crypto/PKGBUILD
new file mode 100644
index 0000000..8d74cbe
--- /dev/null
+++ b/abs/core/python_modules/python-m2crypto/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 87898 2010-08-18 16:12:44Z ibiru $
+# Maintainer:
+# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+pkgname=python-m2crypto
+pkgver=0.20.2
+pkgrel=4
+pkgdesc="A crypto and SSL toolkit for Python"
+arch=('i686' 'x86_64')
+url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto"
+license=('BSD')
+depends=('python2' 'openssl')
+makedepends=('swig')
+source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz"
+	'openssl1.patch')
+md5sums=('6c24410410d6eb1920ea43f77a93613a'
+         '80a707ad6610f2871efdf40658e30364')
+
+build() {
+  cd "${srcdir}/M2Crypto-${pkgver}"
+  patch -Np0 -i ${srcdir}/openssl1.patch
+  python2 setup.py build
+}
+
+package() {
+  cd "${srcdir}/M2Crypto-${pkgver}"
+  python2 setup.py install --root="${pkgdir}/" --optimize=1
+
+  install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/abs/core/python_modules/python-m2crypto/openssl1.patch b/abs/core/python_modules/python-m2crypto/openssl1.patch
new file mode 100644
index 0000000..59dba55
--- /dev/null
+++ b/abs/core/python_modules/python-m2crypto/openssl1.patch
@@ -0,0 +1,531 @@
+Index: tests/test_ssl.py
+===================================================================
+--- tests/test_ssl.py	(revision 698)
++++ tests/test_ssl.py	(working copy)
+@@ -405,8 +405,11 @@
+         try:
+             ctx = SSL.Context('sslv23', weak_crypto=1)
+             s = SSL.Connection(ctx)
+-            s.connect(self.srv_addr)
+-            self.failUnlessEqual(s.get_version(), 'SSLv2')
++            if m2.OPENSSL_VERSION_NUMBER < 0x10000000: # SSLv2 ciphers disabled by default in newer OpenSSL
++                s.connect(self.srv_addr)
++                self.failUnlessEqual(s.get_version(), 'SSLv2')
++            else:
++                self.assertRaises(SSL.SSLError, s.connect, self.srv_addr)
+             s.close()
+         finally:
+             self.stop_server(pid)
+Index: tests/test_x509.py
+===================================================================
+--- tests/test_x509.py	(revision 698)
++++ tests/test_x509.py	(working copy)
+@@ -142,7 +142,7 @@
+         cn.set_data("Hello There!")
+         assert cn.get_data().as_text() == "Hello There!", cn.get_data().as_text()
+ 
+-        assert n.as_hash() == 1697185131
++        self.assertEquals(n.as_hash(), 1697185131)
+         
+         self.assertRaises(IndexError, lambda: n[100])
+         self.assert_(n[10])
+Index: tests/test_smime.py
+===================================================================
+--- tests/test_smime.py	(revision 698)
++++ tests/test_smime.py	(working copy)
+@@ -6,7 +6,7 @@
+ """
+ 
+ import unittest
+-from M2Crypto import SMIME, BIO, Rand, X509, EVP
++from M2Crypto import SMIME, BIO, Rand, X509, EVP, Err
+ 
+ class SMIMETestCase(unittest.TestCase):
+     cleartext = 'some text to manipulate'
+@@ -213,7 +213,7 @@
+ 
+         self.filenameSmime = 'tests/sig.p7s'
+         f = BIO.openfile(self.filenameSmime, 'wb')
+-        assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1
++        assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1, Err.get_error()
+         f.close()
+         
+     def test_write_pkcs7_der(self):
+Index: SWIG/_evp.i
+===================================================================
+--- SWIG/_evp.i	(revision 695)
++++ SWIG/_evp.i	(working copy)
+@@ -180,7 +180,7 @@
+ 
+     PKCS5_PBKDF2_HMAC_SHA1(passbuf, passlen, saltbuf, saltlen, iter,
+                            keylen, key);
+-    ret = PyString_FromStringAndSize(key, keylen);
++    ret = PyString_FromStringAndSize((char*)key, keylen);
+     OPENSSL_cleanse(key, keylen);
+     return ret;
+ }
+@@ -339,7 +339,7 @@
+     klen = EVP_BytesToKey(cipher, md, (unsigned char *)sbuf, 
+         (unsigned char *)dbuf, dlen, iter, 
+         key, NULL); /* Since we are not returning IV no need to derive it */
+-    ret = PyString_FromStringAndSize(key, klen);
++    ret = PyString_FromStringAndSize((char*)key, klen);
+     return ret;
+ }
+ 
+@@ -435,7 +435,7 @@
+         PyErr_SetString(_evp_err, ERR_reason_error_string(ERR_get_error()));
+         return NULL;
+     }
+-    ret = PyString_FromStringAndSize(sigbuf, siglen);
++    ret = PyString_FromStringAndSize((char*)sigbuf, siglen);
+     OPENSSL_cleanse(sigbuf, siglen);
+     OPENSSL_free(sigbuf);
+     return ret;
+@@ -513,7 +513,7 @@
+         PyErr_SetString(PyExc_ValueError, "EVP_PKEY as DER failed");
+         return NULL; 
+     }
+-    der = PyString_FromStringAndSize(pp, len);
++    der = PyString_FromStringAndSize((char*)pp, len);
+     OPENSSL_free(pp);
+     return der;
+ }
+Index: SWIG/_ssl.i
+===================================================================
+--- SWIG/_ssl.i	(revision 695)
++++ SWIG/_ssl.i	(working copy)
+@@ -17,13 +17,17 @@
+ %apply Pointer NONNULL { SSL_CTX * };
+ %apply Pointer NONNULL { SSL * };
+ %apply Pointer NONNULL { SSL_CIPHER * };
+-%apply Pointer NONNULL { STACK * };
++%apply Pointer NONNULL { STACK_OF(SSL_CIPHER) * };
++%apply Pointer NONNULL { STACK_OF(X509) * };
+ %apply Pointer NONNULL { BIO * };
+ %apply Pointer NONNULL { DH * };
+ %apply Pointer NONNULL { RSA * };
+ %apply Pointer NONNULL { EVP_PKEY *};
+ %apply Pointer NONNULL { PyObject *pyfunc };
+ 
++%rename(ssl_get_ciphers) SSL_get_ciphers;
++extern STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *ssl);
++
+ %rename(ssl_get_version) SSL_get_version;
+ extern const char *SSL_get_version(CONST SSL *);
+ %rename(ssl_get_error) SSL_get_error;
+@@ -668,29 +672,25 @@
+     return SSL_CIPHER_get_bits(c, NULL);
+ }
+ 
+-STACK *ssl_get_ciphers(SSL *ssl) {
+-    return (STACK *)SSL_get_ciphers(ssl);
++int sk_ssl_cipher_num(STACK_OF(SSL_CIPHER) *stack) {
++    return sk_SSL_CIPHER_num(stack);
+ }
+ 
+-int sk_ssl_cipher_num(STACK *stack) {
+-    return sk_num(stack);
++SSL_CIPHER *sk_ssl_cipher_value(STACK_OF(SSL_CIPHER) *stack, int idx) {
++    return sk_SSL_CIPHER_value(stack, idx);
+ }
+ 
+-SSL_CIPHER *sk_ssl_cipher_value(STACK *stack, int idx) {
+-    return (SSL_CIPHER *)sk_value(stack, idx);
++STACK_OF(X509) *ssl_get_peer_cert_chain(SSL *ssl) {
++    return SSL_get_peer_cert_chain(ssl);
+ }
+ 
+-STACK *ssl_get_peer_cert_chain(SSL *ssl) {
+-    return (STACK *)SSL_get_peer_cert_chain(ssl);
++int sk_x509_num(STACK_OF(X509) *stack) {
++    return sk_X509_num(stack);
+ }
+ 
+-int sk_x509_num(STACK *stack) {
+-    return sk_num(stack);
++X509 *sk_x509_value(STACK_OF(X509) *stack, int idx) {
++    return sk_X509_value(stack, idx);
+ }
+-
+-X509 *sk_x509_value(STACK *stack, int idx) {
+-    return (X509 *)sk_value(stack, idx);
+-}
+ %}
+ 
+ %threadallow i2d_ssl_session;
+Index: SWIG/_x509.i
+===================================================================
+--- SWIG/_x509.i	(revision 695)
++++ SWIG/_x509.i	(working copy)
+@@ -148,8 +148,15 @@
+ extern int X509_NAME_print_ex(BIO *, X509_NAME *, int, unsigned long);
+ %rename(x509_name_print_ex_fp) X509_NAME_print_ex_fp;
+ extern int X509_NAME_print_ex_fp(FILE *, X509_NAME *, int, unsigned long);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++%rename(x509_name_hash) X509_NAME_hash_old;
++extern unsigned long X509_NAME_hash_old(X509_NAME *);
++#else
+ %rename(x509_name_hash) X509_NAME_hash;
+ extern unsigned long X509_NAME_hash(X509_NAME *);
++#endif
++
+ %rename(x509_name_get_index_by_nid) X509_NAME_get_index_by_NID;
+ extern int X509_NAME_get_index_by_NID(X509_NAME *, int, int);
+ 
+@@ -171,7 +178,7 @@
+     if (PyString_Check($input)) {
+         Py_ssize_t len;
+ 
+-        $1 = PyString_AsString($input); 
++        $1 = (unsigned char *)PyString_AsString($input); 
+         len = PyString_Size($input);
+         if (len > INT_MAX) {
+             PyErr_SetString(PyExc_ValueError, "object too large");
+@@ -184,7 +191,7 @@
+     }
+ }
+ %rename(x509_name_entry_set_data) X509_NAME_ENTRY_set_data;
+-extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, CONST unsigned char *, int);
++extern int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *, int, CONST unsigned char *, int);
+ %typemap(in) (CONST unsigned char *, int);
+ 
+ %rename(x509_req_new) X509_REQ_new;
+@@ -230,7 +237,7 @@
+ %rename(x509_store_ctx_free) X509_STORE_CTX_free;
+ extern void X509_STORE_CTX_free(X509_STORE_CTX *);
+ %rename(x509_store_ctx_get1_chain) X509_STORE_CTX_get1_chain;
+-extern STACK *X509_STORE_CTX_get1_chain(X509_STORE_CTX *);
++extern STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *);
+ 
+ %rename(x509_extension_get_critical) X509_EXTENSION_get_critical;
+ extern int X509_EXTENSION_get_critical(X509_EXTENSION *);
+@@ -348,7 +355,7 @@
+         PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
+     }
+     else {     
+-        ret = PyString_FromStringAndSize(buf, len);
++        ret = PyString_FromStringAndSize((char*)buf, len);
+         OPENSSL_free(buf);
+     }
+     return ret;
+@@ -435,12 +442,12 @@
+ }
+ 
+ int x509_name_set_by_nid(X509_NAME *name, int nid, PyObject *obj) {
+-    return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, PyString_AsString(obj), -1, -1, 0);
++    return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, (unsigned char *)PyString_AsString(obj), -1, -1, 0);
+ }
+ 
+ /* x509_name_add_entry_by_txt */
+ int x509_name_add_entry_by_txt(X509_NAME *name, char *field, int type, char *bytes, int len, int loc, int set) {
+-    return X509_NAME_add_entry_by_txt(name, field, type, bytes, len, loc, set);
++    return X509_NAME_add_entry_by_txt(name, field, type, (unsigned char *)bytes, len, loc, set);
+ }
+ 
+ PyObject *x509_name_get_der(X509_NAME *name)
+@@ -450,23 +457,23 @@
+ }
+ 
+ /* sk_X509_new_null() is a macro returning "STACK_OF(X509) *". */
+-STACK *sk_x509_new_null(void) {
+-    return (STACK *)sk_X509_new_null();
++STACK_OF(X509) *sk_x509_new_null(void) {
++    return sk_X509_new_null();
+ }
+ 
+ /* sk_X509_free() is a macro. */
+-void sk_x509_free(STACK *stack) {
+-    sk_X509_free((STACK_OF(X509) *)stack);
++void sk_x509_free(STACK_OF(X509) *stack) {
++    sk_X509_free(stack);
+ }
+ 
+ /* sk_X509_push() is a macro. */
+-int sk_x509_push(STACK *stack, X509 *x509) {
+-    return sk_X509_push((STACK_OF(X509) *)stack, x509);
++int sk_x509_push(STACK_OF(X509) *stack, X509 *x509) {
++    return sk_X509_push(stack, x509);
+ }
+ 
+ /* sk_X509_pop() is a macro. */
+-X509 *sk_x509_pop(STACK *stack) {
+-    return sk_X509_pop((STACK_OF(X509) *)stack);
++X509 *sk_x509_pop(STACK_OF(X509) *stack) {
++    return sk_X509_pop(stack);
+ }
+ 
+ int x509_store_load_locations(X509_STORE *store, const char *file) {
+@@ -493,21 +500,29 @@
+     return X509_REQ_set_version(x, version);
+ }
+ 
+-int x509_req_add_extensions(X509_REQ *req, STACK *exts) {
+-    return X509_REQ_add_extensions(req, (STACK_OF(X509_EXTENSION) *)exts);
++int x509_req_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts) {
++    return X509_REQ_add_extensions(req, exts);
+ }
+ 
+-X509_NAME_ENTRY *x509_name_entry_create_by_txt( X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) {
+-    return X509_NAME_ENTRY_create_by_txt( ne, field, type, bytes, len);
++X509_NAME_ENTRY *x509_name_entry_create_by_txt(X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) {
++    return X509_NAME_ENTRY_create_by_txt( ne, field, type, (unsigned char *)bytes, len);
+ }
+ 
+-LHASH * 
+-x509v3_lhash(){ 
+-       return lh_new(NULL,NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++LHASH_OF(CONF_VALUE) 
++#else
++LHASH
++#endif
++*x509v3_lhash() { 
++    return lh_new(NULL, NULL); /* Should probably be lh_CONF_VALUE_new but won't compile. */
+ }
+ 
+ X509V3_CTX *
+-x509v3_set_conf_lhash(LHASH * lhash){
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++x509v3_set_conf_lhash(LHASH_OF(CONF_VALUE) * lhash) {
++#else
++x509v3_set_conf_lhash(LHASH                * lhash) {
++#endif
+       X509V3_CTX * ctx;
+       if (!(ctx=(X509V3_CTX *)PyMem_Malloc(sizeof(X509V3_CTX)))) {
+           PyErr_SetString(PyExc_MemoryError, "x509v3_set_conf_lhash");
+@@ -517,11 +532,20 @@
+       return ctx;
+ }
+ 
+-X509_EXTENSION *x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) {
++X509_EXTENSION *
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++x509v3_ext_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, char *name, char *value) {
++#else
++x509v3_ext_conf(LHASH                *conf, X509V3_CTX *ctx, char *name, char *value) {
++#endif
+       X509_EXTENSION * ext = NULL;
+       ext = X509V3_EXT_conf(conf, ctx, name, value); 
+       PyMem_Free(ctx); 
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++      lh_CONF_VALUE_free(conf);
++#else
+       lh_free(conf);
++#endif
+       return ext;
+ }
+ 
+@@ -543,33 +567,33 @@
+ }
+ 
+ /* sk_X509_EXTENSION_new_null is a macro. */
+-STACK *sk_x509_extension_new_null(void) {
+-    return (STACK *)sk_X509_EXTENSION_new_null();
++STACK_OF(X509_EXTENSION) *sk_x509_extension_new_null(void) {
++    return sk_X509_EXTENSION_new_null();
+ }
+ 
+ /* sk_X509_EXTENSION_free() is a macro. */
+-void sk_x509_extension_free(STACK *stack) {
+-    sk_X509_EXTENSION_free((STACK_OF(X509_EXTENSION) *)stack);
++void sk_x509_extension_free(STACK_OF(X509_EXTENSION) *stack) {
++    sk_X509_EXTENSION_free(stack);
+ }
+ 
+ /* sk_X509_EXTENSION_push() is a macro. */
+-int sk_x509_extension_push(STACK *stack, X509_EXTENSION *x509_ext) {
+-    return sk_X509_EXTENSION_push((STACK_OF(X509_EXTENSION) *)stack, x509_ext);
++int sk_x509_extension_push(STACK_OF(X509_EXTENSION) *stack, X509_EXTENSION *x509_ext) {
++    return sk_X509_EXTENSION_push(stack, x509_ext);
+ }
+ 
+ /* sk_X509_EXTENSION_pop() is a macro. */
+-X509_EXTENSION *sk_x509_extension_pop(STACK *stack) {
+-    return sk_X509_EXTENSION_pop((STACK_OF(X509_EXTENSION) *)stack);
++X509_EXTENSION *sk_x509_extension_pop(STACK_OF(X509_EXTENSION) *stack) {
++    return sk_X509_EXTENSION_pop(stack);
+ }
+ 
+ /* sk_X509_EXTENSION_num() is a macro. */
+-int sk_x509_extension_num(STACK *stack) {
+-    return sk_X509_EXTENSION_num((STACK_OF(X509_EXTENSION) *)stack);
++int sk_x509_extension_num(STACK_OF(X509_EXTENSION) *stack) {
++    return sk_X509_EXTENSION_num(stack);
+ }
+ 
+ /* sk_X509_EXTENSION_value() is a macro. */
+-X509_EXTENSION *sk_x509_extension_value(STACK *stack, int i) {
+-    return sk_X509_EXTENSION_value((STACK_OF(X509_EXTENSION) *)stack, i);
++X509_EXTENSION *sk_x509_extension_value(STACK_OF(X509_EXTENSION) *stack, int i) {
++    return sk_X509_EXTENSION_value(stack, i);
+ }
+ 
+ /* X509_STORE_CTX_get_app_data is a macro. */
+@@ -590,7 +614,7 @@
+ #define I2DTYPE int (*)()
+ #endif   
+ 
+-STACK *
++STACK_OF(X509) *
+ make_stack_from_der_sequence(PyObject * pyEncodedString){
+     STACK_OF(X509) *certs;
+     Py_ssize_t encoded_string_len;
+@@ -606,7 +630,7 @@
+         return NULL;
+     }
+ 
+-    certs = ASN1_seq_unpack((unsigned char *)encoded_string, encoded_string_len, (D2ITYPE)d2i_X509, (void(*)())X509_free ); 
++    certs = ASN1_seq_unpack_X509((unsigned char *)encoded_string, encoded_string_len, d2i_X509, X509_free ); 
+     if (!certs) {
+        PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
+        return NULL;
+@@ -616,13 +640,13 @@
+ }
+ 
+ PyObject *
+-get_der_encoding_stack(STACK * stack){
++get_der_encoding_stack(STACK_OF(X509) *stack){
+     PyObject * encodedString;
+     
+     unsigned char * encoding;
+     int len; 
+     
+-    encoding = ASN1_seq_pack((STACK_OF(X509)*) stack, (I2DTYPE)i2d_X509, NULL, &len); 
++    encoding = ASN1_seq_pack_X509(stack, i2d_X509, NULL, &len); 
+     if (!encoding) {
+        PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
+        return NULL;
+Index: SWIG/_aes.i
+===================================================================
+--- SWIG/_aes.i	(revision 695)
++++ SWIG/_aes.i	(working copy)
+@@ -76,7 +76,7 @@
+         AES_encrypt((const unsigned char *)in, out, key);
+     else
+         AES_decrypt((const unsigned char *)in, out, key);
+-    return PyString_FromStringAndSize(out, outlen);
++    return PyString_FromStringAndSize((char*)out, outlen);
+ }
+ 
+ int AES_type_check(AES_KEY *key) {
+Index: SWIG/_util.i
+===================================================================
+--- SWIG/_util.i	(revision 695)
++++ SWIG/_util.i	(working copy)
+@@ -48,7 +48,7 @@
+         PyErr_SetString(_util_err, ERR_reason_error_string(ERR_get_error()));
+         return NULL;
+     }
+-    obj = PyString_FromStringAndSize(ret, len);
++    obj = PyString_FromStringAndSize((char*)ret, len);
+     OPENSSL_free(ret);
+     return obj;
+ }
+Index: SWIG/_m2crypto.i
+===================================================================
+--- SWIG/_m2crypto.i	(revision 695)
++++ SWIG/_m2crypto.i	(working copy)
+@@ -38,6 +38,19 @@
+ #define CONST098
+ #endif
+ 
++/* Bring in STACK_OF macro definition */
++%include <openssl/safestack.h>
++
++/* Bring in LHASH_OF macro definition */
++/* XXX Can't include lhash.h where LHASH_OF is defined, because it includes
++   XXX stdio.h etc. which we fail to include. So we have to (re)define
++   XXX LHASH_OF here instead.
++%include <openssl/lhash.h>
++*/
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#define LHASH_OF(type) struct lhash_st_##type
++#endif
++
+ %include constraints.i
+ %include _threads.i
+ %include _lib.i
+Index: SWIG/_rand.i
+===================================================================
+--- SWIG/_rand.i	(revision 695)
++++ SWIG/_rand.i	(working copy)
+@@ -87,7 +87,7 @@
+         Py_INCREF(Py_None);
+         return Py_None;
+     } else {
+-        PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize(blob, n));
++        PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize((char*)blob, n));
+         PyMem_Free(blob);
+         PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong((long)ret));
+         return tuple;
+Index: SWIG/_pkcs7.i
+===================================================================
+--- SWIG/_pkcs7.i	(revision 695)
++++ SWIG/_pkcs7.i	(working copy)
+@@ -12,7 +12,7 @@
+ %apply Pointer NONNULL { EVP_CIPHER * };
+ %apply Pointer NONNULL { EVP_PKEY * };
+ %apply Pointer NONNULL { PKCS7 * };
+-%apply Pointer NONNULL { STACK * };
++%apply Pointer NONNULL { STACK_OF(X509) * };
+ %apply Pointer NONNULL { X509 * };
+ 
+ %rename(pkcs7_new) PKCS7_new;
+@@ -54,8 +54,8 @@
+ 
+ %threadallow pkcs7_encrypt;
+ %inline %{
+-PKCS7 *pkcs7_encrypt(STACK *stack, BIO *bio, EVP_CIPHER *cipher, int flags) {
+-    return PKCS7_encrypt((STACK_OF(X509) *)stack, bio, cipher, flags);
++PKCS7 *pkcs7_encrypt(STACK_OF(X509) *stack, BIO *bio, EVP_CIPHER *cipher, int flags) {
++    return PKCS7_encrypt(stack, bio, cipher, flags);
+ }
+ 
+ PyObject *pkcs7_decrypt(PKCS7 *pkcs7, EVP_PKEY *pkey, X509 *cert, int flags) {
+@@ -96,14 +96,14 @@
+ 
+ %threadallow pkcs7_sign1;
+ %inline %{
+-PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK *stack, BIO *bio, int flags) {
+-    return PKCS7_sign(x509, pkey, (STACK_OF(X509) *)stack, bio, flags);
++PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK_OF(X509) *stack, BIO *bio, int flags) {
++    return PKCS7_sign(x509, pkey, stack, bio, flags);
+ }
+ %}
+ 
+ %threadallow pkcs7_verify1;
+ %inline %{
+-PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, BIO *data, int flags) {
++PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, BIO *data, int flags) {
+     int outlen;
+     char *outbuf;
+     BIO *bio;
+@@ -113,7 +113,7 @@
+         PyErr_SetString(PyExc_MemoryError, "pkcs7_verify1");
+         return NULL;
+     }
+-    if (!PKCS7_verify(pkcs7, (STACK_OF(X509) *)stack, store, data, bio, flags)) {
++    if (!PKCS7_verify(pkcs7, stack, store, data, bio, flags)) {
+         PyErr_SetString(_pkcs7_err, ERR_reason_error_string(ERR_get_error()));
+         BIO_free(bio);
+         return NULL;
+@@ -131,7 +131,7 @@
+     return ret;
+ }
+ 
+-PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, int flags) {
++PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, int flags) {
+     return pkcs7_verify1(pkcs7, stack, store, NULL, flags);
+ }
+ %}
+@@ -229,7 +229,7 @@
+ }
+ 
+ /* return STACK_OF(X509)* */     
+-STACK *pkcs7_get0_signers(PKCS7 *p7, STACK *certs, int flags) {     
++STACK_OF(X509) *pkcs7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags) {     
+     return PKCS7_get0_signers(p7, certs, flags);      
+ }
+ 
diff --git a/abs/core/python_modules/python-mako/PKGBUILD b/abs/core/python_modules/python-mako/PKGBUILD
new file mode 100644
index 0000000..987116a
--- /dev/null
+++ b/abs/core/python_modules/python-mako/PKGBUILD
@@ -0,0 +1,21 @@
+# $Id: PKGBUILD 87883 2010-08-18 15:32:33Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Roberto Alsina <ralsina@kde.org>
+pkgname=python-mako
+pkgver=0.3.4
+pkgrel=5
+pkgdesc="Hyperfast and lightweight templating for the Python platform."
+arch=('any')
+url="http://www.makotemplates.org/"
+license=('custom')
+depends=('python2' 'python-markupsafe>=0.9.2' 'python-beaker>=1.5.4')
+makedepends=('setuptools')
+source=(http://www.makotemplates.org/downloads/Mako-$pkgver.tar.gz)
+md5sums=('2ae56ccc6c9b5c4e2e67f42b69475009')
+
+build() {
+  cd "$srcdir/Mako-$pkgver"
+  python2 setup.py install --root="$pkgdir" --optimize=1 || return 1
+  install -D LICENSE "$pkgdir/usr/share/licenses/python-mako/COPYING" || return 1
+}
+
diff --git a/abs/core/python_modules/python-markupsafe/PKGBUILD b/abs/core/python_modules/python-markupsafe/PKGBUILD
new file mode 100644
index 0000000..f3563c9
--- /dev/null
+++ b/abs/core/python_modules/python-markupsafe/PKGBUILD
@@ -0,0 +1,23 @@
+# $Id: PKGBUILD 87877 2010-08-18 15:28:18Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Alex Anthony <alex.anthony28991@gmail.com>
+
+pkgname=python-markupsafe
+pkgver=0.9.2
+pkgrel=3
+pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
+arch=('i686' 'x86_64')
+url="http://pypi.python.org/pypi/MarkupSafe"
+license=('custom')
+depends=('python2')
+makedepends=('setuptools')
+source=(http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz)
+md5sums=('69b72d1afdd9e808f9c1ef65f819c7a6')
+
+build() {
+  cd ${srcdir}/MarkupSafe-${pkgver}
+  python2 setup.py install --root=${pkgdir} --optimize=1
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
+
diff --git a/abs/core/python-netifaces/PKGBUILD b/abs/core/python_modules/python-netifaces/PKGBUILD
index 7b526cb..258a9c2 100644
--- a/abs/core/python-netifaces/PKGBUILD
+++ b/abs/core/python_modules/python-netifaces/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=python-netifaces
 _orig_name=netifaces
 pkgver=0.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Portable module to access network interface information in Python."
 depends=('python2')
 makedepend=('gcc')
diff --git a/abs/core/python-nose/PKGBUILD b/abs/core/python_modules/python-nose/PKGBUILD
index 847e88a..e48c434 100644
--- a/abs/core/python-nose/PKGBUILD
+++ b/abs/core/python_modules/python-nose/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=python-nose
 pkgver=0.11.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A discovery-based unittest extension"
 arch=('any')
 url="http://www.somethingaboutorange.com/mrl/projects/nose/"
@@ -15,12 +15,12 @@ source=("http://www.somethingaboutorange.com/mrl/projects/nose/nose-${pkgver}.ta
 md5sums=('7f1dc53750811f78bedef9e14a4bc5a5')
 
 build() {
-  cd "$srcdir/nose-$pkgver"
+  cd "${srcdir}/nose-${pkgver}"
   sed -i -e "s:man/man1:share/man/man1:g" setup.py
 }
 
 package() {
-  cd "$srcdir/nose-$pkgver"
+  cd "${srcdir}/nose-${pkgver}"
   python2 setup.py install --prefix=/usr --root=${pkgdir} || return 1
 }
 
diff --git a/abs/core/python-numeric/PKGBUILD b/abs/core/python_modules/python-numeric/PKGBUILD
index 7c7f58c..2c8ea21 100644
--- a/abs/core/python-numeric/PKGBUILD
+++ b/abs/core/python_modules/python-numeric/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=python-numeric
 pkgver=24.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Numerical Python adds a fast array facility to the Python language"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://numeric.scipy.org/"
 license=('custom')
 depends=('python2')
diff --git a/abs/core/python-numpy/PKGBUILD b/abs/core/python_modules/python-numpy/PKGBUILD
index 3dc66a0..57b41f5 100644
--- a/abs/core/python-numpy/PKGBUILD
+++ b/abs/core/python_modules/python-numpy/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=python-numpy
 pkgver=1.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Scientific tools for Python"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -34,4 +34,3 @@ package() {
              -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
              $(find $pkgdir -name '*.py')
 }
-
diff --git a/abs/core/python_modules/python-oauth/PKGBUILD b/abs/core/python_modules/python-oauth/PKGBUILD
new file mode 100644
index 0000000..1404fec
--- /dev/null
+++ b/abs/core/python_modules/python-oauth/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Snowknight (hopkinsth@gmail.com)
+pkgname=python-oauth
+pkgver=1.0.1
+pkgrel=6
+pkgdesc="An open protocol to allow API authentication in a simple and standard method from desktop and web applications."
+arch=('any')
+url="http://code.google.com/p/oauth/"
+license=('MIT')
+depends=('python2')
+#makedepends=('python2-distribute')
+makedepends=('setuptools')
+source=(http://pypi.python.org/packages/source/o/oauth/oauth-${pkgver}.tar.gz)
+md5sums=('30ed3cc8c11d7841a89feab437aabf81')
+sha1sums=('b2d7609e4852b33d0d33f0bc6ae5cab8fadca014')
+
+build() {
+  cd ${srcdir}/oauth-${pkgver}
+
+  python2 setup.py build || return 1
+}
+package() {
+  cd ${srcdir}/oauth-${pkgver}
+  python2 setup.py install --root=${pkgdir} || return 1
+
+  install -Dm644 LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
+
diff --git a/abs/core/python_modules/python-opengl/LICENSE b/abs/core/python_modules/python-opengl/LICENSE
new file mode 100644
index 0000000..11d88fb
--- /dev/null
+++ b/abs/core/python_modules/python-opengl/LICENSE
@@ -0,0 +1,30 @@
+# Copyright (c) 2006-2008 Alex Holkner
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions 
+# are met:
+#
+#  * Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright 
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+#  * Neither the name of pyglet nor the names of its
+#    contributors may be used to endorse or promote products
+#    derived from this software without specific prior written
+#    permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
diff --git a/abs/core/python_modules/python-opengl/PKGBUILD b/abs/core/python_modules/python-opengl/PKGBUILD
new file mode 100644
index 0000000..e4ff382
--- /dev/null
+++ b/abs/core/python_modules/python-opengl/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 89543 2010-09-01 17:18:01Z remy $
+# Contributor: Josh Taylor <joshtaylor.mail@gmail.com>
+# Contributor: simo <simo@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=python-opengl
+pkgver=3.0.1
+pkgrel=3
+pkgdesc="The cross platform Python binding to OpenGL and related APIs"
+url="http://pyopengl.sourceforge.net"
+license=('BSD')
+arch=('any')
+depends=('python2' 'tk' 'freeglut' 'setuptools')
+provides=('pyopengl' 'python-pyopengl')
+conflicts=('pyopengl' 'python-pyopengl')
+source=(http://downloads.sourceforge.net/pyopengl/PyOpenGL-${pkgver}.tar.gz
+	'LICENSE')
+md5sums=('221d4a6a0928fcfeef26751370ec5f52'
+         '0b53c508a63e5dbaf44cdfb0fa103b3a')
+
+build() {
+	/bin/true
+}
+
+package() {
+	cd ${srcdir}/PyOpenGL-${pkgver}
+	python2 setup.py install --root=${pkgdir} || return 1
+	install -Dm644 ${srcdir}/LICENSE \
+	    ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/abs/core/python-parted/PKGBUILD b/abs/core/python_modules/python-parted/PKGBUILD
index 876f1b9..862405c 100644
--- a/abs/core/python-parted/PKGBUILD
+++ b/abs/core/python_modules/python-parted/PKGBUILD
@@ -2,7 +2,7 @@ pkgname=python-parted
 __pkgname=pyparted
 pkgver=2.0.12
 pkgver=3.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Python bindings for libparted"
 arch=('i686' 'x86_64')
 license=('LGPL' 'MPL')
diff --git a/abs/core/python-pexpect/PKGBUILD b/abs/core/python_modules/python-pexpect/PKGBUILD
index fa09e85..938e3cb 100644
--- a/abs/core/python-pexpect/PKGBUILD
+++ b/abs/core/python_modules/python-pexpect/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Aaron Schaefer <aaron@elasticdog.com>
 pkgname=python-pexpect
 pkgver=2.3
-pkgrel=2
+pkgrel=3
 pkgdesc='A pure Python Expect-like module'
 arch=('i686' 'x86_64')
 url='http://pexpect.sourceforge.net/'
diff --git a/abs/core/python_modules/python-pybluez/PKGBUILD b/abs/core/python_modules/python-pybluez/PKGBUILD
new file mode 100644
index 0000000..f667d66
--- /dev/null
+++ b/abs/core/python_modules/python-pybluez/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD 26298 2010-09-14 17:18:19Z schuay $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: cs-cam - me.at.camdaniel.com
+
+pkgname=python-pybluez
+pkgver=0.18
+pkgrel=3
+pkgdesc="Python wrapper for the BlueZ Bluetooth stack"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/pybluez/"
+license=('GPL')
+provides=('pybluez')
+conflicts=('pybluez')
+replaces=('pybluez')
+depends=('python2' 'bluez')
+source=(http://pybluez.googlecode.com/files/PyBluez-$pkgver.tar.gz)
+md5sums=('be8c8ce615c3189fda1aaf3d568314b2')
+
+build() {
+  cd $srcdir/PyBluez-$pkgver
+  python2 setup.py install --root=$pkgdir
+  ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.6/site-packages/_bluetooth.so
+}
+
diff --git a/abs/core/python_modules/python-pycurl/PKGBUILD b/abs/core/python_modules/python-pycurl/PKGBUILD
new file mode 100644
index 0000000..84da9ef
--- /dev/null
+++ b/abs/core/python_modules/python-pycurl/PKGBUILD
@@ -0,0 +1,23 @@
+# $Id: PKGBUILD 25898 2010-09-11 12:22:23Z andrea $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
+# Contributor: kontrast <kontr4st@gmail.com> 
+
+pkgname=python-pycurl
+pkgver=7.19.0
+pkgrel=7
+pkgdesc="A Python interface to libcurl"
+arch=('i686' 'x86_64')
+url="http://pycurl.sourceforge.net"
+license=('GPL')
+depends=('python2' 'curl')
+replaces=('pycurl')
+provides=('pycurl')
+source=("http://pycurl.sourceforge.net/download/pycurl-${pkgver}.tar.gz")
+md5sums=('919d58fe37e69fe87ce4534d8b6a1c7b')
+
+package() {
+  cd ${srcdir}/pycurl-${pkgver}
+  python2 setup.py install --curl-config=/usr/bin/curl-config --prefix ${pkgdir}/usr
+}
+
diff --git a/abs/core/python_modules/python-pymedia/PKGBUILD b/abs/core/python_modules/python-pymedia/PKGBUILD
new file mode 100644
index 0000000..5433471
--- /dev/null
+++ b/abs/core/python_modules/python-pymedia/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: TDY <tdy@gmx.com>
+
+pkgname=python-pymedia
+pkgver=1.3.7.3
+pkgrel=2
+pkgdesc="A Python library for accessing and manipulating multimedia files"
+arch=('i686' 'x86_64')
+url="http://pymedia.org/"
+license=('LGPL')
+depends=('alsa-lib' 'ffmpeg-svn' 'python2')
+optdepends=('faad2:     AAC support'
+            'lame:      MP3 support'
+            'libogg:    Ogg support'
+            'libvorbis: Vorbis support')
+source=(http://downloads.sourceforge.net/${pkgname/*-}/${pkgname/*-}-$pkgver.tar.gz
+        ${pkgname/*-}-$pkgver-amd64-gentoo.diff)
+md5sums=('2f4930c63866c97af5090b176e2a118a'
+         '3137e65e1208db98e404ee894fcd744a')
+
+build() {
+  cd "$srcdir/${pkgname/*-}-$pkgver"
+  patch -Np1 -i ../${pkgname/*-}-$pkgver-amd64-gentoo.diff || return 1
+
+  find "$srcdir/${pkgname/*-}-$pkgver" -name '*.py' | \
+    xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" || return 1
+  find "$srcdir/${pkgname/*-}-$pkgver" -name '*.py' | \
+    xargs sed -i "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" || return 1
+
+  python2 setup.py build || return 1
+}
+
+package() {
+  cd "$srcdir/${pkgname/*-}-$pkgver"
+  python2 setup.py install --prefix=/usr --root="$pkgdir" || return 1
+}
diff --git a/abs/core/python_modules/python-pymedia/pymedia-1.3.7.3-amd64-gentoo.diff b/abs/core/python_modules/python-pymedia/pymedia-1.3.7.3-amd64-gentoo.diff
new file mode 100644
index 0000000..801eccf
--- /dev/null
+++ b/abs/core/python_modules/python-pymedia/pymedia-1.3.7.3-amd64-gentoo.diff
@@ -0,0 +1,64 @@
+diff -ru pymedia-1.3.7.3/audio/inttypes.h pymedia-1.3.7.3-amd64/audio/inttypes.h
+--- pymedia-1.3.7.3/audio/inttypes.h	2006-06-13 13:32:22.000000000 -0700
++++ pymedia-1.3.7.3-amd64/audio/inttypes.h	2008-03-26 08:05:57.000000000 -0700
+@@ -2,6 +2,7 @@
+ #if !defined( __INTTYPES_H__ )

+ #define __INTTYPES_H__

+ 

++#include <stdint.h>

+ #if defined( _STDINT_H )

+ 

+ 	typedef unsigned short UINT16;

+diff -ru pymedia-1.3.7.3/setup.py pymedia-1.3.7.3-amd64/setup.py
+--- pymedia-1.3.7.3/setup.py	2006-06-19 23:04:43.000000000 -0700
++++ pymedia-1.3.7.3-amd64/setup.py	2008-03-26 08:16:04.000000000 -0700
+@@ -216,7 +216,7 @@
+ 		FILES[ 'video.vcodec' ][ 'libavcodec' ]+= NONMMX_FILES

+ else:

+ 		print 'Using UNIX configuration...\n'

+-		disable_fPIC()

++		#disable_fPIC()

+ 		dep= config.Dependency_unix

+ 		inc_hunt = [ 

+ 			'/usr/include', 

+@@ -224,13 +224,13 @@
+ 			'/usr/local/include', 

+ 			'/usr/local/include/lame',]

+ 		lib_hunt = [ '/usr/lib64', '/usr/lib', '/usr/local/lib64', '/usr/local/lib' ]

+-		LIBS= []

++		LIBS= ['avcodec', 'avformat']

+ 		DEFINES+= [

+ 			('PATH_DEV_DSP', '"/dev/dsp"' ), 

+ 			('PATH_DEV_MIXER','"/dev/mixer"' ), 

+ 			('_FILE_OFFSET_BITS',64),

+ 			('ACCEL_DETECT',1),	

+-			('HAVE_MMX', '1' ),

++			('HAVE_LRINTF', '1' ),

+ 		] 

+ 		if sys.platform== 'cygwin':

+ 			DEFINES+= [	

+@@ -243,13 +243,13 @@
+ 				('DVD_STRUCT_IN_LINUX_CDROM_H', '1' ),

+ 			]

+ 

+-		FILES[ 'video.vcodec' ][ 'libavcodec' ]+= MMX_FILES

++		FILES[ 'video.vcodec' ][ 'libavcodec' ]#+= MMX_FILES

+ 

+ DEPS = [

+ 		dep('OGG', 'libogg-[1-9].*', 'ogg/ogg.h', 'libogg', 'CONFIG_VORBIS').configure(inc_hunt,lib_hunt),

+ 		dep('VORBIS', 'libvorbis-[1-9].*', 'vorbis/codec.h', 'libvorbis', 'CONFIG_VORBIS' ).configure(inc_hunt,lib_hunt),

+ 		dep('FAAD', 'libfaad2', 'faad.h', 'libfaad', 'CONFIG_FAAD').configure(inc_hunt,lib_hunt),

+-		dep('MP3LAME', 'lame-3.95.*', 'lame.h', 'libmp3lame', 'CONFIG_MP3LAME').configure(inc_hunt,lib_hunt),

++		dep('MP3LAME', 'lame-3.96.*', 'lame.h', 'libmp3lame', 'CONFIG_MP3LAME').configure(inc_hunt,lib_hunt),

+ 		dep('VORBISENC', 'libvorbis-[1-9].*','vorbis/vorbisenc.h','libvorbisenc', 'CONFIG_VORBIS').configure(inc_hunt,lib_hunt),

+ 		dep('ALSA', 'libasound','alsa/asoundlib.h','libasound', 'CONFIG_ALSA').configure(inc_hunt,lib_hunt),

+ ]

+@@ -260,7 +260,7 @@
+ DEFINES+= [ ( x.define, None ) for x in DEPS ]+ [ ( 'HAVE_AV_CONFIG_H', None ), ( 'UDF_CACHE', 1 ) ]

+ LIBS+= [ x.lib for x in DEPS ]

+ 

+-choice = raw_input('Continue building '+MODULE_NAME+' ? [Y,n]:')

++choice = 'Y'

+ if choice== 'n':

+ 		print 'To start installation please run: \n\tsetup.py install and press Enter when prompted\n'

+ 		sys.exit()

diff --git a/abs/core/python_modules/python-pyserial/PKGBUILD b/abs/core/python_modules/python-pyserial/PKGBUILD
new file mode 100644
index 0000000..43c5b87
--- /dev/null
+++ b/abs/core/python_modules/python-pyserial/PKGBUILD
@@ -0,0 +1,21 @@
+# $Id: PKGBUILD 29428 2010-10-14 09:13:52Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
+# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
+
+pkgname=python-pyserial
+pkgver=2.5
+pkgrel=3
+pkgdesc="Multiplatform Serial Port Module for Python"
+arch=('any')
+url="http://pyserial.sf.net"
+license=('custom:PYTHON')
+depends=('python2')
+source=(http://downloads.sourceforge.net/sourceforge/pyserial/pyserial-$pkgver.tar.gz)
+md5sums=('34340820710239bea2ceca7f43ef8cab')
+
+build() {
+  cd $srcdir/pyserial-$pkgver
+  python2 setup.py install --root=$pkgdir
+  install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE.txt
+}
diff --git a/abs/core/python_modules/python-pysqlite/ChangeLog b/abs/core/python_modules/python-pysqlite/ChangeLog
new file mode 100644
index 0000000..12c0ad0
--- /dev/null
+++ b/abs/core/python_modules/python-pysqlite/ChangeLog
@@ -0,0 +1,13 @@
+
+2009-08-06  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updated to: 2.5.5
+
+2009-07-19  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updated for i686: 2.5.5
+
+2008-07-15  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updated for i686: 2.4.1
+
diff --git a/abs/core/python_modules/python-pysqlite/PKGBUILD b/abs/core/python_modules/python-pysqlite/PKGBUILD
new file mode 100644
index 0000000..4a45ba5
--- /dev/null
+++ b/abs/core/python_modules/python-pysqlite/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 89652 2010-09-02 20:47:02Z remy $
+# Contributor: Aaron Griffin <aaron@archlinux.org>
+# Contributor: Aaron Griffin <aaron@archlinux.org>
+# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=python-pysqlite
+pkgver=2.6.0
+pkgrel=3
+pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine"
+license=('custom')
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/pysqlite/"
+depends=('python2' 'sqlite3')
+replaces=('pysqlite2')
+source=(http://pysqlite.googlecode.com/files/pysqlite-${pkgver}.tar.gz \
+        setup.cfg)
+md5sums=('fc92618b3b39d02e6ff10dc467c36640'
+	 '86dd356c65afd14a22f2f8f64a26441e')
+build() {
+	cd ${srcdir}/pysqlite-${pkgver}
+	cp ${srcdir}/setup.cfg .
+	python2 setup.py install --root=${pkgdir}
+}
+
+package() {
+	cd ${srcdir}/pysqlite-${pkgver}
+	install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+	rm -r ${pkgdir}/usr/pysqlite2-doc
+}
diff --git a/abs/core/python_modules/python-pysqlite/setup.cfg b/abs/core/python_modules/python-pysqlite/setup.cfg
new file mode 100644
index 0000000..ba6c770
--- /dev/null
+++ b/abs/core/python_modules/python-pysqlite/setup.cfg
@@ -0,0 +1,5 @@
+[build_ext]
+define=
+include_dirs=/usr/include
+library_dirs=/usr/lib
+libraries=sqlite3
diff --git a/abs/core/python-simplejson/ChangeLog b/abs/core/python_modules/python-simplejson/ChangeLog
index 4a5d1d9..4a5d1d9 100644
--- a/abs/core/python-simplejson/ChangeLog
+++ b/abs/core/python_modules/python-simplejson/ChangeLog
diff --git a/abs/core/python-simplejson/PKGBUILD b/abs/core/python_modules/python-simplejson/PKGBUILD
index 5deb30d..05e2b1b 100644
--- a/abs/core/python-simplejson/PKGBUILD
+++ b/abs/core/python_modules/python-simplejson/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=python-simplejson
 pkgver=2.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python"
 license=('MIT')
 arch=('any')
diff --git a/abs/core/python_modules/pyusb/PKGBUILD b/abs/core/python_modules/pyusb/PKGBUILD
new file mode 100644
index 0000000..d9349ec
--- /dev/null
+++ b/abs/core/python_modules/pyusb/PKGBUILD
@@ -0,0 +1,18 @@
+# Contributor: Jason Giangrande <jgiangrande@clarku.edu>
+pkgname=pyusb
+pkgver=0.4.3
+pkgrel=4
+pkgdesc="A native Python module written in C which provides USB access."
+arch=('i686' 'x86_64')
+url="http://pyusb.berlios.de/"
+license=('GPL')
+depends=('python2' 'libusb')
+makedepends=('setuptools')
+source=(http://downloads.sourceforge.net/project/pyusb/PyUSB%200.x/$pkgver/pyusb-$pkgver.tar.gz)
+md5sums=('a1a43bc6407caccbc22073c56439aa06')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	python2 setup.py install -f --root="${pkgdir}" || return 1
+}
+
diff --git a/abs/core/python_modules/pyxdg/PKGBUILD b/abs/core/python_modules/pyxdg/PKGBUILD
new file mode 100644
index 0000000..a3aca49
--- /dev/null
+++ b/abs/core/python_modules/pyxdg/PKGBUILD
@@ -0,0 +1,20 @@
+# $Id: PKGBUILD 89531 2010-09-01 15:23:06Z remy $
+# Maintainer: Hugo Doria <hugo@archlinux.org>
+# Contributor: Mario A. Vazquez <mario_vazq@hotmail.com>
+
+pkgname=pyxdg
+pkgver=0.19
+pkgrel=3
+pkgdesc="Python library to access freedesktop.org standards."
+arch=('any')
+url="http://freedesktop.org/Software/pyxdg"
+license=("LGPL")
+depends=('python2')
+source=(http://www.freedesktop.org/~lanius/${pkgname}-${pkgver}.tar.gz)
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  python2 setup.py install --prefix=/usr --root=${pkgdir} || return 1
+}
+md5sums=('9f33542e846d0fc1e0bfa992a8555b0a')
+
diff --git a/abs/core/setuptools/PKGBUILD b/abs/core/setuptools/PKGBUILD
index 022f939..ccf0941 100644
--- a/abs/core/setuptools/PKGBUILD
+++ b/abs/core/setuptools/PKGBUILD
@@ -5,19 +5,18 @@
 
 pkgname=setuptools
 pkgver=0.6c11
-pkgrel=1
+pkgrel=2
 pkgdesc="setuptools is a collection of enhancements to the Python distutils"
 license=('PSF')
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://peak.telecommunity.com/DevCenter/setuptools"
-depends=('python')
+depends=('python2')
 source=(http://cheeseshop.python.org/packages/source/s/$pkgname/$pkgname-$pkgver.tar.gz)
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  mkdir -p $startdir/pkg/usr/lib/python2.6/site-packages
-  python setup.py install --root=$startdir/pkg
-  echo "/usr/lib/python2.6/site-packages/$pkgname-$pkgver-py2.6.egg" > $startdir/pkg/usr/lib/python2.6/site-packages/setuptools.pth
+  cd ${srcdir}/${pkgname}-${pkgver}
+  mkdir -p ${pkgdir}/usr/lib/python2.6/site-packages
+  python2 setup.py install --root=${pkgdir}
+  echo "/usr/lib/python2.6/site-packages/${pkgname}-${pkgver}-py2.6.egg" > ${pkgdir}/usr/lib/python2.6/site-packages/setuptools.pth
 }
-
 md5sums=('7df2a529a074f613b509fb44feefe74e')
diff --git a/abs/core/xkeyboard-config/fix-abnt2.patch b/abs/core/xkeyboard-config/fix-abnt2.patch
deleted file mode 100644
index a451df8..0000000
--- a/abs/core/xkeyboard-config/fix-abnt2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From b67326a9b271332c5bef23115d9c4ac7e7b2e6d9 Mon Sep 17 00:00:00 2001
-From: Sergey V. Udaltsov<svu@gnome.org>
-Date: Wed, 26  Nov  2008  23:19:41  +0000
-Subject: fixed abnt2 keycodes, b.fd.o#18712
-
----
-diff --git a/keycodes/evdev b/keycodes/evdev
-index 760e2d0..9da2cd5 100644
---- a/keycodes/evdev
-+++ b/keycodes/evdev
-@@ -311,6 +311,7 @@ xkb_keycodes "jp106" {
- // For brazilian ABNT2 keyboard.
- xkb_keycodes "abnt2" {
-     include "evdev(evdev)"
-+    <KPPT> = 129;
- };
- 
- // PC98
---
-cgit v0.8.1-24-ge5fb