Thu May 22 04:02:47 UTC 2014

30 files changed, 92 insertions, 1154 deletions

diff --git a/extra/glib/PKGBUILD b/extra/glib/PKGBUILD
deleted file mode 100644
index d4f9b62fb..000000000
--- a/extra/glib/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 197238 2013-10-24 16:18:46Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=glib
-pkgver=1.2.10
-pkgrel=11
-pkgdesc="Common C routines used by Gtk+ and other libs"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('LGPL')
-depends=('glibc' 'sh')
-options=('!makeflags')
-install=glib.install
-source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz
-	gcc340.patch aclocal-fixes.patch glib1-autotools.patch)
-sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa'
-          'a2cc224a66aeffdcac16ebd9e8af18143cf54918'
-          'ae4438cf56c0c9264ee36f6973fb445f9a820be0'
-          '8a25fde3c79567262b3024f4e74c9ca4ee8a6279')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -Np1 -i "${srcdir}/gcc340.patch"
-  patch -Np0 -i "${srcdir}/aclocal-fixes.patch"
-  patch -Np1 -i "${srcdir}/glib1-autotools.patch"
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  if [[ $CARCH = "i686" ]]; then
-    CONFIGFLAG='--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu'
-  elif [[ $CARCH = "x86_64" ]]; then
-    CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu'
-  fi
-
-  autoreconf --force --install
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-    --infodir=/usr/share/info $CONFIGFLAG
-  make
-}
-
-check() {
-  cd ${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/glib/aclocal-fixes.patch b/extra/glib/aclocal-fixes.patch
deleted file mode 100644
index b064074aa..000000000
--- a/extra/glib/aclocal-fixes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib.m4.orig	2006-03-05 13:13:24.000000000 +0000
-+++ glib.m4	2006-03-05 13:13:35.000000000 +0000
-@@ -5,7 +5,7 @@
- dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
- dnl gthread is specified in MODULES, pass to glib-config
- dnl
--AC_DEFUN(AM_PATH_GLIB,
-+AC_DEFUN([AM_PATH_GLIB],
- [dnl 
- dnl Get the cflags and libraries from the glib-config script
- dnl
diff --git a/extra/glib/gcc340.patch b/extra/glib/gcc340.patch
deleted file mode 100644
index 941111ae7..000000000
--- a/extra/glib/gcc340.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur glib-1.2.10.orig/glib.h glib-1.2.10/glib.h
---- glib-1.2.10.orig/glib.h	2001-02-27 04:44:38.000000000 +0100
-+++ glib-1.2.10/glib.h	2004-05-27 15:50:32.436527848 +0200
-@@ -271,8 +271,10 @@
- 
- /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
-  * macros, so we can refer to them as strings unconditionally.
-+ *
-+ * Unfortunately these are _not_ treated as strings anymore in GCC3.4.
-  */
--#ifdef	__GNUC__
-+#if	defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
- #define	G_GNUC_FUNCTION		__FUNCTION__
- #define	G_GNUC_PRETTY_FUNCTION	__PRETTY_FUNCTION__
- #else	/* !__GNUC__ */
diff --git a/extra/glib/glib.install b/extra/glib/glib.install
deleted file mode 100644
index c0046feba..000000000
--- a/extra/glib/glib.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(glib.info.gz)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
diff --git a/extra/glib/glib1-autotools.patch b/extra/glib/glib1-autotools.patch
deleted file mode 100644
index 1332c9639..000000000
--- a/extra/glib/glib1-autotools.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur glib-1.2.10-orig/configure.in glib-1.2.10/configure.in
---- glib-1.2.10-orig/configure.in	2013-07-22 01:33:26.930091236 -0400
-+++ glib-1.2.10/configure.in	2013-07-22 01:35:19.988776415 -0400
-@@ -17,7 +17,7 @@
- 
- dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
- dnl are available for $ac_help expansion (don't we all *love* autoconf?)
--AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
-+AC_DIVERT_PUSH()dnl
- #
- # The following version number definitions apply to GLib, GModule and GThread
- # as a whole, so if changes occoured in any of them, they are all
-@@ -81,7 +81,7 @@
- 
- dnl figure debugging default, prior to $ac_help setup
- dnl
--AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
-+AC_DIVERT_PUSH()dnl
- if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then
- 	debug_default=yes
- else
-diff -Naur glib-1.2.10-orig/gmodule/Makefile.am glib-1.2.10/gmodule/Makefile.am
---- glib-1.2.10-orig/gmodule/Makefile.am	2013-07-22 01:33:26.933424531 -0400
-+++ glib-1.2.10/gmodule/Makefile.am	2013-07-22 01:38:46.553041607 -0400
-@@ -42,7 +42,7 @@
- libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
- 
- noinst_PROGRAMS = testgmodule
--testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
-+testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
- testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
- 
- .PHONY: files release
diff --git a/extra/gtk/PKGBUILD b/extra/gtk/PKGBUILD
deleted file mode 100644
index 24b355d64..000000000
--- a/extra/gtk/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 197249 2013-10-24 18:51:37Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gtk
-pkgver=1.2.10
-pkgrel=13
-pkgdesc="GTK+ is a multi-platform toolkit (v1)"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('LGPL')
-depends=('libxi' 'glib' 'sh')
-makedepends=('libxt')
-install=gtk.install
-source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz
-        aclocal-fixes.patch)
-sha1sums=('a5adcb909257da01ae4d4761e1d41081d06e4d7c'
-          'b034e33efb85d27f3f3fb082c404e3b6ea79259f')
-
-prepare() {
-  cd gtk+-${pkgver}
-  cp /usr/share/libtool/config/config.guess .
-  cp /usr/share/libtool/config/config.sub .
-  patch -p0 -i "${srcdir}/aclocal-fixes.patch"
-  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" configure
-}
-
-build() {
-  cd gtk+-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --mandir=/usr/share/man --infodir=/usr/share/info \
-    --with-xinput=xfree
-  make
-}
-
-package() {
-  cd gtk+-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/gtk/aclocal-fixes.patch b/extra/gtk/aclocal-fixes.patch
deleted file mode 100644
index dd2ffbd44..000000000
--- a/extra/gtk/aclocal-fixes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk.m4.orig	2006-03-05 13:18:09.000000000 +0000
-+++ gtk.m4	2006-03-05 13:18:20.000000000 +0000
-@@ -4,7 +4,7 @@
- dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
- dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
- dnl
--AC_DEFUN(AM_PATH_GTK,
-+AC_DEFUN([AM_PATH_GTK],
- [dnl 
- dnl Get the cflags and libraries from the gtk-config script
- dnl
diff --git a/extra/gtk/gtk.install b/extra/gtk/gtk.install
deleted file mode 100644
index 8758bebc3..000000000
--- a/extra/gtk/gtk.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gdk.info.gz gtk.info.gz)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
diff --git a/extra/gutenprint/PKGBUILD b/extra/gutenprint/PKGBUILD
index 205d638f0..0a8e75704 100644
--- a/extra/gutenprint/PKGBUILD
+++ b/extra/gutenprint/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198094 2013-10-30 12:46:05Z allan $
+# $Id: PKGBUILD 213362 2014-05-21 14:59:41Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gutenprint
-pkgver=5.2.9
-pkgrel=2
+pkgver=5.2.10
+pkgrel=1
 pkgdesc="Top quality printer drivers for POSIX systems"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,12 +14,13 @@ makedepends=('gimp' 'gtk2' 'cups' 'foomatic-db-engine' 'ghostscript')
 optdepends=('cups:		to use cups printer spooler(recommended)'
             'foomatic-db-engine:	to use foomatic spooler'
             'ghostscript:	adds postscript support for ijsgutenprint'
-            'gimp:		adds gutenprint plugin to gimp')
+            'gimp:		adds gutenprint plugin to gimp'
+            'libusb: required for drivers that depend on gutenprint52usb backend')
 source=(http://downloads.sourceforge.net/gimp-print/$pkgname-$pkgver.tar.bz2)
 url="http://gimp-print.sourceforge.net/"
 replaces=('gimp-print')
 options=('!emptydirs')
-md5sums=('aefbec27b96dd404d9ac9811e17d58ce')
+sha1sums=('9690f9bf0a4c4c6c5a35b43d889ca8a3216c766c')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/libiodbc/PKGBUILD b/extra/libiodbc/PKGBUILD
deleted file mode 100644
index 4b18dcff3..000000000
--- a/extra/libiodbc/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 198186 2013-10-30 13:19:46Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=libiodbc
-pkgver=3.52.8
-pkgrel=2
-pkgdesc='Independent Open DataBase Connectivity for Linux'
-arch=('i686' 'x86_64')
-url="http://www.iodbc.org/dataspace/iodbc/wiki/iODBC/"
-license=('LGPL')
-depends=('sh')
-makedepends=('chrpath')
-source=("http://downloads.sourceforge.net/iodbc/${pkgname}-${pkgver}.tar.gz")
-md5sums=('9889f95f632f10895ff53b8a22162810')
-
-build() {
-	cd ${pkgname}-${pkgver}
-	./configure --prefix=/usr \
-		--disable-static \
-		--includedir=/usr/include/libiodbc \
-		--disable-gui \
-        --disable-libodbc
-	make
-}
-
-package() {
-	cd ${pkgname}-${pkgver}
-	make DESTDIR=${pkgdir} install
-
-	chrpath -d ${pkgdir}/usr/bin/iodbctest{,w}
-	rm -rf ${pkgdir}/usr/share/libiodbc/
-}
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 3a4a38861..423ca1f4e 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 212176 2014-05-09 19:16:27Z andyrtr $
+# $Id: PKGBUILD 213367 2014-05-21 16:40:29Z lcarlier $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
-pkgver=10.1.3
+pkgver=10.1.4
 pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
@@ -13,7 +13,7 @@ url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
         LICENSE)
-md5sums=('ba6dbe2b9cab0b4de840c996b9b6a3ad'
+md5sums=('6fddee101f49b7409cd29994c34ddee7'
          '5c65a0fe315dd347e09b1f2826a1df5a')
 
 build() {
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index 56a86041f..4712a6cb9 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 211814 2014-04-27 16:13:15Z fyan $
+# $Id: PKGBUILD 213366 2014-05-21 15:56:05Z fyan $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
@@ -6,15 +6,16 @@
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=python
-pkgver=3.4.0
-pkgrel=3
+pkgver=3.4.1
+pkgrel=1
 _pybasever=3.4
 pkgdesc="Next generation of the python high-level scripting language"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.python.org/"
 depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
-makedepends=('tk>=8.6.0' 'sqlite' 'valgrind' 'bluez-libs' 'mpdecimal')
+makedepends=('tk' 'sqlite' 'valgrind' 'bluez-libs' 'mpdecimal')
+checkdepends=('gdb')
 optdepends=('python-setuptools'
             'python-pip'
             'sqlite'
@@ -24,26 +25,15 @@ optdepends=('python-setuptools'
 options=('!makeflags')
 provides=('python3')
 replaces=('python3')
-source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz
-        python3.4-test_sqlite.patch::http://hg.python.org/cpython/raw-rev/4d626a9df062
-        issue21207.patch::http://hg.python.org/cpython/raw-rev/a66524ce9551)
-sha1sums=('f54d7cf6af5dbd9bddbe31cf4772f39711381dbe'
-          'b13a0b728d8e1fe1d81dea501b064cb1032f183b'
-          '67486ae413698d6bd3c32de10a9a1e885d0097b8')
+source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
+sha1sums=('143e098efe7ee7bec8a4904ec4b322f28a067a03')
 
 prepare() {
-  cd "${srcdir}/Python-${pkgver}"
+  cd Python-${pkgver}
 
   # FS#23997
   sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py
 
-  # http://bugs.python.org/issue20901
-  patch -p1 -i "$srcdir/python3.4-test_sqlite.patch"
-
-  # http://bugs.python.org/issue21207 FS#40108
-  sed -i "62,74d" "$srcdir/issue21207.patch" # Remove conflicting NEWS part
-  patch -p1 -i "$srcdir/issue21207.patch"
-
   # Ensure that we are using the system copy of various libraries (expat, zlib, libffi, and libmpdec),
   # rather than copies shipped in the tarball
   rm -r Modules/expat
@@ -53,7 +43,7 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/Python-${pkgver}"
+  cd Python-${pkgver}
 
   # Disable bundled pip & setuptools
   ./configure --prefix=/usr \
@@ -72,22 +62,25 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/Python-${pkgver}"
+  # test_site: http://bugs.python.org/issue21535
+  # test_urllib2_localnet: domain "blackhole.snakebite.net" not exist ?!
+
+  cd Python-${pkgver}
   LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
-     "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_posixpath test_logging test_uuid
+  TERM=screen \
+     "${srcdir}/Python-${pkgver}/python" -m test.regrtest -uall -x test_posixpath test_uuid test_site test_urllib2_localnet
 }
 
 package() {
-  cd "${srcdir}/Python-${pkgver}"
+  cd Python-${pkgver}
   make DESTDIR="${pkgdir}" install maninstall
 
   # Why are these not done by default...
-  ln -sf python3               "${pkgdir}"/usr/bin/python
-  ln -sf python3-config        "${pkgdir}"/usr/bin/python-config
-  ln -sf idle3                 "${pkgdir}"/usr/bin/idle
-  ln -sf pydoc3                "${pkgdir}"/usr/bin/pydoc
-  ln -sf python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python3.1
-  ln -sf python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python.1
+  ln -s python3               "${pkgdir}"/usr/bin/python
+  ln -s python3-config        "${pkgdir}"/usr/bin/python-config
+  ln -s idle3                 "${pkgdir}"/usr/bin/idle
+  ln -s pydoc3                "${pkgdir}"/usr/bin/pydoc
+  ln -s python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python.1
 
   # Fix FS#22552
   ln -sf ../../libpython${_pybasever}m.so \
diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD
index 5765c8786..48a661fba 100644
--- a/extra/twisted/PKGBUILD
+++ b/extra/twisted/PKGBUILD
@@ -1,40 +1,72 @@
-# $Id: PKGBUILD 199383 2013-11-11 21:37:43Z eric $
+# $Id: PKGBUILD 213365 2014-05-21 15:56:04Z fyan $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor:  Douglas Soares de Andrade <douglas@archlinux.org>
 
-pkgname=twisted
-pkgver=13.2.0
+pkgbase=twisted
+pkgname=(python-twisted python2-twisted)
+pkgver=14.0.0
 pkgrel=1
 pkgdesc="Asynchronous networking framework written in Python"
 arch=('i686' 'x86_64')
 url="http://twistedmatrix.com/"
 license=('MIT')
-depends=('python2-crypto' 'python2-zope-interface')
-optdepends=('python2-pyopenssl'
-            'python2-soappy: for twisted.web.soap'
-	    'python2-pyasn1: for using conch'
-	    'pygtk: for using manhole'
-	    'tk: for using tkconch')
-install=twisted.install
-source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2)
-sha1sums=('e1d43645fd3d84dc2867f36b60d2e469a71eb01d')
+makedepends=('python-crypto' 'python2-crypto' 'python-zope-interface' 'python2-zope-interface'
+             'python-setuptools' 'python2-setuptools' 'python-service-identity' 'python2-service-identity')
+source=("http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2")
+sha1sums=('a90fae98072f8e28b9459875ce9b77f5524bbc48')
 
 prepare() {
-    cd "Twisted-$pkgver"
-    sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \
-      twisted/python/test/pullpipe.py \
-      twisted/mail/test/pop3testserver.py \
-      twisted/trial/test/scripttest.py
+  cp -a "Twisted-$pkgver"{,-py2}
+
+  cd "Twisted-$pkgver-py2"
+  sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \
+    twisted/python/test/pullpipe.py \
+    twisted/mail/test/pop3testserver.py \
+    twisted/trial/test/scripttest.py
 }
 
 build() {
-    cd "Twisted-$pkgver"
-    python2 setup.py build
+  cd "$srcdir/Twisted-$pkgver"
+  python3 setup.py build
+
+  cd "$srcdir/Twisted-$pkgver-py2"
+  python2 setup.py build
+}
+
+check() {
+  cd "$srcdir/Twisted-$pkgver"
+  #python bin/trial twisted
+
+  cd "$srcdir/Twisted-$pkgver-py2"
+  python2 bin/trial twisted || warning "Tests failed"
 }
 
-package() {
-    cd "Twisted-$pkgver"
-    python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-    install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+package_python-twisted() {
+  depends=('python-crypto' 'python-zope-interface')
+  optdepends=('python-pyopenssl'
+              'python-service-identity: for TLS client hostname verification'
+              'python-pyasn1: for using conch'
+              'tk: for using tkconch')
+
+  cd "Twisted-$pkgver"
+  python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_python2-twisted() {
+  depends=('python2-crypto' 'python2-zope-interface')
+  optdepends=('python2-pyopenssl'
+              'python2-service-identity: for TLS client hostname verification'
+              'python2-soappy: for twisted.web.soap'
+              'python2-pyasn1: for using conch'
+              'pygtk: for using manhole'
+              'tk: for using tkconch')
+  provides=("twisted=$pkgver")
+  conflicts=('twisted<14.0.0')
+  replaces=('twisted<14.0.0')
+
+  cd "Twisted-$pkgver-py2"
+  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/extra/twisted/python2-twisted.install b/extra/twisted/python2-twisted.install
new file mode 100644
index 000000000..67b3cd151
--- /dev/null
+++ b/extra/twisted/python2-twisted.install
@@ -0,0 +1,3 @@
+pre_install() {
+  rm -f /usr/lib/python2.7/site-packages/twisted/plugins/dropin.cache
+}
diff --git a/extra/twisted/twisted.install b/extra/twisted/twisted.install
deleted file mode 100644
index 8e93ffd3c..000000000
--- a/extra/twisted/twisted.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  python2 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1 || return 1
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  find /usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f
-}
diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD
index a454d8ed0..9766297bd 100644
--- a/extra/xf86-input-evdev/PKGBUILD
+++ b/extra/xf86-input-evdev/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 212138 2014-05-08 18:06:04Z andyrtr $
+# $Id: PKGBUILD 213364 2014-05-21 15:18:23Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <Alexander@archlinux.org
 
 pkgname=xf86-input-evdev
-pkgver=2.8.4
+pkgver=2.9.0
 pkgrel=1
 pkgdesc="X.org evdev input driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('glibc' 'systemd' 'mtdev')
+depends=('glibc' 'systemd' 'mtdev' 'libevdev')
 makedepends=('xorg-server-devel' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.15.0' 'X-ABI-XINPUT_VERSION<20' 'X-ABI-XINPUT_VERSION>=21')
 options=('!makeflags')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('85fade9f5e9cf70f02c877165e95b3df4cdb9e08282416122ca80218e254100c')
+sha256sums=('0c0c4aa393cb027a2304967944867a21a340bcad2e5efe630291b6906c3abc35')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/xmms/PKGBUILD b/extra/xmms/PKGBUILD
deleted file mode 100644
index 592ae820e..000000000
--- a/extra/xmms/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 197428 2013-10-25 19:50:15Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xmms
-pkgver=1.2.11
-pkgrel=7
-pkgdesc="The X MultiMedia System - a multimedia player"
-arch=('i686' 'x86_64')
-url="http://legacy.xmms2.org/"
-license=('GPL')
-depends=('gtk' 'libxxf86vm' 'libsm' 'zlib' 'desktop-file-utils')
-makedepends=('mesa' 'libmikmod' 'libvorbis' 'alsa-lib' 'libgl')
-optdepends=('libmikmod: for the MikMod input plugin' \
-            'libvorbis: for the Ogg Vorbis input plugin' \
-            'alsa-lib: for the alsa output plugin' \
-            'libgl: for the OpenGL Spectrum analyser visualization plugin')
-install=xmms.install
-source=(http://legacy.xmms2.org/${pkgname}-${pkgver}.tar.bz2 \
-	xmms-menu.patch xmms-1.2.10-crossfade-0.3.9.patch xmms-fix.diff \
-        xmms-1.2.11-CVE-2007-0653.0654.patch xmms-1.2.11-fix-http-title-mpg123.patch \
-        xmms-1.2.11-3dse.patch xmms-1.2.10-recode-id3.patch xmms-1.2.11-fix-mikmod-driver.patch \
-        xmms-1.2.10-fonts.patch xmms.16.png xmms.32.png xmms.48.png)
-sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d'
-          '27fb6e21bd6db923a425a8df8bd07a2a93867ddb'
-          'ff5c172752c8bee708d9a9ecd53864cc95a4bcc5'
-          'c227284955f2cc16f027dade670155c0f0fbc4ff'
-          '4ef47c34b27b6c868d4301b7a078b257c8604471'
-          '0c060385561ea2a4b1c7ad3bd35d3646ae9554f5'
-          '6f6db13c780ba4cbddb8613f0abd2db2823f3021'
-          '2a3b1bf17054b6bd8b1e5937de5c0ad49af8dc92'
-          '155e11b344af1ba594b4e339640bcca37c8909af'
-          '31abd37c9c57bd13b2088eb11a1e54e5aa312bf3'
-          '0089d11aa3bce67f3496592d68ee65837406e220'
-          'f24071ae484d9b55e61dba076801fa8e7976ff2f'
-          '485c67cb8c8d4678bb3b0b280d2e233b14153b22')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-# Fix xmms.desktop
-  patch -p0 < ../xmms-menu.patch
-# Patch for hang with xmms-crossfade 
-  patch -p1 < ../xmms-1.2.10-crossfade-0.3.9.patch
-# fix xmms not able to be shown double size,at least needed for x86_64
-  patch -p1 < ../xmms-fix.diff
-# Several patches from Mandriva
-  patch -p1 < ../xmms-1.2.11-fix-http-title-mpg123.patch
-  patch -p0 < ../xmms-1.2.10-recode-id3.patch
-  patch -p1 < ../xmms-1.2.11-3dse.patch
-  patch -p1 < ../xmms-1.2.10-fonts.patch
-  patch -p1 < ../xmms-1.2.11-CVE-2007-0653.0654.patch
-  patch -p1 < ../xmms-1.2.11-fix-mikmod-driver.patch
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  if [ "$CARCH" == "i686" ]; then
-    SIMDOPT="--enable-simd"
-  else
-    SIMDOPT="--disable-simd"
-  fi
-  ./configure --prefix=/usr --mandir=/usr/share/man $SIMDOPT
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  install -D -m644 xmms/xmms.desktop "${pkgdir}/usr/share/applications/xmms.desktop"
-  install -D -m644 xmms/xmms_mini.xpm "${pkgdir}/usr/share/pixmaps/xmms_mini.xpm"
-  install -D -m644 ../xmms.16.png "${pkgdir}/usr/share/pixmaps/xmms16.png"
-  install -D -m644 ../xmms.32.png "${pkgdir}/usr/share/pixmaps/xmms32.png"
-  install -D -m644 ../xmms.48.png "${pkgdir}/usr/share/pixmaps/xmms48.png"
-  ln -s /usr/share/pixmaps/xmms48.png "${pkgdir}/usr/share/pixmaps/xmms.png"
-
-  # don't want wmxmms
-  rm -rf "${pkgdir}/usr/bin/wmxmms" "${pkgdir}/usr/share/xmms"
-  rm -f "${pkgdir}"/usr/share/man/man1/{gnomexmms.1,wmxmms.1}
-}
diff --git a/extra/xmms/xmms-1.2.10-crossfade-0.3.9.patch b/extra/xmms/xmms-1.2.10-crossfade-0.3.9.patch
deleted file mode 100644
index 51c51671c..000000000
--- a/extra/xmms/xmms-1.2.10-crossfade-0.3.9.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -ur xmms-1.2.10/xmms/input.c xmms-1.2.10.patched/xmms/input.c
---- xmms-1.2.10/xmms/input.c	2003-08-08 19:10:44.000000000 +0200
-+++ xmms-1.2.10.patched/xmms/input.c	2005-11-25 00:12:36.000000000 +0100
-@@ -285,6 +285,14 @@
- 	}
- }
- 
-+gboolean input_stopped_for_restart = FALSE;  /* crossfade */
-+void input_stop_for_restart()  /* crossfade */
-+{
-+	input_stopped_for_restart = TRUE;
-+	input_stop();
-+	input_stopped_for_restart = FALSE;
-+}
-+
- void input_stop(void)
- {
- 	if (ip_data->playing && get_current_input_plugin())
-diff -ur xmms-1.2.10/xmms/input.h xmms-1.2.10.patched/xmms/input.h
---- xmms-1.2.10/xmms/input.h	2000-02-16 22:05:57.000000000 +0100
-+++ xmms-1.2.10.patched/xmms/input.h	2005-11-25 00:12:36.000000000 +0100
-@@ -34,6 +34,7 @@
- gboolean input_check_file(gchar * filename);
- void input_play(char *filename);
- void input_stop(void);
-+void input_stop_for_restart(void);
- void input_pause(void);
- int input_get_time(void);
- void input_set_eq(int on, float preamp, float *bands);
-diff -ur xmms-1.2.10/xmms/main.c xmms-1.2.10.patched/xmms/main.c
---- xmms-1.2.10/xmms/main.c	2004-02-23 21:31:43.000000000 +0100
-+++ xmms-1.2.10.patched/xmms/main.c	2005-11-25 00:12:36.000000000 +0100
-@@ -881,8 +881,10 @@
- 	mainwin_set_shade(!cfg.player_shaded);
- }
- 
-+gboolean is_quitting = FALSE;  /* crossfade */
- void mainwin_quit_cb(void)
- {
-+	is_quitting = TRUE;  /* crossfade */
- 	input_stop();
- 	gtk_widget_hide(equalizerwin);
- 	gtk_widget_hide(playlistwin);
-@@ -1523,7 +1525,8 @@
- 		int *pos;
- 
- 		if (get_input_playing())
--			input_stop();
-+			input_stop_for_restart();
-+		
- 		pos = gtk_clist_get_row_data(clist, GPOINTER_TO_INT(clist->selection->data));
- 		playlist_set_position(*pos);
- 		playlist_play();
-diff -ur xmms-1.2.10/xmms/playlist.c xmms-1.2.10.patched/xmms/playlist.c
---- xmms-1.2.10/xmms/playlist.c	2004-02-23 21:31:43.000000000 +0100
-+++ xmms-1.2.10.patched/xmms/playlist.c	2005-11-25 00:12:36.000000000 +0100
-@@ -124,7 +124,7 @@
- 		if (get_input_playing())
- 		{
- 			PL_UNLOCK();
--			input_stop();
-+			input_stop_for_restart();
- 			PL_LOCK();
- 			*restart_playing = TRUE;
- 		}
-@@ -570,7 +570,7 @@
- 	}
- 
- 	if (get_input_playing())
--		input_stop();
-+		input_stop_for_restart();
- 
- 	vis_clear_data(mainwin_vis);
- 	vis_clear_data(playlistwin_vis);
-@@ -668,7 +668,7 @@
- 	{
- 		/* We need to stop before changing playlist_position */
- 		PL_UNLOCK();
--		input_stop();
-+		input_stop_for_restart();
- 		PL_LOCK();
- 		restart_playing = TRUE;
- 	}
-@@ -723,7 +723,7 @@
- 	{
- 		/* We need to stop before changing playlist_position */
- 		PL_UNLOCK();
--		input_stop();
-+		input_stop_for_restart();
- 		PL_LOCK();
- 		restart_playing = TRUE;
- 	}
-@@ -852,7 +852,7 @@
- 	{
- 		/* We need to stop before changing playlist_position */
- 		PL_UNLOCK();
--		input_stop();
-+		input_stop_for_restart();
- 		PL_LOCK();
- 		restart_playing = TRUE;
- 	}
diff --git a/extra/xmms/xmms-1.2.10-fonts.patch b/extra/xmms/xmms-1.2.10-fonts.patch
deleted file mode 100644
index 87cd9a8ee..000000000
--- a/extra/xmms/xmms-1.2.10-fonts.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- xmms-1.2.10/xmms/main.c.fonts	2004-08-10 22:16:06.000000000 +0200
-+++ xmms-1.2.10/xmms/main.c	2004-08-12 11:49:17.905598843 +0200
-@@ -351,7 +351,8 @@
- 	cfg.no_playlist_advance = FALSE;
- 	cfg.smooth_title_scroll = TRUE;
- 	cfg.random_skin_on_play = FALSE;
--	cfg.mainwin_use_xfont = FALSE;
-+	cfg.mainwin_use_xfont = TRUE;
-+	cfg.use_fontsets = TRUE;
- 	cfg.use_pl_metadata = TRUE;
- 
- 	cfg.playlist_x = 295;
-@@ -499,9 +500,9 @@
- 		cfg.mainwin_font = NULL;
- 	}
- 	if (cfg.playlist_font == NULL)
--		cfg.playlist_font = g_strdup("-adobe-helvetica-bold-r-*-*-10-*");
-+		cfg.playlist_font = g_strdup("-*-helvetica-bold-r-*-*-10-*,*");
- 	if (cfg.mainwin_font == NULL)
--		cfg.mainwin_font = g_strdup("-adobe-helvetica-medium-r-*-*-8-*");
-+		cfg.mainwin_font = g_strdup("-*-helvetica-medium-r-*-*-8-*,*");
- 	if (cfg.gentitle_format == NULL)
- 		cfg.gentitle_format = g_strdup("%p - %t");
- 	if (cfg.outputplugin == NULL)
diff --git a/extra/xmms/xmms-1.2.10-recode-id3.patch b/extra/xmms/xmms-1.2.10-recode-id3.patch
deleted file mode 100644
index 6bd4ecf1c..000000000
--- a/extra/xmms/xmms-1.2.10-recode-id3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xmms/playlist.c.orig	2005-03-05 17:26:11.685992552 +0200
-+++ xmms/playlist.c	2005-03-05 17:28:01.524294592 +0200
-@@ -1341,7 +1341,7 @@
- 
- 	filename = g_strdup(entry->filename);
- 	
--	if (entry->title == NULL && entry->length == -1)
-+	if (entry->title == NULL)
- 	{
- 		if (playlist_get_info_entry(entry)&&(entry->title)) {
- 			title = xmms_charset_recode_id3(entry->title,0,NULL);
diff --git a/extra/xmms/xmms-1.2.11-3dse.patch b/extra/xmms/xmms-1.2.11-3dse.patch
deleted file mode 100644
index 099bf23b1..000000000
--- a/extra/xmms/xmms-1.2.11-3dse.patch
+++ /dev/null
@@ -1,503 +0,0 @@
---- xmms-1.2.11/Output/OSS/OSS.h.3dse	2003-06-11 20:44:17.000000000 +0200
-+++ xmms-1.2.11/Output/OSS/OSS.h	2007-11-18 20:51:57.000000000 +0100
-@@ -48,6 +48,11 @@
- # define IS_BIG_ENDIAN FALSE
- #endif
- 
-+#define AWE_3DSE		0x90
-+#define MIXER_BASE_DEFAULT	0x220
-+#define MIXER_REG_OFFSET	4
-+#define MIXER_DATA_OFFSET	5
-+
- extern OutputPlugin op;
- 
- typedef struct
-@@ -59,6 +64,8 @@ typedef struct
- 	gboolean use_master;
- 	gboolean use_alt_audio_device, use_alt_mixer_device;
- 	gchar *alt_audio_device, *alt_mixer_device;
-+	gint stereo;
-+	gboolean hardware_access;
- }
- OSSConfig;
- 
-@@ -82,6 +89,12 @@ int oss_get_output_time(void);
- int oss_get_written_time(void);
- void oss_set_audio_params(void);
- 
-+int oss_set_3dse(int stat);
-+int oss_get_3dse(void);
-+void oss_hw_set_3dse(int stat);
-+int oss_hw_get_3dse(void);  
-+int initHardwareAccess ();
-+
- void oss_free_convert_buffer(void);
- int (*oss_get_convert_func(int output, int input))(void **, int);
- int (*oss_get_stereo_convert_func(int output, int input))(void **, int, int);
---- xmms-1.2.11/Output/OSS/configure.c.3dse	2005-05-15 02:01:20.000000000 +0200
-+++ xmms-1.2.11/Output/OSS/configure.c	2007-11-18 20:51:57.000000000 +0100
-@@ -24,6 +24,10 @@ static GtkWidget *mixer_usemaster_check,
- static GtkWidget *adevice_use_alt_check, *audio_alt_device_entry;
- static GtkWidget *mdevice_use_alt_check, *mixer_alt_device_entry;
- static gint audio_device, mixer_device;
-+static GtkWidget *stereo_check_button, *stereo_frame, *stereo_box;
-+static GtkWidget *stereo_label, *stereo_align_button, *stereo_align_label;
-+static GtkWidget *save3dse_check_button, *stereo_table, *hw_check_button; 
-+
- 
- static void configure_win_ok_cb(GtkWidget * w, gpointer data)
- {
-@@ -69,6 +73,8 @@ static void configure_win_ok_cb(GtkWidge
- 	xmms_cfg_write_string(cfgfile, "OSS", "alt_audio_device", oss_cfg.alt_audio_device);
- 	xmms_cfg_write_boolean(cfgfile, "OSS", "use_alt_mixer_device", oss_cfg.use_alt_mixer_device);
- 	xmms_cfg_write_string(cfgfile, "OSS", "alt_mixer_device", oss_cfg.alt_mixer_device);
-+	xmms_cfg_write_int(cfgfile, "OSS", "stereo", oss_cfg.stereo);
-+	xmms_cfg_write_boolean(cfgfile, "OSS", "hardware", oss_cfg.hardware_access);
- 	xmms_cfg_write_default_file(cfgfile);
- 	xmms_cfg_free(cfgfile);
- 
-@@ -85,6 +91,98 @@ static void configure_win_mixer_dev_cb(G
- 	mixer_device = device;
- }
- 
-+static void stereo_check_button_cb(GtkWidget * widget, gpointer data) 
-+{
-+	if (GTK_TOGGLE_BUTTON(widget)->active)
-+	{
-+		if (oss_cfg.stereo != -1)
-+			oss_cfg.stereo = 1;
-+		if (oss_cfg.hardware_access)
-+			oss_hw_set_3dse(1);
-+		else
-+			oss_set_3dse(1);
-+	}
-+	else
-+	{
-+		if (oss_cfg.stereo != -1)
-+			oss_cfg.stereo = 0;
-+		if (oss_cfg.hardware_access)
-+			oss_hw_set_3dse(0);
-+		else
-+			oss_set_3dse(0);
-+	}	
-+}
-+
-+static void save3dse_check_button_cb(GtkWidget * widget, gpointer data) 
-+{
-+	if (GTK_TOGGLE_BUTTON(widget)->active)
-+	{
-+		if (GTK_TOGGLE_BUTTON(data)->active)
-+			oss_cfg.stereo = 1;
-+		else
-+			oss_cfg.stereo = 0;	
-+	}
-+	else
-+	{
-+		oss_cfg.stereo = -1;
-+	}	
-+}
-+
-+void warning_dialog(void)
-+{
-+	GtkWidget *dialog_window, *button, *label;
-+  	dialog_window = gtk_dialog_new();
-+  	gtk_window_set_title(GTK_WINDOW(dialog_window), 
-+		"WARNING: DIRECT ACCESS");
-+  	gtk_window_set_policy(GTK_WINDOW(dialog_window), FALSE, FALSE, TRUE);
-+  	gtk_window_set_position(GTK_WINDOW(dialog_window), GTK_WIN_POS_MOUSE);
-+  	button = gtk_button_new_with_label("Dismiss");
-+  	gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
-+		GTK_SIGNAL_FUNC(gtk_widget_destroy), (gpointer)dialog_window);
-+  	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog_window)->action_area),
-+		button, TRUE, FALSE, 0);
-+  	gtk_widget_show(button);
-+  	label = gtk_label_new(
-+		"Direct hardware access can cause damage to your sound card.\n"
-+		"Only use this option when you are using OSS drivers that\n"
-+		"doesn't support the SND_MIXER_3DSE ioctl.\n"
-+		"USE THIS OPTION AT YOUR OWN RISK !!!\n"
-+		"You can use the environment variable \"BLASTER\" to manual\n"
-+		"set the port of the mixer of your sound card. Only use this\n"
-+		"option when you really know the mixer address. The default\n"
-+		"value is 0x220. Example:\n"
-+		"    BLASTER=M230 ; export BLASTER\n"
-+		"SETTING THE WRONG BLASTER ENVIRONMENT CAN\n"
-+		"CAUSE YOUR SYSTEM TO CRASH AND CAN CAUSE\n"
-+		"PERMANENT DAMAGE !!!");
-+	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
-+  	gtk_misc_set_padding(GTK_MISC(label), 10, 10);
-+  	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog_window)->vbox),
-+		label, TRUE, TRUE, 0);
-+  	gtk_widget_show(label);
-+  	gtk_grab_add(dialog_window);
-+  	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-+  	gtk_widget_grab_default(button);
-+  	gtk_widget_show(dialog_window);
-+}
-+
-+static void hw_check_button_cb(GtkWidget * widget, gpointer data)
-+{
-+	if (GTK_TOGGLE_BUTTON(widget)->active)
-+		{
-+			if (oss_cfg.hardware_access == 0)
-+				warning_dialog();
-+			oss_cfg.hardware_access = 1;
-+			initHardwareAccess ();
-+			gtk_widget_set_sensitive(stereo_check_button, TRUE);
-+			gtk_widget_set_sensitive(save3dse_check_button, TRUE);
-+		}
-+	else
-+		{
-+			oss_cfg.hardware_access = 0;
-+		}
-+}
-+
- static void audio_device_toggled(GtkToggleButton * widget, gpointer data)
- {
- 	gboolean use_alt_audio_device = gtk_toggle_button_get_active(widget);
-@@ -148,10 +246,38 @@ static void scan_devices(gchar * type, G
- 	}
- 	else
- 	{
--		item = gtk_menu_item_new_with_label(_("Default"));
--		gtk_signal_connect(GTK_OBJECT(item), "activate", sigfunc, (gpointer) 0);
--		gtk_widget_show(item);
--		gtk_menu_append(GTK_MENU(menu), item);
-+#ifdef SOUND_MIXER_INFO
-+		int i, fd;
-+		gchar *dev_name;
-+		mixer_info info;
-+		for (i = 0; i < 10; i++) {
-+			if (i)
-+				dev_name = g_strdup_printf ("/dev/mixer%d", i);
-+			else
-+				dev_name = g_strdup_printf ("/dev/mixer");
-+			if ((fd = open (dev_name, O_RDONLY)) != -1) {
-+				if (ioctl (fd, SOUND_MIXER_INFO, &info) != -1) {
-+					if (!index) 
-+						temp = g_strdup_printf ("Default (%s)", info.name);
-+					else 
-+						temp = g_strdup_printf ("%s", info.name);
-+					item = gtk_menu_item_new_with_label (temp);
-+					g_free (temp);
-+					gtk_signal_connect(GTK_OBJECT(item), "activate", sigfunc, (gpointer) index++);
-+					gtk_widget_show(item);
-+					gtk_menu_append(GTK_MENU(menu), item);
-+				}
-+				close(fd);
-+			}
-+			g_free(dev_name);
-+		}
-+#endif
-+		if (!index) {
-+			item = gtk_menu_item_new_with_label(_("Default"));
-+			gtk_signal_connect(GTK_OBJECT(item), "activate", sigfunc, (gpointer) 0);
-+			gtk_widget_show(item);
-+			gtk_menu_append(GTK_MENU(menu), item);
-+		}
- 	}
- 	gtk_option_menu_set_menu(GTK_OPTION_MENU(option_menu), menu);
- }
-@@ -300,6 +426,69 @@ void oss_configure(void)
- 	gtk_table_attach_defaults(GTK_TABLE(mixer_table), mixer_usemaster_check, 0, 1, 0, 1);
- 	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), mixer_frame, gtk_label_new(_("Mixer")));
- 
-+	stereo_frame = gtk_frame_new("3D Stereo Enhancement:");
-+	gtk_container_set_border_width(GTK_CONTAINER(stereo_frame), 5);
-+	gtk_widget_show(stereo_frame);
-+	stereo_box = gtk_vbox_new(FALSE, 0);
-+	gtk_widget_show(stereo_box);
-+	stereo_table = gtk_table_new(3, 1, FALSE);
-+	gtk_widget_show(stereo_table);
-+	stereo_check_button = gtk_check_button_new_with_label("3D Stereo Enhancement");
-+	gtk_signal_connect(GTK_OBJECT(stereo_check_button), "toggled",
-+	GTK_SIGNAL_FUNC(stereo_check_button_cb), NULL);
-+	save3dse_check_button = gtk_check_button_new_with_label("Save 3DSE setting");
-+	gtk_signal_connect(GTK_OBJECT(save3dse_check_button), "toggled",
-+	GTK_SIGNAL_FUNC(save3dse_check_button_cb), stereo_check_button);
-+	hw_check_button = gtk_check_button_new_with_label("Direct hardware access");
-+	gtk_signal_connect(GTK_OBJECT(hw_check_button), "toggled",
-+	GTK_SIGNAL_FUNC(hw_check_button_cb), hw_check_button);
-+	if (oss_cfg.stereo != -1) 
-+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(save3dse_check_button), TRUE);
-+	if (oss_cfg.hardware_access) 
-+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(hw_check_button), TRUE);
-+	if (getuid () != 0 || geteuid () != 0)
-+		gtk_widget_set_sensitive(hw_check_button, FALSE);
-+	switch(oss_get_3dse())
-+	{
-+	case 1:
-+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(stereo_check_button), TRUE);
-+	case 0:
-+		gtk_widget_set_sensitive(hw_check_button, FALSE);
-+		oss_cfg.hardware_access = FALSE;
-+		break;
-+	case -1:
-+		if (!oss_cfg.hardware_access) 
-+			{
-+				gtk_widget_set_sensitive(stereo_check_button, FALSE);
-+				gtk_widget_set_sensitive(save3dse_check_button, FALSE);
-+			}
-+		else
-+			if(oss_hw_get_3dse())
-+				gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(stereo_check_button), TRUE);
-+		break;
-+	}
-+	gtk_table_attach_defaults(GTK_TABLE(stereo_table), stereo_check_button, 0, 1, 0, 1);
-+	gtk_widget_show(stereo_check_button);
-+	gtk_table_attach_defaults(GTK_TABLE(stereo_table), save3dse_check_button, 0, 1, 1, 2);
-+	gtk_widget_show(save3dse_check_button);
-+	gtk_table_attach_defaults(GTK_TABLE(stereo_table), hw_check_button, 0, 1, 2, 3);
-+	gtk_widget_show(hw_check_button);
-+	stereo_align_button = gtk_alignment_new(0.2, 0.5, 0, 0);
-+	gtk_container_add(GTK_CONTAINER(stereo_align_button), stereo_table);
-+	gtk_widget_show(stereo_align_button);
-+	stereo_label = gtk_label_new("Please note that not all sound cards support this feature.\n"
-+		"Supported: SoundBlaster 16, ViBRA, AWE32/64.");
-+	gtk_label_set_justify(GTK_LABEL(stereo_label), GTK_JUSTIFY_LEFT);
-+	gtk_misc_set_padding(GTK_MISC(stereo_label), 5, 5);
-+	gtk_widget_show(stereo_label);
-+	stereo_align_label = gtk_alignment_new(0, 0, 0, 0);
-+	gtk_container_add(GTK_CONTAINER(stereo_align_label), stereo_label);
-+	gtk_widget_show(stereo_align_label);
-+	gtk_box_pack_end(GTK_BOX(stereo_box), stereo_align_label, FALSE, FALSE, 0);
-+	gtk_box_pack_end(GTK_BOX(stereo_box), stereo_align_button, TRUE, FALSE, 0);
-+	gtk_container_add(GTK_CONTAINER(stereo_frame), stereo_box);
-+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), stereo_frame, gtk_label_new("3DSE"));
-+
- 	bbox = gtk_hbutton_box_new();
- 	gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- 	gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
-@@ -317,4 +506,5 @@ void oss_configure(void)
- 	gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 0);
- 
- 	gtk_widget_show_all(configure_win);
-+	gtk_notebook_set_page(GTK_NOTEBOOK(notebook), 0);
- }
---- xmms-1.2.11/Output/OSS/init.c.3dse	2001-03-08 06:49:47.000000000 +0100
-+++ xmms-1.2.11/Output/OSS/init.c	2007-11-18 20:51:57.000000000 +0100
-@@ -33,6 +33,8 @@ void oss_init(void)
- 	oss_cfg.use_alt_audio_device = FALSE;
- 	oss_cfg.alt_audio_device = NULL;
- 	oss_cfg.use_master=0;
-+	oss_cfg.stereo = -1; /* = 3dse setting not saved */
-+	oss_cfg.hardware_access = FALSE;
- 	
- 	if ((cfgfile = xmms_cfg_open_default_file()))
- 	{
-@@ -45,6 +47,32 @@ void oss_init(void)
- 		xmms_cfg_read_string(cfgfile, "OSS", "alt_audio_device", &oss_cfg.alt_audio_device);
- 		xmms_cfg_read_boolean(cfgfile, "OSS", "use_alt_mixer_device", &oss_cfg.use_alt_mixer_device);
- 		xmms_cfg_read_string(cfgfile, "OSS", "alt_mixer_device", &oss_cfg.alt_mixer_device);
-+		xmms_cfg_read_int(cfgfile, "OSS", "stereo", &oss_cfg.stereo);
-+		xmms_cfg_read_boolean(cfgfile, "OSS", "hardware", &oss_cfg.hardware_access);
- 		xmms_cfg_free(cfgfile);
- 	}
-+	if (oss_cfg.hardware_access)
-+		if (initHardwareAccess() == -1)
-+			oss_cfg.hardware_access = FALSE;
-+
-+	if (oss_cfg.hardware_access)
-+		switch(oss_cfg.stereo)
-+		{
-+		case 0:
-+			oss_hw_set_3dse(0);
-+			break;
-+		case 1:
-+			oss_hw_set_3dse(1);
-+			break;
-+		}
-+	else
-+		switch(oss_cfg.stereo)
-+		{
-+		case 0:
-+			oss_set_3dse(0);
-+			break;
-+		case 1:
-+			oss_set_3dse(1);
-+			break;
-+		}
- }
---- xmms-1.2.11/Output/OSS/mixer.c.3dse	2001-06-16 15:30:35.000000000 +0200
-+++ xmms-1.2.11/Output/OSS/mixer.c	2007-11-18 20:51:57.000000000 +0100
-@@ -32,6 +32,10 @@ static char* get_mixer_device(void)
- 	return name;
- }
- 
-+#include <sys/io.h>
-+
-+static int mixer_reg = 0, mixer_data = 0;
-+
- void oss_get_volume(int *l, int *r)
- {
- 	int fd, v, cmd, devs;
-@@ -64,6 +68,156 @@ void oss_get_volume(int *l, int *r)
- 	}
- }
- 
-+int oss_set_3dse(int stat)
-+{
-+	int fd;
-+	gchar *devname;
-+
-+	if ((stat != 0) && (stat != 1))
-+		return -1;
-+
-+	if (oss_cfg.mixer_device > 0)
-+		devname = g_strdup_printf("/dev/mixer%d", oss_cfg.mixer_device);
-+	else
-+		devname = g_strdup("/dev/mixer");
-+	fd = open(devname, O_RDONLY);
-+	g_free(devname);
-+
-+	if (fd != -1)
-+	{
-+		if (ioctl(fd, SOUND_MIXER_3DSE, &stat) < 0)
-+		{
-+			close(fd);
-+			return -1;
-+		}
-+		else
-+		{
-+			close(fd);
-+			return stat;
-+		}
-+	}
-+	return -1;
-+}
-+
-+int oss_get_3dse(void) 
-+{
-+	int fd, test_stat;
-+	gchar *devname;
-+
-+	if (oss_cfg.mixer_device > 0)
-+		devname = g_strdup_printf("/dev/mixer%d", oss_cfg.mixer_device);
-+	else
-+		devname = g_strdup("/dev/mixer");
-+	fd = open(devname, O_RDONLY);
-+	g_free(devname);
-+
-+	if (fd != -1)
-+	{
-+		test_stat = 2; /* code 2 will request status */
-+		if (ioctl(fd, SOUND_MIXER_3DSE, &test_stat) < 0)
-+		{
-+			close(fd);
-+			return -1;
-+		}
-+		else
-+		{
-+			close(fd);
-+			return test_stat;
-+		}
-+	}
-+	return -1;	
-+}
-+
-+static void check_legal_mixer ()
-+{
-+	if (!mixer_reg || !mixer_data)
-+	{
-+		fprintf(stderr, "Illegal mixer settings...\n");
-+		exit(1);
-+	}
-+}
-+
-+void oss_hw_set_3dse(int stat)
-+{
-+	unsigned char b;
-+	check_legal_mixer ();
-+	switch(stat)
-+	{
-+	case 1:
-+		outb(AWE_3DSE, mixer_reg);
-+		b = inb(mixer_data);
-+		b |= 1;
-+		outb(b, mixer_data);
-+		break;
-+	case 0:
-+		outb(AWE_3DSE, mixer_reg);
-+		b = inb(mixer_data);
-+		b &= 0xff - 1;
-+		outb(b, mixer_data);
-+		break;
-+	}
-+}
-+
-+int oss_hw_get_3dse(void) 
-+{
-+	unsigned char b;
-+	check_legal_mixer ();
-+	outb(AWE_3DSE, mixer_reg);
-+	b = inb(mixer_data);
-+	return (b & 1);
-+}
-+
-+int initHardwareAccess () 
-+{
-+	char *blasterEnv, *Aptr, *Mptr;
-+	int tmp, mixer_base = 0;
-+
-+	if ((blasterEnv = getenv ("BLASTER"))) 
-+	{
-+		Aptr = blasterEnv;
-+		while ((Aptr = strchr(Aptr, 'A')))
-+			if ((tmp = strtol(++Aptr, &Aptr, 16)))
-+				mixer_base = tmp;
-+		Mptr = blasterEnv;
-+		while ((Mptr = strchr(Mptr, 'M')))
-+			if ((tmp = strtol(++Mptr, &Mptr, 16)))
-+				mixer_base = tmp;
-+	}
-+	if (!mixer_base) 
-+	{
-+		mixer_base = MIXER_BASE_DEFAULT;
-+	}
-+	else 
-+	{
-+		switch (mixer_base)
-+		{
-+		case 0x210:
-+		case 0x220:
-+		case 0x230:
-+		case 0x240:
-+		case 0x250:
-+		case 0x260:
-+		case 0x280:
-+			break;
-+		default:
-+			fprintf (stderr, "Illegal mixer base.\n");
-+			exit (1);
-+		}
-+	}
-+	mixer_reg = mixer_base + MIXER_REG_OFFSET;
-+	mixer_data = mixer_base + MIXER_DATA_OFFSET;
-+	if (getuid () == 0 && geteuid () == 0)
-+	{
-+		ioperm (mixer_reg, 1, 1);
-+		ioperm (mixer_data, 1, 1);
-+		return 0;
-+	}
-+	else
-+	{
-+		return -1;
-+ 	}
-+}
-+
- void oss_set_volume(int l, int r)
- {
- 	int fd, v, cmd, devs;
---- xmms-1.2.11/Output/OSS/soundcard.h.3dse	2003-06-11 23:01:12.000000000 +0200
-+++ xmms-1.2.11/Output/OSS/soundcard.h	2007-11-18 20:51:57.000000000 +0100
-@@ -1151,8 +1151,8 @@ typedef unsigned char mixer_record[128];
- /*
-  * Two ioctls for special souncard function (OSS/Free only)
-  */
--#define SOUND_MIXER_AGC  _SIOWR('M', 103, int)
--#define SOUND_MIXER_3DSE  _SIOWR('M', 104, int)
-+#define SOUND_MIXER_AGC  __SIOWR('M', 103, int)
-+#define SOUND_MIXER_3DSE  __SIOWR('M', 104, int)
- /*
-  * The SOUND_MIXER_PRIVATE# commands can be redefined by low level drivers.
-  * These features can be used when accessing device specific features.
diff --git a/extra/xmms/xmms-1.2.11-CVE-2007-0653.0654.patch b/extra/xmms/xmms-1.2.11-CVE-2007-0653.0654.patch
deleted file mode 100644
index 5fa977254..000000000
--- a/extra/xmms/xmms-1.2.11-CVE-2007-0653.0654.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- xmms-1.2.11/xmms/bmp.c.CVE-2007-0653.0654	2006-07-16 15:40:04.000000000 +0200
-+++ xmms-1.2.11/xmms/bmp.c	2007-11-18 21:23:11.000000000 +0100
-@@ -19,6 +19,12 @@
-  */
- #include "xmms.h"
- 
-+#if HAVE_STDINT_H
-+#include <stdint.h>
-+#elif !defined(UINT32_MAX)
-+#define UINT32_MAX 0xffffffffU
-+#endif
-+
- struct rgb_quad
- {
- 	guchar rgbBlue;
-@@ -183,7 +189,7 @@ GdkPixmap *read_bmp(gchar * filename)
- 	}
- 	else if (bitcount != 24 && bitcount != 16 && bitcount != 32)
- 	{
--		gint ncols, i;
-+		guint32 ncols, i;
- 
- 		ncols = offset - headSize - 14;
- 		if (headSize == 12)
-@@ -201,9 +207,17 @@ GdkPixmap *read_bmp(gchar * filename)
- 		}
- 	}
- 	fseek(file, offset, SEEK_SET);
-+	/* verify buffer size */
-+	if (!h || !w ||
-+	    w > (((UINT32_MAX - 3) / 3) / h) ||
-+	    h > (((UINT32_MAX - 3) / 3) / w)) {
-+		g_warning("read_bmp(): width(%u)*height(%u) too large", w, h);
-+		fclose(file);
-+		return NULL;
-+	}
-+	data = g_malloc0((w * 3 * h) + 3);	/* +3 is just for safety */
- 	buffer = g_malloc(imgsize);
- 	fread(buffer, imgsize, 1, file);
--	data = g_malloc0((w * 3 * h) + 3);	/* +3 is just for safety */
- 
- 	if (bitcount == 1)
- 		read_1b_rgb(buffer, imgsize, data, w, h, rgb_quads);
diff --git a/extra/xmms/xmms-1.2.11-fix-http-title-mpg123.patch b/extra/xmms/xmms-1.2.11-fix-http-title-mpg123.patch
deleted file mode 100644
index 55c06a756..000000000
--- a/extra/xmms/xmms-1.2.11-fix-http-title-mpg123.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xmms-1.2.11/Input/mpg123/common.c~	2007-11-18 20:37:41.000000000 +0100
-+++ xmms-1.2.11/Input/mpg123/common.c	2007-11-18 20:40:10.000000000 +0100
-@@ -274,6 +274,7 @@ static gboolean read_id3v2_tag(unsigned 
- 			char *songname = mpg123_title;
- 			mpg123_title =
- 				mpg123_format_song_title(tag, mpg123_filename);
-+			if (filept)
- 			mpg123_ip.set_info(mpg123_title, mpg123_length,
- 					   mpg123_bitrate * 1000,
- 					   mpg123_frequency, mpg123_stereo);
diff --git a/extra/xmms/xmms-1.2.11-fix-mikmod-driver.patch b/extra/xmms/xmms-1.2.11-fix-mikmod-driver.patch
deleted file mode 100644
index c2d1b4c77..000000000
--- a/extra/xmms/xmms-1.2.11-fix-mikmod-driver.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Input/mikmod/drv_xmms.c	2003-05-19 23:22:06.000000000 +0200
-+++ b/Input/mikmod/drv_xmms.c	2012-11-16 18:52:41.264644767 +0100
-@@ -117,6 +117,10 @@
- 	return VC_Init();
- }
- 
-+static void xmms_CommandLine(CHAR * commandLine)
-+{
-+}
-+
- MDRIVER drv_xmms =
- {
- 	NULL,
-@@ -126,5 +130,6 @@
-         "xmms",
-         NULL,
- #endif
-+	xmms_CommandLine, // Was missing
-         xmms_IsThere, 
- 	VC_SampleLoad,
diff --git a/extra/xmms/xmms-fix.diff b/extra/xmms/xmms-fix.diff
deleted file mode 100644
index a810aa20c..000000000
--- a/extra/xmms/xmms-fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- xmms-1.2.10+cvs20060429/xmms/util.c.orig	2006-11-05 12:29:59.000000000 +0800
-+++ xmms-1.2.10+cvs20060429/xmms/util.c	2006-11-05 12:30:01.000000000 +0800
-@@ -175,7 +175,7 @@ GdkImage *create_dblsize_image(GdkImage 
- 	 * This needs to be optimized
- 	 */
- 
--	dblimg = gdk_image_new(GDK_IMAGE_NORMAL, gdk_visual_get_best(), img->width << 1, img->height << 1);
-+	dblimg = gdk_image_new(GDK_IMAGE_NORMAL, gdk_visual_get_best_with_depth(img->depth), img->width << 1, img->height << 1);
- 	if (dblimg->bpp == 1)
- 	{
- 		register guint8 *srcptr, *ptr, *ptr2, pix;
diff --git a/extra/xmms/xmms-menu.patch b/extra/xmms/xmms-menu.patch
deleted file mode 100644
index 39304f9fc..000000000
--- a/extra/xmms/xmms-menu.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- xmms/xmms.desktop	2002-02-11 23:15:56.000000000 +0000
-+++ xmms.desktop	2006-02-25 14:21:03.000000000 +0000
-@@ -1,21 +1,16 @@
- [Desktop Entry]
- Name=XMMS
- Comment=X Multimedia System
--comment[az]=X Multimedya Sistemi
--comment[ca]=Sistema Multimèdia per a X
--comment[cs]=Multimediální pøehrávaè
--comment[es]=Sistema Multimedia para X
--comment[gl]=Sistema Multimedia para X
--comment[hr]=X Multimedijski Sustav
--comment[nn]=X Multimedia-system
--comment[pt_BR]=X Multimedia System
--comment[ro]=X MultiMedia Sistem
--comment[th]=ÃкºÁÑŵÔÁÕà´Õº¹ X
--comment[tr]=X Multimedya Sistem
--comment[zh_TW]=X ¦h´CÅé¨t²Î
--Encoding=Legacy-Mixed
-+Comment[es]=Sistema Multimedia para X
-+Comment[gl]=Sistema Multimedia para X
-+Comment[hr]=X Multimedijski Sustav
-+Comment[pt_BR]=X Multimedia System
-+Comment[ro]=X MultiMedia Sistem
-+Comment[tr]=X Multimedya Sistem
-+Encoding=UTF-8
- Exec=xmms
--Icon=xmms_mini.xpm
--MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg
--Terminal=0
-+Icon=xmms
- Type=Application
-+Categories=Application;AudioVideo;
-+MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg
-+Terminal=false
diff --git a/extra/xmms/xmms.16.png b/extra/xmms/xmms.16.png
deleted file mode 100644
index c7f1a768b..000000000
--- a/extra/xmms/xmms.16.png
+++ /dev/null
diff --git a/extra/xmms/xmms.32.png b/extra/xmms/xmms.32.png
deleted file mode 100644
index 1800ea571..000000000
--- a/extra/xmms/xmms.32.png
+++ /dev/null
diff --git a/extra/xmms/xmms.48.png b/extra/xmms/xmms.48.png
deleted file mode 100644
index 999cb831a..000000000
--- a/extra/xmms/xmms.48.png
+++ /dev/null
diff --git a/extra/xmms/xmms.install b/extra/xmms/xmms.install
deleted file mode 100644
index e111ef946..000000000
--- a/extra/xmms/xmms.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}