Remove packages missing from abs.

author: Michał Masłowski <mtjm@mtjm.eu> 2012-11-10 15:10:58 +0100
committer: Michał Masłowski <mtjm@mtjm.eu> 2012-11-10 15:10:58 +0100
commit: 9f050463d1b34e3f36a54aeb9ef65217530f2cd0 (patch)
tree: 0a4fca87cb224834876e3c5cf79375619bca75a4 /extra
parent: bf8d5e47ebdb788735d74c8232db8ec4a724a0bb (diff)
157 files changed, 45 insertions, 6801 deletions
diff --git a/extra/catdoc/PKGBUILD b/extra/catdoc/PKGBUILD
deleted file mode 100644
index e4399c1be..000000000
--- a/extra/catdoc/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161488 2012-06-11 21:02:16Z eric $
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Paulius Palevicius <paulius@birzai.com>
-
-pkgname=catdoc
-pkgver=0.94.3
-pkgrel=1
-pkgdesc="A convertor for Microsoft Word, Excel, PowerPoint and RTF Files to text"
-arch=(i686 x86_64 'mips64el')
-url="http://www.wagner.pp.ru/~vitus/software/catdoc/"
-license=('GPL')
-depends=('glibc')
-optdepends=('tk: for using wordview')
-options=('!makeflags')
-source=(http://ftp.de.debian.org/debian/pool/main/c/catdoc/${pkgname}_$pkgver.orig.tar.gz)
-md5sums=('61212b9fd06b0a31aa7bc9a671130f57')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's/$(prefix)/$(installroot)$(prefix)/' desktop/Makefile.in
-  sed -i 's/0.94.2/0.94.3/' configure* doc/*.1 src/makefile.tc
-  ./configure --prefix=/usr  --with-wish=/usr/bin/wish
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make installroot="$pkgdir" mandir=/usr/share/man/man1 install
-  install -d "$pkgdir"/usr/share/man/man1
-  install -m644 doc/*.1 "$pkgdir"/usr/share/man/man1
-}
diff --git a/extra/cmatrix/PKGBUILD b/extra/cmatrix/PKGBUILD
deleted file mode 100644
index 9dc5bf5df..000000000
--- a/extra/cmatrix/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 137613 2011-09-10 04:45:43Z eric $
-# Maintainer:
-
-pkgname=cmatrix
-pkgver=1.2a
-pkgrel=6.1
-pkgdesc="Let you see the matrix code in your console"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.asty.org/cmatrix/"
-license=('GPL')
-depends=('ncurses' 'fontconfig')
-install=cmatrix.install
-source=(http://www.asty.org/cmatrix/dist/$pkgname-$pkgver.tar.gz)
-md5sums=('ebfb5733104a258173a9ccf2669968a1')
-sha1sums=('ca078c10322a47e327f07a44c9a42b52eab5ad93')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  
-  install -Dm644 mtx.pcf "$pkgdir/usr/share/fonts/misc/mtx.pcf"
-  install -Dm644 matrix.fnt "$pkgdir/usr/share/kbd/consolefonts/matrix.fnt"
-  install -Dm644 matrix.psf.gz "$pkgdir/usr/share/kbd/consolefonts/matrix.psf.gz"
-}
diff --git a/extra/cmatrix/cmatrix.install b/extra/cmatrix/cmatrix.install
deleted file mode 100644
index c46fe4469..000000000
--- a/extra/cmatrix/cmatrix.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_install() {
-  fc-cache
-}
diff --git a/extra/consolekit/PKGBUILD b/extra/consolekit/PKGBUILD
deleted file mode 100644
index 46c534fc9..000000000
--- a/extra/consolekit/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 160357 2012-06-01 12:58:20Z dreisner $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: onestep_ua <onestep@ukr.net>
-
-pkgname=consolekit
-pkgver=0.4.6
-pkgrel=4.1
-pkgdesc="A framework for defining and tracking users, login sessions, and seats"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.freedesktop.org/wiki/Software/ConsoleKit"
-license=('GPL')
-depends=('polkit' 'zlib' 'libx11' 'dbus-glib')
-makedepends=('pkgconfig' 'xmlto' 'docbook-xsl')
-options=(!libtool)
-#source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-$pkgver.tar.bz2
-# this has not been released yet, so this is a snapshot
-source=(ftp://ftp.archlinux.org/other/${pkgname}/ConsoleKit-${pkgver}.tar.bz2
-        pam-foreground-compat.ck consolekit.logrotate consolekit.tmpfiles.conf)
-md5sums=('810990b607e338f06a6396c92b8a4a06'
-         'a8a4de71d9b0549b8143e5f6c2a36fc7'
-         '6fefa451d9fe2fc6d6269629d3529793'
-         '8c5a8059db515d40fae1379daf084094')
-
-build() {
-  cd "$srcdir/ConsoleKit-$pkgver"
-  ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/ConsoleKit \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system \
-      --enable-pam-module \
-      --with-pam-module-dir=/usr/lib/security \
-      --enable-docbook-docs \
-      --enable-udev-acl
-  make
-}
-
-package() {
-  cd "$srcdir/ConsoleKit-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -m755 "$srcdir/pam-foreground-compat.ck" "$pkgdir/usr/lib/ConsoleKit/run-session.d/"
-
-  # install the logrotate config
-  install -D -m644 "$srcdir/consolekit.logrotate" "$pkgdir/etc/logrotate.d/consolekit"
-
-  install -D -m644 "$srcdir/consolekit.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/consolekit.conf"
-
-  rm -rf "${pkgdir}/var/run"
-}
diff --git a/extra/consolekit/consolekit.logrotate b/extra/consolekit/consolekit.logrotate
deleted file mode 100644
index 7c5346ef8..000000000
--- a/extra/consolekit/consolekit.logrotate
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/ConsoleKit/history {
-    missingok
-    notifempty
-    delaycompress
-}
diff --git a/extra/consolekit/consolekit.tmpfiles.conf b/extra/consolekit/consolekit.tmpfiles.conf
deleted file mode 100644
index 4ec125110..000000000
--- a/extra/consolekit/consolekit.tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/ConsoleKit 0755 - - -
diff --git a/extra/consolekit/pam-foreground-compat.ck b/extra/consolekit/pam-foreground-compat.ck
deleted file mode 100644
index 7f6b122d5..000000000
--- a/extra/consolekit/pam-foreground-compat.ck
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-TAGDIR=/var/run/console
-
-[ -n "$CK_SESSION_USER_UID" ] || exit 1
-
-TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`"
-
-if [ "$1" = "session_added" ]; then
-    mkdir -p "$TAGDIR"
-    echo "$CK_SESSION_ID" >> "$TAGFILE"
-fi
-
-if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then
-    sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE"
-    [ -s "$TAGFILE" ] || rm -f "$TAGFILE"
-fi
diff --git a/extra/cpufrequtils/PKGBUILD b/extra/cpufrequtils/PKGBUILD
deleted file mode 100644
index 5b0e00772..000000000
--- a/extra/cpufrequtils/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 149475 2012-02-08 09:53:00Z pierre $
-# Maintainer: kevin <kevin@archlinux.org>
-# Contributor: phrakture <aaronmgriffin+gmail+com>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-
-pkgname=cpufrequtils
-pkgver=008
-pkgrel=2.1
-pkgdesc="Userspace tools for the kernel cpufreq subsystem"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"
-license=('GPL')
-depends=('sysfsutils')
-backup=('etc/conf.d/cpufreq')
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'cpufreq.rcd'
-        'cpufreq.confd'
-        cpufrequtils-mips.patch)
-options=('!libtool' '!makeflags')
-md5sums=('c59b71c044d463896f3247e8dd83dd7e'
-         '7f2b5085df44d2df3e7c2d0b9f6dab08'
-         'baae1f2abffc6bef2bd32a8dd8263c09'
-         'edbe311e6813f3b395a08b7f174065c1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  [ "$CARCH" = "mips64el" ] && patch -Np0 -i ${srcdir}/cpufrequtils-mips.patch
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make INSTALL="/bin/install -c" mandir=/usr/share/man DESTDIR="${pkgdir}" install
-
-  install -D -m755 ${srcdir}/cpufreq.rcd "${pkgdir}/etc/rc.d/cpufreq"
-  install -D -m644 ${srcdir}/cpufreq.confd "${pkgdir}/etc/conf.d/cpufreq"
-}
diff --git a/extra/cpufrequtils/cpufreq.confd b/extra/cpufrequtils/cpufreq.confd
deleted file mode 100644
index 218909748..000000000
--- a/extra/cpufrequtils/cpufreq.confd
+++ /dev/null
@@ -1,14 +0,0 @@
-#configuration for cpufreq control
-
-# valid governors:
-#  ondemand, performance, powersave,
-#  conservative, userspace
-#governor="ondemand"
-
-# limit frequency range (optional)
-# valid suffixes: Hz, kHz (default), MHz, GHz, THz
-#min_freq="2.25GHz"
-#max_freq="3GHz"
-
-# use freq to set up the exact cpu frequency using it with userspace governor
-#freq=
diff --git a/extra/cpufrequtils/cpufreq.rcd b/extra/cpufrequtils/cpufreq.rcd
deleted file mode 100644
index 9bc19b117..000000000
--- a/extra/cpufrequtils/cpufreq.rcd
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/cpufreq ] && . /etc/conf.d/cpufreq
-
-case "$1" in
-  start)
-    stat_busy "Setting cpufreq governing rules"
-
-	params=""
-	if [ -n "$governor" ]; then
-		mod="cpufreq_$governor"
-		params="-g $governor"
-		grep -qw "$governor" /sys/devices/system/cpu/cpu*/cpufreq/scaling_available_governors || modprobe -q $mod
-		if [ $? -eq 0 ]; then
-			if [ "$min_freq" != "" ]; then
-				params="$params -d $min_freq"
-			fi
-			if [ "$max_freq" != "" ]; then
-				params="$params -u $max_freq"
-			fi
-		else
-			stat_busy "    Cannot load governor module '$governor'"
-			stat_fail
-			exit
-		fi
-	fi
-
-	if [ "$params" != "" ]; then
-		CPUS=$(sed -ne 's/^processor.* \([0-9]\+\)$/\1/p' /proc/cpuinfo)
-		stat_append ", cpu"
-		for cpu in $CPUS; do
-			stat_append " $cpu"
-			cpufreq-set -c $cpu $params
-			if [ "$freq" != "" ]; then
-				cpufreq-set -c $cpu -f $freq
-			fi
-		done
-		stat_done
-	else
-		stat_busy "    Invalid configuration in /etc/conf.d/cpufreq"
-		stat_fail
-	fi
-	;;
-  stop)
-	# nothing to do
-	;;
-  restart)
-	$0 start
-	;;
-  set)
-	# TODO: make callable... "cpufreq set 800MHz"
-	;;
-  *)
-	echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/cpufrequtils/cpufrequtils-mips.patch b/extra/cpufrequtils/cpufrequtils-mips.patch
deleted file mode 100644
index cba8ab48b..000000000
--- a/extra/cpufrequtils/cpufrequtils-mips.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- utils/aperf.c.orig	2010-07-18 01:38:02.000000000 +0800
-+++ utils/aperf.c	2010-07-18 01:38:39.000000000 +0800
-@@ -68,11 +68,15 @@
- 
- static int cpu_has_effective_freq()
- {
-+#if defined(__i386__) || defined(__x86_64__)
- 	/* largest base level */
- 	if (cpuid_eax(0) < 6)
- 		return 0;
- 
- 	return cpuid_ecx(6) & 0x1;
-+#else
-+	return 0;
-+#endif
- }
- 
- /*
diff --git a/extra/dansguardian/PKGBUILD b/extra/dansguardian/PKGBUILD
deleted file mode 100644
index 685d936fa..000000000
--- a/extra/dansguardian/PKGBUILD
+++ /dev/null
@@ -1,155 +0,0 @@
-# $Id: PKGBUILD 161292 2012-06-08 23:30:21Z dreisner $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Manolis Tzanidakis
-
-pkgname=dansguardian
-pkgver=2.10.1.1
-pkgrel=4
-pkgdesc="Squid plugin for web content filtering."
-url="http://dansguardian.org"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
-depends=('squid' 'pcre' 'zlib')
-install=${pkgname}.install
-source=(http://dansguardian.org/downloads/2/Stable/${pkgname}-${pkgver}.tar.gz
-        dansguardian
-        dg2.10.1.1-missing.stdio.patch)
-md5sums=('0987a1c9bfbdf398118386f10279611a'
-         'a65a2cb6309670ad8978f1544907d290'
-         '3444718c00cc17337cba711ceaa1c0e5')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i ${srcdir}/dg2.10.1.1-missing.stdio.patch
-  ./configure --prefix="/usr" --with-proxyuser=proxy --with-proxygroup=proxy \
-              --sysconfdir=/etc --localstatedir=/var --enable-email
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -D data/scripts/dansguardian ${pkgdir}/etc/logrotate.d/dansguardian
-  install -D -m755 ${srcdir}/dansguardian ${pkgdir}/etc/rc.d/dansguardian
-  rmdir "$pkgdir/var/run"
-}
-
-backup=(etc/dansguardian/dansguardian.conf 
-etc/dansguardian/dansguardianf1.conf
-etc/dansguardian/downloadmanagers/default.conf
-etc/dansguardian/downloadmanagers/fancy.conf
-etc/dansguardian/authplugins/proxy-digest.conf
-etc/dansguardian/authplugins/proxy-basic.conf
-etc/dansguardian/authplugins/ident.conf
-etc/dansguardian/authplugins/ip.conf
-etc/dansguardian/lists/weightedphraselist 
-etc/dansguardian/lists/contentregexplist
-etc/dansguardian/lists/exceptionfileurllist
-etc/dansguardian/lists/exceptionextensionlist
-etc/dansguardian/lists/bannedextensionlist
-etc/dansguardian/lists/exceptionmimetypelist
-etc/dansguardian/lists/blacklists/ads/urls
-etc/dansguardian/lists/blacklists/ads/domains
-etc/dansguardian/lists/exceptionregexpurllist
-etc/dansguardian/lists/authplugins/ipgroups
-etc/dansguardian/lists/bannedregexpheaderlist
-etc/dansguardian/lists/phraselists/rta/banned
-etc/dansguardian/lists/phraselists/sport/weighted
-etc/dansguardian/lists/phraselists/proxies/weighted
-etc/dansguardian/lists/phraselists/safelabel/banned
-etc/dansguardian/lists/phraselists/peer2peer/weighted
-etc/dansguardian/lists/phraselists/drugadvocacy/weighted
-etc/dansguardian/lists/phraselists/googlesearches/banned
-etc/dansguardian/lists/phraselists/conspiracy/weighted
-etc/dansguardian/lists/phraselists/secretsocieties/weighted
-etc/dansguardian/lists/phraselists/idtheft/weighted
-etc/dansguardian/lists/phraselists/illegaldrugs/banned
-etc/dansguardian/lists/phraselists/illegaldrugs/weighted_portuguese
-etc/dansguardian/lists/phraselists/illegaldrugs/weighted
-etc/dansguardian/lists/phraselists/violence/weighted_portuguese
-etc/dansguardian/lists/phraselists/violence/weighted
-etc/dansguardian/lists/phraselists/domainsforsale/weighted
-etc/dansguardian/lists/phraselists/music/weighted
-etc/dansguardian/lists/phraselists/upstreamfilter/weighted
-etc/dansguardian/lists/phraselists/games/weighted
-etc/dansguardian/lists/phraselists/weapons/weighted_portuguese
-etc/dansguardian/lists/phraselists/weapons/weighted
-etc/dansguardian/lists/phraselists/legaldrugs/weighted
-etc/dansguardian/lists/phraselists/gore/weighted_portuguese
-etc/dansguardian/lists/phraselists/gore/weighted
-etc/dansguardian/lists/phraselists/warezhacking/weighted
-etc/dansguardian/lists/phraselists/pornography/weighted_chinese
-etc/dansguardian/lists/phraselists/pornography/weighted_malay
-etc/dansguardian/lists/phraselists/pornography/weighted_german
-etc/dansguardian/lists/phraselists/pornography/weighted_dutch
-etc/dansguardian/lists/phraselists/pornography/banned_portuguese
-etc/dansguardian/lists/phraselists/pornography/weighted_french
-etc/dansguardian/lists/phraselists/pornography/weighted_polish
-etc/dansguardian/lists/phraselists/pornography/banned
-etc/dansguardian/lists/phraselists/pornography/weighted_danish
-etc/dansguardian/lists/phraselists/pornography/weighted_japanese
-etc/dansguardian/lists/phraselists/pornography/weighted_portuguese
-etc/dansguardian/lists/phraselists/pornography/weighted_russian
-etc/dansguardian/lists/phraselists/pornography/weighted_italian
-etc/dansguardian/lists/phraselists/pornography/weighted_swedish
-etc/dansguardian/lists/phraselists/pornography/weighted
-etc/dansguardian/lists/phraselists/pornography/weighted_norwegian
-etc/dansguardian/lists/phraselists/pornography/weighted_spanish
-etc/dansguardian/lists/phraselists/personals/weighted_portuguese
-etc/dansguardian/lists/phraselists/personals/weighted
-etc/dansguardian/lists/phraselists/nudism/weighted
-etc/dansguardian/lists/phraselists/malware/weighted
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general_polish
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general_swedish
-etc/dansguardian/lists/phraselists/goodphrases/exception_email
-etc/dansguardian/lists/phraselists/goodphrases/exception
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general_danish
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general_malay
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general_dutch
-etc/dansguardian/lists/phraselists/goodphrases/weighted_general_portuguese
-etc/dansguardian/lists/phraselists/goodphrases/weighted_news
-etc/dansguardian/lists/phraselists/translation/weighted
-etc/dansguardian/lists/phraselists/chat/weighted_italian
-etc/dansguardian/lists/phraselists/chat/weighted
-etc/dansguardian/lists/phraselists/news/weighted
-etc/dansguardian/lists/phraselists/badwords/weighted_german
-etc/dansguardian/lists/phraselists/badwords/weighted_dutch
-etc/dansguardian/lists/phraselists/badwords/weighted_french
-etc/dansguardian/lists/phraselists/badwords/weighted_portuguese
-etc/dansguardian/lists/phraselists/badwords/weighted_spanish
-etc/dansguardian/lists/phraselists/webmail/weighted
-etc/dansguardian/lists/phraselists/travel/weighted
-etc/dansguardian/lists/phraselists/gambling/banned_portuguese
-etc/dansguardian/lists/phraselists/gambling/banned
-etc/dansguardian/lists/phraselists/gambling/weighted_portuguese
-etc/dansguardian/lists/phraselists/gambling/weighted
-etc/dansguardian/lists/phraselists/forums/weighted
-etc/dansguardian/lists/phraselists/intolerance/banned_portuguese
-etc/dansguardian/lists/phraselists/intolerance/weighted_portuguese
-etc/dansguardian/lists/phraselists/intolerance/weighted
-etc/dansguardian/lists/logsitelist
-etc/dansguardian/lists/logregexpurllist
-etc/dansguardian/lists/greysitelist
-etc/dansguardian/lists/filtergroupslist
-etc/dansguardian/lists/downloadmanagers/managedmimetypelist
-etc/dansguardian/lists/downloadmanagers/managedextensionlist
-etc/dansguardian/lists/exceptionfilesitelist
-etc/dansguardian/lists/bannedmimetypelist
-etc/dansguardian/lists/pics
-etc/dansguardian/lists/exceptionurllist
-etc/dansguardian/lists/logurllist
-etc/dansguardian/lists/exceptionphraselist
-etc/dansguardian/lists/bannedurllist
-etc/dansguardian/lists/headerregexplist
-etc/dansguardian/lists/bannediplist
-etc/dansguardian/lists/exceptionsitelist
-etc/dansguardian/lists/bannedphraselist
-etc/dansguardian/lists/exceptioniplist
-etc/dansguardian/lists/bannedregexpurllist
-etc/dansguardian/lists/bannedsitelist
-etc/dansguardian/lists/urlregexplist
-etc/dansguardian/lists/greyurllist)
-
-# vim: ts=2 sw=2 et ft=sh
diff --git a/extra/dansguardian/dansguardian b/extra/dansguardian/dansguardian
deleted file mode 100644
index c537da8bd..000000000
--- a/extra/dansguardian/dansguardian
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/dansguardian`
-case "$1" in
-  start)
-    stat_busy "Starting DansGuardian"
-    [ -z "$PID" ] && /usr/sbin/dansguardian
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon dansguardian
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DansGuardian"
-    [ ! -z "$PID" ]  && /usr/sbin/dansguardian -q &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon dansguardian
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/dansguardian/dansguardian.install b/extra/dansguardian/dansguardian.install
deleted file mode 100644
index 05a72ad80..000000000
--- a/extra/dansguardian/dansguardian.install
+++ /dev/null
@@ -1,8 +0,0 @@
-post_install() {
-  echo "--------------------------------------------------"
-  echo "NOTE: DansGuardian is NOT free for commercial use."
-  echo "      See http://dansguardian.org for details on"
-  echo "      setup, configuration, and licensing."
-  echo "--------------------------------------------------"
-  chown -R proxy.proxy var/log/dansguardian 
-}
diff --git a/extra/dansguardian/dg2.10.1.1-missing.stdio.patch b/extra/dansguardian/dg2.10.1.1-missing.stdio.patch
deleted file mode 100644
index b92aef008..000000000
--- a/extra/dansguardian/dg2.10.1.1-missing.stdio.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/downloadmanagers/fancy.cpp.orig	2009-09-13 18:37:56.000000000 -0400
-+++ src/downloadmanagers/fancy.cpp	2009-09-13 18:38:14.000000000 -0400
-@@ -32,6 +32,7 @@
- #include <unistd.h>
- #include <iostream>
- #include <math.h>
-+#include <cstdio>
- 
- 
- // GLOBALS
diff --git a/extra/dvdrtools/PKGBUILD b/extra/dvdrtools/PKGBUILD
deleted file mode 100644
index 138c94157..000000000
--- a/extra/dvdrtools/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 137611 2011-09-10 04:22:54Z eric $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=dvdrtools
-pkgver=0.3.1
-pkgrel=3
-pkgdesc="A fork of cdrtools, with the primary goal of supporting writable DVD drives"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://savannah.nongnu.org/projects/dvdrtools/"
-license=('GPL')
-depends=('file' 'bash')
-makedepends=('transcode')
-optdepends=('transcode: video/DVD ripper and encoder for the terminal/console')
-conflicts=('cdrkit')
-source=(ftp://ftp.archlinux.org/other/dvdrtools/$pkgname-$pkgver.tar.gz)
-md5sums=('5707b7e877b853e258cd738938833006')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/extra/eject/PKGBUILD b/extra/eject/PKGBUILD
deleted file mode 100644
index 093bfcf61..000000000
--- a/extra/eject/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 135944 2011-08-20 17:05:11Z tomegun $
-# Maintainer: Tom Gundersen <teg@jlkm.no>
-# Contributor: Natrio <natrio@list.ru>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=eject
-pkgver=2.1.5
-pkgrel=7.1
-pkgdesc="A program for ejecting removable media under software control."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://eject.sourceforge.net/"
-license=('GPL')
-depends=('glibc')
-source=("ftp://ftp.archlinux.org/other/eject/eject-${pkgver}.tar.bz2"
-        'eject-2.1.1-verbose.patch'
-        'eject-2.1.5-lock.patch'
-        'eject-2.1.5-spaces.patch'
-        'eject-2.1.5-umount.patch'
-        'eject-timeout.patch'
-        'eject-2.1.5-unlock.patch'
-        'eject-2.1.5-openrw.patch')
-md5sums=('5a6cab2184ae4ed21128054d931d558f'
-         '4fb81806de181d5f353a459b7f122081'
-         '7d18c14f7b1bb50149fd2b41215dc4f2'
-         '64f5c54dac064e6dbc427025d919221b'
-         '34221248a269703d3a47a8d2a6fdd2e2'
-         'f6b1b702ef9174e2fd05a56ee2de850e'
-         'f384f98fa689b087d99217a7403bf706'
-         'e74d742540e4f399d348af495bf00e85')
-
-build() {
-  cd "${srcdir}/eject"
-  patch -p1 -i "${srcdir}/eject-2.1.1-verbose.patch"
-  patch -p1 -i "${srcdir}/eject-2.1.5-lock.patch"
-  patch -p1 -i "${srcdir}/eject-2.1.5-spaces.patch"
-  patch -p1 -i "${srcdir}/eject-2.1.5-umount.patch"
-  patch -p1 -i "${srcdir}/eject-timeout.patch"
-  patch -p1 -i "${srcdir}/eject-2.1.5-unlock.patch"
-  patch -p1 -i "${srcdir}/eject-2.1.5-openrw.patch"
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man \
-              --enable-default-device=sr0
-  make
-}
-
-package() {
-  cd "${srcdir}/eject"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/eject/eject-2.1.1-verbose.patch b/extra/eject/eject-2.1.1-verbose.patch
deleted file mode 100644
index 44c05d881..000000000
--- a/extra/eject/eject-2.1.1-verbose.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/eject.c b/eject.c
-index b14d5f2..662ba54 100644
---- a/eject.c
-+++ b/eject.c
-@@ -709,7 +709,9 @@ static int EjectScsi(int fd)
- 	unsigned char sense_buffer[32];
- 
- 	if ((ioctl(fd, SG_GET_VERSION_NUM, &k) < 0) || (k < 30000)) {
--	  printf("not an sg device, or old sg driver\n");
-+	  if (v_option) {
-+		  printf(_("not an sg device, or old sg driver\n"));
-+	  }
- 	  return 0;
- 	}
- 
diff --git a/extra/eject/eject-2.1.5-lock.patch b/extra/eject/eject-2.1.5-lock.patch
deleted file mode 100644
index 25f84651e..000000000
--- a/extra/eject/eject-2.1.5-lock.patch
+++ /dev/null
@@ -1,171 +0,0 @@
- eject.1 |   13 +++++++++++--
- eject.c |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
- 2 files changed, 63 insertions(+), 4 deletions(-)
-
-diff --git a/eject.1 b/eject.1
-index 3c388c6..315dc6d 100644
---- a/eject.1
-+++ b/eject.1
-@@ -17,6 +17,8 @@ eject [\-vn] \-a on|off|1|0 [<name>]
- .br
- eject [\-vn] \-c slot [<name>]
- .br
-+eject [\-vn] \-i on|off|1|0 [<name>]
-+.br
- eject [\-vn] \-t [<name>]
- .br
- eject [\-vn] \-T [<name>]
-@@ -83,6 +85,13 @@ for a change request to work. Please also note that the first slot of
- the changer is referred to as 0, not 1.
- 
- .TP 0.5i
-+.B \-i on|1|off|0
-+This option controls locking of the hardware eject button. When
-+enabled, the drive will not be ejected when the button is pressed.
-+This is useful when you are carrying a laptop in a bag or case and
-+don't want it to eject if the button is inadvertently pressed.
-+
-+.TP 0.5i
- .B \-t
- With this option the drive is given a CD-ROM tray close command. Not
- all devices support this command.
-@@ -121,8 +130,8 @@ performed.
- .B \-r
- This option specifies that the drive should be ejected using a
- CDROM eject command.
--.TP 0.5i
- 
-+.TP 0.5i
- .B \-s
- This option specifies that the drive should be ejected using
- SCSI commands.
-@@ -145,7 +154,7 @@ also passes the \-n option to umount(1).
- .TP 0.5i
- .B \-m
- This option allows eject to work with device drivers which automatically
--mount removable media and therefore must be always mount()ed.
-+mount removable media and therefore must be always mount(1)ed.
- The option tells eject to not try to unmount the given device,
- even if it is mounted according to /etc/mtab or /proc/mounts.
- 
-diff --git a/eject.c b/eject.c
-index f7b2a2e..4175756 100644
---- a/eject.c
-+++ b/eject.c
-@@ -116,6 +116,7 @@ int d_option = 0;
- int f_option = 0;
- int h_option = 0;
- int n_option = 0;
-+int i_option = 0;
- int q_option = 0;
- int r_option = 0;
- int s_option = 0;
-@@ -129,6 +130,7 @@ int m_option = 0;
- int a_arg = 0;
- int c_arg = 0;
- int x_arg = 0;
-+int i_arg = 0;
- static char *programName; /* used in error messages */
- 
- /*
-@@ -163,6 +165,7 @@ static void usage()
- "  eject [-vn] -c <slot> [<name>]	-- switch discs on a CD-ROM changer\n"
- "  eject [-vn] -t [<name>]		-- close tray\n"
- "  eject [-vn] -T [<name>]		-- toggle tray\n"
-+"  eject [-vn] -i on|off|1|0 [<name>]	-- toggle manual eject protection on/off\n"
- "  eject [-vn] -x <speed> [<name>]	-- set CD-ROM max speed\n"
- "  eject [-vn] -X [<name>]		-- list CD-ROM available speeds\n"
- "Options:\n"
-@@ -200,7 +203,7 @@ static void usage()
- #endif
- "\n"
- "  -n --noop   -V --version\n"
--"  -p --proc   -m --no-unmount   -T --traytoggle\n"));
-+"  -p --proc   -m --no-unmount   -T --traytoggle -i --manualeject\n"));
- #endif /* GETOPTLONG */
- 	fprintf(stderr,_(
- "Parameter <name> can be a device file or a mount point.\n"
-@@ -214,7 +217,7 @@ static void usage()
- /* Handle command line options. */
- static void parse_args(int argc, char **argv, char **device)
- {
--	const char *flags = "a:c:x:dfhnqrstTXvVpm";
-+	const char *flags = "a:c:x:i:dfhnqrstTXvVpm";
- #ifdef GETOPTLONG
- 	static struct option long_options[] =
- 	{
-@@ -223,6 +226,7 @@ static void parse_args(int argc, char **argv, char **device)
- 		{"default",	no_argument,	   NULL, 'd'},
- 		{"auto",	required_argument, NULL, 'a'},
- 		{"changerslot", required_argument, NULL, 'c'},
-+		{"manualeject",	required_argument, NULL, 'i'},
- 		{"trayclose",	no_argument,	   NULL, 't'},
- 		{"traytoggle",	no_argument,	   NULL, 'T'},
- 		{"cdspeed",	required_argument, NULL, 'x'},
-@@ -297,6 +301,21 @@ static void parse_args(int argc, char **argv, char **device)
- 			  usage();
- 			  exit(0);
- 			  break;
-+		  case 'i':
-+			  i_option = 1;
-+			  if (!strcmp(optarg, "0"))
-+				  i_arg = 0;
-+			  else if (!strcmp(optarg, "off"))
-+				  i_arg = 0;
-+			  else if (!strcmp(optarg, "1"))
-+				  i_arg = 1;
-+			  else if (!strcmp(optarg, "on"))
-+				  i_arg = 1;
-+			  else {
-+				  fprintf(stderr, _("%s: invalid argument to -i option\n"), programName);
-+				  exit(1);
-+			  }
-+			  break;
- 		  case 'm':
- 			  m_option = 1;
- 			  break;
-@@ -482,6 +501,30 @@ static char *FindDevice(const char *name)
- }
- 
- 
-+/*
-+ * Stops CDROM from opening on manual eject pressing the button.
-+ * This can be useful when you carry your laptop
-+ * in your bag while it's on and no CD inserted in it's drive.
-+ * Implemented as found in Documentation/ioctl/cdrom.txt
-+ *
-+ * TODO: Maybe we should check this also:
-+ * EDRIVE_CANT_DO_THIS   Door lock function not supported.
-+ * EBUSY                 Attempt to unlock when multiple users
-+ *                       have the drive open and not CAP_SYS_ADMIN
-+ */
-+static void ManualEject(int fd, int onOff) 
-+{
-+	if (ioctl(fd, CDROM_LOCKDOOR, onOff) < 0) {
-+		perror("ioctl on CDROM_LOCKDOOR");
-+        } else {
-+            if (onOff)
-+	        printf("CD-Drive may NOT be ejected with device button\n");
-+            else
-+                printf("CD-Drive may be ejected with device button\n");
-+        }
-+}
-+
-+
- /* Set or clear auto-eject mode. */
- static void AutoEject(int fd, int onOff)
- {
-@@ -1233,6 +1276,13 @@ int main(int argc, char **argv)
- 		exit(0);
- 	}
- 
-+	/* handle -i option */
-+	if (i_option) {
-+		fd = OpenDevice(deviceName);
-+		ManualEject(fd, i_arg);
-+		exit(0);
-+	}
-+
- 	/* handle -a option */
- 	if (a_option) {
- 		if (v_option) {
diff --git a/extra/eject/eject-2.1.5-openrw.patch b/extra/eject/eject-2.1.5-openrw.patch
deleted file mode 100644
index 092bfcfda..000000000
--- a/extra/eject/eject-2.1.5-openrw.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -pur eject-1/eject.c eject/eject.c
---- eject-1/eject.c	2011-08-19 11:42:22.697388647 +0400
-+++ eject/eject.c	2011-08-19 11:57:27.636724026 +0400
-@@ -911,7 +911,12 @@ static void Unmount(const char *fullName
- /* Open a device file. */
- static int OpenDevice(const char *fullName)
- {
--	int fd = open(fullName, O_RDONLY|O_NONBLOCK);
-+	int fd = open(fullName, O_RDWR|O_NONBLOCK);
-+	if (fd == -1 && errno == EACCES) {
-+		if (v_option)
-+			printf(_("%s: unable to open `%s' for R/W, SCSI commands can be fail. Trying Read-Only\n"), programName, fullName);
-+		fd = open(fullName, O_RDONLY|O_NONBLOCK);
-+	}
- 	if (fd == -1) {
- 		fprintf(stderr, _("%s: unable to open `%s'\n"), programName, fullName);
- 		exit(1);
diff --git a/extra/eject/eject-2.1.5-spaces.patch b/extra/eject/eject-2.1.5-spaces.patch
deleted file mode 100644
index 40834d902..000000000
--- a/extra/eject/eject-2.1.5-spaces.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/eject.c b/eject.c
-index d67089c..f7b2a2e 100644
---- a/eject.c
-+++ b/eject.c
-@@ -370,6 +370,30 @@ static int FileExists(const char *name, const int try, int *found)
- 
- 
- /*
-+ * Linux mangles spaces in mount points by changing them to an octal string
-+ * of '\040'.  So lets scan the mount point and fix it up by replacing all
-+ * occurrences off '\0##' with the ASCII value of 0##.  Requires a writable
-+ * string as input as we mangle in place.  Some of this was taken from the
-+ * util-linux package.
-+ */
-+#define octalify(a) ((a) & 7)
-+#define tooctal(s) (64*octalify(s[1]) + 8*octalify(s[2]) + octalify(s[3]))
-+#define isoctal(a) (((a) & ~7) == '0')
-+static char *DeMangleMount(char *s)
-+{
-+	char *tmp = s;
-+	while ((tmp = strchr(tmp, '\\')) != NULL) {
-+		if (isoctal(tmp[1]) && isoctal(tmp[2]) && isoctal(tmp[3])) {
-+			tmp[0] = tooctal(tmp);
-+			memmove(tmp+1, tmp+4, strlen(tmp)-3);
-+		}
-+		++tmp;
-+	}
-+	return s;
-+}
-+
-+
-+/*
-  * Given name, such as foo, see if any of the following exist:
-  *
-  * foo (if foo starts with '.' or '/')
-@@ -882,6 +906,8 @@ static int MountedDevice(const char *name, char **mountName, char **deviceName)
- 		rc = sscanf(line, "%1023s %1023s", s1, s2);
- 		if (rc >= 2) {
- 			int mtabmaj, mtabmin;
-+			DeMangleMount(s1);
-+			DeMangleMount(s2);
- 			GetMajorMinor(s1, &mtabmaj, &mtabmin);
- 			if (((strcmp(s1, name) == 0) || (strcmp(s2, name) == 0)) ||
- 				((maj != -1) && (maj == mtabmaj) && (min == mtabmin))) {
-@@ -928,6 +954,8 @@ static int MountableDevice(const char *name, char **mountName, char **deviceName
- 
- 	while (fgets(line, sizeof(line), fp) != 0) {
- 		rc = sscanf(line, "%1023s %1023s", s1, s2);
-+		DeMangleMount(s1);
-+		DeMangleMount(s2);
- 		if (rc >= 2 && s1[0] != '#' && strcmp(s2, name) == 0) {
- 			FCLOSE(fp);
- 			*deviceName = strdup(s1);
-@@ -968,6 +996,8 @@ static void UnmountDevices(const char *pattern)
- 	while (fgets(line, sizeof(line), fp) != 0) {
- 		status = sscanf(line, "%1023s %1023s", s1, s2);
- 		if (status >= 2) {
-+			DeMangleMount(s1);
-+			DeMangleMount(s2);
- 			status = regexec(&preg, s1, 0, 0, 0);
- 			if (status == 0) {
- 				if (v_option)
diff --git a/extra/eject/eject-2.1.5-umount.patch b/extra/eject/eject-2.1.5-umount.patch
deleted file mode 100644
index 2c588a01d..000000000
--- a/extra/eject/eject-2.1.5-umount.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-diff --git a/eject.c b/eject.c
-index 4175756..057d2ea 100644
---- a/eject.c
-+++ b/eject.c
-@@ -42,6 +42,7 @@
- #include <string.h>
- #include <fcntl.h>
- #include <limits.h>
-+#include <dirent.h>
- 
- #ifdef GETOPTLONG
- #include <getopt.h>
-@@ -1133,6 +1134,145 @@ static char *MultiplePartitions(const char *name)
- 	return 0;
- }
- 
-+/*
-+ * Find device name in /sys/block/. Returns NULL if not
-+ * found. The returned pointer must be free()'d.
-+ */
-+static char* FindDeviceSysBlock(const char* deviceName)
-+{
-+	DIR *dir = opendir("/sys/block");
-+	struct dirent *d;
-+	const char *baseName = strrchr(deviceName, '/');
-+	char *device;
-+	int len;
-+	
-+	baseName = baseName ? baseName + 1 : deviceName;
-+	if (!dir) {
-+		fprintf(stderr, _("%s: can not open directory /sys/block/"), programName);
-+		return NULL;
-+	}
-+	while ((d = readdir(dir)) != NULL) { 
-+		if (d->d_type != DT_DIR && d->d_type != DT_LNK && d->d_type != DT_UNKNOWN)
-+			continue;
-+		len = strlen(d->d_name);
-+		if (!strncmp(baseName, d->d_name, len)) {
-+			if ((*(baseName+len) >= '0' &&
-+			     *(baseName+len) <= '9') ||
-+			     *(baseName+len) == '\0') {
-+				device = strdup(d->d_name);
-+				closedir(dir);
-+				return device;
-+			}
-+		}
-+	}
-+	closedir(dir);
-+	return NULL;
-+}
-+
-+/*
-+ * From given path gets a subsystem. Returns subsystem if any found
-+ * otherwise returns NULL. Returned value must not be free()'d
-+ */
-+static char *GetSubSystem(const char *sysfspath)
-+{
-+	static char subsystem[PATH_MAX];
-+	char link_subsystem[PATH_MAX];
-+	struct stat buf;
-+	char *pos;
-+
-+	snprintf(link_subsystem, sizeof(link_subsystem), "%s/subsystem", sysfspath);
-+
-+	if (lstat(link_subsystem, &buf) == -1)
-+		return NULL;
-+	if (!S_ISLNK(buf.st_mode))
-+		return NULL;
-+	if (readlink(link_subsystem, subsystem, sizeof(subsystem)) == -1)
-+		return NULL;
-+	if ((pos = strrchr(subsystem, '/')) == NULL)
-+		return NULL;
-+	strncpy(subsystem, pos+1, sizeof(subsystem));
-+
-+	return subsystem;
-+}
-+
-+/*
-+ * Check content of /sys/block/<dev>/removable. Returns 1 if the file 
-+ * contains '1' otherwise returns 0.
-+ */
-+static int CheckRemovable(const char* deviceName)
-+{
-+	FILE *fp;
-+	int removable = 0;
-+	char *device;
-+	char path[PATH_MAX];
-+
-+	if ((device = FindDeviceSysBlock(deviceName)) == NULL) {
-+		fprintf(stderr,
-+				_("%s: did not find a device %s in /sys/block/\n"),
-+				programName, deviceName);
-+		exit(1);
-+	}
-+	snprintf(path, sizeof(path), "/sys/block/%s/removable", device);
-+	free(device);
-+	if((fp = fopen(path, "r")) == NULL)
-+		return removable;
-+	if (fgetc(fp) == '1')
-+		removable = 1;
-+	
-+	fclose(fp);
-+	return removable;
-+}
-+
-+/* Check if a device is on hotpluggable subsystem. Returns 1 if is
-+ * otherwise returns 0.
-+ */
-+static int CheckHotpluggable(const char* deviceName)
-+{
-+	int hotpluggable = 0;
-+	char *device;
-+	char path[PATH_MAX];
-+	char *device_chain;
-+	struct stat buf;
-+	char *subsystem;
-+	char *pos;
-+
-+	if ((device = FindDeviceSysBlock(deviceName)) == NULL) {
-+		fprintf(stderr, _("%s: did not find a device %s in /sys/block/\n"),
-+				programName, deviceName);
-+		exit(1);
-+	}
-+	snprintf(path, sizeof(path), "/sys/block/%s/device", device);
-+	free(device);
-+
-+	if (lstat(path, &buf) == -1) 
-+		return hotpluggable;
-+	if (!S_ISLNK(buf.st_mode))
-+		return hotpluggable;
-+	if ((device_chain = SymLink(path)) == NULL) 
-+		return hotpluggable;
-+	while ( strncmp(device_chain, "", sizeof(device_chain) != 0)) {
-+		subsystem = GetSubSystem(device_chain);
-+		if (subsystem) {
-+			/* as hotpluggable we assume devices on these buses  */
-+			if (strncmp("usb", subsystem, sizeof("usb")) == 0 ||
-+			    strncmp("ieee1394", subsystem, sizeof("ieee1394")) == 0 ||
-+			    strncmp("pcmcia", subsystem, sizeof("pcmcia")) == 0 ||
-+			    strncmp("mmc", subsystem, sizeof("mmc")) == 0 ||
-+			    strncmp("ccw", subsystem, sizeof("ccw")) == 0) {
-+				hotpluggable = 1;
-+				break;
-+			}
-+		}
-+		/* remove one member from devicechain */
-+		pos = strrchr(device_chain, '/');
-+		if (pos) 
-+			pos[0] = '\0';
-+		else
-+			device_chain[0] = '\0';
-+	}
-+
-+	return hotpluggable;
-+}
- 
- /* handle -x option */
- static void HandleXOption(char *deviceName)
-@@ -1276,6 +1416,17 @@ int main(int argc, char **argv)
- 		exit(0);
- 	}
- 
-+	/* Check if device has removable flag*/
-+	if (v_option)
-+		printf(_("%s: checking if device \"%s\" has a removable or hotpluggable flag\n"),
-+				programName, deviceName);
-+	if (!CheckRemovable(deviceName) && !CheckHotpluggable(deviceName))
-+	{
-+		fprintf(stderr, _("%s: device \"%s\" doesn't have a removable or hotpluggable flag\n"),
-+				programName, deviceName);
-+		exit(1);		
-+	}
-+	
- 	/* handle -i option */
- 	if (i_option) {
- 		fd = OpenDevice(deviceName);
diff --git a/extra/eject/eject-2.1.5-unlock.patch b/extra/eject/eject-2.1.5-unlock.patch
deleted file mode 100644
index d554f9bdf..000000000
--- a/extra/eject/eject-2.1.5-unlock.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -pur eject-orig/eject.c eject/eject.c
---- eject-orig/eject.c	2006-02-11 04:54:38.000000000 +0300
-+++ eject/eject.c	2011-08-11 13:12:16.568112725 +0400
-@@ -527,6 +527,25 @@ static void CloseTray(int fd)
- }
- 
- /*
-+ * Unlock tray using CDROM_LOCKDOOR ioctl.
-+	* New kernels doesn't automatically unlock tray before ejecting,
-+	* and the new udev automatically locks it.
-+ */
-+static int UnlockCdrom(int fd)
-+{
-+	int status = -1;
-+
-+	if (v_option)
-+		printf(_("%s: unlocking tray using CDROM_LOCKDOOR ioctl\n"), programName);
-+
-+	status = ioctl(fd, CDROM_LOCKDOOR, 0);
-+	if (v_option && status != 0)
-+		printf(_("%s: CDROM_LOCKDOOR ioctl failed\n"), programName);
-+
-+	return (status == 0);
-+}
-+
-+/*
-  * Toggle tray.
-  *
-  * Written by Benjamin Schwenk <benjaminschwenk@yahoo.de> and
-@@ -543,6 +562,8 @@ static void ToggleTray(int fd)
- 
- #ifdef CDROMCLOSETRAY
- 
-+	UnlockCdrom(fd);
-+
- 	/* Try to open the CDROM tray and measure the time therefor
- 	 * needed.  In my experience the function needs less than 0.05
- 	 * seconds if the tray was already open, and at least 1.5 seconds
-@@ -566,7 +587,11 @@ static void ToggleTray(int fd)
- 	 * was already open. In this case, close it now. Else the tray was
- 	 * closed before. This would mean that we are done.  */
- 	if (time_elapsed < TRAY_WAS_ALREADY_OPEN_USECS)
-+	{
-+		if (v_option)
-+			printf(_("%s: CD-ROM tray was already open, closing it\n"), programName);
- 		CloseTray(fd);
-+	}
- 
- #else
-     fprintf(stderr, _("%s: CD-ROM tray toggle command not supported by this kernel\n"), programName);
-@@ -681,7 +706,7 @@ static void ListSpeedCdrom(const char *f
- static int EjectCdrom(int fd)
- {
- 	int status = -1;
--
-+	UnlockCdrom(fd);
- #if defined(CDROMEJECT)
- 	status = ioctl(fd, CDROMEJECT);
- #elif defined(CDIOCEJECT)
diff --git a/extra/eject/eject-timeout.patch b/extra/eject/eject-timeout.patch
deleted file mode 100644
index a542d2c2f..000000000
--- a/extra/eject/eject-timeout.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- eject/eject.c.orig	2006-08-07 16:35:15.000000000 +0200
-+++ eject/eject.c	2006-08-07 16:35:54.000000000 +0200
-@@ -723,7 +723,7 @@
- 	io_hdr.dxfer_len = 0;
- 	io_hdr.dxferp = inqBuff;
- 	io_hdr.sbp = sense_buffer;
--	io_hdr.timeout = 2000;
-+	io_hdr.timeout = 10000;
- 
- 	io_hdr.cmdp = allowRmBlk;
- 	status = ioctl(fd, SG_IO, (void *)&io_hdr);
diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD
deleted file mode 100644
index 246d4502d..000000000
--- a/extra/evolution-exchange/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 162101 2012-06-19 20:30:13Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution-exchange
-pkgver=3.4.3
-pkgrel=1.1
-pkgdesc="Ximian Connector Exchange plugin for Evolution"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.ximian.com"
-depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
-makedepends=('intltool' 'evolution')
-options=('!libtool' '!emptydirs')
-install=evolution-exchange.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('28b2b47bfdae097b13722dfd0aae6e1335de8d98bd10534a3c7675489352f7b7')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/evolution --disable-static \
-      --with-libdb=/usr --with-krb5=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain evolution-exchange-3.2 "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f $pkgdir/etc/gconf/schemas/*.schemas
-}
diff --git a/extra/evolution-exchange/evolution-exchange.install b/extra/evolution-exchange/evolution-exchange.install
deleted file mode 100644
index 1179887f9..000000000
--- a/extra/evolution-exchange/evolution-exchange.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=evolution-exchange
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/extra/evolution-groupwise/PKGBUILD b/extra/evolution-groupwise/PKGBUILD
deleted file mode 100644
index 4f3561a61..000000000
--- a/extra/evolution-groupwise/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 159019 2012-05-15 10:23:24Z heftig $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=evolution-groupwise
-pkgver=3.4.2
-pkgrel=1
-pkgdesc="GroupWise connector for evolution"
-arch=(i686 x86_64 mips64el)
-url="http://projects.gnome.org/evolution/"
-license=(LGPL)
-depends=('evolution-data-server' 'gtkhtml4')
-makedepends=(intltool evolution)
-optdepends=('evolution: evolution plugin')
-options=(!libtool)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e26e08eb065df21118c92f29be4cfa2ce2faa52c950210e15a3efbdc9cace2aa')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var  --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-}
-
diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD
deleted file mode 100644
index 3975ccc08..000000000
--- a/extra/fcitx/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 167680 2012-10-02 22:57:36Z eric $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: csslayer <wengxt AT gmail com>
-
-pkgbase=fcitx
-pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
-pkgver=4.2.6.1
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/fcitx/"
-license=('GPL')
-makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu' 'wget' \
-             'iso-codes' 'gobject-introspection' 'libxkbfile' 'enchant')
-source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz)
-sha1sums=('dc4577bb6bd6de41317f978196f377fc801cc63a')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DENABLE_OPENCC=OFF \
-    -DFORCE_PRESAGE=ON \
-    -DENABLE_TEST=ON \
-    -DENABLE_GTK3_IM_MODULE=ON \
-    -DENABLE_QT_IM_MODULE=ON
-  make
-}
-
-check() {
-  cd "${srcdir}"/build
-  make test
-}
-
-package_fcitx() {
-  pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system"
-  depends=('pango' 'libxinerama' 'gtk-update-icon-cache' 'shared-mime-info' \
-           'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' \
-           'libxfixes' 'dbus-core' 'icu')
-  optdepends=('enchant: for word predication support')
-  install=fcitx.install
-
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-
-  rm -r "${pkgdir}"/usr/lib/{gtk-2.0,gtk-3.0,qt}
-}
-
-package_fcitx-gtk2() {
-  pkgdesc='GTK2 IM Module for fcitx'
-  depends=('gtk2' 'fcitx')
-  install=fcitx-gtk2.install
-
-  cd "${srcdir}"/build/src/frontend/gtk2
-  make DESTDIR="${pkgdir}" install
-}
-
-package_fcitx-gtk3() {
-  pkgdesc='GTK3 IM Module for fcitx'
-  depends=('gtk3' 'fcitx')
-  install=fcitx-gtk3.install
-
-  cd "${srcdir}"/build/src/frontend/gtk3
-  make DESTDIR="${pkgdir}" install
-}
-
-package_fcitx-qt() {
-  pkgdesc='QT IM Module for fcitx'
-  depends=('qt' 'fcitx')
-
-  cd "${srcdir}"/build/src/frontend/qt
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/fcitx/fcitx-gtk2.install b/extra/fcitx/fcitx-gtk2.install
deleted file mode 100644
index 7503c05eb..000000000
--- a/extra/fcitx/fcitx-gtk2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/fcitx/fcitx-gtk3.install b/extra/fcitx/fcitx-gtk3.install
deleted file mode 100644
index b44958797..000000000
--- a/extra/fcitx/fcitx-gtk3.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/gtk-query-immodules-3.0 --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/fcitx/fcitx.install b/extra/fcitx/fcitx.install
deleted file mode 100644
index 7f156e002..000000000
--- a/extra/fcitx/fcitx.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/extra/fortune-mod/01_all_fortune_all-fix.patch b/extra/fortune-mod/01_all_fortune_all-fix.patch
deleted file mode 100644
index b4175ac81..000000000
--- a/extra/fortune-mod/01_all_fortune_all-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- fortune/fortune.c.old	2006-03-11 15:33:14.000000000 +0100
-+++ fortune/fortune.c	2006-03-11 15:43:16.000000000 +0100
-@@ -974,7 +974,7 @@
- 	  if (!ret)
- 	    ret=add_file(percent, fullpathname, NULL, &File_list,
- 			 &File_tail, NULL);
--	  if ( (!ret && fullpathname != locpathname) || strcmp(sp, "all") == 0 )
-+	  if (!ret && strncmp(fullpathname, locpathname, sizeof(fullpathname)))
- 	    ret=add_file(percent, locpathname, NULL, &File_list,
- 		         &File_tail, NULL);
- 	  
-@@ -985,7 +985,8 @@
- 	  }
- 	  if (!ret)
- 	    return FALSE;
--	  
-+	  if (strncmp(fullpathname, locpathname, sizeof(fullpathname)) && strcmp(sp, "all") == 0)
-+	    add_file(percent, locpathname, NULL, &File_list, &File_tail, NULL);
- 	}
- 	else
- 	  if (!add_file(percent, fullpathname, NULL, &File_list,
diff --git a/extra/fortune-mod/LICENSE b/extra/fortune-mod/LICENSE
deleted file mode 100644
index d0ad75977..000000000
--- a/extra/fortune-mod/LICENSE
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * Copyright (c) 1986, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ken Arnold.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
diff --git a/extra/fortune-mod/PKGBUILD b/extra/fortune-mod/PKGBUILD
deleted file mode 100644
index 794722784..000000000
--- a/extra/fortune-mod/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 128484 2011-06-24 04:37:24Z eric $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Dale Blount <archlinux@dale.us>
-
-pkgname=fortune-mod
-pkgver=1.99.1
-pkgrel=5.1
-pkgdesc="The Fortune Cookie Program from BSD games"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.redellipse.net/code/fortune"
-license=('BSD')
-depends=('recode')
-source=(ftp://ftp.archlinux.org/other/fortune-mod/$pkgname-$pkgver.tar.gz LICENSE 01_all_fortune_all-fix.patch)
-md5sums=('f208805b3b712e32997d7667e0ec52d8'
-         '0217481ae93971296cfb7872157cabb7'
-         'e85b073f16dc6f0e8f0ed90044797aa3')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p0 < ../01_all_fortune_all-fix.patch
-  make REGEXDEFS='-DHAVE_REGEX_H -DPOSIX_REGEX -DHAVE_STDBOOL'  \
-       COOKIEDIR=/usr/share/fortune  \
-       LOCALDIR=/usr/local/share/fortune all fortune/fortune.man
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make FORTDIR="$pkgdir"/usr/bin \
-       COOKIEDIR="$pkgdir"/usr/share/fortune \
-       BINDIR="$pkgdir"/usr/sbin \
-       BINMANDIR="$pkgdir"/usr/share/man/man1 \
-       FORTMANDIR="$pkgdir"/usr/share/man/man6 install
-  rm "$pkgdir"/usr/share/fortune/*.u8
-  rm "$pkgdir"/usr/share/fortune/off/*.u8
-  install -D -m644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/extra/gcc4.6/PKGBUILD b/extra/gcc4.6/PKGBUILD
deleted file mode 100644
index 80f3fc24e..000000000
--- a/extra/gcc4.6/PKGBUILD
+++ /dev/null
@@ -1,95 +0,0 @@
-# $Id: PKGBUILD 162071 2012-06-19 12:28:59Z allan $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-pkgname=gcc4.6
-pkgver=4.6.3
-_ver=${pkgver:0:3}
-pkgrel=2
-pkgdesc="The GNU Compiler Collection ($_ver; C and C++)"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-depends=('glibc' 'binutils' 'gmp' 'mpfr' 'libmpc' 'ppl' 'isl' 'cloog')
-makedepends=('flex' 'bison')
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-        gcc_pure64.patch
-        gcc-hash-style-both.patch
-        gcc-4.6.2-cloog-0.17.patch)
-md5sums=('773092fe5194353b02bb0110052a972e'
-         '4030ee1c08dd1e843c0225b772360e76'
-         '4df25b623799b148a0703eaeec8fdf3f'
-         '6d9939a2e667376031679ac9f9c49263')
-
-build() {
-  cd gcc-$pkgver
-
-  # Do not install libiberty
-  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
-  # Do not run fixincludes
-  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    patch -p1 -i ${srcdir}/gcc_pure64.patch
-  fi
-  patch -p0 -i ${srcdir}/gcc-hash-style-both.patch
-
-  # compatibility with latest cloog
-  patch -p1 -i ${srcdir}/gcc-4.6.2-cloog-0.17.patch
-
-  echo ${pkgver} > gcc/BASE-VER
-
-  cd ..
-  mkdir gcc-build
-  cd gcc-build
-
-  ../gcc-$pkgver/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --mandir=/usr/share/man --infodir=/usr/share/info \
-      --datadir=/usr/share/gcc-$_ver \
-      --with-bugurl=https://bugs.archlinux.org/ \
-      --enable-languages=c,c++,lto \
-      --enable-shared --enable-threads=posix \
-      --with-system-zlib --enable-__cxa_atexit \
-      --disable-libunwind-exceptions --enable-clocale=gnu \
-      --disable-libstdcxx-pch --enable-libstdcxx-time \
-      --enable-gnu-unique-object --enable-linker-build-id \
-      --with-ppl --enable-cloog-backend=isl \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --disable-multilib --disable-libssp \
-      --enable-checking=release \
-      --program-suffix=-$_ver \
-      --enable-version-specific-runtime-libs
-
-  make
-}
-
-check() {
-  # increase stack size to prevent test failures
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
-  ulimit -s 32768
-
-  # do not abort on error as some are "expected"
-  make -C gcc-build -k check || true
-  gcc-$pkgver/contrib/test_summary
-}
-
-package()
-{
-  make -j1 -C gcc-build DESTDIR=${pkgdir} install
-
-  # Install Runtime Library Exception
-  install -Dm644 gcc-$pkgver/COPYING.RUNTIME \
-    $pkgdir/usr/share/licenses/$pkgname/RUNTIME.LIBRARY.EXCEPTION
-
-  # deal with conflicting man and info pages
-  cd $pkgdir
-  rm usr/share/man/man7/{fsf-funding,gfdl,gpl}.7
-  for i in usr/share/info/*; do
-    mv $i ${i%.info}-$_ver.info
-  done
-}
diff --git a/extra/gcc4.6/gcc-4.6.2-cloog-0.17.patch b/extra/gcc4.6/gcc-4.6.2-cloog-0.17.patch
deleted file mode 100644
index 0503a05ed..000000000
--- a/extra/gcc4.6/gcc-4.6.2-cloog-0.17.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure
---- gcc-4.6-20120120-orig/configure	2011-12-18 20:03:44.000000000 +1000
-+++ gcc-4.6-20120120/configure	2012-02-03 17:55:14.885990135 +1000
-@@ -6049,8 +6049,8 @@
-     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
- 
-     if test "${cloog_org}" = yes ; then
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
--$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5
-+$as_echo_n "checking for version 0.17 of CLooG... " >&6; }
- if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-@@ -6061,8 +6061,7 @@
- main ()
- {
- #if CLOOG_VERSION_MAJOR != 0 \
--    || CLOOG_VERSION_MINOR != 16 \
--    || CLOOG_VERSION_REVISION < 1
-+    || CLOOG_VERSION_MINOR != 17
-     choke me
-    #endif
-   ;
-diff -Naur gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c
---- gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c	2011-03-13 08:05:38.000000000 +1000
-+++ gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c	2012-02-03 17:51:47.943463879 +1000
-@@ -1367,7 +1367,7 @@
-   /* Change cloog output language to C.  If we do use FORTRAN instead, cloog
-      will stop e.g. with "ERROR: unbounded loops not allowed in FORTRAN.", if
-      we pass an incomplete program to cloog.  */
--  options->language = LANGUAGE_C;
-+  options->language = CLOOG_LANGUAGE_C;
- 
-   /* Enable complex equality spreading: removes dummy statements
-      (assignments) in the generated code which repeats the
diff --git a/extra/gcc4.6/gcc-hash-style-both.patch b/extra/gcc4.6/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/extra/gcc4.6/gcc-hash-style-both.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- gcc/config/alpha/linux-elf.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/alpha/linux-elf.h	2011-03-11 10:01:47.770000457 +1000
-@@ -41,7 +41,7 @@
- 
- #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
- 
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
-+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
-   %{O*:-O3} %{!O*:-O1}						\
-   %{shared:-shared}						\
-   %{!shared:							\
---- gcc/config/i386/linux64.h.orig	2011-03-03 08:35:36.000000000 +1000
-+++ gcc/config/i386/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -78,7 +78,7 @@
-  %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/i386/linux.h.orig	2011-01-15 04:45:06.000000000 +1000
-+++ gcc/config/i386/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -104,7 +104,7 @@
-   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
- 
- #undef	LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/ia64/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/ia64/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -64,7 +64,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
---- gcc/config/rs6000/linux64.h.orig	2011-02-11 03:30:10.000000000 +1000
-+++ gcc/config/rs6000/linux64.h	2011-03-11 10:03:34.280000457 +1000
-@@ -389,11 +389,11 @@
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
- 
- 
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
- 
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
- 
---- gcc/config/rs6000/sysv4.h.orig	2011-01-28 04:36:03.000000000 +1000
-+++ gcc/config/rs6000/sysv4.h	2011-03-11 10:01:47.773333792 +1000
-@@ -830,7 +830,7 @@
- #define LINUX_DYNAMIC_LINKER \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
- 
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
- 
---- gcc/config/s390/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/s390/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -77,7 +77,7 @@
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
--  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
-    %{shared:-shared} \
-    %{!shared: \
-       %{static:-static} \
---- gcc/config/sparc/linux64.h.orig	2011-02-17 23:57:21.000000000 +1000
-+++ gcc/config/sparc/linux64.h	2011-03-11 10:01:47.770000457 +1000
-@@ -113,7 +113,7 @@
-   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
-   { "link_arch",	 LINK_ARCH_SPEC },
- 
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -121,7 +121,7 @@
-       %{static:-static}} \
- "
- 
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-@@ -193,7 +193,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
---- gcc/config/sparc/linux.h.orig	2011-01-27 06:30:12.000000000 +1000
-+++ gcc/config/sparc/linux.h	2011-03-11 10:01:47.770000457 +1000
-@@ -74,7 +74,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!static: \
diff --git a/extra/gcc4.6/gcc_pure64.patch b/extra/gcc4.6/gcc_pure64.patch
deleted file mode 100644
index 8c0baf8e2..000000000
--- a/extra/gcc4.6/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
---- gcc-4.2.0.orig/gcc/config/i386/linux64.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/linux64.h	2007-05-18 17:04:05.000000000 -0400
-@@ -49,8 +49,8 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #undef	LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
---- gcc-4.2.0.orig/gcc/config/i386/t-linux64	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/t-linux64	2007-05-18 17:04:36.000000000 -0400
-@@ -6,7 +6,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/extra/ggz-client-libs/PKGBUILD b/extra/ggz-client-libs/PKGBUILD
deleted file mode 100644
index 8ae9d19b6..000000000
--- a/extra/ggz-client-libs/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 149560 2012-02-08 14:11:20Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=ggz-client-libs
-pkgver=0.0.14.1
-pkgrel=3.1
-pkgdesc="GGZ client library, used by the GGZ Gaming Zone server (ggzd), the ggzcore library and other components"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.ggzgamingzone.org/"
-license=('LGPL')
-depends=('libggz>=0.0.14.1' 'expat>=2.0.1')
-options=('!libtool')
-source=("http://ftp.ggzgamingzone.org/pub/ggz/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('299eaa93721b1d867b5bf7dc6ac764b0')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/ggz-gtk-client/PKGBUILD b/extra/ggz-gtk-client/PKGBUILD
deleted file mode 100644
index 4f886abb8..000000000
--- a/extra/ggz-gtk-client/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 143018 2011-11-21 01:24:00Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: dazzy
-
-pkgname=ggz-gtk-client
-pkgver=0.0.14.1
-pkgrel=5
-pkgdesc="GGZ Gaming Zone GTK+ client"
-arch=('i686' 'x86_64')
-url="http://www.ggzgamingzone.org/"
-license=('GPL')
-depends=('gtk2' 'ggz-client-libs')
-options=('!libtool')
-source=(http://ftp.ggzgamingzone.org/pub/ggz/${pkgver}/ggz-gtk-client-${pkgver}.tar.gz
-	gtk2.patch)
-md5sums=('87f67ff01f867bd04ba894a7c6a9f7fc'
-         '368f993d07befd41681ac76ef532b448')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/gtk2.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-debug
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/ggz-gtk-client/gtk2.patch b/extra/ggz-gtk-client/gtk2.patch
deleted file mode 100644
index b8332f401..000000000
--- a/extra/ggz-gtk-client/gtk2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- ggz-gtk-client-0.0.14.1/ggz-gtk/props.c	2008-01-05 20:03:36.000000000 +0100
-+++ ggz-gtk-client-0.0.14.1.PATCHED/ggz-gtk/props.c	2010-08-04 01:53:37.573425091 +0200
-@@ -1203,7 +1203,7 @@
-   gtk_box_pack_start (GTK_BOX (vbox9), color_table, TRUE, TRUE, 0);
-   gtk_container_set_border_width (GTK_CONTAINER (color_table), 3);
- 
--  h_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 1);
-+  h_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 0);
-   h_spin = gtk_spin_button_new (GTK_ADJUSTMENT (h_spin_adj), 1, 0);
-   gtk_widget_ref (h_spin);
-   g_object_set_data_full(G_OBJECT (dlg_props), "h_spin", h_spin,
-@@ -1213,7 +1213,7 @@
-                     (GtkAttachOptions) (0), 0, 0);
-   gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (h_spin), TRUE);
- 
--  n_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 1);
-+  n_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 0);
-   n_spin = gtk_spin_button_new (GTK_ADJUSTMENT (n_spin_adj), 1, 0);
-   gtk_widget_ref (n_spin);
-   g_object_set_data_full(G_OBJECT (dlg_props), "n_spin", n_spin,
-@@ -1223,7 +1223,7 @@
-                     (GtkAttachOptions) (0), 0, 0);
-   gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (n_spin), TRUE);
- 
--  f_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 1);
-+  f_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 0);
-   f_spin = gtk_spin_button_new (GTK_ADJUSTMENT (f_spin_adj), 1, 0);
-   gtk_widget_ref (f_spin);
-   g_object_set_data_full(G_OBJECT (dlg_props), "f_spin", f_spin,
---- ggz-gtk-client-0.0.14.1/ggz-gtk/xtext.c	2008-01-05 20:03:36.000000000 +0100
-+++ ggz-gtk-client-0.0.14.1.PATCHED/ggz-gtk/xtext.c	2010-08-04 01:52:36.446764446 +0200
-@@ -720,7 +720,7 @@
- 	xtext->overdraw = FALSE;
- 	xtext->tint_red = xtext->tint_green = xtext->tint_blue = TINT_VALUE;
- 
--	xtext->adj = (GtkAdjustment *) gtk_adjustment_new (0, 0, 1, 1, 1, 1);
-+	xtext->adj = (GtkAdjustment *) gtk_adjustment_new (0, 0, 1, 1, 1, 0);
- 	g_object_ref (G_OBJECT (xtext->adj));
- 	gtk_object_sink ((GtkObject *) xtext->adj);
- 
diff --git a/extra/gnome-pilot/PKGBUILD b/extra/gnome-pilot/PKGBUILD
deleted file mode 100644
index 7cc25291f..000000000
--- a/extra/gnome-pilot/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 157208 2012-04-26 02:01:26Z eric $
-# Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-pilot
-pkgver=2.91.93
-pkgrel=2
-pkgdesc="Pilot Support for Gnome"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-depends=('pilot-link' 'evolution-data-server')
-makedepends=('intltool' 'gob2' 'gnome-doc-utils' 'gnome-panel')
-optdepends=('gnome-panel')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=gnome-pilot.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('56fbb1c54621dcda9cde4c7ac0754d5d9d68ae2ae1eb63acffb00817e4a8dd21')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-pilot \
-      --localstatedir=/var --disable-static \
-      --without-hal
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/extra/gnome-pilot/gnome-pilot.install b/extra/gnome-pilot/gnome-pilot.install
deleted file mode 100644
index 616daa0e4..000000000
--- a/extra/gnome-pilot/gnome-pilot.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=gnome-pilot
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/extra/gnu-efi/PKGBUILD b/extra/gnu-efi/PKGBUILD
deleted file mode 100644
index 35e433aaf..000000000
--- a/extra/gnu-efi/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 160800 2012-06-06 10:29:37Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer : Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
-_pkgname="gnu-efi"
-_ver="3.0"
-_pkgver="${_ver}q"
-pkgname="${_pkgname}"
-pkgver="${_pkgver}"
-pkgrel=1
-pkgdesc="Library for building UEFI Applications using GNU toolchain"
-url="http://sourceforge.net/projects/gnu-efi/"
-license=('GPL')
-arch=('i686' 'x86_64')
-makedepends=()
-depends=('pciutils')
-source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz")
-options=(!strip !makeflags)
-
-build() {
-	cd "${srcdir}/gnu-efi-${_ver}"	
-	sed 's|-fno-strict-aliasing|-fno-strict-aliasing -fno-stack-protector|g' -i "${srcdir}/gnu-efi-${_ver}/Make.defaults" || true
-	CFLAGS="" make
-	make -C apps clean all
-}
-
-package() {	
-	cd "${srcdir}/gnu-efi-${_ver}"
-	make INSTALLROOT="${pkgdir}/usr/" install
-	install -d "${pkgdir}/usr/share/gnu-efi/"
-	install -D -m0644 "${srcdir}/gnu-efi-${_ver}/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/"
-}
-md5sums=('698d93490e0c0171aa0e2a8eda44209f')
diff --git a/extra/gnuchess/PKGBUILD b/extra/gnuchess/PKGBUILD
deleted file mode 100644
index ccd178813..000000000
--- a/extra/gnuchess/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 152136 2012-03-04 23:43:24Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=gnuchess
-pkgver=6.0.2
-pkgrel=1.1
-pkgdesc="Lets most modern computers play a full game of chess"
-url="http://www.gnu.org/software/chess/chess.html"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('glibc' 'ncurses' 'readline')
-source=(ftp://ftp.gnu.org/pub/gnu/chess/$pkgname-$pkgver.tar.gz{,.sig})
-md5sums=('566a145479c47f2f9d7d9b7b8119e1b0'
-         '044487606aa14ecb29ab9613f83918d9')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make  
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr install
-}
diff --git a/extra/gqview/PKGBUILD b/extra/gqview/PKGBUILD
deleted file mode 100644
index 4e2138782..000000000
--- a/extra/gqview/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 138174 2011-09-18 07:14:08Z eric $
-# Maintainer: dorphell <dorphell@archlinux.org>
-
-pkgname=gqview
-pkgver=2.0.4
-pkgrel=4.1
-pkgdesc="An image browser and viewer"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://gqview.sourceforge.net/"
-license=('GPL')
-depends=('gtk2' 'desktop-file-utils')
-install=gqview.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('7196deab04db94cec2167637cddc02f9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/gqview/gqview.install b/extra/gqview/gqview.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/extra/gqview/gqview.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/extra/gst-plugins-bad/PKGBUILD b/extra/gst-plugins-bad/PKGBUILD
deleted file mode 100644
index d6f84aa06..000000000
--- a/extra/gst-plugins-bad/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 153258 2012-03-12 16:05:19Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gst-plugins-bad
-pkgver=1.0.2
-pkgrel=1
-pkgdesc="GStreamer Multimedia Framework Bad Plugins"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://gstreamer.freedesktop.org/"
-depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'faac' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus')
-makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2')
-options=(!libtool !emptydirs)
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('9e503305799a2b6eb9d0b77c59b8aa8bbe9e6eb815a0635bd013560c73996579')
-
-build() {
-  cd $pkgname-$pkgver
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Bad Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/" \
-    --with-gtk=3.0
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/jhead/LICENSE b/extra/jhead/LICENSE
deleted file mode 100644
index 63ad89ebc..000000000
--- a/extra/jhead/LICENSE
+++ /dev/null
@@ -1,12 +0,0 @@
-License:
-
-    Jhead is public domain software - that is, you can do whatever you want
-    with it, and include it software that is licensesed under the GNU or the 
-    BSD license, or whatever other licence you chose, including proprietary
-    closed source licenses.  Although not part of the liscense, I do expect
-    common courtesy, please.
-
-    If you do integrate the code into some software of yours, I'd appreciate
-    knowing about it though. 
-
-Matthias Wandel
diff --git a/extra/jhead/PKGBUILD b/extra/jhead/PKGBUILD
deleted file mode 100644
index bf8716c86..000000000
--- a/extra/jhead/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 163023 2012-07-05 21:03:35Z eric $
-# Maintainer: François Charette <francois ατ archlinux δοτ org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=jhead
-pkgver=2.96
-pkgrel=1
-pkgdesc="EXIF JPEG info parser and thumbnail remover"
-url="http://www.sentex.net/~mwandel/jhead/"
-arch=('i686' 'x86_64' 'mips64el')
-license=('custom')
-depends=('glibc')
-optdepends=('libjpeg: to up-right images according to rotation tag')
-source=(http://www.sentex.net/~mwandel/${pkgname}/${pkgname}-${pkgver}.tar.gz 
-        LICENSE)
-md5sums=('562b45d4d82f64196debed8c520c1cab'
-         '1f0db611d2642a981719f45252762a45')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -D -m755 jhead "${pkgdir}/usr/bin/jhead"
-  install -D -m644 jhead.1 "${pkgdir}/usr/share/man/man1/jhead.1"
-  install -D -m644 ${srcdir}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD
deleted file mode 100644
index d25dd1a5f..000000000
--- a/extra/kdebase-runtime/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 164845 2012-08-06 23:13:19Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-runtime
-pkgver=4.9.0
-pkgrel=3
-pkgdesc="Plugins and applications necessary for the running of KDE applications"
-arch=('i686' 'x86_64' 'mips64el')
-url='https://projects.kde.org/projects/kde/kde-runtime'
-license=('GPL' 'LGPL')
-depends=('nepomuk-core' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth'
-         'kactivities')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen'
-             'networkmanager')
-optdepends=('kdepimlibs: to generate drkonqi reports'
-            'htdig: to build the search index in khelpcenter'
-            'rarian: needed by khelpcenter'
-            'gdb: drkonq crash handler')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz")
-sha1sums=('89a9e5c7e52cb925217b45a568a354cc041bc28d')
-
-build() {
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../kde-runtime-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_QNtrack=OFF \
-        -DWITH_Xine=OFF
-	make
-}
-
-package() {
-	cd "$srcdir/build"
-	make DESTDIR="$pkgdir" install
-	rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
-
-    ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
-}
diff --git a/extra/kdebase-runtime/kdebase-runtime.install b/extra/kdebase-runtime/kdebase-runtime.install
deleted file mode 100644
index c77e68041..000000000
--- a/extra/kdebase-runtime/kdebase-runtime.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD
deleted file mode 100644
index 7b73b977f..000000000
--- a/extra/kdemultimedia/PKGBUILD
+++ /dev/null
@@ -1,111 +0,0 @@
-# $Id: PKGBUILD 163152 2012-07-08 09:31:34Z ibiru $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdemultimedia
-pkgname=('kdemultimedia-dragonplayer'
-         'kdemultimedia-ffmpegthumbs'
-         'kdemultimedia-juk'
-         'kdemultimedia-kioslave'
-         'kdemultimedia-kmix'
-         'kdemultimedia-kscd'
-         'kdemultimedia-mplayerthumbs')
-pkgver=4.8.4
-pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-makedepends=('cmake' 'automoc4' 'kdelibs' 'ffmpeg' 'mplayer' 'libpulse'
-             'libmusicbrainz3' 'taglib' 'libcanberra')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'mplayerthumbs.config'
-        'ffmpeg0.11.patch')
-sha1sums=('dac721e82308a6347d578361e25da7c466a26ba7'
-          'ba016fa2563c14ffcba852c62506b66bfc6ee683'
-          '48331f7e2dab760c20708b81fe6c4d47c83a63e7')
-
-build() {
-    cd ${srcdir}/${pkgbase}-${pkgver}/ffmpegthumbs
-    patch -p1 -i ${srcdir}/ffmpeg0.11.patch
-
-    cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_TunePimp=OFF
-	make
-}
-
-package_kdemultimedia-dragonplayer() {
-	pkgdesc='Video Player'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/multimedia/dragonplayer/"
-	install='kdemultimedia-dragonplayer.install'
-	cd $srcdir/build/dragonplayer
-	make DESTDIR=$pkgdir install
-    cd $srcdir/build/dragonplayer/doc
-    make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-ffmpegthumbs() {
-	pkgdesc='Video Files (ffmpegthumbs)'
-	depends=('kdebase-runtime' 'ffmpeg')
-	install='kdemultimedia.install'
-	cd $srcdir/build/ffmpegthumbs
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-juk() {
-	pkgdesc='Music Player'
-    depends=('kdebase-runtime' 'taglib')
-	url="http://kde.org/applications/multimedia/juk"
-	install='kdemultimedia.install'
-	cd $srcdir/build/juk
-	make DESTDIR=$pkgdir install
-    cd $srcdir/build/juk/doc
-    make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kioslave() {
-	pkgdesc='Audio CD Browser'
-	depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia')
-	conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
-	replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
-	for i in kioslave libkcddb libkcompactdisc; do
-		cd $srcdir/build/${i}
-		make DESTDIR=$pkgdir install
-	done
-}
-
-package_kdemultimedia-kmix() {
-	pkgdesc='Sound Mixer'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/multimedia/kmix"
-	install='kdemultimedia.install'
-	cd $srcdir/build/kmix
-	make DESTDIR=$pkgdir install
-    cd $srcdir/build/kmix/doc
-    make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kscd() {
-	pkgdesc='CD Player'
-	depends=('kdebase-runtime' 'libmusicbrainz3')
-	url="http://kde.org/applications/multimedia/kscd"
-	install='kdemultimedia.install'
-	cd $srcdir/build/kscd
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-mplayerthumbs() {
-	pkgdesc='Video Files (MPlayerThumbs)'
-	depends=('kdebase-runtime' 'mplayer')
-	replaces=('mplayerthumbs')
-	conflicts=('mplayerthumbs')
-	cd $srcdir/build/mplayerthumbs
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs
-}
diff --git a/extra/kdemultimedia/ffmpeg0.11.patch b/extra/kdemultimedia/ffmpeg0.11.patch
deleted file mode 100644
index 527ac3992..000000000
--- a/extra/kdemultimedia/ffmpeg0.11.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Christoph Feck <christoph@maxiom.de>
-Date: Tue, 29 May 2012 13:53:18 +0000
-Subject: Two deprecated calls have been removed from ffmpeg 0.11.
-X-Git-Tag: v4.8.80
-X-Git-Url: http://quickgit.kde.org/?p=ffmpegthumbs.git&amp;a=commitdiff&amp;h=4f03b20614c122e3e14473d42a000c0bffdce39c
----
-Two deprecated calls have been removed from ffmpeg 0.11.
-
-BUG:300732
----
-
-
---- a/ffmpegthumbnailer/moviedecoder.cpp
-+++ b/ffmpegthumbnailer/moviedecoder.cpp
-@@ -52,12 +52,11 @@ MovieDecoder::~MovieDecoder()
- void MovieDecoder::initialize(const QString& filename)
- {
-     av_register_all();
--    avcodec_init();
-     avcodec_register_all();
- 
-     QFileInfo fileInfo(filename);
- 
--    if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, fileInfo.absoluteFilePath().toUtf8().data(), NULL, 0, NULL) != 0) {
-+    if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, fileInfo.absoluteFilePath().toLocal8Bit().data(), NULL, NULL) != 0) {
-         kDebug() <<  "Could not open input file: " << fileInfo.absoluteFilePath();
-         return;
-     }
-
diff --git a/extra/kdemultimedia/kdemultimedia-dragonplayer.install b/extra/kdemultimedia/kdemultimedia-dragonplayer.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/extra/kdemultimedia/kdemultimedia-dragonplayer.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdemultimedia/kdemultimedia.install b/extra/kdemultimedia/kdemultimedia.install
deleted file mode 100644
index e70c054ec..000000000
--- a/extra/kdemultimedia/kdemultimedia.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kdemultimedia/mplayerthumbs.config b/extra/kdemultimedia/mplayerthumbs.config
deleted file mode 100644
index 761a17953..000000000
--- a/extra/kdemultimedia/mplayerthumbs.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[MPlayerThumbsCfg]
-backend=0
diff --git a/extra/kdeutils-ksecrets/PKGBUILD b/extra/kdeutils-ksecrets/PKGBUILD
deleted file mode 100644
index 677ed70f8..000000000
--- a/extra/kdeutils-ksecrets/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161247 2012-06-08 06:39:24Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-ksecrets
-pkgver=4.8.4
-pkgrel=1
-pkgdesc='Secrets Management Infrastructure for KDE'
-url='http://techbase.kde.org/Projects/Utils/ksecretsservice'
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-workspace' 'qca-ossl')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ksecrets-${pkgver}.tar.xz")
-sha1sums=('d0fd2c601833cf1ffe52760472e22d667a6a6408')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ksecrets-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/kdeutils-ksecrets/kdeutils-ksecrets.install b/extra/kdeutils-ksecrets/kdeutils-ksecrets.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/extra/kdeutils-ksecrets/kdeutils-ksecrets.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/libdrm-new/COPYING b/extra/libdrm-new/COPYING
deleted file mode 100644
index 6e74c337c..000000000
--- a/extra/libdrm-new/COPYING
+++ /dev/null
@@ -1,48 +0,0 @@
- Copyright 2005 Adam Jackson.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation on the rights to use, copy, modify, merge,
- publish, distribute, sub license, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice (including the
- next paragraph) shall be included in all copies or substantial
- portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NON-INFRINGEMENT.  IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-------------------------------------------------------------------------
-
- Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- All Rights Reserved.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice (including the
- next paragraph) shall be included in all copies or substantial
- portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT.  IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS
- SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
diff --git a/extra/libdrm-new/PKGBUILD b/extra/libdrm-new/PKGBUILD
deleted file mode 100644
index 32a85fcd1..000000000
--- a/extra/libdrm-new/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-#Id$
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libdrm-new
-pkgname=(libdrm-new libdrm-nouveau)
-pkgver=2.4.34
-pkgrel=1
-pkgdesc="Userspace interface to kernel DRM services"
-arch=(i686 x86_64)
-license=('custom')
-depends=('glibc' 'libpciaccess')
-makedepends=('cairo' 'valgrind')
-options=('!libtool' '!emptydirs')
-url="http://dri.freedesktop.org/"
-source=(http://dri.freedesktop.org/libdrm/libdrm-$pkgver.tar.bz2
-        no-pthread-stubs.patch
-        COPYING
-)
-sha1sums=('861757baff4b37e564e13f5350c1b5d01c66a181'
-          '2a5410baa3e6e078f9378ce486a88f41d22fd838'
-          'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
-
-build() {
-  cd "libdrm-$pkgver"
-  patch -Np1 -i "$srcdir/no-pthread-stubs.patch"
-
-  #libtoolize --force
-  autoreconf --force --install
-  ./configure --prefix=/usr \
-      --disable-libkms \
-      --disable-intel \
-      --disable-radeon 
-  make
-}
-
-package_libdrm-new() {
-  pkgdesc="Userspace interface to kernel DRM services - used as makedepends for xf86-video-nouveau"
-  conflicts=('libdrm')
-  provides=("libdrm=$pkgver")
-  cd "libdrm-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm "$pkgdir"/usr/lib/libdrm_nouveau.so.2*
-}
-
-package_libdrm-nouveau() {
-  pkgdesc="Userspace interface to kernel DRM services for nouveau - used as depends for xf86-video-nouveau"
-  depends=(libdrm)
-  cd "libdrm-$pkgver"
-  make DESTDIR="$pkgdir" install-libdrm_laLTLIBRARIES
-  make -C nouveau DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir" uninstall-libdrm_laLTLIBRARIES
-  rm "$pkgdir"/usr/include/libdrm/nouveau.h  "$pkgdir"/usr/lib/pkgconfig/libdrm_nouveau.pc  "$pkgdir"/usr/lib/libdrm_nouveau.so
-}
diff --git a/extra/libdrm-new/no-pthread-stubs.patch b/extra/libdrm-new/no-pthread-stubs.patch
deleted file mode 100644
index 6745f4bc4..000000000
--- a/extra/libdrm-new/no-pthread-stubs.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac
---- libdrm-2.4.34.orig/configure.ac	2012-05-12 14:54:06.375335490 +0000
-+++ libdrm-2.4.34/configure.ac	2012-05-12 14:54:32.075142065 +0000
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
- 
- 
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE([udev],
-diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am
---- libdrm-2.4.34.orig/intel/Makefile.am	2012-05-12 14:54:06.372001955 +0000
-+++ libdrm-2.4.34/intel/Makefile.am	2012-05-12 14:55:24.164745055 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	$(VALGRIND_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
-@@ -35,7 +34,6 @@
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_intel_la_LIBADD = ../libdrm.la \
--	@PTHREADSTUBS_LIBS@ \
- 	@PCIACCESS_LIBS@ \
- 	@CLOCK_LIB@
- 
-diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am
---- libdrm-2.4.34.orig/nouveau/Makefile.am	2012-05-12 14:54:06.331998148 +0000
-+++ libdrm-2.4.34/nouveau/Makefile.am	2012-05-12 14:56:00.941132085 +0000
-@@ -2,14 +2,13 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm \
- 	-DDEBUG
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = nouveau.c \
- 			    pushbuf.c \
-diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am
---- libdrm-2.4.34.orig/radeon/Makefile.am	2012-05-12 14:54:06.365334765 +0000
-+++ libdrm-2.4.34/radeon/Makefile.am	2012-05-12 14:55:48.084557437 +0000
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/radeon \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
diff --git a/extra/libdrm-old/COPYING b/extra/libdrm-old/COPYING
deleted file mode 100644
index 6e74c337c..000000000
--- a/extra/libdrm-old/COPYING
+++ /dev/null
@@ -1,48 +0,0 @@
- Copyright 2005 Adam Jackson.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation on the rights to use, copy, modify, merge,
- publish, distribute, sub license, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice (including the
- next paragraph) shall be included in all copies or substantial
- portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NON-INFRINGEMENT.  IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-------------------------------------------------------------------------
-
- Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- All Rights Reserved.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice (including the
- next paragraph) shall be included in all copies or substantial
- portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT.  IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS
- SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
diff --git a/extra/libdrm-old/PKGBUILD b/extra/libdrm-old/PKGBUILD
deleted file mode 100644
index f72b03e5c..000000000
--- a/extra/libdrm-old/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-#Id$
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libdrm-old
-pkgname=(libdrm-old libdrm-nouveau1)
-pkgver=2.4.33
-pkgrel=1
-pkgdesc="Userspace interface to kernel DRM services"
-arch=(i686 x86_64)
-license=('custom')
-depends=('glibc' 'libpciaccess')
-makedepends=('cairo' 'valgrind')
-options=('!libtool' '!emptydirs')
-url="http://dri.freedesktop.org/"
-source=(http://dri.freedesktop.org/libdrm/libdrm-$pkgver.tar.bz2
-        no-pthread-stubs.patch
-        COPYING
-)
-sha1sums=('4da2c635491724e44326871e6a49ccfec0b6b5a6'
-          '825ff5e0c4238b31bdea52f104bfec8949270e25'
-          'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
-
-build() {
-  cd "libdrm-$pkgver"
-  patch -Np1 -i "$srcdir/no-pthread-stubs.patch"
-
-  #libtoolize --force
-  autoreconf --force --install
-  ./configure --prefix=/usr \
-      --disable-libkms \
-      --disable-intel \
-      --disable-radeon \
-      --enable-nouveau-experimental-api
-  make
-}
-
-package_libdrm-old() {
-  pkgdesc="Userspace interface to kernel DRM services - used as makedepends for nouveau-dri"
-  conflicts=('libdrm')
-  provides=("libdrm=$pkgver")
-  cd "libdrm-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm "$pkgdir"/usr/lib/libdrm_nouveau.so.1*
-}
-
-package_libdrm-nouveau1() {
-  pkgdesc="Userspace interface to kernel DRM services for nouveau - used as depends for nouveau-dri"
-  depends=(libdrm)
-  cd "libdrm-$pkgver"
-  make DESTDIR="$pkgdir" install-libdrm_laLTLIBRARIES
-  make -C nouveau DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir" uninstall-libdrm_laLTLIBRARIES
-  rm -rf "$pkgdir"/usr/include/  "$pkgdir"/usr/lib/pkgconfig/libdrm_nouveau.pc  "$pkgdir"/usr/lib/libdrm_nouveau.so
-}
diff --git a/extra/libdrm-old/no-pthread-stubs.patch b/extra/libdrm-old/no-pthread-stubs.patch
deleted file mode 100644
index 5430244f9..000000000
--- a/extra/libdrm-old/no-pthread-stubs.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
---- libdrm-2.4.0/configure.ac	2008-10-09 21:57:09.000000000 +0200
-+++ libdrm-2.4.0-nostubs/configure.ac	2008-10-21 10:48:24.000000000 +0200
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
- 
- 
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE([udev],
---- libdrm-2.4.16/intel/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/intel/Makefile.am.new	2009-12-07 08:11:32.235748069 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
-@@ -34,7 +33,6 @@
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_intel_la_LIBADD = ../libdrm.la \
--	@PTHREADSTUBS_LIBS@ \
- 	@PCIACCESS_LIBS@ \
- 	@CLOCK_LIB@
- 
---- libdrm-2.4.16/radeon/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/radeon/Makefile.am.new	2009-12-07 08:12:31.889075388 +0000
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/radeon \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
---- libdrm-2.4.16/nouveau/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/nouveau/Makefile.am.new	2009-12-07 08:13:01.489072320 +0000
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = \
- 			    nouveau_device.c \
diff --git a/extra/libggz/PKGBUILD b/extra/libggz/PKGBUILD
deleted file mode 100644
index 88807de78..000000000
--- a/extra/libggz/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 149563 2012-02-08 14:13:45Z tpowa $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=libggz
-pkgver=0.0.14.1
-pkgrel=3.1
-pkgdesc="GGZ base library, used by the GGZ Gaming Zone server (ggzd), the ggzcore library and other components"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.ggzgamingzone.org/"
-license=('LGPL')
-depends=('libgcrypt')
-options=('!libtool')
-source=("http://ftp.ggzgamingzone.org/pub/ggz/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('603739504648833779aa13b0327a1c3d')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/libimobiledevice/HOME-segfault.patch b/extra/libimobiledevice/HOME-segfault.patch
new file mode 100644
index 000000000..e48e6cb42
--- /dev/null
+++ b/extra/libimobiledevice/HOME-segfault.patch
@@ -0,0 +1,14 @@
+The patch fixes segfault when both $XDG_CONFIG_HOME and $HOME are unset
+Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com>
+--- src/userpref.c.orig	2012-06-04 17:04:57.387303630 +0300
++++ src/userpref.c	2012-06-04 17:06:05.741301627 +0300
+@@ -125,6 +125,9 @@
+ 	const char *cdir = getenv("XDG_CONFIG_HOME");
+ 	if (!cdir) {
+ 		cdir = getenv("HOME");
++		if (!cdir) {
++			cdir="/root";
++		}
+ 		strcpy(__config_dir, cdir);
+ 		strcat(__config_dir, DIR_SEP_S);
+ 		strcat(__config_dir, ".config");
diff --git a/extra/libimobiledevice/PKGBUILD b/extra/libimobiledevice/PKGBUILD
new file mode 100644
index 000000000..aefb7c445
--- /dev/null
+++ b/extra/libimobiledevice/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 164735 2012-08-04 10:06:26Z tomegun $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Gabriel Martinez < reitaka at gmail dot com >
+
+pkgname=libimobiledevice
+pkgver=1.1.4
+pkgrel=2
+pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
+url="http://libimobiledevice.org/"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL2' 'LGPL2.1')
+depends=('usbmuxd' 'gnutls' 'libgcrypt')
+options=('!libtool')
+source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2
+	HOME-segfault.patch)
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  patch -p0 < "$srcdir/HOME-segfault.patch"
+
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+md5sums=('3f28cbc6a2e30d34685049c0abde5183'
+         '0de709dbf8e79d0b00cca06f5e61d57c')
diff --git a/extra/libkgoogle/PKGBUILD b/extra/libkgoogle/PKGBUILD
deleted file mode 100644
index a714dc1c7..000000000
--- a/extra/libkgoogle/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 159516 2012-05-25 18:26:22Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkgoogle
-pkgver=0.3.1
-pkgrel=1
-pkgdesc="A KDE-based library for accessing various Google services via their public API"
-url='https://projects.kde.org/projects/kdereview/libkgoogle'
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdepimlibs' 'qjson')
-makedepends=('cmake' 'automoc4' 'boost')
-replaces=('akonadi-google')
-conflicts=('akonadi-google')
-source=("http://www.progdan.cz/wp-content/uploads/akonadi-google-${pkgver}.tar.gz")
-md5sums=('fed8d9082547835ab916edd219831cf6')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../akonadi-google-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/libva-driver-intel/PKGBUILD b/extra/libva-driver-intel/PKGBUILD
deleted file mode 100644
index 81f20b214..000000000
--- a/extra/libva-driver-intel/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 161867 2012-06-16 00:18:43Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-
-pkgname=libva-driver-intel
-pkgver=1.0.18
-pkgrel=1
-pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family."
-arch=('i686' 'x86_64')
-url="http://freedesktop.org/wiki/Software/vaapi"
-license=('MIT')
-depends=('libva')
-options=('!libtool')
-source=(http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-${pkgver}.tar.bz2)
-md5sums=('d8c52f07148dfb2e0407549b90300bc1')
-
-build() {
-  cd intel-driver-$pkgver
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd intel-driver-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/libwebkit/PKGBUILD b/extra/libwebkit/PKGBUILD
deleted file mode 100644
index 924d155e6..000000000
--- a/extra/libwebkit/PKGBUILD
+++ /dev/null
@@ -1,91 +0,0 @@
-# $Id: PKGBUILD 165830 2012-08-31 06:45:09Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=libwebkit
-pkgname=(libwebkit) # libwebkit3)
-pkgver=1.8.3
-pkgrel=1.2
-pkgdesc="An opensource web content engine"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://webkitgtk.org/"
-license=('custom')
-depends=('libxt' 'libxslt' 'sqlite' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant' 'libgl'
-         'geoclue')
-makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'mesa') # 'gtk3' 'mesa')
-options=('!libtool' '!emptydirs')
-source=(http://webkitgtk.org/releases/webkit-$pkgver.tar.xz
-        bison26.diff)
-sha256sums=('ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7'
-            '2a9c0c1b9d5259fd1254ebea228fc83313267fbe8cfec1bb43356de1f355b93e')
-
-build() {
-  cd "$srcdir/webkit-$pkgver"
-  # https://bugs.webkit.org/show_bug.cgi?id=92264 / http://trac.webkit.org/changeset/124099
-  patch -Np1 -i ${srcdir}/bison26.diff
-
-  mkdir build-gtk{2,3}
-
-  if [ "$CARCH" = "mips64el" ]; then
-      # Fix MIPS N32 support.
-      sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
-          Source/JavaScriptCore/wtf/Platform.h
-      # Don't enable JIT even if configure finds that it's not supported.
-      sed -i 's/#define ENABLE_JIT 1/#define ENABLE_JIT 0/' \
-          Source/JavaScriptCore/wtf/Platform.h
-
-# --disable-optimizations will add -O0
-      export CFLAGS="${CFLAGS/-O[0-9]}"
-
-      extra="--disable-fast-malloc --disable-optimizations"
-  fi
-
-  # clear makeflags: race during introspection.
-  # WebKit*.gir should be created before WebKit*.typelib, but isn't
-  #MAKEFLAGS=
-
-  ( cd build-gtk2 && _build --with-gtk=2.0 $extra )
- # ( cd build-gtk3 && _build --with-gtk=3.0 $extra )
-}
-
-_build() {
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-introspection \
-    --with-font-backend=freetype \
-    --with-unicode-backend=icu \
-    --enable-spellcheck "$@"
-  #make all stamp-po
-  
-  # crazy smp build fix by LFS - http://www.linuxfromscratch.org/blfs/view/svn/x/webkitgtk.html
-  # !!! safes a lot of time but may cover other bugs you won't notice anymore !!!
-  error_count=0
-  until make all stamp-po #-j$(getconf _NPROCESSORS_ONLN)
-  do
-    if (( $((error_count++)) > 4 ))
-    then
-      echo Too Many Errors
-      break
-    fi
-  done
-  unset error_count
-}
-
-package_libwebkit() {
-  pkgdesc+=" (for GTK2)"
-  depends+=(gtk2)
-
-  cd "$srcdir/webkit-$pkgver/build-gtk2"
-  make DESTDIR="$pkgdir" install
-  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit/LICENSE"
-}
-
-package_libwebkit3() {
-  pkgdesc+=" (for GTK3)"
-  depends+=(gtk3)
-
-  cd "$srcdir/webkit-$pkgver/build-gtk3"
-  make DESTDIR="$pkgdir" install
-  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit3/LICENSE"
-}
-
-
-
diff --git a/extra/libwebkit/bison26.diff b/extra/libwebkit/bison26.diff
deleted file mode 100644
index 682ae7127..000000000
--- a/extra/libwebkit/bison26.diff
+++ /dev/null
@@ -1,556 +0,0 @@
-Subversion Revision: 123651
-diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y
-index c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84 100644
---- a/Source/WebCore/css/CSSGrammar.y
-+++ b/Source/WebCore/css/CSSGrammar.y
-@@ -53,14 +53,13 @@ using namespace HTMLNames;
- #define YYMAXDEPTH 10000
- #define YYDEBUG 0
- 
--// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x
--#define YYPARSE_PARAM parser
--#define YYLEX_PARAM parser
--
- %}
- 
- %pure_parser
- 
-+%parse-param { CSSParser* parser }
-+%lex-param { CSSParser* parser }
-+
- %union {
-     bool boolean;
-     char character;
-@@ -89,7 +88,7 @@ using namespace HTMLNames;
- 
- %{
- 
--static inline int cssyyerror(const char*)
-+static inline int cssyyerror(void*, const char*)
- {
-     return 1;
- }
-diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
-index 650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2 100644
---- a/Source/WebCore/css/CSSParser.cpp
-+++ b/Source/WebCore/css/CSSParser.cpp
-@@ -114,7 +114,7 @@
- extern int cssyydebug;
- #endif
- 
--extern int cssyyparse(void* parser);
-+extern int cssyyparse(WebCore::CSSParser*);
- 
- using namespace std;
- using namespace WTF;
-diff --git a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y
-index 2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3 100644
---- a/Source/WebCore/xml/XPathGrammar.y
-+++ b/Source/WebCore/xml/XPathGrammar.y
-@@ -34,6 +34,7 @@
- #include "XPathParser.h"
- #include "XPathPath.h"
- #include "XPathPredicate.h"
-+#include "XPathStep.h"
- #include "XPathVariableReference.h"
- #include <wtf/FastMalloc.h>
- 
-@@ -44,8 +45,6 @@
- #define YYLTYPE_IS_TRIVIAL 1
- #define YYDEBUG 0
- #define YYMAXDEPTH 10000
--#define YYPARSE_PARAM parserParameter
--#define PARSER static_cast<Parser*>(parserParameter)
- 
- using namespace WebCore;
- using namespace XPath;
-@@ -53,6 +52,7 @@ using namespace XPath;
- %}
- 
- %pure_parser
-+%parse-param { WebCore::XPath::Parser* parser }
- 
- %union
- {
-@@ -71,7 +71,7 @@ using namespace XPath;
- %{
- 
- static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
--static void xpathyyerror(const char*) { }
-+static void xpathyyerror(void*, const char*) { }
-     
- %}
- 
-@@ -118,7 +118,7 @@ static void xpathyyerror(const char*) { }
- Expr:
-     OrExpr
-     {
--        PARSER->m_topExpr = $1;
-+        parser->m_topExpr = $1;
-     }
-     ;
- 
-@@ -138,7 +138,7 @@ AbsoluteLocationPath:
-     '/'
-     {
-         $$ = new LocationPath;
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     |
-     '/' RelativeLocationPath
-@@ -150,7 +150,7 @@ AbsoluteLocationPath:
-     {
-         $$ = $2;
-         $$->insertFirstStep($1);
--        PARSER->unregisterParseNode($1);
-+        parser->unregisterParseNode($1);
-     }
-     ;
- 
-@@ -159,22 +159,22 @@ RelativeLocationPath:
-     {
-         $$ = new LocationPath;
-         $$->appendStep($1);
--        PARSER->unregisterParseNode($1);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     RelativeLocationPath '/' Step
-     {
-         $$->appendStep($3);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($3);
-     }
-     |
-     RelativeLocationPath DescendantOrSelf Step
-     {
-         $$->appendStep($2);
-         $$->appendStep($3);
--        PARSER->unregisterParseNode($2);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($2);
-+        parser->unregisterParseNode($3);
-     }
-     ;
- 
-@@ -183,58 +183,58 @@ Step:
-     {
-         if ($2) {
-             $$ = new Step(Step::ChildAxis, *$1, *$2);
--            PARSER->deletePredicateVector($2);
-+            parser->deletePredicateVector($2);
-         } else
-             $$ = new Step(Step::ChildAxis, *$1);
--        PARSER->deleteNodeTest($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteNodeTest($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     NAMETEST OptionalPredicateList
-     {
-         String localName;
-         String namespaceURI;
--        if (!PARSER->expandQName(*$1, localName, namespaceURI)) {
--            PARSER->m_gotNamespaceError = true;
-+        if (!parser->expandQName(*$1, localName, namespaceURI)) {
-+            parser->m_gotNamespaceError = true;
-             YYABORT;
-         }
-         
-         if ($2) {
-             $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
--            PARSER->deletePredicateVector($2);
-+            parser->deletePredicateVector($2);
-         } else
-             $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     AxisSpecifier NodeTest OptionalPredicateList
-     {
-         if ($3) {
-             $$ = new Step($1, *$2, *$3);
--            PARSER->deletePredicateVector($3);
-+            parser->deletePredicateVector($3);
-         } else
-             $$ = new Step($1, *$2);
--        PARSER->deleteNodeTest($2);
--        PARSER->registerParseNode($$);
-+        parser->deleteNodeTest($2);
-+        parser->registerParseNode($$);
-     }
-     |
-     AxisSpecifier NAMETEST OptionalPredicateList
-     {
-         String localName;
-         String namespaceURI;
--        if (!PARSER->expandQName(*$2, localName, namespaceURI)) {
--            PARSER->m_gotNamespaceError = true;
-+        if (!parser->expandQName(*$2, localName, namespaceURI)) {
-+            parser->m_gotNamespaceError = true;
-             YYABORT;
-         }
- 
-         if ($3) {
-             $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
--            PARSER->deletePredicateVector($3);
-+            parser->deletePredicateVector($3);
-         } else
-             $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
--        PARSER->deleteString($2);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($2);
-+        parser->registerParseNode($$);
-     }
-     |
-     AbbreviatedStep
-@@ -259,23 +259,23 @@ NodeTest:
-         else if (*$1 == "comment")
-             $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
- 
--        PARSER->deleteString($1);
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);
-+        parser->registerNodeTest($$);
-     }
-     |
-     PI '(' ')'
-     {
-         $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
--        PARSER->deleteString($1);        
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);
-+        parser->registerNodeTest($$);
-     }
-     |
-     PI '(' LITERAL ')'
-     {
-         $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
--        PARSER->deleteString($1);        
--        PARSER->deleteString($3);
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);
-+        parser->deleteString($3);
-+        parser->registerNodeTest($$);
-     }
-     ;
- 
-@@ -293,14 +293,14 @@ PredicateList:
-     {
-         $$ = new Vector<Predicate*>;
-         $$->append(new Predicate($1));
--        PARSER->unregisterParseNode($1);
--        PARSER->registerPredicateVector($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerPredicateVector($$);
-     }
-     |
-     PredicateList Predicate
-     {
-         $$->append(new Predicate($2));
--        PARSER->unregisterParseNode($2);
-+        parser->unregisterParseNode($2);
-     }
-     ;
- 
-@@ -315,7 +315,7 @@ DescendantOrSelf:
-     SLASHSLASH
-     {
-         $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -323,13 +323,13 @@ AbbreviatedStep:
-     '.'
-     {
-         $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     |
-     DOTDOT
-     {
-         $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -337,8 +337,8 @@ PrimaryExpr:
-     VARIABLEREFERENCE
-     {
-         $$ = new VariableReference(*$1);
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     '(' Expr ')'
-@@ -349,15 +349,15 @@ PrimaryExpr:
-     LITERAL
-     {
-         $$ = new StringExpression(*$1);
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     NUMBER
-     {
-         $$ = new Number($1->toDouble());
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     FunctionCall
-@@ -369,8 +369,8 @@ FunctionCall:
-         $$ = createFunction(*$1);
-         if (!$$)
-             YYABORT;
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-     FUNCTIONNAME '(' ArgumentList ')'
-@@ -378,9 +378,9 @@ FunctionCall:
-         $$ = createFunction(*$1, *$3);
-         if (!$$)
-             YYABORT;
--        PARSER->deleteString($1);
--        PARSER->deleteExpressionVector($3);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->deleteExpressionVector($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -389,14 +389,14 @@ ArgumentList:
-     {
-         $$ = new Vector<Expression*>;
-         $$->append($1);
--        PARSER->unregisterParseNode($1);
--        PARSER->registerExpressionVector($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerExpressionVector($$);
-     }
-     |
-     ArgumentList ',' Argument
-     {
-         $$->append($3);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($3);
-     }
-     ;
- 
-@@ -412,9 +412,9 @@ UnionExpr:
-         $$ = new Union;
-         $$->addSubExpression($1);
-         $$->addSubExpression($3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -430,9 +430,9 @@ PathExpr:
-     {
-         $3->setAbsolute(true);
-         $$ = new Path(static_cast<Filter*>($1), $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     |
-     FilterExpr DescendantOrSelf RelativeLocationPath
-@@ -440,10 +440,10 @@ PathExpr:
-         $3->insertFirstStep($2);
-         $3->setAbsolute(true);
-         $$ = new Path(static_cast<Filter*>($1), $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($2);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($2);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -453,9 +453,9 @@ FilterExpr:
-     PrimaryExpr PredicateList
-     {
-         $$ = new Filter($1, *$2);
--        PARSER->unregisterParseNode($1);
--        PARSER->deletePredicateVector($2);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->deletePredicateVector($2);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -465,9 +465,9 @@ OrExpr:
-     OrExpr OR AndExpr
-     {
-         $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -477,9 +477,9 @@ AndExpr:
-     AndExpr AND EqualityExpr
-     {
-         $$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -489,9 +489,9 @@ EqualityExpr:
-     EqualityExpr EQOP RelationalExpr
-     {
-         $$ = new EqTestOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -501,9 +501,9 @@ RelationalExpr:
-     RelationalExpr RELOP AdditiveExpr
-     {
-         $$ = new EqTestOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -513,17 +513,17 @@ AdditiveExpr:
-     AdditiveExpr PLUS MultiplicativeExpr
-     {
-         $$ = new NumericOp(NumericOp::OP_Add, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     |
-     AdditiveExpr MINUS MultiplicativeExpr
-     {
-         $$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -533,9 +533,9 @@ MultiplicativeExpr:
-     MultiplicativeExpr MULOP UnaryExpr
-     {
-         $$ = new NumericOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-@@ -546,8 +546,8 @@ UnaryExpr:
-     {
-         $$ = new Negative;
-         $$->addSubExpression($2);
--        PARSER->unregisterParseNode($2);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($2);
-+        parser->registerParseNode($$);
-     }
-     ;
- 
-diff --git a/Source/WebCore/xml/XPathParser.cpp b/Source/WebCore/xml/XPathParser.cpp
-index 62d8ee37fd6ebb74a580a00c59beb6cd40c5a8b7..b5e6a9237593b4aaa2a243f2ff9d86e57f930a97 100644
---- a/Source/WebCore/xml/XPathParser.cpp
-+++ b/Source/WebCore/xml/XPathParser.cpp
-@@ -32,24 +32,21 @@
- #include "XPathEvaluator.h"
- #include "XPathException.h"
- #include "XPathNSResolver.h"
-+#include "XPathPath.h"
- #include "XPathStep.h"
- #include <wtf/StdLibExtras.h>
- #include <wtf/text/StringHash.h>
- 
--int xpathyyparse(void*);
--
-+using namespace WebCore;
- using namespace WTF;
- using namespace Unicode;
-+using namespace XPath;
- 
--namespace WebCore {
--namespace XPath {
--
--class LocationPath;
--
--#include "XPathGrammar.h"    
-+extern int xpathyyparse(WebCore::XPath::Parser*);
-+#include "XPathGrammar.h"
- 
- Parser* Parser::currentParser = 0;
--    
-+
- enum XMLCat { NameStart, NameCont, NotPartOfName };
- 
- typedef HashMap<String, Step::Axis> AxisNamesMap;
-@@ -630,5 +627,3 @@ void Parser::deleteNodeTest(Step::NodeTest* t)
-     delete t;
- }
- 
--}
--}
-
diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD
deleted file mode 100644
index d27cd5ed8..000000000
--- a/extra/lirc/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# $Id: PKGBUILD 161828 2012-06-15 08:18:10Z tpowa $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgbase=lirc
-pkgname=('lirc' 'lirc-utils')
-pkgver=0.9.0
-pkgrel=18
-epoch=1
-_extramodules=extramodules-3.4-ARCH
-arch=('i686' 'x86_64')
-url="http://www.lirc.org/"
-license=('GPL')
-### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-headers>=3.4' 'linux-headers<3.5' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
-options=('!makeflags' '!strip')
-source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
-        lirc_wpc8769l.patch
-        lircd-handle-large-config.patch
-        lirc_atiusb-kfifo.patch
-        kernel-2.6.39.patch
-	lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd)
-md5sums=('b232aef26f23fe33ea8305d276637086'
-         '1cce37e18e3f6f46044abab29016d18f'
-         'b70cc9640505205446ec47b7d4779f38'
-         '1f8b104a2365d9f93404b143f499059b'
-         '087a7d102e1c96bf1179f38db2b0b237'
-         '8d0e238dc0eda95e340fe570605da492'
-         '85f7fdac55e5256967241864049bf5e9'
-         '3deb02604b37811d41816e9b4385fcc3'
-         '5b1f8c9cd788a39a6283f93302ce5c6e'
-         'f0c0ac930326168035f0c8e24357ae55'
-         '69d099e6deedfa3c1ee2b6e82d9b8bfb')
-
-build() {
-  _kernver="$(cat /lib/modules/${_extramodules}/version)"
-  cd "${srcdir}/lirc-${pkgver}"
-  patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
-  patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
-  patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch"
-  patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
-
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  sed -e 's/@X_CFLAGS@//g' \
-      -e 's/@X_LIBS@//g' \
-      -e 's/@X_PRE_LIBS@//g' \
-      -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
-  libtoolize
-  autoreconf
-
-  PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
-      --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
-      --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
-      --with-transmitter
-
-  # Remove drivers already in kernel
-  sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \
-      -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \
-      -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \
-      -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile 
-  make
-}
-
-package_lirc() {
-  pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
-  depends=('lirc-utils' 'linux>=3.4' 'linux<3.5')
-  replaces=('lirc+pctv')
-  install=lirc.install
-
-  cd "${srcdir}/lirc-${pkgver}/drivers"
-  make DESTDIR="${pkgdir}" moduledir="/lib/modules/${_extramodules}" install
-
-  # set the kernel we've built for inside the install script
-  sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install"
-  # gzip -9 modules
-  find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-}
-
-package_lirc-utils() {
-  pkgdesc="Linux Infrared Remote Control utils"
-  depends=('alsa-lib' 'libx11' 'libftdi' 'libirman')
-  optdepends=('python2: pronto2lirc utility')
-  options=('strip' '!libtool')
-  backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf')
-
-  cd "${srcdir}/lirc-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d"
-  cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d"
-  cp -rp remotes "${pkgdir}/usr/share/lirc"
-  chmod -R go-w "${pkgdir}/usr/share/lirc/"
-
-  # install the logrotate config
-  install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
-    
-  # install conf.d file
-  install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf"
-
-  # install conf.d file
-  install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf"
-
-  install -d "${pkgdir}/etc/lirc"
-  
-  # remove built modules
-  rm -r "${pkgdir}/lib/"
-}
diff --git a/extra/lirc/irexec.conf b/extra/lirc/irexec.conf
deleted file mode 100644
index f911c7515..000000000
--- a/extra/lirc/irexec.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters for irexec daemon (path to lircrc)
-#
-
-IREXEC_OPTS=""
-\ No newline at end of file
diff --git a/extra/lirc/irexecd b/extra/lirc/irexecd
deleted file mode 100755
index a64b033a5..000000000
--- a/extra/lirc/irexecd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/irexec.conf
-
-PID=`pidof -o %PPID /usr/bin/irexec`
-case "$1" in
-  start)
-    stat_busy "Starting IREXEC Daemon"
-    [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon irexecd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping IREXEC Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon irexecd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
diff --git a/extra/lirc/kernel-2.6.39.patch b/extra/lirc/kernel-2.6.39.patch
deleted file mode 100644
index 7353d61ca..000000000
--- a/extra/lirc/kernel-2.6.39.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ru lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c
---- lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c	2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c	2011-06-07 17:02:20.356580306 +0200
-@@ -48,7 +48,6 @@
- #include <linux/slab.h>
- #include <linux/module.h>
- #include <linux/kmod.h>
--#include <linux/smp_lock.h>
- #include <linux/completion.h>
- #include <linux/uaccess.h>
- #include <linux/usb.h>
-diff -ru lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c
---- lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c	2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c	2011-06-07 17:04:19.725933627 +0200
-@@ -555,8 +555,8 @@
- 		kfree(ir);
- 		return -EINVAL;
- 	}
--	printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
--	       adap->id, addr, ir->c.name);
-+	printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n",
-+	       addr, ir->c.name);
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
- 	/* register device */
-diff -ru lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c
---- lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c	2011-03-25 23:28:18.000000000 +0100
-+++ lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c	2011-06-07 17:07:23.984935411 +0200
-@@ -361,14 +361,14 @@
- 		size = count << 3;
- 
- 		ldata = (unsigned long *) data_buf;
--		next_one = generic_find_next_le_bit(ldata, size, 0);
-+		next_one = find_next_zero_bit_le(ldata, size, 0);
- 
- 		if (next_one > 0)
- 			put_pulse_bit(next_one
- 				* WPC8769L_USECS_PER_BIT);
- 
- 		while (next_one < size) {
--			next_zero = generic_find_next_zero_le_bit(ldata,
-+			next_zero = find_next_zero_bit_le(ldata,
- 				size, next_one + 1);
- 
- 			put_space_bit(
-@@ -376,7 +376,7 @@
- 				* WPC8769L_USECS_PER_BIT);
- 
- 			if (next_zero < size) {
--				next_one = generic_find_next_le_bit(ldata,
-+				next_one = find_next_bit_le(ldata,
- 					size, next_zero + 1);
- 
- 				put_pulse_bit(
diff --git a/extra/lirc/lirc.install b/extra/lirc/lirc.install
deleted file mode 100644
index 4551e88dc..000000000
--- a/extra/lirc/lirc.install
+++ /dev/null
@@ -1,16 +0,0 @@
-EXTRAMODULES=extramodules-3.4-ARCH
-
-post_install() {
-  # updating module dependencies
-  echo ">>> Updating module dependencies. Please wait ..."
-  depmod $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
-}
-
-post_upgrade() {
-  post_install
-}
-
-# arg 1:  the old package version
-post_remove() {
-  post_install
-}
diff --git a/extra/lirc/lirc.logrotate b/extra/lirc/lirc.logrotate
deleted file mode 100644
index 623c4f328..000000000
--- a/extra/lirc/lirc.logrotate
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/lircd {
-   missingok
-   notifempty
-   delaycompress
-}
diff --git a/extra/lirc/lirc_atiusb-kfifo.patch b/extra/lirc/lirc_atiusb-kfifo.patch
deleted file mode 100644
index a64984dce..000000000
--- a/extra/lirc/lirc_atiusb-kfifo.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001
-From: Jason Martin <publicmsu@gmail.com>
-Date: Fri, 3 Jun 2011 00:12:51 -0400
-Subject: [PATCH] lirc_atiusb: fix buffer alloc to work with new kfifo
-
-I came across posts with regards to lirc_atiusb and its compatibility
-with newer kernels, and their use of kfifo.I spent a little bit of time
-this evening, and was able to correct the issues with the driver, and
-now have a functioning lirc_atiusb device under the 2.6.38 kernel.
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- drivers/lirc_atiusb/lirc_atiusb.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c
-index 52080de..bf2b631 100644
---- a/drivers/lirc_atiusb/lirc_atiusb.c
-+++ b/drivers/lirc_atiusb/lirc_atiusb.c
-@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf)
- 		goto new_irctl_failure_check;
- 	}
- 
--	if (lirc_buffer_init(driver->rbuf, dclen, 1)) {
-+	if (lirc_buffer_init(driver->rbuf, dclen, 2)) {
- 		mem_failure = 4;
- 		goto new_irctl_failure_check;
- 	}
--- 
-1.7.0.1
-
diff --git a/extra/lirc/lirc_wpc8769l.patch b/extra/lirc/lirc_wpc8769l.patch
deleted file mode 100644
index e4e2a049b..000000000
--- a/extra/lirc/lirc_wpc8769l.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 413e83bf504fe9a9a177f27742220cfcb184b034 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Juan=20Jes=C3=BAs=20Garc=C3=ADa=20de=20Soria=20Lucena?= <skandalfo@gmail.com>
-Date: Wed, 30 Mar 2011 16:46:35 -0400
-Subject: [PATCH] Make lirc_wpc8769l functional again
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- drivers/lirc_wpc8769l/lirc_wpc8769l.c |   28 +++++++++++++++++-----------
- 1 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-index f820d11..4d04063 100644
---- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-+++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-@@ -816,10 +816,6 @@ static int set_use_inc(void *data)
- 	/* Reset last timeout value. */
- 	lastus = 0;
- 
--	/* Init the read buffer. */
--	if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0)
--		return -ENOMEM;
--
- 	/* Acquire the IRQ. */
- 	result = request_irq(irq, irq_handler,
- 			   IRQF_DISABLED | IRQF_SHARED,
-@@ -863,9 +859,6 @@ static void set_use_dec(void *data)
- 	/* Free the IRQ. */
- 	free_irq(irq, THIS_MODULE);
- 	dprintk("Freed IRQ %d\n", irq);
--
--	/* Free the RX buffer. */
--	lirc_buffer_free(&rbuf);
- }
- 
- static struct lirc_driver driver = {
-@@ -1065,19 +1058,29 @@ static int __init lirc_wpc8769l_module_init(void)
- 	/* Do load-time checks. */
- 	wpc8769l_power_up_and_check_if_we_woke_us_up();
- 
-+	/* Init the read buffer. */
-+	if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) {
-+		rc = -ENOMEM;
-+		goto exit_platform_exit;
-+	}
-+
- 	/* Configure the driver hooks. */
- 	driver.features = LIRC_CAN_REC_MODE2;
-+	driver.dev = &lirc_wpc8769l_platform_dev->dev;
- 	driver.minor = lirc_register_driver(&driver);
- 	if (driver.minor < 0) {
- 		eprintk("lirc_register_driver failed!\n");
- 		rc = -EIO;
--		goto exit_platform_exit;
-+		goto exit_release_buffer;
- 	}
- 
- 	iprintk("Driver loaded.\n");
- 
- 	return 0; /* Everything OK. */
- 
-+exit_release_buffer:
-+	lirc_buffer_free(&rbuf);
-+
- exit_platform_exit:
- 	lirc_wpc8769l_platform_exit();
- 
-@@ -1095,12 +1098,15 @@ module_init(lirc_wpc8769l_module_init);
- 
- static void __exit lirc_wpc8769l_module_exit(void)
- {
--	/* Unregister the platform driver and device. */
--	lirc_wpc8769l_platform_exit();
--
- 	/* Unregister the LIRC driver. */
- 	lirc_unregister_driver(driver.minor);
- 
-+	/* Free the buffer. */
-+	lirc_buffer_free(&rbuf);
-+
-+	/* Unregister the platform driver and device. */
-+	lirc_wpc8769l_platform_exit();
-+
- 	/* Release the second range. */
- 	if (baseport2)
- 		release_region(baseport2, WPC8769L_IO_REGION_2_SIZE);
--- 
-1.7.0.1
-
diff --git a/extra/lirc/lircd b/extra/lirc/lircd
deleted file mode 100755
index e9739b36e..000000000
--- a/extra/lirc/lircd
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/lircd.conf
-
-PID=$(pidof -o %PPID /usr/sbin/lircd)
-LIRCD_SYMLINKFILE=/dev/lircd
-LIRCD_SOCKET=/var/run/lirc/lircd
-case "$1" in
-  start)
-    stat_busy "Starting LIRC Daemon"
-   [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null
-    rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE
-    if [ $? -ne 0 ]; then
-      stat_fail
-      exit 0
-    fi
-    [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS"
-    [ -z "$PID" ] && 
-      if [ -n "$LIRC_DEVICE" ] ; then
-        eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
-      else
-        /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
-      fi
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon lircd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping LIRC Daemon"
-    rm -f $LIRCD_SYMLINKFILE
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon lircd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 start|stop|restart"
-esac
-exit 0
diff --git a/extra/lirc/lircd-handle-large-config.patch b/extra/lirc/lircd-handle-large-config.patch
deleted file mode 100644
index 85bc20518..000000000
--- a/extra/lirc/lircd-handle-large-config.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001
-From: Jarod Wilson <jarod@redhat.com>
-Date: Wed, 6 Apr 2011 11:04:12 -0400
-Subject: [PATCH] lircd: handle larger config files in write_socket better
-
-Pointed out by Michael Zanetti on list, irsend LIST has issues with long
-config files, which didn't exist in maintainer mode, as we were using a
-do while loop to make sure we spit out everything. Just use that loop
-all the time.
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- daemons/lircd.c |    8 ++------
- 1 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/daemons/lircd.c b/daemons/lircd.c
-index 6c21a3a..ddcca05 100644
---- a/daemons/lircd.c
-+++ b/daemons/lircd.c
-@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len)
- 	int done, todo = len;
- 
- 	while (todo) {
--#ifdef SIM_REC
- 		do {
- 			done = write(fd, buf, todo);
--		}
--		while (done < 0 && errno == EAGAIN);
--#else
--		done = write(fd, buf, todo);
--#endif
-+		} while (done < 0 && errno == EAGAIN);
-+
- 		if (done <= 0)
- 			return (done);
- 		buf += done;
--- 
-1.7.0.1
-
diff --git a/extra/lirc/lircd.conf b/extra/lirc/lircd.conf
deleted file mode 100644
index 760dab065..000000000
--- a/extra/lirc/lircd.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Parameters for lirc daemon
-#
-
-LIRC_DEVICE="/dev/lirc0"
-LIRC_DRIVER=""
-LIRC_EXTRAOPTS=""
-LIRC_CONFIGFILE=""
diff --git a/extra/lirc/lircmd b/extra/lirc/lircmd
deleted file mode 100755
index 220c47c9c..000000000
--- a/extra/lirc/lircmd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/lircmd`
-case "$1" in
-  start)
-    stat_busy "Starting lircmd Daemon"
-    [ -z "$PID" ] && /usr/sbin/lircmd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon lircmd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping lircmd Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon lircmd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/lsdvd/PKGBUILD b/extra/lsdvd/PKGBUILD
deleted file mode 100644
index 6f57870ad..000000000
--- a/extra/lsdvd/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 150946 2012-02-24 09:46:48Z pierre $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=lsdvd
-pkgver=0.16
-pkgrel=6
-pkgdesc="A C application for reading the contents of a DVD and printing the contents to your terminal"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://sourceforge.net/projects/lsdvd/"
-depends=('libdvdread')
-license=('GPL2')
-#Special thanks to Mathieu Clabaut <mathieu.clabaut@gmail.com> for patches
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'stdint_usage.patch')
-md5sums=('340e1abe5c5e5abf7ff8031e78f49ee7'
-         '6cbcbfde873f894bd3c784f65141b2fc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/stdint_usage.patch"
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/lsdvd/stdint_usage.patch b/extra/lsdvd/stdint_usage.patch
deleted file mode 100644
index 67b9ee82d..000000000
--- a/extra/lsdvd/stdint_usage.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/lsdvd.c	2006-03-02 07:48:11.000000000 -0600
-+++ b/lsdvd.c	2007-09-27 19:15:28.000000000 -0500
-@@ -13,6 +13,7 @@
-  *  2003-04-19  Cleanups get_title_name, added dvdtime2msec, added helper macros,
-  *			  output info structures in form of a Perl module, by Henk Vergonet.
-  */
-+#include <stdint.h>
- #include <dvdread/ifo_read.h>
- #include <string.h>
- #include <sys/stat.h>
---- a/configure	2005-12-12 14:22:45.000000000 -0600
-+++ b/configure	2007-09-27 19:15:13.000000000 -0500
-@@ -2887,8 +2887,8 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <dvdread/ifo_read.h>
- 		#include <stdint.h>
-+#include <dvdread/ifo_read.h>
- int
- main ()
- {
diff --git a/extra/mt-st/PKGBUILD b/extra/mt-st/PKGBUILD
deleted file mode 100644
index 9d13fc784..000000000
--- a/extra/mt-st/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 137900 2011-09-12 10:12:39Z allan $
-# Maintainer:
-# Contributer: dorphell <dorphell@archlinux.org>
-
-pkgname=mt-st
-pkgver=1.1
-pkgrel=3.1
-pkgdesc="Linux SCSI tape driver aware magnetic tape control"
-arch=('i686' 'x86_64' 'mips64el')
-url="ftp://ftp.ibiblio.org/pub/linux/system/backup/"
-license=('GPL2')
-depends=('glibc')
-source=(ftp://ftp.ibiblio.org/pub/linux/system/backup/$pkgname-$pkgver.tar.gz)
-md5sums=('fdd5f5ec673c9f630a102ceff7612774')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -dm755 $pkgdir/{sbin,bin,usr/share/man/man1,usr/share/man/man8}
-  make SBINDIR=$pkgdir/sbin BINDIR=$pkgdir/bin \
-    MANDIR=$pkgdir/usr/share/man install
-}
diff --git a/extra/mtx/PKGBUILD b/extra/mtx/PKGBUILD
deleted file mode 100644
index 7c85007e5..000000000
--- a/extra/mtx/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 137902 2011-09-12 10:18:06Z allan $
-# Maintainer:
-# Contributer: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=mtx
-pkgver=1.3.12
-pkgrel=2.1
-pkgdesc="Send robot commands to tape changer"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://mtx.opensource-sw.net/"
-license=('GPL2')
-depends=('glibc')
-source=(http://downloads.sourceforge.net/mtx/${pkgname}-${pkgver}.tar.gz)
-md5sums=('ce8f0e44671fb0c7d9ec30bb0bfa8b5c')
-
-build() {
-  cd $srcdir/${pkgname}-${pkgver}
-  sed -i 's/static const unsigned char scsi_command_size/const unsigned char scsi_command_size/' \
-    sg_err.c
-  ./configure --prefix='/usr' --datadir='/usr/share'
-  make
-}
-
-package() {
-  cd $srcdir/${pkgname}-${pkgver}
-  make prefix=$pkgdir/usr install
-}
diff --git a/extra/multitail/PKGBUILD b/extra/multitail/PKGBUILD
deleted file mode 100644
index 1e455e8d3..000000000
--- a/extra/multitail/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 151290 2012-02-25 13:01:05Z pierre $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Roberto Carvajal <roberto@archlinux.org>
-
-pkgname=multitail
-pkgver=5.2.9
-pkgrel=1
-pkgdesc="Lets you view one or multiple files like the original tail program"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.vanheusden.com/multitail"
-depends=('ncurses')
-backup=('etc/multitail.conf')
-source=("${url}/${pkgname}-${pkgver}.tgz")
-md5sums=('871cb6a9a0d4f599b9cbd9f603da4c51')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  install -D -m 755 multitail ${pkgdir}/usr/bin/multitail
-  install -D -m 644 multitail.1 ${pkgdir}/usr/share/man/man1/multitail.1
-  install -D -m 644 multitail.conf ${pkgdir}/etc/multitail.conf
-}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/extra/nouveau-dri/LICENSE b/extra/nouveau-dri/LICENSE
deleted file mode 100644
index ae33d2709..000000000
--- a/extra/nouveau-dri/LICENSE
+++ /dev/null
@@ -1,82 +0,0 @@
-Disclaimer
-
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from Silicon Graphics,
-Inc.(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-
-Please do not refer to the library as MesaGL (for legal
-reasons). It's just Mesa or The Mesa 3-D graphics
-library
-
-* OpenGL is a trademark of Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-The Mesa distribution consists of several components.  Different copyrights
-and licenses apply to different components.  For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors.  See below for a list of
-Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license.
-This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms
-of the component to which you're contributing.
-The following section lists the primary components of the Mesa distribution
-and their respective licenses.
-
-
-Mesa Component Licenses
-
-Component         Location               Primary Author      License
-----------------------------------------------------------------------------
-Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
-
-Device drivers    src/mesa/drivers/*     See drivers         See drivers
-
-Ext headers       include/GL/glext.h     SGI                 SGI Free B
-                  include/GL/glxext.h
-
-GLUT              src/glut/              Mark Kilgard        Mark's copyright
-
-Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
-
-SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
-
-demo programs     progs/demos/           various             see source files
-
-X demos           progs/xdemos/          Brian Paul          see source files
-
-SGI demos         progs/samples/         SGI                 SGI copyright
-
-RedBook demos     progs/redbook/         SGI                 SGI copyright
diff --git a/extra/nouveau-dri/PKGBUILD b/extra/nouveau-dri/PKGBUILD
deleted file mode 100644
index 2848f0bff..000000000
--- a/extra/nouveau-dri/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 163980 2012-07-23 08:35:29Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=nouveau-dri
-pkgver=8.0.4
-pkgrel=2
-arch=('i686' 'x86_64')
-makedepends=('glproto>=1.4.15' 'libdrm-old' 'libdrm-nouveau1' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 
-             'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-source=(LICENSE
-        mesa-8.0.3-llvm-3.1-fixes.patch
-        ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-)
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         'c452ed3392468170726c004c2f4e02ca'
-         'd546f988adfdf986cff45b1efa2d8a46')
-
-build() {
-    cd ${srcdir}/?esa-*
-
-    patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch"
-
-     autoreconf -vfi
-    ./configure --prefix=/usr \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=nouveau \
-    --with-dri-drivers=nouveau \
-    --enable-gallium-llvm \
-    --enable-gallium-egl \
-    --enable-shared-glapi \
-    --enable-gbm \
-    --enable-glx-tls \
-    --enable-dri \
-    --enable-glx \
-    --enable-osmesa \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-egl \
-    --enable-texture-float \
-    --enable-xa \
-    --enable-shared-dricore
-  make
-}
-
-package() {
-  depends=("libgl=${pkgver}" 'libdrm-nouveau1')
-  pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
-
-  # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
-  # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-}
diff --git a/extra/nouveau-dri/mesa-8.0.3-llvm-3.1-fixes.patch b/extra/nouveau-dri/mesa-8.0.3-llvm-3.1-fixes.patch
deleted file mode 100644
index a567b5926..000000000
--- a/extra/nouveau-dri/mesa-8.0.3-llvm-3.1-fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index a50a51d..f1bb4d9 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
-    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
- 
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
-+   if (!MRI) {
-+      debug_printf("error: no register info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+
-+   OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
-+   if (!MII) {
-+      debug_printf("error: no instruction info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+#endif
-+
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<MCInstPrinter> Printer(
-+         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
-+#elif HAVE_LLVM == 0x0300
-    OwningPtr<MCInstPrinter> Printer(
-          T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
- #elif HAVE_LLVM >= 0x0208
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index fe7616b..68f8808 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -62,7 +62,11 @@
- extern "C" void
- lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
- {
-+#if HAVE_LLVM >= 0x0301
-+   llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
-+#else
-    llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+#endif
- }
- 
- 
diff --git a/extra/nss-myhostname/PKGBUILD b/extra/nss-myhostname/PKGBUILD
deleted file mode 100644
index 54fef6d97..000000000
--- a/extra/nss-myhostname/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 150778 2012-02-21 23:58:05Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Mantas M. <grawity@gmail.com>
-pkgname="nss-myhostname"
-pkgver=0.3
-pkgrel=2.1
-pkgdesc="NSS plugin providing host name resolution for the locally configured system hostname"
-arch=(i686 x86_64 mips64el)
-url="http://0pointer.de/lennart/projects/nss-myhostname/"
-license=('LGPL2.1')
-depends=('glibc')
-source=("http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-install=nss-myhostname.install
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-lynx
-  make
-}
-
-package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-md5sums=('d4ab9ac36c053ab8fb836db1cbd4a48f')
diff --git a/extra/nss-myhostname/nss-myhostname.install b/extra/nss-myhostname/nss-myhostname.install
deleted file mode 100644
index 30ae6844f..000000000
--- a/extra/nss-myhostname/nss-myhostname.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_install() {
-  cat << 'EOM'
-==> To enable resolution of the local hostname, append 'myhostname' to the hosts
-    line in /etc/nsswitch.conf.
-EOM
-}
diff --git a/extra/oxine/PKGBUILD b/extra/oxine/PKGBUILD
deleted file mode 100644
index b0ab5e6ae..000000000
--- a/extra/oxine/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 150882 2012-02-23 13:48:09Z allan $
-# Maintainer:
-# Contributor: Rouslan Solomakhin <rouslan@localnet.com>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=oxine
-pkgver=0.7.1
-pkgrel=6.1
-pkgdesc="A lightweight, purely osd based xine frontend for set-top boxes and home entertainment systems"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://oxine.sourceforge.net/"
-license=('GPL')
-depends=('xine-lib' 'libexif' 'eject' 'libcdio' 'curl' 'libxtst')
-source=(http://downloads.sourceforge.net/sourceforge/oxine/${pkgname}-${pkgver}.tar.gz)
-md5sums=('2a2d05ee21892624e35cf539e532c0dd')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|#include <curl/types.h>||' configure src/download.c
-  ./configure --prefix=/usr --disable-hal --without-jsw --disable-extractor \
-    --without-imagemagick --disable-gdkpixbuf --disable-weather
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/pdksh/PKGBUILD b/extra/pdksh/PKGBUILD
deleted file mode 100644
index 6ad3ddaad..000000000
--- a/extra/pdksh/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 128476 2011-06-24 03:30:58Z eric $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=pdksh
-pkgver=5.2.14
-pkgrel=6.1
-pkgdesc="A public domain clone of the AT&T Korn shell"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.cs.mun.ca/~michael/pdksh/"
-license=('custom')
-depends=('glibc')
-install=pdksh.install
-#ftp://ftp.cs.mun.ca/pub/$pkgname/$pkgname-$pkgver.tar.gz
-source=(http://www.cs.mun.ca/~michael/pdksh/files/$pkgname-$pkgver.tar.gz pdksh-5.2.14.patch usr_ksh.sh)
-md5sums=('871106b3bd937e1afba9f2ef7c43aef3' 'f11d1e711627d21a547c09e344e30dd3'\
-         '56084a657ecafd5dd0813a6056036712')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i ../$pkgname-$pkgver.patch
-  ./configure --prefix=/ --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make prefix="$pkgdir" mandir="$pkgdir/usr/share/man/man1" install
-  install -D -m 755 "${srcdir}/usr_ksh.sh" "${pkgdir}/usr/bin/ksh"
-  install -D -m644 LEGAL "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/extra/pdksh/pdksh-5.2.14.patch b/extra/pdksh/pdksh-5.2.14.patch
deleted file mode 100644
index 134e04f34..000000000
--- a/extra/pdksh/pdksh-5.2.14.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ru pdksh-5.2.14/siglist.sh pdksh-5.2.14.arch/siglist.sh
---- pdksh-5.2.14/siglist.sh	1996-09-18 12:52:41.000000000 -0400
-+++ pdksh-5.2.14.arch/siglist.sh	2004-09-06 08:17:15.000000000 -0400
-@@ -11,19 +11,18 @@
- out=tmpo$$.c
- ecode=1
- trapsigs='0 1 2 13 15'
--trap 'rm -f $in $out; trap 0; exit $ecode' $trapsigs
-+trap 'rm -f $in $out; exit $ecode' $trapsigs
- 
- CPP="${1-cc -E}"
- 
- # The trap here to make up for a bug in bash (1.14.3(1)) that calls the trap
--(trap $trapsigs;
-- echo '#include "sh.h"';
-+(echo '#include "sh.h"';
-  echo '	{ QwErTy SIGNALS , "DUMMY" , "hook for number of signals" },';
-  sed -e '/^[	 ]*#/d' -e 's/^[	 ]*\([^ 	][^ 	]*\)[	 ][	 ]*\(.*[^ 	]\)[ 	]*$/#ifdef SIG\1\
- 	{ QwErTy SIG\1 , "\1", "\2" },\
- #endif/') > $in
- $CPP $in  > $out
--sed -n 's/{ QwErTy/{/p' < $out | awk '{print NR, $0}' | sort +2n +0n |
-+sed -n 's/{ QwErTy/{/p' < $out | awk '{print NR, $0}' | sort -g --key=3 |
-     sed 's/^[0-9]* //' |
-     awk 'BEGIN { last=0; nsigs=0; }
- 	{
diff --git a/extra/pdksh/pdksh.install b/extra/pdksh/pdksh.install
deleted file mode 100644
index 17463a17e..000000000
--- a/extra/pdksh/pdksh.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  if [ ! "$(grep /bin/ksh etc/shells)" ]; then
-    echo "updating /etc/shells... done."
-    sed -i "s|/bin/bash|/bin/bash\n/bin/ksh|" etc/shells
-  else
-    sed -i "s|/usr/bin/ksh|/bin/ksh|" etc/shells
-
-    echo ""
-    echo ">> WARNING: /usr/bin/ksh has moved to /bin/ksh,"
-    echo ">> please update your user accounts as needed"
-    echo ""
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  echo -ne "\nupdating /etc/shells... "
-  sed -i "s|/bin/ksh||" etc/shells
-}
diff --git a/extra/pdksh/usr_ksh.sh b/extra/pdksh/usr_ksh.sh
deleted file mode 100644
index 17a96d1bf..000000000
--- a/extra/pdksh/usr_ksh.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-echo "WARNING: you should be calling ksh with /bin/ksh,"
-echo "not with /usr/bin/ksh. Please execute chsh to fix"
-echo "this. Legacy /usr/bin/ksh support will go away!"
-echo ""
-
-exec /bin/ksh $@
-
diff --git a/extra/pdns-recursor/PKGBUILD b/extra/pdns-recursor/PKGBUILD
deleted file mode 100644
index a949ebea0..000000000
--- a/extra/pdns-recursor/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 151458 2012-02-26 11:37:32Z pierre $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=pdns-recursor
-pkgver=3.3
-pkgrel=2
-pkgdesc="PowerDNS recursor"
-url="http://www.powerdns.com"
-license=('GPL')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('gcc-libs' 'lua')
-makedepends=('boost')
-backup=('etc/powerdns/recursor.conf')
-source=("http://downloads.powerdns.com/releases/${pkgname}-${pkgver}.tar.bz2"
-        'pdns-recursor.rc')
-md5sums=('87daeeebb6f7af9e07814ff6c43300dd'
-         '5b3aa3c8ed2edf55821af16cfb7ef252')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d -m755 "${pkgdir}/etc/rc.d"
-  mv "${pkgdir}/etc/powerdns/recursor.conf-dist" "${pkgdir}/etc/powerdns/recursor.conf"
-  install -m755 "${srcdir}/pdns-recursor.rc" "${pkgdir}/etc/rc.d/pdns-recursor"
-  rm -rf "${pkgdir}/etc/init.d"
-}
diff --git a/extra/pdns-recursor/pdns-recursor.rc b/extra/pdns-recursor/pdns-recursor.rc
deleted file mode 100644
index 992f0b086..000000000
--- a/extra/pdns-recursor/pdns-recursor.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting PowerDNS recursor"
-    ! /usr/sbin/rec_control ping > /dev/null 2>&1 && /usr/sbin/pdns_recursor --daemon
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon pdns-recursor
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping PowerDNS recursor"
-    rec_control quit > /dev/null 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon pdns-recursor
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/pdns/2.9.18-default-mysql-options.patch b/extra/pdns/2.9.18-default-mysql-options.patch
deleted file mode 100755
index a9048e13e..000000000
--- a/extra/pdns/2.9.18-default-mysql-options.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur pdns-2.9.18.orig/modules/gmysqlbackend/smysql.cc pdns-2.9.18/modules/gmysqlbackend/smysql.cc
---- pdns-2.9.18.orig/modules/gmysqlbackend/smysql.cc	2005-04-23 23:40:15.000000000 +0200
-+++ pdns-2.9.18/modules/gmysqlbackend/smysql.cc	2005-07-17 10:38:35.363597586 +0200
-@@ -15,6 +15,9 @@
- 	       const string &password)
- {
-   mysql_init(&d_db);
-+#if MYSQL_VERSION_ID > 32349
-+  mysql_options(&d_db, MYSQL_READ_DEFAULT_GROUP, "client");
-+#endif
-   if (!mysql_real_connect(&d_db, host.empty() ? 0 : host.c_str(), 
- 			  user.empty() ? 0 : user.c_str(), 
- 			  password.empty() ? 0 : password.c_str(),
diff --git a/extra/pdns/PKGBUILD b/extra/pdns/PKGBUILD
deleted file mode 100644
index 855f10911..000000000
--- a/extra/pdns/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 151459 2012-02-26 11:41:02Z pierre $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=pdns
-pkgver=2.9.22.6
-pkgrel=1
-pkgdesc="A modern, advanced and high performance authoritative-only nameserver"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.powerdns.com"
-license=('GPL')
-depends=('gcc-libs' 'zlib' 'postgresql-libs' 'libmysqlclient' 'sqlite3' 'libldap')
-makedepends=('boost')
-provides=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
-replaces=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
-conflicts=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
-install=pdns.install
-options=('!makeflags' '!libtool')
-backup=('etc/powerdns/pdns.conf')
-source=("http://downloads.powerdns.com/releases/${pkgname}-${pkgver}.tar.gz"
-        '2.9.18-default-mysql-options.patch'
-        'pdns-2.9.22-gcc44.patch'
-        'pdns.rc'
-        'pdns.conf')
-md5sums=('ff97ba980b322adb61c3e9c9e9c4adef'
-         '90fb32e843326d14359c508cef855929'
-         '530642273005bdabae27792098834ea6'
-         '16e2d32e9781be7afa8f1700740bcdb0'
-         'a390ab49c4fcde205629be33bddc2e6c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/2.9.18-default-mysql-options.patch"
-  patch -p1 -i "${srcdir}/pdns-2.9.22-gcc44.patch"
-  touch AUTHORS NEWS
-  libtoolize --force --copy
-  aclocal
-  autoconf
-  automake --add-missing
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc/powerdns \
-    --libexecdir=/usr/lib \
-    --libdir=/usr/lib/powerdns \
-    --mandir=/usr/share/man \
-    --with-modules="" \
-    --with-dynmodules="ldap pipe gmysql gpgsql gsqlite3 geo" \
-    --disable-recursor \
-    --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  rm "${pkgdir}/etc/powerdns/pdns.conf-dist"
-  install -m644 "${srcdir}/pdns.conf" "${pkgdir}/etc/powerdns/"
-  install -m755 "${srcdir}/pdns.rc" "${pkgdir}/etc/rc.d/pdns"
-}
diff --git a/extra/pdns/pdns-2.9.22-gcc44.patch b/extra/pdns/pdns-2.9.22-gcc44.patch
deleted file mode 100644
index 35c1c7777..000000000
--- a/extra/pdns/pdns-2.9.22-gcc44.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur pdns-2.9.22.orig/pdns/dnsparser.cc pdns-2.9.22/pdns/dnsparser.cc
---- pdns-2.9.22.orig/pdns/dnsparser.cc	2008-11-15 22:32:46.000000000 +0200
-+++ pdns-2.9.22/pdns/dnsparser.cc	2009-07-06 22:09:02.000000000 +0300
-@@ -16,6 +16,7 @@
-     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
- 
-+#include <stdio.h>
- #include "dnsparser.hh"
- #include "dnswriter.hh"
- #include <boost/lexical_cast.hpp>
-diff -ur pdns-2.9.22.orig/pdns/rcpgenerator.cc pdns-2.9.22/pdns/rcpgenerator.cc
---- pdns-2.9.22.orig/pdns/rcpgenerator.cc	2008-11-15 23:20:27.000000000 +0200
-+++ pdns-2.9.22/pdns/rcpgenerator.cc	2009-07-06 22:07:26.000000000 +0300
-@@ -16,6 +16,7 @@
-     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
- 
-+#include <stdio.h>
- #include "rcpgenerator.hh"
- #include "dnsparser.hh"
- #include "misc.hh"
diff --git a/extra/pdns/pdns.conf b/extra/pdns/pdns.conf
deleted file mode 100644
index 1bf24e73f..000000000
--- a/extra/pdns/pdns.conf
+++ /dev/null
@@ -1,290 +0,0 @@
-# Autogenerated configuration file template
-#################################
-# allow-axfr-ips	If disabled, DO allow zonetransfers from these IP addresses
-#
-# allow-axfr-ips=
-
-#################################
-# allow-recursion	List of netmasks that are allowed to recurse
-#
-allow-recursion=127.0.0.1
-
-#################################
-# allow-recursion-override	Local data overrrides hosts on the internet
-#
-allow-recursion-override=yes
-
-#################################
-# cache-ttl	Seconds to store packets in the PacketCache
-#
-cache-ttl=60
-
-#################################
-# chroot	If set, chroot to this directory for more security
-#
-chroot=/var/empty
-
-#################################
-# config-dir	Location of configuration directory (pdns.conf)
-#
-config-dir=/etc
-
-#################################
-# config-name	Name of this virtual configuration - will rename the binary image
-#
-# config-name=
-
-#################################
-# control-console	Debugging switch - don't use
-#
-# control-console=no
-
-#################################
-# daemon	Operate as a daemon
-#
-daemon=yes
-
-#################################
-# default-soa-name	name to insert in the SOA record if none set in the backend
-#
-# default-soa-name=a.misconfigured.powerdns.server
-
-#################################
-# disable-axfr	Disable zonetransfers but do allow TCP queries
-#
-# disable-axfr=no
-
-#################################
-# disable-tcp	Do not listen to TCP queries
-#
-# disable-tcp=no
-
-#################################
-# distributor-threads	Default number of Distributor (backend) threads to start
-#
-distributor-threads=3
-
-#################################
-# fancy-records	Process URL and MBOXFW records
-#
-# fancy-records=no
-
-#################################
-# guardian	Run within a guardian process
-#
-guardian=yes
-
-#################################
-# launch	Which backends to launch and order to query them in
-#
-#launch=
-
-#################################
-# lazy-recursion	Only recurse if question cannot be answered locally
-#
-lazy-recursion=yes
-
-#################################
-# load-modules	Load this module - supply absolute or relative path
-#
-# load-modules=
-
-#################################
-# local-address	Local IP address to which we bind
-#
-local-address=127.0.0.1
-
-#################################
-# local-ipv6	Local IP address to which we bind
-#
-# local-ipv6=
-
-#################################
-# local-port	The port on which we listen
-#
-local-port=53
-
-#################################
-# log-dns-details	If PDNS should log failed update requests
-#
-#log-dns-details=off
-
-#################################
-# log-failed-updates	If PDNS should log failed update requests
-#
-#log-failed-updates=off
-
-#################################
-# logfile	Logfile to use
-#
-# logfile=pdns.log
-
-#################################
-# logging-facility	Log under a specific facility
-#
-# logging-facility=
-
-#################################
-# loglevel	Amount of logging. Higher is more. Do not set below 3
-#
-loglevel=3
-
-#################################
-# master	Act as a master
-#
-# master=no
-
-#################################
-# max-queue-length	Maximum queuelength before considering situation lost
-#
-# max-queue-length=5000
-
-#################################
-# max-tcp-connections	Maximum number of TCP connections
-#
-# max-tcp-connections=10
-
-#################################
-# module-dir	Default directory for modules
-#
-module-dir=/usr/lib/powerdns
-
-#################################
-# negquery-cache-ttl	Seconds to store packets in the PacketCache
-#
-negquery-cache-ttl=60
-
-#################################
-# only-soa	Make sure that no SOA serial is less than this number
-#
-# only-soa=org
-
-#################################
-# out-of-zone-additional-processing	Do out of zone additional processing
-#
-# out-of-zone-additional-processing=no
-
-#################################
-# query-cache-ttl	Seconds to store packets in the PacketCache
-#
-# query-cache-ttl=20
-
-#################################
-# query-logging	Hint backends that queries should be logged
-#
-# query-logging=no
-
-#################################
-# queue-limit	Maximum number of milliseconds to queue a query
-#
-# queue-limit=1500
-
-#################################
-# receiver-threads	Number of receiver threads to launch
-#
-# receiver-threads=1
-
-#################################
-# recursive-cache-ttl	Seconds to store packets in the PacketCache
-#
-# recursive-cache-ttl=10
-
-#################################
-# recursor	If recursion is desired, IP address of a recursing nameserver
-#
-#recursor=
-
-#################################
-# setgid	If set, change group id to this gid for more security
-#
-setgid=nobody
-
-#################################
-# setuid	If set, change user id to this uid for more security
-#
-setuid=nobody
-
-#################################
-# skip-cname	Do not perform CNAME indirection for each query
-#
-# skip-cname=no
-
-#################################
-# slave	Act as a slave
-#
-# slave=no
-
-#################################
-# slave-cycle-interval	Reschedule failed SOA serial checks once every .. seconds
-#
-# slave-cycle-interval=60
-
-#################################
-# smtpredirector	Our smtpredir MX host
-#
-# smtpredirector=a.misconfigured.powerdns.smtp.server
-
-#################################
-# soa-minimum-ttl	Default SOA mininum ttl
-#
-# soa-minimum-ttl=3600
-
-#################################
-# soa-serial-offset	Make sure that no SOA serial is less than this number
-#
-# soa-serial-offset=0
-
-#################################
-# socket-dir	Where the controlsocket will live
-#
-socket-dir=/var/run
-
-#################################
-# strict-rfc-axfrs	Perform strictly rfc compliant axfrs (very slow)
-#
-# strict-rfc-axfrs=no
-
-#################################
-# urlredirector	Where we send hosts to that need to be url redirected
-#
-# urlredirector=127.0.0.1
-
-#################################
-# use-logfile	Use a log file
-#
-use-logfile=no
-
-#################################
-# webserver	Start a webserver for monitoring
-#
-webserver=no
-
-#################################
-# webserver-address	IP Address of webserver to listen on
-#
-# webserver-address=127.0.0.1
-
-#################################
-# webserver-password	Password required for accessing the webserver
-#
-# webserver-password=
-
-#################################
-# webserver-port	Port of webserver to listen on
-#
-# webserver-port=8081
-
-#################################
-# webserver-print-arguments	If the webserver should print arguments
-#
-# webserver-print-arguments=no
-
-#################################
-# wildcard-url	Process URL and MBOXFW records
-#
-# wildcard-url=no
-
-#################################
-# wildcards	Honor wildcards in the database
-#
-wildcards=yes
diff --git a/extra/pdns/pdns.install b/extra/pdns/pdns.install
deleted file mode 100644
index f41b36b20..000000000
--- a/extra/pdns/pdns.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  cat << 'EOM'
-==> PowerDNS is built without recursor now. To use the recursor, 
-==> please install the pdns-recursor package and update the 
-==> configuration in /etc/powerdns/recursor.conf
-EOM
-}
-
-post_upgrade() {
-  post_install $1
-}
diff --git a/extra/pdns/pdns.rc b/extra/pdns/pdns.rc
deleted file mode 100644
index 2f143ddae..000000000
--- a/extra/pdns/pdns.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting DNS"
-    ! /usr/sbin/pdns_control ping > /dev/null 2>&1 && /usr/sbin/pdns_server --daemon
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon pdns
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DNS"
-    pdns_control quit > /dev/null 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon pdns
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/perl-time-hires/PKGBUILD b/extra/perl-time-hires/PKGBUILD
deleted file mode 100644
index d72b0df14..000000000
--- a/extra/perl-time-hires/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 160559 2012-06-02 10:28:27Z bluewind $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: mezcal <fila at pruda dot com>
-
-pkgname=perl-time-hires
-pkgver=1.9725
-pkgrel=2
-pkgdesc="Perl module: high resolution time, sleep, and alarm"
-arch=('i686' 'x86_64' 'mips64el')
-license=('PerlArtistic')
-url="http://search.cpan.org/dist/Time-HiRes/"
-depends=('perl')
-options=(!emptydirs)
-source=("http://search.cpan.org/CPAN/authors/id/Z/ZE/ZEFRAM/Time-HiRes-${pkgver}.tar.gz")
-md5sums=('cb1108c076d26f3d2fed0bb91313135a')
-
-build() {
-  cd "${srcdir}/Time-HiRes-${pkgver}"
-
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-
-  make
-}
-
-check() {
-  cd "${srcdir}/Time-HiRes-${pkgver}"
-
-  make test
-}
-
-package() {
-  cd "${srcdir}/Time-HiRes-${pkgver}"
-
-  make install DESTDIR="${pkgdir}"
-}
diff --git a/extra/pypgsql/COPYING b/extra/pypgsql/COPYING
deleted file mode 100644
index c13985414..000000000
--- a/extra/pypgsql/COPYING
+++ /dev/null
@@ -1,20 +0,0 @@
-    pyPgSQL, version 2.5
-    A Python DB-API 2.0 compliant interface for PostgreSQL
-    Copyright 2000 by Billy G. Allie.
-    All rights reserved.
-
-    Permission to use, copy, modify, and distribute this software and it's
-    documentation for any purpose and without fee is hereby granted,
-    provided that the above copyright notice appear in all copies and that
-    both that copyright notice and this permission notice appear in
-    supporting documentation, and that the copyright owner's name not be
-    used in advertising or publicity pertaining to distribution of the
-    software without specific, written prior permission.
-
-    THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-    INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN
-    NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-    CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-    USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-    OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
diff --git a/extra/pypgsql/PKGBUILD b/extra/pypgsql/PKGBUILD
deleted file mode 100644
index 374b2d6aa..000000000
--- a/extra/pypgsql/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 151045 2012-02-24 14:28:44Z pierre $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-pkgname=pypgsql
-pkgver=2.5.1
-pkgrel=8
-pkgdesc="A python client library for postgresql"
-arch=('i686' 'x86_64' 'mips64el')
-license=('custom')
-url="http://pypgsql.sourceforge.net/"
-depends=('python-egenix-mx-base' 'postgresql-libs')
-source=("http://downloads.sourceforge.net/${pkgname}/pyPgSQL-${pkgver}.tar.gz"
-        'COPYING')
-md5sums=('82670f6f1652aa4766fdaec2cb43debd'
-         '235c239b51a8b8e6b53c414ef71d7612')
-
-package() {
-  cd ${srcdir}/pyPgSQL-${pkgver}
-  python2 setup.py install --root=${pkgdir}
-
-  # install custom license
-  install -Dm644 $srcdir/COPYING \
-    $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
diff --git a/extra/python-imaging/PKGBUILD b/extra/python-imaging/PKGBUILD
deleted file mode 100644
index e4cd1b9ae..000000000
--- a/extra/python-imaging/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 144447 2011-12-05 21:28:19Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: simo <simo@archlinux.org>
-
-pkgname=python-imaging
-pkgver=1.1.7
-pkgrel=4.1
-pkgdesc="PIL. Provides image processing capabilities for python"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.pythonware.com/products/pil/index.htm"
-license=('custom:"pil"')
-depends=('python2' 'libjpeg' 'freetype2' 'lcms') 
-makedepends=('tk' 'sane')
-optdepends=('tk' 'sane')
-provides=("pil=${pkgver}")
-conflicts=('pil')
-replaces=('pil')
-source=(http://effbot.org/downloads/Imaging-${pkgver}.tar.gz)
-md5sums=('fc14a54e1ce02a0225be8854bfba478e')
-
-build() {
-  cd "${srcdir}"/Imaging-${pkgver}
-  python2 setup.py build_ext
-  cd Sane
-  python2 setup.py build_ext
-}
-
-package() {
-  cd "${srcdir}"/Imaging-${pkgver}
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  
-  pushd Sane
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  popd
-  
-  install -dm755 "${pkgdir}"/usr/include/python2.7/
-  install -m644 -t "${pkgdir}"/usr/include/python2.7/ libImaging/*.h 
-
-  # do not have files ending in .py in /usr/bin
-  for f in pildriver pilprint pilconvert pilfile pilfont; do
-    mv "${pkgdir}"/usr/bin/${f}{.py,}
-  done
-
-  # Install license
-  install -Dm644 "${srcdir}"/Imaging-${pkgver}/README \
-                 "${pkgdir}"/usr/share/licenses/${pkgname}/README
-}
diff --git a/extra/python-pycurl/PKGBUILD b/extra/python-pycurl/PKGBUILD
deleted file mode 100644
index 2562d35f1..000000000
--- a/extra/python-pycurl/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 150558 2012-02-18 14:39:59Z pierre $
-# Maintainer:
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
-
-pkgname=python-pycurl
-pkgver=7.19.0
-pkgrel=6
-pkgdesc="A Python interface to libcurl"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://pycurl.sourceforge.net"
-license=('GPL')
-depends=('python2' 'curl')
-replaces=('pycurl')
-provides=('pycurl')
-source=("http://pycurl.sourceforge.net/download/pycurl-${pkgver}.tar.gz")
-md5sums=('919d58fe37e69fe87ce4534d8b6a1c7b')
-
-package() {
-  cd "${srcdir}"/pycurl-${pkgver}
-  python2 setup.py install --curl-config=/usr/bin/curl-config --prefix ${pkgdir}/usr
-}
diff --git a/extra/raptor1/PKGBUILD b/extra/raptor1/PKGBUILD
deleted file mode 100644
index 085809cc9..000000000
--- a/extra/raptor1/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 144014 2011-12-01 20:20:30Z andrea $
-# Maintainer:
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: eric <eric@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=raptor1
-pkgver=1.4.21
-pkgrel=4
-pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples - old V1 api for compatibility"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://librdf.org/raptor"
-depends=('curl' 'libxslt')
-license=('LGPL')
-options=('!libtool' '!docs')
-source=("http://librdf.org/dist/source/raptor-$pkgver.tar.gz"
-        'curl.patch')
-md5sums=('992061488af7a9e2d933df6b694bb876'
-         '8fe28761645d6a6607b25c94f9ada964')
-
-build() {
-  cd "${srcdir}"/raptor-${pkgver}
-  patch -p1 -i "${srcdir}"/curl.patch
-
-  ./configure --prefix=/usr \
-    --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/raptor-${pkgver}"
-  make prefix="${pkgdir}"/usr install
-  
-  mv "${pkgdir}"/usr/bin/rapper "${pkgdir}"/usr/bin/rapperV1
-  rm -f "${pkgdir}"/usr/share/man/man1/rapper.1
-}
diff --git a/extra/raptor1/curl.patch b/extra/raptor1/curl.patch
deleted file mode 100644
index 590140536..000000000
--- a/extra/raptor1/curl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up raptor-1.4.21/src/raptor_internal.h.curl raptor-1.4.21/src/raptor_internal.h
---- raptor-1.4.21/src/raptor_internal.h.curl	2010-01-29 17:54:42.000000000 -0600
-+++ raptor-1.4.21/src/raptor_internal.h	2011-07-31 11:02:44.182465296 -0500
-@@ -852,7 +852,6 @@ int raptor_utf8_is_nfc(const unsigned ch
- 
- #ifdef RAPTOR_WWW_LIBCURL
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #endif
- 
diff --git a/extra/rssh/PKGBUILD b/extra/rssh/PKGBUILD
deleted file mode 100644
index 1b950c66e..000000000
--- a/extra/rssh/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 164390 2012-08-01 04:02:33Z bisson $
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=rssh
-pkgver=2.3.3
-pkgrel=4
-pkgdesc='Restricted shell for use with OpenSSH, allowing only scp and/or sftp'
-url='http://www.pizzashack.org/rssh/'
-license=('custom:rssh')
-arch=('i686' 'x86_64' 'mips64el')
-backup=('etc/rssh.conf')
-depends=('openssh')
-source=("http://downloads.sourceforge.net/sourceforge/rssh/rssh-${pkgver}.tar.gz"
-        'env-breach.patch'
-        'destdir.patch'
-        'rsync.patch')
-sha1sums=('0a6dd80b5e6059e0db12c9f1276121dd966b610a'
-          '434712f82f24c60834a10142ca5c49b8a57555a7'
-          '85bd1694decae5872cbeeafd578b147eb13313c6'
-          '86564eab4493f4b4502a022e5938babb31450a00')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	patch -p1 -i ../env-breach.patch # FS#30950
-	patch -p1 -i ../rsync.patch # FS#21783
-	patch -p1 -i ../destdir.patch
-
-	./configure \
-		--prefix=/usr \
-		--libexecdir=/usr/lib/rssh \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/rssh/LICENSE
-}
diff --git a/extra/rssh/destdir.patch b/extra/rssh/destdir.patch
deleted file mode 100644
index 90fa03e6d..000000000
--- a/extra/rssh/destdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -aur old//Makefile.am new//Makefile.am
---- old//Makefile.am	2006-12-21 23:22:37.000000000 +0100
-+++ new//Makefile.am	2010-11-25 18:15:29.253376150 +0100
-@@ -16,7 +16,7 @@
- 	$(CC) -c $(DEFS) $(ourdefs) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $<
- 
- install-exec-hook:
--	chmod u+s $(libexecdir)/rssh_chroot_helper
-+	chmod u+s $(DESTDIR)$(libexecdir)/rssh_chroot_helper
- 
- rpm:	dist
- 	rpmbuild -ta --sign $(base).tar.gz
-diff -aur old//Makefile.in new//Makefile.in
---- old//Makefile.in	2010-08-01 15:59:54.000000000 +0200
-+++ new//Makefile.in	2010-11-25 18:15:29.253376150 +0100
-@@ -830,7 +830,7 @@
- 	$(CC) -c $(DEFS) $(ourdefs) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $<
- 
- install-exec-hook:
--	chmod u+s $(libexecdir)/rssh_chroot_helper
-+	chmod u+s $(DESTDIR)$(libexecdir)/rssh_chroot_helper
- 
- rpm:	dist
- 	rpmbuild -ta --sign $(base).tar.gz
diff --git a/extra/rssh/env-breach.patch b/extra/rssh/env-breach.patch
deleted file mode 100644
index e9193c7bd..000000000
--- a/extra/rssh/env-breach.patch
+++ /dev/null
@@ -1,228 +0,0 @@
---- rssh-2.3.3/main.c.in	2010-08-01 15:43:30.000000000 -0400
-+++ rssh-2.3.3/main.c.in	2012-05-11 16:44:39.000000000 -0400
-@@ -184,7 +184,7 @@
- 	 * determine if the command in cmdline is acceptable to run, and store
- 	 * name of program to exec in cmd
- 	 */
--	if ( !(*cmd = check_command_line(cmdline, opts)) ) return NULL;
-+	if ( !(*cmd = get_command(cmdline, opts)) ) return NULL;
- 
- 	/* if we need to do chroot processing, do it */
- 	if ( opts->shell_flags & RSSH_USE_CHROOT ){
-@@ -252,7 +252,9 @@
- 	}
- 
- 	/* return vector of pointers to command line arguments */
--	return build_arg_vector(cmdline, 0);
-+	argvec = build_arg_vector(cmdline, 0);
-+	if (check_command_line(argvec, opts)) return argvec;
-+	else return NULL;
- }
- 
- void vers_info( void )
---- rssh-2.3.3/util.c	2010-08-01 09:07:00.000000000 -0400
-+++ rssh-2.3.3/util.c	2012-05-11 16:43:10.000000000 -0400
-@@ -106,7 +106,7 @@
- 	/* print error message to user and log attempt */
- 	fprintf(stderr, "\nThis account is restricted by rssh.\n"
- 		"%s\n\nIf you believe this is in error, please contact "
--	        "your system administrator.\n\n", cmd);
-+		"your system administrator.\n\n", cmd);
- 	if ( argc < 3 )
- 		log_msg("user %s attempted to log in with a shell",
- 			username);
-@@ -132,31 +132,35 @@
-  */
- bool opt_exist(char *cl, char opt)
- {
--	int	i = 0;
-+	int	i = 1;
- 	int	len;
--	char	*token;
--	bool	optstring = FALSE;
--
- 
- 	len = strlen(cl);
- 
- 	/* process command line character by character */
--	while ( i < (len - 2) ){
--		if ( cl[i] == ' ' || cl[i] == '\t' ){
--			if ( cl[i+1] == '-' ){ 
--				optstring = TRUE;
--				i+=2;
--			}
--		}
--		if ( cl[i] == opt && optstring ) return TRUE;
--		if ( cl[i] == ' ' || cl[i] == '\t' || cl[i] == '-' ) 
--			optstring = FALSE;
-+	if (!(cl[0] == '-')) return FALSE;
-+	while ( i < (len) ){
-+		if ( cl[i] == opt ) return TRUE;
- 		i++;
- 	}
- 	return FALSE;
- }
- 
- 
-+bool opt_filter(char **vec, const char opt)
-+{
-+	while (vec && *vec){
-+		if (opt_exist(*vec, opt)){
-+			fprintf(stderr, "\nillegal insecure %c option", opt);
-+			log_msg("insecure %c option in scp command line!", opt);
-+			return TRUE;
-+		}
-+		vec++;
-+	}
-+	return FALSE;
-+}
-+
-+
- bool check_command( char *cl, ShellOptions_t *opts, char *cmd, int cmdflag )
- {
- 	int	cl_len;		/* length of command line */
-@@ -186,69 +190,78 @@
- 	return FALSE;
- }
- 
-+
- /*
-  * check_command_line() - take the command line passed to rssh, and verify
-- * 			  that the specified command is one the user is
-- * 			  allowed to run.  Return the path of the command
-- * 			  which will be run if it is ok, or return NULL if it
-- * 			  is not.
-+ *			  that the specified command is one the user is
-+ *			  allowed to run and validate the arguments.  Return the
-+ *			  path of the command which will be run if it is ok, or
-+ *			  return NULL if it is not.
-  */
--char *check_command_line( char *cl, ShellOptions_t *opts )
-+char *check_command_line( char **cl, ShellOptions_t *opts )
- {
- 
--	if ( check_command(cl, opts, PATH_SFTP_SERVER, RSSH_ALLOW_SFTP) )
-+	if ( check_command(*cl, opts, PATH_SFTP_SERVER, RSSH_ALLOW_SFTP) )
- 		return PATH_SFTP_SERVER;
- 
--	if ( check_command(cl, opts, PATH_SCP, RSSH_ALLOW_SCP) ){
-+	if ( check_command(*cl, opts, PATH_SCP, RSSH_ALLOW_SCP) ){
- 		/* filter -S option */
--		if ( opt_exist(cl, 'S') ){
--			fprintf(stderr, "\ninsecure -S option not allowed.");
--			log_msg("insecure -S option in scp command line!");
--			return NULL;
--		}
-+		if ( opt_filter(cl, 'S') ) return NULL;
- 		return PATH_SCP;
- 	}
- 
--	if ( check_command(cl, opts, PATH_CVS, RSSH_ALLOW_CVS) ){
--		if ( opt_exist(cl, 'e') ){
--			fprintf(stderr, "\ninsecure -e option not allowed.");
--			log_msg("insecure -e option in cvs command line!");
--			return NULL;
--		}
-+	if ( check_command(*cl, opts, PATH_CVS, RSSH_ALLOW_CVS) ){
-+		if ( opt_filter(cl, 'e') ) return NULL;
- 		return PATH_CVS;
- 	}
- 
--	if ( check_command(cl, opts, PATH_RDIST, RSSH_ALLOW_RDIST) ){
-+	if ( check_command(*cl, opts, PATH_RDIST, RSSH_ALLOW_RDIST) ){
- 		/* filter -P option */
--		if ( opt_exist(cl, 'P') ){
--			fprintf(stderr, "\ninsecure -P option not allowed.");
--			log_msg("insecure -P option in rdist command line!");
--			return NULL;
--		}
-+		if ( opt_filter(cl, 'P') ) return NULL;
- 		return PATH_RDIST;
- 	}
- 
--	if ( check_command(cl, opts, PATH_RSYNC, RSSH_ALLOW_RSYNC) ){
-+	if ( check_command(*cl, opts, PATH_RSYNC, RSSH_ALLOW_RSYNC) ){
- 		/* filter -e option */
--		if ( opt_exist(cl, 'e') ){
--			fprintf(stderr, "\ninsecure -e option not allowed.");
--			log_msg("insecure -e option in rdist command line!");
--			return NULL;
--		}
--		
--		if ( strstr(cl, "--rsh=" ) ){
--			fprintf(stderr, "\ninsecure --rsh= not allowed.");
--			log_msg("insecure --rsh option in rsync command line!");
--			return NULL;
-+		if ( opt_filter(cl, 'e') ) return NULL;
-+		while (cl && *cl){
-+			if ( strstr(*cl, "--rsh=" ) ){
-+				fprintf(stderr, "\ninsecure --rsh= not allowed.");
-+				log_msg("insecure --rsh option in rsync command line!");
-+				return NULL;
-+			}
- 		}
--
- 		return PATH_RSYNC;
- 	}
-+	/* No match, return NULL */
-+	return NULL;
-+}
-+
-+
-+/*
-+ * get_command() - take the command line passed to rssh, and verify
-+ *		   that the specified command is one the user is allowed to run.
-+ *		   Return the path of the command which will be run if it is ok,
-+ *		   or return NULL if it is not.
-+ */
-+char *get_command( char *cl, ShellOptions_t *opts )
-+{
- 
-+	if ( check_command(cl, opts, PATH_SFTP_SERVER, RSSH_ALLOW_SFTP) )
-+		return PATH_SFTP_SERVER;
-+	if ( check_command(cl, opts, PATH_SCP, RSSH_ALLOW_SCP) )
-+		return PATH_SCP;
-+	if ( check_command(cl, opts, PATH_CVS, RSSH_ALLOW_CVS) )
-+		return PATH_CVS;
-+	if ( check_command(cl, opts, PATH_RDIST, RSSH_ALLOW_RDIST) )
-+		return PATH_RDIST;
-+	if ( check_command(cl, opts, PATH_RSYNC, RSSH_ALLOW_RSYNC) )
-+		return PATH_RSYNC;
- 	return NULL;
- }
- 
- 
-+
- /*
-  * extract_root() - takes a root directory and the full path to some other
-  *                  directory, and returns a pointer to a string which
-@@ -264,7 +277,7 @@
- 	len = strlen(root);
- 	/* get rid of a trailing / from the root path */
- 	if ( root[len - 1] == '/' ){
--	       	root[len - 1] = '\0';
-+		root[len - 1] = '\0';
- 		len--;
- 	}
- 	if ( (strncmp(root, path, len)) ) return NULL;
-@@ -309,7 +322,7 @@
-  *                     same name, and returns FALSE if the bits are not valid
-  */
- int validate_access( const char *temp, bool *allow_sftp, bool *allow_scp,
--	       	     bool *allow_cvs, bool *allow_rdist, bool *allow_rsync )
-+		     bool *allow_cvs, bool *allow_rdist, bool *allow_rsync )
- {
- 	int	i;
- 
---- rssh-2.3.3/util.h	2006-12-21 17:22:38.000000000 -0500
-+++ rssh-2.3.3/util.h	2012-05-11 16:21:12.000000000 -0400
-@@ -33,7 +33,8 @@
- #include "rsshconf.h"
- 
- void fail( int flags, int argc, char **argv );
--char *check_command_line( char *cl, ShellOptions_t *opts );
-+char *check_command_line( char **cl, ShellOptions_t *opts );
-+char *get_command( char *cl, ShellOptions_t *opts);
- char *extract_root( char *root, char *path );
- int  validate_umask( const char *temp, int *mask );
- int validate_access( const char *temp, bool *allow_sftp, bool *allow_scp,
diff --git a/extra/rssh/rsync.patch b/extra/rssh/rsync.patch
deleted file mode 100644
index 7d0a51195..000000000
--- a/extra/rssh/rsync.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naur old/util.c new/util.c
---- old/util.c	2012-08-01 13:48:47.803620731 +1000
-+++ new/util.c	2012-08-01 13:55:13.622614598 +1000
-@@ -56,6 +56,7 @@
- #ifdef HAVE_LIBGEN_H
- #include <libgen.h>
- #endif /* HAVE_LIBGEN_H */
-+#include <regex.h>
- 
- /* LOCAL INCLUDES */
- #include "pathnames.h"
-@@ -192,6 +193,33 @@
- 
- 
- /*
-+ * check_rsync_e() - take the command line passed to rssh and look for a -e
-+ *                   option.  If one is found, make sure --server is provided
-+ *                   and the option contains only the protocol information.
-+ *                   Returns 1 if the command line is safe; 0 otherwise.
-+ */
-+static int check_rsync_e( char *cl )
-+{
-+	int	status;
-+	regex_t	re;
-+
-+	/*
-+	 * This is more complicated than it looks because we don't want to
-+	 * trigger on the e in --server, but we do want to catch the common
-+	 * case of -ltpre.iL (which contains -e.).
-+	 */
-+	static const char pattern[] = "[ \t\v\f]-([^-][^ ]*)?e[^.0-9]";
-+
-+	if ( strstr(cl, "--server") == NULL ) return 0;
-+	if ( regcomp(&re, pattern, REG_EXTENDED | REG_NOSUB) != 0 ){
-+		return 0;
-+	}
-+	status = regexec(&re, cl, 0, NULL, 0);
-+	regfree(&re);
-+	return (status == 0) ? 0 : 1;
-+}
-+
-+/*
-  * check_command_line() - take the command line passed to rssh, and verify
-  *			  that the specified command is one the user is
-  *			  allowed to run and validate the arguments.  Return the
-@@ -211,7 +239,7 @@
- 	}
- 
- 	if ( check_command(*cl, opts, PATH_CVS, RSSH_ALLOW_CVS) ){
--		if ( opt_filter(cl, 'e') ) return NULL;
-+		if ( opt_filter(cl, 'e') && !check_rsync_e(cl) ) return NULL;
- 		return PATH_CVS;
- 	}
- 
diff --git a/extra/scummvm/PKGBUILD b/extra/scummvm/PKGBUILD
deleted file mode 100644
index cfa98e178..000000000
--- a/extra/scummvm/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 160951 2012-06-07 12:29:27Z juergen $
-# Maintainer: juergen <juergen@archlinux.org>
-# Contributor: Manolis Tzanidakis, Petter Gundersen
-
-pkgname=scummvm
-pkgver=1.4.1
-pkgrel=2
-pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.scummvm.org/"
-depends=('libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('aa094c2224aad22d5340a1d2d919c883')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  ./configure --disable-debug \
-    --enable-release \
-    --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR=$startdir/pkg install
-  install -Dm644 dists/${pkgname}.desktop \
-	"${pkgdir}"/usr/share/applications/${pkgname}.desktop
-}
diff --git a/extra/skanlite/PKGBUILD b/extra/skanlite/PKGBUILD
deleted file mode 100644
index aa49681be..000000000
--- a/extra/skanlite/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 148928 2012-02-05 11:56:16Z ibiru $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=skanlite
-pkgver=0.8
-pkgrel=2
-pkgdesc="Image Scanning Application for KDE"
-arch=('i686' 'x86_64' 'mips64el')
-url='http://kde-apps.org/content/show.php?content=109803'
-license=('GPL')
-depends=('kdebase-runtime' 'libksane')
-makedepends=('pkgconfig' 'cmake' 'automoc4')
-source=("http://downloads.sourceforge.net/sanewidget/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('baa43dbc78be696e121969b0a3d88929')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/slv2/PKGBUILD b/extra/slv2/PKGBUILD
deleted file mode 100644
index 2bf246084..000000000
--- a/extra/slv2/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 151231 2012-02-25 09:24:44Z allan $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Leslie P. Polzer <polzer@stardawn.org>
-
-pkgname=slv2
-pkgver=0.6.6
-pkgrel=7
-pkgdesc="Library for LV2 hosts"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://drobilla.net/software/slv2"
-license=('GPL')
-depends=('redland>=1.0.13' 'lv2core' 'jack')
-makedepends=('python2')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://download.drobilla.net/$pkgname-$pkgver.tar.bz2)
-md5sums=('b8e8e0e82dd04324fcd533e8acd1ce85')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  python2 waf configure --prefix=/usr
-  python2 waf build $MAKEFLAGS
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  python2 waf install --destdir="$pkgdir/"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/slv2/slv2.changelog b/extra/slv2/slv2.changelog
deleted file mode 100644
index f394a5067..000000000
--- a/extra/slv2/slv2.changelog
+++ /dev/null
@@ -1,23 +0,0 @@
-22 Feb 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 0.6.6-3:
-	raptor rebuild
-
-24 Nov 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* PKGBUILD :
-	Get rid of sed and use python2 directly for waf.
-	waf fix for python transition already included previously (unlogged).
-	Release only (no need binary update; no runtime python requirement).
-
-9 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 0.6.6-2 :
-	Brought into extra from community for ardour
-		- adds "LV2" plug-ins support
-
-	* PKGBUILD :
-	Minor cosmetic ammendments.
-
-	* slv2.changelog :
-	Added this changelog.
diff --git a/extra/slv2/slv2.install b/extra/slv2/slv2.install
deleted file mode 100644
index c980ddfab..000000000
--- a/extra/slv2/slv2.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  echo "Updating Shared Library Links"
-  /sbin/ldconfig
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/squid/PKGBUILD b/extra/squid/PKGBUILD
deleted file mode 100644
index dfa9e37a5..000000000
--- a/extra/squid/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 162165 2012-06-22 13:00:02Z dreisner $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=squid
-pkgver=3.1.20
-pkgrel=2
-pkgdesc="A full-featured Web proxy cache server."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.squid-cache.org"
-depends=('openssl' 'pam' 'cron' 'perl' 'libltdl')
-makedepends=('libcap')
-license=('GPL')
-backup=('etc/squid/squid.conf'
-        'etc/squid/mime.conf'
-        'etc/conf.d/squid')
-install=squid.install
-source=("http://www.squid-cache.org/Versions/v3/3.1/$pkgname-$pkgver.tar.bz2"
-        'squid'
-        'squid.conf.d'
-        'squid.pam'
-        'squid.cron'
-        'squid.service')
-md5sums=('c4d733a383c0508fd0746d64a2d7278a'
-         '02f7b5bd793f778e40834fd6457d2199'
-         '2383772ef94efddc7b920628bc7ac5b0'
-         '270977cdd9b47ef44c0c427ab9034777'
-         'b499c2b725aefd7bd60bec2f1a9de392'
-         '20e00e1aa1198786795f3da32db3c1d8')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # gcc 4.6 doesn't support -fhuge-objects.
-  sed '/^    HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure
-
-  # fix cache_dir, cache_dir size, and effective group.
-  sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in
-  sed '/^#cache_dir/ s/100/256/
-       /^NAME: cache_effective_group/ {n;n;s/none/proxy/}' -i src/cf.data.pre
-
-  ./configure \
-      --prefix=/usr \
-      --datadir=/usr/share/squid \
-      --sysconfdir=/etc/squid \
-      --libexecdir=/usr/lib/squid \
-      --localstatedir=/var \
-      --with-logdir=/var/log/squid \
-      --with-pidfile=/run/squid.pid \
-      --enable-auth="basic,digest,ntlm" \
-      --enable-removal-policies="lru,heap" \
-      --enable-digest-auth-helpers="password" \
-      --enable-storeio="aufs,ufs,diskd" \
-      --enable-basic-auth-helpers="getpwnam,YP,NCSA,SMB,MSNT,PAM,multi-domain-NTLM" \
-      --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \
-      --enable-ntlm-auth-helpers="smb_lm,fakeauth,no_check" \
-      --enable-delay-pools \
-      --enable-arp-acl \
-      --enable-ssl \
-      --enable-snmp \
-      --enable-linux-netfilter \
-      --enable-ident-lookups \
-      --enable-useragent-log \
-      --enable-cache-digests \
-      --enable-referer-log \
-      --enable-arp-acl \
-      --enable-htcp \
-      --enable-carp \
-      --enable-epoll \
-      --with-filedescriptors=4096 \
-      --with-large-files \
-      --enable-arp-acl \
-      --with-default-user=proxy \
-      --enable-async-io \
-      --enable-truncate
-
-  make
-}
-
-package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
-  install -Dm755 "$srcdir"/squid "$pkgdir"/etc/rc.d/squid
-  install -Dm755 "$srcdir"/squid.cron "$pkgdir"/etc/cron.weekly/squid
-  install -Dm644 "$srcdir"/squid.conf.d "$pkgdir"/etc/conf.d/squid
-  install -Dm644 "$srcdir"/squid.pam "$pkgdir"/etc/pam.d/squid
-
-  install -Dm644 "$srcdir/squid.service" "$pkgdir/usr/lib/systemd/system/squid.service"
-
-  # random unneeded empty dir...
-  rmdir "$pkgdir/usr/include"
-}
-
-# vim: ts=2 sw=2 et ft=sh
diff --git a/extra/squid/squid b/extra/squid/squid
deleted file mode 100644
index da5534427..000000000
--- a/extra/squid/squid
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[[ -f /etc/conf.d/squid ]] && . /etc/conf.d/squid
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/run/squid.pid
-{ read -r PID </run/squid.pid; } 2>/dev/null
-if [[ $pid && ! /proc/$pid/exe -ef /usr/sbin/squid ]]; then
-  rm /run/squid.pid
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting squid"
-    if [[ $PID ]] || ! squid $SQUID_ARGS; then
-      stat_fail
-    else
-      add_daemon squid
-      stat_done
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping squid"
-    if [[ -z $PID ]] || ! squid -k shutdown &>/dev/null; then
-      stat_fail
-    else
-      # squid takes forever to shutdown all its listening FDs
-      while [[ /proc/$PID/exe -ef /usr/sbin/squid ]]; do
-        stat_append "."
-        sleep 3
-      done
-      rm_daemon squid
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/squid/squid.conf.d b/extra/squid/squid.conf.d
deleted file mode 100644
index ea248b76c..000000000
--- a/extra/squid/squid.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to squid
-#
-SQUID_ARGS="-sYC"
diff --git a/extra/squid/squid.cron b/extra/squid/squid.cron
deleted file mode 100644
index c78e51105..000000000
--- a/extra/squid/squid.cron
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# exit without error if no pidfile exists
-{ read pid </run/squid.pid; } 2>/dev/null || exit 0
-
-# make sure found PID really is a squid process
-if [ /proc/$pid/exec -ef /usr/sbin/squid ]; then
-  /usr/sbin/squid -k rotate
-fi
diff --git a/extra/squid/squid.install b/extra/squid/squid.install
deleted file mode 100644
index e7aa5ff68..000000000
--- a/extra/squid/squid.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-  if [ -z "$(grep ^proxy: /etc/group)" ]; then
-    usr/sbin/groupadd -g 15 proxy &>/dev/null
-  fi
-
-  id proxy &>/dev/null || \
-    usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy
-
-  chown proxy.proxy var/{cache,log}/squid
-
-#  cat << EOF
-#Release notes:  http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html
-#EOF
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/userdel proxy &> /dev/null
-  if [ ! -z "$(grep ^proxy: /etc/group)" ]; then
-    usr/sbin/groupdel proxy &>/dev/null
-  fi
-}
-
diff --git a/extra/squid/squid.pam b/extra/squid/squid.pam
deleted file mode 100644
index df8a8104f..000000000
--- a/extra/squid/squid.pam
+++ /dev/null
@@ -1,4 +0,0 @@
-#/etc/pam.d/squid
-#
-auth		required	pam_unix.so
-account		required	pam_unix.so
diff --git a/extra/squid/squid.service b/extra/squid/squid.service
deleted file mode 100644
index 9d41cc243..000000000
--- a/extra/squid/squid.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Web Proxy Cache Server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/squid.pid
-ExecStart=/usr/sbin/squid -sYC
-ExecStop=/usr/sbin/squid -k shutdown
-ExecReload=/usr/sbin/squid -k reconfigure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/sysklogd/LICENSE b/extra/sysklogd/LICENSE
deleted file mode 100644
index 7e9b5d59c..000000000
--- a/extra/sysklogd/LICENSE
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 1983, 1988 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
diff --git a/extra/sysklogd/PKGBUILD b/extra/sysklogd/PKGBUILD
deleted file mode 100644
index d07395b8d..000000000
--- a/extra/sysklogd/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 158662 2012-05-05 22:14:49Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=sysklogd
-pkgver=1.5
-pkgrel=4
-pkgdesc="System and kernel log daemons"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.infodrom.org/projects/sysklogd/"
-license=('GPL' 'BSD')
-depends=('glibc' 'bash')
-provides=('logger')
-backup=('etc/syslog.conf' 'etc/logrotate.d/syslog')
-source=(http://www.infodrom.org/projects/sysklogd/download/${pkgname}-${pkgver}.tar.gz{,.asc} \
-        syslog.conf syslog.logrotate syslogd klogd LICENSE \
-        sysklogd-1.4.1-caen-owl-syslogd-bind.diff \
-        sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff \
-        sysklogd-1.4.1-caen-owl-klogd-drop-root.diff \
-        sysklogd-1.5-syslog-func-collision.patch)
-sha1sums=('070cce745b023f2ce7ca7d9888af434d6d61c236'
-          '9599322fc176004d95b5111b05f665b5191dfe67'
-          '35b4cb76109a6ffe9269021a6bfb4f8da614a4eb'
-          'e67c0f78f13c94507d3f686b4e5b8340db4624fd'
-          '848beb23b9ca4de19c6022df03878dbe57e04c0a'
-          'f46088f761c033562a59bc13d4888b7343bc02fc'
-          'c416bcefd3d3d618139cc7912310caddf34c0c0b'
-          '849b2dcaf11060d583ccb3c48356a6971df45cf0'
-          '9701989490748b0c5a1727e0fc459179d0e350a8'
-          '76da0ecd9bca969e292a6ec58d7cd96e4c97e525'
-          '826e76a59834868658eb9f8d8f3aabd8bf748759')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-# CAEN/OWL security patches
-  patch -p1 -i ../sysklogd-1.4.1-caen-owl-syslogd-bind.diff
-  patch -p1 -i ../sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff 
-  patch -p1 -i ../sysklogd-1.4.1-caen-owl-klogd-drop-root.diff
-
-  patch -p1 -i ../sysklogd-1.5-syslog-func-collision.patch
-  sed -i -e "s/-O3/${CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE/" \
-         -e "s/LDFLAGS= -s/LDFLAGS= ${LDFLAGS}/" Makefile
-  sed -i 's/500 -s/755/' Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -d "${pkgdir}/usr/sbin" "${pkgdir}"/usr/share/man/{man5,man8}
-  make prefix="${pkgdir}" install
-  install -D -m644 ../syslog.conf "${pkgdir}/etc/syslog.conf"
-  install -D -m644 ../syslog.logrotate "${pkgdir}/etc/logrotate.d/syslog"
-  install -D -m755 ../syslogd "${pkgdir}/etc/rc.d/syslogd"
-  install -D -m755 ../klogd "${pkgdir}/etc/rc.d/klogd"
-  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/sysklogd/klogd b/extra/sysklogd/klogd
deleted file mode 100755
index 690e13ab4..000000000
--- a/extra/sysklogd/klogd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/klogd`
-case "$1" in
-  start)
-    stat_busy "Starting Kernel Logger"
-    [ -z "$PID" ] && /usr/sbin/klogd -c 4
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon klogd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Kernel Logger"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/klogd.pid
-      rm_daemon klogd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/sysklogd/sysklogd-1.4.1-caen-owl-klogd-drop-root.diff b/extra/sysklogd/sysklogd-1.4.1-caen-owl-klogd-drop-root.diff
deleted file mode 100644
index e2597fe1a..000000000
--- a/extra/sysklogd/sysklogd-1.4.1-caen-owl-klogd-drop-root.diff
+++ /dev/null
@@ -1,161 +0,0 @@
-diff -Naur sysklogd-1.4.1-orig/klogd.8 sysklogd-1.4.1/klogd.8
---- sysklogd-1.4.1-orig/klogd.8	2005-03-11 11:12:09.000000000 -0500
-+++ sysklogd-1.4.1/klogd.8	2005-10-17 23:47:41.615009160 -0400
-@@ -18,6 +19,12 @@
- .RB [ " \-f "
- .I fname
- ]
-+.RB [ " \-u "
-+.I username
-+]
-+.RB [ " \-j "
-+.I chroot_dir
-+]
- .RB [ " \-iI " ]
- .RB [ " \-n " ]
- .RB [ " \-o " ]
-@@ -53,6 +60,20 @@
- .BI "\-f " file
- Log messages to the specified filename rather than to the syslog facility.
- .TP
-+.BI "\-u " username
-+Tells klogd to become the specified user and drop root privileges before
-+starting logging.
-+.TP
-+.BI "\-j " chroot_dir
-+Tells klogd to
-+.BR chroot (2)
-+into this directory after initializing.
-+This option is only valid if the \-u option is also used to run klogd
-+without root privileges.
-+Note that the use of this option will prevent \-i and \-I from working
-+unless you set up the chroot directory in such a way that klogd can still
-+read the kernel module symbols.
-+.TP
- .BI "\-i \-I"
- Signal the currently executing klogd daemon.  Both of these switches control
- the loading/reloading of symbol information.  The \-i switch signals the
-diff -Naur sysklogd-1.4.1-orig/klogd.c sysklogd-1.4.1/klogd.c
---- sysklogd-1.4.1-orig/klogd.c	2004-04-29 09:29:03.000000000 -0400
-+++ sysklogd-1.4.1/klogd.c	2005-10-17 23:46:05.200556847 -0400
-@@ -261,6 +261,8 @@
- #include <stdarg.h>
- #include <paths.h>
- #include <stdlib.h>
-+#include <pwd.h>
-+#include <grp.h>
- #include "klogd.h"
- #include "ksyms.h"
- #ifndef TESTING
-@@ -311,6 +313,9 @@
- int debugging = 0;
- int symbols_twice = 0;
- 
-+char *server_user = NULL;
-+char *chroot_dir = NULL;
-+int log_flags = 0;
- 
- /* Function prototypes. */
- extern int ksyslog(int type, char *buf, int len);
-@@ -531,8 +536,9 @@
- 	 * First do a stat to determine whether or not the proc based
- 	 * file system is available to get kernel messages from.
- 	 */
--	if ( use_syscall ||
--	    ((stat(_PATH_KLOG, &sb) < 0) && (errno == ENOENT)) )
-+	if (!server_user &&
-+	    (use_syscall ||
-+	    ((stat(_PATH_KLOG, &sb) < 0) && (errno == ENOENT))))
- 	{
- 	  	/* Initialize kernel logging. */
- 	  	ksyslog(1, NULL, 0);
-@@ -980,6 +986,27 @@
- }
- 
- 
-+static int drop_root(void)
-+{
-+	struct passwd *pw;
-+
-+	if (!(pw = getpwnam(server_user))) return -1;
-+
-+	if (!pw->pw_uid) return -1;
-+
-+	if (chroot_dir) {
-+		if (chroot(chroot_dir)) return -1;
-+		if (chdir("/")) return -1;
-+	}
-+
-+	if (setgroups(0, NULL)) return -1;
-+	if (setgid(pw->pw_gid)) return -1;
-+	if (setuid(pw->pw_uid)) return -1;
-+
-+	return 0;
-+}
-+
-+
- int main(argc, argv)
- 
- 	int argc;
-@@ -997,7 +1024,7 @@
- 	chdir ("/");
- #endif
- 	/* Parse the command-line. */
--	while ((ch = getopt(argc, argv, "c:df:iIk:nopsvx2")) != EOF)
-+	while ((ch = getopt(argc, argv, "c:df:u:j:iIk:nopsvx2")) != EOF)
- 		switch((char)ch)
- 		{
- 		    case '2':		/* Print lines with symbols twice. */
-@@ -1019,6 +1046,10 @@
- 		    case 'I':
- 			SignalDaemon(SIGUSR2);
- 			return(0);
-+		    case 'j':		/* chroot 'j'ail */
-+			chroot_dir = optarg;
-+			log_flags |= LOG_NDELAY;
-+			break;
- 		    case 'k':		/* Kernel symbol file. */
- 			symfile = optarg;
- 			break;
-@@ -1034,6 +1065,9 @@
- 		    case 's':		/* Use syscall interface. */
- 			use_syscall = 1;
- 			break;
-+		    case 'u':		/* Run as this user */
-+			server_user = optarg;
-+			break;
- 		    case 'v':
- 			printf("klogd %s.%s\n", VERSION, PATCHLEVEL);
- 			exit (1);
-@@ -1042,6 +1076,10 @@
- 			break;
- 		}
- 
-+	if (chroot_dir && !server_user) {
-+		fputs("'-j' is only valid with '-u'", stderr);
-+		exit(1);
-+	}
- 
- 	/* Set console logging level. */
- 	if ( log_level != (char *) 0 )
-@@ -1139,7 +1177,7 @@
- 		}
- 	}
- 	else
--		openlog("kernel", 0, LOG_KERN);
-+		openlog("kernel", log_flags, LOG_KERN);
- 
- 
- 	/* Handle one-shot logging. */
-@@ -1166,6 +1204,11 @@
- 		InitMsyms();
- 	}
- 
-+	if (server_user && drop_root()) {
-+		syslog(LOG_ALERT, "klogd: failed to drop root");
-+		Terminate();
-+	}
-+
-         /* The main loop. */
- 	while (1)
- 	{
diff --git a/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-bind.diff b/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-bind.diff
deleted file mode 100644
index e79a67d0b..000000000
--- a/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-bind.diff
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -ur sysklogd-1.4.1.orig/sysklogd.8 sysklogd-1.4.1/sysklogd.8
---- sysklogd-1.4.1.orig/sysklogd.8	Sun Mar 11 22:35:51 2001
-+++ sysklogd-1.4.1/sysklogd.8	Mon Oct  8 07:20:31 2001
-@@ -15,6 +15,9 @@
- .I config file
- ]
- .RB [ " \-h " ] 
-+.RB [ " \-i "
-+.I IP address
-+]
- .RB [ " \-l "
- .I hostlist
- ]
-@@ -103,8 +106,15 @@
- Specifying this switch on the command line will cause the log daemon to
- forward any remote messages it receives to forwarding hosts which have been
- defined.
- This can cause syslog loops that fill up hard disks quite fast and
- thus needs to be used with caution.
-+.TP
-+.BI "\-i " "IP address"
-+If
-+.B syslogd
-+is configured to accept log input from a UDP port, specify an IP address
-+to bind to, rather than the default of INADDR_ANY.  The address must be in
-+dotted quad notation, DNS host names are not allowed.
- .TP
- .BI "\-l " "hostlist"
- Specify a hostname that should be logged only with its simple hostname
-diff -ur sysklogd-1.4.1.orig/syslogd.c sysklogd-1.4.1/syslogd.c
---- sysklogd-1.4.1.orig/syslogd.c	Sun Mar 11 22:40:10 2001
-+++ sysklogd-1.4.1/syslogd.c	Mon Oct  8 07:24:41 2001
-@@ -736,6 +736,8 @@
- int	NoHops = 1;		/* Can we bounce syslog messages through an
- 				   intermediate host. */
- 
-+char	*bind_addr = NULL;	/* bind UDP port to this interface only */
-+
- extern	int errno;
- 
- /* Function prototypes. */
-@@ -829,7 +831,7 @@
- 		funix[i]  = -1;
- 	}
- 
--	while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:v")) != EOF)
-+	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF)
- 		switch((char)ch) {
- 		case 'a':
- 			if (nfunix < MAXFUNIX)
-@@ -846,9 +848,17 @@
- 		case 'h':
- 			NoHops = 0;
- 			break;
-+		case 'i':
-+			if (bind_addr) {
-+				fprintf(stderr, "Only one -i argument allowed, "
-+					"the first one is taken.\n");
-+				break;
-+			}
-+			bind_addr = optarg;
-+			break;
- 		case 'l':
- 			if (LocalHosts) {
--				fprintf (stderr, "Only one -l argument allowed," \
-+				fprintf(stderr, "Only one -l argument allowed, "
- 					"the first one is taken.\n");
- 				break;
- 			}
-@@ -1175,7 +1185,7 @@
- int usage()
- {
- 	fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
--		" [-s domainlist] [-f conffile]\n");
-+		" [-s domainlist] [-f conffile] [-i IP address]\n");
- 	exit(1);
- }
- 
-@@ -1217,15 +1227,22 @@
- 	int fd, on = 1;
- 	struct sockaddr_in sin;
- 
-+	memset(&sin, 0, sizeof(sin));
-+	sin.sin_family = AF_INET;
-+	sin.sin_port = LogPort;
-+	if (bind_addr) {
-+		if (!inet_aton(bind_addr, &sin.sin_addr)) {
-+			logerror("syslog: not a valid IP address to bind to.");
-+			return -1;
-+		}
-+	}
-+
- 	fd = socket(AF_INET, SOCK_DGRAM, 0);
- 	if (fd < 0) {
- 		logerror("syslog: Unknown protocol, suspending inet service.");
- 		return fd;
- 	}
- 
--	memset(&sin, 0, sizeof(sin));
--	sin.sin_family = AF_INET;
--	sin.sin_port = LogPort;
- 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, \
- 		       (char *) &on, sizeof(on)) < 0 ) {
- 		logerror("setsockopt(REUSEADDR), suspending inet");
diff --git a/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff b/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff
deleted file mode 100644
index b5813c1d2..000000000
--- a/extra/sysklogd/sysklogd-1.4.1-caen-owl-syslogd-drop-root.diff
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -ur sysklogd-1.4.1-caen-owl-syslogd-bind/sysklogd.8 sysklogd-1.4.1/sysklogd.8
---- sysklogd-1.4.1-caen-owl-syslogd-bind/sysklogd.8	Mon Oct  8 07:26:27 2001
-+++ sysklogd-1.4.1/sysklogd.8	Mon Oct  8 07:30:31 2001
-@@ -32,6 +32,9 @@
- .RB [ " \-s "
- .I domainlist
- ]
-+.RB [ " \-u"
-+.IB username
-+]
- .RB [ " \-v " ]
- .LP
- .SH DESCRIPTION
-@@ -159,6 +162,19 @@
- is specified and the host logging resolves to satu.infodrom.north.de
- no domain would be cut, you will have to specify two domains like:
- .BR "\-s north.de:infodrom.north.de" .
-+.TP
-+.BI "\-u " "username"
-+This causes the
-+.B syslogd
-+daemon to become the named user before starting up logging.
-+
-+Note that when this option is in use,
-+.B syslogd
-+will open all log files as root when the daemon is first started;
-+however, after a
-+.B SIGHUP
-+the files will be reopened as the non-privileged user.  You should
-+take this into account when deciding the ownership of the log files.
- .TP
- .B "\-v"
- Print version and exit.
-diff -ur sysklogd-1.4.1-caen-owl-syslogd-bind/syslogd.c sysklogd-1.4.1/syslogd.c
---- sysklogd-1.4.1-caen-owl-syslogd-bind/syslogd.c	Mon Oct  8 07:26:27 2001
-+++ sysklogd-1.4.1/syslogd.c	Mon Oct  8 07:40:35 2001
-@@ -491,6 +491,10 @@
- #include <arpa/nameser.h>
- #include <arpa/inet.h>
- #include <resolv.h>
-+
-+#include <pwd.h>
-+#include <grp.h>
-+
- #ifndef TESTING
- #include "pidfile.h"
- #endif
-@@ -737,6 +741,7 @@
- 				   intermediate host. */
- 
- char	*bind_addr = NULL;	/* bind UDP port to this interface only */
-+char	*server_user = NULL;	/* user name to run server as */
- 
- extern	int errno;
- 
-@@ -778,6 +783,21 @@
- static int create_inet_socket();
- #endif
- 
-+static int drop_root(void)
-+{
-+	struct passwd *pw;
-+
-+	if (!(pw = getpwnam(server_user))) return -1;
-+
-+	if (!pw->pw_uid) return -1;
-+
-+	if (initgroups(server_user, pw->pw_gid)) return -1;
-+	if (setgid(pw->pw_gid)) return -1;
-+	if (setuid(pw->pw_uid)) return -1;
-+
-+	return 0;
-+}
-+
- int main(argc, argv)
- 	int argc;
- 	char **argv;
-@@ -831,7 +851,7 @@
- 		funix[i]  = -1;
- 	}
- 
--	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF)
-+	while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:u:v")) != EOF)
- 		switch((char)ch) {
- 		case 'a':
- 			if (nfunix < MAXFUNIX)
-@@ -884,6 +904,9 @@
- 			}
- 			StripDomains = crunch_list(optarg);
- 			break;
-+		case 'u':
-+			server_user = optarg;
-+			break;
- 		case 'v':
- 			printf("syslogd %s.%s\n", VERSION, PATCHLEVEL);
- 			exit (0);
-@@ -1031,6 +1054,11 @@
- 		kill (ppid, SIGTERM);
- #endif
- 
-+	if (server_user && drop_root()) {
-+		dprintf("syslogd: failed to drop root\n");
-+		exit(1);
-+	}
-+
- 	/* Main loop begins here. */
- 	for (;;) {
- 		int nfds;
-@@ -1185,7 +1213,7 @@
- int usage()
- {
- 	fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
--		" [-s domainlist] [-f conffile] [-i IP address]\n");
-+		" [-s domainlist] [-f conffile] [-i IP address] [-u username]\n");
- 	exit(1);
- }
- 
diff --git a/extra/sysklogd/sysklogd-1.5-syslog-func-collision.patch b/extra/sysklogd/sysklogd-1.5-syslog-func-collision.patch
deleted file mode 100644
index 76912a265..000000000
--- a/extra/sysklogd/sysklogd-1.5-syslog-func-collision.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-http://bugs.gentoo.org/342601
-
-rename local "syslog" and "vsyslog" functions to avoid conflicts with glibc's
-
-patch by Dmitriy Matrosov
-
---- sysklogd-1.5/klogd.c
-+++ sysklogd-1.5/klogd.c
-@@ -258,7 +262,6 @@
- #if !defined(__GLIBC__)
- #include <linux/time.h>
- #endif /* __GLIBC__ */
--#include <stdarg.h>
- #include <paths.h>
- #include <stdlib.h>
- #include <pwd.h>
-@@ -637,7 +640,7 @@
- 			}
- 			argl += 3;
- 		}
--		syslog(priority, fmt, argl);
-+		syslog_own(priority, fmt, argl);
- 		va_end(ap);
- #ifdef TESTING
- 		putchar('\n');
-@@ -646,7 +649,7 @@
- 	}
- 
- 	va_start(ap, fmt);
--	vsyslog(priority, fmt, ap);
-+	vsyslog_own(priority, fmt, ap);
- 	va_end(ap);
- #ifdef TESTING
- 	printf ("\n");
-@@ -1205,7 +1208,7 @@
- 	}
- 
- 	if (server_user && drop_root()) {
--		syslog(LOG_ALERT, "klogd: failed to drop root");
-+		syslog_own(LOG_ALERT, "klogd: failed to drop root");
- 		Terminate();
- 	}
- 
---- sysklogd-1.5/klogd.h
-+++ sysklogd-1.5/klogd.h
-@@ -24,6 +24,7 @@
- #include <stdio.h>
- #include <syslog.h>
- #include <string.h>
-+#include <stdarg.h>
- 
- 
- /* Function prototypes. */
-@@ -38,3 +43,5 @@
- extern char * ExpandKadds(char *, char *);
- extern void SetParanoiaLevel(int);
- extern void Syslog(int priority, char *fmt, ...);
-+extern void syslog_own(int, const char *, ...);
-+extern void vsyslog_own(int, const char *, va_list);
---- sysklogd-1.5/ksym_mod.c
-+++ sysklogd-1.5/ksym_mod.c
-@@ -95,7 +98,6 @@
- #if !defined(__GLIBC__)
- #include <linux/time.h>
- #endif /* __GLIBC__ */
--#include <stdarg.h>
- #include <paths.h>
- #include <linux/version.h>
- 
---- sysklogd-1.5/syslog.c
-+++ sysklogd-1.5/syslog.c
-@@ -75,6 +79,10 @@
- 
- #define	_PATH_LOGNAME	"/dev/log"
- 
-+
-+void syslog_own(int, const char *, ...);
-+void vsyslog_own(int, const char *, va_list);
-+
- static int	LogFile = -1;		/* fd for log */
- static int	connected;		/* have done connect */
- static int	LogStat = 0;		/* status bits, set by openlog() */
-@@ -82,17 +90,17 @@
- static int	LogFacility = LOG_USER;	/* default facility code */
- 
- void
--syslog(int pri, const char *fmt, ...)
-+syslog_own(int pri, const char *fmt, ...)
- {
- 	va_list ap;
- 
- 	va_start(ap, fmt);
--	vsyslog(pri, fmt, ap);
-+	vsyslog_own(pri, fmt, ap);
- 	va_end(ap);
- }
- 
- void
--vsyslog(pri, fmt, ap)
-+vsyslog_own(pri, fmt, ap)
- 	int pri;
- 	const char *fmt;
- 	va_list ap;
diff --git a/extra/sysklogd/syslog.conf b/extra/sysklogd/syslog.conf
deleted file mode 100644
index 7b0eae2e2..000000000
--- a/extra/sysklogd/syslog.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# /etc/syslog.conf
-#
-
-*.emerg						*
-*.err						/var/log/errors
-kern.*						/var/log/kernel
-authpriv.*;auth.*				/var/log/auth
-mail.*						/var/log/mail
-*.info;*.!err;authpriv,auth,mail,kern.none	/var/log/messages
-
-# Log everything to vc12
-# *.*						/dev/vc/12
-
-# End of file
diff --git a/extra/sysklogd/syslog.logrotate b/extra/sysklogd/syslog.logrotate
deleted file mode 100644
index b3d8d8552..000000000
--- a/extra/sysklogd/syslog.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/messages /var/log/auth /var/log/mail /var/log/errors /var/log/kernel {
-    sharedscripts
-    postrotate
-	    /bin/kill -HUP `cat /var/run/syslogd.pid 2>/dev/null` 2> /dev/null || true
-    endscript
-}
diff --git a/extra/sysklogd/syslogd b/extra/sysklogd/syslogd
deleted file mode 100755
index 24c81ec8a..000000000
--- a/extra/sysklogd/syslogd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/syslogd`
-case "$1" in
-  start)
-    stat_busy "Starting System Logger"
-    [ -z "$PID" ] && /usr/sbin/syslogd -m 0
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon syslogd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping System Logger"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/syslogd.pid
-      rm_daemon syslogd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/tomcat/PKGBUILD b/extra/tomcat/PKGBUILD
deleted file mode 100644
index a1bba1b67..000000000
--- a/extra/tomcat/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 138508 2011-09-26 12:20:21Z guillaume $
-# Maintainer: Guillaume ALAUX <guillaume at archlinux dot org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-pkgname=tomcat
-pkgver=5.5.34
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-pkgdesc="Servlet-2.4/JSP-2.0 Container"
-url="http://tomcat.apache.org/"
-license=('APACHE')
-depends=('java-environment')
-makedepends=('openjdk6')
-backup=('opt/tomcat/conf/server.xml' 'opt/tomcat/conf/tomcat-users.xml' 'etc/conf.d/tomcat')
-install=tomcat.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-5/v${pkgver}/bin/apache-tomcat-${pkgver}.tar.gz
-	'tomcat'
-	'tomcat.conf.d')
-md5sums=('d09a09bc84409510574a673d35939f16'
-         '20e6a8e89a148e2b0ac81ca03ceea6b1'
-         '368322d8a51ce20cc5dbdb505706a16a')
-
-build() {
-  unset LDFLAGS
-  # build jsvc
-  cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
-  tar xzf commons-daemon-native.tar.gz
-  cd commons-daemon-1.0.7-native-src/unix
-  sh configure --with-java=/usr/lib/jvm/java-6-openjdk
-  make clean
-  make
-  cp jsvc ../..
-}
-
-package() {
-  cd ${srcdir}/apache-${pkgname}-${pkgver}/bin
-  # get rid of some cruft
-  cd ${srcdir}/apache-${pkgname}-${pkgver}
-  rm -f LICENSE NOTICE RELEASE-NOTES RUNNING.txt
-  rm -fr bin/*.exe bin/*.bat bin/*.tar.gz bin/jsvc-src
-
-  # install everything
-  mkdir -p ${pkgdir}/opt/tomcat
-  cp -R * ${pkgdir}/opt/tomcat
-  install -D -m755 ${srcdir}/tomcat ${pkgdir}/etc/rc.d/tomcat
-  install -D -m644 ${srcdir}/tomcat.conf.d ${pkgdir}/etc/conf.d/tomcat
-  chgrp -R 66 ${pkgdir}/opt/tomcat/{conf,work,webapps,logs}
-  chmod 0660 ${pkgdir}/opt/tomcat/conf/{*.xml,*.policy,*.properties,/Catalina/localhost/*.xml}
-  chmod 775 ${pkgdir}/opt/tomcat/{conf,work,webapps,logs}
-}
diff --git a/extra/tomcat/tomcat b/extra/tomcat/tomcat
deleted file mode 100755
index 43116783d..000000000
--- a/extra/tomcat/tomcat
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-[ -f /etc/conf.d/tomcat ] && . /etc/conf.d/tomcat
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting Tomcat"
-    /opt/tomcat/bin/jsvc \
-      -user tomcat \
-      -home $TOMCAT_JAVA_HOME \
-      -Dcatalina.home=/opt/tomcat \
-      -Dcatalina.base=/opt/tomcat \
-      -Djava.io.tmpdir=/opt/tomcat/temp \
-      -wait 10 \
-      -pidfile /var/run/tomcat.pid \
-      -errfile /opt/tomcat/logs/catalina.log \
-      $CATALINA_OPTS \
-      -cp $TOMCAT_JAVA_HOME/lib/tools.jar:/opt/tomcat/bin/commons-daemon.jar:/opt/tomcat/bin/bootstrap.jar \
-      org.apache.catalina.startup.Bootstrap
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon tomcat
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Tomcat"
-    /opt/tomcat/bin/jsvc \
-      -stop \
-      -pidfile /var/run/tomcat.pid \
-      org.apache.catalina.startup.Bootstrap
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon tomcat
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/tomcat/tomcat.conf.d b/extra/tomcat/tomcat.conf.d
deleted file mode 100644
index aed805cd3..000000000
--- a/extra/tomcat/tomcat.conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-# The JAVA_HOME of the JVM for Tomcat to use
-TOMCAT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
-
-# Tomcat additional commandline options
-CATALINA_OPTS=
diff --git a/extra/tomcat/tomcat.install b/extra/tomcat/tomcat.install
deleted file mode 100644
index 9f7c21d38..000000000
--- a/extra/tomcat/tomcat.install
+++ /dev/null
@@ -1,36 +0,0 @@
-post_install() {
-  getent group tomcat >/dev/null 2>&1 || groupadd -g 66 tomcat
-  getent passwd tomcat >/dev/null 2>&1 || useradd -u 66 -g tomcat -d /opt/tomcat -s /bin/false tomcat
-
-  if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then
-    echo ">>> It appears that your current kernel has linux security"
-    echo ">>> capabilities built as a module. Tomcat requires this"
-    echo ">>> functionality to operate."
-    echo ">>>"
-    echo ">>> To activate the module, please load it now (modprobe capability)."
-    echo ">>> Also, you should add it to your MODULES array in rc.conf, so"
-    echo ">>> it will be activated automatically at boot-up."
-  fi
-
-  echo ""
-  echo "== End of life for Apache Tomcat 5.5.x =="
-  echo "The Apache Tomcat team announces that support for Apache Tomcat 5.5.x"
-  echo "will end on 30 September 2012."
-  echo ""
-  echo "You are thus strongly encouraged to migrate to tomcat6 or tomcat7"
-  echo ""
-  echo "See the Arch Linux wiki page for tomcat for more information."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  if getent passwd tomcat >/dev/null 2>&1; then
-      userdel tomcat
-  fi
-  if getent group tomcat >/dev/null 2>&1; then
-      groupdel tomcat
-  fi
-}
diff --git a/extra/umfpack/PKGBUILD b/extra/umfpack/PKGBUILD
deleted file mode 100644
index ad7bfd249..000000000
--- a/extra/umfpack/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 16363 2010-04-29 09:59:57Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: iKevin <kellwood at ameritech dot net>
-
-pkgname=umfpack
-pkgver=5.5.2
-_ufcfgver=3.7.0
-_amdver=2.2.3
-_cholmodver=1.7.4
-_colamdver=2.7.4
-_ccolamdver=2.7.4
-pkgrel=1
-pkgdesc="A multifrontal direct solver for unsymmetric linear systems (AMD/${_amdver}, UFConfig/${_ufcgfgver})"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.cise.ufl.edu/research/sparse/umfpack"
-license=('LGPL')
-makedepends=('lapack' 'blas')
-noextract=(CHOLMOD-${_cholmodver}.tar.gz
-	COLAMD-${_colamdver}.tar.gz
-	CCOLAMD-${_ccolamdver}.tar.gz)
-source=(http://www.cise.ufl.edu/research/sparse/umfpack/UMFPACK-$pkgver.tar.gz
-	http://www.cise.ufl.edu/research/sparse/UFconfig/UFconfig-${_ufcfgver}.tar.gz
-	http://www.cise.ufl.edu/research/sparse/amd/AMD-${_amdver}.tar.gz
-	http://www.cise.ufl.edu/research/sparse/cholmod/CHOLMOD-${_cholmodver}.tar.gz
-	http://www.cise.ufl.edu/research/sparse/colamd/COLAMD-${_colamdver}.tar.gz
-	http://www.cise.ufl.edu/research/sparse/ccolamd/CCOLAMD-${_ccolamdver}.tar.gz)
-md5sums=('07eaa6ae3de176e5b3681032c10c76be'
-         'ab8c355d683e8c5597a0824b32704c70'
-         '4d2a7db82406f880e7686fbd2df5a3bf'
-         'c2088078a86ca1a88e64037f80ae6540'
-         '186d692ab7211e79f9b727d8192635f7'
-         'bb55f6b4b9358160eaba1a57f863c65e')
-
-build() {
-  CFLAGS+=" -DNCHOLMOD"
-  cd "$srcdir"
-  cp -rf UFconfig/xerbla UMFPACK
-  make -C UMFPACK library
-  make -C AMD library  
-}
-
-package() {
-  cd "$srcdir"
-  
-  install -dm755 "$pkgdir"/usr/{include,lib}
-
-  install -m644 $srcdir/UMFPACK/Lib/libumfpack.a "$pkgdir/usr/lib/"
-  install -m644 $srcdir/UMFPACK/Include/*.h $pkgdir/usr/include
-
-  install -m644 "$srcdir/AMD/Lib/libamd.a" "$pkgdir/usr/lib/"
-  install -m644 $srcdir/AMD/Include/*.h $pkgdir/usr/include
-
-  install -m644 "$srcdir/UFconfig/UFconfig.h" "$pkgdir/usr/include"
-}
diff --git a/extra/vdpau-video/PKGBUILD b/extra/vdpau-video/PKGBUILD
deleted file mode 100644
index e1003f451..000000000
--- a/extra/vdpau-video/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 149310 2012-02-06 18:56:13Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=vdpau-video
-pkgver=0.7.3
-pkgrel=3
-pkgdesc="VDPAU backend for VA API"
-arch=('i686' 'x86_64')
-url="http://cgit.freedesktop.org/vaapi/vdpau-driver/"
-license=('GPL')
-depends=('libva' 'libvdpau')
-makedepends=('mesa')
-options=('!libtool')
-source=(http://www.splitted-desktop.com/~gbeauchesne/vdpau-video/$pkgname-$pkgver.tar.gz)
-md5sums=('18870e007ecdc50a528861fa55556364')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
-
-
diff --git a/extra/wv2/PKGBUILD b/extra/wv2/PKGBUILD
deleted file mode 100644
index 73b733286..000000000
--- a/extra/wv2/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 142173 2011-11-05 11:56:53Z pierre $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=wv2
-pkgver=0.4.2
-pkgrel=2
-pkgdesc="MSWord 9,8,7,6 formats parser"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://sourceforge.net/projects/wvware/"
-depends=('libgsf')
-makedepends=('cmake')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.bz2")
-license=('GPL2')
-md5sums=('850ed8e44a84e7bf0610747827018cbc')
-
-build() {
-  cd ${srcdir}
-  mkdir build
-  cd build
-
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-
-  make
-}
-
-package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
-}
diff --git a/extra/x2x/LICENSE b/extra/x2x/LICENSE
deleted file mode 100644
index 99ff948f8..000000000
--- a/extra/x2x/LICENSE
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * x2x: Uses the XTEST extension to forward keystrokes from a window on
- *      one display to another display.  Useful for desks
- *      with multiple keyboards.
- *
- * Copyright (c) 1997
- * Digital Equipment Corporation.  All rights reserved.
- * 
- * By downloading, installing, using, modifying or distributing this
- * software, you agree to the following:
- * 
- * 1. CONDITIONS. Subject to the following conditions, you may download,
- * install, use, modify and distribute this software in source and binary
- * forms:
- * 
- * a) Any source code, binary code and associated documentation
- * (including the online manual) used, modified or distributed must
- * reproduce and retain the above copyright notice, this list of
- * conditions and the following disclaimer.
- * 
- * b) No right is granted to use any trade name, trademark or logo of
- * Digital Equipment Corporation.  Neither the "Digital Equipment
- * Corporation" name nor any trademark or logo of Digital Equipment
- * Corporation may be used to endorse or promote products derived from
- * this software without the prior written permission of Digital
- * Equipment Corporation.
- * 
- * 2.  DISCLAIMER.  THIS SOFTWARE IS PROVIDED BY DIGITAL "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
diff --git a/extra/x2x/PKGBUILD b/extra/x2x/PKGBUILD
deleted file mode 100644
index 01bc0520f..000000000
--- a/extra/x2x/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 128494 2011-06-24 05:31:20Z eric $
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=x2x
-pkgver=1.27
-pkgrel=6.1
-pkgdesc="Control one X display from another"
-arch=(i686 x86_64 'mips64el')
-url="https://github.com/dottedmag/x2x"
-license=('custom')
-depends=('libxtst')
-makedepends=('imake')
-source=(https://github.com/downloads/dottedmag/x2x/$pkgname-$pkgver.tar.gz LICENSE)
-md5sums=('3d1bc863f3209ec37caf7f57bde7e8f0'
-         '7ebc35f66a8ded9b8d8d7ca4131c7ae8')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  mv x2x.1 x2x.man 
-  xmkmf 
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" MANPATH=/usr/share/man install install.man
-  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/xf86-video-unichrome/LICENSE b/extra/xf86-video-unichrome/LICENSE
deleted file mode 100644
index f4007667b..000000000
--- a/extra/xf86-video-unichrome/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2004-2007 Luc Verhaegen. All Rights Reserved.
-Copyright (c) 2004-2005 The Unichrome Project. All Rights Reserved.
-Copyright (c) 1998-2003 VIA Technologies, Inc. All Rights Reserved.
-Copyright (c) 2001-2003 S3 Graphics, Inc. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sub license,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/extra/xf86-video-unichrome/PKGBUILD b/extra/xf86-video-unichrome/PKGBUILD
deleted file mode 100644
index 1647f8cf1..000000000
--- a/extra/xf86-video-unichrome/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 153378 2012-03-12 20:54:55Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-unichrome
-pkgver=0.2.7
-pkgrel=7
-_gitversion=b917bee87db8a65b8e8da0ca12c24a176c9e9fb2
-pkgdesc="Unichrome video drivers for X.Org"
-arch=(i686 x86_64)
-url="http://unichrome.sf.net/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903' 'libx11' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc') # 'glproto')
-options=('!libtool')
-conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 'xorg-server<1.11.99.903')
-source=(http://cgit.freedesktop.org/~libv/${pkgname}/snapshot/${pkgname}-${_gitversion}.tar.bz2)
-md5sums=('f7adef052de08a01af86e245d1932239')
-
-build() {
-  cd "${srcdir}/${pkgname}-${_gitversion}"
-  ./autogen.sh --prefix=/usr #--enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${_gitversion}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}
diff --git a/extra/xorg-xfs/PKGBUILD b/extra/xorg-xfs/PKGBUILD
deleted file mode 100644
index aa5e4621a..000000000
--- a/extra/xorg-xfs/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 151783 2012-03-02 19:10:39Z andyrtr $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xorg-xfs
-pkgver=1.1.2
-pkgrel=1.1
-pkgdesc="X.Org X11 xfs font server"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://xorg.freedesktop.org/"
-license=('custom')
-backup=('etc/X11/fs/config')
-depends=('xorg-font-utils' 'libxfont>=1.4.5' 'libfs>=1.0.2' 'libx11>=1.2.2')
-makedepends=('pkgconfig' 'xtrans' 'xorg-util-macros')
-source=(${url}/releases/individual/app/xfs-${pkgver}.tar.bz2
-        ${url}/releases/individual/app/xfsinfo-1.0.3.tar.bz2
-        ${url}/releases/individual/app/fslsfonts-1.0.3.tar.bz2
-        ${url}/releases/individual/app/fstobdf-1.0.4.tar.bz2
-        ${url}/releases/individual/app/showfont-1.0.3.tar.bz2
-        xfs.rc)
-sha1sums=('d4a64e12f8a773bd0120977191586ca12baf1ace'
-          '21c5f544f34d9164797575da85727558f5e09d33'
-          '00177564597ac629207ca597f663b689902817df'
-          '5310493f53277fd196f93bbb7f2a204cad8997b7'
-          '161bf5f037db70dd75cb327648fbba559e821e76'
-          '21277375814e358ec16e8f8330f420e3d4df63e5')
-
-build() {
-  cd "${srcdir}"
-  pushd xfs-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make configdir=/etc/X11/fs
-  popd  
-    
-  for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do
-    if [ -d "${i}" ]; then
-      pushd "${i}"
-      ./configure --prefix=/usr
-      make
-      popd
-    fi
-  done
-}
-
-package() {
-  cd "${srcdir}"
-  pushd xfs-${pkgver}
-  make configdir=/etc/X11/fs DESTDIR="${pkgdir}" install
-  sed -i -e 's|/lib/X11/|/share/|g' "${pkgdir}/etc/X11/fs/config"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.xfs"
-  popd
-  
-  for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do
-    if [ -d "${i}" ]; then
-      pushd "${i}"
-      make DESTDIR="${pkgdir}" install
-      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${i%-*}"
-      popd
-    fi
-  done
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 "${srcdir}/xfs.rc" "${pkgdir}/etc/rc.d/xfs"
-}
diff --git a/extra/xorg-xfs/xfs.rc b/extra/xorg-xfs/xfs.rc
deleted file mode 100644
index caac86106..000000000
--- a/extra/xorg-xfs/xfs.rc
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/xfs`
-case "$1" in
-  start)
-    stat_busy "Starting X.Org fontserver"
-    if [ -z "$PID" ]; then
-       /usr/bin/xfs -daemon &> /dev/null
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon xfs
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping X.Org fontserver"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon xfs
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  reload)
-    stat_busy "Reloading X.Org fontserver configuration"
-    [ ! -z "$PID" ]  && kill -HUP $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload}"  
-esac
diff --git a/extra/xscreensaver/LICENSE b/extra/xscreensaver/LICENSE
deleted file mode 100644
index 4f587b5a3..000000000
--- a/extra/xscreensaver/LICENSE
+++ /dev/null
@@ -1,9 +0,0 @@
-/* xscreensaver, Copyright (c) 1993-2006 Jamie Zawinski <jwz@jwz.org>
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation.  No representations are made about the suitability of this
- * software for any purpose.  It is provided "as is" without express or 
- * implied warranty.
- */
diff --git a/extra/xscreensaver/PKGBUILD b/extra/xscreensaver/PKGBUILD
deleted file mode 100644
index 9c38f0f45..000000000
--- a/extra/xscreensaver/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 146796 2012-01-18 14:05:21Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xscreensaver
-pkgver=5.15
-pkgrel=3
-pkgdesc="Screen saver and locker for the X Window System"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.jwz.org/xscreensaver/"
-license=('BSD')
-depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu' \
-         'perl-libwww' 'perl-http-message')
-makedepends=('bc' 'libxpm' 'gdm')
-optdepends=('gdm: for login manager support')
-backup=('etc/pam.d/xscreensaver')
-source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \
-        add-electricsheep.diff xscreensaver.pam LICENSE)
-sha1sums=('b5ce7caa19f4d57c3bac83377a36dddbe7095052'
-          '677496218b81a42d90bee400026e94dd87fb8ffb'
-          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-          '4209ea586b204fd1d81c382a0522c654f9fd9134')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/add-electricsheep.diff"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \
-    --with-pam --with-login-manager --with-gtk --with-gl \
-    --without-gle --with-pixbuf --with-jpeg
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make install_prefix="${pkgdir}" install
-  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -D -m644 ../xscreensaver.pam "${pkgdir}/etc/pam.d/xscreensaver"
-  chmod 755 "${pkgdir}/usr/bin/xscreensaver"
-  echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop"
-}
diff --git a/extra/xscreensaver/add-electricsheep.diff b/extra/xscreensaver/add-electricsheep.diff
deleted file mode 100644
index 18b4dea97..000000000
--- a/extra/xscreensaver/add-electricsheep.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- driver/XScreenSaver.ad.in-orig	2009-10-17 02:19:06.000000000 -0400
-+++ driver/XScreenSaver.ad.in	2009-10-17 02:21:16.000000000 -0400
-@@ -347,7 +347,8 @@
- @GL_KLUDGE@ GL: 				rubikblocks -root			    \n\
- @GL_KLUDGE@ GL: 				companioncube -root			    \n\
- @GL_KLUDGE@ GL: 				hilbert -root				    \n\
--@GL_KLUDGE@ GL: 				tronbit -root				    \n
-+@GL_KLUDGE@ GL: 				tronbit -root				    \n\
-+				electricsheep --root 1				    \n
- 
- 
- 
diff --git a/extra/xscreensaver/xscreensaver.pam b/extra/xscreensaver/xscreensaver.pam
deleted file mode 100644
index b4d80c21f..000000000
--- a/extra/xscreensaver/xscreensaver.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth		required	pam_unix_auth.so
author	Michał Masłowski <mtjm@mtjm.eu>	2012-11-10 15:10:58 +0100
committer	Michał Masłowski <mtjm@mtjm.eu>	2012-11-10 15:10:58 +0100
commit	9f050463d1b34e3f36a54aeb9ef65217530f2cd0 (patch)
tree	0a4fca87cb224834876e3c5cf79375619bca75a4 /extra
parent	bf8d5e47ebdb788735d74c8232db8ec4a724a0bb (diff)