Merge branch 'testing' of ssh://linhes.org/mount/repository/linhes_pkgbuild into testing

88 files changed, 336 insertions, 972 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/extra/python2-distribute/PKGBUILD b/abs/core/python2-distribute/PKGBUILD
index e92d9c7..f21be1d 100644
--- a/abs/extra/python2-distribute/PKGBUILD
+++ b/abs/core/python2-distribute/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Sebastien Binet <binet@farnsworth>
 pkgname=python2-distribute
 pkgver=0.6.14
-pkgrel=3
+pkgrel=4
 pkgdesc="A collection of extensions to the Python 2 distutils"
 arch=('any')
 license=('PSF')
diff --git a/abs/extra/python2-distribute/distribute-0.6.14_python2_and_3.patch b/abs/core/python2-distribute/distribute-0.6.14_python2_and_3.patch
index dc5da86..dc5da86 100644
--- a/abs/extra/python2-distribute/distribute-0.6.14_python2_and_3.patch
+++ b/abs/core/python2-distribute/distribute-0.6.14_python2_and_3.patch
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/extra/bluez-python/PKGBUILD b/abs/core/python_modules/bluez-python/PKGBUILD
index 9738eb7..4314206 100644
--- a/abs/extra/bluez-python/PKGBUILD
+++ b/abs/core/python_modules/bluez-python/PKGBUILD
@@ -2,9 +2,9 @@
 
 pkgname=bluez-python
 pkgver=0.1.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A BlueZ python binding on top of dbus-python"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://code.google.com/p/bluez-python"
 license=('LGPL')
 depends=('bluez>=4.30' 'dbus-python')
@@ -12,6 +12,9 @@ source=(http://bluez-python.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
 md5sums=('013f283d3c32765e67c89ebf7f5470ea')
 
 build() {
-  cd $startdir/src/$pkgname
-  python2 setup.py install --root=$startdir/pkg
+  /bin/true
+}
+package() {
+  cd ${srcdir}/${pkgname}
+  python2 setup.py install --root=${pkgdir}
 }
diff --git a/abs/extra/cddb-py/PKGBUILD b/abs/core/python_modules/cddb-py/PKGBUILD
index 7b8ed12..3facc20 100755
--- a/abs/extra/cddb-py/PKGBUILD
+++ b/abs/core/python_modules/cddb-py/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=cddb-py
 pkgver=1.4
-pkgrel=5
+pkgrel=6
 pkgdesc="CDDB-Server access from Python"
 arch=('i686' 'x86_64')
 url="http://cddb-py.sourceforge.net"
@@ -24,4 +24,3 @@ package() {
 
     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/extra/gnome-python-extras/PKGBUILD b/abs/core/python_modules/gnome-python-extras/PKGBUILD
index 297ef68..690ec2e 100644
--- a/abs/extra/gnome-python-extras/PKGBUILD
+++ b/abs/core/python_modules/gnome-python-extras/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=gnome-python-extras
 pkgver=2.25.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome Python interfaces for libraries not part of the core platform"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
 depends=('gnome-python>=2.22.1')
 makedepends=('libgtkhtml' 'gtkspell' 'gdl' 'xulrunner>=1.9' 'libgksu' 'pkgconfig' 'libgnomeui' 'libgda')
@@ -18,6 +18,9 @@ md5sums=('9f3b7ec5c57130b96061cb486b79c076')
 build() {
   cd "${srcdir}/gnome-python-extras-${pkgver}"
   ./configure --prefix=/usr || return 1
-  make MOZILLA_HOME=/usr/lib/xulrunner-1.9 || 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/extra/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
index 77fd0a4..77fd0a4 100644
--- a/abs/extra/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
diff --git a/abs/extra/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
index d2fa26e..d2fa26e 100644
--- a/abs/extra/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
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/extra/imdbpy/PKGBUILD b/abs/core/python_modules/imdbpy/PKGBUILD
index 58e5264..22efa94 100644
--- a/abs/extra/imdbpy/PKGBUILD
+++ b/abs/core/python_modules/imdbpy/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=imdbpy
 _realname=IMDbPY
 pkgver=4.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Python bindings for imdb"
 url="http://imdbpy.sourceforge.net/"
 arch=('i686' 'x86_64')
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/extra/pycrypto/PKGBUILD b/abs/core/python_modules/pycrypto/PKGBUILD
index fba0c5d..5ba87ac 100644
--- a/abs/extra/pycrypto/PKGBUILD
+++ b/abs/core/python_modules/pycrypto/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=pycrypto
 pkgver=2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 depends=('python2')
 url="http://www.dlitz.net/software/pycrypto/"
 license=(custom)
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/extra/pyopenssl/PKGBUILD b/abs/core/python_modules/pyopenssl/PKGBUILD
index 6d2c355..a136830 100644
--- a/abs/extra/pyopenssl/PKGBUILD
+++ b/abs/core/python_modules/pyopenssl/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=pyopenssl
 pkgver=0.10
-pkgrel=3
+pkgrel=4
 pkgdesc="pyOpenSSL is a Python interface to the OpenSSL library"
 arch=('i686' 'x86_64')
 url="http://pyopenssl.sourceforge.net"
diff --git a/abs/extra/pyorbit/PKGBUILD b/abs/core/python_modules/pyorbit/PKGBUILD
index bc9bf1b..4c94fb8 100644
--- a/abs/extra/pyorbit/PKGBUILD
+++ b/abs/core/python_modules/pyorbit/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=pyorbit
 pkgver=2.24.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Python bindings for ORBit2"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -23,4 +23,3 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-
diff --git a/abs/extra/pyqt/ChangeLog b/abs/core/python_modules/pyqt/ChangeLog
index e20b55a..e20b55a 100644
--- a/abs/extra/pyqt/ChangeLog
+++ b/abs/core/python_modules/pyqt/ChangeLog
diff --git a/abs/extra/pyqt/PKGBUILD b/abs/core/python_modules/pyqt/PKGBUILD
index af3667c..b4083cd 100644
--- a/abs/extra/pyqt/PKGBUILD
+++ b/abs/core/python_modules/pyqt/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=pyqt
 pkgver=4.8.1
-pkgrel=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"
@@ -41,4 +41,3 @@ package(){
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 }
-
diff --git a/abs/extra/pyrex/PKGBUILD b/abs/core/python_modules/pyrex/PKGBUILD
index 031996e..11a7344 100644
--- a/abs/extra/pyrex/PKGBUILD
+++ b/abs/core/python_modules/pyrex/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=pyrex
 pkgver=0.9.9
-pkgrel=2
+pkgrel=3
 pkgdesc="Language for writing Python extension modules"
 arch=(any)
 url="http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/"
diff --git a/abs/extra/community/python-beaker/PKGBUILD b/abs/core/python_modules/python-beaker/PKGBUILD
index 6cf06b4..8780497 100644
--- a/abs/extra/community/python-beaker/PKGBUILD
+++ b/abs/core/python_modules/python-beaker/PKGBUILD
@@ -3,13 +3,13 @@
 # Contributor: Massimiliano Torromeo < massimiliano DOT torromeo AT gmail DOT com >
 pkgname=python-beaker
 pkgver=1.5.4
-pkgrel=2
+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=('python2-distribute')
+makedepends=('setuptools')
 source=("http://cheeseshop.python.org/packages/source/B/Beaker/Beaker-$pkgver.tar.gz")
 md5sums=('de84e7511119dc0b8eb4ac177d3e2512')
 
diff --git a/abs/extra/community/python-chardet/PKGBUILD b/abs/core/python_modules/python-chardet/PKGBUILD
index 6ed1086..d3e67d0 100644
--- a/abs/extra/community/python-chardet/PKGBUILD
+++ b/abs/core/python_modules/python-chardet/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=python-chardet
 _pkgnamebase=python2-chardet
 pkgver=2.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Python module for character encoding auto-detection"
 arch=('any')
 url="http://chardet.feedparser.org"
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/extra/python-geoip/PKGBUILD b/abs/core/python_modules/python-geoip/PKGBUILD
index b8d2063..7d69154 100644
--- a/abs/extra/python-geoip/PKGBUILD
+++ b/abs/core/python_modules/python-geoip/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=python-geoip
 pkgver=1.2.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library."
 arch=(i686 x86_64)
 url="http://www.maxmind.com/app/python"
diff --git a/abs/extra/python-imaging/PKGBUILD b/abs/core/python_modules/python-imaging/PKGBUILD
index f947154..f0b5f3a 100644
--- a/abs/extra/python-imaging/PKGBUILD
+++ b/abs/core/python_modules/python-imaging/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=python-imaging
 pkgver=1.1.7
-pkgrel=4
+pkgrel=5
 pkgdesc="PIL. Provides image processing capabilities for python"
 arch=('i686' 'x86_64')
 url="http://www.pythonware.com/products/pil/index.htm"
diff --git a/abs/extra/python-imaging/__changelog b/abs/core/python_modules/python-imaging/__changelog
index 91214ed..91214ed 100644
--- a/abs/extra/python-imaging/__changelog
+++ b/abs/core/python_modules/python-imaging/__changelog
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/extra/python-lxml/PKGBUILD b/abs/core/python_modules/python-lxml/PKGBUILD
index fbec415..606ec54 100644
--- a/abs/extra/python-lxml/PKGBUILD
+++ b/abs/core/python_modules/python-lxml/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=python-lxml
 pkgver=2.2.6
-pkgrel=3
+pkgrel=4
 pkgdesc="Python binding for the libxml2 and libxslt libraries"
 arch=('i686' 'x86_64')
 license=('BSD' 'GPL' 'custom')
diff --git a/abs/extra/python-m2crypto/PKGBUILD b/abs/core/python_modules/python-m2crypto/PKGBUILD
index 4e8a1aa..8d74cbe 100644
--- a/abs/extra/python-m2crypto/PKGBUILD
+++ b/abs/core/python_modules/python-m2crypto/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=python-m2crypto
 pkgver=0.20.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A crypto and SSL toolkit for Python"
 arch=('i686' 'x86_64')
 url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto"
diff --git a/abs/extra/python-m2crypto/openssl1.patch b/abs/core/python_modules/python-m2crypto/openssl1.patch
index 59dba55..59dba55 100644
--- a/abs/extra/python-m2crypto/openssl1.patch
+++ b/abs/core/python_modules/python-m2crypto/openssl1.patch
diff --git a/abs/extra/community/python-mako/PKGBUILD b/abs/core/python_modules/python-mako/PKGBUILD
index 8d68c9b..987116a 100644
--- a/abs/extra/community/python-mako/PKGBUILD
+++ b/abs/core/python_modules/python-mako/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Roberto Alsina <ralsina@kde.org>
 pkgname=python-mako
 pkgver=0.3.4
-pkgrel=4
+pkgrel=5
 pkgdesc="Hyperfast and lightweight templating for the Python platform."
 arch=('any')
 url="http://www.makotemplates.org/"
diff --git a/abs/extra/community/python-markupsafe/PKGBUILD b/abs/core/python_modules/python-markupsafe/PKGBUILD
index 92c9282..f3563c9 100644
--- a/abs/extra/community/python-markupsafe/PKGBUILD
+++ b/abs/core/python_modules/python-markupsafe/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=python-markupsafe
 pkgver=0.9.2
-pkgrel=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"
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/extra/python-oauth/PKGBUILD b/abs/core/python_modules/python-oauth/PKGBUILD
index 523867f..1404fec 100644
--- a/abs/extra/python-oauth/PKGBUILD
+++ b/abs/core/python_modules/python-oauth/PKGBUILD
@@ -1,13 +1,14 @@
 # Maintainer: Snowknight (hopkinsth@gmail.com)
 pkgname=python-oauth
 pkgver=1.0.1
-pkgrel=4
+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=('python2-distribute')
+makedepends=('setuptools')
 source=(http://pypi.python.org/packages/source/o/oauth/oauth-${pkgver}.tar.gz)
 md5sums=('30ed3cc8c11d7841a89feab437aabf81')
 sha1sums=('b2d7609e4852b33d0d33f0bc6ae5cab8fadca014')
diff --git a/abs/extra/python-opengl/LICENSE b/abs/core/python_modules/python-opengl/LICENSE
index 11d88fb..11d88fb 100644
--- a/abs/extra/python-opengl/LICENSE
+++ b/abs/core/python_modules/python-opengl/LICENSE
diff --git a/abs/extra/python-opengl/PKGBUILD b/abs/core/python_modules/python-opengl/PKGBUILD
index d0638b1..e4ff382 100644
--- a/abs/extra/python-opengl/PKGBUILD
+++ b/abs/core/python_modules/python-opengl/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=python-opengl
 pkgver=3.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="The cross platform Python binding to OpenGL and related APIs"
 url="http://pyopengl.sourceforge.net"
 license=('BSD')
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/extra/python-pybluez/PKGBUILD b/abs/core/python_modules/python-pybluez/PKGBUILD
index 275720f..f667d66 100644
--- a/abs/extra/python-pybluez/PKGBUILD
+++ b/abs/core/python_modules/python-pybluez/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=python-pybluez
 pkgver=0.18
-pkgrel=2
+pkgrel=3
 pkgdesc="Python wrapper for the BlueZ Bluetooth stack"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/pybluez/"
@@ -19,6 +19,6 @@ md5sums=('be8c8ce615c3189fda1aaf3d568314b2')
 build() {
   cd $srcdir/PyBluez-$pkgver
   python2 setup.py install --root=$pkgdir
-  ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.7/site-packages/_bluetooth.so
+  ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.6/site-packages/_bluetooth.so
 }
 
diff --git a/abs/extra/python-pycurl/PKGBUILD b/abs/core/python_modules/python-pycurl/PKGBUILD
index 7dd5e90..84da9ef 100644
--- a/abs/extra/python-pycurl/PKGBUILD
+++ b/abs/core/python_modules/python-pycurl/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=python-pycurl
 pkgver=7.19.0
-pkgrel=6
+pkgrel=7
 pkgdesc="A Python interface to libcurl"
 arch=('i686' 'x86_64')
 url="http://pycurl.sourceforge.net"
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/extra/python-pyserial/PKGBUILD b/abs/core/python_modules/python-pyserial/PKGBUILD
index 0cfb46c..43c5b87 100644
--- a/abs/extra/python-pyserial/PKGBUILD
+++ b/abs/core/python_modules/python-pyserial/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=python-pyserial
 pkgver=2.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Multiplatform Serial Port Module for Python"
 arch=('any')
 url="http://pyserial.sf.net"
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/extra/pyusb/PKGBUILD b/abs/core/python_modules/pyusb/PKGBUILD
index 6ad9bc3..d9349ec 100644
--- a/abs/extra/pyusb/PKGBUILD
+++ b/abs/core/python_modules/pyusb/PKGBUILD
@@ -1,13 +1,13 @@
 # Contributor: Jason Giangrande <jgiangrande@clarku.edu>
 pkgname=pyusb
 pkgver=0.4.3
-pkgrel=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=('python2-distribute')
+makedepends=('setuptools')
 source=(http://downloads.sourceforge.net/project/pyusb/PyUSB%200.x/$pkgver/pyusb-$pkgver.tar.gz)
 md5sums=('a1a43bc6407caccbc22073c56439aa06')
 
diff --git a/abs/extra/community/pyxdg/PKGBUILD b/abs/core/python_modules/pyxdg/PKGBUILD
index 8c3d7bc..a3aca49 100644
--- a/abs/extra/community/pyxdg/PKGBUILD
+++ b/abs/core/python_modules/pyxdg/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=pyxdg
 pkgver=0.19
-pkgrel=2
+pkgrel=3
 pkgdesc="Python library to access freedesktop.org standards."
 arch=('any')
 url="http://freedesktop.org/Software/pyxdg"
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
diff --git a/abs/extra/bash-completion/cowsay.bashcomp b/abs/extra/bash-completion/cowsay.bashcomp
deleted file mode 100644
index 77d8be9..0000000
--- a/abs/extra/bash-completion/cowsay.bashcomp
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/games-misc/cowsay/files/cowsay.bashcomp,v 1.1 2005/02/06 14:37:54 ka0ttic Exp $
-
-# bash command-line completion for cowsay
-# Author: Aaron Walker <ka0ttic@gentoo.org>
-# Modified by: Michal Bentkowski <mr.ecik at gmail.com>
-
-_cowsay() {
-    local cur prev opts x
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-    opts="-e -f -h -l -n -T -W -b -d -g -p -s -t -w -y"
-
-    if [[ "${cur}" == -* || ${COMP_CWORD} -eq 1 ]] ; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-        return 0
-    fi
-
-    case "${prev}" in
-        -f)
-            COMPREPLY=( $( command ls /usr/share/cowsay| \
-                sed -ne 's/^\('$cur'.*\)\.cow$/\1/p') )
-            return 0
-            ;;
-        -[eTW])
-            COMPREPLY=()
-            ;;
-    esac
-}
-complete -o filenames -F _cowsay cowsay cowthink
-
-# vim: set ft=sh tw=80 sw=4 et :
diff --git a/abs/extra/bluez/PKGBUILD b/abs/extra/bluez/PKGBUILD
index f8dfbe5..9fff334 100644
--- a/abs/extra/bluez/PKGBUILD
+++ b/abs/extra/bluez/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
 pkgname=bluez
-pkgver=4.69
+pkgver=4.81
 pkgrel=1
 pkgdesc="Libraries and tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
@@ -22,26 +22,25 @@ source=("http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.bz2"
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --libexecdir=/lib \
-        --mandir=/usr/share/man \
-        --enable-gstreamer \
-        --enable-alsa \
-        --enable-usb \
-        --enable-netlink \
-        --enable-tools \
-        --enable-bccmd \
-        --enable-hid2hci \
-        --enable-dfutool \
-        --enable-hidd \
-        --enable-pand \
-        --enable-dund \
-        --enable-cups \
-        --enable-manpages \
-        --enable-configfiles \
-        --enable-pcmciarules || return 1
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/lib \
+    --enable-gstreamer \
+    --enable-alsa \
+    --enable-usb \
+    --enable-tools \
+    --enable-bccmd \
+    --enable-dfutool \
+    --enable-hidd \
+    --enable-pand \
+    --enable-dund \
+    --disable-cups \
+    --enable-udevrules \
+    --enable-configfiles || return 1
   make || return 1
+}
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install || return 1
 
   install -D -m644 "$srcdir/$pkgname-$pkgver/network/network.conf" "$pkgdir/etc/bluetooth/" || return 1
@@ -53,8 +52,12 @@ build() {
   install -D -m755 "$srcdir/run.dund"                             "$pkgdir/etc/sv/dund/run" || return 1
   install -D -m755 "$srcdir/run.pand"                             "$pkgdir/etc/sv/pand/run" || return 1
   install -D -m755 "$srcdir/run.rfcomm"                           "$pkgdir/etc/sv/rfcomm/run" || return 1
+  
+  sed -i 's#/usr/bin/python#/usr/bin/python2#' test/simple-agent
+  install -Dm755 test/simple-agent ${pkgdir}/usr/bin/bluez-simple-agent
 }
-md5sums=('350568aa11a95eac6e56e9289ff1f91d'
+
+md5sums=('75fbc768bf626fc8f4cf466006767723'
          'd12be5b494525bb1ba6eac5c3983dd3e'
          '1c88fcd455920ad8ee0c7cae3fe15771'
          'a9c1b4da8b5a3969865272bd0fb01da2'
diff --git a/abs/extra/bluez/__Changelog b/abs/extra/bluez/__changelog
index 124d0eb..124d0eb 100644
--- a/abs/extra/bluez/__Changelog
+++ b/abs/extra/bluez/__changelog
diff --git a/abs/extra/community/firefox/browser-app-makefile.patch b/abs/extra/community/firefox/browser-app-makefile.patch
deleted file mode 100644
index 9a02c40..0000000
--- a/abs/extra/community/firefox/browser-app-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- browser/app/Makefile	2009-07-27 22:41:13.000000000 +0930
-+++ browser-new/app/Makefile	2009-07-27 22:42:51.000000000 +0930
-@@ -279,7 +279,7 @@
- 
- ifneq (,$(filter-out OS2 WINNT WINCE,$(OS_ARCH)))
- 
--$(MOZ_APP_NAME):: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
-+$(MOZ_APP_NAME): $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
- 	cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
- 		-e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" > $@
- 	chmod +x $@
diff --git a/abs/extra/community/python-beaker/__changelog b/abs/extra/community/python-beaker/__changelog
deleted file mode 100644
index 9e2b603..0000000
--- a/abs/extra/community/python-beaker/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-makedepends=('setuptools') -> makedepends=('python2-distribute')
diff --git a/abs/extra/community/transmission-cli/PKGBUILD b/abs/extra/community/transmission-cli/PKGBUILD
index 11dbf60..eaa1c08 100644
--- a/abs/extra/community/transmission-cli/PKGBUILD
+++ b/abs/extra/community/transmission-cli/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 pkgname=transmission-cli
-pkgver=2.12
+pkgver=2.13
 pkgrel=1
 pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
 arch=('i686' 'x86_64')
@@ -38,7 +38,7 @@ package() {
   install -D -m644 "$srcdir/transmission.include" "$pkgdir/etc/transmission/transmission.include" || return 1
   install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" || return 1
 }
-md5sums=('f3d34fdbbf3ae25635f9e7bf7e662cd9'
+md5sums=('eb126ae88b80487f2840896939019421'
          'b91534aaf2e403331c611c615ab2c03d'
          'ff22c13dbd52565f9e88b1de22514eb9'
          'b5a49ea375333cd0fee40f70dbac4c2e'
diff --git a/abs/extra/ddclient/ddclient-foreground.patch b/abs/extra/ddclient/ddclient-foreground.patch
deleted file mode 100644
index a814ede..0000000
--- a/abs/extra/ddclient/ddclient-foreground.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- ../ddclient-orig/ddclient	2009-10-19 22:45:15.000000000 +1030
-+++ ddclient	2009-10-19 22:50:11.000000000 +1030
-@@ -307,6 +307,7 @@
- my %variables = (
-     'global-defaults'    => {
- 	'daemon'              => setv(T_DELAY, 0, 0, 1, 0,                    interval('60s')),
-+	'foreground'          => setv(T_BOOL,  0, 0, 1, 0,                    undef),
- 	'file'                => setv(T_FILE,  0, 0, 1, "$etc$program.conf",  undef),
- 	'cache'               => setv(T_FILE,  0, 0, 1, "$cachedir$program.cache", undef),
- 	'pid'                 => setv(T_FILE,  0, 0, 1, "",                   undef),
-@@ -535,6 +536,7 @@
-     "usage: ${program} [options]",
-     "options are:",
-     [ "daemon",      "=s", "-daemon delay         : run as a daemon, specify delay as an interval." ],
-+    [ "foreground",  "!",  "-foreground           : do not fork" ],
-     [ "proxy",       "=s", "-proxy host           : use 'host' as the HTTP proxy" ],
-     [ "server",      "=s", "-server host          : update DNS information on 'host'" ],
-     [ "protocol",    "=s", "-protocol type        : update protocol used" ],
-@@ -623,7 +625,10 @@
- $SIG{'HUP'}    = sub { $caught_hup  = 1; };
- $SIG{'TERM'}   = sub { $caught_term = 1; };
- $SIG{'KILL'}   = sub { $caught_kill = 1; };
--if (opt('daemon') && !opt('force')) {
-+# don't fork() if foreground or force is on
-+if (opt('foreground') || opt('force')) {
-+    ;
-+} elsif (opt('daemon')) {
-     $SIG{'CHLD'}   = 'IGNORE';
-     my $pid = fork;
-     if ($pid < 0) {
-@@ -633,12 +638,15 @@
- 	exit 0;
-     }
-     $SIG{'CHLD'}   = 'DEFAULT';
--    $opt{'syslog'} = 1;
-     open(STDOUT, ">/dev/null");
-     open(STDERR, ">/dev/null");
-     open(STDIN,  "</dev/null");
-+}
- 
-+# write out the pid file if we're daemon'ized
-+if(opt('daemon')) {
-     write_pid();
-+    $opt{'syslog'} = 1;
- }
- 
- umask 077;
diff --git a/abs/extra/ddclient/ddclient.conf.dynamic.dyndns.sample b/abs/extra/ddclient/ddclient.conf.dynamic.dyndns.sample
deleted file mode 100644
index a492c8b..0000000
--- a/abs/extra/ddclient/ddclient.conf.dynamic.dyndns.sample
+++ /dev/null
@@ -1,162 +0,0 @@
-######################################################################
-## 
-## $Id: sample-etc_ddclient.conf 102 2008-11-01 11:23:03Z wimpunk $
-##
-## Define default global variables with lines like:
-## 	var=value [, var=value]*
-## These values will be used for each following host unless overridden
-## with a local variable definition.
-##
-## Define local variables for one or more hosts with:
-## 	var=value [, var=value]* host.and.domain[,host2.and.domain...]
-##
-## Lines can be continued on the following line by ending the line
-## with a \
-##
-##
-## Warning: not all supported routers or dynamic DNS services 
-##          are mentioned here.
-##
-######################################################################
-daemon=300				# check every 300 seconds
-syslog=yes				# log update msgs to syslog
-mail=root				# mail all msgs to root
-mail-failure=root			# mail failed update msgs to root
-pid=/var/run/ddclient.pid		# record PID in file.
-ssl=yes					# use ssl-support.  Works with
-					# ssl-library
-# postscript=script			# run script after updating.  The
-					# new IP is added as argument.
-#
-#use=watchguard-soho,        fw=192.168.111.1:80	# via Watchguard's SOHO FW
-#use=netopia-r910,           fw=192.168.111.1:80	# via Netopia R910 FW
-#use=smc-barricade,          fw=192.168.123.254:80	# via SMC's Barricade FW
-#use=netgear-rt3xx,          fw=192.168.0.1:80		# via Netgear's internet FW
-#use=linksys,                fw=192.168.1.1:80		# via Linksys's internet FW
-#use=maxgate-ugate3x00,      fw=192.168.0.1:80		# via MaxGate's UGATE-3x00  FW
-#use=elsa-lancom-dsl10,      fw=10.0.0.254:80		# via ELSA LanCom DSL/10 DSL Router
-#use=elsa-lancom-dsl10-ch01, fw=10.0.0.254:80		# via ELSA LanCom DSL/10 DSL Router
-#use=elsa-lancom-dsl10-ch02, fw=10.0.0.254:80		# via ELSA LanCom DSL/10 DSL Router
-#use=alcatel-stp,            fw=10.0.0.138:80           # via Alcatel Speed Touch Pro
-#use=xsense-aero,            fw=192.168.1.1:80          # via Xsense Aero Router
-#use=allnet-1298,            fw=192.168.1.1:80          # via AllNet 1298 DSL Router
-#use=3com-oc-remote812,	     fw=192.168.0.254:80	# via 3com OfficeConnect Remote 812
-#use=e-tech,                 fw=192.168.1.1:80          # via E-tech Router
-#use=cayman-3220h,           fw=192.168.0.1:1080        # via Cayman 3220-H DSL Router
-#
-#fw-login=admin,             fw-password=XXXXXX		# FW login and password
-#
-## To obtain an IP address from FW status page (using fw-login, fw-password)
-#use=fw, fw=192.168.1.254/status.htm, fw-skip='IP Address' # found after IP Address
-#
-## To obtain an IP address from Web status page (using the proxy if defined)
-#use=web, web=checkip.dyndns.org/, web-skip='IP Address' # found after IP Address
-#
-#use=ip,                     ip=127.0.0.1	# via static IP's
-#use=if,                     if=eth0		# via interfaces
-use=web					# via web
-#
-#protocol=dyndns2				# default protocol
-#proxy=fasthttp.sympatico.ca:80			# default proxy
-#server=members.dyndns.org			# default server
-#server=members.dyndns.org:8245			# default server (bypassing proxies)
-
-login=your-dynamic-dyndns-login			# default login
-password=your-dynamic-dyndns-password		# default password
-#mx=mx.for.your.host				# default MX
-#backupmx=yes|no				# host is primary MX?
-#wildcard=yes|no				# add wildcard CNAME?
-
-##
-## dyndns.org dynamic addresses
-##
-## (supports variables: wildcard,mx,backupmx)
-##
-server=members.dyndns.org,		\
-protocol=dyndns2			\
-your-dynamic-dyndns-host
-
-##
-## dyndns.org static addresses
-##
-## (supports variables: wildcard,mx,backupmx)
-##
-# static=yes,				\
-# server=members.dyndns.org,		\
-# protocol=dyndns2			\
-# your-static-host.dyndns.org
-
-##
-##
-## dyndns.org custom addresses
-##
-## (supports variables: wildcard,mx,backupmx)
-##
-# custom=yes,				\
-# server=members.dyndns.org,		\
-# protocol=dyndns2			\
-# your-domain.top-level,your-other-domain.top-level
-
-##
-## ZoneEdit (zoneedit.com)
-##
-# server=dynamic.zoneedit.com, 		\
-# protocol=zoneedit1,			\
-# login=your-zoneedit-login,  		\
-# password=your-zoneedit-password	\
-# your.any.domain,your-2nd.any.dom
-
-##
-## EasyDNS (easydns.com)
-##
-# server=members.easydns.com, 		\
-# protocol=easydns,			\
-# login=your-easydns-login,  		\
-# password=your-easydns-password	\
-# your.any.domain,your-2nd.any.domain
-
-##
-## Hammernode (hn.org) dynamic addresses
-##
-# server=dup.hn.org,             	\
-# protocol=hammernode1,         	\
-# login=your-hn-login,           	\
-# password=your-hn-password      	\
-# your-hn-host.hn.org,your-2nd-hn-host.hn.org
-
-##
-## dslreports.com dynamic-host monitoring
-##
-# server=members.dslreports.com		\
-# protocol=dslreports1,			\
-# login=dslreports-login,		\
-# password=dslreports-password		\
-# dslreports-unique-id
-
-##
-## OrgDNS.org account-configuration
-##
-# use=web, web=members.orgdns.org/nic/ip
-# server=www.orgdns.org 		\
-# protocol=dyndns2 			\
-# login=yourLoginName 			\
-# password=yourPassword 		\
-# yourSubdomain.orgdns.org
-
-##
-## dnspark.com
-## (supports variables: mx, mxpri)
-##
-# use=web, web=ipdetect.dnspark.com, web-skip='Current Address:'
-# protocol=dnspark,			\
-# server=www.dnspark.com,		\
-# your-host.dnspark.com
-
-##
-## NameCheap (namecheap.com)
-##
-# protocol=namecheap,				\
-# server=dynamicdns.park-your-domain.com,	\
-# login=my-namecheap.com-login,			\
-# password=my-namecheap.com-password		\
-# myhost.namecheap.com 
diff --git a/abs/extra/gnome-python/PKGBUILD b/abs/extra/gnome-python/PKGBUILD
deleted file mode 100644
index d9e0045..0000000
--- a/abs/extra/gnome-python/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 16730 2008-10-22 02:56:32Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sarah Hay <sarah@archlinux.org>
-
-pkgname=gnome-python
-pkgver=2.22.3
-pkgrel=3
-pkgdesc="gnome-python is a set of interfaces to gnome-libs."
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('pygtk>=2.13.0' 'pyorbit>=2.24.0' 'libgnomeui>=2.24.0')
-makedepends=('pkgconfig')
-groups=('gnome')
-options=('!libtool')
-url="http://www.pygtk.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python/2.22/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ab12d94954a57de39b25eb7903d8429c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./waf configure --prefix=/usr || return 1
-  ./waf build ${MAKEFLAGS} || return 1
-  ./waf install --destdir="${pkgdir}" || return 1
-}
diff --git a/abs/extra/gtk-doc/gtk-doc.install b/abs/extra/gtk-doc/gtk-doc.install
deleted file mode 100644
index 5e39bbf..0000000
--- a/abs/extra/gtk-doc/gtk-doc.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-cat << _EOF
-==> SGML support in gtk-doc is no longer maintained, only very old projects
-==> still use SGML. Install (open)jade for SGML support. 
-_EOF
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra/libebml/PKGBUILD b/abs/extra/libebml/PKGBUILD
index ffa4331..dfe2d6e 100644
--- a/abs/extra/libebml/PKGBUILD
+++ b/abs/extra/libebml/PKGBUILD
@@ -4,18 +4,20 @@
 
 pkgname=libebml
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Extensible Binary Meta Language library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://dl.matroska.org/downloads/libebml/"
 depends=('gcc-libs')
 license=('LGPL')
-#source=(http://www.bunkus.org/videotools/mkvtoolnix/sources/$pkgname-$pkgver.tar.bz2)
-source=($url/$pkgname-$pkgver.tar.bz2)
+source=(${url}/${pkgname}-${pkgver}.tar.bz2)
 
 build() {
- cd $startdir/src/$pkgname-$pkgver/make/linux
+ cd ${srcdir}/${pkgname}-${pkgver}/make/linux
  make || return 1
- make prefix=$startdir/pkg/usr install
+}
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}/make/linux
+ make prefix=${pkgdir}/usr install
 }
 md5sums=('6d438f03d8928d83a2d120ed02705f03')
diff --git a/abs/extra/libmatroska/PKGBUILD b/abs/extra/libmatroska/PKGBUILD
index f515d3e..4a85d50 100644
--- a/abs/extra/libmatroska/PKGBUILD
+++ b/abs/extra/libmatroska/PKGBUILD
@@ -4,17 +4,20 @@
 
 pkgname=libmatroska
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Matroska library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
+license=('LGPL')
 url="http://dl.matroska.org/downloads/libmatroska/"
 depends=('libebml>=1.0.0')
-#source=(http://www.bunkus.org/videotools/mkvtoolnix/sources/$pkgname-$pkgver.tar.bz2)
-source=($url/$pkgname-$pkgver.tar.bz2)
+source=(${url}/${pkgname}-${pkgver}.tar.bz2)
 
 build() {
- cd $startdir/src/$pkgname-$pkgver/make/linux
+ cd ${srcdir}/${pkgname}-${pkgver}/make/linux
  make sharedlib || return 1
- make prefix=$startdir/pkg/usr install
+}
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}/make/linux
+ make prefix=${pkgdir}/usr install
 }
 md5sums=('4efcf3945b17a6f0320cf1aaa326a4de')
diff --git a/abs/extra/mkvtoolnix/PKGBUILD b/abs/extra/mkvtoolnix/PKGBUILD
index 6404481..5ae4896 100644
--- a/abs/extra/mkvtoolnix/PKGBUILD
+++ b/abs/extra/mkvtoolnix/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: 03/08/04 <lefungus@altern.org>
 
 pkgname=mkvtoolnix
-pkgver=4.1.1
+pkgver=4.4.0
 pkgrel=1
 pkgdesc="Set of tools to create, edit and inspect Matroska files"
 arch=('i686' 'x86_64')
@@ -16,7 +16,10 @@ build() {
   cd ${srcdir}/${pkgname}-${pkgver}/
   ./configure --prefix=/usr \
               --with-boost-libdir=/usr/lib
-  make  || return 1
-  make DESTDIR=${pkgdir}/ install
+  ./drake  || return 1
 }
-md5sums=('6f38fefd73b8b95de3ea3feb9de4cdd7')
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./drake DESTDIR=${pkgdir} install
+}
+md5sums=('1f2ea5997066ebb65444198576e5ec4a')
diff --git a/abs/extra/monitorix/monitorix.install b/abs/extra/monitorix/monitorix.install
deleted file mode 100644
index 6c1d1bd..0000000
--- a/abs/extra/monitorix/monitorix.install
+++ /dev/null
@@ -1,30 +0,0 @@
-remove_notes() {
- echo '----------------------------------------------------------------------'
- echo 'To remove all traces of monitorix from your system, you must manually'
- echo 'remove the following dir trees (doing so will delete your databases):'
- echo
- echo '/var/lib/monitorix'
- echo '/srv/http/monitorix'
- echo '----------------------------------------------------------------------'
-}
-
-# $1: The new package version
-# $2: The old package version
-post_upgrade() {
-    echo ''
-    echo '' 
-    echo  'now edit /etc/monitorix.conf'
-    echo ' our $HOSTNAME - your hostname.'
-    echo ' our $ENABLE_LMTEMP - switch this on if you wanna log your temps.'
-    echo ' our @HDDTEMP_LIST - If you system has more than one hdd, add it to the array.'
-    echo ' stats can be seen at http://$THIS_SYSTEMS_IP/monitorix/'
-
-    echo '' 
-    echo '' 
-}
-
-post_install(){
-    . /etc/systemconfig
-    sed -i "s/^our \$HOSTNAME.*$/our \$HOSTNAME = \"${hostname}\"\; /" /etc/monitorix.conf|
-    post_upgrade
-}
diff --git a/abs/extra/nss/nss-nolocalsql.patch b/abs/extra/nss/nss-nolocalsql.patch
deleted file mode 100644
index b72cc66..0000000
--- a/abs/extra/nss/nss-nolocalsql.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -up mozilla/security/nss/lib/Makefile.nolocalsql mozilla/security/nss/lib/Makefile
---- mozilla/security/nss/lib/Makefile.nolocalsql	2007-11-06 15:12:37.000000000 +0100
-+++ mozilla/security/nss/lib/Makefile	2007-11-06 15:13:35.000000000 +0100
-@@ -62,11 +62,11 @@ ifeq ($(OS_TARGET), WINCE)
- DIRS := $(filter-out fortcrypt,$(DIRS))
- endif
- 
--ifndef MOZILLA_CLIENT
--ifndef NSS_USE_SYSTEM_SQLITE
--DIRS := sqlite $(DIRS)
--endif
--endif
-+#ifndef MOZILLA_CLIENT
-+#ifndef NSS_USE_SYSTEM_SQLITE
-+#DIRS := sqlite $(DIRS)
-+#endif
-+#endif
- 
- #######################################################################
- # (5) Execute "global" rules. (OPTIONAL)                              #
-diff -up mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/legacydb/manifest.mn
---- mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql	2007-11-06 15:10:59.000000000 +0100
-+++ mozilla/security/nss/lib/softoken/legacydb/manifest.mn	2007-11-06 15:11:07.000000000 +0100
-@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def
- 
- DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
- 
--ifdef MOZILLA_CLIENT
--INCLUDES += -I$(DIST)/include/sqlite3
--endif
-+#ifdef MOZILLA_CLIENT
-+#INCLUDES += -I$(DIST)/include/sqlite3
-+#endif
- 
- CSRCS = \
- 	dbmshim.c \
-diff -up mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/manifest.mn
---- mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql	2007-11-06 15:08:14.000000000 +0100
-+++ mozilla/security/nss/lib/softoken/manifest.mn	2007-11-06 15:10:21.000000000 +0100
-@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def
- 
- DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
- 
--ifdef MOZILLA_CLIENT
--INCLUDES += -I$(DIST)/include/sqlite3
--endif
-+#ifdef MOZILLA_CLIENT
-+#INCLUDES += -I$(DIST)/include/sqlite3
-+#endif
- 
- EXPORTS = \
- 	pkcs11.h \
-diff -up mozilla/security/nss/lib/softoken/config.mk.nolocalsql mozilla/security/nss/lib/softoken/config.mk
diff --git a/abs/extra/openjdk6/gcjwebplugin_xulrunner.diff b/abs/extra/openjdk6/gcjwebplugin_xulrunner.diff
deleted file mode 100644
index 0ed9209..0000000
--- a/abs/extra/openjdk6/gcjwebplugin_xulrunner.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am	2008-07-21 15:12:07.000000000 +0000
-+++ Makefile.am.new	2008-07-22 08:37:49.000000000 +0000
-@@ -1176,7 +1176,7 @@
- # gcjwebplugin.so.
- gcjwebplugin.so: gcjwebplugin.cc
- 	$(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \
--	  $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \
-+	  $(MOZILLA_LIBS) -Wl,-R/usr/lib/xulrunner-1.9 $(GLIB_CFLAGS) $(GLIB_LIBS) \
- 	  $(GTK_CFLAGS) $(GTK_LIBS) \
- 	  -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
- 	  -fpic -shared -o $@ $<
diff --git a/abs/extra/python-pymedia/PKGBUILD b/abs/extra/python-pymedia/PKGBUILD
deleted file mode 100755
index a23d441..0000000
--- a/abs/extra/python-pymedia/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=python-pymedia
-pkgver=1.3.5.0
-pkgrel=1
-pkgdesc="A Python library for accessing and manipulating media files"
-url="http://www.pymedia.org"
-license=""
-depends=('libvorbis' 'faad2' 'lame')
-makedepends=('python>=2.3')
-replaces=('pymedia')
-provides=('pymedia')
-arch=i686
-source=(http://easynews.dl.sourceforge.net/sourceforge/pymedia/pymedia-$pkgver.tar.gz)
-md5sums=('3b9efcd105707c6696579e3ca8852d0e')
-
-build() {
-	  cd $startdir/src/pymedia-$pkgver
-	    sed -i -e "s:/usr/local/include/lame:/usr/include/lame:g" setup.py
-	      yes "" | python setup.py install --root=$startdir/pkg --prefix=/usr
-      }
diff --git a/abs/extra/sip/PKGBUILD b/abs/extra/sip/PKGBUILD
index 6bba8f2..b17f34b 100644
--- a/abs/extra/sip/PKGBUILD
+++ b/abs/extra/sip/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=sip
 pkgver=4.11.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries"
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.com/software/sip/"
diff --git a/abs/extra/snes9x/snes9x-fixes2.patch b/abs/extra/snes9x/snes9x-fixes2.patch
deleted file mode 100644
index 6007bb6..0000000
--- a/abs/extra/snes9x/snes9x-fixes2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- snes9x-1.5-src.orig/unix/opengl.cpp	2006-06-30 13:34:57.000000000 +0000
-+++ snes9x-1.5-src/unix/opengl.cpp	2006-09-01 08:48:39.000000000 +0000
-@@ -214,7 +214,7 @@
- 
- 	// Strip dots from the version string
- 	char *ptr;
--	while (ptr = strchr (ver, '.'))
-+	while ((ptr = strchr (ver, '.')))
- 	    memmove (ptr, ptr + 1, strlen (ptr + 1) + 1);
- 	
- 	// Pad the string with zeros to 4 digits
-@@ -381,7 +381,7 @@
-                 int i = 0;
-                 for (uint32 y = 0; y < pheight; y++)
-                 {
--                    uint16 *ptr = (uint16 *) (GFX.Screen + (y + startl) * GFX.Pitch2) + startx;
-+                    uint16 *ptr = (uint16 *) (GFX.Screen + (y + startl) * GFX.Pitch) + startx;
-                     for (uint32 x = 0; x < pwidth; x++)
-                     {
-                         int color = *ptr++;
-@@ -399,7 +399,7 @@
- 		for (uint32 y = 0; y < pheight; y++)
- 		{
- 		    memmove (basetexbuffer + sizeof (uint16) * texture_size * y,
--			     (GFX.Screen + (y + startl) * GFX.Pitch2) + startx,
-+			     (GFX.Screen + (y + startl) * GFX.Pitch) + startx,
- 			     sizeof (uint16) * texture_size);
- 		}
- 		data = basetexbuffer;
diff --git a/abs/extra/snes9x/snes9x.install b/abs/extra/snes9x/snes9x.install
deleted file mode 100755
index 1528f50..0000000
--- a/abs/extra/snes9x/snes9x.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  echo ">> If you wish to use Snes9x with OpenGL try osnes9x" 
-  /bin/true
-}
-
-post_upgrade() {
-  echo ">> If you wish to use Snes9x with OpenGL try osnes9x"
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra/xulrunner/xulrunner.install b/abs/extra/xulrunner/xulrunner.install
deleted file mode 100644
index 0b4cf9c..0000000
--- a/abs/extra/xulrunner/xulrunner.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  # Ensure that the ld.so.conf file contains the xulrunner libs.
-  cp -f /etc/ld.so.conf /tmp/ld.so.conf
-  grep -v xulrunner /tmp/ld.so.conf > /etc/ld.so.conf
-  echo /usr/lib/xulrunner-1.9.1.1 >> /etc/ld.so.conf
-  /sbin/ldconfig
-}
-
-post_upgrade() {
-  post_install $*
-}