Removed old core and extra from repo. Renamed -testing to core/extra. This will setup the base for the testing branch.

851 files changed, 0 insertions, 44508 deletions

diff --git a/abs/extra-testing/README b/abs/extra-testing/README
deleted file mode 100644
index e69de29..0000000
--- a/abs/extra-testing/README
+++ /dev/null
diff --git a/abs/extra-testing/abs/ChangeLog b/abs/extra-testing/abs/ChangeLog
deleted file mode 100644
index 03d6d88..0000000
--- a/abs/extra-testing/abs/ChangeLog
+++ /dev/null
@@ -1,41 +0,0 @@
-2008-10-28 Allan McRae <allan@archlinux.org>
-
-	* 2.3-1
-	Upstream update
-	- add ability to download files using tarballs on pacman mirror
-
-2008-08-10 Allan McRae <allan@archlinux.org>
-
-	* 2.2-1
-	Upstream update
-	- adds ability to select which repos/packages
-	  sync on commandline
-	- additional PKGBUILD and install script prototypes
-
-2008-04-19 Travis Willard <travis@archlinux.org>
-
-	* 2.1-1
-	Upstream update - re-adds support for community
-
-2008-04-19 Travis Willard <travis@archlinux.org>
-
-	* 2.0-4
-	Added install warning about /var/abs
-
-2008-04-15 Travis Willard <travis@archlinux.org>
-
-	* 2.0-3
-	Added install message
-	Moved abs.conf to /etc instead of /etc/abs
-
-2008-04-13 Travis Willard <travis@archlinux.org>
-
-	* 2.0-2
-	Moved rsyncd.conf.abs to /usr/share/abs
-	Made rsync server configurable
-
-2008-04-10 Travis Willard <travis@archlinux.org>
-
-	* 2.0-1
-	Added ChangeLog
-	New rsync-based release
diff --git a/abs/extra-testing/abs/PKGBUILD b/abs/extra-testing/abs/PKGBUILD
deleted file mode 100644
index 872fc59..0000000
--- a/abs/extra-testing/abs/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 17300 2008-10-28 04:37:22Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=abs
-pkgver=2.3
-pkgrel=1
-pkgdesc="Utilities to download and work with the Arch Build System (ABS)"
-arch=('i686' 'x86_64')
-url="http://projects.archlinux.org/git/?p=abs.git"
-license=('GPL')
-depends=('bash' 'rsync')
-backup=(etc/abs.conf)
-install=abs.install
-source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d6fd791aa487ba8bb5ff48c3ace20592')
-
-build() {
-  cd ${srcdir}/${pkgname}
-
-  make CONFDIR=/etc/ || return 1
-  make CONFDIR=/etc/ DESTDIR=${pkgdir} install || return 1
-
-  # Add readme file, and make base /var/abs path
-  install -dm0755 ${pkgdir}/var/abs/local/
-  install -Dm0644 ${srcdir}/abs/README ${pkgdir}/var/abs/README
-
-  # change ABS tags for x86_64 to correct values
-  if [ "$CARCH" = "x86_64" ]; then
-    sed -i "s|i686|x86_64|g" ${pkgdir}/etc/abs.conf
-  fi
-}
-
-# vim: set ts=2 sw=2 noet:
diff --git a/abs/extra-testing/abs/abs.install b/abs/extra-testing/abs/abs.install
deleted file mode 100644
index 1b19b4a..0000000
--- a/abs/extra-testing/abs/abs.install
+++ /dev/null
@@ -1,15 +0,0 @@
-## arg 1:  the new package version
-## arg 2:  the old package version
-pre_upgrade() {
-  if [ "$(vercmp $2 2.0-1)" -lt 0 ]; then
-    echo "==> ABS now uses rsync, instead of cvsup, to synchronize your tree."
-    echo "==> Please note the new configuration in /etc/abs.conf"
-  fi
-
-  if [ "$(vercmp $2 2.0-4)" -lt 0 ]; then
-    echo "==> Warning: abs clears out the contents of /var/abs when syncing."
-    echo "==> Keep all local PKGBUILDs in /var/abs/local, or they will disappear"
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/abs/extra-testing/alpine/2.00-lpam.patch b/abs/extra-testing/alpine/2.00-lpam.patch
deleted file mode 100644
index 69e66d7..0000000
--- a/abs/extra-testing/alpine/2.00-lpam.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- alpine-2.00.orig/alpine/Makefile.in
-+++ alpine-2.00/alpine/Makefile.in
-@@ -169,7 +169,7 @@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lpam
- LIBTOOL = @LIBTOOL@
- LN = @LN@
- LN_S = @LN_S@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
diff --git a/abs/extra-testing/alpine/CVE-2008-5514.patch b/abs/extra-testing/alpine/CVE-2008-5514.patch
deleted file mode 100644
index 594bea0..0000000
--- a/abs/extra-testing/alpine/CVE-2008-5514.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- alpine-2.00/imap/src/c-client/rfc822.c
-+++ alpine-2.00/imap/src/c-client/rfc822.c
-@@ -1351,6 +1351,7 @@
- 
- static long rfc822_output_char (RFC822BUFFER *buf,int c)
- {
-+  if ((buf->cur == buf->end) && !rfc822_output_flush (buf)) return NIL;
-   *buf->cur++ = c;		/* add character, soutr buffer if full */
-   return (buf->cur == buf->end) ? rfc822_output_flush (buf) : LONGT;
- }
-@@ -1374,7 +1375,8 @@
-       len -= i;
-     }
- 				/* soutr buffer now if full */
--    if (len && !rfc822_output_flush (buf)) return NIL;
-+    if ((len || (buf->cur == buf->end)) && !rfc822_output_flush (buf))
-+      return NIL;
-   }
-   return LONGT;
- }
diff --git a/abs/extra-testing/alpine/ChangeLog b/abs/extra-testing/alpine/ChangeLog
deleted file mode 100644
index 4c3bf81..0000000
--- a/abs/extra-testing/alpine/ChangeLog
+++ /dev/null
@@ -1,43 +0,0 @@
-2010-01-23  Eric Belanger  <eric@archlinux.org>
-
-	* alpine 2.00-7
-	* Updated patchset to level 53
-
-2009-09-18  Eric Belanger  <eric@archlinux.org>
-
-	* alpine 2.00-6
-	* libldap-2.4 rebuild
-
-2009-09-18  Eric Belanger  <eric@archlinux.org>
-
-	* alpine 2.00-5
-	* Updated patchset to level 52
-	* Security fix
-
-2009-09-17  Allan McRae  <allan@archlinux.org>
-
-	* alpine 2.00-4
-	* libldap-2.4 rebuild
-
-2009-02-07  Eric Belanger  <eric@archlinux.org>
-
-	* alpine 2.00-3
-	* Updated patchset to level 20
-
-2008-12-05  Eric Belanger  <eric@archlinux.org>
-
-	* alpine 2.00-2
-	* Rebuilt against heimdal 1.2.1
-	* Placed copy of all.patch.gz patch on local ftp (close FS#11964)
-
-2008-09-04  Eric Belanger  <eric@archlinux.org>
-
-	* alpine 2.00-1
-	* Upstream update
-	* Replaced install scriptlet with optdepends
-
-2008-03-26  Eric Belanger  <eric@archlinux.org>
-
-	* alpine 1.10-1
-	* Upstream update
-	* Added ChangeLog
diff --git a/abs/extra-testing/alpine/PKGBUILD b/abs/extra-testing/alpine/PKGBUILD
deleted file mode 100644
index 1d75c85..0000000
--- a/abs/extra-testing/alpine/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 64978 2010-01-23 22:24:15Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Fabio Scotoni <fabio@esse.ch>
-
-pkgname=alpine
-pkgver=2.00
-pkgrel=7
-_patchlevel=53
-pkgdesc="The Apache-licensed PINE (a tool for reading, sending, and managing electronic messages)"
-arch=('i686' 'x86_64')
-url="http://www.washington.edu/alpine/"
-license=('APACHE')
-depends=('libldap>=2.4.11' 'heimdal>=1.2.1' 'gettext')
-optdepends=('aspell: for spell-checking support')
-provides=('pine')
-conflicts=('pine')
-replaces=('pine')
-options=('!makeflags')
-source=(ftp://ftp.cac.washington.edu/${pkgname}/${pkgname}.tar.bz2 \
-        http://staff.washington.edu/chappa/alpine/patches/alpine-${pkgver}/all_${_patchlevel}.patch.gz \
-        2.00-lpam.patch CVE-2008-5514.patch)
-md5sums=('84e44cbf71ed674800a5d57eed9c1c52' 'c4a85b865f59c095f838617d08b1b123'\
-         'cd3911c16fc6a072e853c0ccfc35857c' '1b52a54a656979116c09fb1d948a4325')
-sha1sums=('dcbd3c5419954f484ccf706feaba31ce48cdebc4' '7396ed92062924c126087dc32b98ccebf98e17cc'\
-         '1b39525f91ebd5a9de5a1e04f5554f6fa5f58ae3' 'bc61d76a237ff42b00b3f60f2e6fc5c45e261dbb')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../all_${_patchlevel}.patch || return 1
-  patch -p1 < ../2.00-lpam.patch || return 1
-  patch -p1 < ../CVE-2008-5514.patch || return 1
-  ./configure --prefix=/usr --without-passfile --without-tcl \
-    --disable-shared --with-system-pinerc=/etc/alpine.d/pine.conf \
-    --with-system-fixed-pinerc=/etc/alpine.d/pine.conf.fixed || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra-testing/alsa-firmware/PKGBUILD b/abs/extra-testing/alsa-firmware/PKGBUILD
deleted file mode 100644
index d9c890b..0000000
--- a/abs/extra-testing/alsa-firmware/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 79046 2010-04-30 05:38:39Z tpowa $
-# Contributor: Jochen Immendörfer <jochen dot immendoerfer at gmail dot com>
-# Package Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=alsa-firmware
-pkgver=1.0.23
-pkgrel=1
-pkgdesc="ALSA firmware package"
-arch=('i686' 'x86_64')
-url="http://alsa-project.org/"
-license=('GPL')
-source=(ftp://ftp.alsa-project.org/pub/firmware/$pkgname-$pkgver.tar.bz2)
-options=(!strip)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-  # remove files which conflicts with kernel26-firmware
-  rm -rf ${pkgdir}/lib/firmware/ess/maestro3_assp_kernel.fw || return 1
-  rm -rf ${pkgdir}/lib/firmware/ess/maestro3_assp_minisrc.fw || return 1
-  rm -rf ${pkgdir}/lib/firmware/korg/k1212.dsp || return 1
-  rm -rf ${pkgdir}/lib/firmware/sb16/alaw_main.csp || return 1
-  rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_capture.csp || return 1
-  rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_init.csp || return 1
-  rm -rf ${pkgdir}/lib/firmware/sb16/ima_adpcm_playback.csp || return 1
-  rm -rf ${pkgdir}/lib/firmware/sb16/mulaw_main.csp || return 1
-  rm -rf ${pkgdir}/lib/firmware/yamaha/ds1_ctrl.fw || return 1
-  rm -rf ${pkgdir}/lib/firmware/yamaha/ds1_dsp.fw || return 1
-  rm -rf ${pkgdir}/lib/firmware/yamaha/ds1e_ctrl.fw || return 1
-  rm -rf ${pkgdir}/lib/firmware/yamaha/yss225_registers.bin || return 1
-}
-md5sums=('e3f755331d6d485f6fd697249b90f877')
diff --git a/abs/extra-testing/apache-ant/PKGBUILD b/abs/extra-testing/apache-ant/PKGBUILD
deleted file mode 100644
index 663cc19..0000000
--- a/abs/extra-testing/apache-ant/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 24082 2009-01-12 21:42:39Z paul $
-# Contributor: Andrew Wright <andreww@photism.org>
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgname=apache-ant
-pkgver=1.7.1
-pkgrel=1
-pkgdesc="Ant is a java-based build tool."
-arch=(i686 x86_64)
-license=('APACHE')
-url="http://ant.apache.org/"
-depends=('java-runtime')
-makedepends=('java-environment')
-noextract=('junit3.8.1.zip')
-source=(http://archive.apache.org/dist/ant/source/${pkgname}-${pkgver}-src.tar.bz2
-        http://heanet.dl.sourceforge.net/sourceforge/junit/junit3.8.1.zip)
-md5sums=('0d68db4a1ada5c91bcbf53cefd0c2fd7' '5110326e4b7f7497dfa60ede4b626751')
-
-build() {
-  cd ${startdir}/src || return 1
-  unzip junit3.8.1.zip || return 1
-
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  if [ -f /etc/profile.d/java-gcj-compat.sh ]; then
-    . /etc/profile.d/java-gcj-compat.sh
-  elif [ -f /etc/profile.d/jdk.sh ]; then
-    . /etc/profile.d/jre.sh
-    . /etc/profile.d/jdk.sh
-  fi
-
-   # we need the junit jar in the classpath to build ant
-  export CLASSPATH="${startdir}/src/junit3.8.1/junit.jar"
-
-  # build
-  mkdir dist || return 1
-  ./build.sh -Ddist.dir=dist/ dist || return 1
-
-  # install
-  export ANT_HOME="${startdir}/pkg/usr"
-  ./build.sh install-lite || return 1
-}
diff --git a/abs/extra-testing/apcupsd/PKGBUILD b/abs/extra-testing/apcupsd/PKGBUILD
deleted file mode 100644
index ad57d1a..0000000
--- a/abs/extra-testing/apcupsd/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD,v 1.17 2009/01/19 10:34:32 sergej Exp $
-# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
-# Maintainer: Todd Musall <tmusall@comcast.net>
-
-pkgname=apcupsd
-pkgver=3.14.8
-pkgrel=1
-pkgdesc="Apcupsd can be used for power mangement and controlling most of APC's UPS models on Unix and Windows machines."
-arch=(i686 x86_64)
-url="http://www.apcupsd.org"
-license=('GPL')
-depends=('gcc-libs' 'gd' 'gconf')
-makedepends=('pkgconfig')
-backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf \
-        etc/apcupsd/multimon.conf)
-source=(http://switch.dl.sf.net/sourceforge/apcupsd/$pkgname-$pkgver.tar.gz \
-	apcupsd
-	apcupsd.conf
-	run)
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --enable-cgi --enable-usb --enable-net \
-              --with-upstype=usb --with-upscable=usb \
-              --with-serial-dev=/dev/usb/hid/hiddev[0-9] \
-              --enable-pthreads --enable-gapcmon
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
-  install -D -m755 ../apcupsd $startdir/pkg/etc/rc.d/apcupsd && \
-  chmod 755 $startdir/pkg/sbin/*
-  cp ../apcupsd.conf $startdir/pkg/etc/apcupsd/
-  mkdir -p  $startdir/pkg/etc/sv/apcupsd/supervise
-  install -D -m755 ../run $startdir/pkg/etc/sv/apcupsd
-}
-md5sums=('cd17f0a903dc2220e55ed54e242359d2'
-         '5eae3c4d921eeb81798a0250fe3dd111'
-         '2f533aec32c9445510bb2127b453b175'
-         '32ae73bc096c1d0982c12d8ec46abee2')
diff --git a/abs/extra-testing/apcupsd/apcupsd b/abs/extra-testing/apcupsd/apcupsd
deleted file mode 100755
index 3cd5c9d..0000000
--- a/abs/extra-testing/apcupsd/apcupsd
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /sbin/apcupsd`
-case "$1" in
-  start)
-    stat_busy "Starting APCUPSD Daemon"
-    rm -f /etc/apcupsd/powerfail
-    rm -f /etc/nologin
-    [ -z "$PID" ] && /sbin/apcupsd -f /etc/apcupsd/apcupsd.conf
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=`pidof -o %PPID /sbin/apcupsd`
-      echo $PID > /var/run/apcupsd.pid
-      add_daemon apcupsd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping APCUPSD Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/apcupsd.pid
-      rm_daemon apcupsd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  status)
-    /sbin/apcaccess status
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|status}"  
-esac
-exit 0
diff --git a/abs/extra-testing/apcupsd/apcupsd.conf b/abs/extra-testing/apcupsd/apcupsd.conf
deleted file mode 100644
index dd60889..0000000
--- a/abs/extra-testing/apcupsd/apcupsd.conf
+++ /dev/null
@@ -1,325 +0,0 @@
-## apcupsd.conf v1.1 ##
-# 
-#  for apcupsd release 3.14.5 (10 January 2009) - unknown
-#
-# "apcupsd" POSIX config file
-
-#
-# ========= General configuration parameters ============
-#
-
-# UPSNAME xxx
-#   Use this to give your UPS a name in log files and such. This
-#   is particulary useful if you have multiple UPSes. This does not
-#   set the EEPROM. It should be 8 characters or less.
-#UPSNAME
-
-# UPSCABLE <cable>
-#   Defines the type of cable connecting the UPS to your computer.
-#
-#   Possible generic choices for <cable> are:
-#     simple, smart, ether, usb
-#
-#   Or a specific cable model number may be used:
-#     940-0119A, 940-0127A, 940-0128A, 940-0020B,
-#     940-0020C, 940-0023A, 940-0024B, 940-0024C,
-#     940-1524C, 940-0024G, 940-0095A, 940-0095B,
-#     940-0095C, M-04-02-2000
-#
-UPSCABLE usb
-
-# To get apcupsd to work, in addition to defining the cable
-# above, you must also define a UPSTYPE, which corresponds to
-# the type of UPS you have (see the Description for more details).
-# You must also specify a DEVICE, sometimes referred to as a port.
-# For USB UPSes, please leave the DEVICE directive blank. For
-# other UPS types, you must specify an appropriate port or address.
-#
-# UPSTYPE   DEVICE           Description
-# apcsmart  /dev/tty**       Newer serial character device,
-#                            appropriate for SmartUPS models using
-#                            a serial cable (not USB).
-#
-# usb       <BLANK>          Most new UPSes are USB. A blank DEVICE
-#                            setting enables autodetection, which is
-#                            the best choice for most installations.
-#
-# net       hostname:port    Network link to a master apcupsd
-#                            through apcupsd's Network Information
-#                            Server. This is used if you don't have
-#                            a UPS directly connected to your computer.
-#
-# snmp      hostname:port:vendor:community
-#                            SNMP Network link to an SNMP-enabled
-#                            UPS device. Vendor is the MIB used by
-#                            the UPS device: can be "APC", "APC_NOTRAP"
-#                            or "RFC" where APC is the powernet MIB,
-#                            "APC_NOTRAP" is powernet with SNMP trap
-#                            catching disabled, and RFC is the IETF's 
-#                            rfc1628 UPS-MIB. You usually want "APC".
-#                            Port is usually 161. Community is usually
-#                            "private".
-#
-# dumb      /dev/tty**       Old serial character device for use 
-#                            with simple-signaling UPSes.
-#
-# pcnet    ipaddr:username:passphrase
-#                            PowerChute Network Shutdown protocol
-#                            which can be used as an alternative to SNMP
-#                            with AP9617 family of smart slot cards.
-#                            ipaddr is the IP address of the UPS mgmt
-#                            card. username and passphrase are the
-#                            credentials for which the card has been
-#                            configured.
-#
-UPSTYPE usb
-DEVICE /dev/usb/hid/hiddev[0-9]
-
-# POLLTIME <int>
-#   Interval (in seconds) at which apcupsd polls the UPS for status. This
-#   setting applies both to directly-attached UPSes (UPSTYPE apcsmart, usb, 
-#   dumb) and networked UPSes (UPSTYPE net, snmp). Lowering this setting
-#   will improve apcupsd's responsiveness to certain events at the cost of
-#   higher CPU utilization. The default of 60 is appropriate for most
-#   situations.
-#POLLTIME 60
-
-# LOCKFILE <path to lockfile>
-#   Path for device lock file. Not used on Win32.
-LOCKFILE /var/lock
-
-# SCRIPTDIR <path to script directory>
-#   Directory in which apccontrol and event scripts are located.
-SCRIPTDIR /etc/apcupsd
-
-# PWRFAILDIR <path to powerfail directory>
-#   Directory in which to write the powerfail flag file. This file
-#   is created when apcupsd initiates a system shutdown and is
-#   checked in the OS halt scripts to determine if a killpower
-#   (turning off UPS output power) is required.
-PWRFAILDIR /etc/apcupsd
-
-# NOLOGINDIR <path to nologin directory>
-#   Directory in which to write the nologin file. The existence
-#   of this flag file tells the OS to disallow new logins.
-NOLOGINDIR /etc
-
-
-#
-# ======== Configuration parameters used during power failures ==========
-#
-
-# The ONBATTERYDELAY is the time in seconds from when a power failure
-#   is detected until we react to it with an onbattery event.
-#
-#   This means that, apccontrol will be called with the powerout argument
-#   immediately when a power failure is detected.  However, the
-#   onbattery argument is passed to apccontrol only after the 
-#   ONBATTERYDELAY time.  If you don't want to be annoyed by short
-#   powerfailures, make sure that apccontrol powerout does nothing
-#   i.e. comment out the wall.
-ONBATTERYDELAY 6
-
-# 
-# Note: BATTERYLEVEL, MINUTES, and TIMEOUT work in conjunction, so
-# the first that occurs will cause the initation of a shutdown.
-#
-
-# If during a power failure, the remaining battery percentage
-# (as reported by the UPS) is below or equal to BATTERYLEVEL, 
-# apcupsd will initiate a system shutdown.
-BATTERYLEVEL 5
-
-# If during a power failure, the remaining runtime in minutes 
-# (as calculated internally by the UPS) is below or equal to MINUTES,
-# apcupsd, will initiate a system shutdown.
-MINUTES 3
-
-# If during a power failure, the UPS has run on batteries for TIMEOUT
-# many seconds or longer, apcupsd will initiate a system shutdown.
-# A value of 0 disables this timer.
-#
-#  Note, if you have a Smart UPS, you will most likely want to disable
-#    this timer by setting it to zero. That way, you UPS will continue
-#    on batteries until either the % charge remaing drops to or below BATTERYLEVEL,
-#    or the remaining battery runtime drops to or below MINUTES.  Of course,
-#    if you are testing, setting this to 60 causes a quick system shutdown
-#    if you pull the power plug.   
-#  If you have an older dumb UPS, you will want to set this to less than
-#    the time you know you can run on batteries.
-TIMEOUT 0
-
-#  Time in seconds between annoying users to signoff prior to
-#  system shutdown. 0 disables.
-ANNOY 300
-
-# Initial delay after power failure before warning users to get
-# off the system.
-ANNOYDELAY 60
-
-# The condition which determines when users are prevented from
-# logging in during a power failure.
-# NOLOGON <string> [ disable | timeout | percent | minutes | always ]
-NOLOGON disable
-
-# If KILLDELAY is non-zero, apcupsd will continue running after a
-# shutdown has been requested, and after the specified time in
-# seconds attempt to kill the power. This is for use on systems
-# where apcupsd cannot regain control after a shutdown.
-# KILLDELAY <seconds>  0 disables
-KILLDELAY 0
-
-#
-# ==== Configuration statements for Network Information Server ====
-#
-
-# NETSERVER [ on | off ] on enables, off disables the network
-#  information server. If netstatus is on, a network information
-#  server process will be started for serving the STATUS and
-#  EVENT data over the network (used by CGI programs).
-NETSERVER on
-
-# NISIP <dotted notation ip address>
-#  IP address on which NIS server will listen for incoming connections.
-#  This is useful if your server is multi-homed (has more than one
-#  network interface and IP address). Default value is 0.0.0.0 which
-#  means any incoming request will be serviced. Alternatively, you can
-#  configure this setting to any specific IP address of your server and 
-#  NIS will listen for connections only on that interface. Use the
-#  loopback address (127.0.0.1) to accept connections only from the
-#  local machine.
-NISIP 0.0.0.0
-
-# NISPORT <port> default is 3551 as registered with the IANA
-#  port to use for sending STATUS and EVENTS data over the network.
-#  It is not used unless NETSERVER is on. If you change this port,
-#  you will need to change the corresponding value in the cgi directory
-#  and rebuild the cgi programs.
-NISPORT 3551
-
-# If you want the last few EVENTS to be available over the network
-# by the network information server, you must define an EVENTSFILE.
-EVENTSFILE /var/log/apcupsd.events
-
-# EVENTSFILEMAX <kilobytes>
-#  By default, the size of the EVENTSFILE will be not be allowed to exceed
-#  10 kilobytes.  When the file grows beyond this limit, older EVENTS will
-#  be removed from the beginning of the file (first in first out).  The
-#  parameter EVENTSFILEMAX can be set to a different kilobyte value, or set
-#  to zero to allow the EVENTSFILE to grow without limit.
-EVENTSFILEMAX 10
-
-#
-# ========== Configuration statements used if sharing =============
-#            a UPS with more than one machine
-
-#
-# Remaining items are for ShareUPS (APC expansion card) ONLY
-#
-
-# UPSCLASS [ standalone | shareslave | sharemaster ]
-#   Normally standalone unless you share an UPS using an APC ShareUPS
-#   card.
-UPSCLASS standalone
-
-# UPSMODE [ disable | share ]
-#   Normally disable unless you share an UPS using an APC ShareUPS card.
-UPSMODE disable
-
-#
-# ===== Configuration statements to control apcupsd system logging ========
-#
-
-# Time interval in seconds between writing the STATUS file; 0 disables
-STATTIME 300
-
-# Location of STATUS file (written to only if STATTIME is non-zero)
-STATFILE /var/log/apcupsd.status
-
-# LOGSTATS [ on | off ] on enables, off disables
-# Note! This generates a lot of output, so if         
-#       you turn this on, be sure that the
-#       file defined in syslog.conf for LOG_NOTICE is a named pipe.
-#  You probably do not want this on.
-LOGSTATS off
-
-# Time interval in seconds between writing the DATA records to
-#   the log file. 0 disables.
-DATATIME 0
-
-# FACILITY defines the logging facility (class) for logging to syslog. 
-#          If not specified, it defaults to "daemon". This is useful 
-#          if you want to separate the data logged by apcupsd from other
-#          programs.
-#FACILITY DAEMON
-
-#
-# ========== Configuration statements used in updating the UPS EPROM =========
-#
-
-#
-# These statements are used only by apctest when choosing "Set EEPROM with conf
-# file values" from the EEPROM menu. THESE STATEMENTS HAVE NO EFFECT ON APCUPSD.
-#
-
-# UPS name, max 8 characters 
-#UPSNAME UPS_IDEN
-
-# Battery date - 8 characters
-#BATTDATE mm/dd/yy
-
-# Sensitivity to line voltage quality (H cause faster transfer to batteries)  
-# SENSITIVITY H M L        (default = H)
-#SENSITIVITY H
-
-# UPS delay after power return (seconds)
-# WAKEUP 000 060 180 300   (default = 0)
-#WAKEUP 60
-
-# UPS Grace period after request to power off (seconds)
-# SLEEP 020 180 300 600    (default = 20)
-#SLEEP 180
-
-# Low line voltage causing transfer to batteries
-# The permitted values depend on your model as defined by last letter 
-#  of FIRMWARE or APCMODEL. Some representative values are:
-#    D 106 103 100 097
-#    M 177 172 168 182
-#    A 092 090 088 086
-#    I 208 204 200 196     (default = 0 => not valid)
-#LOTRANSFER  208
-
-# High line voltage causing transfer to batteries
-# The permitted values depend on your model as defined by last letter 
-#  of FIRMWARE or APCMODEL. Some representative values are:
-#    D 127 130 133 136
-#    M 229 234 239 224
-#    A 108 110 112 114
-#    I 253 257 261 265     (default = 0 => not valid)
-#HITRANSFER 253
-
-# Battery charge needed to restore power
-# RETURNCHARGE 00 15 50 90 (default = 15)
-#RETURNCHARGE 15
-
-# Alarm delay 
-# 0 = zero delay after pwr fail, T = power fail + 30 sec, L = low battery, N = never
-# BEEPSTATE 0 T L N        (default = 0)
-#BEEPSTATE T
-
-# Low battery warning delay in minutes
-# LOWBATT 02 05 07 10      (default = 02)
-#LOWBATT 2
-
-# UPS Output voltage when running on batteries
-# The permitted values depend on your model as defined by last letter 
-#  of FIRMWARE or APCMODEL. Some representative values are:
-#    D 115
-#    M 208
-#    A 100
-#    I 230 240 220 225     (default = 0 => not valid)
-#OUTPUTVOLTS 230
-
-# Self test interval in hours 336=2 weeks, 168=1 week, ON=at power on
-# SELFTEST 336 168 ON OFF  (default = 336)
-#SELFTEST 336
diff --git a/abs/extra-testing/apcupsd/run b/abs/extra-testing/apcupsd/run
deleted file mode 100644
index bc5c22b..0000000
--- a/abs/extra-testing/apcupsd/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-exec 2>&1
-   stat_runit "Starting APC UPS Daemon"
-      exec /sbin/apcupsd -b -f /etc/apcupsd/apcupsd.conf
diff --git a/abs/extra-testing/asciidoc/ChangeLog b/abs/extra-testing/asciidoc/ChangeLog
deleted file mode 100644
index e9e5156..0000000
--- a/abs/extra-testing/asciidoc/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-
-2009-11-07  Chris Brannon <cmbrannon79@gmail.com>
-
-	* Fixed optdepends, converted to arch=('any').
-
-
-2008-07-06  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for x86_64 - 8.2.7
-
diff --git a/abs/extra-testing/asciidoc/PKGBUILD b/abs/extra-testing/asciidoc/PKGBUILD
deleted file mode 100644
index 2a73a22..0000000
--- a/abs/extra-testing/asciidoc/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Chris Brannon <cmbrannon79@gmail.com>
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-# Contributor: Dan McGee <dan@archlinux.org>
-# Contributor: Jaroslaw Rosiek <philosoph@interia.pl>
-# Contributor: Darwin Bautista <djclue917@gmail.com>
-
-pkgname=asciidoc
-pkgver=8.5.3
-pkgrel=2
-pkgdesc="Text document format for short documents, articles, books and UNIX man pages"
-arch=('any')
-url="http://www.methods.co.nz/asciidoc/"
-license=('GPL')
-depends=('python' 'libxslt' 'docbook-xsl')
-optdepends=('lilypond: music-filter'
-	    'imagemagick: music-filter (used in conjunction with lilypond)'
-	    'source-highlight: source-highlight-filter'
-	    'fop: pdf generation'
-	    'lynx: text generation'
-	    'w3m: text generation (alternative to lynx)')
-source=(http://downloads.sourceforge.net/asciidoc/asciidoc-${pkgver}.tar.gz)
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc || return 1
-  make install DESTDIR="${pkgdir}" || return 1
-  install -Dm644 asciidocapi.py ${pkgdir}/usr/lib/python2.6/site-packages/asciidocapi.py
-}
-md5sums=('7377872275c2a575151655b19ac6dd3e')
diff --git a/abs/extra-testing/atomicparsley/PKGBUILD b/abs/extra-testing/atomicparsley/PKGBUILD
deleted file mode 100644
index 4108fa9..0000000
--- a/abs/extra-testing/atomicparsley/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com>
-pkgname=atomicparsley
-pkgver=0.9.0
-pkgrel=2
-pkgdesc="command line program for reading, parsing and setting iTunes-style metadata in MPEG4 files"
-arch=(i686 x86_64)
-url="http://atomicparsley.sourceforge.net/"
-license=('GPL')
-source=(http://ftp.knoppmyth.net/R6/sources/$pkgname/AtomicParsley-source-$pkgver.tar.bz2)
-md5sums=('dfe6700089ca20c87f7f5293dee5df6c')
-
-build() {
-  cd $startdir/src/
-  unzip AtomicParsley-source-$pkgver
-  cd $startdir/src/AtomicParsley-source-$pkgver
-  ./build
-  install -D -m 755 AtomicParsley $startdir/pkg/usr/bin/AtomicParsley
-}
diff --git a/abs/extra-testing/autofs/Changelog b/abs/extra-testing/autofs/Changelog
deleted file mode 100755
index d8df4dc..0000000
--- a/abs/extra-testing/autofs/Changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-5.0.4-5 4/29/09
-Cecil - Added run and finish files for runit.
-6/28/10
-Britney - Updated run to manage automount; removed finish and /etc/rc.d/autofs; added logger
-5.0.5-1 6/12/10
-Britney - Updated to 5.0.5 based on arch autofs 5.0.5 PKGBUILD and heimdal.patch with runit support added.
diff --git a/abs/extra-testing/autofs/PKGBUILD b/abs/extra-testing/autofs/PKGBUILD
deleted file mode 100755
index ae04100..0000000
--- a/abs/extra-testing/autofs/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 75323 2010-04-01 10:16:24Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Dale Blount <dale@archlinux.org>
-# Contributor: Manolis Tzanidakis
-
-pkgname=autofs
-pkgver=5.0.5
-pkgrel=3
-pkgdesc="A kernel-based automounter for Linux"
-arch=('i686' 'x86_64')
-url="http://wiki.autofs.net/FrontPage"
-license=('GPL2')
-depends=('libldap' 'libxml2' 'heimdal')
-backup=(etc/autofs/auto.master etc/autofs/auto.misc etc/conf.d/autofs)
-install=${pkgname}.install
-source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2"
-        'autofs' 'autofs.conf.d' 'auto.master' 'auto.misc'
-        'heimdal.patch')
-md5sums=('a1d262cb6ebef0c2dd0fe22232fb3d5a'
-         'e307bf6d2638e46eeb916cf42fe029b2'
-         '47f597c870410055e0fdb66103daf928'
-         'a6cefb591e77b31b79dbb7243646c96b'
-         'd8a15ec9186c5c0b36e5cea1e2739e8a'
-         'efd46b6406b940cb48f7c6197790fb8e')
-
-build() {
-  export MAKEFLAGS="-j1"
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" Makefile.rules
-  patch -Np1 -i ${srcdir}/heimdal.patch
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc/autofs \
-    --with-mapdir=/etc/autofs \
-    --without-hesiod
-  make || return 1
-
-  sed -i "s:/etc:/etc/autofs:g" man/auto.master.5
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make INSTALLROOT=${pkgdir} install
-  
-  install -Dm644 ${srcdir}/auto.master ${pkgdir}/etc/autofs/auto.master || return 1
-  install -Dm644 ${srcdir}/auto.misc ${pkgdir}/etc/autofs/auto.misc || return 1
-  install -Dm755 ${srcdir}/autofs ${pkgdir}/etc/rc.d/autofs || return 1
-  install -Dm644 ${srcdir}/autofs.conf.d ${pkgdir}/etc/conf.d/autofs || return 1
-}
diff --git a/abs/extra-testing/autofs/auto.master b/abs/extra-testing/autofs/auto.master
deleted file mode 100644
index be4ea73..0000000
--- a/abs/extra-testing/autofs/auto.master
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sample auto.master file
-# Format of this file:
-# mountpoint map options
-# For details of the format look at autofs(5).
-
-#/media /etc/autofs/auto.media
diff --git a/abs/extra-testing/autofs/auto.misc b/abs/extra-testing/autofs/auto.misc
deleted file mode 100644
index 5691566..0000000
--- a/abs/extra-testing/autofs/auto.misc
+++ /dev/null
@@ -1,7 +0,0 @@
-# This is an automounter map and it has the following format
-# key [ -mount-options-separated-by-comma ] location
-# Details may be found in the autofs(5) manpage
-
-cdrom -fstype=iso9660,ro,nodev,nosuid :/dev/cdrom
-floppy -fstype=auto,async,nodev,nosuid,umask=000 :/dev/fl
-usbstick -fstype=auto,async,nodev,nosuid,umask=000 :/dev/sda1
diff --git a/abs/extra-testing/autofs/autofs b/abs/extra-testing/autofs/autofs
deleted file mode 100644
index 08bd3e1..0000000
--- a/abs/extra-testing/autofs/autofs
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-daemon_name=autofs
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/autofs ] && . /etc/conf.d/autofs
-
-if [ ! -z "$TIMEOUT" ]; then
-  daemonoptions="--timeout=$TIMEOUT $daemonoptions"
-fi
-
-PID=`cat /var/run/autofs-running 2> /dev/null`
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-    [ -z "$PID" ] && /usr/sbin/automount $daemonoptions &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-  restart)
-    stat_busy "Restarting $daemon_name daemon"
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|status}"  
-esac
-exit 0
diff --git a/abs/extra-testing/autofs/autofs.conf.d b/abs/extra-testing/autofs/autofs.conf.d
deleted file mode 100644
index bc82491..0000000
--- a/abs/extra-testing/autofs/autofs.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#localoptions='rsize=8192,wsize=8192'
-
-# e.g. --timeout=60
-daemonoptions=''
diff --git a/abs/extra-testing/autofs/autofs.install b/abs/extra-testing/autofs/autofs.install
deleted file mode 100644
index 7806efa..0000000
--- a/abs/extra-testing/autofs/autofs.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_install(){
-	echo "#########################################################"
-	echo "In autofs5 --ghost option isn't valid. In order to start autofs"
-	echo "you must remove that option from your /etc/conf.d/autofs. "
-}
diff --git a/abs/extra-testing/autofs/finish b/abs/extra-testing/autofs/finish
deleted file mode 100755
index 40d2fdc..0000000
--- a/abs/extra-testing/autofs/finish
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-exec 2>&1
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-stat_runit "Stopping autofs4 kernel module" && echo ""
-set -e  # barf if modprobe fails
-/sbin/modprobe -r autofs4
diff --git a/abs/extra-testing/autofs/heimdal.patch b/abs/extra-testing/autofs/heimdal.patch
deleted file mode 100644
index 4aa3218..0000000
--- a/abs/extra-testing/autofs/heimdal.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- autofs-5.0.5/modules/cyrus-sasl.c~	2010-03-03 01:38:41.582901786 +0100
-+++ autofs-5.0.5/modules/cyrus-sasl.c	2010-03-03 01:41:32.313704755 +0100
-@@ -66,6 +66,15 @@
- #endif
- #endif
- 
-+/**
-+ * The type of a principal is different for MIT Krb5 and Heimdal.
-+ * These macros are provided by Heimdal, and introduced here for MIT.
-+ */
-+#ifndef krb5_realm_length
-+#define krb5_realm_length(r) ((r).length)
-+#define krb5_realm_data(r) ((r).data)
-+#endif
-+
- /*
-  *  Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME
-  *  environment variable so that the library knows where to find it.
-@@ -452,11 +452,11 @@
- 
- 	/* setup a principal for the ticket granting service */
- 	ret = krb5_build_principal_ext(ctxt->krb5ctxt, &tgs_princ,
--		krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
--		krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
-+		krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)),
-+		krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)),
- 		strlen(KRB5_TGS_NAME), KRB5_TGS_NAME,
--		krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
--		krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
-+		krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)),
-+		krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)),
- 		0);
- 	if (ret) {
- 		error(logopt,
---- autofs-5.0.5/modules/Makefile~	2010-03-03 01:42:18.532868539 +0100
-+++ autofs-5.0.5/modules/Makefile	2010-03-03 01:42:35.360367371 +0100
-@@ -43,7 +43,7 @@
-   ifeq ($(SASL), 1)
-     SASL_OBJ = cyrus-sasl.o
-     LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) -DLDAP_THREAD_SAFE
--    LIBLDAP += $(LIBSASL) $(XML_LIBS)
-+    LIBLDAP += $(LIBSASL) $(XML_LIBS) -lkrb5
-   endif
- endif
\ No newline at end of file
diff --git a/abs/extra-testing/autofs/log.run b/abs/extra-testing/autofs/log.run
deleted file mode 100755
index d184328..0000000
--- a/abs/extra-testing/autofs/log.run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/logger -p info -i -t autofs
diff --git a/abs/extra-testing/autofs/run b/abs/extra-testing/autofs/run
deleted file mode 100755
index 342ade6..0000000
--- a/abs/extra-testing/autofs/run
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-exec 2>&1
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-stat_runit "Starting autofs4 kernel module" && echo ""
-set -e  # barf if modprobe fails
-/sbin/modprobe autofs4
-
-stat_runit "Starting autofs automount" && echo ""
-# source application-specific settings
-[ -f /etc/conf.d/autofs ] && . /etc/conf.d/autofs
-
-if [ ! -z "$TIMEOUT" ]; then
-  daemonoptions="--timeout=$TIMEOUT $daemonoptions"
-fi
-
-exec /usr/sbin/automount -f $daemonoptions
diff --git a/abs/extra-testing/bash-completion/PKGBUILD b/abs/extra-testing/bash-completion/PKGBUILD
deleted file mode 100644
index 5aa6b22..0000000
--- a/abs/extra-testing/bash-completion/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 67318 2010-02-06 09:38:55Z eric $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Aurelien Foret <orelien@chez.com>
-# Contributor: Evangelos Foutras <foutrelis@gmail.com>
-
-pkgname=bash-completion
-pkgver=1.2
-pkgrel=1
-pkgdesc="Programmable completion for the bash shell"
-arch=(any)
-url="http://bash-completion.alioth.debian.org/"
-license=('GPL')
-depends=('bash')
-source=(http://bash-completion.alioth.debian.org/files/$pkgname-$pkgver.tar.gz cowsay.bashcomp)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # fixes for archlinux
-  sed -i 's#/sbin/lsmod#/bin/lsmod#' bash_completion || return 1
-
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make || return 1
-  make DESTDIR="$pkgdir" install
-  install -D -m644 "$srcdir/cowsay.bashcomp" "$pkgdir/etc/bash_completion.d/cowsay"
-
-  # apache2ctl doesn't work, even when renamed to apachectl (and sed'd)
-  rm "$pkgdir/etc/bash_completion.d/apache2ctl"
-  # munin-node doesn't work, even i've updated munin to 1.4.0
-  rm "$pkgdir/etc/bash_completion.d/munin-node"
-}
-# vim:set ts=2 sw=2 et:
-md5sums=('457c8808ed54f2b2cdd737b1f37ffa24'
-         'e9766bdc391caf825cb24e704422987e')
diff --git a/abs/extra-testing/bash-completion/cowsay.bashcomp b/abs/extra-testing/bash-completion/cowsay.bashcomp
deleted file mode 100644
index 77d8be9..0000000
--- a/abs/extra-testing/bash-completion/cowsay.bashcomp
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/games-misc/cowsay/files/cowsay.bashcomp,v 1.1 2005/02/06 14:37:54 ka0ttic Exp $
-
-# bash command-line completion for cowsay
-# Author: Aaron Walker <ka0ttic@gentoo.org>
-# Modified by: Michal Bentkowski <mr.ecik at gmail.com>
-
-_cowsay() {
-    local cur prev opts x
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-    opts="-e -f -h -l -n -T -W -b -d -g -p -s -t -w -y"
-
-    if [[ "${cur}" == -* || ${COMP_CWORD} -eq 1 ]] ; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-        return 0
-    fi
-
-    case "${prev}" in
-        -f)
-            COMPREPLY=( $( command ls /usr/share/cowsay| \
-                sed -ne 's/^\('$cur'.*\)\.cow$/\1/p') )
-            return 0
-            ;;
-        -[eTW])
-            COMPREPLY=()
-            ;;
-    esac
-}
-complete -o filenames -F _cowsay cowsay cowthink
-
-# vim: set ft=sh tw=80 sw=4 et :
diff --git a/abs/extra-testing/beautiful-soup/PKGBUILD b/abs/extra-testing/beautiful-soup/PKGBUILD
deleted file mode 100644
index 082700c..0000000
--- a/abs/extra-testing/beautiful-soup/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-# Contributor: phrakture < aaron m griffin * gmail::com >
-# Contributor: tardo <tardo@nagi-fanboi.net>
-
-pkgname=beautiful-soup
-pkgver=3.1.0.1
-pkgrel=1
-pkgdesc="A Python HTML/XML parser designed for quick turnaround projects like screen-scraping"
-arch=('i686' 'x86_64')
-url="http://www.crummy.com/software/BeautifulSoup/index.html"
-license=('PSF')
-depends=('python')
-source=(http://www.crummy.com/software/BeautifulSoup/download/BeautifulSoup-$pkgver.tar.gz)
-
-build() {
-    cd $startdir/src/BeautifulSoup-$pkgver
-    python setup.py install --root=$startdir/pkg
-}
-md5sums=('bcffef3eda6e06e6d1e18c06a9db8a24')
diff --git a/abs/extra-testing/bluez-firmware/PKGBUILD b/abs/extra-testing/bluez-firmware/PKGBUILD
deleted file mode 100644
index 64466c1..0000000
--- a/abs/extra-testing/bluez-firmware/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com>
-
-pkgname=bluez-firmware
-pkgver=1.2
-pkgrel=4
-pkgdesc="Firmware for Broadcom BCM203x Blutonium devices"
-url="http://www.bluez.org/"
-arch=('i686' 'x86_64')
-license=('GPL2')
-depends=()
-source=("http://bluez.sf.net/download/$pkgname-$pkgver.tar.gz")
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --libdir=/lib || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums=('1cc3cefad872e937e05de5a0a2b390dd')
diff --git a/abs/extra-testing/bluez-hcidump/PKGBUILD b/abs/extra-testing/bluez-hcidump/PKGBUILD
deleted file mode 100644
index 25e0fdf..0000000
--- a/abs/extra-testing/bluez-hcidump/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Geoffroy carrier <geoffroy@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Joerie de Gram <j.de.gram@gmail.com>
-
-pkgname=bluez-hcidump
-pkgver=1.42
-pkgrel=1
-pkgdesc="Bluetooth HCI package analyzer"
-url="http://www.bluez.org/"
-arch=('i686' 'x86_64')
-license=('GPL2')
-depends=('bluez>=4.18')
-source=(http://bluez.sf.net/download/$pkgname-$pkgver.tar.gz)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums=('5704737aaf72104eeaf77335218a1827')
diff --git a/abs/extra-testing/bluez-python/PKGBUILD b/abs/extra-testing/bluez-python/PKGBUILD
deleted file mode 100644
index fcf2639..0000000
--- a/abs/extra-testing/bluez-python/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Contributor: Li Dongyang<Jerry87905@gmail.com>
-
-pkgname=bluez-python
-pkgver=0.1.4
-pkgrel=1
-pkgdesc="A BlueZ python binding on top of dbus-python"
-arch=(i686 x86_64)
-url="http://code.google.com/p/bluez-python"
-license=('LGPL')
-depends=('bluez>=4.30' 'dbus-python')
-source=(http://bluez-python.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('013f283d3c32765e67c89ebf7f5470ea')
-
-build() {
-  cd $startdir/src/$pkgname
-  python setup.py install --root=$startdir/pkg
-}
diff --git a/abs/extra-testing/bluez/PKGBUILD b/abs/extra-testing/bluez/PKGBUILD
deleted file mode 100644
index f8dfbe5..0000000
--- a/abs/extra-testing/bluez/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
-pkgname=bluez
-pkgver=4.69
-pkgrel=1
-pkgdesc="Libraries and tools for the Bluetooth protocol stack"
-url="http://www.bluez.org/"
-arch=('i686' 'x86_64')
-license=('GPL2')
-depends=('dbus-core' 'glib2')
-makedepends=('gstreamer0.10-base' 'alsa-lib' 'libusb')
-optdepends=('gstreamer0.10-base' 'alsa-lib' 'libusb')
-conflicts=('bluez-libs' 'bluez-utils')
-provides=('bluez-libs' 'bluez-utils')
-replaces=('bluez-libs' 'bluez-utils')
-install='bluez.install'
-backup=(etc/bluetooth/{main,rfcomm,audio,network,input}.conf
-        etc/conf.d/bluetooth)
-source=("http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.bz2"
-        bluetooth.conf.d run.bluetoothd run.hidd run.dund run.pand
-        run.rfcomm)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --libexecdir=/lib \
-        --mandir=/usr/share/man \
-        --enable-gstreamer \
-        --enable-alsa \
-        --enable-usb \
-        --enable-netlink \
-        --enable-tools \
-        --enable-bccmd \
-        --enable-hid2hci \
-        --enable-dfutool \
-        --enable-hidd \
-        --enable-pand \
-        --enable-dund \
-        --enable-cups \
-        --enable-manpages \
-        --enable-configfiles \
-        --enable-pcmciarules || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
-
-  install -D -m644 "$srcdir/$pkgname-$pkgver/network/network.conf" "$pkgdir/etc/bluetooth/" || return 1
-  install -D -m644 "$srcdir/$pkgname-$pkgver/input/input.conf"     "$pkgdir/etc/bluetooth/" || return 1
-  install -D -m644 "$srcdir/$pkgname-$pkgver/audio/audio.conf"     "$pkgdir/etc/bluetooth/" || return 1
-  install -D -m644 "$srcdir/bluetooth.conf.d"                     "$pkgdir/etc/conf.d/bluetooth" || return 1
-  install -D -m755 "$srcdir/run.bluetoothd"                       "$pkgdir/etc/sv/bluetoothd/run" || return 1
-  install -D -m755 "$srcdir/run.hidd"                             "$pkgdir/etc/sv/hidd/run" || return 1
-  install -D -m755 "$srcdir/run.dund"                             "$pkgdir/etc/sv/dund/run" || return 1
-  install -D -m755 "$srcdir/run.pand"                             "$pkgdir/etc/sv/pand/run" || return 1
-  install -D -m755 "$srcdir/run.rfcomm"                           "$pkgdir/etc/sv/rfcomm/run" || return 1
-}
-md5sums=('350568aa11a95eac6e56e9289ff1f91d'
-         'd12be5b494525bb1ba6eac5c3983dd3e'
-         '1c88fcd455920ad8ee0c7cae3fe15771'
-         'a9c1b4da8b5a3969865272bd0fb01da2'
-         '89c073f43a074844b87e28103e48623d'
-         '8ee99afea417561d01012b8047fd06d5'
-         '934a9eaa25c275d18115068101fb75e8')
diff --git a/abs/extra-testing/bluez/__Changelog b/abs/extra-testing/bluez/__Changelog
deleted file mode 100644
index 124d0eb..0000000
--- a/abs/extra-testing/bluez/__Changelog
+++ /dev/null
@@ -1,11 +0,0 @@
-# by mihanson
-I really have no idea how this bluetooth stuff works.  If anyone wants to
-take a stab at getting this working properly with runit, feel free.  I
-only need this package to get mythpywii working.
-
-2010-04-01:
-Make this package work with runit.  All daemons were seperated into their
-own run scripts.  Of particular interest is rfcomm and hid2hci utilities.
-They are not daemons and I added "/sbin/sv <executable> down ." in their
-respective run files.  All based on this thread:
-http://article.gmane.org/gmane.comp.sysutils.supervision.general/1585/
diff --git a/abs/extra-testing/bluez/bluetooth.conf.d b/abs/extra-testing/bluez/bluetooth.conf.d
deleted file mode 100644
index 8f25ef4..0000000
--- a/abs/extra-testing/bluez/bluetooth.conf.d
+++ /dev/null
@@ -1,33 +0,0 @@
-# Bluetooth configuraton file
-
-# Bluetooth services (allowed values are "true" and "false")
-
-# Run the bluetoothd daemon (default: true)
-#DAEMON_ENABLE="false"
-
-# Run hid2hci (default: false)
-#HID2HCI_ENABLE="true"
-
-# Run the sdp daemon (default: false)
-# If this is disabled, hcid's internal sdp daemon will be used
-#SDPD_ENABLE="true"
-
-# Run the bluetooth HID daemon (default: false)
-#HIDD_ENABLE="true"
-
-# Activate rfcomm ports (default: false)
-#RFCOMM_ENABLE="true"
-
-# Run bluetooth dial-up networking daemon (default: false)
-#DUND_ENABLE="true"
-
-# Run bluetooth PAN daemon (default: false)
-#PAND_ENABLE="true"
-
-# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf)
-#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-# Options for hidd, dund and pand (default: none)
-#HIDD_OPTIONS=""
-#DUND_OPTIONS=""
-#PAND_OPTIONS=""
diff --git a/abs/extra-testing/bluez/bluez.install b/abs/extra-testing/bluez/bluez.install
deleted file mode 100644
index f9b757b..0000000
--- a/abs/extra-testing/bluez/bluez.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-    add_service.sh bluetoothd
-    echo ">>> Only the bluetoothd daemon is started by default."
-    echo ">>> You can optionally add the following as required:"
-    echo ">>> hidd dund pand rfcomm"
-    echo ">>> $ sudo add_service.sh <service_name>"
-}
-
-pre_remove() {
-    for d in { bluetoothd,hidd,dund,pand,rfcomm } ; do
-      if [ -d /var/service/${d} ] ; then
-        remove_servcie.sh $d
-      fi
-    done
-}
diff --git a/abs/extra-testing/bluez/run.bluetoothd b/abs/extra-testing/bluez/run.bluetoothd
deleted file mode 100644
index 7a92437..0000000
--- a/abs/extra-testing/bluez/run.bluetoothd
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# Start/stop the Bluetooth daemons
-#
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
-
-    stat_runit "Starting bluetooth subsystem:"
-      exec /usr/sbin/bluetoothd -n
diff --git a/abs/extra-testing/bluez/run.dund b/abs/extra-testing/bluez/run.dund
deleted file mode 100644
index c42cfa1..0000000
--- a/abs/extra-testing/bluez/run.dund
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# Start/stop the Bluetooth daemons
-#
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
-
-svwaitup -s 3 /var/service/bluetoothd || exit 1
-
-    stat_runit "Starting BlueZ Bluetooth dial-up networking daemon"
-      exec /usr/bin/dund -n -s
diff --git a/abs/extra-testing/bluez/run.hidd b/abs/extra-testing/bluez/run.hidd
deleted file mode 100644
index e4f66d3..0000000
--- a/abs/extra-testing/bluez/run.hidd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# Start/stop the Bluetooth daemons
-#
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
-
-svwaitup -s 3 /var/service/bluetoothd || exit 1
-
-    stat_runit "Starting Bluetooth HID daemon:"
-      exec /usr/bin/hidd -n --server
diff --git a/abs/extra-testing/bluez/run.pand b/abs/extra-testing/bluez/run.pand
deleted file mode 100644
index ab15ef6..0000000
--- a/abs/extra-testing/bluez/run.pand
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# Start/stop the Bluetooth daemons
-#
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
-
-svwaitup -s 3 /var/service/bluetoothd || exit 1
-
-    stat_runit "Starting BlueZ Bluetooth PAN daemon"
-      exec /usr/bin/pand -n -s
diff --git a/abs/extra-testing/bluez/run.rfcomm b/abs/extra-testing/bluez/run.rfcomm
deleted file mode 100644
index 8bc619b..0000000
--- a/abs/extra-testing/bluez/run.rfcomm
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# Start/stop the Bluetooth daemons
-#
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
-
-RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-svwaitup -s 3 /var/service/bluetoothd || exit 1
-
-    stat_runit "Starting RFCOMM for the bluetooth subsystem"
-      /usr/bin/rfcomm -f $RFCOMM_CONFIG bind all
-      /sbin/sv down .
diff --git a/abs/extra-testing/bmp/0.9.7-visualization.patch b/abs/extra-testing/bmp/0.9.7-visualization.patch
deleted file mode 100644
index ac03323..0000000
--- a/abs/extra-testing/bmp/0.9.7-visualization.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- beep/vis.c	2004-12-04 10:04:29.000000000 +0100
-+++ beep/vis.c	2005-02-17 12:02:25.391044008 +0100
-@@ -223,7 +223,8 @@ vis_draw(Widget * w)
-     /* FIXME: The check "shouldn't" be neccessary? */
-     /*	if (GTK_IS_WINDOW(vis->vs_window)) { */
-     GDK_THREADS_ENTER();
--    gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc,
-+    if (GDK_IS_DRAWABLE(vis->vs_window))
-+        gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc,
-                            vis->vs_widget.x, vis->vs_widget.y,
-                            vis->vs_widget.width, vis->vs_widget.height,
-                            GDK_RGB_DITHER_NORMAL, (guchar *) rgb_data,
diff --git a/abs/extra-testing/bmp/0.9.7.1-visualization.patch b/abs/extra-testing/bmp/0.9.7.1-visualization.patch
deleted file mode 100644
index ac03323..0000000
--- a/abs/extra-testing/bmp/0.9.7.1-visualization.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- beep/vis.c	2004-12-04 10:04:29.000000000 +0100
-+++ beep/vis.c	2005-02-17 12:02:25.391044008 +0100
-@@ -223,7 +223,8 @@ vis_draw(Widget * w)
-     /* FIXME: The check "shouldn't" be neccessary? */
-     /*	if (GTK_IS_WINDOW(vis->vs_window)) { */
-     GDK_THREADS_ENTER();
--    gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc,
-+    if (GDK_IS_DRAWABLE(vis->vs_window))
-+        gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc,
-                            vis->vs_widget.x, vis->vs_widget.y,
-                            vis->vs_widget.width, vis->vs_widget.height,
-                            GDK_RGB_DITHER_NORMAL, (guchar *) rgb_data,
diff --git a/abs/extra-testing/bmp/PKGBUILD b/abs/extra-testing/bmp/PKGBUILD
deleted file mode 100644
index ffcc1bf..0000000
--- a/abs/extra-testing/bmp/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 9914 2008-08-21 00:36:16Z eric $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Ben <contrasutra@myrealbox.com>
-
-pkgname=bmp
-pkgver=0.9.7.1
-pkgrel=4
-pkgdesc="gtk2 port of xmms"
-arch=(i686 x86_64)
-url="http://bmp.beep-media-player.org/"
-depends=('esd' 'id3lib' 'libglade' 'libsm' 'libvorbis' 'unzip')
-source=(http://voxel.dl.sourceforge.net/sourceforge/beepmp/bmp-$pkgver.tar.gz $pkgver-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch)
-md5sums=('c25d5a8d49cc5851d13d525a20023c4c' 'fa1bdf5a8d03e8539a6bed5caa471176'\
-         '42ad4109ddb66024d4c6d1f3e572ab86')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -p0 -i ../${pkgver}-visualization.patch
-  patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch
-  ./configure --prefix=/usr
-  /usr/bin/make || return 1
-  /usr/bin/make DESTDIR=$startdir/pkg install
-  find $startdir/pkg -name '*.la' -exec rm {} \;
-}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/abs/extra-testing/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch b/abs/extra-testing/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch
deleted file mode 100644
index 4c1e46d..0000000
--- a/abs/extra-testing/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-Patch taken from xmms-crossfade 3.10 tarball.  Required for crossfade to
-work.  http://www.eisenlohr.org/xmms-crossfade/
-
-diff -ur bmp-0.9.7.1/beep/mainwin.c bmp-0.9.7.1.patched/beep/mainwin.c
---- bmp-0.9.7.1/beep/mainwin.c	2005-05-09 10:45:39.000000000 +0200
-+++ bmp-0.9.7.1.patched/beep/mainwin.c	2005-11-25 00:03:59.000000000 +0100
-@@ -655,9 +655,11 @@
-     mainwin_set_shade(!cfg.player_shaded);
- }
- 
-+gboolean is_quitting = FALSE;
- void
- mainwin_quit_cb(void)
- {
-+    is_quitting = TRUE;
-     gtk_widget_hide(equalizerwin);
-     gtk_widget_hide(playlistwin);
-     gtk_widget_hide(mainwin);
-@@ -1318,7 +1320,7 @@
- change_song(guint pos)
- {
-     if (bmp_playback_get_playing())
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
- 
-     playlist_set_position(pos);
-     bmp_playback_initiate();
-diff -ur bmp-0.9.7.1/beep/playback.c bmp-0.9.7.1.patched/beep/playback.c
---- bmp-0.9.7.1/beep/playback.c	2005-01-26 06:56:15.000000000 +0100
-+++ bmp-0.9.7.1.patched/beep/playback.c	2005-11-25 00:03:59.000000000 +0100
-@@ -89,7 +89,7 @@
-         return;
- 
-     if (bmp_playback_get_playing())
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
- 
-     vis_clear_data(mainwin_vis);
-     vis_clear_data(playlistwin_vis);
-@@ -135,6 +135,15 @@
-     get_current_input_plugin()->pause(ip_data.paused);
- }
- 
-+gboolean input_stopped_for_restart = FALSE;
-+void
-+bmp_playback_stop_for_restart(void)
-+{
-+	input_stopped_for_restart = TRUE;
-+	bmp_playback_stop();
-+	input_stopped_for_restart = FALSE;
-+}
-+
- void
- bmp_playback_stop(void)
- {
-diff -ur bmp-0.9.7.1/beep/playback.h bmp-0.9.7.1.patched/beep/playback.h
---- bmp-0.9.7.1/beep/playback.h	2004-12-04 10:04:26.000000000 +0100
-+++ bmp-0.9.7.1.patched/beep/playback.h	2005-11-25 00:03:59.000000000 +0100
-@@ -26,6 +26,7 @@
- void bmp_playback_initiate(void);
- void bmp_playback_pause(void);
- void bmp_playback_stop(void);
-+void bmp_playback_stop_for_restart(void);
- gboolean bmp_playback_play_file(const gchar * filename);
- gboolean bmp_playback_get_playing(void);
- gboolean bmp_playback_get_paused(void);
-diff -ur bmp-0.9.7.1/beep/playlist.c bmp-0.9.7.1.patched/beep/playlist.c
---- bmp-0.9.7.1/beep/playlist.c	2005-08-11 09:25:51.000000000 +0200
-+++ bmp-0.9.7.1.patched/beep/playlist.c	2005-11-25 00:03:59.000000000 +0100
-@@ -817,7 +817,7 @@
-     if (bmp_playback_get_playing()) {
-         /* We need to stop before changing playlist_position */
-         PLAYLIST_UNLOCK();
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
-         PLAYLIST_LOCK();
-         restart_playing = TRUE;
-     }
-@@ -868,7 +868,7 @@
-     if (bmp_playback_get_playing()) {
-         /* We need to stop before changing playlist_position */
-         PLAYLIST_UNLOCK();
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
-         PLAYLIST_LOCK();
-         restart_playing = TRUE;
-     }
-@@ -1018,7 +1018,7 @@
-     if (bmp_playback_get_playing()) {
-         /* We need to stop before changing playlist_position */
-         PLAYLIST_UNLOCK();
--        bmp_playback_stop();
-+        bmp_playback_stop_for_restart();
-         PLAYLIST_LOCK();
-         restart_playing = TRUE;
-     }
-@@ -1047,7 +1047,10 @@
- {
-     GList *plist_pos_list;
- 
--    bmp_playback_stop();
-+    if (cfg.repeat)
-+        bmp_playback_stop_for_restart();
-+    else
-+        bmp_playback_stop();
- 
-     PLAYLIST_LOCK();
-     plist_pos_list = find_playlist_position_list();
diff --git a/abs/extra-testing/boost/0001-date_time-gcc-4.3-fix.patch b/abs/extra-testing/boost/0001-date_time-gcc-4.3-fix.patch
deleted file mode 100644
index 9f7e016..0000000
--- a/abs/extra-testing/boost/0001-date_time-gcc-4.3-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 88f7023cc36d82133cfa0e705531a9d73feb4686 Mon Sep 17 00:00:00 2001
-From: Tim Blechmann <tim@klingt.org>
-Date: Sat, 2 Feb 2008 17:22:58 +0100
-Subject: [PATCH] date_time: gcc-4.3 fix
-
----
- boost/date_time/tz_db_base.hpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/boost/date_time/tz_db_base.hpp b/boost/date_time/tz_db_base.hpp
-index b9c0a8a..03f748e 100644
---- a/boost/date_time/tz_db_base.hpp
-+++ b/boost/date_time/tz_db_base.hpp
-@@ -158,7 +158,7 @@ namespace boost {
-       typedef typename time_zone_type::base_type time_zone_base_type;
-       typedef typename time_zone_type::time_duration_type time_duration_type;
-       typedef time_zone_names_base<char_type> time_zone_names;
--      typedef dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
-+      typedef boost::date_time::dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
-       typedef std::basic_string<char_type> string_type;
- 
-       //! Constructs an empty database
--- 
-1.5.3.8
-
diff --git a/abs/extra-testing/boost/PKGBUILD b/abs/extra-testing/boost/PKGBUILD
deleted file mode 100644
index 1fcfd98..0000000
--- a/abs/extra-testing/boost/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 24200 2009-01-15 01:41:45Z douglas $
-# Maintainer: kevin <kevin@archlinux.org>
-# TU: Kritoke <kritoke@gamebox.net>
-# Contributor: Luca Roccia <little_rock@users.sourceforge.net>
- 
-pkgname=boost
-pkgver=1.37.0
-_boostver=1_37_0
-pkgrel=1
-pkgdesc="Boost provides free peer-reviewed portable C++ source libraries."
-arch=(i686 x86_64)
-url="http://www.boost.org/"
-depends=('python>=2.5' 'bzip2' 'zlib')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_${_boostver}.tar.gz 0001-date_time-gcc-4.3-fix.patch)
-license=('custom')
- 
-build() {
-  cd ${srcdir}/${pkgname}_${_boostver}
-  export CFLAGS="${CFLAGS} -fno-strict-aliasing"
-  #patch -Np1 -i ${srcdir}/0001-date_time-gcc-4.3-fix.patch || return 1
-
-  # build bjam
-  cd ${srcdir}/${pkgname}_${_boostver}/tools/jam/src
-  ./build.sh cc || return 1
-
-  _bindir="bin.linuxx86"
-  [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
-
-  install -m755 -d ${pkgdir}/usr/bin
-  install -m755 ${_bindir}/bjam ${pkgdir}/usr/bin/bjam || return 1
- 
-  # build bcp
-  cd ${srcdir}/${pkgname}_${_boostver}/tools/bcp
-  ../jam/src/${_bindir}/bjam || return 1
-  install -m755 ${srcdir}/${pkgname}_${_boostver}/dist/bin/bcp \
-                ${pkgdir}/usr/bin/bcp || return 1
-
-  # build libs
-  cd ${srcdir}/${pkgname}_${_boostver}
-  # default "debug release <runtime-link>static/dynamic <threading>single/multi"
-  # --layout=system removes the -gcc suffix from libraries and installs
-  # includes in /usr/include/boost.
-  ./tools/jam/src/${_bindir}/bjam \
-            release debug-symbols=off threading=single,multi \
-			runtime-link=shared link=shared,static \
-            --prefix=${pkgdir}/usr \
-            -sPYTHON_ROOT=/usr \
-            -sPYTHON_VERSION=2.5 \
-            -sTOOLS=gcc \
-            --layout=system \
-            install || return 1
-
-  # build pyste
-  cd ${srcdir}/${pkgname}_${_boostver}/libs/python/pyste/install
-  python setup.py install --root=${pkgdir} || return 1
-
-  # license
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 ${srcdir}/${pkgname}_${_boostver}/LICENSE_1_0.txt \
-                ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
-}
-md5sums=('c38b88bb4ebc6d0d9193f432842273d2'
-         'd7f821056540ef08eb1d5ebd5ed017f1')
diff --git a/abs/extra-testing/boost/serialization_gcc43.patch b/abs/extra-testing/boost/serialization_gcc43.patch
deleted file mode 100644
index 13dbf5d..0000000
--- a/abs/extra-testing/boost/serialization_gcc43.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: /home/maik/workspace/boost/boost/archive/polymorphic_iarchive.hpp
-===================================================================
---- /home/maik/workspace/boost/boost/archive/polymorphic_iarchive.hpp	(Revision 43953)
-+++ /home/maik/workspace/boost/boost/archive/polymorphic_iarchive.hpp	(Arbeitskopie)
-@@ -17,6 +17,7 @@
- //  See http://www.boost.org for updates, documentation, and revision history.
- 
- #include <cstddef> // std::size_t
-+#include <climits> // ULONG_MAX
- #include <boost/config.hpp>
- 
- #if defined(BOOST_NO_STDC_NAMESPACE)
-@@ -38,6 +39,9 @@
- // i.e. that its not a synonym for (unsigned) long
- // if there is no 64 bit int or if its the same as a long
- // we shouldn't define separate functions for int64 data types.
-+#ifndef ULONG_MAX
-+# error "ULONG_MAX is not defined"
-+#endif
- #if defined(BOOST_NO_INT64_T) \
-     || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
- #   define BOOST_NO_INTRINSIC_INT64_T
-Index: /home/maik/workspace/boost/boost/archive/polymorphic_oarchive.hpp
-===================================================================
---- /home/maik/workspace/boost/boost/archive/polymorphic_oarchive.hpp	(Revision 43953)
-+++ /home/maik/workspace/boost/boost/archive/polymorphic_oarchive.hpp	(Arbeitskopie)
-@@ -18,6 +18,7 @@
- 
- #include <cstddef> // size_t
- #include <string>
-+#include <climits> // ULONG_MAX
- 
- #include <boost/config.hpp>
- #if defined(BOOST_NO_STDC_NAMESPACE)
-@@ -37,6 +38,9 @@
- // i.e. that its not a synonym for (unsigned) long
- // if there is no 64 bit int or if its the same as a long
- // we shouldn't define separate functions for int64 data types.
-+#ifndef ULONG_MAX
-+# error "ULONG_MAX is not defined"
-+#endif
- #if defined(BOOST_NO_INT64_T) \
-     || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1
- #   define BOOST_NO_INTRINSIC_INT64_T
diff --git a/abs/extra-testing/cabextract/PKGBUILD b/abs/extra-testing/cabextract/PKGBUILD
deleted file mode 100644
index 2b8eb10..0000000
--- a/abs/extra-testing/cabextract/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: dale <dale@archlinux.org>
-pkgname=cabextract
-pkgver=1.2
-pkgrel=1
-pkgdesc="A program to extract Microsoft cabinet (.CAB) files."
-license=(GPL)
-arch=(i686 x86_64)
-depends=(glibc)
-conflicts=()
-backup=()
-install=
-url="http://www.kyz.uklinux.net/cabextract.php"
-source=(http://www.cabextract.org.uk/$pkgname-$pkgver.tar.gz)
-md5sums=('dc421a690648b503265c82ade84e143e')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make || return 1
-  make prefix=$startdir/pkg/usr install
-}
diff --git a/abs/extra-testing/ccache/PKGBUILD b/abs/extra-testing/ccache/PKGBUILD
deleted file mode 100644
index 81f188b..0000000
--- a/abs/extra-testing/ccache/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 33524 2009-04-04 13:56:15Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=ccache
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="ccache is a compiler cache"
-url="http://ccache.samba.org/"
-source=(http://samba.org/ftp/${pkgname}/$pkgname-$pkgver.tar.gz)
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('glibc')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make || return 1
-  install -Dm 755 ccache ${pkgdir}/usr/bin/ccache
-  install -Dm 644 ccache.1 ${pkgdir}/usr/share/man/man1/ccache.1
-
-  mkdir -p ${pkgdir}/usr/lib/ccache/bin
-  ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/cc 
-  ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/gcc
-  ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/g++
-  ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/cpp
-  ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/c++
-  ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-cc
-  ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-gcc
-  ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-g++
-  ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-cpp
-  ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-c++
-}
-
-md5sums=('15f2449899d9e8dc3aff6b86f97ab63e')
diff --git a/abs/extra-testing/cddb-py/PKGBUILD b/abs/extra-testing/cddb-py/PKGBUILD
deleted file mode 100755
index 6852446..0000000
--- a/abs/extra-testing/cddb-py/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=cddb-py
-pkgver=1.4
-pkgrel=1
-pkgdesc="CDDB-Server access from Python. Differs from pycddb"
-url="http://cddb-py.sourceforge.net"
-license=""
-depends=(python)
-makedepends=()
-conflicts=()
-replaces=()
-backup=()
-install=
-arch='i686'
-source=("http://easynews.dl.sourceforge.net/sourceforge/cddb-py/CDDB-$pkgver.tar.gz")
-md5sums=('254698082bafe3030d07d88fb7e13fe2')
-
-build() {
-	  cd $startdir/src/CDDB-$pkgver
-	    python setup.py install --root=$startdir/pkg/
-    }
diff --git a/abs/extra-testing/community/amule/PKGBUILD b/abs/extra-testing/community/amule/PKGBUILD
deleted file mode 100644
index 3bb5c1b..0000000
--- a/abs/extra-testing/community/amule/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 63810 2010-01-18 20:34:42Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Henrik Ronellenfitsch <searinox@web.de>
-
-pkgname=amule
-pkgver=2.2.6
-pkgrel=2
-pkgdesc="An eMule-like client for ed2k p2p network"
-arch=('i686' 'x86_64')
-url="http://www.amule.org"
-license=('GPL')
-depends=('wxgtk>=2.8.10.1' 'gd>=2.0.35' 'geoip')
-makedepends=('crypto++')
-source=(http://downloads.sourceforge.net/project/${pkgname}/aMule/${pkgver}/aMule-${pkgver}.tar.bz2)
-md5sums=('530d9b48187e36f78fc21bb19e94326d')
-
-build() {
-  cd ${srcdir}/aMule-${pkgver}
-
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man \
-              --enable-cas \
-              --enable-wxcas \
-              --enable-amule-daemon \
-              --enable-amulecmd \
-              --enable-amule-gui \
-              --enable-alc \
-              --enable-alcc \
-              --enable-webserver \
-              --disable-debug \
-              --enable-optimize \
-	      --enable-ccache \
-	      --enable-geoip
-
-  make || return 1
-  make DESTDIR=${pkgdir}/ install || return 1
-}
diff --git a/abs/extra-testing/community/athcool/PKGBUILD b/abs/extra-testing/community/athcool/PKGBUILD
deleted file mode 100644
index c5a3290..0000000
--- a/abs/extra-testing/community/athcool/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=athcool
-pkgver=0.3.12
-pkgrel=3
-pkgdesc="Small utility allowing to enable powersaving mode on AMD Duron/Athlon/Athlon XP processors."
-url="http://members.jcom.home.ne.jp/jacobi/linux/softwares.html"
-depends=(pciutils)
-license="GPL"
-install=athcool.install
-arch=(i686)
-source=(http://members.jcom.home.ne.jp/jacobi/linux/files/$pkgname-$pkgver.tar.gz
-athcool run finish)
-md5sums=('f2e0f4fbd04f5e1f09aa60a3ecb24645'
-	 'bbf32484cec6431568ccf51c2516f9e7'
-	 'b9cf31ac580c1665d50d70e405d276bc')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  /bin/install -D -m0755 ../athcool $startdir/pkg/etc/rc.d/athcool
-  mkdir -p $pkgdir/etc/sv/athcool/supervise
-  install -D -m0755 ../run $pkgdir/etc/sv/athcool
-  install -D -m0755 ../finish $pkgdir/etc/sv/athcool
-}
diff --git a/abs/extra-testing/community/athcool/athcool b/abs/extra-testing/community/athcool/athcool
deleted file mode 100644
index f49bd40..0000000
--- a/abs/extra-testing/community/athcool/athcool
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
- 
-. /etc/rc.conf
-. /etc/rc.d/functions
- 
-ATHCOOL=/usr/sbin/athcool
- 
-case "$1" in
- start)
-  stat_busy "Enabling Athcool"
-  $ATHCOOL on > /dev/null
-  if [ $? -gt 0 ]; then
-  stat_fail
-  else
-  stat_done
-  fi
-  ;;
- stop)
-  stat_busy "Disabling Athcool"
-  $ATHCOOL off > /dev/null
-  if [ $? -gt 0 ]; then
-  stat_fail
-  else
-  stat_done
-  fi
-  ;;
- restart)
-  $0 stop
-  /bin/sleep 1
-  $0 start
-  ;;
- *)
-  echo "Usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/extra-testing/community/athcool/athcool.install b/abs/extra-testing/community/athcool/athcool.install
deleted file mode 100644
index 8896da2..0000000
--- a/abs/extra-testing/community/athcool/athcool.install
+++ /dev/null
@@ -1,18 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-	add_service.sh athcool
-}
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	/bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-	remove_service.sh athcool
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/community/athcool/finish b/abs/extra-testing/community/athcool/finish
deleted file mode 100755
index cae6b1b..0000000
--- a/abs/extra-testing/community/athcool/finish
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-exec 2>&1
-sv down athcool
diff --git a/abs/extra-testing/community/athcool/run b/abs/extra-testing/community/athcool/run
deleted file mode 100644
index b43936c..0000000
--- a/abs/extra-testing/community/athcool/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/sbin/athcool on 2>&1
diff --git a/abs/extra-testing/community/blockcontrol/PKGBUILD b/abs/extra-testing/community/blockcontrol/PKGBUILD
deleted file mode 100644
index 2507adc..0000000
--- a/abs/extra-testing/community/blockcontrol/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Daniele Marinello <marinz at email dot it>
-
-pkgname=blockcontrol
-pkgver=1.6.9
-pkgrel=3
-pkgdesc="blockcontrol is designed to do all tasks related to IP block daemons (MoBlock or NFBlock). They check internet traffic based on large lists of IP address ranges in order to protect your privacy."
-arch=('i686' 'x86_64')
-url="http://moblock-deb.sourceforge.net/"
-license=('GPL2' 'BSD')
-depends=('moblock' 'wget')
-conflicts=('moblockcontrol')
-source=(http://downloads.sourceforge.net/moblock-deb/$pkgname-$pkgver.tar.gz \
-                 blockcontrol.lib.patch)
-backup=('etc/blockcontrol/blockcontrol.conf' 'etc/blockcontrol/blocklists.list')
-
-build() {  
-  cd "$startdir/src/$pkgname-$pkgver"
-  patch -Np1 -i ../blockcontrol.lib.patch || return 1
-  
-  install -D -m 755 $startdir/src/$pkgname-$pkgver/blockcontrol ${pkgdir}/usr/bin/blockcontrol
-  install -D -m 755 $startdir/src/$pkgname-$pkgver/blockcontrol.main ${pkgdir}/usr/lib/blockcontrol/blockcontrol.main
-  install -D -m 644 $startdir/src/$pkgname-$pkgver/blockcontrol.defaults ${pkgdir}/usr/lib/blockcontrol/blockcontrol.defaults
-  install -D -m 644 $startdir/src/$pkgname-$pkgver/blockcontrol.lib ${pkgdir}/usr/lib/blockcontrol/blockcontrol.lib
-  install -D -m 755 $startdir/src/$pkgname-$pkgver/blockcontrol.wd ${pkgdir}/usr/bin/blockcontrol.wd
-  install -D -m 644 $startdir/src/$pkgname-$pkgver/allow.p2p ${pkgdir}/etc/blockcontrol/allow.p2p
-  install -D -m 644 $startdir/src/$pkgname-$pkgver/blockcontrol.conf ${pkgdir}/etc/blockcontrol/blockcontrol.conf
-  install -D -m 644 $startdir/src/$pkgname-$pkgver/blocklists.list ${pkgdir}/etc/blockcontrol/blocklists.list
-# install -D -m 755 $startdir/src/$pkgname-$pkgver/if-up ${pkgdir}/etc/network/if-up.d/blockcontrol
-  install -D -m 755 $startdir/src/$pkgname-$pkgver/cron.daily ${pkgdir}/etc/cron.daily/blockcontrol
-  install -D -m 755 $startdir/src/$pkgname-$pkgver/init ${pkgdir}/etc/rc.d/blockcontrol
-  install -D -m 644 $startdir/src/$pkgname-$pkgver/logrotate ${pkgdir}/etc/logrotate.d/blockcontrol
-  install -d ${pkgdir}/var/lib/blockcontrol
-  install -d ${pkgdir}/var/spool/blockcontrol
-}
-
-md5sums=('d02002745aacf6100ff9057bdc80adf3'
-         'efcca84e52ea98cc10610830f9c2ba37')
diff --git a/abs/extra-testing/community/blockcontrol/blockcontrol.lib.patch b/abs/extra-testing/community/blockcontrol/blockcontrol.lib.patch
deleted file mode 100644
index 4be1c75..0000000
--- a/abs/extra-testing/community/blockcontrol/blockcontrol.lib.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- blockcontrol/blockcontrol_old.lib	2009-09-14 19:35:24.000000000 +0200
-+++ blockcontrol/blockcontrol.lib	2009-11-05 20:29:50.000000000 +0100
-@@ -1344,10 +1344,10 @@
- 				DAEMON_OPTS="$CUSTOM_DAEMON_OPTS"
- 			elif [ "$NAME" = moblock ] ; then
- 				# The options MoBlock is started with
--				DAEMON_OPTS="-$BLOCKLIST_FORMAT $BLOCKLIST $NFQUEUE_NUMBER_OPT $LOG_SYSLOG_OPT $LOG_TIMESTAMP_OPT $REJECT_OPT $ACCEPT_OPT $DAEMON_LOG"
-+				DAEMON_OPTS="-$BLOCKLIST_FORMAT $BLOCKLIST $NFQUEUE_NUMBER_OPT $LOG_SYSLOG_OPT $DAEMON_LOG"
- 			elif [ "$NAME" = nfblockd ] ; then
- 				# The options NFBlock is started with
--				DAEMON_OPTS="-d -f $BLOCKLIST -p $PIDFILE $NFQUEUE_NUMBER_OPT $REJECT_OPT $ACCEPT_OPT $LOG_SYSLOG_OPT"
-+				DAEMON_OPTS="-d -f $BLOCKLIST -p $PIDFILE $NFQUEUE_NUMBER_OPT $LOG_SYSLOG_OPT"
- 			fi
- 
- 			# Test NICE_LEVEL setting.
diff --git a/abs/extra-testing/community/cksfv/PKGBUILD b/abs/extra-testing/community/cksfv/PKGBUILD
deleted file mode 100644
index b82aa60..0000000
--- a/abs/extra-testing/community/cksfv/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Wijnand Modderman <wijanand+aur@archlinux.nl>
-
-pkgname=cksfv
-pkgver=1.3.12
-pkgrel=1
-pkgdesc="SFV (Simple File Verification) Checker"
-arch=('i686' 'x86_64')
-url="http://zakalwe.virtuaalipalvelin.net/~shd/foss/cksfv/"
-license=('GPL')
-depends=('glibc')
-source=(http://zakalwe.virtuaalipalvelin.net/~shd/foss/cksfv/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('1d277da8bafaec9ddadb92ece4999590')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --package-prefix=$startdir/pkg
-  make || return 1
-  make install
-  chmod 644 $startdir/pkg/usr/share/man/man1/$pkgname.1
-}
diff --git a/abs/extra-testing/community/codecs/PKGBUILD b/abs/extra-testing/community/codecs/PKGBUILD
deleted file mode 100644
index 8cf80be..0000000
--- a/abs/extra-testing/community/codecs/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 27228 2009-02-17 05:58:02Z thayer $
-# Contributor: Thomas Baechler <thomas@archlinux.org>
-# Maintainer: Thayer Williams <thayer@archlinux.org>
-
-pkgname=codecs
-pkgver=20071007
-pkgrel=3
-pkgdesc="Non-linux native codec pack. (Win32, Real9, QuickTime)"
-arch=('i686' 'x86_64')
-license=('unknown')
-# The codec packages are different
-# only the 32 bit package needs legacy libstdc++
-[ "$CARCH" = "i686" ] && depends=('libstdc++5')
-[ "$CARCH" = "x86_64" ] && depends=('gcc-libs')
-options=('!strip')
-url="http://www.mplayerhq.hu/design7/dload.html"
-
-md5sums=('4ea9c2dbd0945c83af1a8d0dd363993c')
-_arch=""
-if [ "${CARCH}" = "x86_64" ]; then
-  _arch="-amd64"
-  md5sums=('8e1ceeec51469f5baac65e56fac709e8')
-fi
-source=(http://www.mplayerhq.hu/MPlayer/releases/codecs/essential${_arch}-${pkgver}.tar.bz2)
-
-build() {
-  mkdir -p ${pkgdir}/usr/lib/codecs
-  cd ${pkgdir}/usr/lib
-  ln -s codecs win32
-  install -m755 ${srcdir}/essential${_arch}-${pkgver}/* ${pkgdir}/usr/lib/codecs
-  rm ${pkgdir}/usr/lib/codecs/README
-}
-
diff --git a/abs/extra-testing/community/cpulimit/PKGBUILD b/abs/extra-testing/community/cpulimit/PKGBUILD
deleted file mode 100644
index 28a3b55..0000000
--- a/abs/extra-testing/community/cpulimit/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD,v 1.6 2009/02/09 18:02:27 abhidg Exp $
-# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
-# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
-
-pkgname=cpulimit
-pkgver=1.1
-pkgrel=1
-pkgdesc="Limit cpu usage in %. Actualy sends SIGSTOP/SIGCONT"
-arch=('i686' 'x86_64')
-url="http://cpulimit.sourceforge.net/"
-license=("GPL")
-source=("http://downloads.sourceforge.net/sourceforge/cpulimit/cpulimit-$pkgver.tar.gz")
-md5sums=('f4ff6d4bfaef1258e8f5cd2041e2e2a3')
-
-build () {
-  cd $startdir/src/$pkgname-$pkgver
-  make
-  install -D -m0755 cpulimit $startdir/pkg/usr/bin/cpulimit
-}
-
diff --git a/abs/extra-testing/community/cwiid-git/PKGBUILD b/abs/extra-testing/community/cwiid-git/PKGBUILD
deleted file mode 100644
index 909f224..0000000
--- a/abs/extra-testing/community/cwiid-git/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-#Contributor:Andrea Tarocchi <valdar@email.it> 
-pkgname=cwiid-git
-#pkgver=`date +%Y%m%d`
-pkgver=20100716
-pkgrel=1
-pkgdesc="Cwiid-git is the bleeding edge version of a wiimote's driver and utility tools"
-arch=(i686 x86_64)
-url="http://github.com/abstrakraft/cwiid"
-license=('GPL')
-
-depends=('bluez>=4' 'gtk2' 'python')
-makedepends=('git' 'make' 'automake' 'autoconf')
-replaces=('cwiid' 'cwiid-svn')
-provides=('cwiid' 'cwiid-git')
-install=('cwiid.install')
-source=()
-
-_gitroot=git://github.com/abstrakraft/cwiid.git
-_gitname=cwiid
-_builddir=$srcdir/$_gitname-build
-
-build() {
-  
-  export LDFLAGS=
-
-  cd $srcdir/
-  msg "Connecting to github.com GIT server...."
-  if [ -d $srcdir/$_gitname ] ; then
-    pushd $_gitname && git pull origin && popd
-    msg "The local files are updated."
-  else
-    git clone $_gitroot
-  fi
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-  rm -rf $_gitname-build
-  git clone $_gitname $_gitname-build
-
-  cd $_builddir
-  
-  aclocal
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-ldconfig
-
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-
-#  aclocal
-#  autoreconf
-  
-#  ./configure --disable-ldconfig --prefix=/usr --sysconfdir=/etc --with-cwiid-plugins-dir=/lib/cwiid/plugins
-#  make LDFLAGS=-L../libcwiid || return 1
-
-#  install -d $startdir/pkg/usr/bin
-#  install -d $startdir/pkg/etc
-#  install -d $startdir/pkg/usr/lib
-#  install -d $startdir/pkg/usr/include
-
-#  make install LDFLAGS=-L../libcwiid prefix=$startdir/pkg/usr sysconfdir=$startdir/pkg/etc install
-
-#  install -D -m644 ./wminput/README $pkgdir/usr/share/doc/cwiid/wminput
-}
diff --git a/abs/extra-testing/community/cwiid-git/cwiid.install b/abs/extra-testing/community/cwiid-git/cwiid.install
deleted file mode 100644
index 5dc5faf..0000000
--- a/abs/extra-testing/community/cwiid-git/cwiid.install
+++ /dev/null
@@ -1,16 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-echo -e "Note:"
-echo -e "\033[1;31m==> In order to use wminput you have to load the uinput kernel module:\033[0m"
-echo -e "\033[1;31m==> modprobe uinput (as root)\033[0m"
-echo -e "\033[1;31m==> and you have to assign correct right acces to /dev/uinput\033[0m"
-echo -e "\033[1;31m==> PLEAS READ THE DOC FILE /usr/share/doc/cwiid/wminput\033[0m"
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-op=$1
-shift
-$op $*
\ No newline at end of file
diff --git a/abs/extra-testing/community/deluge/PKGBUILD b/abs/extra-testing/community/deluge/PKGBUILD
deleted file mode 100644
index 8238baa..0000000
--- a/abs/extra-testing/community/deluge/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 26558 2009-02-09 16:10:09Z hugo $
-# Maintainer: Hugo Doria <hugo@archlinux.org>
-
-pkgname=deluge
-pkgver=1.2.2
-pkgrel=1
-pkgdesc="A bittorrent client written with python and pygtk"
-arch=('i686' 'x86_64')
-url="http://deluge-torrent.org/"
-license=('GPL3')
-depends=('pygtk' 'boost>=1.37.0' 'pyxdg' 'dbus-python' 'librsvg' 'setuptools')
-makedepends=('subversion' 'intltool')
-options=('!emptydirs')
-source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.gz)
-
-build() {
-
-  cd ${srcdir}/${pkgname}-${pkgver}/
-  python setup.py build
-  python setup.py install --prefix=/usr --root=${pkgdir}
-
-  install -D -m644 deluge/data/pixmaps/deluge.svg ${pkgdir}/usr/share/pixmaps/deluge.svg 
-}
-
-md5sums=('5165c6113efa75e2be0310976ce55e43')
diff --git a/abs/extra-testing/community/desktop-file-utils/ChangeLog b/abs/extra-testing/community/desktop-file-utils/ChangeLog
deleted file mode 100644
index 8941e48..0000000
--- a/abs/extra-testing/community/desktop-file-utils/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-2008-07-22  Alexander Fehr  <pizzapunk gmail com>
-
-  * desktop-file-utils-0.15-1:
-  New upstream release.
-  New maintainer.
-  Changed url.
-  Added ChangeLog.
diff --git a/abs/extra-testing/community/desktop-file-utils/PKGBUILD b/abs/extra-testing/community/desktop-file-utils/PKGBUILD
deleted file mode 100644
index aa92c33..0000000
--- a/abs/extra-testing/community/desktop-file-utils/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 6468 2008-07-24 13:00:42Z alexanderf $
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
-
-pkgname=desktop-file-utils
-pkgver=0.15
-pkgrel=1
-pkgdesc="Command line utilities for working with desktop entries"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/desktop-file-utils"
-license=('GPL')
-depends=('glib2')
-source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-$pkgver.tar.gz)
-md5sums=('2fe8ebe222fc33cd4a959415495b7eed')
-
-build() {
-  cd "$srcdir/desktop-file-utils-$pkgver"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
-}
diff --git a/abs/extra-testing/community/djmount/PKGBUILD b/abs/extra-testing/community/djmount/PKGBUILD
deleted file mode 100644
index a3648dc..0000000
--- a/abs/extra-testing/community/djmount/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Contributor: Michele Schäuble <mschaeuble@swissonline.ch>
-
-pkgname=djmount
-pkgver=0.71
-pkgrel=1
-pkgdesc="A UPnP AV client that mounts media server contents as a filesystem."
-arch=('i686')
-url="http://djmount.sourceforge.net/"
-license=('GPL')
-depends=('fuse')
-source=(http://voxel.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz \
-        djmount.rcd djmount.confd)
-md5sums=('c922753e706c194bf82a8b6ca77e6a9a' \
-         'f473b5150df385447f2f58049bfb6199' \
-         '21de4c947c17e8558f1007a20757f254')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-
-  install -D -m755 $startdir/src/djmount.rcd $startdir/pkg/etc/rc.d/djmount
-  install -D -m644 $startdir/src/djmount.confd $startdir/pkg/etc/conf.d/djmount
-}
diff --git a/abs/extra-testing/community/djmount/djmount.confd b/abs/extra-testing/community/djmount/djmount.confd
deleted file mode 100644
index 079100e..0000000
--- a/abs/extra-testing/community/djmount/djmount.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-OPTIONS="-o ro,allow_other"
-MOUNTPOINT="/media/upnp"
diff --git a/abs/extra-testing/community/djmount/djmount.rcd b/abs/extra-testing/community/djmount/djmount.rcd
deleted file mode 100755
index 84899dd..0000000
--- a/abs/extra-testing/community/djmount/djmount.rcd
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
- . /etc/rc.conf
- . /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/djmount ] && . /etc/conf.d/djmount
-
- case "$1" in
-
-   start)
-     stat_busy "Starting djmount"
-     /usr/bin/djmount $OPTIONS $MOUNTPOINT &>/dev/null
-     if [ $? -ne 0 ]; then
-       stat_fail
-     else
-       add_daemon djmount
-       stat_done
-     fi
-   ;;
-
-   stop)
-     stat_busy "Stopping djmount"
-     fusermount -u $MOUNTPOINT
-     kill -9 `pidof /usr/bin/djmount` &>/dev/null
-     rm_daemon djmount
-     stat_done
-   ;;
-
-   restart)
-     stat_busy "Restarting djmount ..."
-     $0 stop
-     $0 start
-     stat_done
-   ;;
-
-   *)
-     echo "usage: $0 {start|stop|restart}"
- esac
diff --git a/abs/extra-testing/community/enca/PKGBUILD b/abs/extra-testing/community/enca/PKGBUILD
deleted file mode 100644
index 1bbd7db..0000000
--- a/abs/extra-testing/community/enca/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD,v 1.7 2009/02/27 12:40:33 sergej Exp $
-# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
-# Contributor: Filip Dvorak <fila@pruda.com>
-
-pkgname=enca
-pkgver=1.9
-pkgrel=4
-pkgdesc="Charset analyser and converter"
-arch=(i686 x86_64)
-url="http://trific.ath.cx/software/enca"
-options=('!libtool')
-license=("GPL")
-depends=()
-source=(http://archlinux-stuff.googlecode.com/files/enca-$pkgver.tar.bz2)
-md5sums=('b3581e28d68d452286fb0bfe58bed3b3')
-
-build() {
-  cd $startdir/src/enca-$pkgver
-  ./configure --prefix=/usr --libexecdir=/usr/lib/enca
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
-
diff --git a/abs/extra-testing/community/firefox-i18n/PKGBUILD b/abs/extra-testing/community/firefox-i18n/PKGBUILD
deleted file mode 100644
index 7f65aa7..0000000
--- a/abs/extra-testing/community/firefox-i18n/PKGBUILD
+++ /dev/null
@@ -1,87 +0,0 @@
-# $Id: PKGBUILD 36428 2009-04-22 11:57:51Z pierre $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
-# Contributor: Michal Hybner <dta081@gmail.com>
-pkgname=firefox-i18n
-pkgver=3.0.9
-pkgrel=1
-_languages=af,ar,be,bg,bn-IN,ca,cs,cy,da,de,el,en-GB,eo,es-AR,es-ES,et,eu,fi,fr,fy-NL,ga-IE,gl,gu-IN,he,hi-IN,hu,id,is,it,ja,ka,kn,ko,ku,lt,lv,mk,mn,mr,nb-NO,nl,nn-NO,oc,pa-IN,pl,pt-BR,pt-PT,ro,ru,si,sk,sl,sq,sr,sv-SE,te,th,tr,uk,zh-CN,zh-TW
-pkgdesc="Language packs for Firefox"
-arch=(i686 x86_64)
-license=('MPL')
-url="http://www.mozilla.com/"
-depends=("firefox>=${pkgver}")
-eval conflicts=(mozilla-firefox-i18n mozilla-firefox-{${_languages}} firefox-{${_languages}})
-makedepends=('unzip')
-eval source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}/linux-i686/xpi/{${_languages}}.xpi)
-md5sums=('da750827ddf1aaa6c3b09fbb7ca4ebfc'
-         '3beb35aeb195552627394b7769f09c5e'
-         'cc25e1dfe322e163edd453b54b18ed6c'
-         '3a24f88aed1ec222739909467d45c36f'
-         '458dc3b51d94dfb92180b6513da33768'
-         '6100761f50681a27ecee4b9d43968090'
-         '33f8922cf3f574ddfc40e350e09e1ee8'
-         '1aac80931215e85a9434821318322840'
-         '0fdce63787e71ade32f4150555db446c'
-         'c40760c6b6ec0a5d43d708d175af71e0'
-         '8a861ec0bc928f7d2babb9c9fdac7afa'
-         'b5318a854916e712a79f7d3022c82d58'
-         '5d82688be741219e4a2e884c27674d06'
-         '3b786beb412062770cf921b7dfc7c412'
-         '4c4913ba9e21903bc979ff2883256cdb'
-         '2fab4572520a5062d69815bfcde647b5'
-         'd42995bda0f79edb8115f995e1ecf44f'
-         '7438e9461d20a65c13514ee340db4369'
-         '7be481c1595300ec83ca0632a0e5fd8f'
-         '6784c85f27219f04daecc2151a3ffa3a'
-         '479d5ab78dee9aa3b23ca14e39721034'
-         'e98a62f1c4096fb471f8d858d01d044f'
-         '59fbe6d0584b5c6c0adff7d16ef8ea51'
-         'f62a1d67104514da3aad97481e16e81e'
-         '0e43c81c9bd55c5feedcdcab2fb9c4df'
-         'd2e1c28de1be2474ff42c54727cd8c07'
-         'c78d170dca0d767c8d9bc31954cd2324'
-         'dafc51a775d512e3b34601c2a2291f76'
-         '76e95f638d7499fe36e5db2aa4446fc1'
-         '2a12e9ed49515a3e4210224d37f325ca'
-         'b904d86f667768c7554f7ac1630e2fc7'
-         '466ee82c40244cb0f3308798ae3ef1df'
-         '8e3ab0ac7127b9e651fa8150803d59fa'
-         '6e817a315663b926c4bcee48ef025195'
-         '67cb1f812b5e1ad2cd58d77e34e5e154'
-         'bc22bb46828c4a929c1e2ec41b090c97'
-         'ee4d58656343e0f0ee54e066d7e72451'
-         '9b2ac04cffc153a752b4ff6e000b2a29'
-         '329283f9e7a7aaa8a8e5f5ae7e62660d'
-         '13c5186b51ab3c5374620adf8e5c3576'
-         'a2b1f79253729735ad2e59568144f1b4'
-         'ccb9763952394717a8b5ec3dec877706'
-         'e508856e25040ffb87e023de94dca70b'
-         '322eaad0dd48a464187000ea0be5362a'
-         '3632809f34b423ad3ba31077682bbf26'
-         'fa15ae8bb4927d416abd3f1661dd4af9'
-         '5b8d7b418c477060a78f334d2928702d'
-         '3d5f4b14ae257ed03096757d6a05b217'
-         '4ad2c7aca6a890078f511bf4224e5347'
-         '18754e6cb9cee7b408702bd35cadeb0d'
-         '892701fea3cc09c4350f19ed5c9900ac'
-         '0a939cce9bbff751da5a1e006a26093f'
-         '1e3aeeb18c2958d81ee6eb4801aa9faa'
-         'cb29c96ac0dd5ece19e78653e74da48a'
-         '9517325ea18e01007787b5e3210c776c'
-         'c61320979392169249da20a48f81d2a8'
-         'a2765b25542e7e4d43279f098ea97e72'
-         'cc42c2b4151c5c41543507d5a4eb699d'
-         '195bb042493f8dc4bda09a66c8a2f49e'
-         'fe36d87eb352e46459b3c2cc01c4dc2f'
-         '2b73195d3c12fb8ebfd39f30267d3e64')
-
-build() {
-  cd ${startdir}/src
-  for lang in $(echo "${_languages}" | sed 's|,| |g'); do
-    unzip -o ${lang}.xpi
-    sed -i "s|jar:chrome/${lang}.jar|jar:${lang}.jar|" chrome.manifest || return 1
-    install -D -m 644 chrome/${lang}.jar ${pkgdir}/usr/lib/firefox-3.0/chrome/${lang}.jar || return 1
-    install -D -m 644 chrome.manifest ${pkgdir}/usr/lib/firefox-3.0/chrome/${lang}.manifest || return 1
-  done
-}
diff --git a/abs/extra-testing/community/firefox/PKGBUILD b/abs/extra-testing/community/firefox/PKGBUILD
deleted file mode 100644
index 17a70b3..0000000
--- a/abs/extra-testing/community/firefox/PKGBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# $Id: PKGBUILD 46468 2009-07-18 13:24:45Z jgc $
-# Contributor: Jakub Schmidtke <sjakub@gmail.com>
-
-pkgname=firefox
-pkgver=3.5.1
-pkgrel=4
-_xulver=1.9.1.1
-pkgdesc="Standalone web browser from mozilla.org"
-arch=(i686 x86_64)
-license=('MPL' 'GPL' 'LGPL')
-depends=("xulrunner>=${_xulver}" 'desktop-file-utils' "nspr>=4.8" gconf)
-makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui>=2.24.1' 'python')
-replaces=('firefox3')
-install=firefox.install
-url="http://www.mozilla.org/projects/firefox"
-source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}/source/firefox-${pkgver}-source.tar.bz2
-        mozconfig
-        firefox.desktop
-        firefox-safe.desktop
-        mozilla-firefox-1.0-lang.patch
-        browser-defaulturls.patch
-        firefox-version.patch
-	browser-app-makefile.patch
-	http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz)
-md5sums=('18169e189785d680827d4fce94524449'
-         '3c928b11918d22377eba01de34debc19'
-         '68cf02788491c6e846729b2f2913bf79'
-         '5e68cabfcf3c021806b326f664ac505e'
-         'bd5db57c23c72a02a489592644f18995'
-         '346d74ec560e7bbf453c02ff21f4b868'
-         '1dd9a10df0b9e4cf332eadc326d78e07'
-         '165c43a5b03a0bf7ad2e7210b0d8c82c'
-         '6306980e40a3266b4b6c173bfcfdc946')
-
-build() {
-  cd "${srcdir}/mozilla-1.9.1"
-  patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" || return 1
-  patch -Np0 -i "${srcdir}/browser-defaulturls.patch" || return 1
-  patch -Np1 -i "${srcdir}/firefox-version.patch" || return 1
-
-  cp "${srcdir}/mozconfig" .mozconfig
-  unset CFLAGS
-  unset CXXFLAGS
-
-  export LDFLAGS="-Wl,-rpath,/usr/lib/firefox-3.5"
-
-  make -j1 -f client.mk configure MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1
-  cd browser/app
-  patch -p2 < "${srcdir}/browser-app-makefile.patch" || return 1
-  cd ../..
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1
-  make -j1 DESTDIR="${pkgdir}" install || return 1
-
-  rm -f ${pkgdir}/usr/lib/firefox-3.5/libjemalloc.so
-
-  install -m755 -d ${pkgdir}/usr/share/applications
-  install -m755 -d ${pkgdir}/usr/share/pixmaps
-  install -m644 ${srcdir}/mozilla-1.9.1/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/firefox.png || return 1
-  install -m644 ${srcdir}/firefox.desktop ${pkgdir}/usr/share/applications/ || return 1
-  install -m644 ${srcdir}/firefox-safe.desktop ${pkgdir}/usr/share/applications/ || return 1
-
-  # Install the flash player plugin.
-
-  mkdir -p ${pkgdir}/usr/lib/firefox-3.5/plugins
-  install -m755 ${srcdir}/libflashplayer.so ${pkgdir}/usr/lib/firefox-3.5/plugins || return 1
-
-  # This is to stop firefox from crashing when the flashplayer (youtube) is 
-  # set to full screen. To test if it is still necessary with updates to 
-  # this package, run /usr/bin/firefox.bin without setting the LD_PRELOAD var.
-
-  mv ${pkgdir}/usr/bin/firefox ${pkgdir}/usr/bin/firefox.bin
-  echo "#!/bin/bash
-/usr/lib/GConf/gconfd-2 &
-export LD_PRELOAD=/usr/lib/libGL.so.1
-/usr/bin/firefox.bin" > ${pkgdir}/usr/bin/firefox
-  chmod 755 ${pkgdir}/usr/bin/firefox
-}
diff --git a/abs/extra-testing/community/firefox/browser-app-makefile.patch b/abs/extra-testing/community/firefox/browser-app-makefile.patch
deleted file mode 100644
index 9a02c40..0000000
--- a/abs/extra-testing/community/firefox/browser-app-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- browser/app/Makefile	2009-07-27 22:41:13.000000000 +0930
-+++ browser-new/app/Makefile	2009-07-27 22:42:51.000000000 +0930
-@@ -279,7 +279,7 @@
- 
- ifneq (,$(filter-out OS2 WINNT WINCE,$(OS_ARCH)))
- 
--$(MOZ_APP_NAME):: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
-+$(MOZ_APP_NAME): $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
- 	cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
- 		-e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" > $@
- 	chmod +x $@
diff --git a/abs/extra-testing/community/firefox/browser-defaulturls.patch b/abs/extra-testing/community/firefox/browser-defaulturls.patch
deleted file mode 100644
index 42a2e1d..0000000
--- a/abs/extra-testing/community/firefox/browser-defaulturls.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- browser/branding/unofficial/locales/browserconfig.properties~	2009-06-13 17:04:42.000000000 +0200
-+++ browser/branding/unofficial/locales/browserconfig.properties	2009-06-13 17:05:28.000000000 +0200
-@@ -1,3 +1,3 @@
- # Do NOT localize or otherwise change these values
--browser.startup.homepage=http://www.mozilla.org/projects/shiretoko/
-+browser.startup.homepage=http://www.google.com/firefox
- 
---- browser/branding/unofficial/pref/firefox-branding.js~	2009-06-13 16:57:53.000000000 +0200
-+++ browser/branding/unofficial/pref/firefox-branding.js	2009-06-13 16:59:17.000000000 +0200
-@@ -1,5 +1,5 @@
--pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/");
--pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
-+pref("startup.homepage_override_url","http://www.mozilla.com/%APP%/%VERSION%/whatsnew/");
-+pref("startup.homepage_welcome_url","http://www.mozilla.com/%APP%/%VERSION%/firstrun/");
- // The time interval between checks for a new version (in seconds)
- // nightly=8 hours, official=24 hours
- pref("app.update.interval", 28800);
-@@ -11,7 +11,7 @@
- pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
- 
- // Release notes URL
--pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
-+pref("app.releaseNotesURL", "http://www.mozilla.com/%APP%/%VERSION%/releasenotes/");
- 
- // Search codes belong only in builds with official branding
- pref("browser.search.param.yahoo-fr", "");
diff --git a/abs/extra-testing/community/firefox/firefox-safe.desktop b/abs/extra-testing/community/firefox/firefox-safe.desktop
deleted file mode 100644
index afb4cdb..0000000
--- a/abs/extra-testing/community/firefox/firefox-safe.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=firefox -safe-mode %u
-Icon=firefox
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=Firefox - Safe Mode
-GenericName=Web Browser - Safe Mode
-StartupNotify=false
-Categories=Application;Network;
diff --git a/abs/extra-testing/community/firefox/firefox-version.patch b/abs/extra-testing/community/firefox/firefox-version.patch
deleted file mode 100644
index b0a4552..0000000
--- a/abs/extra-testing/community/firefox/firefox-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-1.9.1/browser/installer/Makefile.in.ver	2009-07-18 13:32:35.000000000 +0200
-+++ mozilla-1.9.1/browser/installer/Makefile.in	2009-07-18 13:33:12.000000000 +0200
-@@ -43,6 +43,8 @@
- 
- include $(DEPTH)/config/autoconf.mk
- 
-+MOZ_APP_VERSION="3.5"
-+
- NO_PKG_FILES = \
- 	$(MOZ_APP_NAME)-config \
- 	$(MOZ_APP_NAME)-bin.elf \
diff --git a/abs/extra-testing/community/firefox/firefox.desktop b/abs/extra-testing/community/firefox/firefox.desktop
deleted file mode 100644
index 2a4b678..0000000
--- a/abs/extra-testing/community/firefox/firefox.desktop
+++ /dev/null
@@ -1,83 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=firefox %u
-Icon=firefox
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=Firefox
-Name[bn]=ফায়ারফক�স3
-Name[eo]=Fajrovulpo3
-Name[fi]=Firefox3
-Name[pa]=ਫਾਇਰਫੋਕਸ3
-Name[tg]=Рӯбоҳи оташин3
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متص�ح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব�রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlíže�
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Πε�ιηγητής Ιστο�
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן �ינטרנט
-GenericName[hi]=वेब ब�राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브�우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web P�rlūks
-GenericName[mk]=Прели�тувач на Интернет 
-GenericName[mn]=Веб-Хөтөч
-GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ �ਲਕਾਰਾ
-GenericName[pl]=PrzeglÄ…darka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliada�
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživa�
-GenericName[ss]=Ibrawuza yeWeb 
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Таф�иргари в�б
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=�авігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[zh_CN]=网页�览器
-GenericName[zh_TW]=網��覽器
-GenericName[zu]=Umcingi we-Web
-MimeType=text/html
-StartupNotify=true
-Categories=Application;Network;
diff --git a/abs/extra-testing/community/firefox/firefox.install b/abs/extra-testing/community/firefox/firefox.install
deleted file mode 100644
index cd50dec..0000000
--- a/abs/extra-testing/community/firefox/firefox.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-  update-desktop-database -q
-
-  # For LinHES: check for a fluxbox keys file that doesnt have a mapping
-  # for Alt-w and map it to firefox.
-
-  if [ -e /home/mythtv/.fluxbox/keys ] 
-  then
-    if ! grep -q "Mod1 w" /home/mythtv/.fluxbox/keys 
-    then
-      echo Adding fluxbox key for firefox.
-      echo "Mod1 w :ExecCommand firefox" >> /home/mythtv/.fluxbox/keys
-    fi
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-}
-
diff --git a/abs/extra-testing/community/firefox/mozconfig b/abs/extra-testing/community/firefox/mozconfig
deleted file mode 100644
index 030317d..0000000
--- a/abs/extra-testing/community/firefox/mozconfig
+++ /dev/null
@@ -1,35 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-png
-ac_add_options --with-pthreads
-ac_add_options --disable-tests
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --disable-installer
-ac_add_options --enable-xinerama
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --disable-xprint
-ac_add_options --enable-strip
-ac_add_options --enable-pango
-ac_add_options --enable-system-cairo
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --enable-startup-notification
-ac_add_options --enable-libxul
-ac_add_options --disable-crashreporter
-ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9.1.1
-ac_add_options --enable-safe-browsing
-ac_add_options --with-branding=browser/branding/unofficial
-
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-export USE_SHORT_LIBNAME=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options USE_SHORT_LIBNAME=1
diff --git a/abs/extra-testing/community/firefox/mozilla-firefox-1.0-lang.patch b/abs/extra-testing/community/firefox/mozilla-firefox-1.0-lang.patch
deleted file mode 100644
index f0f7325..0000000
--- a/abs/extra-testing/community/firefox/mozilla-firefox-1.0-lang.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla/browser/app/profile/firefox.js.lang	2005-01-13 15:32:03.509282726 +0100
-+++ mozilla/browser/app/profile/firefox.js	2005-01-13 15:33:40.220914789 +0100
-@@ -253,6 +253,9 @@
- pref("font.language.group", "chrome://global/locale/intl.properties");
- pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
- 
-+// Use LANG environment variable to choose locale
-+pref("intl.locale.matchOS", true);
-+
- // 0=lines, 1=pages, 2=history , 3=text size
- pref("mousewheel.withcontrolkey.action",3);
- pref("mousewheel.withshiftkey.action",2);
diff --git a/abs/extra-testing/community/flashplugin-prerelease/PKGBUILD b/abs/extra-testing/community/flashplugin-prerelease/PKGBUILD
deleted file mode 100644
index d6eca0b..0000000
--- a/abs/extra-testing/community/flashplugin-prerelease/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor : Anish Bhatt <anish[removethis][at]gatech[dot]edu>
-
-pkgname=flashplugin-prerelease
-_licensefile='Reader_Player_AIR_WWEULA-Combined-20080204_1313.pdf'
-pkgver=10.1.51.66
-pkgrel=1
-source=('http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_1_p2_linux_121709.tar.gz'
-	"http://www.adobe.com/products/eulas/pdfs/${_licensefile}")
-md5sums=('4f56f8235cb72a59d04d64ca4bd442b3'
-	'1636037610ee2aa35c5fb736a697b7e0')
-
-pkgdesc='Adobe Flash Player Prerelease'
-url='http://labs.adobe.com/technologies/flashplayer10/'
-arch=('i686')
-depends=('mozilla-common' 'libxt' 'gtk2' 'nss' 'curl')
-conflicts=('flashplugin')
-provides=('flashplayer')
-license=('custom')
-
-build() {
-  install -d -m755 ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
-  if [ "${CARCH}" = 'i686' ]; then
-    install -m755 ${srcdir}/install_flash_player_10_linux/libflashplayer.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
-  fi
-  install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
-  install -m644 "${_licensefile}" ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
-}
-
diff --git a/abs/extra-testing/community/flashplugin/PKGBUILD b/abs/extra-testing/community/flashplugin/PKGBUILD
deleted file mode 100644
index 7d7e65f..0000000
--- a/abs/extra-testing/community/flashplugin/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 60911 2009-12-09 11:51:09Z andrea $
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=flashplugin
-_licensefile='Reader_Player_AIR_WWEULA-Combined-20080204_1313.pdf'
-pkgver=10.1.53.64
-pkgrel=1
-pkgdesc='Adobe Flash Player'
-url='http://get.adobe.com/flashplayer'
-arch=('i686' 'x86_64')
-depends=('mozilla-common' 'libxt' 'gtk2' 'nss' 'curl')
-replaces=('flashplugin-beta')
-provides=('flashplayer')
-license=('custom')
-source=('http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz'
-        "http://www.adobe.com/products/eulas/pdfs/${_licensefile}")
-[ "${CARCH}" = "x86_64" ] && source[0]="http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-${pkgver}.linux-${CARCH}.so.tar.gz"
-[ "${CARCH}" = "x86_64" ] && md5sums[0]='8b427c2991c0447af56a951c653ee383'
-
-build() {
-  install -d -m755 ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
-  install -m755 ${srcdir}/libflashplayer.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
-  install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
-  install -m644 "${_licensefile}" ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.pdf || return 1
-}
-md5sums=('e4cb4d26124605a54c3d498cc440368f'
-         '1636037610ee2aa35c5fb736a697b7e0')
diff --git a/abs/extra-testing/community/fluidsynth/PKGBUILD b/abs/extra-testing/community/fluidsynth/PKGBUILD
deleted file mode 100644
index f3606cb..0000000
--- a/abs/extra-testing/community/fluidsynth/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: damir <damir@archlinux.org>
-
-pkgname=fluidsynth
-pkgver=1.0.8
-origver=1.0.8
-pkgrel=1
-pkgdesc="FluidSynth is a real-time software synthesizer based on the SoundFont 2 specifications."
-arch=("i686" "x86_64")
-url="http://www.fluidsynth.org/"
-depends=('jack-audio-connection-kit' 'ladspa')
-options=('!libtool')
-license=('LGPL')
-source=("http://savannah.nongnu.org/download/fluid/$pkgname-$pkgver.tar.gz")
-md5sums=('e2abfd2e69fd8b28d965df968d7d44ee')
-
-
-build() {
-  cd $startdir/src/$pkgname-$origver
-  ./configure --prefix=/usr \
-              --enable-ladspa
-  make || return 1
-  make prefix=$startdir/pkg/usr install
-}
-
diff --git a/abs/extra-testing/community/fluxconf/PKGBUILD b/abs/extra-testing/community/fluxconf/PKGBUILD
deleted file mode 100644
index 9d9220f..0000000
--- a/abs/extra-testing/community/fluxconf/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Jochem Kossen <j.kossen@home.nl>
-
-pkgname=fluxconf
-pkgver=0.9.9
-pkgrel=1
-pkgdesc="Configuration utility for the Fluxbox windowmanager"
-arch=(i686 x86_64)
-depends=('gtk2')
-source=(http://devaux.fabien.free.fr/flux/$pkgname-$pkgver.tar.gz)
-url="http://devaux.fabien.free.fr/flux/"
-md5sums=('ac37b12410daa06128f8eb29163a741d')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  /usr/bin/make || return 1
-  /usr/bin/make prefix=$startdir/pkg/usr install
-  cd $startdir/pkg/usr/bin
-  /bin/ln -sf $pkgname fluxbare
-  /bin/ln -sf $pkgname fluxkeys
-  /bin/ln -sf $pkgname fluxmenu
-}
diff --git a/abs/extra-testing/community/foldingathome/PKGBUILD b/abs/extra-testing/community/foldingathome/PKGBUILD
deleted file mode 100644
index 6f00936..0000000
--- a/abs/extra-testing/community/foldingathome/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Jason Taylor <jftaylor21@gmail.com>
-# Contributor: seratne
-# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
-
-pkgname=foldingathome
-pkgver=6.02
-pkgrel=7
-pkgdesc="Folding@Home is a distributed computing project which studies protein folding, misfolding, aggregation, and related diseases."
-arch=('i686')
-url="http://folding.stanford.edu/"
-license=('custom')
-depends=('bash')
-backup=('etc/conf.d/foldingathome')
-install=foldingathome.install
-source=(http://www.stanford.edu/group/pandegroup/folding/release/FAH$pkgver-Linux.tgz
-	run)
-
-build() {
-  cd $startdir/src/
-
-  tar zxf FAH${pkgver}-Linux.tgz
-
-  # At this stage, the mpiexec is not included because it requires x86_64.
-  install -D -c -m755 fah6 $startdir/pkg/usr/bin/fah6 || return 1
-  install -D -m755 run $startdir/pkg/etc/sv/fah/run
-}
-md5sums=('112b3d66909050f1bb990993a1464cb9'
-         'cefaf5ba2f3e2fe81533b5ee4795dc78')
diff --git a/abs/extra-testing/community/foldingathome/foldingathome.install b/abs/extra-testing/community/foldingathome/foldingathome.install
deleted file mode 100644
index 20e48d1..0000000
--- a/abs/extra-testing/community/foldingathome/foldingathome.install
+++ /dev/null
@@ -1,47 +0,0 @@
-post_install() {
-  # Check for an R5.5 fah installation.
-  r5_fah_dir=/myth/folding@home
-  r6_fah_dir=/myth/foldingathome/$(hostname)
-  if [ -d "$r5_fah_dir" ] ; then
-    if [ -d "$r6_fah_dir" ] ; then
-      cat << 'EOM'
-  --> You have an R5.5 and an R6 folding directory at the same time!
-  --> you should manually delete the R5.5 directory:
-  -->    $r5_fah_dir
-  --> The directroy used on R6 will be:
-  -->    $r6_fah_dir
-EOM
-    else
-      mkdir -p /myth/foldingathome
-      mv $r5_fah_dir $r6_fah_dir
-    fi
-  else
-    if [ ! -d "$r6_fah_dir" ] ; then
-      mkdir -p $r6_fah_dir
-      cat > $r6_fah_dir/client.cfg << 'EOM'
-[settings]
-username=LinHES
-team=50975
-passkey=
-asknet=no
-bigpackets=normal
-machineid=1
-
-[http]
-active=no
-host=localhost
-port=8080
-EOM
-    fi
-  fi
-  rm -fr $r6_fah_dir/index.html
-  ln -s $r6_fah_dir/MyFolding.html $r6_fah_dir/index.html
-  ln -s $r6_fah_dir /data/srv/httpd/htdocs/foldingathome
-  /sbin/add_service.sh fah
-}
-
-pre_remove() {
-  sv stop fah
-  /sbin/remove_service.sh fah
-}
-
diff --git a/abs/extra-testing/community/foldingathome/run b/abs/extra-testing/community/foldingathome/run
deleted file mode 100644
index cd4a072..0000000
--- a/abs/extra-testing/community/foldingathome/run
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting folding@home"
-
-FOLDING_DIR=/myth/foldingathome/$(hostname)
-
-if [ -d $FOLDING_DIR ] ; then
-  cd $FOLDING_DIR
-  # Ensure that the client configuration file has the same details as /etc/systemconfig
-
-  source /etc/systemconfig
-
-  if [ -n "$foldingusername" ] ; then
-    sed -i 's/username=.*$/username='$foldingusername'/g' $FOLDING_DIR/client.cfg
-  fi
-
-  if [ -n "$foldingworksize" ] ; then
-    sed -i 's/bigpackets=.*$/bigpackets='$foldingworksize'/g' $FOLDING_DIR/client.cfg
-  fi
-
-  # No need to direct output to a log file becase a log file
-  # will automatically be placed in $FOLDING_DIR
-  exec /usr/bin/fah6 &> /dev/null < /dev/null
-fi
diff --git a/abs/extra-testing/community/fuzemux/PKGBUILD b/abs/extra-testing/community/fuzemux/PKGBUILD
deleted file mode 100644
index 5cce2d0..0000000
--- a/abs/extra-testing/community/fuzemux/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: Michael Hanson <hansonorders@verizon.net>
-# Maintainer: Michael Hanson <hansonorders@verizon.net>
-pkgname=fuzemux-svn
-pkgver=11
-pkgrel=1
-pkgdesc="A tool to remux AVI video files for the San Disk Sansa Fuze portable media player"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/fuzemux"
-license=('GPL3')
-#depends=()
-makedepends=('subversion' 'autoconf')
-provides=('fuzemux')
-install=('fuzemux-svn.install')
-
-_svntrunk=http://fuzemux.googlecode.com/svn/trunk/
-_svnmod=fuzemux
-
-build() {
-  cd "$srcdir"
-
-  if [ -d $_svnmod/.svn ]; then
-    (cd $_svnmod && svn up -r $pkgver)
-  else
-    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-  fi
-
-  msg "SVN checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "$srcdir/$_svnmod-build"
-  cp -r "$srcdir/$_svnmod" "$srcdir/$_svnmod-build"
-  cd "$srcdir/$_svnmod-build"
-
-  #
-  # BUILD
-  #
-  /usr/bin/autoreconf --install
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install
-}
-md5sums=()
diff --git a/abs/extra-testing/community/fuzemux/fuzemux-svn.install b/abs/extra-testing/community/fuzemux/fuzemux-svn.install
deleted file mode 100644
index 877ec1b..0000000
--- a/abs/extra-testing/community/fuzemux/fuzemux-svn.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_install() {
-	echo ">>>"
-	echo ">>> A user job script is supplied at /usr/LH/bin/myth2fuze"
-	echo ">>>"
-}
diff --git a/abs/extra-testing/community/gnash-common/PKGBUILD b/abs/extra-testing/community/gnash-common/PKGBUILD
deleted file mode 100644
index 107afb8..0000000
--- a/abs/extra-testing/community/gnash-common/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 17544 2008-10-30 22:40:52Z pierre $
-
-pkgname=gnash-common
-pkgver=0.8.4
-pkgrel=1
-pkgdesc='A GNU Flash movie player'
-arch=('i686' 'x86_64')
-url='http://www.gnu.org/software/gnash/'
-license=('GPL3')
-depends=('curl' 'giflib' 'boost' 'libldap' 'gstreamer0.10-base' 'sdl' 'libgl'
-         'libjpeg' 'libpng' 'mesa')
-makedepends=('pkgconfig')
-source=("http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2")
-options=('!libtool' '!emptydirs' '!docs')
-provides=('gnash')
-replaces=('gnash')
-md5sums=('b47a7ed4b7c66b8c2ebacc2286ef0d4b')
-
-build() {
-	cd $srcdir/gnash-$pkgver
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-plugins \
-		--disable-menus \
-		--enable-gui=sdl \
-		--enable-renderer=ogl \
-		--enable-z \
-		--enable-jpeg \
-		--enable-libpng \
-		--enable-gif \
-		--enable-fontconfig \
-		--enable-Xft \
-		--enable-expat \
-		--enable-gstreamer \
-		--enable-media=gst || return 1
-
-	make || return 1
-	make DESTDIR=$pkgdir install || return 1
-}
diff --git a/abs/extra-testing/community/gnash-gtk/PKGBUILD b/abs/extra-testing/community/gnash-gtk/PKGBUILD
deleted file mode 100644
index 45ba804..0000000
--- a/abs/extra-testing/community/gnash-gtk/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 17609 2008-10-31 06:16:21Z pierre $
-
-pkgname=gnash-gtk
-pkgver=0.8.4
-pkgrel=1
-pkgdesc='A GNU Flash movie player (gtk)'
-arch=('i686' 'x86_64')
-url='http://www.gnu.org/software/gnash/'
-license=("GPL3")
-depends=("gnash-common=$pkgver" 'gtk2' 'gtkglext')
-makedepends=('pkgconfig')
-source=("http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2")
-options=('!libtool' '!emptydirs' '!docs')
-md5sums=('b47a7ed4b7c66b8c2ebacc2286ef0d4b')
-
-build() {
-	cd $srcdir/gnash-$pkgver
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--enable-gui=gtk \
-		--with-plugins-install=system \
-		--with-npapi-plugindir=/usr/lib/mozilla/plugins \
-		--enable-renderer=ogl \
-		--enable-z \
-		--enable-jpeg \
-		--enable-libpng \
-		--enable-gif \
-		--enable-fontconfig \
-		--enable-Xft \
-		--enable-expat \
-		--enable-gstreamer \
-		--enable-media=gst || return 1
-
-	make || return 1
-	make DESTDIR=$pkgdir install install-plugin || return 1
-	rm -rf $pkgdir/usr/{lib/gnash,share}
-	rm -f $pkgdir/usr/bin/{gnash,gprocessor,dumpshm,soldumper,flvdumper}
-	rm -rf $pkgdir/etc
-}
diff --git a/abs/extra-testing/community/gstreamer0.10-base-plugins/PKGBUILD b/abs/extra-testing/community/gstreamer0.10-base-plugins/PKGBUILD
deleted file mode 100644
index 5678e9d..0000000
--- a/abs/extra-testing/community/gstreamer0.10-base-plugins/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 14436 2008-10-06 17:41:07Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gstreamer0.10-base-plugins
-pkgver=0.10.21
-pkgrel=1
-pkgdesc="GStreamer Multimedia Framework Base Plugins (gst-plugins-base)"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gstreamer0.10-base>=0.10.21' 'gnome-vfs>=2.24.0' 'alsa-lib>=1.0.17a' 'cdparanoia>=10.2' 'libvisual' 'libvorbis>=1.2.0' 'libtheora')
-makedepends=('pkgconfig')
-replaces=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-gnomevfs' 'gstreamer0.10-ogg')
-conflicts=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-gnomevfs' 'gstreamer0.10-ogg')
-provides=("gstreamer0.10-alsa=${pkgver}" "gstreamer0.10-theora=${pkgver}" "gstreamer0.10-libvisual=${pkgver}" "gstreamer0.10-pango=${pkgver}" "gstreamer0.10-cdparanoia=${pkgver}" "gstreamer0.10-vorbis=${pkgver}" "gstreamer0.10-gnomevfs=${pkgver}" "gstreamer0.10-ogg=${pkgver}" "gst-plugins-base=${pkgver}")
-options=(!libtool)
-url="http://gstreamer.freedesktop.org/"
-groups=('gstreamer0.10-plugins')
-_relname=gst-plugins-base
-source=(${url}/src/${_relname}/${_relname}-${pkgver}.tar.bz2)
-md5sums=('0e0cd485311502ad1c0c028148e3186a')
-
-build() {
-  cd "${srcdir}/${_relname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --disable-docs-build --disable-plugin-docs \
-    --with-package-name="GStreamer Base Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/" || return 1
-
-  make || return 1
-  cd ext || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra-testing/community/gstreamer0.10-base/PKGBUILD b/abs/extra-testing/community/gstreamer0.10-base/PKGBUILD
deleted file mode 100644
index b1b065d..0000000
--- a/abs/extra-testing/community/gstreamer0.10-base/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 14433 2008-10-06 17:33:22Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gstreamer0.10-base
-pkgver=0.10.21
-pkgrel=1
-pkgdesc="GStreamer Multimedia Framework Base plugin libraries"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gstreamer0.10>=0.10.21' 'liboil>=0.3.15' 'libsm' 'libxv')
-makedepends=('pkgconfig')
-options=(!libtool)
-url="http://gstreamer.freedesktop.org/"
-_relname=gst-plugins-base
-source=(${url}/src/${_relname}/${_relname}-${pkgver}.tar.bz2)
-md5sums=('0e0cd485311502ad1c0c028148e3186a')
-
-build() {
-  cd ${startdir}/src/${_relname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental --disable-external \
-    --disable-docs-build --disable-plugin-docs \
-    --with-package-name="GStreamer Base Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/" || return 1
-
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-}
diff --git a/abs/extra-testing/community/gstreamer0.10/PKGBUILD b/abs/extra-testing/community/gstreamer0.10/PKGBUILD
deleted file mode 100644
index 52934e2..0000000
--- a/abs/extra-testing/community/gstreamer0.10/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 18833 2008-11-09 14:51:01Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gstreamer0.10
-pkgver=0.10.21
-pkgrel=2
-pkgdesc="GStreamer Multimedia Framework"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://gstreamer.freedesktop.org/"
-depends=('libxml2>=2.6.32' 'glib2>=2.18.1')
-makedepends=('perlxml' 'pkgconfig' 'gtk-doc')
-options=('!libtool')
-source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.bz2
-	bgo555631.patch)
-md5sums=('7bad90af3fd81a1535363cf85359125c'
-         '71eb301845184638e6556dacd1ca7d55')
-
-build() {
-  cd "${srcdir}/gstreamer-${pkgver}"
-  patch -Np0 -i "${srcdir}/bgo555631.patch" || return 1
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc --localstatedir=/var \
-	--disable-docs-build || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  cd "${pkgdir}/usr/bin"
-
-  #Remove unversioned gst-* binaries to get rid of conflicts
-  for bins in `ls *-0.10`; do
-    rm -f ${bins/-0.10/}
-  done
-}
diff --git a/abs/extra-testing/community/gstreamer0.10/bgo555631.patch b/abs/extra-testing/community/gstreamer0.10/bgo555631.patch
deleted file mode 100644
index b9a18f4..0000000
--- a/abs/extra-testing/community/gstreamer0.10/bgo555631.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- libs/gst/base/gstbasetransform.c	2008/10/20 13:29:06	1.126
-+++ libs/gst/base/gstbasetransform.c	2008/10/21 16:30:41	1.127
-@@ -251,7 +251,7 @@
-   /* upstream caps and size suggestions */
-   GstCaps *sink_suggest;
-   guint size_suggest;
--  gint suggest_pending;
-+  gboolean suggest_pending;
- 
-   gboolean reconfigure;
- };
-@@ -1224,7 +1224,7 @@
-             gst_caps_unref (priv->sink_suggest);
-           priv->sink_suggest = gst_caps_ref (othercaps);
-           priv->size_suggest = size_suggest;
--          g_atomic_int_set (&trans->priv->suggest_pending, 1);
-+          trans->priv->suggest_pending = TRUE;
-           GST_OBJECT_UNLOCK (trans->sinkpad);
-         }
-         gst_caps_unref (othercaps);
-@@ -1366,7 +1366,7 @@
-   GstBaseTransform *trans;
-   GstBaseTransformPrivate *priv;
-   GstFlowReturn res;
--  gboolean proxy, suggest;
-+  gboolean proxy, suggest, same_caps;
-   GstCaps *sink_suggest;
-   guint size_suggest;
- 
-@@ -1384,8 +1384,12 @@
- 
-   /* we remember our previous alloc request to quickly see if we can proxy or
-    * not. We skip this check if we have a pending suggestion. */
--  if (g_atomic_int_get (&priv->suggest_pending) == 0 && caps &&
--      gst_caps_is_equal (priv->sink_alloc, caps)) {
-+  GST_OBJECT_LOCK (pad);
-+  same_caps = !priv->suggest_pending && caps &&
-+      gst_caps_is_equal (priv->sink_alloc, caps);
-+  GST_OBJECT_UNLOCK (pad);
-+
-+  if (same_caps) {
-     /* we have seen this before, see below if we need to proxy */
-     GST_DEBUG_OBJECT (trans, "have old caps");
-     sink_suggest = caps;
-@@ -1414,7 +1418,7 @@
-       size_suggest = size;
-       suggest = FALSE;
-     }
--    g_atomic_int_set (&priv->suggest_pending, 0);
-+    priv->suggest_pending = FALSE;
-     GST_OBJECT_UNLOCK (pad);
- 
-     /* check if we actually handle this format on the sinkpad */
-@@ -1462,7 +1466,10 @@
-     }
-   }
-   /* remember the new caps */
-+  GST_OBJECT_LOCK (pad);
-   gst_caps_replace (&priv->sink_alloc, sink_suggest);
-+  GST_OBJECT_UNLOCK (pad);
-+
-   proxy = priv->proxy_alloc;
-   GST_DEBUG_OBJECT (trans, "doing default alloc, proxy %d", proxy);
- 
-@@ -1487,11 +1494,13 @@
-     if (!gst_caps_is_equal (newcaps, caps)) {
-       GST_DEBUG_OBJECT (trans, "caps are new");
-       /* we have new caps, see if we can proxy downstream */
--      if (gst_pad_peer_accept_caps (trans->sinkpad, newcaps)) {
-+      if (gst_pad_peer_accept_caps (pad, newcaps)) {
-         /* peer accepts the caps, return a buffer in this format */
-         GST_DEBUG_OBJECT (trans, "peer accepted new caps");
-         /* remember the format */
-+        GST_OBJECT_LOCK (pad);
-         gst_caps_replace (&priv->sink_alloc, newcaps);
-+        GST_OBJECT_UNLOCK (pad);
-       } else {
-         GST_DEBUG_OBJECT (trans, "peer did not accept new caps");
-         /* peer does not accept the caps, free the buffer we received and
-@@ -2306,7 +2315,7 @@
-     caps = gst_caps_copy (caps);
-   trans->priv->sink_suggest = caps;
-   trans->priv->size_suggest = size;
--  g_atomic_int_set (&trans->priv->suggest_pending, 1);
-+  trans->priv->suggest_pending = TRUE;
-   GST_DEBUG_OBJECT (trans, "new suggest %" GST_PTR_FORMAT, caps);
-   GST_OBJECT_UNLOCK (trans->sinkpad);
- }
diff --git a/abs/extra-testing/community/gtkglext/PKGBUILD b/abs/extra-testing/community/gtkglext/PKGBUILD
deleted file mode 100644
index a310af6..0000000
--- a/abs/extra-testing/community/gtkglext/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 9958 2008-08-21 02:56:50Z eric $
-# Maintainer: damir <damir@archlinux.org>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=gtkglext
-pkgver=1.2.0
-pkgrel=1
-pkgdesc="opengl extensions for gtk2"
-arch=('i686' 'x86_64')
-url="http://gtkglext.sourceforge.net/"
-depends=('gtk2' 'pango')
-makedepends=('gcc>=4.0.3')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/gtkglext/$pkgname-$pkgver.tar.bz2") # $pkgname-$pkgver-pangox.patch)
-md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  # fix "undefined reference to `pango_x_font*" trouble
-  #cat $startdir/src/$pkgname-$pkgver-pangox.patch | patch -p1 || return 1
-  autoconf --force
-  ./configure --prefix=/usr
-  make || return 1
-  make prefix=$startdir/pkg/usr install
-}
diff --git a/abs/extra-testing/community/gtkglext/gtkglext-1.0.6-pangox.patch b/abs/extra-testing/community/gtkglext/gtkglext-1.0.6-pangox.patch
deleted file mode 100644
index 8cd589e..0000000
--- a/abs/extra-testing/community/gtkglext/gtkglext-1.0.6-pangox.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- gtkglext-1.0.6/configure.in	2005-09-10 16:45:06.000000000 +0200
-+++ gtkglext-1.0.6.az/configure.in	2005-09-10 16:46:01.000000000 +0200
-@@ -59,6 +59,10 @@
- m4_define([pango_pkg], [pango])
- m4_define([pango_required_version], [1.0.0])
- 
-+# Pangox
-+m4_define([pangox_pkg], [pangox])
-+m4_define([pangox_required_version], [1.0.0])
-+
- # PangoFT2
- m4_define([pangoft2_pkg], [pangoft2])
- m4_define([pangoft2_required_version], [1.0.0])
-@@ -345,6 +349,7 @@
- gtk_pkg >= gtk_required_version \
- gdk_pkg >= gdk_required_version \
- pango_pkg >= pango_required_version \
-+pangox_pkg >= pango_required_version \
- gmodule_pkg >= gmodule_required_version \
- ])
- 
-@@ -789,7 +794,7 @@
- # CFLAGS and LIBS
- ##################################################
- 
--GDKGLEXT_PACKAGES="gdk_pkg pango_pkg gmodule_pkg"
-+GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg"
- GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
- GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
- GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
diff --git a/abs/extra-testing/community/ircii/PKGBUILD b/abs/extra-testing/community/ircii/PKGBUILD
deleted file mode 100644
index 2eb8ad6..0000000
--- a/abs/extra-testing/community/ircii/PKGBUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-# Contributor: Mateusz Herych <heniekk@gmail.com>
-pkgname=ircii
-pkgver=20060725
-pkgrel=1
-pkgdesc="IRC Client"
-arch=('i686')
-url="http://www.eterna.com.au/ircii/"
-license=('BSD')
-source=(ftp://ircii.warped.com/pub/ircII/ircii-$pkgver.tar.bz2)
-md5sums=('280ae54367627591c1c43c765eb9d59b')
-build() {
-	cd $startdir/src/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make install DESTDIR=$startdir/pkg || return 1
-}
diff --git a/abs/extra-testing/community/jdk/PKGBUILD b/abs/extra-testing/community/jdk/PKGBUILD
deleted file mode 100644
index 31924ce..0000000
--- a/abs/extra-testing/community/jdk/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
-# Previous Maintainer: Jason Chu <jason@archlinux.org>
-pkgname=jdk
-pkgver=6u12
-pkgrel=1
-pkgdesc="Sun's Java Development Kit"
-arch=(i686 x86_64)
-  [ "${CARCH}" = "i686" ]   && ARCH=i586
-  [ "${CARCH}" = "x86_64" ] && ARCH=amd64
-url="http://java.sun.com"
-depends=('glibc' 'jre')
-install="jdk.install"
-source=(http://download.java.net/dlj/binaries/jdk-${pkgver}-dlj-linux-${ARCH}.bin
-        https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh
-    	jdk.profile)
-[ "$CARCH" = "i686" ]   && md5sums=('560a51cfeecc4918d01ca29abc858d52'
-                                    '94065b612df0046d9ae758943f9f6a75'
-                                    '1e937a8bbca36330f730fc17663e3625')
-[ "$CARCH" = "x86_64" ] && md5sums=('0f687b6dbfe54e117bb0d9e090fda20b'
-                                    '94065b612df0046d9ae758943f9f6a75'
-                                    '1e937a8bbca36330f730fc17663e3625')
-replaces=('j2sdk')
-conflicts=('java-environment' 'j2sdk')
-provides=('java-environment' 'j2sdk')
-license=('custom')
-
-build() {
-  cd ${startdir}/src
-
-  mkdir unbundle-jdk
-  cd unbundle-jdk
-
-  sh ../jdk-${pkgver}-dlj-linux-${ARCH}.bin --accept-license
-
-  cd ..
-
-  sh construct.sh unbundle-jdk linux-jdk linux-jre
-
-  rm -rf linux-jdk/jre
-
-  mkdir -p ${startdir}/pkg/opt
-  mv linux-jdk ${startdir}/pkg/opt/java
-
-  install -D -m755 ${startdir}/src/${pkgname}.profile ${startdir}/pkg/etc/profile.d/${pkgname}.sh
-
-  mkdir -p $startdir/pkg/usr/share/licenses/jdk
-  cp $startdir/pkg/opt/java/COPYRIGHT $startdir/pkg/usr/share/licenses/jdk
-  cp $startdir/pkg/opt/java/LICENSE $startdir/pkg/usr/share/licenses/jdk
-  cp $startdir/pkg/opt/java/THIRDPARTYLICENSEREADME.txt $startdir/pkg/usr/share/licenses/jdk
-}
diff --git a/abs/extra-testing/community/jdk/jdk.install b/abs/extra-testing/community/jdk/jdk.install
deleted file mode 100644
index 6fb8be5..0000000
--- a/abs/extra-testing/community/jdk/jdk.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_upgrade() {
-	post_install $1
-}
-
-post_install() {
-   echo "The jdk package is licensed software."
-   echo "You MUST read and agree to the license stored in"
-   echo "/opt/java/LICENSE before using it."
-					
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/community/jdk/jdk.profile b/abs/extra-testing/community/jdk/jdk.profile
deleted file mode 100644
index b39d49c..0000000
--- a/abs/extra-testing/community/jdk/jdk.profile
+++ /dev/null
@@ -1,3 +0,0 @@
-export J2SDKDIR=/opt/java
-export PATH=$PATH:/opt/java/bin
-export JAVA_HOME=/opt/java
diff --git a/abs/extra-testing/community/libdvbpsi/PKGBUILD b/abs/extra-testing/community/libdvbpsi/PKGBUILD
deleted file mode 100644
index 5b261a2..0000000
--- a/abs/extra-testing/community/libdvbpsi/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 14016 2008-10-01 07:44:22Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
-
-pkgname=libdvbpsi
-pkgver=0.1.6
-pkgrel=3
-pkgdesc="MPEG TS and DVB PSI tables library (needed by vlc for streaming)"
-arch=('i686' 'x86_64')
-license=('GPL2')
-depends=('glibc')
-options=('!libtool')
-replaces=('libdvbpsi4' 'libdvbpsi5')
-conflicts=('libdvbpsi4' 'libdvbpsi5')
-url="http://developers.videolan.org/libdvbpsi/"
-source=(http://download.videolan.org/pub/libdvbpsi/0.1.6/libdvbpsi5-$pkgver.tar.bz2)
-md5sums=('bd2d9861be3311e1e03c91cd9345f542')
-
-build()
-{
-  cd $startdir/src/libdvbpsi5-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make prefix=$startdir/pkg/usr install
-}
diff --git a/abs/extra-testing/community/libelf/PKGBUILD b/abs/extra-testing/community/libelf/PKGBUILD
deleted file mode 100644
index 0cf517b..0000000
--- a/abs/extra-testing/community/libelf/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 20525 2008-12-05 13:31:11Z jgc $
-# Maintainer: arjan <arjan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=libelf
-pkgver=0.8.10
-pkgrel=3
-pkgdesc="libelf is a free ELF object file access library"
-arch=(i686 x86_64)
-license=('GPL')
-source=(http://www.mr511.de/software/${pkgname}-${pkgver}.tar.gz)
-url="http://directory.fsf.org/libs/misc/libelf.html"
-depends=('glibc')
-md5sums=('9db4d36c283d9790d8fa7df1f4d7b4d9')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure --prefix=/usr --enable-shared \
-      --enable-gnu-names --enable-compat || return 1
-    make || return 1
-    make prefix="${pkgdir}/usr" install || return 1
-}
diff --git a/abs/extra-testing/community/libmodplug/PKGBUILD b/abs/extra-testing/community/libmodplug/PKGBUILD
deleted file mode 100644
index 12c67db..0000000
--- a/abs/extra-testing/community/libmodplug/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net>
-
-pkgname=libmodplug
-pkgver=0.8.4
-pkgrel=1
-pkgdesc="A MOD playing library"
-arch=(i686 x86_64)
-url="http://modplug-xmms.sourceforge.net/"
-license=('GPL')
-depends=(gcc-libs)
-source=(http://downloads.sf.net/sourceforge/modplug-xmms/libmodplug-${pkgver}.tar.gz)
-md5sums=('091bd1168a524a4f36fc61f95209e7e4')
-options=('!libtool')
-
-build() {
-  cd ${startdir}/src/libmodplug-${pkgver}
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
-}
-
diff --git a/abs/extra-testing/community/libnetfilter_queue/PKGBUILD b/abs/extra-testing/community/libnetfilter_queue/PKGBUILD
deleted file mode 100644
index 986c916..0000000
--- a/abs/extra-testing/community/libnetfilter_queue/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
-# Maintainer: Filip Wojciechowski, filip at loka dot pl
-pkgname=libnetfilter_queue
-pkgver=0.0.16
-pkgrel=1
-pkgdesc="userspace library providing an API to packets that have been queued by the kernel packet filter"
-arch=('i686' 'x86_64')
-url="http://www.netfilter.org/projects/libnetfilter_queue/index.html"
-license=('GPL')
-depends=(libnfnetlink)
-makedepends=(pkgconfig)
-options=('!libtool')
-source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('b36664e6cd39edbfe46b416a86118add')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
diff --git a/abs/extra-testing/community/libnfnetlink/PKGBUILD b/abs/extra-testing/community/libnfnetlink/PKGBUILD
deleted file mode 100644
index 2e0242e..0000000
--- a/abs/extra-testing/community/libnfnetlink/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-pkgname=libnfnetlink
-pkgver=0.0.40
-pkgrel=1
-pkgdesc="low-level library for netfilter related kernel/userspace communication"
-depends=(glibc)
-url="http://www.netfilter.org/projects/libnfnetlink/index.html"
-license=('GPL')
-arch=('i686' 'x86_64')
-options=('!libtool')
-source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('3fe19dc4b05ba7e7e6216123097c2819')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
diff --git a/abs/extra-testing/community/liboil/PKGBUILD b/abs/extra-testing/community/liboil/PKGBUILD
deleted file mode 100644
index 23230f5..0000000
--- a/abs/extra-testing/community/liboil/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 14430 2008-10-06 17:28:40Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=liboil
-pkgver=0.3.15
-pkgrel=1
-pkgdesc="Library of simple functions that are optimized for various CPUs."
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://liboil.freedesktop.org/"
-depends=('glibc')
-makedepends=('glib2' 'pkgconfig' 'docbook-xsl')
-options=('!libtool' '!makeflags')
-source=(${url}/download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('11dd39b1ca13ce2e0618d4df8303f137')
-
-build() {
-  unset CFLAGS
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -m755 -d "${pkgdir}/usr/share/licenses/liboil"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/liboil/"
-}
diff --git a/abs/extra-testing/community/libshout/PKGBUILD b/abs/extra-testing/community/libshout/PKGBUILD
deleted file mode 100644
index b23c88e..0000000
--- a/abs/extra-testing/community/libshout/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 19191 2008-11-17 11:43:24Z jgc $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: arjan <arjan@archlinux.org>
-# Contributor: Jason Chu <jchu@xentac.net>
-
-pkgname=libshout
-pkgver=2.2.2
-pkgrel=2
-pkgdesc="Library for accessing a shoutcast/icecast server"
-arch=('i686' 'x86_64')
-depends=('libvorbis' 'libtheora' 'speex')
-url="http://www.icecast.org/"
-options=('!libtool' 'force')
-license=('LGPL2')
-source=(http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('4f75fc9901c724b712c371c9a1e782d3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
-  make LDFLAGS+=-lspeex || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra-testing/community/libstdc++5/PKGBUILD b/abs/extra-testing/community/libstdc++5/PKGBUILD
deleted file mode 100644
index 00bee17..0000000
--- a/abs/extra-testing/community/libstdc++5/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libstdc++5
-pkgver=3.3.6
-pkgrel=2
-pkgdesc="GNU Standard C++ library version 3"
-arch=(i686 x86_64)
-url="http://gcc.gnu.org"
-depends=('gcc-libs')
-makedepends=('binutils' 'gcc')
-options=(!libtool)
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2 gcc-3.4.3-no_multilib_amd64.patch)
-md5sums=(18c52e6fb8966b7700665dca289d077f 6b3d00b8d079805be1b895f7f6ce47a0 \
-         088e0807e677010cafe4e590e8711be1)
-
-build(){
-  export MAKEFLAGS="-j1"
-  export CFLAGS=$(echo $CFLAGS | sed 's|-mtune=generic||')
-  export CXXFLAGS=$(echo $CXXFLAGS | sed 's|-mtune=generic||')
-  cd ${startdir}/src/gcc-${pkgver}
-
-  if [ "$CARCH" = "x86_64" ]; then
-    patch -Np0 -i ../gcc-3.4.3-no_multilib_amd64.patch || return 1
-  fi
-
-  # No fixincludes
-  sed -i -e 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-  mkdir ../gcc-build
-  cd ../gcc-build
-  ../gcc-${pkgver}/configure --prefix=/usr --enable-shared \
-      --enable-languages=c++ --enable-threads=posix --enable-__cxa_atexit \
-      --disable-multilib --libdir=/usr/lib
-  make all-target-libstdc++-v3 BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || return 1
-  make DESTDIR=${startdir}/pkg install-target-libstdc++-v3 || return 1
-
-  # Remove includefiles and libs provided by gcc
-  rm -rf ${startdir}/pkg/usr/{include,share/locale}
-  rm -f ${startdir}/pkg/usr/lib/*.a
-  rm -f ${startdir}/pkg/usr/lib/libstdc++.so
-}
diff --git a/abs/extra-testing/community/libstdc++5/gcc-3.4.3-no_multilib_amd64.patch b/abs/extra-testing/community/libstdc++5/gcc-3.4.3-no_multilib_amd64.patch
deleted file mode 100644
index dce10d4..0000000
--- a/abs/extra-testing/community/libstdc++5/gcc-3.4.3-no_multilib_amd64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc/config/i386/t-linux64.orig	2003-06-28 00:19:59.000000000 +0000
-+++ gcc/config/i386/t-linux64	2003-06-28 00:20:07.000000000 +0000
-@@ -6,7 +6,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 ../lib
-+MULTILIB_OSDIRNAMES = . ../lib
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/abs/extra-testing/community/libv4l/PKGBUILD b/abs/extra-testing/community/libv4l/PKGBUILD
deleted file mode 100644
index 3afcf6c..0000000
--- a/abs/extra-testing/community/libv4l/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id: PKGBUILD 28297 2009-02-28 18:20:12Z thomas $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-pkgname=libv4l
-pkgver=0.5.8
-pkgrel=1
-pkgdesc="Userspace library for Video 4 Linux (1 and 2)"
-arch=('i686' 'x86_64')
-url="http://hansdegoede.livejournal.com/3636.html"
-license=('LGPL')
-depends=('glibc')
-source=(http://people.atrpms.net/~hdegoede/$pkgname-$pkgver.tar.gz)
-md5sums=('4f8ae9c743b215c8ac0e553eaa01e980')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make || return 1
-  make install PREFIX="/usr" DESTDIR="$pkgdir/"
-}
diff --git a/abs/extra-testing/community/lua/PKGBUILD b/abs/extra-testing/community/lua/PKGBUILD
deleted file mode 100644
index ff0b435..0000000
--- a/abs/extra-testing/community/lua/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 10401 2008-08-29 00:31:46Z allan $
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=lua 
-pkgver=5.1.4
-pkgrel=3
-pkgdesc="A powerful light-weight programming language designed for extending applications." 
-arch=(i686 x86_64)
-url="http://www.lua.org/" 
-depends=('readline' 'ncurses') 
-license=(MIT)
-options=('!makeflags')
-source=($url/ftp/$pkgname-$pkgver.tar.gz $pkgname-arch.patch 'lua-5.1-cflags.diff')
-md5sums=('d0870f2de55d59c1c8419f36e8fac150'
-         '1bd1164a19abf9165e231ba0d8a0bbc7'
-         '249582bf1fd861ccf492d2c35a9fe732')
-
-build() { 
-  cd $startdir/src/$pkgname-$pkgver 
-  patch -p1 -i $startdir/src/$pkgname-arch.patch || return 1
-  
-  [ "$CARCH" == "x86_64" ] && patch -Np1 -i ../lua-5.1-cflags.diff
-  [ "$CARCH" == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC"
-  make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so  INSTALL_TOP=$startdir/pkg/usr INSTALL_MAN=$startdir/pkg/usr/share/man/man1 \
-    linux install  || return 1
-  install -D -m 644 etc/lua.pc $startdir/pkg/usr/lib/pkgconfig/lua.pc
-  install -D -m644 COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/COPYRIGHT
-}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/abs/extra-testing/community/lua/lua-5.1-cflags.diff b/abs/extra-testing/community/lua/lua-5.1-cflags.diff
deleted file mode 100644
index db658ae..0000000
--- a/abs/extra-testing/community/lua/lua-5.1-cflags.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile
---- lua-5.1.orig/src/Makefile	2006-02-16 16:45:09.000000000 +0100
-+++ lua-5.1/src/Makefile	2006-03-01 14:55:29.000000000 +0100
-@@ -8,7 +8,8 @@
- PLAT= none
- 
- CC= gcc
--CFLAGS= -O2 -Wall $(MYCFLAGS)
-+CFLAGS ?= -O2 -Wall
-+CFLAGS += $(MYCFLAGS)
- AR= ar rcu
- RANLIB= ranlib
- RM= rm -f
diff --git a/abs/extra-testing/community/lua/lua-5.1.3-official-patch1.diff b/abs/extra-testing/community/lua/lua-5.1.3-official-patch1.diff
deleted file mode 100644
index dec8fba..0000000
--- a/abs/extra-testing/community/lua/lua-5.1.3-official-patch1.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/lbaselib.c
-+++ src/lbaselib.c
-443c443,444
-< ** functions to consume unlimited stack space.
----
-> ** functions to consume unlimited stack space. (must be smaller than
-> ** -LUA_REGISTRYINDEX)
-445,446c446
-< #define LUAI_MCS_AUX  ((int)(INT_MAX / (4*sizeof(LUA_NUMBER))))
-< #define LUAI_MAXCSTACK        (LUAI_MCS_AUX > SHRT_MAX ? SHRT_MAX : LUAI_MCS_AUX)
----
-> #define LUAI_MAXCSTACK        8000
diff --git a/abs/extra-testing/community/lua/lua-5.1.3-official-patch2.diff b/abs/extra-testing/community/lua/lua-5.1.3-official-patch2.diff
deleted file mode 100644
index 05ac244..0000000
--- a/abs/extra-testing/community/lua/lua-5.1.3-official-patch2.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lbaselib.c	(old)
-+++ src/lbaselib.c	(new)
-@@ -526,7 +526,7 @@
-   status = lua_resume(co, narg);
-   if (status == 0 || status == LUA_YIELD) {
-     int nres = lua_gettop(co);
--    if (!lua_checkstack(L, nres))
-+    if (!lua_checkstack(L, nres + 1))
-       luaL_error(L, "too many results to resume");
-     lua_xmove(co, L, nres);  /* move yielded values */
-     return nres;
diff --git a/abs/extra-testing/community/lua/lua-5.1.3-official-patch3.diff b/abs/extra-testing/community/lua/lua-5.1.3-official-patch3.diff
deleted file mode 100644
index 8126ff5..0000000
--- a/abs/extra-testing/community/lua/lua-5.1.3-official-patch3.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/lapi.c	(old)
-+++ src/lapi.c	(new)
-@@ -93,15 +93,14 @@
- 
- 
- LUA_API int lua_checkstack (lua_State *L, int size) {
--  int res;
-+  int res = 1;
-   lua_lock(L);
--  if ((L->top - L->base + size) > LUAI_MAXCSTACK)
-+  if (size > LUAI_MAXCSTACK || (L->top - L->base + size) > LUAI_MAXCSTACK)
-     res = 0;  /* stack overflow */
--  else {
-+  else if (size > 0) {
-     luaD_checkstack(L, size);
-     if (L->ci->top < L->top + size)
-       L->ci->top = L->top + size;
--    res = 1;
-   }
-   lua_unlock(L);
-   return res;
diff --git a/abs/extra-testing/community/lua/lua-5.1.3-official-patch4.diff b/abs/extra-testing/community/lua/lua-5.1.3-official-patch4.diff
deleted file mode 100644
index 1d03f37..0000000
--- a/abs/extra-testing/community/lua/lua-5.1.3-official-patch4.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/lbaselib.c	(old)
-+++ src/lbaselib.c	(new)
-@@ -344,10 +344,12 @@
-   luaL_checktype(L, 1, LUA_TTABLE);
-   i = luaL_optint(L, 2, 1);
-   e = luaL_opt(L, luaL_checkint, 3, luaL_getn(L, 1));
-+  if (i > e) return 0;  /* empty range */
-   n = e - i + 1;  /* number of elements */
--  if (n <= 0) return 0;  /* empty range */
--  luaL_checkstack(L, n, "table too big to unpack");
--  for (; i<=e; i++)  /* push arg[i...e] */
-+  if (n <= 0 || !lua_checkstack(L, n))  /* n <= 0 means arith. overflow */
-+    return luaL_error(L, "too many results to unpack");
-+  lua_rawgeti(L, 1, i);  /* push arg[i] (avoiding overflow problems) */
-+  while (i++ < e)  /* push arg[i + 1...e] */
-     lua_rawgeti(L, 1, i);
-   return n;
- }
diff --git a/abs/extra-testing/community/lua/lua-arch.patch b/abs/extra-testing/community/lua/lua-arch.patch
deleted file mode 100644
index 7d6d331..0000000
--- a/abs/extra-testing/community/lua/lua-arch.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -ur lua-5.1.orig/etc/lua.pc lua-5.1/etc/lua.pc
---- lua-5.1.orig/etc/lua.pc	2006-03-21 11:51:53.000000000 +0100
-+++ lua-5.1/etc/lua.pc	2006-03-21 11:52:05.000000000 +0100
-@@ -6,7 +6,7 @@
- V= 5.1
- 
- # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
--prefix= /usr/local
-+prefix= /usr
- INSTALL_BIN= ${prefix}/bin
- INSTALL_INC= ${prefix}/include
- INSTALL_LIB= ${prefix}/lib
-diff -ur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile
---- lua-5.1.orig/src/Makefile	2006-03-21 11:51:53.000000000 +0100
-+++ lua-5.1/src/Makefile	2006-03-21 11:52:09.000000000 +0100
-@@ -23,6 +23,7 @@
- PLATS= aix ansi bsd generic linux macosx mingw posix solaris
- 
- LUA_A=	liblua.a
-+LUA_SO=	liblua.so
- CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
- 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
- 	lundump.o lvm.o lzio.o
-@@ -36,7 +37,7 @@
- LUAC_O=	luac.o print.o
- 
- ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
--ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
-+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
- ALL_A= $(LUA_A)
- 
- default: $(PLAT)
-@@ -51,6 +52,10 @@
- 	$(AR) $@ $?
- 	$(RANLIB) $@
- 
-+$(LUA_SO): $(CORE_O) $(LIB_O)
-+	$(CC) -shared -ldl -Wl,-soname,liblua.so -o $@.5.1 $? $(MYLDFLAGS)
-+	ln -s $@.5.1 $@
-+
- $(LUA_T): $(LUA_O) $(LUA_A)
- 	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
- 
-diff -ur lua-5.1.orig/src/luaconf.h lua-5.1/src/luaconf.h
---- lua-5.1.orig/src/luaconf.h	2006-03-21 11:51:53.000000000 +0100
-+++ lua-5.1/src/luaconf.h	2006-03-21 11:52:05.000000000 +0100
-@@ -82,7 +82,7 @@
- 	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
- 
- #else
--#define LUA_ROOT	"/usr/local/"
-+#define LUA_ROOT	"/usr/"
- #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
- #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
- #define LUA_PATH_DEFAULT  \
diff --git a/abs/extra-testing/community/mediatomb/PKGBUILD b/abs/extra-testing/community/mediatomb/PKGBUILD
deleted file mode 100644
index aaf4d58..0000000
--- a/abs/extra-testing/community/mediatomb/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# Orginal Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Nikhil Bysani <nikron@gmail.com>
-# Contributor: Mika Hynnä <igheax@gmail.com>
-
-# 20090525: 
-#	+ makedepends=('gcc' 'patch' 'make')
-#	+ mediatomb-0.11.0+glibc-2.10.patch
-
-pkgname=mediatomb
-pkgver=0.11.0
-pkgrel=10
-pkgdesc="A UPnP mediaserver"
-arch=('i686' 'x86_64')
-url="http://mediatomb.sourceforge.net"
-license=('GPL')
-depends=('libexif' 'taglib' 'sqlite3' 'expat' 'spidermonkey' 'curl' 'ffmpeg')
-makedepends=('gcc' 'patch' 'make')
-backup=(etc/conf.d/mediatomb)
-source=(
-	http://mesh.dl.sourceforge.net/sourceforge/mediatomb/mediatomb-$pkgver.tar.gz \
-	mediatomb.rc \
-	mediatomb.conf \
-	http://kapsi.fi/~ighea/arch/mediatomb-gcc-4.3.patch
-	mediatomb-0.11.0+glibc-2.10.patch
-)
-
-build()
-{
-	cd $startdir/src/mediatomb-$pkgver || return 1
-	patch -Np1 < ../mediatomb-gcc-4.3.patch || return 1
-	patch -Np0 < ../mediatomb-0.11.0+glibc-2.10.patch || return 1
-	
-	sed -e s/"ffmpeg\/avformat.h"/"libavformat\/avformat.h"/g -i configure
-	sed -e s/"ffmpeg\/avformat.h"/"libavformat\/avformat.h"/g -i configure.ac
-	sed -e s/"ffmpeg\/avformat.h"/"libavformat\/avformat.h"/g -i src/metadata/ffmpeg_handler.cc
-	
-
-	./configure --prefix=/usr --enable-mysql=no --enable-libmagic=yes \
-	 --enable-libjs=yes --enable-ffmpeg --with-ffmpeg-h=/usr/include/ || return 1
-
-	make || return 1
-	make DESTDIR=$startdir/pkg install || return 1
-
-	# rc-script
-	mkdir -p $startdir/pkg/etc/rc.d/ || return 1
-	install -m0755 ../mediatomb.rc $startdir/pkg/etc/rc.d/mediatomb || return 1
-
-	# config-file
-	mkdir -p $startdir/pkg/etc/conf.d/ || return 1
-	install -m0644 ../mediatomb.conf $startdir/pkg/etc/conf.d/mediatomb || return 1
-
-}
-md5sums=('661f08933830d920de21436fe122fb15'
-         'a7ff197d5760b20b04675ba67bfd9e86'
-         'a4cbd08c32c93f116363a29bef60e21d'
-         'eda28d01e035b3237566da5b1aad7712'
-         '3b895eabee88a0697b4fd0c30af6cab2')
diff --git a/abs/extra-testing/community/mediatomb/mediatomb-0.11.0+glibc-2.10.patch b/abs/extra-testing/community/mediatomb/mediatomb-0.11.0+glibc-2.10.patch
deleted file mode 100644
index b1436c1..0000000
--- a/abs/extra-testing/community/mediatomb/mediatomb-0.11.0+glibc-2.10.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/tools.cc	(revisione 2018)
-+++ src/tools.cc	(copia locale)
-@@ -303,8 +303,8 @@
-     Ref<StringBuffer> buf(new StringBuffer(len / 2));
-     for (int i = 0; i < len; i += 2)
-     {
--        char *chi = strchr(HEX_CHARS, ptr[i]);
--        char *clo = strchr(HEX_CHARS, ptr[i + 1]);
-+        const char *chi = strchr(HEX_CHARS, ptr[i]);
-+        const char *clo = strchr(HEX_CHARS, ptr[i + 1]);
-         int hi, lo;
-         
-         if (chi)
-@@ -397,7 +397,7 @@
-             char clo = data[i++];
-             int hi, lo;
- 
--            char *pos;
-+            const char *pos;
- 
-             pos = strchr(hex, chi);
-             if (!pos)
-
diff --git a/abs/extra-testing/community/mediatomb/mediatomb-gcc-4.3.patch b/abs/extra-testing/community/mediatomb/mediatomb-gcc-4.3.patch
deleted file mode 100644
index 9440bec..0000000
--- a/abs/extra-testing/community/mediatomb/mediatomb-gcc-4.3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# GCC-4.3 compatibility patch by Mika Hynnä (ighea) <igheaxATgmailDOTcom>
-#
---- mediatomb-0.11.0/src/url.cc	2008-03-02 00:48:36.000000000 +0200
-+++ mediatomb-0.11.0.new/src/url.cc	2008-04-14 00:53:21.000000000 +0300
-@@ -75,7 +75,7 @@
- 
-     if (only_header)
-     {
--        curl_easy_setopt(curl_handle, CURLOPT_NOBODY);
-+        curl_easy_setopt(curl_handle, CURLOPT_NOBODY,0);
-         curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, URL::dl);
-         curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA, 
-                          (void *)buffer.getPtr());
---- mediatomb-0.11.0/src/metadata/id3_handler.cc	2008-03-02 00:48:36.000000000 +0200
-+++ mediatomb-0.11.0.new/src/metadata/id3_handler.cc	2008-04-14 01:22:36.000000000 +0300
-@@ -36,6 +36,8 @@
- 
- #ifdef HAVE_ID3
- 
-+#include <string.h>
-+
- #ifdef HAVE_CONFIG_H
-     #undef HAVE_CONFIG_H // else utils.h from the id3 library tries to import "config.h"
- 
diff --git a/abs/extra-testing/community/mediatomb/mediatomb.conf b/abs/extra-testing/community/mediatomb/mediatomb.conf
deleted file mode 100644
index 339bd9e..0000000
--- a/abs/extra-testing/community/mediatomb/mediatomb.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# User to run the mediatomb as:
-USER=""
-# Extra parameters to pass to the daemon:
-PARAMS=""
-
diff --git a/abs/extra-testing/community/mediatomb/mediatomb.rc b/abs/extra-testing/community/mediatomb/mediatomb.rc
deleted file mode 100755
index b3333cc..0000000
--- a/abs/extra-testing/community/mediatomb/mediatomb.rc
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-DESC="MediaTomb UPnP A/V Media Server"
-
-USER=""
-
-if [ "$(whoami)" != "root" ];then
- echo "You must be root to start/restart/stop services."
- exit 1
-fi
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -r "/etc/conf.d/mediatomb" ] && . /etc/conf.d/mediatomb
-
-PID=`pidof -o %PPID /usr/bin/mediatomb`
-
-case "$1" in
-  start)
-    stat_busy "Starting $DESC"
-    if [ -z "$PID" ]; then
-	if [ -n "$USER" ]; then
-		echo -n "Starting as user: $USER"
-		su - $USER -c "/usr/bin/mediatomb -d $PARAMS &> /dev/null" || stat_fail
-	else
-		/usr/bin/mediatomb -d $PARAMS &> /dev/null || stat_fail
-	fi
-	PID=`pidof -o %PPID /usr/bin/mediatomb`
-	if [ -z "$PID" ]; then exit 1;fi
-	echo $PID > /var/run/mediatomb.pid
-	add_daemon mediatomb
-        stat_done
-    else    
-		echo -n "Already running!"
-		stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping $DESC"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      echo -n "Not started!"
-      stat_fail
-    else
-      rm /var/run/mediatomb.pid
-      rm_daemon mediatomb
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/abs/extra-testing/community/mmv/PKGBUILD b/abs/extra-testing/community/mmv/PKGBUILD
deleted file mode 100644
index 0ccec1b..0000000
--- a/abs/extra-testing/community/mmv/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: blue_lizard lizard@blue.dyn-o-saur.com 
-
-pkgname=mmv
-pkgver=1.01b.orig
-pkgrel=1
-pkgdesc="multiple move files"
-depends=('glibc' 'sed')
-conflicts=()
-backup=()
-source=(http://ftp.de.debian.org/debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz http://ftp.de.debian.org/debian/pool/main/m/mmv/mmv_1.01b-14.diff.gz)
-md5sums=('1b2135ab2f17bdfa9e08debbb3c46ad8' 'a69eff7501e63c0bd1fcd231bf6949f1')
-url="http://linux.maruhn.com/sec/mmv.html"
-license="GPL"
-install=$pkgname.install
-arch=('i686')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -p1 < ../mmv_1.01b-14.diff
-  cat Makefile | sed -e "s/LDFLAGS.\s=-s -N/LDFLAGS	=-s/g" > /tmp/Makefile
-  mv /tmp/Makefile ./
-  make || return 1
-  mkdir -p $startdir/pkg/usr/bin
-  mkdir -p $startdir/pkg/usr/man/man1
-  make DESTDIR=$startdir/pkg install
-  chmod 644 $startdir/pkg/usr/man/man1/mmv.1
-  cd $startdir/pkg/usr/bin
-  ln -s mmv mcp
-  ln -s mmv mad
-  ln -s mmv mln
-  cd $startdir/pkg/usr/man/man1/
-  ln -s mmv.1 mcp.1
-  ln -s mmv.1 mad.1
-  ln -s mmv.1 mln.1 
-}
diff --git a/abs/extra-testing/community/mmv/mmv.install b/abs/extra-testing/community/mmv/mmv.install
deleted file mode 100644
index 9b23e48..0000000
--- a/abs/extra-testing/community/mmv/mmv.install
+++ /dev/null
@@ -1,19 +0,0 @@
-# arg 1: the new package version
-post_install() {
-  echo ">>>"
-  echo ">>>" 
-  echo ">>>"
-  echo ">>> many thanks to the debian people who provide the sources"
-  echo ">>>"
-}
-
-# arg 1:  the old package version
-post_remove() {
-  echo ">>>"
-  echo ">>>"
-  echo ">>>"
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/community/moblock/MoBlock-nfq.sh.patch b/abs/extra-testing/community/moblock/MoBlock-nfq.sh.patch
deleted file mode 100644
index 15e742f..0000000
--- a/abs/extra-testing/community/moblock/MoBlock-nfq.sh.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- MoBlock-0.8/MoBlock-nfq.sh.orig	2008-11-30 03:44:02.000000000 -0500
-+++ MoBlock-0.8/MoBlock-nfq.sh	2008-12-01 18:56:15.000000000 -0500
-@@ -3,14 +3,10 @@
- # MoBlock.sh - MoBlock start script
- # ---------------------------------
- 
--ACTIVATE_CHAINS=1
--WHITE_TCP_IN=""
--WHITE_UDP_IN=""
--WHITE_TCP_OUT=""
--WHITE_UDP_OUT=""
--WHITE_TCP_FORWARD=""
--WHITE_UDP_FORWARD=""
-+# Some configuration options have been moved to an external conf file
-+# This should make maintenance and upgrading easier
- 
-+. /etc/moblock/config
- 
- PIDF=/var/run/moblock.pid
- 
-@@ -78,6 +74,17 @@
- 	iptables -I MOBLOCK_FW -p udp --dport $PORT -j ACCEPT
- done
- 
-+# For added IP whitelisting support
-+
-+for IP in $WHITE_IP_OUT; do
-+    iptables -I MOBLOCK_OUT -p all -m iprange --dst-range $IP -j ACCEPT
-+done
-+for IP in $WHITE_IP_IN; do
-+    iptables -I MOBLOCK_IN -p all -m iprange --dst-range $IP -j ACCEPT
-+done
-+for IP in $WHITE_IP_FW; do
-+    iptables -I MOBLOCK_FW -p all -m iprange --dst-range $IP -j ACCEPT
-+done
- 
- # Loopback traffic fix
- 
-@@ -85,7 +92,8 @@
- iptables -I OUTPUT -p all -o lo -j ACCEPT
- 
- # Here you can change block list and log files
--./moblock -p /etc/guarding.p2p ./moblock.log
-+#./moblock -p /etc/guarding.p2p ./moblock.log
-+/usr/bin/moblock -p /etc/moblock/banned.list /var/log/moblock.log >/dev/null 2>&1
- 
- # On exit delete the rules we added
- 
-@@ -108,3 +116,4 @@
- if [ -f $PIDF ]; then	
- 	rm $PIDF;
- fi
-+
diff --git a/abs/extra-testing/community/moblock/PKGBUILD b/abs/extra-testing/community/moblock/PKGBUILD
deleted file mode 100755
index f6c7e51..0000000
--- a/abs/extra-testing/community/moblock/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
-# Maintainer: Filip Wojciechowski, filip at loka dot pl
-
-pkgname=moblock
-pkgver=0.9rc2
-pkgrel=8
-pkgdesc="Console application that blocks connections from/to hosts listed in a file in peerguardian format"
-arch=('i686' 'x86_64')
-url="http://moblock.berlios.de/"
-license=('GPL')
-depends=(libnetfilter_queue iptables)
-backup=(etc/moblock/config)
-install=moblock.install
-source=(http://download.berlios.de/moblock/MoBlock-0.8-i586.tar.bz2 \
-        moblock_0.9_rc2.patch \
-        MoBlock-nfq.sh.patch \
-        moblock_include.patch \
-        config \
-        moblock-update \
-        moblock \
-        moblock.logrotate)
-md5sums=('199967adb48b153be90db10fe21325c5'
-         'e4e33c515677fa53eaca4616591d4e44'
-         '1193adccce219d31a7c0540807a4a8e8'
-         'b23b5214965df59632de5cec317ddbde'
-         '840bb52a99529305e49212a69c9ced8a'
-         '49a16feb221d4d912cc7200313517f7b'
-         '1bdc949fcff0ce751a5096e489061513'
-         'a8285fd3e68043cd8d21993d3dbbf9d4')
-
-build() {
-    cd $startdir/src/MoBlock-0.8
-    
-    # patch to update moblock to the latest cvs version
-    patch -Np1 -i ../moblock_0.9_rc2.patch || return 1
-    # add IP whitelisting and move configs to a separate conf file
-    patch -Np1 -i ../MoBlock-nfq.sh.patch || return 1
-    # necessary to make moblock build with recent kernels
-    patch -Np1 -i ../moblock_include.patch || return 1
-    
-    # change the CFLAGS for both i686 and x84_64 builds
-    sed -i "s#-Wall -O.*-ffast-math#$CFLAGS#g" Makefile
-    
-    # build
-    make || return 1
-    
-    #move the files
-    install -D -m 755 ./MoBlock-nfq.sh $startdir/pkg/usr/bin/moblock-nfq || return 1
-    install -D -m 744 ./moblock $startdir/pkg/usr/bin/moblock || return 1
-    install -D -m 755 ../moblock-update $startdir/pkg/usr/bin/moblock-update || return 1
-    install -D -m 744 ../moblock $startdir/pkg/etc/rc.d/moblock || return 1
-    install -D -m 644 ../config $startdir/pkg/etc/moblock/config || return 1
-    install -D -m 644 ../moblock.logrotate $startdir/pkg/etc/logrotate.d/moblock || return 1
-}
-
-
diff --git a/abs/extra-testing/community/moblock/config b/abs/extra-testing/community/moblock/config
deleted file mode 100644
index 7d7c287..0000000
--- a/abs/extra-testing/community/moblock/config
+++ /dev/null
@@ -1,30 +0,0 @@
-# Original MoBlock configuration options from MoBlock-nfq.sh file
-ACTIVATE_CHAINS=1
-WHITE_TCP_IN=""
-WHITE_UDP_IN=""
-WHITE_TCP_OUT="" # Add "http https" here to prevent moblock from blocking webpages
-WHITE_UDP_OUT=""
-WHITE_TCP_FORWARD=""
-WHITE_UDP_FORWARD=""
-
-# Added IP whitelisting support
-WHITE_IP_IN=""
-WHITE_IP_OUT=""
-WHITE_IP_FW=""
-
-# Individual lists can be disabled by prefixing them with '!'
-# Bluetack blacklists (http://www.bluetack.co.uk)
-BLUETACK=(level1 level2 !level3 !edu ads-trackers-and-bad-pr0n bogon spyware spider Microsoft !proxy hijacked templist !rangetest dshield)
-
-# blocklist.org lists (currently doesn't work)
-#BLOCKLIST=(p2p gov spy ads edu)
-
-# backup lists (might be outdated)
-#PHOENIXLABS=(!p2b.p2b edu.txt spider.txt spyware.txt level1.txt !level2.txt !level3.txt)
-
-# Change to 'yes' if you want to backup up the old list before writing 
-# a new one. Only one backup copy will be kept.
-BACKUP_OLD_LIST="no"
-
-# Options passed to wget
-WGET_OPTS="-q"
diff --git a/abs/extra-testing/community/moblock/moblock b/abs/extra-testing/community/moblock/moblock
deleted file mode 100755
index d88bd2e..0000000
--- a/abs/extra-testing/community/moblock/moblock
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-    start)
-        stat_busy "Starting MoBlock"
-        if [ ! -f /var/run/moblock.pid ]
-        then
-            /usr/bin/moblock-nfq &
-            if [ $? -gt 0 ]
-            then
-                stat_fail
-            else
-                add_daemon moblock
-                stat_done
-            fi
-        else
-            stat_fail
-        fi
-        ;;
-    update)
-        stat_busy "Updating MoBlock block list..."
-        error=0
-        /usr/bin/moblock-update || error=1
-        stat_busy "Updating MoBlock block list"
-        if [ $error -eq 1 ]; then
-            stat_fail
-        else
-            stat_done
-        fi
-        ;;
-    stats)
-        stat_busy "Logging stats to /var/log/MoBlock.stats"
-        PID=`cat /var/run/moblock.pid 2>/dev/null`
-        if [ ! -z "$PID" ]; then
-            /bin/kill -USR2 $PID
-            if [ $? -gt 0 ]; then
-                stat_fail
-            else
-                stat_done
-            fi
-        else
-            stat_fail
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping MoBlock"
-        PID=`cat /var/run/moblock.pid 2>/dev/null`
-        if [ ! -z "$PID" ]; then
-            /bin/kill $PID
-            if [ $? -gt 0 ]; then
-                stat_fail
-            else
-                rm_daemon moblock
-                stat_done
-            fi
-        else
-            stat_fail
-        fi
-        ;;
-    restart)
-        $0 stop
-        sleep 2
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart|update|stats}"
-esac
diff --git a/abs/extra-testing/community/moblock/moblock-update b/abs/extra-testing/community/moblock/moblock-update
deleted file mode 100755
index aae861d..0000000
--- a/abs/extra-testing/community/moblock/moblock-update
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/bin/bash
-
-. /etc/moblock/config
-
-CONF_DIR=/etc/moblock
-TEMP_DIR=$(/usr/bin/mktemp -t -d moblock-updateXXXXXXXX)
-LIST_FILE=banned.list
-
-USECOLOR="no"
-. /etc/rc.d/functions
-PREFIX_REG=" >"
-PREFIX_HL="::"
-
-function extract()
-{
-    /usr/bin/find $TEMP_DIR -type f -name '*.gz' -o -name '*.zip' |\
-    while read N
-    do
-        case "$N" in
-            *.zip)  /usr/bin/unzip -oqq "$N" 2>/dev/null
-                    if [ $? -gt 0 ]; then
-                        rm -f "$N"
-                        return 1
-                    else
-                        rm -f "$N"
-                    fi
-                    ;;
-            *.gz)   /bin/gunzip -f "$N" 2>/dev/null
-                    if [ $? -gt 0 ]; then
-                        rm -f "$N"
-                        return 1
-                    fi
-                    ;;
-            *)      continue
-                    ;;
-        esac
-    done
-    return 0
-}
-
-cd $TEMP_DIR
-
-printf "${C_SEPARATOR}   ------------------------------\n"
-printhl "Downloading and extracting files:\n"
-
-# Bluetack lists (with fallback)
-for i in ${BLUETACK[@]}
-do
-    if [ $(echo $i | /bin/grep '^[^\!]' | /usr/bin/wc -l) -eq 1 ]; then
-        stat_busy "BLUETACK '${i}'... " 
-        /usr/bin/wget ${WGET_OPTS} "http://www.bluetack.co.uk/config/${i}.gz" && extract
-        if [ $? -gt 0 ] || [ ! -f ${i} ]; then
-            stat_fail
-            bfile=$i
-            if [ "$bfile" = "ads-trackers-and-bad-pr0n" ]; then
-                bfile="ads"
-            elif [ "$bfile" = "Microsoft" ];then
-                bfile="microsoft"
-            fi
-            stat_busy "[!!] BLUETACK '${i}' (fallback link)... "
-            /usr/bin/wget ${WGET_OPTS} "http://list.iblocklist.com/?list=bt_${bfile%%-*}" -O "${i}.gz" && extract
-            if [ $? -gt 0 ]; then
-                stat_fail
-            else
-                stat_done
-            fi
-        else
-            stat_done
-        fi
-    fi
-done
-
-# Blocklist lists
-for i in ${BLOCKLIST[@]}
-do
-    if [ $(echo $i | /bin/grep '^[^\!]' | /usr/bin/wc -l) -eq 1 ]; then
-        stat_busy "BLOCKLIST '${i}'... "
-        /usr/bin/wget ${WGET_OPTS} "blocklist.org/${i}.p2b.gz" && extract
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            stat_done
-        fi
-    fi
-done
-
-# Old phoenixlabs.org lists
-for i in ${PHOENIXLABS[@]}
-do
-    if [ $(echo $i | /bin/grep '^[^\!]' | /usr/bin/wc -l) -eq 1 ]; then
-        stat_busy "PHOENIXLABS '${i}'... "
-        /usr/bin/wget ${WGET_OPTS} "fox.phoenixlabs.org/${i}" && extract
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            stat_done
-        fi
-    fi
-done
-
-if [ $(/bin/cat "$TEMP_DIR"/* | /usr/bin/wc -l) -eq 0 ]; then
-    printf "\n"
-    printhl "ERROR: No files were downloaded"
-    printf "${C_SEPARATOR}   ------------------------------\n"
-    exit 1
-fi
-
-# Check files
-printsep
-printhl "Checking integrity of downloaded files:\n"
-
-/usr/bin/find -type f | while read N
-do
-    stat_busy "File '$(echo $N | /bin/awk -F/ '{print $NF}')'... "
-    scan1=$(/bin/cat "$N" | /usr/bin/wc -l)
-    scan2=$(/bin/egrep -o ":[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*-[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*" "$N" | /usr/bin/wc -l)
-    if [ $scan1 -eq $scan2 ]; then
-        stat_done
-    else
-        if [ $scan2 -gt 0 ]; then
-            if [ $scan1 -gt $scan2 ]; then
-                stat_append "$(($scan1-$scan2)) of $scan1 entries failed validation; keeping the file"
-                stat_done
-            fi
-        else
-            stat_fail
-            stat_busy "[!!] Removing corrupted file... "
-            rm "$N" 2>/dev/null
-            if [ $? -gt 0 ]; then
-                stat_fail
-                exit 1
-            else
-                stat_done
-            fi
-        fi
-    fi
-done
-
-printsep
-printhl "Saving the list:\n"
-
-# Make backup
-if [ "$BACKUP_OLD_LIST" = "yes" ] && [ -f "$CONF_DIR"/"$LIST_FILE" ]; then
-    stat_busy "Backing up old list to '$CONF_DIR/$LIST_FILE.gz'... "
-    /bin/gzip -f "$CONF_DIR"/"$LIST_FILE" 2>/dev/null
-    if [ $? -gt 0 ]; then
-        stat_fail
-    else
-        stat_done
-    fi
-fi
-
-# Save the list
-stat_busy "Saving new list to '$CONF_DIR/$LIST_FILE'... "
-/bin/cat "$TEMP_DIR"/* > "$CONF_DIR"/"$LIST_FILE" 2>&1
-if [ $? -gt 0 ]; then
-    stat_fail
-    exit 1
-else
-    stat_done
-    printf "\n"
-    printhl "Saved `cat "$CONF_DIR"/"$LIST_FILE" | wc -l` ranges"
-    printf "${C_SEPARATOR}   ------------------------------\n"
-fi
-
-rm -rf "$TEMP_DIR"
-
-# Restart MoBlock
-if [ -f /var/run/moblock.pid ]; then
-    /bin/kill -HUP `cat /var/run/moblock.pid` >/dev/null 2>&1
-fi
-
-exit 0
-
diff --git a/abs/extra-testing/community/moblock/moblock.install b/abs/extra-testing/community/moblock/moblock.install
deleted file mode 100644
index c7715e7..0000000
--- a/abs/extra-testing/community/moblock/moblock.install
+++ /dev/null
@@ -1,30 +0,0 @@
-post_install() {
-	#clean up after an old hack
-    if [ -h /usr/lib/libnfnetlink.so.1 ]; then
-        rm /usr/lib/libnfnetlink.so.1
-    fi
-    echo ""
-    echo ">>> moblock-update script no longer uses /var/spool/moblock"
-    echo ">>> as a temporary directory.  You can safely delete it."
-    echo ""
-    if [ ! -d /var/spool/moblock/used ]
-    then
-        mkdir -p /var/spool/moblock/used
-    fi
-}
-
-post_upgrade() {
-	#clean up after an old hack
-    if [ -h /usr/lib/libnfnetlink.so.1 ]; then
-        rm /usr/lib/libnfnetlink.so.1
-    fi
-    if [ ! -d /var/spool/moblock/used ]
-    then
-        mkdir -p /var/spool/moblock/used
-   fi
-}
-
-op=$1
-shift
-$op $*
-
diff --git a/abs/extra-testing/community/moblock/moblock.logrotate b/abs/extra-testing/community/moblock/moblock.logrotate
deleted file mode 100644
index 6ed64bb..0000000
--- a/abs/extra-testing/community/moblock/moblock.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-"/var/log/moblock.log" /var/log/MoBlock.stats {
-  daily
-  missingok
-  notifempty
-  sharedscripts
-  postrotate
-    /usr/bin/test -f /var/run/moblock.pid && /bin/kill -HUP `cat /var/run/moblock.pid 2>/dev/null` 2>/dev/null || exit 0
-  endscript
-  compress
-}
-
diff --git a/abs/extra-testing/community/moblock/moblock_0.9_rc2.patch b/abs/extra-testing/community/moblock/moblock_0.9_rc2.patch
deleted file mode 100644
index 69994ff..0000000
--- a/abs/extra-testing/community/moblock/moblock_0.9_rc2.patch
+++ /dev/null
@@ -1,912 +0,0 @@
-diff -Naur MoBlock-0.8_orig/Changelog MoBlock-0.8/Changelog
---- MoBlock-0.8_orig/Changelog	2006-03-22 12:44:31.000000000 -0500
-+++ MoBlock-0.8/Changelog	2008-02-10 11:56:08.000000000 -0500
-@@ -4,6 +4,23 @@
- 
- ---
- 
-+0.9: - fix for kernel 2.6.23
-+	 - support for MARKing packets instead of DROPping or
-+	   ACCEPTing
-+	 - example start script that REJECTs packets instead of
-+	   DROPping.
-+	 - Integrated a patch from David Walluck for proper loading
-+	   of p2b files (version 2)
-+	 - command line options for logging to syslog, stdout
-+	   and log timestamping
-+	 - fixed loading pg1 lists with comments (lines starting
-+	   with '#')
-+	 - fixed a bug in ranges merge
-+	 - applied patch 2223 by badfish99: "IPs logged with bytes
-+	   reversed on big-endian m/c"
-+
-+---
-+
- 0.8: - support for NFQUEUE-ing from iptables FORWARD chain (thx to
-        hyakki for suggestions and testing!)
-      - included patches from Maximilian Mehnert to support log file
-diff -Naur MoBlock-0.8_orig/Makefile MoBlock-0.8/Makefile
---- MoBlock-0.8_orig/Makefile	2006-03-22 12:44:31.000000000 -0500
-+++ MoBlock-0.8/Makefile	2007-11-22 08:10:44.000000000 -0500
-@@ -1,4 +1,3 @@
--
- # To use the old-soon-to-be-deprecated libipq interface
- # uncomment the following line and comment the NFQUEUE one,
- # then comment the gcc line with netfilter_queue and
-@@ -7,7 +6,7 @@
- #QUEUE_LIB=LIBIPQ
- QUEUE_LIB=NFQUEUE
- 
--CFLAGS=-Wall -O2 -march=i586 -mtune=i686 -fomit-frame-pointer -ffast-math \
-+CFLAGS=-Wall -O3 -march=i586 -mtune=i686 -fomit-frame-pointer -ffast-math \
- 	-D_GNU_SOURCE -D$(QUEUE_LIB) -L/usr/include/libipq
- CC=gcc
- 
-diff -Naur MoBlock-0.8_orig/MoBlock-nfq-reject.sh MoBlock-0.8/MoBlock-nfq-reject.sh
---- MoBlock-0.8_orig/MoBlock-nfq-reject.sh	1969-12-31 19:00:00.000000000 -0500
-+++ MoBlock-0.8/MoBlock-nfq-reject.sh	2007-11-22 08:10:44.000000000 -0500
-@@ -0,0 +1,104 @@
-+#!/bin/sh
-+#
-+# MoBlock.sh - MoBlock start script
-+# ---------------------------------
-+
-+ACTIVATE_CHAINS=1
-+WHITE_TCP_IN=""
-+WHITE_UDP_IN=""
-+WHITE_TCP_OUT=""
-+WHITE_UDP_OUT=""
-+WHITE_TCP_FORWARD=""
-+WHITE_UDP_FORWARD=""
-+REJECT_MARK="10"
-+
-+PIDF=/var/run/moblock.pid
-+
-+FNAME=`basename $0 .sh`
-+MODE=`echo $FNAME|awk -F-  '{print $2}'`
-+
-+if [ -f $PIDF  ]; then
-+	PID=`cat $PIDF`
-+	if [ `ps -p $PID|wc -l` -gt 1 ]; then
-+		echo "$0: $PIDF exists and processs seems to be running. Exiting."
-+		exit 1;
-+	fi;
-+fi;
-+
-+if [ $MODE == "ipq" ]; then
-+	modprobe ip_queue
-+	TARGET="QUEUE"
-+elif [ $MODE == "nfq" ]; then
-+	modprobe ipt_NFQUEUE
-+	TARGET="NFQUEUE"
-+fi;
-+
-+modprobe ipt_state
-+
-+# Filter all traffic, edit for your needs
-+
-+iptables -N MOBLOCK_IN
-+iptables -N MOBLOCK_OUT
-+iptables -N MOBLOCK_FW
-+
-+if [ $ACTIVATE_CHAINS -eq 1 ]; then
-+	iptables -I INPUT -p all -m state --state NEW -j MOBLOCK_IN
-+	iptables -I OUTPUT -p all -m state --state NEW -j MOBLOCK_OUT
-+	iptables -I FORWARD -p all -m state --state NEW -j MOBLOCK_FW	
-+fi;
-+
-+
-+iptables -I MOBLOCK_IN -p all -j $TARGET
-+
-+iptables -I MOBLOCK_OUT -p all -j $TARGET
-+
-+iptables -I MOBLOCK_FW -p all -j $TARGET
-+
-+for PORT in $WHITE_TCP_OUT; do
-+	iptables -I MOBLOCK_OUT -p tcp --dport $PORT -j ACCEPT
-+done
-+for PORT in $WHITE_UDP_OUT; do
-+	iptables -I MOBLOCK_OUT -p udp --dport $PORT -j ACCEPT
-+done
-+
-+for PORT in $WHITE_TCP_IN; do
-+	iptables -I MOBLOCK_IN -p tcp --dport $PORT -j ACCEPT
-+done
-+for PORT in $WHITE_UDP_IN; do
-+	iptables -I MOBLOCK_IN -p udp --dport $PORT -j ACCEPT
-+done
-+
-+for PORT in $WHITE_TCP_FORWARD; do
-+	iptables -I MOBLOCK_FW -p tcp --dport $PORT -j ACCEPT
-+done
-+for PORT in $WHITE_UDP_FORWARD; do
-+	iptables -I MOBLOCK_FW -p udp --dport $PORT -j ACCEPT
-+done
-+
-+iptables -I OUTPUT -p all -m state --state NEW -m mark --mark $REJECT_MARK -j REJECT
-+iptables -I FORWARD -p all -m state --state NEW -m mark --mark $REJECT_MARK -j REJECT
-+
-+# Here you can change block list and log files
-+./moblock -d /etc/ipfilter.dat -t -s -r $REJECT_MARK ./moblock.log
-+
-+# On exit delete the rules we added
-+
-+if [ $ACTIVATE_CHAINS -eq 1 ]; then
-+	iptables -D INPUT -p all -m state --state NEW -j MOBLOCK_IN
-+	iptables -D OUTPUT -p all -m state --state NEW -j MOBLOCK_OUT
-+	iptables -D FORWARD -p all -m state --state NEW -j MOBLOCK_FW
-+fi;
-+
-+iptables -D OUTPUT -p all -m state --state NEW -m mark --mark $REJECT_MARK -j REJECT
-+iptables -D FORWARD -p all -m state --state NEW -m mark --mark $REJECT_MARK -j REJECT
-+
-+iptables -F MOBLOCK_IN
-+iptables -X MOBLOCK_IN
-+iptables -F MOBLOCK_OUT
-+iptables -X MOBLOCK_OUT
-+iptables -F MOBLOCK_FW
-+iptables -X MOBLOCK_FW
-+
-+if [ -f $PIDF ]; then	
-+	rm $PIDF;
-+fi
-diff -Naur MoBlock-0.8_orig/MoBlock.c MoBlock-0.8/MoBlock.c
---- MoBlock-0.8_orig/MoBlock.c	2006-03-22 12:44:31.000000000 -0500
-+++ MoBlock-0.8/MoBlock.c	2008-02-10 11:56:08.000000000 -0500
-@@ -35,6 +35,8 @@
- #include <linux/netfilter_ipv4.h>

- #include <signal.h>

- #include <regex.h>

-+#include <time.h>

-+#include <syslog.h>

- 

- // in Makefile define LIBIPQ to use soon-to-be-deprecated ip_queue,

- // NFQUEUE for ipt_NFQUEUE (from kernel 2.6.14)

-@@ -46,7 +48,7 @@
- 	#include <libnetfilter_queue/libnetfilter_queue.h>

- #endif

- 

--#define MB_VERSION	"0.8"

-+#define MB_VERSION	"0.9rc2"

- 

- #define BUFSIZE		2048

- #define PAYLOADSIZE	21

-@@ -58,6 +60,9 @@
- #define SRC_ADDR(payload) (*(in_addr_t *)((payload)+12))

- #define DST_ADDR(payload) (*(in_addr_t *)((payload)+16))

- 

-+#define likely(x)       __builtin_expect((x),1)

-+#define unlikely(x)     __builtin_expect((x),0)

-+

- // rbt datatypes/functions

- 

- typedef enum {

-@@ -96,7 +101,8 @@
- 	char filename[100];

- } blocklist_info;

- 

--int merged_ranges=0, skipped_ranges=0;

-+u_int32_t merged_ranges=0, skipped_ranges=0, accept_mark=0, reject_mark=0;

-+u_int8_t log2syslog=0, log2file=0, log2stdout=0, timestamp=0;

- 

- #ifdef LIBIPQ

- static void die(struct ipq_handle *h)

-@@ -112,11 +118,13 @@
- 	static char buf[2][ sizeof("aaa.bbb.ccc.ddd") ];

- 	static short int index=0;

- 	

-+	ip = ntohl(ip);

-+	

- 	sprintf(buf[index],"%d.%d.%d.%d",

--			(ip) & 0xff,

--			(ip >> 8) & 0xff,

-+			(ip >> 24) & 0xff,

- 			(ip >> 16) & 0xff,

--			(ip >> 24) & 0xff);

-+			(ip >> 8) & 0xff,

-+			(ip) & 0xff);

- 	

- 	if (index) {

- 		index=0;

-@@ -134,10 +142,38 @@
- 	fflush(stdout);

- }

- 

-+void log_action(char *msg)

-+{

-+	char timestr[30];

-+	time_t tv;

-+

-+	if (timestamp) {

-+		tv = time(NULL);

-+		strncpy(timestr, ctime(&tv), 19);

-+		timestr[19] = '\0';

-+		strcat(timestr, "| ");

-+	}

-+	else strcpy(timestr, "");

-+

-+	if (log2syslog) {

-+		syslog(LOG_INFO, msg);

-+	}

-+

-+	if (log2file) {

-+		fprintf(logfile,"%s%s",timestr,msg);

-+		fflush(logfile);

-+	}

-+

-+	if (log2stdout) {

-+		fprintf(stdout,"%s%s",timestr,msg);

-+	}

-+}

-+

- inline void ranged_insert(char *name,char *ipmin,char *ipmax)

- {

-     recType tmprec;

-     int ret;

-+    char msgbuf[255];

- 

- 	if ( strlen(name) > (BNAME_LEN-1) ) {

- 		strncpy(tmprec.blockname, name, BNAME_LEN);

-@@ -149,10 +185,11 @@
-     if ( (ret=insert(ntohl(inet_addr(ipmin)),&tmprec)) != STATUS_OK  )

-         switch(ret) {

-             case STATUS_MEM_EXHAUSTED:

--                fprintf(logfile,"Error inserting range, MEM_EXHAUSTED.\n");

-+                log_action("Error inserting range, MEM_EXHAUSTED.\n");

-                 break;

-             case STATUS_DUPLICATE_KEY:

--                fprintf(logfile,"Duplicated range ( %s )\n",name);

-+                sprintf(msgbuf,"Duplicated range ( %s )\n",name);

-+                log_action(msgbuf);

-                 break;

- 			case STATUS_MERGED:

- 				merged_ranges++;

-@@ -161,8 +198,9 @@
- 				skipped_ranges++;

- 				break;

-             default:

--                fprintf(logfile,"Unexpected return value from ranged_insert()!\n");

--                fprintf(logfile,"Return value was: %d\n",ret);

-+                log_action("Unexpected return value from ranged_insert()!\n");

-+                sprintf(msgbuf,"Return value was: %d\n",ret);

-+                log_action(msgbuf);

-                 break;

-         }                

- }

-@@ -177,15 +215,19 @@
- 	regex_t regmain;

- 	regmatch_t matches[4];

- 	int i;

-+	char msgbuf[255];

- 

- 	regcomp(&regmain, "^(.*)[:]([0-9.]*)[-]([0-9.]*)$", REG_EXTENDED);

- 

- 	fp=fopen(filename,"r");

- 	if ( fp == NULL ) {

--		fprintf(logfile,"Error opening %s, aborting...\n", filename);

-+		sprintf(msgbuf,"Error opening %s, aborting...\n", filename);

-+		log_action(msgbuf);

- 		exit(-1);

- 	}

- 	while ( (count=getline(&line,&len,fp)) != -1 ) {

-+		if ( line[0] == '#' )		//comment line, skip

-+			continue;

- 		for(i=count-1; i>=0; i--) {

- 			if ((line[i] == '\r') || (line[i] == '\n') || (line[i] == ' ')) {

- 				line[i] = 0;

-@@ -207,36 +249,78 @@
- 				      line+matches[3].rm_so);

- 			ntot++;

- 		} else {

--			fprintf(logfile,"Short guarding.p2p line %s, skipping it...\n", line);

-+			sprintf(msgbuf,"Short guarding.p2p line %s, skipping it...\n", line);

-+			log_action(msgbuf);

- 		}

- 	}

- 	if (line)

- 		free(line);

- 	fclose(fp);

--	fprintf(logfile,"Ranges loaded: %d\n",ntot);

--	printf("* Ranges loaded: %d\n",ntot);

-+	sprintf(msgbuf, "* Ranges loaded: %d\n", ntot);

-+	log_action(msgbuf);

-+	if ( !log2stdout )

-+		printf(msgbuf);

- }

- 

--void loadlist_pg2(char *filename)		// experimental, no check for list sanity

-+void loadlist_pg2(char *filename)		// supports only v2 files

- {

-     FILE *fp;

--    int i,retval,ntot=0;

--    char name[100],ipmin[16];			// hope we don't have a list with longer names...

-+    int i, j, c, retval=0, ntot=0;

-+    char name[100],ipmin[16], msgbuf[255];	// hope we don't have a list with longer names...

-     uint32_t start_ip, end_ip;

-     struct in_addr startaddr,endaddr;

-+	size_t s;

- 

-     fp=fopen(filename,"r");

-     if ( fp == NULL ) {

--        fprintf(logfile,"Error opening %s, aborting...\n", filename);

-+        sprintf(msgbuf, "Error opening %s, aborting...\n", filename);

-+        log_action(msgbuf);

-         exit(-1);

-     }

- 

--    fgetc(fp);					// skip first 4 bytes, don't know what they are

--    fgetc(fp);

--    fgetc(fp);

--    retval=fgetc(fp);

-+	for (j=0; j<4; j++) {

-+		c=fgetc(fp);

-+		if ( c != 0xff ) {

-+			sprintf(msgbuf,"Byte %d: 0x%x != 0xff, aborting...\n", j+1, c);

-+			log_action(msgbuf);

-+			fclose(fp);

-+			exit(-1);

-+		}

-+	}

-+	

-+	c=fgetc(fp);

-+	if ( c != 'P' ) {

-+		sprintf(msgbuf,"Byte 5: %c != P, aborting...\n", c);

-+		log_action(msgbuf);

-+		fclose(fp);

-+		exit(-1);

-+	}

-+

-+	c=fgetc(fp);

-+	if ( c != '2' ) {

-+		sprintf(msgbuf,"Byte 6: %c != 2, aborting...\n", c);

-+		log_action(msgbuf);

-+		fclose(fp);

-+		exit(-1);

-+	}

- 

--    while ( retval != EOF ) {

-+	c=fgetc(fp);

-+	if ( c != 'B' ) {

-+		sprintf(msgbuf,"Byte 7: %c != B, aborting...\n", c);

-+		log_action(msgbuf);

-+		fclose(fp);

-+		exit(-1);

-+	}

-+

-+	c=fgetc(fp);

-+	if ( c != 0x02 ) {

-+		sprintf(msgbuf,"Byte 8: version: %d != 2, aborting...\n", c);

-+		log_action(msgbuf);

-+		fclose(fp);

-+		exit(-1);

-+	}

-+

-+	do {

-         i=0;

-         do {

-             name[i]=fgetc(fp);

-@@ -244,9 +328,22 @@
-         } while ( name[i-1] != 0x00 && name[i-1] != EOF);

-         if ( name[i-1] != EOF ) {

-             name[i-1]='\0';

--            fread(&start_ip,4,1,fp);

--            fread(&end_ip,4,1,fp);

--            startaddr.s_addr=start_ip;

-+			s=fread(&start_ip,4,1,fp);

-+			if ( s != 1 ) {

-+				sprintf(msgbuf,"Failed to read start IP: %d != 1, aborting...\n", (int)s);

-+				log_action(msgbuf);

-+                fclose(fp);

-+                exit(-1);

-+            }

-+            s=fread(&end_ip,4,1,fp);

-+            if ( s != 1 ) {

-+                sprintf(msgbuf,"Failed to read end IP: %d != 1, aborting...\n", (int)s);

-+				log_action(msgbuf);

-+                fclose(fp);

-+                exit(-1);

-+            }

-+			

-+			startaddr.s_addr=start_ip;

-             endaddr.s_addr=end_ip;

-             strcpy(ipmin,inet_ntoa(startaddr));

-             ranged_insert(name,ipmin,inet_ntoa(endaddr));

-@@ -255,22 +352,25 @@
-         else {

-             retval=EOF;

-         }

--    }

-+    } while ( retval != EOF );

-     fclose(fp);

--    fprintf(logfile,"Ranges loaded: %d\n",ntot);

--	printf("* Ranges loaded: %d\n",ntot);

-+    sprintf(msgbuf, "* Ranges loaded: %d\n",ntot);

-+    log_action(msgbuf);

-+	if ( !log2stdout )

-+		printf(msgbuf);

- }

- 

- void loadlist_dat(char *filename)

- {

-     FILE *fp;

-     int ntot=0;

--    char readbuf[200], *name, start_ip[16], end_ip[16];

-+    char readbuf[200], *name, start_ip[16], end_ip[16], msgbuf[255];

-     unsigned short ip1_0, ip1_1, ip1_2, ip1_3, ip2_0, ip2_1, ip2_2, ip2_3;

-     

-     fp=fopen(filename,"r");

-     if ( fp == NULL ) {

--        fprintf(logfile,"Error opening %s, aborting...\n", filename);

-+        sprintf(msgbuf,"Error opening %s, aborting...\n", filename);

-+        log_action(msgbuf);

-         exit(-1);

-     }

-     

-@@ -286,38 +386,45 @@
-         ntot++;

-     }

-     fclose(fp);

--    fprintf(logfile,"Ranges loaded: %d\n",ntot);

--	printf("* Ranges loaded: %d\n",ntot);

-+    sprintf(msgbuf, "* Ranges loaded: %d\n", ntot);

-+    log_action(msgbuf);

-+	if ( !log2stdout )

-+		printf(msgbuf);

- }

- 

- void reopen_logfile(void)

- {

-+	char msgbuf[255];

-+

- 	if (logfile != NULL) {

-         	fclose(logfile);

- 		logfile=NULL;

- 	}

- 	logfile=fopen(logfile_name,"a");

- 	if (logfile == NULL) {

--		fprintf(stderr, "Unable to open logfile %s\n", logfile_name);

-+		sprintf(msgbuf, "Unable to open logfile %s\n", logfile_name);

-+		log_action(msgbuf);

- 		exit(-1);

- 	}

--	fprintf(logfile, "Reopening logfile.\n");

-+	log_action("Reopening logfile.\n");

- }

- 

- void my_sahandler(int sig)

- {

-+	char msgbuf[255];

-+

- 	switch( sig ) {

-         	case SIGUSR1:

--			fprintf(logfile,"Got SIGUSR1! Dumping stats...\n");

-+			log_action("Got SIGUSR1! Dumping stats...\n");

- 			ll_show(logfile);

- 			reopen_logfile();

- 			break;

- 		case SIGUSR2:

--			fprintf(logfile,"Got SIGUSR2! Dumping stats to /var/log/MoBlock.stats\n");

-+			log_action("Got SIGUSR2! Dumping stats to /var/log/MoBlock.stats\n");

- 			ll_log();

- 			break;

- 		case SIGHUP:

--			fprintf(logfile,"\nGot SIGHUP! Dumping and resetting stats, reloading blocklist\n\n");

-+			log_action("Got SIGHUP! Dumping and resetting stats, reloading blocklist\n");

- 			ll_log();

- 			ll_clear();		// clear stats list

- 			destroy_tree();		// clear loaded ranges

-@@ -332,17 +439,18 @@
- 					loadlist_pg2(blocklist_info.filename);

- 					break;

- 				default:

--					fprintf(logfile,"Unknown blocklist type while reloading list, contact the developer!\n");

-+					log_action("Unknown blocklist type while reloading list, contact the developer!\n");

- 					break;

- 			}

- 			reopen_logfile();

- 			break;

- 		case SIGTERM:

--			fprintf(logfile,"Got SIGTERM! Dumping stats and exiting.\n");

-+			log_action("Got SIGTERM! Dumping stats and exiting.\n");

- 			ll_log();

- 			exit(0);

- 		default:

--			fprintf(logfile,"Received signal = %d but not handled\n",sig);

-+			sprintf(msgbuf,"Received signal = %d but not handled\n",sig);

-+			log_action(msgbuf);

- 			break;

- 	}

- }

-@@ -378,7 +486,7 @@
- {

- 	int id=0, status=0;

- 	struct nfqnl_msg_packet_hdr *ph;

--	char *payload;

-+	char *payload, msgbuf[255];

- 	recType tmprec;

- 

- 	ph = nfq_get_msg_packet_hdr(nfa);

-@@ -389,34 +497,78 @@
- 		switch (ph->hook) {

- 			case NF_IP_LOCAL_IN:

- 				if ( find(ntohl(SRC_ADDR(payload)),&tmprec) == STATUS_OK ) {

-+					// we drop the packet instead of rejecting

-+					// we don't want the other host to know we are alive

- 					status=nfq_set_verdict(qh, id, NF_DROP, 0, NULL);

--					fprintf(logfile,"Blocked IN: %s,hits: %d,SRC: %s\n",tmprec.blockname,tmprec.hits,ip2str(SRC_ADDR(payload)));

--				} else status = nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL);

-+					sprintf(msgbuf,"Blocked IN: %s,hits: %d,SRC: %s\n",tmprec.blockname,tmprec.hits,ip2str(SRC_ADDR(payload)));

-+					log_action(msgbuf);

-+				}

-+				else if ( unlikely(accept_mark) ) {

-+					// we set the user-defined accept_mark and set NF_REPEAT verdict

-+					// it's up to other iptables rules to decide what to do with this marked packet

-+					status = nfq_set_verdict_mark(qh, id, NF_REPEAT, accept_mark, 0, NULL);

-+				     }

-+				     else {

-+				     	// no accept_mark, just NF_ACCEPT the packet

-+				     	status = nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL);

-+				     }

- 				break;

- 			case NF_IP_LOCAL_OUT:

- 				if ( find(ntohl(DST_ADDR(payload)),&tmprec) == STATUS_OK ) {

--					status=nfq_set_verdict(qh, id, NF_DROP, 0, NULL);

--					fprintf(logfile,"Blocked OUT: %s,hits: %d,DST: %s\n",tmprec.blockname,tmprec.hits,ip2str(DST_ADDR(payload)));

--				} else status = nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL);

-+					if ( likely(reject_mark) ) {

-+						// we set the user-defined reject_mark and set NF_REPEAT verdict

-+						// it's up to other iptables rules to decide what to do with this marked packet

-+						status = nfq_set_verdict_mark(qh, id, NF_REPEAT, reject_mark, 0, NULL);

-+					}

-+					else {

-+						status = nfq_set_verdict(qh, id, NF_DROP, 0, NULL);

-+					}

-+					sprintf(msgbuf,"Blocked OUT: %s,hits: %d,DST: %s\n",tmprec.blockname,tmprec.hits,ip2str(DST_ADDR(payload)));

-+					log_action(msgbuf);

-+				}

-+				else if ( unlikely(accept_mark) ) {

-+					// we set the user-defined accept_mark and set NF_REPEAT verdict

-+					// it's up to other iptables rules to decide what to do with this marked packet

-+ 				        status = nfq_set_verdict_mark(qh, id, NF_REPEAT, accept_mark, 0, NULL);

-+				     }

-+				     else {

-+					// no accept_mark, just NF_ACCEPT the packet

-+					status = nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL);

-+				     }

- 				break;

- 			case NF_IP_FORWARD:

- 				if ( find2(ntohl(SRC_ADDR(payload)), ntohl(DST_ADDR(payload)), &tmprec) == STATUS_OK ) {

--					status=nfq_set_verdict(qh, id, NF_DROP, 0, NULL);

--					fprintf(logfile,"Blocked FWD: %s,hits: %d,SRC: %s, DST: %s\n",

-+					if ( likely(reject_mark) ) {

-+						// we set the user-defined reject_mark and set NF_REPEAT verdict

-+						// it's up to other iptables rules to decide what to do with this marked packet

-+						status = nfq_set_verdict_mark(qh, id, NF_REPEAT, reject_mark, 0, NULL);

-+					}

-+					else {

-+						status = nfq_set_verdict(qh, id, NF_DROP, 0, NULL);

-+					}

-+					sprintf(msgbuf,"Blocked FWD: %s,hits: %d,SRC: %s, DST: %s\n",

- 								tmprec.blockname, tmprec.hits, ip2str(SRC_ADDR(payload)), ip2str(DST_ADDR(payload)));

--					fflush(logfile);

--				} else status = nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL);

-+					log_action(msgbuf);

-+				}

-+				else if ( unlikely(accept_mark) ) {

-+					// we set the user-defined accept_mark and set NF_REPEAT verdict

-+					// it's up to other iptables rules to decide what to do with this marked packet

-+					status = nfq_set_verdict_mark(qh, id, NF_REPEAT, accept_mark, 0, NULL);

-+				     }

-+				     else {

-+				     	// no accept_mark, just NF_ACCEPT the packet

-+					status = nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL);

-+				     }

- 				break;

- 			default:

--				fprintf(logfile,"Not NF_LOCAL_IN/OUT/FORWARD packet!\n");

-+				log_action("Not NF_LOCAL_IN/OUT/FORWARD packet!\n");

- 				break;

- 		}

- 	}

- 	else {

--		fprintf(logfile,"NFQUEUE: can't get msg packet header.\n");

-+		log_action("NFQUEUE: can't get msg packet header.\n");

- 		return(1);		// from nfqueue source: 0 = ok, >0 = soft error, <0 hard error

- 	}

--	fflush(logfile);

- 	return(0);

- }

- #endif

-@@ -492,46 +644,48 @@
- 	struct nfq_q_handle *qh;

- 	struct nfnl_handle *nh;

- 	int fd,rv;

--	char buf[BUFSIZE];

-+	char buf[BUFSIZE], msgbuf[255];

- 

- 	h = nfq_open();

- 	if (!h) {

--		fprintf(logfile, "Error during nfq_open()\n");

-+		log_action("Error during nfq_open()\n");

- 		exit(-1);

- 	}

- 

- 	if (nfq_unbind_pf(h, AF_INET) < 0) {

--		fprintf(logfile, "error during nfq_unbind_pf()\n");

--		exit(-1);

-+		log_action("error during nfq_unbind_pf()\n");

-+		//exit(-1);

- 	}

- 

- 	if (nfq_bind_pf(h, AF_INET) < 0) {

--		fprintf(logfile, "Error during nfq_bind_pf()\n");

-+		log_action("Error during nfq_bind_pf()\n");

- 		exit(-1);

- 	}

- 

--	fprintf(logfile,"NFQUEUE: binding to queue '%hd'\n", queuenum);

-+	sprintf(msgbuf,"NFQUEUE: binding to queue '%hd'\n", queuenum);

-+	log_action(msgbuf);

- 	qh = nfq_create_queue(h,  queuenum, &nfqueue_cb, NULL);

- 	if (!qh) {

--		fprintf(logfile, "error during nfq_create_queue()\n");

-+		log_action("error during nfq_create_queue()\n");

- 		exit(-1);

- 	}

- 

- 	if (nfq_set_mode(qh, NFQNL_COPY_PACKET, PAYLOADSIZE) < 0) {

--		fprintf(logfile, "can't set packet_copy mode\n");

-+		log_action("can't set packet_copy mode\n");

- 		exit(-1);

- 	}

- 

- 	nh = nfq_nfnlh(h);

- 	fd = nfnl_fd(nh);

- 

--	while ((rv = recv(fd, buf, sizeof(buf), 0)) && rv >= 0) {

-+	while ((rv = recv(fd, buf, sizeof(buf), 0)) >= 0) {

- 		nfq_handle_packet(h, buf, rv);

- 	}

- 

--	printf("NFQUEUE: unbinding from queue 0\n");

-+	log_action("NFQUEUE: unbinding from queue 0\n");

- 	nfq_destroy_queue(qh);

- 	nfq_close(h);

-+	nfq_unbind_pf(h, AF_INET);

- 	return(0);

- #endif

- 

-@@ -540,11 +694,16 @@
- void print_options(void)

- {

- 	printf("\nMoBlock %s by Morpheus",MB_VERSION);

--	printf("\nSyntax: MoBlock -dnp <blocklist> [-b] [-q 0-65535] <logfile>\n\n");

-+	printf("\nSyntax: MoBlock -dnp <blocklist> [-q 0-65535] <logfile>\n\n");

- 	printf("\t-d\tblocklist is an ipfilter.dat file\n");

- 	printf("\t-n\tblocklist is a peerguardian 2.x file (.p2b)\n");

- 	printf("\t-p\tblocklist is a peerguardian file (.p2p)\n");

- 	printf("\t-q\t0-65535 NFQUEUE number (as specified in --queue-num with iptables)\n");

-+	printf("\t-r MARK\tmark packet with MARK instead of DROP\n");

-+	printf("\t-a MARK\tmark packet with MARK instead of ACCEPT\n");

-+	printf("\t-l\tlog to stdout\n");

-+	printf("\t-s\tlog to syslog\n");

-+	printf("\t-t\tlog timestamping\n\n");

- }

- 

- void on_quit()

-@@ -556,6 +715,7 @@
- {

- 	int ret=0;

- 	unsigned short int queuenum=0;

-+	char msgbuf[255];

- 

- 	if (argc < 3) {

- 		print_options();

-@@ -591,10 +751,11 @@
- 	}

- 	logfile_name=malloc(strlen(argv[argc-1])+1);

- 	strcpy(logfile_name,argv[argc-1]);

-+	log2file = 1;

- 	printf("* Logging to %s\n",logfile_name);

- 	

- 	while (1) {		//scan command line options

--		ret=getopt(argc, argv, "d:n:p:q:");

-+		ret=getopt(argc, argv, "d:n:p:q:a:r:stl");

- 		if ( ret == -1 ) break;

- 		

- 		switch (ret) {

-@@ -619,6 +780,28 @@
- 			case 'q':

- 				queuenum=(unsigned short int)atoi(optarg);

- 				break;

-+			case 'r':

-+				reject_mark=(u_int32_t)atoi(optarg);

-+				printf("* DROP MARK: %d\n", reject_mark);

-+				reject_mark=htonl(reject_mark);

-+				break;

-+			case 'a':

-+				accept_mark=(u_int32_t)atoi(optarg);

-+				printf("* ACCEPT MARK: %d\n", accept_mark);

-+				accept_mark=htonl(accept_mark);

-+				break;

-+			case 's':

-+				log2syslog = 1;

-+				printf("* Logging to syslog\n");

-+				break;

-+			case 't':

-+				timestamp = 1;

-+				printf("* Log timestamp enabled\n");

-+				break;

-+			case 'l':

-+				log2stdout = 1;

-+				printf("* Log to stdout enabled\n");

-+				break;

- 			case '?':			// unknown option

- 				print_options();

- 				exit(-1);

-@@ -626,10 +809,14 @@
- 		}

- 	}

- 	

--	printf("* Merged ranges: %d\n", merged_ranges);

--	fprintf(logfile, "Merged ranges: %d\n", merged_ranges);

--	printf("* Skipped useless ranges: %d\n", skipped_ranges);

--	fprintf(logfile,"Skipped useless ranges: %d\n", skipped_ranges);

-+	sprintf(msgbuf, "* Merged ranges: %d\n", merged_ranges);

-+	log_action(msgbuf);

-+	if ( !log2stdout )

-+		printf(msgbuf);

-+	sprintf(msgbuf,"* Skipped useless ranges: %d\n", skipped_ranges);

-+	log_action(msgbuf);

-+	if ( !log2stdout )

-+		printf(msgbuf);

- 	fflush(NULL);

- 

- 	netlink_loop(queuenum);

-diff -Naur MoBlock-0.8_orig/README MoBlock-0.8/README
---- MoBlock-0.8_orig/README	2006-03-22 12:44:31.000000000 -0500
-+++ MoBlock-0.8/README	2007-11-22 08:10:44.000000000 -0500
-@@ -1,5 +1,5 @@
- 
--MoBlock README v0.8
-+MoBlock README v0.9
- http://moblock.berlios.de
- 
- .Introduction.
-@@ -47,6 +47,22 @@
- 	ip_conntrack           40044  1 ipt_state
- 	iptable_filter          2176  1
- 	ip_tables              17600  3 ipt_NFQUEUE,ipt_state,iptable_filter
-+	
-+	...and these with kernel 2.6.23 using NFQUEUE interface:
-+	
-+	nfnetlink_queue         9344  1
-+	nfnetlink               4568  2 nfnetlink_queue
-+	ipt_REJECT              3520  2
-+	xt_mark                 1600  2
-+	nf_conntrack_ipv4      12424  5
-+	iptable_filter          2308  1
-+	ip_tables              10328  1 iptable_filter
-+	xt_state                1984  5
-+	nf_conntrack           48356  2 nf_conntrack_ipv4,xt_state
-+	xt_NFQUEUE              1664  3
-+	x_tables               11396  5 ipt_REJECT,xt_mark,ip_tables,xt_state,xt_NFQUEUE
-+	
-+	(notice that ipt_NFQUEUE has changed to xt_NFQUEUE, same thing for other modules too)
- 
- 2) A valid guarding.p2p/ipfilter.dat/p2p.p2b host file in /etc ( /etc/guarding.p2p ).
-    MoBlock tries to skip malformed or duplicate ranges but
-@@ -140,8 +156,18 @@
-    To specify a NFQUEUE queue number:
- 
- 	./moblock -p /etc/guarding.p2p -q 5 MoBlock.log
-+	
-+   From version 0.9 MoBlock supports MARKing packets and RETURN them to
-+   iptables, there's an example start script (MoBlock-nfq-reject.sh) that
-+   uses this feature to REJECT packet instead of dropping them. It can help
-+   in complex firewall configuration where you need more control of packets
-+   flow after MoBlock inspection.
-+   See the mentioned start script for reference, you can set the MARK value
-+   for packets that MoBlock would drop (ip in list) with the "-r" command line
-+   option and for packets that MoBlock would accept (ip not in list) with
-+   the "-a" command line option.
- 
--   To stop it:
-+   To stop MoBlock:
- 
-    kill -TERM <MoBlockPid>
- 
-@@ -149,7 +175,7 @@
-    To obtain stats about blocked ranges while it's running:
- 
-    kill -USR1 <MoBlockPid>	# write stats to logfile
--   kill -USR2 <MoBlockPid>      # write stats to /var/log/MoBlock.stats
-+   kill -USR2 <MoBlockPid>  # write stats to /var/log/MoBlock.stats
- 
- ** NEW: to reload the blocklist while MoBlock is running send to it the
-    HUP signal:
-@@ -168,7 +194,10 @@
-   took some code and ideas from his FTwall
- - Andrew de Quincey (adq at lidskialf dot net) for regular expressions
-   and command line args patch
--- Maximilian Mehnert (clessing at freenet dot de) for logfile rotation
-+- clessing at freenet dot de for logfile rotation
-   patches, pid file creation, start script, fixes/files for debian packaging
-+- David Walluck, patch for proper loading of p2b files
-+- jre, for continuing clessing work on debian packaging and many other
-+  contributions
- 
--Last Updated: 20/Mar/2006
-+Last Updated: 15/Oct/2007
-diff -Naur MoBlock-0.8_orig/rbt.c MoBlock-0.8/rbt.c
---- MoBlock-0.8_orig/rbt.c	2006-03-22 12:44:31.000000000 -0500
-+++ MoBlock-0.8/rbt.c	2008-02-10 11:56:08.000000000 -0500
-@@ -19,7 +19,7 @@
- #include <stdarg.h>
- #include <time.h>
- 
--#define RBT_VERSION 0.8
-+#define RBT_VERSION 0.9
- #define BNAME_LEN	80
- 
- /* implementation dependend declarations */
-@@ -421,7 +421,7 @@
- 
- statusEnum insert(keyType key, recType *rec) {
-     nodeType *current, *parent, *x;
--	keyType tmpkey;
-+	//keyType tmpkey;
- 	recType tmprec;
- 	int ret;
- 	
-@@ -433,6 +433,23 @@
-     current = root;
-     parent = 0;
-     while (current != NIL) {
-+		if (compEQ2(current->key, key, rec->ipmax)) {	// current node key is inside new range to be inserted
-+			strcpy(tmprec.blockname, rec->blockname);	// block name from new range
-+			if (compLT(current->rec.ipmax, rec->ipmax))
-+				tmprec.ipmax = rec->ipmax;
-+			else tmprec.ipmax = current->rec.ipmax;
-+			tmprec.hits = 0;
-+			//printf("deleting node :%lu\n", current->key);
-+			ret=delete(current->key);
-+			if ( ret != STATUS_OK )
-+				return(ret);
-+			ret=insert(key, &tmprec);
-+			if ( ret == STATUS_OK ) {
-+				printf("new merge\n");
-+				return(STATUS_MERGED);
-+			}
-+			else return(ret);
-+		}
-         if (compEQ(key, current->key)) {
- 			if ( rec->ipmax > current->rec.ipmax ) {
- 				current->rec.ipmax=rec->ipmax;
-@@ -458,7 +475,7 @@
- 			}
- 		}
- 		//check if higher ip (ipmax) is already in a range
--		if (compEQ2(rec->ipmax,current->key,current->rec.ipmax)) {
-+		/*if (compEQ2(rec->ipmax,current->key,current->rec.ipmax)) {
- 			fprintf(logfile,"higher ip in range\n");
- 			tmpkey=key;
- 			strcpy(tmprec.blockname,current->rec.blockname);
-@@ -470,7 +487,7 @@
- 			if ( ret == STATUS_OK )
- 				return(STATUS_MERGED);
- 			else return(ret);
--		}
-+		}*/
-         parent = current;
-         current = compLT(key, current->key) ?
-             current->left : current->right;
-@@ -495,7 +512,7 @@
-     } else {
-         root = x;
-     }
--
-+	//printf("new node, key: %lu, parent: %lu\n", x->key, parent ? parent->key : 0);
-     insertFixup(x);
-     lastFind = NULL;
- 
diff --git a/abs/extra-testing/community/moblock/moblock_include.patch b/abs/extra-testing/community/moblock/moblock_include.patch
deleted file mode 100644
index 644e824..0000000
--- a/abs/extra-testing/community/moblock/moblock_include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- MoBlock-0.8/MoBlock.c.orig	2008-08-15 14:41:49.000000000 -0400
-+++ MoBlock-0.8/MoBlock.c	2008-08-15 14:43:45.000000000 -0400
-@@ -32,6 +32,7 @@
- #include <netinet/udp.h>

- #include <sys/socket.h>

- #include <arpa/inet.h>

-+#include <limits.h>

- #include <linux/netfilter_ipv4.h>

- #include <signal.h>

- #include <regex.h>

diff --git a/abs/extra-testing/community/mobloquer/PKGBUILD b/abs/extra-testing/community/mobloquer/PKGBUILD
deleted file mode 100644
index b6254d5..0000000
--- a/abs/extra-testing/community/mobloquer/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: Daniele Marinello <marinz att email dot it>
-
-pkgname=mobloquer
-pkgver=0.6
-pkgrel=6
-pkgdesc="A graphical front end for moblock"
-arch=('i686' 'x86_64')
-url="http://mobloquer.foutrelis.com/"
-license=('GPL')
-depends=('qt' 'blockcontrol')
-source=(http://downloads.sourceforge.net/mobloquer/$pkgname-$pkgver.tar.gz)
-md5sums=('6363ee4c42da1d85367fdd65d4bf42ca')
-
-build() {
- 
-  cd $startdir/src/$pkgname-$pkgver
-  
-  qmake
-  make || return 1
-
-  install -d ${pkgdir}/usr/share/applications ${pkgdir}/usr/bin ${pkgdir}/usr/share/pixmaps
-  install -m 644 -p $startdir/src/$pkgname-$pkgver/images/mobloquer.png $startdir/pkg/usr/share/pixmaps/
-  install -m 644 -p $startdir/src/$pkgname-$pkgver/other/Mobloquer.desktop $startdir/pkg/usr/share/applications/
-  install -m 755 -p $startdir/src/$pkgname-$pkgver/mobloquer $startdir/pkg/usr/bin/mobloquer
-}
-
diff --git a/abs/extra-testing/community/motion-svn/PKGBUILD b/abs/extra-testing/community/motion-svn/PKGBUILD
deleted file mode 100644
index dcbd162..0000000
--- a/abs/extra-testing/community/motion-svn/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: Demind <demind@gmail.com>
-pkgname=motion-svn
-pkgver=1
-pkgrel=1
-pkgdesc="Motion is a software motion detector. It grabs images from video4linux devices and/or from webcams."
-arch=('i686' 'x86_64')
-url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
-license=('GPL2')
-depends=('zlib' 'libjpeg')
-makedepends=('subversion')
-provides=('motion')
-conflicts=('motion')
-install="motion-svn.install"
-source=('rc.motion')
-md5sums=('fc09828564850824f8549d258053e0b6')
-
-_svntrunk=http://www.lavrsen.dk/svn/motion/trunk/
-_svnmod=motion
-
-build() {
-  cd $startdir/src
-
-  msg "Retrieving sources"
-  svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-
-  [ -d ./$_svnmod-build ] && rm -fr ./$_svnmod-build
-  cp -r ./$_svnmod ./$_svnmod-build
-  cd ./$_svnmod-build
-
-  msg "SVN checkout done or server timeout"
-  msg "Starting build"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc
-
-  make || return 1
-  make DESTDIR=$startdir/pkg/ install || return 1
-  install -D -m755 $startdir/src/rc.motion $startdir/pkg/etc/rc.d/motion
-  rm -rf $startdir/src/$_svnmod-build
-}
-
diff --git a/abs/extra-testing/community/motion-svn/motion-svn.install b/abs/extra-testing/community/motion-svn/motion-svn.install
deleted file mode 100644
index f88a2fc..0000000
--- a/abs/extra-testing/community/motion-svn/motion-svn.install
+++ /dev/null
@@ -1,11 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  echo ""
-  echo ">>> An example configuration has been saved to /etc/motion-dispatch.conf"
-}
-
-op=$1
-shift
-[ "$(type -t "$op")" = "function" ] && $op "$@"
-
-# vim:set ts=2 et:
diff --git a/abs/extra-testing/community/motion-svn/rc.motion b/abs/extra-testing/community/motion-svn/rc.motion
deleted file mode 100644
index 7dd027c..0000000
--- a/abs/extra-testing/community/motion-svn/rc.motion
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/motion`
-case "$1" in
-  start)
-    stat_busy "Starting Motion"
-    [ -z "$PID" ] && /usr/bin/motion
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon motion
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Motion"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon motion
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/abs/extra-testing/community/mozplugger/ChangeLog b/abs/extra-testing/community/mozplugger/ChangeLog
deleted file mode 100644
index 048d061..0000000
--- a/abs/extra-testing/community/mozplugger/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-2008-12-07  Allan McRae <allan@archlinux.org>
-	* mozplugger 1.12.0-1
-	* upstream update
-
-2008-01-14  JJDaNiMoTh <jjdanimoth.aur@gmail.com>
-	* Version bump to 1.10.1
-	* Added mozplugger.install
diff --git a/abs/extra-testing/community/mozplugger/PKGBUILD b/abs/extra-testing/community/mozplugger/PKGBUILD
deleted file mode 100644
index b2fdbcd..0000000
--- a/abs/extra-testing/community/mozplugger/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD,v 1.14 2008/12/07 05:27:24 allan Exp $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Todd Musall <tmusall@comcast.net>
-
-pkgname=mozplugger
-pkgver=1.12.0
-pkgrel=1
-pkgdesc="A Mozilla & Firefox multimedia plugin."
-arch=('i686' 'x86_64')
-url="http://mozplugger.mozdev.org"
-license="GPL"
-depends=('libx11')
-backup=(etc/mozpluggerrc)
-source=(http://$pkgname.mozdev.org/files/$pkgname-$pkgver.tar.gz)
-md5sums=('6d4dd7b1c577f625c9d664532389d6db')
-install=$pkgname.install
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  make linux || return 1
-  install -Dm755 mozplugger.so $pkgdir/usr/lib/mozilla/plugins/mozplugger.so
-  install -Dm644 mozpluggerrc $pkgdir/etc/mozpluggerrc
-  install -Dm755 mozplugger-helper $pkgdir/usr/bin/mozplugger-helper
-  install -Dm755 mozplugger-controller $pkgdir/usr/bin/mozplugger-controller
-  install -Dm644 mozplugger.7 $pkgdir/usr/share/man/man7/mozplugger.7
-}
diff --git a/abs/extra-testing/community/mozplugger/mozplugger.install b/abs/extra-testing/community/mozplugger/mozplugger.install
deleted file mode 100644
index 1a08b9d..0000000
--- a/abs/extra-testing/community/mozplugger/mozplugger.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- echo -en "
-==> You may need to delete your local $HOME/.mozilla/firefox/pluginreg.dat 
-==> file for mozplugger to be enabled correctly after you update it. 
-==> (It will get regenerated). 
-==> To add more helpers, edit /etc/mozpluggerrc. 
-==> The window name can be obtained using the utility xprop(1x).
-==> Type "xprop WM_CLASS" and click on a window.\n"
-}
-
-post_upgrade() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/abs/extra-testing/community/mpc/ChangeLog b/abs/extra-testing/community/mpc/ChangeLog
deleted file mode 100644
index b645e19..0000000
--- a/abs/extra-testing/community/mpc/ChangeLog
+++ /dev/null
@@ -1,15 +0,0 @@
-2009-03-11  Alexander Fehr  <pizzapunk gmail com>
-
-  * mpc-0.15-1:
-  New upstream release.
-  Changed license to GPL2.
-
-2008-12-22  Alexander Fehr  <pizzapunk gmail com>
-
-  * mpc-0.14-1:
-  New upstream release.
-  New maintainer.
-  Changed url.
-  Added !emptydirs option.
-  Changed download location to downloads.sourceforge.net.
-  Added ChangeLog.
diff --git a/abs/extra-testing/community/mpc/PKGBUILD b/abs/extra-testing/community/mpc/PKGBUILD
deleted file mode 100644
index 345a2d6..0000000
--- a/abs/extra-testing/community/mpc/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 33671 2009-04-04 15:49:53Z alexanderf $
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Link Dupont <link@subpop.net>
-
-pkgname=mpc
-pkgver=0.15
-pkgrel=1
-pkgdesc="Minimalist command line interface to MPD"
-arch=('i686' 'x86_64')
-url="http://mpd.wikia.com/wiki/Client:Mpc"
-license=('GPL2')
-depends=('glibc')
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/musicpd/mpc-$pkgver.tar.bz2)
-md5sums=('48897aeb3a7ee5c64f30e56789f105a8')
-
-build() {
-  cd "$srcdir/mpc-$pkgver"
-
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
-
-  # Install bash completion file
-  install -D -m644 doc/mpc-bashrc "$pkgdir/etc/bash_completion.d/mpc" || return 1
-}
diff --git a/abs/extra-testing/community/mpd/PKGBUILD b/abs/extra-testing/community/mpd/PKGBUILD
deleted file mode 100644
index 75a79ee..0000000
--- a/abs/extra-testing/community/mpd/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 27462 2009-02-22 02:31:36Z eric $
-# Maintainer: Damir Perisa <damir.perisa@bluewin.ch>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=mpd
-pkgver=0.15.3
-pkgrel=1
-pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://musicpd.org"
-depends=('libid3tag' 'libmad' 'flac>=1.1.3' 'audiofile' 'faad2>=2.6' 'libmikmod'
-         'alsa-lib' 'libshout' 'libmpcdec>=1.2.5' 'libsamplerate' 'libao' 'ffmpeg'
-	 'wavpack' 'glib2' 'curl')
-install=mpd.install
-source=(http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.gz
-        'mpd')
-md5sums=('43e854e7f46ac87bb1f1a7247ae4b902'
-         'b1fd15de359db08e4b9ae4b199640f0e')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --disable-jack \
-    --enable-ao --enable-mod \
-    --with-zeroconf=no
-  make || return 1
-  make DESTDIR=${pkgdir} install
-
-  # set ours dirs in mpd.conf file
-  sed -i 's|music_directory.*$|#music_directory "path_to_your_music_collection"|1' doc/mpdconf.example
-  sed -i 's|playlist_directory.*$|playlist_directory "/var/lib/mpd/playlists"|1' doc/mpdconf.example
-  sed -i 's|db_file.*$|db_file "/var/lib/mpd/mpd.db"|1' doc/mpdconf.example
-  sed -i 's|log_file.*$|log_file "/var/log/mpd/mpd.log"|1' doc/mpdconf.example
-  sed -i 's|error_file.*$|error_file "/var/log/mpd/mpd.error"|1' doc/mpdconf.example
-  sed -i 's|#pid_file.*$|pid_file "/var/run/mpd/mpd.pid"|1' doc/mpdconf.example
-  sed -i 's|#state_file.*$|state_file "/var/lib/mpd/mpdstate"|1' doc/mpdconf.example
-  sed -i 's|#user.*$|user "mpd"|1' doc/mpdconf.example
-
-  install -Dm644 doc/mpdconf.example ${pkgdir}/etc/mpd.conf.example || return 1
-
-  install -D ${srcdir}/mpd ${pkgdir}/etc/rc.d/mpd || return 1
-  install -d ${pkgdir}/var/lib/mpd/playlists ${pkgdir}/var/log/mpd ${pkgdir}/var/run/mpd
-}
diff --git a/abs/extra-testing/community/mpd/mpd b/abs/extra-testing/community/mpd/mpd
deleted file mode 100755
index 76ec1c0..0000000
--- a/abs/extra-testing/community/mpd/mpd
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting Music Player Daemon"
-    /usr/bin/mpd /etc/mpd.conf &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon mpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Music Player Daemon"
-    /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mpd
-      stat_done
-    fi
-    ;;
-  create-db)
-    stat_busy "Creating mpd's database ..."
-	logpath="/var/log/mpd/mpd.db-creation"
-    /usr/bin/mpd --create-db /etc/mpd.conf > $logpath \
-        && stat_busy "Output written to $logpath"
-              stat_done
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|create-db}"
-esac
-exit 0
diff --git a/abs/extra-testing/community/mpd/mpd.install b/abs/extra-testing/community/mpd/mpd.install
deleted file mode 100644
index e44c9be..0000000
--- a/abs/extra-testing/community/mpd/mpd.install
+++ /dev/null
@@ -1,23 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  echo "==> mpd: Create a config under /etc/mpd.conf before using MPD (Example: /etc/mpd.conf.example)"
-  groupadd -g 45 mpd &>/dev/null
-  useradd -u 45 -g mpd -d /var/lib/mpd -s /bin/true mpd &>/dev/null
-  gpasswd -a mpd audio &>/dev/null
-  chown mpd:mpd -R /var/{lib,log,run}/mpd
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  if [ "$(vercmp $2 0.12)" -lt 0 ]; then
-    echo "==> mpd: upgrade from 0.11 -> 0.12: configuration file syntax changed, "
-    echo "==> mpd: make sure to update your configuration file! example conf: /etc/mpd.conf.example"
-  fi
-  chown mpd:mpd -R /var/{lib,log,run}/mpd
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  userdel mpd &>/dev/null
-}
diff --git a/abs/extra-testing/community/mre/PKGBUILD b/abs/extra-testing/community/mre/PKGBUILD
deleted file mode 100644
index 0987904..0000000
--- a/abs/extra-testing/community/mre/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-arch=('i686')
-pkgname=mre
-pkgver=1.1.2
-pkgrel=5
-_kernver=2.6.28-LinHES
-pkgdesc="Myth Recording Extender"
-url="http://sourceforge.net/projects/mythtv-tools/"
-license=('GPL-2')
-depends=('PearDB' 'PearLog')
-makedepends=()
-source=('mre-1.1.2.tar.gz' 'patch.diff' 'run' 'mre.lr')
-install=('mre.install')
-
-build() {
-	cd $startdir/src/mre-1.1.2/
-	patch -p0 < ../patch.diff
-	./configure
-	make INST_ROOT=$startdir/pkg install
-	cp $startdir/src/mre-1.1.2/conf/mre.conf $startdir/pkg/etc/mre.conf
-	cp $startdir/src/mre-1.1.2/test/test_title_subtitle.php\
-     		$startdir/pkg/usr/local/bin/
-	chmod a+x $startdir/pkg/usr/local/bin/test_title_subtitle.php
-	rm -r $startdir/pkg/etc/init.d
-	mkdir -p $startdir/pkg/var/log/mre
-	chown root:log "$startdir/pkg/var/log/mre"
-	touch $startdir/pkg/var/log/mre/mre.log
-	chown mythtv:mythtv "$startdir/pkg/var/log/mre/mre.log"
-	mkdir -p $startdir/pkg/etc/sv/mre
-	cp $startdir/src/run $startdir/pkg/etc/sv/mre/run
-	mkdir -p $startdir/pkg/etc/logrotate.d
-	cp $startdir/src/mre.lr $startdir/pkg/etc/logrotate.d/mre.lr
-}
-
-md5sums=('8ab312e7597ae9413a57bd5e9a068096'
-         'ed6cb9012c88d589e26132796132bf25'
-         '10e01d572b45ad718e49ff9ef5c230c5'
-         '6d71ab57afd974c5130c994b94e8746f')
diff --git a/abs/extra-testing/community/mre/mre-1.1.2.tar.gz b/abs/extra-testing/community/mre/mre-1.1.2.tar.gz
deleted file mode 100644
index 3846e4b..0000000
--- a/abs/extra-testing/community/mre/mre-1.1.2.tar.gz
+++ /dev/null
diff --git a/abs/extra-testing/community/mre/mre.install b/abs/extra-testing/community/mre/mre.install
deleted file mode 100755
index bb08427..0000000
--- a/abs/extra-testing/community/mre/mre.install
+++ /dev/null
@@ -1,20 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-	add_service.sh mre
-	sed -i.pacsave '/^open_basedir/s|$|:/var/log/mre:/usr/local/lib/mre|' /etc/php/php.ini
-}
-
-post_upgrade() {
-	/bin/true
-}
-
-
-# arg 1:  the old package version
-post_remove() {
-	remove_service.sh mre
-	sed -i.pacsave '/^open_basedir/s|:/var/log/mre:/usr/local/lib/mre||' /etc/php/php.ini
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/community/mre/mre.lr b/abs/extra-testing/community/mre/mre.lr
deleted file mode 100644
index 3b54c23..0000000
--- a/abs/extra-testing/community/mre/mre.lr
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/mre/mre.log {
-	copytruncate
-	daily
-	size 10M
-	missingok
-	rotate 7
-	compress
-	notifempty
-}
diff --git a/abs/extra-testing/community/mre/patch.diff b/abs/extra-testing/community/mre/patch.diff
deleted file mode 100644
index 38a501a..0000000
--- a/abs/extra-testing/community/mre/patch.diff
+++ /dev/null
@@ -1,293 +0,0 @@
---- ../mre-1.1.2/class/MythClient.php.original	2006-04-05 17:39:13.000000000 -0500
-+++ ../mre-1.1.2/class/MythClient.php	2010-05-14 10:16:54.000000000 -0500
-@@ -112,7 +112,7 @@
-          return '0';
-       }
-       foreach($out as $line)
--         if(preg_match('/^Library API version: (.*)$/', $line, $matches))
-+         if(preg_match('/^Library API *: (.*)$/', $line, $matches))
-             return $matches[1];
-       return '0';
-    }
---- ../mre-1.1.2/conf/mre.conf.in.original	2006-08-13 16:48:57.000000000 -0500
-+++ ../mre-1.1.2/conf/mre.conf.in	2010-05-04 00:25:26.000000000 -0500
-@@ -28,9 +28,9 @@
- ; *** Application settings
- ; Unprivledged user to run as, if started as root
- ; This script will not run as root
--user = nobody
-+user = mythtv
- ; Run MRE as daemon?  Requires pcntl_* functions built into PHP
--daemon = true
-+daemon = false
- ; Number of minutes to sleep between runs
- sleep = 5
- ; Logging level (0 = normal, 1 = +error, 2 = +warning, 3 = +debug)
---- ../mre-1.1.2/class/EventFactory.php.original	2006-09-22 10:18:07.000000000 -0500
-+++ ../mre-1.1.2/class/EventFactory.php	2010-08-28 00:02:37.000000000 -0500
-@@ -50,7 +50,7 @@
-                $obj = new NHLEvent($data['subtitle']); break;
-             case 'MLB Baseball':
-                $obj = new MLBEvent($data['subtitle']); break;
--            case 'NFL Football':
-+            case ($data['title']=='NFL Football' || $data['title']=='NFL Preseason Football'):
-                $obj = new NFLEvent($data['subtitle']); break;
-             case 'College Football':
-                $obj = new NCAAFEvent($data['subtitle']); break;
---- ../mre-1.1.2/class/MLBEvent.php.original	2006-11-05 17:06:57.000000000 -0600
-+++ ../mre-1.1.2/class/MLBEvent.php	2010-08-28 00:02:37.000000000 -0500
-@@ -27,7 +27,7 @@
-    /**
-     * URL to grab game info from
-     */
--   const url = 'http://scores.espn.go.com/mlb/scoreboard';
-+   const url = 'http://sports.espn.go.com/mlb/bottomline/scores';
- 
-    /**
-     * Class constructor.
-@@ -43,41 +43,25 @@
-          trigger_error("Unable to generate valid search terms! [$gameInfo]", E_USER_WARNING);
-       else
-       {
--         $data = file(self::url);
--         $games = array();
--         if($data !== FALSE)
--         {
--            // Split the huge string into individual game data
--            foreach($data as $line)
--               if(preg_match('/\<div id="allGames".*\>.*/', $line))
--               {
--                  while(($loc = strrpos($line, 'teamTop')) !== FALSE)
--                  {
--                     $games[] = substr($line, $loc);
--                     $line = substr($line, 0, $loc);
--                  }
--                  break;
--               }
--            if(!sizeof($games))
--               trigger_error("Unable to find valid game data within source!", E_USER_WARNING);
--            foreach($criteria as $term)
--            {
--               foreach($games as $game)
--               {
--                  if(preg_match('/' . preg_quote($term) . '/', $game))
--                     if(preg_match('/teamTop.*\>(.*)\<\/td\>/U', $game, $matches))
--                     {
--                        $this->setStatus($matches[1]);
--                        if(preg_match('/^(Final|Postponed)/', $matches[1]))
--                           $this->setEventOver(TRUE);
--                        else
--                           $this->setEventOver(FALSE);
--                        $this->setValid(TRUE);
--                        break 2;
--                     }
--               }
-+	 $data = file(self::url);
-+         if($data)
-+	 {
-+	    $data_array=explode("&", $data[0]);
-+	    foreach($data_array as $line)
-+	    {
-+	       $line=str_replace("%20", " ", $line);
-+	       $line=str_replace("Chicago Sox", "Chicago White Sox", $line); #Program guide gives Chicago White Sox, website gives Chicago Sox 
-+              if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1])))
-+   	       {
-+     		  if((strpos($line,'FINAL'))or(strpos($line,'Postponed'))) 
-+ 		     $this->setEventOver(TRUE);
-+  		  else
-+  		     $this->setEventOver(FALSE);
-+  		  $this->setValid(TRUE);
-+  		  break;
-+  	       }
-             }
--         }
-+	 }
-       }
-       if(!$this->isValid())
-          trigger_error("Unable to find MLB info for '$gameInfo'!  The MLB parser may need to be updated.", E_USER_WARNING);
---- ../mre-1.1.2/class/NFLEvent.php.original	2006-11-05 17:06:57.000000000 -0600
-+++ ../mre-1.1.2/class/NFLEvent.php	2010-08-28 00:06:56.000000000 -0500
-@@ -27,7 +27,7 @@
-    /**
-     * URL to grab game info from
-     */
--   const url = 'http://scores.espn.go.com/nfl/scoreboard';
-+   const url = 'http://sports.espn.go.com/nfl/bottomline/scores';
- 
-    /**
-     * Class constructor.
-@@ -44,33 +44,23 @@
-       else
-       {
-          $data = file(self::url);
--         $games = array();
--         if($data !== FALSE)
--         {
--            // Split the huge string into individual game data
--            foreach($data as $line)
--               if(preg_match('/\<td class="teamTop.*".*\>.*/', $line))
--                  $games[] = $line;
--            if(!sizeof($games))
--               trigger_error("Unable to find valid game data within source!", E_USER_WARNING);
--            foreach($criteria as $term)
--            {
--               foreach($games as $game)
--               {
--                  if(preg_match('/' . preg_quote($term) . '/', $game))
--                     if(preg_match('/teamTop.*\>(.*)\<\/td\>/U', $game, $matches))
--                     {
--                        $this->setStatus($matches[1]);
--                        if(preg_match('/^(Final|Postponed)/', $matches[1]))
--                           $this->setEventOver(TRUE);
--                        else
--                           $this->setEventOver(FALSE);
--                        $this->setValid(TRUE);
--                        break 2;
--                     }
--               }
--            }
--         }
-+	 if($data)
-+	 {
-+	    $data_array=explode("&", $data[0]);	 
-+	    foreach($data_array as $line)
-+	    {
-+	       $line=str_replace("%20", " ", $line);
-+              if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1])))
-+	       {
-+		  if(strpos($line,'FINAL'))
-+		     $this->setEventOver(TRUE);
-+		  else
-+		     $this->setEventOver(FALSE);
-+		  $this->setValid(TRUE);
-+		  break;
-+	       }
-+	    }
-+	 }
-       }
-       if(!$this->isValid())
-          trigger_error("Unable to find NFL info for '$gameInfo'!  The NFL parser may need to be updated.", E_USER_WARNING);
---- ../mre-1.1.2/class/NBAEvent.php.original	2006-11-05 17:06:57.000000000 -0600
-+++ ../mre-1.1.2/class/NBAEvent.php	2010-08-28 00:09:50.000000000 -0500
-@@ -27,7 +27,7 @@
-    /**
-     * URL to grab game info from
-     */
--   const url = 'http://scores.espn.go.com/nba/scoreboard';
-+   const url = 'http://sports.espn.go.com/nba/bottomline/scores';
- 
-    /**
-     * Class constructor.
-@@ -44,35 +44,23 @@
-       else
-       {
-          $data = file(self::url);
--         if($data !== FALSE)
--            foreach($criteria as $term)
--            {
--               $status = '';
--               $i = 0;
--               while($i < sizeof($data))
--               {
--                  if(preg_match('/' . preg_quote($term) . '/', $data[$i]))
--                  {
--                     $status = $data[$i];
--                     break;
--                  }
--                  ++$i;
--               }
--               if($i == sizeof($data))
--                  --$i;
--
--               if(preg_match('/id.*clock"\>(.*)\<\/div/U', $data[$i], $match) ||
--                  preg_match('/id.*clock"\>(.*)\<\/div/U', $data[$i-1], $match))
--               {
--                  $this->setStatus($match[1]);
--                  if(preg_match('/^Final/', $match[1]))
--                     $this->setEventOver(TRUE);
--                  else
--                     $this->setEventOver(FALSE);
--                  $this->setValid(TRUE);
--                  break;
--               }
-+         if($data)
-+	 {
-+	    $data_array=explode("&", $data[0]);
-+            foreach($data_array as $line)
-+	    {
-+	       $line=str_replace("%20", " ", $line);
-+              if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1])))
-+  	       {
-+       		  if(strpos($line,'FINAL')) 
-+ 		     $this->setEventOver(TRUE);
-+  		  else
-+  		     $this->setEventOver(FALSE);
-+  		  $this->setValid(TRUE);
-+ 		  break;
-+  	       }
-             }
-+         }
-       }
-       if(!$this->isValid())
-          trigger_error("Unable to find NBA info for '$gameInfo'!  The NBA parser may need to be updated.", E_USER_WARNING);
---- ../mre-1.1.2/class/NHLEvent.php.original	2006-11-05 17:06:57.000000000 -0600
-+++ ../mre-1.1.2/class/NHLEvent.php	2010-08-28 00:09:04.000000000 -0500
-@@ -27,7 +27,7 @@
-    /**
-     * URL to grab game info from
-     */
--   const url = 'http://scores.espn.go.com/nhl/scoreboard';
-+   const url = 'http://sports.espn.go.com/nhl/bottomline/scores';
- 
-    /**
-     * Class constructor.
-@@ -39,32 +39,29 @@
-       parent::__construct();
- 
-       $criteria = $this->generateSearchTerms($gameInfo);
-+      
-       if(!sizeof($criteria))
-          trigger_error("Unable to generate valid search terms! [$gameInfo]", E_USER_WARNING);
-       else
-       {
-          $data = file(self::url);
--         if($data !== FALSE)
--            foreach($criteria as $term)
--            {
--               $status = '';
--               foreach($data as $line)
--                  if(preg_match('/' . preg_quote($term) . '/', $line))
--                  {
--                     $status = $line;
--                     break;
--                  }
--               if(preg_match('/id.*st"\>(.*)\<\/td/U', $status, $match))
--               {
--                  $this->setStatus($match[1]);
--                  if(preg_match('/^Final/', $match[1]))
--                     $this->setEventOver(TRUE);
--                  else
--                     $this->setEventOver(FALSE);
--                  $this->setValid(TRUE);
--                  break;
--               }
-+         if($data)
-+	 {
-+	    $data_array=explode("&", $data[0]);
-+            foreach($data_array as $line)
-+	    {
-+	       $line=str_replace("%20", " ", $line);
-+              if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1])))
-+	       {
-+		  if(strpos($line,'FINAL')) 
-+		     $this->setEventOver(TRUE);
-+		  else
-+		     $this->setEventOver(FALSE);
-+		  $this->setValid(TRUE);
-+		  break;
-+	       }
-             }
-+         }
-       }
-       if(!$this->isValid())
-          trigger_error("Unable to find NHL info for '$gameInfo'!  The NHL parser may need to be updated.", E_USER_WARNING);
\ No newline at end of file
diff --git a/abs/extra-testing/community/mre/run b/abs/extra-testing/community/mre/run
deleted file mode 100755
index 94381b3..0000000
--- a/abs/extra-testing/community/mre/run
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting mythrecordingextender"
-
-export HOME=/home/mythtv
-
-sv start mythbackend || exit 1
-sleep 5
-
-exec /usr/local/bin/mre.php
diff --git a/abs/extra-testing/community/mythpywii/CONTROLS b/abs/extra-testing/community/mythpywii/CONTROLS
deleted file mode 100644
index d733964..0000000
--- a/abs/extra-testing/community/mythpywii/CONTROLS
+++ /dev/null
@@ -1,25 +0,0 @@
-    * Keypad : same as keypad on keyboard
-    * A : Enter (Accept, OK, next, .)
-    * Minus (-) : d (Delete)
-    * Home : escape (Exit to previous menu/exit mythfrontend)
-    * Plus (+) : p (Play/pause)
-    * 1 : Info
-    * 2 : Menu
-    * B + left : rewind to beginning of video
-    * B + twist wiimote : rewind (if twisted to the left) or fastforward
-      (otherwise) with speed dependant on twist amount.
-    * B + A + twist wiimote: timestretching . slower (if twisted left) or
-      faster (if twisted right)
-
-A comment on twisting:
-Point the wii remote at the screen, and twist from the elbow so that it
- continues to point at the screen.
-
-The maximum fastforward/rewind speed is 180x. The speeds are dictated by
-mythfrontend itself. When you rotate the wiimote, you will feel a slight
-vibration (0.05 seconds) to let you know you have gone up or down a speed
-segment. To stop fastforwarding/rewinding, simply let go of B.
-
-Beware: there is no power saving built in. However you should be able to
-turn the wiimote off (power button) when not in use, and turn it back on
-by holding down 1 and 2 to make it sync.
diff --git a/abs/extra-testing/community/mythpywii/PKGBUILD b/abs/extra-testing/community/mythpywii/PKGBUILD
deleted file mode 100644
index 38e456f..0000000
--- a/abs/extra-testing/community/mythpywii/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $
-# Maintainer: Cecil Watson<knoppmyth@gmail.com>
-
-pkgname=mythpywii
-pkgver=17
-pkgrel=8
-pkgdesc="Control MythTV using Wiimote."
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.benjiegillam.com/"
-depends=('bluez' 'python-pybluez' 'cwiid-svn')
-install=mythpywii.install
-source=(http://www.benjiegillam.com/code/myth_py_wii.py \
-        wiimote.rules mythpywii.install CONTROLS)
-
-build() {
-  install -D -m755 ${srcdir}/myth_py_wii.py ${startdir}/pkg/usr/bin/myth_py_wii.py || return 1
-  install -D -m644 ${srcdir}/wiimote.rules ${startdir}/pkg/etc/udev/rules.d/z90-wiimote.rules || return 1
-  install -d -o mythtv -g mythtv ${startdir}/pkg/home/mythtv/.cwiid/wminput || return 1
-  install -D -m755 -o mythtv -g mythtv /etc/cwiid/wminput/{acc_led,buttons,gamepad,neverball,nunchuk_stick2btn,acc_ptr,ir_ptr,nunchuk_acc_ptr} ${startdir}/pkg/home/mythtv/.cwiid/wminput || return 1
-  install -D -m644 ${srcdir}/CONTROLS ${startdir}/pkg/usr/share/docs/mythpywii/CONTROLS || return 1
-  cd ${startdir}/pkg/home/mythtv/.cwiid/wminput
-  ln -s acc_led default
-}
-md5sums=('5bd5e1bb9c4cbfabbffdb28ff616e83b'
-         '0d817a971d414b9320587a4cf289386b'
-         '64fa8dbd324dac68f71753ebd828d358'
-         '0872cbdb3def3dd9aa2b97b191ad76d8')
diff --git a/abs/extra-testing/community/mythpywii/mythpywii.install b/abs/extra-testing/community/mythpywii/mythpywii.install
deleted file mode 100644
index 8d0b867..0000000
--- a/abs/extra-testing/community/mythpywii/mythpywii.install
+++ /dev/null
@@ -1,59 +0,0 @@
-post_install() {
-    . /home/mythtv/.mythtv/mysql.txt
-    # Enable the Network Remote Control Interface for use with the wiimote.
-    # Get local machine's hostname
-      HOST=`cat /etc/hostname`
-    # Update mysql for Network Remote Control Support
-      mysql -u mythtv -pmythtv --host=${DBHostName} mythconverg -e \
-        "UPDATE settings SET data = '1' WHERE value = 'NetworkControlEnabled' AND hostname = '${HOST}'";
-      echo "------------------------------------------------------------"
-      echo "myth_py_wii.py expects the Network Control Port to be set to"
-      echo "mythtv's default port of 6546.  It will not work if you have"
-      echo "changed it to something else."
-      echo "------------------------------------------------------------"
-    # Add myth_py_wii.py to ~/mythtv/.fluxbox/apps before LinHES-run
-      sed -i '/LinHES-run/ i [startup] {/usr/bin/myth_py_wii.py >/dev/null}' /home/mythtv/.fluxbox/apps
-    # udev needs to pick up our new rule for the mythpywii.
-      udevadm trigger --subsystem-match="misc" --subsystem-match="bluetooth"
-    # Add the uinput module
-      modprobe uinput
-    # Ensure this module is loaded across reboots
-      echo "# uinput is needed by mythpywii" >> /etc/modules.mythvantage
-      echo "uinput" >> /etc/modules.mythvantage
-    # Bring up the bluetooth interface -- udev will do this after reboot
-      /usr/sbin/hciconfig hci0 up
-    # Punting on the multiple bluetooth adapter question.
-      echo "It is assumed your bluetooth adapter will be hci0."
-      echo "If you have more than one bluetooth adapter, you"
-      echo "may need to edit /etc/udev/rules.d/z90-wiimote.rules"
-    echo "--------------------------------------------------------------"
-    echo "--------------------------------------------------------------"
-    # Unfortunately there does not seem to be a way to do this without
-    # the user manually intervening.
-    echo "To use your wiimote you will need to restart the frontend service."
-    echo "$ sudo sv restart frontend"
-    echo "or simply reboot your machine."
-    echo "--------------------------------------------------------------"
-    echo "--------------------------------------------------------------"
-    echo "After frontend restart, you should now be able to pair your"
-    echo "Wiimote with your bluetooth adapter by pressing 1 & 2 at the"
-    echo "same time.  After a few seconds the wiimote should vibrate and the"
-    echo "LEDs will show [ # . . # ] where # is on and . is off."
-    echo "--------------------------------------------------------------"
-    echo "See /usr/share/docs/mythpywii/CONTROLS for more information."
-    echo "--------------------------------------------------------------"
-}
-
-post_remove() {
-    . /home/mythtv/.mythtv/mysql.txt
-    # kill myth_py_wii.py
-      WIIPID=`pidof -o %PPID /usr/bin/myth_py_wii.py`
-        [ -n "$WIIPID" ] && kill $WIIPID
-    # Remove uinput
-      sed -i '/uinput/d' /etc/modules.mythvantage
-    # Remove line in .fluxbox/apps
-      sed -i '/myth_py_wii.py/d' /home/mythtv/.fluxbox/apps
-    # Remove network remote control support
-      mysql -u mythtv -pmythtv --host=${DBHostName} mythconverg -e \
-        "UPDATE settings SET data = '0' WHERE value = 'NetworkControlEnabled' AND hostname = '${HOST}'";
-}
diff --git a/abs/extra-testing/community/mythpywii/wiimote.rules b/abs/extra-testing/community/mythpywii/wiimote.rules
deleted file mode 100644
index 4bb2d9d..0000000
--- a/abs/extra-testing/community/mythpywii/wiimote.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-# For Bluetooth/Wiimote
-  KERNEL=="uinput", MODE="0660", GROUP="mythtv"
-
-# Automaticly bring up/down the bluetooth interface
-  ACTION=="add", KERNEL=="hci%n", SUBSYSTEM=="bluetooth", RUN+="/usr/sbin/hciconfig hci%n up"
-  ACTION=="remove", KERNEL=="hci%n", SUBSYSTEM=="bluetooth", RUN+="/usr/sbin/hciconfig hci%n down"
diff --git a/abs/extra-testing/community/mythtv-vdpau/2.6.28_dvb_api_version.diff b/abs/extra-testing/community/mythtv-vdpau/2.6.28_dvb_api_version.diff
deleted file mode 100644
index 0116023..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/2.6.28_dvb_api_version.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: libs/libmythtv/dvbtypes.h
-===================================================================
---- libs/libmythtv/dvbtypes.h	(revision 19792)
-+++ libs/libmythtv/dvbtypes.h	(working copy)
-@@ -19,7 +19,7 @@
- #include <linux/dvb/frontend.h>
- #include <linux/dvb/dmx.h>
- 
--#if (DVB_API_VERSION != 3)
-+#if (DVB_API_VERSION != 3 && DVB_API_VERSION != 5)
- #    error "DVB driver includes with API version 3 not found!"
- #endif
- 
-@@ -27,7 +27,7 @@
- #    define DVB_API_VERSION_MINOR 0
- #endif
- 
--#if (DVB_API_VERSION >= 3 && DVB_API_VERSION_MINOR >= 1)
-+#if ((DVB_API_VERSION == 3 && DVB_API_VERSION_MINOR >= 1) || DVB_API_VERSION == 5)
- #    define USE_ATSC
- #else
- #warning DVB API version < 3.1
diff --git a/abs/extra-testing/community/mythtv-vdpau/PKGBUILD b/abs/extra-testing/community/mythtv-vdpau/PKGBUILD
deleted file mode 100644
index 9c293e2..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/PKGBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-pkgname=mythtv-vdpau
-pkgver=0.21
-pkgrel=23
-pkgdesc="A Homebrew PVR project"
-arch=('i686' 'x86_64')
-depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' \
-	'libxvmc' 'libavc1394' 'libdc1394' 'libiec61883' 'nvidia>=180.29' \
-	'perl-net-upnp')
-backup=(etc/mythtv/mythbackend.conf etc/mythtv/mysql.txt usr/share/mythtv/is.xml usr/share/mythtv/media_settings.xml)
-source=(ftp://ftp.knoppmyth.net/R6/sources/mythtv-${pkgver}-fixes.tar.bz2 \
-	mythbackend myththemedmenu.cpp.patch myththemedmenu.h.patch  \
-	smolt_jump.patch pretty \
-	http://www.avenard.org/files/media/vdpau/mythtv-fixes-glvdpau20549.patch.gz mpegpspatch mythbackend.lr mythfrontend.lr)
-
-#md5sums=('e316ed18d7ac837cf8c4af54b1478793' '7ef6de58240e7aad389a0b13d91b1cf6'\
-#         'a0ecb7f476cb71c0c1ac90d349fc7695')
-conflicts=('mythtv')
-provides=('mythtv'=${pkgver})
-license=('GPL2')
-makedepends=(libgl subversion 'nvidia-utils>=180.29' python perl)
-groups=('pvr')
-options=(!strip)
-url="http://www.mythtv.org/"
-install=mythtv.install
-
-build() {
-	cd $startdir/src/mythtv-${pkgver} || return 1
-	svn update
-
-#apply patches 
-	 patch -p0 < ../myththemedmenu.cpp.patch
-	 patch -p0 < ../myththemedmenu.h.patch
-#	 patch -p0 < ../pop_be_restart.h.patch
-#	 patch -p0 < ../pop_be_restart.cpp.patch
-	 patch -p0 < ../smolt_jump.patch
-#	 patch -p0 < ../2.6.28_dvb_api_version.diff
-       	patch -p1 < ../mythtv-fixes-glvdpau20549.patch
-        cd libs/libavformat
-        patch -p0 < $startdir/src/mpegpspatch
-        cd -
-
-   . /etc/profile.d/qt3.sh
-
-   # use QT3 qmake
-   export PATH=$QTDIR/bin:$PATH
-  [ "$CARCH" = "i686"   ] && ARCH="i686"
-  [ "$CARCH" = "x86_64" ] && ARCH="x86-64"
-
-  ./configure --prefix=/usr --cpu=${ARCH} --enable-mmx --enable-audio-oss \
-   --enable-audio-alsa --enable-dvb --enable-lirc --enable-joystick-menu \
-   --enable-firewire --enable-v4l --enable-ivtv --enable-dvb \
-   --dvb-path=/usr/include --enable-xvmc --disable-ffmpeg \
-   --enable-xvmc-pro --enable-xvmc-vld --enable-opengl-vsync \
-   --disable-audio-jack --disable-audio-arts --disable-directfb \
-   --enable-vdpau  --enable-opengl-video --compile-type=debug || return 1
-
-   # build
-   #needs the subversion program
-   pkgversubversion=`svnversion`
-   echo $pkgversubversion
-   sed -i -e "s/\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`/$pkgversubversion/" version.pro
-
-
-#   qmake mythtv.pro  || return 1
-#   make qmake || return 1
-   make || return 1
-
-   # basic install
-   make INSTALL_ROOT=$startdir/pkg install || return 1
-   
-   # install db schema
-   install -m0644 database/mc.sql $startdir/pkg/usr/share/mythtv/ \
-   	|| return 1
-   install -D -m0755 ../mythbackend $startdir/pkg/etc/rc.d/mythbackend \
-   	|| return 1
-   cp -r docs $startdir/pkg/usr/share/mythtv/ || return 1
-  # cp ../QUICKSTART.archlinux $startdir/pkg/usr/share/mythtv/ \
-#   	|| return 1
-
-   # install contrib
-   mkdir -p $startdir/pkg/usr/share/mythtv/contrib || return 1
-   install -m0755 contrib/* $startdir/pkg/usr/share/mythtv/contrib
-
-   # set suid on mythfrontend
-   #chmod a+s $startdir/pkg/usr/bin/mythfrontend
-
-#Patch the xml LinHES style
-  cp -r $startdir/menu-xml/*.xml $startdir/pkg/usr/share/mythtv
-  cd $startdir/pkg/usr/share/mythtv
-  patch -p0 < $startdir/menu-xml/mainmenu.xml.patch
-  patch -p0 < $startdir/menu-xml/optical_menu.xml.patch
-  patch -p0 < $startdir/menu-xml/library.xml.patch
-  patch -p0 < $startdir/menu-xml/util_menu.xml.patch
-
-#Make log dir
-  mkdir -p $startdir/pkg/var/log/mythtv
-  chown 1000.1000 $startdir/pkg/var/log/mythtv
-  mkdir -p $startdir/pkg/etc/cron.hourly
-  install -m0755 $startdir/src/pretty $startdir/pkg/etc/cron.hourly/
-  mkdir -p $startdir/pkg/etc/logrotate.d
-  cp $startdir/src/*.lr $startdir/pkg/etc/logrotate.d
-}
diff --git a/abs/extra-testing/community/mythtv-vdpau/PKGBUILD.orig b/abs/extra-testing/community/mythtv-vdpau/PKGBUILD.orig
deleted file mode 100644
index 9299fa1..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/PKGBUILD.orig
+++ /dev/null
@@ -1,102 +0,0 @@
-pkgname=mythtv-vdpau
-pkgver=0.21
-pkgrel=19
-pkgdesc="A Homebrew PVR project"
-arch=('i686' 'x86_64')
-depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' \
-	'libxvmc' 'libavc1394' 'libdc1394' 'libiec61883' 'nvidia>=180.29' \
-	'perl-net-upnp')
-backup=(etc/mythtv/mythbackend.conf etc/mythtv/mysql.txt usr/share/mythtv/is.xml usr/share/mythtv/media_settings.xml)
-source=(ftp://ftp.knoppmyth.net/R6/sources/mythtv-${pkgver}-fixes.tar.bz2 \
-	mythbackend myththemedmenu.cpp.patch myththemedmenu.h.patch  \
-	smolt_jump.patch pretty \
-	http://www.avenard.org/files/media/vdpau/mythtv-fixes-glvdpau20462.patch.gz mpegpspatch mythbackend.lr mythfrontend.lr)
-
-#md5sums=('e316ed18d7ac837cf8c4af54b1478793' '7ef6de58240e7aad389a0b13d91b1cf6'\
-#         'a0ecb7f476cb71c0c1ac90d349fc7695')
-conflicts=('mythtv')
-provides=('mythtv'=${pkgver})
-license=('GPL2')
-makedepends=(libgl subversion 'nvidia-utils>=180.29' python perl)
-groups=('pvr')
-url="http://www.mythtv.org/"
-install=mythtv.install
-
-build() {
-	cd $startdir/src/mythtv-${pkgver} || return 1
-	svn update
-
-#apply patches 
-	 patch -p0 < ../myththemedmenu.cpp.patch
-	 patch -p0 < ../myththemedmenu.h.patch
-#	 patch -p0 < ../pop_be_restart.h.patch
-#	 patch -p0 < ../pop_be_restart.cpp.patch
-	 patch -p0 < ../smolt_jump.patch
-#	 patch -p0 < ../2.6.28_dvb_api_version.diff
-       	patch -p1 < ../mythtv-fixes-glvdpau20462.patch
-        cd libs/libavformat
-        patch -p0 < $startdir/src/mpegpspatch
-        cd -
-
-   . /etc/profile.d/qt3.sh
-
-   # use QT3 qmake
-   export PATH=$QTDIR/bin:$PATH
-  [ "$CARCH" = "i686"   ] && ARCH="i686"
-  [ "$CARCH" = "x86_64" ] && ARCH="x86-64"
-
-  ./configure --prefix=/usr --cpu=${ARCH} --enable-mmx --enable-audio-oss \
-   --enable-audio-alsa --enable-dvb --enable-lirc --enable-joystick-menu \
-   --disable-firewire --enable-v4l --enable-ivtv --enable-dvb \
-   --dvb-path=/usr/include --enable-xvmc --disable-ffmpeg \
-   --enable-xvmc-pro --enable-xvmc-vld --enable-opengl-vsync \
-   --disable-audio-jack --disable-audio-arts --disable-directfb \
-   --enable-vdpau  --enable-opengl-video --enable-ffmpeg-pthreads \
-   --enable-glx-procaddrarb || return 1
-
-   # build
-   #needs the subversion program
-   pkgversubversion=`svnversion`
-   echo $pkgversubversion
-   sed -i -e "s/\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`/$pkgversubversion/" version.pro
-
-
-#   qmake mythtv.pro  || return 1
-#   make qmake || return 1
-   make || return 1
-
-   # basic install
-   make INSTALL_ROOT=$startdir/pkg install || return 1
-   
-   # install db schema
-   install -m0644 database/mc.sql $startdir/pkg/usr/share/mythtv/ \
-   	|| return 1
-   install -D -m0755 ../mythbackend $startdir/pkg/etc/rc.d/mythbackend \
-   	|| return 1
-   cp -r docs $startdir/pkg/usr/share/mythtv/ || return 1
-  # cp ../QUICKSTART.archlinux $startdir/pkg/usr/share/mythtv/ \
-#   	|| return 1
-
-   # install contrib
-   mkdir -p $startdir/pkg/usr/share/mythtv/contrib || return 1
-   install -m0755 contrib/* $startdir/pkg/usr/share/mythtv/contrib
-
-   # set suid on mythfrontend
-   #chmod a+s $startdir/pkg/usr/bin/mythfrontend
-
-#Patch the xml LinHES style
-  cp -r $startdir/menu-xml/*.xml $startdir/pkg/usr/share/mythtv
-  cd $startdir/pkg/usr/share/mythtv
-  patch -p0 < $startdir/menu-xml/mainmenu.xml.patch
-  patch -p0 < $startdir/menu-xml/optical_menu.xml.patch
-  patch -p0 < $startdir/menu-xml/library.xml.patch
-  patch -p0 < $startdir/menu-xml/util_menu.xml.patch
-
-#Make log dir
-  mkdir -p $startdir/pkg/var/log/mythtv
-  chown 1000.1000 $startdir/pkg/var/log/mythtv
-  mkdir -p $startdir/pkg/etc/cron.hourly
-  install -m0755 $startdir/src/pretty $startdir/pkg/etc/cron.hourly/
-  mkdir -p $startdir/pkg/etc/logrotate.d
-  cp $startdir/src/*.lr $startdir/pkg/etc/logrotate.d
-}
diff --git a/abs/extra-testing/community/mythtv-vdpau/QUICKSTART.archlinux b/abs/extra-testing/community/mythtv-vdpau/QUICKSTART.archlinux
deleted file mode 100644
index 310705c..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/QUICKSTART.archlinux
+++ /dev/null
@@ -1,69 +0,0 @@
-MythTV QUICKSTART

-=================

-This Arch Linux package provides a generic MythTV installation. It 

-requires extensive user configuration. This is a skeletal document, and 

-more extensive information is available in /usr/share/mythtv/docs.

-

-MythTV is split into a backend and a frontend. The backend records 

-television programming, keeps up with scheduling, does commercial 

-flagging, transcoding, and other such jobs. The frontend provides a 

-pretty GUI which allows playback and edition of the recorded programs. 

-It also provides a means to schedule recordings. There are a number of 

-plugins available for MythTV, and most of the official ones are 

-available as Arch packages. There are two configurations; the backend 

-and frontend can be on the same machine, or on two different machines on 

-the same network.

-

-Backend Configuration

----------------------

-MythTV keeps the majority of its settings and program information in a 

-mysql database. Before running the backend configuration program, it is 

-necessary to initialize the datase. Make sure mysql is running properly.

-

-# mysql < /usr/share/mythtv/mc.sql

-

-If your frontend is going to be remote, you must allow other computers 

-on your network to have access to your database. Substitute 192.168.1.% 

-with whatever IP range you use. If you have a root mysql password (as 

-you should), leave the -p in the mysql command line. Otherwise remove 

-the switch.

-

-# mysql -u root -p

-  mysql> connect mythconverg;

-  mysql> grant all on mythconverg.* to mythtv@"192.168.1.%" identified by "mythtv";

-  mysql> flush privileges;

-  mysql> quit

-

-In order to configure the MythTV backend, you will need to run the 

-mythtv-setup program. Note that this requires X. If your backend is 

-headless, considering using vnc as a quick and dirty "fix".

-

-# mythtv-setup

-

-Go through all the menus. You will need to know information like your 

-capture card device (/dev/v4l/video[0-9]) and your program information 

-acquisition method. United States users will most likely subscribe to 

-Zap2it Labs' DataDirect service. It requires that users take a survey 

-every three months in order to continue service. This isn't as hard as 

-it sounds.

-

-It is necessary to update the database with all the current TV listings. 

-Run the mythfilldatabase program to grab the listings using whatever 

-method you specified in mythtv-setup.

-

-# mythfilldatabase

-

-Run mythbackend from the command line to make sure everything starts ok.

-

-# mythbackend

-

-If so, you may kill the task with "ctrl-c" on your keyboard, and add the 

-backend to /etc/rc.conf. In the DAEMONS line, just add "mythbackend" to 

-the list.

-

-In the future, you will need to run mythfilldatabase regularly. I allow 

-my frontend computer to do this, as it runs continuously, and it is an 

-option within MythTV. Otherwise, you can set up a cron job, or move 

-mythfilldatabasecron to /etc/cron.daily

-

-cp /usr/share/mythtv/mythfilldatabasecron /etc/cron.daily

diff --git a/abs/extra-testing/community/mythtv-vdpau/menu-xml/HOST_SETTINGS.xml b/abs/extra-testing/community/mythtv-vdpau/menu-xml/HOST_SETTINGS.xml
deleted file mode 100755
index f257920..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/menu-xml/HOST_SETTINGS.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<mythmenu name="HOST_SETTINGS">
-
-   <button>
-       <type>MV_NETWORK_SETUP_MENU</type>
-      <text>Network Settings</text>
-      <action>EXEC  mythinstall -s network </action>
-   </button>
-
-   <button>
-       <type>MV_SYSTEM_SETUP_MENU</type>
-      <text>System type</text>
-        <action>EXEC  mythinstall -s hostype </action>
-   </button>
-
-   <button>
-       <type>MV_MISC_SETUP_MENU</type>
-      <text>Misc Settings</text>
-       <action>EXEC  mythinstall -s misc </action>
-   </button>
-
-   <button>
-       <type>MV_SOFTWARE_MENU</type>
-      <text>Software</text>
-       <action>EXEC  mythinstall -s  plugins </action>
-   </button>
-
-   <button>
-      <type>MV_SHUTDOWN_SETUP_MENU</type>
-      <text>Shutdown settings</text>
-        <action>EXEC  mythinstall -s sleep </action>
-   </button>
-
-
-<button>
-   <type>MV_ADVANCED_X_SETUP_MENU</type>
-    <text>Display</text>
-    <action>EXEC  mythinstall -s advancedX</action>
-</button>
-
-<button>
-   <type>MV_ADVANCED_SETUP_MENU</type>
-    <text>Advanced settings</text>
-    <action>EXEC  mythinstall -s advanced</action>
-</button>
-
-
-<button>
-       <type>MV_AUDIO_SETUP_MENU</type>
-       <text>Audio settings</text>
-        <action>EXEC  mythinstall -s sound </action>
-</button>
-
-
-<button>
-       <type>MV_ACCESS_SETUP_MENU</type>
-       <text>Access</text>
-       <action>EXEC  mythinstall -s accesscontrol </action>
-</button>
-
-<button>
-       <type>MV_USER_SETUP_MENU</type>
-       <text>Password </text>
-       <action>EXEC  mythinstall -s user </action>
-</button>
-
-<button>
-       <type>MV_WEBACCESS_SETUP_MENU</type>
-       <text>Web security</text>
-       <action>EXEC  mythinstall -s webuser </action>
-</button>
-
-
-
-
-   <!--
-   <button>
-       <type>SETUP_MENU</type>
-       <text>Settings profile manager</text>
-        <action>EXEC  mythinstall -t </action>
-
-   </button>
-   -->
-
-
-
-
-</mythmenu>
diff --git a/abs/extra-testing/community/mythtv-vdpau/menu-xml/is.xml b/abs/extra-testing/community/mythtv-vdpau/menu-xml/is.xml
deleted file mode 100644
index 88b7e6b..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/menu-xml/is.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<mythmenu name="Internet Steams">
-
-</mythmenu>
diff --git a/abs/extra-testing/community/mythtv-vdpau/menu-xml/library.xml.patch b/abs/extra-testing/community/mythtv-vdpau/menu-xml/library.xml.patch
deleted file mode 100644
index efc8623..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/menu-xml/library.xml.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- library.xml.orig	2009-02-09 04:30:04.000000000 +0000
-+++ library.xml	2009-02-09 04:31:50.000000000 +0000
-@@ -119,10 +119,9 @@
- 
-    <button>
-      <type>STREAM</type>
--     <text>Play Online Streams</text>
-+     <text>Online Streams</text>
-      <text lang="HE">נגן מדיה מכוונת</text>
--     <action>PLUGIN mythstream</action>
--     <depends>mythstream</depends>
-+     <action>MENU is.xml</action>
-    </button>
- 
-    <button>
diff --git a/abs/extra-testing/community/mythtv-vdpau/menu-xml/linhes.xml b/abs/extra-testing/community/mythtv-vdpau/menu-xml/linhes.xml
deleted file mode 100644
index 8bc929f..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/menu-xml/linhes.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<mythmenu name="LinHES">
-
-   <button>
-     <type>SETUP_GENERAL</type>
-     <text>MythTV Configuration</text>
-     <text lang="IT">Impostazioni</text>
-     <text lang="ES">Configuración</text>
-     <text lang="CA">Configurar</text>
-     <text lang="FR">paramètres</text>
-     <text lang="DE">Zubehör / Konfiguration</text>
-     <text lang="DK">Tilbehør/Indstillinger</text>
-     <text lang="IS">Uppsetning</text>
-     <text lang="NL">Configuratie</text>
-     <text lang="PT">Utensílios</text>
-     <text lang="SV">Verktyg / Inställningar</text>
-     <text lang="JA">設定</text>
-     <text lang="FI">Oheis/Asetukset</text>
-     <text lang="ZH_TW">工具/設定</text>
-     <text lang="SI">Nastavitve</text>
-     <text lang="ET">Utiliidid / sätted</text>
-     <text lang="NB">Verktøy/Oppsett</text>
-     <text lang="CZ">Pomůcky</text>
-     <text lang="RU">Утилиты / �а�тройки</text>
-     <text lang="AR">تضبيطات</text>
-     <text lang="PL">Narzędzia / ustawienia</text>
-     <text lang="HE">עזרי� / הגדרות</text>
-     <alttext lang="DE">Verschiedenes</alttext>
-     <alttext lang="SV">Inställningar</alttext>
-     <alttext lang="ET">Sätted</alttext>
-     <alttext lang="RU">�а�тройки</alttext>
-     <alttext lang="AR">تضبيطات</alttext>
-     <action>MENU util_menu.xml</action>
-   </button>
-
-   <button>
-     <type>LINHES_SETUP</type>
-     <text>LinHES Configuration</text>
-     <action>MENU HOST_SETTINGS.xml</action>
-   </button>
-
-   <button>
-     <type>BACKUP</type>
-     <text>Backup LinHES</text>
-     <action>MENU mythbackup.xml</action>
-   </button>
-
-   <button>
-     <type>RESTORE</type>
-     <text>Restore LinHES</text>
-     <action>MENU mythrestore.xml</action>
-   </button>
-   
-</mythmenu>
-
diff --git a/abs/extra-testing/community/mythtv-vdpau/menu-xml/mainmenu.xml.patch b/abs/extra-testing/community/mythtv-vdpau/menu-xml/mainmenu.xml.patch
deleted file mode 100644
index a299325..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/menu-xml/mainmenu.xml.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- mainmenu.xml.orig	2009-01-09 02:45:07.000000000 +0000
-+++ mainmenu.xml	2009-01-22 08:04:28.000000000 +0000
-@@ -158,34 +158,8 @@
- 
-    <button>
-      <type>MENU_UTILITIES_SETUP</type>
--     <text>Utilities / Setup</text>
--     <text lang="IT">Impostazioni</text>
--     <text lang="ES">Configuración</text>
--     <text lang="CA">Configurar</text>
--     <text lang="FR">paramètres</text>
--     <text lang="DE">Zubehör / Konfiguration</text>
--     <text lang="DK">Tilbehør/Indstillinger</text>
--     <text lang="IS">Uppsetning</text>
--     <text lang="NL">Configuratie</text>
--     <text lang="PT">Utensílios</text>
--     <text lang="SV">Verktyg / Inställningar</text>
--     <text lang="JA">設定</text>
--     <text lang="FI">Oheis/Asetukset</text>
--     <text lang="ZH_TW">工具/設定</text>
--     <text lang="SI">Nastavitve</text>
--     <text lang="ET">Utiliidid / sätted</text>
--     <text lang="NB">Verktøy/Oppsett</text>
--     <text lang="CZ">Pomůcky</text>
--     <text lang="RU">Утилиты / �а�тройки</text>
--     <text lang="AR">تضبيطات</text>
--     <text lang="PL">Narzędzia / ustawienia</text>
--     <text lang="HE">עזרי� / הגדרות</text>
--     <alttext lang="DE">Verschiedenes</alttext>
--     <alttext lang="SV">Inställningar</alttext>
--     <alttext lang="ET">Sätted</alttext>
--     <alttext lang="RU">�а�тройки</alttext>
--     <alttext lang="AR">تضبيطات</alttext>
--     <action>MENU util_menu.xml</action>
-+     <text>Service Menu</text>
-+     <action>MENU linhes.xml</action>
-    </button>
- 
-    <!-- <button>
diff --git a/abs/extra-testing/community/mythtv-vdpau/menu-xml/mythbackup.xml b/abs/extra-testing/community/mythtv-vdpau/menu-xml/mythbackup.xml
deleted file mode 100644
index 656860d..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/menu-xml/mythbackup.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<mythmenu name="LinHES">
-
-   <button>
-     <type>BACKUP</type>
-     <text>Do you wish to backup?</text>
-     <action>NONE</action>
-   </button>
-
-   <button>
-     <type>BACKUP</type>
-     <text>Yes</text>
-     <action>EXEC sudo /usr/LH/bin/mythbackup</action>
-   </button>
-   
-   <button>
-     <type>BACKUP</type>
-     <text>No</text>
-     <action>MENU linhes.xml</action>
-   </button>
-</mythmenu>
diff --git a/abs/extra-testing/community/mythtv-vdpau/menu-xml/mythrestore.xml b/abs/extra-testing/community/mythtv-vdpau/menu-xml/mythrestore.xml
deleted file mode 100644
index 05cb0a7..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/menu-xml/mythrestore.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<mythmenu name="LinHES">
-
-   <button>
-     <type>RESTORE</type>
-     <text>Do you wish to restore?</text>
-     <action>NONE</action>
-   </button>
-
-   <button>
-     <type>RESTORE</type>
-     <text>Yes</text>
-     <action>EXEC sudo /usr/LH/bin/mythrestore</action>
-   </button>
-   
-   <button>
-     <type>BACKUP</type>
-     <text>No</text>
-     <action>MENU linhes.xml</action>
-   </button>
-</mythmenu>
diff --git a/abs/extra-testing/community/mythtv-vdpau/menu-xml/optical_menu.xml.patch b/abs/extra-testing/community/mythtv-vdpau/menu-xml/optical_menu.xml.patch
deleted file mode 100644
index d1cb70c..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/menu-xml/optical_menu.xml.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- optical_menu.xml.orig	2008-10-02 22:46:30.000000000 +0000
-+++ optical_menu.xml	2008-07-02 04:05:15.000000000 +0000
-@@ -129,6 +129,12 @@
-    </button>
- 
-    <button>
-+      <type>DVD_RIP</type>
-+      <text>Import video files from DVD</text>
-+      <action>EXEC /usr/LH/bin/importfiles.sh</action>
-+   </button>
-+
-+   <button>
-       <type>EJECT</type>
-       <text>Eject media</text>
-       <text lang="IT">Espelli Media</text>
diff --git a/abs/extra-testing/community/mythtv-vdpau/menu-xml/original/create_patch.sh b/abs/extra-testing/community/mythtv-vdpau/menu-xml/original/create_patch.sh
deleted file mode 100644
index 34d8b8c..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/menu-xml/original/create_patch.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-for i in *.xml
-do
-	diff -u $i.orig $i > ../$i.patch
-done
diff --git a/abs/extra-testing/community/mythtv-vdpau/menu-xml/setup.xml b/abs/extra-testing/community/mythtv-vdpau/menu-xml/setup.xml
deleted file mode 100644
index f56bb6f..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/menu-xml/setup.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<mythmenu name="MAIN">
-
-   <button>
-     <type>SETUP_GENERAL</type>
-     <text>1. General</text>
-     <text lang="IT">1. Generale</text>
-     <text lang="PT">1. Geral</text>
-     <text lang="SV">1. Generellt</text>
-     <text lang="JA">1. 一般</text>
-     <text lang="DE">1. Allgemeines</text>
-     <text lang="FI">1. Yleiset</text>
-     <text lang="FR">1. Général</text>
-     <text lang="SI">1. Splošno</text>
-     <text lang="ET">1. Ãœldine</text>
-     <text lang="NB">1 Generelt</text>
-     <text lang="DK">1. Generelt</text>
-     <text lang="ES">1. General</text>
-     <text lang="CZ">1. Obecný</text>
-     <text lang="RU">1. Общие</text>
-     <action>GENERAL</action>
-   </button>
-
-   <button>
-     <type>SETUP_CAPTURE_CARDS</type>
-     <text>2. Capture cards</text>
-     <text lang="IT">2. Schede di Acquisizione</text>
-     <text lang="PT">2. Placas de Captura</text>
-     <text lang="SV">2. TV-kort</text>
-     <text lang="JA">2. キャプ�ャカード</text>
-     <text lang="DE">2. TV-Karten</text>
-     <text lang="FI">2. TV-kortit</text>
-     <text lang="FR">2. Cartes d'acquisition</text>
-     <text lang="SI">2. Kartice za zajem</text>
-     <text lang="ET">2. TV-kaardid</text>
-     <text lang="NB">2 TV-kort</text>
-     <text lang="DK">2. TV-kort</text>
-     <text lang="ES">2. Capturadoras</text>
-     <text lang="CZ">2. Zachytávací karty</text>
-     <text lang="RU">2. Карты захвата</text>
-     <action>CAPTURE CARDS</action>
-   </button>
-
-   <button>
-     <type>SETUP_VIDEO_SOURCES</type>
-     <text>3. Video sources</text>
-     <text lang="IT">3. Fonte Video</text>
-     <text lang="PT">3. Fontes de Vídeo</text>
-     <text lang="SV">3. Videokällor</text>
-     <text lang="JA">3. ビデオソース</text>
-     <text lang="DE">3. Videoquellen</text>
-     <text lang="FI">3. Kuvanlähteet</text>
-     <text lang="FR">3. Sources vidéo</text>
-     <text lang="SI">3. Video viri</text>
-     <text lang="ET">3. Videosisendid</text>
-     <text lang="NB">3 Videokilder</text>
-     <text lang="DK">3. Videokilder</text>
-     <text lang="ES">3. Fuentes de Vídeo</text>
-     <text lang="CZ">3. Zdroje obrazu</text>
-     <text lang="RU">3. Видео и�точники</text>
-     <action>VIDEO SOURCES</action>
-   </button>
-
-   <button>
-     <type>SETUP_INPUT_CONNECTIONS</type>
-     <text>4. Input connections</text>
-     <text lang="IT">4. Connessioni di Ingresso</text>
-     <text lang="PT">4. Ligações de Entrada</text>
-     <text lang="SV">4. Anslutningar</text>
-     <text lang="JA">4. 入力�ソース�接続</text>
-     <text lang="DE">4. Verknüpfungen</text>
-     <text lang="FI">4. Sisääntuloasetukset</text>
-     <text lang="FR">4. Entrées Vidéos</text>
-     <text lang="SI">4. Vhodne povezave</text>
-     <text lang="ET">4. Sisendite ühendused</text>
-     <text lang="NB">4 Inndata</text>
-     <text lang="DK">4. Indgange</text>
-     <text lang="ES">4. Conexiones</text>
-     <text lang="CZ">4. Připojení vstupů</text>
-     <text lang="RU">4. Соединение входов</text>
-     <action>CARD INPUTS</action>
-   </button>
-
-   <button>
-     <type>SETUP_CHANNEL_EDITOR</type>
-     <text>5. Channel Editor</text>
-     <text lang="IT">5. Modifica Canali</text>
-     <text lang="SV">5. Kanaleditor</text>
-     <text lang="JA">5. �ャン�ル設定</text>
-     <text lang="DE">5. Sender bearbeiten</text>
-     <text lang="FI">5. Kanavanviritys</text>
-     <text lang="FR">5. Editeur de chaînes</text>
-     <text lang="SI">5. Urejanje kanalov</text>
-     <text lang="ET">5. Kanaliredaktor</text>
-     <text lang="NB">5 Kanalredigerer</text>
-     <text lang="DK">5. Kanal opsætning</text>
-     <text lang="ES">5. Editor Canales</text>
-     <text lang="CZ">5. Editor kanálů</text>
-     <text lang="RU">5. Редактор каналов</text>
-     <action>CHANNEL EDITOR</action>
-   </button>
-
-   <button>
-     <type>SETUP_STORAGE_GROUPS</type>
-     <text>6. Storage Directories</text>
-     <text lang="IT">6. Cartelle</text>
-     <text lang="FI">Tallennusryhmät</text>
-     <text lang="SV">Lagringsgrupper</text>
-     <action>STORAGE GROUPS</action>
-   </button>
-
-</mythmenu>
diff --git a/abs/extra-testing/community/mythtv-vdpau/menu-xml/siriusmenu.xml b/abs/extra-testing/community/mythtv-vdpau/menu-xml/siriusmenu.xml
deleted file mode 100644
index e317b36..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/menu-xml/siriusmenu.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<mythmenu name="SIRIUS">
-   <button>
-      <type>MUSIC</type>
-      <text>Sirius Hits 1</text>
-      <action>EXEC /usr/bin/cliSipie siriushits1</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>StarLite</text>
-      <action>EXEC /usr/bin/cliSipie starlite</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Sirius Love</text>
-      <action>EXEC /usr/bin/cliSipie siriuslove</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Movin EZ</text>
-      <action>EXEC /usr/bin/cliSipie movineasy</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Sirius Gold</text>
-      <action>EXEC /usr/bin/cliSipie siriusgold</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>'60s Vibrations</text>
-      <action>EXEC /usr/bin/cliSipie 60svibrations</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Totally '70s</text>
-      <action>EXEC /usr/bin/cliSipie totally70s</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Big '80s</text>
-      <action>EXEC /usr/bin/cliSipie big80s</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>ThePulse</text>
-      <action>EXEC /usr/bin/cliSipie thepulse</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Bridge</text>
-      <action>EXEC /usr/bin/cliSipie thebridge</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>BBC Radio 1</text>
-      <action>EXEC /usr/bin/cliSipie bbcradio1</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Super Shuffle</text>
-      <action>EXEC /usr/bin/cliSipie supershuffle</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Elvis Radio</text>
-      <action>EXEC /usr/bin/cliSipie elvisradio</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Classic Vinyl</text>
-      <action>EXEC /usr/bin/cliSipie classicvinyl</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Classic Rewind</text>
-      <action>EXEC /usr/bin/cliSipie classicrewind</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>TheVault</text>
-      <action>EXEC /usr/bin/cliSipie thevault</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Jam_ON</text>
-      <action>EXEC /usr/bin/cliSipie jamon</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Spectrum</text>
-      <action>EXEC /usr/bin/cliSipie thespectrum</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>BuzzSaw</text>
-      <action>EXEC /usr/bin/cliSipie buzzsaw</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Octane</text>
-      <action>EXEC /usr/bin/cliSipie octane</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Alt Nation</text>
-      <action>EXEC /usr/bin/cliSipie altnation</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>1st Wave</text>
-      <action>EXEC /usr/bin/cliSipie firstwave</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Hair Nation</text>
-      <action>EXEC /usr/bin/cliSipie hairnation</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>'90s Alternative</text>
-      <action>EXEC /usr/bin/cliSipie 90salternative</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Garage</text>
-      <action>EXEC /usr/bin/cliSipie undergroundgarage</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Left of Center</text>
-      <action>EXEC /usr/bin/cliSipie leftofcenter</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Hard Attack</text>
-      <action>EXEC /usr/bin/cliSipie hardattack</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Faction</text>
-      <action>EXEC /usr/bin/cliSipie faction</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Punk</text>
-      <action>EXEC /usr/bin/cliSipie punk</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>The Coffee House</text>
-      <action>EXEC /usr/bin/cliSipie coffeehouse</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Margaritaville</text>
-      <action>EXEC /usr/bin/cliSipie radiomargaritaville</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Sirius Disorder</text>
-      <action>EXEC /usr/bin/cliSipie siriusdisorder</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Reggae</text>
-      <action>EXEC /usr/bin/cliSipie reggaerhythms</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Area 33</text>
-      <action>EXEC /usr/bin/cliSipie area33</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Boombox</text>
-      <action>EXEC /usr/bin/cliSipie boombox</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Chill</text>
-      <action>EXEC /usr/bin/cliSipie chill</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>The Beat</text>
-      <action>EXEC /usr/bin/cliSipie thebeat</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Strobe</text>
-      <action>EXEC /usr/bin/cliSipie thestrobe</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Hip-Hop Nation</text>
-      <action>EXEC /usr/bin/cliSipie hiphopnation</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>BackSpin</text>
-      <action>EXEC /usr/bin/cliSipie backspin</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Shade 45</text>
-      <action>EXEC /usr/bin/cliSipie shade45</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Hot Jamz</text>
-      <action>EXEC /usr/bin/cliSipie hotjamz</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Heart  &amp; Soul</text>
-      <action>EXEC /usr/bin/cliSipie heartandsoul</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>SoulTown</text>
-      <action>EXEC /usr/bin/cliSipie soultown</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>New Country</text>
-      <action>EXEC /usr/bin/cliSipie newcountry</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Prime Country</text>
-      <action>EXEC /usr/bin/cliSipie primecountry</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Roadhouse</text>
-      <action>EXEC /usr/bin/cliSipie theroadhouse</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Outlaw Country</text>
-      <action>EXEC /usr/bin/cliSipie outlawcountry</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Bluegrass</text>
-      <action>EXEC /usr/bin/cliSipie bluegrass</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Spirit</text>
-      <action>EXEC /usr/bin/cliSipie spirit</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Praise</text>
-      <action>EXEC /usr/bin/cliSipie praise</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Planet Jazz</text>
-      <action>EXEC /usr/bin/cliSipie planetjazz</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>JazzCafe</text>
-      <action>EXEC /usr/bin/cliSipie jazzcafe</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>PureJazz</text>
-      <action>EXEC /usr/bin/cliSipie purejazz</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Spa 73</text>
-      <action>EXEC /usr/bin/cliSipie spa73</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Blues</text>
-      <action>EXEC /usr/bin/cliSipie siriusblues</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Siriusly Sinatra</text>
-      <action>EXEC /usr/bin/cliSipie siriuslysinatra</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Broadway's Best</text>
-      <action>EXEC /usr/bin/cliSipie broadwaysbest</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Symphony Hall</text>
-      <action>EXEC /usr/bin/cliSipie symphonyhall</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Met Opera Radio</text>
-      <action>EXEC /usr/bin/cliSipie metropolitanopera</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Sirius Pops</text>
-      <action>EXEC /usr/bin/cliSipie siriuspops</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Universo Latino</text>
-      <action>EXEC /usr/bin/cliSipie universolatino</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Rumbon</text>
-      <action>EXEC /usr/bin/cliSipie rumbon</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Martha Stewart</text>
-      <action>EXEC /usr/bin/cliSipie marthastewartlivingradio</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Sirius Stars</text>
-      <action>EXEC /usr/bin/cliSipie siriusstars</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>OutQ Gay Radio</text>
-      <action>EXEC /usr/bin/cliSipie siriusoutq</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Patriot</text>
-      <action>EXEC /usr/bin/cliSipie siriuspatriot</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Left</text>
-      <action>EXEC /usr/bin/cliSipie siriusleft</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>CNN</text>
-      <action>EXEC /usr/bin/cliSipie cnn</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>wrn</text>
-      <action>EXEC /usr/bin/cliSipie wrn</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Blue Collar Comedy</text>
-      <action>EXEC /usr/bin/cliSipie bluecollarcomedy</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Raw Dog Comedy</text>
-      <action>EXEC /usr/bin/cliSipie rawdog</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Laugh Break Comedy</text>
-      <action>EXEC /usr/bin/cliSipie laughbreak</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>thefoxxhole</text>
-      <action>EXEC /usr/bin/cliSipie thefoxxhole</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>lime</text>
-      <action>EXEC /usr/bin/cliSipie lime</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Kids Stuff</text>
-      <action>EXEC /usr/bin/cliSipie kidsstuff</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Catholic Channel</text>
-      <action>EXEC /usr/bin/cliSipie thecatholicchannel</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>EWTN</text>
-      <action>EXEC /usr/bin/cliSipie ewtnglobal</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>christiantalk</text>
-      <action>EXEC /usr/bin/cliSipie christiantalk</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Sirius NFL Radio</text>
-      <action>EXEC /usr/bin/cliSipie siriusnflradio</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Maxim Radio</text>
-      <action>EXEC /usr/bin/cliSipie maximradio</action>
-   </button>
-   <button>
-      <type>MUSIC</type>
-      <text>Cosmo Radio</text>
-      <action>EXEC /usr/bin/cliSipie cosmopolitanradio</action>
-   </button>
-   <button>
-     <type>TV_DELETE</type>
-     <text>Stop Listening</text>
-     <action>EXEC /usr/bin/sipie_kill</action>
-  </button>
-
-</mythmenu>
-
diff --git a/abs/extra-testing/community/mythtv-vdpau/menu-xml/util_menu.xml.patch b/abs/extra-testing/community/mythtv-vdpau/menu-xml/util_menu.xml.patch
deleted file mode 100644
index 26ac863..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/menu-xml/util_menu.xml.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- util_menu.xml.orig	2009-01-09 02:45:07.000000000 +0000
-+++ util_menu.xml	2009-01-22 08:04:28.000000000 +0000
-@@ -76,7 +76,13 @@
-       <action>PLUGIN mythcontrols</action>
-       <depends>mythcontrols</depends>	
-    </button>
--      
-+
-+   <button>
-+      <type>VIDEO_SCREENSHOOTER</type>
-+      <text>Thumbnail Generator</text>
-+      <action>EXEC /usr/LH/bin/shootscreens-mythtv.sh</action>
-+   </button>
-+
-    <button>
-       <type>SETUP_MENU</type>
-       <text>Setup</text>
diff --git a/abs/extra-testing/community/mythtv-vdpau/menu-xml/xmmenu.xml b/abs/extra-testing/community/mythtv-vdpau/menu-xml/xmmenu.xml
deleted file mode 100644
index 6b26d11..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/menu-xml/xmmenu.xml
+++ /dev/null
@@ -1,574 +0,0 @@
-<!-- Current as of April 25, 2007 -->
-<mythmenu name="XM">
-
-	<button>
-		<type>MUSIC</type>
-		<text>The '40s</text>
-		<action>EXEC /usr/bin/xamp kill 4</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The '50s</text>
-		<action>EXEC /usr/bin/xamp kill 5</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The '60s</text>
-		<action>EXEC /usr/bin/xamp kill 6</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The '70s</text>
-		<action>EXEC /usr/bin/xamp kill 7</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The '80s</text>
-		<action>EXEC /usr/bin/xamp kill 8</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The '90s</text>
-		<action>EXEC /usr/bin/xamp kill 9</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>America</text>
-		<action>EXEC /usr/bin/xamp kill 10</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>X Country</text>
-		<action>EXEC /usr/bin/xamp kill 12</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Willie's Place</text>
-		<action>EXEC /usr/bin/xamp kill 13</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Bluegrass Junction</text>
-		<action>EXEC /usr/bin/xamp kill 14</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Village</text>
-		<action>EXEC /usr/bin/xamp kill 15</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Highway 16</text>
-		<action>EXEC /usr/bin/xamp kill 16</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>US Country</text>
-		<action>EXEC /usr/bin/xamp kill 17</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>20 on 20</text>
-		<action>EXEC /usr/bin/xamp kill 20</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Heart</text>
-		<action>EXEC /usr/bin/xamp kill 23</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Blend</text>
-		<action>EXEC /usr/bin/xamp kill 25</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Flight 26</text>
-		<action>EXEC /usr/bin/xamp kill 26</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Cinemagic</text>
-		<action>EXEC /usr/bin/xamp kill 27</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>On Broadway</text>
-		<action>EXEC /usr/bin/xamp kill 28</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>U-Pop</text>
-		<action>EXEC /usr/bin/xamp kill 29</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XM Hitlist</text>
-		<action>EXEC /usr/bin/xamp kill 30</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Torch</text>
-		<action>EXEC /usr/bin/xamp kill 31</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Message</text>
-		<action>EXEC /usr/bin/xamp kill 32</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Spirit</text>
-		<action>EXEC /usr/bin/xamp kill 33</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>enLighten</text>
-		<action>EXEC /usr/bin/xamp kill 34</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Deep Tracks</text>
-		<action>EXEC /usr/bin/xamp kill 40</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Boneyard</text>
-		<action>EXEC /usr/bin/xamp kill 41</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XM Liquid Metal</text>
-		<action>EXEC /usr/bin/xamp kill 42</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XMU</text>
-		<action>EXEC /usr/bin/xamp kill 43</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Fred</text>
-		<action>EXEC /usr/bin/xamp kill 44</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XM Cafe</text>
-		<action>EXEC /usr/bin/xamp kill 45</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Top Tracks</text>
-		<action>EXEC /usr/bin/xamp kill 46</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Ethel</text>
-		<action>EXEC /usr/bin/xamp kill 47</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Squizz</text>
-		<action>EXEC /usr/bin/xamp kill 48</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Big Tracks</text>
-		<action>EXEC /usr/bin/xamp kill 49</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Loft</text>
-		<action>EXEC /usr/bin/xamp kill 50</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XM Music Lab</text>
-		<action>EXEC /usr/bin/xamp kill 51</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Verge</text>
-		<action>EXEC /usr/bin/xamp kill 52</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Fungus</text>
-		<action>EXEC /usr/bin/xamp kill 53</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Lucy</text>
-		<action>EXEC /usr/bin/xamp kill 54</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Soul Street</text>
-		<action>EXEC /usr/bin/xamp kill 60</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Flow</text>
-		<action>EXEC /usr/bin/xamp kill 61</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Suite 62</text>
-		<action>EXEC /usr/bin/xamp kill 62</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Groove</text>
-		<action>EXEC /usr/bin/xamp kill 64</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Rhyme</text>
-		<action>EXEC /usr/bin/xamp kill 65</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>RAW</text>
-		<action>EXEC /usr/bin/xamp kill 66</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The City</text>
-		<action>EXEC /usr/bin/xamp kill 67</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Heat</text>
-		<action>EXEC /usr/bin/xamp kill 68</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Real Jazz</text>
-		<action>EXEC /usr/bin/xamp kill 70</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Watercolors</text>
-		<action>EXEC /usr/bin/xamp kill 71</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Beyond Jazz</text>
-		<action>EXEC /usr/bin/xamp kill 72</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>High Standards</text>
-		<action>EXEC /usr/bin/xamp kill 73</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Bluesville</text>
-		<action>EXEC /usr/bin/xamp kill 74</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Hear Music</text>
-		<action>EXEC /usr/bin/xamp kill 75</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Fine Tuning</text>
-		<action>EXEC /usr/bin/xamp kill 76</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Audio Visions</text>
-		<action>EXEC /usr/bin/xamp kill 77</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Escape</text>
-		<action>EXEC /usr/bin/xamp kill 78</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>On The Rocks</text>
-		<action>EXEC /usr/bin/xamp kill 79</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Move</text>
-		<action>EXEC /usr/bin/xamp kill 80</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>BPM</text>
-		<action>EXEC /usr/bin/xamp kill 81</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The System</text>
-		<action>EXEC /usr/bin/xamp kill 82</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Chrome</text>
-		<action>EXEC /usr/bin/xamp kill 83</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XM-Chill</text>
-		<action>EXEC /usr/bin/xamp kill 84</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Fuego</text>
-		<action>EXEC /usr/bin/xamp kill 90</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Viva</text>
-		<action>EXEC /usr/bin/xamp kill 91</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Aguila</text>
-		<action>EXEC /usr/bin/xamp kill 92</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Caliente</text>
-		<action>EXEC /usr/bin/xamp kill 94</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Luna</text>
-		<action>EXEC /usr/bin/xamp kill 95</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Air Musique</text>
-		<action>EXEC /usr/bin/xamp kill 100</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Joint</text>
-		<action>EXEC /usr/bin/xamp kill 101</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Sur La Route</text>
-		<action>EXEC /usr/bin/xamp kill 102</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>World Zone</text>
-		<action>EXEC /usr/bin/xamp kill 103</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Ngoma</text>
-		<action>EXEC /usr/bin/xamp kill 104</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XM Classics</text>
-		<action>EXEC /usr/bin/xamp kill 110</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Vox</text>
-		<action>EXEC /usr/bin/xamp kill 112</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XM Pops</text>
-		<action>EXEC /usr/bin/xamp kill 113</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XM Kids</text>
-		<action>EXEC /usr/bin/xamp kill 116</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Bob Edwards Show</text>
-		<action>EXEC /usr/bin/xamp kill 133</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>XM Comedy</text>
-		<action>EXEC /usr/bin/xamp kill 150</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Laugh USA</text>
-		<action>EXEC /usr/bin/xamp kill 151</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Special X</text>
-		<action>EXEC /usr/bin/xamp kill 154</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Agenda</text>
-		<action>EXEC /usr/bin/xamp kill 134</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Oprah and Friends</text>
-		<action>EXEC /usr/bin/xamp kill 156</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>The Virus</text>
-		<action>EXEC /usr/bin/xamp kill 202</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>1 Hit Wonders</text>
-		<action>EXEC /usr/bin/xamp kill 300</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Metalcore</text>
-		<action>EXEC /usr/bin/xamp kill 301</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>New Indie First</text>
-		<action>EXEC /usr/bin/xamp kill 302</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Late Night Mix</text>
-		<action>EXEC /usr/bin/xamp kill 303</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Sessions@AOL</text>
-		<action>EXEC /usr/bin/xamp kill 304</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>Shuffle</text>
-		<action>EXEC /usr/bin/xamp kill 305</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>New Rock First</text>
-		<action>EXEC /usr/bin/xamp kill 306</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>New Country First</text>
-		<action>EXEC /usr/bin/xamp kill 307</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>New Hip Hop First</text>
-		<action>EXEC /usr/bin/xamp kill 308</action>
-	</button>
-
-	<button>
-		<type>MUSIC</type>
-		<text>New Pop First</text>
-		<action>EXEC /usr/bin/xamp kill 309</action>
-	</button>
-
-	<button>
-		<type>TV_DELETE</type>
-		<text>Stop Listening</text>
-		<action>EXEC /usr/bin/xamp kill</action>
-	</button>
-
-</mythmenu>
diff --git a/abs/extra-testing/community/mythtv-vdpau/mpegpspatch b/abs/extra-testing/community/mythtv-vdpau/mpegpspatch
deleted file mode 100644
index eed08eb..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/mpegpspatch
+++ /dev/null
@@ -1,66 +0,0 @@
---- orig_mpeg.c	2009-03-23 11:26:22.000000000 -0700
-+++ mpeg.c	2009-03-23 11:28:09.000000000 -0700
-@@ -66,35 +66,40 @@
- 
- static int mpegps_probe(AVProbeData *p)
- {
-+    uint32_t code= -1;
-+    int sys=0, pspack=0, priv1=0, vid=0, audio=0, invalid=0;
-     int i;
--    int size= FFMIN(2048, p->buf_size);
--    uint32_t code=0xFF;
-+    int score=0;
- 
--    /* we search the first start code. If it is a packet start code,
--       then we decide it is mpeg ps. We do not send highest value to
--       give a chance to mpegts */
--    /* NOTE: the search range was restricted to avoid too many false
--       detections */
--
--    for (i = 0; i < size; i++) {
--        code = (code << 8) | p->buf[i];
-+    for(i=0; i<p->buf_size; i++){
-+        code = (code<<8) + p->buf[i];
-         if ((code & 0xffffff00) == 0x100) {
--            if (code == PACK_START_CODE ||
--                code == SYSTEM_HEADER_START_CODE ||
--                (code >= 0x1e0 && code <= 0x1ef) ||
--                (code >= 0x1c0 && code <= 0x1df) ||
--                code == PRIVATE_STREAM_2 ||
--                code == PROGRAM_STREAM_MAP ||
--                code == PRIVATE_STREAM_1 ||
--                code == PADDING_STREAM ||
--                code >= 0x100 && code <= 0x1b0)
--                return AVPROBE_SCORE_MAX - 2;
--            else
--                return 0;
-+            int pes= check_pes(p->buf+i, p->buf+p->buf_size);
-+
-+            if(code == SYSTEM_HEADER_START_CODE) sys++;
-+            else if(code == PRIVATE_STREAM_1)    priv1++;
-+            else if(code == PACK_START_CODE)     pspack++;
-+            else if((code & 0xf0) == VIDEO_ID &&  pes) vid++;
-+            else if((code & 0xe0) == AUDIO_ID &&  pes) audio++;
-+
-+            else if((code & 0xf0) == VIDEO_ID && !pes) invalid++;
-+            else if((code & 0xe0) == AUDIO_ID && !pes) invalid++;
-         }
-     }
- 
--    return 0;
-+    if(vid+audio > invalid)     /* invalid VDR files nd short PES streams */
-+        score= AVPROBE_SCORE_MAX/4;
-+
-+//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d len:%d\n", sys, priv1, pspack,vid, audio, p->buf_size);
-+    if(sys>invalid && sys*9 <= pspack*10)
-+        return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
-+    if(priv1 + vid + audio > invalid && (priv1+vid+audio)*9 <= pspack*10)
-+        return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
-+    if((!!vid ^ !!audio) && (audio > 4 || vid > 1) && !sys && !pspack && p->buf_size>2048) /* PES stream */
-+        return AVPROBE_SCORE_MAX/2+2;
-+
-+    //02-Penguin.flac has sys:0 priv1:0 pspack:0 vid:0 audio:1
-+    return score;
- }
- 
- typedef struct MpegDemuxContext {
diff --git a/abs/extra-testing/community/mythtv-vdpau/mythbackend b/abs/extra-testing/community/mythtv-vdpau/mythbackend
deleted file mode 100755
index 93773a2..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/mythbackend
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/mythbackend`
-case "$1" in
-  start)
-    stat_busy "Starting MythTV Backend"
-    [ ! -e /var/run/mysqld.pid ] && echo -n "mysqld not started" && stat_fail && exit
-    [ -z "$PID" ] && /usr/bin/mythbackend -d -l /var/log/mythbackend.log -v important 
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/mythbackend.pid
-      add_daemon mythbackend
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping MythTV Backend"
-    [ ! -z "$PID" ]  && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mythbackend
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1s 
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/extra-testing/community/mythtv-vdpau/mythbackend.lr b/abs/extra-testing/community/mythtv-vdpau/mythbackend.lr
deleted file mode 100644
index 4f218bc..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/mythbackend.lr
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/mythtv/mythbackend.log {
-	copytruncate
-	daily
-	size 10M
-	missingok
-	rotate 7
-	compress
-	notifempty
-}
diff --git a/abs/extra-testing/community/mythtv-vdpau/mythfrontend.lr b/abs/extra-testing/community/mythtv-vdpau/mythfrontend.lr
deleted file mode 100644
index 1580533..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/mythfrontend.lr
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/mythtv/mythfrontend.log {
-	copytruncate
-	daily
-	size 10M
-	missingok
-	rotate 7
-	compress
-	notifempty
-}
diff --git a/abs/extra-testing/community/mythtv-vdpau/myththemedmenu.cpp.patch b/abs/extra-testing/community/mythtv-vdpau/myththemedmenu.cpp.patch
deleted file mode 100644
index e5c57ef..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/myththemedmenu.cpp.patch
+++ /dev/null
@@ -1,125 +0,0 @@
---- libs/libmythui/myththemedmenu.cpp.orig	2008-01-31 15:26:38.000000000 +0000
-+++ libs/libmythui/myththemedmenu.cpp	2008-02-07 22:24:27.000000000 +0000
-@@ -2102,6 +2102,10 @@
-             }
-             lastbutton = NULL;
-         }
-+        else if (action == "MENU")
-+        {
-+            parent->doMenu();
-+        }
-         else if (action == "EJECT")
-         {
-             myth_eject();
-@@ -2482,6 +2486,8 @@
- 
-     if (d->foundtheme)
-         d->parseMenu(menufile);
-+
-+    m_menuPopup = NULL;
- }
- 
- MythThemedMenu::~MythThemedMenu(void)
-@@ -2592,3 +2598,102 @@
-     MythScreenType::aboutToShow();
-     d->updateLCD();
- }
-+void MythThemedMenu::doMenu()
-+{
-+    int allowsd = gContext->GetNumSetting("AllowQuitShutdown");
-+    if (m_menuPopup)
-+        return;
-+    QString label = "System Menu";
-+    MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
-+    m_menuPopup = new MythDialogBox(label, mainStack, "menuPopup");
-+    if (m_menuPopup->Create())
-+        mainStack->AddScreen(m_menuPopup);
-+
-+    //changed line to always show shutdown/reboot
-+    if ( allowsd != 10 && allowsd !=14  )
-+    {
-+        m_menuPopup->SetReturnEvent(this,"popmenu_exit");
-+        m_menuPopup->AddButton("Power off");
-+        m_menuPopup->AddButton("Reboot");
-+        m_menuPopup->AddButton("About");
-+        m_menuPopup->AddButton("Cancel");
-+    }
-+    else
-+    {
-+        m_menuPopup->SetReturnEvent(this,"popmenu_noexit");
-+        m_menuPopup->AddButton("About");
-+        m_menuPopup->AddButton("Cancel");
-+    }
-+}
-+
-+void MythThemedMenu::aboutScreen()
-+{
-+{
-+        extern const char *myth_source_version;
-+        extern const char *myth_source_path;
-+        QString distro_line;
-+        distro_line="";
-+
-+        QFile file("/etc/os_myth_release");
-+        if ( file.open(IO_ReadOnly | IO_Translate) )
-+        {
-+            QTextStream t( &file );        // use a text stream
-+            distro_line = t.readLine();
-+            file.close();
-+        }
-+
-+        QString label = "";
-+        label.append(QObject::tr("Revision: ") + myth_source_version   + "  \n  Branch:" +  myth_source_path  + "\n" + distro_line );
-+
-+        MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
-+        m_menuPopup = new MythDialogBox(label, mainStack, "About");
-+        if (m_menuPopup->Create())
-+            mainStack->AddScreen(m_menuPopup);
-+
-+        m_menuPopup->SetReturnEvent(this,"About");
-+        m_menuPopup->AddButton("OK!");
-+    }
-+}
-+
-+void MythThemedMenu::customEvent(QCustomEvent *event)
-+{
-+    if (event->type() == kMythDialogBoxCompletionEventType)
-+    {
-+        DialogCompletionEvent *dce =
-+                dynamic_cast<DialogCompletionEvent*>(event);
-+
-+        QString resultid= dce->GetId();
-+        int buttonnum  = dce->GetResult();
-+        if (resultid == "popmenu_exit")
-+        {
-+            if (buttonnum == 0)
-+            {
-+                QString halt_cmd = gContext->GetSetting("HaltCommand",
-+                        "sudo /sbin/halt -p");
-+                if (!halt_cmd.isEmpty())
-+                    system(halt_cmd.ascii());
-+            }
-+
-+            if (buttonnum == 1)
-+            {
-+                QString reboot_cmd = gContext->GetSetting("RebootCommand",
-+                        "sudo /sbin/reboot");
-+                if (!reboot_cmd.isEmpty())
-+                    system(reboot_cmd.ascii());
-+            }
-+
-+            if (buttonnum == 2)
-+            {
-+                aboutScreen();
-+            }
-+        }
-+
-+        if (resultid == "popmenu_noexit")
-+        {
-+            if (buttonnum == 0)
-+                aboutScreen();
-+        }
-+
-+        m_menuPopup = NULL;
-+    }
-+}
diff --git a/abs/extra-testing/community/mythtv-vdpau/myththemedmenu.h.patch b/abs/extra-testing/community/mythtv-vdpau/myththemedmenu.h.patch
deleted file mode 100644
index 9744b11..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/myththemedmenu.h.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- libs/libmythui/myththemedmenu.h.orig	2008-01-31 15:26:45.000000000 +0000
-+++ libs/libmythui/myththemedmenu.h	2008-02-07 21:00:22.000000000 +0000
-@@ -2,6 +2,7 @@
- #define MYTHTHEMEDMENU_H_
- 
- #include "mythscreentype.h"
-+#include "mythdialogbox.h"
- 
- class MythMainWindow;
- class MythThemedMenuPrivate;
-@@ -26,8 +27,14 @@
- 
-     void ReloadTheme(void);
-     void ReloadExitKey(void);
-+
-     virtual void aboutToShow(void);
- 
-+    void doMenu();
-+    void aboutScreen();
-+    MythDialogBox *m_menuPopup;
-+    void customEvent(QCustomEvent *event);
-+
-   protected:
-     virtual bool keyPressEvent(QKeyEvent *e);
-     virtual void gestureEvent(MythUIType *origtype, MythGestureEvent *ge);
diff --git a/abs/extra-testing/community/mythtv-vdpau/mythtv.install b/abs/extra-testing/community/mythtv-vdpau/mythtv.install
deleted file mode 100644
index a063766..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/mythtv.install
+++ /dev/null
@@ -1,61 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-	if [ ! -d /var/log/mythtv ]
-	then
-		mkdir -p /var/log/mythv
-		chown -R mythtv /var/log/mythtv
-		echo "---" > /var/log/mythtv/mythbackend.log
-		chown mythtv /var/log/mythtv/mythbackend.log
-	fi
-	if [ -e /tmp/is.xml ]
-	then
-		cp /tmp/is.xml /usr/share/mythtv/is.xml
-	fi
-
-	if [ -e /tmp/media_settings.xml ]
-	then
-		 cp /tmp/media_settings.xml /usr/share/mythtv/media_settings.xml 
-        fi
-
-        echo
-        echo
-        echo "As is with no guarantee, please don't file any bu reports against this package."
-}
-pre_upgrade() {
-	if [ -e /usr/share/mythtv/is.xml ]
-	then
-		cp /usr/share/mythtv/is.xml /tmp
-	fi
-
-	if [ -e /usr/share/mythtv/media_settings.xml ]
-	then
-		cp /usr/share/mythtv/media_settings.xml /tmp
-	fi
-}
-
-post_upgrade() {
-	cp /tmp/is.xml /usr/share/mythtv/
-	cp /tmp/media_settings.xml /usr/share/mythtv/
-	if [ ! -d /var/log/mythtv ]
-	then
-		mkdir -p /var/log/mythv
-		chown -R mythtv /var/log/mythtv
-	fi
-        echo
-        echo
-        echo "As is with no guarantee, please don't file any bu reports against this package."
-
-}
-pre_remove () {
-	pre_upgrade
-}
-
-# arg 1:  the old package version
-post_remove() {
-	/bin/true
-
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/community/mythtv-vdpau/pretty b/abs/extra-testing/community/mythtv-vdpau/pretty
deleted file mode 100644
index eed6f9c..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/pretty
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-su - mythtv -c "/usr/bin/perl /usr/share/mythtv/contrib/mythrename.pl --link /myth/pretty"
diff --git a/abs/extra-testing/community/mythtv-vdpau/smolt_jump.patch b/abs/extra-testing/community/mythtv-vdpau/smolt_jump.patch
deleted file mode 100644
index 696be80..0000000
--- a/abs/extra-testing/community/mythtv-vdpau/smolt_jump.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- programs/mythfrontend/networkcontrol.cpp.orig	2008-03-23 23:00:25.000000000 +0000
-+++ programs/mythfrontend/networkcontrol.cpp	2008-03-23 23:01:33.000000000 +0000
-@@ -81,6 +81,7 @@
-     jumpMap["zoneminderliveview"]    = "ZoneMinder Live View";
-     jumpMap["zoneminderevents"]      = "ZoneMinder Events";
-+    jumpMap["mythsmolt"]             = "MythSmolt";
- 
-     // These jump point names match the (lowercased) locations from gContext
-     jumpMap["channelrecpriority"]    = "Channel Recording Priorities";
diff --git a/abs/extra-testing/community/ncdu/PKGBUILD b/abs/extra-testing/community/ncdu/PKGBUILD
deleted file mode 100644
index fb61b63..0000000
--- a/abs/extra-testing/community/ncdu/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Contributor: lp76 <l.peduto@gmail.com>
-pkgname=ncdu
-pkgver=1.4
-pkgrel=1
-pkgdesc="An NCurses version of the famous old 'du' unix command"
-arch=('i686' 'x86_64')
-url="http://dev.yorhel.nl/ncdu/"
-license=('MIT')
-depends=('ncurses')
-source=(http://dev.yorhel.nl/download/$pkgname-$pkgver.tar.gz)
-md5sums=('07f01579f7c9852033139ae9fa2414c9')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-  install -D COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/abs/extra-testing/community/network-ups-tools/PKGBUILD b/abs/extra-testing/community/network-ups-tools/PKGBUILD
deleted file mode 100644
index 1644c2e..0000000
--- a/abs/extra-testing/community/network-ups-tools/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 12757 2010-03-13 04:22:57Z dgriffiths $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-# Contributor: Giuseppe Lucarelli <luk@rebelsoft.org>
-
-pkgname=network-ups-tools
-pkgver=2.4.3
-pkgrel=5
-pkgdesc="NUT is a collection of programs for monitoring and administering UPS hardware"
-arch=('i686' 'x86_64')
-url="http://www.networkupstools.org/"
-license=('GPL2')
-depends=('openssl' 'hal' 'gd')
-makedepends=('libusb')
-backup=(etc/ups/{ups.conf,upsd.conf,upsd.users,upsmon.conf,upssched.conf})
-install=nut.install
-source=(http://www.networkupstools.org/source/2.4/nut-$pkgver.tar.gz run.upsd finish.upsd)
-options=('!emptydirs' '!libtool')
-
-build() {
-cd $srcdir/nut-$pkgver
-./configure --with-user=nut \
---prefix=/usr \
---datadir=/usr/share/ups \
---sysconfdir=/etc/ups \
---with-group=nut \
---with-hal \
---with-usb \
---with-cgi \
---with-cgipath=/usr/share/webapps/nut \
---with-htmlpath=/usr/share/webapps/nut \
---with-udev-dir=/etc/udev || return 1
-
-  make || return 1
-  make DESTDIR=$pkgdir install
-  #ugly hack because --with-pkgconfig-dir doesn't work
-  install -D -m644 lib/libupsclient.pc $pkgdir/usr/lib/pkgconfig
-
-  install -D -m644 conf/ups.conf.sample $pkgdir/etc/ups/ups.conf
-  install -D -m640 conf/upsd.conf.sample $pkgdir/etc/ups/upsd.conf
-  install -D -m640 conf/upsd.users.sample $pkgdir/etc/ups/upsd.users
-  install -D -m640 conf/upsmon.conf.sample $pkgdir/etc/ups/upsmon.conf
-  install -D -m644 conf/upssched.conf.sample $pkgdir/etc/ups/upssched.conf
-  install -D -m755 ../run.upsd $pkgdir/etc/sv/upsd/run || return 1
-  install -D -m755 ../finish.upsd $pkgdir/etc/sv/upsd/finish || return 1
-
-  # Fix udev rules
-  sed -i "s|SYSFS|ATTRS|g" $pkgdir/etc/udev/rules.d/52-nut-usbups.rules
-  install -dm755 ${pkgdir}/lib
-  mv ${pkgdir}/etc/udev ${pkgdir}/lib
-}
-md5sums=('6f893b61b07915e7a139324fa3f79121'
-         'd7af81650a966660f6fd41f957c66165'
-         'd50f13385848a9bb8f8cbc9ee5dd9fd5')
diff --git a/abs/extra-testing/community/network-ups-tools/finish.upsd b/abs/extra-testing/community/network-ups-tools/finish.upsd
deleted file mode 100644
index 8eb335b..0000000
--- a/abs/extra-testing/community/network-ups-tools/finish.upsd
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/upsd`
-     stat_runit "Stopping UPSd Daemon"
-     /usr/bin/upsdrvctl stop &> /dev/null
-     /usr/sbin/upsmon -c stop &> /dev/null
-     [ ! -z "$PID" ] && kill $PID &> /dev/null
-     if [ $? -gt 0 ]; then
-       stat_fail
-     else
-       rm_daemon upsd
-       stat_done
-     fi
diff --git a/abs/extra-testing/community/network-ups-tools/nut.install b/abs/extra-testing/community/network-ups-tools/nut.install
deleted file mode 100644
index 1e6beee..0000000
--- a/abs/extra-testing/community/network-ups-tools/nut.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-  groupadd -g 55 nut &> /dev/null
-  useradd -u 55 -g nut -G tty -d /var/state/ups -s /bin/false nut >/dev/null 2>&1
-  mkdir -p /var/state/ups/
-  chmod 0770 /var/state/ups/
-  chown root:nut /var/state/ups/
-  chown root:nut /etc/ups/upsd.conf /etc/ups/upsd.users /etc/ups/upsmon.conf
-  echo ">>> Before starting your UPSd daemon, it is imperative"
-  echo ">>> that you read through and edit where needed these files:"
-  echo ">>> /etc/ups/{ups.conf,upsd.conf,upsmon.conf,upsd.users}"
-  echo ">>>"
-  echo ">>> Then add the the upsd service:"
-  echo ">>> $ sudo add_service.sh upsd"
-}
-
-pre_remove() {
-  remove_service.sh upsd
-  userdel nut >/dev/null 2>&1
-  groupdel nut >/dev/null 2>&1
-  rm -rf /var/state/ups/
-}
diff --git a/abs/extra-testing/community/network-ups-tools/run.upsd b/abs/extra-testing/community/network-ups-tools/run.upsd
deleted file mode 100644
index 83be88d..0000000
--- a/abs/extra-testing/community/network-ups-tools/run.upsd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/upsd`
-
-    stat_runit "Starting UPSd Daemon"
-    /usr/bin/upsdrvctl start &> /dev/null
-    [ -z "$PID" ] && /usr/sbin/upsd &>/dev/null
-    /usr/sbin/upsmon &>/dev/null
-    if [ $? -gt 0 ]; then
-       stat_fail
-    else
-       add_daemon upsd
-       stat_done
-   fi
-
-   while [ -n $PID ] ; do
-   sleep 60
-   done
diff --git a/abs/extra-testing/community/nvclock/PKGBUILD b/abs/extra-testing/community/nvclock/PKGBUILD
deleted file mode 100644
index d49f915..0000000
--- a/abs/extra-testing/community/nvclock/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 23406 2009-01-09 22:39:57Z andyrtr $
-# Contributor: Markus Meissner <markus@meissna.de>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=nvclock
-pkgver=0.8b4
-pkgrel=1
-pkgdesc="A small utility which allows users to overclock NVIDIA based video cards"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk2')
-source=(http://www.linuxhardware.org/$pkgname/${pkgname}${pkgver}.tar.gz
-	nvclock-0.8b4-buildfix.patch)
-url="http://www.linuxhardware.org/nvclock/"
-md5sums=('23f1b3ebf40f35d76d5fdac50f66ab11'
-         '1da24b50dd6a8c4704fa550a3e1a8b53')
-options=('!makeflags')
-
-build(){
-  cd ${srcdir}/$pkgname$pkgver
-  # build fix from Fedora
-  patch -Np1 -i $srcdir/nvclock-0.8b4-buildfix.patch || return 1
-  sed -i 's:${prefix}/man:${prefix}\/share\/man:' ${srcdir}/$pkgname$pkgver/Makefile.in || return 1
-  ./configure --prefix=/usr --bindir=/usr/bin
-  make || return 1 || return 1
-  make DESTDIR=${pkgdir} install || return 1
-}
diff --git a/abs/extra-testing/community/nvclock/nvclock-0.8b4-buildfix.patch b/abs/extra-testing/community/nvclock/nvclock-0.8b4-buildfix.patch
deleted file mode 100644
index cdc9f5c..0000000
--- a/abs/extra-testing/community/nvclock/nvclock-0.8b4-buildfix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -upNr nvclock0.8b4.orign/src/Makefile.in nvclock0.8b4/src/Makefile.in
---- nvclock0.8b4.orign/src/Makefile.in	2009-01-03 18:02:54.000000000 +0100
-+++ nvclock0.8b4/src/Makefile.in	2009-01-07 11:37:39.000000000 +0100
-@@ -50,8 +50,8 @@ distclean: distclean-recursive clean-app
- install: install-recursive install-app
- install-app:
- 	mkdir -p $(bindir)
--	$(INSTALL) -c nvclock $(DESTDIR)$(bindir)/nvclock
--	$(INSTALL) -c smartdimmer $(DESTDIR)$(bindir)/smartdimmer
-+	$(INSTALL) -c nvclock $(bindir)/nvclock
-+	$(INSTALL) -c smartdimmer $(bindir)/smartdimmer
- 
- 
- uninstall: uninstall-recursive uninstall-app
-
-
diff --git a/abs/extra-testing/community/nvidia-beta/PKGBUILD b/abs/extra-testing/community/nvidia-beta/PKGBUILD
deleted file mode 100644
index d4beaf7..0000000
--- a/abs/extra-testing/community/nvidia-beta/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer : Dan Vratil <progdan@progdansoft.com>
-
-pkgname=nvidia-beta 
-pkgver=180.41
-_kernver=2.6.28-LinHES
-pkgrel=1
-pkgdesc="NVIDIA beta drivers for kernel26." 
-arch=('i686' 'x86_64') 
-[ "$CARCH" = "i686" ] && ARCH=x86 && NV=0 
-[ "$CARCH" = "x86_64" ] && ARCH=x86_64 && NV=0 
-provides=('nvidia=180.41')
-url="http://www.nvidia.com/" 
-depends=('kernel26' 'nvidia-utils-beta=180.41') 
-conflicts=('nvidia-96xx' 'nvidia-71xx' 'nvidia-legacy') 
-license=('custom') 
-provides=("nvidia")
-install=('nvidia.install')
-source=(ftp://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg${NV}.run) 
-
-md5sums=('ec91f014a00357303c12f4cfd03c8a3f')
-[ "$CARCH" = "x86_64" ] && md5sums=('07ec7b5521d927b6ff332ef019ac80cd')
-
-
-build()
-{
-  # Extract
-  echo ${_kernver}
-  cd $startdir/src/
-  sh NVIDIA-Linux-$ARCH-${pkgver}-pkg${NV}.run --extract-only
-  cd NVIDIA-Linux-$ARCH-${pkgver}-pkg${NV}
-  
-  # Any extra patches are applied in here...
-
-  cd usr/src/nv/
-  ln -s Makefile.kbuild Makefile
-  make SYSSRC=/lib/modules/${_kernver}/build module 
-  
-  # install kernel module
-  mkdir -p $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/video/
-  install -m644 nvidia.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/video/
-
-  sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install
-}
-
diff --git a/abs/extra-testing/community/nvidia-beta/nvidia.install b/abs/extra-testing/community/nvidia-beta/nvidia.install
deleted file mode 100644
index f892d98..0000000
--- a/abs/extra-testing/community/nvidia-beta/nvidia.install
+++ /dev/null
@@ -1,22 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  KERNEL_VERSION=`uname -r`
-  depmod -v $KERNEL_VERSION  > /dev/null 2>&1
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-  rmmod nvidia || echo 'In order to use the new nvidia module, exit Xserver and unload it manually.'
-}
-
-# arg 1:  the old package version
-post_remove() {
-  KERNEL_VERSION=`uname -r`
-  depmod -v $KERNEL_VERSION	 > /dev/null 2>&1	 
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/community/nvidia-utils-beta/PKGBUILD b/abs/extra-testing/community/nvidia-utils-beta/PKGBUILD
deleted file mode 100644
index d89addd..0000000
--- a/abs/extra-testing/community/nvidia-utils-beta/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-#Maintainer: Dan Vratil <progdan@progdansoft.com>
-
-pkgname=nvidia-utils-beta
-pkgver=180.41
-pkgrel=1
-pkgdesc="NVIDIA beta drivers utilities and libraries."
-provides=('nvidia-utils' 'libgl')
-arch=('i686' 'x86_64')
-[ "$CARCH" = "i686"   ] && ARCH=x86 && NV=0
-[ "$CARCH" = "x86_64" ] && ARCH=x86_64 && NV=0
-url="http://www.nvidia.com/"
-depends=('xorg-server>=1.5')
-provides=('nvidia-utils=180.41' 'libgl')
-conflicts=('libgl' 'libgl-dri' 'ati-fglrx-utils' 'nvidia-legacy-utils' \
-           'nvidia-71xx-utils' 'nvidia-96xx-utils')
-license=('custom')
-install=nvidia.install
-source=(ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/NVIDIA-Linux-${ARCH}-${pkgver}-pkg${NV}.run \
-        supported-cards.txt) 
-        
-md5sums=('ec91f014a00357303c12f4cfd03c8a3f'
-         '5b5835bdb1508a57591b812c109a2679')
-[ "$CARCH" = "x86_64" ] && md5sums=('07ec7b5521d927b6ff332ef019ac80cd'
-         '5b5835bdb1508a57591b812c109a2679')                  
-options=(docs)
-
-build()
-{
-  # override nvida install routine and do it the long way.
-  cd $startdir/src/
-  sh NVIDIA-Linux-${ARCH}-${pkgver}-pkg${NV}.run --extract-only
-  cd NVIDIA-Linux-${ARCH}-${pkgver}-pkg${NV}/usr/
-
-  mkdir -p $startdir/pkg/usr/{lib,bin,share/applications,share/pixmaps,man/man1}
-  mkdir -p $startdir/pkg/usr/lib/xorg/modules/{extensions,drivers}
-  mkdir -p $startdir/pkg/usr/share/licenses/nvidia/
-  
-  #install lib/{libGLcore,libGL,libnvidia-cfg,libcuda,tls/libnvidia-tls}.so.${pkgver} \
-  mkdir -p $startdir/pkg/usr/include/{,GL,cuda,vdpau}
-  
-  install -m644 include/cuda/{cudaGL,cuda}.h $startdir/pkg/usr/include/cuda
-  install -m644 include/vdpau/{vdpau_x11,vdpau}.h $startdir/pkg/usr/include/vdpau
-  # Conflicts with MESA; if you want to develop opengl app, enable this line
-  #install -m644 include/GL/{glxext,gl,glx,glext}.h $startdir/pkg/usr/include/GL
-  
-  install lib/{libGLcore,libGL,libnvidia-cfg,libcuda,tls/libnvidia-tls,libvdpau_nvidia,libvdpau,libvdpau_trace}.so.${pkgver} \
-    $startdir/pkg/usr/lib/ || return 1
-  
-  install -m644 share/man/man1/* $startdir/pkg/usr/man/man1/ || return 1
-  rm $startdir/pkg/usr/man/man1/nvidia-installer.1.gz || return 1
-  install X11R6/lib/libXv* $startdir/pkg/usr/lib/ || return 1
-  install -m644 share/applications/nvidia-settings.desktop $startdir/pkg/usr/share/applications/ || return 1
-  # fix nvidia .desktop file
-  sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i $startdir/pkg/usr/share/applications/nvidia-settings.desktop
-  install -m644 share/pixmaps/nvidia-settings.png $startdir/pkg/usr/share/pixmaps/ || return 1
-  install X11R6/lib/modules/libnvidia-wfb.so.$pkgver $startdir/pkg/usr/lib/xorg/modules || return 1
-  install X11R6/lib/modules/drivers/nvidia_drv.so $startdir/pkg/usr/lib/xorg/modules/drivers || return 1
-  install X11R6/lib/modules/extensions/libglx.so.$pkgver $startdir/pkg/usr/lib/xorg/modules/extensions || return 1
-  install -m755 bin/nvidia-{settings,xconfig,bug-report.sh} $startdir/pkg/usr/bin/ || return 1
-  cd $startdir/pkg/usr/lib/
-  ln -s libGL.so.$pkgver libGL.so || return 1
-  ln -s libGL.so.$pkgver libGL.so.1 || return 1
-  ln -s libGLcore.so.$pkgver libGLcore.so.1 || return 1
-  ln -s libnvidia-cfg.so.$pkgver libnvidia-cfg.so.1 || return 1
-  ln -s libnvidia-tls.so.$pkgver libnvidia-tls.so.1 || return 1
-  ln -s libcuda.so.$pkgver libcuda.so.1 || return 1
-  ln -s libXvMCNVIDIA.so.$pkgver libXvMCNVIDIA_dynamic.so.1 || return 1
-  ln -s libvdpau.so.$pkgver libvdpau.so.1 || return 1
-  ln -s libvdpau.so.$pkgver libvdpau.so || return 1
-  cd $startdir/pkg/usr/lib/xorg/modules/extensions
-  ln -s libglx.so.$pkgver libglx.so || return 1
-
-  install -m644 $startdir/src/NVIDIA-Linux-${ARCH}-${pkgver}-pkg${NV}/LICENSE $startdir/pkg/usr/share/licenses/nvidia/ || return 1
-  ln -s nvidia $startdir/pkg/usr/share/licenses/nvidia-utils || return 1
-  install -D -m644 $startdir/src/NVIDIA-Linux-${ARCH}-${pkgver}-pkg${NV}/usr/share/doc/README.txt $startdir/pkg/usr/share/doc/nvidia/README || return 1
-  install -D -m644 $startdir/src/supported-cards.txt $startdir/pkg/usr/share/doc/nvidia/supported-cards.txt || return 1
-  
-  find $startdir/pkg/usr -type d -exec chmod 755 {} \;
-}
-
diff --git a/abs/extra-testing/community/nvidia-utils-beta/nvidia.install b/abs/extra-testing/community/nvidia-utils-beta/nvidia.install
deleted file mode 100644
index 6f50f79..0000000
--- a/abs/extra-testing/community/nvidia-utils-beta/nvidia.install
+++ /dev/null
@@ -1,36 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-
-  echo -------------------------------
-  echo By using this package you accept the NVIDIA license, 
-  echo which has been installed in /usr/share/licenses/nvidia/LICENSE
-  echo If you do not accept this license, you must remove the package immediately.
-  echo Dont forget to update your /etc/X11/xorg.conf
-  echo In order to use nvidia-settings, you need to install the 'gtk2' package.
-  echo In order to use nvidia-xconfig, you need to install the 'pkgconfig' package.
-  echo -------------------------------
-  echo nvidia 9746 drops support for Geforce 3 and 4 cards
-  echo If you have such a card, install the nvidia-96xx, nvidia-96xx-utils,
-  echo nvidia-96xx-ck, nvidia-96xx-beyond, nvidia-96xx-suspend2 packages
-  echo For a list of supported cards, see /usr/share/doc/nvidia/supported-cards.txt
-  echo -------------------------------
-  echo This drivers are beta. We recommend to use drivers from extra repo.
-
-# echo ":: Updating symlinks to use built-in libwfb"
-# ln -sf /usr/lib/xorg/modules/libnvidia-wfb.so.*  /usr/lib/xorg/modules/libwfb.so 
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-#post_remove() {
-# echo ":: Updating symlinks to use xorg-server libwfb"
-# ln -sf /usr/lib/xorg/modules/libwfb.so.*  /usr/lib/xorg/modules/libwfb.so
-#}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/community/nvidia-utils-beta/supported-cards.txt b/abs/extra-testing/community/nvidia-utils-beta/supported-cards.txt
deleted file mode 100644
index 7dfcb45..0000000
--- a/abs/extra-testing/community/nvidia-utils-beta/supported-cards.txt
+++ /dev/null
@@ -1,272 +0,0 @@
-Archlinux currently manages three branches of the NVIDIA binary driver:
-
-nvidia (latest nvidia release)
-nvidia-96xx (96xx legacy branch)
-nvidia-71xx (71xx legacy branch)
-
-This contains GPUs currently supported by the 177.76 beta driver.
-
-______________________________________________________________________________
-
-Appendix A. Supported NVIDIA GPU Products
-______________________________________________________________________________
-
-For the most complete and accurate listing of supported GPUs, please see the
-Supported Products List, available from the NVIDIA Linux x86 Graphics Driver
-download page. Please go to http://www.nvidia.com/object/unix.html, follow the
-Archive link under the Linux x86 heading, follow the link for the 177.36
-driver, and then go to the Supported Products List.
-
-
-A1. NVIDIA GEFORCE GPUS
-
-
-    NVIDIA GPU product                    Device PCI ID
-    ----------------------------------    ----------------------------------
-    GeForce 9800 GTX+			  0x0613
-    GeForce 9800GT			  0x0614
-    GeForce 8100P			  0x0847
-    nForce 780a SLI			  0x084C
-    nForce 750a SLI			  0x084D
-    GeForce 9700 M GTS			  0x062A
-    GeForce 9800 GX2                      0x0604
-    GeForce 9800 GTX                      0x0612
-    GeForce 9600 GT                       0x0622
-    GeForce 9500 GT			  0x0640
-    GeForce 9500M GS	                  0x0405
-    GeForce 8800M GTX                     0x060C
-    GeForce 8800M GTS                     0x0609
-    GeForce 8800 Ultra                    0x0194
-    GeForce 8800 GTX	                  0x0191
-    GeForce 8800 GTS 512	          0x0600
-    GeForce 8800 GTS	                  0x0193
-    GeForce 8800 GT	                  0x0602
-    GeForce 8800 GT	                  0x0611
-    GeForce 8800 GS	                  0x0606
-    GeForce 8800 GS	                  0x060D
-    GeForce 8700M GT	                  0x0409
-    GeForce 8600M GT	                  0x0407
-    GeForce 8600M GS	                  0x0425
-    GeForce 8600 GTS	                  0x0400
-    GeForce 8600 GT	                  0x0401
-    GeForce 8600 GT	                  0x0402
-    GeForce 8500 GT	                  0x0421
-    GeForce 8400M GT	                  0x0426
-    GeForce 8400M GS	                  0x0427
-    GeForce 8400M G	                  0x0428
-    GeForce 8400 SE	                  0x0420
-    GeForce 8400 GS	                  0x0404
-    GeForce 8400 GS	                  0x0422
-    GeForce 8400 GS	                  0x0424
-    GeForce 8400 GS	                  0x06E4
-    GeForce 8300 GS	                  0x0423
-    GeForce 8300	                  0x0848
-    GeForce 8200/ nForce 730a	          0x084A
-    GeForce 8200	                  0x0849
-    GeForce 8200	                  0x084B
-    GeForce 8100 / nForce 720a	          0x084F
-    GeForce 7950 GX2	                    0x0293
-    GeForce 7950 GX2	                    0x0294
-    GeForce 7950 GT	                      0x0295
-    GeForce 7950 GT	                      0x02E4
-    GeForce 7900 GTX	                    0x0290
-    GeForce 7900 GT/GTO	                  0x0291
-    GeForce 7900 GS	                      0x0292
-    GeForce 7900 GS	                      0x02E3
-    GeForce 7800 SLI	                    0x0095
-    GeForce 7800 GTX	                    0x0090
-    GeForce 7800 GTX	                    0x0091
-    GeForce 7800 GT	                      0x0092
-    GeForce 7800 GS	                      0x0093
-    GeForce 7800 GS	                      0x00F5
-    GeForce 7650 GS	                      0x0390
-    GeForce 7600 LE	                      0x0394
-    GeForce 7600 GT	                      0x02E0
-    GeForce 7600 GT	                      0x0391
-    GeForce 7600 GS	                      0x02E1
-    GeForce 7600 GS	                      0x0392
-    GeForce 7500 LE	                      0x01DD
-    GeForce 7350 LE	                      0x01D0
-    GeForce 7300 SE/7200 GS	              0x01D3
-    GeForce 7300 LE	                      0x01D1
-    GeForce 7300 GT	                      0x0393
-    GeForce 7300 GT	                      0x0395
-    GeForce 7300 GS	                      0x01DF
-    GeForce 7150M / nForce 630M	          0x0531
-    GeForce 7150 / NVIDIA nForce 630i	    0x07E0
-    GeForce 7100 GS	                      0x016A
-    GeForce 7100 / NVIDIA nForce 630i	    0x07E1
-    GeForce 7050 PV / NVIDIA nForce 630a	0x053A
-    GeForce 7050 PV / NVIDIA nForce 630a	0x053B
-    GeForce 7050 / NVIDIA nForce 610i	    0x07E3
-    GeForce 7025 / NVIDIA nForce 630a	    0x053E
-    GeForce 7000M / nForce 610M	          0x0533
-    GeForce 6800 XT	                      0x0044
-    GeForce 6800 XT	                      0x0048
-    GeForce 6800 XT	                      0x00C3
-    GeForce 6800 XT	                      0x0218
-    GeForce 6800 XE	                      0x0043
-    GeForce 6800 Ultra	                  0x0040
-    GeForce 6800 Ultra	                  0x00F9
-    GeForce 6800 LE	                      0x0042
-    GeForce 6800 LE	                      0x00C2
-    GeForce 6800 LE	                      0x0212
-    GeForce 6800 GT	                      0x0045
-    GeForce 6800 GT	                      0x0046
-    GeForce 6800 GT	                      0x0215
-    GeForce 6800 GS	                      0x0047
-    GeForce 6800 GS	                      0x00C0
-    GeForce 6800 GS	                      0x00F6
-    GeForce 6800	                        0x0041
-    GeForce 6800	                        0x00C1
-    GeForce 6800	                        0x00F0
-    GeForce 6800	                        0x0211
-    GeForce 6700 XL	                      0x0147
-    GeForce 6610 XL	                      0x0145
-    GeForce 6600 VE	                      0x0143
-    GeForce 6600 LE	                      0x00F4
-    GeForce 6600 LE	                      0x0142
-    GeForce 6600 GT	                      0x00F1
-    GeForce 6600 GT	                      0x0140
-    GeForce 6600	                        0x00F2
-    GeForce 6600	                        0x0141
-    GeForce 6500	                        0x0160
-    GeForce 6250	                        0x0169
-    GeForce 6200SE TurboCache(TM)	        0x0162
-    GeForce 6200 TurboCache(TM)	          0x0161
-    GeForce 6200 LE	                      0x0163
-    GeForce 6200 A-LE	                    0x0222
-    GeForce 6200	                        0x00F3
-    GeForce 6200	                        0x014F
-    GeForce 6200	                        0x0221
-    GeForce 6150SE nForce 430	            0x03D0
-    GeForce 6150 LE	                      0x0241
-    GeForce 6150	                        0x0240
-    GeForce 6100 nForce 420	              0x03D5
-    GeForce 6100 nForce 405	              0x03D1
-    GeForce 6100 nForce 400	              0x03D2
-    GeForce 6100	                        0x0242
-    GeForce PCX 5900	                    0x00FB
-    GeForce PCX 5750	                    0x00FA
-    GeForce PCX 5300	                    0x00FC
-    GeForce Go 7950 GTX	                  0x0297
-    GeForce Go 7900 GTX	                  0x0299
-    GeForce Go 7900 GS	                  0x0298
-    GeForce Go 7800 GTX	                  0x0099
-    GeForce Go 7800	                      0x0098
-    GeForce Go 7600 GT	                  0x0399
-    GeForce Go 7600	                      0x0398
-    GeForce Go 7400	                      0x01D8
-    GeForce Go 7300	                      0x01D7
-    GeForce Go 7200	                      0x01D6
-    GeForce Go 6800 Ultra	                0x00C9
-    GeForce Go 6800	                      0x00C8
-    GeForce Go 6600 TE/6200 TE	          0x0146
-    GeForce Go 6600 GT	                  0x0149
-    GeForce Go 6600	                      0x0144
-    GeForce Go 6600	                      0x0148
-    GeForce Go 6400	                      0x0166
-    GeForce Go 6400	                      0x0168
-    GeForce Go 6200	                      0x0164
-    GeForce Go 6200	                      0x0167
-    GeForce Go 6150	                      0x0244
-    GeForce Go 6100	                      0x0247
-    GeForce FX Go5700	                    0x0347
-    GeForce FX Go5700	                    0x0348
-    GeForce FX Go5650	                    0x031B
-    GeForce FX Go5600	                    0x031A
-    GeForce FX Go53xx	                    0x032C
-    GeForce FX Go5250	                    0x0325
-    GeForce FX Go5200 32M/64M	            0x0328
-    GeForce FX Go5200	                    0x0324
-    GeForce FX Go5100	                    0x032D
-    GeForce FX 5950 Ultra	                0x0333
-    GeForce FX 5900ZT	                    0x0334
-    GeForce FX 5900XT	                    0x0332
-    GeForce FX 5900 Ultra	                0x0330
-    GeForce FX 5900	                      0x0331
-    GeForce FX 5800 Ultra	                0x0301
-    GeForce FX 5800	                      0x0302
-    GeForce FX 5700VE	                    0x0344
-    GeForce FX 5700LE	                    0x0343
-    GeForce FX 5700 Ultra	                0x0341
-    GeForce FX 5700	                      0x0342
-    GeForce FX 5600XT	                    0x0314
-    GeForce FX 5600 Ultra	                0x0311
-    GeForce FX 5600	                      0x0312
-    GeForce FX 5500	                      0x0326
-    GeForce FX 5200LE	                    0x0323
-    GeForce FX 5200 Ultra	                0x0321
-    GeForce FX 5200	                      0x0320
-    GeForce FX 5200	                      0x0322
-    GeForce FX 5100	                      0x0327
-
-
-A1. TESLA GPUS
-
-    NVIDIA GPU product                        Device PCI ID
-    ----------------------------------        ----------------------------------
-    Tesla C870                                0x0197
-
-
-A1. NVIDIA GEFORCE GPUS
-
-    NVIDIA GPU product                        Device PCI ID
-    ----------------------------------        ----------------------------------
-    Quadro FX 770M			      0x065C
-    Quadro NVS 160M			      0x06EB
-    Quadro NVS 150M			      0x06EA
-    Quadro FX 1000	                      0x0309
-    Quadro FX 1100	                      0x034E
-    Quadro FX 1300	                      0x00FE
-    Quadro FX 1400	                      0x00CE
-    Quadro FX 1500	                      0x029E
-    Quadro FX 1500M	                      0x029B
-    Quadro FX 1600M	                      0x040D
-    Quadro FX 1700	                      0x040F
-    Quadro FX 2000	                      0x0308
-    Quadro FX 2500M	                      0x029A
-    Quadro FX 3000	                      0x0338
-    Quadro FX 330	                        0x00FC
-    Quadro FX 3450/4000 SDI	              0x00CD
-    Quadro FX 350	                        0x01DE
-    Quadro FX 3500	                      0x029D
-    Quadro FX 350M	                      0x01DC
-    Quadro FX 3600M	                      0x061C
-    Quadro FX 360M	                      0x042D
-    Quadro FX 370	                        0x040A
-    Quadro FX 3700	                      0x061A
-    Quadro FX 4000	                      0x004E
-    Quadro FX 4400/Quadro FX 3400	        0x00F8
-    Quadro FX 4500	                      0x009D
-    Quadro FX 4500 X2	                    0x029F
-    Quadro FX 4600	                      0x019E
-    Quadro FX 500/FX 600	                0x032B
-    Quadro FX 540	                        0x014E
-    Quadro FX 540M	                      0x014C
-    Quadro FX 550	                        0x014D
-    Quadro FX 5500	                      0x029C
-    Quadro FX 560	                        0x039E
-    Quadro FX 5600	                      0x019D
-    Quadro FX 570	                        0x040E
-    Quadro FX 570M	                      0x040C
-    Quadro FX 700	                        0x033F
-    Quadro FX Go1000	                    0x034C
-    Quadro FX Go1400	                    0x00CC
-    Quadro FX Go700	                      0x031C
-    Quadro NVS 110M	                      0x01D7
-    Quadro NVS 110M	                      0x01DA
-    Quadro NVS 120M	                      0x01DB
-    Quadro NVS 130M	                      0x042A
-    Quadro NVS 135M	                      0x042B
-    Quadro NVS 140M	                      0x0429
-    Quadro NVS 210S                       0x0245 
-    NVIDIA GeForce 6150L                  0x0245
-    Quadro NVS 280 PCI-E/Quadro FX 330	  0x00FD
-    Quadro NVS 285	                      0x0165
-    Quadro NVS 290	                      0x042F
-    Quadro NVS 320M	                      0x040B
-    Quadro NVS 440	                      0x014A
-    Quadro NVS 55/280 PCI	                0x032A
-    
-    
diff --git a/abs/extra-testing/community/nxtvepg.tar.gz b/abs/extra-testing/community/nxtvepg.tar.gz
deleted file mode 100644
index fe8da09..0000000
--- a/abs/extra-testing/community/nxtvepg.tar.gz
+++ /dev/null
diff --git a/abs/extra-testing/community/nxtvepg/PKGBUILD b/abs/extra-testing/community/nxtvepg/PKGBUILD
deleted file mode 100644
index 5de6bc7..0000000
--- a/abs/extra-testing/community/nxtvepg/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: Perry3D <perry3d at gmail dot com>
-# Previous: Gilles CHAUVIN <gcnweb at gmail dot com>
-
-pkgname=nxtvepg
-pkgver=2.8.1
-pkgrel=2
-pkgdesc="A decoder for nexTView EPG an Electronic TV Programme Guide"
-url="http://nxtvepg.sf.net/"
-license="GPL"
-depends=('tcl>=8.5.0' 'tk' 'libxmu')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz \
-tcl_85.patch \
-$pkgname-icon-16.png $pkgname-icon-32.png $pkgname-icon-48.png \
-$pkgname.desktop)
-arch=('i686' 'x86_64')
-
-build() {
-	cd $startdir/src/$pkgname-$pkgver
-
-	msg "Applying patch for tcl/tk8.5..."
-	patch -p0 < ../tcl_85.patch
-
-	make || return 1
-
-	make prefix=$startdir/pkg/usr/ \
-	bindir=$startdir/pkg/usr/bin \
-	resdir=$startdir/pkg/usr/share/X11 \
-	INST_DB_DIR=$startdir/pkg/var/tmp/nxtvdb \
-	cfgdir=$startdir/pkg/usr/share/nxtvepg \
-	install
-
-	# Icons
-	for size in 16 32 48; do
-		install $startdir/src/$pkgname-icon-$size.png -D -m644 $startdir/pkg/usr/share/pixmaps/$pkgname-icon-$size.png
-	done
-
-	# .desktop file
-	install $startdir/src/$pkgname.desktop -D -m644 $startdir/pkg/usr/share/applications/$pkgname.desktop
-}
-md5sums=('0811b1b95537b3cbab9f8d18d1501411'
-         'db5e77089204aeb35e84c7f5505664a6'
-         '5f7c220d3355b6f043a2bdd5acec8608'
-         '8988d3f33a90bd99f9a61d8f7e4f46c3'
-         '26d86bd935df1dc9328f07b879f30de2'
-         '5d14ff096ef811ccb7dc330e5d3a76fd')
diff --git a/abs/extra-testing/community/nxtvepg/nxtvepg-icon-16.png b/abs/extra-testing/community/nxtvepg/nxtvepg-icon-16.png
deleted file mode 100644
index e6d8a85..0000000
--- a/abs/extra-testing/community/nxtvepg/nxtvepg-icon-16.png
+++ /dev/null
diff --git a/abs/extra-testing/community/nxtvepg/nxtvepg-icon-32.png b/abs/extra-testing/community/nxtvepg/nxtvepg-icon-32.png
deleted file mode 100644
index 9071f10..0000000
--- a/abs/extra-testing/community/nxtvepg/nxtvepg-icon-32.png
+++ /dev/null
diff --git a/abs/extra-testing/community/nxtvepg/nxtvepg-icon-48.png b/abs/extra-testing/community/nxtvepg/nxtvepg-icon-48.png
deleted file mode 100644
index a5f991b..0000000
--- a/abs/extra-testing/community/nxtvepg/nxtvepg-icon-48.png
+++ /dev/null
diff --git a/abs/extra-testing/community/nxtvepg/nxtvepg.desktop b/abs/extra-testing/community/nxtvepg/nxtvepg.desktop
deleted file mode 100644
index 6703dfc..0000000
--- a/abs/extra-testing/community/nxtvepg/nxtvepg.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Comment=Electronic TV Programme Guide
-Icon=/usr/share/pixmaps/nxtvepg-icon-48.png
-Exec=nxtvepg
-Name=nexTView EPG
-GenericName=electronic TV Programme Guide
-Terminal=false
-Type=Application
-Categories=Application;AudioVideo;
diff --git a/abs/extra-testing/community/nxtvepg/tcl_85.patch b/abs/extra-testing/community/nxtvepg/tcl_85.patch
deleted file mode 100644
index 9059a6c..0000000
--- a/abs/extra-testing/community/nxtvepg/tcl_85.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.orig	2008-02-03 20:01:14.000000000 +0100
-+++ Makefile	2008-02-03 20:01:23.000000000 +0100
-@@ -58,8 +58,8 @@
- YACC    = /usr/bin/yacc
- 
- # select Tcl/Tk version (8.5 recommended due to modernized widget appearence)
--TCL_VER := $(shell echo 'puts [package require Tcl]' | tclsh)
--#TCL_VER = 8.5
-+#TCL_VER := $(shell echo 'puts [package require Tcl]' | tclsh)
-+TCL_VER = 8.5
- 
- ifeq ($(shell test -d /usr/include/tcl$(TCL_VER) && echo YES),YES)
- INCS   += -I/usr/include/tcl$(TCL_VER)
diff --git a/abs/extra-testing/community/nzbperl/PKGBUILD b/abs/extra-testing/community/nzbperl/PKGBUILD
deleted file mode 100755
index bbfee00..0000000
--- a/abs/extra-testing/community/nzbperl/PKGBUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-#Contributor: Xavier Vierling <xavierling@free.fr>
-pkgname=nzbperl
-pkgver=0.6.8
-pkgrel=1
-pkgdesc="nzb based nntp/usenet downloader in perl"
-arch=('i686' 'x86_64')
-url="http://noisybox.net/computers/nzbperl/"
-license="GPL"
-depends=(perl-term-readkey perl-xml-dom uudeview)
-source=(http://noisybox.net/computers/nzbperl/$pkgname-$pkgver.pl)
-md5sums=('70e64b7cd4ff9c7c098bf8dffeb62578')
-
-build() {
-	cd $startdir/src
-	install -D nzbperl-$pkgver.pl $startdir/pkg/usr/bin/nzbperl
-}
\ No newline at end of file
diff --git a/abs/extra-testing/community/peardb/PKGBUILD b/abs/extra-testing/community/peardb/PKGBUILD
deleted file mode 100755
index dafe00f..0000000
--- a/abs/extra-testing/community/peardb/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-arch=('i686')
-pkgname=PearDB
-pkgver=1.7.13
-pkgrel=1
-_kernver=2.6.28-LinHES
-pkgdesc="Pear Database Abstraction Layer"
-url="http://pear.php.net/"
-license=('GPL-2')
-source=('http://download.pear.php.net/package/DB-1.7.13.tgz')
-#install=('')
-
-build() {
-	mkdir -p $startdir/pkg/usr/share/pear/
-	cp -r $startdir/src/DB-$pkgver/DB* $startdir/pkg/usr/share/pear/
-	mkdir -p $startdir/pkg/usr/share/pear/docs/DB/
-	cp -r $startdir/src/DB-$pkgver/doc/* $startdir/pkg/usr/share/pear/docs/DB/
-	mkdir -p $startdir/pkg/usr/share/pear/tests/DB/
-	cp -r $startdir/src/DB-$pkgver/tests/* $startdir/pkg/usr/share/pear/tests/DB/
-
-	}
-
-md5sums=('39b451245941a7059511a852f18b4946')
diff --git a/abs/extra-testing/community/pearlog/PKGBUILD b/abs/extra-testing/community/pearlog/PKGBUILD
deleted file mode 100755
index 5bc4ccc..0000000
--- a/abs/extra-testing/community/pearlog/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-arch=('i686')
-pkgname=PearLog
-pkgver=1.12.0
-pkgrel=1
-_kernver=2.6.28-LinHES
-pkgdesc="Pear Logging Framework"
-url="http://pear.php.net/"
-license=('GPL-2')
-source=('http://download.pear.php.net/package/Log-1.12.0.tgz')
-#install=('')
-
-build() {
-	mkdir -p $startdir/pkg/usr/share/pear/
-	cp -r $startdir/src/Log-$pkgver/Log* $startdir/pkg/usr/share/pear/
-	mkdir -p $startdir/pkg/usr/share/pear/docs/Log
-	cp -r $startdir/src/Log-$pkgver/docs/* $startdir/pkg/usr/share/pear/docs/Log/
-	mkdir -p $startdir/pkg/usr/share/pear/examples/Log
-	cp -r $startdir/src/Log-$pkgver/examples/* $startdir/pkg/usr/share/pear/examples/Log/
-	mkdir -p $startdir/pkg/usr/share/pear/misc/Log
-	cp -r $startdir/src/Log-$pkgver/misc/* $startdir/pkg/usr/share/pear/misc/Log/
-	mkdir -p $startdir/pkg/usr/share/pear/tests/Log
-	cp -r $startdir/src/Log-$pkgver/tests/* $startdir/pkg/usr/share/pear/tests/Log/
-	}
-
-md5sums=('7fe68920afc4b122cb15aba40d735cb6')
diff --git a/abs/extra-testing/community/powernowd/PKGBUILD b/abs/extra-testing/community/powernowd/PKGBUILD
deleted file mode 100644
index f784523..0000000
--- a/abs/extra-testing/community/powernowd/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: kastor <kastor@fobos.org.ar>
-
-pkgname=powernowd
-pkgver=1.00
-pkgrel=2
-pkgdesc="Program for powering down CPUs dynamicly"
-arch=('i686' 'x86_64')
-url="http://www.deater.net/john/powernowd.html"
-license="GPL"
-depends=('glibc')
-source=(http://www.deater.net/john/$pkgname-$pkgver.tar.gz \
-        run finish powernowd.install powernowd.conf.d)
-install=($pkgname.install)
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  make || return 1
-  install -D -m755 powernowd $startdir/pkg/usr/sbin/powernowd || return 1
-  mkdir -p $startdir/pkg/etc/sv/powernowd || return 1
-  install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/powernowd || return 1
-  install -D -m755 $startdir/src/finish $startdir/pkg/etc/sv/powernowd || return 1
-  install -D -m644 $startdir/src/powernowd.conf.d $startdir/pkg/etc/conf.d/powernowd || return 1
-}
-md5sums=('abc48b690d104e9e71a85400ba19d799'
-         'ffd9b939665f74dac2220b4311482e04'
-         '13c6591ffc27d0b16f41f7892671302f'
-         'dcbf8e98425b208c29f4c06b687dd0d0'
-         'c9385af22c7c74e6cd6bdc982f94644f')
diff --git a/abs/extra-testing/community/powernowd/finish b/abs/extra-testing/community/powernowd/finish
deleted file mode 100644
index 97e3034..0000000
--- a/abs/extra-testing/community/powernowd/finish
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# AUR Credits:
-# simple init script the ARCH-way for Powernowd
-# Made by, CyberTron, packages@linuxportalen.com
-
-# Modifications by Alexander Baldeck <alexander@archlinux.org>
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/powernowd`
-
-[ -f /etc/conf.d/powernowd ] && source /etc/conf.d/powernowd
-
-        stat_runit "Stopping Powernowd"
-        [ ! -z "$PID" ]  && kill $PID &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm /var/run/powernowd.pid
-            rm_daemon powernowd
-            stat_done
-        fi
diff --git a/abs/extra-testing/community/powernowd/powernowd.conf.d b/abs/extra-testing/community/powernowd/powernowd.conf.d
deleted file mode 100644
index 287c2bc..0000000
--- a/abs/extra-testing/community/powernowd/powernowd.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-# Configuration file for powernowd
-
-# If no options given, powernowd should be able to autodetect
-# a sane setup. So most users will not have to put anything
-# here.
-OPTIONS="-d"
diff --git a/abs/extra-testing/community/powernowd/powernowd.install b/abs/extra-testing/community/powernowd/powernowd.install
deleted file mode 100644
index af218af..0000000
--- a/abs/extra-testing/community/powernowd/powernowd.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  add_service.sh powernowd
-
-  echo "Be sure to modprobe the proper module for your CPU and then add it
-  echo "to /etc/rc.conf in the MODULES section."
-  echo "i.e. for a Core2Duo modprobe/add acpi_cpufreq"
-  echo "Then restart the powernowd service: sudo sv restart powernowd"
-}
-
-post_upgrade() {
-  echo "Be sure to modprobe the proper module for your CPU and then add it
-  echo "to /etc/rc.conf in the MODULES section."
-  echo "i.e. for a Core2Duo modprobe/add acpi_cpufreq"
-  echo "Then restart the powernowd service: sudo sv restart powernowd"
-}
-
-pre_remove() {
-  remove_service.sh powernowd
-}
diff --git a/abs/extra-testing/community/powernowd/run b/abs/extra-testing/community/powernowd/run
deleted file mode 100644
index 0e83b98..0000000
--- a/abs/extra-testing/community/powernowd/run
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# AUR Credits:
-# simple init script the ARCH-way for Powernowd
-# Made by, CyberTron, packages@linuxportalen.com
-
-# Modifications by Alexander Baldeck <alexander@archlinux.org>
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/powernowd`
-
-[ -f /etc/conf.d/powernowd ] && source /etc/conf.d/powernowd
-
-        stat_runit "Starting Powernowd"
-        [ -z "$PID" ] && /usr/sbin/powernowd $OPTIONS 2>/dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-        echo $PID > /var/run/powernowd.pid
-            add_daemon powernowd
-            stat_done
-        fi
diff --git a/abs/extra-testing/community/projectx/PKGBUILD b/abs/extra-testing/community/projectx/PKGBUILD
deleted file mode 100644
index 62092a4..0000000
--- a/abs/extra-testing/community/projectx/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributer: Sebastian Sareyko <public@nooms.de>
-
-pkgname=projectx
-pkgver=0.90.4.00
-pkgrel=8
-license=('GPL')
-arch=('i686' 'x86_64')
-pkgdesc="DVB demux tool for repairing and analyzing different stream types"
-makedepends=('java-environment')
-depends=('java-runtime')
-url="http://sourceforge.net/projects/project-x"
-source=(http://dl.sourceforge.net/sourceforge/project-x/ProjectX_Source_eng_$pkgver.zip \
-	http://dl.sourceforge.net/sourceforge/project-x/ProjectX_LanguagePack_$pkgver.zip \
-	projectx)
-
-md5sums=('92d7b5aea50b8811307f27b6e01ceb5c'
-         'edfe8d04bd3d403eec4d9e27d1b976d2'
-         '0c88b15884a0c997e3386d15e207cd30')
-
-build() {
-    cd $startdir/src/ProjectX_Source_0.90.4
-
-    sed -i 's,^Exec=.*,Exec=projectx,' projectx.desktop
-    
-    mkdir -p build
-
-    javac -encoding "ISO-8859-1" -O -g:none \
-        -classpath lib/commons-net-1.3.0.jar:lib/jakarta-oro-2.0.8.jar \
-        -d build @sources.lst || return 1
-
-    mv resources/* ./build
-    sed -i -e 's/ReleaseNotes_0.90.1.txt/ReleaseNotes_0.90.4.txt/' htmls/index.html
-    mv htmls build
-    mv ReadMe.txt build
-    mv ReleaseNotes_0.90.4.txt build
-    jar cvfm ProjectX.jar MANIFEST.MF -C build .
-
-    install -D -m0755 $startdir/projectx $startdir/pkg/usr/bin/projectx
-    install -D -m0644 ProjectX.jar $startdir/pkg/opt/projectx/ProjectX.jar
-    install -D -m0644 lib/commons-net-1.3.0.jar \
-        $startdir/pkg/opt/projectx/lib/commons-net-1.3.0.jar
-    install -D -m0644 lib/jakarta-oro-2.0.8.jar \
-        $startdir/pkg/opt/projectx/lib/jakarta-oro-2.0.8.jar
-    install -D -m0644 projectx.desktop $startdir/pkg/usr/share/applications/projectx.desktop
-}
diff --git a/abs/extra-testing/community/projectx/projectx b/abs/extra-testing/community/projectx/projectx
deleted file mode 100644
index 1d540bc..0000000
--- a/abs/extra-testing/community/projectx/projectx
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ ! -d ~/.projectx ] ; then
-        mkdir ~/.projectx
-fi
-
-if [ "$#" -eq 0 ] ; then
-	cd ~/.projectx 
-fi
-java -jar /opt/projectx/ProjectX.jar "$@"
diff --git a/abs/extra-testing/community/pyxdg/PKGBUILD b/abs/extra-testing/community/pyxdg/PKGBUILD
deleted file mode 100644
index c56fd55..0000000
--- a/abs/extra-testing/community/pyxdg/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# $Id: PKGBUILD 16878 2008-10-23 00:28:55Z douglas $
-# Maintainer: Aaron Griffin <aarongriffin@gmail.com>
-# Contributor: Mario A. Vazquez <mario_vazq@hotmail.com>
-pkgname=pyxdg
-pkgver=0.15
-pkgrel=3
-pkgdesc="Python library to access freedesktop.org standards."
-arch=(i686 x86_64)
-url="http://freedesktop.org/Software/pyxdg"
-license=("LGPL")
-depends=('python')
-source=(http://gentoolabs.com.ar/distfiles/${pkgname}-${pkgver}.tar.gz)
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  python setup.py install --prefix=/usr --root=${startdir}/pkg || return 1
-}
-md5sums=('86a5441285fc908145414b63348d11a3')
diff --git a/abs/extra-testing/community/screen/PKGBUILD b/abs/extra-testing/community/screen/PKGBUILD
deleted file mode 100644
index f97df4b..0000000
--- a/abs/extra-testing/community/screen/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 9361 2008-08-17 06:28:44Z allan $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Committer: dorphell <dorphell@gmx.net>
-
-pkgname=screen
-pkgver=4.0.3
-pkgrel=6
-_ptygroup=5 #the UID of our PTY/TTY group
-pkgdesc="Full-screen window manager that multiplexes a physical terminal"
-license=('GPL')
-arch=('i686' 'x86_64')
-install=screen.install
-depends=(ncurses libelf shadow gpm)
-backup=('etc/screenrc' 'etc/pam.d/screen')
-url="ftp://ftp.uni-erlangen.de/pub/utilities/screen"
-source=(ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-${pkgver}.tar.gz \
-        screen.pam)
-md5sums=('8506fd205028a96c741e4037de6e3c42' '74f7919d7b65436cc2ea5341fa8ca374')
-
-build() {
-  export MAKEFLAGS="-j1"
-  cd ${startdir}/src/${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --enable-pam \
-        --with-sys-screenrc=/etc/screenrc --enable-colors256 \
-       --enable-rxvt_osc --with-pty-group=$_ptygroup \
-       --mandir=/usr/share/man
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  mkdir -p ${startdir}/pkg/etc/pam.d 
-  install -m644 ${startdir}/src/screen.pam ${startdir}/pkg/etc/pam.d/screen
-
-  cd etc/
-  mkdir -p ${startdir}/pkg/usr/share/zsh/site-functions/
-  install -m644 completer.zsh ${startdir}/pkg/usr/share/zsh/site-functions/screen
-  mkdir -p ${startdir}/pkg/etc/skel/
-  install -m644 etcscreenrc ${startdir}/pkg/etc/screenrc
-  install -m644 screenrc ${startdir}/pkg/etc/skel/.screenrc
-
-  rm -rf ${startdir}/pkg/usr/info
-}
diff --git a/abs/extra-testing/community/screen/screen.install b/abs/extra-testing/community/screen/screen.install
deleted file mode 100644
index 51bd6a7..0000000
--- a/abs/extra-testing/community/screen/screen.install
+++ /dev/null
@@ -1,27 +0,0 @@
-
-pre_upgrade() {
-    pre_remove $*
-}
-
-pre_remove() {
-    compiled="/usr/share/terminfo/s/screen-256color"
-    if [ -e $compiled ]; then
-        if pacman -Qo $compiled 2>&1 | grep "No package owns" >/dev/null; then
-            echo -n "removing compiled terminfo..."
-            rm -f $compiled
-            echo "done."
-        fi
-    fi
-    compiled="/usr/share/terminfo/s/screen-256color-bce"
-    if [ -e $compiled ]; then
-        if pacman -Qo $compiled 2>&1 | grep "No package owns" >/dev/null; then
-            echo -n "removing compiled terminfo..."
-            rm -f $compiled
-            echo "done."
-        fi
-    fi
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/community/screen/screen.pam b/abs/extra-testing/community/screen/screen.pam
deleted file mode 100644
index 07c42ad..0000000
--- a/abs/extra-testing/community/screen/screen.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth		required	pam_unix.so
diff --git a/abs/extra-testing/community/smplayer/ChangeLog b/abs/extra-testing/community/smplayer/ChangeLog
deleted file mode 100644
index a40f9a4..0000000
--- a/abs/extra-testing/community/smplayer/ChangeLog
+++ /dev/null
@@ -1,62 +0,0 @@
-2009-03-13  Allan McRae <allan@archlinux.org>
-	* smplayer 0.6.7-1
-	* Upstream update
-
-2009-01-01  Allan McRae <allan@archlinux.org>
-	* smplayer 0.6.6-1
-	* Upstream update
-
-2008-11-14  Allan McRae <allan@archlinux.org>
-	* smplayer 0.6.5.1-1
-	* Upstream update
-
-2008-10-27  Allan McRae <allan@archlinux.org>
-	* smplayer 0.6.4-1
-	* Upstream update
-
-2008-09-27  Allan McRae <allan@archlinux.org>
-	* smplayer 0.6.3-1
-	* Upstream update
-
-2008-06-21  Allan McRae <allan@archlinux.org>
-
-	* smplayer 0.6.2-1
-	* Upstream update
-	* Removed install message
-
-2008-06-21  Allan McRae <allan@archlinux.org>
-
-	* smplayer 0.6.1-1
-	* Upstream update
-	* Removed provides/conflicts/replaces
-
-2008-05-23  Eric Belanger  <eric@archlinux.org>
-
-	* smplayer 0.6.0-1
-	* Upstream update
-	* Updated .install file
-
-2008-01-32  Varun Acharya <varun@archlinux.org>
-	
-	* smplayer-0.5.62-1 moved to extra, thanks molok
-	* PKGBUILD cleanup
-
-2007-11-27  Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
-	* smplayer-0.5.62-1
-	* version bump
-
-2007-10-24  Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
-	* smplayer-0.5.61-1
-	* build against qt4
-	* removed post_upgrade message
-
-2007-07-12  Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
-	* smplayer-0.5.21-1
-	* version bump
-
-2007-05-30  Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-	* smplayer-0.5.0-1
-	* version bump
diff --git a/abs/extra-testing/community/smplayer/PKGBUILD b/abs/extra-testing/community/smplayer/PKGBUILD
deleted file mode 100644
index 3aa1d3d..0000000
--- a/abs/extra-testing/community/smplayer/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 29947 2009-03-14 00:58:48Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-# Contributor: shamrok <szamrok@gmail.com>
- 
-pkgname=smplayer
-pkgver=0.6.7
-pkgrel=2
-pkgdesc="A complete front-end for MPlayer" 
-arch=('i686' 'x86_64')
-url="http://smplayer.sourceforge.net/" 
-license=('GPL')
-depends=('qt' 'mplayer')
-source=(http://downloads.sourceforge.net/sourceforge/smplayer/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('306b99374ad89cee93f1ad6fa94dea71')
-
-build() { 
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # remove broken translation
-  sed -i "s|translations/smplayer_gl.ts|#translations/smplayer_gl.ts|" src/smplayer.pro
-
-  make PREFIX=/usr || return 1 
-  make PREFIX=${pkgdir}/usr install || return 1
-
-  install -dm755 ${pkgdir}/usr/share/pixmaps
-  ln -s /usr/share/icons/hicolor/64x64/apps/smplayer.png \
-        ${pkgdir}/usr/share/pixmaps/
-}
-
diff --git a/abs/extra-testing/community/squeezeboxserver/PKGBUILD b/abs/extra-testing/community/squeezeboxserver/PKGBUILD
deleted file mode 100644
index 45db11f..0000000
--- a/abs/extra-testing/community/squeezeboxserver/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Contributor: Anton Prins <uar at prinsonline dot demon dot nl>
-
-pkgname=squeezeboxserver
-pkgver=7.4.1
-pkgrel=1
-pkgdesc="Powerful streaming audio server from Slim Devices"
-depends=(
-# unknown to me, default arch install + openssh handles it
-        )
-
-source=(http://downloads.slimdevices.com/SqueezeboxServer_v${pkgver}/squeezeboxserver-${pkgver}.tgz
-        $pkgname.rc
-        $pkgname.conf.d
-        )
-
-url="http://www.slimdevices.com/pi_features.html"
-license=('GPL')
-arch=('i686' 'x86_64')
-install=squeezeboxserver.install
-
-#not sure how to handle the build number -28947?
-build() {
-cd $startdir/src/squeezeboxserver-${pkgver}-28947 || return 1
-
-mkdir -p $startdir/pkg/home/squeezeboxserver || return 1
-cp -a * $startdir/pkg/home/squeezeboxserver || return 1
-install -D -m755 ../squeezeboxserver.rc $startdir/pkg/etc/rc.d/squeezeboxserver || return 1
-install -D -m644 ../squeezeboxserver.conf.d $startdir/pkg/etc/conf.d/squeezeboxserver || return 1
-mkdir $startdir/pkg/home/squeezeboxserver/prefs
-}
-
-md5sums=('fa65636e7df75ae7af884a2efa184639'
-         '5e57982c257797badbf72c2ae04994f7'
-         'aa65896541958e119e63ee7c96be39af')
diff --git a/abs/extra-testing/community/squeezeboxserver/squeezeboxserver.conf.d b/abs/extra-testing/community/squeezeboxserver/squeezeboxserver.conf.d
deleted file mode 100644
index d14a2e9..0000000
--- a/abs/extra-testing/community/squeezeboxserver/squeezeboxserver.conf.d
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration file for SqueezeCenter on Arch Linux.
-# Save this as /etc/conf.d/squeezeboxserver
-
-# Enter space-delimited options on the following line.
-# e.g. SQUEEZEBOXSERVER_OPTS="--diag --d_scan --d_command"
-# See "/home/squeezeboxserver/slimserver.pl --help" for a full list of possible options.
-SQUEEZEBOXSERVER_OPTS=""
diff --git a/abs/extra-testing/community/squeezeboxserver/squeezeboxserver.install b/abs/extra-testing/community/squeezeboxserver/squeezeboxserver.install
deleted file mode 100644
index 058de02..0000000
--- a/abs/extra-testing/community/squeezeboxserver/squeezeboxserver.install
+++ /dev/null
@@ -1,56 +0,0 @@
-post_install() {
-echo -n "adding squeezeboxserver user... "
-useradd -c "SqueezeBoxServer" -g users -s /bin/false squeezeboxserver && echo "done."
-passwd -l squeezeboxserver &>/dev/null
-
-chown -R squeezeboxserver:users /home/squeezeboxserver
-
-install -o squeezeboxserver -d /var/cache/squeezeboxserver
-touch /var/log/squeezeboxserver.log
-chown squeezeboxserver:users /var/log/squeezeboxserver.log
-
-cat << 'EOM'
-
-==> SqueezeBoxServer uses MySQL instead of sqlite. If you have MySQL up and running
-==> you can configure SqueezeBoxServer to use that server as described here:
-==> http://wiki.slimdevices.com/index.php/ExistingMySQLInstance 
-
-==> PLEASE NOTE: SqueezeBoxServer should always be run as the user 'squeezeboxserver'.
-==> This is easily done by adding squeezeboxserver to the DAEMONS array in rc.conf,
-==> after network and mysql.
-
-==> Additional run-time options can be added to /etc/conf.d/squeezeboxserver.
-==> Please refer to "/home/squeezeboxserver/slimserver.pl --help" for full details.
-
-EOM
-}
-
-post_upgrade() {
-chown -R squeezeboxserver:users /home/squeezeboxserver
-
-cat << 'EOM'
-
-==> SqueezeBoxServer uses MySQL instead of sqlite. If you have MySQL up and running
-==> you can configure SqueezeBoxServer to use that server as described here:
-==> http://wiki.slimdevices.com/index.php/ExistingMySQLInstance 
-
-EOM
-}
-
-pre_remove() {
-# pre_remove gets called whenever post_remove is defined.
-true
-}
-
-post_remove() {
-# post_remove doesn't start at a newline like the other post_* functions,
-# so we'll have to make one for ourselves.
-echo -n -e "\nremoving squeezeboxserver user... "
-userdel squeezeboxserver && echo "done."
-
-rm -r /var/cache/squeezeboxserver /var/log/squeezeboxserver.log
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/community/squeezeboxserver/squeezeboxserver.rc b/abs/extra-testing/community/squeezeboxserver/squeezeboxserver.rc
deleted file mode 100644
index d33db16..0000000
--- a/abs/extra-testing/community/squeezeboxserver/squeezeboxserver.rc
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/squeezeboxserver ] && . /etc/conf.d/squeezeboxserver
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-squeezehome=/home/squeezeboxserver
-pidfile=/var/run/squeezeboxserver.pid
-logfile=/var/log/squeezeboxserver.log
-prefsdir=/home/squeezeboxserver/prefs
-cachedir=/var/cache/squeezeboxserver
-
-
-case "$1" in
-  start)
-    stat_busy "Starting SqueezeBoxServer"
-    cd $squeezehome
-    ./slimserver.pl --daemon --user squeezeboxserver --prefsdir $prefsdir \
-    --cachedir $cachedir --pidfile $pidfile --logfile $logfile $SQUEEZEBOXSERVER_OPTS 
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon squeezeboxserver
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping SqueezeBoxServer"
-    kill `cat $pidfile` &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon squeezeboxserver
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/abs/extra-testing/community/torrentflux/PKGBUILD b/abs/extra-testing/community/torrentflux/PKGBUILD
deleted file mode 100644
index 2f2c9f0..0000000
--- a/abs/extra-testing/community/torrentflux/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# 'Maintainer': Mikko Seppälä <t-r-a-y@mbnet.fi> aka Neverth
-
-pkgname=torrentflux
-pkgver=2.4
-pkgrel=4
-pkgdesc="TorrentFlux is a free php based Torrent client that runs on a web server. Manage all of your Torrents remotely or locally."
-arch=(i686 x86_64)
-url="http://www.torrentflux.com/"
-license=(GPL)
-# You still need your favorite httpd, I do not wish to force it.
-depends=('mysql' 'php' 'python' 'pycrypto' 'transmission-cli')
-makedepends=('findutils')
-conflicts=('torrentflux2')
-backup=('opt/torrentflux/config.php')
-install=(torrentflux.install)
-source=("http://mesh.dl.sourceforge.net/sourceforge/torrentflux/${pkgname}_${pkgver}.tar.gz" "torrentflux.install")
-md5sums=('8fdc3952bc2ece9f10bcee299b2aeb16' 'f14ebd47dd41c7949411973c2f74f4fd')
-
-build()
-{
-        cd $startdir/src/${pkgname}_${pkgver}
-        install -d $startdir/pkg/opt/torrentflux
-	
-	# This thing is compressed in windows? fix permissions later..
-        cp -R html/* $startdir/pkg/opt/torrentflux/
-        cp -R sql $startdir/pkg/opt/torrentflux
-
-	cd $startdir/pkg
-	# Our group
-        chgrp -R daemon opt/torrentflux
-        chmod -R 775 opt/torrentflux
-	
-	# Our mysqluser, we dont want root here :p
-        sed -re 's/root/torrentfluxie/' -i opt/torrentflux/config.php
-	
-	cd opt/torrentflux
-        # Permissions...
-        find ./ -name \*php -exec chmod 444 '{}' \;
-        find ./ -name \*png -exec chmod 444 '{}' \; 
-        find ./ -name \*gif -exec chmod 444 '{}' \;
-       # They dont want to read this
-        chmod 660 config.php
-        chmod 444 favicon.ico dtree.css *.js blank.html TF_BitTornado/index.html images/*{gif,png,ico,html} searchEngines/* themes/index.html downloads/index.html
-        # We dont touch to adodb, leave it for customizer, as so we leave subdirs for now
-
-        # Upgrade files
-        install -D -m444 $startdir/src/${pkgname}_${pkgver}/upgrades/upgrade21_22.php $startdir/pkg/opt/torrentflux/upgradeflux21_22.php
-        install -D -m444 $startdir/src/${pkgname}_${pkgver}/upgrades/upgrade22_23.php $startdir/pkg/opt/torrentflux/upgradeflux22_23.php
-        install -D -m444 $startdir/src/${pkgname}_${pkgver}/upgrades/upgrade23_24.php $startdir/pkg/opt/torrentflux/upgradeflux23_24.php
-}
-
diff --git a/abs/extra-testing/community/torrentflux/srclinks.Ko3AqnsqY/torrentflux/PKGBUILD b/abs/extra-testing/community/torrentflux/srclinks.Ko3AqnsqY/torrentflux/PKGBUILD
deleted file mode 120000
index 45a9d6a..0000000
--- a/abs/extra-testing/community/torrentflux/srclinks.Ko3AqnsqY/torrentflux/PKGBUILD
+++ /dev/null
@@ -1 +0,0 @@
-/data/LinHES-PKGBUILD/abs/extra-testing/community/torrentflux/PKGBUILD
\ No newline at end of file
diff --git a/abs/extra-testing/community/torrentflux/srclinks.Ko3AqnsqY/torrentflux/torrentflux.install b/abs/extra-testing/community/torrentflux/srclinks.Ko3AqnsqY/torrentflux/torrentflux.install
deleted file mode 120000
index 8ce21bd..0000000
--- a/abs/extra-testing/community/torrentflux/srclinks.Ko3AqnsqY/torrentflux/torrentflux.install
+++ /dev/null
@@ -1 +0,0 @@
-/data/LinHES-PKGBUILD/abs/extra-testing/community/torrentflux/torrentflux.install
\ No newline at end of file
diff --git a/abs/extra-testing/community/torrentflux/torrentflux.install b/abs/extra-testing/community/torrentflux/torrentflux.install
deleted file mode 100644
index 2aa50aa..0000000
--- a/abs/extra-testing/community/torrentflux/torrentflux.install
+++ /dev/null
@@ -1,60 +0,0 @@
-post_install() {
-  cat << EOF
-OK. So youre about to install torrentflux? Postgresql and mysql are supported.
-Instructions are for mysql so lets use it? ok? 
-Remove mysql from depencies if you dont like.
-(mysqlcommands might need '-u root -p' depending on your setup)
-
-1. You need to create mysql database for it
-mysqladmin create torrentflux 
-(eg. 'mysqladmin -u root -p create torrentflux' if needed)
-
-2. Load the script that creates tables and such 
-(.sql files for postgresql are here too!)
-mysql torrentflux < /opt/torrentflux/sql/mysql_torrentflux.sql
-
-3. Edit the config.php located in /opt/torrentflux/html
-
-4. Point your fav http server to use this,
-(eg. use vhosts for apache or create symlink to /opt/torrentflux from 
-somewhere that http server can access)
-
-5. Our database user is "torrentfluxie"
-(use mysql_setpermission to give rights for him)
-mysql_setpermission -u mysqlroot
-hit 5 in menu and choose torrentflux as database
-give torrentfluxie as user and give password if you want 
-(if you do this, you need to set the password to /opt/torrentflux/config.php:
-$cfg["db_pass"] = "yourpass";)
-localhost is good choice for host 
-(we dont need password always if we got private comp)
-
-6. Safemode must be off in php.ini (/etc/php.ini)
-
-httpd server must support php and mysql, you can look for archwiki 
-if you dont know howto enable them.
-Notice that the httpd server should belong to daemon group 
-(one way or another)
-EOF
-}
-
-post_upgrade() {
- cat << EOF
-To upgrade your database, use files in /opt/torrentflux/
-(eg for 2.2 -> 2.4 go from browser to http://yourtorrentfuxdomain.and.path/upgradeflux22_23.php 
-and do the same on upgradeflux23_24.php file)
-All your old information should stay trough the upgrades
-When it tells you to remove the files, just chmod them to 000 and they will not harm.
-EOF
-}
-
-pre_remove() {
-  /bin/echo "Remember to remove mysql tables if you want :p"
-  /bin/echo "mysqladmin -f drop torrentflux" 
-  /bin/echo "(remeber -u root -p, hope it worked)"
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/abs/extra-testing/community/transmission-cli/PKGBUILD b/abs/extra-testing/community/transmission-cli/PKGBUILD
deleted file mode 100644
index 40af42a..0000000
--- a/abs/extra-testing/community/transmission-cli/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 23076 2009-01-02 11:33:41Z alexanderf $
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
-pkgname=transmission-cli
-pkgver=2.04
-pkgrel=1
-pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
-arch=('i686' 'x86_64')
-url="http://www.transmissionbt.com/"
-license=('MIT')
-depends=('curl' 'libevent')
-makedepends=('intltool')
-replaces=('transmission')
-backup=('etc/conf.d/transmissiond')
-install=transmission-cli.install
-source=(http://mirrors.m0k.org/transmission/files/transmission-$pkgver.tar.bz2
-        run.transmissiond
-        transmission-cli.install
-        transmission.include
-        transmissiond.conf)
-
-build() {
-  cd "$srcdir/transmission-$pkgver"
-
-  ./configure --prefix=/usr --disable-gtk || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
-
-  mkdir -p -m744 "$pkgdir/etc/sv/transmissiond" || return 1
-  mkdir -p -m777 "$pkgdir/myth/transmission" || return 1
-  install -D -m755 "$srcdir/run.transmissiond" "$pkgdir/etc/sv/transmissiond/run" || return 1
-  install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond" || return 1
-  install -D -m644 "$srcdir/transmission.include" "$pkgdir/etc/transmission/transmission.include" || return 1
-  install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" || return 1
-}
-md5sums=('84fe15eb7e000fdc369def513299358b'
-         'b91534aaf2e403331c611c615ab2c03d'
-         'ff22c13dbd52565f9e88b1de22514eb9'
-         'b5a49ea375333cd0fee40f70dbac4c2e'
-         'd05567c7a4f9df9f28602d1356d5c05c')
diff --git a/abs/extra-testing/community/transmission-cli/run.transmissiond b/abs/extra-testing/community/transmission-cli/run.transmissiond
deleted file mode 100755
index 714c946..0000000
--- a/abs/extra-testing/community/transmission-cli/run.transmissiond
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/transmissiond
-
-CONFIGDIR=/home/$TRANS_USER/.config/transmission-daemon
-PID=`pidof -o %PPID /usr/bin/transmission-daemon`
-# Update the block lists - try to keep the bad guys out.
-          cd ${CONFIGDIR}/blocklists
-          if [ $? -eq 0 ]; then
-             find . -mtime +4 -type f -name level1 -exec rm {} \;
-             if [ ! -f ${CONFIGDIR}/blocklists/level1 ]; then
-                # update blocklist
-               # echo "updating blocklist, ~4MB"
-                wget -q -O level1.gz http://download.m0k.org/transmission/files/level1.gz
-                if [ -f level1.gz ]; then
-                  gunzip level1.gz
-                  if [ $? -eq 0 ]; then
-                    chmod go+r level1
-                  else
-                    rm -f level1*
-                  fi
-                fi
-             fi
-             cd - 2>&1 >/dev/null
-          fi
-    stat_runit "Starting Transmission Daemon"
-    [ -z "$PID" ] && exec su -l -c "/usr/bin/nice -n 19 /usr/bin/transmission-daemon $TRANS_OPTS" $TRANS_USER 2>/dev/null
diff --git a/abs/extra-testing/community/transmission-cli/transmission-cli.install b/abs/extra-testing/community/transmission-cli/transmission-cli.install
deleted file mode 100644
index 088ecc6..0000000
--- a/abs/extra-testing/community/transmission-cli/transmission-cli.install
+++ /dev/null
@@ -1,28 +0,0 @@
-post_install() {
-  /bin/echo 'include "/etc/transmission/transmission.include"' >> /etc/lighttpd/conf.include
-  killall -HUP lighttpd  
-
-  add_service.sh transmissiond
-
-  cat << _EOF
-
-  You can edit the user and options in /etc/conf.d/transmissiond.
-
-  To access the web interface:
-  http://localhost/transmission
-
-  Configuration file editing information can be found at:
-  http://trac.transmissionbt.com/wiki/ConfigFiles
-
-_EOF
-
-}
-
-pre_upgrade() {
-  rm -f /usr/share/man/man1/transmission*
-
-}
-
-pre_remove() {
-  remove_service.sh transmissiond
-}
diff --git a/abs/extra-testing/community/transmission-cli/transmission.include b/abs/extra-testing/community/transmission-cli/transmission.include
deleted file mode 100644
index 5cbf399..0000000
--- a/abs/extra-testing/community/transmission-cli/transmission.include
+++ /dev/null
@@ -1,15 +0,0 @@
-#Redirect from /transmission to /transmission/web
-url.rewrite-once += ( "^/transmission[/]?$" => "/transmission/web" )
-$HTTP["url"] =~ "^/transmission/" {
-  #Serve static files from /usr/share/transmission
-  server.document-root = "/usr/share/"
-  #Forward RPC requests to the Transmission daemon
-  proxy.server = (
-    "/transmission/rpc" => (
-      (
-        "host" => "127.0.0.1",
-        "port" => 9091
-      )
-    )
-  )
-}
diff --git a/abs/extra-testing/community/transmission-cli/transmissiond.conf b/abs/extra-testing/community/transmission-cli/transmissiond.conf
deleted file mode 100644
index d642c01..0000000
--- a/abs/extra-testing/community/transmission-cli/transmissiond.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-TRANS_USER="mythtv"
-TRANS_OPTS="-f -ep -w /myth/transmission"
diff --git a/abs/extra-testing/community/tre/PKGBUILD b/abs/extra-testing/community/tre/PKGBUILD
deleted file mode 100644
index b7d82eb..0000000
--- a/abs/extra-testing/community/tre/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Contributor: Igor Galic<i.galic@gmail.com>
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de
-pkgname=tre
-pkgver=0.7.5
-pkgrel=4
-arch=('i686' 'x86_64')
-pkgdesc="POSIX compliant regexp matching library. It includes agrep for aproximate (fuzzy) grepping."
-url="http://laurikari.net/tre/index.html"
-license=('GPL')
-source=(http://laurikari.net/tre/$pkgname-$pkgver.tar.bz2)
-md5sums=('e72e5c94008865cf720992a0b25d6e89')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --enable-static || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-}
-
diff --git a/abs/extra-testing/community/unrar/PKGBUILD b/abs/extra-testing/community/unrar/PKGBUILD
deleted file mode 100644
index 6b68616..0000000
--- a/abs/extra-testing/community/unrar/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 18913 2008-11-10 11:16:31Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: dorphell <dorphell@gmx.net>
-
-pkgname=unrar
-pkgver=3.8.5
-pkgrel=1
-pkgdesc="The RAR uncompression program"
-arch=('i686' 'x86_64')
-depends=('gcc-libs')
-url="http://rarlab.com"
-license=('custom')
-replaces=('rar')
-source=(http://www.rarlab.com/rar/unrarsrc-${pkgver}.tar.gz)
-md5sums=('875688e6a144a3f75d2a6a0da3e43f8b')
-
-build() {
-  cd ${srcdir}/${pkgname}
-  make -f makefile.unix
-  install -Dm755 unrar ${pkgdir}/usr/bin/unrar
-  # install license
-  install -Dm644 license.txt ${pkgdir}/usr/share/licenses/$pkgname/license.txt
-}
diff --git a/abs/extra-testing/community/unrar/unrar-3.5.2-optimalization-fix.patch b/abs/extra-testing/community/unrar/unrar-3.5.2-optimalization-fix.patch
deleted file mode 100644
index 2ed2e6e..0000000
--- a/abs/extra-testing/community/unrar/unrar-3.5.2-optimalization-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur unrar.orig/makefile.unix unrar/makefile.unix
---- unrar.orig/makefile.unix	2005-05-27 21:53:56.000000000 +0000
-+++ unrar/makefile.unix	2005-05-27 21:54:16.000000000 +0000
-@@ -7,7 +7,7 @@
- 
- # Linux using GCC
- CXX=g++
--CXXFLAGS=-O2
-+CXXFLAGS=${CFLAGS}
- DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
- STRIP=strip
- 
diff --git a/abs/extra-testing/community/uudeview/PKGBUILD b/abs/extra-testing/community/uudeview/PKGBUILD
deleted file mode 100644
index cdb3a81..0000000
--- a/abs/extra-testing/community/uudeview/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD,v 1.5 2008/09/23 12:49:17 sergej Exp $
-# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
-# Maintainer: kmaster <kmaster12@sasktel.net>
-
-pkgname=uudeview
-pkgver=0.5.20
-pkgrel=6
-pkgdesc="UUDeview helps transmitting & recieving binary files using mail or newsgroups. Includes library files."
-arch=('i686' 'x86_64')
-url="http://www.fpx.de/fp/Software/UUDeview/"
-license=('GPL')
-optdepends=('tk: for GUI')
-source=(http://www.fpx.de/fp/Software/UUDeview/download/$pkgname-$pkgver.tar.gz)
-md5sums=('0161abaec3658095044601eae82bbc5b')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make prefix=$startdir/pkg/usr install || return 1
-  mkdir -p $startdir/pkg/usr/lib/uudeview && \
-  mkdir -p $startdir/pkg/usr/include/uudeview || return 1
-
-  cd $startdir/src/uudeview-$pkgver/uulib
-  ./configure --prefix=/usr
-  make || return 1
-  cp -v *.o $startdir/pkg/usr/lib/uudeview && \
-  cp -v *.a $startdir/pkg/usr/lib/uudeview && \
-  cp -v *.h $startdir/pkg/usr/include/uudeview
-}
diff --git a/abs/extra-testing/community/vlc/PKGBUILD b/abs/extra-testing/community/vlc/PKGBUILD
deleted file mode 100644
index 77e21f7..0000000
--- a/abs/extra-testing/community/vlc/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 24027 2009-01-11 23:38:33Z eric $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgname=vlc
-pkgver=0.9.8a
-pkgrel=4
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/vlc/"
-license=('GPL2')
-depends=('libmad' 'libmpeg2' 'ffmpeg>=20081220' 'x264>=20090108' 'fluidsynth' \
-         'libdvbpsi' 'fribidi' 'sysfsutils' 'libdvdnav' \
-         'libmatroska' 'zvbi' 'libdvdread' 'libmpcdec' \
-         'libdca' 'libxml2' 'lirc-utils' 'libcddb' 'libraw1394' \
-         'smbclient' 'taglib'  'libmodplug' 'avahi' 'libv4l' \
-         'sdl_image' 'libshout' 'lua' 'qt' 'a52dec' 'libgcrypt')
-makedepends=('pkgconfig' 'live-media>=2008.09.02')
-optdepends=('libnotify')
-options=('!libtool' 'force')
-source=(http://download.videolan.org/pub/videolan/vlc/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('8ffa2ff763badd5de7592004d8d69a63')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  sed -i -e 's:#include <vlc\/vlc.h>:#include <vlc/vlc.h> \n #include <locale.h>: ' modules/misc/freetype.c
-  sed -i -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/VeraBd.ttf:' modules/misc/freetype.c
-  [ "${CARCH}" = "i686" ] && EXTRAFEATURES="--enable-loader --enable-live555 --with-live555-tree=/usr/lib/live-media"
-  [ "${CARCH}" = "x86_64" ] && EXTRAFEATURES="--enable-fast-install"
-  ./configure --prefix=/usr \
-              --enable-dvdread \
-              --enable-dvdnav \
-              --enable-madi \
-              --enable-ffmpeg \
-              --disable-rpath \
-              --enable-qt4 \
-              --enable-faad \
-              --enable-alsa \
-              --enable-skins2 \
-              --enable-dvb \
-              --enable-dmo \
-              --with-ffmpeg-faac \
-              --with-ffmpeg-vorbis \
-              --with-ffmpeg-dts \
-              --with-ffmpeg-ogg \
-              --with-ffmpeg-theora \
-              --enable-v4l \
-              --enable-theora \
-              --enable-flac \
-              --enable-snapshot \
-              --enable-hal \
-              --enable-dbus \
-              --enable-ogg \
-              --enable-dbus-control \
-              --enable-shared \
-              --enable-nls \
-              --enable-lirc \
-              --enable-shout \
-              --enable-pvr \
-              --enable-release \
-              --program-suffix= \
-              --with-dv-raw1394=/usr/include/libraw1394 ${EXTRAFEATURES} || return 1
-  make || return 1
-  make DESTDIR=${pkgdir}/ install || return 1
-  
-  for res in 16 32 48 128; do
-    install -D -m644 ${srcdir}/vlc-${pkgver}/share/vlc${res}x${res}.png \
-		     ${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png || return 1
-  done
-  rm -rf ${pkgdir}/usr/lib/mozilla
-}
diff --git a/abs/extra-testing/community/vsftpd/PKGBUILD b/abs/extra-testing/community/vsftpd/PKGBUILD
deleted file mode 100644
index 32a4007..0000000
--- a/abs/extra-testing/community/vsftpd/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 29700 2009-03-11 22:18:56Z hugo $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=vsftpd
-pkgver=2.1.0
-pkgrel=4
-pkgdesc="Very Secure FTP daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-backup=(etc/vsftpd.conf etc/xinetd.d/vsftpd)
-url="http://vsftpd.beasts.org/"
-#makedepends=('vim')
-depends=('glibc' 'pam' 'tcp_wrappers>=7.6-8' 'openssl>=0.9.8j-1' 'libcap>=2.16')
-install=vsftpd.install
-source=(ftp://vsftpd.beasts.org/users/cevans/vsftpd-$pkgver.tar.gz \
-        vsftpd.xinetd vsftpd.d run)
-md5sums=('7890b54e7ffa6106ffbdfda53f47fa41'
-         'b07fd4609c70063c1d6b20142910c1a6'
-         'e46ed8e4c4a6e6a3de59f60b98e4f569'
-	 '8abbed7cc75f9a9d2944e0e83c8dd90d')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  # build-time config
-  sed \
-    -e 's|^#undef VSF_BUILD_TCPWRAPPERS$|#define VSF_BUILD_TCPWRAPPERS|' \
-    -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \
-    -i builddefs.h
-  make CFLAGS="${CFLAGS}" || return 1
-  install -D -m755 vsftpd ${pkgdir}/usr/sbin/vsftpd || return 1
-  install -D -m644 vsftpd.conf ${pkgdir}/etc/vsftpd.conf || return 1
-  install -D -m644 vsftpd.8 ${pkgdir}/usr/share/man/man8/vsftpd.8 || return 1
-  install -D -m644 vsftpd.conf.5 ${pkgdir}/usr/share/man/man5/vsftpd.conf.5 || return 1
-  install -D -m644 ../vsftpd.xinetd ${pkgdir}/etc/xinetd.d/vsftpd  || return 1
-  install -D -m755 ../vsftpd.d ${pkgdir}/etc/rc.d/vsftpd || return 1
-  mkdir -p $startdir/pkg/usr/share/empty
-#  ex ${pkgdir}/etc/vsftpd.conf <<_EOF
-#2
-#i
-##
-## Use this to use vsftpd in standalone mode, otherwise it runs through (x)inetd
-##listen=YES
-#.
-#w
-#q
-#_EOF
-#}
-# Below added for LinHES
-  mkdir -p $startdir/pkg/etc/sv/vsftpd/supervise
-  install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/vsftpd/
-}
diff --git a/abs/extra-testing/community/vsftpd/run b/abs/extra-testing/community/vsftpd/run
deleted file mode 100644
index 1fd5202..0000000
--- a/abs/extra-testing/community/vsftpd/run
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-exec 2>&1
-. /etc/profile
-. /etc/systemconfig
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-stat_runit "Starting VSFTPD"
-export HOME=/root
-
-# Start vsftpd
-/usr/sbin/vsftpd /etc/vsftpd.conf
diff --git a/abs/extra-testing/community/vsftpd/vsftpd.d b/abs/extra-testing/community/vsftpd/vsftpd.d
deleted file mode 100644
index b43a6d0..0000000
--- a/abs/extra-testing/community/vsftpd/vsftpd.d
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/vsftpd`
-case "$1" in
-	start)
-		stat_busy "Starting vsftpd FTP Daemon"
-		if [ -z "$PID" ]; then 
-			/usr/sbin/vsftpd &
-			PID=`pidof -o %PPID /usr/sbin/vsftpd`
-			if [ -z $PID ]; then
-				stat_fail
-			else
-				add_daemon vsftpd
-				stat_done
-			fi
-		else
-			stat_fail
-		fi
-	;;
-	stop)
-		stat_busy "Stopping vsftpd FTP Daemon"
-		[ ! -z "$PID" ]  && kill $PID &> /dev/null
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			rm_daemon vsftpd
-			stat_done
-		fi
-	;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-	;;
-	*)
-		echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/abs/extra-testing/community/vsftpd/vsftpd.install b/abs/extra-testing/community/vsftpd/vsftpd.install
deleted file mode 100644
index 3bbb2cc..0000000
--- a/abs/extra-testing/community/vsftpd/vsftpd.install
+++ /dev/null
@@ -1,22 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  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.  vsftpd 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
-# Below added for LinHES
-  add_service.sh vsftpd
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-	remove_service.sh vsftpd
-}
diff --git a/abs/extra-testing/community/vsftpd/vsftpd.xinetd b/abs/extra-testing/community/vsftpd/vsftpd.xinetd
deleted file mode 100644
index eff2eb3..0000000
--- a/abs/extra-testing/community/vsftpd/vsftpd.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service ftp
-{
-        socket_type             = stream
-        wait                    = no
-        user                    = root
-        server                  = /usr/sbin/vsftpd
-        log_on_success  += HOST DURATION
-        log_on_failure  += HOST
-        disable                 = yes
-}
diff --git a/abs/extra-testing/community/wiiuse/PKGBUILD b/abs/extra-testing/community/wiiuse/PKGBUILD
deleted file mode 100644
index d8b1e2b..0000000
--- a/abs/extra-testing/community/wiiuse/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-#Contributor:Andrea Tarocchi <valdar@email.it> 
-pkgname=wiiuse
-pkgver=0.12
-pkgrel=2
-pkgdesc="Wiiuse is a library written in C that connects with several Nintendo Wii remotes." 
-arch=(i686 x86_64)
-url="http://wiiuse.sourceforge.net/" 
-depends=('bluez')
-license="GPL3"
-install=wiiuse.install
-postfix=_src.tar.gz
-source=(http://downloads.sourceforge.net/sourceforge/wiiuse/wiiuse_v$pkgver\_src.tar.gz) 
-
-md5sums=('29b555096f79dbd3fbc9b96b8d443083')
-
-build() {
-  cd $startdir/src/wiiuse_v$pkgver
-  make wiiuse || return 1
-
-#installing
-  mkdir -p $startdir/pkg/usr/lib
-  mkdir -p $startdir/pkg/usr/include
-
-  install -D -m644 ./src/release-`gcc -v 2>&1|grep ^Target:|cut -d' ' -f2`/libwiiuse.so $startdir/pkg/usr/lib
-  install -D -m644 ./src/wiiuse.h $startdir/pkg/usr/include
-}
diff --git a/abs/extra-testing/community/wiiuse/wiiuse.install b/abs/extra-testing/community/wiiuse/wiiuse.install
deleted file mode 100644
index d856696..0000000
--- a/abs/extra-testing/community/wiiuse/wiiuse.install
+++ /dev/null
@@ -1,17 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-cat << EOF
-Note:
-==> for using this lib in your projects include wiiuse.h and link against libwiiuse.so
-EOF
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-op=$1
-shift
-$op $*
\ No newline at end of file
diff --git a/abs/extra-testing/community/xine-lib-vdpau-svn/PKGBUILD b/abs/extra-testing/community/xine-lib-vdpau-svn/PKGBUILD
deleted file mode 100644
index 2d1e887..0000000
--- a/abs/extra-testing/community/xine-lib-vdpau-svn/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Contributor: Dennis Brendel <buddabrod@gmail.com>
-pkgname=xine-lib-vdpau-svn
-pkgver=222
-pkgrel=2
-pkgdesc="A free video player library for Unix with support for vdpau"
-arch=('i686' 'x86_64')
-url="http://xinehq.de/"
-license=('GPL')
-depends=('libxvmc' 'esound' 'flac>=1.1.4' 'libvorbis' 'sdl' 'libmng' 'libtheora' 'libxcb' 'wavpack' 'ffmpeg>=20080715' 'heimdal>=1.2.1' 'nvidia-utils>=180.22' 'nvidia>=180.22')
-optdepends=('codecs')
-makedepends=('subversion' 'pkgconfig' 'libtool' 'imagemagick' 'smbclient' 'mesa' 'alsa-lib' 'vcdimager' 'jack-audio-connection-kit' 'cvs')
-conflicts=('xine-lib')
-provides=('xine-lib=1.1.16.1' 'xine-lib')
-
-_svntrunk=svn://jusst.de/xine-vdpau
-_svnmod=xine-vdpau
-
-build() {
-
-  cd ${srcdir}
-
-  if [ -d $_svnmod/.svn ]; then
-    (cd $_svnmod && svn up -r $pkgver)
-  else
-    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-  fi
-
-  msg "SVN checkout done or server timeout"
-  msg "Starting make..."
-
-  cp -r $_svnmod $_svnmod-build
-  cd $_svnmod-build
-
-  unset CFLAGS
-
-  ./autogen.sh --prefix=/usr --with-w32-path=/usr/lib/codecs \
-    --with-xv-path=/usr/lib --with-xxmc-path=/usr/lib --with-xvmc-path=/usr/lib \
-    --with-libflac --with-wavpack --with-xcb \
-    --without-arts --with-jack --without-speex \
-    --disable-gnomevfs --without-pulseaudio --disable-aalib \
-    --disable-modplug --with-external-ffmpeg || return 1
-
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-
-  rm -rf ${srcdir}/${_svnmod}-build
-}
diff --git a/abs/extra-testing/community/zvbi/PKGBUILD b/abs/extra-testing/community/zvbi/PKGBUILD
deleted file mode 100644
index f638f29..0000000
--- a/abs/extra-testing/community/zvbi/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-pkgname=zvbi
-pkgver=0.2.26
-pkgrel=1
-pkgdesc="zvbi is needed for zapping"
-arch=(i686 x86_64)
-depends=('libpng')
-license=('GPL')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/zapping/$pkgname-$pkgver.tar.bz2)
-url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome"
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make prefix=$startdir/pkg/usr install
-}
-md5sums=('82805319ca61f6ffd7b7bb64d7433448')
diff --git a/abs/extra-testing/conky/PKGBUILD b/abs/extra-testing/conky/PKGBUILD
deleted file mode 100644
index 0b27d0b..0000000
--- a/abs/extra-testing/conky/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 15346 2008-10-12 21:48:59Z giovanni $
-# Maintainer: James Rayner <james@archlinux.org>
-# Contributor: MrGreen <mrgreen.linuxuser@gmail.com>
-
-pkgname=conky
-pkgver=1.8.0
-pkgrel=1
-pkgdesc="Conky is an advanced, highly configurable system monitor for X based on torsmo"
-arch=('i686' 'x86_64')
-url="http://conky.sourceforge.net/"
-license=('custom')
-replaces=('torsmo')
-depends=('libxext' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage')
-makedepends=('pkgconfig')
-source=(http://downloads.sourceforge.net/sourceforge/conky/$pkgname-$pkgver.tar.bz2)
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --enable-xft --enable-mpd --enable-double-buffer \
-  --enable-proc-uptime --enable-seti --enable-wlan --enable-rss --enable-smapi
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  mkdir -p $startdir/pkg/etc/xdg/
-  mv $startdir/pkg/usr/etc/conky/ $startdir/pkg/etc/xdg/
-  rmdir $startdir/pkg/usr/etc
-  install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING
-}
-
-md5sums=('494cbaf1108cfdb977fc80454d9b13e2')
diff --git a/abs/extra-testing/consolekit/PKGBUILD b/abs/extra-testing/consolekit/PKGBUILD
deleted file mode 100644
index 10a1f7f..0000000
--- a/abs/extra-testing/consolekit/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 87085 2010-08-10 18:29:16Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: onestep_ua <onestep@ukr.net>
-
-pkgname=consolekit
-pkgver=0.4.1
-pkgrel=4
-pkgdesc="A framework for defining and tracking users, login sessions, and seats"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/ConsoleKit"
-license=('GPL')
-depends=('polkit>=0.95' 'zlib' 'libx11>=1.2.2')
-makedepends=('pkgconfig' 'xmlto' 'docbook-xsl')
-options=(!libtool)
-source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${pkgver}.tar.bz2
-        pam-foreground-compat.ck
-        nodaemon.patch
-        reorder-initialization.patch
-        add_since_option.patch
-        consolekit.logrotate)
-md5sums=('48eda4483cc97841d5f88e8e003eb6d7'
-         'a8a4de71d9b0549b8143e5f6c2a36fc7'
-         'a5bfd56bc89411ff5bb18276a68cb212'
-         '99fa8cb1bf232050cc0c076378e216c5'
-         'bd5e72397fe2d42a933a897d28d58155'
-         '6fefa451d9fe2fc6d6269629d3529793')
-
-build() {
-  cd "${srcdir}/ConsoleKit-${pkgver}"
-  patch -Np1 -i "${srcdir}/nodaemon.patch"
-  patch -Np1 -i "${srcdir}/reorder-initialization.patch"
-  patch -Np1 -i "${srcdir}/add_since_option.patch"
-  ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/ConsoleKit \
-      --enable-pam-module \
-      --enable-docbook-docs
-  make
-  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
-}
diff --git a/abs/extra-testing/consolekit/add_since_option.patch b/abs/extra-testing/consolekit/add_since_option.patch
deleted file mode 100644
index 50c1421..0000000
--- a/abs/extra-testing/consolekit/add_since_option.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-From c9f2292339540d4b9d8940bcef16b7485480c8d9 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <jmccann@redhat.com>
-Date: Fri, 11 Jun 2010 19:53:22 +0000
-Subject: Add a --since option to show entries in a time window
-
-Doesn't load any history files it doesn't need to which should
-help performance on systems with long histories.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=25660
----
-diff --git a/tools/ck-history.c b/tools/ck-history.c
-index 606106c..d02caaa 100644
---- a/tools/ck-history.c
-+++ b/tools/ck-history.c
-@@ -62,8 +62,8 @@ typedef enum {
- 
- static GList *all_events = NULL;
- 
--static gboolean
--process_event_line (const char *line)
-+static CkLogEvent *
-+parse_event_line (const char *line)
- {
-         GString    *str;
-         CkLogEvent *event;
-@@ -72,47 +72,80 @@ process_event_line (const char *line)
-         event = ck_log_event_new_from_string (str);
-         g_string_free (str, TRUE);
- 
--        if (event != NULL) {
--                all_events = g_list_prepend (all_events, event);
--        }
--
--        return TRUE;
-+        return event;
- }
- 
- static gboolean
--process_log_gzstream (gzFile *fstream)
-+process_log_gzstream (gzFile   *fstream,
-+                      GTimeVal *since)
- {
--        char line[MAX_LINE_LEN];
-+        char     line[MAX_LINE_LEN];
-+        gboolean hit_since;
-+        GList   *events;
- 
-+        events = NULL;
-+        hit_since = FALSE;
-         while (gzgets (fstream, line, sizeof (line)) != Z_NULL) {
-+                CkLogEvent *event;
-+
-                 if (strlen (line) == sizeof (line) - 1) {
-                         g_warning ("Log line truncated");
-                 }
- 
--                process_event_line (line);
-+                event = parse_event_line (line);
-+                if (event == NULL) {
-+                        continue;
-+                }
-+
-+                if (since == NULL || event->timestamp.tv_sec >= since->tv_sec) {
-+                        events = g_list_prepend (events, event);
-+                } else {
-+                        hit_since = TRUE;
-+                }
-         }
- 
--        return TRUE;
-+        all_events = g_list_concat (all_events, events);
-+
-+        return !hit_since;
- }
- 
- static gboolean
--process_log_stream (FILE *fstream)
-+process_log_stream (FILE     *fstream,
-+                    GTimeVal *since)
- {
--        char line[MAX_LINE_LEN];
-+        char     line[MAX_LINE_LEN];
-+        gboolean hit_since;
-+        GList   *events;
- 
-+        events = NULL;
-+        hit_since = FALSE;
-         while (fgets (line, sizeof (line), fstream) != NULL) {
-+                CkLogEvent *event;
-+
-                 if (strlen (line) == sizeof (line) - 1) {
-                         g_warning ("Log line truncated");
-                 }
- 
--                process_event_line (line);
-+                event = parse_event_line (line);
-+                if (event == NULL) {
-+                        continue;
-+                }
-+
-+                if (since == NULL || event->timestamp.tv_sec >= since->tv_sec) {
-+                        events = g_list_prepend (events, event);
-+                } else {
-+                        hit_since = TRUE;
-+                }
-         }
- 
--        return TRUE;
-+        all_events = g_list_concat (all_events, events);
-+
-+        return !hit_since;
- }
- 
- static gboolean
--process_log_file (const char *filename)
-+process_log_file (const char *filename,
-+                  GTimeVal   *since)
- {
-         gboolean ret;
- 
-@@ -131,7 +164,7 @@ process_log_file (const char *filename)
-                                    errmsg);
-                         return FALSE;
-                 }
--                ret = process_log_gzstream (f);
-+                ret = process_log_gzstream (f, since);
-                 gzclose (f);
-         } else {
-                 FILE    *f;
-@@ -143,7 +176,7 @@ process_log_file (const char *filename)
-                                    g_strerror (errno));
-                         return FALSE;
-                 }
--                ret = process_log_stream (f);
-+                ret = process_log_stream (f, since);
-                 fclose (f);
-         }
- 
-@@ -180,11 +213,14 @@ get_log_file_list (void)
-                 files = g_list_prepend (files, filename);
-         };
- 
-+        /* Return the list in reverse time order, newest first */
-+        files = g_list_reverse (files);
-+
-         return files;
- }
- 
- static gboolean
--process_logs (void)
-+process_logs (GTimeVal *since)
- {
-         gboolean ret;
-         GList   *files;
-@@ -199,8 +235,7 @@ process_logs (void)
-                 char    *filename;
- 
-                 filename = l->data;
--
--                res = process_log_file (filename);
-+                res = process_log_file (filename, since);
-                 if (! res) {
-                         goto out;
-                 }
-@@ -843,6 +878,8 @@ main (int    argc,
-         GError             *error = NULL;
-         int                 report_type;
-         int                 uid;
-+        GTimeVal            timestamp;
-+        gboolean            use_since;
-         static gboolean     do_version = FALSE;
-         static gboolean     report_last_compat = FALSE;
-         static gboolean     report_last = FALSE;
-@@ -851,6 +888,7 @@ main (int    argc,
-         static char        *username = NULL;
-         static char        *seat = NULL;
-         static char        *session_type = NULL;
-+        static char        *since = NULL;
-         static GOptionEntry entries [] = {
-                 { "version", 'V', 0, G_OPTION_ARG_NONE, &do_version, N_("Version of this application"), NULL },
-                 { "frequent", 0, 0, G_OPTION_ARG_NONE, &report_frequent, N_("Show listing of frequent users"), NULL },
-@@ -860,6 +898,7 @@ main (int    argc,
-                 { "seat", 's', 0, G_OPTION_ARG_STRING, &seat, N_("Show entries for the specified seat"), N_("SEAT") },
-                 { "session-type", 't', 0, G_OPTION_ARG_STRING, &session_type, N_("Show entries for the specified session type"), N_("TYPE") },
-                 { "user", 'u', 0, G_OPTION_ARG_STRING, &username, N_("Show entries for the specified user"), N_("NAME") },
-+                { "since", 0, 0, G_OPTION_ARG_STRING, &since, N_("Show entries since the specified time (ISO 8601 format)"), N_("DATETIME") },
-                 { NULL }
-         };
- 
-@@ -880,6 +919,15 @@ main (int    argc,
-                 exit (1);
-         }
- 
-+        use_since = FALSE;
-+        if (since != NULL) {
-+                use_since = g_time_val_from_iso8601 (since, &timestamp);
-+                if (! use_since) {
-+                        g_warning ("Invalid ISO 8601 time value");
-+                        exit (1);
-+                }
-+        }
-+
-         if (report_last_compat) {
-                 report_type = REPORT_TYPE_LAST_COMPAT;
-         } else if (report_last) {
-@@ -902,7 +950,11 @@ main (int    argc,
-                 uid = -1;
-         }
- 
--        process_logs ();
-+        if (use_since) {
-+                process_logs (&timestamp);
-+        } else {
-+                process_logs (NULL);
-+        }
-         generate_report (report_type, uid, seat, session_type);
-         free_events ();
- 
---
-cgit v0.8.3-6-g21f6
diff --git a/abs/extra-testing/consolekit/consolekit.logrotate b/abs/extra-testing/consolekit/consolekit.logrotate
deleted file mode 100644
index 7c5346e..0000000
--- a/abs/extra-testing/consolekit/consolekit.logrotate
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/ConsoleKit/history {
-    missingok
-    notifempty
-    delaycompress
-}
diff --git a/abs/extra-testing/consolekit/nodaemon.patch b/abs/extra-testing/consolekit/nodaemon.patch
deleted file mode 100644
index c4c08e9..0000000
--- a/abs/extra-testing/consolekit/nodaemon.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in.nodaemon ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in
---- ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in.nodaemon	2009-12-15 10:56:39.839818556 -0500
-+++ ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in	2009-12-15 10:56:50.177792048 -0500
-@@ -1,4 +1,4 @@
- [D-BUS Service]
- Name=org.freedesktop.ConsoleKit
--Exec=@sbindir@/console-kit-daemon
-+Exec=@sbindir@/console-kit-daemon --no-daemon
- User=root
diff --git a/abs/extra-testing/consolekit/pam-foreground-compat.ck b/abs/extra-testing/consolekit/pam-foreground-compat.ck
deleted file mode 100644
index 7f6b122..0000000
--- a/abs/extra-testing/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/abs/extra-testing/consolekit/reorder-initialization.patch b/abs/extra-testing/consolekit/reorder-initialization.patch
deleted file mode 100644
index f65abd5..0000000
--- a/abs/extra-testing/consolekit/reorder-initialization.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -up ConsoleKit-0.4.1/src/main.c.reorder-initialization ConsoleKit-0.4.1/src/main.c
---- ConsoleKit-0.4.1/src/main.c.reorder-initialization	2009-12-18 14:51:38.821212946 -0500
-+++ ConsoleKit-0.4.1/src/main.c	2009-12-18 14:52:19.246211176 -0500
-@@ -294,11 +294,19 @@ main (int    argc,
- 
-         setup_debug_log (debug);
- 
-+        g_debug ("initializing console-kit-daemon %s", VERSION);
-+
-         connection = get_system_bus ();
-         if (connection == NULL) {
-                 goto out;
-         }
- 
-+        manager = ck_manager_new ();
-+
-+        if (manager == NULL) {
-+                goto out;
-+        }
-+
-         bus_proxy = get_bus_proxy (connection);
-         if (bus_proxy == NULL) {
-                 g_warning ("Could not construct bus_proxy object; bailing out");
-@@ -310,16 +318,8 @@ main (int    argc,
-                 goto out;
-         }
- 
--        g_debug ("initializing console-kit-daemon %s", VERSION);
--
-         create_pid_file ();
- 
--        manager = ck_manager_new ();
--
--        if (manager == NULL) {
--                goto out;
--        }
--
-         loop = g_main_loop_new (NULL, FALSE);
- 
-         g_signal_connect (bus_proxy,
diff --git a/abs/extra-testing/cpufreqd/PKGBUILD b/abs/extra-testing/cpufreqd/PKGBUILD
deleted file mode 100644
index fd6d544..0000000
--- a/abs/extra-testing/cpufreqd/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 60269 2009-12-02 16:30:29Z giovanni $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Kevin Piche <kevin@archlinux.org>
-# Contributor: Manolis Tzanidakis <manolis@archlinux.org>
-
-pkgname=cpufreqd
-pkgver=2.4.2
-pkgrel=1
-pkgdesc="A small daemon to adjust cpu speed (and indeed voltage)"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/cpufreqd"
-license=('GPL2')
-depends=('cpufrequtils')
-install="$pkgname.install"
-backup=(etc/cpufreqd.conf)
-options=('!libtool')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-	'cpufreqd')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc
-  make || return 1
-  make DESTDIR=$pkgdir install
-
-  install -D -m 755 $srcdir/cpufreqd $pkgdir/etc/rc.d/cpufreqd || return 1
-}
-md5sums=('2ca80a77849c9a69b81e27c1843c97f5'
-         'ae7b0ec1e8e9f9e7f05fb83749af4ed4')
diff --git a/abs/extra-testing/cpufreqd/cpufreqd b/abs/extra-testing/cpufreqd/cpufreqd
deleted file mode 100644
index af55456..0000000
--- a/abs/extra-testing/cpufreqd/cpufreqd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/cpufreqd`
-case "$1" in
-  start)
-    stat_busy "Starting cpufreqd"
-    [ -z "$PID" ] && /usr/sbin/cpufreqd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon cpufreqd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping cpufreqd"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon cpufreqd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/abs/extra-testing/cpufreqd/cpufreqd.install b/abs/extra-testing/cpufreqd/cpufreqd.install
deleted file mode 100644
index e56ce57..0000000
--- a/abs/extra-testing/cpufreqd/cpufreqd.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-	cat << EOF
-
-NOTE
-----
-In order to use that daemon you need to either patch your
-kernel-2.4.x with cpufreq patch (check 
-http://www.codemonkey.org.uk/projects/cpufreq/),
-or use kernel-2.6.x or 2.4.x.-ac.
-
-EOF
-}
-
-post_upgrade() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/abs/extra-testing/cpufrequtils/PKGBUILD b/abs/extra-testing/cpufrequtils/PKGBUILD
deleted file mode 100644
index c9087aa..0000000
--- a/abs/extra-testing/cpufrequtils/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 66595 2010-02-01 00:00:07Z giovanni $
-# Maintainer: kevin <kevin@archlinux.org>
-# Contributor: phrakture <aaronmgriffin+gmail+com>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-
-pkgname=cpufrequtils
-pkgver=008
-pkgrel=1
-pkgdesc="Userspace tools for the kernel cpufreq subsystem"
-arch=('i686' 'x86_64')
-url="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"
-license=('GPL')
-depends=('sysfsutils')
-backup=('etc/conf.d/cpufreq')
-source=(http://www.kernel.org/pub/linux/utils/kernel/cpufreq/${pkgname}-${pkgver}.tar.bz2
-        cpufreq.rcd
-        cpufreq.confd)
-options=(!libtool)
-
-build()
-{
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make -j1 || return 1
-  make INSTALL="/bin/install -c" mandir=/usr/share/man DESTDIR="${pkgdir}" install || return 1
-
-  install -D -m755 ${srcdir}/cpufreq.rcd "${pkgdir}/etc/rc.d/cpufreq" || return 1
-  install -D -m644 ${srcdir}/cpufreq.confd "${pkgdir}/etc/conf.d/cpufreq" || return 1
-}
-md5sums=('c59b71c044d463896f3247e8dd83dd7e'
-         '7f2b5085df44d2df3e7c2d0b9f6dab08'
-         'baae1f2abffc6bef2bd32a8dd8263c09')
diff --git a/abs/extra-testing/cpufrequtils/cpufreq.confd b/abs/extra-testing/cpufrequtils/cpufreq.confd
deleted file mode 100644
index 2189097..0000000
--- a/abs/extra-testing/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/abs/extra-testing/cpufrequtils/cpufreq.rcd b/abs/extra-testing/cpufrequtils/cpufreq.rcd
deleted file mode 100644
index 9bc19b1..0000000
--- a/abs/extra-testing/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/abs/extra-testing/crda/PKGBUILD b/abs/extra-testing/crda/PKGBUILD
deleted file mode 100644
index 5a23fbd..0000000
--- a/abs/extra-testing/crda/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 24388 2009-01-15 23:18:18Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=crda
-pkgver=0.9.5
-_regdbver=2009-01-15
-pkgrel=2
-pkgdesc="Central Regulatory Domain Agent"
-arch=(i686 x86_64)
-url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
-license=('custom')
-depends=('libnl' 'libgcrypt' 'udev' 'iw')
-makedepends=('python-m2crypto')
-source=(http://wireless.kernel.org/download/crda/$pkgname-$pkgver.tar.bz2
-        http://wireless.kernel.org/download/wireless-regdb/regulatory.bins/${_regdbver}-regulatory.bin
-        crda.rc
-        crda.conf.d)
-backup=(etc/conf.d/wireless-regdom)
-md5sums=('cee459e588441f713a96ae2fb0472d7f'
-         'a0db99e5385c876b6da7e2869546f6e2'
-         '014eef3f8655e9a130064ec6891317fc'
-         '2374dcf1c6530332f375e5362b80169b')
-                  
-build() {
-  # Install crda, regdbdump and udev rules
-  msg "Compiling and installing crda ..."
-  cd $srcdir/$pkgname-$pkgver
-  make crda regdbdump || return 1
-  make DESTDIR=$pkgdir install || return 1
-
-  # Install and verify regulatory.bin file
-  msg "Installing and verifying the regulatory.bin file ..."
-  install -D -m444 $srcdir/${_regdbver}-regulatory.bin $pkgdir/usr/lib/crda/regulatory.bin || return 1
-  if $pkgdir/sbin/regdbdump $pkgdir/usr/lib/crda/regulatory.bin > /dev/null; then
-    msg "Regulatory database verification was succesful."
-  else
-    error "Regulatory database verification failed."
-    return 1
-  fi
-  
-  msg "Installing license ..."
-  install -D -m644 $srcdir/$pkgname-$pkgver/LICENSE $pkgdir/usr/share/licenses/crda/LICENSE || return 1
-  
-  msg "Installing boot scripts ..."
-  install -D -m755 $srcdir/crda.rc $pkgdir/etc/rc.d/wireless-regdom || return 1
-  install -D -m644 $srcdir/crda.conf.d $pkgdir/etc/conf.d/wireless-regdom || return 1
-  for dom in $($pkgdir/sbin/regdbdump $pkgdir/usr/lib/crda/regulatory.bin | grep ^country | cut -d' ' -f2 | sed 's|:||g'); do
-    echo "#WIRELESS_REGDOM=\"${dom}\"" >> $pkgdir/etc/conf.d/wireless-regdom || return 1
-  done
-}
diff --git a/abs/extra-testing/crda/crda.conf.d b/abs/extra-testing/crda/crda.conf.d
deleted file mode 100644
index 8511238..0000000
--- a/abs/extra-testing/crda/crda.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Wireless regulatory domain configuration
-#
-
diff --git a/abs/extra-testing/crda/crda.rc b/abs/extra-testing/crda/crda.rc
deleted file mode 100755
index 13dbd87..0000000
--- a/abs/extra-testing/crda/crda.rc
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/wireless-regdom
-
-case "$1" in
-  start)
-    if [ -n "${WIRELESS_REGDOM}" ]; then
-        stat_busy "Setting wireless regulatory domain: ${WIRELESS_REGDOM}"
-        if iw reg set ${WIRELESS_REGDOM}; then
-            stat_done
-        else
-            stat_fail
-        fi
-    fi
-    ;;
-  stop)
-    ;;
-  restart)
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 start"  
-esac
-exit 0
diff --git a/abs/extra-testing/crypto++/PKGBUILD b/abs/extra-testing/crypto++/PKGBUILD
deleted file mode 100644
index 35bf2b7..0000000
--- a/abs/extra-testing/crypto++/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 68024 2010-02-10 14:24:12Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Kritoke <kritoke@gamebox.net>
-# Contributor: jlvsimoes <jlvsimoes@oninet.pt>
-
-pkgname=crypto++
-pkgver=5.6.0
-_srcver=560
-pkgrel=2
-pkgdesc="A free C++ class library of cryptographic schemes."
-arch=('i686' 'x86_64')
-license=('custom')
-makedepends=('unzip')
-url="http://www.cryptopp.com/"
-source=(http://www.cryptopp.com/cryptopp${_srcver}.zip)
-md5sums=('36f35789ad60489d58003d3c849807e8')
-
-build() {
-  cd ${srcdir}
-  sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
-  make -f GNUmakefile || return 1
-  install -d ${pkgdir}/usr/{lib,include/cryptopp}
-  install -m644 *.h ${pkgdir}/usr/include/cryptopp/
-  install -m644 libcryptopp.a ${pkgdir}/usr/lib/
-  install -D -m644 License.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/abs/extra-testing/cups/PKGBUILD b/abs/extra-testing/cups/PKGBUILD
deleted file mode 100644
index e1f13b7..0000000
--- a/abs/extra-testing/cups/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# $Id: PKGBUILD 82848 2010-06-18 06:18:19Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase="cups"
-pkgname=('libcups' 'cups')
-pkgver=1.4.4
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.cups.org/"
-makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0'  'acl' 'openslp' 'pam' 'xdg-utils' 'heimdal>=1.3.1' 'gnutls>=2.8.3' 'poppler>=0.12.3'
-             'xinetd' 'gzip' 'autoconf' 'php' 'libusb' 'dbus-core' 'avahi'  'hicolor-icon-theme')
-source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
-	cups-avahi.patch
-        cups cups.logrotate cups.pam)
-#options=('!emptydirs')
-md5sums=('8776403ad60fea9e85eab9c04d88560d'
-         '3388dbe3fc20f16f37912e60a8ec46bc'
-         '5c85b7d8d2ddd02c2c64955cebbf55ea'
-         'f861b18f4446c43918c8643dcbbd7f6d'
-         '96f82c38f3f540b53f3e5144900acf17')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  # Avahi support in the dnssd backend. patch from Fedora
-  patch -Np1 -i ${srcdir}/cups-avahi.patch || return 1
-  # Rebuild configure script for --enable-avahi.
-  aclocal -I config-scripts
-  autoconf -I config-scripts
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-     --with-logdir=/var/log/cups -with-docdir=/usr/share/cups/doc \
-     --with-cups-user=daemon --with-cups-group=lp --enable-pam=yes \
-     --disable-ldap --libdir=/usr/lib --enable-raw-printing \
-     --enable-dbus --with-dbusdir=/etc/dbus-1 --enable-ssl=yes --enable-gnutls --disable-threads --enable-dnssd\
-     --with-php=/usr/bin/php-cgi --with-pdftops=pdftops --with-optim="$CFLAGS"
-  make || return 1
-}
-
-package_libcups() {
-pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'heimdal>=1.3.1')
-optdepends=('avahi: for the "dnssd" CUPS backend')
-
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-headers install-libs || return 1
-  # put this into the libs pkg to make other software find the libs(no pkg-config file included)
-  mkdir -p ${pkgdir}/usr/bin
-  install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
-}
-
-package_cups() {
-pkgdesc="The CUPS Printing System - deamon package"
-install=cups.install
-backup=(etc/cups/cupsd.conf
-        etc/cups/mime.convs
-        etc/cups/mime.types
-        etc/cups/snmp.conf
-        etc/cups/printers.conf
-        etc/cups/classes.conf
-        etc/cups/client.conf
-        etc/cups/subscriptions.conf
-        etc/dbus-1/system.d/cups.conf
-        etc/logrotate.d/cups
-        etc/pam.d/cups
-        etc/xinetd.d/cups-lpd)
-depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'poppler>=0.12.3' 'libusb' 'dbus-core' 'hicolor-icon-theme')
-optdepends=('php: for included phpcups.so module')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-data install-exec || return 1
-
-  # this one we ship in the libcups pkg
-  rm -f ${pkgdir}/usr/bin/cups-config
-
-  # kill the sysv stuff
-  rm -rf ${pkgdir}/etc/rc*.d
-  rm -rf ${pkgdir}/etc/init.d
-  install -D -m755 ../cups ${pkgdir}/etc/rc.d/cups
-  install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
-  install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
-  
-  # fix perms on /var/spool and /etc
-  chmod 755 ${pkgdir}/var/spool
-  chmod 755 ${pkgdir}/etc
-
-  # install ssl directory where to store the certs, solves some samba issues
-  install -dm700 -g lp ${pkgdir}/etc/cups/ssl
-  install -dm511 -g lp ${pkgdir}/var/run/cups/certs 
-
-  # install some more configuration files that will get filled by cupsd
-  touch ${pkgdir}/etc/cups/printers.conf
-  touch ${pkgdir}/etc/cups/classes.conf
-  touch ${pkgdir}/etc/cups/client.conf
-  echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf
-  echo "ServerName /var/run/cups/cups.sock #  alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf
-  touch ${pkgdir}/etc/cups/subscriptions.conf 
-  chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,client.conf,subscriptions.conf}
-  
-  # fix .desktop file
-  sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop
-  
-  # compress some driver files, adopted from Fedora
-  find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
-}
diff --git a/abs/extra-testing/cups/cups b/abs/extra-testing/cups/cups
deleted file mode 100755
index 4afaf5a..0000000
--- a/abs/extra-testing/cups/cups
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/cupsd`
-case "$1" in
-  start)
-    stat_busy "Starting CUPS Daemon"
-    [ -z "$PID" ] && /usr/sbin/cupsd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $(pidof -o %PPID -x /usr/sbin/cupsd) > /var/run/cups.pid
-      add_daemon cups
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping CUPS Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/cups.pid
-      rm_daemon cups
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/abs/extra-testing/cups/cups-1.3.7-peercred.patch b/abs/extra-testing/cups/cups-1.3.7-peercred.patch
deleted file mode 100644
index eda2c93..0000000
--- a/abs/extra-testing/cups/cups-1.3.7-peercred.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur cups-1.3.7/scheduler/auth.c cups-1.3.7.new/scheduler/auth.c
---- cups-1.3.7/scheduler/auth.c	2008-03-20 21:58:16.000000000 +0100
-+++ cups-1.3.7.new/scheduler/auth.c	2008-06-09 14:53:45.535194741 +0200
-@@ -54,6 +54,7 @@
-  * Include necessary headers...
-  */
- 
-+#define _GNU_SOURCE
- #include "cupsd.h"
- #include <grp.h>
- #ifdef HAVE_SHADOW_H
diff --git a/abs/extra-testing/cups/cups-avahi.patch b/abs/extra-testing/cups/cups-avahi.patch
deleted file mode 100644
index 01fcb1a..0000000
--- a/abs/extra-testing/cups/cups-avahi.patch
+++ /dev/null
@@ -1,1089 +0,0 @@
-diff -up cups-1.4.0/backend/dnssd.c.avahi cups-1.4.0/backend/dnssd.c
---- cups-1.4.0/backend/dnssd.c.avahi	2009-08-07 23:27:12.000000000 +0100
-+++ cups-1.4.0/backend/dnssd.c	2009-09-04 14:57:04.730388833 +0100
-@@ -22,6 +22,7 @@
-  *   exec_backend()          - Execute the backend that corresponds to the
-  *                             resolved service name.
-  *   get_device()            - Create or update a device.
-+*    find_device()
-  *   query_callback()        - Process query data.
-  *   sigterm_handler()       - Handle termination signals...
-  *   unquote()               - Unquote a name string.
-@@ -33,7 +34,18 @@
- 
- #include "backend-private.h"
- #include <cups/array.h>
--#include <dns_sd.h>
-+#ifdef HAVE_DNSSD
-+#  include <dns_sd.h>
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/lookup.h>
-+#  include <avahi-common/simple-watch.h>
-+#  include <avahi-common/domain.h>
-+#  include <avahi-common/error.h>
-+#  include <avahi-common/malloc.h>
-+#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -52,7 +64,12 @@ typedef enum
- 
- typedef struct
- {
-+#ifdef HAVE_DNSSD
-   DNSServiceRef	ref;			/* Service reference for resolve */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  int		resolved;		/* Did we resolve the device? */
-+#endif /* HAVE_AVAHI */
-   char		*name,			/* Service name */
- 		*domain,		/* Domain name */
- 		*fullName,		/* Full name */
-@@ -64,6 +81,20 @@ typedef struct
- 		sent;			/* Did we list the device? */
- } cups_device_t;
- 
-+typedef struct
-+{
-+  char key[256];
-+  char value[256];
-+
-+#ifdef HAVE_DNSSD
-+  const uint8_t *data;
-+  const uint8_t *datanext;
-+  const uint8_t *dataend;
-+#else /* HAVE_AVAHI */
-+  AvahiStringList *txt;
-+#endif /* HAVE_DNSSD */
-+} cups_txt_records_t;
-+
- 
- /*
-  * Local globals...
-@@ -77,6 +108,7 @@ static int		job_canceled = 0;
-  * Local functions...
-  */
- 
-+#ifdef HAVE_DNSSD
- static void		browse_callback(DNSServiceRef sdRef,
- 			                DNSServiceFlags flags,
- 				        uint32_t interfaceIndex,
-@@ -92,12 +124,6 @@ static void		browse_local_callback(DNSSe
- 					      const char *regtype,
- 					      const char *replyDomain,
- 					      void *context);
--static int		compare_devices(cups_device_t *a, cups_device_t *b);
--static void		exec_backend(char **argv);
--static cups_device_t	*get_device(cups_array_t *devices,
--			            const char *serviceName,
--			            const char *regtype,
--				    const char *replyDomain);
- static void		query_callback(DNSServiceRef sdRef,
- 			               DNSServiceFlags flags,
- 				       uint32_t interfaceIndex,
-@@ -106,9 +132,111 @@ static void		query_callback(DNSServiceRe
- 				       uint16_t rrclass, uint16_t rdlen,
- 				       const void *rdata, uint32_t ttl,
- 				       void *context);
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+static void		avahi_client_callback (AvahiClient *client,
-+					       AvahiClientState state,
-+					       void *context);
-+static void		avahi_browse_callback (AvahiServiceBrowser *browser,
-+					       AvahiIfIndex interface,
-+					       AvahiProtocol protocol,
-+					       AvahiBrowserEvent event,
-+					       const char *serviceName,
-+					       const char *regtype,
-+					       const char *replyDomain,
-+					       AvahiLookupResultFlags flags,
-+					       void *context);
-+#endif /* HAVE_AVAHI */
-+
-+static cups_device_t *	find_device (cups_array_t *devices,
-+				     cups_txt_records_t *txt,
-+				     cups_device_t *dkey);
-+static int		compare_devices(cups_device_t *a, cups_device_t *b);
-+static void		exec_backend(char **argv);
-+static cups_device_t	*get_device(cups_array_t *devices,
-+			            const char *serviceName,
-+			            const char *regtype,
-+				    const char *replyDomain);
- static void		sigterm_handler(int sig);
- static void		unquote(char *dst, const char *src, size_t dstsize);
- 
-+#ifdef HAVE_AVAHI
-+static AvahiSimplePoll *simple_poll = NULL;
-+static int avahi_got_callback;
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * cups_txt_records_t access functions
-+ */
-+static cups_txt_records_t *
-+next_txt_record (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+  txt->data = txt->datanext;
-+#else /* HAVE_AVAHI */
-+  txt->txt = avahi_string_list_get_next (txt->txt);
-+  if (txt->txt == NULL)
-+    return NULL;
-+#endif /* HAVE_DNSSD */
-+
-+  return txt;
-+}
-+
-+static int
-+parse_txt_record_pair (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+  uint8_t	datalen;
-+  uint8_t	*data = txt->data;
-+  char		*ptr;
-+
-+ /*
-+  * Read a key/value pair starting with an 8-bit length.  Since the
-+  * length is 8 bits and the size of the key/value buffers is 256, we
-+  * don't need to check for overflow...
-+  */
-+
-+  datalen = *data++;
-+  if (!datalen || (data + datalen) >= txt->dataend)
-+    return NULL;
-+  txt->datanext = data + datalen;
-+
-+  for (ptr = txt->key; data < txt->datanext && *data != '='; data ++)
-+    *ptr++ = *data;
-+  *ptr = '\0';
-+
-+  if (data < txt->datanext && *data == '=')
-+  {
-+    data++;
-+
-+    if (data < datanext)
-+      memcpy (txt->value, data, txt->datanext - data);
-+    value[txt->datanext - data] = '\0';
-+  }
-+  else
-+    return 1;
-+#else /* HAVE_AVAHI */
-+  char *key, *value;
-+  size_t len;
-+  avahi_string_list_get_pair (txt->txt, &key, &value, &len);
-+  if (len > sizeof (txt->value) - 1)
-+    len = sizeof (txt->value) - 1;
-+
-+  memcpy (txt->value, value, len);
-+  txt->value[len] = '\0';
-+  len = strlen (key);
-+  if (len > sizeof (txt->key) - 1)
-+    len = sizeof (txt->key) - 1;
-+
-+  memcpy (txt->key, key, len);
-+  txt->key[len] = '\0';
-+  avahi_free (key);
-+  avahi_free (value);
-+#endif /* HAVE_AVAHI */
-+
-+  return 0;
-+}
- 
- /*
-  * 'main()' - Browse for printers.
-@@ -119,6 +247,13 @@ main(int  argc,				/* I - Number of comm
-      char *argv[])			/* I - Command-line arguments */
- {
-   const char	*name;			/* Backend name */
-+  cups_array_t	*devices;		/* Device array */
-+  cups_device_t	*device;		/* Current device */
-+  char		uriName[1024];		/* Unquoted fullName for URI */
-+#ifdef HAVE_DNSSD
-+  int		fd;			/* Main file descriptor */
-+  fd_set	input;			/* Input set for select() */
-+  struct timeval timeout;		/* Timeout for select() */
-   DNSServiceRef	main_ref,		/* Main service reference */
- 		fax_ipp_ref,		/* IPP fax service reference */
- 		ipp_ref,		/* IPP service reference */
-@@ -130,12 +265,11 @@ main(int  argc,				/* I - Number of comm
- 		pdl_datastream_ref,	/* AppSocket service reference */
- 		printer_ref,		/* LPD service reference */
- 		riousbprint_ref;	/* Remote IO service reference */
--  int		fd;			/* Main file descriptor */
--  fd_set	input;			/* Input set for select() */
--  struct timeval timeout;		/* Timeout for select() */
--  cups_array_t	*devices;		/* Device array */
--  cups_device_t	*device;		/* Current device */
--  char		uriName[1024];		/* Unquoted fullName for URI */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  AvahiClient	*client;
-+  int		error;
-+#endif /* HAVE_AVAHI */
- #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-   struct sigaction action;		/* Actions for POSIX signals */
- #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-@@ -194,6 +328,49 @@ main(int  argc,				/* I - Number of comm
-   * Browse for different kinds of printers...
-   */
- 
-+#ifdef HAVE_AVAHI
-+  if ((simple_poll = avahi_simple_poll_new ()) == NULL)
-+  {
-+    perror ("ERROR: Unable to create avahi simple poll object");
-+    return (1);
-+  }
-+
-+  client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+			     0, avahi_client_callback, NULL, &error);
-+  if (!client)
-+  {
-+    perror ("ERROR: Unable to create avahi client");
-+    return (1);
-+  }
-+
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_fax-ipp._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_ipp._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_ipp-tls._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_pdl-datastream._tcp",
-+			     NULL, 0,
-+			     avahi_browse_callback,
-+			     devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_printer._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_riousbprint._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+#endif /* HAVE_AVAHI */
-+#ifdef HAVE_DNSSD
-   if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError)
-   {
-     perror("ERROR: Unable to create service connection");
-@@ -245,6 +422,7 @@ main(int  argc,				/* I - Number of comm
-   riousbprint_ref = main_ref;
-   DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0,
-                    "_riousbprint._tcp", NULL, browse_callback, devices);
-+#endif /* HAVE_DNSSD */
- 
-  /*
-   * Loop until we are killed...
-@@ -252,6 +430,9 @@ main(int  argc,				/* I - Number of comm
- 
-   while (!job_canceled)
-   {
-+    int announce = 0;
-+
-+#ifdef HAVE_DNSSD
-     FD_ZERO(&input);
-     FD_SET(fd, &input);
- 
-@@ -271,11 +452,35 @@ main(int  argc,				/* I - Number of comm
-     }
-     else
-     {
-+      announce = 1;
-+    }
-+#else /* HAVE_AVAHI */
-+    int r;
-+    avahi_got_callback = 0;
-+    r = avahi_simple_poll_iterate (simple_poll, 1);
-+    if (r != 0 && r != EINTR)
-+    {
-+     /*
-+      * We've been told to exit the loop.  Perhaps the connection to
-+      * avahi failed.
-+      */
-+
-+      break;
-+    }
-+
-+    if (avahi_got_callback)
-+      announce = 1;
-+#endif /* HAVE_DNSSD */
-+
-+    if (announce)
-+    {
-      /*
-       * Announce any devices we've found...
-       */
- 
-+#ifdef HAVE_DNSSD
-       DNSServiceErrorType status;	/* DNS query status */
-+#endif /* HAVE_DNSSD */
-       cups_device_t *best;		/* Best matching device */
-       char	device_uri[1024];	/* Device URI */
-       int	count;			/* Number of queries */
-@@ -285,6 +490,7 @@ main(int  argc,				/* I - Number of comm
-                best = NULL, count = 0;
-            device;
- 	   device = (cups_device_t *)cupsArrayNext(devices))
-+#ifdef HAVE_DNSSD
-         if (!device->ref && !device->sent)
- 	{
- 	 /*
-@@ -313,14 +519,23 @@ main(int  argc,				/* I - Number of comm
- 	      count ++;
-           }
- 	}
--	else if (!device->sent)
-+	else
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+	if (!device->resolved)
-+	  continue;
-+        else
-+#endif /* HAVE_AVAHI */
-+	if (!device->sent)
- 	{
-+#ifdef HAVE_DNSSD
- 	 /*
- 	  * Got the TXT records, now report the device...
- 	  */
- 
- 	  DNSServiceRefDeallocate(device->ref);
- 	  device->ref = 0;
-+#endif /* HAVE_DNSSD */
- 
-           if (!best)
- 	    best = device;
-@@ -372,6 +587,7 @@ main(int  argc,				/* I - Number of comm
-  * 'browse_callback()' - Browse devices.
-  */
- 
-+#ifdef HAVE_DNSSD
- static void
- browse_callback(
-     DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -405,12 +621,14 @@ browse_callback(
- 
-   get_device((cups_array_t *)context, serviceName, regtype, replyDomain);
- }
-+#endif /* HAVE_DNSSD */
- 
- 
- /*
-  * 'browse_local_callback()' - Browse local devices.
-  */
- 
-+#ifdef HAVE_DNSSD
- static void
- browse_local_callback(
-     DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -456,6 +674,7 @@ browse_local_callback(
- 	  device->fullName);
-   device->sent = 1;
- }
-+#endif /* HAVE_DNSSD */
- 
- 
- /*
-@@ -528,6 +747,32 @@ exec_backend(char **argv)		/* I - Comman
-   exit(CUPS_BACKEND_STOP);
- }
- 
-+static int
-+device_type (const char *regtype)
-+{
-+#ifdef HAVE_AVAHI
-+  if (!strcmp(regtype, "_ipp._tcp") ||
-+      !strcmp(regtype, "_ipp-tls._tcp"))
-+    return (CUPS_DEVICE_IPP);
-+  else if (!strcmp(regtype, "_fax-ipp._tcp"))
-+    return (CUPS_DEVICE_FAX_IPP);
-+  else if (!strcmp(regtype, "_printer._tcp"))
-+    return (CUPS_DEVICE_PDL_DATASTREAM);
-+#else
-+  if (!strcmp(regtype, "_ipp._tcp.") ||
-+      !strcmp(regtype, "_ipp-tls._tcp."))
-+    return (CUPS_DEVICE_IPP);
-+  else if (!strcmp(regtype, "_fax-ipp._tcp."))
-+    return (CUPS_DEVICE_FAX_IPP);
-+  else if (!strcmp(regtype, "_printer._tcp."))
-+    return (CUPS_DEVICE_PRINTER);
-+  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
-+    return (CUPS_DEVICE_PDL_DATASTREAM);
-+#endif /* HAVE_AVAHI */
-+
-+  return (CUPS_DEVICE_RIOUSBPRINT);
-+}
-+
- 
- /*
-  * 'get_device()' - Create or update a device.
-@@ -550,18 +795,7 @@ get_device(cups_array_t *devices,	/* I -
-   */
- 
-   key.name = (char *)serviceName;
--
--  if (!strcmp(regtype, "_ipp._tcp.") ||
--      !strcmp(regtype, "_ipp-tls._tcp."))
--    key.type = CUPS_DEVICE_IPP;
--  else if (!strcmp(regtype, "_fax-ipp._tcp."))
--    key.type = CUPS_DEVICE_FAX_IPP;
--  else if (!strcmp(regtype, "_printer._tcp."))
--    key.type = CUPS_DEVICE_PRINTER;
--  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
--    key.type = CUPS_DEVICE_PDL_DATASTREAM;
--  else
--    key.type = CUPS_DEVICE_RIOUSBPRINT;
-+  key.type = device_type (regtype);
- 
-   for (device = cupsArrayFind(devices, &key);
-        device;
-@@ -581,8 +815,14 @@ get_device(cups_array_t *devices,	/* I -
-         free(device->domain);
- 	device->domain = strdup(replyDomain);
- 
-+#ifdef HAVE_DNSSD
- 	DNSServiceConstructFullName(fullName, device->name, regtype,
- 	                            replyDomain);
-+#else /* HAVE_AVAHI */
-+	avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+				 serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
- 	free(device->fullName);
- 	device->fullName = strdup(fullName);
-       }
-@@ -602,6 +842,9 @@ get_device(cups_array_t *devices,	/* I -
-   device->domain   = strdup(replyDomain);
-   device->type     = key.type;
-   device->priority = 50;
-+#ifdef HAVE_AVAHI
-+  device->resolved = 0;
-+#endif /* HAVE_AVAHI */
- 
-   cupsArrayAdd(devices, device);
- 
-@@ -609,7 +852,13 @@ get_device(cups_array_t *devices,	/* I -
-   * Set the "full name" of this service, which is used for queries...
-   */
- 
-+#ifdef HAVE_DNSSD
-   DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain);
-+#else /* HAVE_AVAHI */
-+  avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+			   serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
-   device->fullName = strdup(fullName);
- 
-   return (device);
-@@ -620,6 +869,7 @@ get_device(cups_array_t *devices,	/* I -
-  * 'query_callback()' - Process query data.
-  */
- 
-+#ifdef HAVE_DNSSD
- static void
- query_callback(
-     DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -639,7 +889,7 @@ query_callback(
- 		*ptr;			/* Pointer into string */
-   cups_device_t	dkey,			/* Search key */
- 		*device;		/* Device */
--
-+  cups_txt_records_t txt;
- 
-   fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, "
-                   "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", "
-@@ -673,84 +923,212 @@ query_callback(
-   if ((ptr = strstr(name, "._")) != NULL)
-     *ptr = '\0';
- 
--  if (strstr(fullName, "_ipp._tcp.") ||
--      strstr(fullName, "_ipp-tls._tcp."))
--    dkey.type = CUPS_DEVICE_IPP;
--  else if (strstr(fullName, "_fax-ipp._tcp."))
--    dkey.type = CUPS_DEVICE_FAX_IPP;
--  else if (strstr(fullName, "_printer._tcp."))
--    dkey.type = CUPS_DEVICE_PRINTER;
--  else if (strstr(fullName, "_pdl-datastream._tcp."))
--    dkey.type = CUPS_DEVICE_PDL_DATASTREAM;
-+  dkey.type = device_type (fullName);
-+
-+  txt.data = rdata;
-+  txt.dataend = rdata + rdlen;
-+  device = find_device ((cups_array_t *) context, &txt, &dkey);
-+  if (!device)
-+    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+}
-+#endif /* HAVE_DNSSD */
-+
-+#ifdef HAVE_AVAHI
-+static void
-+avahi_client_callback(AvahiClient *client,
-+		      AvahiClientState state,
-+		      void *context)
-+{
-+ /*
-+  * If the connection drops, quit.
-+  */
-+
-+  if (state == AVAHI_CLIENT_FAILURE)
-+  {
-+    fprintf (stderr, "ERROR: Avahi connection failed\n");
-+    avahi_simple_poll_quit (simple_poll);
-+  }
-+}
-+
-+static void
-+avahi_query_callback(AvahiServiceResolver *resolver,
-+		     AvahiIfIndex interface,
-+		     AvahiProtocol protocol,
-+		     AvahiResolverEvent event,
-+		     const char *name,
-+		     const char *type,
-+		     const char *domain,
-+		     const char *host_name,
-+		     const AvahiAddress *address,
-+		     uint16_t port,
-+		     AvahiStringList *txt,
-+		     AvahiLookupResultFlags flags,
-+		     void *context)
-+{
-+  AvahiClient		*client;
-+  cups_device_t		key,
-+			*device;
-+  char			uqname[1024],
-+			*ptr;
-+  cups_txt_records_t	txtr;
-+
-+  client = avahi_service_resolver_get_client (resolver);
-+  if (event != AVAHI_RESOLVER_FOUND)
-+  {
-+    if (event == AVAHI_RESOLVER_FAILURE)
-+    {
-+      fprintf (stderr, "ERROR: %s\n",
-+	       avahi_strerror (avahi_client_errno (client)));
-+    }
-+
-+    avahi_service_resolver_free (resolver);
-+    return;
-+  }
-+
-+ /*
-+  * Set search key for device.
-+  */
-+
-+  key.name = uqname;
-+  unquote (uqname, name, sizeof (uqname));
-+  if ((ptr = strstr(name, "._")) != NULL)
-+    *ptr = '\0';
-+
-+  key.domain = (char *) domain;
-+  key.type = device_type (type);
-+
-+ /*
-+  * Find the device and the the TXT information.
-+  */
-+
-+  txtr.txt = txt;
-+  device = find_device ((cups_array_t *) context, &txtr, &key);
-+  if (device)
-+  {
-+   /*
-+    * Let the main loop know to announce the device.
-+    */
-+
-+    device->resolved = 1;
-+    avahi_got_callback = 1;
-+  }
-   else
--    dkey.type = CUPS_DEVICE_RIOUSBPRINT;
-+    fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name);
-+
-+  avahi_service_resolver_free (resolver);
-+}
-+
-+static void
-+avahi_browse_callback(AvahiServiceBrowser *browser,
-+		      AvahiIfIndex interface,
-+		      AvahiProtocol protocol,
-+		      AvahiBrowserEvent event,
-+		      const char *name,
-+		      const char *type,
-+		      const char *domain,
-+		      AvahiLookupResultFlags flags,
-+		      void *context)
-+{
-+  AvahiClient *client = avahi_service_browser_get_client (browser);
-+
-+  switch (event)
-+  {
-+  case AVAHI_BROWSER_FAILURE:
-+    fprintf (stderr, "ERROR: %s\n",
-+	     avahi_strerror (avahi_client_errno (client)));
-+    avahi_simple_poll_quit (simple_poll);
-+    return;
-+
-+  case AVAHI_BROWSER_NEW:
-+   /*
-+    * This object is new on the network.
-+    */
-+
-+    if (flags & AVAHI_LOOKUP_RESULT_LOCAL)
-+    {
-+     /*
-+      * This comes from the local machine so ignore it.
-+      */
-+
-+      fprintf (stderr, "DEBUG: ignoring local service %s\n", name);
-+    }
-+    else
-+    {
-+     /*
-+      * Create a device entry for it if it doesn't yet exist.
-+      */
-+
-+      get_device ((cups_array_t *)context, name, type, domain);
-+
-+     /*
-+      * Now look for a TXT entry.
-+      */
-+
-+      if (avahi_service_resolver_new (client, interface, protocol,
-+				      name, type, domain,
-+				      AVAHI_PROTO_UNSPEC, 0,
-+				      avahi_query_callback, context) == NULL)
-+      {
-+	fprintf (stderr, "ERROR: failed to resolve service %s: %s\n",
-+		 name, avahi_strerror (avahi_client_errno (client)));
-+      }
-+    }
-+
-+    break;
- 
--  for (device = cupsArrayFind(devices, &dkey);
-+  case AVAHI_BROWSER_REMOVE:
-+  case AVAHI_BROWSER_ALL_FOR_NOW:
-+  case AVAHI_BROWSER_CACHE_EXHAUSTED:
-+    break;
-+  }  
-+}
-+#endif /* HAVE_AVAHI */
-+
-+static cups_device_t *
-+find_device (cups_array_t *devices,
-+	     cups_txt_records_t *txt,
-+	     cups_device_t *dkey)
-+{
-+  cups_device_t	*device;
-+  char		*ptr;
-+
-+  for (device = cupsArrayFind(devices, dkey);
-        device;
-        device = cupsArrayNext(devices))
-   {
--    if (strcasecmp(device->name, dkey.name) ||
--        strcasecmp(device->domain, dkey.domain))
-+    if (strcasecmp(device->name, dkey->name) ||
-+        strcasecmp(device->domain, dkey->domain))
-     {
-       device = NULL;
-       break;
-     }
--    else if (device->type == dkey.type)
-+    else if (device->type == dkey->type)
-     {
-      /*
-       * Found it, pull out the priority and make and model from the TXT
-       * record and save it...
-       */
- 
--      const uint8_t	*data,		/* Pointer into data */
--			*datanext,	/* Next key/value pair */
--			*dataend;	/* End of entire TXT record */
--      uint8_t		datalen;	/* Length of current key/value pair */
--      char		key[256],	/* Key string */
--			value[256],	/* Value string */
--			make_and_model[512],
-+      char		make_and_model[512],
- 				      	/* Manufacturer and model */
- 			model[256],	/* Model */
--			device_id[2048];/* 1284 device ID */
--
-+			device_id[2048]; /* 1284 device ID */
- 
-       device_id[0]      = '\0';
-       make_and_model[0] = '\0';
- 
-       strcpy(model, "Unknown");
- 
--      for (data = rdata, dataend = data + rdlen;
--           data < dataend;
--           data = datanext)
-+      for (;;)
-       {
--       /*
--        * Read a key/value pair starting with an 8-bit length.  Since the
--	* length is 8 bits and the size of the key/value buffers is 256, we
--	* don't need to check for overflow...
--	*/
--
--        datalen = *data++;
--
--        if (!datalen || (data + datalen) >= dataend)
--	  break;
--
--        datanext = data + datalen;
-+	char *key;
-+	char *value;
- 
--        for (ptr = key; data < datanext && *data != '='; data ++)
--	  *ptr++ = *data;
--	*ptr = '\0';
--
--	if (data < datanext && *data == '=')
--	{
--	  data ++;
--
--	  if (data < datanext)
--	    memcpy(value, data, datanext - data);
--	  value[datanext - data] = '\0';
--	}
--	else
--	  continue;
-+	if (parse_txt_record_pair (txt))
-+	  goto next;
- 
-+	key = txt->key;
-+	value = txt->value;
-         if (!strncasecmp(key, "usb_", 4))
- 	{
- 	 /*
-@@ -805,6 +1183,10 @@ query_callback(
- 	  if (device->type == CUPS_DEVICE_PRINTER)
- 	    device->sent = 1;
- 	}
-+
-+      next:
-+	if (next_txt_record (txt) == NULL)
-+	  break;
-       }
- 
-       if (device->device_id)
-@@ -854,11 +1236,9 @@ query_callback(
-     }
-   }
- 
--  if (!device)
--    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+  return device;
- }
- 
--
- /*
-  * 'sigterm_handler()' - Handle termination signals...
-  */
-diff -up cups-1.4.0/config.h.in.avahi cups-1.4.0/config.h.in
---- cups-1.4.0/config.h.in.avahi	2009-06-10 16:51:21.000000000 +0100
-+++ cups-1.4.0/config.h.in	2009-09-04 14:57:04.733388405 +0100
-@@ -336,6 +336,13 @@
- 
- 
- /*
-+ * Do we have Avahi for DNS Service Discovery?
-+ */
-+
-+#undef HAVE_AVAHI
-+
-+
-+/*
-  * Do we have <sys/ioctl.h>?
-  */
- 
-diff -up cups-1.4.0/config-scripts/cups-dnssd.m4.avahi cups-1.4.0/config-scripts/cups-dnssd.m4
---- cups-1.4.0/config-scripts/cups-dnssd.m4.avahi	2009-02-10 17:05:35.000000000 +0000
-+++ cups-1.4.0/config-scripts/cups-dnssd.m4	2009-09-04 14:57:04.731388902 +0100
-@@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [  --with-dn
- DNSSDLIBS=""
- DNSSD_BACKEND=""
- 
-+AC_ARG_ENABLE(avahi, [  --enable-avahi          turn on DNS Service Discovery support, default=no],
-+	      [if test x$enable_avahi = xyes; then
-+		       AC_MSG_CHECKING(for Avahi)
-+		       if $PKGCONFIG --exists avahi-client; then
-+			       AC_MSG_RESULT(yes)
-+			       CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`"
-+			       DNSSDLIBS="`$PKGCONFIG --libs avahi-client`"
-+			       DNSSD_BACKEND="dnssd"
-+			       AC_DEFINE(HAVE_AVAHI)
-+			       enable_dnssd=no
-+		       else
-+			       AC_MSG_RESULT(no)
-+		       fi
-+	       fi])
-+
- if test x$enable_dnssd != xno; then
- 	AC_CHECK_HEADER(dns_sd.h, [
- 		case "$uname" in
-diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c
---- cups-1.4.0/cups/http-support.c.avahi	2009-06-12 01:21:58.000000000 +0100
-+++ cups-1.4.0/cups/http-support.c	2009-09-04 14:57:04.736398674 +0100
-@@ -55,6 +55,11 @@
- #  include <dns_sd.h>
- #  include <poll.h>
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/lookup.h>
-+#  include <avahi-common/simple-watch.h>
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -121,6 +126,24 @@ static void		resolve_callback(DNSService
- 					 void *context);
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+static void	avahi_resolve_uri_client_cb(AvahiClient *client,
-+					    AvahiClientState state,
-+					    void *simple_poll);
-+static void	avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver,
-+					      AvahiIfIndex interface,
-+					      AvahiProtocol protocol,
-+					      AvahiResolverEvent event,
-+					      const char *name,
-+					      const char *type,
-+					      const char *domain,
-+					      const char *host_name,
-+					      const AvahiAddress *address,
-+					      uint16_t port,
-+					      AvahiStringList *txt,
-+					      AvahiLookupResultFlags flags,
-+					      void *context);
-+#endif /* HAVE_AVAHI */
- 
- /*
-  * 'httpAssembleURI()' - Assemble a uniform resource identifier from its
-@@ -1349,15 +1372,26 @@ _httpResolveURI(
- 
-   if (strstr(hostname, "._tcp"))
-   {
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+    char		*regtype,	/* Pointer to type in hostname */
-+			*domain;	/* Pointer to domain in hostname */
- #ifdef HAVE_DNSSD
-     DNSServiceRef	ref,		/* DNS-SD master service reference */
- 			domainref,	/* DNS-SD service reference for domain */
- 			localref;	/* DNS-SD service reference for .local */
-     int			domainsent = 0;	/* Send the domain resolve? */
--    char		*regtype,	/* Pointer to type in hostname */
--			*domain;	/* Pointer to domain in hostname */
-     _http_uribuf_t	uribuf;		/* URI buffer */
-     struct pollfd	polldata;	/* Polling data */
-+#else /* HAVE_AVAHI */
-+    AvahiSimplePoll	*simple_poll;
-+    AvahiClient		*client;
-+    int			error;
-+    struct
-+    {
-+      AvahiSimplePoll	*poll;
-+      _http_uribuf_t	uribuf;
-+    } user_data;
-+#endif /* HAVE_DNSSD */
- 
- 
-     if (logit)
-@@ -1395,8 +1429,13 @@ _httpResolveURI(
-     if (domain)
-       *domain++ = '\0';
- 
-+#ifdef HAVE_DNSSD
-     uribuf.buffer  = resolved_uri;
-     uribuf.bufsize = resolved_size;
-+#else
-+    user_data.uribuf.buffer = resolved_uri;
-+    user_data.uribuf.bufsize = resolved_size;
-+#endif
- 
-     resolved_uri[0] = '\0';
- 
-@@ -1411,6 +1450,7 @@ _httpResolveURI(
- 
-     uri = NULL;
- 
-+#ifdef HAVE_DNSSD
-     if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError)
-     {
-       localref = ref;
-@@ -1486,6 +1526,36 @@ _httpResolveURI(
- 
-       DNSServiceRefDeallocate(ref);
-     }
-+#else /* HAVE_AVAHI */
-+    if ((simple_poll = avahi_simple_poll_new ()) != NULL)
-+    {
-+      if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+				      0, avahi_resolve_uri_client_cb,
-+				      &simple_poll, &error)) != NULL)
-+      {
-+	user_data.poll = simple_poll;
-+	if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC,
-+					AVAHI_PROTO_UNSPEC, hostname,
-+					regtype, domain, AVAHI_PROTO_UNSPEC, 0,
-+					avahi_resolve_uri_resolver_cb,
-+					&user_data) != NULL)
-+	{
-+	  avahi_simple_poll_loop (simple_poll);
-+
-+	 /*
-+	  * Collect the result.
-+	  */
-+
-+	  if (resolved_uri[0])
-+	    uri = resolved_uri;
-+	}
-+
-+	avahi_client_free (client);
-+      }
-+
-+      avahi_simple_poll_free (simple_poll);
-+    }
-+#endif /* HAVE_DNSSD */
- 
-     if (logit)
-     {
-@@ -1497,13 +1567,13 @@ _httpResolveURI(
-       fputs("STATE: -connecting-to-device\n", stderr);
-     }
- 
--#else
-+#else /* HAVE_DNSSD || HAVE_AVAHI */
-    /*
-     * No DNS-SD support...
-     */
- 
-     uri = NULL;
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-     if (logit && !uri)
-       _cupsLangPuts(stderr, _("Unable to find printer!\n"));
-@@ -1708,6 +1778,105 @@ resolve_callback(
- }
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+static void
-+avahi_resolve_uri_client_cb (AvahiClient *client,
-+			     AvahiClientState state,
-+			     void *simple_poll)
-+{
-+  DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, "
-+		"simple_poll=%p)\n", client, state, simple_poll));
-+
-+  /*
-+   * If the connection drops, quit.
-+   */
-+
-+  if (state == AVAHI_CLIENT_FAILURE)
-+    avahi_simple_poll_quit (simple_poll);
-+}
-+
-+static void
-+avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver,
-+			       AvahiIfIndex interface,
-+			       AvahiProtocol protocol,
-+			       AvahiResolverEvent event,
-+			       const char *name,
-+			       const char *type,
-+			       const char *domain,
-+			       const char *host_name,
-+			       const AvahiAddress *address,
-+			       uint16_t port,
-+			       AvahiStringList *txt,
-+			       AvahiLookupResultFlags flags,
-+			       void *context)
-+{
-+  const char		*scheme;	/* URI scheme */
-+  char			rp[256];	/* Remote printer */
-+  AvahiStringList	*pair;
-+  char			*value;
-+  size_t		valueLen = 0;
-+  char			addr[AVAHI_ADDRESS_STR_MAX];
-+  struct
-+  {
-+    AvahiSimplePoll	*poll;
-+    _http_uribuf_t	uribuf;
-+  }		*poll_uribuf = context;
-+
-+  DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, "
-+		"interface=%d, protocol=%d, event=%d, name=\"%s\", "
-+		"type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, "
-+		"port=%d, txt=%p, flags=%d, context=%p)\n",
-+		resolver, interface, protocol, event, name, type, domain,
-+		host_name, address, port, txt, flags, context));
-+
-+  if (event != AVAHI_RESOLVER_FOUND)
-+  {
-+    avahi_service_resolver_free (resolver);
-+    avahi_simple_poll_quit (poll_uribuf->poll);
-+    return;
-+  }
-+
-+ /*
-+  * Figure out the scheme from the full name...
-+  */
-+
-+  if (strstr(type, "_ipp."))
-+    scheme = "ipp";
-+  else if (strstr(type, "_printer."))
-+    scheme = "lpd";
-+  else if (strstr(type, "_pdl-datastream."))
-+    scheme = "socket";
-+  else
-+    scheme = "riousbprint";
-+
-+ /*
-+  * Extract the "remote printer key from the TXT record...
-+  */
-+
-+  if ((pair = avahi_string_list_find (txt, "rp")) != NULL)
-+  {
-+    avahi_string_list_get_pair (pair, NULL, &value, &valueLen);
-+    rp[0] = '/';
-+    memcpy (rp + 1, value, valueLen);
-+    rp[valueLen + 1] = '\0';
-+  }
-+  else
-+    rp[0] = '\0';
-+
-+ /*
-+  * Assemble the final device URI...
-+  */
-+
-+  avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address);
-+  httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer,
-+		  poll_uribuf->uribuf.bufsize, scheme, NULL,
-+		  addr, port, rp);
-+  DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n",
-+		poll_uribuf->uribuf.buffer));
-+  avahi_simple_poll_quit (poll_uribuf->poll);
-+}
-+#endif /* HAVE_AVAHI */
-+
- 
- /*
-  * End of "$Id: http-support.c 8705 2009-06-12 00:21:58Z mike $".
-
diff --git a/abs/extra-testing/cups/cups.install b/abs/extra-testing/cups/cups.install
deleted file mode 100644
index 97fda5a..0000000
--- a/abs/extra-testing/cups/cups.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/abs/extra-testing/cups/cups.logrotate b/abs/extra-testing/cups/cups.logrotate
deleted file mode 100644
index 9c49bbd..0000000
--- a/abs/extra-testing/cups/cups.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/cups/*log {
-   missingok
-   notifempty
-   delaycompress
-   postrotate
-      /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/abs/extra-testing/cups/cups.pam b/abs/extra-testing/cups/cups.pam
deleted file mode 100644
index 53724d1..0000000
--- a/abs/extra-testing/cups/cups.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
diff --git a/abs/extra-testing/cups/fix-infinite-usb-loop.patch b/abs/extra-testing/cups/fix-infinite-usb-loop.patch
deleted file mode 100644
index bad179e..0000000
--- a/abs/extra-testing/cups/fix-infinite-usb-loop.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -urNad cups-1.4.0~/backend/usb-libusb.c cups-1.4.0/backend/usb-libusb.c
---- cups-1.4.0~/backend/usb-libusb.c	2009-08-08 00:24:14.000000000 +0200
-+++ cups-1.4.0/backend/usb-libusb.c	2009-09-02 16:37:31.000000000 +0200
-@@ -158,7 +158,7 @@
- 
-     while (poll(pfds, 2, -1) > 0)
-     {
--      if (pfds[0].revents & POLLIN)
-+      if (pfds[0].revents & (POLLIN + POLLHUP))
-       {
- 	if ((bytes = read(print_fd, buffer, sizeof(buffer))) > 0)
- 	{
-@@ -179,7 +179,12 @@
-       }
- 
-       if (pfds[1].revents & POLLIN)
--        tbytes += side_cb(printer, print_fd);
-+      {
-+        if ((bytes = side_cb(printer, print_fd)) < 0)
-+	  pfds[1].events = 0;		/* Filter has gone away... */
-+	else
-+          tbytes += bytes;
-+      }
-     }
-   }
- 
-@@ -747,7 +752,7 @@
-   if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
-   {
-     _cupsLangPuts(stderr, _("WARNING: Failed to read side-channel request!\n"));
--    return (0);
-+    return (-1);
-   }
- 
-   switch (command) 
diff --git a/abs/extra-testing/cvs/PKGBUILD b/abs/extra-testing/cvs/PKGBUILD
deleted file mode 100644
index 26b95db..0000000
--- a/abs/extra-testing/cvs/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 75326 2010-04-01 10:25:20Z allan $
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=cvs
-pkgver=1.11.23
-pkgrel=5
-pkgdesc="Concurrent Versions System - a source control system"
-arch=(i686 x86_64)
-url="http://cvs.nongnu.org"
-license=('GPL')
-depends=('heimdal>=1.3.1')
-optdepends=('openssh: for using cvs over ssh' 'inetutils: for using cvs over rsh')
-install=cvs.install
-source=(ftp://ftp.gnu.org/non-gnu/cvs/source/stable/$pkgver/$pkgname-$pkgver.tar.bz2
-	cvs-1.11.23-getline64.patch)
-sha256sums=('400f51b59d85116e79b844f2d5dbbad4759442a789b401a94aa5052c3d7a4aa9'
-            '9126d7992ace943980ad8a10d5a09aeb6f1eeeb9b921fc796fe31de7b1c220cf')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  unset EDITOR VISUAL
-
-  patch -Np1 -i $srcdir/cvs-1.11.23-getline64.patch || return 1
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$pkgdir install
-  rm ${pkgdir}/usr/share/info/dir
-}
diff --git a/abs/extra-testing/cvs/cvs-1.11.23-getline64.patch b/abs/extra-testing/cvs/cvs-1.11.23-getline64.patch
deleted file mode 100644
index 99942e0..0000000
--- a/abs/extra-testing/cvs/cvs-1.11.23-getline64.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- cvs-1.11.23/lib/getline.c	2005-04-04 22:46:05.000000000 +0200
-+++ cvs-1.11.23/lib/getline.c.old	2008-06-03 19:06:25.000000000 +0200
-@@ -154,7 +154,7 @@
-   return ret;
- }
- 
--int
-+ssize_t
- getline (lineptr, n, stream)
-      char **lineptr;
-      size_t *n;
-@@ -163,7 +163,7 @@
-   return getstr (lineptr, n, stream, '\n', 0, GETLINE_NO_LIMIT);
- }
- 
--int
-+ssize_t
- getline_safe (lineptr, n, stream, limit)
-      char **lineptr;
-      size_t *n;
---- cvs-1.11.23/lib/getline.h	2005-04-04 22:46:05.000000000 +0200
-+++ cvs-1.11.23/lib/getline.h.old	2008-06-03 19:06:27.000000000 +0200
-@@ -11,9 +11,9 @@
- 
- #define GETLINE_NO_LIMIT -1
- 
--int
-+ssize_t
-   getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
--int
-+ssize_t
-   getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
-                          int limit));
- int
diff --git a/abs/extra-testing/cvs/cvs.install b/abs/extra-testing/cvs/cvs.install
deleted file mode 100644
index f1cdd1f..0000000
--- a/abs/extra-testing/cvs/cvs.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(cvs.info cvs-info-1 cvs-info-2 cvsclient.info)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/abs/extra-testing/ddclient/PKGBUILD b/abs/extra-testing/ddclient/PKGBUILD
deleted file mode 100644
index f283cb9..0000000
--- a/abs/extra-testing/ddclient/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD,v 1.13 2008/08/07 07:11:09 abhidg Exp $
-# Maintainer: Abhishek Dasgupta <abhidg@gmail.com>
-# Contributor: David Rosenstrauch <darose@darose.net>
-
-pkgname=ddclient
-pkgver=3.8.0
-pkgrel=1
-pkgdesc="Update dynamic DNS entries for accounts on many dynamic DNS services."
-arch=('i686' 'x86_64')
-url="http://ddclient.sourceforge.net/"
-license=('GPL2')
-depends=('perl' 'perl-io-socket-ssl')
-backup=('etc/ddclient.conf')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-        ddclient.conf.dynamic.dyndns.sample
-        ddclient-foreground.patch)
-
-build() {
-  cd ${srcdir}/$pkgname-${pkgver}
-  patch < ${srcdir}/ddclient-foreground.patch
-
-  # core files
-  install -D -m755 ddclient ${pkgdir}/usr/sbin/ddclient
-  install -D -m600 sample-etc_ddclient.conf ${pkgdir}/etc/ddclient/ddclient.conf.sample
-  install -D -m600 ${srcdir}/ddclient.conf.dynamic.dyndns.sample ${pkgdir}/etc/ddclient/
-  install -d ${pkgdir}/var/cache/ddclient
-
-  # additional instructions, sample configs
-  install -D -m644 README ${pkgdir}/etc/ddclient/README
-}
-md5sums=('6cac7a5eb1da781bfd4d98cef0b21f8e'
-         '4194825b9b4a7fcc1c57c2f5a4f6162b'
-         'd8ffc95f98f9afcb4a06a1e192220e35')
diff --git a/abs/extra-testing/ddclient/ddclient-foreground.patch b/abs/extra-testing/ddclient/ddclient-foreground.patch
deleted file mode 100644
index a814ede..0000000
--- a/abs/extra-testing/ddclient/ddclient-foreground.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- ../ddclient-orig/ddclient	2009-10-19 22:45:15.000000000 +1030
-+++ ddclient	2009-10-19 22:50:11.000000000 +1030
-@@ -307,6 +307,7 @@
- my %variables = (
-     'global-defaults'    => {
- 	'daemon'              => setv(T_DELAY, 0, 0, 1, 0,                    interval('60s')),
-+	'foreground'          => setv(T_BOOL,  0, 0, 1, 0,                    undef),
- 	'file'                => setv(T_FILE,  0, 0, 1, "$etc$program.conf",  undef),
- 	'cache'               => setv(T_FILE,  0, 0, 1, "$cachedir$program.cache", undef),
- 	'pid'                 => setv(T_FILE,  0, 0, 1, "",                   undef),
-@@ -535,6 +536,7 @@
-     "usage: ${program} [options]",
-     "options are:",
-     [ "daemon",      "=s", "-daemon delay         : run as a daemon, specify delay as an interval." ],
-+    [ "foreground",  "!",  "-foreground           : do not fork" ],
-     [ "proxy",       "=s", "-proxy host           : use 'host' as the HTTP proxy" ],
-     [ "server",      "=s", "-server host          : update DNS information on 'host'" ],
-     [ "protocol",    "=s", "-protocol type        : update protocol used" ],
-@@ -623,7 +625,10 @@
- $SIG{'HUP'}    = sub { $caught_hup  = 1; };
- $SIG{'TERM'}   = sub { $caught_term = 1; };
- $SIG{'KILL'}   = sub { $caught_kill = 1; };
--if (opt('daemon') && !opt('force')) {
-+# don't fork() if foreground or force is on
-+if (opt('foreground') || opt('force')) {
-+    ;
-+} elsif (opt('daemon')) {
-     $SIG{'CHLD'}   = 'IGNORE';
-     my $pid = fork;
-     if ($pid < 0) {
-@@ -633,12 +638,15 @@
- 	exit 0;
-     }
-     $SIG{'CHLD'}   = 'DEFAULT';
--    $opt{'syslog'} = 1;
-     open(STDOUT, ">/dev/null");
-     open(STDERR, ">/dev/null");
-     open(STDIN,  "</dev/null");
-+}
- 
-+# write out the pid file if we're daemon'ized
-+if(opt('daemon')) {
-     write_pid();
-+    $opt{'syslog'} = 1;
- }
- 
- umask 077;
diff --git a/abs/extra-testing/ddclient/ddclient.conf.dynamic.dyndns.sample b/abs/extra-testing/ddclient/ddclient.conf.dynamic.dyndns.sample
deleted file mode 100644
index a492c8b..0000000
--- a/abs/extra-testing/ddclient/ddclient.conf.dynamic.dyndns.sample
+++ /dev/null
@@ -1,162 +0,0 @@
-######################################################################
-## 
-## $Id: sample-etc_ddclient.conf 102 2008-11-01 11:23:03Z wimpunk $
-##
-## Define default global variables with lines like:
-## 	var=value [, var=value]*
-## These values will be used for each following host unless overridden
-## with a local variable definition.
-##
-## Define local variables for one or more hosts with:
-## 	var=value [, var=value]* host.and.domain[,host2.and.domain...]
-##
-## Lines can be continued on the following line by ending the line
-## with a \
-##
-##
-## Warning: not all supported routers or dynamic DNS services 
-##          are mentioned here.
-##
-######################################################################
-daemon=300				# check every 300 seconds
-syslog=yes				# log update msgs to syslog
-mail=root				# mail all msgs to root
-mail-failure=root			# mail failed update msgs to root
-pid=/var/run/ddclient.pid		# record PID in file.
-ssl=yes					# use ssl-support.  Works with
-					# ssl-library
-# postscript=script			# run script after updating.  The
-					# new IP is added as argument.
-#
-#use=watchguard-soho,        fw=192.168.111.1:80	# via Watchguard's SOHO FW
-#use=netopia-r910,           fw=192.168.111.1:80	# via Netopia R910 FW
-#use=smc-barricade,          fw=192.168.123.254:80	# via SMC's Barricade FW
-#use=netgear-rt3xx,          fw=192.168.0.1:80		# via Netgear's internet FW
-#use=linksys,                fw=192.168.1.1:80		# via Linksys's internet FW
-#use=maxgate-ugate3x00,      fw=192.168.0.1:80		# via MaxGate's UGATE-3x00  FW
-#use=elsa-lancom-dsl10,      fw=10.0.0.254:80		# via ELSA LanCom DSL/10 DSL Router
-#use=elsa-lancom-dsl10-ch01, fw=10.0.0.254:80		# via ELSA LanCom DSL/10 DSL Router
-#use=elsa-lancom-dsl10-ch02, fw=10.0.0.254:80		# via ELSA LanCom DSL/10 DSL Router
-#use=alcatel-stp,            fw=10.0.0.138:80           # via Alcatel Speed Touch Pro
-#use=xsense-aero,            fw=192.168.1.1:80          # via Xsense Aero Router
-#use=allnet-1298,            fw=192.168.1.1:80          # via AllNet 1298 DSL Router
-#use=3com-oc-remote812,	     fw=192.168.0.254:80	# via 3com OfficeConnect Remote 812
-#use=e-tech,                 fw=192.168.1.1:80          # via E-tech Router
-#use=cayman-3220h,           fw=192.168.0.1:1080        # via Cayman 3220-H DSL Router
-#
-#fw-login=admin,             fw-password=XXXXXX		# FW login and password
-#
-## To obtain an IP address from FW status page (using fw-login, fw-password)
-#use=fw, fw=192.168.1.254/status.htm, fw-skip='IP Address' # found after IP Address
-#
-## To obtain an IP address from Web status page (using the proxy if defined)
-#use=web, web=checkip.dyndns.org/, web-skip='IP Address' # found after IP Address
-#
-#use=ip,                     ip=127.0.0.1	# via static IP's
-#use=if,                     if=eth0		# via interfaces
-use=web					# via web
-#
-#protocol=dyndns2				# default protocol
-#proxy=fasthttp.sympatico.ca:80			# default proxy
-#server=members.dyndns.org			# default server
-#server=members.dyndns.org:8245			# default server (bypassing proxies)
-
-login=your-dynamic-dyndns-login			# default login
-password=your-dynamic-dyndns-password		# default password
-#mx=mx.for.your.host				# default MX
-#backupmx=yes|no				# host is primary MX?
-#wildcard=yes|no				# add wildcard CNAME?
-
-##
-## dyndns.org dynamic addresses
-##
-## (supports variables: wildcard,mx,backupmx)
-##
-server=members.dyndns.org,		\
-protocol=dyndns2			\
-your-dynamic-dyndns-host
-
-##
-## dyndns.org static addresses
-##
-## (supports variables: wildcard,mx,backupmx)
-##
-# static=yes,				\
-# server=members.dyndns.org,		\
-# protocol=dyndns2			\
-# your-static-host.dyndns.org
-
-##
-##
-## dyndns.org custom addresses
-##
-## (supports variables: wildcard,mx,backupmx)
-##
-# custom=yes,				\
-# server=members.dyndns.org,		\
-# protocol=dyndns2			\
-# your-domain.top-level,your-other-domain.top-level
-
-##
-## ZoneEdit (zoneedit.com)
-##
-# server=dynamic.zoneedit.com, 		\
-# protocol=zoneedit1,			\
-# login=your-zoneedit-login,  		\
-# password=your-zoneedit-password	\
-# your.any.domain,your-2nd.any.dom
-
-##
-## EasyDNS (easydns.com)
-##
-# server=members.easydns.com, 		\
-# protocol=easydns,			\
-# login=your-easydns-login,  		\
-# password=your-easydns-password	\
-# your.any.domain,your-2nd.any.domain
-
-##
-## Hammernode (hn.org) dynamic addresses
-##
-# server=dup.hn.org,             	\
-# protocol=hammernode1,         	\
-# login=your-hn-login,           	\
-# password=your-hn-password      	\
-# your-hn-host.hn.org,your-2nd-hn-host.hn.org
-
-##
-## dslreports.com dynamic-host monitoring
-##
-# server=members.dslreports.com		\
-# protocol=dslreports1,			\
-# login=dslreports-login,		\
-# password=dslreports-password		\
-# dslreports-unique-id
-
-##
-## OrgDNS.org account-configuration
-##
-# use=web, web=members.orgdns.org/nic/ip
-# server=www.orgdns.org 		\
-# protocol=dyndns2 			\
-# login=yourLoginName 			\
-# password=yourPassword 		\
-# yourSubdomain.orgdns.org
-
-##
-## dnspark.com
-## (supports variables: mx, mxpri)
-##
-# use=web, web=ipdetect.dnspark.com, web-skip='Current Address:'
-# protocol=dnspark,			\
-# server=www.dnspark.com,		\
-# your-host.dnspark.com
-
-##
-## NameCheap (namecheap.com)
-##
-# protocol=namecheap,				\
-# server=dynamicdns.park-your-domain.com,	\
-# login=my-namecheap.com-login,			\
-# password=my-namecheap.com-password		\
-# myhost.namecheap.com 
diff --git a/abs/extra-testing/deb2targz/PKGBUILD b/abs/extra-testing/deb2targz/PKGBUILD
deleted file mode 100644
index adf074d..0000000
--- a/abs/extra-testing/deb2targz/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Douglas Soares de Andrade <dsandrade@gmail.org>
-# Contributor: Jason Erik Jackson <jacksonje@gmail.org>
-
-pkgname=deb2targz
-pkgver=1
-pkgrel=2
-pkgdesc="Converts .deb archives to tar.gz"
-arch=('i686' 'x86_64')
-url="http://www.miketaylor.org.uk/tech/deb/"
-depends=("perl")
-source=("http://www.miketaylor.org.uk/tech/deb/$pkgname")
-
-md5sums=('5b944785778d023a43e33af53bea2056')
-
-build() {
-	mkdir -p $startdir/pkg/usr/bin
-	install -m755 $startdir/src/$pkgname $startdir/pkg/usr/bin
-}
-
-
diff --git a/abs/extra-testing/diffstat/PKGBUILD b/abs/extra-testing/diffstat/PKGBUILD
deleted file mode 100644
index 2c049ce..0000000
--- a/abs/extra-testing/diffstat/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 13739 2008-09-28 10:43:08Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Matthias-Christian Ott <matthias.christian.at.tiscali.de>
-
-pkgname=diffstat
-pkgver=1.46
-pkgrel=1
-pkgdesc="diffstat produces graph of changes introduced by a diff file"
-arch=('i686' 'x86_64')
-url="http://invisible-island.net/diffstat"
-depends=('glibc')
-license=('GPL')
-source=(ftp://invisible-island.net/diffstat/diffstat-$pkgver.tgz)
-md5sums=('626acb8cdd9e5cdb3a502bc12b828067')
-
-build () {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
diff --git a/abs/extra-testing/dnsmasq/PKGBUILD b/abs/extra-testing/dnsmasq/PKGBUILD
deleted file mode 100644
index f888ccd..0000000
--- a/abs/extra-testing/dnsmasq/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 66607 2010-02-01 01:42:17Z giovanni $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=dnsmasq
-pkgver=2.55
-pkgrel=1
-pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
-url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('glibc' 'bash')
-makedepends=('libcap>=2.16')
-backup=('etc/dnsmasq.conf')
-install=
-source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" 
-        'rc.dnsmasq')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # Build
-  make || return 1
-
-  # Install
-  install -d $pkgdir/etc/rc.d || return 1
-  make PREFIX=/usr DESTDIR=$pkgdir install || return 1
-
-  install -D -m755 \
-    $srcdir/rc.dnsmasq $pkgdir/etc/rc.d/dnsmasq || return 1
-  install -D -m644 \
-    dnsmasq.conf.example $pkgdir/etc/dnsmasq.conf || return 1
-
-  # Make the Required Directories for DHCP Server Default Directories
-  install -d $pkgdir/var/db || return 1
-  install -d $pkgdir/var/lib/misc || return 1
-}
-
-# vim: ts=2 sw=2 et ft=sh
-md5sums=('b093d7c6bc7f97ae6fd35d048529232a'
-         'e956eee1ec24212a3254d2b168187495')
diff --git a/abs/extra-testing/dnsmasq/rc.dnsmasq b/abs/extra-testing/dnsmasq/rc.dnsmasq
deleted file mode 100755
index 1676072..0000000
--- a/abs/extra-testing/dnsmasq/rc.dnsmasq
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/dnsmasq`
-case "$1" in
-  start)
-    stat_busy "Starting DNS/DHCP daemon"
-    [ -z "$PID" ] && /usr/sbin/dnsmasq
-    if [ $? -gt 0 ] ; then
-      stat_fail
-    else
-      add_daemon dnsmasq                     # create the 'state' dir
-      stat_done 
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DNS/DHCP daemon"
-    [ "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon dnsmasq                      # remove the 'state' dir
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 5
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/extra-testing/docbook-xml/PKGBUILD b/abs/extra-testing/docbook-xml/PKGBUILD
deleted file mode 100644
index feac080..0000000
--- a/abs/extra-testing/docbook-xml/PKGBUILD
+++ /dev/null
@@ -1,268 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=docbook-xml
-pkgver=4.5
-pkgrel=1
-pkgdesc="A widely used XML scheme for writing documentation and help"
-arch=(i686 x86_64)
-url="http://scrollkeeper.sourceforge.net/docbook.shtml"
-depends=('libxml2')
-makedepends=('unzip')
-install=docbook-xml.install
-source=(http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip
-        http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip
-	http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip
-	http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip
-	http://www.docbook.org/xml/4.1.2/docbkx412.zip)
-noextract=('docbook-xml-4.5.zip' 'docbook-xml-4.4.zip' 'docbook-xml-4.3.zip' 'docbook-xml-4.2.zip' 'docbkx412.zip')
-md5sums=('03083e288e87a7e829e437358da7ef9e'
-         'cbb04e9a700955d88c50962ef22c1634'
-         'ab200202b9e136a144db1e0864c45074'
-         '73fe50dfe74ca631c1602f558ed8961f'
-         '900d7609fb7e6d78901b357e4acfbc17')
-
-build() {
-  for ver in 4.2 4.3 4.4 4.5; do
-    mkdir docbook-xml-${ver}
-    pushd docbook-xml-${ver}
-    unzip ${startdir}/src/docbook-xml-${ver}.zip
-    mkdir -p ${startdir}/pkg/usr/share/xml/docbook/xml-dtd-${ver}
-    cp -af docbook.cat *.dtd ent/ *.mod \
-              ${startdir}/pkg/usr/share/xml/docbook/xml-dtd-${ver}/
-    popd
-  done
-  mkdir docbook-xml-4.1.2
-  pushd docbook-xml-4.1.2
-  unzip ${startdir}/src/docbkx412.zip
-  mkdir -p ${startdir}/pkg/usr/share/xml/docbook/xml-dtd-4.1.2
-  cp -af docbook.cat *.dtd ent/ *.mod \
-            ${startdir}/pkg/usr/share/xml/docbook/xml-dtd-4.1.2/
-  popd
-
-  mkdir -p ${startdir}/pkg/etc/xml
-  xmlcatalog --noout --create ${startdir}/pkg/etc/xml/docbook-xml
-
-  # V4.1.2
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.1.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2/calstblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2/calstblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2/soextblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2/dbpoolx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2/dbhierx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2/dbgenent.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2/dbnotnx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2/dbcentx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.1.2" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.1.2" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-
-  # V4.2
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook CALS Table Model V4.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.2/calstblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.2/soextblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.2/dbpoolx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.2/dbhierx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.2/dbgenent.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook Notations V4.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.2/dbnotnx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.2/dbcentx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.2" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.2" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.2" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.2" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-
-  # V4.3
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.3//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook CALS Table Model V4.3//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.3/calstblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.3/soextblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.3/dbpoolx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.3//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.3/dbhierx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook Additional General Entities V4.3//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.3/dbgenent.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook Notations V4.3//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.3/dbnotnx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook Character Entities V4.3//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.3/dbcentx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.3" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.3" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.3" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.3" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-
-  # V4.4
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.4//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook CALS Table Model V4.4//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.4/calstblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.4/htmltblx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.4/soextblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.4/dbpoolx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.4/dbhierx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.4/dbgenent.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook Notations V4.4//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.4/dbnotnx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook Character Entities V4.4//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.4/dbcentx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.4" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.4" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.4" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.4" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-
-  # V4.5
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.5//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.5" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-  xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.5" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5" \
-    ${startdir}/pkg/etc/xml/docbook-xml
-}
diff --git a/abs/extra-testing/docbook-xml/docbook-xml.install b/abs/extra-testing/docbook-xml/docbook-xml.install
deleted file mode 100644
index c62f65f..0000000
--- a/abs/extra-testing/docbook-xml/docbook-xml.install
+++ /dev/null
@@ -1,46 +0,0 @@
-post_install() {
-  if [ -e etc/xml/catalog.preserve ]; then
-    mv etc/xml/catalog.preserve etc/xml/catalog
-  elif [ ! -e etc/xml/catalog ]; then
-    xmlcatalog --noout --create etc/xml/catalog
-  fi
-  xmlcatalog --noout --add "delegatePublic" \
-    "-//OASIS//ENTITIES DocBook XML" \
-    "file:///etc/xml/docbook-xml" \
-    etc/xml/catalog
-  xmlcatalog --noout --add "delegatePublic" \
-    "-//OASIS//DTD DocBook XML" \
-    "file:///etc/xml/docbook-xml" \
-    etc/xml/catalog
-  xmlcatalog --noout --add "delegateSystem" \
-    "http://www.oasis-open.org/docbook/" \
-    "file:///etc/xml/docbook-xml" \
-    etc/xml/catalog
-  xmlcatalog --noout --add "delegateURI" \
-    "http://www.oasis-open.org/docbook/" \
-    "file:///etc/xml/docbook-xml" \
-    etc/xml/catalog
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  if [ $(vercmp $2 4.5) -lt 0 ]; then
-    xmlcatalog --del "file:///etc/xml/docbook" etc/xml/catalog > etc/xml/catalog.preserve
-  fi
-}
-
-post_upgrade() {
-  if [ $(vercmp $2 4.5) -ge 0 ]; then
-    post_remove
-  fi
-  post_install
-}
-
-post_remove() {
-  xmlcatalog --noout --del file:///etc/xml/docbook-xml etc/xml/catalog
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/docbook-xml/docbook.patch b/abs/extra-testing/docbook-xml/docbook.patch
deleted file mode 100644
index 1932f19..0000000
--- a/abs/extra-testing/docbook-xml/docbook.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-diff -Naur docbookx412-orig/Makefile docbookx412/Makefile
---- docbookx412-orig/Makefile	2002-02-16 11:08:29.000000000 -0800
-+++ docbookx412/Makefile	2002-08-24 12:03:31.000000000 -0700
-@@ -1,7 +1,7 @@
- SHELL=/bin/sh
- VERSION=4.1.2-9
--DESTDIR=/usr/share/xml/docbook/xml-dtd-$(VERSION)
--CATALOG=/usr/share/xml/docbook/catalog
-+DESTDIR=$(ROOT)/usr/share/xml/docbook/xml-dtd-$(VERSION)
-+CATALOG=$(ROOT)/usr/share/xml/docbook/catalog
- OPENJADEVER=1.3
- 
- all:
-@@ -24,7 +24,7 @@
- 	#
-         #
- 	# DocBook XML V4.1.2
--	@./buildDocBookCatalog
-+	@./buildDocBookCatalog $(ROOT)
- 
- uninstall:
- 	#
-diff -Naur docbookx412-orig/buildDocBookCatalog docbookx412/buildDocBookCatalog
---- docbookx412-orig/buildDocBookCatalog	2002-02-17 09:32:45.000000000 -0800
-+++ docbookx412/buildDocBookCatalog	2002-08-24 12:15:23.000000000 -0700
-@@ -28,16 +28,20 @@
- # Modifications made to Daniel Veillard's catalog build script at 
- # http://xmlsoft.org/buildDocBookCatalog.
- 
--if [ ! -d /etc/xml -a -w /etc ]
-+DESTDIR=$1
-+echo "DESTDIR is $DESTDIR"
-+mkdir $DESTDIR/etc
-+
-+if [ ! -d $DESTDIR/etc/xml -a -w $DESTDIR/etc ]
- then
-     echo Directory /etc/xml missing creating it
--    mkdir /etc/xml
--    chmod 755 /etc/xml
-+    mkdir $DESTDIR/etc/xml
-+    chmod 755 $DESTDIR/etc/xml
- fi
--if [ -w /etc/xml ]
-+if [ -w $DESTDIR/etc/xml ]
- then
--    ROOTCATALOG=/etc/xml/catalog
--    CATALOG=/etc/xml/docbook
-+    ROOTCATALOG=$DESTDIR/etc/xml/catalog
-+    CATALOG=$DESTDIR/etc/xml/docbook
- else
-     echo Unable to update root catalog /etc/xml/catalog
-     echo Using $HOME/xmlcatalog as the root catalog
-@@ -69,16 +73,7 @@
- #
- # find the prefix for DocBook DTD
- #
--found=`find /usr/share/xml -name docbookx.dtd`
--if [ "$found" = "" ] ; then
--    found=`find $HOME -name docbookx.dtd`
--fi
--if [ "$found" = "" ] ; then
--    found=`find /usr/local -name docbookx.dtd`
--fi
--if [ "$found" = "" ] ; then
--    found=`find /usr/share/sgml -name docbookx.dtd`
--fi
-+found=`find $DESTDIR/usr/share/xml -name docbookx.dtd`
- if [ "$found" = "" ] ; then
-     echo could not locate docbookx.dtd for DocBook XML
-     exit 1
-@@ -105,49 +100,52 @@
- #    exit 2
- #fi
- 
-+fakedocbookdir=`echo $docbookdir | sed "s|^$DESTDIR||"`
-+FAKECATALOG=`echo $CATALOG | sed "s|^$DESTDIR||"`
-+
- xmlcatalog --noout --add "public" \
-     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \
--    "file://$docbookdir/dbpoolx.mod" $CATALOG
-+    "file://$fakedocbookdir/dbpoolx.mod" $CATALOG
- xmlcatalog --noout --add "public" \
-     "-//OASIS//DTD DocBook XML V4.1.2//EN" \
--    "file://$docbookdir/docbookx.dtd" $CATALOG
-+    "file://$fakedocbookdir/docbookx.dtd" $CATALOG
- xmlcatalog --noout --add "public" \
-     "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \
--    "file://$docbookdir/dbcentx.mod" $CATALOG
-+    "file://$fakedocbookdir/dbcentx.mod" $CATALOG
- xmlcatalog --noout --add "public" \
-     "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \
--    "file://$docbookdir/dbnotnx.mod" $CATALOG
-+    "file://$fakedocbookdir/dbnotnx.mod" $CATALOG
- xmlcatalog --noout --add "public" \
-     "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \
--    "file://$docbookdir/dbgenent.mod" $CATALOG
-+    "file://$fakedocbookdir/dbgenent.mod" $CATALOG
- xmlcatalog --noout --add "public" \
-     "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \
--    "file://$docbookdir/dbhierx.mod" $CATALOG
-+    "file://$fakedocbookdir/dbhierx.mod" $CATALOG
- xmlcatalog --noout --add "public" \
-     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
--    "file://$docbookdir/soextblx.dtd" $CATALOG
-+    "file://$fakedocbookdir/soextblx.dtd" $CATALOG
- xmlcatalog --noout --add "public" \
-     "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
--    "file://$docbookdir/calstblx.dtd" $CATALOG
-+    "file://$fakedocbookdir/calstblx.dtd" $CATALOG
- xmlcatalog --noout --add "rewriteSystem" \
-     "http://www.oasis-open.org/docbook/xml/4.1.2" \
--    "file://$docbookdir" $CATALOG
-+    "file://$fakedocbookdir" $CATALOG
- xmlcatalog --noout --add "rewriteURI" \
-     "http://www.oasis-open.org/docbook/xml/4.1.2" \
--    "file://$docbookdir" $CATALOG
-+    "file://$fakedocbookdir" $CATALOG
- 
- xmlcatalog --noout --add "delegatePublic" \
-     "-//OASIS//ENTITIES DocBook XML" \
--    "file://$CATALOG" $ROOTCATALOG
-+    "file://$FAKECATALOG" $ROOTCATALOG
- xmlcatalog --noout --add "delegatePublic" \
-     "-//OASIS//DTD DocBook XML" \
--    "file://$CATALOG" $ROOTCATALOG
-+    "file://$FAKECATALOG" $ROOTCATALOG
- xmlcatalog --noout --add "delegateSystem" \
-     "http://www.oasis-open.org/docbook/" \
--    "file://$CATALOG" $ROOTCATALOG
-+    "file://$FAKECATALOG" $ROOTCATALOG
- xmlcatalog --noout --add "delegateURI" \
-     "http://www.oasis-open.org/docbook/" \
--    "file://$CATALOG" $ROOTCATALOG
-+    "file://$FAKECATALOG" $ROOTCATALOG
- 
- #
- # find the prefix for ISO DocBook entities
-@@ -187,66 +185,68 @@
- isodir=`dirname $entxml`
- echo Found ISO DocBook entities in $isodir
- 
-+fakeisodir=`echo $isodir | sed "s|^$DESTDIR||"`
-+
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Publishing//EN" \
--    "file://$isodir/iso-pub.ent" $CATALOG
-+    "file://$fakeisodir/iso-pub.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Greek Letters//EN" \
--    "file://$isodir/iso-grk1.ent" $CATALOG
-+    "file://$fakeisodir/iso-grk1.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \
--    "file://$isodir/iso-box.ent" $CATALOG
-+    "file://$fakeisodir/iso-box.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Greek Symbols//EN" \
--    "file://$isodir/iso-grk3.ent" $CATALOG
-+    "file://$fakeisodir/iso-grk3.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
--    "file://$isodir/iso-amsn.ent" $CATALOG
-+    "file://$fakeisodir/iso-amsn.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
--    "file://$isodir/iso-num.ent" $CATALOG
-+    "file://$fakeisodir/iso-num.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
--    "file://$isodir/iso-grk4.ent" $CATALOG
-+    "file://$fakeisodir/iso-grk4.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
--    "file://$isodir/iso-dia.ent" $CATALOG
-+    "file://$fakeisodir/iso-dia.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
--    "file://$isodir/iso-grk2.ent" $CATALOG
-+    "file://$fakeisodir/iso-grk2.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
--    "file://$isodir/iso-amsa.ent" $CATALOG
-+    "file://$fakeisodir/iso-amsa.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
--    "file://$isodir/iso-amso.ent" $CATALOG
-+    "file://$fakeisodir/iso-amso.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
--    "file://$isodir/iso-cyr1.ent" $CATALOG
-+    "file://$fakeisodir/iso-cyr1.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES General Technical//EN" \
--    "file://$isodir/iso-tech.ent" $CATALOG
-+    "file://$fakeisodir/iso-tech.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
--    "file://$isodir/iso-amsc.ent" $CATALOG
-+    "file://$fakeisodir/iso-amsc.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Added Latin 1//EN" \
--    "file://$isodir/iso-lat1.ent" $CATALOG
-+    "file://$fakeisodir/iso-lat1.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
--    "file://$isodir/iso-amsb.ent" $CATALOG
-+    "file://$fakeisodir/iso-amsb.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Added Latin 2//EN" \
--    "file://$isodir/iso-lat2.ent" $CATALOG
-+    "file://$fakeisodir/iso-lat2.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
--    "file://$isodir/iso-amsr.ent" $CATALOG
-+    "file://$fakeisodir/iso-amsr.ent" $CATALOG
- xmlcatalog --noout --add "public" \
-     "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
--    "file://$isodir/iso-cyr2.ent" $CATALOG
-+    "file://$fakeisodir/iso-cyr2.ent" $CATALOG
- 
- xmlcatalog --noout --add "delegatePublic" \
-     "ISO 8879:1986" \
--    "file://$CATALOG" $ROOTCATALOG
-+    "file://$FAKECATALOG" $ROOTCATALOG
- #
- #
diff --git a/abs/extra-testing/docbook-xsl/PKGBUILD b/abs/extra-testing/docbook-xsl/PKGBUILD
deleted file mode 100644
index cedcfa8..0000000
--- a/abs/extra-testing/docbook-xsl/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 20950 2008-12-08 05:32:07Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributer: Sean Middleditch <elanthis@awesomeplay.com>
-
-pkgname=docbook-xsl
-pkgver=1.74.0
-pkgrel=1
-pkgdesc="XML stylesheets for Docbook-xml transformations."
-arch=(i686 x86_64)
-license=('custom')
-url="http://scrollkeeper.sourceforge.net/docbook.shtml"
-depends=('libxml2' 'libxslt' 'docbook-xml')
-source=(http://downloads.sourceforge.net/sourceforge/docbook/docbook-xsl-${pkgver}.tar.bz2)
-install=docbook-xsl.install
-md5sums=('a56b598decd006d5d39e4544c0bfbc6a')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  mkdir -p ${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/common
-  install -m644 common/*.{xml,xsl,dtd,ent} ${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/common/
-
-  mkdir -p ${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/params
-  install -m644 params/*.xml ${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/params/
-
-  for fn in fo highlighting html roundtrip; do
-    mkdir -p ${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/${fn}
-    install -m644 ${fn}/*.{xml,xsl} ${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/${fn}/
-  done
-  for fn in eclipse htmlhelp javahelp lib manpages profiling template website xhtml; do
-    mkdir -p ${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/${fn}
-    install -m644 ${fn}/*.xsl ${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/${fn}/
-  done
-  mkdir -p ${pkgdir}/etc/xml
-  install -m644 VERSION ${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/
-
-  install -m644 -D COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-}
diff --git a/abs/extra-testing/docbook-xsl/docbook-xsl.install b/abs/extra-testing/docbook-xsl/docbook-xsl.install
deleted file mode 100644
index a8ea3e7..0000000
--- a/abs/extra-testing/docbook-xsl/docbook-xsl.install
+++ /dev/null
@@ -1,47 +0,0 @@
-post_install() {
-  if [ ! -f /etc/xml/catalog ]; then
-    xmlcatalog --noout --create /etc/xml/catalog
-  fi
-  _NEW=`echo $1 | sed 's|\(.*\)\-.*|\1|'`
-
-  xmlcatalog --noout --add "rewriteSystem" \
-    "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
-    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
-    etc/xml/catalog
-
-  xmlcatalog --noout --add "rewriteURI" \
-    "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
-    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
-    etc/xml/catalog &&
-
-  xmlcatalog --noout --add "rewriteSystem" \
-    "http://docbook.sourceforge.net/release/xsl/current" \
-    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
-    etc/xml/catalog &&
-
-  xmlcatalog --noout --add "rewriteURI" \
-    "http://docbook.sourceforge.net/release/xsl/current" \
-    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
-    etc/xml/catalog
-}
-
-post_upgrade() {
-  post_remove $2
-  post_install $1
-}
-
-post_remove() {
-  _OLD=`echo $1 | sed 's|\(.*\)\-.*|\1|'`
-  xmlcatalog --noout --del "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" etc/xml/catalog
-
-  if [ $(vercmp $1 1.72.0-3) -lt 0 ]; then
-    xmlcatalog --noout --del "/usr/share/xml/docbook" etc/xml/catalog
-    xmlcatalog --noout --del "file:///etc/xml/docbook" etc/xml/catalog
-  fi
-}
-
-op=$1
-shift
-
-$op $*
-
diff --git a/abs/extra-testing/doxygen/PKGBUILD b/abs/extra-testing/doxygen/PKGBUILD
deleted file mode 100644
index 272c267..0000000
--- a/abs/extra-testing/doxygen/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 84267 2010-06-28 05:13:23Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-pkgname=doxygen
-pkgver=1.7.1
-pkgrel=1
-pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
-license=('GPL')
-arch=(i686 x86_64)
-url="http://www.doxygen.org/"
-depends=('gcc-libs')
-# qt required to build and run doxywizard, but don't want to drag it in
-makedepends=('flex' 'qt')
-optdepends=('graphviz: for caller/callee graph generation'
-            'qt: for doxywizard')
-source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  QTDIR=/usr ./configure --prefix /usr --with-doxywizard
-  make || return 1
-  make INSTALL=${startdir}/pkg/usr MAN1DIR=share/man/man1 install
-}
-
-md5sums=('13e76e10fb55581a16ee04de35c264f0')
-
diff --git a/abs/extra-testing/doxygen/PKGBUILD.orig b/abs/extra-testing/doxygen/PKGBUILD.orig
deleted file mode 100644
index f4b09d2..0000000
--- a/abs/extra-testing/doxygen/PKGBUILD.orig
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 14308 2008-10-05 15:59:28Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-pkgname=doxygen
-pkgver=1.7.1
-pkgrel=1
-pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
-license=('GPL')
-arch=(i686 x86_64)
-url="http://www.doxygen.org/"
-depends=('gcc-libs')
-# qt required to build and run doxywizard, but don't want to drag it in
-makedepends=('flex' 'qt3')
-optdepends=('graphviz: for caller/callee graph generation'
-            'qt3: for doxywizard')
-source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
-
-build() {
-  . /etc/profile.d/qt3.sh
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix /usr --with-doxywizard
-  make || return 1
-  make INSTALL=${startdir}/pkg/usr MAN1DIR=share/man/man1 install
-}
-md5sums=('13e76e10fb55581a16ee04de35c264f0')
diff --git a/abs/extra-testing/dpgconv/PKGBUILD b/abs/extra-testing/dpgconv/PKGBUILD
deleted file mode 100644
index 82fe117..0000000
--- a/abs/extra-testing/dpgconv/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
-pkgname=dpgconv
-pkgver=9
-pkgrel=1
-pkgdesc="This is a converter to produce DPG movies for Moonshell software for Nintendo DS."
-arch=('i686' 'x86_64')
-url="http://theli.is-a-geek.org/blog/static/dpgconv"
-license=('GPL2')
-depends=('mpeg_stat' 'mplayer')
-source=(http://theli.is-a-geek.org/files/dpgconv/dpgconv-$pkgver.py.bz2
-	dpgconv-panscan.patch)
-
-build() {
-
-cd $startdir/src
-patch < dpgconv-panscan.patch
-install -m755 -D $startdir/src/dpgconv-$pkgver.py $startdir/pkg/usr/bin/dpgconv-$pkgver.py
-cd $startdir/pkg/usr/bin
-ln -s dpgconv-$pkgver.py dpgconv.py
-}
-md5sums=('fa61ceb4ebb241e98fc005aed86406e5')
-
diff --git a/abs/extra-testing/dpgconv/dpgconv-panscan.patch b/abs/extra-testing/dpgconv/dpgconv-panscan.patch
deleted file mode 100644
index 471d518..0000000
--- a/abs/extra-testing/dpgconv/dpgconv-panscan.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- dpgconv-9.py.old	2009-10-28 19:33:46.000000000 +1030
-+++ dpgconv-9.py	2009-10-28 19:28:01.000000000 +1030
-@@ -49,9 +49,12 @@
- 	--width xxx
- 		destination video width (default: 256)
- 	--keep-aspect
--		try to keep aspect ratio
-+		try to keep aspect ratio by letterboxing
-+        --keep-aspect-panscan
-+		try to keep aspect ratio by cropping original
- 	
- 	NOTE:	width/height have no effect when --keep-aspect is set
-+		--keep-aspect-panscan overrides --keep-aspect
- 	
- 	--mv
- 		additional parameters for mencoder for video
-@@ -150,8 +153,38 @@
- 		v_pf = "format=rgb24,"
- 		options.pf = 3
- 
--	if options.aspect:
--		aspect = commands.getoutput( MPLAYER + " -frames 1 -vo null -ao null -identify \"" + file + "\" | grep -E \"^ID_VIDEO_ASPECT\"")
-+	crop=""
-+	if options.panscan:
-+		options.width=256
-+		options.height=192
-+
-+		aspect = commands.getoutput( MPLAYER + " -frames 1 -vo null -ao null -identify \"" + file + "\" | grep -E \"^ID_VIDEO_ASPECT\" | tail -1")
-+		p1 = re.compile ("ID_VIDEO_ASPECT=(.*)")
-+		m1 = p1.search( aspect )
-+		width = commands.getoutput( MPLAYER + " -frames 1 -vo null -ao null -identify \"" + file + "\" | grep -E \"^ID_VIDEO_WIDTH\" | tail -1")
-+		p2 = re.compile ("ID_VIDEO_WIDTH=(.*)")
-+		m2 = p2.search( width )
-+		height = commands.getoutput( MPLAYER + " -frames 1 -vo null -ao null -identify \"" + file + "\" | grep -E \"^ID_VIDEO_HEIGHT\" | tail -1")
-+		p3 = re.compile ("ID_VIDEO_HEIGHT=(.*)")
-+		m3 = p3.search( height )
-+		if m1 and m2 and m3:
-+			print "Input Aspect %s" % m1.group(1)
-+			print "Input Width %s" % m2.group(1)
-+			print "Input Height %s" % m3.group(1)
-+			ar = float (m1.group(1))
-+			iw = int (m2.group(1))
-+			ih = int (m3.group(1))
-+			if aspect > 1.333333:
-+				cropw=int(round(iw / ar * 4 / 3, 0))
-+				croph=ih
-+			else:
-+				cropw=iw
-+				croph=int(round(ih * ar * 3 / 4, 0))
-+			crop="crop="+`cropw`+":"+`croph`+","
-+			print crop
-+
-+	elif options.aspect:
-+		aspect = commands.getoutput( MPLAYER + " -frames 1 -vo null -ao null -identify \"" + file + "\" | grep -E \"^ID_VIDEO_ASPECT\" | tail -1")
- 		p = re.compile ("ID_VIDEO_ASPECT=(.*)")
- 		m = p.search( aspect )
- 		if m:
-@@ -169,13 +202,13 @@
- 		if options.fps < 24:
- 			print "mencoder won't work with double pass and fps < 24, forcing fps = 24"
- 			options.fps = 24
--		v_cmd =  ( " \""+ file +"\" -v -ofps " + `options.fps` + " -sws 9 -vf " + v_pf + "scale=" + `options.width` + ":" + `options.height` +":::3,harddup -nosound -ovc lavc -lavcopts vcodec=mpeg1video:vstrict=-2:mbd=2:trell:cbp:mv0:vmax_b_frames=2:cmp=6:subcmp=6:precmp=6:dia=4:predia=4:bidir_refine=4:mv0_threshold=0:last_pred=3:vbitrate=" + `options.vbps` )
-+		v_cmd =  ( " \""+ file +"\" -v -ofps " + `options.fps` + " -sws 9 -vf " + v_pf + crop + "scale=" + `options.width` + ":" + `options.height` +":::3,harddup -nosound -ovc lavc -lavcopts vcodec=mpeg1video:vstrict=-2:mbd=2:trell:cbp:mv0:vmax_b_frames=2:cmp=6:subcmp=6:precmp=6:dia=4:predia=4:bidir_refine=4:mv0_threshold=0:last_pred=3:vbitrate=" + `options.vbps` )
- 	elif options.hq:
--		v_cmd =  ( " \""+ file +"\" -v -ofps " + `options.fps` + " -sws 9 -vf " + v_pf + "scale=" + `options.width` + ":" + `options.height` +":::3,harddup -nosound -ovc lavc -lavcopts vcodec=mpeg1video:vstrict=-2:mbd=2:trell:cbp:mv0:cmp=6:subcmp=6:precmp=6:dia=3:predia=3:last_pred=3:vbitrate=" + `options.vbps` + " -o " + MPGTMP + " -of rawvideo" )
-+		v_cmd =  ( " \""+ file +"\" -v -ofps " + `options.fps` + " -sws 9 -vf " + v_pf + crop + "scale=" + `options.width` + ":" + `options.height` +":::3,harddup -nosound -ovc lavc -lavcopts vcodec=mpeg1video:vstrict=-2:mbd=2:trell:cbp:mv0:cmp=6:subcmp=6:precmp=6:dia=3:predia=3:last_pred=3:vbitrate=" + `options.vbps` + " -o " + MPGTMP + " -of rawvideo" )
- 	elif options.lq:
--		v_cmd = ( " \"" + file + "\" -v -ofps " + `options.fps` + " -vf " + v_pf + "scale=" + `options.width` + ":" + `options.height` + ",harddup -nosound -ovc lavc -lavcopts vcodec=mpeg1video:vstrict=-2:vbitrate=" + `options.vbps` + " -o " + MPGTMP + " -of rawvideo" )
-+		v_cmd = ( " \"" + file + "\" -v -ofps " + `options.fps` + " -vf " + v_pf + crop + "scale=" + `options.width` + ":" + `options.height` + ",harddup -nosound -ovc lavc -lavcopts vcodec=mpeg1video:vstrict=-2:vbitrate=" + `options.vbps` + " -o " + MPGTMP + " -of rawvideo" )
- 	else :
--		v_cmd = ( " \""+ file +"\" -v -ofps " + `options.fps` + " -sws 9 -vf " + v_pf + "scale=" + `options.width` + ":" + `options.height` + ":::3,harddup -nosound -ovc lavc -lavcopts vcodec=mpeg1video:vstrict=-2:mbd=2:trell:cbp:mv0:cmp=2:subcmp=2:precmp=2:vbitrate=" + `options.vbps` + " -o " + MPGTMP + " -of rawvideo")
-+		v_cmd = ( " \""+ file +"\" -v -ofps " + `options.fps` + " -sws 9 -vf " + v_pf + crop + "scale=" + `options.width` + ":" + `options.height` + ":::3,harddup -nosound -ovc lavc -lavcopts vcodec=mpeg1video:vstrict=-2:mbd=2:trell:cbp:mv0:cmp=2:subcmp=2:precmp=2:vbitrate=" + `options.vbps` + " -o " + MPGTMP + " -of rawvideo")
- 	
- 	if options.nosub:
- 		if options.sub != None:
-@@ -459,6 +492,7 @@
- parser.add_option("-a","--abps", type="int", dest="abps", default=128)
- parser.add_option("--volnorm", action="store_true", dest="volnorm", default=False)
- parser.add_option("--keep-aspect", action="store_true", dest="aspect", default=False)
-+parser.add_option("--keep-aspect-panscan", action="store_true", dest="panscan", default=False)
- parser.add_option("--height", type="int", dest="height", default=192)
- parser.add_option("--width", type="int", dest="width", default=256)
- parser.add_option("-z","--hz", type="int", dest="hz", default=32000)
diff --git a/abs/extra-testing/enchant/PKGBUILD b/abs/extra-testing/enchant/PKGBUILD
deleted file mode 100644
index 0937bd8..0000000
--- a/abs/extra-testing/enchant/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 2581 2008-06-08 12:52:18Z jgc $
-# Maintainer: dorphell <dorphell@archlinux.org>
-pkgname=enchant
-pkgver=1.6.0
-pkgrel=1
-pkgdesc="A wrapper library for generic spell checking"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('aspell' 'dbus-glib>=0.74' 'hunspell>=1.2.2')
-makedepends=('hspell')
-options=(!libtool)
-source=(http://www.abisource.com/downloads/enchant/${pkgver}/${pkgname}-${pkgver}.tar.gz)
-url="http://www.abisource.com/enchant/"
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-}
-md5sums=('de11011aff801dc61042828041fb59c7')
diff --git a/abs/extra-testing/ethtool/PKGBUILD b/abs/extra-testing/ethtool/PKGBUILD
deleted file mode 100644
index 1fddeb1..0000000
--- a/abs/extra-testing/ethtool/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=ethtool
-pkgver=6
-pkgrel=1
-pkgdesc="gkernel ethtool"
-arch=(i686 x86_64)
-url="http://sourceforge.net/projects/gkernel/"
-license=('GPL')
-depends=(glibc)
-makedepends=()
-conflicts=()
-replaces=()
-backup=()
-install=
-source=(http://easynews.dl.sf.net/sourceforge/gkernel/$pkgname-$pkgver.tar.gz)
-md5sums=('3b721ec27f17ebf320ba8c505cf66d9c')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver || return 1
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
-}
diff --git a/abs/extra-testing/evrouter/PKGBUILD b/abs/extra-testing/evrouter/PKGBUILD
deleted file mode 100644
index 0f7d7b7..0000000
--- a/abs/extra-testing/evrouter/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Contributor: Jonathan Liu <net147@hotmail.com>
-pkgname=evrouter
-pkgver=0.4
-pkgrel=1
-pkgdesc="An Input Event Router for Linux"
-arch=(i686)
-url="http://www.bedroomlan.org/~alexios/coding_evrouter.html"
-license=('GPL2')
-depends=('libxt' 'libxtst' 'xorg-server')
-source=(http://debian.bedroomlan.org/debian/pool/main/e/evrouter/${pkgname}_${pkgver}.tar.gz)
-
-build() {
-  cd "${startdir}/src/${pkgname}-${pkgver}"
-  ./autogen.sh
-  ./configure --prefix=/usr --without-xmms
-  make || return 1
-  make DESTDIR="${startdir}/pkg" install
-}
-md5sums=('eef1b9d8e3b545c330eb025670ffa3e8')
diff --git a/abs/extra-testing/evtest/PKGBUILD b/abs/extra-testing/evtest/PKGBUILD
deleted file mode 100644
index 0952c5e..0000000
--- a/abs/extra-testing/evtest/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu>
-pkgname=evtest
-pkgver=1.25
-pkgrel=2
-pkgdesc="Simple tool for input event debugging."
-arch=('i686' 'x86_64')
-url="http://cgit.freedesktop.org/~whot/evtest/"
-license=('GPL')
-depends=(libxml2)
-makedepends=(xmlto asciidoc)
-optdepends=(libxslt)
-source=("http://cgit.freedesktop.org/~whot/evtest/snapshot/$pkgname-$pkgver.zip" "evtest.diff")
-
-build()
-{
- cd $srcdir/$pkgname-$pkgver
- patch -p1 < ../evtest.diff || return 1
- autoreconf -iv
- ./configure --prefix=/usr 
- make || return 1
- make DESTDIR=${startdir}/pkg install
-}
-md5sums=('1edddfcd366bb52490e08cbf1dbaeddf'
-         '1753bd5825ca7e5244a1a09029b8a47d')
diff --git a/abs/extra-testing/evtest/evtest.diff b/abs/extra-testing/evtest/evtest.diff
deleted file mode 100644
index 0dc7ba5..0000000
--- a/abs/extra-testing/evtest/evtest.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ruaN evtest-1.25.orig/evtest-capture.c evtest-1.25/evtest-capture.c
---- evtest-1.25.orig/evtest-capture.c	2009-12-02 22:24:44.000000000 +0000
-+++ evtest-1.25/evtest-capture.c	2010-05-06 08:38:03.000000000 +0000
-@@ -560,16 +560,6 @@
- 	[ABS_TOOL_WIDTH] = "ABS_TOOL_WIDTH",
- 	[ABS_VOLUME] = "ABS_VOLUME",
- 	[ABS_MISC] = "ABS_MISC",
--	[ABS_MT_TOUCH_MAJOR] = "ABS_MT_TOUCH_MAJOR",
--	[ABS_MT_TOUCH_MINOR] = "ABS_MT_TOUCH_MINOR",
--	[ABS_MT_WIDTH_MAJOR] = "ABS_MT_WIDTH_MAJOR",
--	[ABS_MT_WIDTH_MINOR] = "ABS_MT_WIDTH_MINOR",
--	[ABS_MT_ORIENTATION] = "ABS_MT_ORIENTATION",
--	[ABS_MT_POSITION_X] = "ABS_MT_POSITION_X",
--	[ABS_MT_POSITION_Y] = "ABS_MT_POSITION_Y",
--	[ABS_MT_TOOL_TYPE] = "ABS_MT_TOOL_TYPE",
--	[ABS_MT_BLOB_ID] = "ABS_MT_BLOB_ID",
--	[ABS_MT_TRACKING_ID] = "ABS_MT_TRACKING_ID",
- };
- 
- const char *misc[MSC_MAX + 1] = {
-diff -ruaN evtest-1.25.orig/evtest.c evtest-1.25/evtest.c
---- evtest-1.25.orig/evtest.c	2009-12-02 22:24:44.000000000 +0000
-+++ evtest-1.25/evtest.c	2010-05-06 08:38:21.000000000 +0000
-@@ -192,7 +192,7 @@
- 	[BTN_TOOL_MOUSE] = "ToolMouse",		[BTN_TOOL_LENS] = "ToolLens",
- 	[BTN_TOUCH] = "Touch",			[BTN_STYLUS] = "Stylus",
- 	[BTN_STYLUS2] = "Stylus2",		[BTN_TOOL_DOUBLETAP] = "Tool Doubletap",
--	[BTN_TOOL_TRIPLETAP] = "Tool Tripletap", [BTN_TOOL_QUADTAP] = "Tool Quadtap",
-+	[BTN_TOOL_TRIPLETAP] = "Tool Tripletap",
- 	[BTN_GEAR_DOWN] = "WheelBtn",
- 	[BTN_GEAR_UP] = "Gear up",		[KEY_OK] = "Ok",
- 	[KEY_SELECT] = "Select",		[KEY_GOTO] = "Goto",
diff --git a/abs/extra-testing/exo/PKGBUILD b/abs/extra-testing/exo/PKGBUILD
deleted file mode 100644
index e402aac..0000000
--- a/abs/extra-testing/exo/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 28206 2009-02-28 11:01:08Z andyrtr $
-# Maintainer: tobias <tobias funnychar archlinux.org>
-# Contributor: Aurelien Foret <orelien@chez.com>
-
-pkgname=exo
-pkgver=0.3.100
-pkgrel=1
-pkgdesc="Extensions to Xfce by os-cillation"
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2')
-url="http://www.os-cillation.com/article.php?sid=40"
-groups=('xfce4')
-depends=("libxfce4util" "hal" 'hicolor-icon-theme')
-makedepends=("pygtk>=2.14.0" 'pkgconfig' 'libnotify' 'perl-uri')
-optdepends=('libnotify		enables notification support' \
-            'perl		enables mail-compose helper script')
-options=('!libtool')
-install=${pkgname}.install
-source=(http://www.xfce.org/archive/xfce-4.6.0/src/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ebded97ff55f43cd0fe6b16242992ecf')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
-    --localstatedir=/var --disable-static --enable-notifications \
-    --enable-python || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-}
diff --git a/abs/extra-testing/exo/exo.install b/abs/extra-testing/exo/exo.install
deleted file mode 100644
index 21b79d2..0000000
--- a/abs/extra-testing/exo/exo.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/abs/extra-testing/fakeroot/PKGBUILD b/abs/extra-testing/fakeroot/PKGBUILD
deleted file mode 100644
index 688c3d3..0000000
--- a/abs/extra-testing/fakeroot/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 29508 2009-03-09 17:06:43Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Jochem Kossen <j.kossen@home.nl>
-
-pkgname=fakeroot
-pkgver=1.14.4
-pkgrel=1
-pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://packages.debian.org/fakeroot"
-groups=('base-devel')
-install=fakeroot.install
-depends=('glibc' 'filesystem' 'grep' 'sed')
-options=('!libtool')
-source=(http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2)
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-  ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot \
-	 --disable-static --with-ipc=sysv
-	# --with-ipc=tcp is currently broken and no option on smp systems
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  # install README for sysv/tcp usage
-  install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README
-}
-md5sums=('bea628be77838aaa7323a2f7601c2d7e')
diff --git a/abs/extra-testing/fakeroot/fakeroot.install b/abs/extra-testing/fakeroot/fakeroot.install
deleted file mode 100644
index c2f62a7..0000000
--- a/abs/extra-testing/fakeroot/fakeroot.install
+++ /dev/null
@@ -1,30 +0,0 @@
-# arg 1: the new package version
-post_install() {
-	if [ ! "`grep /usr/lib/libfakeroot etc/ld.so.conf`" ]; then
-		echo -n "updating /etc/ld.so.conf... "
-		echo "/usr/lib/libfakeroot" >>etc/ld.so.conf
-		sbin/ldconfig -r .
-		echo "done."
-	fi
-echo "The package is built using sysv ipc. If this causes segfaults"
-echo "see included README file and rebuild the pkg --with-ipc=tcp"
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
-	post_install $1
-}
-
-# arg 1: the old package version
-pre_remove() {
-	echo -ne "\nupdating /etc/ld.so.conf... "
-	sed -i -e '/\/usr\/lib\/libfakeroot/d' etc/ld.so.conf
-	sbin/ldconfig -r .
-	echo "done."
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/abs/extra-testing/fceu/PKGBUILD b/abs/extra-testing/fceu/PKGBUILD
deleted file mode 100755
index cdae29a..0000000
--- a/abs/extra-testing/fceu/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
-# Contributor: Jo Christian Bergskås <jcberg@gmail.com>
-
-pkgname=fceu
-pkgver=0.98.15
-pkgrel=1
-pkgdesc="FCE Ultra is a fast and ultra-compatible NES/Famicom emulator with SDL, OpenGL and SVGALIB support."
-arch=('i686' 'x86_64')
-url="http://fceultra.sourceforge.net"
-license="GPL"
-options=('docs')
-depends=('sdl' 'zlib')
-source=(ftp://ftp.knoppmyth.net/R6/sources/$pkgname-$pkgver-src.tar.bz2)
-md5sums=('bfe9aa7f91c19fa17bb6e5424dc5901b')
-
-build() {
-  cd $startdir/src/fceu
-  ./configure --prefix=/usr --with-opengl --build=i686-linux-gnu
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  install -D -m644 $startdir/src/fceu/Documentation/fceu-sdl.6 $startdir/pkg/usr/man/man6/fceu.6
-  install -d $startdir/pkg/usr/share/doc/fceu-doc
-  cp -r $startdir/src/fceu/Documentation/* $startdir/pkg/usr/share/doc/fceu-doc
-}
diff --git a/abs/extra-testing/fftw/PKGBUILD b/abs/extra-testing/fftw/PKGBUILD
deleted file mode 100644
index a4ca689..0000000
--- a/abs/extra-testing/fftw/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 20304 2008-12-02 10:48:00Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=fftw
-pkgver=3.2.2
-pkgrel=1
-pkgdesc="A library for computing the discrete Fourier transform (DFT)"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.fftw.org/"
-depends=('glibc')
-options=(!libtool)
-source=(http://www.fftw.org/${pkgname}-${pkgver}.tar.gz)
-install=fftw.install
-
-# notes:
-# http://www.fftw.org/fftw2_doc/fftw_6.html#SEC69
-# http://www.fftw.org/faq/section2.html#singleprec
-# http://www.fftw.org/fftw3_doc/Precision.html#Precision
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
- # build & install double precision
-  ./configure F77=gfortran --prefix=/usr \
-              --enable-shared || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  make clean 
-
-  # build & install long double precission
-  ./configure F77=gfortran --prefix=/usr \
-   --enable-long-double  --enable-shared || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  make clean
-
-  # build + install single precision
-  ./configure F77=gfortran --prefix=/usr \
-              --enable-float --enable-shared || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-
-  # handle info files
-  rm -f $pkgdir/usr/share/info/dir
-  gzip $pkgdir/usr/share/info/*
-}
-md5sums=('b616e5c91218cc778b5aa735fefb61ae')
diff --git a/abs/extra-testing/fftw/fftw.install b/abs/extra-testing/fftw/fftw.install
deleted file mode 100644
index a3748aa..0000000
--- a/abs/extra-testing/fftw/fftw.install
+++ /dev/null
@@ -1,22 +0,0 @@
-info_dir=/usr/share/info
-info_files=(fftw3.info)
-
-post_install() {
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-        post_install
-}
-
-pre_remove() {
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-
-
-
diff --git a/abs/extra-testing/frozen-bubble/PKGBUILD b/abs/extra-testing/frozen-bubble/PKGBUILD
deleted file mode 100644
index ca48827..0000000
--- a/abs/extra-testing/frozen-bubble/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Contributer: Brandon Niemczyk <maccorin@cfl.rr.com>
-
-pkgname=frozen-bubble
-pkgver=2.1.0
-pkgrel=2
-pkgdesc="A game in which you throw colorful bubbles and build groups to destroy the bubbles"
-arch=(i686 x86_64)
-url="http://www.frozen-bubble.org"
-depends=('sdl_perl' 'sdl_mixer' 'perl-locale-gettext' 'sdl_pango')
-makedepends=('imagemagick')
-source=(http://www.frozen-bubble.org/data/${pkgname}-${pkgver}.tar.bz2 \
-        frozen-bubble.desktop)
-md5sums=('f5eb984897e1ccd52a0d8820d8359861' '3e0755836580e374e0911653f8cd33e2')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}/gfx/balls
-  # Fix missing files for colourblind
-  for g in bubble-colourblind-?.gif; do
-    convert -depth 8 -scale 16x16 ${g} ${g/%.gif/-mini.png}
-  done
-  cd ../..
-  make OPTIMIZE="${CFLAGS}" \
-       CFLAGS="$(pkg-config glib-2.0 --cflags)" INSTALLDIRS=vendor \
-       PREFIX=/usr || return 1
- 
-  make DESTDIR=${startdir}/pkg PREFIX=/usr install || return 1
-  install -D -m644 icons/frozen-bubble-icon-64x64.png ${startdir}/pkg/usr/share/pixmaps/frozen-bubble.png || return 1
-  install -D -m644 ${startdir}/src/frozen-bubble.desktop ${startdir}/pkg/usr/share/applications/frozen-bubble.desktop || return 1
-}
diff --git a/abs/extra-testing/frozen-bubble/frozen-bubble.desktop b/abs/extra-testing/frozen-bubble/frozen-bubble.desktop
deleted file mode 100644
index 6e53e5d..0000000
--- a/abs/extra-testing/frozen-bubble/frozen-bubble.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Encoding=UTF-8
-Name=Frozen Bubble
-Icon=frozen-bubble.png
-Exec=frozen-bubble
-Terminal=false
-Categories=Game;
diff --git a/abs/extra-testing/fuppes-svn/PKGBUILD b/abs/extra-testing/fuppes-svn/PKGBUILD
deleted file mode 100644
index 03ffb9c..0000000
--- a/abs/extra-testing/fuppes-svn/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# Contributor: Andrew Krawchyk <krawch_a@denison.edu>
-# patch for svn r634: Ivan Yurasov <vd@vdk.su>
-
-pkgname=fuppes-svn
-pkgver=664
-pkgrel=1
-pkgdesc="A free, multiplatform Universal Plug and Play A/V MediaServer"
-arch=('i686' 'x86_64')
-url="http://fuppes.ulrich-voelkel.de/"
-license=('GPL2')
-depends=('pcre' 'libxml2' 'sqlite3' 'gettext' 'taglib' 'imagemagick' 'ffmpeg' 'libmp4v2' 'lame' 'libvorbis' 'libmpcdec' 'flac' 'faad2' 'libmad')
-makdepends=('pkgconfig' 'autoconf' 'subversion')
-install=fuppes.install
-source=(fuppes-r634-archlinux.patch fuppes.diff fuppes.cfg run fuppes.ch fuppes.lr)
-
-_svnmod="fuppes"
-_svntrunk="https://fuppes.svn.sourceforge.net/svnroot/fuppes/trunk"
-
-build()
-{
-	cd ${startdir}/src
-
-	msg "Getting sources..."
-	svn co ${_svntrunk} ${_svnmod}
-	msg "Done getting sources or failed to connect to server."
-
-	cd ${_svnmod}
-
-#	patch -Np0 -i ../fuppes-r634-archlinux.patch
-#	patch -Np0 -i ../fuppes.diff
-	autoreconf -vfi
-	
-	./configure --prefix=/usr \
-	--enable-video-transcoding \
-	--disable-twolame || return 1
-	
-	make || return 1
-	make DESTDIR=$startdir/pkg install || return 1
-	mkdir -p $startdir/pkg/etc/sv/fuppes/supervise
-	install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/fuppes/
-	mkdir -p $startdir/pkg/etc/fuppes
-	cp $startdir/src/fuppes.cfg $startdir/pkg/etc/fuppes
-	mkdir -p $startdir/pkg/etc/cron.hourly
-	mkdir -p $startdir/pkg/etc/logrotate.d/
-	install -D -m755 $startdir/src/fuppes.ch $startdir/pkg/etc/cron.hourly
-	install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/fuppes
-	install -D -m755 $startdir/src/fuppes.lr $startdir/pkg/etc/logrotate.d
-}
-md5sums=('5d9f6331cc91b64aab69449ce327b214'
-         'c495fa1bd9a870ae36820632434319ee'
-         'b0cef07d8e60d01c8146a69870672e1f'
-         '3850001378088e5efac60487e5550d54'
-         '3c355b860f1b0d273f5aa8b2bea1bde6'
-         '3151a3862fbc6b758d7ae5776eba3d57')
diff --git a/abs/extra-testing/fuppes-svn/PKGBUILD.orig b/abs/extra-testing/fuppes-svn/PKGBUILD.orig
deleted file mode 100644
index 79d11e2..0000000
--- a/abs/extra-testing/fuppes-svn/PKGBUILD.orig
+++ /dev/null
@@ -1,52 +0,0 @@
-# Contributor: Andrew Krawchyk <krawch_a@denison.edu>
-# patch for svn r634: Ivan Yurasov <vd@vdk.su>
-
-pkgname=fuppes-svn
-pkgver=636
-pkgrel=9
-pkgdesc="A free, multiplatform Universal Plug and Play A/V MediaServer"
-arch=('i686' 'x86_64')
-url="http://fuppes.ulrich-voelkel.de/"
-license=('GPL2')
-depends=('pcre' 'libxml2' 'sqlite3' 'gettext' 'taglib' 'imagemagick' 'ffmpeg' 'libmp4v2' 'lame' 'libvorbis' 'libmpcdec' 'flac' 'faad2' 'libmad')
-makdepends=('pkgconfig' 'autoconf' 'subversion')
-install=fuppes.install
-source=(fuppes-r634-archlinux.patch fuppes.diff fuppes.cfg run fuppes.ch fuppes.lr)
-md5sums=('5d9f6331cc91b64aab69449ce327b214' 'c495fa1bd9a870ae36820632434319ee' \
-	 'b0cef07d8e60d01c8146a69870672e1f' '3850001378088e5efac60487e5550d54' \
-	 '3c355b860f1b0d273f5aa8b2bea1bde6')
-
-_svnmod="fuppes"
-_svntrunk="https://fuppes.svn.sourceforge.net/svnroot/fuppes/trunk"
-
-build()
-{
-	cd ${startdir}/src
-
-	msg "Getting sources..."
-	svn co -r 636 ${_svntrunk} ${_svnmod}
-	msg "Done getting sources or failed to connect to server."
-
-	cd ${_svnmod}
-
-	patch -Np0 -i ../fuppes-r634-archlinux.patch
-	patch -Np0 -i ../fuppes.diff
-	autoreconf -vfi
-	
-	./configure --prefix=/usr \
-	--enable-video-transcoding \
-	--disable-twolame || return 1
-	
-	make || return 1
-	make DESTDIR=$startdir/pkg install || return 1
-	mkdir -p $startdir/pkg/etc/sv/fuppes/supervise
-	install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/fuppes/
-	mkdir -p $startdir/pkg/etc/fuppes
-	cp $startdir/src/fuppes.cfg $startdir/pkg/etc/fuppes
-	mkdir -p $startdir/pkg/etc/cron.hourly
-	mkdir -p $startdir/pkg/etc/logrotate.d/
-	mkdir -p $startdir/pkg/etc/sv/fuppes/supervise
-	install -D -m755 $startdir/src/fuppes.ch $startdir/pkg/etc/cron.hourly
-	install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/fuppes
-	install -D -m755 $startdir/src/fuppes.lr $startdir/pkg/etc/logrotate.d
-}
diff --git a/abs/extra-testing/fuppes-svn/fuppes-r634-archlinux.patch b/abs/extra-testing/fuppes-svn/fuppes-r634-archlinux.patch
deleted file mode 100644
index feaccfa..0000000
--- a/abs/extra-testing/fuppes-svn/fuppes-r634-archlinux.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-Index: src/plugins/ffmpeg/ffmpeg.cpp
-===================================================================
---- src/plugins/ffmpeg/ffmpeg.cpp	(revision 634)
-+++ src/plugins/ffmpeg/ffmpeg.cpp	(working copy)
-@@ -2190,7 +2190,7 @@
- 				p=NULL;	
- 				for(p = av_codec_next(p); p != NULL; p = av_codec_next(p) ) {				
- 				#else
--				for(p = first_avcodec; p != NULL; p = p->next) {
-+				for(p = av_codec_next(NULL); p != NULL; p = p->next) {
- 				#endif
-         
-             if((p2==NULL || strcmp(p->name, p2->name)<0) &&
-@@ -2269,7 +2269,7 @@
-     }
-     avformat_opts = av_alloc_format_context();
- #ifdef HAVE_LIBSWSCALE
--    sws_opts = sws_getContext(16,16,0, 16,16,0, sws_flags, NULL,NULL,NULL);
-+    sws_opts = sws_getContext(16,16,(PixelFormat)0, 16,16,(PixelFormat)0, sws_flags, NULL,NULL,NULL);
- #endif
- 
-     
-Index: src/plugins/ffmpeg/ffmpeg.h
-===================================================================
---- src/plugins/ffmpeg/ffmpeg.h	(revision 634)
-+++ src/plugins/ffmpeg/ffmpeg.h	(working copy)
-@@ -38,7 +38,7 @@
-   #include <ctype.h>
-   #include <string.h>
- 
--#if FFMPEG_VERSION >= 52 && !defined(OLD_INCLUDES_PATH)
-+/* #if FFMPEG_VERSION >= 52 && !defined(OLD_INCLUDES_PATH) */
-   #include <libavformat/avformat.h>
-   #include <libavutil/avutil.h>
-   #include <libavutil/fifo.h> 
-@@ -51,27 +51,27 @@
-   #ifdef HAVE_AVSTRING_H
-   #include <libavutil/avstring.h>
-   #endif	
--#else
-+/* #else
-   #include <avformat.h>
-   #include <avutil.h>
-   #include <fifo.h>
--  #include <opt.h>
-+  #include <opt.h> */
-   
-   
-   #ifdef HAVE_LIBSWSCALE
--	#include <swscale.h>
-+	#include <libswscale/swscale.h>
-   #endif 
- 	
-   #ifdef HAVE_AVSTRING_H
--  #include <avstring.h>
-+  #include <libavutil/avstring.h>
-   #endif	
--#endif
-+/* #endif */
- 
- 
-   #include <math.h>
-   #include <stdlib.h>
-   #include <limits.h>  
--  //#include <mem.h> 
-+  //#include <mem.h>
- 
- } 
- #endif // __cplusplus 
-Index: version.sh
-===================================================================
---- version.sh  (revision 634)
-+++ version.sh  (working copy)
-@@ -1,8 +1,15 @@
- #!/bin/sh
-
--svn_revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
--test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2`
--test $svn_revision || svn_revision=`cd "$1" && sed -n -e '/^dir$/{n;p;q}' .svn/entries 2>/dev/null`
-+if [ "$1" == "" ]
-+then
-+DIR="."
-+else
-+DIR="$1"
-+fi
-+
-+svn_revision=`cd "$DIR" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
-+test $svn_revision || svn_revision=`cd "$DIR" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2`
-+test $svn_revision || svn_revision=`cd "$DIR" && sed -n -e '/^dir$/{n;p;q}' .svn/entries 2>/dev/null`
- test $svn_revision || svn_revision=UNKNOWN
-
- NEW_REVISION="#define FUPPES_VERSION \"0.$svn_revision\""
-
diff --git a/abs/extra-testing/fuppes-svn/fuppes.cfg b/abs/extra-testing/fuppes-svn/fuppes.cfg
deleted file mode 100644
index beb81cf..0000000
--- a/abs/extra-testing/fuppes-svn/fuppes.cfg
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fuppes_config version="0.7.2.3">
-  <shared_objects>
-    <!--<dir>/mnt/music</dir>-->
-    <!--<itunes>/Users/.../iTunes.xml</itunes>-->
-    <dir>/myth/tv</dir>
-    <dir>/myth/video</dir>
-    <dir>/myth/music</dir>
-    <dir>/myth/gallery</dir>
-    <dir>/myth/pretty</dir>
-  </shared_objects>
-  <network>
-    <!--empty = automatic detection-->
-    <interface>192.168.1.253</interface>
-    <!--empty or 0 = random port-->
-    <http_port>81</http_port>
-    <!--list of ip addresses allowed to access fuppes. if empty all ips are allowed-->
-    <allowed_ips>
-      <!--<ip>192.168.0.1</ip>-->
-    </allowed_ips>
-  </network>
-  <content_directory>
-    <!--a list of possible charsets can be found under:
-      http://www.gnu.org/software/libiconv/-->
-    <local_charset>UTF-8</local_charset>
-    <!--libs used for metadata extraction when building the database. [true|false]-->
-    <use_imagemagick>true</use_imagemagick>
-    <use_taglib>true</use_taglib>
-    <use_libavformat>true</use_libavformat>
-  </content_directory>
-  <global_settings>
-    <temp_dir/>
-    <!--uuid is written to and read from <config-dir>/uuid.txt if set to true-->
-    <use_fixed_uuid>false</use_fixed_uuid>
-  </global_settings>
-  <device_settings>
-    <!--"default" settings are inhertied by specific devices and can be overwritten-->
-    <!--do NOT remove the "default" device settings-->
-    <!--all new file types have to be added to the default settings-->
-    <!--adding new file types just to a specific device will have no affect-->
-    <device name="default">
-      <!--specify the maximum length for file names (0 or empty = unlimited)-->
-      <max_file_name_length>0</max_file_name_length>
-      <!--[file|container]-->
-      <playlist_style>file</playlist_style>
-      <show_childcount_in_title>false</show_childcount_in_title>
-      <enable_dlna>false</enable_dlna>
-      <transcoding_release_delay>4</transcoding_release_delay>
-      <file_settings>
-        <!--audio files-->
-        <file ext="mp3">
-          <type>AUDIO_ITEM</type>
-          <mime_type>audio/mpeg</mime_type>
-          <dlna>MP3</dlna>
-        </file>
-        <file ext="ogg">
-          <type>AUDIO_ITEM</type>
-          <mime_type>application/octet-stream</mime_type>
-          <transcode enabled="true">
-            <ext>mp3</ext>
-            <mime_type>audio/mpeg</mime_type>
-            <dlna>MP3</dlna>
-            <http_encoding>chunked</http_encoding>
-            <decoder>vorbis</decoder>
-            <encoder>lame</encoder>
-            <bitrate>192</bitrate>
-            <samplerate>44100</samplerate>
-          </transcode>
-        </file>
-        <file ext="mpc">
-          <type>AUDIO_ITEM</type>
-          <mime_type>application/octet-stream</mime_type>
-          <transcode enabled="true">
-            <ext>mp3</ext>
-            <mime_type>audio/mpeg</mime_type>
-            <dlna>MP3</dlna>
-            <http_encoding>chunked</http_encoding>
-            <decoder>musepack</decoder>
-            <encoder>lame</encoder>
-            <bitrate>192</bitrate>
-            <samplerate>44100</samplerate>
-          </transcode>
-        </file>
-        <file ext="wav">
-          <type>AUDIO_ITEM</type>
-          <mime_type>audio/x-wav</mime_type>
-        </file>
-        <file ext="flac">
-          <type>AUDIO_ITEM</type>
-          <mime_type>audio/x-flac</mime_type>
-          <transcode enabled="true">
-            <ext>mp3</ext>
-            <mime_type>audio/mpeg</mime_type>
-            <dlna>MP3</dlna>
-            <http_encoding>chunked</http_encoding>
-            <decoder>flac</decoder>
-            <encoder>lame</encoder>
-            <bitrate>192</bitrate>
-            <samplerate>44100</samplerate>
-          </transcode>
-        </file>
-        <file ext="wma">
-          <type>AUDIO_ITEM</type>
-          <mime_type>audio/x-ms-wma</mime_type>
-          <dlna>WMAFULL</dlna>
-        </file>
-        <!--image files-->
-        <file ext="jpg">
-          <ext>jpeg</ext>
-          <type>IMAGE_ITEM</type>
-          <mime_type>image/jpeg</mime_type>
-          <convert enabled="false">
-            <!--<dcraw enabled="true">-q 0</dcraw>-->
-            <ext>png</ext>
-            <mime_type>image/png</mime_type>
-            <height>0</height>
-            <width>0</width>
-            <!--set "greater" to "true" if you only want to resize images greater than "height" or "width"-->
-            <greater>false</greater>
-            <!--set "less" to "true" if you only want to resize images less than "height" or "width"-->
-            <less>false</less>
-            <!--set "less" and "greater" to "false" if you always want to resize-->
-          </convert>
-        </file>
-        <file ext="bmp">
-          <type>IMAGE_ITEM</type>
-          <mime_type>image/bmp</mime_type>
-        </file>
-        <file ext="png">
-          <type>IMAGE_ITEM</type>
-          <mime_type>image/png</mime_type>
-        </file>
-        <file ext="gif">
-          <type>IMAGE_ITEM</type>
-          <mime_type>image/gif</mime_type>
-        </file>
-        <!--video files-->
-        <file ext="mpg">
-          <ext>mpeg</ext>
-          <type>VIDEO_ITEM</type>
-          <mime_type>video/mpeg</mime_type>
-        </file>
-        <file ext="mp4">
-          <type>VIDEO_ITEM</type>
-          <mime_type>video/mp4</mime_type>
-        </file>
-        <file ext="avi">
-          <type>VIDEO_ITEM</type>
-          <mime_type>video/x-msvideo</mime_type>
-        </file>
-        <file ext="wmv">
-          <type>VIDEO_ITEM</type>
-          <mime_type>video/x-ms-wmv</mime_type>
-        </file>
-        <file ext="vob">
-          <type>VIDEO_ITEM</type>
-          <mime_type>video/x-ms-vob</mime_type>
-        </file>
-        <file ext="vdr">
-          <type>VIDEO_ITEM</type>
-          <mime_type>video/x-extension-vdr</mime_type>
-          <transcode enabled="true">
-            <ext>vob</ext>
-            <mime_type>video/x-ms-vob</mime_type>
-          </transcode>
-        </file>
-        <file ext="flv">
-          <type>VIDEO_ITEM</type>
-          <mime_type>application/x-flash-video</mime_type>
-        </file>
-        <file ext="asf">
-          <type>VIDEO_ITEM</type>
-          <mime_type>video/x-ms-asf</mime_type>
-        </file>
-        <!--playlists-->
-        <file ext="pls">
-          <type>PLAYLIST</type>
-          <mime_type>audio/x-scpls</mime_type>
-        </file>
-        <file ext="m3u">
-          <type>PLAYLIST</type>
-          <mime_type>audio/x-mpegurl</mime_type>
-        </file>
-      </file_settings>
-    </device>
-    <!--For other device settings take a look at http://fuppes.ulrich-voelkel.de/wiki/index.php/Category:Device-->
-    <!--If you have more than one device it is a good idea to set the ip address as some devices may have conflicting "user agents".-->
-    <!--It is safe to remove unneeded devices-->
-    <device name="PS3" enabled="false">
-      <user_agent>UPnP/1.0 DLNADOC/1.00</user_agent>
-      <user_agent>PLAYSTATION3</user_agent>
-      <!--<ip></ip>-->
-      <enable_dlna>true</enable_dlna>
-      <transcoding_release_delay>50</transcoding_release_delay>
-      <file_settings>
-        <file ext="ogg">
-          <type>AUDIO_ITEM_MUSIC_TRACK</type>
-          <transcode enabled="true">
-            <http_encoding>stream</http_encoding>
-          </transcode>
-        </file>
-      </file_settings>
-    </device>
-    <device name="Xbox 360" virtual="Xbox 360" enabled="false">
-      <user_agent>Xbox/2.0.\d+.\d+ UPnP/1.0 Xbox/2.0.\d+.\d+</user_agent>
-      <user_agent>Xenon</user_agent>
-      <xbox360>true</xbox360>
-      <show_empty_resolution>true</show_empty_resolution>
-      <description_values>
-        <friendly_name>%s %v : 1 : Windows Media Connect</friendly_name>
-        <model_name>Windows Media Connect compatible (%s)</model_name>
-        <model_number>2.0</model_number>
-      </description_values>
-    </device>
-  </device_settings>
-</fuppes_config>
diff --git a/abs/extra-testing/fuppes-svn/fuppes.ch b/abs/extra-testing/fuppes-svn/fuppes.ch
deleted file mode 100644
index 60960b5..0000000
--- a/abs/extra-testing/fuppes-svn/fuppes.ch
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-/usr/bin/wget -O /dev/null -q http://localhost:81/presentation/options.html?db=update &> /dev/null
diff --git a/abs/extra-testing/fuppes-svn/fuppes.diff b/abs/extra-testing/fuppes-svn/fuppes.diff
deleted file mode 100644
index 9b7b6a8..0000000
--- a/abs/extra-testing/fuppes-svn/fuppes.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/plugins/ffmpeg/ffmpeg.cpp.orig	2009-05-29 20:12:09.000000000 +0000
-+++ src/plugins/ffmpeg/ffmpeg.cpp	2009-05-29 20:10:01.000000000 +0000
-@@ -1021,19 +1021,9 @@
-         if (subtitle_to_free) {
-             if (subtitle_to_free->rects != NULL) {
-                 for (i = 0; i < subtitle_to_free->num_rects; i++) {
--									
--#ifndef LIBAVCODEC_VERSION_MINOR
--#define LIBAVCODEC_VERSION_MINOR 0
--#endif
--
--#if LIBAVCODEC_VERSION_MINOR >= 11
--                    av_freep(subtitle_to_free->rects[i]->pict.data[0]);
--                    av_freep(subtitle_to_free->rects[i]->pict.data[1]);
--                    av_freep(subtitle_to_free->rects[i]);
--#else
--                    av_free(subtitle_to_free->rects[i].bitmap);
--                    av_free(subtitle_to_free->rects[i].rgba_palette);									
--#endif
-+		av_freep(&subtitle_to_free->rects[i]->pict.data[0]);
-+		av_freep(&subtitle_to_free->rects[i]->pict.data[1]);
-+		av_freep(&subtitle_to_free->rects[i]);
-                 }
-                 av_freep(&subtitle_to_free->rects);
-             }
diff --git a/abs/extra-testing/fuppes-svn/fuppes.install b/abs/extra-testing/fuppes-svn/fuppes.install
deleted file mode 100644
index d0099e3..0000000
--- a/abs/extra-testing/fuppes-svn/fuppes.install
+++ /dev/null
@@ -1,20 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  sv stop mythbackend
-  mv /etc/sv/mythbackend/run /tmp
-  sed 's/logfile/noupnp\ --logfile/' </tmp/run >/etc/sv/mythbackend/run
-  chmod 755 /etc/sv/mythbackend/run
-  sv start mythbackend
-  add_service.sh fuppes
-  sv start fuppes
-}
-
-post_remove() {
-	sv stop fuppes
-	remove_service.sh fuppes
-	mv /etc/sv/mythbackend/run /tmp/run
-	sv stop mythbackend
-	sed 's/--noupnp\ --logfile/--logfile/' </tmp/run >/etc/sv/mythbackend/run
-  	chmod 755 /etc/sv/mythbackend/run
-	sv start mythbackend
-}
diff --git a/abs/extra-testing/fuppes-svn/fuppes.lr b/abs/extra-testing/fuppes-svn/fuppes.lr
deleted file mode 100644
index ec2f88f..0000000
--- a/abs/extra-testing/fuppes-svn/fuppes.lr
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/fuppes/fuppes.log {
-	copytruncate
-	daily
-	size 10M
-	missingok
-	rotate 7
-	compress
-	notifempty
-}
diff --git a/abs/extra-testing/fuppes-svn/run b/abs/extra-testing/fuppes-svn/run
deleted file mode 100755
index dc69879..0000000
--- a/abs/extra-testing/fuppes-svn/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec su mythtv -c "/usr/bin/fuppes --config-dir /etc/fuppes --database-file /data/srv/fuppes/fuppes.db --temp-dir /myth/tmp"
diff --git a/abs/extra-testing/gconf/01_xml-gettext-domain.patch b/abs/extra-testing/gconf/01_xml-gettext-domain.patch
deleted file mode 100644
index d1323f6..0000000
--- a/abs/extra-testing/gconf/01_xml-gettext-domain.patch
+++ /dev/null
@@ -1,362 +0,0 @@
-# Description: Support calling gettext at runtime and putting the gettext domain into the .schemas file instead of replicating translations in /usr/share/gconf/schemas/*.schemas *and* /var/lib/gconf/defaults/%gconf-tree-$LANG.xml. This saves in the order of 90 MB uncompressed/10 MB compressed on hard disks.
-# Ubuntu: https://bugs.launchpad.net/bugs/123025
-# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=568845
---- GConf-2.26.0/backends/markup-tree.c.gettext	2009-04-26 23:33:05.258484987 -0400
-+++ GConf-2.26.0/backends/markup-tree.c	2009-04-26 23:34:25.026700526 -0400
-@@ -52,6 +52,7 @@ struct _MarkupEntry
-   char       *schema_name;
-   char       *mod_user;
-   GTime       mod_time;
-+  const char *gettext_domain;
- };
- 
- static LocalSchemaInfo* local_schema_info_new  (void);
-@@ -1593,6 +1594,8 @@ markup_entry_set_value (MarkupEntry     
-                              gconf_schema_get_type (schema));
-       gconf_schema_set_owner (current_schema,
-                               gconf_schema_get_owner (schema));
-+      gconf_schema_set_gettext_domain (current_schema,
-+                              gconf_schema_get_gettext_domain (schema));
-     }
- 
-   /* Update mod time */
-@@ -1805,6 +1808,8 @@ markup_entry_get_value (MarkupEntry *ent
-       else if (c_local_schema && c_local_schema->long_desc)
-         gconf_schema_set_long_desc (schema, c_local_schema->long_desc);
- 
-+      gconf_schema_set_gettext_domain (schema, entry->gettext_domain);
-+
-       return retval;
-     }
- }
-@@ -2339,8 +2344,9 @@ parse_value_element (GMarkupParseContext
-   const char *ltype;
-   const char *list_type;
-   const char *owner;
-+
-   GConfValueType vtype;
--  const char *dummy1, *dummy2, *dummy3, *dummy4;
-+  const char *dummy1, *dummy2, *dummy3, *dummy4, *dummy5;
-   
- #if 0
-   g_assert (ELEMENT_IS ("entry") ||
-@@ -2377,6 +2383,7 @@ parse_value_element (GMarkupParseContext
-                           "muser", &dummy2,
-                           "mtime", &dummy3,
-                           "schema", &dummy4,
-+                          "gettext_domain", &dummy5,
- 
-                           NULL))
-     return;
-@@ -2683,6 +2690,7 @@ parse_entry_element (GMarkupParseContext
-       const char *mtime;
-       const char *schema;
-       const char *type;
-+      const char *gettext_domain;
-       const char *dummy1, *dummy2, *dummy3, *dummy4;
-       const char *dummy5, *dummy6, *dummy7;
-       GConfValue *value;
-@@ -2693,6 +2701,7 @@ parse_entry_element (GMarkupParseContext
-       mtime = NULL;
-       schema = NULL;
-       type = NULL;
-+      gettext_domain = NULL;
- 
-       if (!locate_attributes (context, element_name, attribute_names, attribute_values,
-                               error,
-@@ -2701,6 +2710,7 @@ parse_entry_element (GMarkupParseContext
-                               "mtime", &mtime,
-                               "schema", &schema,
-                               "type", &type,
-+                              "gettext_domain", &gettext_domain,
-                           
-                               /* These are allowed but we don't use them until
-                                * parse_value_element
-@@ -2768,6 +2778,9 @@ parse_entry_element (GMarkupParseContext
-        */
-       if (schema)
-         entry->schema_name = g_strdup (schema);
-+
-+      if (gettext_domain)
-+        entry->gettext_domain = g_intern_string (gettext_domain);
-     }
-   else
-     {
-@@ -3716,6 +3729,7 @@ write_value_element (GConfValue *value,
-         GConfSchema *schema;
-         GConfValueType stype;
-         const char *owner;
-+        const char *gettext_domain;
-         
-         schema = gconf_value_get_schema (value);
- 
-@@ -3741,6 +3755,23 @@ write_value_element (GConfValue *value,
-             
-             g_free (s);
-           }
-+
-+        gettext_domain = gconf_schema_get_gettext_domain (schema);
-+        
-+        if (gettext_domain)
-+          {
-+            char *s;
-+
-+            s = g_markup_escape_text (gettext_domain, -1);
-+            
-+            if (fprintf (f, " gettext_domain=\"%s\"", s) < 0)
-+              {
-+                g_free (s);
-+                return FALSE;
-+              }
-+            
-+            g_free (s);
-+          }
-         
-         if (stype == GCONF_VALUE_LIST)
-           {
-diff -up GConf-2.26.0/doc/gconf-1.0.dtd.gettext GConf-2.26.0/doc/gconf-1.0.dtd
---- GConf-2.26.0/doc/gconf-1.0.dtd.gettext	2009-04-26 23:33:17.240736103 -0400
-+++ GConf-2.26.0/doc/gconf-1.0.dtd	2009-04-26 23:34:25.027700384 -0400
-@@ -7,7 +7,7 @@
- <!-- A single schema. What I am trying to say is "this set of
- elements, in any order". Duplicate elements (apart from <locale>) are
- not allowed). -->
--<!ELEMENT schema  (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*)*>
-+<!ELEMENT schema  (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*|gettext_domain?)*>
- 
- <!-- The key for this schema (e.g. /schemas/apps/foo/bar) -->
- <!ELEMENT key     (#PCDATA)>
-diff -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-internals.c
---- GConf-2.26.0/gconf/gconf-internals.c.gettext	2009-04-26 23:34:10.994700035 -0400
-+++ GConf-2.26.0/gconf/gconf-internals.c	2009-04-26 23:34:53.767450191 -0400
-@@ -513,6 +513,7 @@ gconf_fill_corba_schema_from_gconf_schem
-   cs->short_desc = CORBA_string_dup (gconf_schema_get_short_desc (sc) ? gconf_schema_get_short_desc (sc) : "");
-   cs->long_desc = CORBA_string_dup (gconf_schema_get_long_desc (sc) ? gconf_schema_get_long_desc (sc) : "");
-   cs->owner = CORBA_string_dup (gconf_schema_get_owner (sc) ? gconf_schema_get_owner (sc) : "");
-+  cs->gettext_domain = CORBA_string_dup (gconf_schema_get_gettext_domain (sc) ? gconf_schema_get_gettext_domain (sc) : "");
- 
-   {
-     gchar* encoded;
-@@ -600,6 +601,14 @@ gconf_schema_from_corba_schema(const Con
-         gconf_schema_set_owner(sc, cs->owner);
-     }
-       
-+  if (*cs->gettext_domain != '\0')
-+    {
-+      if (!g_utf8_validate (cs->gettext_domain, -1, NULL))
-+        gconf_log (GCL_ERR, _("Invalid UTF-8 in gettext domain for schema"));
-+      else
-+        gconf_schema_set_gettext_domain(sc, cs->gettext_domain);
-+    }
-+      
-   {
-     GConfValue* val;
- 
-diff -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-schema.c
---- GConf-2.26.0/gconf/gconf-schema.c.gettext	2009-04-26 23:33:26.787483545 -0400
-+++ GConf-2.26.0/gconf/gconf-schema.c	2009-04-26 23:35:54.240450142 -0400
-@@ -32,9 +32,10 @@ typedef struct {
-   GConfValueType car_type; /* Pair car type of the described entry */
-   GConfValueType cdr_type; /* Pair cdr type of the described entry */
-   gchar* locale;       /* Schema locale */
--  gchar* owner;        /* Name of creating application */
-+  const gchar* owner;        /* Name of creating application */
-   gchar* short_desc;   /* 40 char or less description, no newlines */
-   gchar* long_desc;    /* could be a paragraph or so */
-+  const gchar* gettext_domain; /* description gettext domain */
-   GConfValue* default_value; /* Default value of the key */
- } GConfRealSchema;
- 
-@@ -63,7 +64,6 @@ gconf_schema_free (GConfSchema* sc)
-   g_free (real->locale);
-   g_free (real->short_desc);
-   g_free (real->long_desc);
--  g_free (real->owner);
- 
-   if (real->default_value)
-     gconf_value_free (real->default_value);
-@@ -91,7 +91,9 @@ gconf_schema_copy (const GConfSchema* sc
- 
-   dest->long_desc = g_strdup (real->long_desc);
- 
--  dest->owner = g_strdup (real->owner);
-+  dest->gettext_domain = real->gettext_domain;
-+
-+  dest->owner = real->owner;
- 
-   dest->default_value = real->default_value ? gconf_value_copy (real->default_value) : NULL;
-   
-@@ -136,6 +138,17 @@ gconf_schema_set_locale (GConfSchema* sc
-     REAL_SCHEMA (sc)->locale = NULL;
- }
- 
-+void
-+gconf_schema_set_gettext_domain (GConfSchema* sc, const gchar* domain)
-+{
-+  g_return_if_fail (domain == NULL || g_utf8_validate (domain, -1, NULL));
-+  
-+  if (domain)
-+    REAL_SCHEMA (sc)->gettext_domain = g_intern_string (domain);
-+  else 
-+    REAL_SCHEMA (sc)->gettext_domain = NULL;
-+}
-+
- void          
- gconf_schema_set_short_desc (GConfSchema* sc, const gchar* desc)
- {
-@@ -169,11 +182,8 @@ gconf_schema_set_owner (GConfSchema* sc,
- {
-   g_return_if_fail (owner == NULL || g_utf8_validate (owner, -1, NULL));
-   
--  if (REAL_SCHEMA (sc)->owner)
--    g_free (REAL_SCHEMA (sc)->owner);
--
-   if (owner)
--    REAL_SCHEMA (sc)->owner = g_strdup (owner);
-+    REAL_SCHEMA (sc)->owner = g_intern_string (owner);
-   else
-     REAL_SCHEMA (sc)->owner = NULL;
- }
-@@ -228,6 +238,14 @@ gconf_schema_validate (const GConfSchema
-       return FALSE;
-     }
- 
-+  if (real->gettext_domain && !g_utf8_validate (real->gettext_domain, -1, NULL))
-+    {
-+      g_set_error (err, GCONF_ERROR,
-+                   GCONF_ERROR_FAILED,
-+                   _("Schema contains invalid UTF-8"));
-+      return FALSE;
-+    }
-+
-   if (real->owner && !g_utf8_validate (real->owner, -1, NULL))
-     {
-       g_set_error (err, GCONF_ERROR,
-@@ -299,11 +317,32 @@ gconf_schema_get_locale (const GConfSche
- }
- 
- const char*
-+gconf_schema_get_gettext_domain (const GConfSchema *schema)
-+{
-+  g_return_val_if_fail (schema != NULL, NULL);
-+
-+  return REAL_SCHEMA (schema)->gettext_domain;
-+}
-+
-+static inline const char *
-+schema_translate (const GConfSchema *schema,
-+                  const char        *string)
-+{
-+  if (REAL_SCHEMA (schema)->gettext_domain)
-+    {
-+      bind_textdomain_codeset (REAL_SCHEMA (schema)->gettext_domain, "UTF-8");
-+      return g_dgettext(REAL_SCHEMA (schema)->gettext_domain, string);
-+    }
-+  else
-+    return string;
-+}
-+
-+const char*
- gconf_schema_get_short_desc (const GConfSchema *schema)
- {
-   g_return_val_if_fail (schema != NULL, NULL);
- 
--  return REAL_SCHEMA (schema)->short_desc;
-+ return schema_translate (schema, REAL_SCHEMA (schema)->short_desc);
- }
- 
- const char*
-@@ -311,7 +350,7 @@ gconf_schema_get_long_desc (const GConfS
- {
-   g_return_val_if_fail (schema != NULL, NULL);
- 
--  return REAL_SCHEMA (schema)->long_desc;
-+ return schema_translate (schema, REAL_SCHEMA (schema)->long_desc);
- }
- 
- const char*
-diff -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-schema.h
---- GConf-2.26.0/gconf/gconf-schema.h.gettext	2009-04-26 23:33:33.979744088 -0400
-+++ GConf-2.26.0/gconf/gconf-schema.h	2009-04-26 23:34:25.030737043 -0400
-@@ -48,6 +48,8 @@ void gconf_schema_set_cdr_type          
-                                             GConfValueType  type);
- void gconf_schema_set_locale               (GConfSchema    *sc,
-                                             const gchar    *locale);
-+void gconf_schema_set_gettext_domain       (GConfSchema    *sc,
-+                                            const gchar    *domain);
- void gconf_schema_set_short_desc           (GConfSchema    *sc,
-                                             const gchar    *desc);
- void gconf_schema_set_long_desc            (GConfSchema    *sc,
-@@ -65,6 +67,7 @@ GConfValueType gconf_schema_get_list_typ
- GConfValueType gconf_schema_get_car_type      (const GConfSchema *schema);
- GConfValueType gconf_schema_get_cdr_type      (const GConfSchema *schema);
- const char*    gconf_schema_get_locale        (const GConfSchema *schema);
-+const char*    gconf_schema_get_gettext_domain(const GConfSchema *schema);
- const char*    gconf_schema_get_short_desc    (const GConfSchema *schema);
- const char*    gconf_schema_get_long_desc     (const GConfSchema *schema);
- const char*    gconf_schema_get_owner         (const GConfSchema *schema);
-diff -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c
---- GConf-2.26.0/gconf/gconftool.c.gettext	2009-04-26 23:33:41.907451190 -0400
-+++ GConf-2.26.0/gconf/gconftool.c	2009-04-26 23:34:25.034736752 -0400
-@@ -3295,6 +3295,7 @@ struct _SchemaInfo {
-   GConfValueType cdr_type;
-   GConfValue* global_default;
-   GHashTable* hash;
-+  gchar* gettext_domain;
- };
- 
- static int
-@@ -3547,6 +3548,15 @@ extract_global_info(xmlNodePtr node,
-               else
-                 g_printerr (_("WARNING: empty <applyto> node"));
-             }
-+          else if (strcmp((char *)iter->name, "gettext_domain") == 0)
-+            {
-+              tmp = (char *)xmlNodeGetContent(iter);
-+              if (tmp)
-+                {
-+                  info->gettext_domain = g_strdup(tmp);
-+                  xmlFree(tmp);
-+                }
-+            }
-           else
-             g_printerr (_("WARNING: node <%s> not understood below <schema>\n"),
- 			iter->name);
-@@ -3636,6 +3646,9 @@ process_locale_info(xmlNodePtr node, Sch
-   if (info->owner != NULL)
-     gconf_schema_set_owner(schema, info->owner);
- 
-+  if (info->gettext_domain != NULL)
-+    gconf_schema_set_gettext_domain(schema, info->gettext_domain);
-+
-   xmlFree(name);
- 
-   /* Locale-specific info */
-@@ -3765,6 +3778,7 @@ get_schema_from_xml(xmlNodePtr node, gch
-   info.apply_to = NULL;
-   info.owner = NULL;
-   info.global_default = NULL;
-+  info.gettext_domain = NULL;
-   info.hash = g_hash_table_new(g_str_hash, g_str_equal);
-   
-   extract_global_info(node, &info);
-@@ -3801,6 +3815,8 @@ get_schema_from_xml(xmlNodePtr node, gch
-             ;  /* nothing */
-           else if (strcmp((char *)iter->name, "applyto") == 0)
-             ;  /* nothing */
-+          else if (strcmp((char *)iter->name, "gettext_domain") == 0)
-+            ;  /* nothing */
-           else if (strcmp((char *)iter->name, "locale") == 0)
-             {
-               process_locale_info(iter, &info);
-diff -up GConf-2.26.0/gconf/GConfX.idl.gettext GConf-2.26.0/gconf/GConfX.idl
---- GConf-2.26.0/gconf/GConfX.idl.gettext	2009-04-26 23:33:58.457483190 -0400
-+++ GConf-2.26.0/gconf/GConfX.idl	2009-04-26 23:34:53.764448732 -0400
-@@ -16,6 +16,7 @@ struct ConfigSchema {
-   string short_desc;
-   string long_desc;
-   string owner;
-+  string gettext_domain;
-   // Work around lack of recursive data types
-   string encoded_default_value;
- };
diff --git a/abs/extra-testing/gconf/PKGBUILD b/abs/extra-testing/gconf/PKGBUILD
deleted file mode 100644
index 3da7a0c..0000000
--- a/abs/extra-testing/gconf/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 74317 2010-03-30 19:00:27Z ibiru $
-# Maintainer:  Jan de Groot <jan@archlinux.org>
-
-pkgname=gconf
-pkgver=2.28.1
-pkgrel=1
-pkgdesc="A configuration database system"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('orbit2>=2.14.17' 'gtk2>=2.20.0' 'libxml2>=2.7.7' 'polkit>=0.96' 'libldap>=2.4.18' 'dbus')
-makedepends=('pkgconfig' 'intltool' 'gtk-doc')
-options=('!libtool')
-install=gconf.install
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/GConf/2.28/GConf-${pkgver}.tar.bz2
-        gconf-merge-schema
-        gconfpkg
-        gconf-reload.patch
-        01_xml-gettext-domain.patch)
-md5sums=('27663faf0af4f6a6d534de9270f6d24a'
-         '240b473fa17b748fc9020caf372d936c'
-         'b745f04b4121d8724c002b14a4c110b6'
-         'cfcc8e15be7b8a48de4aa34336ff6090'
-         '1f9362976d71312bdb57c57fa031681d')
-
-build() {
-  cd "${srcdir}/GConf-${pkgver}"
-  # Patch from fedora - reloads gconf after installing schemas
-  patch -Np1 -i "${srcdir}/gconf-reload.patch" || return 1
-  # http://bugzilla.gnome.org/show_bug.cgi?id=568845
-  patch -Np1 -i "${srcdir}/01_xml-gettext-domain.patch" || return 1
-   
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/GConf \
-      --disable-static --enable-defaults-service || return 1
-  make pkglibdir=/usr/lib/GConf || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -m755 -d "${pkgdir}/etc/gconf/gconf.xml.system" || return 1
-  install -m755 "${srcdir}/gconf-merge-schema" "${pkgdir}/usr/bin/" || return 1
-  install -d -m755 "${pkgdir}/usr/sbin"
-  install -m755 "${srcdir}/gconfpkg" "${pkgdir}/usr/sbin/" || return 1
-}
diff --git a/abs/extra-testing/gconf/gconf-merge-schema b/abs/extra-testing/gconf/gconf-merge-schema
deleted file mode 100755
index 992c162..0000000
--- a/abs/extra-testing/gconf/gconf-merge-schema
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-if [ ! "$1" -a ! "$2" ]; then
-  echo "Usage: $0 output.schemas [--domain gettextdomain] file1.schemas [file2.schemas [...]]"
-  exit 1
-fi
-
-OUTFILE="$1"
-DOMAIN=""
-shift
-
-if [ "$1" = "--domain" ]; then
-  shift
-  DOMAIN=$1
-  shift
-fi
-
-echo '<?xml version="1.0"?>' > "$OUTFILE"
-echo '<gconfschemafile><schemalist>' >> "$OUTFILE"
-
-while [ "$1" ]; do
-  if [ -f "$1" ]; then
-    sed -e '/<?xml/d' \
-        -e 's|<gconfschemafile>||g' \
-	-e 's|</gconfschemafile>||g' \
-        -e 's|<schemalist>||g' \
-	-e 's|</schemalist>||g' "$1" >> "$OUTFILE"
-  fi
-  shift
-done
-  
-echo '</schemalist></gconfschemafile>' >> "$OUTFILE"
-if [ "$DOMAIN" != "" ]; then
-  sed -ri "s/^([[:space:]]*)(<locale name=\"C\">)/\1<gettext_domain>$DOMAIN<\/gettext_domain>\n\1\2/; /^[[:space:]]*<locale name=\"[^C]/,/^[[:space:]]*<\/locale>[[:space:]]*\$/ d; /^$/d; s/<\/schema>$/&\n/" "$OUTFILE"
-fi
diff --git a/abs/extra-testing/gconf/gconf-reload.patch b/abs/extra-testing/gconf/gconf-reload.patch
deleted file mode 100644
index 910f0da..0000000
--- a/abs/extra-testing/gconf/gconf-reload.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- GConf-2.16.0/gconf/gconftool.c.orig	2006-10-14 17:37:14.000000000 +0000
-+++ GConf-2.16.0/gconf/gconftool.c	2006-10-14 17:39:27.000000000 +0000
-@@ -963,6 +963,8 @@ main (int argc, char** argv)
-       
-       gconf_engine_unref (conf);
- 
-+      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
-+
-       return retval;
-     }
- 
-@@ -975,6 +977,8 @@ main (int argc, char** argv)
-       
-       gconf_engine_unref (conf);
- 
-+      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
-+
-       return retval;
-     }
- 
diff --git a/abs/extra-testing/gconf/gconf.install b/abs/extra-testing/gconf/gconf.install
deleted file mode 100644
index 4e792c4..0000000
--- a/abs/extra-testing/gconf/gconf.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-  ldconfig -r .
-  chmod 755 etc/gconf/gconf.xml.system
-}
-
-post_upgrade() {
-  ldconfig -r .
-  if [ `vercmp $2 2.18.0.1-2` -lt 0 ]; then
-    echo "Regenerating GConf database... "
-    # Move from /opt/gnome to /usr
-    ldconfig -r .
-    export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-    find /opt/gnome/{etc,share}/gconf/schemas -name "*.schemas" | xargs \
-      usr/bin/gconftool-2 --makefile-install-rule > /dev/null
-    if [ -f opt/gnome/etc/gconf/panel-default-setup.entries ]; then
-      usr/bin/gconftool-2 --direct --load opt/gnome/etc/gconf/panel-default-setup.entries > /dev/null
-    fi
-    echo "done."
-  fi
-  chmod 755 etc/gconf/gconf.xml.system
-    
-  PID=`pidof gconfd-2`
-  if [ ! -z "${PID}" ]; then
-    kill ${PID}
-  fi
-}
diff --git a/abs/extra-testing/gconf/gconfpkg b/abs/extra-testing/gconf/gconfpkg
deleted file mode 100755
index 72021e4..0000000
--- a/abs/extra-testing/gconf/gconfpkg
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-usage() {
-cat << _EOF
-Usage:
-  gconfpkg [OPTION] [PACKAGE] 
-
-  Help Options:
-    -?, --help            Show help options
-
-  Application Options:
-    --install             Install schemas for a given package
-    --uninstall           Uninstall schemas for a given package
-
-_EOF
-}
-
-install() {
-  GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-      /usr/bin/gconftool-2 --makefile-install-rule /usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
-}
-
-uninstall() {
-  if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=/usr/share/gconf/schemas/${pkgname}.schemas
-  elif [ -f /opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=/opt/gnome/share/gconf/schemas/${pkgname}.schemas
-  else
-    schemas=`pacman -Ql ${pkgname} | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`
-  fi
-  GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-      /usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas} >/dev/null
-}
-
-if [ -z "$2" ]; then
-  usage
-else
-  pkgname="$2"
-  case "$1" in
-    --install)
-      install
-    ;;
-    --uninstall)
-      uninstall
-    ;;
-    *)
-    usage
-    ;;
-  esac
-fi
diff --git a/abs/extra-testing/gd/PKGBUILD b/abs/extra-testing/gd/PKGBUILD
deleted file mode 100644
index 3df77a1..0000000
--- a/abs/extra-testing/gd/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-
-pkgname=gd
-pkgver=2.0.35
-pkgrel=2
-pkgdesc="Library for the dynamic creation of images by programmers"
-arch=('i686' 'x86_64')
-url="http://www.libgd.org/"
-license=('custom')
-depends=('libpng>=1.2.16' 'fontconfig>=2.4.2' 'libjpeg')
-options=('!libtool')
-source=(http://www.libgd.org/releases/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('6c6c3dbb7bf079e0bb5fbbfd3bb8a71c')
-sha1sums=('ccf34a610abff2dbf133a20c4d2a4aa94939018a')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --without-xpm
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
-  install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING
-}
diff --git a/abs/extra-testing/gdl/PKGBUILD b/abs/extra-testing/gdl/PKGBUILD
deleted file mode 100644
index f7ee580..0000000
--- a/abs/extra-testing/gdl/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 32356 2009-03-30 17:59:10Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gdl
-pkgver=2.90.0
-pkgrel=1
-pkgdesc="Gnome Devtool Libraries"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.gnome.org/"
-depends=('libglade>=2.6.4')
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/gdl/2.90/${pkgname}-${pkgver}.tar.bz2)
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
-md5sums=('7ccaafc1b55c510a4e39ea7e54844bb3')
diff --git a/abs/extra-testing/geoip/PKGBUILD b/abs/extra-testing/geoip/PKGBUILD
deleted file mode 100644
index 9ae74ba..0000000
--- a/abs/extra-testing/geoip/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 40078 2009-05-27 06:04:17Z juergen $
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Contributor: Manolis Tzanidakis <manolis@archlinux.org>
-
-pkgname=geoip
-pkgver=1.4.6
-pkgrel=1
-pkgdesc="Non-DNS IP-to-country resolver C library & utils"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.maxmind.com/app/c"
-depends=('zlib')
-backup=(etc/geoip/GeoIP.conf)
-options=('!libtool')
-source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-${pkgver}.tar.gz)
-md5sums=('cb14b1beeb40631a12676b11ca0c309a')
-
-build() {
-  cd ${startdir}/src/GeoIP-${pkgver}
-  ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc/geoip
-  make || return 1
-  make check || return 1
-  make DESTDIR=${startdir}/pkg install
-}
-
diff --git a/abs/extra-testing/glew/PKGBUILD b/abs/extra-testing/glew/PKGBUILD
deleted file mode 100644
index 1db995d..0000000
--- a/abs/extra-testing/glew/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 27226 2009-02-17 05:43:56Z eric $
-# AUR-Maintainer: William Rea <sillywilly@gmail.com>
-# Contributor: SleepyDog
-
-pkgname=glew
-pkgver=1.5.5
-pkgrel=1
-pkgdesc="A cross-platform C/C++ extension loading library"
-arch=('i686' 'x86_64')
-url="http://glew.sourceforge.net"
-license=('BSD' 'MIT' 'GPL')
-depends=('libxmu' 'libxi' 'mesa')
-makedepends=('hd2u')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz)
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  dos2unix config/config.guess
-  make || return 1
-  make GLEW_DEST=${startdir}/pkg/usr LIBDIR=${startdir}/pkg/usr/lib install || return 1
-  install -D -m644 LICENSE.txt ${startdir}/pkg/usr/share/licenses/${pkgname}/LICENSE.txt || return 1
-}
-md5sums=('3621f27cfd3e33d5dbcc1111ecb5b762')
diff --git a/abs/extra-testing/gnome-common/PKGBUILD b/abs/extra-testing/gnome-common/PKGBUILD
deleted file mode 100644
index e0078dd..0000000
--- a/abs/extra-testing/gnome-common/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id: PKGBUILD 54859 2009-10-11 19:55:23Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-common
-pkgver=2.28.0
-pkgrel=1
-pkgdesc="Common development macros for GNOME2"
-arch=(any)
-license=('GPL')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('dd4817103d23745d00c735dd137951552ba7b576cb8f68e6a529d06661e9b6a1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra-testing/gnome-desktop/PKGBUILD b/abs/extra-testing/gnome-desktop/PKGBUILD
deleted file mode 100644
index ddd10ad..0000000
--- a/abs/extra-testing/gnome-desktop/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 24727 2009-01-20 10:17:53Z douglas $
-# Maintainer:  Jan de Groot <jan@archlinux.org>
-
-pkgname=gnome-desktop
-pkgver=2.24.3
-pkgrel=1
-pkgdesc="The GNOME Desktop"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('libgnomeui>=2.24.0' 'startup-notification>=0.9')
-makedepends=('gnome-doc-utils>=0.14.2' 'pkgconfig' 'intltool')
-optdepends=('gnome-python: gnome-about')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('27579963a56d1d35a22e30c21666a500')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-        --localstatedir=/var --disable-static \
-	--with-gnome-distributor="Archlinux" \
-	--disable-scrollkeeper || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra-testing/gnome-doc-utils/PKGBUILD b/abs/extra-testing/gnome-doc-utils/PKGBUILD
deleted file mode 100644
index b450165..0000000
--- a/abs/extra-testing/gnome-doc-utils/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 24717 2009-01-20 09:52:00Z douglas $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-doc-utils
-pkgver=0.14.2
-pkgrel=1
-pkgdesc="Documentation utilities for Gnome"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('libxslt>=1.1.24' 'python>=2.6' 'docbook-xml' 'rarian>=0.8.1')
-makedependd7a7d8646f34571704e4be62e5c7107fs=('pkgconfig' 'perlxml')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.14/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d7a7d8646f34571704e4be62e5c7107f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
-              --localstatedir=/var --disable-scrollkeeper || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra-testing/gnome-keyring/PKGBUILD b/abs/extra-testing/gnome-keyring/PKGBUILD
deleted file mode 100644
index d0ea53d..0000000
--- a/abs/extra-testing/gnome-keyring/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-#$Id: PKGBUILD 15806 2008-10-19 09:55:58Z jgc $
-#Maintainer: Jan De Groot <jgc@archlinux.org>
-
-pkgname=gnome-keyring
-pkgver=2.24.1
-pkgrel=1
-pkgdesc="GNOME Password Management daemon"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gconf>=2.24.0' 'hal>=0.5.11')
-makedepends=('perlxml' 'pkgconfig')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=gnome-keyring.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2
-	gnome-keyring.service)
-md5sums=('aa5552dc129f3509ee39145b7f0bf977' '16062d82eb8062201fb24f3e0ceb49a6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static \
-	      --libexecdir=/usr/lib/gnome-keyring \
-	      --with-pam-dir=/lib/security || return 1
-  make || return 1
-  make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
-
-  install -m755 -d "${pkgdir}/usr/share/dbus-1/services"
-  install -m644 "${srcdir}/gnome-keyring.service" "${pkgdir}/usr/share/dbus-1/services/" || return 1
-     
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/abs/extra-testing/gnome-keyring/gnome-keyring.install b/abs/extra-testing/gnome-keyring/gnome-keyring.install
deleted file mode 100644
index 8874c6e..0000000
--- a/abs/extra-testing/gnome-keyring/gnome-keyring.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=gnome-keyring
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  if [ -f usr/share/gconf/${pkgname}.schemas ]; then
-    usr/sbin/gconfpkg --uninstall ${pkgname}
-  fi
-}
diff --git a/abs/extra-testing/gnome-keyring/gnome-keyring.service b/abs/extra-testing/gnome-keyring/gnome-keyring.service
deleted file mode 100644
index 96ea061..0000000
--- a/abs/extra-testing/gnome-keyring/gnome-keyring.service
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.gnome.keyring
-Exec=/usr/bin/gnome-keyring-daemon
diff --git a/abs/extra-testing/gnome-menus/PKGBUILD b/abs/extra-testing/gnome-menus/PKGBUILD
deleted file mode 100644
index 491fd40..0000000
--- a/abs/extra-testing/gnome-menus/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 19656 2008-11-28 20:25:40Z jgc $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-
-pkgname=gnome-menus
-pkgver=2.24.2
-pkgrel=1
-pkgdesc="GNOME menu specifications"
-arch=(i686 x86_64)
-depends=('pygtk>=2.13.0')
-makedepends=('pkgconfig' 'intltool')
-options=('!libtool' '!makeflags')
-license=('GPL' 'LGPL')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2
-	menus.patch)
-md5sums=('ca8e25b031fd7024b3f9abe1c6865d2c' '37b1021887f60a9cead67172e51a3a18')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i "${srcdir}/menus.patch" || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var \
-	      --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra-testing/gnome-menus/menus.patch b/abs/extra-testing/gnome-menus/menus.patch
deleted file mode 100644
index bf73e86..0000000
--- a/abs/extra-testing/gnome-menus/menus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- layout/applications.menu	2005-06-28 10:16:39.000000000 +0200
-+++ layout/applications.menu	2005-09-12 23:21:20.000000000 +0200
-@@ -7,7 +7,6 @@
-   <Directory>Applications.directory</Directory>
- 
-   <!-- Scan legacy dirs first, as later items take priority -->
--  <KDELegacyDirs/>
-   <LegacyDir>/etc/X11/applnk</LegacyDir>
-   <LegacyDir>/usr/share/gnome/apps</LegacyDir>
- 
-@@ -18,6 +17,14 @@
-   <!-- Read in overrides and child menus from applications-merged/ -->
-   <DefaultMergeDirs/>
- 
-+  <!-- Archlinux submenu -->
-+  <Menu>
-+    <Name>Archlinux</Name>
-+    <Directory>Archlinux.directory</Directory>
-+    <Include>
-+      <Category>Archlinux</Category>
-+    </Include>
-+  </Menu> <!-- End Archlinux -->
-   <!-- Accessories submenu -->
-   <Menu>
-     <Name>Accessories</Name>
diff --git a/abs/extra-testing/gnome-mime-data/PKGBUILD b/abs/extra-testing/gnome-mime-data/PKGBUILD
deleted file mode 100644
index 2ce4092..0000000
--- a/abs/extra-testing/gnome-mime-data/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-mime-data
-pkgver=2.18.0
-pkgrel=3
-pkgdesc="The base MIME and Application database for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('shared-mime-info') 
-makedepens=('perlxml')
-url="http://www.gnome.org"
-groups=('gnome')
-source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('541858188f80090d12a33b5a7c34d42c')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
-
-  mkdir -p ${startdir}/pkg/usr/lib
-  mv ${startdir}/pkg/usr/share/pkgconfig ${startdir}/pkg/usr/lib/
-}
diff --git a/abs/extra-testing/gnome-python-extras/PKGBUILD b/abs/extra-testing/gnome-python-extras/PKGBUILD
deleted file mode 100644
index 297ef68..0000000
--- a/abs/extra-testing/gnome-python-extras/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 35285 2009-04-11 20:46:50Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-python-extras
-pkgver=2.25.3
-pkgrel=1
-pkgdesc="Gnome Python interfaces for libraries not part of the core platform"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gnome-python>=2.22.1')
-makedepends=('libgtkhtml' 'gtkspell' 'gdl' 'xulrunner>=1.9' 'libgksu' 'pkgconfig' 'libgnomeui' 'libgda')
-optdepends=('libgtkhtml' 'gtkspell' 'gdl' 'xulrunner' 'libgksu' 'libgnomeui' 'libgda')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python-extras/2.25/gnome-python-extras-${pkgver}.tar.bz2)
-url="http://www.daa.com.au/~james/pygtk/"
-md5sums=('9f3b7ec5c57130b96061cb486b79c076')
-
-build() {
-  cd "${srcdir}/gnome-python-extras-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make MOZILLA_HOME=/usr/lib/xulrunner-1.9 || return 1 
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra-testing/gnome-python-extras/gnome-python-extras-2.19.1-pkg-config.patch b/abs/extra-testing/gnome-python-extras/gnome-python-extras-2.19.1-pkg-config.patch
deleted file mode 100644
index 77fd0a4..0000000
--- a/abs/extra-testing/gnome-python-extras/gnome-python-extras-2.19.1-pkg-config.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -up gnome-python-extras-2.19.1/configure.pkg-config gnome-python-extras-2.19.1/configure
---- gnome-python-extras-2.19.1/configure.pkg-config	2008-01-12 21:07:56.000000000 -0500
-+++ gnome-python-extras-2.19.1/configure	2008-01-12 21:09:49.000000000 -0500
-@@ -22096,14 +22096,14 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$mozpackage-gtkmozembed >= \$mozpackage_required_version,
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\mozilla-gtkmozembed >= \$mozpackage_required_version,
-                                 gtk+-2.0                >= 2.4.0\"") >&5
--  ($PKG_CONFIG --exists --print-errors "$mozpackage-gtkmozembed >= $mozpackage_required_version,
-+  ($PKG_CONFIG --exists --print-errors "mozilla-gtkmozembed >= $mozpackage_required_version,
-                                 gtk+-2.0                >= 2.4.0") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "$mozpackage-gtkmozembed >= $mozpackage_required_version,
-+  pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "mozilla-gtkmozembed >= $mozpackage_required_version,
-                                 gtk+-2.0                >= 2.4.0" 2>/dev/null`
- else
-   pkg_failed=yes
-@@ -22117,14 +22117,14 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$mozpackage-gtkmozembed >= \$mozpackage_required_version,
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\mozilla-gtkmozembed >= \$mozpackage_required_version,
-                                 gtk+-2.0                >= 2.4.0\"") >&5
--  ($PKG_CONFIG --exists --print-errors "$mozpackage-gtkmozembed >= $mozpackage_required_version,
-+  ($PKG_CONFIG --exists --print-errors "mozilla-gtkmozembed >= $mozpackage_required_version,
-                                 gtk+-2.0                >= 2.4.0") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "$mozpackage-gtkmozembed >= $mozpackage_required_version,
-+  pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "mozilla-gtkmozembed >= $mozpackage_required_version,
-                                 gtk+-2.0                >= 2.4.0" 2>/dev/null`
- else
-   pkg_failed=yes
-@@ -22144,10 +22144,10 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$mozpackage-gtkmozembed >= $mozpackage_required_version,
-+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-gtkmozembed >= $mozpackage_required_version,
-                                 gtk+-2.0                >= 2.4.0"`
-         else
--	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$mozpackage-gtkmozembed >= $mozpackage_required_version,
-+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-gtkmozembed >= $mozpackage_required_version,
-                                 gtk+-2.0                >= 2.4.0"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
-@@ -22179,7 +22179,7 @@ fi
- if test -n "$export_dynamic"; then
-   GTKMOZEMBED_LIBS=`echo $GTKMOZEMBED_LIBS | sed -e "s/$export_dynamic//"`
- fi
--MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
-+MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
- 
- 
- 
diff --git a/abs/extra-testing/gnome-python-extras/gnome-python-extras-2.19.1-xulrunner.patch b/abs/extra-testing/gnome-python-extras/gnome-python-extras-2.19.1-xulrunner.patch
deleted file mode 100644
index d2fa26e..0000000
--- a/abs/extra-testing/gnome-python-extras/gnome-python-extras-2.19.1-xulrunner.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up gnome-python-extras-2.19.1/docs/gtkmozembed/html/class-gtkmozembed.html.old gnome-python-extras-2.19.1/docs/gtkmozembed/html/class-gtkmozembed.html
-diff -up gnome-python-extras-2.19.1/docs/gtkmozembed/html/pygtkmozembed.devhelp.old gnome-python-extras-2.19.1/docs/gtkmozembed/html/pygtkmozembed.devhelp
-diff -up gnome-python-extras-2.19.1/docs/gtkmozembed/gtkmozembed-gtkmozembed.xml.old gnome-python-extras-2.19.1/docs/gtkmozembed/gtkmozembed-gtkmozembed.xml
-diff -up gnome-python-extras-2.19.1/gtkmozembed/gtkmozembed.override.old gnome-python-extras-2.19.1/gtkmozembed/gtkmozembed.override
-diff -up gnome-python-extras-2.19.1/gtkmozembed/gtkmozembed.defs.old gnome-python-extras-2.19.1/gtkmozembed/gtkmozembed.defs
---- gnome-python-extras-2.19.1/gtkmozembed/gtkmozembed.defs.old	2007-06-05 16:52:30.000000000 +0200
-+++ gnome-python-extras-2.19.1/gtkmozembed/gtkmozembed.defs	2007-11-27 12:54:42.000000000 +0100
-@@ -123,6 +123,14 @@
-   )
- )
- 
-+(define-function set_path
-+  (c-name "gtk_moz_embed_set_path")
-+  (return-type "none")
-+  (parameters
-+    '("char*" "aPath")
-+  )
-+)
-+
- (define-function gtk_moz_embed_set_profile_path
-   (c-name "gtk_moz_embed_set_profile_path_deprecated")
-   (return-type "none")
diff --git a/abs/extra-testing/gnome-python/PKGBUILD b/abs/extra-testing/gnome-python/PKGBUILD
deleted file mode 100644
index d9e0045..0000000
--- a/abs/extra-testing/gnome-python/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 16730 2008-10-22 02:56:32Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sarah Hay <sarah@archlinux.org>
-
-pkgname=gnome-python
-pkgver=2.22.3
-pkgrel=3
-pkgdesc="gnome-python is a set of interfaces to gnome-libs."
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('pygtk>=2.13.0' 'pyorbit>=2.24.0' 'libgnomeui>=2.24.0')
-makedepends=('pkgconfig')
-groups=('gnome')
-options=('!libtool')
-url="http://www.pygtk.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python/2.22/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ab12d94954a57de39b25eb7903d8429c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./waf configure --prefix=/usr || return 1
-  ./waf build ${MAKEFLAGS} || return 1
-  ./waf install --destdir="${pkgdir}" || return 1
-}
diff --git a/abs/extra-testing/gnome-screensaver/PKGBUILD b/abs/extra-testing/gnome-screensaver/PKGBUILD
deleted file mode 100644
index cdd4e0b..0000000
--- a/abs/extra-testing/gnome-screensaver/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 29213 2009-03-06 18:47:56Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-screensaver
-pkgver=2.24.1
-pkgrel=7
-pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
-arch=(i686 x86_64)
-license=('GPL')
-url="http://live.gnome.org/GnomeScreensaver"
-backup=(etc/pam.d/gnome-screensaver)
-depends=('gnome-menus>=2.24.2' 'libgnomekbd>=2.24.0' 'libxss' 'libgl' 'libnotify' 'gnome-desktop>=2.24.2' 'libxxf86misc')
-makedepends=('pkgconfig' 'gettext' 'intltool' 'mesa' 'xscreensaver' 'libxslt')
-groups=('gnome')
-options=(!emptydirs)
-install=gnome-screensaver.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2
-	gnome-screensaver.pam
-	bug564548.patch)
-md5sums=('f0b9cc3108bb9105141a8c22b56bf615'
-         '4b4d2672a787e0d2ed792b4c308ccf8d'
-	 'b2accd56fd1e7e3855c1cee3cc3780c4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/bug564548.patch" || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --libexecdir=/usr/lib/gnome-screensaver \
-              --localstatedir=/var --with-gdm-config=/usr/share/gdm/defaults.conf \
-	      --with-xscreensaverdir=/usr/share/xscreensaver/config \
-	      --with-xscreensaverhackdir=/usr/lib/xscreensaver \
-	      --with-dpms-ext || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-
-  install -m644 "${srcdir}/gnome-screensaver.pam" "${pkgdir}/etc/pam.d/gnome-screensaver" || return 1
-
-  #Migrate xscreensaver configuration files
-  cd "${pkgdir}/usr/share/applications/screensavers"
-  "${srcdir}/${pkgname}-${pkgver}/data/migrate-xscreensaver-config.sh" /usr/share/xscreensaver/config/*.xml || return 1
-  
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-  ls $pkgdir/usr/share/applications/screensavers/|cut -d. -f1 > $startdir/gscreensavers
-
-}
diff --git a/abs/extra-testing/gnome-screensaver/__changelog b/abs/extra-testing/gnome-screensaver/__changelog
deleted file mode 100644
index 3fb149c..0000000
--- a/abs/extra-testing/gnome-screensaver/__changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-add defaults to install file
-make xsltproc part of makedepends
-print list of screensavers to gscreensavers
-  ls $pkgdir/usr/share/applications/screensavers/|cut -d. -f1 > $startdir/gscreensavers
-
diff --git a/abs/extra-testing/gnome-screensaver/bug564548.patch b/abs/extra-testing/gnome-screensaver/bug564548.patch
deleted file mode 100644
index da58094..0000000
--- a/abs/extra-testing/gnome-screensaver/bug564548.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- trunk/src/gs-window-x11.c	2008/05/29 17:03:19	1452
-+++ trunk/src/gs-window-x11.c	2008/12/15 15:19:36	1571
-@@ -2287,6 +2287,10 @@
- 
-         gs_window_dialog_finish (window);
- 
-+        if (window->priv->background_pixmap) {
-+               g_object_unref (window->priv->background_pixmap);
-+        }
-+
-         G_OBJECT_CLASS (gs_window_parent_class)->finalize (object);
- }
- 
diff --git a/abs/extra-testing/gnome-screensaver/gnome-screensaver.install b/abs/extra-testing/gnome-screensaver/gnome-screensaver.install
deleted file mode 100644
index bd98655..0000000
--- a/abs/extra-testing/gnome-screensaver/gnome-screensaver.install
+++ /dev/null
@@ -1,32 +0,0 @@
-pkgname=gnome-screensaver
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  #set defaults
-  gconftool-2 --direct  --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults  --type bool   --set /apps/gnome-screensaver/lock_enabled false
-  gconftool-2 --direct  --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults  --type int -s "/apps/gnome-screensaver/idle_delay" 10
-  gconftool-2 --direct  --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults  --set --type list --list-type=string /apps/gnome-screensaver/themes [screensavers-cosmos-slideshow]
-  gconftool-2 --direct  --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults  --type string -s "/apps/gnome-screensaver/mode" single 
-
-       if grep gnome-screensaver-command /home/mythtv/.mplayer/config
-       then
-                echo "Nothing to do here..."
-       else
-	        echo "heartbeat-cmd=\"gnome-screensaver-command -p &\"" >> /home/mythtv/.mplayer/config
-	fi
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-  grep -v gnome-screensaver /home/mythtv/.mplayer/config > /tmp/mp-config
-  mv /tmp/mp-config /home/mythtv/.mplayer/config
-  chown mythtv.mythtv /home/mythtv/.mplayer/config
-}
diff --git a/abs/extra-testing/gnome-screensaver/gnome-screensaver.pam b/abs/extra-testing/gnome-screensaver/gnome-screensaver.pam
deleted file mode 100644
index c776a54..0000000
--- a/abs/extra-testing/gnome-screensaver/gnome-screensaver.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth        required     pam_unix_auth.so
-auth        optional     pam_gnome_keyring.so
diff --git a/abs/extra-testing/gnome-screensaver/gscreensavers b/abs/extra-testing/gnome-screensaver/gscreensavers
deleted file mode 100644
index 7f56072..0000000
--- a/abs/extra-testing/gnome-screensaver/gscreensavers
+++ /dev/null
@@ -1,200 +0,0 @@
-abstractile
-anemone
-anemotaxis
-antinspect
-antmaze
-antspotlight
-apollonian
-apple2
-atlantis
-attraction
-atunnel
-barcode
-blaster
-blinkbox
-blitspin
-blocktube
-boing
-bouboule
-bouncingcow
-boxed
-boxfit
-braid
-bsod
-bubble3d
-bumps
-cage
-carousel
-ccurve
-celtic
-circuit
-cloudlife
-compass
-coral
-cosmos-slideshow
-crackberg
-crystal
-cube21
-cubenetic
-cubestorm
-cubicgrid
-cwaves
-cynosure
-dangerball
-decayscreen
-deco
-deluxe
-demon
-discrete
-distort
-drift
-endgame
-engine
-epicycle
-eruption
-euler2d
-extrusion
-fadeplot
-fiberlamp
-fireworkx
-flame
-flipflop
-flipscreen3d
-fliptext
-flow
-fluidballs
-flurry
-flyingtoasters
-fontglide
-footlogo-floaters
-fuzzyflakes
-galaxy
-gears
-gflux
-glblur
-glcells
-gleidescope
-glhanoi
-glknots
-glmatrix
-glplanet
-glschool
-glslideshow
-glsnake
-gltext
-goop
-grav
-greynetic
-halftone
-halo
-helix
-hopalong
-hyperball
-hypercube
-hypertorus
-hypnowheel
-ifs
-imsmap
-interaggregate
-interference
-intermomentary
-jigglypuff
-jigsaw
-juggle
-juggler3d
-julia
-kaleidescope
-klein
-kumppa
-lament
-lavalite
-lcdscrub
-lockward
-loop
-m6502
-maze
-memscroller
-menger
-metaballs
-mirrorblob
-moebius
-moebiusgears
-moire
-moire2
-molecule
-morph3d
-mountain
-munch
-nerverot
-noof
-noseguy
-pacman
-pedal
-penetrate
-penrose
-personal-slideshow
-petri
-phosphor
-photopile
-piecewise
-pinion
-pipes
-polyhedra
-polyominoes
-polytopes
-pong
-popsquares
-providence
-pulsar
-pyro
-qix
-queens
-rd-bomb
-ripples
-rocks
-rorschach
-rotzoomer
-rubik
-sballs
-shadebobs
-sierpinski
-sierpinski3d
-skytentacles
-slidescreen
-slip
-sonar
-speedmine
-spheremonics
-spotlight
-sproingies
-squiral
-stairs
-starfish
-starwars
-stonerview
-strange
-substrate
-superquadrics
-swirl
-tangram
-thornbird
-timetunnel
-topblock
-triangle
-truchet
-twang
-vermiculate
-vidwhacker
-voronoi
-wander
-webcollage
-whirlwindwarp
-wormhole
-xanalogtv
-xflame
-xjack
-xlyap
-xmatrix
-xrayswarm
-xspirograph
-zoom
diff --git a/abs/extra-testing/gnome-vfs/PKGBUILD b/abs/extra-testing/gnome-vfs/PKGBUILD
deleted file mode 100644
index b8434a7..0000000
--- a/abs/extra-testing/gnome-vfs/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 75359 2010-04-01 11:48:46Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-vfs
-pkgver=2.24.3
-pkgrel=2
-pkgdesc="The GNOME Virtual File System"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('fam' 'gconf>=2.28.0' 'hal>=0.5.13' 'bzip2' 'avahi>=0.6.25' 'smbclient>=3.3.7' 'gnome-mime-data>=2.18.0-2' 'heimdal>=1.3.1' 'gnutls>=2.8.3')
-makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common')
-options=('!libtool' '!emptydirs' '!makeflags')
-conflicts=(gnome-vfs-samba)
-provides=(gnome-vfs-samba)
-replaces=(gnome-vfs-samba gnome-vfs-extras)
-url="http://www.gnome.org"
-install=gnome-vfs.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2
-        hal-show-volume-names.patch
-        gnutls-config.patch)
-sha256sums=('3b0f342e79813bfc11d8e636db96b3ffd16c9ca48b07306410e09a3fd1065b4a'
-            'b38b86d6c966dcf64f9140d800aebe8a14845bb8ce7c045f52d4df483cacd23b'
-            '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  #Archlinux patch (b.g.o #321498)
-  patch -Np1 -i "${srcdir}/hal-show-volume-names.patch" || return 1
-
-  #Fix build with new gnutls
-  patch -Np1 -i "${srcdir}/gnutls-config.patch" || return 1
-  libtoolize --force || return 1
-  gtkdocize || return 1
-  aclocal || return 1
-  autoconf || return 1
-  automake || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-vfs-2.0 \
-      --enable-samba --enable-hal \
-      --enable-avahi --disable-howl \
-      --disable-openssl --enable-gnutls || return 1
-  make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
-
-  install -d -m755 "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-vfs-2.0 ${startdir}/pkg/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/abs/extra-testing/gnome-vfs/gnome-vfs.install b/abs/extra-testing/gnome-vfs/gnome-vfs.install
deleted file mode 100644
index 793a3e7..0000000
--- a/abs/extra-testing/gnome-vfs/gnome-vfs.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=gnome-vfs
-
-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/abs/extra-testing/gnome-vfs/gnutls-config.patch b/abs/extra-testing/gnome-vfs/gnutls-config.patch
deleted file mode 100644
index f6fa18b..0000000
--- a/abs/extra-testing/gnome-vfs/gnutls-config.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0
-# Use pkg-config in place of gnutls own macro since it's not present anymore.
---- a/configure.in	2009-03-07 19:59:53.805507753 +0100
-+++ b/configure.in	2009-03-07 18:34:36.928169018 +0100
-@@ -686,14 +686,14 @@
-     AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***])
-   else
-     AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***]))
--    AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
--			      have_ssl=true])
-+    PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
-+    				 	   	  have_ssl=true])
- 
-     if test "x${LIBGNUTLS_LIBS}" = "x"; then
--      AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
--                                 AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
--				 have_ssl=true],
--                                 AC_MSG_ERROR([Unable to find GNUTLS]))
-+      PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
-+      				   	     	    AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
-+						    have_ssl=true],
-+						    AC_MSG_ERROR([Unable to find GNUTLS]))
-     fi
-   fi
- fi
diff --git a/abs/extra-testing/gnome-vfs/hal-show-volume-names.patch b/abs/extra-testing/gnome-vfs/hal-show-volume-names.patch
deleted file mode 100644
index 5b8420c..0000000
--- a/abs/extra-testing/gnome-vfs/hal-show-volume-names.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: gnome-vfs-hal-mounts.c
-===================================================================
-RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-hal-mounts.c,v
-retrieving revision 1.33
-diff -u -p -r1.33 gnome-vfs-hal-mounts.c
---- gnome-vfs/libgnomevfs/gnome-vfs-hal-mounts.c	7 Jul 2006 15:56:57 -0000	1.33
-+++ gnome-vfs/libgnomevfs/gnome-vfs-hal-mounts.c	14 Jul 2006 18:48:51 -0000
-@@ -877,6 +877,7 @@ _hal_add_volume (GnomeVFSVolumeMonitorDa
- 	GnomeVFSDrive *drive;
- 	GnomeVFSVolumeMonitor *volume_monitor;
- 	char *name;
-+  char *icon;
- 	gboolean allowed_by_policy;
- 	const char *backing_udi;
- 
-@@ -975,6 +976,8 @@ _hal_add_volume (GnomeVFSVolumeMonitorDa
- 	 */
- 	drive = _gnome_vfs_volume_monitor_find_drive_by_hal_udi (volume_monitor, libhal_volume_get_udi (hal_volume));
- 	if (drive == NULL && allowed_by_policy) {
-+    name = _hal_drive_policy_get_display_name (volume_monitor_daemon, hal_drive, hal_volume);
-+    icon = _hal_drive_policy_get_icon (volume_monitor_daemon, hal_drive, hal_volume);
- 		drive = g_object_new (GNOME_VFS_TYPE_DRIVE, NULL);
- 		if (libhal_volume_disc_has_audio (hal_volume)) {
- 			drive->priv->activation_uri = g_strdup_printf ("cdda://%s", 
-@@ -989,16 +992,16 @@ _hal_add_volume (GnomeVFSVolumeMonitorDa
- 			 * So just set it to the empty string
- 			 */
- 			drive->priv->activation_uri = g_strdup ("");
-+      g_free (name);
-+      name = _hal_volume_policy_get_display_name (volume_monitor_daemon, hal_drive, hal_volume);
-+      g_free (icon);
-+      icon = _hal_volume_policy_get_icon (volume_monitor_daemon, hal_drive, hal_volume);
- 		}
- 		drive->priv->is_connected = TRUE;
- 		drive->priv->device_path = g_strdup (libhal_volume_get_device_file (hal_volume));
- 		drive->priv->device_type = _hal_get_gnome_vfs_device_type (hal_drive);
- 	
--		/* TODO: could add an icon of a drive with media in it since this codepath only
--		 * handles drives with media in them
--		 */
--		drive->priv->icon = _hal_drive_policy_get_icon (volume_monitor_daemon, hal_drive, NULL);
--		name = _hal_drive_policy_get_display_name (volume_monitor_daemon, hal_drive, hal_volume);
-+    drive->priv->icon = icon;
- 		drive->priv->display_name = _gnome_vfs_volume_monitor_uniquify_drive_name (volume_monitor, name);
- 		g_free (name);
- 		name = g_utf8_casefold (drive->priv->display_name, -1);
diff --git a/abs/extra-testing/gnu-netcat/PKGBUILD b/abs/extra-testing/gnu-netcat/PKGBUILD
deleted file mode 100644
index 82c90f3..0000000
--- a/abs/extra-testing/gnu-netcat/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 49781 2009-08-15 16:06:57Z jgc $
-# Maintainer: Tom K <tomk@runbox.com>
-
-pkgname=gnu-netcat
-pkgver=0.7.1
-pkgrel=3
-pkgdesc="GNU rewrite of netcat, the network piping application"
-depends=('glibc' 'texinfo')
-arch=('i686' 'x86_64')
-url="http://netcat.sourceforge.net/"
-license=('GPL')
-replaces=('netcat')
-provides=('netcat')
-install=gnu-netcat.install
-source=(http://internap.dl.sourceforge.net/sourceforge/netcat/netcat-$pkgver.tar.bz2)
-md5sums=('0a29eff1736ddb5effd0b1ec1f6fe0ef')
-
-build() {
-  cd "${srcdir}/netcat-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra-testing/gnu-netcat/gnu-netcat.install b/abs/extra-testing/gnu-netcat/gnu-netcat.install
deleted file mode 100644
index a946aa2..0000000
--- a/abs/extra-testing/gnu-netcat/gnu-netcat.install
+++ /dev/null
@@ -1,13 +0,0 @@
-infodir=/usr/share/info
-
-post_install() {
-  install-info $infodir/netcat.info.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  install-info --delete $infodir/netcat.info.gz $infodir/dir 2> /dev/null
-}
diff --git a/abs/extra-testing/gnupg/PKGBUILD b/abs/extra-testing/gnupg/PKGBUILD
deleted file mode 100644
index cb980ce..0000000
--- a/abs/extra-testing/gnupg/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 52155 2009-09-16 11:08:07Z allan $
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
-pkgname=gnupg
-pkgver=1.4.10
-pkgrel=2
-pkgdesc="GNU Privacy Guard - a PGP replacement tool"
-arch=('i686' 'x86_64')
-license=('GPL3')
-depends=('zlib' 'bzip2' 'libldap>=2.4.11' 'libusb' 'curl>=7.16.2' 'readline>=5.0.00')
-source=(ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg/$pkgname-$pkgver.tar.bz2)
-install=gnupg.install
-url="http://www.gnupg.org/"
-md5sums=('dcf7ed712997888d616e029637bfc303')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --libexecdir=/usr/lib # docdir can't be set properly
-  make || return 1
-  ln -s ${pkgname}-${pkgver}/scripts ..
-  make DESTDIR=${pkgdir} install || return 1
-  
-  # fix fileconflict with gnupg2 pkg
-  rm ${pkgdir}/usr/share/man/man1/gpg-zip.1
-}
diff --git a/abs/extra-testing/gnupg/gnupg.install b/abs/extra-testing/gnupg/gnupg.install
deleted file mode 100644
index 5a67047..0000000
--- a/abs/extra-testing/gnupg/gnupg.install
+++ /dev/null
@@ -1,21 +0,0 @@
-info_dir=/usr/share/info
-info_files=(gnupg1.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-# vim:set ts=2 sw=2 et:
diff --git a/abs/extra-testing/gnuplot/PKGBUILD b/abs/extra-testing/gnuplot/PKGBUILD
deleted file mode 100644
index 3b04bde..0000000
--- a/abs/extra-testing/gnuplot/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: damir <damir@archlinux.org>
-# Contributor: Niklas Volbers <mithrandir42@web.de>
-
-pkgname=gnuplot
-pkgver=4.4.0
-pkgrel=1
-pkgdesc="Command-line driven interactive data and function plotting utility"
-url="http://www.gnuplot.info"
-depends=('gd>=2.0.29' 'wxgtk' 'libjpeg>=7')
-makedepends=('texinfo')
-license='custom'
-arch=('i686')
-source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-
-  ./configure --prefix=/usr \
-    --datadir=/usr/share \
-    --libexecdir=/usr/bin \
-    --with-readline=gnu \
-    --enable-history-file \
-    --with-x
-
-   make X11_DRIVER_DIR='/usr/bin' || return 1
-
-   make DESTDIR=$startdir/pkg \
-      libexecdir=/usr/bin \
-      pkglibexecdir=/usr/bin install
-
-   install -D $startdir/src/$pkgname-$pkgver/Copyright $startdir/pkg/usr/share/licenses/custom/gnuplot/Copyright
-}
-md5sums=('e708665bd512153ad5c35252fe499059')
diff --git a/abs/extra-testing/gpac/ChangeLog b/abs/extra-testing/gpac/ChangeLog
deleted file mode 100644
index 5e63198..0000000
--- a/abs/extra-testing/gpac/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-2009-04-19  Allan McRae <allan@archlinux.org>
-	* gpac-0.4.5-2
-	* Rebuild against libavcodec.so.52 (FS#14291)
-
-2008-12-14  Allan McRae <allan@archlinux.org>
-	* gpac-0.4.5-1
-	* upstream update
-	* FHS man page
-	
diff --git a/abs/extra-testing/gpac/PKGBUILD b/abs/extra-testing/gpac/PKGBUILD
deleted file mode 100755
index 04ce3cc..0000000
--- a/abs/extra-testing/gpac/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD,v 1.4 2009/04/19 08:06:33 allan Exp $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: niQo
-
-pkgname=gpac
-pkgver=0.4.5
-pkgrel=4
-pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
-arch=('i686' 'x86_64')
-url="http://gpac.sourceforge.net"
-depends=('libxml2' 'wxgtk' 'alsa-lib' 'sdl' 'spidermonkey' 'libmad' \
-         'faad2' 'xvidcore' 'ffmpeg' 'freeglut' 'libjpeg')
-license=('LGPL')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('755e8c438a48ebdb13525dd491f5b0d1')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  chmod +x configure
-  sed -i 's#osmozilla##g' applications/Makefile
-  sed -i 's#"$(prefix)#"$(DESTDIR)$(prefix)#' applications/osmo4_wx/Makefile
-  sed -i 's#ldconfig || true##g' Makefile
-  ./configure --prefix=/usr --mandir=/usr/share/man --use-js=no
-  make || return 1
-  make DESTDIR=${pkgdir}/ install-lib
-  make DESTDIR=${pkgdir}/ install
-}
diff --git a/abs/extra-testing/gpac/gpac-0.4.2-ffmpeg-errno.patch b/abs/extra-testing/gpac/gpac-0.4.2-ffmpeg-errno.patch
deleted file mode 100755
index ec59cec..0000000
--- a/abs/extra-testing/gpac/gpac-0.4.2-ffmpeg-errno.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: gpac/modules/ffmpeg_in/ffmpeg_demux.c
-===================================================================
---- gpac.orig/modules/ffmpeg_in/ffmpeg_demux.c
-+++ gpac/modules/ffmpeg_in/ffmpeg_demux.c
-@@ -23,6 +23,7 @@
-  */
- 
- #include "ffmpeg_in.h"
-+#include <errno.h>
- 
- /*default buffer is 200 ms per channel*/
- #define FFD_DATA_BUFFER		800
-@@ -285,7 +286,6 @@ static GF_ESD *FFD_GetESDescriptor(FFDem
- 		case CODEC_ID_MP3:
- 			esd->decoderConfig->objectTypeIndication = 0x69;
- 			break;
--		case CODEC_ID_MPEG4AAC:
- 		case CODEC_ID_AAC:
- 			if (!dec->extradata_size) goto opaque_audio;
- 			esd->decoderConfig->objectTypeIndication = 0x40;
diff --git a/abs/extra-testing/gpgme/PKGBUILD b/abs/extra-testing/gpgme/PKGBUILD
deleted file mode 100644
index ce03d89..0000000
--- a/abs/extra-testing/gpgme/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 48153 2009-07-31 20:34:25Z tpowa $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-# Contributor: Sarah Hay <sarah@archlinux.org>
-
-pkgname=gpgme
-pkgver=1.2.0
-pkgrel=1
-pkgdesc="A C wrapper library for GnuPG."
-arch=('i686' 'x86_64')
-url="http://www.gnupg.org/related_software/gpgme/"
-license=('GPL')
-depends=('libgpg-error>=1.5' 'pth' 'gnupg')
-install=gpgme.install
-options=('!libtool' '!emptydirs')
-source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3164bbbd49f94863f2849f39c343521e')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${pkgdir} install
-  rm ${pkgdir}/usr/share/info/dir
-  gzip ${pkgdir}/usr/share/info/*
-}
diff --git a/abs/extra-testing/gpgme/__changelog b/abs/extra-testing/gpgme/__changelog
deleted file mode 100644
index 4074d1b..0000000
--- a/abs/extra-testing/gpgme/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-removed gnupg2 requirement
diff --git a/abs/extra-testing/gpgme/gpgme.install b/abs/extra-testing/gpgme/gpgme.install
deleted file mode 100644
index b54620d..0000000
--- a/abs/extra-testing/gpgme/gpgme.install
+++ /dev/null
@@ -1,18 +0,0 @@
-infodir=/usr/share/info
-filelist=(gpgme.info gpgme.info-1 gpgme.info-2)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
diff --git a/abs/extra-testing/graphload/PKGBUILD b/abs/extra-testing/graphload/PKGBUILD
deleted file mode 100644
index 6af2f95..0000000
--- a/abs/extra-testing/graphload/PKGBUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-pkgname=graphload
-pkgver=1
-pkgrel=1
-pkgdesc="command to graph the total CPU utilization for N-core systems for a given interval"
-depends=('gnuplot>=4.2.5')
-license='GPLv2'
-arch=('i686')
-
-build() {
-   LH_ROOT=/usr/LH
-   mkdir -p $startdir/pkg/$LH_ROOT/bin/
-
-   cd $startdir
-   # executables
-   install -m0755 -D graphload.sh  $startdir/pkg/$LH_ROOT/bin/
-}
diff --git a/abs/extra-testing/graphload/graphload.sh b/abs/extra-testing/graphload/graphload.sh
deleted file mode 100755
index 79023ec..0000000
--- a/abs/extra-testing/graphload/graphload.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-MYTICKS=100
-MYINTERVAL=4 # we sample once every $MYINTERVAL seconds
-MYINVERSEINTERVAL=0.25
-
-top -d $MYINVERSEINTERVAL -n $MYTICKS -b -i | grep Cpu | perl -e "while(<>) { split(','); \$load = 100 - substr @_[3], 0, -3; print \$load,\"\n\";}" > profile
-perl -e '$second=0; while(<>) { chop(); $load = $_; print "$second $load "; split " ", $load; print @_[0] + @_[1], "\n"; $second+=0.25;}' < profile > points
-echo "set grid
-set xrange [0: $(($MYTICKS/$MYINTERVAL))]
-set yrange [0: 101]
-set xtics 0,$MYINVERSEINTERVAL,$(($MYTICKS/$MYINTERVAL))
-set xlabel \"time\"
-set ylabel \"CPU usage\"
-plot \"points\" using 1:2 with lines title 'total load'
-replot" > gplot.cmds
-gnuplot -persist gplot.cmds
diff --git a/abs/extra-testing/gtk-doc/PKGBUILD b/abs/extra-testing/gtk-doc/PKGBUILD
deleted file mode 100644
index 3b07565..0000000
--- a/abs/extra-testing/gtk-doc/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: dorphell <dorphell@archlinux.org>
-
-pkgname=gtk-doc 
-pkgver=1.15
-pkgrel=1
-options=('docs')
-pkgdesc="Used to document the public API of libraries" 
-arch=(i686 x86_64)
-license=('GPL' 'FDL')
-depends=('perl>=5.8.8' 'rarian' 'docbook-xsl') 
-makedepends=('pkgconfig' 'jade')
-install=gtk-doc.install
-url="http://www.gtk.org/gtk-doc/"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2) 
-
-build() { 
-  cd ${startdir}/src/${pkgname}-${pkgver} 
-  ./configure --prefix=/usr || return 1
-  make || return 1 
-  make DESTDIR=${startdir}/pkg install || return 1
-}
-md5sums=('c022788b1fbbec30d55df4ccb34eeb90')
diff --git a/abs/extra-testing/gtk-doc/gtk-doc.install b/abs/extra-testing/gtk-doc/gtk-doc.install
deleted file mode 100644
index 5e39bbf..0000000
--- a/abs/extra-testing/gtk-doc/gtk-doc.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-cat << _EOF
-==> SGML support in gtk-doc is no longer maintained, only very old projects
-==> still use SGML. Install (open)jade for SGML support. 
-_EOF
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/gtk-sharp-2/PKGBUILD b/abs/extra-testing/gtk-sharp-2/PKGBUILD
deleted file mode 100644
index cabcc92..0000000
--- a/abs/extra-testing/gtk-sharp-2/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 26977 2009-02-15 00:09:35Z jgc $
-# Maintainer: tobias <tobias@archlinux.org>
-
-pkgname=gtk-sharp-2
-pkgver=2.12.8
-pkgrel=1
-pkgdesc="gtk2 bindings for C#"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://gtk-sharp.sourceforge.net"
-depends=('mono>=2.2' 'libglade>=2.6.3' 'gtk2>=2.14.7')
-makedepends=('pkgconfig' 'monodoc')
-conflicts=('gtk#')
-options=('!libtool' '!makeflags')
-source=(http://ftp.gnome.org/pub/GNOME/sources/gtk-sharp/2.12/gtk-sharp-${pkgver}.tar.bz2)
-md5sums=('1b12a33df2ab87448848c0cc0733ca77')
-
-build() {
- # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR="${srcdir}/weird"
-  mkdir -p "${MONO_SHARED_DIR}"
-
-  cd "${srcdir}/gtk-sharp-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static || return 1
-  make || return 1
-  make GACUTIL="/usr/bin/gacutil /root ${pkgdir}/usr/lib" \
-     	 DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra-testing/gtkspell/PKGBUILD b/abs/extra-testing/gtkspell/PKGBUILD
deleted file mode 100644
index 1b372a1..0000000
--- a/abs/extra-testing/gtkspell/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 22305 2008-12-25 18:48:10Z jgc $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-# Contributer: Ben <ben@benmazer.net>
-
-pkgname=gtkspell
-pkgver=2.0.15
-pkgrel=1
-url="http://gtkspell.sourceforge.net/"
-pkgdesc="GtkSpell provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk2>=2.14.6' 'enchant>=1.4.2')
-makedepends=('intltool')
-options=('!libtool')
-source=(http://gtkspell.sourceforge.net/download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d90a7fe883f29caca149f04f31e2f0f9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra-testing/guile/PKGBUILD b/abs/extra-testing/guile/PKGBUILD
deleted file mode 100644
index 3721e3f..0000000
--- a/abs/extra-testing/guile/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 23033 2009-01-01 17:11:52Z jgc $
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=guile
-pkgver=1.8.6
-pkgrel=1
-pkgdesc="Guile is a portable, embeddable Scheme implementation written in C"
-url="http://www.gnu.org/software/guile/"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gmp' 'libtool' 'ncurses>=5.6-7' 'texinfo')
-install=guile.install
-source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-options=('!libtool')
-md5sums=('9e23d3dbea0e89bab8a9acc6880150de')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-networking \
-    --disable-error-on-warning || return 1
-  make LDFLAGS+="-lpthread" || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  rm -f "${pkgdir}/usr/share/info/dir"
-  gzip "${pkgdir}/usr/share/info"/* || return 1
-}
diff --git a/abs/extra-testing/guile/guile.install b/abs/extra-testing/guile/guile.install
deleted file mode 100644
index 8fab0b1..0000000
--- a/abs/extra-testing/guile/guile.install
+++ /dev/null
@@ -1,27 +0,0 @@
-files=(goops.info
-       guile-tut.info
-       guile.info
-       guile.info-1
-       guile.info-2
-       guile.info-3
-       guile.info-4
-       guile.info-5
-       guile.info-6
-       guile.info-7
-       r5rs.info)
-
-post_install() {
-  for f in "${files[@]}"; do
-    install-info usr/share/info/${f}.gz usr/share/info/dir 2>/dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for f in "${files[@]}"; do
-    install-info --delete usr/share/info/${f}.gz usr/share/info/dir 2> /dev/null
-  done
-}
diff --git a/abs/extra-testing/gvim/PKGBUILD b/abs/extra-testing/gvim/PKGBUILD
deleted file mode 100644
index 63c901a..0000000
--- a/abs/extra-testing/gvim/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 17439 2008-10-29 19:05:16Z tobias $
-# Maintainer: tobias [ tobias at archlinux org ]
-
-pkgname=gvim
-_srcver=7.2
-_patchlevel=132
-pkgver=${_srcver}.${_patchlevel}
-pkgrel=1
-pkgdesc="the vim text editor with advanced features enabled, such as a gui mode"
-arch=(i686 x86_64)
-license=('custom:vim')
-url="http://www.vim.org"
-depends=("vim>=${pkgver}" 'perl' 'python' 'acl' 'libxt' 'gtk2' )
-makedepends=('pkgconfig')
-backup=(etc/gvimrc)
-conflicts=('gvim-devel')
-provides=('gvim-devel')
-install=${pkgname}.install
-source=(ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2 \
-        ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-extra.tar.gz \
-        ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-lang.tar.gz \
-        ${pkgname}.desktop fetch_patches.sh)
-
-build()
-{
-  # patch party
-  # pull in patches from vim.org (or the src cache alternatively)
-  . ${startdir}/src/fetch_patches.sh
-  get_patches || return 1
-  cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")
-   # define the place for the global (g)vimrc file (set to /etc/vimrc)
-  sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' src/feature.h
-  ./configure --prefix=/usr --localstatedir=/var/lib/vim --mandir=/usr/share/man \
-    --with-compiledby=ArchLinux --with-features=big \
-    --with-x=yes --disable-gpm --with-x=yes --enable-gui=gtk2 \
-    --with-global-runtime=/usr/share/vim --with-vim-name=gvim \
-    --enable-multibyte --enable-cscope \
-    --enable-perlinterp --enable-pythoninterp 
-  make || return 1
-  # install everything first ...
-  make VIMRCLOC=/etc DESTDIR=${startdir}/pkg VIMRTDIR= install
-
-   # ... and clean up what vim already has for us
-   # move the binary and fix the (g)* related symlinks
-  find ${startdir}/pkg/usr/bin -type l 2> /dev/null | while read symlink; do
-    rm ${symlink}
-  done
-  cd ${startdir}/pkg/usr/bin
-  rm -f gvimtutor xxd
-  ln -s gvim evim
-  ln -s gvim egview
-  ln -s gvim gview
-  ln -s gvim gvimdiff
-  ln -s gvim rgview
-  ln -s gvim rgvim
-
-   # delete the manpages/symlinks provided by vi package
-  find ${startdir}/pkg/usr/share/man -type d -name 'man1' 2> /dev/null | \
-   while read mandir; do
-    cd ${mandir}
-    rm -f *.1
-    ln -s evi.1.gz evim.1.gz
-    ln -s vi.1.gz egview.1.gz
-    ln -s vi.1.gz gview.1.gz
-    ln -s vi.1.gz gvim.1.gz
-    ln -s vimdiff.1.gz gvimdiff.1.gz
-    ln -s vi.1.gz rgvim.1.gz
-    ln -s vi.1.gz rgview.1.gz
-  done
-
-  install -Dm644 ${startdir}/pkg/usr/share/vim/gvimrc_example.vim \
-    ${startdir}/pkg/etc/gvimrc
-   # clean all settings and controls -  served by vi package
-  rm -rf ${startdir}/pkg/usr/share/vim
-   # freedesktop links
-  install -D -m644 ${startdir}/src/${pkgname}.desktop \
-    ${startdir}/pkg/usr/share/applications/gvim.desktop
-  install -D -m644 ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")/runtime/vim48x48.png \
-    ${startdir}/pkg/usr/share/pixmaps/gvim.png
-
- ##############################################################
-   sed -i "s/mouse=a/mouse-=a/g" $startdir/pkg/etc/gvimrc
- #################################################################
-}
diff --git a/abs/extra-testing/gvim/fetch_patches.sh b/abs/extra-testing/gvim/fetch_patches.sh
deleted file mode 100644
index 2ce1019..0000000
--- a/abs/extra-testing/gvim/fetch_patches.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-# the external logic for pulling in patches
-
-get_patches() {
-  _patchdir=${startdir}/src/patches
-  cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")
-  if [ -d ${_patchdir} ]; then
-    rm -rf ${_patchdir}
-    echo -e "\tremove patches from old build"
-  fi
-  mkdir ${_patchdir} && cd ${_patchdir}
-  _rpath=ftp://ftp.vim.org/pub/vim/patches/${_srcver}
-
-  # change IFS to loop line-by-line
-  _OLDIFS=$IFS
-  IFS="
-"
-  echo -e "\tfetching checksumfile for patches"
-  wget ${_rpath}/MD5SUMS >/dev/null 2>&1
-
-  downloads=-1
-  for _line in $(/bin/cat MD5SUMS); do
-    downloads=$((${downloads} + 1))
-    _md5=$(echo $_line | cut -d ' ' -f1)
-    _file=$(echo $_line | cut -d ' ' -f3)
-    if [ -f ${SRCDEST}/vim-${_srcver}/${_file} ]; then
-      echo -e "\thaving patch file:${_file}"
-      cp ${SRCDEST}/vim-${_srcver}/${_file} ./
-    else
-      echo -n -e "\t... fetching patch file: ${_file} ..."
-      wget ${_rpath}/${_file} >/dev/null 2>&1
-      if [ -w ${SRCDEST} ]; then
-        if [ ! -d ${SRCDEST}/vim-${_srcver} ]; then
-          mkdir -p ${SRCDEST}/vim-${_srcver}
-        fi
-        cp ${_file} ${SRCDEST}/vim-${_srcver}/
-        echo " done!"
-      fi
-    fi
-
-    if [ $(echo "${_md5}  ${_file}" | md5sum --status -c -) ]; then
-      echo ${_file} md5sums do not match
-      return 1
-    fi
-  done
-  cd $startdir/src/patches
-  rm 7.2.001-100.gz
-  ########
-
-  if [ ${downloads} != ${_patchlevel} ]; then
-    echo -e "Number of patches does not match the patchlevel!\nEdit the PKGBUILD accordingly!"
-    return 1
-  fi
-  IFS=$_OLDIFS
-  rm MD5SUMS
-  cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")
-  for _patch in $(/bin/ls ${_patchdir}); do
-    patch -Np0 -i ${_patchdir}/${_patch} || return 1
-  done
-  rm -rf ${_patchdir}
-  return 0
-}
diff --git a/abs/extra-testing/gvim/gvim.desktop b/abs/extra-testing/gvim/gvim.desktop
deleted file mode 100644
index 8c99660..0000000
--- a/abs/extra-testing/gvim/gvim.desktop
+++ /dev/null
@@ -1,42 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=gVim
-Name[eo]=VIM-fasado
-Name[sv]=gVim
-Name[xx]=xx
-Comment=GTK2 enhanced vim text editor
-Comment[ar]=محرر نصوص
-Comment[bg]=Тек�т Редактор
-Comment[de]=Texteditor
-Comment[el]=Διο�θωτής Κειμένου
-Comment[eo]=Tekstredaktilo
-Comment[et]=Tekstiredaktor
-Comment[eu]=Testu Editorea
-Comment[fi]=Tekstieditori
-Comment[he]=עורך טקסט
-Comment[is]=Textaritill
-Comment[ja]=テキストエディタ
-Comment[lt]=Teksto redaktorius
-Comment[mt]=Editur tat-test
-Comment[pt_BR]=Editor de Texto
-Comment[ro]=Editor de text
-Comment[ru]=редактор
-Comment[sk]=Textový editor
-Comment[sl]=Urejevalnik besedil
-Comment[ta]=¯¨Ã ¦¾¡ÌôÀ¡Ç÷
-Comment[tr]=Metin Düzenleyici
-Comment[uk]=Редактор тек�тів
-Comment[vi]=Trình soạn văn bản
-Comment[xx]=xx
-Comment[zh_CN]=文本编辑器
-Comment[zh_TW]=文字編輯器
-GenericName=Text Editor
-Type=Application
-TryExec=gvim
-Exec=gvim
-Icon=gvim
-Terminal=false
-X-MultipleArgs=false
-Categories=GTK;Application;Utility;TextEditor;
-MimeType=application/mathml+xml;application/xhtml+xml;application/x-perl;application/x-python;application/x-shellscript;audio/x-mpegurl;audio/x-scpls;image/svg+xml;message/news;message/rfc822;text/calendar;text/css;text/english;text/html;text/mrml;text/plain;text/rdf;text/rss;text/rtf;text/sgml;text/vnd.wap.wml;text/x-adasrc;text/x-bibtex;text/x-chdr;text/x-c++hdr;text/x-csrc;text/x-c++src;text/x-c;text/x-objc;text/x-csv;text/x-diff;text/x-java;text/x-katefilelist;text/x-latex;text/x-log;text/x-lyx;text/x-makefile;text/xmcd;text/xml;text/x-moc;text/x-mswinurl;text/x-objcsrc;text/x-pascal;text/x-perl;text/x-php;text/x-php-source;text/x-python;text/x-tcl;text/x-tex;text/x-vcalendar;text/x-vcard;text/x-xslfo;text/x-xslt;
diff --git a/abs/extra-testing/gvim/gvim.install b/abs/extra-testing/gvim/gvim.install
deleted file mode 100644
index f49c345..0000000
--- a/abs/extra-testing/gvim/gvim.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-  echo "Updating desktop and mime database..."
-  update-desktop-database -q
-  echo -n "Updating vim help tags..."
-  usr/bin/vim --noplugins -u NONE -U NONE \
-    --cmd ":helptags usr/share/vim/doc" --cmd ":q" > /dev/null 2>&1
-  echo "done."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  echo -n "Updating desktop and mime database..."
-  update-desktop-database
-  echo "done."
-}
-
-op=$1
-shift
-[ "$(type -t "$op")" = "function" ] && $op "$@"
-
-# vim:set ts=2 sw=2 et ft=sh:
diff --git a/abs/extra-testing/hd2u/PKGBUILD b/abs/extra-testing/hd2u/PKGBUILD
deleted file mode 100644
index 8cde95c..0000000
--- a/abs/extra-testing/hd2u/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 13676 2008-09-27 21:20:46Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=hd2u
-pkgver=1.0.3
-pkgrel=1
-pkgdesc="Dos2Unix text file converter"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://hany.sk/~hany/software/hd2u/"
-depends=('popt')
-source=(http://hany.sk/~hany/_data/hd2u/$pkgname-$pkgver.tgz)
-md5sums=('8f6668fafb279aa19f956ec0515717b6')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make || return 1
-  make prefix=$pkgdir/usr install
-}
diff --git a/abs/extra-testing/hddtemp/ChangeLog b/abs/extra-testing/hddtemp/ChangeLog
deleted file mode 100644
index d9b03e7..0000000
--- a/abs/extra-testing/hddtemp/ChangeLog
+++ /dev/null
@@ -1,14 +0,0 @@
-2009-03-05 Andreas Radke <andyrtr@archlinux.org>
-* pkg moved to extra from AUR
-
-2008-01-23 Roman Kyrylych <roman@archlinux.org>
-* Updated to v38 of Debian's patchset
-
-2007-11-30 Roman Kyrylych <roman@archlinux.org>
-* Backup /etc/conf.d/hddtemp
-
-2007-11-09 Roman Kyrylych <roman@archlinux.org>
-* Updated to v37 of Debian's patchset
-
-2007-06-26 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
diff --git a/abs/extra-testing/hddtemp/PKGBUILD b/abs/extra-testing/hddtemp/PKGBUILD
deleted file mode 100644
index 996577d..0000000
--- a/abs/extra-testing/hddtemp/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 29127 2009-03-05 18:08:55Z andyrtr $
-# Maintainer: Andrea Scarpino <bash@archlinux.it>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-# Contributor: Damir Perisa <damir@archlinux.org>
-
-pkgname=hddtemp
-pkgver=0.3.beta15.45
-_origver=0.3-beta15
-_patchver=45
-pkgrel=2
-pkgdesc="Gives you the temperature of your hard drive by reading S.M.A.R.T. information"
-arch=('i686' 'x86_64')
-url="http://www.guzu.net/linux/hddtemp.php"
-license=('GPL')
-depends=('glibc')
-backup=('etc/conf.d/hddtemp')
-source=(http://www.guzu.net/files/hddtemp-${_origver}.tar.bz2
-        http://ftp.debian.org/debian/pool/main/h/hddtemp/hddtemp_${_origver}-${_patchver}.diff.gz
-        'hddtemp' 'hddtemp.confd')
-md5sums=('8b829339e1ae9df701684ec239021bb8'
-         'a809a3a28d29ee719b2855af9b4eb1a8'
-         'b7ebb86dfeef3bc4577ed1040307e36b'
-         'fdca5c43900406f0be76534ef2a5a697')
-options=('!libtool')
-
-build() {
-  cd "$srcdir/$pkgname-${_origver}"
-
-  patch -Np1 -i "$srcdir/${pkgname}_${_origver}-${_patchver}.diff" || return 1
-
-  ./configure --prefix=/usr --mandir=/usr/share/man --with-db-path=/usr/share/$pkgname/hddtemp.db
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
-
-  install -D -m644 "$srcdir/$pkgname-${_origver}/debian/hddtemp.db" \
-    "$pkgdir/usr/share/${pkgname}/hddtemp.db" || return 1
-  install -D -m644 "$srcdir/hddtemp.confd" "$pkgdir/etc/conf.d/hddtemp" || return 1
-  install -D -m755 "$srcdir/hddtemp" "$pkgdir/etc/rc.d/hddtemp" || return 1
-}
diff --git a/abs/extra-testing/hddtemp/hddtemp b/abs/extra-testing/hddtemp/hddtemp
deleted file mode 100644
index 62f0908..0000000
--- a/abs/extra-testing/hddtemp/hddtemp
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PARAMS=
-DRIVES=
-[ -f /etc/conf.d/hddtemp ] && . /etc/conf.d/hddtemp
-PID=$(pidof -o %PPID /usr/sbin/hddtemp)
-case "$1" in
-  start)
-    stat_busy "Starting HDDTemp"
-    [ -z "$PID" ] && /usr/sbin/hddtemp -d $PARAMS $DRIVES
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon hddtemp
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping HDDTemp"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon hddtemp
-      stat_done
-    fi 
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/extra-testing/hddtemp/hddtemp.confd b/abs/extra-testing/hddtemp/hddtemp.confd
deleted file mode 100644
index 6a1e18e..0000000
--- a/abs/extra-testing/hddtemp/hddtemp.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-PARAMS="-q -l 127.0.0.1"
-DRIVES="/dev/sda"
diff --git a/abs/extra-testing/hdhgrab/PKGBUILD b/abs/extra-testing/hdhgrab/PKGBUILD
deleted file mode 100755
index be4fc7f..0000000
--- a/abs/extra-testing/hdhgrab/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=hdhgrab
-pkgver=1
-pkgrel=1
-arch=("i686")
-pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
-url="myth2ipod.com"
-depends=('hdhomerun' )
-source=(http://ops.nocc.us/hdh/hdhgrab.tar.gz)
-
-
-build() {
-	cd $startdir/src
-	
-	install -D -m 755 hdhscan $startdir/pkg/usr/bin/hdhscan
-	install -D -m 755 hdhgrab $startdir/pkg/usr/bin/hdhgrab
-	install -D -m755  README $startdir/pkg/usr/share/README.hdhgrab
-
-
-}
diff --git a/abs/extra-testing/help2man/PKGBUILD b/abs/extra-testing/help2man/PKGBUILD
deleted file mode 100644
index ef9642e..0000000
--- a/abs/extra-testing/help2man/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 67994 2010-02-10 11:34:11Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Paul Mattal <paul@mattal.com>
-
-pkgname=help2man
-pkgver=1.37.1
-pkgrel=1
-pkgdesc="Conversion tool to create man files"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/help2man/"
-license=('GPL')
-depends=('perl-locale-gettext')
-source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        help2man-1.37.1-respect-LDFLAGS.patch)
-md5sums=('371b5cc74fe9c2ea3ee1ca23c19b19a8'
-         '6f80dfd75b46c6bfbc2eeb5516771096')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i ${srcdir}/help2man-1.37.1-respect-LDFLAGS.patch || return 1
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man \
-	      --infodir=/usr/share/info \
-	      --libdir=/lib
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra-testing/help2man/help2man-1.37.1-respect-LDFLAGS.patch b/abs/extra-testing/help2man/help2man-1.37.1-respect-LDFLAGS.patch
deleted file mode 100644
index a314c27..0000000
--- a/abs/extra-testing/help2man/help2man-1.37.1-respect-LDFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in	2009-11-14 07:21:34.000000000 +0100
-+++ b/Makefile.in	2010-02-10 12:23:35.000000000 +0100
-@@ -103,7 +103,7 @@
- 
- preload: $(preload).so
- $(preload).so: $(srcdir)/$(preload).c
--	$(CC) $(CFLAGS) -o $@ -fPIC -shared $? $(LIBS)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -fPIC -shared $? $(LIBS)
- 
- man: $(target).1
- $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m
diff --git a/abs/extra-testing/hicolor-icon-theme/PKGBUILD b/abs/extra-testing/hicolor-icon-theme/PKGBUILD
deleted file mode 100644
index 7109330..0000000
--- a/abs/extra-testing/hicolor-icon-theme/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: arjan <arjan@archlinux.org>
-# Contributer: Jan De Groot <jan@jgc.homeip.net>
-pkgname=hicolor-icon-theme
-pkgver=0.12
-pkgrel=1
-pkgdesc="Freedesktop.org Hicolor icon theme"
-arch=(i686 x86_64)
-depends=()
-url="http://icon-theme.freedesktop.org/wiki/HicolorTheme"
-source=(http://icon-theme.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
-}
-md5sums=('55cafbcef8bcf7107f6d502149eb4d87')
diff --git a/abs/extra-testing/hspell/PKGBUILD b/abs/extra-testing/hspell/PKGBUILD
deleted file mode 100644
index 7700435..0000000
--- a/abs/extra-testing/hspell/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 28768 2009-03-02 04:21:08Z eric $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=hspell
-pkgver=1.0
-pkgrel=2
-pkgdesc="Hebrew spell-checker"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.ivrix.org.il/projects/spell-checker/"
-depends=('glibc>=2.7' 'zlib' 'perl')
-options=('!libtool' '!makeflags')
-source=(ftp://ftp.archlinux.org/other/hspell/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3e12fa383c2cfd430918d115f33f9841')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver} 
-  [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC"
-  sed -i -e 's|/usr/bin/awk|/bin/awk|' wzip
-  ./configure --prefix=/usr  --enable-linginfo
-  make || return 1
-  make DESTDIR=${startdir}/pkg/ install || return 1
-}
diff --git a/abs/extra-testing/htop/ChangeLog b/abs/extra-testing/htop/ChangeLog
deleted file mode 100644
index 7d77d0b..0000000
--- a/abs/extra-testing/htop/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-2008-12-09  Alexander Fehr  <pizzapunk gmail com>
-
-  * htop-0.8.1-1:
-  New upstream release.
-  New maintainer.
-  Added patch to fix FS#12235.
-  Enabled Unicode support.
-  Added ChangeLog.
diff --git a/abs/extra-testing/htop/PKGBUILD b/abs/extra-testing/htop/PKGBUILD
deleted file mode 100644
index 95b9660..0000000
--- a/abs/extra-testing/htop/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 21081 2008-12-09 17:41:11Z alexanderf $
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
-
-pkgname=htop
-pkgver=0.8.3
-pkgrel=1
-pkgdesc="Interactive process viewer"
-arch=('i686' 'x86_64')
-url="http://htop.sourceforge.net/"
-license=('GPL')
-depends=('ncurses')
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/htop/htop-$pkgver.tar.gz)
-
-build() {
-  cd "$srcdir/htop-$pkgver"
-  sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c || return 1
-  ./configure --prefix=/usr --enable-unicode || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
-}
-md5sums=('5c9f093f9eaddf6e77aa6d54c2116d0c')
diff --git a/abs/extra-testing/htop/htop-treeview.patch b/abs/extra-testing/htop/htop-treeview.patch
deleted file mode 100644
index bcf6334..0000000
--- a/abs/extra-testing/htop/htop-treeview.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur htop-0.8.1.orig/ProcessList.c htop-0.8.1/ProcessList.c
---- htop-0.8.1.orig/ProcessList.c	2008-09-23 08:23:14.000000000 +0200
-+++ htop-0.8.1/ProcessList.c	2008-12-09 15:14:56.000000000 +0100
-@@ -331,7 +331,7 @@
- 
-    for (int i = Vector_size(this->processes) - 1; i >= 0; i--) {
-       Process* process = (Process*) (Vector_get(this->processes, i));
--      if (process->tgid == pid || (process->tgid == process->pid && process->ppid == pid)) {
-+      if (process->tgid == pid || process->ppid == pid) {
-          Process* process = (Process*) (Vector_take(this->processes, i));
-          Vector_add(children, process);
-       }
diff --git a/abs/extra-testing/huludesktop/PKGBUILD b/abs/extra-testing/huludesktop/PKGBUILD
deleted file mode 100644
index b215d19..0000000
--- a/abs/extra-testing/huludesktop/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-pkgname=huludesktop
-pkgver=0.1
-pkgrel=5
-pkgdesc="Hulu Desktop for Linux"
-arch=(i686)
-url="http://www.hulu.com/labs/hulu-desktop-linux"
-license=('unknown')
-makedepends=('deb2targz')
-depends=('glib2' 'gtk2' 'lirc' 'flashplugin')
-install=huludesktop.install
-options=('')
-source=('http://download.hulu.com/huludesktop_i386.deb' 'huludesktop')
-md5sums=('ee339181b7fb206e2ca2795d46213529')
-
-build() {
-    cd $startdir/src
-    deb2targz huludesktop_i386.deb
-    tar -xzvf huludesktop_i386.tar.gz -C $pkgdir
-    mkdir -p $pkgdir/home/mythtv
-    cp huludesktop $pkgdir/home/mythtv/.huludesktop
-}
diff --git a/abs/extra-testing/huludesktop/huludesktop b/abs/extra-testing/huludesktop/huludesktop
deleted file mode 100644
index c3ae870..0000000
--- a/abs/extra-testing/huludesktop/huludesktop
+++ /dev/null
@@ -1,25 +0,0 @@
-[display]
-fullscreen = TRUE
-width = 1024
-height = 576
-pos_x = 201
-pos_y = 179
-
-[remote]
-lirc_device = /dev/lircd
-lirc_remote_identifier = mceusb
-lirc_release_suffix = _UP
-lirc_repeat_threshold = 10
-button_name_up = Up
-button_name_down = Down
-button_name_left = Left
-button_name_right = Right
-button_name_select = OK
-button_name_menu = Home
-
-[flash]
-flash_location = /usr/lib/mozilla/plugins/libflashplayer.so
-
-[version]
-latest = (null)
-eula_version = 0
diff --git a/abs/extra-testing/huludesktop/huludesktop.install b/abs/extra-testing/huludesktop/huludesktop.install
deleted file mode 100644
index 271c5a1..0000000
--- a/abs/extra-testing/huludesktop/huludesktop.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  mv /usr/share/mythtv/is.xml /tmp
-  grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp
-  echo "<!--#Hulu-->" >> /tmp/is.xml.tmp
-  echo "   <button>" >> /tmp/is.xml.tmp
-  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
-  echo "     <text>Hulu Desktop</text>" >> /tmp/is.xml.tmp
-  echo "     <action>EXEC huludesktop</action>" >> /tmp/is.xml.tmp 
-  echo "   </button>" >> /tmp/is.xml.tmp
-  echo "<!--#Hulu-->" >> /tmp/is.xml.tmp
-  echo "" >> /tmp/is.xml.tmp
-  echo "</mythmenu>" >> /tmp/is.xml.tmp
-  mv /tmp/is.xml.tmp /usr/share/mythtv/is.xml
-}
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_remove() {
-	rm -fr /usr/share/mythtv/appletrailer.xml
-	mv /usr/share/mythtv/is.xml /tmp/is.xml.tmp
-	sed -e '/\#Hulu/,/\#Hulu/d' < /tmp/is.xml.tmp > /usr/share/mythtv/is.xml
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/hunspell/ChangeLog b/abs/extra-testing/hunspell/ChangeLog
deleted file mode 100644
index dcb3a2a..0000000
--- a/abs/extra-testing/hunspell/ChangeLog
+++ /dev/null
@@ -1,6 +0,0 @@
-2008-12-02  Alexander Fehr  <pizzapunk gmail com>
-
-  * hunspell-1.2.8-1:
-  New upstream release.
-  New maintainer.
-  Added ChangeLog.
diff --git a/abs/extra-testing/hunspell/PKGBUILD b/abs/extra-testing/hunspell/PKGBUILD
deleted file mode 100644
index 07a6e66..0000000
--- a/abs/extra-testing/hunspell/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 20746 2008-12-06 14:17:50Z alexanderf $
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Hussam Al-Tayeb <ht990332@gmail.com>
-
-pkgname=hunspell
-pkgver=1.2.11
-pkgrel=1
-pkgdesc="Spell checker and morphological analyzer library and program"
-arch=('i686' 'x86_64')
-url="http://hunspell.sourceforge.net/"
-license=('GPL' 'LGPL' 'MPL')
-depends=('gcc-libs')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/hunspell/hunspell-$pkgver.tar.gz)
-
-build() {
-  cd "$srcdir/hunspell-$pkgver"
-
-  ./configure --prefix=/usr --disable-static || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
-}
-md5sums=('8f57cdc4db091d69e1f682ed4d8ab282')
diff --git a/abs/extra-testing/hunspell/__changelog b/abs/extra-testing/hunspell/__changelog
deleted file mode 100644
index 173ca43..0000000
--- a/abs/extra-testing/hunspell/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-update to 1.2.11
diff --git a/abs/extra-testing/i2c-tools/Makefile.patch b/abs/extra-testing/i2c-tools/Makefile.patch
deleted file mode 100644
index f90fa14..0000000
--- a/abs/extra-testing/i2c-tools/Makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.orig	2007-11-01 18:54:57.000000000 +0100
-+++ Makefile	2008-09-24 14:46:54.000000000 +0200
-@@ -5,7 +5,7 @@
- # Licensed under the GNU General Public License.
- 
- DESTDIR	=
--prefix	= /usr/local
-+prefix	= /usr
- bindir	= $(prefix)/bin
- sbindir	= $(prefix)/sbin
- mandir	= $(prefix)/share/man
-@@ -32,6 +32,6 @@
- all:
- 
- include eeprom/Module.mk
--include include/Module.mk
-+#include include/Module.mk
- include stub/Module.mk
- include tools/Module.mk
diff --git a/abs/extra-testing/i2c-tools/PKGBUILD b/abs/extra-testing/i2c-tools/PKGBUILD
deleted file mode 100644
index db1700d..0000000
--- a/abs/extra-testing/i2c-tools/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Contributor: DonVla <donvla@users.sourceforge.net>
-
-pkgname=i2c-tools
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="Heterogeneous set of I2C tools for Linux that used to be part of lm-sensors"
-arch=('i686' 'x86_64')
-url="http://www.lm-sensors.org/wiki/I2CTools"
-license=('GPL')
-depends=('lm_sensors' 'perl' 'read-edid')
-options=(strip)
-source=(http://dl.lm-sensors.org/$pkgname/releases/$pkgname-$pkgver.tar.bz2 Makefile.patch)
-md5sums=('b546345ac19db56719dea6b8199f11e0' '49d17834f9d7e68407ec46785e47bb94')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p0 < $startdir/Makefile.patch
-  make || return 1
-  make DESTDIR="$pkgdir" install
-}
-# vim:set ts=2 sw=2 et:
diff --git a/abs/extra-testing/icon-naming-utils/PKGBUILD b/abs/extra-testing/icon-naming-utils/PKGBUILD
deleted file mode 100644
index ce025df..0000000
--- a/abs/extra-testing/icon-naming-utils/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 4394 2008-07-06 20:12:55Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=icon-naming-utils
-pkgver=0.8.90
-pkgrel=1
-pkgdesc="Maps the new names of icons for Tango to the legacy names used by the GNOME and KDE desktops."
-arch=(i686 x86_64)
-license=('GPL')
-url="http://tango.freedesktop.org/"
-depends=('perl-xml-simple')
-source=(http://tango.freedesktop.org/releases/${pkgname}-${pkgver}.tar.bz2)
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --libexecdir=/usr/lib/icon-naming-utils \
-	      --localstatedir=/var
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
-  mv ${startdir}/pkg/usr/share/pkgconfig ${startdir}/pkg/usr/lib/pkgconfig
-}
-md5sums=('dd8108b56130b9eedc4042df634efa66')
diff --git a/abs/extra-testing/id3lib/PKGBUILD b/abs/extra-testing/id3lib/PKGBUILD
deleted file mode 100644
index ba0328a..0000000
--- a/abs/extra-testing/id3lib/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 2134 2008-05-26 00:30:40Z eric $
-# Maintainer: 
-# Contributor: Jochem Kossen <j.kossen@home.nl>
-pkgname=id3lib
-pkgver=3.8.3
-pkgrel=10
-pkgdesc="An open-source, cross-platform software development library for reading, writing, and manipulating ID3v1 and ID3v2 tags"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://id3lib.sourceforge.net/"
-depends=('zlib' 'gcc-libs')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	patch_id3lib_3.8.3_UTF16_writing_bug.diff
-	id3lib-3.8.3-CVE-2007-4460.patch
-	id3lib-3.8.3-gcc-4.3.patch)
-md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7' '196c65adee1ba511ddacef2de0dfd102'\
-         '78e90e15ddd1122b66da352b6c3b00ff' 'fdbffd2d9d289ed0d730950c78d4ebc4')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/src/patch_id3lib_3.8.3_UTF16_writing_bug.diff || return 1
-  patch -Np0 -i ${startdir}/src/id3lib-3.8.3-CVE-2007-4460.patch || return 1
-  patch -Np1 -i ${startdir}/src/id3lib-3.8.3-gcc-4.3.patch || return 1
-  ./configure --prefix=/usr
-  sed -i -e 's/^LIBS =/LIBS = -lz -lstdc++/' src/Makefile || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
-}
diff --git a/abs/extra-testing/id3lib/id3lib-3.8.3-CVE-2007-4460.patch b/abs/extra-testing/id3lib/id3lib-3.8.3-CVE-2007-4460.patch
deleted file mode 100644
index daa0866..0000000
--- a/abs/extra-testing/id3lib/id3lib-3.8.3-CVE-2007-4460.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/tag_file.cpp
-+++ src/tag_file.cpp
-@@ -242,8 +242,8 @@
-     strcpy(sTempFile, filename.c_str());
-     strcat(sTempFile, sTmpSuffix.c_str());
- 
--#if ((defined(__GNUC__) && __GNUC__ >= 3  ) || !defined(HAVE_MKSTEMP))
--    // This section is for Windows folk && gcc 3.x folk
-+#if !defined(HAVE_MKSTEMP)
-+    // This section is for Windows folk
-     fstream tmpOut;
-     createFile(sTempFile, tmpOut);
- 
-@@ -257,7 +257,7 @@
-       tmpOut.write((char *)tmpBuffer, nBytes);
-     }
- 
--#else //((defined(__GNUC__) && __GNUC__ >= 3  ) || !defined(HAVE_MKSTEMP))
-+#else //!defined(HAVE_MKSTEMP)
- 
-     // else we gotta make a temp file, copy the tag into it, copy the
-     // rest of the old file after the tag, delete the old file, rename
-@@ -270,7 +270,7 @@
-       //ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file");
-     }
- 
--    ofstream tmpOut(fd);
-+    ofstream tmpOut(sTempFile);
-     if (!tmpOut)
-     {
-       tmpOut.close();
-@@ -285,14 +285,14 @@
-     uchar tmpBuffer[BUFSIZ];
-     while (file)
-     {
--      file.read(tmpBuffer, BUFSIZ);
-+      file.read((char *)tmpBuffer, BUFSIZ);
-       size_t nBytes = file.gcount();
--      tmpOut.write(tmpBuffer, nBytes);
-+      tmpOut.write((char *)tmpBuffer, nBytes);
-     }
- 
-     close(fd); //closes the file
- 
--#endif ////((defined(__GNUC__) && __GNUC__ >= 3  ) || !defined(HAVE_MKSTEMP))
-+#endif ////!defined(HAVE_MKSTEMP)
- 
-     tmpOut.close();
-     file.close();
diff --git a/abs/extra-testing/id3lib/id3lib-3.8.3-gcc-4.3.patch b/abs/extra-testing/id3lib/id3lib-3.8.3-gcc-4.3.patch
deleted file mode 100644
index f5ec498..0000000
--- a/abs/extra-testing/id3lib/id3lib-3.8.3-gcc-4.3.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -Naur id3lib-3.8.3-orig/configure id3lib-3.8.3/configure
---- id3lib-3.8.3-orig/configure      2008-05-24 23:39:36.000000000 -0400
-+++ id3lib-3.8.3/configure   2008-05-24 23:39:57.000000000 -0400
-@@ -10296,8 +10296,7 @@
- 
- for ac_header in \
-   string                        \
--  iomanip.h                     \
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- 
-diff -Naur id3lib-3.8.3-orig/include/id3/id3lib_strings.h id3lib-3.8.3/include/id3/id3lib_strings.h
---- id3lib-3.8.3-orig/include/id3/id3lib_strings.h	2008-03-05 18:19:46.000000000 -0600
-+++ id3lib-3.8.3/include/id3/id3lib_strings.h	2008-03-05 18:19:38.000000000 -0600
-@@ -30,6 +30,7 @@
- #define _ID3LIB_STRINGS_H_
- 
- #include <string>
-+#include <cstring>
- 
- #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
- namespace std
-diff -Naur id3lib-3.8.3-orig/include/id3/writers.h id3lib-3.8.3/include/id3/writers.h
---- id3lib-3.8.3-orig/include/id3/writers.h	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/include/id3/writers.h	2008-03-05 18:23:05.000000000 -0600
-@@ -30,7 +30,7 @@
- 
- #include "id3/writer.h"
- #include "id3/id3lib_streams.h"
--//#include <string.h>
-+#include <string.h>
- 
- class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
- {
-diff -Naur id3lib-3.8.3-orig/examples/demo_convert.cpp id3lib-3.8.3/examples/demo_convert.cpp
---- id3lib-3.8.3-orig/examples/demo_convert.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_convert.cpp	2008-03-05 18:26:50.000000000 -0600
-@@ -84,7 +84,7 @@
-   }
- }
- 
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
-   flags_t ulFlag = ID3TT_ALL;
-   gengetopt_args_info args;
-diff -Naur id3lib-3.8.3-orig/examples/demo_info.cpp id3lib-3.8.3/examples/demo_info.cpp
---- id3lib-3.8.3-orig/examples/demo_info.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_info.cpp	2008-03-05 18:27:40.000000000 -0600
-@@ -309,7 +309,7 @@
- 
- #define DEBUG
- 
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
-   ID3D_INIT_DOUT();
- 
-diff -Naur id3lib-3.8.3-orig/examples/demo_tag.cpp id3lib-3.8.3/examples/demo_tag.cpp
---- id3lib-3.8.3-orig/examples/demo_tag.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_tag.cpp	2008-03-05 18:31:20.000000000 -0600
-@@ -46,7 +46,7 @@
-     os << "v2";
- }
- 
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
-   int ulFlag = ID3TT_ID3;
-   ID3D_INIT_DOUT();
-diff -Naur id3lib-3.8.3-orig/examples/demo_copy.cpp id3lib-3.8.3/examples/demo_copy.cpp
---- id3lib-3.8.3-orig/examples/demo_copy.cpp	2003-03-01 18:23:00.000000000 -0600
-+++ id3lib-3.8.3/examples/demo_copy.cpp	2008-03-05 18:32:44.000000000 -0600
-@@ -81,7 +81,7 @@
-   }
- }
- 
--int main( unsigned int argc, char * const argv[])
-+int main( int argc, char * const argv[])
- {
-   int ulFlag = ID3TT_ID3;
-   ID3D_INIT_DOUT();
diff --git a/abs/extra-testing/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff b/abs/extra-testing/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
deleted file mode 100644
index b05d2cf..0000000
--- a/abs/extra-testing/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ruN id3lib-3.8.3.orig/ChangeLog id3lib-3.8.3/ChangeLog
---- id3lib-3.8.3.orig/ChangeLog	2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/ChangeLog	2006-02-22 00:33:59.946214472 +0100
-@@ -1,3 +1,8 @@
-+2006-02-17  Jerome Couderc
-+
-+    * Patch from Spoon to fix UTF-16 writing bug
-+      http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
-+
- 2003-03-02 Sunday 17:38   Thijmen Klok <thijmen@id3lib.org>
- 
- 	* THANKS (1.20): added more people 
-diff -ruN id3lib-3.8.3.orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp
---- id3lib-3.8.3.orig/src/io_helpers.cpp	2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/src/io_helpers.cpp	2006-02-22 00:35:02.926639992 +0100
-@@ -363,11 +363,22 @@
-     // Write the BOM: 0xFEFF
-     unicode_t BOM = 0xFEFF;
-     writer.writeChars((const unsigned char*) &BOM, 2);
-+    // Patch from Spoon : 2004-08-25 14:17
-+    //   http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
-+    // Wrong code
-+    //for (size_t i = 0; i < size; i += 2)
-+    //{
-+    //  unicode_t ch = (data[i] << 8) | data[i+1];
-+    //  writer.writeChars((const unsigned char*) &ch, 2);
-+    //}
-+    // Right code
-+    unsigned char *pdata = (unsigned char *) data.c_str();
-     for (size_t i = 0; i < size; i += 2)
-     {
--      unicode_t ch = (data[i] << 8) | data[i+1];
-+      unicode_t ch = (pdata[i] << 8) | pdata[i+1];
-       writer.writeChars((const unsigned char*) &ch, 2);
-     }
-+    // End patch
-   }
-   return writer.getCur() - beg;
- }
diff --git a/abs/extra-testing/ifenslave/PKGBUILD b/abs/extra-testing/ifenslave/PKGBUILD
deleted file mode 100644
index 8a75170..0000000
--- a/abs/extra-testing/ifenslave/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 12836 2008-09-21 14:41:26Z dan $
-# Maintainer: Judd Vinet <jvinet@zeroflux.org>
-pkgname=ifenslave
-pkgver=1.1.0
-pkgrel=4
-pkgdesc="Utility for bonding ethernet interfaces"
-license=('GPL2')
-arch=(i686 x86_64)
-url="http://www.linuxfoundation.org/en/Net:Bonding"
-depends=('glibc')
-source=(ftp://ftp.archlinux.org/other/ifenslave/ifenslave.c bonding.conf.d)
-md5sums=('b0d8e4c97094155747cc9238f762c7aa'
-         '397fccbf574d5082c7a3c8d3793dc000')
-
-build() {
-  cd $startdir/src
-  gcc $CFLAGS -I/usr/src/linux/include ifenslave.c -o ifenslave || return 1
-  install -D -m755 ifenslave $startdir/pkg/sbin/ifenslave
-  install -D -m644 bonding.conf.d $startdir/pkg/etc/conf.d/bonding
-}
diff --git a/abs/extra-testing/ifenslave/bonding.conf.d b/abs/extra-testing/ifenslave/bonding.conf.d
deleted file mode 100644
index 3092c5e..0000000
--- a/abs/extra-testing/ifenslave/bonding.conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Settings for ethernet bonding
-#
-# For each bond interface declared in INTERFACES (in rc.conf), declare
-# a bond_${IF} variable that contains the real ethernet interfaces that
-# should be bonded to the bond interface with the ifenslave utility.
-# Then list the bond interface name in the BOND_INTERFACES array.
-#
-
-#bond_bond0="eth0 eth1"
-#BOND_INTERFACES=(bond0)
-
diff --git a/abs/extra-testing/imdbpy/PKGBUILD b/abs/extra-testing/imdbpy/PKGBUILD
deleted file mode 100644
index f3fe589..0000000
--- a/abs/extra-testing/imdbpy/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 5794 2009-11-19 01:18:33Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-# Contributor: lang2 <wenzhi.liang@gmail.com>
-
-pkgname=imdbpy
-pkgver=4.6
-pkgrel=1
-pkgdesc="Python bindings for imdb"
-url="http://imdbpy.sourceforge.net/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('python')
-makedepends=('setuptools')
-optdepends=('python-lxml' 'python-sqlalchemy' 'python-sqlobject')
-source=(http://downloads.sourceforge.net/$pkgname/IMDbPY-$pkgver.tar.gz)
-
-build(){
-  cd "$srcdir/IMDbPY-$pkgver"
-  python setup.py install --root="$pkgdir" || return 1
-
-  # fix directories path
-  mv ${pkgdir}/usr/etc ${pkgdir}
-  install -d ${pkgdir}/usr/share
-  mv ${pkgdir}/usr/imdb ${pkgdir}/usr/share
-  mv ${pkgdir}/usr/doc ${pkgdir}/usr/share/imdb/
-}
-md5sums=('876d4cd041fa23633e3637c22bf95622')
diff --git a/abs/extra-testing/inadyn/PKGBUILD b/abs/extra-testing/inadyn/PKGBUILD
deleted file mode 100644
index 405f34d..0000000
--- a/abs/extra-testing/inadyn/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-pkgname=inadyn
-pkgver=1.96.2
-pkgrel=4
-pkgdesc="Simple dynamic DNS client"
-url="http://www.dyndns.com/support/kb/using_inadyn_with_dyndns_services.html"
-makedepends=('unzip')
-arch=('i686' 'x86_64')
-license=('GPL')
-source=(http://cdn.dyndns.com/$pkgname.zip run)
-	
-
-build() {
-  cd $startdir/src/$pkgname
-  install -m755 -D bin/linux/$pkgname $startdir/pkg/usr/sbin/$pkgname
-  install -m644 -D man/$pkgname.8 $startdir/pkg/usr/man/man8/$pkgname.8
-  install -m644 -D man/$pkgname.conf.5 $startdir/pkg/usr/man/man5/$pkgname.conf.5
-  install -m755 -D ../run $startdir/pkg/etc/sv/inadyn/run
-}
diff --git a/abs/extra-testing/inadyn/run b/abs/extra-testing/inadyn/run
deleted file mode 100644
index 7046c12..0000000
--- a/abs/extra-testing/inadyn/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-exec 2>&1
-. /etc/systemconfig
-exec /usr/sbin/inadyn -u $DDnslogin -p $DDnspassword -a $DDnshostname --syslog
diff --git a/abs/extra-testing/irqbalance/Makefile.irqbalance b/abs/extra-testing/irqbalance/Makefile.irqbalance
deleted file mode 100644
index fe08dc0..0000000
--- a/abs/extra-testing/irqbalance/Makefile.irqbalance
+++ /dev/null
@@ -1,13 +0,0 @@
-CFLAGS := $(CFLAGS) -D_FORTIFY_SOURCE=2 -Wall -W $(shell pkg-config --cflags glib-2.0)
-LDFLAGS := $(shell pkg-config --libs glib-2.0)
-
-OBJS = bitmap.o irqbalance.o cputree.o procinterrupts.o irqlist.o \
-	placement.o activate.o network.o powermode.o numa.o classify.o
-
-all: irqbalance
-
-irqbalance: $(OBJS)
-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
-
-clean:
-	rm -f irqbalance *~ *.o
diff --git a/abs/extra-testing/irqbalance/PKGBUILD b/abs/extra-testing/irqbalance/PKGBUILD
deleted file mode 100644
index a21cda2..0000000
--- a/abs/extra-testing/irqbalance/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Contributor: Martin Striz <ms@poruba.net>
-
-pkgname=irqbalance
-pkgver=0.55
-pkgrel=4
-pkgdesc="IRQ balancing daemon for SMP systems"
-arch=('i686' 'x86_64')
-url="http://www.irqbalance.org/"
-license=('GPL')
-depends=(glib2)
-makedepends=(pkgconfig)
-backup=(etc/conf.d/irqbalance)
-install=($pkgname.install)
-source=(http://www.irqbalance.org/releases/$pkgname-$pkgver.tar.gz
-        Makefile.irqbalance
-        irqbalance.conf.d
-        run
-        finish
-        irqbalance.install)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # use our Makefile instead of one provided which is not quite right
-  cp ../Makefile.irqbalance Makefile
-  make || return 1
-
-  install -D -m755 irqbalance $pkgdir/usr/sbin/irqbalance || return 1
-  mkdir -p $pkgdir/etc/sv/irqbalance || return 1
-  install -D -m644 ../irqbalance.conf.d $pkgdir/etc/conf.d/irqbalance || return 1
-  install -D -m755 ../run $pkgdir/etc/sv/irqbalance || return 1
-  install -D -m755 ../finish $pkgdir/etc/sv/irqbalance || return 1
-}
-md5sums=('9f6b314ff1fdc14173abeb40592d4edf'
-         '45bc9e1d041d8547f2dbf12f887216df'
-         '336c1ee99818f9ecda1687e34c69fd6b'
-         '7f3ee7fb2fccb619f7c66668b6d96d35'
-         'ebb35e88267f4c2e6f68e675c81b2a34'
-         '5f5e96d2fbf35e85d4a8004a3d6b73fc')
diff --git a/abs/extra-testing/irqbalance/finish b/abs/extra-testing/irqbalance/finish
deleted file mode 100644
index ccd9278..0000000
--- a/abs/extra-testing/irqbalance/finish
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/irqbalance`
-
-    stat_runit "Stopping IRQ balancing"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon irqbalance
-      stat_done
-    fi
diff --git a/abs/extra-testing/irqbalance/irqbalance.conf.d b/abs/extra-testing/irqbalance/irqbalance.conf.d
deleted file mode 100644
index ef1bdfd..0000000
--- a/abs/extra-testing/irqbalance/irqbalance.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Settings for irqbalance daemon
-#
-
-# one shot mode - set to 1 if you have Pentium 4 with HT
-ONESHOT=0
diff --git a/abs/extra-testing/irqbalance/irqbalance.install b/abs/extra-testing/irqbalance/irqbalance.install
deleted file mode 100644
index d4e15f1..0000000
--- a/abs/extra-testing/irqbalance/irqbalance.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install () {
-  add_service.sh irqbalance
-
-}
-
-pre_remove () {
-  remove_service.sh irqbalance
-
-}
-
diff --git a/abs/extra-testing/irqbalance/run b/abs/extra-testing/irqbalance/run
deleted file mode 100644
index f0d18f7..0000000
--- a/abs/extra-testing/irqbalance/run
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-ONESHOT=0
-[ -f /etc/conf.d/irqbalance ] && . /etc/conf.d/irqbalance
-
-if [ "$ONESHOT" -ne 0 ]; then
-	ONESHOT_CMD="oneshot"
-fi
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/irqbalance`
-
-    stat_runit "Starting IRQ balancing"
-    [ -z "$PID" ] && /usr/sbin/irqbalance --debug $ONESHOT_CMD >/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      if [ "$ONESHOT" -eq 0 ]; then
-        add_daemon irqbalance
-      fi
-      stat_done
-    fi
diff --git a/abs/extra-testing/iso-codes/PKGBUILD b/abs/extra-testing/iso-codes/PKGBUILD
deleted file mode 100644
index 9477d74..0000000
--- a/abs/extra-testing/iso-codes/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id: PKGBUILD 1166 2008-05-01 15:36:12Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=iso-codes
-pkgver=3.18
-pkgrel=1
-arch=(i686 x86_64)
-license=('LGPL')
-pkgdesc="Lists of the country, language, and currency names"
-source=(ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/${pkgname}-${pkgver}.tar.bz2)
-url="http://pkg-isocodes.alioth.debian.org/"
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} pkgconfigdir=/usr/lib/pkgconfig install || return 1
-}
-md5sums=('96d22a03e307a8e0ca1e43280392cdc4')
diff --git a/abs/extra-testing/iw/PKGBUILD b/abs/extra-testing/iw/PKGBUILD
deleted file mode 100644
index 2f66bdc..0000000
--- a/abs/extra-testing/iw/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 24436 2009-01-17 00:02:46Z thomas $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-
-pkgname=iw
-pkgver=0.9.20
-pkgrel=1
-pkgdesc="nl80211 based CLI configuration utility for wireless devices"
-arch=("i686" "x86_64")
-url="http://www.linuxwireless.org/en/users/Documentation/iw"
-license=("GPL")
-depends=("libnl")
-makedepends=("kernel-headers")
-source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
-
-build() {
-  cd $pkgname-$pkgver
-  make || return 1
-  make DESTDIR=$pkgdir install
-}
-md5sums=('1055799b544b3e08169d155bb6c21bb0')
diff --git a/abs/extra-testing/jade/PKGBUILD b/abs/extra-testing/jade/PKGBUILD
deleted file mode 100644
index e6a7722..0000000
--- a/abs/extra-testing/jade/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 3700 2008-06-29 13:36:31Z jgc $
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-pkgname=jade
-pkgver=1.2.1
-pkgrel=5
-_debpatch=47
-pkgdesc="James Clark's DSSSL Engine"
-url='http://www.jclark.com/jade/'
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('gcc-libs')
-replaces='openjade'
-options=('!libtool')
-source=(ftp://ftp.jclark.com/pub/jade/jade-${pkgver}.tar.gz
-        http://ftp.debian.org/debian/pool/main/j/jade/jade_${pkgver}-${_debpatch}.diff.gz)
-md5sums=('4239670ca6b578bff68b8c2e7cd1225f'
-         'feb3889e2a5fa86ac6bdb742a25d0001')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/jade_${pkgver}-${_debpatch}.diff || return 1
-  chmod 755 configure || return 1
-  ./configure --prefix=/usr --enable-default-catalog=/usr/share/sgml/catalog || return 1
-  make || return 1
-  install -d -m755 ${pkgdir}/usr/lib
-  make prefix=${pkgdir}/usr install || return 1
-  mv ${pkgdir}/usr/bin/sx ${pkgdir}/usr/bin/sgml2xml || return 1
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
-}
diff --git a/abs/extra-testing/java-sun/PKGBUILD b/abs/extra-testing/java-sun/PKGBUILD
deleted file mode 100644
index b348f0d..0000000
--- a/abs/extra-testing/java-sun/PKGBUILD
+++ /dev/null
@@ -1,123 +0,0 @@
-# $Id: PKGBUILD 22893 2010-07-31 09:47:07Z ibiru $
-# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Guillaume ALAUX <Guillaume at alaux dot net>
-
-pkgname=('jre' 'jdk')
-pkgbase=java-sun
-pkgver=6u21
-pkgrel=1
-pkgdesc="Sun/Oracle's implementation of tha Java 6 specification"
-arch=('i686' 'x86_64')
-	[ "$CARCH" = "i686" ]   && _arch=i586
-	[ "$CARCH" = "x86_64" ] && _arch=amd64
-url="http://java.sun.com"
-license=('custom')
-makedepends=('java-runtime')
-source=(http://download.java.net/dlj/binaries/jdk-${pkgver}-dlj-linux-${_arch}.bin
-	https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh
-	jdk.profile
-	java-control-panel.desktop
-	java-monitoring-and-management-console.desktop
-	java-policy-settings.desktop
-	java-visualvm.desktop
-	java-web-start.desktop
-	jre.profile)
-
-[ "$CARCH" = "i686" ]   && md5sums=('b3fbbe55bafedb3f8f93e91d4e809390'
-				'94065b612df0046d9ae758943f9f6a75'
-				'7aaac9ec3e440b92361c6561ac00424a'
-				'e4d814c0f310d77ed6990c731bccd0fb'
-				'4bc2b0be93f76ed07b471e3c89eb5a8a'
-				'8e3cec7ab641ec449cabd068be583f5c'
-				'9ba148ebabce8ed3351b813a9a66b6e5'
-				'568451cf45fc8c7adb83a222a61ca2c6'
-				'50b4f5ac4129097461d246645d73a622')
-[ "$CARCH" = "x86_64" ] && md5sums=('7961051f95c014a9b94ffe3e95ea66e6'
-				'94065b612df0046d9ae758943f9f6a75'
-				'7aaac9ec3e440b92361c6561ac00424a'
-				'e4d814c0f310d77ed6990c731bccd0fb'
-				'4bc2b0be93f76ed07b471e3c89eb5a8a'
-				'8e3cec7ab641ec449cabd068be583f5c'
-				'9ba148ebabce8ed3351b813a9a66b6e5'
-				'568451cf45fc8c7adb83a222a61ca2c6'
-				'50b4f5ac4129097461d246645d73a622')
-
-build() {
-  cd ${srcdir}
-  mkdir unbundle-jdk
-  cd unbundle-jdk
-  sh ../jdk-${pkgver}-dlj-linux-$_arch.bin --accept-license
-  cd ..
-  sh construct.sh unbundle-jdk linux-jdk linux-jre
-}
-
-package_jre() {
-  pkgdesc="Sun/Oracle's Java Runtime Environment"
-  depends=('glibc' 'libxtst')
-  provides=('j2re' 'java-runtime=6')
-  conflicts=('j2re' 'java-runtime')
-  replaces=('j2re')
-  install='jre.install'
-
-  cd ${srcdir}
-
-  mkdir -p ${pkgdir}/opt/java
-  cp -R linux-jdk/jre ${pkgdir}/opt/java
-
-  install -Dm755 ${srcdir}/jre.profile ${pkgdir}/etc/profile.d/jre.sh
-
-  mkdir -p ${pkgdir}/usr/lib/mozilla/plugins
-
-  if [ "$CARCH" = "i686" ]; then
-    ln -s /opt/java/jre/lib/i386/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins
-  else ln -s /opt/java/jre/lib/amd64/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins
-  fi
-
-  mkdir -p ${pkgdir}/usr/share/licenses/jre
-  cp ${pkgdir}/opt/java/jre/COPYRIGHT ${pkgdir}/usr/share/licenses/jre
-  cp ${pkgdir}/opt/java/jre/LICENSE ${pkgdir}/usr/share/licenses/jre
-  cp ${pkgdir}/opt/java/jre/THIRDPARTYLICENSEREADME.txt ${pkgdir}/usr/share/licenses/jre
-
-  # Fix system prefs folder (FS#18872)
-  install -dm755 ${pkgdir}/etc/.java/.systemPrefs
-}
-
-package_jdk() {
-  pkgdesc="Sun/Oracle's Java Development Kit"
-  depends=('glibc' 'jre')
-  provides=('java-environment=6' 'j2sdk')
-  conflicts=('java-environment' 'j2sdk')
-  replaces=('j2sdk')
-  install='jdk.install'
-
-  cd ${srcdir}
-
-  #copy icon
-  install -Dm644 ${srcdir}/linux-jdk/jre/lib/desktop/icons/hicolor/48x48/apps/sun-java.png \
-  		 ${pkgdir}/usr/share/pixmaps/java.png
-
-  rm -rf linux-jdk/jre
-  mkdir -p ${pkgdir}/opt
-  mv linux-jdk ${pkgdir}/opt/java
-
-  install -D -m755 ${srcdir}/jdk.profile ${pkgdir}/etc/profile.d/jdk.sh
-
-  mkdir -p ${pkgdir}/usr/share/licenses/jdk
-  cp ${pkgdir}/opt/java/COPYRIGHT ${pkgdir}/usr/share/licenses/jdk
-  cp ${pkgdir}/opt/java/LICENSE ${pkgdir}/usr/share/licenses/jdk
-  cp ${pkgdir}/opt/java/THIRDPARTYLICENSEREADME.txt ${pkgdir}/usr/share/licenses/jdk
-
-  #desktop entries
-  install -Dm644 ${srcdir}/java-control-panel.desktop \
-  		 ${pkgdir}/usr/share/applications/java-control-panel.desktop
-  install -Dm644 ${srcdir}/java-monitoring-and-management-console.desktop \
-  		 ${pkgdir}/usr/share/applications/java-monitoring-and-management-console.desktop
-  install -Dm644 ${srcdir}/java-policy-settings.desktop \
-  		 ${pkgdir}/usr/share/applications/java-policy-settings.desktop
-  install -Dm644 ${srcdir}/java-visualvm.desktop \
-  		 ${pkgdir}/usr/share/applications/java-visualvm.desktop
-  install -Dm644 ${srcdir}/java-web-start.desktop \
-  		 ${pkgdir}/usr/share/applications/java-web-start.desktop
-}
diff --git a/abs/extra-testing/java-sun/java-control-panel.desktop b/abs/extra-testing/java-sun/java-control-panel.desktop
deleted file mode 100644
index 476e04a..0000000
--- a/abs/extra-testing/java-sun/java-control-panel.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/jcontrol
-GenericName[cs]=Nastavení prostředí Java
-GenericName=Java Environment Settings
-Icon=java
-Name[cs]=Nastavení Javy
-Name=Java Control Panel
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Settings;Java;
diff --git a/abs/extra-testing/java-sun/java-monitoring-and-management-console.desktop b/abs/extra-testing/java-sun/java-monitoring-and-management-console.desktop
deleted file mode 100644
index c0e1e59..0000000
--- a/abs/extra-testing/java-sun/java-monitoring-and-management-console.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/jconsole
-Icon=java
-Name[cs]=Konzole monitorování a správy prostředí Java
-Name=Java Monitoring and Management Console
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Development;Java;
diff --git a/abs/extra-testing/java-sun/java-policy-settings.desktop b/abs/extra-testing/java-sun/java-policy-settings.desktop
deleted file mode 100644
index 1009301..0000000
--- a/abs/extra-testing/java-sun/java-policy-settings.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/policytool
-Icon=java
-Name[cs]=Nastavení politiky Java aplikací
-Name=Java Policy Settings
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Settings;Java;
diff --git a/abs/extra-testing/java-sun/java-visualvm.desktop b/abs/extra-testing/java-sun/java-visualvm.desktop
deleted file mode 100644
index 8aa9527..0000000
--- a/abs/extra-testing/java-sun/java-visualvm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/jvisualvm
-GenericName[cs]=Nástroj pro monitorování a sledování výkonu Java aplikací
-GenericName=Java Monitoring and Performance Monitoring Tool
-Icon=java
-Name=Java VisualVM
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Development;Java;
diff --git a/abs/extra-testing/java-sun/java-web-start.desktop b/abs/extra-testing/java-sun/java-web-start.desktop
deleted file mode 100644
index 573ddc0..0000000
--- a/abs/extra-testing/java-sun/java-web-start.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/javaws -viewer
-GenericName[cs]=Spravovat a spouštět aplikace Java Web Start
-GenericName=Manage and run Java Web Start Applications
-Icon=java
-MimeType=application/x-java-jnlp-file;
-Name[cs]=Java Web Start
-Name=Java Web Start
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Network;Java;
diff --git a/abs/extra-testing/java-sun/jdk.install b/abs/extra-testing/java-sun/jdk.install
deleted file mode 100644
index ae439b1..0000000
--- a/abs/extra-testing/java-sun/jdk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_upgrade() {
-	post_install $1
-}
-
-post_install() {
-   echo "The jdk package is licensed software."
-	echo "You MUST read and agree to the license stored in"
-	echo "/opt/java/LICENSE before using it."
-
-}
-
diff --git a/abs/extra-testing/java-sun/jdk.profile b/abs/extra-testing/java-sun/jdk.profile
deleted file mode 100644
index 9bee9a7..0000000
--- a/abs/extra-testing/java-sun/jdk.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-export J2SDKDIR=/opt/java
-export PATH=$PATH:/opt/java/bin
-export JAVA_HOME=/opt/java
-export DERBY_HOME=/opt/java/db
diff --git a/abs/extra-testing/java-sun/jre.install b/abs/extra-testing/java-sun/jre.install
deleted file mode 100644
index 41e698f..0000000
--- a/abs/extra-testing/java-sun/jre.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_upgrade() {
-	post_install $1
-}
-
-post_install() {
-   echo "The jre package is licensed software."
-	echo "You MUST read and agree to the license stored in"
-	echo "/opt/java/jre/LICENSE before using it."
-	if [ -f /etc/mailcap ] ; then
-		sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
-	fi
-	echo 'application/x-java-jnlp-file;/opt/java/jre/bin/javaws %s' >>/etc/mailcap
-}
-
-post_remove() {
-	mailcap=$(grep -v 'application/x-java-jnlp-file' /etc/mailcap)
-	if [ "$mailcap" != "" ] ; then
-		sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
-	else
-		rm /etc/mailcap
-	fi
-}
diff --git a/abs/extra-testing/java-sun/jre.profile b/abs/extra-testing/java-sun/jre.profile
deleted file mode 100644
index af3e373..0000000
--- a/abs/extra-testing/java-sun/jre.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-export PATH=$PATH:/opt/java/jre/bin
-if [ ! -f /etc/profile.d/jdk.sh ]; then
-        export JAVA_HOME=/opt/java/jre
-fi
diff --git a/abs/extra-testing/joyutils/PKGBUILD b/abs/extra-testing/joyutils/PKGBUILD
deleted file mode 100644
index bd24a63..0000000
--- a/abs/extra-testing/joyutils/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Arkham <arkham at archlinux dot us>
-# Contributor: dirty_d <andrew2085 at gmail dot com>
-
-pkgname=joyutils
-pkgver=1.2.15
-pkgrel=2
-pkgdesc="jscal, jstest, and jsattach utilities for the linux joystick driver"
-arch=('i686' 'x86_64')
-url="http://atrey.karlin.mff.cuni.cz/~vojtech/joystick/"
-license=('GPL')
-source=(ftp://atrey.karlin.mff.cuni.cz/pub/linux/joystick/joystick-$pkgver.tar.gz)
-md5sums=('023500eb6986e1a94aa1a0c30af729c2')
-
-build() {
-    # Fix some warnings
-    cd $srcdir/joystick-$pkgver
-    sed -i 's:#include <sys/ioctl.h>:#include <stdlib.h>\n#include <sys/ioctl.h>:' jscal.c
-
-    # Compile
-    gcc -lm -o jscal jscal.c
-    gcc -o jstest jstest.c
-    gcc -o jsattach jsattach.c
-
-    # Install
-    install -Dm 755 jscal $pkgdir/usr/bin/jscal
-    install -m 755 jstest $pkgdir/usr/bin/
-    install -m 755 jsattach $pkgdir/usr/bin/
-    install -Dm 644 jscal.1 $pkgdir/usr/share/man/man1/jscal.1
-    install -m 644 jstest.1 $pkgdir/usr/share/man/man1/
-    install -m 644 jsattach.1 $pkgdir/usr/share/man/man1/
-}
diff --git a/abs/extra-testing/ladspa/PKGBUILD b/abs/extra-testing/ladspa/PKGBUILD
deleted file mode 100644
index c734ca0..0000000
--- a/abs/extra-testing/ladspa/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 18545 2008-11-06 23:58:57Z jgc $
-# Maintainer: damir <damir@archlinux.org>
-
-pkgname=ladspa
-pkgver=1.13
-pkgrel=2
-pkgdesc="Linux Audio Developer's Simple Plugin API (LADSPA)"
-arch=("i686" "x86_64")
-license=('LGPL')
-url="http://www.ladspa.org/"
-depends=('gcc-libs>=4.3')
-source=(http://www.ladspa.org/download/${pkgname}_sdk_${pkgver}.tgz
-	hardcode-path.patch)
-md5sums=('671be3e1021d0722cadc7fb27054628e'
-         '27743258232d828575d66940e6de2858')
-
-build() {
-  cd "${srcdir}/${pkgname}_sdk/src"
-  patch -Np1 -i "${srcdir}/hardcode-path.patch" || return 1
-  sed -i -e 's/mkdirhier/mkdir -p/' makefile || return 1
-  make targets || return 1
-  make INSTALL_PLUGINS_DIR="${pkgdir}/usr/lib/ladspa/" \
-       INSTALL_INCLUDE_DIR="${pkgdir}/usr/include/" \
-       INSTALL_BINARY_DIR="${pkgdir}/usr/bin/" install || return 1
-}
diff --git a/abs/extra-testing/ladspa/hardcode-path.patch b/abs/extra-testing/ladspa/hardcode-path.patch
deleted file mode 100644
index 821c200..0000000
--- a/abs/extra-testing/ladspa/hardcode-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/search.c.orig	2008-11-07 00:38:18.000000000 +0100
-+++ src/search.c	2008-11-07 00:50:51.000000000 +0100
-@@ -83,6 +83,8 @@
- 	dlclose(pcFilename);
- 	free(pcFilename);
-       }
-+    } else {
-+      free(pcFilename);
-     }
-   }
- }
-@@ -99,13 +101,10 @@
- 
-   pcLADSPAPath = getenv("LADSPA_PATH");
-   if (!pcLADSPAPath) {
--    fprintf(stderr,
--	    "Warning: You do not have a LADSPA_PATH "
--	    "environment variable set.\n");
--    return;
-+    pcStart = "/usr/lib/ladspa/";
-+  } else {
-+    pcStart = pcLADSPAPath;
-   }
--  
--  pcStart = pcLADSPAPath;
-   while (*pcStart != '\0') {
-     pcEnd = pcStart;
-     while (*pcEnd != ':' && *pcEnd != '\0')
diff --git a/abs/extra-testing/lcdproc/PKGBUILD b/abs/extra-testing/lcdproc/PKGBUILD
deleted file mode 100644
index e5cc719..0000000
--- a/abs/extra-testing/lcdproc/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: Bernhard Walle <bernhard.walle@gmx.de>
-pkgname=lcdproc
-pkgver=0.5.3
-pkgrel=3
-pkgdesc="LCDproc is a utility to drive one or more LCD (and LCD-like) devices attached to a host."
-url="http://lcdproc.omnipotent.net/"
-license="GPL"
-depends=(libusb serdisplib libftdi autoconf automake lirc libnxml libmrss pkgconfig xosd)
-backup=(etc/LCDd.conf)
-arch=(i686 x86_64)
-install=lcdproc.install
-source=(http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
-        lcdproc-add-serdisplib
-        )
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-#  patch -p1 < ../lcdproc-add-serdisplib
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-libusb --enable-lcdproc-menus --enable-stat-smbfs --enable-drivers=all
-  make
-  make DESTDIR=$startdir/pkg install
-  sed -e "s/server\/drivers\//\/usr\/lib\/lcdproc\//g" LCDd.conf > $pkgdir/etc/LCDd.conf
-}
-md5sums=('fe9a7c9d8f2c5e76250ce2ea8f644921'
-         '274322642740ad323c43ec5d324519d4')
diff --git a/abs/extra-testing/lcdproc/__changelog b/abs/extra-testing/lcdproc/__changelog
deleted file mode 100644
index 96fd954..0000000
--- a/abs/extra-testing/lcdproc/__changelog
+++ /dev/null
@@ -1,4 +0,0 @@
-add xosd
-# mihanson 2010-04-05
-updated to 0.5.3
-removed lcdproc-add-serdisplib as it does not appear to be needed anymore
diff --git a/abs/extra-testing/lcdproc/lcdproc-add-serdisplib b/abs/extra-testing/lcdproc/lcdproc-add-serdisplib
deleted file mode 100644
index 48d239a..0000000
--- a/abs/extra-testing/lcdproc/lcdproc-add-serdisplib
+++ /dev/null
@@ -1,1353 +0,0 @@
-[PATCH] Add serdisplib driver
-
-This patch adds a serdisplib driver for the serdisplib library
-(http://serdisplib.sf.net) that is used for low-level accessing of dot-matrix
-devices (i.e. such displays that are drived by pixel and not by characters
-unlike HD44780, for example).
-
-I know there's already glcdlib. But that approach has several disadvantages:
-
-  o Unnecessary library dependencies.
-  o Complicated installation, i.e. you have to edit two configuration files.
-  o Too much redraws. In fact, that was the reason for me to write this
-    driver because my ctinclud display (http://www.ct-maeusekino.de) was quite
-    unusable with the glcdlib driver. The problem is simply that lcdproc
-    redraws the whole screen each second and it's the task of the driver
-    to not to redraw it in reality. The problem is now that the glcdproc
-    driver only has the view of characters, and cannot decide which pixels it
-    actually has to redraw. And graphlcd which has the per-pixel view doesn't
-    do that "caching" and simply redraws all. Of course, that _can_
-    be changed in graphlcd, but I'm sure that leads to endless discussions and
-    because I didn't like the glcdlib -> graphlcd -> serdisplib approach
-    anyway, I decided to write that driver.
-
-Some important design decisions:
-
- o The driver is split into lcdgraphic.c and serdisplib.c. All function that
-   do the character -> pixel "rendering" are split out into lcdgraphic.c,
-   so it would be possible to write another low-level driver that uses that
-   function. However, in normal cases it makes more sense to add that part to
-   serdisplib.
- o It only requires FreeType (http://freetype.sf.net) for font rendering.
-   That's no new real dependency because in almost all cases, graphlcd was
-   compiled with FreeType support.
- o Only mono space fonts are supported.
- o The driver implements symbols (arrow, etc.) using Unicode characters of the
-   font. (The recommended font is Andale Mono which is available for free
-   from http://corefonts.sf.net)
- o Works on i686 and x86_64.
-
-Please review. The patch is against 0.5.2. If you consider to add this into
-CVS, I'll provide documentation. And this time, I'll provide the documentation
-in time unlike with the ula200 driver. ;-)
-
-
-Signed-off-by: Bernhard Walle <bernhard.walle@gmx.de>
-
----
- LCDd.conf                   |   28 ++
- acinclude.m4                |   27 +-
- server/drivers/Makefile.am  |    5 
- server/drivers/lcdgraphic.c |  590 ++++++++++++++++++++++++++++++++++++++++++++
- server/drivers/lcdgraphic.h |  195 ++++++++++++++
- server/drivers/serdisplib.c |  379 ++++++++++++++++++++++++++++
- 6 files changed, 1220 insertions(+), 4 deletions(-)
-
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -10,13 +10,13 @@ AC_ARG_ENABLE(drivers,
- 	[                    irman,joy,lb216,lcdm001,lcterm,lirc,MD8800,ms6931,]
- 	[                    mtc_s16209x,MtxOrb,NoritakeVFD,picolcd,pyramid,sed1330]
- 	[                    sed1520,serialPOS,serialVFD,sli,stv5730,svga,t6963,text,]
--	[                    tyan,ula200,xosd]
-+	[                    tyan,ula200,serdisplib,xosd]
- 	[                  'all' compiles all drivers;]
- 	[                  'all,!xxx,!yyy' de-selects previously selected drivers],
- 	drivers="$enableval",
- 	drivers=[bayrad,CFontz,CFontz633,curses,CwLnx,glk,lb216,lcdm001,MtxOrb,pyramid,text])
- 
--allDrivers=[bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,ea65,EyeboxOne,g15,glcdlib,glk,hd44780,icp_a106,imon,IOWarrior,irman,joy,lb216,lcdm001,lcterm,lirc,MD8800,ms6931,mtc_s16209x,MtxOrb,NoritakeVFD,picolcd,pyramid,sed1330,sed1520,serialPOS,serialVFD,sli,stv5730,svga,t6963,text,tyan,ula200,xosd]
-+allDrivers=[bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,ea65,EyeboxOne,g15,glcdlib,glk,hd44780,icp_a106,imon,IOWarrior,irman,joy,lb216,lcdm001,lcterm,lirc,MD8800,ms6931,mtc_s16209x,MtxOrb,NoritakeVFD,picolcd,pyramid,sed1330,sed1520,serialPOS,serialVFD,sli,stv5730,svga,t6963,text,tyan,ula200,serdisplib,xosd]
- 
- drivers=`echo $drivers | sed -e 's/,/ /g'`
- 
-@@ -383,6 +383,29 @@ dnl			else
- 				AC_MSG_WARN([The ula200 driver needs ftdi.h and usb.h])
- 			])
- 			;;
-+                serdisplib)
-+                        LIBFREETYPE_CFLAGS=`pkg-config --cflags freetype2`
-+                        LIBFREETYPE_LIBS=`pkg-config --libs freetype2`
-+                        if test x"$LIBFREETYPE_CFLAGS" = "x" ; then
-+                                AC_MSG_WARN([The serdisplib driver needs freetype2])
-+                        fi
-+
-+                        AC_CHECK_HEADERS([serdisplib/serdisp.h],[
-+                                AC_CHECK_LIB(serdisp, serdisp_nextdisplaydescription,[
-+                                        LIBSERDISP="-lserdisp"
-+                                        DRIVERS="$DRIVERS serdisplib${SO}"
-+                                        actdrivers=["$actdrivers serdisplib"]
-+                                ],[
-+                                        AC_MSG_WARN([The serdisplib driver needs serdisplib])
-+                                ])
-+                        ],[
-+                                AC_MSG_WARN([The serdisplib driver needs serdislib/serdisp.h])
-+                        ])
-+
-+                        AC_SUBST(LIBFREETYPE_CFLAGS)
-+                        AC_SUBST(LIBFREETYPE_LIBS)
-+                        AC_SUBST(LIBSERDISP)
-+                        ;;
- 		xosd)
- 			AC_CHECK_HEADERS([xosd.h],[
- 				AC_CHECK_LIB(xosd, main,[
---- a/server/drivers/Makefile.am
-+++ b/server/drivers/Makefile.am
-@@ -19,12 +19,13 @@ AM_LDFLAGS = @LDSHARED@
- #LIBS =
- 
- pkglib_PROGRAMS = @DRIVERS@
--EXTRA_PROGRAMS = bayrad CFontz CFontz633 CFontzPacket curses CwLnx ea65 EyeboxOne g15 glcdlib glk hd44780 icp_a106 imon IOWarrior irman joy lb216 lcdm001 lcterm lirc MD8800 ms6931 mtc_s16209x MtxOrb NoritakeVFD picolcd pyramid sed1330 sed1520 serialPOS serialVFD stv5730 svga t6963 text tyan sli ula200 xosd
-+EXTRA_PROGRAMS = bayrad CFontz CFontz633 CFontzPacket curses CwLnx ea65 EyeboxOne g15 glcdlib glk hd44780 icp_a106 imon IOWarrior irman joy lb216 lcdm001 lcterm lirc MD8800 ms6931 mtc_s16209x MtxOrb NoritakeVFD picolcd pyramid sed1330 sed1520 serialPOS serialVFD stv5730 svga t6963 text tyan sli ula200 serdisplib xosd
- noinst_LIBRARIES = libLCD.a libbignum.a
- 
- IOWarrior_CFLAGS =   @libusb_cflags@ $(AM_CFLAGS)
- hd44780_CFLAGS =     @libusb_cflags@ $(AM_CFLAGS)
- g15_CFLAGS =         @libusb_cflags@ $(AM_CFLAGS)
-+serdisplib_CFLAGS =  @LIBFREETYPE_CFLAGS@ $(AM_CFLAGS)
- 
- CFontz_LDADD =       libLCD.a libbignum.a
- CFontz633_LDADD =    libLCD.a libbignum.a
-@@ -53,6 +54,7 @@ svga_LDADD =         @LIBSVGA@
- t6963_LDADD =        libLCD.a
- tyan_LDADD =         libLCD.a libbignum.a
- ula200_LDADD =       libLCD.a @LIBFTDI@
-+serdisplib_LDADD =   libLCD.a @LIBSERDISP@ @LIBFREETYPE_LIBS@
- sli_LDADD =          libLCD.a
- xosd_LDADD =         @LIBXOSD@
- 
-@@ -99,6 +101,7 @@ t6963_SOURCES =      lcd.h lcd_lib.h t69
- text_SOURCES =       lcd.h text.h text.c report.h
- tyan_SOURCES =       lcd.h lcd_lib.h tyan_lcdm.h tyan_lcdm.c report.h adv_bignum.h
- ula200_SOURCES =     lcd.h lcd_lib.h ula200.h ula200.c report.h
-+serdisplib_SOURCES = lcd.h serdisplib.h serdisplib.c lcdgraphic.c lcdgraphic.h
- sli_SOURCES =        lcd.h lcd_lib.h wirz-sli.h wirz-sli.c report.h
- xosd_SOURCES =       lcd.h xosdlib_drv.c xosdlib_drv.h report.h
- 
---- /dev/null
-+++ b/server/drivers/lcdgraphic.c
-@@ -0,0 +1,590 @@
-+// Description:
-+
-+/*  Copyright (C) 2007 Bernhard Walle <bernhard.walle@gmx.de>
-+
-+    This program is free software; you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation; either version 2 of the License, or
-+    any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program; if not, write to the Free Software
-+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 */
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <termios.h>
-+#include <fcntl.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <limits.h>
-+#include <syslog.h>
-+#include <stdint.h>
-+
-+#include "lcdgraphic.h"
-+
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Defines
-+
-+#undef report
-+#define lcdgr_report    lcdgr->drv->report
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Returns the value of a pixel in the new_buffer buffer.
-+//
-+// @param lcdgr     a pointer to a valid lcdgraphic structure
-+// @param x         the x location of the pixel
-+// @param y         the y location of the pixel
-+//
-+// @return the value of the pixel
-+//
-+static inline int get_pixel_new(struct lcdgraphic *lcdgr, int x, int y)
-+{
-+    if (x >= lcdgr->width || y >= lcdgr->height)
-+        return -1;
-+    else
-+        return lcdgr->new_buffer[lcdgr->width * y + x];
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Returns the value of a pixel in the disp_buffer buffer.
-+//
-+// @param lcdgr     a pointer to a valid lcdgraphic structure
-+// @param x         the x location of the pixel
-+// @param y         the y location of the pixel
-+//
-+// @return the value of the pixel
-+//
-+static inline int get_pixel_disp(struct lcdgraphic *lcdgr, int x, int y)
-+{
-+    if (x >= lcdgr->width || y >= lcdgr->height)
-+        return -1;
-+    else
-+        return lcdgr->disp_buffer[lcdgr->width * y + x];
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Sets the value of a pixel in the new_buffer buffer.
-+//
-+// @param lcdgr     a pointer to a valid lcdgraphic structure
-+// @param x         the x location of the pixel
-+// @param y         the y location of the pixel
-+// @param value     the value to which the buffer should be set
-+//
-+static void set_pixel_new(struct lcdgraphic *lcdgr, int x, int y, int value)
-+{
-+    if (x < lcdgr->width && y < lcdgr->height)
-+        lcdgr->new_buffer[lcdgr->width * y + x] = value;
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Sets the value of a pixel in the disp_buffer buffer.
-+//
-+// @param lcdgr     a pointer to a valid lcdgraphic structure
-+// @param x         the x location of the pixel
-+// @param y         the y location of the pixel
-+// @param value     the value to which the buffer should be set
-+//
-+static void set_pixel_disp(struct lcdgraphic *lcdgr, int x, int y, int value)
-+{
-+    if (x < lcdgr->width && y < lcdgr->height)
-+        lcdgr->disp_buffer[lcdgr->width * y + x] = value;
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Maps a lcdproc icon to a unicode code for an icon.
-+//
-+// @param icon      the lcdproc icon constant
-+//
-+// @return Unicode value
-+//
-+static int icon2unicode(int icon)
-+{
-+    switch (icon) {
-+        case ICON_BLOCK_FILLED:
-+            return UNICODE_BLOCK_FILLED;
-+        case ICON_HEART_FILLED:
-+            return UNICODE_HEART_FILLED;
-+        case ICON_HEART_OPEN:
-+            return UNICODE_HEART_OPEN;
-+        case ICON_ARROW_UP:
-+            return UNICODE_ARROW_UP;
-+        case ICON_ARROW_DOWN:
-+            return UNICODE_ARROW_DOWN;
-+        case ICON_ARROW_LEFT:
-+            return UNICODE_ARROW_LEFT;
-+        case ICON_ARROW_RIGHT:
-+            return UNICODE_ARROW_RIGHT;
-+        case ICON_SELECTOR_AT_LEFT:
-+            return UNICODE_SELECTOR_AT_LEFT;
-+        case ICON_SELECTOR_AT_RIGHT:
-+            return UNICODE_SELECTOR_AT_RIGHT;
-+        case ICON_ELLIPSIS:
-+            return UNICODE_ELLIPSIS;
-+        default:
-+            return -1;
-+    }
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Initialises the instance
-+//
-+// @param lcdgr     a pointer to a valid lcdgraphic structure (not initialised,
-+//                  only allocated
-+// @param settings  a pointer to a settings structure, for a description of the
-+//                  members, see above
-+// @param functions a pointer to the functions structure, for a description of
-+//                  the members, see above
-+//
-+// @return          0 on success, != 0 on failure
-+//
-+int lcdgraphic_init(struct lcdgraphic              *lcdgr,
-+                    struct lcdgraphic_settings     *settings,
-+                    struct lcdgraphic_functions    *functions)
-+{
-+    int ret;
-+
-+    // check the arguments
-+    if (!lcdgr || !functions || !settings) {
-+        lcdgr_report(RPT_ERR, "lcdgraphic_init: one of the arguments is NULL");
-+        return -EINVAL;
-+    }
-+
-+    // check functions
-+    if (!functions->setpixel || !functions->clear || !functions->flush) {
-+        lcdgr_report(RPT_ERR, "lcdgraphic_init: all functions must be valid");
-+        return -EINVAL;
-+    }
-+
-+    // validation
-+    if (settings->cwidth == 0 || settings->cheight == 0) {
-+        lcdgr_report(RPT_ERR, "lcdgraphic_init: cwidth / cheight is 0");
-+        return -EINVAL;
-+    }
-+
-+    // zero all first
-+    memset(lcdgr, 0, sizeof(struct lcdgraphic));
-+
-+    // assign some members
-+    lcdgr->width = settings->width;
-+    lcdgr->height = settings->height;
-+    lcdgr->cwidth = settings->cwidth;
-+    lcdgr->cheight = settings->cheight;
-+    lcdgr->bwidth = settings->bheight;
-+    lcdgr->drv = settings->drv;
-+    strncpy(lcdgr->normal_font, settings->normal_font, PATH_MAX);
-+    lcdgr->normal_font[PATH_MAX-1] = 0;
-+    lcdgr->funcs = *functions;
-+    lcdgr->all_dirty = 1;
-+
-+    // calculate some stuff
-+    lcdgr->num_pixels = lcdgr->width * lcdgr->height;
-+    lcdgr->xchars = (lcdgr->width - 2*lcdgr->bwidth) / lcdgr->cwidth;
-+    lcdgr->ychars = (lcdgr->height - 2*lcdgr->bheight) / lcdgr->cheight;
-+
-+    // initialise freetype
-+    ret = FT_Init_FreeType(&lcdgr->ft_library);
-+    if (ret != 0) {
-+        lcdgr_report(RPT_ERR, "Freetype initialisation failed");
-+        goto out;
-+    }
-+
-+    // load the font face for freetype
-+    ret = FT_New_Face(lcdgr->ft_library, lcdgr->normal_font, 0,
-+            &lcdgr->ft_normal_font);
-+    if (ret != 0) {
-+        lcdgr_report(RPT_ERR, "Freetype creation of font '%s' failed",
-+                lcdgr->normal_font);
-+        goto out;
-+    }
-+
-+    // allocate the buffers
-+    lcdgr->disp_buffer = (int *)malloc(sizeof(int) * lcdgr->num_pixels);
-+    if (!lcdgr->disp_buffer) {
-+        lcdgr_report(RPT_ERR, "lcdgraphic_init: malloc of disp_buffer failed");
-+        ret = -ENOMEM;
-+        goto out;
-+    }
-+
-+    lcdgr->new_buffer = (int *)malloc(sizeof(int) * lcdgr->num_pixels);
-+    if (!lcdgr->new_buffer) {
-+        lcdgr_report(RPT_ERR, "lcdgraphic_init: malloc of new_buffer failed");
-+        ret = -ENOMEM;
-+        goto out;
-+    }
-+
-+    // clear buffers initially
-+    memset(lcdgr->new_buffer, 0, sizeof(int) * lcdgr->num_pixels);
-+    memset(lcdgr->disp_buffer, 0, sizeof(int) * lcdgr->num_pixels);
-+
-+    return 0;
-+
-+out:
-+    if (lcdgr->ft_normal_font)
-+        FT_Done_Face(lcdgr->ft_normal_font);
-+    if (lcdgr->ft_library)
-+        FT_Done_FreeType(lcdgr->ft_library);
-+    if (lcdgr->new_buffer)
-+        free(lcdgr->new_buffer);
-+    if (lcdgr->disp_buffer)
-+        free(lcdgr->disp_buffer);
-+
-+    return ret;
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Destroys the instance
-+//
-+// @param lcdgr     a pointer to a valid lcdgraphic structure
-+//
-+void lcdgraphic_destroy(struct lcdgraphic *lcdgr)
-+{
-+    if (!lcdgr) {
-+        lcdgr_report(RPT_ERR, "lcdgraphic_destroy: lcdgr == NULL");
-+        return;
-+    }
-+
-+    if (lcdgr->ft_normal_font)
-+        FT_Done_Face(lcdgr->ft_normal_font);
-+    if (lcdgr->ft_library)
-+        FT_Done_FreeType(lcdgr->ft_library);
-+
-+    free(lcdgr->disp_buffer);
-+    free(lcdgr->new_buffer);
-+
-+    // allow multiple calls of that function
-+    lcdgr->disp_buffer = NULL;
-+    lcdgr->new_buffer = NULL;
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Returns the number of characters in one line. This function can be used
-+// inside the width callback of the display driver.
-+//
-+// @param lcdgr     a pointer to a valid lcdgraphic structure
-+//
-+// @return the number of characters in a line
-+//
-+int lcdgraphic_width(struct lcdgraphic *lcdgr)
-+{
-+    if (!lcdgr) {
-+        lcdgr_report(RPT_ERR, "lcdgraphic_destroy: lcdgr == NULL");
-+        return -1;
-+    }
-+
-+    return lcdgr->xchars;
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Returns the number of lines. This function can be used inside the height
-+// callback of the display driver.
-+//
-+// @param lcdgr     a pointer to a valid lcdgraphic structure
-+//
-+// @return the number lines
-+//
-+int lcdgraphic_height(struct lcdgraphic *lcdgr)
-+{
-+    if (!lcdgr) {
-+        lcdgr_report(RPT_ERR, "lcdgraphic_destroy: lcdgr == NULL");
-+        return -1;
-+    }
-+
-+    return lcdgr->ychars;
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Clears the buffer. Doesn't draw anything.
-+//
-+// @param lcdgr     a pointer to a valid lcdgraphic structure
-+//
-+void lcdgraphic_clear(struct lcdgraphic *lcdgr)
-+{
-+    if (!lcdgr) {
-+        lcdgr_report(RPT_ERR, "lcdgraphic_destroy: lcdgr == NULL");
-+        return;
-+    }
-+
-+    memset(lcdgr->new_buffer, 0, sizeof(int) * lcdgr->num_pixels);
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Draws a string into the display buffer. This calls lcdgraphic_draw_char()
-+// internally.
-+//
-+// @param lcdgr     a pointer to a valid lcdgraphic structure
-+// @param x         the column (position in characters!) where the character
-+//                  should be drawn
-+// @param y         the line (position in characters!) where the character
-+//                  should be drawn
-+// @param str       the string that should be drawn
-+//
-+void lcdgraphic_draw_string(struct lcdgraphic *lcdgr, int x, int y, char *str)
-+{
-+    int i;
-+    int num_chars = strlen(str);
-+
-+    // check string length
-+    if (x + num_chars > lcdgr->xchars) {
-+        lcdgr_report(RPT_WARNING, "lcdgraphic_draw_string: %dx%d - %s too long",
-+                x, y, str);
-+        return;
-+    }
-+
-+    for (i = 0; i < num_chars; i++)
-+        lcdgraphic_draw_char(lcdgr, x + i, y, str[i]);
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Draws a Unicode character into the display buffer.
-+//
-+// @param lcdgr     a pointer to a valid lcdgraphic structure
-+// @param x         the column (position in characters!) where the character
-+//                  should be drawn
-+// @param y         the line (position in characters!) where the character
-+//                  should be drawn
-+// @param c         the character that should be drawn (unicode code)
-+// @param scale     for big numbers -- the number of cells that the rendered
-+//                  string should occupy
-+// @param width     the width in characters
-+//
-+static int lcdgraphic_draw_char_unicode(struct lcdgraphic *lcdgr,
-+                                        int               x,
-+                                        int               y,
-+                                        int               c,
-+                                        int               scale,
-+                                        int               width)
-+{
-+    static int      last_font_size = -1;
-+    int             xoffset, yoffset; // in pixel
-+    int             err;
-+    FT_Bitmap       *bitmap;
-+    unsigned char   *bitmap_buf;
-+    int             col, row;
-+    FT_GlyphSlot    glyph;
-+    FT_Face         face;
-+    int             cwidth, cheight;
-+    int             font_size;
-+
-+    face = lcdgr->ft_normal_font;
-+    xoffset = lcdgr->bwidth + x*lcdgr->cwidth;
-+    yoffset = lcdgr->bheight + y*lcdgr->cheight;
-+
-+    // set the font size
-+    font_size = lcdgr->cheight * scale;
-+    if (last_font_size != font_size) {
-+        err = FT_Set_Pixel_Sizes(lcdgr->ft_normal_font, font_size, font_size);
-+        if (err != 0) {
-+            lcdgr_report(RPT_ERR, "Failed to set pixel size (%dx%x)",
-+                    lcdgr->cwidth * scale, lcdgr->cheight * scale);
-+            return -1;
-+        }
-+
-+        last_font_size = font_size;
-+    }
-+
-+    // load the glyph and render it
-+    err = FT_Load_Char(lcdgr->ft_normal_font, c,
-+            FT_LOAD_RENDER | FT_LOAD_MONOCHROME);
-+    if (err != 0) {
-+        lcdgr_report(RPT_WARNING, "lcdgraphic_draw_char: loading char "
-+                "'%c' (%d) failed", c, c);
-+
-+        return -1;
-+    }
-+
-+    // clear the rectangle first
-+    cwidth = lcdgr->cwidth * width;
-+    cheight = lcdgr->cheight * scale;
-+    for (col = 0; col < cwidth; col++)
-+        for (row = 0; row < cheight; row++)
-+            set_pixel_new(lcdgr, xoffset + col, yoffset + row, 0);
-+
-+    // set some data elements for convenience
-+    glyph = lcdgr->ft_normal_font->glyph;
-+    bitmap = &glyph->bitmap;
-+    bitmap_buf = bitmap->buffer;
-+
-+    // and now copy the pixels
-+    for (row = 0; row < bitmap->rows; row++) {
-+        for (col = 0; col < bitmap->width; col++) {
-+            int bitmap_left = glyph->bitmap_left;
-+
-+            if (scale != width)
-+                bitmap_left = (cwidth - bitmap->width)/2;
-+
-+            set_pixel_new(lcdgr, xoffset + col + bitmap_left,
-+                    yoffset + row + lcdgr->cheight + (face->size->metrics.descender >> 6)
-+                    - glyph->bitmap_top,
-+                    bitmap_buf[col/8] >> (7 - (col % 8)) & 1);
-+        }
-+        bitmap_buf += bitmap->pitch;
-+    }
-+
-+    return 0;
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Draws a character into the display buffer.
-+//
-+// @param lcdgr     a pointer to a valid lcdgraphic structure
-+// @param x         the column (position in characters!) where the character
-+//                  should be drawn
-+// @param y         the line (position in characters!) where the character
-+//                  should be drawn
-+// @param c         the character that should be drawn
-+//
-+void lcdgraphic_draw_char(struct lcdgraphic *lcdgr, int x, int y, char c)
-+{
-+    if (lcdgraphic_draw_char_unicode(lcdgr, x, y, c & 0xff, 1, 1) != 0)
-+        lcdgraphic_draw_char_unicode(lcdgr, x, y, '?', 1, 1);
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Draws a big number into the display buffer.
-+//
-+// @param lcdgr     a pointer to a valid lcdgraphic structure
-+// @param x         the x position
-+// @param num       the actual number
-+//
-+void lcdgraphic_draw_num(struct lcdgraphic *lcdgr, int x, int num)
-+{
-+    int y;
-+    const int BIG_HEIGHT = 3;
-+
-+    if (num < 0 || num > 10) {
-+        lcdgr_report(RPT_WARNING, "lcdgraphic_draw_num: num out of range (%d)", num);
-+        return;
-+    }
-+
-+    y = lcdgr->ychars - (lcdgr->ychars - BIG_HEIGHT + 1)/2;
-+    if (num == 10)
-+        lcdgraphic_draw_char_unicode(lcdgr, x, y, ':', BIG_HEIGHT, 1);
-+    else
-+        lcdgraphic_draw_char_unicode(lcdgr, x, y, '0' + num, BIG_HEIGHT, BIG_HEIGHT);
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Draws an icon (which standard lcdproc icon syntax)
-+//
-+// @param lcdgr     a pointer to a valid lcdgraphic structure
-+// @param x         the x position of the icon
-+// @param y         the y position of the icon
-+// @param icon      the icon constant
-+//
-+// @return 0 on success, -1 on failure (i.e. the core replaces the icon by a
-+//         suitable character
-+//
-+int lcdgraphic_icon(struct lcdgraphic *lcdgr, int x, int y, int icon)
-+{
-+    int unicode;
-+
-+    unicode = icon2unicode(icon);
-+    if (unicode > 0)
-+        return lcdgraphic_draw_char_unicode(lcdgr, x, y, unicode, 1, 1);
-+    else
-+        return -1;
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Draws a horizontal bar
-+//
-+// @param lcdgr     a pointer to a valid lcdgraphic structure
-+// @param x         the x position of the bar
-+// @param y         the y position of the bar
-+// @param len       the maximum length
-+// @param promille  the current state
-+// @param options
-+//
-+void lcdgraphic_hbar(struct lcdgraphic  *lcdgr,
-+                     int                x,
-+                     int                y,
-+                     int                len,
-+                     int                promille,
-+                     int                options)
-+{
-+    int startx, midx, endx, starty, endy;
-+    int col, row;
-+
-+    /* calculate positions */
-+    startx = lcdgr->bwidth + x*lcdgr->cwidth;
-+    midx   = startx + promille * (len*lcdgr->cwidth) / 1000;
-+    endx   = startx + len*lcdgr->cwidth;
-+    starty = lcdgr->bheight + y*lcdgr->cheight;
-+    endy   = starty + lcdgr->cheight - 1;  /* don't draw the last line */
-+
-+    for (col = startx; col < endx; col++)
-+        for (row = starty; row < endy; row++)
-+                set_pixel_new(lcdgr, col, row, col < midx);
-+}
-+
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Draws a vertical bar
-+//
-+// @param lcdgr     a pointer to a valid lcdgraphic structure
-+// @param x         the x position of the bar
-+// @param y         the y position of the bar
-+// @param len       the maximum length
-+// @param promille  the current state
-+// @param options
-+//
-+void lcdgraphic_vbar(struct lcdgraphic  *lcdgr,
-+                     int                x,
-+                     int                y,
-+                     int                len,
-+                     int                promille,
-+                     int                options)
-+{
-+    int startx, endx, starty, midy, endy;
-+    int col, row;
-+
-+    /* calculation positions */
-+    startx = lcdgr->bwidth + x*lcdgr->cwidth;
-+    endx   = startx + lcdgr->cwidth - 1; /* don't draw the last column */
-+    starty = lcdgr->bheight + (y + 1)*lcdgr->cheight - 1;
-+    midy   = starty - promille * (len*lcdgr->cheight) / 1000;
-+    endy   = starty - len*lcdgr->cheight;
-+
-+    for (col = startx; col < endx; col++)
-+        for (row = starty; row > endy; row--)
-+            set_pixel_new(lcdgr, col, row, row > midy);
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Flushes the output to the display. Uses the provided callback functions
-+// of the underlying display.
-+//
-+// @param lcdgr     a pointer to a valid lcdgraphic structure
-+//
-+void lcdgraphic_flush(struct lcdgraphic *lcdgr)
-+{
-+    int x, y;
-+
-+    if (lcdgr->all_dirty)
-+        lcdgr->funcs.clear(lcdgr->drv);
-+
-+    for (y = 0; y < lcdgr->height; y++) {
-+        for (x = 0; x < lcdgr->width; x++) {
-+            int val = get_pixel_new(lcdgr, x, y);
-+
-+            if (lcdgr->all_dirty ||
-+                    (val != get_pixel_disp(lcdgr, x, y)) ) {
-+                lcdgr->funcs.setpixel(lcdgr->drv, x, y, val);
-+                set_pixel_disp(lcdgr, x, y, val);
-+            }
-+        }
-+    }
-+
-+    lcdgr->funcs.flush(lcdgr->drv);
-+    lcdgr->all_dirty = 0;
-+}
-+
-+// vimx: set sw=4 ts=4 et:
---- /dev/null
-+++ b/server/drivers/lcdgraphic.h
-@@ -0,0 +1,195 @@
-+// Description:
-+
-+/*  Copyright (C) 2007 Bernhard Walle <bernhard.walle@gmx.de>
-+
-+    This program is free software; you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation; either version 2 of the License, or
-+    any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program; if not, write to the Free Software
-+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 */
-+
-+#ifndef LCDGRAPHIC_H
-+#define LCDGRAPHIC_H
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <termios.h>
-+#include <fcntl.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <syslog.h>
-+#include <iconv.h>
-+
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-+
-+#include <serdisplib/serdisp.h>
-+
-+
-+#include "lcd.h"
-+#include "report.h"
-+#include "timing.h"
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// constants
-+//
-+
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Unicode characters
-+//
-+
-+#define UNICODE_BLOCK_FILLED        0x2588
-+#define UNICODE_HEART_OPEN		    0x2661
-+#define UNICODE_HEART_FILLED	    0x2665
-+#define UNICODE_ARROW_UP		    0x2191
-+#define UNICODE_ARROW_DOWN  	    0x2193
-+#define UNICODE_ARROW_LEFT  	    0x2190
-+#define UNICODE_ARROW_RIGHT         0x2192
-+#define UNICODE_CHECKBOX_OFF        -1          /* -1 == not implemented */
-+#define UNICODE_CHECKBOX_ON         -1
-+#define UNICODE_CHECKBOX_GRAY       -1
-+#define UNICODE_SELECTOR_AT_LEFT    -1
-+#define UNICODE_SELECTOR_AT_RIGHT   -1
-+#define UNICODE_ELLIPSIS            -1
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// These are callback functions that the low level driver must provide
-+//
-+struct lcdgraphic_functions {
-+
-+    // sets the colour of a pixel
-+    void (*setpixel)(Driver *drvthis, int x, int y, int pixel);
-+
-+    // clears the whole display
-+    void (*clear)(Driver *drvthis);
-+
-+    // flushes the display
-+    void (*flush)(Driver *drvthis);
-+};
-+
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// That structure should be passed by the user, while struct lcdgraphic is
-+// entirely private to the library
-+struct lcdgraphic_settings {
-+
-+    // the width and the height (in number of pixels) of the display
-+	int width, height;
-+
-+    // the width and the height of one character
-+    int cwidth, cheight;
-+
-+    // defines unused area on the display (border width / border height)
-+    int bwidth, bheight;
-+
-+    // that's the cookie that is passed to the callback functions
-+    // it's also used for reporting errors
-+    Driver *drv;
-+
-+    // font file used for normal characters (TTF, must be monospaced)
-+    char normal_font[PATH_MAX];
-+};
-+
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Private structure for drivers that use the functions of that library.
-+// Don't access the members by hand here.
-+//
-+struct lcdgraphic {
-+
-+    // --- public members from the structure above -----
-+
-+    // the width and the height (in number of pixels) of the display
-+	int width, height;
-+
-+    // the width and the height of one character
-+    int cwidth, cheight;
-+
-+    // defines unused area on the display (border width / border height)
-+    int bwidth, bheight;
-+
-+    // that's the cookie that is passed to the callback functions
-+    // it's also used for reporting errors
-+    Driver *drv;
-+
-+    // font file used for normal characters (TTF, must be monospaced)
-+    char normal_font[PATH_MAX];
-+
-+    // a set of callback functions
-+    struct lcdgraphic_functions funcs;
-+
-+    // --- private members -----
-+
-+    // the framebuffer that's actually displayed
-+    int *disp_buffer;
-+
-+    // the buffer that shows the contents of the next update but wasn't
-+    // flushed yet
-+    int *new_buffer;
-+
-+    // (calculated) convenience value because we need that often
-+    int num_pixels;
-+
-+    // (calculated) number of characters in both directions
-+    int xchars, ychars;
-+
-+    // all buffers are dirty, i.e. update all
-+    int all_dirty;
-+
-+    // freetype library handle
-+    FT_Library ft_library;
-+
-+    // handle for the normal font
-+    FT_Face ft_normal_font;
-+
-+    // handle for charset convertions
-+    iconv_t iconv_handle;
-+};
-+
-+// Forward declarations for 'clients'
-+
-+int lcdgraphic_init(struct lcdgraphic              *lcdgr,
-+                    struct lcdgraphic_settings     *settings,
-+                    struct lcdgraphic_functions    *functions);
-+
-+int lcdgraphic_width(struct lcdgraphic *lcdgr);
-+int lcdgraphic_height(struct lcdgraphic *lcdgr);
-+void lcdgraphic_destroy(struct lcdgraphic *lcdgr);
-+void lcdgraphic_clear(struct lcdgraphic *lcdgr);
-+void lcdgraphic_flush(struct lcdgraphic *lcdgr);
-+void lcdgraphic_draw_string(struct lcdgraphic *lcdgr, int x, int y, char *str);
-+void lcdgraphic_draw_char(struct lcdgraphic *lcdgr, int x, int y, char c);
-+void lcdgraphic_draw_num(struct lcdgraphic *lcdgr, int x, int num);
-+int lcdgraphic_icon(struct lcdgraphic *lcdgr, int x, int y, int icon);
-+
-+void lcdgraphic_hbar(struct lcdgraphic  *lcdgr,
-+                     int                x,
-+                     int                y,
-+                     int                len,
-+                     int                promille,
-+                     int                options);
-+
-+void lcdgraphic_vbar(struct lcdgraphic  *lcdgr,
-+                     int                x,
-+                     int                y,
-+                     int                len,
-+                     int                promille,
-+                     int                options);
-+
-+#endif /* LCDGRAPHIC_H */
-+
-+// vim: set sw=4 ts=4 et:
---- /dev/null
-+++ b/server/drivers/serdisplib.c
-@@ -0,0 +1,379 @@
-+// Description:
-+
-+/*  Copyright (C) 2007 Bernhard Walle <bernhard.walle@gmx.de>
-+
-+    This program is free software; you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation; either version 2 of the License, or
-+    any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program; if not, write to the Free Software
-+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 */
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <termios.h>
-+#include <fcntl.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <limits.h>
-+#include <syslog.h>
-+
-+#include <serdisplib/serdisp.h>
-+
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
-+#include "lcd.h"
-+#include "report.h"
-+#include "timing.h"
-+#include "lcdgraphic.h"
-+
-+/* Vars for the server core */
-+MODULE_EXPORT char *api_version = API_VERSION;
-+MODULE_EXPORT int stay_in_foreground = 0;
-+MODULE_EXPORT int supports_multiple = 1;
-+MODULE_EXPORT char *symbol_prefix = "serdisplib_";
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// constants
-+//
-+#define SERDISPLIB_MAX_DISPLAYNAME      32
-+#define SERDISPLIB_MAX_DEVICENAME       PATH_MAX
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// private data types
-+//
-+typedef struct {
-+
-+    // the name of the display driver in serdisplib, e.g. 'ctinclud'
-+    char display_name[SERDISPLIB_MAX_DISPLAYNAME];
-+
-+    // the name of the device in serdisplib, e.g. /dev/parport0
-+    char display_device[SERDISPLIB_MAX_DEVICENAME];
-+
-+    // the serdisplib connection handle
-+    serdisp_CONN_t* serdisplib_conn;
-+
-+    // the serdisplib handle
-+    serdisp_t *serdisplib;
-+
-+    // invert the display
-+    int invert;
-+
-+    // the lcdgraphic handle
-+    struct lcdgraphic *lcdgraphic;
-+
-+} PrivateData;
-+
-+
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Callback functions
-+//
-+
-+static void callback_setpixel(Driver *drvthis, int x, int y, int pixel)
-+{
-+	PrivateData *p = (PrivateData *) drvthis->private_data;
-+
-+    serdisp_setcolour(p->serdisplib, x, y, pixel ? SD_COL_BLACK : SD_COL_WHITE);
-+}
-+
-+static void callback_clear(Driver *drvthis)
-+{
-+	PrivateData *p = (PrivateData *) drvthis->private_data;
-+
-+    serdisp_clearbuffer(p->serdisplib);
-+}
-+
-+static void callback_flush(Driver *drvthis)
-+{
-+	PrivateData *p = (PrivateData *) drvthis->private_data;
-+
-+    serdisp_update(p->serdisplib);
-+}
-+
-+struct lcdgraphic_functions lcdgraphic_functions = {
-+    .setpixel       = callback_setpixel,
-+    .clear          = callback_clear,
-+    .flush          = callback_flush
-+};
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Init the driver and display
-+//
-+MODULE_EXPORT int
-+serdisplib_init(Driver *drvthis)
-+{
-+    PrivateData *p;
-+    int ret;
-+    struct lcdgraphic_settings settings;
-+    const char *s;
-+
-+    // Alocate and store private data
-+    p = (PrivateData *) malloc(sizeof(PrivateData));
-+    if (!p)
-+        return -1;
-+    if (drvthis->store_private_ptr(drvthis, p))
-+        return -1;
-+    memset(p, 0, sizeof(PrivateData));
-+
-+    // get the display name
-+    s = drvthis->config_get_string(drvthis->name, "display_name", 0, NULL);
-+    if (!s) {
-+        report(RPT_ERR, "You must specify display_name in configuration");
-+        goto out;
-+    }
-+    strncpy(p->display_name, s, SERDISPLIB_MAX_DISPLAYNAME);
-+    p->display_name[SERDISPLIB_MAX_DISPLAYNAME-1] = 0;
-+
-+    // get the display device
-+    s = drvthis->config_get_string(drvthis->name, "display_device", 0, NULL);
-+    if (!s) {
-+        report(RPT_ERR, "You must specify display_device in configuration");
-+        goto out;
-+    }
-+    strncpy(p->display_device, s, SERDISPLIB_MAX_DEVICENAME);
-+    p->display_device[SERDISPLIB_MAX_DEVICENAME-1] = 0;
-+
-+    // get the normal font
-+    s = drvthis->config_get_string(drvthis->name, "normal_font", 0, NULL);
-+    if (!s) {
-+        report(RPT_ERR, "You must specify normal_font in configuration");
-+        goto out;
-+    }
-+    strncpy(settings.normal_font, s, PATH_MAX);
-+    settings.normal_font[PATH_MAX-1] = 0;
-+
-+    // character size
-+    s = drvthis->config_get_string(drvthis->name, "char_size", 0, "6x10");
-+    if (!s) {
-+        report(RPT_ERR, "Could not retrieve char_size from configuration");
-+        goto out;
-+    }
-+    if (sscanf(s, "%dx%d", &settings.cwidth, &settings.cheight) != 2) {
-+        report(RPT_ERR, "Could not scan '%s' correctly", s);
-+        goto out;
-+    }
-+
-+    // border size
-+    s = drvthis->config_get_string(drvthis->name, "border_size", 0, "0x0");
-+    if (!s) {
-+        report(RPT_ERR, "Could not retrieve border size from configuration");
-+        goto out;
-+    }
-+    if (sscanf(s, "%dx%d", &settings.bwidth, &settings.bheight) != 2) {
-+        report(RPT_ERR, "Could not scan '%s' correctly", s);
-+        goto out;
-+    }
-+
-+    // invert
-+    p->invert = drvthis->config_get_bool(drvthis->name, "invert", 0, 1);
-+
-+
-+    /* End of config file parsing */
-+
-+    // opening the output device */
-+    p->serdisplib_conn = SDCONN_open(p->display_device);
-+    if (!p->serdisplib_conn) {
-+        report(RPT_ERR, "Could not open %s: %s", p->display_device,
-+                sd_geterrormsg());
-+        goto out;
-+    }
-+
-+    // opening and initialising the display
-+    p->serdisplib = serdisp_init(p->serdisplib_conn, p->display_name, "");
-+    if (!p->serdisplib) {
-+        report(RPT_ERR, "Error opening display %s: %s\n", p->display_name,
-+                sd_geterrormsg());
-+        goto out;
-+    }
-+
-+    // invert settings
-+    serdisp_setoption(p->serdisplib, "INVERT", p->invert
-+            ? SD_OPTION_YES : SD_OPTION_NO);
-+
-+    // allocate lcdgraphic handle
-+    p->lcdgraphic = (struct lcdgraphic *)malloc(sizeof(struct lcdgraphic));
-+    if (!p->lcdgraphic) {
-+        report(RPT_ERR, "Not enough memory to allocate struct lcdgraphic");
-+        goto out;
-+    }
-+
-+    // register at the lcdgraphic backend
-+    settings.width = serdisp_getwidth(p->serdisplib);
-+    settings.height = serdisp_getheight(p->serdisplib);
-+    settings.drv = drvthis;
-+
-+    ret = lcdgraphic_init(p->lcdgraphic, &settings, &lcdgraphic_functions);
-+    if (ret != 0) {
-+        report(RPT_ERR, "Error registering at lcdgraphic subsystem");
-+        goto out;
-+    }
-+
-+    return 0;
-+
-+out:
-+    if (p->serdisplib_conn && !p->serdisplib)
-+        SDCONN_close(p->serdisplib_conn);
-+    if (p->serdisplib)
-+        serdisp_quit(p->serdisplib);
-+    drvthis->store_private_ptr(drvthis, NULL);
-+    free(p);
-+
-+    return -1;
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Clean-up
-+//
-+MODULE_EXPORT void
-+serdisplib_close(Driver *drvthis)
-+{
-+	PrivateData *p = (PrivateData *) drvthis->private_data;
-+
-+    if (p) {
-+        if (p->serdisplib)
-+            serdisp_quit(p->serdisplib);
-+        if (p->lcdgraphic)
-+            lcdgraphic_destroy(p->lcdgraphic);
-+    }
-+    drvthis->store_private_ptr(drvthis, NULL);
-+    free(p);
-+}
-+
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Returns the display width
-+//
-+MODULE_EXPORT int
-+serdisplib_width (Driver *drvthis)
-+{
-+	PrivateData *p = (PrivateData *) drvthis->private_data;
-+
-+    return lcdgraphic_width(p->lcdgraphic);
-+}
-+
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Returns the display height
-+//
-+MODULE_EXPORT int
-+serdisplib_height (Driver *drvthis)
-+{
-+	PrivateData *p = (PrivateData *) drvthis->private_data;
-+
-+    return lcdgraphic_height(p->lcdgraphic);
-+}
-+
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Clear the framebuffer
-+//
-+MODULE_EXPORT void
-+serdisplib_clear (Driver *drvthis)
-+{
-+	PrivateData *p = (PrivateData *) drvthis->private_data;
-+
-+    lcdgraphic_clear(p->lcdgraphic);
-+}
-+
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Place a character in the framebuffer
-+//
-+MODULE_EXPORT void
-+serdisplib_chr (Driver *drvthis, int x, int y, char ch)
-+{
-+	PrivateData *p = (PrivateData *) drvthis->private_data;
-+
-+    lcdgraphic_draw_char(p->lcdgraphic, x - 1, y - 1, ch);
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Place a string in the framebuffer
-+//
-+MODULE_EXPORT void
-+serdisplib_string (Driver *drvthis, int x, int y, char *s)
-+{
-+	PrivateData *p = (PrivateData *) drvthis->private_data;
-+
-+    lcdgraphic_draw_string(p->lcdgraphic, x - 1, y - 1, s);
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Place a big number in the framebuffer
-+//
-+MODULE_EXPORT void
-+serdisplib_num (Driver *drvthis, int x, int num)
-+{
-+	PrivateData *p = (PrivateData *) drvthis->private_data;
-+
-+    lcdgraphic_draw_num(p->lcdgraphic, x - 1, num);
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Sets the backlight on or off
-+//
-+MODULE_EXPORT void
-+serdisplib_backlight (Driver *drvthis, int on)
-+{
-+	PrivateData *p = (PrivateData *) drvthis->private_data;
-+
-+    serdisp_setoption(p->serdisplib, "BACKLIGHT", on ? SD_OPTION_YES : SD_OPTION_NO);
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Flush the framebuffer to the display
-+//
-+MODULE_EXPORT void
-+serdisplib_flush(Driver *drvthis)
-+{
-+	PrivateData *p = (PrivateData *) drvthis->private_data;
-+
-+    lcdgraphic_flush(p->lcdgraphic);
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Set default icon into a userdef char
-+//
-+MODULE_EXPORT int
-+serdisplib_icon(Driver *drvthis, int x, int y, int icon)
-+{
-+    PrivateData *p = (PrivateData *) drvthis->private_data;
-+
-+    return lcdgraphic_icon(p->lcdgraphic, x - 1, y - 1, icon);
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Draws a horizontal bar
-+//
-+MODULE_EXPORT void
-+serdisplib_hbar(Driver *drvthis, int x, int y, int len, int promille, int options)
-+{
-+    PrivateData *p = (PrivateData *) drvthis->private_data;
-+
-+    lcdgraphic_hbar(p->lcdgraphic, x - 1, y - 1, len, promille, options);
-+}
-+
-+///////////////////////////////////////////////////////////////////////////////
-+// Draws a vertical bar
-+//
-+MODULE_EXPORT void
-+serdisplib_vbar(Driver *drvthis, int x, int y, int len, int promille, int options)
-+{
-+    PrivateData *p = (PrivateData *) drvthis->private_data;
-+
-+    lcdgraphic_vbar(p->lcdgraphic, x - 1, y - 1, len, promille, options);
-+}
-+
-+
-+// vim: set sw=4 ts=4 et:
---- a/LCDd.conf
-+++ b/LCDd.conf
-@@ -40,7 +40,8 @@
- #   EyeboxOne, g15, glcdlib, glk, hd44780, icp_a106, imon, IOWarrior,
- #   irman, joy, lb216, lcdm001, lcterm, lirc, MD8800, ms6931, mtc_s16209x,
- #   MtxOrb, NoritakeVFD, picolcd, pyramid, sed1330, sed1520, serialPOS,
--#   serialVFD, sli, stv5730, svga, t6963, text, tyan, ula200, xosd
-+#   serialVFD, sli, stv5730, svga, t6963, text, tyan, ula200, serdisplib,
-+#   xosd
- Driver=curses
- 
- # Tells the driver to bind to the given interface
-@@ -931,6 +932,31 @@ Size=20x4
- # KeyMap_E=Enter
- # KeyMap_F=Escape
- 
-+## serdisplib meta-driver for dot-matrix displays ##
-+[serdisplib]
-+
-+# the underlying serdisplib driver, e.g. ctinclud
-+display_name=ctinclud
-+
-+# the display device, e.g. serraw:/dev/ttyS0, parport:/dev/parport0
-+# or USB:07c0/1501 (vendor ID, device ID)
-+display_device=USB:07c0/1501
-+
-+# the font which is used for rendering, this font must be monospace
-+# and should contain some special Unicode characters like arrows
-+# (Andale Mono is recommended and can be fetched at
-+# http://corefonts.sf.net or from a Windows installation)
-+normal_font=/usr/share/fonts/truetype/andalemo.ttf
-+
-+# invert the display (black => white, white => black)
-+invert=0
-+
-+# the size of one characters, the number of characters is calculated
-+# automatically from this and from border_size (see below)
-+char_size=6x10
-+
-+# size of the border around the drawing area
-+border_size=0
- 
- 
- ## Wirz SLI LCD driver ##
diff --git a/abs/extra-testing/lcdproc/lcdproc.install b/abs/extra-testing/lcdproc/lcdproc.install
deleted file mode 100644
index bd3c85e..0000000
--- a/abs/extra-testing/lcdproc/lcdproc.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-      add_service.sh lcdd
-}
-
-pre_remove() {
-      remove_service.sh lcdd
-}
diff --git a/abs/extra-testing/libbonobo/PKGBUILD b/abs/extra-testing/libbonobo/PKGBUILD
deleted file mode 100644
index de48e25..0000000
--- a/abs/extra-testing/libbonobo/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 29425 2009-03-08 17:32:56Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libbonobo
-pkgver=2.24.3
-pkgrel=1
-pkgdesc="A set of language and system independant CORBA interfaces for creating reusable components"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('orbit2>=2.14.17' 'libxml2>=2.7.3' 'dbus-glib>=0.78')
-makedepends=('intltool' 'pkgconfig' 'flex')
-options=('!libtool')
-backup=('etc/bonobo-activation/bonobo-activation-config.xml')
-replaces=('bonobo-activation')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/libbonobo/2.24/libbonobo-${pkgver}.tar.bz2
-	bonobo-activation-config.xml)
-install=libbonobo.install
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static \
-	      --libexecdir=/usr/lib/bonobo || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -m644 "${srcdir}/bonobo-activation-config.xml" "${pkgdir}/etc/bonobo-activation/" || return 1
-}
-md5sums=('b217cef6a187505290c66c5bf8225d38'
-         '6392efaca30a26f826eafc4b8ccbc01f')
diff --git a/abs/extra-testing/libbonobo/bonobo-activation-config.xml b/abs/extra-testing/libbonobo/bonobo-activation-config.xml
deleted file mode 100644
index 65ee75f..0000000
--- a/abs/extra-testing/libbonobo/bonobo-activation-config.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-
-<oafconfig>
-
-<searchpath>
-    <!-- Examples: -->
-    <item>/usr/lib/bonobo/servers</item>
-    <item>/opt/gnome/lib/bonobo/servers</item>
-    <!-- <item>/usr/local/gnome2/lib/bonobo/servers</item> -->
-    <!-- <item>/usr/local/lib/bonobo/servers</item> -->
-    <!-- <item>/opt/gnome2/bonobo-activation/lib/bonobo/servers</item> -->
-</searchpath>
-
-</oafconfig>
diff --git a/abs/extra-testing/libbonobo/libbonobo.install b/abs/extra-testing/libbonobo/libbonobo.install
deleted file mode 100644
index 1794e4a..0000000
--- a/abs/extra-testing/libbonobo/libbonobo.install
+++ /dev/null
@@ -1,23 +0,0 @@
-post_install() {
-  /bin/true
-}
-
-post_upgrade() {
-  ldconfig -r .
-  PID=`pidof bonobo-activation-server`
-  if [ ! -z "${PID}" ]; then
-    killall -HUP bonobo-activation-server 2>&1
-  fi
-}
-
-pre_remove() {
-  /bin/true
-}
-
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/libbonoboui/PKGBUILD b/abs/extra-testing/libbonoboui/PKGBUILD
deleted file mode 100644
index 7118102..0000000
--- a/abs/extra-testing/libbonoboui/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 29428 2009-03-08 17:35:50Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libbonoboui
-pkgver=2.24.3
-pkgrel=1
-pkgdesc="User Interface library for Bonobo"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('libgnomecanvas>=2.20.1.1' 'libgnome>=2.24.1')
-makedepends=('perlxml' 'pkgconfig')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  rm -f "${pkgdir}/usr/share/applications/bonobo-browser.desktop"
-}
-md5sums=('3a754b1df0a4d5fd4836a05020a0bb4a')
diff --git a/abs/extra-testing/libcdio/PKGBUILD b/abs/extra-testing/libcdio/PKGBUILD
deleted file mode 100644
index 1d4cacf..0000000
--- a/abs/extra-testing/libcdio/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 9268 2008-08-17 05:54:40Z allan $
-# Maintainer: damir <damir@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=libcdio
-pkgver=0.82
-pkgrel=1
-pkgdesc="GNU Compact Disc Input and Control Library"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://www.gnu.org/software/libcdio/"
-depends=('gcc-libs>=4.3.0' 'libcddb' 'ncurses')
-options=('!libtool')
-source=(http://ftp.gnu.org/gnu/libcdio/$pkgname-$pkgver.tar.gz)
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --disable-vcd-info || return 1
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
-  install -m644 libcdio_paranoia.pc libcdio_cdda.pc \
-    ${startdir}/pkg/usr/lib/pkgconfig/ || return 1
-  rm ${pkgdir}/usr/share/info/dir
-}
-
-md5sums=('1c29b18e01ab2b966162bc727bf3c360')
diff --git a/abs/extra-testing/libdvdcss/PKGBUILD b/abs/extra-testing/libdvdcss/PKGBUILD
deleted file mode 100644
index 9b5253e..0000000
--- a/abs/extra-testing/libdvdcss/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 14403 2008-10-06 08:19:39Z douglas $
-# Maintainer: arjan <arjan@archlinux.org>
-# Contributor Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgname=libdvdcss
-pkgver=1.2.10
-pkgrel=1
-pkgdesc="libdvdcss is a cross-platform library for transparent DVD device access with on-the-fly CSS decryption."
-arch=('i686' 'x86_64')
-depends=('glibc')
-options=('!libtool')
-source=(http://download.videolan.org/pub/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-url="http://www.videolan.org/libdvdcss/"
-
-md5sums=('ebd5370b79ac5a83e5c61b24a214cf74')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
diff --git a/abs/extra-testing/libdvdnav/PKGBUILD b/abs/extra-testing/libdvdnav/PKGBUILD
deleted file mode 100644
index 4e9e3ca..0000000
--- a/abs/extra-testing/libdvdnav/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 927 2008-04-24 21:34:43Z jgc $
-# Maintainer: arjan <arjan@archlinux.org>
-# contributor Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgname=libdvdnav
-pkgver=0.1.10
-pkgrel=3
-pkgdesc="The library for xine-dvdnav plugin."
-arch=(i686 x86_64)
-license=('GPL')
-url="http://dvd.sourceforge.net/index.shtml"
-depends=('glibc')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/dvd/${pkgname}-${pkgver}.tar.gz)
-md5sums=('c8ddee96ba1182d73447eaf0bb6fde81')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./autogen.sh --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-}
diff --git a/abs/extra-testing/libebml/PKGBUILD b/abs/extra-testing/libebml/PKGBUILD
deleted file mode 100644
index ffa4331..0000000
--- a/abs/extra-testing/libebml/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: damir <damir@archlinux.org>
-# Contributor: 03/08/04 <lefungus@altern.org>
-
-pkgname=libebml
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="Extensible Binary Meta Language library"
-arch=(i686 x86_64)
-url="http://dl.matroska.org/downloads/libebml/"
-depends=('gcc-libs')
-license=('LGPL')
-#source=(http://www.bunkus.org/videotools/mkvtoolnix/sources/$pkgname-$pkgver.tar.bz2)
-source=($url/$pkgname-$pkgver.tar.bz2)
-
-build() {
- cd $startdir/src/$pkgname-$pkgver/make/linux
- make || return 1
- make prefix=$startdir/pkg/usr install
-}
-md5sums=('6d438f03d8928d83a2d120ed02705f03')
diff --git a/abs/extra-testing/libffi/PKGBUILD b/abs/extra-testing/libffi/PKGBUILD
deleted file mode 100644
index 555f0eb..0000000
--- a/abs/extra-testing/libffi/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 72255 2010-03-13 20:43:14Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libffi
-pkgver=3.0.9
-pkgrel=1
-pkgdesc="A portable, high level programming interface to various calling conventions."
-arch=('i686' 'x86_64')
-license=('MIT')
-url="http://sourceware.org/libffi"
-depends=('glibc' 'texinfo')
-options=('!libtool' 'force')
-install=libffi.install
-source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz)
-md5sums=('1f300a7a7f975d4046f51c3022fa5ff1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
-}
diff --git a/abs/extra-testing/libffi/libffi.install b/abs/extra-testing/libffi/libffi.install
deleted file mode 100644
index 151b79b..0000000
--- a/abs/extra-testing/libffi/libffi.install
+++ /dev/null
@@ -1,18 +0,0 @@
-infodir=/usr/share/info
-filelist=(libffi.info.gz)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
diff --git a/abs/extra-testing/libftdi/PKGBUILD b/abs/extra-testing/libftdi/PKGBUILD
deleted file mode 100644
index b5a72da..0000000
--- a/abs/extra-testing/libftdi/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Contributor: Bernhard Walle <bernhard.walle@gmx.de>
-pkgname=libftdi
-pkgver=0.18
-pkgrel=1
-pkgdesc="Library to program and control the FTDI USB controller"
-url="http://www.intra2net.com/de/produkte/opensource/ftdi/"
-license="GPL"
-depends=(libusb)
-arch=(i686 x86_64)
-source=(http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/$pkgname-$pkgver.tar.gz)
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-  make DESTDIR=$startdir/pkg install
-}
-# :mode=shellscript:
-md5sums=('916f65fa68d154621fc0cf1f405f2726')
diff --git a/abs/extra-testing/libgda/Changelog b/abs/extra-testing/libgda/Changelog
deleted file mode 100644
index 88ba942..0000000
--- a/abs/extra-testing/libgda/Changelog
+++ /dev/null
@@ -1,2 +0,0 @@
-4.0.2 5/2/09
-Added path for jni headers in configure.
diff --git a/abs/extra-testing/libgda/PKGBUILD b/abs/extra-testing/libgda/PKGBUILD
deleted file mode 100644
index c4350b7..0000000
--- a/abs/extra-testing/libgda/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 36066 2009-04-19 20:31:09Z jgc $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=libgda
-pkgver=4.0.2
-pkgrel=4
-pkgdesc="data abstraction layer; with mysql, pgsql, ldap, xml, sqlite providers"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('glib2>=2.20.1' 'libxslt' 'db>=4.7' 'ncurses>=5.7-2')
-makedepends=('intltool' 'pkgconfig' 'openjdk6')
-options=('!libtool')
-url="http://www.gnome-db.org"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/4.0/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('cd79f6542cdd9477017b76b5f81c776f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static --with-jni=/usr/lib/jvm/java-1.6.0-openjdk/include/ --without-java || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra-testing/libgda/bdb43.patch b/abs/extra-testing/libgda/bdb43.patch
deleted file mode 100644
index 3fe6e93..0000000
--- a/abs/extra-testing/libgda/bdb43.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -r -u libgda-1.2.0.old/providers/bdb/gda-bdb-recordset.c libgda-1.2.0/providers/bdb/gda-bdb-recordset.c
---- libgda-1.2.0.old/providers/bdb/gda-bdb-recordset.c	2003-12-17 11:27:02.000000000 +0000
-+++ libgda-1.2.0/providers/bdb/gda-bdb-recordset.c	2005-02-19 15:43:12.000000000 +0000
-@@ -227,10 +227,14 @@
- 
- 	/* get the number of records in the database */
- 	ret = dbp->stat (dbp,
-+#if BDB_VERSION > 40300
-+			 NULL,
-+#endif
- 			 &statp,
- #if BDB_VERSION < 40000
- 			 NULL,
- #endif
-+
- 			 0);
- 	if (ret != 0) {
- 		gda_connection_add_error (cnc, gda_bdb_make_error (ret));
diff --git a/abs/extra-testing/libgda/libgda.install b/abs/extra-testing/libgda/libgda.install
deleted file mode 100644
index 6420004..0000000
--- a/abs/extra-testing/libgda/libgda.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  scrollkeeper-update -q -p var/lib/scrollkeeper
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/abs/extra-testing/libgdiplus/PKGBUILD b/abs/extra-testing/libgdiplus/PKGBUILD
deleted file mode 100644
index 3b91775..0000000
--- a/abs/extra-testing/libgdiplus/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 15386 2008-10-13 16:29:55Z daniel $
-# Maintainer: daniel@archlinux.org
-
-pkgname=libgdiplus
-pkgver=2.2
-pkgrel=1
-pkgdesc="An Open Source Implementation of the GDI+ API"
-arch=(i686 x86_64)
-license=('MPL' 'LGPL')
-url="http://www.mono-project.com"
-depends=('libtiff' 'cairo>=1.6.4' 'giflib' 'glib2>=2.18.0' 'libexif')
-makedepends=('automake' 'pkgconfig')
-options=('!libtool')
-source=(http://go-mono.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4af9c8171e75f1408c3628a8f7937d9f')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --with-cairo=system
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-}
diff --git a/abs/extra-testing/libgdiplus/system-cairo.patch b/abs/extra-testing/libgdiplus/system-cairo.patch
deleted file mode 100644
index b605a3e..0000000
--- a/abs/extra-testing/libgdiplus/system-cairo.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -ur libgdiplus-1.1.15-old/Makefile.am libgdiplus-1.1.15/Makefile.am
---- libgdiplus-1.1.15-old/Makefile.am	2006-04-14 10:04:55.000000000 -0700
-+++ libgdiplus-1.1.15/Makefile.am	2006-04-21 18:06:49.000000000 -0700
-@@ -1,4 +1,4 @@
--SUBDIRS = cairo src tests
-+SUBDIRS = src tests
- #libpixman
- 
- pkgconfigdir = $(libdir)/pkgconfig
-diff -ur libgdiplus-1.1.15-old/configure.in libgdiplus-1.1.15/configure.in
---- libgdiplus-1.1.15-old/configure.in	2006-04-14 10:04:55.000000000 -0700
-+++ libgdiplus-1.1.15/configure.in	2006-04-21 18:06:49.000000000 -0700
-@@ -18,32 +18,32 @@
- 	AC_MSG_ERROR("Did not find Glib >= 2.2.3");
- fi
- 
--AC_CONFIG_SUBDIRS(cairo)
--CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la'
--CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src -I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src -I$(top_srcdir)/cairo/src'
--AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus])
-+#AC_CONFIG_SUBDIRS(cairo)
-+#CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la'
-+#CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src -I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src -I$(top_srcdir)/cairo/src'
-+#AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus])
- 
- # Activate this when we support linking to an already exiting Cairo installation
--#default_cairo=included
--#AC_ARG_WITH(cairo, [  --with-cairo=included,installed],[cairo_v=$with_cairo],[cairo_v=$default_cairo])
-+default_cairo=included
-+AC_ARG_WITH(cairo, [  --with-cairo=included,installed],[cairo_v=$with_cairo],[cairo_v=$default_cairo])
- #
--#if test $cairo_v = "included";
--#then
-+if test $cairo_v = "included";
-+then
- #	#AC_CONFIG_SUBDIRS(libpixman)
--#	AC_CONFIG_SUBDIRS(cairo)
--#	CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la'
--#	CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src -I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src -I$(top_srcdir)/cairo/src'
--#	AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus])
--#else
--#	if pkg-config --exact-version 0.3.0 cairo; then
--#		echo Cairo installation OK
--#	else
--#		AC_MSG_ERROR("Did not find Cairo == 0.3.0");
--#	fi
--#
--#	CAIRO_LIBS="`pkg-config --libs cairo`"
--#	CAIRO_CFLAGS="`pkg-config --cflags cairo`"
--#fi
-+	AC_CONFIG_SUBDIRS(cairo)
-+	CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la'
-+	CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src -I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src -I$(top_srcdir)/cairo/src'
-+	AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus])
-+else
-+	if pkg-config --atleast-version 1.0.1 cairo; then
-+		echo Cairo installation OK
-+	else
-+		AC_MSG_ERROR("Did not find Cairo == 1.0.1");
-+	fi
-+
-+	CAIRO_LIBS="`pkg-config --libs cairo`"
-+	CAIRO_CFLAGS="`pkg-config --cflags cairo`"
-+fi
- 
- GDIPLUS_LIBS="$CAIRO_LIBS `pkg-config --libs glib-2.0 ` `pkg-config freetype2 fontconfig --libs`"
- GDIPLUS_CFLAGS="$CAIRO_CFLAGS `pkg-config --cflags glib-2.0 ` `pkg-config freetype2 fontconfig --cflags`"
diff --git a/abs/extra-testing/libgksu/PKGBUILD b/abs/extra-testing/libgksu/PKGBUILD
deleted file mode 100644
index 5f18266..0000000
--- a/abs/extra-testing/libgksu/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 5570 2008-07-18 21:03:14Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgksu
-pkgver=2.0.7
-pkgrel=1
-pkgdesc="gksu authorization library"
-arch=(i686 x86_64)
-url="http://www.nongnu.org/gksu/index.html"
-license=(GPL)
-depends=('gnome-keyring>=2.22.3' 'libgtop>=2.22.3'
-         'libglade>=2.6.2' 'startup-notification>=0.9')
-makedepends=('gtk-doc' 'pkgconfig')
-options=('!libtool')
-install=libgksu.install
-source=(http://people.debian.org/~kov/gksu/${pkgname}-${pkgver}.tar.gz)
-md5sums=('2f2c6a21281370942ea2855553d3ad89')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static || return 1
-  make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
-  rm -f ${startdir}/pkg/usr/lib/*.a
-  install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
-  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
-}
diff --git a/abs/extra-testing/libgksu/libgksu.install b/abs/extra-testing/libgksu/libgksu.install
deleted file mode 100644
index 89cf0cf..0000000
--- a/abs/extra-testing/libgksu/libgksu.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=libgksu
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
diff --git a/abs/extra-testing/libgnome/PKGBUILD b/abs/extra-testing/libgnome/PKGBUILD
deleted file mode 100644
index 9197e0f..0000000
--- a/abs/extra-testing/libgnome/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 30321 2009-03-18 21:50:51Z jgc $ 
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgnome
-pkgver=2.26.0
-pkgrel=2
-pkgdesc="Common libraries for GNOME"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gnome-vfs>=2.24.1-2' 'esound>=0.2.41' 'libbonobo>=2.24.1')
-makedepends=('pkgconfig' 'intltool')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=libgnome.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a5634fe9ddc54bbb726cbaaa35abc0b9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static || return 1
-  make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain libgnome-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/abs/extra-testing/libgnome/libgnome.install b/abs/extra-testing/libgnome/libgnome.install
deleted file mode 100644
index db4e04d..0000000
--- a/abs/extra-testing/libgnome/libgnome.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=libgnome
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
diff --git a/abs/extra-testing/libgnomecanvas/PKGBUILD b/abs/extra-testing/libgnomecanvas/PKGBUILD
deleted file mode 100644
index 7e419ed..0000000
--- a/abs/extra-testing/libgnomecanvas/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 30223 2009-03-17 18:18:11Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgnomecanvas
-pkgver=2.26.0
-pkgrel=1
-pkgdesc="The GNOME Canvas library"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('libglade>=2.6.4' 'libart-lgpl>=2.3.20')
-makedepends=('pkgconfig' 'intltool')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9bbc635e5ae70e63af071af74ba7e72f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra-testing/libgnomekbd/PKGBUILD b/abs/extra-testing/libgnomekbd/PKGBUILD
deleted file mode 100644
index 8aab901..0000000
--- a/abs/extra-testing/libgnomekbd/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 30447 2009-03-19 22:15:35Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgnomekbd
-pkgver=2.26.0
-pkgrel=1
-pkgdesc="Gnome keyboard library"
-url="http://gswitchit.sourceforge.net"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('libxklavier>=3.9' 'gconf>=2.26.0-2' 'libglade>=2.6.4')
-makedepends=('perlxml' 'pkgconfig')
-options=('!libtool' '!emptydirs')
-install=libgnomekbd.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('aee58c088c4fd980e1bf813ea813c156')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static || return 1
-  make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain libgnomekbd ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/abs/extra-testing/libgnomekbd/libgnomekbd.install b/abs/extra-testing/libgnomekbd/libgnomekbd.install
deleted file mode 100644
index 9fc9f55..0000000
--- a/abs/extra-testing/libgnomekbd/libgnomekbd.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=libgnomekbd
-
-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/abs/extra-testing/libgnomeui/PKGBUILD b/abs/extra-testing/libgnomeui/PKGBUILD
deleted file mode 100644
index f34cbf5..0000000
--- a/abs/extra-testing/libgnomeui/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 74363 2010-03-30 20:45:54Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgnomeui
-pkgver=2.24.3
-pkgrel=1
-pkgdesc="User Interface library for GNOME"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libbonoboui>=2.24.3' 'libgnome-keyring>=2.29.4' 'libsm')
-makedepends=('intltool' 'pkgconfig')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('04c81f3bb5a337cdf3ed1230916f82d29857ee95eb884f58dd2f5c6860efe803')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/libgnomeui || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra-testing/libgtkhtml/PKGBUILD b/abs/extra-testing/libgtkhtml/PKGBUILD
deleted file mode 100644
index f0753d7..0000000
--- a/abs/extra-testing/libgtkhtml/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 18537 2008-11-06 23:26:35Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-pkgname=libgtkhtml
-pkgver=2.11.1
-pkgrel=2
-pkgdesc="An HTML library for GTK"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gtk2>=2.14.4' 'libxml2>=2.6.32')
-makedepends=('perlxml' 'pkgconfig')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.11/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a1d1a197dcff8c4571659deef5495e24')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra-testing/libgtop/PKGBUILD b/abs/extra-testing/libgtop/PKGBUILD
deleted file mode 100644
index da34a59..0000000
--- a/abs/extra-testing/libgtop/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 35522 2009-04-13 20:24:53Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgtop
-pkgver=2.26.1
-pkgrel=1
-pkgdesc="A library that read information about processes and the running system"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('glib2>=2.20.1' 'libxau' 'texinfo')
-install=libgtop.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool')
-url="http://www.gnome.org/"
-md5sums=('49fe5c91a6bbc103a0a05c6854a6cc11')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static \
-	      --with-libgtop-smp --with-libgtop-inodedb \
-	      --with-linux-table || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-
-  rm -f "${pkgdir}/usr/share/info/dir"
-  gzip -9nf ${pkgdir}/usr/share/info/*
-}
diff --git a/abs/extra-testing/libgtop/libgtop.install b/abs/extra-testing/libgtop/libgtop.install
deleted file mode 100644
index 15690f1..0000000
--- a/abs/extra-testing/libgtop/libgtop.install
+++ /dev/null
@@ -1,13 +0,0 @@
-info_dir=/usr/share/info
-
-post_install() {
-  install-info ${info_dir}/libgtop2.info.gz ${info_dir}/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  install-info --delete ${info_dir}/libgtop2.info.gz ${info_dir}/dir 2> /dev/null
-}
diff --git a/abs/extra-testing/libidl2/PKGBUILD b/abs/extra-testing/libidl2/PKGBUILD
deleted file mode 100644
index 488909a..0000000
--- a/abs/extra-testing/libidl2/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 30208 2009-03-17 17:59:14Z jgc $
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=libidl2
-pkgver=0.8.13
-pkgrel=1
-pkgdesc="A front-end for CORBA 2.2 IDL and Netscape's XPIDL"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('glib2>=2.20.0' 'texinfo')
-makedepends=('pkgconfig')
-install=libidl2.install
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-${pkgver}.tar.bz2)
-url="http://www.gnome.org"
-md5sums=('b43b289a859eb38a710f70622c46e571')
-
-build() {
-  cd "${srcdir}/libIDL-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  
-  rm -f "${pkgdir}/usr/share/info/dir"
-  gzip -9nf "${pkgdir}/usr/share/info/"*
-}
diff --git a/abs/extra-testing/libidl2/libidl2.install b/abs/extra-testing/libidl2/libidl2.install
deleted file mode 100644
index 38b3d56..0000000
--- a/abs/extra-testing/libidl2/libidl2.install
+++ /dev/null
@@ -1,13 +0,0 @@
-info_dir=/usr/share/info
-
-post_install() {
-  install-info ${info_dir}/libIDL2.info.gz ${info_dir}/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  install-info --delete ${info_dir}/libIDL2.info.gz ${info_dir}/dir 2> /dev/null
-}
diff --git a/abs/extra-testing/libmatroska/PKGBUILD b/abs/extra-testing/libmatroska/PKGBUILD
deleted file mode 100644
index f515d3e..0000000
--- a/abs/extra-testing/libmatroska/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: damir <damir@archlinux.org>
-# Contributor 03/08/04 <lefungus@altern.org>
-
-pkgname=libmatroska
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="Matroska library"
-arch=(i686 x86_64)
-url="http://dl.matroska.org/downloads/libmatroska/"
-depends=('libebml>=1.0.0')
-#source=(http://www.bunkus.org/videotools/mkvtoolnix/sources/$pkgname-$pkgver.tar.bz2)
-source=($url/$pkgname-$pkgver.tar.bz2)
-
-build() {
- cd $startdir/src/$pkgname-$pkgver/make/linux
- make sharedlib || return 1
- make prefix=$startdir/pkg/usr install
-}
-md5sums=('4efcf3945b17a6f0320cf1aaa326a4de')
diff --git a/abs/extra-testing/libmikmod/PKGBUILD b/abs/extra-testing/libmikmod/PKGBUILD
deleted file mode 100644
index eb124f3..0000000
--- a/abs/extra-testing/libmikmod/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: arjan <arjan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-pkgname=libmikmod
-pkgver=3.1.12
-pkgrel=1
-pkgdesc="A portable sound library"
-license=('GPL' 'LGPL')
-url="http://sourceforge.net/projects/mikmod/"
-arch=('i686' 'x86_64')
-depends=('glibc')
-source=(http://downloads.sourceforge.net/mikmod/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9f3c740298260d5f88981fc0d51f6f16')
-options=('!libtool')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  missing_dir="`pwd`" ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
-
diff --git a/abs/extra-testing/libmms/PKGBUILD b/abs/extra-testing/libmms/PKGBUILD
deleted file mode 100644
index 230b082..0000000
--- a/abs/extra-testing/libmms/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-#$Id$
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libmms
-pkgver=0.5
-pkgrel=1
-pkgdesc="MMS stream protocol library"
-arch=(i686 x86_64)
-url="https://launchpad.net/libmms"
-license=(LGPL)
-depends=('glib2>=2.16.4')
-options=('!libtool')
-source=(http://launchpad.net/libmms/trunk/${pkgver}/+download/libmms-${pkgver}.tar.gz)
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-}
-md5sums=('cf83053ec891f14e73a04c84d9de08ee')
diff --git a/abs/extra-testing/libmng/PKGBUILD b/abs/extra-testing/libmng/PKGBUILD
deleted file mode 100644
index 6607718..0000000
--- a/abs/extra-testing/libmng/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 63248 2010-01-16 20:44:09Z jgc $
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: judd <jvinet@zeroflux.org>
-pkgname=libmng
-pkgver=1.0.10
-pkgrel=3
-pkgdesc="A collection of routines used to create and manipulate MNG format graphics files"
-arch=('i686' 'x86_64')
-url="http://www.libmng.com/"
-license=('custom')
-depends=('zlib' 'libjpeg>=8')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('a464ae7d679781beebdf7440d144b7bd')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ln -s makefiles/configure.in .
-  ln -s makefiles/Makefile.am .
-  autoreconf --force --install
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/abs/extra-testing/libmpcdec/PKGBUILD b/abs/extra-testing/libmpcdec/PKGBUILD
deleted file mode 100644
index feeaf8b..0000000
--- a/abs/extra-testing/libmpcdec/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libmpcdec
-pkgver=1.2.6
-pkgrel=1
-pkgdesc="Musepack decoding library"
-arch=(i686 x86_64)
-license=('custom')
-depends=('glibc')
-options=('!libtool')
-source=(http://files.musepack.net/source/${pkgname}-${pkgver}.tar.bz2)
-url="http://musepack.net/"
-md5sums=('7f7a060e83b4278acf4b77d7a7b9d2c0')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  install -Dm644 COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING
-}
diff --git a/abs/extra-testing/libmrss/PKGBUILD b/abs/extra-testing/libmrss/PKGBUILD
deleted file mode 100644
index 7d23508..0000000
--- a/abs/extra-testing/libmrss/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Contributor: Bernhard Walle <bernhard.walle@gmx.de>
-pkgname=libmrss
-pkgver=0.19.2
-pkgrel=1
-pkgdesc="C library for parsing, writing and creating RSS/ATOM files or streams"
-url="http://www2.autistici.org/bakunin/libmrss/"
-license="LGPL"
-depends=(curl libnxml)
-arch=('i686' 'x86_64')
-options=('!libtool')
-source=(http://www2.autistici.org/bakunin/libmrss/$pkgname-$pkgver.tar.gz)
-md5sums=('a6f66b72898d27270e3a68007f90d62b')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
-# :mode=shellscript:
diff --git a/abs/extra-testing/libnl/PKGBUILD b/abs/extra-testing/libnl/PKGBUILD
deleted file mode 100644
index 4a6465a..0000000
--- a/abs/extra-testing/libnl/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 930 2008-04-24 22:14:40Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-pkgname=libnl
-pkgver=1.1
-pkgrel=2
-pkgdesc="Library for applications dealing with netlink sockets"
-arch=('i686' 'x86_64')
-url="http://people.suug.ch/~tgr/libnl"
-license=('GPL')
-depends=('glibc')
-source=(http://people.suug.ch/~tgr/${pkgname}/files/${pkgname}-${pkgver}.tar.gz ulong_max.patch)
-md5sums=('ae970ccd9144e132b68664f98e7ceeb1' '255bb3740149d518766032675810c590')
-
-build() {
-  cd ${startdir}/src/libnl-${pkgver}
-  patch -p1 < ../ulong_max.patch
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-}
diff --git a/abs/extra-testing/libnl/ulong_max.patch b/abs/extra-testing/libnl/ulong_max.patch
deleted file mode 100644
index d9ef218..0000000
--- a/abs/extra-testing/libnl/ulong_max.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libnl-1.1/include/netlink-local.h.orig      2008-06-08 19:09:20.000000000
-+0200
-+++ libnl-1.1/include/netlink-local.h   2008-06-08 19:09:33.000000000 +0200
-@@ -26,6 +26,7 @@
- #include <sys/socket.h>
- #include <inttypes.h>
- #include <assert.h>
-+#include <limits.h>
-
- #include <arpa/inet.h>
- #include <netdb.h>
diff --git a/abs/extra-testing/libnotify/PKGBUILD b/abs/extra-testing/libnotify/PKGBUILD
deleted file mode 100644
index 3b8d12f..0000000
--- a/abs/extra-testing/libnotify/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 19585 2008-11-27 18:06:47Z hugo $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libnotify
-pkgver=0.4.5
-pkgrel=1
-pkgdesc="Desktop notification library"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('dbus-glib>=0.76' 'gtk2>=2.14.4')
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://www.galago-project.org/files/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-url="http://www.galago-project.org/"
-md5sums=('472e2c1f808848365572a9b024d9e8f5')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-}
diff --git a/abs/extra-testing/libnxml/PKGBUILD b/abs/extra-testing/libnxml/PKGBUILD
deleted file mode 100644
index 0c4f9cb..0000000
--- a/abs/extra-testing/libnxml/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD,v 1.1 2008/09/27 07:05:31 allan Exp $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Bernhard Walle <bernhard.walle@gmx.de>
-
-pkgname=libnxml
-pkgver=0.18.3
-pkgrel=1
-pkgdesc="C library for parsing, writing and creating XML 1.0 and 1.1 files or streams"
-url="http://www2.autistici.org/bakunin//libnxml/"
-license=('LGPL')
-depends=('curl')
-arch=('i686' 'x86_64')
-options=('!libtool')
-source=(http://www2.autistici.org/bakunin//libnxml/$pkgname-$pkgver.tar.gz)
-md5sums=('857f43970e7f0724d28f4ddc87085daf')
-
-build() {
-    cd $srcdir/$pkgname-$pkgver
-    ./configure --prefix=/usr
-    make || return 1
-    make DESTDIR=$pkgdir install
-}
diff --git a/abs/extra-testing/libsamplerate/ChangeLog b/abs/extra-testing/libsamplerate/ChangeLog
deleted file mode 100644
index b76b041..0000000
--- a/abs/extra-testing/libsamplerate/ChangeLog
+++ /dev/null
@@ -1,14 +0,0 @@
-2009-04-08  Eric Belanger  <eric@archlinux.org>
-
-	* libsamplerate 0.1.7-1
-	* Upstream update
-
-2009-01-30  Eric Belanger  <eric@archlinux.org>
-
-	* libsamplerate 0.1.6-1
-	* Upstream update
-
-2008-07-10  Eric Belanger  <eric@archlinux.org>
-
-	* libsamplerate 0.1.4-1
-	* Upstream update
diff --git a/abs/extra-testing/libsamplerate/PKGBUILD b/abs/extra-testing/libsamplerate/PKGBUILD
deleted file mode 100644
index dc0f0fa..0000000
--- a/abs/extra-testing/libsamplerate/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 34235 2009-04-08 11:01:52Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Jason Chu <jchu@xentac.net>
-
-pkgname=libsamplerate
-pkgver=0.1.7
-pkgrel=1
-pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio"
-arch=('i686' 'x86_64')
-url="http://www.mega-nerd.com/SRC/index.html"
-license=('GPL')
-depends=('libsndfile' 'flac>=1.1.4')
-options=('!libtool')
-source=(http://www.mega-nerd.com/SRC/libsamplerate-${pkgver}.tar.gz)
-md5sums=('ad093e60ec44f0a60de8e29983ddbc0f')
-sha1sums=('98a52392eb97f9ba724ca024b3af29a8a0cc0206')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-}
diff --git a/abs/extra-testing/libxfce4util/PKGBUILD b/abs/extra-testing/libxfce4util/PKGBUILD
deleted file mode 100644
index 46e2539..0000000
--- a/abs/extra-testing/libxfce4util/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 28199 2009-02-28 10:49:12Z andyrtr $
-# Maintainer: tobias <tobias funnychar archlinux.org>
-
-pkgname=libxfce4util
-pkgver=4.6.0
-pkgrel=1
-pkgdesc="Basic utility non-GUI functions for Xfce"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.xfce.org/"
-groups=('xfce4')
-depends=("glib2>=2.18.3")
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://www.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2b0b7cdb4516704940eedf11edc94d5e')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --disable-static
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  rm -rf ${pkgdir}/usr/share/gtk-doc
-}
diff --git a/abs/extra-testing/libxklavier/PKGBUILD b/abs/extra-testing/libxklavier/PKGBUILD
deleted file mode 100644
index 02ca7e3..0000000
--- a/abs/extra-testing/libxklavier/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 20594 2008-12-05 21:38:46Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Arjan Timmerman <arjan@archlinux.org>
-
-pkgname=libxklavier
-pkgver=3.8
-pkgrel=1
-pkgdesc="High-level API for X Keyboard Extension"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('libxkbfile>=1.0.5' 'libxml2>=2.6.32' 'glib2>=2.18.3' 'xkeyboard-config>=1.4' 'iso-codes')
-makedepends=('pkgconfig')
-options=('!libtool' '!emptydirs')
-url="http://gswitchit.sourceforge.net"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e4f1b9e600c4159f39d38ab94d56cf9b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-	--with-xkb-base=/usr/share/X11/xkb --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra-testing/lm_sensors/ChangeLog b/abs/extra-testing/lm_sensors/ChangeLog
deleted file mode 100644
index dfec49d..0000000
--- a/abs/extra-testing/lm_sensors/ChangeLog
+++ /dev/null
@@ -1,50 +0,0 @@
-2010-02-02  Eric Belanger  <eric@archlinux.org>
-
-	* lm_sensors 3.1.2-1
-	* Upstream update
-	* Fixed fancontrol daemon script (close FS#17775)
-
-2009-11-23  Eric Belanger  <eric@archlinux.org>
-
-	* lm_sensors 3.1.1-4
-	* Added more configs in backup array (close FS#17260)
-	* Changed rrdtool optdepends to a depends
-
-2009-11-20  Eric Belanger  <eric@archlinux.org>
-
-	* lm_sensors 3.1.1-3
-	* Fixed stopping of fancontrol daemon script (close FS#17083)
-	* Fixed healthd script (close FS#17089)
-
-2009-09-28  Eric Belanger  <eric@archlinux.org>
-
-	* lm_sensors 3.1.1-2
-	* Fixed fancontrol daemon script (close FS#15269)
-	* Added sensord daemon script (close FS#15811)
-
-2009-06-24  Eric Belanger  <eric@archlinux.org>
-
-	* lm_sensors 3.1.1-1
-	* Upstream update
-	* Added healthd daemon (close FS#14597)
-
-2009-03-03  Eric Belanger  <eric@archlinux.org>
-
-	* lm_sensors 3.1.0-1
-	* Upstream update
-	* Updated sensors-detect.patch
-
-2009-01-03  Eric Belanger  <eric@archlinux.org>
-
-	* lm_sensors 3.0.3-2
-	* Rebuilt against rrdtool 1.3.5
-
-2008-11-08  Eric Belanger  <eric@archlinux.org>
-
-	* lm_sensors 3.0.3-1
-	* Upstream update
-	* Updated sensors-detect.patch patch
-	* FHS man pages
-	* Changed sensors daemon script to move config in new location (cf. FS#9516)
-	* Did several other fixes and clean up in sensors daemon script
-	* Added ChangeLog
diff --git a/abs/extra-testing/lm_sensors/PKGBUILD b/abs/extra-testing/lm_sensors/PKGBUILD
deleted file mode 100644
index 226139a..0000000
--- a/abs/extra-testing/lm_sensors/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 67093 2010-02-03 03:55:56Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Aurelien Foret <orelien@chez.com>
-
-pkgname=lm_sensors
-pkgver=3.1.2
-pkgrel=7
-pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
-arch=('i686' 'x86_64')
-url="http://www.lm-sensors.org/"
-license=('GPL')
-depends=('perl' 'sysfsutils' 'rrdtool')
-backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord')
-options=('!emptydirs')
-install=sensors.install
-source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \
-	sensors.rc fancontrol.rc sensors-detect.patch healthd healthd.conf healthd.rc \
-        sensord.conf sensord.rc)
-md5sums=('58a9a225808ac4587c4c8cbd12b40b5c' 'c370f5e620bfe41113354a1e22c0c18c'\
-         '1e04aad66debdb72557b4528bf79b742' '47c40b381d1f25d6634ae84cecf35f33'\
-         '6549050897c237514aeaa2bb6cfd29ea' 'f649261f52bd4329347bf93f5f83cb0a'\
-         '970408d2e509dc4138927020efefe323' '96a8dd468e81d455ec9b165bdf33e0b7'\
-         '41a5c20854bbff00ea7174bd2276b736')
-sha1sums=('4a3b13e4f9c18c29e7f853739bdd88ca7799fcc7' 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'\
-         '66f3cdde688127f4e4e81b5ec3c180149b5c36ea' '47095a32a918d6be50bd8daa8aaa9c24940d60e9'\
-         '78b5cd36c3cb8e98b972cdd8c4a12687d79a79a8' 'c6ddfebc20685ba69700f66038c6b00a7c0bdb80'\
-         'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f' 'de8d4d65406815c389f8a04e2a8508a1ae6749c8'\
-         '72a60251d1d55a67307dab4105d9f3f01a080af4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../sensors-detect.patch || return 1
-
-  make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
-    PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install || return 1
-
-  install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors" || return 1
-  install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol" || return 1
-  install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd" || return 1
-  install -D -m755 "${srcdir}/healthd.rc" "${pkgdir}/etc/rc.d/healthd" || return 1
-  install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/conf.d/healthd" || return 1
-  install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord" || return 1
-  install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord" || return 1
-}
diff --git a/abs/extra-testing/lm_sensors/fancontrol.rc b/abs/extra-testing/lm_sensors/fancontrol.rc
deleted file mode 100644
index bce5d7e..0000000
--- a/abs/extra-testing/lm_sensors/fancontrol.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID -x /usr/sbin/fancontrol)
-case "$1" in
-  start)
-    stat_busy "Starting fancontrol"
-    [ -z "$PID" ] && /usr/sbin/fancontrol >/dev/null 2>&1 &
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon fancontrol
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping fancontrol"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon fancontrol
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/abs/extra-testing/lm_sensors/healthd b/abs/extra-testing/lm_sensors/healthd
deleted file mode 100644
index 0315dd7..0000000
--- a/abs/extra-testing/lm_sensors/healthd
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-#
-# /usr/sbin/healthd
-#
-
-. /etc/conf.d/healthd
-
-cmd="${ALARM_CMD}"
-addr="${ADMIN_EMAIL}"
-slp="${ALARM_SLEEP}"
-sensors="/usr/bin/sensors"
-
-
-while [ $# -gt 0 ] ; do
-	case "${1}" in
-		-c ) cmd="${2}" ; shift 2 ;;
-		-m ) addr="${2}" ; shift 2 ;;
-		-s ) slp="${2}" ; shift 2 ;;
-		*  ) shift 1 ;;
-	esac
-done
-
-[ -n "${cmd}" ] && [ -n "$( which -- "${cmd%% *}" )" ] || \
-	[ -n "${addr}" ] || exit 1
-
-[ "${slp}" -ge 2 ] || slp=600
-
-while true ; do
-	sleep 15
-	message="$( $sensors )"
-	case "$message" in
-		''      ) message='Could not get any sensor values !' ;;
-		*ALARM* ) : ;;
-		*       ) message='' ;;
-	esac
-	if [ -n "$message" ]; then
-		if [ -n "${addr}" ]; then
-			echo "$message" | mail -s \
-				"Sensors ALARM detected at host: $( hostname )" \
-				"${addr}"
-		fi
-		[ -z "${cmd}" ] || ${cmd} &
-		sleep ${slp}
-	fi
-done &
diff --git a/abs/extra-testing/lm_sensors/healthd.conf b/abs/extra-testing/lm_sensors/healthd.conf
deleted file mode 100644
index 36c5f55..0000000
--- a/abs/extra-testing/lm_sensors/healthd.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# /etc/conf.d/healthd
-#
-
-# reset any pending alarms on startup
-ALARM_RESET="yes"
-
-# where to sent mails on alarm
-ADMIN_EMAIL="root"
-
-# Seconds to sleep when alarm detected before checking again
-# If you want to fill up your mail inbox set this to 2. ;-)
-ALARM_SLEEP=600
-
-# command to run in background on each alarm
-ALARM_CMD="beep -f 800 -l 500 -d 500 -r 600"
diff --git a/abs/extra-testing/lm_sensors/healthd.rc b/abs/extra-testing/lm_sensors/healthd.rc
deleted file mode 100644
index 7bb7951..0000000
--- a/abs/extra-testing/lm_sensors/healthd.rc
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-#
-# /etc/rc.d/healthd
-#
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/healthd
-
-maybe_alarm_reset() {
-  case "${ALARM_RESET}" in
-    yes) /usr/bin/sensors > /dev/null
-    ;;
-    no) true
-    ;;
-    *) false
-    esac
-  return $?
-}
-
-PID=$(pidof -x -o %PPID /usr/sbin/healthd)
-case "${1}" in
-  start)
-    stat_busy "Starting Health Daemon"
-    [ -z "${PID}" ] && maybe_alarm_reset && /usr/sbin/healthd &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo "${PID}" > /var/run/healthd.pid
-      add_daemon healthd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Health Daemon"
-    [ ! -z "${PID}" ] && kill ${PID} &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon healthd
-      stat_done
-    fi
-    ;;
-  restart) 
-    $0 stop 
-    sleep 2
-    $0 start 
-    ;;
-  *) echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/extra-testing/lm_sensors/sensord.conf b/abs/extra-testing/lm_sensors/sensord.conf
deleted file mode 100644
index a1cf091..0000000
--- a/abs/extra-testing/lm_sensors/sensord.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to sensord
-#
-SENSORD_ARGS=""
diff --git a/abs/extra-testing/lm_sensors/sensord.rc b/abs/extra-testing/lm_sensors/sensord.rc
deleted file mode 100644
index e3ef4d2..0000000
--- a/abs/extra-testing/lm_sensors/sensord.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sensord
-
-PID=$(pidof -o %PPID /usr/sbin/sensord)
-case "$1" in
-  start)
-    stat_busy "Starting sensord"
-    [ -z "$PID" ] && /usr/sbin/sensord ${SENSORD_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon sensord
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping sensord"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon sensord
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/abs/extra-testing/lm_sensors/sensors-detect.patch b/abs/extra-testing/lm_sensors/sensors-detect.patch
deleted file mode 100644
index 1d12a2c..0000000
--- a/abs/extra-testing/lm_sensors/sensors-detect.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Naur lm_sensors-3.1.0/prog/detect/sensors-detect lm_sensors-3.1.0-new/prog/detect/sensors-detect
---- lm_sensors-3.1.0/prog/detect/sensors-detect	2009-03-03 20:36:33.000000000 -0500
-+++ lm_sensors-3.1.0-new/prog/detect/sensors-detect	2009-03-03 20:52:06.000000000 -0500
-@@ -5282,21 +5282,21 @@
- 		}
- 	}
- 
--	my $have_sysconfig = -d '/etc/sysconfig';
--	printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ",
--	       (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'),
-+	my $have_sysconfig = -d '/etc/conf.d';
-+	printf "Do you want to \%s /etc/conf.d/lm_sensors? (\%s): ",
-+	       (-e '/etc/conf.d/lm_sensors' ? 'overwrite' : 'generate'),
- 	       ($have_sysconfig ? 'YES/no' : 'yes/NO');
- 	$_ = <STDIN>;
- 	if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) {
- 		unless ($have_sysconfig) {
--			mkdir('/etc/sysconfig', 0777)
--				or die "Sorry, can't create /etc/sysconfig ($!)";
-+			mkdir('/etc/conf.d', 0777)
-+				or die "Sorry, can't create /etc/conf.d ($!)";
- 		}
--		open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
--			or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
-+		open(local *SYSCONFIG, ">/etc/conf.d/lm_sensors")
-+			or die "Sorry, can't create /etc/conf.d/lm_sensors ($!)";
- 		print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n";
- 		print SYSCONFIG <<'EOT';
--# This file is sourced by /etc/init.d/lm_sensors and defines the modules to
-+# This file is sourced by /etc/rc.d/lm_sensors and defines the modules to
- # be loaded/unloaded.
- #
- # The format of this file is a shell script that simply defines variables:
-@@ -5322,13 +5322,13 @@
- 		}
- 		close(SYSCONFIG);
- 
--		print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
-+		print "Copy prog/init/lm_sensors.init to /etc/rc.d/lm_sensors\n".
- 		      "for initialization at boot time.\n"
--			unless -f "/etc/init.d/lm_sensors";
-+			unless -f "/etc/rc.d/lm_sensors";
- 
--		if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") {
--			system("/sbin/insserv", "/etc/init.d/lm_sensors");
--		} elsif (-x "/sbin/chkconfig" && -f "/etc/init.d/lm_sensors") {
-+		if (-x "/sbin/insserv" && -f "/etc/rc.d/lm_sensors") {
-+			system("/sbin/insserv", "/etc/rc.d/lm_sensors");
-+		} elsif (-x "/sbin/chkconfig" && -f "/etc/rc.d/lm_sensors") {
- 			system("/sbin/chkconfig", "lm_sensors", "on");
- 			if (-x "/sbin/service") {
- 				system("/sbin/service", "lm_sensors", "start");
-@@ -5377,7 +5377,7 @@
- 		exit -1;
- 	}
- 
--	if (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
-+	if (-x "/sbin/service" && -f "/etc/rc.d/sensors" &&
- 	    -f "/var/lock/subsys/lm_sensors") {
- 		system("/sbin/service", "lm_sensors", "stop");
- 	}
diff --git a/abs/extra-testing/lm_sensors/sensors.install b/abs/extra-testing/lm_sensors/sensors.install
deleted file mode 100644
index d593f84..0000000
--- a/abs/extra-testing/lm_sensors/sensors.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	echo ">>> to control the lm_sensors daemon type"
-	echo ">>> \"/etc/rc.d/sensors start|stop|restart\" "
-	echo ">>> --------------------------------------"
-	echo ">>> before you can use the fancontrol daemon"
-	echo ">>> first create a fancontrol config file, use \"pwmconfig\""
-	echo ">>> then type \"/etc/rc.d/fancontrol start|stop|restart\" "
-	echo ">>> --------------------------------------"
-	echo ">>> to decode memory SPD timings modprobe eeprom module"
-	echo ">>> and get this perl script from"
-	echo ">>> \"http://www.lm-sensors.org/browser/lm-sensors/trunk/prog/eeprom/decode-dimms.pl\""
-}
diff --git a/abs/extra-testing/lm_sensors/sensors.rc b/abs/extra-testing/lm_sensors/sensors.rc
deleted file mode 100644
index 4acde22..0000000
--- a/abs/extra-testing/lm_sensors/sensors.rc
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-
-# description: sensors is used for monitoring motherboard sensor values.
-# config: /etc/conf.d/lm_sensors
-
-# See also the lm_sensors homepage at:
-#     http://www2.lm-sensors.nu/~lm78/index.html
-
-# It uses a config file /etc/conf.d/lm_sensors that contains the modules to
-# be loaded/unloaded. That file is sourced into this one.
-
-# The format of that file a shell script that simply defines the modules
-# in order as normal shell variables with the special names:
-#    MODULE_1, MODULE_2, MODULE_3, etc.
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PSENSORS=/usr/bin/sensors
-
-if $(grep -q sysfs /proc/mounts); then
-  WITHSYS=1
-else
-  WITHSYS=0
-fi
-
-if [ $WITHSYS == "0" ]; then
-  # If sensors isn't supported by the kernel, try loading the module...
-  [ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc &>/dev/null
-
-  # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have support for sensors.
-  if ! [ -e /proc/sys/dev/sensors ]; then
-    echo  "lm_sensors: kernel does not have sensors support"
-    stat_fail
-  fi
-
-  # If sensors was not already running, unload the module...
-  [ -e /var/run/daemons/sensors ] || /sbin/modprobe -r i2c-proc &>/dev/null
-fi
-
-if [ -e /etc/conf.d/lm_sensors ]; then
-  CONFIG=/etc/conf.d/lm_sensors
-elif [ -e /etc/sysconfig/lm_sensors ]; then
-  # Moving config to new Arch-specific location
-  mv /etc/sysconfig/lm_sensors /etc/conf.d/lm_sensors
-  CONFIG=/etc/conf.d/lm_sensors
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting Up Sensors"
-
-    if [ -r "$CONFIG" ]; then
-      . "$CONFIG"
-      modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ')
-      i=0
-      while [ $i -lt $modules ] ; do
-        module=$(eval echo '$'MODULE_$i)
-       # echo starting module __${module}__ #debug
-        /sbin/modprobe $module &>/dev/null
-        i=$(expr $i + 1)
-      done
-    fi
-
-    $PSENSORS -s
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon sensors
-      stat_done
-    fi	  
-    ;;
-
-  stop)
-    stat_busy "Shutting Down Sensors"
-
-    if [ -r "$CONFIG" ]; then
-      . "$CONFIG"
-      modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ')
-      i=$(expr $modules - 1)
-      while [ $i -ge 0 ] ; do
-        module=$(eval echo '$'MODULE_$i)
-      #  echo stoping module __${module}__ #debug
-        /sbin/modprobe -r $module &>/dev/null
-        i=$(expr $i - 1)
-      done
-    fi
-
-    if [ $WITHSYS == "0" ]; then
-      /sbin/modprobe -r i2c-proc &>/dev/null
-    fi
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon sensors
-      stat_done
-    fi
-    ;;
-    
-  status)
-    $PSENSORS
-    ;;
-    
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  condrestart)
-    [ -e /var/run/daemons/sensors ] && $0 restart || :
-    ;;
-
-  *)
-    echo "Usage: $0 {start|stop|restart|status|condrestart}"
-esac
-exit 0
diff --git a/abs/extra-testing/lynx/PKGBUILD b/abs/extra-testing/lynx/PKGBUILD
deleted file mode 100644
index 326e3ee..0000000
--- a/abs/extra-testing/lynx/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 9279 2008-08-17 05:59:10Z allan $
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-pkgname=lynx
-pkgver=2.8.6
-pkgrel=2
-pkgdesc="A text browser for the World Wide Web"
-url="http://lynx.isc.org/"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('ncurses' 'openssl')
-source=(http://lynx.isc.org/release/${pkgname}${pkgver}.tar.gz)
-url="http://lynx.isc.org"
-backup=('etc/lynx.cfg')
-md5sums=('c1346198ae99302cc26763d89f89a239')
-
-build() {
-  cd $startdir/src/${pkgname}2-8-6
-  ./configure --prefix=/usr --sysconfdir=/etc --with-ssl --enable-nls \
-    --mandir=/usr/share/man
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
diff --git a/abs/extra-testing/make/PKGBUILD b/abs/extra-testing/make/PKGBUILD
deleted file mode 100644
index a908e6e..0000000
--- a/abs/extra-testing/make/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: judd <jvinet@zeroflux.org>
-pkgname=make
-pkgver=3.81
-pkgrel=4
-pkgdesc="GNU make utility to maintain groups of programs"
-arch=(i686 x86_64)
-url="http://www.gnu.org/software/make"
-license=('GPL')
-groups=('base-devel')
-depends=('glibc' 'bash')
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('a4e9494ac6dc3f6b0c5ff75c5d52abba')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
diff --git a/abs/extra-testing/mc/PKGBUILD b/abs/extra-testing/mc/PKGBUILD
deleted file mode 100644
index e8b6b2f..0000000
--- a/abs/extra-testing/mc/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 3023 2008-06-18 02:32:22Z eric $
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
-pkgname=mc
-pkgver=4.6.1
-pkgrel=5
-pkgdesc="A filemanager/shell that emulates Norton Commander"
-arch=('i686' 'x86_64')
-url="http://www.ibiblio.org/mc/"
-license=('GPL')
-depends=('e2fsprogs' 'glib2' 'pcre' 'gpm>=1.20.4' 'slang')
-makedepends=('libxt' 'libx11')
-conflicts=('mc-utf8')
-replaces=('mc-utf8')
-options=('!emptydirs' '!makeflags')
-source=(http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/${pkgname}-${pkgver}.tar.gz \
-        ftp://ftp.archlinux.org/other/mc/mc-4.6.1-utf8-r2.patch.bz2 \
-        mc-4.6.1-bash-all.patch mc-4.6.1-find.patch mc-4.6.1-invalid-mtime.patch \
-        mc-4.6.1-largefile.patch mc-4.6.1-nonblock.patch)
-md5sums=('18b20db6e40480a53bac2870c56fc3c4' 'f90bffe7f51883e818143dc2077eb98f'\
-         'd0c5d1f7258daf2a86b41b185524dced' '3c950491cdf44091df216cfa709d133a'\
-         '81930cce827fe93639dcd6bff630a1a4' '80b45ecf38d9b5df6d368c83d14fd89d'\
-         '00e89cfc43fe6026b61f52b218a65907')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 < ../mc-4.6.1-find.patch || return 1
-  patch -p1 < ../mc-4.6.1-largefile.patch || return 1
-  patch -p1 < ../mc-4.6.1-invalid-mtime.patch || return 1
-  patch -p1 < ../mc-4.6.1-utf8-r2.patch || return 1
-  patch -p1 < ../mc-4.6.1-nonblock.patch || return 1
-  patch -p1 < ../mc-4.6.1-bash-all.patch || return 1
-
-# Prevent lazy bindings in cons.saver binary.
-#  - not using bindnow-flags() because cons.saver is only built on GNU/Linux
-  sed -i -e "s:^\(cons_saver_LDADD = .*\):\1 -Wl,-z,now:" src/Makefile.in
-
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-    --without-gnome --without-debug --with-screen=slang --without-included-gettext \
-    -enable-largefile --with-subshell --with-edit --with-vfs --with-samba --with-mmap \
-    --with-x --with-gpm-mouse --enable-charset
-  make || return 1
-  make DESTDIR=${pkgdir} install
-
-  iconv -f koi8-r -t utf8 ${pkgdir}/usr/share/mc/mc.hint.ru > ${pkgdir}/usr/share/mc/mc.hint.ru.tmp || return 1
-  mv ${pkgdir}/usr/share/mc/mc.hint.ru.tmp ${pkgdir}/usr/share/mc/mc.hint.ru
-
-  iconv -f koi8-r -t utf8 ${pkgdir}/usr/share/mc/mc.hlp.ru > ${pkgdir}/usr/share/mc/mc.hlp.ru.tmp || return 1
-  mv ${pkgdir}/usr/share/mc/mc.hlp.ru.tmp ${pkgdir}/usr/share/mc/mc.hlp.ru
-
-  # convert man pages to utf8
-  cd ${pkgdir}/usr/share/man/ru
-  find -type f | xargs -i123 -- sh -c "mv 123 123.old && iconv -f koi8-r -t utf8 123.old >123 && rm 123.old" || return 1
-}
diff --git a/abs/extra-testing/mc/mc-4.6.1-bash-all.patch b/abs/extra-testing/mc/mc-4.6.1-bash-all.patch
deleted file mode 100644
index e3e2afc..0000000
--- a/abs/extra-testing/mc/mc-4.6.1-bash-all.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- /src/subshell.c.000	2006-05-08 23:11:48.000000000 +0200
-+++ /src/subshell.c	2006-10-28 15:40:46.000000000 +0200
-@@ -745,29 +745,13 @@ subshell_name_quote (const char *s)
-     memcpy (d, cmd_start, len);
-     d += len;
- 
--    /*
--     * Print every character in octal format with the leading backslash.
--     * tcsh and zsh may require 4-digit octals, bash < 2.05b doesn't like them.
--     */
--    if (subshell_type == BASH) {
- 	for (; *s; s++) {
--	    /* Must quote numbers, so that they are not glued to octals */
- 	    if (isalpha ((unsigned char) *s)) {
- 		*d++ = (unsigned char) *s;
- 	    } else {
--		sprintf (d, "\\%03o", (unsigned char) *s);
--		d += 4;
--	    }
--	}
--    } else {
--	for (; *s; s++) {
--	    if (isalnum ((unsigned char) *s)) {
--		*d++ = (unsigned char) *s;
--	    } else {
- 		sprintf (d, "\\0%03o", (unsigned char) *s);
- 		d += 5;
- 	    }
--	}
-     }
- 
-     memcpy (d, common_end, sizeof (common_end));
-
diff --git a/abs/extra-testing/mc/mc-4.6.1-find.patch b/abs/extra-testing/mc/mc-4.6.1-find.patch
deleted file mode 100644
index f44a6ac..0000000
--- a/abs/extra-testing/mc/mc-4.6.1-find.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-diff -Naur mc-4.6.1.orig/src/cmd.c mc-4.6.1/src/cmd.c
---- mc-4.6.1.orig/src/cmd.c	2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/cmd.c	2006-03-19 12:57:00.000000000 +0100
-@@ -510,7 +510,7 @@
- 		continue;
- 	}
- 	c = regexp_match (reg_exp_t, current_panel->dir.list[i].fname,
--			  match_file);
-+			  match_file, 0);
- 	if (c == -1) {
- 	    message (1, MSG_ERROR, _("  Malformed regular expression  "));
- 	    g_free (reg_exp);
-diff -Naur mc-4.6.1.orig/src/dir.c mc-4.6.1/src/dir.c
---- mc-4.6.1.orig/src/dir.c	2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/dir.c	2006-03-19 12:58:56.000000000 +0100
-@@ -405,7 +405,7 @@
- 	    *stale_link = 1;
-     }
-     if (!(S_ISDIR (buf1->st_mode) || *link_to_dir) && filter
--	&& !regexp_match (filter, dp->d_name, match_file))
-+	&& !regexp_match (filter, dp->d_name, match_file, 0))
- 	return 0;
- 
-     /* Need to grow the *list? */
-diff -Naur mc-4.6.1.orig/src/ext.c mc-4.6.1/src/ext.c
---- mc-4.6.1.orig/src/ext.c	2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/ext.c	2006-03-19 13:00:43.000000000 +0100
-@@ -394,7 +394,7 @@
-     }
- 
-     if (content_string[0]
--	&& regexp_match (ptr, content_string + content_shift, match_regex)) {
-+	&& regexp_match (ptr, content_string + content_shift, match_regex, 0)) {
- 	found = 1;
-     }
- 
-@@ -534,11 +534,11 @@
- 		/* Do not transform shell patterns, you can use shell/ for
- 		 * that
- 		 */
--		if (regexp_match (p, filename, match_regex))
-+		if (regexp_match (p, filename, match_regex, 0))
- 		    found = 1;
- 	    } else if (!strncmp (p, "directory/", 10)) {
- 		if (S_ISDIR (mystat.st_mode)
--		    && regexp_match (p + 10, filename, match_regex))
-+		    && regexp_match (p + 10, filename, match_regex, 0))
- 		    found = 1;
- 	    } else if (!strncmp (p, "shell/", 6)) {
- 		p += 6;
-diff -Naur mc-4.6.1.orig/src/find.c mc-4.6.1/src/find.c
---- mc-4.6.1.orig/src/find.c	2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/find.c	2006-03-19 13:04:10.000000000 +0100
-@@ -575,6 +575,7 @@
-     struct stat tmp_stat;
-     static int pos;
-     static int subdirs_left = 0;
-+    int flags = 0;
- 
-     if (!h) { /* someone forces me to close dirp */
- 	if (dirp) {
-@@ -586,6 +587,10 @@
-         dp = 0;
- 	return 1;
-     }
-+    
-+    if (!(case_sense->state & C_BOOL))
-+	flags |= REG_ICASE;
-+	
-  do_search_begin:
-     while (!dp){
- 	
-@@ -662,7 +667,7 @@
- 	g_free (tmp_name);
-     }
- 
--    if (regexp_match (find_pattern, dp->d_name, match_file)){
-+    if (regexp_match (find_pattern, dp->d_name, match_file, flags)){
- 	if (content_pattern) {
- 	    if (search_content (h, directory, dp->d_name)) {
- 		return 1;
-diff -Naur mc-4.6.1.orig/src/user.c mc-4.6.1/src/user.c
---- mc-4.6.1.orig/src/user.c	2005-07-01 17:47:07.000000000 +0200
-+++ mc-4.6.1/src/user.c	2006-03-19 13:05:00.000000000 +0100
-@@ -412,18 +412,18 @@
- 	    break;
- 	case 'f': /* file name pattern */
- 	    p = extract_arg (p, arg, sizeof (arg));
--	    *condition = panel && regexp_match (arg, panel->dir.list [panel->selected].fname, match_file);
-+	    *condition = panel && regexp_match (arg, panel->dir.list [panel->selected].fname, match_file, 0);
- 	    break;
- 	case 'y': /* syntax pattern */
-             if (edit_widget && edit_widget->syntax_type) {
- 	        p = extract_arg (p, arg, sizeof (arg));
- 	        *condition = panel &&
--                    regexp_match (arg, edit_widget->syntax_type, match_normal);
-+                    regexp_match (arg, edit_widget->syntax_type, match_normal, 0);
- 	    }
-             break;
- 	case 'd':
- 	    p = extract_arg (p, arg, sizeof (arg));
--	    *condition = panel && regexp_match (arg, panel->cwd, match_file);
-+	    *condition = panel && regexp_match (arg, panel->cwd, match_file, 0);
- 	    break;
- 	case 't':
- 	    p = extract_arg (p, arg, sizeof (arg));
-diff -Naur mc-4.6.1.orig/src/util.c mc-4.6.1/src/util.c
---- mc-4.6.1.orig/src/util.c	2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/util.c	2006-03-19 13:06:58.000000000 +0100
-@@ -563,27 +563,30 @@
- 	return  g_strdup (pattern);
- }
- 
--int regexp_match (const char *pattern, const char *string, int match_type)
-+int regexp_match (const char *pattern, const char *string, int match_type, int flags)
- {
-     static regex_t r;
-     static char *old_pattern = NULL;
-     static int old_type;
-+    static int old_flags;
-     int    rval;
-     char *my_pattern;
- 
--    if (!old_pattern || STRCOMP (old_pattern, pattern) || old_type != match_type){
-+    if (!old_pattern || STRCOMP (old_pattern, pattern) || old_type != match_type || old_flags != flags){
- 	if (old_pattern){
- 	    regfree (&r);
- 	    g_free (old_pattern);
- 	    old_pattern = NULL;
- 	}
- 	my_pattern = convert_pattern (pattern, match_type, 0);
--	if (regcomp (&r, my_pattern, REG_EXTENDED|REG_NOSUB|MC_ARCH_FLAGS)) {
-+	
-+	if (regcomp (&r, my_pattern, REG_EXTENDED|REG_NOSUB|MC_ARCH_FLAGS|flags)) {
- 	    g_free (my_pattern);
- 	    return -1;
- 	}
- 	old_pattern = my_pattern;
- 	old_type = match_type;
-+	old_flags = flags;
-     }
-     rval = !regexec (&r, string, 0, NULL, 0);
-     return rval;
-diff -Naur mc-4.6.1.orig/src/util.h mc-4.6.1/src/util.h
---- mc-4.6.1.orig/src/util.h	2005-01-13 20:20:47.000000000 +0100
-+++ mc-4.6.1/src/util.h	2006-03-19 13:07:16.000000000 +0100
-@@ -116,7 +116,7 @@
- 
- extern int easy_patterns;
- char *convert_pattern (const char *pattern, int match_type, int do_group);
--int regexp_match (const char *pattern, const char *string, int match_type);
-+int regexp_match (const char *pattern, const char *string, int match_type, int flags);
- 
- /* Error pipes */
- void open_error_pipe (void);
diff --git a/abs/extra-testing/mc/mc-4.6.1-invalid-mtime.patch b/abs/extra-testing/mc/mc-4.6.1-invalid-mtime.patch
deleted file mode 100644
index 07b1f6d..0000000
--- a/abs/extra-testing/mc/mc-4.6.1-invalid-mtime.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-
-  Invalid timestamps on files caused mc to segfault by passing a null
-  pointer to strftime. Avoid trying to print the time in this case.
-
-  Reported by Maxim Britov <maxim@office.modum.by>
-  at http://bugs.gentoo.org/184296
-
---- mc-4.6.1/src/util.c
-+++ mc-4.6.1/src/util.c
-@@ -717,6 +717,7 @@
-     static size_t i18n_timelength = 0;
-     static const char *fmtyear, *fmttime;
-     const char *fmt;
-+    struct tm *whentm;
- 
-     if (i18n_timelength == 0){
- 	i18n_timelength = i18n_checktimelength() + 1;
-@@ -740,7 +741,11 @@
-     else
- 	fmt = fmttime;
-     
--    strftime (timebuf, i18n_timelength, fmt, localtime(&when));
-+    whentm = localtime(&when);
-+    if (whentm == NULL)
-+	return "(invalid)";
-+
-+    strftime (timebuf, i18n_timelength, fmt, whentm);
-     return timebuf;
- }
- 
diff --git a/abs/extra-testing/mc/mc-4.6.1-largefile.patch b/abs/extra-testing/mc/mc-4.6.1-largefile.patch
deleted file mode 100644
index de30715..0000000
--- a/abs/extra-testing/mc/mc-4.6.1-largefile.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-diff -Naur mc-4.6.1.orig/intl/loadmsgcat.c mc-4.6.1/intl/loadmsgcat.c
---- mc-4.6.1.orig/intl/loadmsgcat.c	2005-07-23 18:52:57.000000000 +0200
-+++ mc-4.6.1/intl/loadmsgcat.c	2006-03-19 17:11:14.000000000 +0100
-@@ -1002,7 +1002,7 @@
-       /* The magic number is wrong: not a message catalog file.  */
- #ifdef HAVE_MMAP
-       if (use_mmap)
--	munmap ((caddr_t) data, size);
-+	munmap ((void *) data, size);
-       else
- #endif
- 	free (data);
-@@ -1271,7 +1271,7 @@
- 	free (domain->malloced);
- #ifdef HAVE_MMAP
-       if (use_mmap)
--	munmap ((caddr_t) data, size);
-+	munmap ((void *) data, size);
-       else
- #endif
- 	free (data);
-@@ -1306,7 +1306,7 @@
- 
- # ifdef _POSIX_MAPPED_FILES
-   if (domain->use_mmap)
--    munmap ((caddr_t) domain->data, domain->mmap_size);
-+    munmap ((void *) domain->data, domain->mmap_size);
-   else
- # endif	/* _POSIX_MAPPED_FILES */
-     free ((void *) domain->data);
-diff -Naur mc-4.6.1.orig/src/view.c mc-4.6.1/src/view.c
---- mc-4.6.1.orig/src/view.c	2005-05-27 16:19:18.000000000 +0200
-+++ mc-4.6.1/src/view.c	2006-03-19 17:10:34.000000000 +0100
-@@ -76,6 +76,12 @@
- #define vwidth (view->widget.cols - (view->have_frame ? 2 : 0))
- #define vheight (view->widget.lines - (view->have_frame ? 2 : 0))
- 
-+#if GLIB_MAJOR_VERSION >= 2
-+#  define my_g_malloc g_try_malloc
-+#else
-+#  define my_g_malloc g_malloc
-+#endif
-+
- /* Offset in bytes into a file */
- typedef unsigned long offset_type;
- #define INVALID_OFFSET ((offset_type) -1)
-@@ -560,8 +566,8 @@
- 	view->data = mc_mmap (0, view->s.st_size, PROT_READ,
- 			      MAP_FILE | MAP_SHARED, view->file, 0);
-     else
--	view->data = (caddr_t) -1;
--    if ((caddr_t) view->data != (caddr_t) - 1) {
-+	view->data = (void *) -1;
-+    if (view->data != (void *)-1) {
- 	/* mmap worked */
- 	view->first = 0;
- 	view->bytes_read = view->s.st_size;
-@@ -573,6 +579,9 @@
-     /* For the OSes that don't provide mmap call, try to load all the
-      * file into memory (alex@bcs.zaporizhzhe.ua).  Also, mmap can fail
-      * for any reason, so we use this as fallback (pavel@ucw.cz) */
-+     
-+    /* If large file support is enabled, st_size is a 64 bit value and
-+     * will thus on 32 bit platforms possibly be beyond the range of gulong */
- 
-     /* Make sure view->s.st_size is not truncated when passed to g_malloc */
-     if ((gulong) view->s.st_size == view->s.st_size)
-diff -Naur mc-4.6.1.orig/vfs/local.c mc-4.6.1/vfs/local.c
---- mc-4.6.1.orig/vfs/local.c	2004-09-25 01:00:18.000000000 +0200
-+++ mc-4.6.1/vfs/local.c	2006-03-19 17:00:45.000000000 +0100
-@@ -243,8 +243,8 @@
- }
- 
- #ifdef HAVE_MMAP
--caddr_t
--local_mmap (struct vfs_class *me, caddr_t addr, size_t len, int prot, int flags, void *data, off_t offset)
-+void *
-+local_mmap (struct vfs_class *me, void *addr, size_t len, int prot, int flags, void *data, off_t offset)
- {
-     int fd = * (int *)data;
- 
-@@ -252,7 +252,7 @@
- }
- 
- int
--local_munmap (struct vfs_class *me, caddr_t addr, size_t len, void *data)
-+local_munmap (struct vfs_class *me, void *addr, size_t len, void *data)
- {
-     return munmap (addr, len);
- }
-diff -Naur mc-4.6.1.orig/vfs/local.h mc-4.6.1/vfs/local.h
---- mc-4.6.1.orig/vfs/local.h	2004-08-17 11:17:43.000000000 +0200
-+++ mc-4.6.1/vfs/local.h	2006-03-19 17:01:35.000000000 +0100
-@@ -13,9 +13,9 @@
- extern int local_errno (struct vfs_class *me);
- extern int local_lseek (void *data, off_t offset, int whence);
- #ifdef HAVE_MMAP
--extern caddr_t local_mmap (struct vfs_class *me, caddr_t addr, size_t len,
-+extern void *local_mmap (struct vfs_class *me, void *addr, size_t len,
-                            int prot, int flags, void *data, off_t offset);
--extern int local_munmap (struct vfs_class *me, caddr_t addr, size_t len, void *data);
-+extern int local_munmap (struct vfs_class *me, void *addr, size_t len, void *data);
- #endif
- 
- #endif
-diff -Naur mc-4.6.1.orig/vfs/samba/lib/util.c mc-4.6.1/vfs/samba/lib/util.c
---- mc-4.6.1.orig/vfs/samba/lib/util.c	2005-05-27 16:19:19.000000000 +0200
-+++ mc-4.6.1/vfs/samba/lib/util.c	2006-03-19 17:06:39.000000000 +0100
-@@ -1836,7 +1836,7 @@
- 	
-   /* Look up the host address in the address list we just got. */
-   for (i = 0; hp->h_addr_list[i]; i++) {
--    if (memcmp(hp->h_addr_list[i], (caddr_t) & addr, sizeof(addr)) == 0)
-+    if (memcmp(hp->h_addr_list[i], &addr, sizeof(addr)) == 0)
-       return True;
-   }
- 
-diff -Naur mc-4.6.1.orig/vfs/vfs.c mc-4.6.1/vfs/vfs.c
---- mc-4.6.1.orig/vfs/vfs.c	2005-05-27 16:19:19.000000000 +0200
-+++ mc-4.6.1/vfs/vfs.c	2006-03-19 17:03:48.000000000 +0100
-@@ -740,27 +740,27 @@
- 
- #ifdef HAVE_MMAP
- static struct mc_mmapping {
--    caddr_t addr;
-+    void *addr;
-     void *vfs_info;
-     struct vfs_class *vfs;
-     struct mc_mmapping *next;
- } *mc_mmaparray = NULL;
- 
--caddr_t
--mc_mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
-+void *
-+mc_mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset)
- {
-     struct vfs_class *vfs;
--    caddr_t result;
-+    void *result;
-     struct mc_mmapping *mcm;
- 
-     if (fd == -1)
--	return (caddr_t) -1;
-+	return (void *) -1;
-     
-     vfs = vfs_op (fd);
--    result = vfs->mmap ? (*vfs->mmap)(vfs, addr, len, prot, flags, vfs_info (fd), offset) : (caddr_t)-1;
--    if (result == (caddr_t)-1){
-+    result = vfs->mmap ? (*vfs->mmap)(vfs, addr, len, prot, flags, vfs_info (fd), offset) : (void *)-1;
-+    if (result == (void *)-1){
- 	errno = ferrno (vfs);
--	return (caddr_t)-1;
-+	return (void *)-1;
-     }
-     mcm =g_new (struct mc_mmapping, 1);
-     mcm->addr = result;
-@@ -772,7 +772,7 @@
- }
- 
- int
--mc_munmap (caddr_t addr, size_t len)
-+mc_munmap (void *addr, size_t len)
- {
-     struct mc_mmapping *mcm, *mcm2 = NULL;
-     
-diff -Naur mc-4.6.1.orig/vfs/vfs.h mc-4.6.1/vfs/vfs.h
---- mc-4.6.1.orig/vfs/vfs.h	2004-11-16 17:16:08.000000000 +0100
-+++ mc-4.6.1/vfs/vfs.h	2006-03-19 17:05:57.000000000 +0100
-@@ -49,8 +49,8 @@
- int mc_ctl (int fd, int ctlop, void *arg);
- int mc_setctl (const char *path, int ctlop, void *arg);
- #ifdef HAVE_MMAP
--caddr_t mc_mmap (caddr_t, size_t, int, int, int, off_t);
--int mc_munmap (caddr_t addr, size_t len);
-+void *mc_mmap (void *, size_t, int, int, int, off_t);
-+int mc_munmap (void *addr, size_t len);
- #endif				/* HAVE_MMAP */
- 
- /* Operations for mc_ctl - on open file */
-diff -Naur mc-4.6.1.orig/vfs/vfs-impl.h mc-4.6.1/vfs/vfs-impl.h
---- mc-4.6.1.orig/vfs/vfs-impl.h	2004-09-02 15:57:59.000000000 +0200
-+++ mc-4.6.1/vfs/vfs-impl.h	2006-03-19 17:12:01.000000000 +0100
-@@ -72,9 +72,9 @@
-     int (*setctl) (struct vfs_class *me, const char *path, int ctlop,
- 		   void *arg);
- #ifdef HAVE_MMAP
--    caddr_t (*mmap) (struct vfs_class *me, caddr_t addr, size_t len,
-+    void *(*mmap) (struct vfs_class *me, void *addr, size_t len,
- 		     int prot, int flags, void *vfs_info, off_t offset);
--    int (*munmap) (struct vfs_class *me, caddr_t addr, size_t len,
-+    int (*munmap) (struct vfs_class *me, void *addr, size_t len,
- 		   void *vfs_info);
- #endif
- };
diff --git a/abs/extra-testing/mc/mc-4.6.1-nonblock.patch b/abs/extra-testing/mc/mc-4.6.1-nonblock.patch
deleted file mode 100644
index eca34aa..0000000
--- a/abs/extra-testing/mc/mc-4.6.1-nonblock.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mc-4.6.1/src/cons.saver.c.old	2006-04-30 20:45:11.725128977 +0200
-+++ mc-4.6.1/src/cons.saver.c	2006-04-30 20:45:55.545063247 +0200
-@@ -134,7 +134,7 @@
- 
-   if (seteuid (uid) < 0)
-     die ();
--  console_fd = open (tty_name, O_RDONLY);
-+  console_fd = open (tty_name, O_RDONLY | O_NONBLOCK);
-   if (console_fd < 0)
-     die ();
-   if (fstat (console_fd, &st) < 0 || ! S_ISCHR (st.st_mode))
diff --git a/abs/extra-testing/mdbtools/PKGBUILD b/abs/extra-testing/mdbtools/PKGBUILD
deleted file mode 100644
index c7a562d..0000000
--- a/abs/extra-testing/mdbtools/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributor: TDY <tdy@gmx.com>
-# Contributor: Eduard "bekks" Warkentin <eduard.warkentin@gmail.com>
-pkgname=mdbtools
-pkgver=0.5
-pkgrel=8
-pkgdesc="Utilities for viewing data and exporting schema from Microsoft Access Database files"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/mdbtools/"
-license=('LGPL' 'GPL')
-depends=('libgnomeui')
-makedepends=('bison' 'flex')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-        gmdb2.desktop)
-md5sums=('4a18bf96e67161101cade64526756d22'
-         '289f236ca91d73510e842922b5776999')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man
-  make || return 1
-  make DESTDIR="$pkgdir" install
-  install -Dm644 ../gmdb2.desktop "$pkgdir/usr/share/applications/gmdb2.desktop"
-}
diff --git a/abs/extra-testing/mdbtools/gmdb2.desktop b/abs/extra-testing/mdbtools/gmdb2.desktop
deleted file mode 100644
index 8b40dc2..0000000
--- a/abs/extra-testing/mdbtools/gmdb2.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=MDB Tools
-Comment=View data and export schema from MDB files
-TryExec=/usr/bin/gmdb2
-Exec=gmdb2
-Icon=/usr/share/gmdb/glade/logo.xpm
-Categories=System;FileTools;
diff --git a/abs/extra-testing/mediaserv/PKGBUILD b/abs/extra-testing/mediaserv/PKGBUILD
deleted file mode 100644
index 59eed79..0000000
--- a/abs/extra-testing/mediaserv/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $
-# Maintainer: Cecil Watson<knoppmyth@gmail.com>
-
-pkgname=mediaserv
-pkgver=0.05
-pkgrel=20
-pkgdesc="On-demand transcoding server for videos, targetting the Nokia Internet Tablets."
-arch=('i686' 'x86_64')
-license=('ARTISTIC')
-depends=('tablet-encode' 'perl-xml-rss')
-backup=(/myth/mediaserv/config)
-install=(mediaserv.install)
-url="http://mediautils.garage.maemo.org/tablet-encode.html"
-source=(https://garage.maemo.org/frs/download.php/2632/mediaserv-0.05.tar.gz linhes-mediaserv.tar.bz2 mediaserv.no_daemon.patch run finish)
-
-build() {
-  cd ${srcdir}/mediaserv
-  patch -Np1 -i ${startdir}/src/mediaserv.no_daemon.patch || return 1
-  mkdir -p $startdir/pkg/usr/bin
-  mkdir -p $startdir/pkg/etc/sv/mediaserv/supervise
-  mkdir -p $startdir/pkg/usr/share/doc/mediaserv
-  mkdir -p $startdir/pkg/myth/mediaserv
-  mkdir -p $startdir/pkg/myth/mediaserv/media
-  install -D -m755 mediaserv $startdir/pkg/usr/bin
-  cp README.txt $startdir/pkg/usr/share/doc/mediaserv
-  cp -a ${srcdir}/.mediaserv/* ${pkgdir}/myth/mediaserv
-  install -D -m755 ${srcdir}/run ${srcdir}/finish $startdir/pkg/etc/sv/mediaserv
-}
-md5sums=('94c300a0e95c55dae42a61f77e4e41fe'
-         'e7b6fcc91b73939db350c4854c19e9ee'
-         '68d25630786e76fa36c9e6bb29821367'
-         'd047f0fa5f1d39d864debd8a76f677e2'
-         'f2022c1cc8f04959299c97edde06d023')
diff --git a/abs/extra-testing/mediaserv/finish b/abs/extra-testing/mediaserv/finish
deleted file mode 100644
index f424494..0000000
--- a/abs/extra-testing/mediaserv/finish
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Stopping mediaserv"
-#wait
-exec /usr/bin/killall mediaserv
diff --git a/abs/extra-testing/mediaserv/linhes-mediaserv.tar.bz2 b/abs/extra-testing/mediaserv/linhes-mediaserv.tar.bz2
deleted file mode 100644
index 6397fb7..0000000
--- a/abs/extra-testing/mediaserv/linhes-mediaserv.tar.bz2
+++ /dev/null
diff --git a/abs/extra-testing/mediaserv/mediaserv.install b/abs/extra-testing/mediaserv/mediaserv.install
deleted file mode 100644
index 4a9de8e..0000000
--- a/abs/extra-testing/mediaserv/mediaserv.install
+++ /dev/null
@@ -1,38 +0,0 @@
-# arg 1:  the new package version
-
-
-post_install() {
-  if [ ! -e /home/mythtv/.mediaserv ]
-  then
-      ln -s /myth/mediaserv /home/mythtv/.mediaserv
-  fi
-
-  if [ ! -e /myth/mediaserv/media/tv ]
-  then
-      ln -s /myth/pretty /myth/mediaserv/media/tv
-  fi
-  if [ ! -e /myth/mediaserv/media/video ]
-  then
-      ln -s /myth/video /myth/mediaserv/media/video
-  fi
-  chown -R mythtv.mythtv /myth/mediaserv
-  add_service.sh mediaserv
-  sv start mediaserv
-}
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-# arg 1:  the old package version
-post_remove() {
-	sv stop mediaserv
-	remove_service.sh mediaserv
-	rm -fr /home/mythtv/.mediaserv
-	rm -fr /myth/mediaserv
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/mediaserv/mediaserv.no_daemon.patch b/abs/extra-testing/mediaserv/mediaserv.no_daemon.patch
deleted file mode 100644
index b659354..0000000
--- a/abs/extra-testing/mediaserv/mediaserv.no_daemon.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- mediaserv/mediaserv.orig	2009-06-15 03:16:53.000000000 +0000
-+++ mediaserv/mediaserv	2009-06-15 03:17:29.000000000 +0000
-@@ -608,10 +608,10 @@
- # daemonize - daemonize the parent/control app
- #
- sub daemonize {
--    my $pid = fork;                              # Fork off the main process
--    defined ($pid) or die "Cannot start daemon: $!";
--    print "Parent daemon running.\n" if $pid;    # If we have a PID, the parent daemonized okay
--    exit if $pid;                                # Return control to the user
-+#    my $pid = fork;                              # Fork off the main process
-+#    defined ($pid) or die "Cannot start daemon: $!";
-+    print "Parent daemon running.\n" ;    # If we have a PID, the parent daemonized okay
-+#    exit if $pid;                                # Return control to the user
- 
-     # Now we're a daemonized parent process!
- 
diff --git a/abs/extra-testing/mediaserv/run b/abs/extra-testing/mediaserv/run
deleted file mode 100644
index fbd1c97..0000000
--- a/abs/extra-testing/mediaserv/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting mediaserv"
-exec su mythtv -c "/usr/bin/mediaserv" 2>/dev/null 
-wait
diff --git a/abs/extra-testing/mednafen/PKGBUILD b/abs/extra-testing/mednafen/PKGBUILD
deleted file mode 100755
index 69e127f..0000000
--- a/abs/extra-testing/mednafen/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Daenyth <Daenyth+Arch [at] gmail [dot] com>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: kagan <juanynie@mi.madritel.es>
-pkgname=mednafen
-pkgver=0.8.C
-pkgrel=1
-pkgdesc="A command-line multi-system gaming emulator"
-url="http://mednafen.sourceforge.net/"
-license=(GPL)
-arch=('i686' 'x86_64')
-depends=('libcdio>=0.80-3' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib')
-makedepends=('pkgconfig')
-source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2)
-md5sums=('e8f4b6ba7ed2eca399b02578e1803831')
-
-build() {
-  cd $srcdir/$pkgname
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$pkgdir install
-}
diff --git a/abs/extra-testing/mercurial/ChangeLog b/abs/extra-testing/mercurial/ChangeLog
deleted file mode 100644
index cea6101..0000000
--- a/abs/extra-testing/mercurial/ChangeLog
+++ /dev/null
@@ -1,21 +0,0 @@
-
-2009-03-05  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 1.2
-
-2009-01-03  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 1.1.2
-
-2008-12-02  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 1.1
-
-2008-08-17  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 1.0.2
-
-2008-07-10  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 1.0.1
-
diff --git a/abs/extra-testing/mercurial/PKGBUILD b/abs/extra-testing/mercurial/PKGBUILD
deleted file mode 100644
index 08d38e3..0000000
--- a/abs/extra-testing/mercurial/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 29080 2009-03-05 10:10:06Z douglas $
-# Contributor: Jeff Mickey <jeff@archlinux.org>
-# Contributor: Giovanni Scafora <linuxmania@gmail.com>
-# Contributor: David 'SleepyDog' <goodluv@gmail.com>
-# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=mercurial
-pkgver=1.2
-pkgrel=1
-pkgdesc="A scalable distributed SCM tool"
-url="http://www.selenic.com/mercurial"
-license=("GPL")
-depends=('python>=2.6')
-source=(http://www.selenic.com/mercurial/release/$pkgname-$pkgver.tar.gz)
-arch=('i686' 'x86_64')
-
-build() {
-    cd $startdir/src/$pkgname-$pkgver
-    python setup.py install --root $startdir/pkg
-    
-    install -d $startdir/pkg/usr/share/man/{man1,man5}
-    install -m644 doc/hg.1 $startdir/pkg/usr/share/man/man1
-    install -m644 doc/{hgrc.5,hgignore.5} $startdir/pkg/usr/share/man/man5
-    install -m755 contrib/hgk $startdir/pkg/usr/bin
-    install -m644 -D contrib/zsh_completion $startdir/pkg/usr/share/zsh/site-functions/_hg
-    install -m644 -D contrib/bash_completion $startdir/pkg/etc/bash_completion.d/hg 
-    install -d $startdir/pkg/usr/share/emacs/site-lisp
-    install -m644 contrib/{mq.el,mercurial.el} $startdir/pkg/usr/share/emacs/site-lisp
-    install -m644 -D contrib/vim/HGAnnotate.vim $startdir/pkg/usr/share/vim/syntax/HGAnnotate.vim
-
-    # Autoloading plugins to vim = no good.  
-    #  install -d $startdir/pkg/usr/share/vim/plugin
-    #  install -m644 contrib/vim/{hg-menu.vim,hgcommand.vim,patchreview.vim} $startdir/pkg/usr/share/vim/plugin
-}
-md5sums=('ac9d16b078f99f7a89d6865421570f05')
diff --git a/abs/extra-testing/mime-types/PKGBUILD b/abs/extra-testing/mime-types/PKGBUILD
deleted file mode 100644
index 563857d..0000000
--- a/abs/extra-testing/mime-types/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Id: PKGBUILD 35674 2009-04-15 05:29:19Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-pkgname=mime-types
-pkgver=1.0
-pkgrel=2
-pkgdesc="Provides /etc/mime.types"
-arch=('i686' 'x86_64')
-url="http://www.archlinux.org/"
-license=('GPL2')
-backup=('etc/mime.types')
-source=(mime.types)
-md5sums=('aa90248272ba2e9dca0a243746686739')
-
-build() {
-  cd ${srcdir}
-  install -D -m644 mime.types ${pkgdir}/etc/mime.types || return 1
-}
diff --git a/abs/extra-testing/mime-types/mime.types b/abs/extra-testing/mime-types/mime.types
deleted file mode 100644
index 5a6bbd4..0000000
--- a/abs/extra-testing/mime-types/mime.types
+++ /dev/null
@@ -1,758 +0,0 @@
-###############################################################################
-#
-#  MIME-TYPES and the extensions that represent them
-#
-#  This file is part of the mime-types package, which is based on 
-#  gentoo's "app-misc/mime-types".  If you would like new types and/or 
-#  extensions to be added here, please file a bug on http://bugs.archlinux.org
-#
-#  The reason that all types are managed by the mime-support package instead
-#  allowing individual packages to install types in much the same way as they
-#  add entries in to the mailcap file is so these types can be referenced by
-#  other programs (such as a web server) even if the specific support package
-#  for that type is not installed.
-#
-#  Users can add their own types if they wish by creating a ".mime.types"
-#  file in their home directory.  Definitions included there will take
-#  precedence over those listed here.
-#
-#  Note: Compression schemes like "gzip", "bzip", and "compress" are not
-#  actually "mime-types".  They are "encodings" and hence must _not_ have
-#  entries in this file to map their extensions.  The "mime-type" of an
-#  encoded file refers to the type of data that has been encoded, not the
-#  type of encoding.
-#
-###############################################################################
-
-
-application/activemessage
-application/andrew-inset			ez
-application/applefile
-application/atomicmail
-application/batch-SMTP
-application/beep+xml
-application/cals-1840
-application/commonground
-application/cu-seeme				cu
-application/cybercash
-application/dca-rft
-application/dec-dx
-application/docbook+xml
-application/dsptype				tsp
-application/dvcs
-application/edi-consent
-application/edi-x12
-application/edifact
-application/eshop
-application/font-tdpfr
-application/futuresplash			spl
-application/ghostview
-application/hta					hta
-application/http
-application/hyperstudio
-application/iges
-application/index
-application/index.cmd
-application/index.obj
-application/index.response
-application/index.vnd
-application/iotp
-application/ipp
-application/isup
-application/java-archive			jar
-application/java-serialized-object		ser
-application/java-vm				class
-application/mac-binhex40			hqx
-application/mac-compactpro			cpt
-application/macwriteii
-application/marc
-application/mathematica				nb
-application/mathematica-old
-application/msaccess				mdb
-application/msword				doc dot
-application/news-message-id
-application/news-transmission
-application/ocsp-request
-application/ocsp-response
-application/octet-stream			bin
-application/oda					oda
-application/ogg					ogg
-application/parityfec
-application/pdf					pdf
-application/pgp-encrypted
-application/pgp-keys				key
-application/pgp-signature			pgp
-application/pics-rules				prf
-application/pkcs10
-application/pkcs7-mime
-application/pkcs7-signature
-application/pkix-cert
-application/pkix-crl
-application/pkixcmp
-application/postscript				ps ai eps
-application/prs.alvestrand.titrax-sheet
-application/prs.cww
-application/prs.nprend
-application/qsig
-application/rar					rar
-application/rdf+xml				rdf
-application/remote-printing
-application/riscos
-application/rss+xml				rss
-application/rtf
-application/sdp
-application/set-payment
-application/set-payment-initiation
-application/set-registration
-application/set-registration-initiation
-application/sgml
-application/sgml-open-catalog
-application/sieve
-application/slate
-application/smil				smi smil
-application/timestamp-query
-application/timestamp-reply
-application/vemmi
-application/whoispp-query
-application/whoispp-response
-application/wita
-application/wordperfect				wpd
-application/wordperfect5.1			wp5
-application/x400-bp
-application/xhtml+xml				xhtml xht
-application/xml					xml xsl
-application/xml-dtd
-application/xml-external-parsed-entity
-application/zip					zip
-application/vnd.3M.Post-it-Notes
-application/vnd.accpac.simply.aso
-application/vnd.accpac.simply.imp
-application/vnd.acucobol
-application/vnd.aether.imp
-application/vnd.anser-web-certificate-issue-initiation
-application/vnd.anser-web-funds-transfer-initiation
-application/vnd.audiograph
-application/vnd.bmi
-application/vnd.businessobjects
-application/vnd.canon-cpdl
-application/vnd.canon-lips
-application/vnd.cinderella			cdy
-application/vnd.claymore
-application/vnd.commerce-battelle
-application/vnd.commonspace
-application/vnd.comsocaller
-application/vnd.contact.cmsg
-application/vnd.cosmocaller
-application/vnd.ctc-posml
-application/vnd.cups-postscript
-application/vnd.cups-raster
-application/vnd.cups-raw
-application/vnd.cybank
-application/vnd.dna
-application/vnd.dpgraph
-application/vnd.dxr
-application/vnd.ecdis-update
-application/vnd.ecowin.chart
-application/vnd.ecowin.filerequest
-application/vnd.ecowin.fileupdate
-application/vnd.ecowin.series
-application/vnd.ecowin.seriesrequest
-application/vnd.ecowin.seriesupdate
-application/vnd.enliven
-application/vnd.epson.esf
-application/vnd.epson.msf
-application/vnd.epson.quickanime
-application/vnd.epson.salt
-application/vnd.epson.ssf
-application/vnd.ericsson.quickcall
-application/vnd.eudora.data
-application/vnd.fdf
-application/vnd.ffsns
-application/vnd.flographit
-application/vnd.framemaker
-application/vnd.fsc.weblaunch
-application/vnd.fujitsu.oasys
-application/vnd.fujitsu.oasys2
-application/vnd.fujitsu.oasys3
-application/vnd.fujitsu.oasysgp
-application/vnd.fujitsu.oasysprs
-application/vnd.fujixerox.ddd
-application/vnd.fujixerox.docuworks
-application/vnd.fujixerox.docuworks.binder
-application/vnd.fut-misnet
-application/vnd.grafeq
-application/vnd.groove-account
-application/vnd.groove-identity-message
-application/vnd.groove-injector
-application/vnd.groove-tool-message
-application/vnd.groove-tool-template
-application/vnd.groove-vcard
-application/vnd.hhe.lesson-player
-application/vnd.hp-HPGL
-application/vnd.hp-PCL
-application/vnd.hp-PCLXL
-application/vnd.hp-hpid
-application/vnd.hp-hps
-application/vnd.httphone
-application/vnd.hzn-3d-crossword
-application/vnd.ibm.MiniPay
-application/vnd.ibm.afplinedata
-application/vnd.ibm.modcap
-application/vnd.informix-visionary
-application/vnd.intercon.formnet
-application/vnd.intertrust.digibox
-application/vnd.intertrust.nncp
-application/vnd.intu.qbo
-application/vnd.intu.qfx
-application/vnd.irepository.package+xml
-application/vnd.is-xpr
-application/vnd.japannet-directory-service
-application/vnd.japannet-jpnstore-wakeup
-application/vnd.japannet-payment-wakeup
-application/vnd.japannet-registration
-application/vnd.japannet-registration-wakeup
-application/vnd.japannet-setstore-wakeup
-application/vnd.japannet-verification
-application/vnd.japannet-verification-wakeup
-application/vnd.koan
-application/vnd.lotus-1-2-3
-application/vnd.lotus-approach
-application/vnd.lotus-freelance
-application/vnd.lotus-notes
-application/vnd.lotus-organizer
-application/vnd.lotus-screencam
-application/vnd.lotus-wordpro
-application/vnd.mcd
-application/vnd.mediastation.cdkey
-application/vnd.meridian-slingshot
-application/vnd.mif
-application/vnd.minisoft-hp3000-save
-application/vnd.mitsubishi.misty-guard.trustweb
-application/vnd.mobius.daf
-application/vnd.mobius.dis
-application/vnd.mobius.msl
-application/vnd.mobius.plc
-application/vnd.mobius.txf
-application/vnd.motorola.flexsuite
-application/vnd.motorola.flexsuite.adsi
-application/vnd.motorola.flexsuite.fis
-application/vnd.motorola.flexsuite.gotap
-application/vnd.motorola.flexsuite.kmr
-application/vnd.motorola.flexsuite.ttc
-application/vnd.motorola.flexsuite.wem
-application/vnd.mozilla.xul+xml			xul
-application/vnd.ms-artgalry
-application/vnd.ms-asf
-application/vnd.ms-excel			xls xlb xlt
-application/vnd.ms-lrm
-application/vnd.ms-pki.seccat			cat
-application/vnd.ms-pki.stl			stl
-application/vnd.ms-powerpoint			ppt pps
-application/vnd.ms-project
-application/vnd.ms-tnef
-application/vnd.ms-works
-application/vnd.mseq
-application/vnd.msign
-application/vnd.music-niff
-application/vnd.musician
-application/vnd.netfpx
-application/vnd.noblenet-directory
-application/vnd.noblenet-sealer
-application/vnd.noblenet-web
-application/vnd.novadigm.EDM
-application/vnd.novadigm.EDX
-application/vnd.novadigm.EXT
-application/vnd.oasis.opendocument.chart	odc
-application/vnd.oasis.opendocument.database	odb
-application/vnd.oasis.opendocument.formula	odf
-application/vnd.oasis.opendocument.graphics	odg
-application/vnd.oasis.opendocument.graphics-template otg
-application/vnd.oasis.opendocument.image	odi
-application/vnd.oasis.opendocument.presentation	odp
-application/vnd.oasis.opendocument.presentation-template otp
-application/vnd.oasis.opendocument.spreadsheet	ods
-application/vnd.oasis.opendocument.spreadsheet-template ots
-application/vnd.oasis.opendocument.text		odt
-application/vnd.oasis.opendocument.text-master	odm
-application/vnd.oasis.opendocument.text-template ott
-application/vnd.oasis.opendocument.text-web	oth
-application/vnd.osa.netdeploy
-application/vnd.palm
-application/vnd.pg.format
-application/vnd.pg.osasli
-application/vnd.powerbuilder6
-application/vnd.powerbuilder6-s
-application/vnd.powerbuilder7
-application/vnd.powerbuilder7-s
-application/vnd.powerbuilder75
-application/vnd.powerbuilder75-s
-application/vnd.previewsystems.box
-application/vnd.publishare-delta-tree
-application/vnd.pvi.ptid1
-application/vnd.pwg-xhtml-print+xml
-application/vnd.rapid
-application/vnd.rim.cod				cod
-application/vnd.s3sms
-application/vnd.seemail
-application/vnd.shana.informed.formdata
-application/vnd.shana.informed.formtemplate
-application/vnd.shana.informed.interchange
-application/vnd.shana.informed.package
-application/vnd.smaf				mmf
-application/vnd.sss-cod
-application/vnd.sss-dtf
-application/vnd.sss-ntf
-application/vnd.stardivision.calc		sdc
-application/vnd.stardivision.draw		sda
-application/vnd.stardivision.impress		sdd sdp
-application/vnd.stardivision.math		smf
-application/vnd.stardivision.writer		sdw vor
-application/vnd.stardivision.writer-global	sgl
-application/vnd.street-stream
-application/vnd.sun.xml.calc			sxc
-application/vnd.sun.xml.calc.template		stc
-application/vnd.sun.xml.draw			sxd
-application/vnd.sun.xml.draw.template		std
-application/vnd.sun.xml.impress			sxi
-application/vnd.sun.xml.impress.template	sti
-application/vnd.sun.xml.math			sxm
-application/vnd.sun.xml.writer			sxw
-application/vnd.sun.xml.writer.global		sxg
-application/vnd.sun.xml.writer.template		stw
-application/vnd.svd
-application/vnd.swiftview-ics
-application/vnd.symbian.install			sis
-application/vnd.triscape.mxs
-application/vnd.trueapp
-application/vnd.truedoc
-application/vnd.tve-trigger
-application/vnd.ufdl
-application/vnd.uplanet.alert
-application/vnd.uplanet.alert-wbxml
-application/vnd.uplanet.bearer-choice
-application/vnd.uplanet.bearer-choice-wbxml
-application/vnd.uplanet.cacheop
-application/vnd.uplanet.cacheop-wbxml
-application/vnd.uplanet.channel
-application/vnd.uplanet.channel-wbxml
-application/vnd.uplanet.list
-application/vnd.uplanet.list-wbxml
-application/vnd.uplanet.listcmd
-application/vnd.uplanet.listcmd-wbxml
-application/vnd.uplanet.signal
-application/vnd.vcx
-application/vnd.vectorworks
-application/vnd.vidsoft.vidconference
-application/vnd.visio				vsd
-application/vnd.vividence.scriptfile
-application/vnd.wap.sic
-application/vnd.wap.slc
-application/vnd.wap.wbxml			wbxml
-application/vnd.wap.wmlc			wmlc
-application/vnd.wap.wmlscriptc			wmlsc
-application/vnd.webturbo
-application/vnd.wrq-hp3000-labelled
-application/vnd.wt.stf
-application/vnd.xara
-application/vnd.xfdl
-application/vnd.yellowriver-custom-menu
-application/x-123				wk
-application/x-abiword				abw
-application/x-apple-diskimage			dmg
-application/x-bcpio				bcpio
-application/x-bittorrent			torrent
-application/x-cdf				cdf
-application/x-cdlink				vcd
-application/x-chess-pgn				pgn
-application/x-core
-application/x-cpio				cpio
-application/x-csh				csh
-application/x-debian-package			deb udeb
-application/x-director				dcr dir dxr
-application/x-dms				dms
-application/x-doom				wad
-application/x-dvi				dvi
-application/x-executable
-application/x-flac				flac
-application/x-font				pfa pfb gsf pcf pcf.Z
-application/x-freemind				mm
-application/x-futuresplash			spl
-application/x-gnumeric				gnumeric
-application/x-go-sgf				sgf
-application/x-graphing-calculator		gcf
-application/x-gtar				gtar tgz taz
-application/x-hdf				hdf
-application/x-ica				ica
-application/x-internet-signup			ins isp
-application/x-iphone				iii
-application/x-iso9660-image			iso
-application/x-java-applet
-application/x-java-bean
-application/x-java-jnlp-file			jnlp
-application/x-javascript			js
-application/x-jmol				jmz
-application/x-kchart				chrt
-application/x-kdelnk
-application/x-killustrator			kil
-application/x-koan				skp skd skt skm
-application/x-kpresenter			kpr kpt
-application/x-kspread				ksp
-application/x-kword				kwd kwt
-application/x-latex				latex
-application/x-lha				lha
-application/x-lzh				lzh
-application/x-lzx				lzx
-application/x-maker				frm maker frame fm fb book fbdoc
-application/x-mif				mif
-application/x-ms-wmd				wmd
-application/x-ms-wmz				wmz
-application/x-msdos-program			com exe bat dll
-application/x-msi				msi
-application/x-netcdf				nc
-application/x-ns-proxy-autoconfig		pac
-application/x-nwc				nwc
-application/x-object				o
-application/x-oz-application			oza
-application/x-pkcs7-certreqresp			p7r
-application/x-pkcs7-crl				crl
-application/x-python-code			pyc pyo
-application/x-quicktimeplayer			qtl
-application/x-redhat-package-manager		rpm
-application/x-rx
-application/x-sh				sh
-application/x-shar				shar
-application/x-shellscript
-application/x-shockwave-flash			swf swfl
-application/x-stuffit				sit
-application/x-sv4cpio				sv4cpio
-application/x-sv4crc				sv4crc
-application/x-tar				tar
-application/x-tcl				tcl
-application/x-tex-gf				gf
-application/x-tex-pk				pk
-application/x-texinfo				texinfo texi
-application/x-trash				~ % bak old sik
-application/x-troff				t tr roff
-application/x-troff-man				man
-application/x-troff-me				me
-application/x-troff-ms				ms
-application/x-ustar				ustar
-application/x-videolan
-application/x-wais-source			src
-application/x-wingz				wz
-application/x-x509-ca-cert			crt
-application/x-xcf				xcf
-application/x-xfig				fig
-application/x-xpinstall				xpi
-
-audio/32kadpcm
-audio/basic					au snd
-audio/dvi4
-audio/g.722.1
-audio/g722
-audio/g723
-audio/g726-16
-audio/g726-24
-audio/g726-32
-audio/g726-40
-audio/g728
-audio/g729
-audio/g729d
-audio/g729e
-audio/gsm
-audio/gsm-efr
-audio/l8
-audio/l16
-audio/lpc
-audio/midi					mid midi kar
-audio/mp4a-latm
-audio/mpa
-audio/mpa-robust
-audio/mpeg					mpga mpega mp2 mp3 m4a
-audio/mpegurl					m3u
-audio/parityfec
-audio/pcma
-audio/pcmu
-audio/prs.sid					sid
-audio/qcelp
-audio/red
-audio/telephone-event
-audio/tone
-audio/vdvi
-audio/vnd.cisco.nse
-audio/vnd.cns.anp1
-audio/vnd.cns.inf1
-audio/vnd.digital-winds
-audio/vnd.everad.plj
-audio/vnd.lucent.voice
-audio/vnd.nortel.vbk
-audio/vnd.nuera.ecelp4800
-audio/vnd.nuera.ecelp7470
-audio/vnd.nuera.ecelp9600
-audio/vnd.octel.sbc
-audio/vnd.qcelp
-audio/vnd.rhetorex.32kadpcm
-audio/vnd.vmx.cvsd
-audio/x-aiff					aif aiff aifc
-audio/x-gsm					gsm
-audio/x-mpegurl					m3u
-audio/x-ms-wma					wma
-audio/x-ms-wax					wax
-audio/x-pn-realaudio-plugin
-audio/x-pn-realaudio				ra rm ram
-audio/x-realaudio				ra
-audio/x-scpls					pls
-audio/x-sd2					sd2
-audio/x-wav					wav
-
-chemical/x-alchemy				alc
-chemical/x-cache				cac cache
-chemical/x-cache-csf				csf
-chemical/x-cactvs-binary			cbin cascii ctab
-chemical/x-cdx					cdx
-chemical/x-cerius				cer
-chemical/x-chem3d				c3d
-chemical/x-chemdraw				chm
-chemical/x-cif					cif
-chemical/x-cmdf					cmdf
-chemical/x-cml					cml
-chemical/x-compass				cpa
-chemical/x-crossfire				bsd
-chemical/x-csml					csml csm
-chemical/x-ctx					ctx
-chemical/x-cxf					cxf cef
-#chemical/x-daylight-smiles			smi
-chemical/x-embl-dl-nucleotide			emb embl
-chemical/x-galactic-spc				spc
-chemical/x-gamess-input				inp gam gamin
-chemical/x-gaussian-checkpoint			fch fchk
-chemical/x-gaussian-cube			cub
-chemical/x-gaussian-input			gau gjc gjf
-chemical/x-gaussian-log				gal
-chemical/x-gcg8-sequence			gcg
-chemical/x-genbank				gen
-chemical/x-hin					hin
-chemical/x-isostar				istr ist
-chemical/x-jcamp-dx				jdx dx
-chemical/x-kinemage				kin
-chemical/x-macmolecule				mcm
-chemical/x-macromodel-input			mmd mmod
-chemical/x-mdl-molfile				mol
-chemical/x-mdl-rdfile				rd
-chemical/x-mdl-rxnfile				rxn
-chemical/x-mdl-sdfile				sd sdf
-chemical/x-mdl-tgf				tgf
-#chemical/x-mif					mif
-chemical/x-mmcif				mcif
-chemical/x-mol2					mol2
-chemical/x-molconn-Z				b
-chemical/x-mopac-graph				gpt
-chemical/x-mopac-input				mop mopcrt mpc dat zmt
-chemical/x-mopac-out				moo
-chemical/x-mopac-vib				mvb
-chemical/x-ncbi-asn1				asn
-chemical/x-ncbi-asn1-ascii			prt ent
-chemical/x-ncbi-asn1-binary			val aso
-chemical/x-ncbi-asn1-spec			asn
-chemical/x-pdb					pdb ent
-chemical/x-rosdal				ros
-chemical/x-swissprot				sw
-chemical/x-vamas-iso14976			vms
-chemical/x-vmd					vmd
-chemical/x-xtel					xtel
-chemical/x-xyz					xyz
-
-image/cgm
-image/g3fax
-image/gif					gif
-image/ief					ief
-image/jpeg					jpeg jpg jpe
-image/naplps
-image/pcx					pcx
-image/png					png
-image/prs.btif
-image/prs.pti
-image/svg+xml					svg svgz
-image/tiff					tiff tif
-image/vnd.cns.inf2
-image/vnd.djvu					djvu djv
-image/vnd.dwg
-image/vnd.dxf
-image/vnd.fastbidsheet
-image/vnd.fpx
-image/vnd.fst
-image/vnd.fujixerox.edmics-mmr
-image/vnd.fujixerox.edmics-rlc
-image/vnd.mix
-image/vnd.net-fpx
-image/vnd.svf
-image/vnd.wap.wbmp				wbmp
-image/vnd.xiff
-image/x-cmu-raster				ras
-image/x-coreldraw				cdr
-image/x-coreldrawpattern			pat
-image/x-coreldrawtemplate			cdt
-image/x-corelphotopaint				cpt
-image/x-icon					ico
-image/x-jg					art
-image/x-jng					jng
-image/x-ms-bmp					bmp
-image/x-photoshop				psd
-image/x-portable-anymap				pnm
-image/x-portable-bitmap				pbm
-image/x-portable-graymap			pgm
-image/x-portable-pixmap				ppm
-image/x-rgb					rgb
-image/x-xbitmap					xbm
-image/x-xpixmap					xpm
-image/x-xwindowdump				xwd
-
-inode/chardevice
-inode/blockdevice
-inode/directory-locked
-inode/directory
-inode/fifo
-inode/socket
-
-message/delivery-status
-message/disposition-notification
-message/external-body
-message/http
-message/s-http
-message/news
-message/partial
-message/rfc822
-
-model/iges					igs iges
-model/mesh					msh mesh silo
-model/vnd.dwf
-model/vnd.flatland.3dml
-model/vnd.gdl
-model/vnd.gs-gdl
-model/vnd.gtw
-model/vnd.mts
-model/vnd.vtu
-model/vrml					wrl vrml
-
-multipart/alternative
-multipart/appledouble
-multipart/byteranges
-multipart/digest
-multipart/encrypted
-multipart/form-data
-multipart/header-set
-multipart/mixed
-multipart/parallel
-multipart/related
-multipart/report
-multipart/signed
-multipart/voice-message
-
-text/calendar					ics icz
-text/comma-separated-values			csv
-text/css					css
-text/directory
-text/english
-text/enriched
-text/h323					323
-text/html					html htm shtml
-text/iuls					uls
-text/mathml					mml
-text/parityfec
-text/plain					asc txt text diff pot
-text/prs.lines.tag
-text/x-psp					psp
-text/rfc822-headers
-text/richtext					rtx
-text/rtf					rtf
-text/scriptlet					sct wsc
-text/t140
-text/texmacs					tm ts
-text/tab-separated-values			tsv
-text/uri-list
-text/vnd.abc
-text/vnd.curl
-text/vnd.DMClientScript
-text/vnd.flatland.3dml
-text/vnd.fly
-text/vnd.fmi.flexstor
-text/vnd.in3d.3dml
-text/vnd.in3d.spot
-text/vnd.IPTC.NewsML
-text/vnd.IPTC.NITF
-text/vnd.latex-z
-text/vnd.motorola.reflex
-text/vnd.ms-mediapackage
-text/vnd.sun.j2me.app-descriptor		jad
-text/vnd.wap.si
-text/vnd.wap.sl
-text/vnd.wap.wml				wml
-text/vnd.wap.wmlscript				wmls
-text/x-bibtex					bib
-text/x-c++hdr					h++ hpp hxx hh
-text/x-c++src					c++ cpp cxx cc
-text/x-chdr					h
-text/x-crontab
-text/x-csh					csh
-text/x-csrc					c
-text/x-haskell					hs
-text/x-java					java
-text/x-literate-haskell				lhs
-text/x-makefile
-text/x-moc					moc
-text/x-pascal					p pas
-text/x-pcs-gcd					gcd
-text/x-perl					pl pm
-text/x-python					py
-text/x-server-parsed-html
-text/x-setext					etx
-text/x-sh					sh
-text/x-tcl					tcl tk
-text/x-tex					tex ltx sty cls
-text/x-vcalendar				vcs
-text/x-vcard					vcf
-
-video/bmpeg
-video/bt656
-video/celb
-video/dl					dl
-video/dv					dif dv
-video/fli					fli
-video/gl					gl
-video/jpeg
-video/h261
-video/h263
-video/h263-1998
-video/h263-2000
-video/mp1s
-video/mp2p
-video/mp2t
-video/mp4					mp4
-video/mp4v-es
-video/mpeg					mpeg mpg mpe
-video/mpv
-video/nv
-video/parityfec
-video/pointer
-video/quicktime					qt mov
-video/vnd.fvt
-video/vnd.motorola.video
-video/vnd.motorola.videop
-video/vnd.mpegurl				mxu
-video/vnd.mts
-video/vnd.nokia.interleaved-multimedia
-video/vnd.vivo
-video/x-la-asf					lsf lsx
-video/x-mng					mng
-video/x-ms-asf					asf asx
-video/x-ms-wm					wm
-video/x-ms-wmv					wmv
-video/x-ms-wmx					wmx
-video/x-ms-wvx					wvx
-video/x-msvideo					avi
-video/x-sgi-movie				movie
-video/x-flv					flv
-
-x-conference/x-cooltalk				ice
-
-x-world/x-vrml					vrm vrml wrl
diff --git a/abs/extra-testing/mingetty/PKGBUILD b/abs/extra-testing/mingetty/PKGBUILD
deleted file mode 100644
index d24a8b5..0000000
--- a/abs/extra-testing/mingetty/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: stonecrest <stonecrestATgmailDOTcom>
-pkgname=mingetty
-pkgver=1.08
-pkgrel=2
-pkgdesc="Designed to be a minimal getty and allows automatic logins."
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/mingetty"
-license=('GPL')
-depends=('glibc')
-makedepends=('gcc' 'make')
-provides=('mingetty')
-conflicts=('mingetty')
-md5sums=('2a75ad6487ff271424ffc00a64420990'
-         'b1bcb0668c34d4981e3acddc3990dfdb')
-source=(http://downloads.sourceforge.net/sourceforge/mingetty/$pkgname-$pkgver.tar.gz
-		mingetty-utf8.patch)
-
-build() {
-	patch $startdir/src/$pkgname-$pkgver/mingetty.c mingetty-utf8.patch || return 1
-
-	mkdir -p $startdir/pkg/sbin || return 1
-	mkdir -p $startdir/pkg/usr/man/man8 || return 1
-	
-	cd $startdir/src || return 1
-	cd $startdir/src/$pkgname-$pkgver || return 1
-	
-	LDFLAGS="-s" make || return 1
-	install -m 0755 mingetty $startdir/pkg/sbin || return 1
-	install -m 0644 mingetty.8 $startdir/pkg/usr/man/man8 || return 1
-}
diff --git a/abs/extra-testing/mingetty/mingetty-utf8.patch b/abs/extra-testing/mingetty/mingetty-utf8.patch
deleted file mode 100644
index c269039..0000000
--- a/abs/extra-testing/mingetty/mingetty-utf8.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff -Nru mingetty-1.07.orig/mingetty.c mingetty-1.07/mingetty.c
---- mingetty-1.07.orig/mingetty.c	2004-01-03 15:15:56.000000000 +0200
-+++ mingetty-1.07/mingetty.c	2006-11-22 22:13:26.967910100 +0200
-@@ -16,10 +16,15 @@
-  * - autologin only at first login
-  * - /etc/mingetty.conf that can be used instead of /etc/inittab for
-  *   command line options
-- * - Can UTF-8 setup be done within mingetty?
-+ * - Can UTF-8 setup be done within mingetty? Let's try now :-) (VinzC)
-  * - Also add /bin/login-type functionality in here?
-  */
- 
-+/* Additional comments: Vincent Cadet <vcadet@hotmail.com> (2006-11-21)
-+ * - Attempt to make mingetty support UTF-8. Modifications were imported
-+ *   from Suse migetty.c 0.9.6s.
-+ */
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -39,6 +44,19 @@
- #include <syslog.h>
- #include <sys/utsname.h>
- #include <time.h>
-+#include <locale.h>
-+#include <iconv.h>
-+#include <wctype.h>
-+#include <sys/kd.h>
-+#include <sys/ttydefaults.h>
-+
-+#ifndef IUTF8
-+# ifndef ASM_IUTF8
-+#  error ASM_IUTF8 input flag not defined - Cannot define IUTF8
-+# else
-+#  define IUTF8	ASM_IUTF8
-+# endif
-+#endif
- 
- /* name of this program (argv[0]) */
- static char *progname;
-@@ -74,6 +92,8 @@
- static char *autologin = NULL;
- /* try to read a char before dropping to login prompt */
- static int loginpause = 0;
-+/* terminal mode */
-+static int mode = K_RAW;
- 
- /* error() - output error messages */
- static void error (const char *fmt, ...)
-@@ -187,10 +207,21 @@
- 	if (fd > 2)
- 		close (fd);
- 
-+	/* Detect mode of current keyboard setup, e.g. for UTF-8 */
-+	if (ioctl(0, KDGKBMODE, &mode) < 0)
-+		mode = K_RAW;
-+
- 	/* Write a reset string to the terminal. This is very linux-specific
- 	   and should be checked for other systems. */
- 	if (noclear == 0)
--		write (0, "\033c", 2);
-+		/* don't write a full reset (ESC c) because this leaves the 
-+		   unicode mode again if the terminal was in unicode mode
-+		   and also undos the ESC sequences in CONSOLE_MAGIC which
-+		   are needed for some languages/console-fonts.
-+		   Just put the cursor to the home position (ESC [ H),
-+		   erase everything below the cursor (ESC [ J), and set the
-+		   scrolling region to the full window (ESC [ r) */
-+		write (0, "\033[r\033[H\033[J", 9);
- 
- 	sigaction (SIGHUP, &sa_old, NULL);
- }
-@@ -292,32 +323,75 @@
- 
- static char *get_logname (void)
- {
--	static char logname[40];
-+	static char logname[4*UT_NAMESIZE];
- 	char *bp;
- 	unsigned char c;
-+	int ascii;
-+	iconv_t ic;
- 
- 	tcflush (0, TCIFLUSH);		/* flush pending input */
-+
-+	/* Check for UTF-8 mode */
-+	switch(mode) {
-+		case K_UNICODE:
-+			ascii = 0;
-+			setlocale(LC_CTYPE, "en_US.UTF-8");
-+			break;
-+		case K_RAW:
-+		case K_MEDIUMRAW:
-+		case K_XLATE:
-+		default:
-+			ascii = 1;
-+			setlocale(LC_CTYPE, "POSIX");
-+			break;
-+	}
-+
- 	for (*logname = 0; *logname == 0;) {
- 		do_prompt (1);
- 		for (bp = logname;;) {
- 			if (read (0, &c, 1) < 1) {
--				if (errno == EINTR || errno == EIO
--					|| errno == ENOENT)
-+				if (errno == EINTR || errno == EAGAIN) {
-+					usleep(1000);
-+					continue;
-+				}
-+				if (errno == EIO || errno == ENOENT)
- 					exit (EXIT_SUCCESS);
- 				error ("%s: read: %s", tty, strerror (errno));
- 			}
- 			if (c == '\n' || c == '\r') {
- 				*bp = 0;
- 				break;
--			} else if (!isprint (c))
--				error ("%s: invalid character 0x%x in login"
--					" name", tty, c);
-+			}
-+
-+			if (ascii && !isprint (c))
-+				error ("%s: invalid character 0x%x in login name", tty, c);
- 			else if ((size_t)(bp - logname) >= sizeof (logname) - 1)
- 				error ("%s: too long login name", tty);
--			else
--				*bp++ = c;
-+
-+			*bp++ = c;
- 		}
- 	}
-+
-+	if (!ascii && (ic = iconv_open("WCHAR_T", "UTF-8"))) {
-+		char tmpbuf[4*sizeof(logname)], *op, *lp;
-+		size_t len = bp - logname;
-+		size_t out = sizeof(tmpbuf) - 1;
-+		size_t wcl;
-+		wint_t *wcp;
-+
-+		op = tmpbuf;
-+		lp = logname;
-+		if ((wcl = iconv(ic , &lp, &len, &op, &out)) == (size_t)-1)
-+			error ("%s: invalid character conversion for login name", tty);
-+		iconv_close(ic);
-+
-+		wcp = (wint_t*)tmpbuf;
-+		wcp[wcl] = (wint_t)0;
-+		while (*wcp) {
-+			if (!iswprint(*wcp++))
-+				error ("%s: invalid character for login name found", tty);
-+ 		}
-+ 	}
- 	return logname;
- }
- 
-
-
diff --git a/abs/extra-testing/miro/ChangeLog b/abs/extra-testing/miro/ChangeLog
deleted file mode 100644
index 223b1de..0000000
--- a/abs/extra-testing/miro/ChangeLog
+++ /dev/null
@@ -1,34 +0,0 @@
-2008-01-30 Eric Belanger <eric@archlinux.org>
-	* miro-1.1-2
-	* rebuilt against xulrunner 1.8.1.11
-
-2008-01-16 Varun Acharya <varun@archlinux.org>
-
-	* upgpkg miro-1.1
-
-2008-01-03 Varun Acharya <varun@archlinux.org>
-
-	* Adopted and moved to extra, miro-1.0-2
-
-2007-11-26  Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
-	* miro-1.0-2
-	* changed url
-	* added sqlite3 as dep (fix  FS#8636)
-
-2007-11-13  Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
-	* miro-1.0-1
-	* version bump
-
-2007-09-09  Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
-	* miro-0.9.9-1
-	* version bump
-
-2007-08-08  Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
-	* miro-0.9.8.1-1
-	* initial commit
-
-
diff --git a/abs/extra-testing/miro/Changelog b/abs/extra-testing/miro/Changelog
deleted file mode 100644
index 40505f2..0000000
--- a/abs/extra-testing/miro/Changelog
+++ /dev/null
@@ -1,2 +0,0 @@
-Miro 2.0.4-3 4/30/09
-Upgrade miro.install to add remove miro from is.xml.
diff --git a/abs/extra-testing/miro/Miro-xulrunner.patch b/abs/extra-testing/miro/Miro-xulrunner.patch
deleted file mode 100644
index b8f4db3..0000000
--- a/abs/extra-testing/miro/Miro-xulrunner.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -up Miro-1.2.3/platform/gtk-x11/platform/mozsetup.py.old Miro-1.2.3/platform/gtk-x11/platform/mozsetup.py
---- Miro-1.2.3/platform/gtk-x11/platform/mozsetup.py.old	2008-04-22 17:17:01.000000000 +0200
-+++ Miro-1.2.3/platform/gtk-x11/platform/mozsetup.py	2008-04-28 12:51:46.000000000 +0200
-@@ -106,8 +106,8 @@ def setupMozillaEnvironment():
-         set_profile_path = gtkmozembed.gtk_moz_embed_set_profile_path
-         
-     set_profile_path(config.get(prefs.SUPPORT_DIRECTORY), 'mozilla')
--    if hasattr(gtkmozembed, 'set_comp_path'):
--        set_comp_path = gtkmozembed.set_comp_path
-+    if hasattr(gtkmozembed, 'set_path'):
-+        set_comp_path = gtkmozembed.set_path
-     elif hasattr(gtkmozembed, 'set_path'):
-         set_comp_path = gtkmozembed.set_path
-     else:
-diff -up Miro-1.2.3/platform/gtk-x11/setup.py.old Miro-1.2.3/platform/gtk-x11/setup.py
---- Miro-1.2.3/platform/gtk-x11/setup.py.old	2008-04-22 17:17:01.000000000 +0200
-+++ Miro-1.2.3/platform/gtk-x11/setup.py	2008-04-28 13:14:27.000000000 +0200
-@@ -209,6 +209,7 @@ def parsePkgConfig(command, components, 
-         options_dict = {
-             'include_dirs' : [],
-             'library_dirs' : [],
-+            'runtime_dirs' : [],
-             'libraries' : [],
-             'extra_compile_args' : []
-         }
-@@ -224,6 +225,11 @@ def parsePkgConfig(command, components, 
-             options_dict['libraries'].append(rest)
-         else:
-             options_dict['extra_compile_args'].append(comp)
-+            
-+    commandLine = "%s --variable=libdir %s" % (command, components)
-+    output = getCommandOutput(commandLine).strip()
-+    options_dict['runtime_dirs'].append(output)
-+    
-     return options_dict
- 
- #### The fasttypes extension ####
-@@ -279,6 +285,8 @@ mozilla_browser_options = parsePkgConfig
-         "gtk+-2.0 glib-2.0 pygtk-2.0 --define-variable=includetype=unstable %s %s" % (gtkmozembed, xpcom))
- mozilla_lib_path = parsePkgConfig('pkg-config', 
-         '%s' % gtkmozembed)['library_dirs']
-+runtime_lib_path = parsePkgConfig('pkg-config', 
-+        '%s' % gtkmozembed)['runtime_dirs']
- # Find the base mozilla directory, and add the subdirs we need.
- def allInDir(directory, subdirs):
-     for subdir in subdirs:
-@@ -334,7 +342,7 @@ mozilla_browser_ext = Extension("miro.pl
-           os.path.join(platform_html_frontend_dir,'DragAndDrop.cc'),
-           os.path.join(platform_html_frontend_dir,'XPCOMUtil.cc'),
-         ],
--        runtime_library_dirs=mozilla_lib_path,
-+        runtime_library_dirs=runtime_lib_path,
-         **mozilla_browser_options)
- #### Xlib Extension ####
- xlib_ext = \
-@@ -434,7 +442,7 @@ class install_data (distutils.command.in
-                              BUILD_MACHINE="%s@%s" % (getlogin(),
-                                                       os.uname()[1]),
-                              BUILD_TIME=str(time.time()),
--                             MOZILLA_LIB_PATH=mozilla_lib_path[0])
-+                             MOZILLA_LIB_PATH=runtime_lib_path[0])
-         self.outfiles.append(dest)
- 
-         locale_dir = os.path.join (resource_dir, "locale")
diff --git a/abs/extra-testing/miro/PKGBUILD b/abs/extra-testing/miro/PKGBUILD
deleted file mode 100644
index 1411c43..0000000
--- a/abs/extra-testing/miro/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 35621 2009-04-14 18:07:17Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=miro
-pkgver=2.0.4
-pkgrel=9
-pkgdesc="The free and open source internet TV platform"
-arch=('i686' 'x86_64')
-url="http://www.getmiro.com"
-license=('GPL2')
-depends=('xine-lib>=1.1.16.1' 'boost>=1.37.0' 'gnome-python-extras>=2.25.3'
-	 'dbus-python>=0.82.4' 'pyrex' 'xulrunner>=1.9.0.1' 'gtk2' 'nspr'
-	 'desktop-file-utils')
-makedepends=('pkgconfig' 'pm-utils' 'qt3')
-optdepends=('gstreamer0.10-python: gstreamer backend (potentially unstable)' 'gstreamer0.10: gstreamer backend (potentially unstable')
-install=miro.install
-conflicts=('democracy')
-replaces=('democracy')
-provides=('democracy')
-source=(http://ftp.osuosl.org/pub/pculture.org/miro/src/Miro-${pkgver}.tar.gz
-	miro.exec.patch)
-md5sums=('e6cf48252496b2bddd290f375fc0ca33'
-         '355648eac790d52c51ccb014736f90fc')
-
-build() {
-  cd ${srcdir}/Miro-${pkgver}/platform/gtk-x11
-  python setup.py install --root=${pkgdir} || return 1
-
-  # Fix FS#14196
-  cd ${pkgdir}
-  patch -Np0 -i ${srcdir}/miro.exec.patch || return 1
-}
diff --git a/abs/extra-testing/miro/boost_1.36.0_fix.patch b/abs/extra-testing/miro/boost_1.36.0_fix.patch
deleted file mode 100644
index b3b5a48..0000000
--- a/abs/extra-testing/miro/boost_1.36.0_fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- Miro-1.2.7/portable/libtorrent/src/torrent_info.cpp.old	2008-09-21 13:47:00.122974031 +0200
-+++ Miro-1.2.7/portable/libtorrent/src/torrent_info.cpp	2008-09-21 13:48:54.812965713 +0200
-@@ -352,7 +352,7 @@
- 		fs::path tmp = m_name;
- 		if (tmp.is_complete()) throw std::runtime_error("torrent contains "
- 			"a file with an absolute path: '" + m_name + "'");
--		if (tmp.has_branch_path()) throw std::runtime_error(
-+		if (!tmp.branch_path().empty()) throw std::runtime_error(
- 			"torrent contains name with directories: '" + m_name + "'");
- 	
- 		// extract file list
-@@ -556,7 +556,7 @@
- 	{
- //		TORRENT_ASSERT(file.begin() != file.end());
- 
--		if (!file.has_branch_path())
-+		if (file.branch_path().empty())
- 		{
- 			// you have already added at least one file with a
- 			// path to the file (branch_path), which means that
-
---- Miro-1.2.7/portable/libtorrent/include/libtorrent/disk_io_thread.hpp.old	2008-09-21 13:57:05.433330334 +0200
-+++ Miro-1.2.7/portable/libtorrent/include/libtorrent/disk_io_thread.hpp	2008-09-21 13:57:29.060304305 +0200
-@@ -41,6 +41,7 @@
- #include <boost/bind.hpp>
- #include <boost/pool/pool.hpp>
- #include <boost/noncopyable.hpp>
-+#include <boost/thread/condition.hpp>
- #include "libtorrent/config.hpp"
- 
- namespace libtorrent
-
diff --git a/abs/extra-testing/miro/miro-xine.patch b/abs/extra-testing/miro/miro-xine.patch
deleted file mode 100644
index 5abf5f1..0000000
--- a/abs/extra-testing/miro/miro-xine.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- usr/bin/miro.old	2009-02-22 21:49:26.332356738 +0100
-+++ usr/bin/miro	2009-02-22 21:50:39.169010435 +0100
-@@ -21,7 +21,7 @@
-         exit;
-     fi
- 
--    LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 $GDB -ex 'set breakpoint pending on' -ex 'break gdk_x_error' -ex 'run' --args $PYTHON ./miro.real --sync "$@"
-+    LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 $GDB -ex 'set breakpoint pending on' -ex 'break gdk_x_error' -ex 'run' --args $PYTHON ./miro.real --set xine-driver=opengl --sync "$@"
- else
--    LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 miro.real "$@"
-+    LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 miro.real --set xine-driver=opengl "$@"
- fi
diff --git a/abs/extra-testing/miro/miro.exec.patch b/abs/extra-testing/miro/miro.exec.patch
deleted file mode 100644
index 4b012af..0000000
--- a/abs/extra-testing/miro/miro.exec.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- usr/bin/miro.old	2009-04-14 19:40:09.578785938 +0200
-+++ usr/bin/miro	2009-04-14 19:40:34.445435006 +0200
-@@ -23,5 +23,5 @@
- 
-     LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 $GDB -ex 'set breakpoint pending on' -ex 'run' --args $PYTHON ./miro.real --sync "$@"
- else
--    LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 miro.real "$@"
-+    MOZILLA_FIVE_HOME="/usr/lib/xulrunner-1.9/" LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 miro.real "$@"
- fi
diff --git a/abs/extra-testing/miro/miro.install b/abs/extra-testing/miro/miro.install
deleted file mode 100644
index db52df4..0000000
--- a/abs/extra-testing/miro/miro.install
+++ /dev/null
@@ -1,54 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  update-desktop-database -q
-  mv /usr/share/mythtv/is.xml /tmp/is.xml.tmp
-  sed -e '/\#Miro/,/\#Miro/d' < /tmp/is.xml.tmp > /usr/share/mythtv/is.xml
-  mv /usr/share/mythtv/is.xml /tmp
-  grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp
-  echo "<!--#Miro-->" >> /tmp/is.xml.tmp
-  echo "   <button>" >> /tmp/is.xml.tmp
-  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
-  echo "     <text>Miro Player</text>" >> /tmp/is.xml.tmp
-  echo "     <action>EXEC /usr/bin/miro --set xine-xvhack=false --set renderer=xine</action>" >> /tmp/is.xml.tmp 
-  echo "   </button>" >> /tmp/is.xml.tmp
-  echo "<!--#Miro-->" >> /tmp/is.xml.tmp
-  echo "" >> /tmp/is.xml.tmp
-  echo "</mythmenu>" >> /tmp/is.xml.tmp
-  mv /tmp/is.xml.tmp /usr/share/mythtv/is.xml
-  if [ -d /myth/democracy ]
-  then
-	  ln -s /myth/democracy /home/mythtv/.miro
-	  ln -s /myth/miro/Movies /myth/video/Miro
-	  exit 1
-  else
-	  if [ -d /myth/miro ]
-	  then
-		  ln -s /myth/miro /home/mythtv/.miro
-		  ln -s /myth/miro/Movies /myth/video/Miro
-		  exit 1
-	  else
-		  if [ ! -d /myth/miro -o /myth/democracy ]
-		  then
-			  mkdir -p /myth/miro/Movies
-			  ln -s /myth/miro /home/mythtv/.miro
-			  ln -s /myth/miro/Movies /home/mythtv/Movies
-			  ln -s /myth/miro/Movies /myth/video/Miro
-		  fi
-	  fi
-  fi
-}
-
-post_update() {
-	post_install $1
-}
-
-post_remove() {
-	update-desktop-database -q
-	rm -fr /home/mythtv/.miro /myth/video/Miro /myth/miro /myth/democracy
-	mv /usr/share/mythtv/is.xml /tmp/is.xml.tmp
-	sed -e '/\#Miro/,/\#Miro/d' < /tmp/is.xml.tmp > /usr/share/mythtv/is.xml
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/miro/miro_python26.patch b/abs/extra-testing/miro/miro_python26.patch
deleted file mode 100644
index f404a4e..0000000
--- a/abs/extra-testing/miro/miro_python26.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- miro.real	2008-10-24 19:49:17.000000000 +0200
-+++ miro.real.new	2008-11-12 08:51:17.649458321 +0100
-@@ -6,8 +6,12 @@
- if xlibhelper.XInitThreads() == 0:
-     print "WARNING: XInitThreads() failed!"
- 
--import os.path
-+import miro.feedparser
-+import miro.storedatabase
- import sys
-+sys.modules['feedparser'] = miro.feedparser
-+sys.modules['storedatabase'] = miro.storedatabase
-+import os.path
- import optparse
- 
- import pygtk
diff --git a/abs/extra-testing/miro/missing-headers.patch b/abs/extra-testing/miro/missing-headers.patch
deleted file mode 100644
index 7dc42b8..0000000
--- a/abs/extra-testing/miro/missing-headers.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur a/portable/libtorrent/include/libtorrent/peer_id.hpp b/portable/libtorrent/include/libtorrent/peer_id.hpp
---- a/portable/libtorrent/include/libtorrent/peer_id.hpp	2008-04-22 10:17:04.000000000 -0500
-+++ b/portable/libtorrent/include/libtorrent/peer_id.hpp	2008-05-07 01:51:09.000000000 -0500
-@@ -38,6 +38,7 @@
- #include <cctype>
- #include <algorithm>
- #include <string>
-+#include <cstring>
- 
- #include "libtorrent/config.hpp"
- #include "libtorrent/assert.hpp"
-diff -ur a/portable/libtorrent/src/entry.cpp b/portable/libtorrent/src/entry.cpp
---- a/portable/libtorrent/src/entry.cpp	2008-04-22 10:17:04.000000000 -0500
-+++ b/portable/libtorrent/src/entry.cpp	2008-05-07 02:16:14.000000000 -0500
-@@ -33,6 +33,7 @@
- #include "libtorrent/pch.hpp"
- 
- #include <algorithm>
-+#include <iostream>
- #include <iomanip>
- #include "libtorrent/entry.hpp"
- #include "libtorrent/config.hpp"
-diff -ur a/portable/libtorrent/src/file.cpp b/portable/libtorrent/src/file.cpp
---- a/portable/libtorrent/src/file.cpp	2008-04-22 10:17:04.000000000 -0500
-+++ b/portable/libtorrent/src/file.cpp	2008-05-07 01:53:04.000000000 -0500
-@@ -68,6 +68,7 @@
- #include <boost/filesystem/operations.hpp>
- #include "libtorrent/file.hpp"
- #include <sstream>
-+#include <cstring>
- 
- #ifndef O_BINARY
- #define O_BINARY 0
diff --git a/abs/extra-testing/mkvtoolnix/PKGBUILD b/abs/extra-testing/mkvtoolnix/PKGBUILD
deleted file mode 100644
index 6404481..0000000
--- a/abs/extra-testing/mkvtoolnix/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 41916 2009-06-07 23:34:29Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: 03/08/04 <lefungus@altern.org>
-
-pkgname=mkvtoolnix
-pkgver=4.1.1
-pkgrel=1
-pkgdesc="Set of tools to create, edit and inspect Matroska files"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
-depends=('libmatroska>=1.0.0' 'libebml>=1.0.0' 'flac>=1.1.4' 'libvorbis' 'wxgtk>=2.8.0.1' 'file' 'boost' 'lzo2')
-source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2")
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}/
-  ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib
-  make  || return 1
-  make DESTDIR=${pkgdir}/ install
-}
-md5sums=('6f38fefd73b8b95de3ea3feb9de4cdd7')
diff --git a/abs/extra-testing/monitorix-linhes.tar.gz b/abs/extra-testing/monitorix-linhes.tar.gz
deleted file mode 100644
index 02ea6e2..0000000
--- a/abs/extra-testing/monitorix-linhes.tar.gz
+++ /dev/null
diff --git a/abs/extra-testing/monitorix/PKGBUILD b/abs/extra-testing/monitorix/PKGBUILD
deleted file mode 100644
index e73fcd1..0000000
--- a/abs/extra-testing/monitorix/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# Maintainer: graysky <da_audiophile yahoo>
-
-pkgname=monitorix
-pkgver=1.4.2
-pkgrel=8
-pkgdesc='A lightweight system monitoring tool that uses rrd databases.'
-arch=(i686)
-url=http://www.$pkgname.org/
-license=(GPL)
-depends=(dcron rrdtool lighttpd )
-optdepends=('lm_sensors: enable support for system temp monitoring'
-'hddtemp: enable support for hdd temp monitoring')
-
-backup=(etc/$pkgname.conf)
-source=($url$pkgname-$pkgver.tar.gz
-        monitorix.rc.d)
-md5sums=('6db1bdbeeb0d128622590dfecb9694e4'
-'34e7cb2d78bb4e3ece4aeb4ed26a0d43')
-install=('monitorix.install')
-
-build() {
-  cd $pkgname-$pkgver
-
-  install -D $pkgname.pl $pkgdir/usr/sbin/$pkgname.pl
-  install -D ../$pkgname.rc.d $pkgdir/etc/rc.d/$pkgname
-
-# use LinHES defaults
-  sed -e '/^our $OSTYPE/ s,RHFC,Arch,' \
-      -e '/^our $TITLE/ s,FIBRANET NSP\, SL,LinHES,' \
-      -e '/^our @HDDTEMP_LIST/ s,hda,sda,' \
-      -e '/^our $ENABLE_CROND_MAIL/ s,Y,N,' \
-      -e '/^our $ENABLE_SERVU/ s,Y,N,' \
-      -e '/^our $ENABLE_PORT/ s,Y,N,' \
-      -e '/^our $ENABLE_USER/ s,Y,N,' \
-      -e '/^our $ENABLE_INT/ s,Y,N,' \
-      -e '/^our @HDDTEMP_LIST/ s,hda,sda,' \
-      -e '/^our @MNT_LIST/ s,boot,myth,' \
-      -e '/^\s*"Linux-Arch"/ s,/var/log/httpd/access.log,/var/log/httpd/access_log,' \
-      -e '/^\s*"Linux-Arch"/ s,/var/log/secure,/var/log/auth.log,' \
-      -e '/^\s*"Linux-Arch"/ s,/srv/http,/data/srv/httpd/htdocs,' < $pkgname.conf \
-                                                                        > $pkgdir/etc/$pkgname.conf
-
-  mkdir -p $pkgdir/var/lib/$pkgname/usage
-  cp -r reports $pkgdir/var/lib/$pkgname
-
-  mkdir -p $pkgdir/usr/share/doc/$pkgname
-  cp Changes $pkgname-apache.conf $pkgname-alert.sh README README.nginx TODO \
-     $pkgdir/usr/share/doc/$pkgname
-
-  install -dm777 $pkgdir/data/srv/httpd/htdocs/$pkgname/imgs
-  cp {logo_bot,logo_top,${pkgname}ico}.png $pkgdir/data/srv/httpd/htdocs/$pkgname
-
-  install -D $pkgname.cgi $pkgdir/data/srv/httpd/htdocs/cgi-bin/$pkgname.cgi
-
-  gzip -9 man/man5/$pkgname.conf.5
-  install -Dm644 man/man5/$pkgname.conf.5.gz $pkgdir/usr/share/man/man5/$pkgname.conf.5.gz
-}
-
diff --git a/abs/extra-testing/monitorix/monitorix.install b/abs/extra-testing/monitorix/monitorix.install
deleted file mode 100644
index 6c1d1bd..0000000
--- a/abs/extra-testing/monitorix/monitorix.install
+++ /dev/null
@@ -1,30 +0,0 @@
-remove_notes() {
- echo '----------------------------------------------------------------------'
- echo 'To remove all traces of monitorix from your system, you must manually'
- echo 'remove the following dir trees (doing so will delete your databases):'
- echo
- echo '/var/lib/monitorix'
- echo '/srv/http/monitorix'
- echo '----------------------------------------------------------------------'
-}
-
-# $1: The new package version
-# $2: The old package version
-post_upgrade() {
-    echo ''
-    echo '' 
-    echo  'now edit /etc/monitorix.conf'
-    echo ' our $HOSTNAME - your hostname.'
-    echo ' our $ENABLE_LMTEMP - switch this on if you wanna log your temps.'
-    echo ' our @HDDTEMP_LIST - If you system has more than one hdd, add it to the array.'
-    echo ' stats can be seen at http://$THIS_SYSTEMS_IP/monitorix/'
-
-    echo '' 
-    echo '' 
-}
-
-post_install(){
-    . /etc/systemconfig
-    sed -i "s/^our \$HOSTNAME.*$/our \$HOSTNAME = \"${hostname}\"\; /" /etc/monitorix.conf|
-    post_upgrade
-}
diff --git a/abs/extra-testing/monitorix/monitorix.rc.d b/abs/extra-testing/monitorix/monitorix.rc.d
deleted file mode 100644
index 9649519..0000000
--- a/abs/extra-testing/monitorix/monitorix.rc.d
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-#
-# @(#) Fibranet NSP, SL
-# Copyright (C) 2005-2009 by Jordi Sanfeliu <jordi@fibranet.cat>
-#
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case $1 in
-    start)
-        stat_busy "Starting Monitorix"
-        if ck_daemon monitorix; then
-	if [ -x /etc/cron.hourly/sync-monitorix.sh ]; then
-                /etc/cron.hourly/sync-monitorix.sh >/dev/null 2>&1
-        fi
-            # Creates RRDs files if needed
-            /usr/sbin/monitorix.pl create >/dev/null 2>&1 || stat_die $?
-            /usr/sbin/monitorix.pl init >/dev/null 2>&1 || stat_die $?
-            add_daemon monitorix
-        # restart crond so data gets collected
-        /sbin/sv restart cron
-            stat_done
-        else
-            stat_fail
-        fi
-    ;;
-
-    stop)
-        stat_busy "Stopping Monitorix"
-        if ! ck_daemon monitorix; then
-        if [ -x /etc/cron.hourly/sync-monitorix.sh ]; then
-                /etc/cron.hourly/sync-monitorix.sh >/dev/null 2>&1
-        fi
-            /usr/sbin/monitorix.pl stop 2>&1 || stat_die $?
-            rm_daemon monitorix
-        # restart crond data stops getting collected
-        /sbin/sv restart cron
-            stat_done
-        else
-            stat_fail
-        fi
-    ;;
-
-    restart)
-        $0 stop
-        sleep 1
-        $0 start
-    ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-    ;;
-esac
-
-exit 0
diff --git a/abs/extra-testing/mono/PKGBUILD b/abs/extra-testing/mono/PKGBUILD
deleted file mode 100644
index 94ad05a..0000000
--- a/abs/extra-testing/mono/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 25123 2009-01-23 17:05:04Z daniel $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: Brice Carpentier <brice@dlfp.org>
-
-pkgname=mono
-pkgver=2.2
-pkgrel=1
-pkgdesc="Free implementation of the .NET platform including runtime and compiler"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11')
-url="http://www.mono-project.com/"
-depends=('zlib' 'libgdiplus>=2.2')
-makedepends=('pkgconfig' 'bison')
-options=('!libtool' '!makeflags')
-provides=('monodoc')
-conflicts=('monodoc')
-source=(http://www.go-mono.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        mono.rc.d)
-md5sums=('da147e24d14a73d8ad52775dd4a3d165'
-         '8315e46c6a6e9625502521fc0ad1a322')
-
-build() {
-  # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR=${startdir}/src/weird
-  mkdir -p "${MONO_SHARED_DIR}"
-  mkdir -p ${startdir}/pkg/usr/share/licenses/$pkgname
-  # build mono
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  rm -f libgc/libtool.m4
-  autoreconf --force --install
-  autoreconf --force --install libgc
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --with-libgdiplus=installed --with-icu=no \
-              --with-tls=pthread --with-jit=yes --with-preview=yes \
-              --with-sigaltstack=yes --enable-nunit-tests \
-	      --with-moonlight=yes
-  make || return 1
-  sed -i "/NO_INSTALL = yes/d" mcs/nunit20/nunit-console/Makefile
-  make DESTDIR=${startdir}/pkg install
-
-  # install daemons and pathes
-  mkdir -p ${startdir}/pkg/etc/rc.d
-  install -m755 ${startdir}/src/mono.rc.d $startdir/pkg/etc/rc.d/mono
-
-  #install license
-  install -m644 mcs/MIT.X11 ${startdir}/pkg/usr/share/licenses/$pkgname/
-}
diff --git a/abs/extra-testing/mono/__changelog b/abs/extra-testing/mono/__changelog
deleted file mode 100644
index 254c863..0000000
--- a/abs/extra-testing/mono/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-add bison as a make depends
diff --git a/abs/extra-testing/mono/bug434892.patch b/abs/extra-testing/mono/bug434892.patch
deleted file mode 100644
index d4f46f6..0000000
--- a/abs/extra-testing/mono/bug434892.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs	2008/07/01 20:17:46	107006
-+++ trunk/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs	2008/10/28 09:32:46	117243
-@@ -177,7 +177,7 @@
- 				foreach (OperationMessage om in op.Messages) {
- 					Message msg = ctx.Services.GetMessage (om.Message);
- 					foreach (MessagePart part in msg.Parts)
--						parts.Add (part,part);
-+						parts [part] = part; // do not use Add() - there could be the same MessagePart instance.
- 				}
- 			}
- 			
diff --git a/abs/extra-testing/mono/mono.rc.d b/abs/extra-testing/mono/mono.rc.d
deleted file mode 100644
index 548cc2d..0000000
--- a/abs/extra-testing/mono/mono.rc.d
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-. /etc/rc.conf
-. /etc/rc.d/functions
- 
-case "$1" in
-  start)
-    stat_busy "Registering .NET IL binaries with mono"
-    if [ ! -d /proc/sys/fs/binfmt_misc ]; then
-      stat_die "You need support for \"misc binaries\" in your kernel!"
-    fi
-    mount | grep -q binfmt_misc
-    if [ $? != 0 ]; then
-      mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
-      if [ $? != 0 ]; then
-        stat_die
-      fi
-    fi
-    echo ':CLR:M::MZ::/usr/bin/mono:' > /proc/sys/fs/binfmt_misc/register
-    stat_done
-    ;;
-  stop)
-
-    stat_busy "Unregistering .NET IL binaries"
-    if [ -f /proc/sys/fs/binfmt_misc/CLR ]; then
-      echo '-1' > /proc/sys/fs/binfmt_misc/CLR
-    fi
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac 
diff --git a/abs/extra-testing/most/PKGBUILD b/abs/extra-testing/most/PKGBUILD
deleted file mode 100644
index b2d8624..0000000
--- a/abs/extra-testing/most/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 57011 2009-10-31 08:09:42Z allan $
-# Maintainer: juergen <juergen@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=most
-pkgver=5.0.0a
-pkgrel=2
-pkgdesc="A terminal pager similar to 'more' and 'less'"
-arch=('i686' 'x86_64')
-depends=('slang')
-license=('GPL')
-url="ftp://space.mit.edu/pub/davis/most/"
-source=(ftp://space.mit.edu/pub/davis/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('30f2131b67f61716f6fe1f65205da48b')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc || return 1
-  make DESTDIR=$pkgdir install || return 1
-}
diff --git a/abs/extra-testing/most/most-debian.patch b/abs/extra-testing/most/most-debian.patch
deleted file mode 100644
index 4387420..0000000
--- a/abs/extra-testing/most/most-debian.patch
+++ /dev/null
@@ -1,1655 +0,0 @@
---- most-4.10.2.orig/most.1
-+++ most-4.10.2/most.1
-@@ -134,7 +134,7 @@
- Use this switch when you want to view files
- containing 8 bit characters.
- .I most
--will display the file 16 bytes per line in hexidecimal notation.
-+will display the file 16 bytes per line in hexadecimal notation.
- A typical line looks like:
- .IP
- .Ds
-@@ -185,12 +185,13 @@
- This option is meaningful only when used with the
- .B \-v
- option.
-+.TP
- .BI + lineno
- Start up at
- .IR lineno .
- .TP
--.B +c
--Make search case sensitive.
-+.B -c
-+Make searches case sensitive.
- By default, they are not.
- .TP
- .B +d
-@@ -482,7 +483,7 @@
- descriptors that represent the file name and line number,
- respectively.  For example, if JED is your editor, then set
- .B MOST_EDITOR 
--to 'jed %s -g %d'.
-+to 'jed %s -g %d'. This will only work where the %s preceeds the %d.
- .TP
- .B MOST_HELP
- This variable may be used to specify an alternate help file.
-@@ -496,7 +497,7 @@
- .I most.rc
- on other systems.
- .SH CONFIGURATION FILE SYNTAX
--When most starts up, it tries to read a system confiuration file and
-+When most starts up, it tries to read a system configuration file and
- then a personal configuration file.  These files may be used to
- specify keybindings and colors.
- .PP
---- most-4.10.2.orig/src/buffer.c
-+++ most-4.10.2/src/buffer.c
-@@ -44,10 +44,10 @@
- 
- Most_Buffer_Type *Most_Buf;
- 
--int Most_Num_Lines;
-+long long Most_Num_Lines;
- 
--unsigned int Most_C_Offset;
--int Most_C_Line;
-+unsigned long long Most_C_Offset;
-+long long Most_C_Line;
- 
- static unsigned char *beg_of_line1(void)
- {
-@@ -61,24 +61,29 @@
-      {
- 	if (*pos == '\n')
- 	  {
--	     pos--;
--	     while ((pos > Most_Beg)
--		    && (*pos != '\n'))
-+	     pos--; /* Skip back the new-line. */
-+	     /* This block is UTF-8 safe, because it only scans the
-+		buffer for a new-line, and doesn't count
-+		characters. */
-+	     while ((pos > Most_Beg) && (*pos != '\n'))
- 	       pos--;
- 
--	     if (*pos != '\n') return pos;
-+	     if (*pos != '\n') return Most_Beg;
-+	     /* from here on *pos == '\n' */
- 	     if (pos + 1 != cpos)
- 	       return pos + 1;
- 	  }
-      }
--   else pos--;
-+   else
-+     pos = SLutf8_bskip_char(Most_Beg, pos);
- 
-    if (*pos != '\n')
-      {
--	while ((pos > Most_Beg)
--	       && (*pos != '\n'))
-+	/* This block is UTF-8 safe. See comment above. */
-+	while ((pos > Most_Beg) && (*pos != '\n'))
- 	  pos--;
- 	if (*pos != '\n') return Most_Beg;
-+	/* from here on *pos == '\n' */
- 	return pos + 1;
-      }
- 
-@@ -93,55 +98,6 @@
-    return pos;
- }
- 
--
--static unsigned char *forward_columns (unsigned char *b, unsigned char *e, unsigned int num_cols)
--{
--   unsigned int col = 0;
--
--   while ((b < e)
--	  && (col < num_cols))
--     {
--	unsigned char ch = *b++;
--	if (((ch >= ' ') && (ch < 0x7F))
--	    || (ch >= SLsmg_Display_Eight_Bit))
--	  {
--	     col++;
--	     continue;
--	  }
--	
--	if ((ch == '\b') || (ch == '\t') || (ch == '\r'))
--	  switch (ch)
--	    {
--	     case '\b':
--	       if (Most_V_Opt == 0)
--		 {
--		    if (col > 0) col--;
--		 }
--	       else col += 2;
--	       break;
--	       
--	     case '\r':
--	       if (Most_V_Opt == 0)
--		 col = 0;
--	       else 
--		 col += 2;
--	       break;
--	       
--	     case '\t':
--	       if (Most_T_Opt == 0)
--		 col = Most_Tab_Width * (col/Most_Tab_Width + 1);
--	       else
--		 col += 2;
--	       break;
--	    }
--	else if (ch & 0x80)
--	  col += 3;
--	else
--	  col += 2;
--     }
--   return b;
--}
--
- /* does not move point */
- static unsigned char *end_of_line1(void)
- {
-@@ -164,6 +120,9 @@
- 
-    if (*pos != '\n')
-      {
-+	/* This block is UTF-8 safe, because it only scans the buffer
-+	   for a new-line, and doesn't count characters. */
-+
- 	n = pmax - pos;
- 	n2 = n % 8;
- 	pmax = pos + (n - 8);
-@@ -215,7 +174,7 @@
-    ncols = SLtt_Screen_Cols-1;
-    while (1)
-      {
--	unsigned char *next_b = forward_columns (b, e, ncols);
-+	unsigned char *next_b = most_forward_columns (b, e, ncols, 1);
- 	if ((next_b == e) || (next_b == b))
- 	  break;
- 	
-@@ -237,11 +196,12 @@
-      return e;
- 
-    if (b == NULL) b = most_beg_of_line ();
--   b = forward_columns (b, e, SLtt_Screen_Cols-1);
-+   b = most_forward_columns (b, e, SLtt_Screen_Cols-1, 1);
-    
-    /* Do not wrap the line if the last character falls on the last column 
-     * of the display.
-     */
-+   /* FIXME potential bug if dealing with multi-byte char. */
-    if ((b + 1 <= e) 
-        && (b + 1 < Most_Eob) 
-        && (b[1] == '\n'))
-@@ -250,10 +210,10 @@
-    return b;
- }
- 
--int most_forward_line(int save)
-+long long most_forward_line(long long save)
- {
--   int m;
--   register int n = save;
-+   long long m;
-+   register long long n = save;
-    unsigned char *p;
-    unsigned char *pmax;
- 
-@@ -346,14 +306,14 @@
- }
- 
- /* Count lines in the region.  A half line counts as 1 */
--int most_count_lines(unsigned char *beg, unsigned char *end)
-+long long most_count_lines(unsigned char *beg, unsigned char *end)
- {
--   int save_line, n;
-+   long long save_line, n;
-    unsigned char *save_beg, *save_eob;
--   unsigned int save_pos;
-+   unsigned long long save_pos;
-    int dn = 1000;
- 
--   if (Most_B_Opt) return(1 + (int)(end - beg) / 16);
-+   if (Most_B_Opt) return(1 + (long long)(end - beg) / 16);
- 
-    save_line = Most_C_Line; save_beg = Most_Beg; save_eob = Most_Eob;
-    save_pos = Most_C_Offset;
-@@ -371,9 +331,9 @@
-    return(n);
- }
- 
--void most_goto_line(int line)
-+void most_goto_line(long long line)
- {
--   int dif_c, dif_b,dif_t;
-+   long long dif_c, dif_b,dif_t;
- 
-    if (line < 1) line = 1;
-    most_read_to_line(line);
-@@ -420,7 +380,7 @@
- }
- 
- /* return line the point is on without the final '\n's  */
--int most_extract_line(unsigned char **beg, unsigned char **end)
-+long long most_extract_line(unsigned char **beg, unsigned char **end)
- {
-    *beg = most_beg_of_line();
-    *end = end_of_line (*beg);
-@@ -428,12 +388,12 @@
-    return 0;
- }
- 
--int most_what_line(unsigned char *pos)
-+long long most_what_line(unsigned char *pos)
- {
--   unsigned int save_pos;
--   int save_line, dir;
--   register int dif_c, dif_b,dif_t;
--   int ret;
-+   unsigned long long save_pos;
-+   long long save_line, dir;
-+   register long long dif_c, dif_b,dif_t;
-+   long long ret;
- 
-    if (Most_B_Opt)
-      {
-@@ -517,7 +477,7 @@
- }
- 
- /* given a buffer position, find the line and column */
--void most_find_row_column(unsigned char *pos, int *r, int *c)
-+void most_find_row_column(unsigned char *pos, long long *r, long long *c)
- {
-    unsigned char *beg;
-    unsigned int save_offset;
-@@ -545,7 +505,10 @@
-     /* Now we have found the line it is on so.... */
-    beg = most_beg_of_line();
-    *c = 1;
--   while (beg++ < pos) *c = *c + 1;
-+   if (Most_UTF8_Mode)
-+     while ((beg = SLutf8_skip_char(beg, pos)) < pos) *c = *c + 1;
-+   else
-+     while (beg++ < pos) *c = *c + 1;
-    Most_C_Line = save_line;
-    Most_C_Offset = save_offset;
- }
---- most-4.10.2.orig/src/buffer.h
-+++ most-4.10.2/src/buffer.h
-@@ -23,12 +23,12 @@
- 
- extern Most_Buffer_Type *Most_Buf;
- extern unsigned char *Most_Beg, *Most_Eob;
--extern int Most_Num_Lines;
-+extern long long Most_Num_Lines;
- 
- /* Offset of current position from beginning of buffer */
--extern unsigned int Most_C_Offset;
-+extern unsigned long long Most_C_Offset;
- 
--extern int Most_C_Line;
-+extern long long Most_C_Line;
- /*
-  *  Current line number.  If at the beginning of the buffer, it is 1.  If
-  *  we are at the last point of the buffer it is the number of lines.
-@@ -37,26 +37,26 @@
- /* This routine does not move the point */
- extern unsigned char *most_beg_of_line(void);
- 
--extern int most_forward_line(int);
-+extern long long most_forward_line(long long);
- /* This routine moves the point forward n lines. n can be negative.
-    It returns the number moved. */
- 
--extern void most_goto_line(int);
-+extern void most_goto_line(long long);
- /* Move the point somewhere on the nth line of the buffer returning
-    C_POS */
- 
--extern int most_what_line(unsigned char *);
-+extern long long most_what_line(unsigned char *);
- /* return the line number of position 'argument'. Does not move point */
- 
- /* count the number of lines in the region delimited by beg and end.
-    Counts lines from beg up to end but does not count end.
-    Does not move point. */
--extern int most_count_lines(unsigned char *, unsigned char *);
--extern int most_extract_line(unsigned char **, unsigned char **);
-+extern long long most_count_lines(unsigned char *, unsigned char *);
-+extern long long most_extract_line(unsigned char **, unsigned char **);
- 
- extern Most_Buffer_Type *most_switch_to_buffer(Most_Buffer_Type *);
- extern Most_Buffer_Type *most_create_buffer(char *);
--extern void most_find_row_column(unsigned char *, int *, int *);
-+extern void most_find_row_column(unsigned char *, long long *, long long *);
- 
- #endif
- 
---- most-4.10.2.orig/src/keym.c
-+++ most-4.10.2/src/keym.c
-@@ -228,7 +228,7 @@
- static void goto_percent_cmd(void)
- {
-    unsigned char *pos;
--   int n;
-+   long long n;
- 
-    if (Most_Digit_Arg != (int *) NULL) n = *Most_Digit_Arg;
-    else
-@@ -282,7 +282,7 @@
- 
- static void find_next_cmd(void)
- {
--   int col, line, n = 1;
-+   long long col, line, n = 1;
-    unsigned long ofs;
- 
-    if (Most_Digit_Arg != NULL) n = *Most_Digit_Arg;
-@@ -309,7 +309,7 @@
- #else
- 				 "Search: ",
- #endif
--				 Most_Search_Str,
-+				 (char *) Most_Search_Str,
- 				 MOST_SEARCH_BUF_LEN
- 				 ) == -1) return;
-    Most_Curs_Offset = Most_C_Offset;
-@@ -325,7 +325,7 @@
- #else
- 				 "Search Backwards: ",
- #endif
--				 Most_Search_Str,
-+				 (char *) Most_Search_Str,
- 				 MOST_SEARCH_BUF_LEN) == -1) return;
-    find_next_cmd();
- }
---- most-4.10.2.orig/src/line.c
-+++ most-4.10.2/src/line.c
-@@ -87,8 +87,7 @@
-    while (b < end)
-      {
-         ch = *b++;
--	if (((ch >= ' ') && (ch < 0x7F))
--	    || (ch >= SLsmg_Display_Eight_Bit))
-+	if (most_isprint(ch))
- 	  {
- 	     *s++ = ch;
- 	     continue;
-@@ -108,103 +107,156 @@
- 
-    if (end > Most_Eob) end = Most_Eob;
- 
--   sprintf (buf, "0x%08X: ", Most_C_Offset);
-+   sprintf (buf, "0x%08llX: ", Most_C_Offset);
-    ascii_format_line (beg, end, buf + 12);
-    SLsmg_write_string (buf);
-    SLsmg_erase_eol ();
- }
- 
--static int most_analyse_line(unsigned char *begg, unsigned char *endd, 
--			     char *out, char *attributes)
-+int most_isprint(unsigned char ch)
- {
--   unsigned char *beg, *end;
--   unsigned int min_col, max_col;
--   unsigned int i, i_max;
-+   /* Can this be directly replaced with isprint? */
-+   return (ch >= ' ' && ch < 0x7F) || ch >= SLsmg_Display_Eight_Bit;
-+}
-+
-+static void most_analyse_line(unsigned char *beg, unsigned char *end,
-+			      unsigned char *out, char *attributes)
-+{
-+   unsigned char *pout;
-+   char* pattributes;
-+
-+   /* Holds the number of columns for the current character counting
-+    * from the left margin (in contrast to the leftmost visible
-+    * column).
-+    */
-+   unsigned int col;
-+
-+   /* Holds the number of the column up to which to apply the
-+    * current/following formatting. Only meaningful when format_rlim > i.
-+    */
-+   unsigned int format_rlim;
- 
--   beg = begg;
--   end = endd;
--   i = i_max = 0;
--   min_col = Most_Column - 1;
--   max_col = min_col + SLtt_Screen_Cols;
-+   beg = most_forward_columns(beg, end, Most_Column - 1, 0);
-+   pout = out;
-+   pattributes = attributes;
-+   col = format_rlim = 0;
- 
-    while (beg < end)
-      {
- 	char attr = ' ';
--	unsigned char ch;
-+	unsigned char ch = *beg++;
- 
--	if ('\n' == (ch = *beg++))
-+	if ('\n' == ch)
- 	  break;
- 	
- 	if ((ch == '\r') && (Most_V_Opt == 0))
- 	  {
--	     if (i > i_max) i_max = i;
--	     i = 0;
-+	     if (col > format_rlim) format_rlim = col;
-+	     col = 0;
- 	     continue;
- 	  }
- 	
- 	if ((ch == '\b') && (Most_V_Opt == 0))
- 	  {
--	     if (i > i_max) i_max = i;
--	     if (i > 0)
--	       i--;
-+	     if (col > format_rlim) format_rlim = col;
-+	     if (col > 0)
-+	       {
-+		  if (Most_UTF8_Mode)
-+		    {
-+		       SLwchar_Type wc;
-+		       pout = SLutf8_bskip_char(out, pout);
-+		       if (SLutf8_decode(pout, pout + SLUTF8_MAX_MBLEN, &wc, NULL))
-+			 {
-+			    unsigned int char_len = SLwchar_wcwidth(wc);
-+			    if (char_len > 1)
-+			      col -= char_len - 1;
-+			 }
-+		    }
-+		  else
-+		    pout--;
-+		  pattributes--;
-+		  col--;
-+	       }
- 	     continue;
- 	  }
- 	
--	if (i < i_max)		       /* overstrike */
-+	if (col < format_rlim)		       /* overstrike */
- 	  {
- 	     attr = 'b';
--	     if ((i >= min_col) && (i < max_col))
-+	     if (col < SLtt_Screen_Cols)
- 	       {
--		  if (out[i-min_col] == '_')
-+		  if (*pout == '_')
- 		    attr = 'u';
- 		  else if (ch == '_')
- 		    {
- 		       attr = 'u';
--		       ch = out[i - min_col];
-+		       ch = *pout;
- 		    }
- 	       }
- 	     if (ch == ' ')
- 	       {
--		  i++;
-+		  col++;
- 		  continue;
- 	       }
- 	     /* drop */
- 	  }
--	
--	if ((ch >= ' ') && (ch < 0x7F))
--	  {
--	     if ((i >= min_col) && (i < max_col))
-+
-+	if (Most_UTF8_Mode) {
-+	   unsigned char *prev = --beg;
-+	   SLwchar_Type wc;
-+	   unsigned int len;
-+
-+	   if (SLutf8_decode(beg, end, &wc, NULL))
-+	     {
-+	        unsigned int char_len = SLwchar_wcwidth(wc);
-+		if (char_len > 1)
-+	          col += char_len - 1;
-+	     }
-+
-+	   beg = SLutf8_skip_char(beg, end);
-+	   len = beg - prev;
-+
-+	   if (len > 1) {
-+	     /* Non-ASCII char, display it. */
-+	     if (col < SLtt_Screen_Cols)
- 	       {
--		  out[i-min_col] = ch;
--		  attributes[i-min_col] = attr;
-+		  memcpy(pout, prev, len);
-+		  pout += len;
-+		  *pattributes++ = attr;
- 	       }
--	     i++;
-+	     col++;
- 	     continue;
--	  }
--	
--	if (ch >= SLsmg_Display_Eight_Bit)
-+	   }
-+	}
-+
-+	if (most_isprint(ch))
- 	  {
--	     if ((i >= min_col) && (i < max_col))
-+	     if (col < SLtt_Screen_Cols)
- 	       {
--		  out[i-min_col] = ch;
--		  attributes[i-min_col] = attr;
-+		  *pout++ = ch;
-+		  *pattributes++ = attr;
- 	       }
--	     i++;
-+	     col++;
- 	     continue;
- 	  }
- 
- 	if ((ch == '\t') && (Most_T_Opt == 0) && (Most_Tab_Width))
- 	  {
--
--	     int nspaces = Most_Tab_Width * (i/Most_Tab_Width + 1) - i;
-+	     /* Tab expansion must take into consideration the
-+	      * leftmost visible column. However, variable col holds the
-+	      * number of columns from the left margin and must be
-+	      * corrected.
-+	      */
-+	     int vis_col = col + Most_Column - 1;
-+	     int nspaces = Most_Tab_Width - (vis_col % Most_Tab_Width);
- 	     while (nspaces > 0)
- 	       {
--		  if ((i >= min_col) && (i < max_col))
-+		  if (col < SLtt_Screen_Cols)
- 		    {
--		       out[i-min_col] = ' ';
--		       attributes[i-min_col] = attr;
-+		       *pout++ = ' ';
-+		       *pattributes++ = attr;
- 		    }
--		  i++;
-+		  col++;
- 		  nspaces--;
- 	       }
- 	     continue;
-@@ -212,36 +264,36 @@
- 
- 	if (ch & 0x80)
- 	  {
--	     if ((i >= min_col) && (i < max_col))
-+	     if (col < SLtt_Screen_Cols)
- 	       {
--		  out[i-min_col] = '~';
--		  attributes[i-min_col] = attr;
-+		  *pout++ = '~';
-+		  *pattributes++ = attr;
- 	       }
--	     i++;
-+	     col++;
- 	     ch &= 0x7F;
- 	     /* drop */
- 	  }
- 	
--	if ((i >= min_col) && (i < max_col))
-+	if (col < SLtt_Screen_Cols)
- 	  {
--	     out[i-min_col] = '^';
--	     attributes[i-min_col] = attr;
-+	     *pout++ = '^';
-+	     *pattributes++ = attr;
- 	  }
--	i++;
-+	col++;
- 	
- 	if (ch == 0x7F) ch = '?';
- 	else ch += '@';
- 	
--	if ((i >= min_col) && (i < max_col))
-+	if (col < SLtt_Screen_Cols)
- 	  {
--	     out[i-min_col] = ch;
--	     attributes[i-min_col] = attr;
-+	     *pout++ = ch;
-+	     *pattributes++ = attr;
- 	  }
--	i++;
-+	col++;
-      }
- 
--   if (i < i_max) 
--     i = i_max;
-+   if (col < format_rlim) 
-+     col = format_rlim;
- 
-    /* Now add "..." if selective display.  To do that, the next line needs to 
-     * be dealt with to determine whether or not it will be hidden.
-@@ -249,7 +301,7 @@
-    if (Most_Selective_Display 
-        && (Most_W_Opt == 0)
-        && (beg < Most_Eob)
--       && ((i >= min_col) && (i < max_col)))
-+       && (col < SLtt_Screen_Cols))
-      {
- 	if (*beg == '\n') beg++;
- 
-@@ -260,37 +312,29 @@
- 	if ((beg >= Most_Eob) || (*beg == '\n') 
- 	    || (most_apparant_distance(beg) >= Most_Selective_Display))
- 	  {
--	     i_max = i + 3;
--	     while (i < i_max)
-+	     /* Add an ellipsis, if they fit on the screen. */
-+	     int rlimit = col + 3;
-+	     while (col < rlimit)
- 	       {
--		  if (i < max_col)
-+		  if (col < SLtt_Screen_Cols)
- 		    {
--		       out[i] = '.';
--		       attributes[i] = ' ';
-+		       *pout++ = '.';
-+		       *pattributes++ = ' ';
- 		    }
--		  i++;
-+		  col++;
- 	       }
- 	  }
-      }
--   
--   i_max = i;
- 
--   if (i < min_col)
--     i = min_col;
--   else if (i >= max_col)
--     i = max_col;
--
--   i -= min_col;
--
--   out[i] = 0;
--   attributes[i] = 0;
--   return i_max;
-+   *pout = 0;
-+   *pattributes = 0;
- }
- 
--static void output_with_attr (unsigned char *out, unsigned char *attr)
-+static void output_with_attr (unsigned char *out, char *attr)
- {
--   unsigned char at, ch, lat;
-+   unsigned char at, lat;
-    unsigned char *p = out;
-+   unsigned char *pmax = p + strlen((char *) p);
- 
-    if (Most_V_Opt) 
-      {
-@@ -299,7 +343,7 @@
-      }
- 
-    lat = ' ';
--   while ((ch = *p) != 0)
-+   while (p < pmax)
-      {
- 	if (lat != *attr)
- 	  {
-@@ -321,7 +365,7 @@
- 	     else most_tt_normal_video ();
- 	     lat = at;
- 	  }
--	p++;
-+	p = SLutf8_skip_char(p, pmax);
- 	attr++;
-      }
- 
-@@ -340,10 +384,11 @@
- void most_display_line (void)
- {
-    unsigned char *beg, *end;
--   unsigned int len;
-+#if 0
-    unsigned char dollar;
-+#endif
-    static unsigned char *line;
--   static unsigned char *attr;
-+   static char *attr;
-    static unsigned int line_len;
- 
-    if (Most_B_Opt)
-@@ -357,37 +402,43 @@
-    if (line_len < (unsigned int)(SLtt_Screen_Cols + 1) * SLUTF8_MAX_MBLEN)
-      {
- 	SLfree ((char *) line);
--	SLfree ((char *) attr);
-+	SLfree (attr);
- 	
- 	line_len = (SLtt_Screen_Cols + 1) * SLUTF8_MAX_MBLEN;
- 	
- 	if ((NULL == (line = (unsigned char *) SLmalloc (line_len)))
--	    || (NULL == (attr = (unsigned char *) SLmalloc (line_len))))
-+	    || (NULL == (attr = SLmalloc (line_len))))
- 	  most_exit_error ("Out of memory");
-      }
- 
-    (void) most_extract_line (&beg, &end);
- 
--   len = most_analyse_line(beg, end, (char *) line, (char *) attr);
-+   most_analyse_line(beg, end, line, attr);
- 
-+#if 0
-+   /* Currently the dollar sign is not always being written at the
-+      rightmost column when displaying multi-byte characters. */
-    dollar = 0;
-    if (Most_W_Opt)
-      {
--	if ((end < Most_Eob)
--	    && (*end != '\n'))
--	  dollar = '\\';
-+       if ((end < Most_Eob)
-+           && (*end != '\n'))
-+         dollar = '\\';
-      }
-    else if (len > (unsigned int) SLtt_Screen_Cols + (Most_Column - 1))
-      dollar = '$';
--   
-+
-    if (dollar)
-      {
--	line[SLtt_Screen_Cols-1] = dollar;
--	attr[SLtt_Screen_Cols-1] = ' ';
--	line[SLtt_Screen_Cols] = 0;
--	attr[SLtt_Screen_Cols] = 0;
-+       unsigned char *pline =
-+	 most_forward_columns(line, line + line_len, SLtt_Screen_Cols-1, 1);
-+       *pline = dollar;
-+       *(pline+1) = 0;
-+       attr[SLtt_Screen_Cols-1] = ' ';
-+       attr[SLtt_Screen_Cols] = 0;
-      }
--   
-+#endif
-+
-    output_with_attr (line, attr);
-    SLsmg_erase_eol ();
- }
-@@ -398,21 +449,34 @@
- int most_apparant_distance (unsigned char *pos)
- {
-    int i;
--   unsigned char *save_pos, ch;
-+   unsigned char *save_pos, *beg, ch;
-    unsigned int save_offset;
- 
-    save_offset = Most_C_Offset;
-    save_pos = pos;
-    Most_C_Offset = (unsigned int) (pos - Most_Beg);
--   pos = most_beg_of_line();
-+   beg = pos = most_beg_of_line();
-    Most_C_Offset = save_offset;
- 
-    i = 0;
-    while (pos < save_pos)
-      {
--	ch = *pos++;
--	if (((ch >= ' ') && (ch < 0x7F))
--	    || (ch >= SLsmg_Display_Eight_Bit))
-+	ch = *pos;
-+
-+	if (Most_UTF8_Mode) {
-+	   unsigned char *prev = pos;
-+	   int len;
-+	   pos = SLutf8_skip_char(pos, save_pos);
-+	   len = pos - prev;
-+	   if (len > 1) {
-+	     i++;
-+	     continue;
-+	   }
-+	} else {
-+	   pos++;
-+	}
-+
-+	if (most_isprint(ch))
- 	  {
- 	     i++;
- 	     continue;
-@@ -420,7 +484,13 @@
- 
- 	if (!Most_V_Opt && (ch == '\b'))
- 	  {
--	     if (i > 0) i--;
-+	     if (i > 0)
-+	       {
-+		  if (Most_UTF8_Mode)
-+		    i -= pos - SLutf8_bskip_char(beg, pos);
-+		  else
-+		    i--;
-+	       }
- 	  }
- 	else if (!Most_V_Opt && (ch == '\015')) /* ^M */
- 	  {
-@@ -439,3 +509,95 @@
-      }
-    return i;
- }
-+
-+/*
-+ * Returns a pointer to the num_cols'th character after the one
-+ * pointed at b. Invisible character runs are not counted toward this
-+ * limit, i.e. strings that represent attributes, such as "_\b" for
-+ * underlines.
-+ *
-+ * If multi_column is non-zero, characters spanning more than one
-+ * column will add their extra width to the column count.
-+ *
-+ * If there the end of the buffer is reached, as delimited by argument
-+ * e, then e is returned.
-+ */
-+unsigned char *most_forward_columns (unsigned char *beg, unsigned char *e, unsigned int num_cols, int multi_column)
-+{
-+   unsigned int col = 0;
-+   unsigned int prev_width = 1;
-+   unsigned char* b = beg;
-+
-+   while ((b < e)
-+	  && ((col < num_cols)
-+	      || (*b == '\b')
-+	      || (*b == '\r')))
-+     {
-+	unsigned char ch = *b;
-+
-+	if (Most_UTF8_Mode)
-+	  {
-+	     unsigned char *prev = b;
-+	     int len;
-+	     b = SLutf8_skip_char(b, e);
-+	     len = b - prev;
-+	     if (len > 1)
-+	       {
-+		  if (multi_column)
-+		    {
-+		        SLwchar_Type wc;
-+			if (SLutf8_decode(prev, e, &wc, NULL))
-+			  col += prev_width = SLwchar_wcwidth(wc);
-+		    }
-+		  else
-+		    col++;
-+		  continue;
-+	       }
-+	  }
-+	else
-+	  b++;
-+
-+	if (most_isprint(ch))
-+	  {
-+	     col++;
-+	     prev_width = 1;
-+	     continue;
-+	  }
-+
-+	if ((ch == '\b') || (ch == '\t') || (ch == '\r'))
-+	  switch (ch)
-+	    {
-+	     case '\b':
-+	       if (Most_V_Opt == 0)
-+		 {
-+		    if (col > 0) col -= prev_width;
-+		 }
-+	       else col += 2;
-+	       break;
-+
-+	     case '\r':
-+	       if (Most_V_Opt == 0)
-+		 col = 0;
-+	       else
-+		 col += 2;
-+	       break;
-+
-+	     case '\t':
-+	       if (Most_T_Opt == 0)
-+		 col = Most_Tab_Width * (col/Most_Tab_Width + 1);
-+	       else
-+		 col += 2; /* ^I is two chars long. */
-+	       break;
-+	    }
-+	else if (ch & 0x80)
-+	  col += 3;
-+	else
-+	  col += 2;
-+     }
-+
-+   /* Last character was too wide. Backstep it. */
-+   if (col > num_cols)
-+     b = SLutf8_bskip_char(beg, b);
-+
-+   return b;
-+}
---- most-4.10.2.orig/src/line.h
-+++ most-4.10.2/src/line.h
-@@ -7,5 +7,7 @@
- 
- extern void most_display_line(void);
- extern int most_apparant_distance(unsigned char *);
-+extern int most_isprint(unsigned char);
-+extern unsigned char *most_forward_columns (unsigned char *, unsigned char *, unsigned int, int);
- #endif
- 
---- most-4.10.2.orig/src/most.c
-+++ most-4.10.2/src/most.c
-@@ -125,7 +125,7 @@
-    ch = *(++str);
-    if ( ch == '/')
-      {
--	strcpy (Most_Search_Str,++str);
-+	strcpy ((char *) Most_Search_Str,++str);
- 	return;
-      }
- 
-@@ -329,7 +329,8 @@
- 
- static void do_most (char *file, int start)
- {
--   int piped, row, col;
-+   int piped;
-+   long long row, col;
- 
-    most_get_cdir(Most_C_Dir);
- 
-@@ -347,7 +348,7 @@
-    Most_Curs_Offset = Most_C_Offset;
- 
-    if (*Most_Search_Str
--       && ((row = most_search (Most_Beg + Most_C_Offset, 1, &col)) > 0))
-+       && ((row = most_search (Most_Beg + Most_C_Offset, 1LL, &col)) > 0))
-      most_goto_line(row);
-    else
-      {
-@@ -455,13 +456,7 @@
- 
-    SLtt_get_terminfo();
- #if SLANG_VERSION >= 20000
--#if 0
--   Most_UTF8_Mode = SLutf8_enable (1);
--   if (Most_UTF8_Mode)
--     {
--	fprintf (stderr, "UTF-8 Mode is in effect\n");
--     }
--#endif
-+   Most_UTF8_Mode = SLutf8_enable (-1);
- #endif
-    SLtt_Ignore_Beep = 1;
-    if (No_Colors) 
---- most-4.10.2.orig/src/most.h
-+++ most-4.10.2/src/most.h
-@@ -1,4 +1,5 @@
- #include "config.h"
-+#define SLANG_REGEXP
- extern int Most_S_Opt;
- extern int Most_A_Opt;             /* automatically choose -b if necessary */
- extern int Most_V_Opt;             /* display control chars */
---- most-4.10.2.orig/src/search.c
-+++ most-4.10.2/src/search.c
-@@ -20,6 +20,7 @@
- */
- #include "config.h"
- 
-+#include <ctype.h>
- #include <stdio.h>
- #include <string.h>
- #include <slang.h>
-@@ -31,18 +32,18 @@
- #include "display.h"
- #include "search.h"
- 
--/* Note!!!  The regular expression searches may not work.  I have not
-- * tested them.
-- * FIXME!!!
-- */
--
- int Most_Case_Sensitive = 0;
--char Most_Search_Str[256];
-+unsigned char Most_Search_Str[256];
- int Most_Search_Dir = 1;
- 
- #include "jdmacros.h"
- 
--#define UPCASE(ch) ((!Most_Case_Sensitive && (ch <= 'z') && (ch >= 'a')) ? (ch - 32) : ch)
-+#if SLANG_VERSION < 20000
-+# define NORM_CHAR(ch) ((!Most_Case_Sensitive) ? toupper(ch) : ch)
-+# define UPCASE(ch) NORM_CHAR(ch)
-+#else
-+# define NORM_CHAR(ch) (ch)
-+#endif
- 
- #if	defined(HAVE_V8_REGCOMP) || defined(SLANG_REGEXP)
- 
-@@ -78,7 +79,7 @@
-  * This function is called by the V8 regcomp to report
-  * errors in regular expressions.
-  */
--static void regerror(char *s)
-+static void regerror(const char *s)
- {
-    char	string[256];
- 
-@@ -95,13 +96,17 @@
-  *	      0	 error
-  *
-  */
--static int do_regcomp(unsigned char *key)
-+static int do_regcomp(const unsigned char *key)
- {
-    static int old_Most_Case_Sensitive;
--   unsigned char UpCaseKey[sizeof(savepattern)];
- # ifndef HAVE_V8_REGCOMP
-    int	posn;			/* reg exp error at this offset */
- # endif
-+# if SLANG_VERSION < 20000
-+   unsigned char UpCaseKey[sizeof(savepattern)];
-+# else
-+   int re_flags = 0;
-+# endif
- 
-    /*
-     *	Only recompile search string if it has changed
-@@ -124,6 +129,7 @@
- 
-    old_Most_Case_Sensitive = Most_Case_Sensitive;
- 
-+# if SLANG_VERSION < 20000
-    if ( Most_Case_Sensitive == 0 )
-      {
- 	register unsigned char	*p;		/* ptr to UpCaseKey */
-@@ -141,6 +147,7 @@
- 
- 	*p = '\0';
-      }
-+# endif
- 
-    strcpy((char *)savepattern, (char *)key);
- 
-@@ -162,7 +169,12 @@
- #  else
-    if (Regexp != NULL)
-      SLregexp_free (Regexp);
--   if (NULL == (Regexp = SLregexp_compile ((char *)key, Most_Case_Sensitive ? 0 : SLREGEXP_CASELESS)))
-+
-+   if (!Most_Case_Sensitive)
-+     re_flags |= SLREGEXP_CASELESS;
-+   if (Most_UTF8_Mode)
-+     re_flags |= SLREGEXP_UTF8;
-+   if (NULL == (Regexp = SLregexp_compile ((char *)key, re_flags)))
-      posn = -1;
-    else
-      posn = 0;
-@@ -187,7 +199,7 @@
-  * Call the appropriate regular expression execute function
-  */
- 
--static unsigned char *do_regexec(unsigned char *string)
-+static unsigned char *do_regexec(const unsigned char *string, size_t length)
- {
- # ifdef	HAVE_V8_REGCOMP
-    if ( regexec(regpattern, (char *)string) )
-@@ -196,40 +208,46 @@
-      return( NULL );
- # else
- #  if SLANG_VERSION < 20000
--   return ( SLang_regexp_match(string, strlen((char *)string), &regdata) );
-+   return ( SLang_regexp_match(string, length, &regdata) );
- #  else
--   return (unsigned char *)SLregexp_match (Regexp, (char *)string, strlen ((char *)string));
-+   return (unsigned char *)SLregexp_match (Regexp, (char *)string, length);
- #  endif
- # endif	/* HAVE_V8_REGCOMP */
- }
- 
- /*
-- *  Make a upper case copy of a string.	 Also changes any "c\b" character
-- *  strings into just "" so that highlighted and underlined characters
-- *  can be searched.
-+ *  Changes any "c\b" character strings into just "" so that
-+ *  highlighted and underlined characters can be searched.  Stores in
-+ *  length the new size of the string, after the aforementioned
-+ *  changes.
-+ *
-+ *  If using a version of S-Lang that does not support case
-+ *  insensitive regular expressions, this function upper cases the
-+ *  input string, as well.
-  *
-  *  Reuses malloced memory, so a copy cannot be retained between calls.
-  */
- 
--static unsigned char *StrUpCaseCopy(unsigned char *input)
-+static const unsigned char *StrNormCopy(const unsigned char *input,
-+					size_t *length)
- {
-    static unsigned char *uppercase;	/* ptr to malloced area */
-    static size_t	  bufsize;	/* size of malloced area */
--   unsigned char	 *src;		/* ptr to source */
-+   const unsigned char	 *src;		/* ptr to source */
-+   const unsigned char	 *end;		/* ptr to end of source */
-    register unsigned char *dest;	/* ptr to destination */
-    register int	  idx;	/* index into uppercase[] */
--   register unsigned char c;		/* source character */
--   size_t		  length;	/* size of string to copy */
- 
-    src = input;
--   length = strlen((char *)src) + 1;	/* len of line plus terminator */
-+   end = input + *length;
- 
--   if ( length > bufsize )
-+   if ( *length >= bufsize )
-      {
- 	if ( uppercase != (unsigned char *)NULL )
- 	  free(uppercase);
- 
--	bufsize = (length > 256 ) ? length : 256;	/* 256 byte default */
-+	/* len of line plus terminator */
-+	bufsize = (*length >= 256 ) ? *length + 1 : 256; /* 256 byte default */
- 
- 	uppercase = (unsigned char *)malloc(bufsize);
- 	if ( uppercase == (unsigned char *)NULL )
-@@ -242,8 +260,9 @@
- 
-    dest = uppercase;
- 
--   for ( idx = 0 ; (c = *src) != '\0' ; src++ )
-+   for ( idx = 0 ; src < end ; src++ )
-      {
-+	unsigned char c = *src;
- 	if ( c == '\b' )		/* backspace */
- 	  {
- 	     if ( idx-- > 0 )
-@@ -252,54 +271,79 @@
- 	else
- 	  {
- 	     if ( idx++ >= 0 )
--	       *dest++ = UPCASE(c);
-+	       *dest++ = NORM_CHAR(c);
- 	  }
-      }
- 
-    *dest = '\0';		/* add termination */
- 
-+   *length = dest - uppercase;
-    return(uppercase);
- }
- 
- /*
-- *  Given an offset into a copy made by StrUpCaseCopy() and a pointer to the
-+ *  Given an offset into a copy made by StrNormCopy() and a pointer to the
-  *  original string, returns a pointer into the original string corresponding
-  *  to this offset.
-  */
- 
--static unsigned char *GetOrigPtr(unsigned char *original, int offset)
-+static const unsigned char *
-+GetOrigPtr(const unsigned char *original, int offset,
-+	   const unsigned char *end)
- {
--   register unsigned char *p = original;
-+   const unsigned char *p = original;
-    register int	    j = offset;
- 
-     /*
-      *	Step through, adjusting offset according to backspaces found
-      */
--   while ( *p != '\0' )
-+   while ( p < end )
-      {
-+	const unsigned char *next;
-+	if (Most_UTF8_Mode)
-+	  next = SLutf8_skip_char((unsigned char*) p, (unsigned char*) end);
-+	else
-+	  next = p + 1;
-+	size_t length_last = next - p;
-+
- 	if ( *p == '\b' )
--	  j++;
-+	  j += length_last;
- 	else
--	  j--;
-+	  j -= length_last;
- 
- 	if ( j < 0 )
- 	  break;
- 	else
--	  p++;
-+ 	  p = next;
-      }
- 
-    return(p);
- }
- #endif	/* HAVE_V8_REGCOMP || SLANG_REGEXP */
- 
-+/* Returns a pointer to the first occurrence of '\n' in string beg, or
-+ * end if no '\n' can be found between inclusive beg and exclusive
-+ * end.
-+ */
-+static const unsigned char *
-+find_eol(const unsigned char *beg, const unsigned char *end)
-+{
-+   const unsigned char *p;
-+   if ( (p = memchr(beg, '\n', end - beg)) != NULL)
-+     return p;
-+   else
-+     return end;
-+}
-+
- /* This routine returns the 1 + position of first match of key in str.
-    key is modified to match the case of str. */
- /* We should try to optimize this routine */
- /* searches from beg up to but not including end */
- 
--static unsigned char *forw_search_region(unsigned char *beg,
--					 unsigned char *end,
--					 unsigned char *key)
-+static const unsigned char *
-+forw_search_region(const unsigned char *beg,
-+		   const unsigned char *end,
-+		   const unsigned char *key)
- {
- #if	defined(HAVE_V8_REGCOMP) || defined(SLANG_REGEXP)
-     /*
-@@ -307,10 +351,11 @@
-      *	to be broken into lines.
-      *
-      */
--   unsigned char	*p;		/* temp pointer */
--   unsigned char	*linebeg;	/* beginning of working line */
--   unsigned char	*copy;		/* ptr to upper case copy */
-+   const unsigned char	*linebeg;	/* beginning of working line */
-+   const unsigned char	*lineend;	/* end of working line */
-+   const unsigned char	*norm_line;	/* ptr to normalized line */
-    unsigned char	*match;		/* ptr to matching string */
-+   int			anchored_re;
- 
-     /*
-      *	Compile "key" into an executable regular expression
-@@ -318,58 +363,35 @@
-    if ( do_regcomp(key) == 0 )
-      return(Most_Eob);
- 
--    /*
--     *	For regular expression searches we need to do a line by line
--     *	search, so it is necessary to temporarily replace '\n' with '\0'
--     *	characters.
--     */
--   p = beg;
--   linebeg = beg;
-+   anchored_re = key[0] == '^';
- 
--   while (linebeg < end)
-+   for ( linebeg = beg ; linebeg < end ; linebeg = lineend + 1 )
-      {
--	while ((p < end) && (*p != '\n')) p++;
--	if (p == end) break;
--	*p = 0;
-+	size_t length;
- 
--	if ( Most_Case_Sensitive == 0 )	/* i.e. case insensitive */
--	  {
--	     copy = StrUpCaseCopy(linebeg);
--	     if ( copy == (unsigned char *)NULL )
--	       return(Most_Eob);
--	  }
-+ 	lineend = find_eol(linebeg, end);
-+
-+	length = lineend - linebeg;
-+	if (0 == length) continue; /* Skip empty lines. */
-+
-+	norm_line = StrNormCopy(linebeg, &length);
-+	if ( norm_line == NULL )
-+	  return(Most_Eob);
- 
- 	/*
- 	 * Quick sanity check for beginning of line archored tests.
--	 * If 1st char of key is "^", then the character before linebeg (which
--	 * must be beyond the start of the window), must be a "\n",
--	 * otherwise do_regexec() isn't called.
-+	 * If 1st char of key is "^", then the character before
-+	 * linebeg (which must be within the buffer), must be a "\n".
- 	 */
--	if ( 
--# if 0
--	     ((*key != '^') 
--	      || (linebeg > Most_Win->beg_pos && linebeg[-1] == '\n'))
--	     &&
--#endif
--	     (match = do_regexec(Most_Case_Sensitive ? linebeg : copy)))
-+	if ( !(anchored_re && (linebeg <= Most_Beg || linebeg[-1] != '\n'))
-+	     && (match = do_regexec(norm_line, length)) )
- 	  {
--	     *p = '\n';
--	     if ( Most_Case_Sensitive == 0 )
--	       {
--		/*
--		 *  Use offset into "copy" as idx to find point in
--		 *  real line.
--		 */
--		  return( GetOrigPtr(linebeg, match - copy) );
--	       }
--	     else
--	       {
--		  return( match );
--	       }
-+	     /*
-+	      *  Use offset into "norm_line" as idx to find point in
-+	      *  real line.
-+	      */
-+	     return( GetOrigPtr(linebeg, match - norm_line, lineend) );
- 	  }
--
--	*p++ = '\n';
--	linebeg = p;
-      }
- 
-    return(Most_Eob);
-@@ -475,23 +497,18 @@
-  *  pattern "key".
-  */
- 
--static unsigned char *back_search_region(unsigned char *beg,
--					 unsigned char *end,
--					 unsigned char *key)
-+static const unsigned char *
-+back_search_region(const unsigned char *beg,
-+		   const unsigned char *end,
-+		   const unsigned char *key)
- {
- #if	defined(HAVE_V8_REGCOMP) || defined(SLANG_REGEXP)
--   register unsigned char	*p;
--   unsigned char		*endp,		/* end of line */
--   *lastmatch,	/* last match in line */
-+   const unsigned char	*p;
-+   const unsigned char	*endp,		/* end of line */
-+   *lastmatch,		/* last match in line */
-    *endprevline,	/* end of line before this one */
-    *match;		/* ptr to matching string */
--   unsigned char		savec;		/* last char on line */
--
--    /*
--     *	Compile "key" into an executable regular expression
--     */
--   if ( do_regcomp(key) == 0 )
--     return(Most_Eob);
-+   int			anchored_re;
- 
-     /*
-      *	Starting from the end of the buffer, break the buffer into lines
-@@ -501,84 +518,60 @@
-      *	and isn't that what we want to do in a reverse search.
-      */
-    endp = end;
--   lastmatch = Most_Eob;
--   while ( 1 )			/* forever loop */
--     {
--	if ( (endp < beg) )
--	  return(Most_Eob);		/* Reach start of buffer, no match */
-+   endprevline = end;
-+   match = Most_Eob;
- 
--	/* Find the real end of current line */
--	if ( (p = (unsigned char *)strchr((char *)endp, '\n')) != NULL )
--	  endp = p;
--
--	savec = *endp;
--	*endp = '\0';			/* terminate line with NULL */
-+   /* Find out whether the regexp attempts to match a line boundary.
-+    * In this case, only a match on the full line should be attempted.
-+    */
-+   anchored_re = key[strlen((const char *) key)-1] == '$';
- 
-+   while ( endp > beg )
-+     {
- 	/* Find the beginning of line */
- 	for ( p = endp - 1 ; (p >= beg) && (*p != '\n') ; p-- )
- 	  {
- 	  }
- 
-+	if ( p < beg )
-+	  break;
-+
- 	endprevline = p;
- 
--	p++;			/* point to 1st char after newline */
-+	/*
-+	 * Quick sanity check for end of line archored tests.  If last
-+	 * char of key is "$", then the character after endp (which
-+	 * must be within the buffer), must be a "\n".
-+	 */
-+	if ( anchored_re && endp < Most_Eob && endp[0] != '\n' )
-+	  {
-+	     endp = p;
-+	     continue;
-+	  }
- 
- 	/*
- 	 *  Keep searching forward in this line till no more matches
- 	 */
--	if ( Most_Case_Sensitive == 0 )		/* i.e. case insensitive */
-+	do
- 	  {
--	     unsigned char	*copy;		/* ptr to upper case copy */
--	     unsigned char	*savecopy;	/* copy of "copy" */
--
--	     copy = StrUpCaseCopy(p);
--	     if ( copy == (unsigned char *)NULL )
--	       return(Most_Eob);
-+	     lastmatch = match;
- 
--	     savecopy = copy;
--
--	    /*
--	     * Quick sanity check for beginning of line archored tests.
--	     * Must be at start of line.
--	     */
--	     while ( ((*key != '^') || (copy == savecopy))
--		    && (match = do_regexec(copy)) )
--	       {
--		  if ( GetOrigPtr(p, match - savecopy) > end )
--		    break;
--		  lastmatch = match;
--		  if ( *lastmatch == '\0' )	/* key must be "$" or "^" */
--		    break;
--		  copy = lastmatch + 1;		/* character after match */
--	       }
-+	     if (Most_UTF8_Mode)
-+	       p = SLutf8_skip_char((unsigned char*) p, (unsigned char*) endp);
-+	     else
-+	       p++;
- 
--	     if ( lastmatch != Most_Eob )	/* found a match */
--	       lastmatch = GetOrigPtr(p, lastmatch - savecopy);
--	  }
--	else
--	  {
--	    /*
--	     * Quick sanity check for beginning of line archored tests.
--	     * Must be at start of buffer or start of line
--	     */
--	     while ( ( (*key != '^') || (p == endprevline + 1) )
--		    && (match = do_regexec(p)) )
--	       {
--		  if ( match > end )
--		    break;
--		  lastmatch = match;
--		  if ( *lastmatch == '\0' )	/* key must be "$" or "^" */
--		    break;
--		  p = lastmatch + 1;		/* character after match */
--	       }
-+	     match = forw_search_region(p, endp, key);
- 	  }
-+	while ( match <= endp );
- 
--	*endp = savec;
- 	if ( lastmatch != Most_Eob )	/* found a match */
- 	  return(lastmatch);
- 
- 	endp = endprevline;
-      }
-+
-+   return(Most_Eob);		/* Reached start of buffer, no match */
- #else
-    char ch, char1, work[256];
-    unsigned char *pos;
-@@ -670,15 +663,15 @@
- #endif	/* HAVE_V8_REGCOMP || SLANG_REGEXP */
- }
- 
--int most_search(unsigned char *from, int repeat, int *col)
-+long long most_search(const unsigned char *from, int repeat, long long *col)
- {
-     /* return the line match was found as well as line number,
-      * search from i on; assume that line_array match the i so we need
-      * no initial lookup */
- 
--   int test, save_line, the_col, row, s_len;
-+   long long test, save_line, the_col, row, s_len;
-    char string[300];
--   unsigned char *pos;
-+   const unsigned char *pos;
-    unsigned int save_ofs;
-    unsigned int found_ofs;
- 
-@@ -687,7 +680,10 @@
-    save_line = Most_C_Line;
-    found_ofs = Most_Eob - Most_Beg;
-    *col = 0;
--   s_len = strlen (Most_Search_Str);
-+   if (Most_UTF8_Mode)
-+     s_len = SLutf8_strlen (Most_Search_Str, 0);
-+   else
-+     s_len = strlen ((char *) Most_Search_Str);
-    pos = from;
- 
-    if (*Most_Search_Str)
---- most-4.10.2.orig/src/search.h
-+++ most-4.10.2/src/search.h
-@@ -6,7 +6,7 @@
- extern int Most_Case_Sensitive;
- extern int Most_Search_Dir;
- #define MOST_SEARCH_BUF_LEN	256
--extern char Most_Search_Str[MOST_SEARCH_BUF_LEN];
--extern int most_search(unsigned char *, int, int *);
-+extern unsigned char Most_Search_Str[MOST_SEARCH_BUF_LEN];
-+extern long long most_search(const unsigned char *, int, long long *);
- #endif
- 
---- most-4.10.2.orig/src/window.c
-+++ most-4.10.2/src/window.c
-@@ -48,10 +48,11 @@
- 
- Most_Window_Type *Most_Win;
- Most_Window_Type *Most_Top_Win;
--int Most_Top_Line;		       /* row number of top window */
--int Most_Curs_Row;
--int Most_Curs_Col;
--int Most_Column = 1;
-+long long Most_Top_Line;		       /* row number of top window */
-+long long Most_Curs_Row;
-+long long Most_Curs_Col;
-+/* The leftmost visible column. */
-+long long Most_Column = 1;
- int Most_Restore_Width_To = 0;
- char Most_Mini_Buf[256];
- unsigned long Most_Curs_Offset;
-@@ -156,7 +157,7 @@
- 	SLsmg_write_nchars (buf + point, len - point);
- 	if (col < SLtt_Screen_Cols)
- 	  break;
--	buf++; point--; len--;      /* FIXME for UTF-8 */
-+	buf++; point--; len--;
-      }
-    SLsmg_erase_eol ();
-    SLsmg_gotorc (SLtt_Screen_Rows - 1, col);
-@@ -227,6 +228,8 @@
- {
-    SLang_RLine_Info_Type *rli;
-    unsigned int flags = SL_RLINE_BLINK_MATCH;
-+   if (Most_UTF8_Mode)
-+     flags |= SL_RLINE_UTF8_MODE;
-    
-    if (NULL == (rli = SLrline_open (SLtt_Screen_Cols, flags)))
-      return NULL;
-@@ -258,7 +261,7 @@
- 
-    /* do not use default.  The up arrow can always get it back. */
-    if ((what != NULL) 
--       && (*what) && (what != Most_Search_Str))
-+       && (*what) && (what != (char *) Most_Search_Str))
-      {
- 	if (-1 == SLrline_set_line (Most_RLI, what))
- 	  return -1;
-@@ -593,7 +596,8 @@
-    unsigned int num_chars;
-    unsigned int field_width, info_len;
-    unsigned char *eob;
--   int r, x;
-+   int r;
-+   long long x;
- 
-    eob = Most_Eob;
- #if MOST_HAS_MMAP
-@@ -601,20 +605,20 @@
-      eob = Most_Beg + Most_Buf->mmap_size;
- #endif
-    
--   if (eob == Most_Beg) x = 100;
-+   if (eob == Most_Beg) x = 100LL;
-    else
-      {
--	x = Most_C_Offset * 100;
-+	x = Most_C_Offset * 100LL;
- 	x = x / (eob - Most_Beg);
-      }
- 
-    if (Most_C_Line + (Most_Win->bot - Most_Win->top + 1) >= Most_Num_Lines)
--     x = 100;
-+     x = 100LL;
- 
-    /* for files with end of file above the bottom row (due to window manipulations) */
--   if (x > 100) x = 100;
-+   if (x > 100LL) x = 100LL;
- 
--   sprintf (info, "(%d,%d) %d%%", Most_C_Line, Most_Column, x);
-+   sprintf (info, "(%lld,%lld) %d%%", Most_C_Line, Most_Column, (int)x);
- 
-    r = Most_Win->bot + 1;
-    most_goto_rc (r,1);
---- most-4.10.2.orig/src/window.h
-+++ most-4.10.2/src/window.h
-@@ -5,11 +5,11 @@
- typedef struct _Most_Window_Type
- {
-    unsigned long top_offset; /* offset of top line of window from bob */
--   int beg_line;             /* line number of top */
--   int curs_line;            /* line number of curs pos */
--   int curs_col;             /* column number of curs pos */
-+   long long beg_line;       /* line number of top */
-+   long long curs_line;      /* line number of curs pos */
-+   long long curs_col;       /* column number of curs pos */
-    unsigned long curs_offset;  /* pos of cursor from bob*/
--   int col;                  /* column offset */
-+   long long col;             /* column offset */
-    int n_lines;              /* number of lines of buffer (mode dependent) */
-    int top;                  /* screen location of top */
-    int bot;                  /* screen location of bot */
-@@ -29,9 +29,9 @@
- extern Most_Window_Type *Most_Win;
- extern Most_Window_Type *Most_Top_Win;
- extern unsigned long Most_Curs_Offset;
--extern int Most_Column;
--extern int Most_Curs_Row;
--extern int Most_Curs_Col;
-+extern long long Most_Column;
-+extern long long Most_Curs_Row;
-+extern long long Most_Curs_Col;
- #define MOST_MINI_BUF_LEN	256
- extern char Most_Mini_Buf[MOST_MINI_BUF_LEN];
- extern int Most_Selective_Display;
diff --git a/abs/extra-testing/mozilla-common/PKGBUILD b/abs/extra-testing/mozilla-common/PKGBUILD
deleted file mode 100644
index 563ebf4..0000000
--- a/abs/extra-testing/mozilla-common/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Id: PKGBUILD 3686 2008-06-29 10:43:22Z jgc $
-# Maintainer: dale <dale@archlinux.org>
-
-pkgname=mozilla-common
-pkgver=1.2
-pkgrel=1
-pkgdesc="Common Initialization Profile for Mozilla.org products"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.mozilla.org/"
-source=(mozilla-common.sh)
-md5sums=('2ecf5090ce1170c7e280e8d726952f8a')
-
-build() {
-  install -m755 -d ${startdir}/pkg/etc/profile.d
-  install -m755 ${startdir}/src/mozilla-common.sh ${startdir}/pkg/etc/profile.d/ || return 1
-}
diff --git a/abs/extra-testing/mozilla-common/mozilla-common.sh b/abs/extra-testing/mozilla-common/mozilla-common.sh
deleted file mode 100755
index 4b73259..0000000
--- a/abs/extra-testing/mozilla-common/mozilla-common.sh
+++ /dev/null
@@ -1 +0,0 @@
-export MOZ_PLUGIN_PATH="/usr/lib/mozilla/plugins:/opt/mozilla/lib/plugins"
diff --git a/abs/extra-testing/mpeg_stat/PKGBUILD b/abs/extra-testing/mpeg_stat/PKGBUILD
deleted file mode 100644
index 37be249..0000000
--- a/abs/extra-testing/mpeg_stat/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
-pkgname=mpeg_stat
-pkgver=2.2b
-pkgrel=2
-pkgdesc="A Berkely MPEG Tools bitstream analysis tool."
-arch=('i686' 'x86_64')
-url="http://bmrc.berkeley.edu/ftp/pub/multimedia/mpeg/"
-license=('custom')
-depends=('ffmpeg')
-source=(http://www.sfr-fresh.com/unix/misc/old/${pkgname}-${pkgver}-src.tar.gz)
-
-build() {
-
-cd $startdir/src/mpeg_stat
-make || return 1
-install -m755 -D $startdir/src/mpeg_stat/mpeg_stat $startdir/pkg/usr/bin/mpeg_stat
-install -m644 -D $startdir/src/mpeg_stat/COPYRIGHT $startdir/pkg/usr/share/licenses/mpeg_stat/COPYRIGHT
-}
-
diff --git a/abs/extra-testing/mpgtx/PKGBUILD b/abs/extra-testing/mpgtx/PKGBUILD
deleted file mode 100644
index 1181564..0000000
--- a/abs/extra-testing/mpgtx/PKGBUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-pkgname="mpgtx"
-pkgver="1.3.1"
-pkgrel=1
-arch=('i686')
-pkgdesc="mpgtx is a commandline MPEG audio/video/system file toolbox."
-url="http://mpgtx.sourceforge.net/"
-source=(http://downloads.sourceforge.net/project/mpgtx/mpgtx/$pkgver/mpgtx-$pkgver.tar.gz)
-md5sums=('d628060aa04ad3b40a175bf35f5167cf')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make INSTALLDIR=$startdir/pkg/usr/bin MANDIR=$startdir/pkg/usr/man/man1 MANDIRDE=$startdir/usr/man/de/man1 install
-}
-
diff --git a/abs/extra-testing/mupen64plus-svn/PKGBUILD b/abs/extra-testing/mupen64plus-svn/PKGBUILD
deleted file mode 100644
index 5df794d..0000000
--- a/abs/extra-testing/mupen64plus-svn/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-#!!! Due to a limitation in pacman's SVN package handling,
-# this package requires out-of-the-ordinary building. pacman checks 
-# the SVN repo for new revisions before scanning the PKGBUILD.
-#!!! So, when you run makepkg, if it asks you for a password for 'mupen64',
-# give it 'Dyson5632-kart' without the quotes. If it asks for a password
-# for _your_ username, hit Enter to make it ask for a new username, tell it
-# 'mupen64' without the quotes, and then give it the password above. When
-# it asks you to save the password unencrypted, you can say yes, because
-# it's just a read-only access login :P Once you do that, you shouldn't
-# need to do the above anymore.
-
-# Maintainer: Devin Cofer <ranguvar@archlinux.us>
-# Contributor: Rudy Matela <rudy.matela@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Zephyr
-
-pkgname=mupen64plus-svn
-pkgver=1416
-pkgrel=1
-pkgdesc="Nintendo64 emulator, SVN version"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/mupen64plus/"
-license=('GPL2')
-
-makedepends=('subversion' 'pkgconfig' 'libsamplerate' 'yasm' 'mesa')
-depends=('gtk2' 'sdl_ttf')
-optdepends=('libsamplerate: Higher quality audio')
-conflicts=('mupen64plus')
-provides=('mupen64plus')
-source=('install.patch'
-        'fix-gcc4.4-const-char.patch')
-md5sums=('f6a3bc6e59d4f2af9db1b3fce257eb43'
-         '7bb0182949bf043847ad7ff66097e66f')
-
-_svnuser=mupen64
-_svnpass=Dyson5632-kart
-_svntrunk=svn://$_svnuser:$_svnpass@fascination.homelinux.net:7684/mupen64plus/trunk
-_svnmod=mupen64plus
-
-build() {
-	if [ -d $_svnmod/.svn ]; then
-		(cd $_svnmod &&\
-		svn up --config-dir . -r $pkgver \
-		--non-interactive --username $_svnuser --password $_svnpass)
-	else
-		svn co $_svntrunk --config-dir . -r $pkgver $_svnmod \
-		--non-interactive --username $_svnuser --password $_svnpass
-	fi
-	msg "SVN checkout done or server timeout"
-
-	cp -r $_svnmod $_svnmod-build
-	patch -d $_svnmod-build < install.patch || return 1
-#	patch -p0 -d $_svnmod-build < fix-gcc4.4-const-char.patch || return 1
-	cd $_svnmod-build
-
-	make PREFIX="/usr" LIRC=1 all || return 1
-	make PREFIX="$pkgdir/usr" install || return 1
-
-	##### Qt 4 GUI build #####
-	#==> Currently broken
-	#make PREFIX="/usr" GUI=QT4 all || return 1
-	#install -m755 mupen64plus "$pkgdir/usr/bin/mupen64plus-qt"
-	#
-	#cd "$pkgdir/usr/share/applications"
-	#cp mupen64plus.desktop mupen64plus-qt.desktop
-	#sed -i "s#Name=Mupen64Plus#Name=Mupen64Plus (Qt)#" mupen64plus-qt.desktop || return 1
-	#sed -i "s#Exec=mupen64plus#Exec=mupen64plus-qt#" mupen64plus-qt.desktop || return 1
-	##### End Qt 4 GUI build #####
-
-	rm -r "$srcdir/$_svnmod-build"
-}
diff --git a/abs/extra-testing/mupen64plus-svn/fix-gcc4.4-const-char.patch b/abs/extra-testing/mupen64plus-svn/fix-gcc4.4-const-char.patch
deleted file mode 100644
index fd1495d..0000000
--- a/abs/extra-testing/mupen64plus-svn/fix-gcc4.4-const-char.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- glide64/Combine.old.cpp     2009-06-19 17:59:20.191723065 -0400
-+++ glide64/Combine.cpp 2009-06-19 18:43:46.955453868 -0400
-@@ -11873,7 +11873,7 @@
-   LOG ("InitCombine() ");
-   memset(&cmb, 0, sizeof(cmb));
-   const char *extensions = grGetString (GR_EXTENSION);
--  if (char * extstr = strstr(extensions, "COMBINE")) {
-+  if (const char * extstr = strstr(extensions, "COMBINE")) {
-     if (!strncmp(extstr, "COMBINE", 7)) {
-       LOG ("extensions ");
-       cmb.grColorCombineExt = (GRCOLORCOMBINEEXT) grGetProcAddress("grColorCombineExt");
---- glide64/Main.old.cpp        2009-06-19 18:47:04.238930057 -0400
-+++ glide64/Main.cpp    2009-06-19 18:47:18.018772876 -0400
-@@ -784,7 +784,7 @@
-   printf("bebefore2\n");
-   if (settings.fb_hires)
-   {
--    if (char * extstr = strstr(extensions, "TEXTUREBUFFER")) 
-+    if (const char * extstr = strstr(extensions, "TEXTUREBUFFER")) 
-     {
-       if (!strncmp(extstr, "TEXTUREBUFFER", 13)) 
-       {
diff --git a/abs/extra-testing/mupen64plus-svn/install.patch b/abs/extra-testing/mupen64plus-svn/install.patch
deleted file mode 100644
index 5e41460..0000000
--- a/abs/extra-testing/mupen64plus-svn/install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: install.sh
-===================================================================
---- install.sh	(revision 1295)
-+++ install.sh	(working copy)
-@@ -90,7 +90,7 @@
- if [ -f mupen64plus.desktop ]
- then
-     $INSTALL -d -v "${APPLICATIONSDIR}"
--    $INSTALL -m 0644 mupen64plus.desktop "${APPLICATIONSDIR}"
-+    $INSTALL -m 0644 mupen64plus.desktop "${APPLICATIONSDIR}/mupen64plus.desktop"
- fi
- if [ "x$(ls plugins/)" != "x" ]
- then
diff --git a/abs/extra-testing/mutt/PKGBUILD b/abs/extra-testing/mutt/PKGBUILD
deleted file mode 100644
index c481eec..0000000
--- a/abs/extra-testing/mutt/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 50055 2009-08-19 01:49:30Z thayer $
-# Maintainer: tobias [tobias [at] archlinux.org]
-pkgname=mutt
-pkgver=1.5.20
-pkgrel=2
-pkgdesc="A small but very powerful text-based mail client"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.mutt.org/"
-depends=('slang' 'openssl>=0.9.8e' 'gdbm' 'mime-types' 'zlib' 'libsasl' 'gpgme')
-makedepends=('gnupg')
-install=${pkgname}.install
-source=(ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz 
-        mutt-unmailbox.patch)
-url="http://www.mutt.org/"
-md5sums=('027cdd9959203de0c3c64149a7ee351c'
-         'fa8e03a49a2fa7b294dc8237d928cdb7')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # patch a segfault bug in 1.5.20 -- remove for next release
-  patch -p1 < ${srcdir}/mutt-unmailbox.patch || return 1
-  #patch -Np1 -i ../mutt-unmailbox.patch || exit 1
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --enable-pop --enable-imap --enable-smtp \
-    --with-sasl --with-ssl=/usr --without-idn \
-    --enable-hcache --enable-pgp --enable-inodesort \
-	 --enable-compressed --with-regex \
-	 --enable-gpgme --with-slang=/usr
-  make || return 1
-  make DESTDIR=${pkgdir} install
-  rm -f ${pkgdir}/usr/bin/{flea,muttbug}
-  rm -f ${pkgdir}/usr/share/man/man1/{flea,muttbug}.1
-  rm -f ${pkgdir}/etc/mime.types*
-  install -Dm644 contrib/gpg.rc ${pkgdir}/etc/Muttrc.gpg.dist
-}
-
diff --git a/abs/extra-testing/mutt/mutt-unmailbox.patch b/abs/extra-testing/mutt/mutt-unmailbox.patch
deleted file mode 100644
index cbb3210..0000000
--- a/abs/extra-testing/mutt/mutt-unmailbox.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/buffy.c	2009-08-10 08:23:12.731846990 -0400
-+++ b/buffy.c	2009-08-10 08:23:50.541878087 -0400
-@@ -236,7 +236,6 @@
-     {
-       if(*tmp)
-       {
--        FREE (&((*tmp)->path));
-         tmp1=(*tmp)->next;
-         FREE (tmp);		/* __FREE_CHECKED__ */
-         *tmp=tmp1;
diff --git a/abs/extra-testing/mutt/mutt.install b/abs/extra-testing/mutt/mutt.install
deleted file mode 100644
index 98ece96..0000000
--- a/abs/extra-testing/mutt/mutt.install
+++ /dev/null
@@ -1,15 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  cat << EOM
-
---> to support gpg, please use the following line in your ~/.muttrc
-
-source /etc/Muttrc.gpg.dist
-
-EOM
-}
-
-post_upgrade() {
-  post_install $1
-}
-
diff --git a/abs/extra-testing/myt2xvid3/PKGBUILD b/abs/extra-testing/myt2xvid3/PKGBUILD
deleted file mode 100755
index abd7cb5..0000000
--- a/abs/extra-testing/myt2xvid3/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-pkgname=myt2xvid3
-pkgver=0.1
-pkgrel=9
-arch=("i686")
-pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
-url="http://www.knoppmythwiki.org/index.php?page=XvidEncoding"
-depends=('nuvexport')
-install="myt2xvid3.install"
-source=( myt2xvid3 myt2xvid3-userjob.sh archive.php)
-
-
-build() {
-	cd $startdir/src
-	install -D -m 755 myt2xvid3 $startdir/pkg/usr/bin/myt2xvid3
-	install -D -m 755 myt2xvid3-userjob.sh $startdir/pkg/usr/bin/myt2xvid3-userjob.sh
-	mkdir -m777 -p $startdir/pkg/myth/video/archive/
-	install -D -m 755 archive.php $startdir/pkg/myth/video/archive/
-}
diff --git a/abs/extra-testing/myt2xvid3/archive.php b/abs/extra-testing/myt2xvid3/archive.php
deleted file mode 100644
index f970868..0000000
--- a/abs/extra-testing/myt2xvid3/archive.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?
-//archive.php
-// based on m2iweb.php by http://anthony.lusby.us/m2iweb/
-//release 0.1
-//10/05/07
-?>
-
-<html>
-<head>
-    <title>MythWeb - Archive Recordings</title>
-
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-
-    <script type="text/javascript" src="/mythweb/js/init.js"></script>
-    <script type="text/javascript" src="/mythweb/js/browser.js"></script>
-    <script type="text/javascript" src="/mythweb/js/utils.js"></script>
-
-    <script type="text/javascript" src="/mythweb/js/mouseovers.js"></script>
-    <script type="text/javascript" src="/mythweb/js/visibility.js"></script>
-    <script type="text/javascript" src="/mythweb/js/ajax.js"></script>
-
-    <link rel="stylesheet" type="text/css" href="/mythweb/skins/default/style.css" />
-    <link rel="stylesheet" type="text/css" href="/mythweb/skins/default/header.css" />
-    <link rel="stylesheet" type="text/css" href="/mythweb/skins/default/menus.css" />
-    <link rel="stylesheet" type="text/css" href="/mythweb/skins/default/programming.css" />
-
-    <link rel="stylesheet" type="text/css" href="/mythweb/skins/default/status.css" />
-
-</head>
-
-<body>
-
-<div id="page_header" class="clearfix">
-    <div id="logo_box">
-        <a id="mythtv_logo" href="/mythweb/">
-        <img src="/mythweb/skins/default/img/mythtv-logo.png" 
-width="174" height="48" border="0" alt="MythTV" class="alpha_png">
-        </a>
-
-    </div>
-    <div id="sections">
-        <a id="tv_link" href="/mythweb/tv" onmouseover="return help_text('TV functions, including recorded programs.')" onmouseout="return help_text()">
-            <img src="/mythweb/skins/default/img/tv.png" width="48" height="48" class="alpha_png" alt="MythTV"/>
-        </a>
-        <a id="video_link" href="/mythweb/video" onmouseover="return help_text('MythVideo on the web.')" onmouseout="return help_text()">
-            <img src="/mythweb/skins/default/img/video.png" width="48" height="48" class="alpha_png" alt="MythVideo" />
-        </a>
-        <a id="weather_link" href="/mythweb/weather" onmouseover="return help_text('MythWeb Weather.')" onmouseout="return help_text()">
-            <img src="/mythweb/skins/default/img/weather.png" width="48" height="48" class="alpha_png" alt="MythWeather" />
-        </a>
-        <a id="settings_link" href="/mythweb/settings" onmouseover="return help_text('Edit MythWeb and some MythTV settings.')" onmouseout="return help_text()">
-            <img src="/mythweb/skins/default/img/settings.png" width="48" height="48" class="alpha_png" alt="Settings" />
-        </a>
-    </div>
-    <div id="extra_header">
-        <div id="help_wrapper">
-            <div id="help_box">
-
-                <div id="help_text_default">
-                MythWeb: Mon May 16, 2006, 09:09 PM                </div>
-                <div id="help_text">
-                </div>
-            </div>
-        </div>
-        <div id="search" >
-            <form action="/mythweb/tv/search" method="post">
-
-                <div id="simple_search">
-                    <input id="search_text" type="text" name="searchstr" size="15" value="">
-                    <input id="search_submit" type="submit" class="submit" value="Search"> (<a href="/mythweb/tv/search">Advanced</a>)
-                </div>
-                <div id="search_options">
-                </div>
-            </form>
-
-        </div>
-    </div>
-</div>
-
-
-<table width="100%" border="0" cellspacing="2" cellpadding="0">
-<tr>
-
-    <td colspan="2" class="menu menu_border_t menu_border_b"><table class="body" width="100%" border="0" 
-
-cellspacing="2" cellpadding="2">
-        <tr>
-            <td><div id="command_choices">
-                    <a href="/mythweb/" id="category_legend" onmouseover="popup('category_legend'); return true;">MythTV:</a> &nbsp; &nbsp;
-
-                    <a href="/mythweb/tv/list">Listings</a>
-                    &nbsp; | &nbsp;
-                    <a href="/mythweb/tv/searches">Searches</a>
-                    &nbsp; | &nbsp;
-                    <a href="/mythweb/tv/schedules">Recording Schedules</a>
-                    (<a href="/mythweb/tv/schedules/manual">Manual</a>,
-                    <a href="/mythweb/tv/schedules/custom">Custom</a>)
-                    &nbsp; | &nbsp;
-                    <a href="/mythweb/tv/upcoming">Upcoming Recordings</a>
-                    &nbsp; | &nbsp;
-                    <a href="/mythweb/tv/recorded">Recorded Programs</a>
-                    &nbsp; | &nbsp;
-                    <a href="/ipodfeed/m2iweb.php">Myth2iPod</a>
-                    &nbsp; | &nbsp;
-                    <a href="/archive/archive.php">Myt2XviD3</a>
-                    &nbsp; | &nbsp;
-                    <a href="/mythweb/status">Backend Status</a>
-                </div></td>
-        </tr>
-        </table></td>
-
-</tr>
-</table>
-
-<table width="100%" border="0" cellpadding="4" cellspacing="2" class="list small">
-<tr><td colspan="10" class="list_separator">View and delete recordings transcoded to XviD via Myt2XviD3.</td></tr>
-<?php
-if (isset($_REQUEST['delete'])){
-	$delete = $_REQUEST['delete'];
-	if ($delete AND substr($delete, -9) == ".XviD.xml") {
-  echo '<tr><td colspan="10" class="list_separator">
-        <font color="red">';
-  echo $delete;
-  unlink($delete) or print(" failed to be ");
-  echo ' has been deleted, ';
-  $deletetoo = substr($delete, 0, -3)."avi";
-  echo $deletetoo;
-  unlink($deletetoo) or print(" failed to be ");
-  echo ' has been deleted.';
-  echo'</td></tr>';
-	}
-}
-  $i=1;
-  foreach (glob("*.XviD.xml") as $file) {
-    $lines = file($file);
-    echo '<tr class="recorded"><td class="list">&nbsp;</td><td>';
-    echo '<font color="';
-    if (!file_exists(substr($file, 0, -3)."avi")) {
-      echo "red";
-    }
-    echo '">'.$i.'</font>';
-    echo "</td></td><td><a href=".'"'.substr($file, 0, -3)."avi".'"'."style='color:white'>".strip_tags($lines[1])."</a></td><td>".strip_tags($lines[7])."</td><td>".strip_tags($lines[6])."</td><td nowrap>".filesizeparse(filesize(substr($file, 0, -3)."avi"))."</td><td>".'<a href="?delete='.$file.'" onclick="return confirm('."'Are you sure you want to delete?'".')">Delete</a>'."</td>".'<td class="list">&nbsp;</td>'."</tr>";
-    $i++;
-  }
-//}
-
-function filesizeparse($size){
-  $i=0;
-  $iec = array(" B", " KB", " MB", " GB", " TB");
-  while (($size/1024)>1) {
-   $size=$size/1024;
-   $i++;
-  }
-  return substr($size,0,strpos($size,'.')+3).$iec[$i];
-}
-?>
-</table>
-</body>
-</html>
diff --git a/abs/extra-testing/myt2xvid3/myt2xvid3 b/abs/extra-testing/myt2xvid3/myt2xvid3
deleted file mode 100755
index af65188..0000000
--- a/abs/extra-testing/myt2xvid3/myt2xvid3
+++ /dev/null
@@ -1,310 +0,0 @@
-#!/usr/bin/perl -w

-# VERSION: 1.0b2 - myth2ipod

-# Get the latest version, and change log at myth2ipod.com

-# Author: Chris aka Wififun - email: wififun@myth2ipod.com 

-# Contributions and testing by Paul Egli

-# modified to use nuvexport by starv at juniks dot org

-

-# Includes

-use DBI;

-use Getopt::Long;

-use File::Path;

-

-# User variables

-my $portable = "XviD";

-my $feedfile = "/myth/video/archive/feed.php";

-my $feedpath = "/myth/video/archive/";

-my $wwwloc = "/data/srv/httpd/htdocs";

-my $feedurl = "http://REPLACEME/archive/";

-my $nuvoptions ="--mode=XviD --nice=19 --cutlist --nodenoise --nodeinterlace --crop --multipass";

-

-# Some variables

-our ($dest, $format, $usage);

-our ($db_host, $db_user, $db_name, $db_pass, $video_dir);

-our ($hostname, $db_handle, $sql, $statement, $row_ref);

-our ($chanid, $start, $nuvfile, @nuvarray);	

-my $rebuild = '0';

-my $encode = '0';

-my $debug = '0';

-my $setup = '0';

-my $cut = '0';

-my( $rightnow ) = `date`; 

-

-GetOptions ("rebuild" => \$rebuild,

-	    "encode"   => \$encode,

-	    "debug"	=>	\$debug,

-	    "setup" => \$setup,

-	    "cut" => \$cut);

-

-if ($setup == 1){

-    system("clear");

-    print "Setup will do everything needed to run this script.\n";

-    print "This has only been tested on KnoppMyth R5A22.\n";

-    print "make sure you have edited the variables for your conguration.\n";

-    my $cksetup = &promptUser("\nAre you sure you want to procceed?","n");

-    if ($cksetup =~ "y") {

-	DoSetup();

-	exit;

-    }

-    print "Setup exited. Nothing done.\n";

-    exit;

-}

-elsif ($rebuild == 1){

-    GenerateRSSFeed();

-    print "Rebuilding of RSS feed is complete.\n";

-    exit;

-}

-else {

-    Encode4Portable();

-    print "$title is ready for your $portable\n";

-    

-    # Check to see if the feed file exists; if not, create it.

-    if (! -e $feedfile) { 

-	print "No feed file found. I will make one for you.\n";

-	GenerateRSSFeed();

-	print "All done.\n";

-    }

-}

-

-sub Encode4Portable{

-    if ($#ARGV != 1) { 

-	print "Encoding requires options.\nusage: myth2ipod <options> DIRECTORY FILE\n"; 

-	exit; 

-    }

-    

-    # Get the show information

-    $directory = $ARGV[0]; 

-    $file = $ARGV[1]; 

-    @file = split(/_/, $file);

-    $chanid = $file[0];

-    $start = substr $file[1],0,14;

-    if($debug == 1){ print "$chanid\n$start\n"};

-    if (! -e $directory."/".$file){

-	print "Oops, the file ".$directory.$file." does not exist.\n";

-	exit;

-    }

-    

-    # Connect to the database

-    PrepSQLRead();

-    $db_handle = DBI->connect("dbi:mysql:database=$db_name:host=$db_host", $db_user, $db_pass)

-	or die "Cannot connect to database: $!\n\n";

-    $sql = "SELECT title, subtitle, description, category, starttime FROM recorded WHERE chanid = $chanid AND DATE_FORMAT(starttime,'%Y%m%d%H%i%s') = $start";

-

-    $statement = $db_handle->prepare($sql)

-	or die "Couldn't prepare query '$sql': $DBI::errstr\n";

-    

-    $statement->execute()

-	or die "Couldn't execute query '$sql': $DBI::errstr\n";

-    $row_ref = $statement->fetchrow_hashref();

-    if($debug == 1){ print "$row_ref->{starttime}\n"};

-    $title = $row_ref->{title}; 

-    $subtitle = $row_ref->{subtitle};

-    $recorddate = $row_ref->{starttime}; 

-    $description = $row_ref->{description};

-    $category = $row_ref->{category};

-    $filename = $title."-".$subtitle."-".substr $start, 0, 8;

-    $filename =~ s/ /_/g;

-    $filename =~ s/&/+/g;

-    $filename =~ s/\047//g;

-    $filename =~ s/[^+0-9a-zA-Z_-]+/_/g;

-    $filename =~ s/_$//g;

-    

-    printf("Starting nuvexport...\n"); 

-    EncodeIt(); 

-    printf("Nuvexport completed, starting xml generation...\n"); 

-    CreateItemXML(); 

-    printf("XML file created for \"$filename\" : Yipeee\n"); 

-    printf("Cleaning up temporary files\n"); 

-    $cmd = "rm -f $feedpath$chanid\_$start.temp.mp4";

-    print $cmd."\n";

-    if(system($cmd)) { print "Removing nuvexport temp file failed\n"; }

-    

-    # remove the cutlist incase we added it.

-    if ($cut == 1){

-	printf("Generating cutlist\n"); 

-	$cmd = "/usr/bin/mythcommflag --chanid $chanid --starttime $start --clearcutlist";

-	print $cmd."\n"; 

-	if(system($cmd)) { print "It looks like I was not able to generate a cutlist.\n"; } 

-    }

-    return 0;

-}

-

-#

-# Encode for Portable

-#

-sub EncodeIt { 

-    # Create cutlist from commercial flagging if -cut was passed to the script

-    if ($cut == 1){

-	printf("Generating cutlist\n"); 

-	$cmd = "/usr/bin/mythcommflag --chanid $chanid --starttime $start --gencutlist";

-	print $cmd."\n"; 

-	if(system($cmd)) { print "It looks like I was not able to generate a cutlist.\n"; } 

-    }

-    

-    # Use nuvexport to do the work

-    $cmd = "/usr/bin/nuvexport --chanid=$chanid --start=$start $nuvoptions --filename=$chanid\_$start.$portable --path=$feedpath";

-    print $cmd."\n"; 

-    if(system($cmd)) { print "Nuvexport encoding seems to have failed\n"; } 

-    

-    # Now clean up the output so iPods with firmware 1.1 and above can use it

-    #$cmd = "/usr/local/bin/MP4Box -add $feedpath$chanid\_$start.temp.mp4 $feedpath$chanid\_$start.$portable.mp4";

-    #print $cmd."\n"; 

-    #if(system($cmd)) { print "MP4Box cleanup seems to have failed\n"; } 

-    return 0;

-}

-

-#

-# Create XML with <ITEM> tag for this video file

-#

-sub CreateItemXML {

-    open(ITEM, ">$feedpath$chanid\_$start.$portable.xml");

-    print ITEM "<item>\n";  

-    print ITEM "<title>".&encodeForXML($title." - ".$subtitle)."</title>\n";

-    print ITEM "<itunes:author>MythTV</itunes:author>\n";  

-    print ITEM "<author>MythTV</author>\n";  

-    print ITEM "<itunes:category text=\"TV Shows\"></itunes:category>\n";

-    print ITEM "<comments>".&encodeForXML($file)."</comments>\n";  

-    print ITEM "<description>".&encodeForXML($description)."</description>\n";  

-    print ITEM "<pubDate>".$recorddate."</pubDate>\n";  

-    print ITEM "<enclosure url=\"".&encodeForXML("$feedurl$chanid\_$start.$portable.avi")."\" type=\"video/quicktime\" />\n";  

-    print ITEM "<itunes:duration></itunes:duration>\n";  

-    print ITEM "<itunes:keywords>".&encodeForXML($title." - ".$subtitle." - ".$category)."</itunes:keywords>\n";

-    print ITEM "<category>".&encodeForXML($category)."</category>\n";			

-    print ITEM "</item>\n";

-    print "\"$filename\" has been added to the feed.\n";

-    close(ITEM);

-    return 0;

-}

-

-#

-# Generate the RSS feed by combining the ITEM XML Files

-#

-sub GenerateRSSFeed {

-

-    open(RSS, ">$feedfile");

-    print RSS "<?php\n"; 

-    print RSS "header(\"Content-Type: text/xml\");\n"; 

-    print RSS "echo \"<?xml version=\\\"1.0\\\" encoding=\\\"UTF-8\\\"?>\"; ?>\n"; 

-    print RSS "<rss xmlns:itunes=\"http://www.itunes.com/DTDs/Podcast-1.0.dtd\" version=\"2.0\">\n"; 

-    print RSS "<channel>\n"; 

-    print RSS "<title>MythTV - <? if (\$_GET['title'] == \"\") { \$title = \"*\"; echo \"Recorded Programs\"; }\n";

-    print RSS "else { \$title = \$_GET['title']; echo str_replace(\"_\",\" \",\$_GET['title']); } ?> </title>\n";

-    print RSS "<itunes:author>MythTV - myth2ipod</itunes:author>\n"; 

-    print RSS "<link>".&encodeForXML($feedurl)."</link>\n";

-    print RSS "<itunes:subtitle>Transcoded recording for your iPod Video.</itunes:subtitle>\n"; 

-    print RSS "<itunes:summary>Myth TV Recorded Programs for the iPod v.1</itunes:summary>\n"; 

-    print RSS "<description>Myth TV Recorded Programs for the iPod v.1</description>\n"; 

-    print RSS "<itunes:owner>\n"; 

-    print RSS "<itunes:name>MythTV</itunes:name>\n"; 

-    print RSS "<itunes:email>mythtv\@localhost</itunes:email>\n"; 

-    print RSS "</itunes:owner>\n"; 

-    print RSS "<itunes:explicit>No</itunes:explicit>\n"; 

-    print RSS "<language>en-us</language>\n"; 

-    print RSS "<copyright>Copyright 2005.</copyright>\n"; 

-    print RSS "<webMaster>mythtv\@localhost</webMaster>\n"; 

-    print RSS "<itunes:image href=\"http://myth2ipod.com/mythipod_200.jpg\" />\n"; 

-    print RSS "<itunes:category text=\"TV Shows\"></itunes:category>\n"; 

-    print RSS "<category>TV Shows</category>\n";

-    print RSS "<itunes:image href=\"http://myth2ipod.com/mythipod_200.jpg\"/>";

-    print RSS "<image>"; 

-    print RSS "<url>http://myth2ipod.com/mythipod_200.jpg</url>\n";

-    print RSS "<title>MythTV 2 iPod</title>\n";

-    print RSS "<link>".&encodeForXML($feedurl)."</link>\n";	

-    print RSS "<width>200</width>\n";		

-    print RSS "<height>200</height>\n";		

-    print RSS "</image>\n";

-    print RSS "<? foreach (glob(\$title\.\"*\.$portable\.xml\") as \$file) {include \$file;} ?>\n";

-    print RSS "</channel>\n"; 

-    print RSS "</rss>\n";

-    close(RSS);

-    if($debug == 1){ print "I created a feed file, was I supposed to?\n"};

-

-    return 0;

-}

-

-# substitute for XML entities

-sub encodeForXML {

-    local $result;

-    $result = $_[0];

-    $result =~ s/&/&amp;/g;

-    $result =~ s/</&lt;/g;

-    $result =~ s/>/&gt;/g;

-    $result;

-}

-

-

-#

-# This code taken from one of the mythlink.sh scripts to get MySQL information

-#

-sub PrepSQLRead{

-# Get the hostname of this machine

-    $hostname = `hostname`;

-    chomp($hostname);

-    

-# Read the mysql.txt file in use by MythTV.

-# could be in a couple places, so try the usual suspects

-    my $found = 0;

-    my @mysql = ('/usr/local/share/mythtv/mysql.txt',

-                 '/usr/share/mythtv/mysql.txt',

-                 '/etc/mythtv/mysql.txt',

-                 '/usr/local/etc/mythtv/mysql.txt',

-                 "$ENV{HOME}/.mythtv/mysql.txt",

-                 'mysql.txt'

-	);

-    foreach my $file (@mysql) {

-        next unless (-e $file);

-        $found = 1;

-        open(CONF, $file) or die "Unable to open $file:  $!\n\n";

-        while (my $line = <CONF>) {

-	    # Cleanup

-            next if ($line =~ /^\s*#/);

-            $line =~ s/^str //;

-            chomp($line);

-	    # Split off the var=val pairs

-            my ($var, $val) = split(/\=/, $line, 2);

-            next unless ($var && $var =~ /\w/);

-            if ($var eq 'DBHostName') {

-                $db_host = $val;

-            }

-            elsif ($var eq 'DBUserName') {

-                $db_user = $val;

-            }

-            elsif ($var eq 'DBName') {

-                $db_name = $val;

-            }

-            elsif ($var eq 'DBPassword') {

-                $db_pass = $val;

-            }

-	    # Hostname override

-            elsif ($var eq 'LocalHostName') {

-                $hostname = $val;

-            }

-        }

-        close CONF;

-    }

-    die "Unable to locate mysql.txt:  $!\n\n" unless ($found && $db_host);

-    return 0;

-}

-

-sub promptUser {

-    local($promptString,$defaultValue) = @_;

-    if ($defaultValue) {

-	print $promptString, "[", $defaultValue, "]: ";

-    } else {

-	print $promptString, ": ";

-    }

-

-    $| = 1;               # force a flush after our print

-    $_ = <STDIN>;         # get the input from STDIN (presumably the keyboard)

-    chomp;

-    if ("$defaultValue") {

-	return $_ ? $_ : $defaultValue;    # return $_ if it has a value

-    } else {

-	return $_;

-    }

-}

-

-sub DoSetup {

-    print "\nNot ready yet. How do you send the cd command from perl?\n";

-    return 0;

-}

diff --git a/abs/extra-testing/myt2xvid3/myt2xvid3-userjob.sh b/abs/extra-testing/myt2xvid3/myt2xvid3-userjob.sh
deleted file mode 100755
index 6bd46ea..0000000
--- a/abs/extra-testing/myt2xvid3/myt2xvid3-userjob.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-. /etc/profile
-#su  mythtv -c "TERM=vt100 /usr/bin/myth2ipod "$1" "$2"  >/tmp/logfile"
-su  mythtv -c "TERM=vt100 /usr/bin/myt2xvid3 "$1" "$2" "
-#or to also use commercial flagging cutlist
-#su  mythtv -c "TERM=vt100 /usr/bin/myth2ipod -cut "$1" "$2"  >/tmp/logfile"
diff --git a/abs/extra-testing/myt2xvid3/myt2xvid3.install b/abs/extra-testing/myt2xvid3/myt2xvid3.install
deleted file mode 100755
index b3767f3..0000000
--- a/abs/extra-testing/myt2xvid3/myt2xvid3.install
+++ /dev/null
@@ -1,38 +0,0 @@
-
-pre_install() {
-	mkdir -p /myth/video/archive
-	chown mythtv:http /myth/video/archive
-}
-
-pre_upgrade() {
-  pre_install
-}
-
-pre_remove() {
-  pre_install
-}
-
-post_install() {
-	. /etc/systemconfig
-	ln -s /myth/video/archive /data/srv/httpd/htdocs/archive
-	ln -s /myth/video/archive/archive.php /myth/video/archive/index.php
-	sed -i -e "s/REPLACEME/$HOSTNAME/g" /usr/bin/myt2xvid3
-	chown -R mythtv:http /myth/video/archive
-	/usr/bin/myt2xvid3 -rebuild
-}
-
-post_upgrade() {
-	/usr/bin/myt2xvid3 -rebuild
-}
-
-post_remove() {
- 	rm -fr /data/srv/http/htdocs/archive
-	rm -rf /myth/video/archive/index.php
-	rm -rf /myth/video/archive/archive.php
-	# don't delete content that the user may still want, so leave /myth/video/archive
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/abs/extra-testing/myth2ipod/PKGBUILD b/abs/extra-testing/myth2ipod/PKGBUILD
deleted file mode 100755
index 2c7540b..0000000
--- a/abs/extra-testing/myth2ipod/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=myth2ipod
-pkgver=0.2
-pkgrel=29
-arch=("i686")
-pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
-url="myth2ipod.com"
-depends=('gpac' 'nuvexport' )
-install="myth2ipod.install"
-source=( myth2ipod iPod.pm myth2ipod-userjob.sh m2iweb.php)
-
-
-build() {
-	cd $startdir/src
-	install -D -m 755 myth2ipod $startdir/pkg/usr/bin/myth2ipod
-	install -D -m 755 myth2ipod-userjob.sh /$startdir/pkg/usr/bin/myth2ipod-userjob.sh
-	install -D -m755 iPod.pm $startdir/pkg/usr/share/nuvexport/export/ffmpeg/iPod.pm
-	mkdir -m755 -p $startdir/pkg/myth/ipodfeed
-	install -D -m755 m2iweb.php $startdir/pkg/myth/ipodfeed/
-}
diff --git a/abs/extra-testing/myth2ipod/iPod.pm b/abs/extra-testing/myth2ipod/iPod.pm
deleted file mode 100755
index 24eae99..0000000
--- a/abs/extra-testing/myth2ipod/iPod.pm
+++ /dev/null
@@ -1,184 +0,0 @@
-#
-# $Date: 2006-01-18 00:15:31 -0800 (Wed, 18 Jan 2006) $
-# $Revision: 226 $
-# $Author: xris $
-#
-#  export::ffmpeg::iPod
-#
-
-package export::ffmpeg::iPod;
-    use base 'export::ffmpeg';
-
-# Load the myth and nuv utilities, and make sure we're connected to the database
-    use nuv_export::shared_utils;
-    use nuv_export::cli;
-    use nuv_export::ui;
-    use mythtv::db;
-    use mythtv::recordings;
-
-# Load the following extra parameters from the commandline
-    add_arg('quantisation|q=i', 'Quantisation');
-    add_arg('a_bitrate|a=i',    'Audio bitrate');
-    add_arg('v_bitrate|v=i',    'Video bitrate');
-    add_arg('multipass!',       'Enably two-pass encoding.');
-
-    sub new {
-        my $class = shift;
-        my $self  = {
-                     'cli'      => qr/\bipod\b/i,
-                     'name'     => 'Export to iPod',
-                     'enabled'  => 1,
-                     'errors'   => [],
-                     'defaults' => {},
-                    };
-        bless($self, $class);
-
-    # Initialize the default parameters
-        $self->load_defaults();
-
-    # Verify any commandline or config file options
-        die "Audio bitrate must be > 0\n" unless (!defined $self->val('a_bitrate') || $self->{'a_bitrate'} > 0);
-        die "Video bitrate must be > 0\n" unless (!defined $self->val('v_bitrate') || $self->{'v_bitrate'} > 0);
-
-    # VBR, multipass, etc.
-        if ($self->val('multipass')) {
-            $self->{'vbr'} = 0;
-        }
-        elsif ($self->val('quantisation')) {
-            die "Quantisation must be a number between 1 and 31 (lower means better quality).\n" if ($self->{'quantisation'} < 1 || $self->{'quantisation'} > 31);
-            $self->{'vbr'} = 1;
-        }
-
-    # Initialize and check for ffmpeg
-        $self->init_ffmpeg();
-
-    # Can we even encode ipod?
-    #    if (!$self->can_encode('mov')) {
-    #        push @{$self->{'errors'}}, "Your ffmpeg installation doesn't support encoding to mov file formats.";
-    #    }
-        if (!$self->can_encode('xvid')) {
-            push @{$self->{'errors'}}, "Your ffmpeg installation doesn't support encoding to xvid video.";
-        }
-        if (!$self->can_encode('aac')) {
-            push @{$self->{'errors'}}, "Your ffmpeg installation doesn't support encoding to aac audio.";
-        }
-    # Any errors?  disable this function
-        $self->{'enabled'} = 0 if ($self->{'errors'} && @{$self->{'errors'}} > 0);
-    # Return
-        return $self;
-    }
-
-# Load default settings
-    sub load_defaults {
-        my $self = shift;
-    # Load the parent module's settings
-        $self->SUPER::load_defaults();
-    # Default bitrates
-        $self->{'defaults'}{'v_bitrate'} = 384;
-        $self->{'defaults'}{'a_bitrate'} = 64;
-    }
-
-# Gather settings from the user
-    sub gather_settings {
-        my $self = shift;
-    # Load the parent module's settings
-        $self->SUPER::gather_settings();
-    # Audio Bitrate
-        $self->{'a_bitrate'} = query_text('Audio bitrate?',
-                                          'int',
-                                          $self->val('a_bitrate'));
-    # VBR options
-        if (!$is_cli) {
-            $self->{'vbr'} = query_text('Variable bitrate video?',
-                                        'yesno',
-                                        $self->val('vbr'));
-            if ($self->{'vbr'}) {
-                $self->{'multipass'} = query_text('Multi-pass (slower, but better quality)?',
-                                                  'yesno',
-                                                  $self->val('multipass'));
-                if (!$self->{'multipass'}) {
-                    while (1) {
-                        my $quantisation = query_text('VBR quality/quantisation (1-31)?',
-                                                      'float',
-                                                      $self->val('quantisation'));
-                        if ($quantisation < 1) {
-                            print "Too low; please choose a number between 1 and 31.\n";
-                        }
-                        elsif ($quantisation > 31) {
-                            print "Too high; please choose a number between 1 and 31\n";
-                        }
-                        else {
-                            $self->{'quantisation'} = $quantisation;
-                            last;
-                        }
-                    }
-                }
-            } else {
-                $self->{'multipass'} = 0;
-            }
-        # Ask the user what video bitrate he/she wants
-            $self->{'v_bitrate'} = query_text('Video bitrate?',
-                                              'int',
-                                              $self->val('v_bitrate'));
-        }
-    }
-
-    sub export {
-        my $self    = shift;
-        my $episode = shift;
-    # Force to 4:3 aspect ratio
-        $self->{'out_aspect'}       = 1.3333;
-        $self->{'aspect_stretched'} = 1;
-    # PAL or NTSC?
-        my $standard = ($episode->{'finfo'}{'fps'} =~ /^2(?:5|4\.9)/) ? 'PAL' : 'NTSC';
-        $self->{'width'}   = 320;
-        $self->{'height'}  = ($standard eq 'PAL') ? '288' : '240';
-        $self->{'out_fps'} = ($standard eq 'PAL') ? 25    : 29.97;
-    # Embed the title
-        my $safe_title = shell_escape($episode->{'show_name'}.' - '.$episode->{'title'});
-    # Dual pass?
-        if ($self->{'multipass'}) {
-        # Build the common ffmpeg string
-            my $ffmpeg_xtra  = ' -b ' . $self->{'v_bitrate'}
-                              .' -bufsize 65535'
-                              .' -vcodec xvid -acodec aac '
-                              .' -ab ' . $self->{'a_bitrate'}
-                              ." -f mp4 -title $safe_title";
-        # Add the temporary file to the list
-            push @tmpfiles, "/tmp/xvid.$$.log";
-        # Back up the path and use /dev/null for the first pass
-            my $path_bak = $self->{'path'};
-            $self->{'path'} = '/dev/null';
-        # Build the ffmpeg string
-            print "First pass...\n";
-            $self->{'ffmpeg_xtra'}  = " -pass 1 -passlogfile '/tmp/divx.$$.log'"
-                                     .$ffmpeg_xtra;
-            $self->SUPER::export($episode, '');
-        # Restore the path
-            $self->{'path'} = $path_bak;
-        # Second Pass
-            print "Final pass...\n";
-            $self->{'ffmpeg_xtra'}  = " -pass 2 -passlogfile '/tmp/divx.$$.log'"
-                                     .$ffmpeg_xtra;
-        }
-    # Single Pass
-        else {
-            $self->{'ffmpeg_xtra'}  = ' -b ' . $self->{'v_bitrate'}
-                                     .(($self->{'vbr'})
-                                       ? ' -qmin '.$self->{'quantisation'}
-                                        .' -qmax 31 -minrate 32'
-                                        .' -maxrate '.(2*$self->{'v_bitrate'})
-                                        .' -bt 32'
-                                       : '')
-                                     .' -vcodec xvid -acodec aac '
-                                     .' -ab ' . $self->{'a_bitrate'}
-                                     ." -f mp4 -title $safe_title";
-        }
-    # Execute the (final pass) encode
-        $self->SUPER::export($episode, '.mp4');
-    }
-
-1;  #return true
-
-# vim:ts=4:sw=4:ai:et:si:sts=4
-
diff --git a/abs/extra-testing/myth2ipod/m2iweb.php b/abs/extra-testing/myth2ipod/m2iweb.php
deleted file mode 100755
index a8a9e4d..0000000
--- a/abs/extra-testing/myth2ipod/m2iweb.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?
-//archive.php
-// based on m2iweb.php by http://anthony.lusby.us/m2iweb/
-//release 0.1
-//10/05/07
-?>
-
-<html>
-<head>
-    <title>MythWeb - Archive Recordings</title>
-
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-
-    <script type="text/javascript" src="/mythweb/js/init.js"></script>
-    <script type="text/javascript" src="/mythweb/js/browser.js"></script>
-    <script type="text/javascript" src="/mythweb/js/utils.js"></script>
-
-    <script type="text/javascript" src="/mythweb/js/mouseovers.js"></script>
-    <script type="text/javascript" src="/mythweb/js/visibility.js"></script>
-    <script type="text/javascript" src="/mythweb/js/ajax.js"></script>
-
-    <link rel="stylesheet" type="text/css" href="/mythweb/skins/default/style.css" />
-    <link rel="stylesheet" type="text/css" href="/mythweb/skins/default/header.css" />
-    <link rel="stylesheet" type="text/css" href="/mythweb/skins/default/menus.css" />
-    <link rel="stylesheet" type="text/css" href="/mythweb/skins/default/programming.css" />
-
-    <link rel="stylesheet" type="text/css" href="/mythweb/skins/default/status.css" />
-
-</head>
-
-<body>
-
-<div id="page_header" class="clearfix">
-    <div id="logo_box">
-        <a id="mythtv_logo" href="/mythweb/">
-        <img src="/mythweb/skins/default/img/mythtv-logo.png" 
-width="174" height="48" border="0" alt="MythTV" class="alpha_png">
-        </a>
-
-    </div>
-    <div id="sections">
-        <a id="tv_link" href="/mythweb/tv" onmouseover="return help_text('TV functions, including recorded programs.')" onmouseout="return help_text()">
-            <img src="/mythweb/skins/default/img/tv.png" width="48" height="48" class="alpha_png" alt="MythTV"/>
-        </a>
-        <a id="video_link" href="/mythweb/video" onmouseover="return help_text('MythVideo on the web.')" onmouseout="return help_text()">
-            <img src="/mythweb/skins/default/img/video.png" width="48" height="48" class="alpha_png" alt="MythVideo" />
-        </a>
-        <a id="weather_link" href="/mythweb/weather" onmouseover="return help_text('MythWeb Weather.')" onmouseout="return help_text()">
-            <img src="/mythweb/skins/default/img/weather.png" width="48" height="48" class="alpha_png" alt="MythWeather" />
-        </a>
-        <a id="settings_link" href="/mythweb/settings" onmouseover="return help_text('Edit MythWeb and some MythTV settings.')" onmouseout="return help_text()">
-            <img src="/mythweb/skins/default/img/settings.png" width="48" height="48" class="alpha_png" alt="Settings" />
-        </a>
-    </div>
-    <div id="extra_header">
-        <div id="help_wrapper">
-            <div id="help_box">
-
-                <div id="help_text_default">
-                MythWeb: Mon May 16, 2006, 09:09 PM                </div>
-                <div id="help_text">
-                </div>
-            </div>
-        </div>
-        <div id="search" >
-            <form action="/mythweb/tv/search" method="post">
-
-                <div id="simple_search">
-                    <input id="search_text" type="text" name="searchstr" size="15" value="">
-                    <input id="search_submit" type="submit" class="submit" value="Search"> (<a href="/mythweb/tv/search">Advanced</a>)
-                </div>
-                <div id="search_options">
-                </div>
-            </form>
-
-        </div>
-    </div>
-</div>
-
-
-<table width="100%" border="0" cellspacing="2" cellpadding="0">
-<tr>
-
-    <td colspan="2" class="menu menu_border_t menu_border_b"><table class="body" width="100%" border="0" 
-
-cellspacing="2" cellpadding="2">
-        <tr>
-            <td><div id="command_choices">
-                    <a href="/mythweb/" id="category_legend" onmouseover="popup('category_legend'); return true;">MythTV:</a> &nbsp; &nbsp;
-
-                    <a href="/mythweb/tv/list">Listings</a>
-                    &nbsp; | &nbsp;
-                    <a href="/mythweb/tv/searches">Searches</a>
-                    &nbsp; | &nbsp;
-                    <a href="/mythweb/tv/schedules">Recording Schedules</a>
-                    (<a href="/mythweb/tv/schedules/manual">Manual</a>,
-                    <a href="/mythweb/tv/schedules/custom">Custom</a>)
-                    &nbsp; | &nbsp;
-                    <a href="/mythweb/tv/upcoming">Upcoming Recordings</a>
-                    &nbsp; | &nbsp;
-                    <a href="/mythweb/tv/recorded">Recorded Programs</a>
-                    &nbsp; | &nbsp;
-                    <a href="/ipodfeed/m2iweb.php">Myth2iPod</a>
-                    &nbsp; | &nbsp;
-                    <a href="/archive/archive.php">Myt2XviD3</a>
-                    &nbsp; | &nbsp;
-                    <a href="/mythweb/status">Backend Status</a>
-                </div></td>
-        </tr>
-        </table></td>
-
-</tr>
-</table>
-<table width="100%" border="0" cellpadding="4" cellspacing="2" class="list small">
-<tr><td colspan="10" class="list_separator">View information and delete myth2ipod recordings.</td></tr>
-<?php
-if (isset($_REQUEST['delete'])){
-$delete = $_REQUEST['delete'];
-if ($delete AND substr($delete, -9) == ".ipod.xml") {
-  echo '<br><font color="red">';
-  echo $delete;
-  unlink($delete) or print(" failed to be ");
-  echo 'deleted<br>';
-  $deletetoo = substr($delete, 0, -3)."mp4";
-  echo $deletetoo;
-  unlink($deletetoo) or print(" failed to be ");
-  echo 'deleted<br><br><a href="?">Home</a>';
-}
-}
-else {
-  $i=1;
-  foreach (glob("*.ipod.xml") as $file) {
-    $lines = file($file);
-    echo '<tr class="recorded"><td class="list">&nbsp;</td><td>';
-    echo '<font color="';
-    if (!file_exists(substr($file, 0, -3)."mp4")) {
-      echo "red";
-    }
-    echo '">'.$i.'</font>';
-    echo "</td></td><td><a href=".'"'.substr($file, 0, -3)."mp4".'"'."style='color:white'>".strip_tags($lines[1])."</a></td><td>".strip_tags($lines[7])."</td><td>".strip_tags($lines[6])."</td><td nowrap>".filesizeparse(filesize(substr($file, 0, -3)."mp4"))."</td><td>".'<a href="?delete='.$file.'" onclick="return confirm('."'Are you sure you want to delete?'".')">Delete</a>'."</td>".'<td class="list">&nbsp;</td>'."</tr>";
-    $i++;
-  }
-}
-function filesizeparse($size){
-  $i=0;
-  $iec = array(" B", " KB", " MB", " GB", " TB");
-  while (($size/1024)>1) {
-   $size=$size/1024;
-   $i++;
-  }
-  return substr($size,0,strpos($size,'.')+3).$iec[$i];
-}
-?>
-</table>
-</body>
-</html>
-</code>
diff --git a/abs/extra-testing/myth2ipod/myth2ipod b/abs/extra-testing/myth2ipod/myth2ipod
deleted file mode 100755
index baf749e..0000000
--- a/abs/extra-testing/myth2ipod/myth2ipod
+++ /dev/null
@@ -1,310 +0,0 @@
-#!/usr/bin/perl -w
-# VERSION: 1.0b2 - myth2ipod
-# Get the latest version, and change log at myth2ipod.com
-# Author: Chris aka Wififun - email: wififun@myth2ipod.com 
-# Contributions and testing by Paul Egli
-# modified to use nuvexport by starv at juniks dot org
-
-# Includes
-use DBI;
-use Getopt::Long;
-use File::Path;
-
-# User variables
-my $portable = "ipod";
-my $feedfile = "/myth/ipodfeed/feed.php";
-my $feedpath = "/myth/ipodfeed/";
-my $wwwloc = "/data/srv/httpd/htdocs";
-my $feedurl = "http://REPLACEME/ipodfeed/";
-my $nuvoptions ="--mode=iPod --nice=19 --cutlist --nodenoise --nodeinterlace --nomultipass";
-
-# Some variables
-our ($dest, $format, $usage);
-our ($db_host, $db_user, $db_name, $db_pass, $video_dir);
-our ($hostname, $db_handle, $sql, $statement, $row_ref);
-our ($chanid, $start, $nuvfile, @nuvarray);	
-my $rebuild = '0';
-my $encode = '0';
-my $debug = '0';
-my $setup = '0';
-my $cut = '0';
-my( $rightnow ) = `date`; 
-
-GetOptions ("rebuild" => \$rebuild,
-	    "encode"   => \$encode,
-	    "debug"	=>	\$debug,
-	    "setup" => \$setup,
-	    "cut" => \$cut);
-
-if ($setup == 1){
-    system("clear");
-    print "Setup will do everything needed to run this script.\n";
-    print "This has only been tested on KnoppMyth R5A22.\n";
-    print "make sure you have edited the variables for your conguration.\n";
-    my $cksetup = &promptUser("\nAre you sure you want to procceed?","n");
-    if ($cksetup =~ "y") {
-	DoSetup();
-	exit;
-    }
-    print "Setup exited. Nothing done.\n";
-    exit;
-}
-elsif ($rebuild == 1){
-    GenerateRSSFeed();
-    print "Rebuilding of RSS feed is complete.\n";
-    exit;
-}
-else {
-    Encode4Portable();
-    print "$title is ready for your $portable\n";
-    
-    # Check to see if the feed file exists; if not, create it.
-    if (! -e $feedfile) { 
-	print "No feed file found. I will make one for you.\n";
-	GenerateRSSFeed();
-	print "All done.\n";
-    }
-}
-
-sub Encode4Portable{
-    if ($#ARGV != 1) { 
-	print "Encoding requires options.\nusage: myth2ipod <options> DIRECTORY FILE\n"; 
-	exit; 
-    }
-    
-    # Get the show information
-    $directory = $ARGV[0]; 
-    $file = $ARGV[1]; 
-    @file = split(/_/, $file);
-    $chanid = $file[0];
-    $start = substr $file[1],0,14;
-    if($debug == 1){ print "$chanid\n$start\n"};
-    if (! -e $directory."/".$file){
-	print "Oops, the file ".$directory.$file." does not exist.\n";
-	exit;
-    }
-    
-    # Connect to the database
-    PrepSQLRead();
-    $db_handle = DBI->connect("dbi:mysql:database=$db_name:host=$db_host", $db_user, $db_pass)
-	or die "Cannot connect to database: $!\n\n";
-    $sql = "SELECT title, subtitle, description, category, starttime FROM recorded WHERE chanid = $chanid AND DATE_FORMAT(starttime,'%Y%m%d%H%i%s') = $start";
-
-    $statement = $db_handle->prepare($sql)
-	or die "Couldn't prepare query '$sql': $DBI::errstr\n";
-    
-    $statement->execute()
-	or die "Couldn't execute query '$sql': $DBI::errstr\n";
-    $row_ref = $statement->fetchrow_hashref();
-    if($debug == 1){ print "$row_ref->{starttime}\n"};
-    $title = $row_ref->{title}; 
-    $subtitle = $row_ref->{subtitle};
-    $recorddate = $row_ref->{starttime}; 
-    $description = $row_ref->{description};
-    $category = $row_ref->{category};
-    $filename = $title."-".$subtitle."-".substr $start, 0, 8;
-    $filename =~ s/ /_/g;
-    $filename =~ s/&/+/g;
-    $filename =~ s/\047//g;
-    $filename =~ s/[^+0-9a-zA-Z_-]+/_/g;
-    $filename =~ s/_$//g;
-    
-    printf("Starting nuvexport...\n"); 
-    EncodeIt(); 
-    printf("Nuvexport completed, starting xml generation...\n"); 
-    CreateItemXML(); 
-    printf("XML file created for \"$filename\" : Yipeee\n"); 
-    printf("Cleaning up temporary files\n"); 
-    $cmd = "rm -f $feedpath$chanid\_$start.temp.mp4";
-    print $cmd."\n";
-    if(system($cmd)) { print "Removing nuvexport temp file failed\n"; }
-    
-    # remove the cutlist incase we added it.
-    if ($cut == 1){
-	printf("Generating cutlist\n"); 
-	$cmd = "/usr/bin/mythcommflag --chanid $chanid --starttime $start --clearcutlist";
-	print $cmd."\n"; 
-	if(system($cmd)) { print "It looks like I was not able to generate a cutlist.\n"; } 
-    }
-    return 0;
-}
-
-#
-# Encode for Portable
-#
-sub EncodeIt { 
-    # Create cutlist from commercial flagging if -cut was passed to the script
-    if ($cut == 1){
-	printf("Generating cutlist\n"); 
-	$cmd = "/usr/bin/mythcommflag --chanid $chanid --starttime $start --gencutlist";
-	print $cmd."\n"; 
-	if(system($cmd)) { print "It looks like I was not able to generate a cutlist.\n"; } 
-    }
-    
-    # Use nuvexport to do the work
-    $cmd = "/usr/bin/nuvexport --chanid=$chanid --start=$start $nuvoptions --filename=$chanid\_$start.temp --path=$feedpath";
-    print $cmd."\n"; 
-    if(system($cmd)) { print "Nuvexport encoding seems to have failed\n"; } 
-    
-    # Now clean up the output so iPods with firmware 1.1 and above can use it
-    $cmd = "/usr/bin/MP4Box -add $feedpath$chanid\_$start.temp.mp4 $feedpath$chanid\_$start.$portable.mp4";
-    print $cmd."\n"; 
-    if(system($cmd)) { print "MP4Box cleanup seems to have failed\n"; } 
-    return 0;
-}
-
-#
-# Create XML with <ITEM> tag for this video file
-#
-sub CreateItemXML {
-    open(ITEM, ">$feedpath$chanid\_$start.$portable.xml");
-    print ITEM "<item>\n";  
-    print ITEM "<title>".&encodeForXML($title." - ".$subtitle)."</title>\n";
-    print ITEM "<itunes:author>MythTV</itunes:author>\n";  
-    print ITEM "<author>MythTV</author>\n";  
-    print ITEM "<itunes:category text=\"TV Shows\"></itunes:category>\n";
-    print ITEM "<comments>".&encodeForXML($file)."</comments>\n";  
-    print ITEM "<description>".&encodeForXML($description)."</description>\n";  
-    print ITEM "<pubDate>".$recorddate."</pubDate>\n";  
-    print ITEM "<enclosure url=\"".&encodeForXML("$feedurl$chanid\_$start.$portable.mp4")."\" type=\"video/quicktime\" />\n";  
-    print ITEM "<itunes:duration></itunes:duration>\n";  
-    print ITEM "<itunes:keywords>".&encodeForXML($title." - ".$subtitle." - ".$category)."</itunes:keywords>\n";
-    print ITEM "<category>".&encodeForXML($category)."</category>\n";			
-    print ITEM "</item>\n";
-    print "\"$filename\" has been added to the feed.\n";
-    close(ITEM);
-    return 0;
-}
-
-#
-# Generate the RSS feed by combining the ITEM XML Files
-#
-sub GenerateRSSFeed {
-
-    open(RSS, ">$feedfile");
-    print RSS "<?php\n"; 
-    print RSS "header(\"Content-Type: text/xml\");\n"; 
-    print RSS "echo \"<?xml version=\\\"1.0\\\" encoding=\\\"UTF-8\\\"?>\"; ?>\n"; 
-    print RSS "<rss xmlns:itunes=\"http://www.itunes.com/DTDs/Podcast-1.0.dtd\" version=\"2.0\">\n"; 
-    print RSS "<channel>\n"; 
-    print RSS "<title>MythTV - <? if (\$_GET['title'] == \"\") { \$title = \"*\"; echo \"Recorded Programs\"; }\n";
-    print RSS "else { \$title = \$_GET['title']; echo str_replace(\"_\",\" \",\$_GET['title']); } ?> </title>\n";
-    print RSS "<itunes:author>MythTV - myth2ipod</itunes:author>\n"; 
-    print RSS "<link>".&encodeForXML($feedurl)."</link>\n";
-    print RSS "<itunes:subtitle>Transcoded recording for your iPod Video.</itunes:subtitle>\n"; 
-    print RSS "<itunes:summary>Myth TV Recorded Programs for the iPod v.1</itunes:summary>\n"; 
-    print RSS "<description>Myth TV Recorded Programs for the iPod v.1</description>\n"; 
-    print RSS "<itunes:owner>\n"; 
-    print RSS "<itunes:name>MythTV</itunes:name>\n"; 
-    print RSS "<itunes:email>mythtv\@localhost</itunes:email>\n"; 
-    print RSS "</itunes:owner>\n"; 
-    print RSS "<itunes:explicit>No</itunes:explicit>\n"; 
-    print RSS "<language>en-us</language>\n"; 
-    print RSS "<copyright>Copyright 2005.</copyright>\n"; 
-    print RSS "<webMaster>mythtv\@localhost</webMaster>\n"; 
-    print RSS "<itunes:image href=\"http://myth2ipod.com/mythipod_200.jpg\" />\n"; 
-    print RSS "<itunes:category text=\"TV Shows\"></itunes:category>\n"; 
-    print RSS "<category>TV Shows</category>\n";
-    print RSS "<itunes:image href=\"http://myth2ipod.com/mythipod_200.jpg\"/>";
-    print RSS "<image>"; 
-    print RSS "<url>http://myth2ipod.com/mythipod_200.jpg</url>\n";
-    print RSS "<title>MythTV 2 iPod</title>\n";
-    print RSS "<link>".&encodeForXML($feedurl)."</link>\n";	
-    print RSS "<width>200</width>\n";		
-    print RSS "<height>200</height>\n";		
-    print RSS "</image>\n";
-    print RSS "<? foreach (glob(\$title\.\"*\.$portable\.xml\") as \$file) {include \$file;} ?>\n";
-    print RSS "</channel>\n"; 
-    print RSS "</rss>\n";
-    close(RSS);
-    if($debug == 1){ print "I created a feed file, was I supposed to?\n"};
-
-    return 0;
-}
-
-# substitute for XML entities
-sub encodeForXML {
-    local $result;
-    $result = $_[0];
-    $result =~ s/&/&amp;/g;
-    $result =~ s/</&lt;/g;
-    $result =~ s/>/&gt;/g;
-    $result;
-}
-
-
-#
-# This code taken from one of the mythlink.sh scripts to get MySQL information
-#
-sub PrepSQLRead{
-# Get the hostname of this machine
-    $hostname = `hostname`;
-    chomp($hostname);
-    
-# Read the mysql.txt file in use by MythTV.
-# could be in a couple places, so try the usual suspects
-    my $found = 0;
-    my @mysql = ('/usr/share/mythtv/mysql.txt',
-                 '/usr/share/mythtv/mysql.txt',
-                 '/etc/mythtv/mysql.txt',
-                 '/usr/local/etc/mythtv/mysql.txt',
-                 '$ENV{HOME}/.mythtv/mysql.txt',
-                 'mysql.txt'
-	);
-    foreach my $file (@mysql) {
-        next unless (-e $file);
-        $found = 1;
-        open(CONF, $file) or die "Unable to open $file:  $!\n\n";
-        while (my $line = <CONF>) {
-	    # Cleanup
-            next if ($line =~ /^\s*#/);
-            $line =~ s/^str //;
-            chomp($line);
-	    # Split off the var=val pairs
-            my ($var, $val) = split(/\=/, $line, 2);
-            next unless ($var && $var =~ /\w/);
-            if ($var eq 'DBHostName') {
-                $db_host = $val;
-            }
-            elsif ($var eq 'DBUserName') {
-                $db_user = $val;
-            }
-            elsif ($var eq 'DBName') {
-                $db_name = $val;
-            }
-            elsif ($var eq 'DBPassword') {
-                $db_pass = $val;
-            }
-	    # Hostname override
-            elsif ($var eq 'LocalHostName') {
-                $hostname = $val;
-            }
-        }
-        close CONF;
-    }
-    die "Unable to locate mysql.txt:  $!\n\n" unless ($found && $db_host);
-    return 0;
-}
-
-sub promptUser {
-    local($promptString,$defaultValue) = @_;
-    if ($defaultValue) {
-	print $promptString, "[", $defaultValue, "]: ";
-    } else {
-	print $promptString, ": ";
-    }
-
-    $| = 1;               # force a flush after our print
-    $_ = <STDIN>;         # get the input from STDIN (presumably the keyboard)
-    chomp;
-    if ("$defaultValue") {
-	return $_ ? $_ : $defaultValue;    # return $_ if it has a value
-    } else {
-	return $_;
-    }
-}
-
-sub DoSetup {
-    print "\nNot ready yet. How do you send the cd command from perl?\n";
-    return 0;
-}
diff --git a/abs/extra-testing/myth2ipod/myth2ipod-userjob.sh b/abs/extra-testing/myth2ipod/myth2ipod-userjob.sh
deleted file mode 100755
index 9ed65b2..0000000
--- a/abs/extra-testing/myth2ipod/myth2ipod-userjob.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-. /etc/profile
-#su  mythtv -c "TERM=vt100 /usr/bin/myth2ipod "$1" "$2"  >/tmp/logfile"
-su  mythtv -c "TERM=vt100 /usr/bin/myth2ipod "$1" "$2" "
-#or to also use commercial flagging cutlist
-#su  mythtv -c "TERM=vt100 /usr/bin/myth2ipod -cut "$1" "$2"  >/tmp/logfile"
diff --git a/abs/extra-testing/myth2ipod/myth2ipod.install b/abs/extra-testing/myth2ipod/myth2ipod.install
deleted file mode 100755
index 367d90f..0000000
--- a/abs/extra-testing/myth2ipod/myth2ipod.install
+++ /dev/null
@@ -1,38 +0,0 @@
-
-pre_install() {
-	mkdir -p /myth/ipodfeed
-	chown mythtv:http /myth/ipodfeed
-}
-
-pre_upgrade() {
-  pre_install
-}
-
-pre_remove() {
-  pre_install
-}
-
-post_install() {
-	. /etc/systemconfig
-	ln -s /myth/ipodfeed /data/srv/httpd/htdocs/ipodfeed
-	ln -s /myth/ipodfeed/m2iweb.php /myth/ipodfeed/index.php
-	sed -i -e "s/REPLACEME/$hostname/g" /usr/bin/myth2ipod
-	chown -R mythtv:http /myth/ipodfeed
-	/usr/bin/myth2ipod -rebuild
-}
-
-post_upgrade() {
-	 /usr/bin/myth2ipod -rebuild
-}
-
-post_remove() {
- 	rm -fr /data/srv/httpd/htdocs/ipodfeed
-	rm -rf /myth/ipodfeed/m2iweb.php
-	rm -rf /myth/ipodfeed/index.php
-	# don't delete content that the user may still want, so leave /myth/ipodfeed
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/abs/extra-testing/mythappletrailers/PKGBUILD b/abs/extra-testing/mythappletrailers/PKGBUILD
deleted file mode 100644
index 2f36a4d..0000000
--- a/abs/extra-testing/mythappletrailers/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $
-# Maintainer: Cecil Watson<knoppmyth@gmail.com>
-
-pkgname=mythappletrailers
-pkgver=0.04.3
-pkgrel=41
-pkgdesc="Unofficial Add-on for MythTV to get Apple.com Movie Trailers."
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.mythtv.org/wiki/index.php/Myth_Apple_Trailers"
-depends=('php' 'mythtv' 'mplayer-wrapper')
-install=mythappletrailers.install
-source=('myth_trailers_grabber' 'appletrailer.xml'
-'trailers' 'loading.sh' 'fix_aple_url.sh')
-
-build() {
-  mkdir -p $startdir/pkg/usr/bin
-  mkdir -p $startdir/pkg/etc/cron.daily
-  mkdir -p $startdir/pkg/home/mythtv/
-  mkdir -p $startdir/pkg/usr/share/mythtv/
-  cp appletrailer.xml  $startdir/pkg/home/mythtv/appletrailer.xml
-  chown 1000:1000 $startdir/pkg/home/mythtv/appletrailer.xml
-  chmod 755 trailers
-  chmod 755 myth_trailers_grabber
-  chmod 755 loading.sh 
-  cp myth_trailers_grabber $startdir/pkg/usr/bin/
-  cp loading.sh $startdir/pkg/usr/bin/
-  cp trailers $startdir/pkg/etc/cron.daily/
-  install -m755 $srcdir/fix_aple_url.sh $pkgdir/usr/bin
-}
-md5sums=('336e68953d0e1e8a0c7a4990f8d43a2b'
-         'c7da92600afe2a3b1f564764500315a0'
-         '5fdd4aa17b9c1e77b272437ae42a1827'
-         'ece3c5f8a605b6e2270c6f7671705631'
-         'a2349f844e47fd95a672739177ca44ff')
diff --git a/abs/extra-testing/mythappletrailers/appletrailer.xml b/abs/extra-testing/mythappletrailers/appletrailer.xml
deleted file mode 100644
index 9aa19f5..0000000
--- a/abs/extra-testing/mythappletrailers/appletrailer.xml
+++ /dev/null
@@ -1,602 +0,0 @@
-<mythmenu name="TRAILERS">
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Morning Glory</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/paramount/morningglory/morningglory-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Scott Pilgrim vs. The World</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/universal/scottpilgrim/scottpilgrim-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Adjustment Bureau</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/universal/adjustmentbureau/adjustmentbureau-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Grease Sing-A-Long</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/paramount/greasesingalong/greasesingalong-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Solitary Man</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/solitaryman/solitaryman-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Racing Dreams</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/racingdreams/racingdreams-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Joan Rivers: A Piece of Work</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/joanriversapieceofwork/joanriversapieceofwork-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>The Killer Inside Me</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/ifc_films/killerinsideme/killerinsideme-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>You Again</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/disney/youagain/youagain-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Love Ranch</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/loveranch/loveranch-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Charlie St. Cloud</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/universal/charliestcloud/charliestcloud-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Step Up 3D</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/touchstone/stepup3d/stepup3d-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Secretariat</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/disney/secretariat/secretariat-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>African Cats</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/disney/africancats/africancats-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Nowhere Boy</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/weinstein/nowhereboy/nowhereboy-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Jonah Hex</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/weinstein/jonahhex/jonahhex-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Splice</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/wb/splice/splice-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Winter's Bone</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/wintersbone/wintersbone-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Super 8</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/paramount/super8/super8-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Piranha 3D</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/weinstein/piranha3d/piranha3d-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Gangster Paradise: Jerusalema</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/gangsterparadise/gangsterparadise-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Waiting for Superman</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/paramount_vantage/waitingforsuperman/waitingforsuperman-tlr1a_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Survival of the Dead</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/survivalofthedead/survivalofthedead-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Countdown to Zero</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/magnolia_pictures/countdowntozero/countdowntozero-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Nanny McPhee Returns</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/universal/nannymcpheereturns/nannymcpheereturns-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>I Spit On Your Grave</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/ispitonyourgrave/ispitonyourgrave-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Buried</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/lionsgate/buried/buried-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Lottery Ticket</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/wb/lotteryticket/lotteryticket-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Get Low</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony/getlow/getlow-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Princess Kaiulani</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/princesskaiulani/princesskaiulani-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>The Twilight Saga: Eclipse</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/summit/twilightsagaeclipse/twilightsagaeclipse-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>8: The Mormon Proposition</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/8themormonproposition/8themormonproposition_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Predators</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/fox/predators/predators-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Acts of Violence</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/actsofviolence/actsofviolence-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>The Disappearance of Alice Creed</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/thedisappearanceofalicecreed/disappearanceofalicecreed-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>The Expendables</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/lionsgate/theexpendables/expendables-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>TiMER</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/timer/timer-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Paper Man</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/paperman/paperman-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Holy Rollers</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/holyrollers/holyrollers-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Ondine</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/magnolia_pictures/ondine/ondine-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>DCI 2010: The Countdown</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/dci2010thecountdown/dcicountdown-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>The Other Guys</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony_pictures/theotherguys/theotherguys-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>The Kids Are All Right</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/focus_features/thekidsareallright/kidsarealright-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Dinner for Schmucks</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/paramount/dinnerforschmucks/dinnerforschmucks-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Micmacs</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony/micmacs/micmacs-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Coco Chanel and Igor Stravinsky</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony/cocoandigor/cocoigor-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Casino Jack and the United States of Money</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/magnolia_pictures/casinojack/casinojack-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>I Am Love</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/magnolia_pictures/iamlove/iamlove-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Mother and Child</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony/motherandchild/motherandchild-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Just Wright</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/fox_searchlight/justwright/justwright-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>In My Sleep</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/inmysleep/inmysleep_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>My Girlfriend's Boyfriend</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/mygirlfriendsboyfriend/mygirlfriendsboyfriend-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Wild Grass</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony/wildgrass/wildgrass-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Eat Pray Love</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony/eatpraylove/eatpraylove-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>The Secret In Their Eyes</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony/thesecretintheireyes/thesecretintheireyes-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>The Switch</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/miramax/theswitch/theswitch-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Harry Brown</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/harrybrown/harrybrown-tlr1a_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Please Give</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony/pleasegive/pleasegive-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Touching Home</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/touchinghome/touchinghome-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Hey Hey It's Esther Blueburger </text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/heyheyitsestherblueburger/heyhey-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>The Good Heart</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/magnolia_pictures/thegoodheart/thegoodheart-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Killers</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/lionsgate/killers/killers-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Get Him To The Greek</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/universal/gethimtothegreek/gethimtothegreek-tlr_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>The A-Team</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/fox/theateam/ateam-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Alice In Wonderland</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/disney/aliceinwonderland/aliceinwonderland-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Avatar</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/fox/avatar/avatar-tlrf_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Babies</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/focus_features/babies/babies-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>The Back-up Plan</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/thebackupplan/backupplan-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Beastly</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/beastly/beastly-tlr1b_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Cats and Dogs: The Revenge of Kitty Galore 3D</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/wb/catsanddogs2/catsanddogs2-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Cyrus</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/fox_searchlight/cyrus/cyrus-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Date Night</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/fox/datenight/datenight-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Despicable Me</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/universal/despicableme/despicableme-tlr5i_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Furry Vengeance</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/summit/furryvengeance/furryvengeance-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Grown Ups</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony_pictures/grownups/grownups-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Hot Tub Time Machine</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/mgm/hottubtimemachine/hottubtimemachine-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>How To Train Your Dragon</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/dreamworks/howtotrainyourdragon/howtotrainyourdragon-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Hubble 3D</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/imax/hubble3d/hubble3d-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Inception</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/wb/inception/inception-tlr3_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Iron Man 2</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/paramount/ironman2/ironman2-34rgrwt9-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Karate Kid</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony_pictures/karatekid/karatekid-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Knight and Day</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/fox/knightandday/knightandday-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>The Last Airbender</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/paramount/thelastairbender/lastairbender-tlr3_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Letters To Juliet</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/summit/letterstojuliet/letterstojuliet-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>The Losers</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/wb/thelosers/thelosers-tlr1b_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>MacGruber</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/universal/macgruber/macgruber-tlr4_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Multiple Sarcasms</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/independent/multiplesarcasms/multiplesarcasms-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>A Nightmare On Elm Street</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/newline/anightmareonelmstreet/nightmareonelmstreet-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Oceans</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/disney/oceans/oceans-tsr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Prince of Persia: the Sands of Time</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/disney/princeofpersia/princeofpersia-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Robin Hood</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/universal/robinhood/robinhood-tlr3_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Salt</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/sony_pictures/salt/salt-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Sex and the City 2</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/wb/sexandthecity2/sexandthecity2-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Shrek Forever After</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/dreamworks/shrekforeverafter/shrek4-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Shutter Island</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/paramount/shutterisland/shutterisland-tlr1r2r_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>The Sorcerer's Apprentice</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/disney/thesorcerersapprentice/sorcerersapprentice-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Toy Story 3</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/disney/toystory3/toystory3-tlr3_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Tron Legacy</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/disney/tronlegacy/tronlegacy-tsr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Tyler Perry's Why Did I Get Married Too</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/lionsgate/whydidigetmarriedtoo/whydidigetmarriedtoo-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Wall Street: Money Never Sleeps</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://trailers.apple.com/movies/fox/wallstreetmoneyneversleeps/wallstreet-tlrf_h640w.mov</action>
-	</button>
-
-</mythmenu>
diff --git a/abs/extra-testing/mythappletrailers/fix_aple_url.sh b/abs/extra-testing/mythappletrailers/fix_aple_url.sh
deleted file mode 100644
index a08be65..0000000
--- a/abs/extra-testing/mythappletrailers/fix_aple_url.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cat /home/mythtv/appletrailer.xml | sed -e 's|http:/\/\movies.apple|http:\/\/apple|g' > /tmp/appletrailer.xml
-mv /tmp/appletrailer.xml /home/mythtv
diff --git a/abs/extra-testing/mythappletrailers/loading.sh b/abs/extra-testing/mythappletrailers/loading.sh
deleted file mode 100755
index e4e85fc..0000000
--- a/abs/extra-testing/mythappletrailers/loading.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-. /etc/osd_cat.cfg || {
-    color=yellow
-    outline=2
-    outlinecolour=black
-    shadow=0
-    shadowcolour=black
-    font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
-}
-
-echo -e "Loading . . . " | osd_cat --pos=middle --align=center --delay=10 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font
diff --git a/abs/extra-testing/mythappletrailers/myth_trailers_grabber b/abs/extra-testing/mythappletrailers/myth_trailers_grabber
deleted file mode 100755
index ae32e75..0000000
--- a/abs/extra-testing/mythappletrailers/myth_trailers_grabber
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-/**
- *  Copyright (C) 2007 Ben Leto <undertoe@chemlab.org>
- * 
- *  Description: Apple Trailer Grabber for mythtv
- * 
- *  Version 0.4.3
- * 
- *  Apple Trailer Grabber is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- * 
- *  Apple Trailer Grabber is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
- *  Usage: read the INSTALL file
- *  	Setup as a cron script to run as frequently as you want
- *
- *
- */
-
-/************************************************************************/
-// CONFIGURATION
-
-// command to use when streaming content from the internet - cache 50% before displaying and use 32MB of memory
-$STREAMING_EXEC_CMD		= 'loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000';
-$APPLE_FEED = 'http://www.apple.com/trailers/home/xml/current.xml';
-/************************************************************************/
-// Shouldn't Need To modify anything beyond here
-
-
-define("PLAYERCMD", $STREAMING_EXEC_CMD);
-define("XMLFEED", $APPLE_FEED);
-
-/************************************************************************/
-
-init_main();
-
-// Function:  returns null | init_main () 
-// Description: Outputs Apple Trailer XML feed to watchable movie urls in MythTV menu XML format
-function init_main()
-{
-
-	print "<mythmenu name=\"TRAILERS\">\n";
-	
-	if(valid_url(XMLFEED)){
-		
-		// Gather Array of Current Movie Trailers  
-		//XML Data
-		$xml_data = url_to_string(XMLFEED);
-		//Creating Instance of the Class
-		$xmlObj    = new XmlToArray($xml_data);
-		$arrayData = $xmlObj->createArray();
-				
-		foreach($arrayData['records']['movieinfo'] as $Row){
-			
-			$MovieTitle = $Row['info'][0]['title'];
-			$MovieLink = $Row['preview'][0]['large'];
-			$VideoPlayCMD = PLAYERCMD . ' ' . $MovieLink;
-			
-			if(!valid_url($MovieLink)){
-				$MovieTitle = $MovieTitle . '*VIDEO ERROR*';
-				$VideoPlayCMD = '';			
-			}
-			
-			print "\t<button>\n";
-			print "\t\t<type>VIDEO_BROWSER</type>\n";
-			$MovieTitle = preg_replace('/ & /', ' &amp; ', $MovieTitle);
-			print "\t\t<text>$MovieTitle</text>\n";
-			print "\t\t<action>EXEC $VideoPlayCMD</action>\n";
-			print "\t</button>\n\n";		
-			
-		}
-	}else{
-			print "\t<button>\n";
-			print "\t\t<type>VIDEO_BROWSER</type>\n";
-			print "\t\t<text>Error Grabbing XML Feed</text>\n";
-			print "\t\t<action></action>\n";
-			print "\t</button>\n\n";				
-	}
-	
-	print "</mythmenu>\n";
-	
-
-	
-}
-
-
-// Function:  returns boolean | valid_url ( var | url to check) 
-// Description: Checks to see if a url is a valid page    
-function valid_url($str)
-{
-	if(@fopen($str, "r")) {
-		return true;
-	} else {
-		return false;
-	}
-}
-
-// Function:  returns string | all elements of XML ( var | url to feed) 
-// Description: Converts each element in an XML feed to single line string
-// Notes: must have 'allow_url_fopen = On' in php.ini 
-function url_to_string($url){
-	$lines = file($url);
-	foreach ($lines as $line) {
-		$lineR = trim($line);
-	}
-	$lineR = eregi_replace("<" . "large" . "[^>]*>", "<large>", $lineR); //hack for apple goofy xml
-	return $lineR;
-}
-
-// Class:  returns (~) x array | elements of XML ( var | XML in string) 
-// Description: Converts each element in an XML feed to an Array
-class XmlToArray
-{
-   
-    var $xml='';
-   
-    /**
-    * Default Constructor
-    * @param $xml = xml data
-    * @return none
-    */
-   
-    function XmlToArray($xml)
-    {
-       $this->xml = $xml;   
-    }
-   
-    /**
-    * _struct_to_array($values, &$i)
-    *
-    * This is adds the contents of the return xml into the array for easier processing.
-    * Recursive, Static
-    *
-    * @access    private
-    * @param    array  $values this is the xml data in an array
-    * @param    int    $i  this is the current location in the array
-    * @return    Array
-    */
-   
-    function _struct_to_array($values, &$i)
-    {
-        $child = array();
-        if (isset($values[$i]['value'])) array_push($child, $values[$i]['value']);
-       
-        while ($i++ < count($values)) {
-            switch ($values[$i]['type']) {
-                case 'cdata':
-                array_push($child, $values[$i]['value']);
-                break;
-               
-                case 'complete':
-                    $name = $values[$i]['tag'];
-                    if(!empty($name)){
-                    $child[$name]= ($values[$i]['value'])?($values[$i]['value']):'';
-                    if(isset($values[$i]['attributes'])) {                   
-                        $child[$name] = $values[$i]['attributes'];
-                    }
-                }   
-              break;
-               
-                case 'open':
-                    $name = $values[$i]['tag'];
-                    $size = isset($child[$name]) ? sizeof($child[$name]) : 0;
-                    $child[$name][$size] = $this->_struct_to_array($values, $i);
-                break;
-               
-                case 'close':
-                return $child;
-                break;
-            }
-        }
-        return $child;
-    }//_struct_to_array
-   
-    /**
-    * createArray($data)
-    *
-    * This is adds the contents of the return xml into the array for easier processing.
-    *
-    * @access    public
-    * @param    string    $data this is the string of the xml data
-    * @return    Array
-    */
-    function createArray()
-    {
-        $xml    = $this->xml;
-        $values = array();
-        $index  = array();
-        $array  = array();
-        $parser = xml_parser_create();
-        xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-        xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
-        xml_parse_into_struct($parser, $xml, $values, $index);
-        xml_parser_free($parser);
-        $i = 0;
-        $name = $values[$i]['tag'];
-        $array[$name] = isset($values[$i]['attributes']) ? $values[$i]['attributes'] : '';
-        $array[$name] = $this->_struct_to_array($values, $i);
-        return $array;
-    }
-   
-   
-}
-
-?>
diff --git a/abs/extra-testing/mythappletrailers/mythappletrailers.install b/abs/extra-testing/mythappletrailers/mythappletrailers.install
deleted file mode 100644
index 96f6717..0000000
--- a/abs/extra-testing/mythappletrailers/mythappletrailers.install
+++ /dev/null
@@ -1,37 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  ln -s /home/mythtv/appletrailer.xml /usr/share/mythtv/themes/defaultmenu/appletrailer.xml
-  mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp
-  grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp
-  echo "<!--#MythAppleTrailers-->" >> /tmp/is.xml.tmp
-  echo "   <button>" >> /tmp/is.xml.tmp
-  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
-  echo "     <text>Apple Trailers</text>" >> /tmp/is.xml.tmp
-  echo "     <action>MENU appletrailer.xml</action>" >> /tmp/is.xml.tmp 
-  echo "   </button>" >> /tmp/is.xml.tmp
-  echo "<!--#MythAppleTrailers-->" >> /tmp/is.xml.tmp
-  echo "" >> /tmp/is.xml.tmp
-  echo "</mythmenu>" >> /tmp/is.xml.tmp
-  mv /tmp/is.xml.tmp /usr/share/mythtv/themes/defaultmenu/is.xml
-}
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  if [ -e /usr/share/mythtv/themes/defaultmenu/appletrailer.xml ]
-  then
-  	exit
-  else	
-  ln -s /home/mythtv/appletrailer.xml /usr/share/mythtv/themes/defaultmenu/appletrailer.xml
-  fi
-}
-
-# arg 1:  the old package version
-post_remove() {
-	rm -fr /usr/share/mythtv/appletrailer.xml /usr/share/mythtv/themes/defaulmenu/mythappletrailer.xml
-	mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp/is.xml.tmp
-	sed -e '/\#MythAp/,/\#MythAp/d' < /tmp/is.xml.tmp > /usr/share/mythtv/themes/defaultmenu/is.xml
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/mythappletrailers/trailers b/abs/extra-testing/mythappletrailers/trailers
deleted file mode 100755
index 241a60a..0000000
--- a/abs/extra-testing/mythappletrailers/trailers
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-su mythtv -c '/usr/bin/php -q /usr/bin/myth_trailers_grabber > /home/mythtv/appletrailer.xml && /usr/bin/fix_aple_url.sh' 2>/dev/null
diff --git a/abs/extra-testing/mythexport/PKGBUILD b/abs/extra-testing/mythexport/PKGBUILD
deleted file mode 100644
index 3cd04f3..0000000
--- a/abs/extra-testing/mythexport/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $
-# Maintainer: Cecil Watson<knoppmyth@gmail.com>
-
-pkgname=mythexport
-pkgver=2.0.71
-pkgrel=5
-pkgdesc="Script to export recordings for portable devices."
-arch=('i686' 'x86_64')
-license=('GPL3')
-depends=('atomicparsley' 'perl-config-simple' 'perl-net-upnp' 'perl-proc-daemon' 'perl-proc-pid-file')
-url="http://linhes.org/"
-source=(ftp://ftp.knoppmyth.net/R6/sources/mythexport.tar.bz2)
-install=mythexport.install
-
-build() {
-  cp -a mythexport/* $startdir/pkg
-}
diff --git a/abs/extra-testing/mythexport/mythexport.install b/abs/extra-testing/mythexport/mythexport.install
deleted file mode 100644
index edd60f5..0000000
--- a/abs/extra-testing/mythexport/mythexport.install
+++ /dev/null
@@ -1,10 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-	mysql -u root mythconverg < /usr/share/mythtv/mythexport.sql
-	ln -s /usr/share/mythtv/mythexport /data/srv/httpd/htdocs/
-	ln -s /myth/archive /usr/share/mythtv/mythexport/video
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/mythfeed/PKGBUILD b/abs/extra-testing/mythfeed/PKGBUILD
deleted file mode 100644
index 9f634df..0000000
--- a/abs/extra-testing/mythfeed/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $
-# Maintainer: Cecil Watson<knoppmyth@gmail.com>
-
-pkgname=mythfeed
-pkgver=0.06c
-pkgrel=1
-pkgdesc="Unofficial MythTV plugin to allow selection of internet flash media sources"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.mythfeed.sourceforge.net"
-depends=('mythtv' 'firefox' 'flashplugin' 'python')
-makedepends=('qt')
-install=mythfeed.install
-source=('http://softlayer.dl.sourceforge.net/project/mythfeed/mythfeed/0.06c/mythfeed.06c.tar.gz')
-
-build() {
-  mkdir -p $startdir/pkg/usr/bin
-  mkdir -p $startdir/pkg/etc/cron.daily
-  mkdir -p $startdir/pkg/home/mythtv/
-  mkdir -p $startdir/pkg/usr/share/mythtv/
-  cp trailers $startdir/pkg/etc/cron.daily/
-}
diff --git a/abs/extra-testing/mythfeed/mythfeed.install b/abs/extra-testing/mythfeed/mythfeed.install
deleted file mode 100644
index 0f6d8fa..0000000
--- a/abs/extra-testing/mythfeed/mythfeed.install
+++ /dev/null
@@ -1,37 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  ln -s /home/mythtv/appletrailer.xml /usr/share/mythtv/appletrailer.xml
-  mv /usr/share/mythtv/is.xml /tmp
-  grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp
-  echo "<!--#MythAppleTrailers-->" >> /tmp/is.xml.tmp
-  echo "   <button>" >> /tmp/is.xml.tmp
-  echo "     <type>STREAM</type>" >> /tmp/is.xml.tmp
-  echo "     <text>Apple Trailers</text>" >> /tmp/is.xml.tmp
-  echo "     <action>MENU appletrailer.xml</action>" >> /tmp/is.xml.tmp 
-  echo "   </button>" >> /tmp/is.xml.tmp
-  echo "<!--#MythAppleTrailers-->" >> /tmp/is.xml.tmp
-  echo "" >> /tmp/is.xml.tmp
-  echo "</mythmenu>" >> /tmp/is.xml.tmp
-  mv /tmp/is.xml.tmp /usr/share/mythtv/is.xml
-}
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  if [ -e /usr/share/mythtv/appletrailer.xml ]
-  then
-  	exit
-  else	
-  ln -s /home/mythtv/appletrailer.xml /usr/share/mythtv/appletrailer.xml
-  fi
-}
-
-# arg 1:  the old package version
-post_remove() {
-	rm -fr /usr/share/mythtv/appletrailer.xml
-	mv /usr/share/mythtv/is.xml /tmp/is.xml.tmp
-	sed -e '/\#MythAp/,/\#MythAp/d' < /tmp/is.xml.tmp > /usr/share/mythtv/is.xml
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/mythnuv2mkv/PKGBUILD b/abs/extra-testing/mythnuv2mkv/PKGBUILD
deleted file mode 100644
index 5df33a7..0000000
--- a/abs/extra-testing/mythnuv2mkv/PKGBUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-pkgname=mythnuv2mkv
-pkgver=1.60
-pkgrel=1
-conflicts=()
-pkgdesc="Converts MythTV nuv or mpg files to mkv, mp4 or avi files. It can be run as a MythTV User Job or at command line to convert MythTV recordings or stand alone files."
-depends=(perl mplayer wget bc imagemagick lame x264 faac faad2 mkvtoolnix vorbis-tools gpac )
-arch=('i686')
-license=('GPL')
-source=(http://web.aanet.com.au/~auric/files2/V${pkgver}/mythnuv2mkv.sh)
-
-build() {
-    patch -p0 <$startdir/mythnuv2mkv.patch || return 1
-    mkdir -p $startdir/pkg/usr/bin
-    install -m 0755 mythnuv2mkv.sh $startdir/pkg/usr/bin/mythnuv2mkv.sh
-}
-md5sums=('19a5c8bed9bd7d6a86d35e96afa4b3bb')
diff --git a/abs/extra-testing/mythnuv2mkv/mythnuv2mkv.patch b/abs/extra-testing/mythnuv2mkv/mythnuv2mkv.patch
deleted file mode 100644
index 5ca20ae..0000000
--- a/abs/extra-testing/mythnuv2mkv/mythnuv2mkv.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- mythnuv2mkv.sh.orig	2010-04-21 01:41:11.000000000 +0000
-+++ mythnuv2mkv.sh	2010-04-21 01:43:04.000000000 +0000
-@@ -7,19 +7,19 @@
- #
- ######### Vars you may want to set for your environment ######################################################
- # Default aspect for Myth Recording mpg files. It will try to work it out but if it can't will use this.
--readonly DEFAULTMPEG2ASPECT="NA" # 4:3 or 16:9
-+readonly DEFAULTMPEG2ASPECT="16:9" # 4:3 or 16:9
- # Log directory
--readonly LOGBASEDIR="/var/tmp" # Don't use a directory with spaces in it's name
-+readonly LOGBASEDIR="/tmp" # Don't use a directory with spaces in it's name
- # Number of errors reported by mplayer allowed in the transcoded file
- readonly MPLAYER_ERROR_COUNT="8"
- # Path to your mysql.txt file
- readonly MYSQLTXT=""
- # What to separate Title SeasonEpisode SubTitle with
--readonly SEP=","
-+readonly SEP="_"
- # Chapter marks every X minutes
--CHAPTERDURATION=0
-+CHAPTERDURATION=5
- # Crop input
--CROP="ON" # ON | OFF, can also change with --crop argument
-+CROP="OFF" # ON | OFF, can also change with --crop argument
- CROPSIZE=8
- # Delete recording after successful transcode. Only for transcode out of MythRecording. (Actually just sets to high priority autoexpire.)
- DELETEREC="OFF" # ON | OFF, can also change with --deleterec argument
-@@ -29,7 +29,7 @@
- DEBLOCK="OFF" # ON | OFF, can also change with --deblock argument
- # Include deinterlace filter.
- # SOURCENAME is ON for that source. Can have multiple. e.g. DEINTERLACE="Cabel,FTA1"
--DEINTERLACE="ON" # ON | OFF | SOURCENAME,SOURCENAME can also change with --deinterlace argument.
-+DEINTERLACE="OFF" # ON | OFF | SOURCENAME,SOURCENAME can also change with --deinterlace argument.
- # Include inverse Telecine filter (Experimental. Can someone from NTSC/ATSC land try this?).
- # invtelecine filter is never added if deinterlace has been added.
- INVTELECINE="OFF" # ON | OFF, can also change with --invtelecine argument.
diff --git a/abs/extra-testing/mythtv-contrib/6200ch.tar.gz b/abs/extra-testing/mythtv-contrib/6200ch.tar.gz
deleted file mode 100644
index 53debf4..0000000
--- a/abs/extra-testing/mythtv-contrib/6200ch.tar.gz
+++ /dev/null
diff --git a/abs/extra-testing/mythtv-contrib/PKGBUILD b/abs/extra-testing/mythtv-contrib/PKGBUILD
deleted file mode 100644
index 7f73f9d..0000000
--- a/abs/extra-testing/mythtv-contrib/PKGBUILD
+++ /dev/null
@@ -1,150 +0,0 @@
-# Contributor: Michael Hanson <hansonorders@verizon.net>
-# Maintainer: Michael Hanson <hansonorders@verizon.net>
-pkgname=mythtv-contrib
-pkgver=0.23
-pkgrel=7
-pkgdesc="User contributed scripts and utilities for mythtv."
-arch=('i686' 'x86_64')
-url="http://mythtv.org"
-license=('GPL')
-groups=('mythtv-extras')
-depends=('perl' 'mythtv')
-makedepends=('gcc' 'subversion' 'libavc1394' 'libraw1394' 'libiec61883')
-install='mythtv-contrib.install'
-source=('http://www.pdp8.net/directv/directv.pl' \
-        'http://stb-command.googlecode.com/files/stb-command1.2.tar.gz' \
-        'http://mythtv.mlaronson.com/myth-xbmc-connect/downloads/xbmc_mythlink.tgz' \
-        'mythchanger.10f.beta.tar' '6200ch.tar.gz' 'dct-channel_make.patch' \
-        'mythchanger_make.patch')
-patches=('dct-channel_make.patch' 'mythchanger_make.patch')
-_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-23-fixes/mythtv/contrib
-_svnver=23566
-_svnmod=contrib
-
-build() {
-	# get clean copy from SVN repo
-	svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
-	svn revert -R $_svnmod
-
-	cd $startdir/src/contrib
-
-	# build and install
-        echo "Building 6200ch..."
-        cd $srcdir
-        tar zxf 6200ch.tar.gz
-        cd $srcdir/6200ch
-        gcc -std=gnu99 -o 6200ch 6200ch.c -lavc1394 -lrom1394 -lraw1394 || return 1
-        install -D -m755 6200ch $startdir/pkg/usr/bin/6200ch || return 1
-        install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.6200ch || return 1
-
-        echo "Building change-channel-lirc..."
-        cd $srcdir/contrib/channel_changers/change-channel-lirc || return 1
-        install -D -m755 *{.pl,.sh} $startdir/pkg/usr/bin || return 1
-
-        echo "Building d10control..."
-        cd $srcdir/contrib/channel_changers/d10control || return 1
-        install -D -m755 d10control.pl $startdir/pkg/usr/bin/d10control.pl  || return 1
-        install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.d10control
-
-        echo "Building dct-channel..."
-        cd $srcdir/contrib/channel_changers/dct-channel
-        patch -p4 <$startdir/dct-channel_make.patch || return 1
-        cd $srcdir/contrib/channel_changers/dct-channel || return 1
-        make || return 1
-        install -D -m755 channel $startdir/pkg/usr/bin || return 1
-        install -D -m644 channel.1 $startdir/pkg/usr/man/man1/channel.1 || return 1
-        install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.dct-channel
-        install -D -m644 COPYING $startdir/pkg/usr/share/licenses/mythtv-contrib/COPYING.dct-channel
-
-        echo "Building dct2000serial..."
-        cd $srcdir/contrib/channel_changers/dct2000serial || return 1
-        install -D -m755 *.py $startdir/pkg/usr/bin || return 1
-        install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.dct2000serial
-
-        echo "Building redeye..."
-        cd $srcdir/contrib/channel_changers/red_eye || return 1
-        gcc -Wall -o red_eye red_eye.c || return 1
-        install -D -m755 red_eye $startdir/pkg/usr/bin/red_eye || return 1
-        install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.red_eye
-
-        echo "Building sa3250ch..."
-        cd $srcdir/contrib/channel_changers/sa3250ch || return 1
-        gcc -Wall -o sa3250ch sa3250ch.c -lrom1394 -lavc1394 -lraw1394 || return 1
-        install -D -m755 sa3250ch $startdir/pkg/usr/bin/sa3250ch || return 1
-        install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.sa3250ch
-
-        echo "Building firewire_tester..."
-        cd $srcdir/contrib/development/firewire_tester || return 1
-        gcc -Wall -o firewire_tester firewire_tester.c -liec61883 -lraw1394 || return 1
-        install -D -m755 firewire_tester $startdir/pkg/usr/bin || return 1
-        install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.firewire_tester
-
-        echo "Building tsc-calibrate..."
-        cd $srcdir/contrib/development/tsc-calibrate || return 1
-        gcc -o tsc-calibrate tsc-calibrate.c || return 1
-        install -D -m755 tsc-calibrate $startdir/pkg/usr/bin || return 1
-
-        echo "Building mythname..."
-        cd $srcdir/contrib/info/mythname || return 1
-        install -D -m755 mythname.pl $startdir/pkg/usr/bin || return 1
-        install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.mythname
-
-        echo "Building misc_status_info..."
-        cd $srcdir/contrib/info/misc_status_info || return 1
-        install -D -m755 *{.sh,.pl} $startdir/pkg/usr/bin || return 1
-        install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.misc_status_info
-
-        echo "Building maintenance..."
-        cd $srcdir/contrib/maintenance || return 1
-        install -D -m755 *.pl $startdir/pkg/usr/bin || return 1
-
-        echo "Building mythmail..."
-        cd $srcdir/contrib/mythmail || return 1
-        install -D -m755 *.pl $startdir/pkg/usr/bin || return 1
-
-        echo "Building recovery..."
-        cd $srcdir/contrib/recovery || return 1
-        install -D -m755 *.pl $startdir/pkg/usr/bin || return 1
-
-        echo "Building user_jobs..."
-        cd $srcdir/contrib/user_jobs || return 1
-        install -D -m755 *.pl $startdir/pkg/usr/bin || return 1
-        install -D -m755 setbookmark $startdir/pkg/usr/bin/setbookmark.pl || return 1
-
-        echo "Building directv.pl..."
-        cd $srcdir || return 1
-        install -D -m755 directv.pl $startdir/pkg/usr/bin || return 1
-
-        echo "Building stb-command..."
-        cd $srcdir
-        tar zxf stb-command1.0.tar.gz || return 1
-        cd $srcdir/stb-command
-        make || return 1
-	install -D -m755 stb-command $startdir/pkg/usr/bin || return 1
-        install -D -m755 sa3250_ch_guid  $startdir/pkg/usr/bin || return 1
-        install -D -m755 stb_cmd_guid  $startdir/pkg/usr/bin || return 1
-        install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.stb-command || return 1
-
-        echo "Building mythchanger..."
-        cd $srcdir
-        tar xf mythchanger.10f.beta.tar || return 1
-        cd $srcdir/mythchanger.10f.beta
-        patch -p1 <$startdir/mythchanger_make.patch || return 1
-        make || return 1
-        install -D -m755 mythchanger $pkgdir/usr/bin || return 1
-        install -D -m644 README $startdir/pkg/usr/share/doc/mythtv-contrib/README.mythchanger
-
-        echo "Building xbmc mythlink..."
-        cd $srcdir
-        tar zxf xbmc_mythlink.tgz || return 1
-        install -D -m755 tvdb_get.sh $startdir/pkg/usr/bin || return 1
-        install -D -m755 xbmc_cleanup.sh $startdir/pkg/usr/bin || return 1
-        install -D -m755 xbmc_mythlink.py $startdir/pkg/usr/bin || return 1
-}
-md5sums=('89cfc17883a41e365e85e0a4ac20994f'
-         '8067175170add2c4d8aa333e43c9387c'
-         '2ee7eafc3804f0bd48ede0ad05e718f1'
-         '34d148795f832f12973a08d59e9a0ef3'
-         '9029957cad36d5867a070da373d2bc2a'
-         '309342034f20d85dce3270a21320fb4c'
-         'c5996437bef4448acbee300bd6659dad')
diff --git a/abs/extra-testing/mythtv-contrib/dct-channel_make.patch b/abs/extra-testing/mythtv-contrib/dct-channel_make.patch
deleted file mode 100644
index 9d9dc53..0000000
--- a/abs/extra-testing/mythtv-contrib/dct-channel_make.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/contrib/channel_changers/dct-channel/Makefile.orig	2010-03-23 00:56:51.000000000 +0000
-+++ src/contrib/channel_changers/dct-channel/Makefile	2010-03-23 00:57:47.000000000 +0000
-@@ -1,5 +1,5 @@
- CFLAGS = -Wall
--PREFIX = /usr/local
-+PREFIX = /data/LinHES-PKGBUILD/abs/extra-testing/community/mythtv-contrib/pkg/usr
- MANPATH = ${PREFIX}/man/man1
- BINPATH = ${PREFIX}/bin
- 
-@@ -44,4 +44,4 @@
- 	rm -f *.o channel core
- 
- veryclean: clean
--	rm -f channel.1
-\ No newline at end of file
-+	rm -f channel.1
diff --git a/abs/extra-testing/mythtv-contrib/mythchanger.10f.beta.tar b/abs/extra-testing/mythtv-contrib/mythchanger.10f.beta.tar
deleted file mode 100644
index e848866..0000000
--- a/abs/extra-testing/mythtv-contrib/mythchanger.10f.beta.tar
+++ /dev/null
diff --git a/abs/extra-testing/mythtv-contrib/mythchanger_make.patch b/abs/extra-testing/mythtv-contrib/mythchanger_make.patch
deleted file mode 100644
index facd9e6..0000000
--- a/abs/extra-testing/mythtv-contrib/mythchanger_make.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- mythchanger.10f.beta/Makefile.orig	2010-03-23 01:35:27.000000000 +0000
-+++ mythchanger.10f.beta/Makefile	2010-03-23 01:36:16.000000000 +0000
-@@ -1,4 +1,4 @@
--prefix = /usr
-+prefix = /data/LinHES-PKGBUILD/abs/extra-testing/community/mythtv-contrib/pkg/usr
- 
- CC = gcc
- 
diff --git a/abs/extra-testing/mythtv-contrib/mythtv-contrib.install b/abs/extra-testing/mythtv-contrib/mythtv-contrib.install
deleted file mode 100644
index bb7b801..0000000
--- a/abs/extra-testing/mythtv-contrib/mythtv-contrib.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-     echo ">>> AS IS WITHOUT WARRANTY."
-     echo ">>> DO NOT FILE BUG REPORTS ON COMPONENTS OF THIS PACKAGE."
-     echo ">>> ANY ISSUES WITH SHOULD BE TAKEN UP WITH THE COMPONENT'S"
-     echo ">>> AUTHOR."
-     echo ">>> See README's in /usr/share/doc/mythtv-contrib"
-}
diff --git a/abs/extra-testing/mythtv-contrib/xbmc_mythlink.tgz b/abs/extra-testing/mythtv-contrib/xbmc_mythlink.tgz
deleted file mode 100644
index be3f2ef..0000000
--- a/abs/extra-testing/mythtv-contrib/xbmc_mythlink.tgz
+++ /dev/null
diff --git a/abs/extra-testing/neon/PKGBUILD b/abs/extra-testing/neon/PKGBUILD
deleted file mode 100644
index c87a5f0..0000000
--- a/abs/extra-testing/neon/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 77208 2010-04-11 13:31:45Z pierre $
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-
-# KEEP LIBTOOL FILES!
-pkgname=neon
-pkgver=0.29.3
-pkgrel=2
-pkgdesc="HTTP and WebDAV client library with a C interface"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-depends=('heimdal' 'expat' 'ca-certificates')
-url="http://www.webdav.org/neon/"
-source=("http://www.webdav.org/neon/${pkgname}-${pkgver}.tar.gz")
-md5sums=('ba1015b59c112d44d7797b62fe7bee51')
-options=('libtool')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --with-expat --enable-shared --disable-static \
-    --with-ssl=openssl --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/abs/extra-testing/netkit-bsd-finger/LICENSE b/abs/extra-testing/netkit-bsd-finger/LICENSE
deleted file mode 100644
index 7825451..0000000
--- a/abs/extra-testing/netkit-bsd-finger/LICENSE
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Tony Nardo of the Johns Hopkins University/Applied Physics Lab.
- *
- * 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/abs/extra-testing/netkit-bsd-finger/PKGBUILD b/abs/extra-testing/netkit-bsd-finger/PKGBUILD
deleted file mode 100644
index 06a45cc..0000000
--- a/abs/extra-testing/netkit-bsd-finger/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 35715 2009-04-16 03:28:17Z eric $
-# Maintainer: dorphell <dorphell@archlinux.org>
-pkgname=netkit-bsd-finger
-pkgver=0.17
-pkgrel=4
-pkgdesc="bsd-finger ported to Linux"
-arch=('i686' 'x86_64')
-url="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit"
-license=('BSD')
-depends=('glibc' 'xinetd')
-backup=('etc/xinetd.d/finger')
-source=(ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/bsd-finger-$pkgver.tar.gz finger.xinetd LICENSE)
-md5sums=('52bf281aac8814bf56cdc92f7661ee75' 'a8682004dc8dee356065162bde892b47'\
-         '5fc568418a0379fc3a358ed1c2523b44')
-
-build() {
-   cd $srcdir/bsd-finger-$pkgver
-   install -d $pkgdir/usr/{bin,sbin} $pkgdir/usr/share/man/{man1,man8}
-   ./configure --prefix=/usr || return 1
-   sed -i 's@include <sys/time.h>@include <time.h>@' finger/lprint.c || return 1
-   sed -i 's@include <sys/time.h>@include <time.h>@' finger/sprint.c || return 1
-   make || return 1
-   make INSTALLROOT=$pkgdir MANDIR=/usr/share/man install || return 1
-   install -D -m644 $srcdir/finger.xinetd $pkgdir/etc/xinetd.d/finger || return 1
-   install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/abs/extra-testing/netkit-bsd-finger/finger.xinetd b/abs/extra-testing/netkit-bsd-finger/finger.xinetd
deleted file mode 100644
index cc9a8b1..0000000
--- a/abs/extra-testing/netkit-bsd-finger/finger.xinetd
+++ /dev/null
@@ -1,8 +0,0 @@
-service finger
-{
-	socket_type		= stream
-	wait			= no
-	user			= nobody
-	server			= /usr/sbin/in.fingerd
-	disable			= yes
-}
diff --git a/abs/extra-testing/nspr/PKGBUILD b/abs/extra-testing/nspr/PKGBUILD
deleted file mode 100644
index 453b515..0000000
--- a/abs/extra-testing/nspr/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 18817 2008-11-09 12:29:50Z jgc $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-pkgname=nspr
-pkgver=4.8
-pkgrel=2
-pkgdesc="Netscape Portable Runtime"
-arch=(i686 x86_64)
-url="http://www.mozilla.org/projects/nspr/"
-license=('MPL' 'GPL')
-depends=('glibc')
-makedepends=('zip')
-options=(!emptydirs)
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
-	nspr.pc.in)
-md5sums=('e0916a72bcc6c427551ea262183fdb26'
-         'bce1611f3117b53fc904cab549c09967')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  [ "$CARCH" = "x86_64" ] && confflags="--enable-64bit"
-  unset CFLAGS
-  unset CXXFLAGS
-  ./mozilla/nsprpub/configure \
-  	--prefix=/usr \
-	--libdir=/usr/lib \
-	--includedir=/usr/include/nspr \
-	--enable-optimize \
-	--disable-debug ${confflags} || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-
-  NSPR_LIBS=`./config/nspr-config --libs`
-  NSPR_CFLAGS=`./config/nspr-config --cflags`
-  NSPR_VERSION=`./config/nspr-config --version`
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig" || return 1
-  sed "${srcdir}/nspr.pc.in" -e "s,%libdir%,/usr/lib," \
-  	-e "s,%prefix%,/usr," \
-	-e "s,%exec_prefix%,/usr/bin," \
-	-e "s,%includedir%,/usr/include/nspr," \
-	-e "s,%NSPR_VERSION%,${NSPR_VERSION}," \
-	-e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \
-	-e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > "${pkgdir}/usr/lib/pkgconfig/nspr.pc" || return 1
-  chmod 644 "${pkgdir}/usr/lib/pkgconfig/nspr.pc" || return 1
-  ln -sf nspr.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nspr.pc" || return 1
-
-  chmod 644 ${pkgdir}/usr/lib/*.a || return 1
-
-  rm -rf "${pkgdir}/usr/bin/compile-et.pl" \
-	"${pkgdir}/usr/bin/prerr.properties" \
-	"${pkgdir}/usr/share/aclocal/nspr.m4" \
-	"${pkgdir}/usr/include/nspr/md"
-}
diff --git a/abs/extra-testing/nspr/nspr.pc.in b/abs/extra-testing/nspr/nspr.pc.in
deleted file mode 100644
index 1d8f4a0..0000000
--- a/abs/extra-testing/nspr/nspr.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSPR
-Description: The Netscape Portable Runtime
-Version: %NSPR_VERSION%
-Libs: %FULL_NSPR_LIBS%
-Cflags: %FULL_NSPR_CFLAGS%
diff --git a/abs/extra-testing/nss/PKGBUILD b/abs/extra-testing/nss/PKGBUILD
deleted file mode 100644
index 8e7d434..0000000
--- a/abs/extra-testing/nss/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 22037 2008-12-21 11:44:41Z jgc $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-pkgname=nss
-pkgver=3.12.3
-_pkgver=3_12_3
-_nssver=3.12.3.0
-pkgrel=2
-pkgdesc="Mozilla Network Security Services"
-arch=(i686 x86_64)
-url="http://www.mozilla.org/projects/security/pki/nss/"
-license=('MPL' 'GPL')
-_nsprver=4.8
-depends=("nspr>=${_nsprver}" 'sqlite3>=3.6.7')
-replaces=('nss-nspr')
-source=(https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${_pkgver}_RTM/src/nss-${pkgver}.tar.bz2
-	nss-nolocalsql.patch
-	nss.pc.in
-	nss-config.in)
-md5sums=('ecb7079ba4ebcf29b7716775384f1f18'
-         '1837781eed35bfb6f826cfb3efcd6409'
-         'c547b030c57fe1ed8b77c73bf52b3ded'
-         '46bee81908f1e5b26d6a7a2e14c64d9f')
-
-build() {
-  cd ${srcdir}/nss-${pkgver}
-  patch -Np0 -i "${srcdir}/nss-nolocalsql.patch" || return 1
-  unset CFLAGS
-  unset CXXFLAGS
-  export BUILD_OPT=1
-  export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-  export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-  export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
-  export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'`
-
-  [ "$CARCH" = "x86_64" ] && export USE_64=1
-
-  make -j 1 -C mozilla/security/coreconf || return 1
-  make -j 1 -C mozilla/security/dbm || return 1
-  make -j 1 -C mozilla/security/nss || return 1
-
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m755 -d "${pkgdir}/usr/bin"
-  install -m755 -d "${pkgdir}/usr/include/nss"
-
-  NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-  NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-  NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-
-  sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib,g" \
-  				-e "s,%prefix%,/usr,g" \
-				-e "s,%exec_prefix%,/usr/bin,g" \
-				-e "s,%includedir%,/usr/include/nss,g" \
-				-e "s,%NSPR_VERSION%,${_nsprver},g" \
-				-e "s,%NSS_VERSION%,${_nssver},g" > \
-			"${pkgdir}/usr/lib/pkgconfig/nss.pc" || return 1
-  ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc" || return 1
-  chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc || return 1
-
-  sed "${srcdir}/nss-config.in" -e "s,@libdir@,/usr/lib,g" \
-  				    -e "s,@prefix@,/usr/bin,g" \
-				    -e "s,@exec_prefix@,/usr/bin,g" \
-				    -e "s,@includedir@,/usr/include/nss,g" \
-				    -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
-				    -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
-				    -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
-			    > "${pkgdir}/usr/bin/nss-config" || return 1
-  chmod 755 "${pkgdir}/usr/bin/nss-config" || return 1
-
-  for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
-              libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so
-  do
-    install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/" || return 1
-  done
-  for file in libcrmf.a libnssb.a libnssckfw.a; do
-    install -m644 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/" || return 1
-  done
-
-  for file in certutil cmsutil crlutil modutil pk12util signtool signver ssltap; do
-    install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/" || return 1
-  done
-
-  install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/" || return 1
-}
diff --git a/abs/extra-testing/nss/nss-config.in b/abs/extra-testing/nss/nss-config.in
deleted file mode 100644
index f8f893e..0000000
--- a/abs/extra-testing/nss/nss-config.in
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-
-major_version=@MOD_MAJOR_VERSION@
-minor_version=@MOD_MINOR_VERSION@
-patch_version=@MOD_PATCH_VERSION@
-
-usage()
-{
-	cat <<EOF
-Usage: nss-config [OPTIONS] [LIBRARIES]
-Options:
-	[--prefix[=DIR]]
-	[--exec-prefix[=DIR]]
-	[--includedir[=DIR]]
-	[--libdir[=DIR]]
-	[--version]
-	[--libs]
-	[--cflags]
-Dynamic Libraries:
-	nss
-	nssutil
-	ssl
-	smime
-EOF
-	exit $1
-}
-
-if test $# -eq 0; then
-	usage 1 1>&2
-fi
-
-lib_ssl=yes
-lib_smime=yes
-lib_nss=yes
-lib_nssutil=yes
-
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      prefix=$optarg
-      ;;
-    --prefix)
-      echo_prefix=yes
-      ;;
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      ;;
-    --exec-prefix)
-      echo_exec_prefix=yes
-      ;;
-    --includedir=*)
-      includedir=$optarg
-      ;;
-    --includedir)
-      echo_includedir=yes
-      ;;
-    --libdir=*)
-      libdir=$optarg
-      ;;
-    --libdir)
-      echo_libdir=yes
-      ;;
-    --version)
-      echo ${major_version}.${minor_version}.${patch_version}
-      ;;
-    --cflags)
-      echo_cflags=yes
-      ;;
-    --libs)
-      echo_libs=yes
-      ;;
-    ssl)
-      lib_ssl=yes
-      ;;
-    smime)
-      lib_smime=yes
-      ;;
-    nss)
-      lib_nss=yes
-      ;;
-    nssutil)
-      lib_nssutil=yes
-      ;;
-    *)
-      usage 1 1>&2
-      ;;
-  esac
-  shift
-done
-
-# Set variables that may be dependent upon other variables
-if test -z "$exec_prefix"; then
-    exec_prefix=`pkg-config --variable=exec_prefix nss`
-fi
-if test -z "$includedir"; then
-    includedir=`pkg-config --variable=includedir nss`
-fi
-if test -z "$libdir"; then
-    libdir=`pkg-config --variable=libdir nss`
-fi
-
-if test "$echo_prefix" = "yes"; then
-    echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
-    echo $exec_prefix
-fi
-
-if test "$echo_includedir" = "yes"; then
-    echo $includedir
-fi
-
-if test "$echo_libdir" = "yes"; then
-    echo $libdir
-fi
-
-if test "$echo_cflags" = "yes"; then
-    echo -I$includedir
-fi
-
-if test "$echo_libs" = "yes"; then
-      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
-      if test -n "$lib_ssl"; then
-	libdirs="$libdirs -lssl${major_version}"
-      fi
-      if test -n "$lib_smime"; then
-	libdirs="$libdirs -lsmime${major_version}"
-      fi
-      if test -n "$lib_nss"; then
-	libdirs="$libdirs -lnss${major_version}"
-      fi
-      if test -n "$lib_nssutil"; then
-	libdirs="$libdirs -lnssutil${major_version}"
-      fi
-      echo $libdirs
-fi      
-
diff --git a/abs/extra-testing/nss/nss-nolocalsql.patch b/abs/extra-testing/nss/nss-nolocalsql.patch
deleted file mode 100644
index b72cc66..0000000
--- a/abs/extra-testing/nss/nss-nolocalsql.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -up mozilla/security/nss/lib/Makefile.nolocalsql mozilla/security/nss/lib/Makefile
---- mozilla/security/nss/lib/Makefile.nolocalsql	2007-11-06 15:12:37.000000000 +0100
-+++ mozilla/security/nss/lib/Makefile	2007-11-06 15:13:35.000000000 +0100
-@@ -62,11 +62,11 @@ ifeq ($(OS_TARGET), WINCE)
- DIRS := $(filter-out fortcrypt,$(DIRS))
- endif
- 
--ifndef MOZILLA_CLIENT
--ifndef NSS_USE_SYSTEM_SQLITE
--DIRS := sqlite $(DIRS)
--endif
--endif
-+#ifndef MOZILLA_CLIENT
-+#ifndef NSS_USE_SYSTEM_SQLITE
-+#DIRS := sqlite $(DIRS)
-+#endif
-+#endif
- 
- #######################################################################
- # (5) Execute "global" rules. (OPTIONAL)                              #
-diff -up mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/legacydb/manifest.mn
---- mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql	2007-11-06 15:10:59.000000000 +0100
-+++ mozilla/security/nss/lib/softoken/legacydb/manifest.mn	2007-11-06 15:11:07.000000000 +0100
-@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def
- 
- DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
- 
--ifdef MOZILLA_CLIENT
--INCLUDES += -I$(DIST)/include/sqlite3
--endif
-+#ifdef MOZILLA_CLIENT
-+#INCLUDES += -I$(DIST)/include/sqlite3
-+#endif
- 
- CSRCS = \
- 	dbmshim.c \
-diff -up mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/manifest.mn
---- mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql	2007-11-06 15:08:14.000000000 +0100
-+++ mozilla/security/nss/lib/softoken/manifest.mn	2007-11-06 15:10:21.000000000 +0100
-@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def
- 
- DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
- 
--ifdef MOZILLA_CLIENT
--INCLUDES += -I$(DIST)/include/sqlite3
--endif
-+#ifdef MOZILLA_CLIENT
-+#INCLUDES += -I$(DIST)/include/sqlite3
-+#endif
- 
- EXPORTS = \
- 	pkcs11.h \
-diff -up mozilla/security/nss/lib/softoken/config.mk.nolocalsql mozilla/security/nss/lib/softoken/config.mk
diff --git a/abs/extra-testing/nss/nss.pc.in b/abs/extra-testing/nss/nss.pc.in
deleted file mode 100644
index d47b9e1..0000000
--- a/abs/extra-testing/nss/nss.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSS
-Description: Network Security Services
-Version: %NSS_VERSION%
-Requires: nspr >= %NSPR_VERSION%
-Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
-Cflags: -I${includedir}
diff --git a/abs/extra-testing/numlockx/PKGBUILD b/abs/extra-testing/numlockx/PKGBUILD
deleted file mode 100644
index 172cceb..0000000
--- a/abs/extra-testing/numlockx/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 19225 2008-11-17 22:12:15Z thayer $
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Travis Willard <travisw@wmpub.ca> 
-# Maintainer: Thayer Williams <thayer@archlinux.org> 
-
-pkgname=numlockx
-pkgver=1.1
-pkgrel=4
-pkgdesc="Turns on the numlock key in X11"
-arch=('i686' 'x86_64')
-license=('MIT')
-url="http://ktown.kde.org/~seli/numlockx/"
-depends=('libxtst')
-source=(http://ktown.kde.org/~seli/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('127d9dfbbbe6dbec62cc78db340f913c')
-
-build() {
-	cd $srcdir/$pkgname-$pkgver
-	./configure --prefix=/usr x_includes=/usr/include/X11 \
-		x_libraries=/usr/lib || return 1
-	make || return 1
-	make prefix=$pkgdir/usr install || return 1
-
-    # Install the custom MIT license
-    install -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE || return 1
-}
diff --git a/abs/extra-testing/nvram-wakup/PKGBUILD b/abs/extra-testing/nvram-wakup/PKGBUILD
deleted file mode 100755
index 057606b..0000000
--- a/abs/extra-testing/nvram-wakup/PKGBUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-pkgname=nvram-wakup
-pkgver=1.1
-pkgrel=1
-pkgdesc="set the wakeup time of the localpc"
-license="GPL"
-arch=(i686)
-url="http://sourceforge.net/projects/nvram-wakeup/"
-source=("http://downloads.sourceforge.net/project/nvram-wakeup/nvram-wakup-1.1.tar.gz?use_mirror=kent")
-
-build() {
-	cd $startdir/src/$pkgname-$pkgver
-	make || return 1
-	make prefix=$startdir/pkg/usr install
-}
-
diff --git a/abs/extra-testing/ocaml/PKGBUILD b/abs/extra-testing/ocaml/PKGBUILD
deleted file mode 100644
index 1ca7fe5..0000000
--- a/abs/extra-testing/ocaml/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 28732 2009-03-01 22:25:49Z tpowa $
-#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=ocaml	
-pkgver=3.11.0
-pkgrel=1
-pkgdesc="Ocaml compiler - Ocaml is a functional language with OO extensions"
-arch=(i686 x86_64)
-license=('LGPL2' 'custom: QPL-1.0')
-url="http://caml.inria.fr/"
-depends=('gdbm')
-makedepends=('tk' 'ncurses>=5.6-7' 'libx11')
-optdepends=('ncurses=5.6-7: advanced ncurses features' 'tk: advanced tk features')
-source=(http://caml.inria.fr/distrib/ocaml-3.11/$pkgname-$pkgver.tar.gz)
-options=('!makeflags' '!emptydirs')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure -prefix /usr
-  make world.opt || return 1
-  make PREFIX=$pkgdir/usr install || return 1
-   
-# Save >10MB with this one, makepkg only strips debug symbols.
- find ${startdir}/pkg/usr/lib -type f -name '*.so.*' -exec strip --strip-unneeded {} \;
-
-# install license
-install -D -m 644 $startdir/src/$pkgname-$pkgver/LICENSE $startdir/pkg/usr/share/licenses/ocaml/LICENSE
-}
-md5sums=('be152066bdf09761ddf1c31291e5cb90')
diff --git a/abs/extra-testing/openjdk6/PKGBUILD b/abs/extra-testing/openjdk6/PKGBUILD
deleted file mode 100644
index 22ee813..0000000
--- a/abs/extra-testing/openjdk6/PKGBUILD
+++ /dev/null
@@ -1,155 +0,0 @@
-# $Id: PKGBUILD 29222 2009-03-06 20:55:45Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=openjdk6
-pkgver=1.5
-_icedteaver=1.5pre
-pkgrel=0.1
-_date=20090305
-pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
-url='http://icedtea.classpath.org'
-arch=('i686' 'x86_64')
-license=('GPL')
-_openjdk_version=b14
-_openjdk_date=25_nov_2008
-_hotspotver=fc6a5ae3fef5 # what it downlopads itself / remove from configure to get it
-depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme')
-makedepends=('alsa-lib' 'libxtst' 'giflib' 'libxp' 'gtk2' 'nspr' 'zlib' 'freetype2' 'libjpeg' 'libx11' 'libcups' 'patch' 'xalan-java' 'xulrunner>=1.9.0.3' 'apache-ant>=1.7.0' 'autoconf' 'unzip' 'rhino' 'mercurial')
-conflicts=('java-environment' 'java-runtime')
-provides=('java-environment=6' 'java-runtime=6')
-options=(!emptydirs)
-install=openjdk6.install
-source=(http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-	#http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
-	ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.bz2
-	http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/${_hotspotver}.tar.gz
-	fix_jdk_cmds_path.diff
-	fix_corba_cmds_path.diff
-	gcjwebplugin_xulrunner.diff
-	aatext_by_default.diff
-	fontconfig-paths.diff
-	openjdk6.profile)
-noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz ${_hotspotver}.tar.gz)
-md5sums=('9f9773a822156dd3d576d83d794364ce'
-         'd57bf545dc50d41588b43112393dac26'
-         '1c3510387dccdb4907d0fd2f1c58e372'
-         '5da3e39fa60985576c4f37d1491efbe2'
-         'f7e7a212e50abb56a6ef1a2b1bd27405'
-         'ed2e808df2d2fc2ea7dae5139d475192'
-         'ef60d567c0d9bad111212851220deafd'
-         '104380f0b900c840141e572a7fb70c27'
-         'd0703088e10aa957c037644ab88d716d')
-
-build() {
-  # for hg checkout install mercurial and
-#  mkdir ${srcdir}/icedtea6-${_date}
-#  cd ${srcdir}/icedtea6-${_date}
-#  hg clone http://icedtea.classpath.org/hg/icedtea6 || return 1
-#  tar -cvjf ../../icedtea6-${_date}.tar.bz2 *
-#  return 1
-
-  unset JAVA_HOME
-  unset CLASSPATH
-  if [ "${CARCH}" = "x86_64" ]; then
-    _arch=amd64
-  else
-    _arch=i586
-  fi
-  _javaver=1.6.0
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd ${srcdir}/icedtea6
-#  cd ${srcdir}/icedtea6-${_icedteaver}
-  ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
-  ln -s ${srcdir}/${_hotspotver}.tar.gz .
-
-  # fix xulrunner linking
-  patch -Np0 -i ${srcdir}/gcjwebplugin_xulrunner.diff || return 1
-
-  cp ${srcdir}/*.diff ${srcdir}/icedtea6/patches/
-#  cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
-  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fix_corba_cmds_path.diff patches/aatext_by_default.diff patches/fontconfig-paths.diff"
-
-  ./autogen.sh
-  autoreconf # needed due to mercurial build
-
-  export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
-  export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
-  unset MAKEFLAGS
-
-  if [ -x ${_jvmdir}/bin/javac ]; then
-    JCONF="--with-openjdk --with-openjdk-home=${_jvmdir}"
-  elif [ -x /opt/java/bin/javac ]; then
-    JCONF="--with-openjdk --with-openjdk-home=/opt/java"
-  elif [ -x /usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/bin/javac ]; then
-    JCONF="--with-gcj-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0 --with-javac"
-  elif [ -x /usr/lib/java-${_javaver}-openjdk/bin/javac ]; then
-    JCONF="--with-openjdk --with-openjdk-home=/usr/lib/java-${_javaver}-openjdk" 
-    # ^ only fallback to build with broken 1.2-3, can be removed later
-  else
-    echo "No supported java installation found, install either openjdk6, jdk or java-gcj-compat"
-    return 1
-  fi
-
-  ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
-	--with-xalan2-jar=/usr/share/java/xalan.jar \
-	--with-hotspot-src-zip=${_hotspotver}.tar.gz \
-	--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH  $JCONF
-  LD_PRELOAD="" make || return 1
-  
-  install -m755 -d ${pkgdir}/${_jvmdir}/jre
-
-  pushd ${srcdir}/icedtea6/openjdk/control/build/linux-${_arch}/j2sdk-image
-#  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk/control/build/linux-${_arch}/j2sdk-image
-   # Install main files.
-  cp -a bin include lib src.zip ${pkgdir}/${_jvmdir}/ || return 1
-  cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ || return 1
-
-  mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \
-     ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src || return 1
-  mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \
-     ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc || return 1
-  rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc
-  rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src
-
-   # Install man pages.
-  install -m755 -d ${pkgdir}/usr/share/man/man1
-  install -m644 man/man1/*.1 ${pkgdir}/usr/share/man/man1/ || return 1
-
-   # Install demos and samples.
-  cp -a demo ${pkgdir}/${_jvmdir}/ || return 1
-  install -m755 -d sample/rmi
-  mv bin/java-rmi.cgi sample/rmi || return 1
-  cp -a sample ${pkgdir}/${_jvmdir}/ || return 1
-  popd
-
-  # Install icons and menu entries.
-  for s in 16 24 32 48 ; do
-    install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps
-    install -m644 openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
-      ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png || return 1
-  done
-
-  # Install desktop files.
-  install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
-  install -m644 javaws.png ${pkgdir}/usr/share/pixmaps || return 1
-  install -m644 {javaws,jconsole,policytool}.desktop ${pkgdir}/usr/share/applications || return 1
-
-  # link the mozilla-plugin
-  install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
-  ln -sf ${_jvmdir}/jre/lib/${_arch/i586/i386}/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
-
-  # link binaries into /usr/bin
-  install -m755 -d ${pkgdir}/usr/bin
-  pushd ${pkgdir}/${_jvmdir}/bin
-  for file in *; do
-    ln -sf ${_jvmdir}/bin/${file} \
-      ${pkgdir}/usr/bin || return 1
-  done
-  popd
- 
-  # set some variables
-  install -m755 -d ${pkgdir}/etc/profile.d
-  install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh || return 1
-}
diff --git a/abs/extra-testing/openjdk6/aatext_by_default.diff b/abs/extra-testing/openjdk6/aatext_by_default.diff
deleted file mode 100644
index 268ea99..0000000
--- a/abs/extra-testing/openjdk6/aatext_by_default.diff
+++ /dev/null
@@ -1,35 +0,0 @@
---- openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java.old	2008-01-08 20:23:56.000000000 +0200
-+++ openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java	2008-02-24 12:39:19.000000000 +0200
-@@ -1875,7 +1875,6 @@
-      */
-     private static boolean useSystemAAFontSettings() {
-         if (!checkedSystemAAFontSettings) {
--            useSystemAAFontSettings = true; /* initially set this true */
-             String systemAAFonts = null;
-             Toolkit tk = Toolkit.getDefaultToolkit();
-             if (tk instanceof SunToolkit) {
-@@ -1883,20 +1882,10 @@
-                     (String)AccessController.doPrivileged(
-                          new GetPropertyAction("awt.useSystemAAFontSettings"));
-             }
--            if (systemAAFonts != null) {
--                useSystemAAFontSettings =
--                    Boolean.valueOf(systemAAFonts).booleanValue();
--                /* If it is anything other than "true", then it may be
--                 * a hint name , or it may be "off, "default", etc.
--                 */
--                if (!useSystemAAFontSettings) {
--                    desktopFontHints = getDesktopAAHintsByName(systemAAFonts);
--                }
--            }
--            /* If its still true, apply the extra condition */
--            if (useSystemAAFontSettings) {
--                 useSystemAAFontSettings = lastExtraCondition;
--            }
-+            if (systemAAFonts == null || Boolean.parseBoolean(systemAAFonts))
-+                systemAAFonts = "on";
-+            desktopFontHints = getDesktopAAHintsByName(systemAAFonts);
-+            useSystemAAFontSettings = desktopFontHints != null;
-             checkedSystemAAFontSettings = true;
-         }
-         return useSystemAAFontSettings;
diff --git a/abs/extra-testing/openjdk6/fix_corba_cmds_path.diff b/abs/extra-testing/openjdk6/fix_corba_cmds_path.diff
deleted file mode 100644
index 8426578..0000000
--- a/abs/extra-testing/openjdk6/fix_corba_cmds_path.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- openjdk/corba/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:26:12.000000000 +0300
-+++ openjdk/corba/make/common/shared/Defs-utils.gmk	2008-04-14 15:35:13.000000000 +0300
-@@ -86,10 +86,10 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
--CUT            = $(UTILS_USR_BIN_PATH)cut
-+CUT            = $(UTILS_COMMAND_PATH)cut
- DATE           = $(UTILS_COMMAND_PATH)date
- DF             = $(UTILS_COMMAND_PATH)df
- DIFF           = $(UTILS_USR_BIN_PATH)diff
-@@ -136,7 +136,7 @@
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
- TOUCH          = $(UTILS_COMMAND_PATH)touch
--TR             = $(UTILS_USR_BIN_PATH)tr
-+TR             = $(UTILS_COMMAND_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
- UNIQ           = $(UTILS_USR_BIN_PATH)uniq
-@@ -186,7 +186,7 @@
-   # others have it in /usr/bin.
-   SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
- 		   $(wildcard $(UTILS_USR_BIN_PATH)sort))
--  NAWK           = $(USRBIN_PATH)gawk
-+  NAWK           = $(UTILS_COMMAND_PATH)gawk
-   # Intrinsic unix command, with backslash-escaped character interpretation
-   ECHO           = /bin/echo -e
-   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/abs/extra-testing/openjdk6/fix_jdk_cmds_path.diff b/abs/extra-testing/openjdk6/fix_jdk_cmds_path.diff
deleted file mode 100644
index 7e16e17..0000000
--- a/abs/extra-testing/openjdk6/fix_jdk_cmds_path.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:33:23.000000000 +0300
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2008-04-14 15:37:34.000000000 +0300
-@@ -76,10 +76,10 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
--CUT            = $(UTILS_USR_BIN_PATH)cut
-+CUT            = $(UTILS_COMMAND_PATH)cut
- DATE           = $(UTILS_COMMAND_PATH)date
- DF             = $(UTILS_COMMAND_PATH)df
- DIFF           = $(UTILS_USR_BIN_PATH)diff
-@@ -126,7 +126,7 @@
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
- TOUCH          = $(UTILS_COMMAND_PATH)touch
--TR             = $(UTILS_USR_BIN_PATH)tr
-+TR             = $(UTILS_COMMAND_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
- UNIQ           = $(UTILS_USR_BIN_PATH)uniq
-@@ -173,7 +173,7 @@
-   BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
-                        $(wildcard $(UTILS_USR_BIN_PATH)basename))
- 
--  NAWK           = $(USRBIN_PATH)gawk
-+  NAWK           = $(UTILS_COMMAND_PATH)gawk
-   # Intrinsic unix command, with backslash-escaped character interpretation
-   ECHO           = /bin/echo -e
-   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/abs/extra-testing/openjdk6/fontconfig-paths.diff b/abs/extra-testing/openjdk6/fontconfig-paths.diff
deleted file mode 100644
index 77d3e03..0000000
--- a/abs/extra-testing/openjdk6/fontconfig-paths.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.orig	2008-08-06 14:11:55.000000000 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties	2008-08-06 14:15:36.000000000 +0200
-@@ -128,23 +128,23 @@
- 
- # Font File Names
- 
--filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
--filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
--filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf
--filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf
-+filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf
-+filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf
-+filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf
-+filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf
- 
--filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
--filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf
--filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf
--filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf
-+filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf
-+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf
-+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf
-+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
- 
--filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf
--filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf
--filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf
--filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf
-+filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf
-+filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf
-+filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf
-+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf
- 
--filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic-subst.ttf
--filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho-subst.ttf
--filename.AR_PL_ZenKai_Uni=/usr/share/fonts//truetype/arphic/ukai.ttf
--filename.Baekmuk_Dotum=/usr/share/fonts/truetype/baekmuk/dotum.ttf
--filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
-+filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic-subst.ttf
-+filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho-subst.ttf
-+filename.AR_PL_ZenKai_Uni=/usr/share/fonts/TTF/ukai.ttf
-+filename.Baekmuk_Dotum=/usr/share/fonts/TTF/dotum.ttf
-+filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf
diff --git a/abs/extra-testing/openjdk6/gcjwebplugin_xulrunner.diff b/abs/extra-testing/openjdk6/gcjwebplugin_xulrunner.diff
deleted file mode 100644
index 0ed9209..0000000
--- a/abs/extra-testing/openjdk6/gcjwebplugin_xulrunner.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am	2008-07-21 15:12:07.000000000 +0000
-+++ Makefile.am.new	2008-07-22 08:37:49.000000000 +0000
-@@ -1176,7 +1176,7 @@
- # gcjwebplugin.so.
- gcjwebplugin.so: gcjwebplugin.cc
- 	$(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \
--	  $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \
-+	  $(MOZILLA_LIBS) -Wl,-R/usr/lib/xulrunner-1.9 $(GLIB_CFLAGS) $(GLIB_LIBS) \
- 	  $(GTK_CFLAGS) $(GTK_LIBS) \
- 	  -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
- 	  -fpic -shared -o $@ $<
diff --git a/abs/extra-testing/openjdk6/openjdk6.install b/abs/extra-testing/openjdk6/openjdk6.install
deleted file mode 100644
index 3557847..0000000
--- a/abs/extra-testing/openjdk6/openjdk6.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-
-post_remove() {
-  post_install
-}
diff --git a/abs/extra-testing/openjdk6/openjdk6.profile b/abs/extra-testing/openjdk6/openjdk6.profile
deleted file mode 100644
index 4af417f..0000000
--- a/abs/extra-testing/openjdk6/openjdk6.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-export J2SDKDIR=/usr/lib/jvm/java-1.6.0-openjdk
-export J2REDIR=$J2SDKDIR/jre
-export JAVA_HOME=/usr/lib/jvm/java-1.6.0-openjdk
-#export CLASSPATH="${CLASSPATH:+$CLASSPATH:}$J2SDKDIR/lib:$J2REDIR/lib"
diff --git a/abs/extra-testing/openjpeg/30_fix_build_for_debian.dpatch b/abs/extra-testing/openjpeg/30_fix_build_for_debian.dpatch
deleted file mode 100644
index afd9950..0000000
--- a/abs/extra-testing/openjpeg/30_fix_build_for_debian.dpatch
+++ /dev/null
@@ -1,70 +0,0 @@
-
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_fix_build_for_debian.dpatch by <robin.cornelius@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Dont apply the -s strip flag to the shared lib debian will do it for us 
-## DP: where necessary
-## DP: Remove unnecessary linkage on lstdc++ and lm and add missing linkage for -lm
-
-@DPATCH@
-
-Index: ./Makefile
-===================================================================
---- ./Makefile	(revision 96)
-+++ ./Makefile	(working copy)
-@@ -18,8 +18,7 @@
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
- 
--COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC
--LIBRARIES = -lstdc++
-+COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC -g $(EXTRA_CFLAGS)
- 
- MODULES = $(SRCS:.c=.o)
- CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
-@@ -54,7 +53,7 @@
- 	$(AR) r $@ $(MODULES)
- 
- $(SHAREDLIB): $(MODULES)
--	$(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
-+	$(CC) -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) -lm
- 
- install: OpenJPEG
- 	install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'
-
-Index: ./indexer_JPIP/Makefile
-===================================================================
---- ./indexer_JPIP/Makefile	(revision 95)
-+++ ./indexer_JPIP/Makefile	(working copy)
-@@ -1,7 +1,6 @@
- CC = gcc
- 
--LDFLAGS = -lm
--CFLAGS = -Wall
-+CFLAGS = -Wall $(EXTRA_CFLAGS)
- 
- all: index_create
- 
-Index: ./codec/Makefile
-===================================================================
---- ./codec/Makefile	(revision 96)
-+++ ./codec/Makefile	(working copy)
-@@ -1,13 +1,13 @@
- # Makefile for the main OpenJPEG codecs: j2k_to_image and image_to_j2k
- 
--CFLAGS = -O3 -lstdc++ # -g -p -pg
-+CFLAGS = $(EXTRA_CFLAGS) # -g -p -pg
- 
- all: j2k_to_image image_to_j2k
- 
--j2k_to_image: j2k_to_image.c ../libopenjpeg.a
-+j2k_to_image: j2k_to_image.c
- 	gcc $(CFLAGS) compat/getopt.c index.c convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
- 
--image_to_j2k: image_to_j2k.c ../libopenjpeg.a
-+image_to_j2k: image_to_j2k.c
- 	gcc $(CFLAGS) compat/getopt.c index.c convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
- 
- clean:
-
diff --git a/abs/extra-testing/openjpeg/PKGBUILD b/abs/extra-testing/openjpeg/PKGBUILD
deleted file mode 100644
index 087da2f..0000000
--- a/abs/extra-testing/openjpeg/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=openjpeg
-pkgver=1.3
-_pkgver=v1_3
-pkgrel=3
-pkgdesc="An open source JPEG 2000 codec"
-arch=(i686 x86_64)
-license=('BSD')
-url="http://www.openjpeg.org"
-depends=('glibc')
-source=(http://www.openjpeg.org/openjpeg_${_pkgver}.tar.gz
-	30_fix_build_for_debian.dpatch)
-md5sums=('f9a3ccfa91ac34b589e9bf7577ce8ff9'
-	 '2557f485513e77f6dcea77f4741c4fa1')
-
-build() {
-  cd "${srcdir}/OpenJPEG_${_pkgver}"
-  patch -Np1 -i "${srcdir}/30_fix_build_for_debian.dpatch" || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -m755 -d "${pkgdir}/usr/share/licenses/openjpeg"
-  tr '\r' '\n' < license.txt > "${pkgdir}/usr/share/licenses/openjpeg/license.txt" || return 1
-  chmod 644 "${pkgdir}/usr/share/licenses/openjpeg/license.txt" || return 1
-  ln -s libopenjpeg.so.2 "${pkgdir}/usr/lib/libopenjpeg.so" || return 1
-}
diff --git a/abs/extra-testing/openslp/PKGBUILD b/abs/extra-testing/openslp/PKGBUILD
deleted file mode 100644
index 9ba1f94..0000000
--- a/abs/extra-testing/openslp/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 75251 2010-04-01 04:53:24Z allan $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=openslp
-pkgver=1.2.1
-pkgrel=3
-pkgdesc="Open-source implementation of Service Location Protocol"
-arch=(i686 x86_64)
-url="http://www.openslp.org"
-license=('BSD')
-depends=('glibc' 'bash' 'openssl')
-backup=('etc/slp.conf' 'etc/slp.reg' 'etc/slp.spi')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.slpd)
-md5sums=('ff9999d1b44017281dd00ed2c4d32330' '4f6889a5944894b8be2c01404a9566d2')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} DOC_DIR=/usr/share/doc/openslp-${pkgver} install || return 1
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  install -D -m755 ../rc.slpd ${pkgdir}/etc/rc.d/slpd
-}
diff --git a/abs/extra-testing/openslp/rc.slpd b/abs/extra-testing/openslp/rc.slpd
deleted file mode 100755
index 4330c37..0000000
--- a/abs/extra-testing/openslp/rc.slpd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/slpd`
-case "$1" in
-  start)
-    stat_busy "Starting SLPD"
-    [ -z "$PID" ] && /usr/sbin/slpd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/slpd.pid
-      add_daemon slpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping SLPD"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/slpd.pid
-      rm_daemon slpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/abs/extra-testing/opera/PKGBUILD b/abs/extra-testing/opera/PKGBUILD
deleted file mode 100644
index b7342f8..0000000
--- a/abs/extra-testing/opera/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 28942 2009-03-03 08:21:13Z daniel $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=opera
-pkgver=9.64
-pkgrel=2
-pkgdesc="The Opera web browser"
-url="http://www.opera.com/"
-depends=('qt')
-license=('custom:opera')
-arch=('i686' 'x86_64')
-source=(http://ftp.opera.com/pub/opera/linux/${pkgver/./}/final/en/i386/opera-${pkgver}.gcc4-qt4.i386.tar.bz2 opera.desktop opera_logo48.png opera-qt4-theme.patch)
-md5sums=('bbfb1f77cc3091b3134b710b4719ba3e'
-         'f99bef1a9200abe5a5cda78665cddc84'
-         'a270c65b8d4f8e2e76439f417ea44265'
-         'e977071ea5f09b36820367bf6e4dc3e1')
-
-[ "$CARCH" = "x86_64" ] && depends=('qt3')
-[ "$CARCH" = "x86_64" ] && source=(http://ftp.opera.com/pub/opera/linux/${pkgver/./}/final/en/x86_64/opera-${pkgver}.gcc4-shared-qt3.x86_64.tar.bz2 opera.desktop opera_logo48.png)
-[ "$CARCH" = "x86_64" ] && md5sums=('b4ca665855639a72fc0c3ae47b751fae'
-         'f99bef1a9200abe5a5cda78665cddc84'
-         'a270c65b8d4f8e2e76439f417ea44265')
-build() {
-if [ "$CARCH" = "x86_64" ]; then
-       cd ${startdir}/src/opera-${pkgver}-2480.gcc4-shared-qt3.x86_64
-       sed 's|/usr/X11R6/lib/mozilla/plugins=1|/usr/lib/mozilla/plugins=1|' -i usr/share/opera/ini/pluginpath.ini || return 1
-  else cd ${startdir}/src/opera-${pkgver}-2480.gcc4-qt4.i386
-       sed 's|/usr/X11R6/lib/mozilla/plugins=1|/usr/lib/mozilla/plugins=1|' -i usr/share/opera/ini/pluginpath.ini || return 1
-fi
-   ./install.sh DESTDIR=${startdir}/pkg
-   if [ "$CARCH" = "i686" ]; then
-	pushd ${startdir}/pkg/usr/bin
-	patch -Np0 -i ${startdir}/src/opera-qt4-theme.patch || return 1
-	popd
-   fi
-   install -D -m 644 ${startdir}/src/opera.desktop ${startdir}/pkg/usr/share/applications/opera.desktop
-   install -D -m 644 LICENSE ${startdir}/pkg/usr/share/licenses/opera/license.txt
-   install -D -m 644 ${startdir}/src/opera_logo48.png ${startdir}/pkg/usr/share/opera/images/opera_48x48.png
-}
diff --git a/abs/extra-testing/opera/opera-qt4-theme.patch b/abs/extra-testing/opera/opera-qt4-theme.patch
deleted file mode 100644
index f00f2cd..0000000
--- a/abs/extra-testing/opera/opera-qt4-theme.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- opera.orig	2008-10-22 19:37:21.000000000 +0200
-+++ opera	2008-10-22 19:38:13.000000000 +0200
-@@ -30,7 +30,7 @@
- done
- test -z "$toset" || die Missing parameter for $arg
- 
--test "${_QTSTYLE_FROM_CMDLINE_}" = 'NO' && test -f "$HOME/.qt/qtrc" && _OPERA_QTSTYLE=`sed -n 's/^style=//p' $HOME/.qt/qtrc` && test "$_OPERA_QTSTYLE" && set -- "$@" -style "$_OPERA_QTSTYLE"
-+test "${_QTSTYLE_FROM_CMDLINE_}" = 'NO' && test -f "$HOME/.config/Trolltech.conf" && _OPERA_QTSTYLE=`sed -n 's/^style=//p' $HOME/.config/Trolltech.conf` && test "$_OPERA_QTSTYLE" && set -- "$@" -style "$_OPERA_QTSTYLE"
- 
- 
- # Add ending path divider "/" if missing, so execution won't fail
diff --git a/abs/extra-testing/opera/opera.desktop b/abs/extra-testing/opera/opera.desktop
deleted file mode 100644
index 23fa418..0000000
--- a/abs/extra-testing/opera/opera.desktop
+++ /dev/null
@@ -1,91 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=opera %u
-Terminal=false
-Icon=/usr/share/opera/images/opera_48x48.png
-Type=Application
-MimeType=text/html
-Categories=Application;Network;
-Name=Opera
-Name[ar]=أوبرا
-Name[bn]=অপেরা
-Name[eo]=Opero
-Name[fa]=اپرا
-Name[hi]=ऑपेरा
-Name[ko]=오페�
-Name[lo]=ໂອເປຣາ
-Name[pa]=ਓਪੇਰਾ
-Name[ta]=ஓபேரா
-Name[th]=โอเปรา
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متص�ح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব�রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlíže�
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Πε�ιηγητής Ιστο�
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[fy]=Webblêder
-GenericName[ga]=Brabhsálaí Lín
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן �ינטרנט
-GenericName[hi]=वेब ब�राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[km]=កម្មវិធី​រុករក​បណ្ដាញ
-GenericName[ko]=웹 브�우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Tīmekļa P�rlūks
-GenericName[mk]=Прели�тувач на Интернет 
-GenericName[mn]=Веб-Хөтөч
-GenericName[ms]=Pelayar Web
-GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ �ਲਕਾਰਾ
-GenericName[pl]=PrzeglÄ…darka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[rw]=Mucukumbuzi Urubuga
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliada�
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб прегледач
-GenericName[sr@Latn]=Veb pregleda�
-GenericName[ss]=Ibrawuza yeWeb 
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Таф�иргари в�б
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=�авігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[zh_CN]=Web �览器
-GenericName[zh_TW]=網��覽器
-GenericName[zu]=Umcingi we-Web
diff --git a/abs/extra-testing/opera/opera_logo48.png b/abs/extra-testing/opera/opera_logo48.png
deleted file mode 100644
index be7e5ae..0000000
--- a/abs/extra-testing/opera/opera_logo48.png
+++ /dev/null
diff --git a/abs/extra-testing/orbit2/PKGBUILD b/abs/extra-testing/orbit2/PKGBUILD
deleted file mode 100644
index a8e3337..0000000
--- a/abs/extra-testing/orbit2/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 29413 2009-03-08 16:43:13Z jgc $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-
-pkgname=orbit2
-pkgver=2.14.17
-pkgrel=1
-pkgdesc="Thin/fast CORBA ORB"
-arch=(i686 x86_64)
-license=('LGPL' 'GPL')
-depends=('libidl2>=0.8.11')
-makedepends=('pkgconfig')
-options=('!libtool' '!makeflags')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/ORBit2/2.14/ORBit2-${pkgver}.tar.bz2)
-md5sums=('10bfb957fa4a8935a0b4afaee7d71df7')
-
-build() {
-  cd "${srcdir}/ORBit2-${pkgver}"
-  ./configure --prefix=/usr --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra-testing/oss/PKGBUILD b/abs/extra-testing/oss/PKGBUILD
deleted file mode 100644
index d568ff3..0000000
--- a/abs/extra-testing/oss/PKGBUILD
+++ /dev/null
@@ -1,225 +0,0 @@
-# $Id: PKGBUILD,v 1.8 2009/02/11 17:22:38 thotypous Exp $
-# Maintainer: Paulo Matias <matiasΘarchlinux-br·org>
-
-pkgname="oss"
-pkgver="4.1_1051"
-pkgrel=7
-pkgdesc="Open Sound System UNIX audio architecture"
-arch=('i686' 'x86_64')
-url="http://developer.opensound.com/"
-license=('GPL2')
-depends=('gcc' 'make' 'kernel-headers' 'module-init-tools' 'libtool' 'sed')
-makedepends=('pkgconfig' 'gawk' 'gtk2')
-conflicts=('oss-linux' 'oss-linux-free' 'oss-testing')
-install='oss.install'
-source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2"
-        'oss.rm-init-scripts.patch' 'oss.rc' 'oss.install' 'hg-latest-fixes.diff')
-
-
-optdepends=('gtk2: for graphical mixer (ossxmix)'
-            'hal: for automatic USB audio configuration'
-            'libflashsupport-oss: for Flash plugin support')
-
-build() {
-    _dir="oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl"
-
-    cd "$srcdir/$_dir"
-
-    # Apply patchs from hg.
-    msg "Applying latest fixes from hg."
-    patch -p1 < "$srcdir/hg-latest-fixes.diff" || return 1
-
-    cd "$srcdir"
-
-    # Avoid these flags conflicting with OSS build system.
-    unset CFLAGS
-    unset OSFLAGS
-    unset LIBRARIES
-
-    # Remove libflashsupport, as it belongs to a separate package.
-    rm -f "$srcdir/$_dir/oss/lib/flashsupport.c" &> /dev/null
-
-    msg "Preparing the build environment."
-
-    if [ ! -d build ]; then
-        # Create build directory and configure
-        mkdir build && cd build
-        "$srcdir/$_dir/configure" --enable-libsalsa=NO || return 1
-    else
-        # Change to existing build directory
-        cd build
-    fi
-
-    msg "Building OSS."
-    make build || return 1
-
-    msg "Patching init scripts."
-    cd "$srcdir/build/prototype"
-    rm usr/lib/oss/etc/S89oss
-    patch -b -p0 < "$srcdir/oss.rm-init-scripts.patch" || return 1
-
-    msg "Copying files."
-    cp -R * "$pkgdir"
-    install -D -m755 "$srcdir/oss.rc" "$pkgdir/etc/rc.d/oss"
-################################
-PREFIX=$startdir/pkg
-OSSLIBDIR=$PREFIX/usr/lib/oss
-UNAME=2.6.28-LinHES
-KERNELDIR=/lib/modules/$UNAME/build
-mkdir -p ${PREFIX}/lib/modules/$UNAME/kernel/oss
-
-cd $OSSLIBDIR/build
-rm -f $OSSLIBDIR/.cuckoo_installed
-   REGPARM=REGPARM
-   rm -rf $OSSLIBDIR/objects
-   ln -s $OSSLIBDIR/objects.regparm $OSSLIBDIR/objects
-   rm -rf $OSSLIBDIR/modules
-   ln -s $OSSLIBDIR/modules.regparm $OSSLIBDIR/modules
-
-echo OSS build environment set up for $REGPARM kernels
-
-if ! test -f $OSSLIBDIR/objects/osscore.o
-then
-    echo Error: OSS core module for $REGPARM kernel is not available in $OSSLIBDIR/objects
-    exit 1
-fi
-OK=1
-
-if ! test -d /lib/modules/$UNAME
-then
-    echo Error: Kernel directory /lib/modules/$UNAME does not exist
-    exit 1
-fi
-
-cp -f ../objects/osscore.o osscore_mainline.o
-
-ln -sf ../include/sys/*.h ../include/sys/ossddk .
-
-rm -f Makefile
-ln -s Makefile.osscore Makefile
-
-echo Building module osscore
-
-if ! make KERNELDIR=$KERNELDIR> build.list 2>&1
-then
-    echo Failed to compile OSS
-    cat build.list
-    exit 2
-fi
-
-if ! test -d /lib/modules/$UNAME/kernel/oss
-then
-  mkdir /lib/modules/$UNAME/kernel/oss
-fi
-
-if ! test -d /lib/modules/$UNAME/kernel/oss
-then
-    echo OSS module directory /lib/modules/$UNAME/kernel/oss does not exist.
-    exit 3
-fi
-
-if ! ld -r osscore.ko osscore_mainline.o -o /lib/modules/$UNAME/kernel/oss/osscore.ko
-then
-    echo Linking the osscore module failed
-    exit 5
-fi
-
-if test -f Module.symvers
-then
-    #Take generated symbol information and add it to module.inc
-    rm -f osscore_symbols.inc
-    echo "static const struct modversion_info ____versions[]" >> osscore_symbols.inc
-    echo " __attribute__((used))" >> osscore_symbols.inc
-    echo "__attribute__((section(\"__versions\"))) = {" >> osscore_symbols.inc
-    sed -e "s:^:{:" -e "s:\t:, \":" -e "s:\t\(.\)*:\"},:" < Module.symvers >> osscore_symbols.inc
-    echo "};" >> osscore_symbols.inc
-else
-    echo > osscore_symbols.inc
-fi
-
-#depmod -a
-
-for n in ../modules/*.o
-do
-    N=`basename $n .o`
-    echo Building module $N
-
-    rm -f $N_mainline.o Makefile
-
-    sed "s/MODNAME/$N/" < Makefile.tmpl > Makefile
-    ln -s $n $N_mainline.o
-
-    if ! make KERNELDIR=$KERNELDIR > build.list 2>&1
-    then
-        echo Compiling module $N failed
-        cat build.list
-        exit 4
-    fi
-
-    if ! ld -r $N.ko $N_mainline.o -o /lib/modules/$UNAME/kernel/oss/$N.ko
-    then
-        echo Linking $N module failed
-        exit 6
-    fi
-
-    rm -f $N_mainline.o
-    make clean
-
-done
-rm -f Makefile
-
-cp -rp /lib/modules/$UNAME/kernel/oss/*  ${PREFIX}/lib/modules/$UNAME/kernel/oss/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-
diff --git a/abs/extra-testing/oss/hg-fix-devc.diff b/abs/extra-testing/oss/hg-fix-devc.diff
deleted file mode 100644
index 8e8b4cf..0000000
--- a/abs/extra-testing/oss/hg-fix-devc.diff
+++ /dev/null
@@ -1,397 +0,0 @@
-
-# HG changeset patch
-# User Hannu Savolainen <hannu@opensound.com>
-# Date 1227908228 -7200
-# Node ID 5a75f44925143c924a51dc474119035f4b08bf06
-# Parent e138663cd973a1e35950fddf299017bfefd16bdc
-Fixed devc=NULL problems left after changeset 502
-
---- a/attic/drv/oss_allegro/oss_allegro.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/attic/drv/oss_allegro/oss_allegro.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -876,7 +876,7 @@ init_allegro (allegro_devc * devc)
- 					&allegro_audio_driver,
- 					sizeof (audiodrv_t),
- 					caps,
--					AFMT_U8 | AFMT_S16_LE, NULL, -1)) < 0)
-+					AFMT_U8 | AFMT_S16_LE, devc, -1)) < 0)
- 	{
- 	  adev = -1;
- 	  return 0;
---- a/attic/drv/oss_als3xx/oss_als3xx.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/attic/drv/oss_als3xx/oss_als3xx.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -740,7 +740,7 @@ init_als300 (als300_devc * devc)
- 					&als300_audio_driver,
- 					sizeof (audiodrv_t),
- 					caps,
--					AFMT_U8 | AFMT_S16_LE, NULL, -1)) < 0)
-+					AFMT_U8 | AFMT_S16_LE, devc, -1)) < 0)
- 	{
- 	  adev = -1;
- 	  return 0;
---- a/attic/drv/oss_als4k/oss_als4k.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/attic/drv/oss_als4k/oss_als4k.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -1018,7 +1018,7 @@ init_als4000 (als4000_devc * devc)
- 					&als4000_audio_driver,
- 					sizeof (audiodrv_t),
- 					caps,
--					AFMT_U8 | AFMT_S16_LE, NULL, -1)) < 0)
-+					AFMT_U8 | AFMT_S16_LE, devc, -1)) < 0)
- 	{
- 	  adev = -1;
- 	  return 0;
---- a/attic/drv/oss_maestro/oss_maestro.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/attic/drv/oss_maestro/oss_maestro.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -2181,7 +2181,7 @@ init_maestro (maestro_devc * devc)
- 					&maestro_audio_driver,
- 					sizeof (audiodrv_t),
- 					caps,
--					AFMT_U8 | AFMT_S16_LE, NULL, -1)) < 0)
-+					AFMT_U8 | AFMT_S16_LE, devc, -1)) < 0)
- 	{
- 	  adev = -1;
- 	  return 0;
---- a/attic/drv/oss_neomagic/oss_neomagic.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/attic/drv/oss_neomagic/oss_neomagic.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -730,7 +730,7 @@ neomagic_install (neomagic_devc * devc, 
- 				 devc->chip_name,
- 				 &neomagic_audio_driver,
- 				 sizeof (audiodrv_t),
--				 0, AFMT_U8 | AFMT_S16_LE, NULL, -1)) < 0)
-+				 0, AFMT_U8 | AFMT_S16_LE, devc, -1)) < 0)
- 	{
- 	  adev = -1;
- 	  return 0;
---- a/attic/drv/oss_vortex/oss_vortex.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/attic/drv/oss_vortex/oss_vortex.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -1449,7 +1449,7 @@ attach_channel (vortex_devc * devc, int 
- 					&vortex_driver,
- 					sizeof (audiodrv_t),
- 					caps,
--					AFMT_U8 | AFMT_S16_LE, NULL, -1)) < 0)
-+					AFMT_U8 | AFMT_S16_LE, devc, -1)) < 0)
- 	{
- 	  adev = -1;
- 	  return;
---- a/attic/drv/oss_vortex/oss_vortex2.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/attic/drv/oss_vortex/oss_vortex2.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -1601,7 +1601,7 @@ attach_channel_vortex2 (vortex_devc * de
- 					&vortex2_driver,
- 					sizeof (audiodrv_t),
- 					caps,
--					AFMT_U8 | AFMT_S16_LE, NULL, -1)) < 0)
-+					AFMT_U8 | AFMT_S16_LE, devc, -1)) < 0)
- 	{
- 	  adev = -1;
- 	  return;
---- a/kernel/drv/oss_ali5455/oss_ali5455.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_ali5455/oss_ali5455.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -835,7 +835,7 @@ init_ALI (ALI_devc * devc)
- 					  tmp_name,
- 					  &ALI_audio_driver,
- 					  sizeof (audiodrv_t), opts,
--					  formats, NULL, -1)) < 0)
-+					  formats, devc, -1)) < 0)
- 	{
- 	  my_dev = -1;
- 	  return 0;
---- a/kernel/drv/oss_atiaudio/oss_atiaudio.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_atiaudio/oss_atiaudio.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -946,7 +946,7 @@ init_ATI (ATI_devc * devc)
- 					  tmp_name,
- 					  &ATI_audio_driver,
- 					  sizeof (audiodrv_t),
--					  opts, formats, NULL, -1,
-+					  opts, formats, devc, -1,
- 					  devfile_name)) < 0)
- 	{
- 	  my_dev = -1;
---- a/kernel/drv/oss_audigyls/oss_audigyls.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_audigyls/oss_audigyls.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -1470,7 +1470,7 @@ install_audio_devices (audigyls_devc * d
- 					names[i],
- 					&audigyls_audio_driver,
- 					sizeof (audiodrv_t),
--					flags, fmts, NULL, -1)) < 0)
-+					flags, fmts, devc, -1)) < 0)
- 	{
- 	  return 0;
- 	}
-@@ -1484,6 +1484,7 @@ install_audio_devices (audigyls_devc * d
-       audio_engines[adev]->rate_source = frontdev;
-       audio_engines[adev]->mixer_dev = devc->mixer_dev;
-       audio_engines[adev]->binding = bindings[i];
-+      audio_engines[adev]->dmabuf_maxaddr = MEMLIMIT_ISA;
-       if (audio_engines[adev]->flags & ADEV_FIXEDRATE)
- 	{
- 	  audio_engines[adev]->fixed_rate = DEFAULT_RATE;
---- a/kernel/drv/oss_audiopci/oss_audiopci.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_audiopci/oss_audiopci.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -1384,7 +1384,7 @@ init_apci (apci_devc * devc)
- 					&apci_audio_driver,
- 					sizeof (audiodrv_t),
- 					caps,
--					AFMT_U8 | AFMT_S16_LE, NULL, -1)) < 0)
-+					AFMT_U8 | AFMT_S16_LE, devc, -1)) < 0)
- 	{
- 	  adev = -1;
- 	  return 0;
---- a/kernel/drv/oss_cmi878x/oss_cmi878x.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_cmi878x/oss_cmi878x.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -2396,7 +2396,7 @@ init_cmi8788 (cmi8788_devc * devc)
- 				 devc->osdev, tmp_name,
- 				 &cmi8788_audio_driver,
- 				 sizeof (audiodrv_t), caps, fmt,
--				 NULL, -1)) < 0)
-+				 devc, -1)) < 0)
- 	{
- 	  return 0;
- 	}
---- a/kernel/drv/oss_cmpci/oss_cmpci.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_cmpci/oss_cmpci.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -2212,7 +2212,7 @@ init_cmpci (cmpci_devc * devc)
- 						   sizeof (audiodrv_t),
- 						   caps,
- 						   AFMT_U8 | AFMT_S16_LE |
--						   AFMT_AC3, NULL, -1)) < 0)
-+						   AFMT_AC3, devc, -1)) < 0)
- 	{
- 	  return 0;
- 	}
---- a/kernel/drv/oss_cs4281/oss_cs4281.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_cs4281/oss_cs4281.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -909,7 +909,7 @@ init_cs4281 (cs4281_devc * devc)
- 					&cs4281_audio_driver,
- 					sizeof (audiodrv_t),
- 					caps,
--					AFMT_S16_LE | AFMT_U8, NULL, -1)) < 0)
-+					AFMT_S16_LE | AFMT_U8, devc, -1)) < 0)
- 	{
- 	  adev = -1;
- 	  return 0;
---- a/kernel/drv/oss_cs461x/oss_cs461x.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_cs461x/oss_cs461x.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -1719,7 +1719,7 @@ init_cs461x (cs461x_devc * devc)
- 					&cs461x_audio_driver,
- 					sizeof (audiodrv_t),
- 					caps,
--					AFMT_S16_LE | AFMT_U8, NULL, -1)) < 0)
-+					AFMT_S16_LE | AFMT_U8, devc, -1)) < 0)
- 	{
- 	  adev = -1;
- 	  return 0;
---- a/kernel/drv/oss_emu10k1x/oss_emu10k1x.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_emu10k1x/oss_emu10k1x.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -1038,7 +1038,7 @@ install_audio_devices (emu10k1x_devc * d
- 					name,
- 					&emu10k1x_audio_driver,
- 					sizeof (audiodrv_t),
--					flags, AFMT_S16_LE | AFMT_AC3, NULL,
-+					flags, AFMT_S16_LE | AFMT_AC3, devc,
- 					-1)) < 0)
- 	{
- 	  return;
---- a/kernel/drv/oss_envy24/envy24_direct.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_envy24/envy24_direct.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -342,7 +342,7 @@ envy24d_install (envy24_devc * devc)
- 				    sizeof (audiodrv_t),
- 				    ADEV_NOVIRTUAL | ADEV_NOINPUT | ADEV_COLD
- 				    | ADEV_SPECIAL | ADEV_32BITONLY,
--				    AFMT_S32_LE, NULL, -1,
-+				    AFMT_S32_LE, devc, -1,
- 				    "10ch_out")) >= 0)
-     {
-       portc = &devc->direct_portc_out;
-@@ -379,7 +379,7 @@ envy24d_install (envy24_devc * devc)
- 				    sizeof (audiodrv_t),
- 				    ADEV_NOVIRTUAL | ADEV_NOOUTPUT | ADEV_COLD
- 				    | ADEV_SPECIAL | ADEV_32BITONLY,
--				    AFMT_S32_LE, NULL, -1,
-+				    AFMT_S32_LE, devc, -1,
- 				    "12ch_in")) >= 0)
-     {
-       portc = &devc->direct_portc_in;
---- a/kernel/drv/oss_envy24/oss_envy24.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_envy24/oss_envy24.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -3114,7 +3114,7 @@ install_adev (envy24_devc * devc, char *
- 				   ADEV_AUTOMODE | ADEV_NOMMAP |
- 				   flags | ADEV_NOVIRTUAL,
- 				   fmts | AFMT_S16_LE | AFMT_S32_LE |
--				   AFMT_S24_LE, NULL, -1,
-+				   AFMT_S24_LE, devc, -1,
- 				   devfile_name)) < 0)
-     {
-       dev = -1;
---- a/kernel/drv/oss_fmedia/oss_fmedia.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_fmedia/oss_fmedia.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -925,7 +925,7 @@ init_fm801 (fm801_devc * devc)
- 					&fm801_audio_driver,
- 					sizeof (audiodrv_t),
- 					caps,
--					AFMT_U8 | AFMT_S16_LE, NULL, -1)) < 0)
-+					AFMT_U8 | AFMT_S16_LE, devc, -1)) < 0)
- 	{
- 	  adev = -1;
- 	  return 1;
---- a/kernel/drv/oss_geode/oss_geode.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_geode/oss_geode.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -750,7 +750,7 @@ init_geode (geode_devc * devc)
- 					tmp_name,
- 					&geode_audio_driver,
- 					sizeof (audiodrv_t),
--					caps, AFMT_S16_LE, NULL, -1)) < 0)
-+					caps, AFMT_S16_LE, devc, -1)) < 0)
- 	{
- 	  adev = -1;
- 	  return 0;
---- a/kernel/drv/oss_hdaudio/oss_hdaudio.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_hdaudio/oss_hdaudio.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -1442,7 +1442,7 @@ install_outputdevs (hda_devc_t * devc)
- 					       tmp_name,
- 					       &hda_audio_driver,
- 					       sizeof (audiodrv_t),
--					       opts, formats, NULL, -1,
-+					       opts, formats, devc, -1,
- 					       devfile_name)) < 0)
- 	  {
- 	    return;
-@@ -1564,7 +1564,7 @@ install_inputdevs (hda_devc_t * devc)
- 					     tmp_name,
- 					     &hda_audio_driver,
- 					     sizeof (audiodrv_t),
--					     opts, formats, NULL, -1,
-+					     opts, formats, devc, -1,
- 					     devfile_name)) < 0)
- 	{
- 	  return;
---- a/kernel/drv/oss_sblive/oss_sblive.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_sblive/oss_sblive.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -3806,7 +3806,7 @@ oss_sblive_attach (oss_device_t * osdev)
- 				 tmp,
- 				 &sblive_audio_driver,
- 				 sizeof (audiodrv_t), caps,
--				 fmts | AFMT_U8 | AFMT_S16_LE, NULL, -1)) < 0)
-+				 fmts | AFMT_U8 | AFMT_S16_LE, devc, -1)) < 0)
- 	{
- 	  portc->audiodev = -1;
- 	  return (i > 0);
---- a/kernel/drv/oss_sbpci/oss_sbpci.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_sbpci/oss_sbpci.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -1231,7 +1231,7 @@ init_apci97 (apci97_devc * devc, int dev
- 					tmp_name,
- 					&apci97_audio_driver,
- 					sizeof (audiodrv_t),
--					caps, fmts, NULL, -1)) < 0)
-+					caps, fmts, devc, -1)) < 0)
- 	{
- 	  adev = -1;
- 	  return 0;
---- a/kernel/drv/oss_solo/oss_solo.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_solo/oss_solo.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -1051,7 +1051,7 @@ init_solo (solo_devc * devc)
- 					&solo_audio_driver,
- 					sizeof (audiodrv_t),
- 					caps,
--					AFMT_U8 | AFMT_S16_LE, NULL, -1)) < 0)
-+					AFMT_U8 | AFMT_S16_LE, devc, -1)) < 0)
- 	{
- 	  adev = -1;
- 	  return 0;
---- a/kernel/drv/oss_trident/oss_trident.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_trident/oss_trident.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -1348,7 +1348,7 @@ init_trident (trident_devc * devc)
- 					sizeof (audiodrv_t),
- 					caps,
- 					AFMT_U8 | AFMT_S16_LE | AFMT_AC3,
--					NULL, -1)) < 0)
-+					devc, -1)) < 0)
- 
- 	{
- 	  adev = -1;
---- a/kernel/drv/oss_userdev/oss_userdev.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_userdev/oss_userdev.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -268,6 +268,7 @@ attach_control_device(void)
-  * Create the control device files that are used to create client/server
-  * device pairs and to redirect access to them.
-  */
-+  userdev_devc_t *devc = (userdev_devc_t*)0xdeadcafe; /* This should never get referenced */
- 
-   if ((client_dev = oss_install_audiodev_with_devname (OSS_AUDIO_DRIVER_VERSION,
- 				    userdev_osdev,
-@@ -275,7 +276,7 @@ attach_control_device(void)
- 				    "User space audio device client side",
- 				    &userdev_client_control_driver,
- 				    sizeof (audiodrv_t),
--				    ADEV_AUTOMODE, AFMT_S16_NE, NULL, -1,
-+				    ADEV_AUTOMODE, AFMT_S16_NE, devc, -1,
- 				    "client")) < 0)
-     {
-       return;
-@@ -289,7 +290,7 @@ attach_control_device(void)
- 				    "User space audio device server side",
- 				    &userdev_server_control_driver,
- 				    sizeof (audiodrv_t),
--				    ADEV_AUTOMODE, AFMT_S16_NE, NULL, -1, 
-+				    ADEV_AUTOMODE, AFMT_S16_NE, devc, -1, 
- 				    "server")) < 0)
-     {
-       return;
---- a/kernel/drv/oss_via823x/oss_via823x.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_via823x/oss_via823x.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -813,7 +813,7 @@ via8233_init (via8233_devc * devc)
- 					sizeof (audiodrv_t),
- 					opts,
- 					AFMT_U8 | AFMT_S16_LE | AFMT_AC3,
--					NULL, -1)) < 0)
-+					devc, -1)) < 0)
- 	{
- 	  adev = -1;
- 	  return 1;
---- a/kernel/drv/oss_via97/oss_via97.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_via97/oss_via97.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -742,7 +742,7 @@ init_via97 (via97_devc * devc)
- 					&via97_audio_driver,
- 					sizeof (audiodrv_t),
- 					opts,
--					AFMT_U8 | AFMT_S16_LE, NULL, -1)) < 0)
-+					AFMT_U8 | AFMT_S16_LE, devc, -1)) < 0)
- 	{
- 	  adev = -1;
- 	  return 0;
---- a/kernel/drv/oss_ymf7xx/oss_ymf7xx.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/drv/oss_ymf7xx/oss_ymf7xx.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -1314,7 +1314,7 @@ init_ymf7xx (ymf7xx_devc * devc)
- 					sizeof (audiodrv_t),
- 					caps,
- 					AFMT_U8 | AFMT_S16_LE | AFMT_AC3,
--					NULL, -1)) < 0)
-+					devc, -1)) < 0)
- 	{
- 	  adev = -1;
- 	  return 0;
---- a/kernel/framework/audio/oss_audio_core.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/framework/audio/oss_audio_core.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -6242,6 +6242,12 @@ oss_install_audiodev_with_devname (int v
-   int chdev_flags = 0;
-   int devfile_num = 0;
- 
-+  if (devc == NULL)
-+     {
-+	     cmn_err(CE_WARN, "devc==NULL for %s. Cannot install audio device\n", name);
-+	     return OSS_EINVAL;
-+     }
-+
-   if (name == NULL)
-     cmn_err (CE_CONT, "Name is really NULL\n");
-   if (master_osdev == NULL)
---- a/kernel/framework/remux/oss_remux.c	Thu Nov 27 19:36:57 2008 +0200
-+++ b/kernel/framework/remux/oss_remux.c	Fri Nov 28 23:37:08 2008 +0200
-@@ -508,7 +508,7 @@ remux_install (char *name, oss_device_t 
- 					       sizeof (audiodrv_t),
- 					       ADEV_NOINPUT | ADEV_SPECIAL |
- 					       ADEV_DISABLE_VIRTUAL |
--					       ADEV_NOSRC, AFMT_S16_NE, NULL,
-+					       ADEV_NOSRC, AFMT_S16_NE, devc,
- 					       -1)) < 0)
-     {
-       devc->audio_dev = -1;
-
diff --git a/abs/extra-testing/oss/hg-latest-fixes.diff b/abs/extra-testing/oss/hg-latest-fixes.diff
deleted file mode 100644
index 15da42d..0000000
--- a/abs/extra-testing/oss/hg-latest-fixes.diff
+++ /dev/null
@@ -1,104 +0,0 @@
---- a/kernel/drv/oss_hdaudio/.devices	Fri Feb 06 00:36:29 2009 +0200
-+++ b/kernel/drv/oss_hdaudio/.devices	Fri Feb 06 17:00:26 2009 +0200
-@@ -13,6 +13,7 @@ oss_hdaudio	pci10de,44a	Nvidia High Defi
- oss_hdaudio	pci10de,44a	Nvidia High Definition Audio (MCP65)
- oss_hdaudio	pci10de,55c	Nvidia High Definition Audio (MCP67)
- oss_hdaudio	pci10de,774	Nvidia High Definition Audio (MCP78S)
-+oss_hdaudio	pci10de,ac0	Nvidia High Definition Audio (MCP79)
- oss_hdaudio	pci1002,437b	ATI High Definition Audio (SB450)
- oss_hdaudio	pci1002,4383	ATI High Definition Audio (SB600)
- oss_hdaudio	pci1106,3288	VIA High Definition Audio
---- a/kernel/drv/oss_hdaudio/oss_hdaudio.c	Fri Feb 06 00:36:29 2009 +0200
-+++ b/kernel/drv/oss_hdaudio/oss_hdaudio.c	Fri Feb 06 17:00:26 2009 +0200
-@@ -30,6 +30,7 @@
- #define NVIDIA_DEVICE_MCP65     0x044a
- #define NVIDIA_DEVICE_MCP67     0x055c
- #define NVIDIA_DEVICE_MCP78S    0x0774
-+#define NVIDIA_DEVICE_MCP79     0x0ac0
- 
- #define ATI_VENDOR_ID           0x1002
- #define ATI_DEVICE_SB450        0x437b
-@@ -1720,7 +1721,7 @@ oss_hdaudio_attach (oss_device_t * osdev
-        device != NVIDIA_DEVICE_MCP51 && device != NVIDIA_DEVICE_MCP55 &&
-        device != NVIDIA_DEVICE_MCP61 && device != NVIDIA_DEVICE_MCP61A &&
-        device != NVIDIA_DEVICE_MCP65 && device != NVIDIA_DEVICE_MCP67 &&
--       device != NVIDIA_DEVICE_MCP78S &&
-+       device != NVIDIA_DEVICE_MCP78S && device != NVIDIA_DEVICE_MCP79 &&
-        device != VIA_DEVICE_HDA &&
-        device != SIS_DEVICE_HDA &&
-        device != ULI_DEVICE_HDA &&
-@@ -1776,6 +1777,7 @@ oss_hdaudio_attach (oss_device_t * osdev
-     case NVIDIA_DEVICE_MCP65:
-     case NVIDIA_DEVICE_MCP67:
-     case NVIDIA_DEVICE_MCP78S:
-+    case NVIDIA_DEVICE_MCP79:
-       devc->chip_name = "nVidia HD Audio";
-       pci_read_config_byte (osdev, 0x4e, &btmp);
-       pci_write_config_byte (osdev, 0x4e, (btmp & 0xf0) | 0x0f);
---- a/kernel/drv/oss_hdaudio/.devices	Fri Feb 06 17:05:21 2009 +0200
-+++ b/kernel/drv/oss_hdaudio/.devices	Sat Feb 07 11:10:36 2009 +0200
-@@ -12,6 +12,7 @@ oss_hdaudio	pci10de,3f0	Nvidia High Defi
- oss_hdaudio	pci10de,3f0	Nvidia High Definition Audio (MCP61)
- oss_hdaudio	pci10de,44a	Nvidia High Definition Audio (MCP65)
- oss_hdaudio	pci10de,55c	Nvidia High Definition Audio (MCP67)
-+oss_hdaudio	pci10de,7fc	Nvidia High Definition Audio (MCP73)
- oss_hdaudio	pci10de,774	Nvidia High Definition Audio (MCP78S)
- oss_hdaudio	pci10de,ac0	Nvidia High Definition Audio (MCP79)
- oss_hdaudio	pci1002,437b	ATI High Definition Audio (SB450)
---- a/kernel/drv/oss_hdaudio/oss_hdaudio.c	Fri Feb 06 17:05:21 2009 +0200
-+++ b/kernel/drv/oss_hdaudio/oss_hdaudio.c	Sat Feb 07 11:10:36 2009 +0200
-@@ -29,6 +29,7 @@
- #define NVIDIA_DEVICE_MCP61A    0x03f0
- #define NVIDIA_DEVICE_MCP65     0x044a
- #define NVIDIA_DEVICE_MCP67     0x055c
-+#define NVIDIA_DEVICE_MCP73     0x07fc
- #define NVIDIA_DEVICE_MCP78S    0x0774
- #define NVIDIA_DEVICE_MCP79     0x0ac0
- 
-@@ -1721,7 +1722,8 @@ oss_hdaudio_attach (oss_device_t * osdev
-        device != NVIDIA_DEVICE_MCP51 && device != NVIDIA_DEVICE_MCP55 &&
-        device != NVIDIA_DEVICE_MCP61 && device != NVIDIA_DEVICE_MCP61A &&
-        device != NVIDIA_DEVICE_MCP65 && device != NVIDIA_DEVICE_MCP67 &&
--       device != NVIDIA_DEVICE_MCP78S && device != NVIDIA_DEVICE_MCP79 &&
-+       device != NVIDIA_DEVICE_MCP73 && device != NVIDIA_DEVICE_MCP78S &&
-+       device != NVIDIA_DEVICE_MCP79 &&
-        device != VIA_DEVICE_HDA &&
-        device != SIS_DEVICE_HDA &&
-        device != ULI_DEVICE_HDA &&
-@@ -1776,6 +1778,7 @@ oss_hdaudio_attach (oss_device_t * osdev
-     case NVIDIA_DEVICE_MCP61A:
-     case NVIDIA_DEVICE_MCP65:
-     case NVIDIA_DEVICE_MCP67:
-+    case NVIDIA_DEVICE_MCP73:
-     case NVIDIA_DEVICE_MCP78S:
-     case NVIDIA_DEVICE_MCP79:
-       devc->chip_name = "nVidia HD Audio";
---- a/kernel/framework/vmix_core/vmix_core.c	Mon Feb 09 21:21:39 2009 +0200
-+++ b/kernel/framework/vmix_core/vmix_core.c	Mon Feb 09 19:52:22 2009 -0200
-@@ -1590,7 +1590,7 @@ create_vmix_engine (vmix_mixer_t * mixer
-   adev_t *adev, *master_adev;
-   int opts = ADEV_VIRTUAL | ADEV_DEFAULT | ADEV_VMIX;
- 
--  n = mixer->num_clientdevs++;
-+  n = mixer->num_clientdevs;
- 
-   /*
-    * ADEV_HIDDEN is used for the VMIX devices because they should not be
-@@ -1611,7 +1611,7 @@ create_vmix_engine (vmix_mixer_t * mixer
-   if (mixer->masterdev == -1)
-     return OSS_ENXIO;
- 
--  if (mixer->num_clientdevs >= MAX_CLIENTS) /* Cannot create more client engines */
-+  if (n + 1 >= MAX_CLIENTS) /* Cannot create more client engines */
-      return OSS_EBUSY;
- 
-   /*
-@@ -1628,6 +1628,8 @@ create_vmix_engine (vmix_mixer_t * mixer
-     }
-   memset (portc, 0, sizeof (*portc));
-   portc->open_pending = 1; /* Reserve this engine to the client it was created for */
-+
-+  mixer->num_clientdevs++;
- 
-   portc->num = n;
- 
diff --git a/abs/extra-testing/oss/oss.install b/abs/extra-testing/oss/oss.install
deleted file mode 100644
index 8c4bd0a..0000000
--- a/abs/extra-testing/oss/oss.install
+++ /dev/null
@@ -1,38 +0,0 @@
-_MSG_LIBOSSDIR=" Please note that OSS stores some of its configuration files
- at /usr/lib/oss. If you are upgrading from an older OSS
- release and it doesn't work properly, try removing that
- directory and reinstall this package."
-
-post_install() {
-	echo "Creating backup of alsa modules"
-	KER=`uname -r`
-	cd /lib/modules/$KER/kernel
-	tar -cvf /lib/modules/alsa-$KER.tar sound
-	rm -rf sound
-#	/bin/sh /usr/lib/oss/build/install.sh &> /dev/null
-	depmod -a
-
-}
-
-post_upgrade() {
-	echo "Running OSS update script..."
-	KER=`uname -r`
-	cd /lib/modules/$KER/kernel
-	if [ -f sound/soundcore.ko ]
-	then
-		tar -cvf /lib/modules/alsa-$KER.tar sound
-		rm -rf sound
-		/bin/true
-	fi
-	depmod -a
-}
-
-pre_remove() {
-
-}
-
-post_remove() {
-
-	/bin/true
-}
-
diff --git a/abs/extra-testing/oss/oss.rc b/abs/extra-testing/oss/oss.rc
deleted file mode 100644
index 3f63378..0000000
--- a/abs/extra-testing/oss/oss.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-        stat_busy 'Starting Open Sound System'
-	if /usr/sbin/soundon
-	then
-		add_daemon oss
-		stat_done
-	else
-		stat_fail
-	fi
-        ;;
-  stop)
-        stat_busy 'Stopping Open Sound System'
-	if /usr/sbin/soundoff
-	then
-		rm_daemon oss
-		stat_done
-	else
-		stat_fail
-	fi
-        ;;
-  restart)
-        $0 stop
-        $0 start
-        ;;
-  *)
-        echo "Usage: $0 {start|stop|restart}"
-esac
diff --git a/abs/extra-testing/oss/oss.rm-init-scripts.patch b/abs/extra-testing/oss/oss.rm-init-scripts.patch
deleted file mode 100644
index 981ff60..0000000
--- a/abs/extra-testing/oss/oss.rm-init-scripts.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- usr/lib/oss/build/install.sh.orig	2008-09-25 11:41:47.180167692 -0300
-+++ usr/lib/oss/build/install.sh	2008-09-25 11:41:47.180167692 -0300
-@@ -290,38 +290,6 @@
-    echo 
- fi
- 
--if ! test -d /etc/init.d
--then
--  mkdir /etc/init.d
--fi
--
--rm -f /etc/init.d/oss /etc/rc.d/rc3.d/S89oss /etc/rc3.d/S89oss
--cp -f $OSSLIBDIR/etc/S89oss /etc/init.d/oss
--
--chmod 744 /etc/init.d/oss
--
--if test -x /sbin/chkconfig
--then
--  /sbin/chkconfig oss on        > /dev/null 2>&1
--else
-- if test -x /usr/sbin/update-rc.d
-- then
--   /usr/sbin/update-rc.d oss defaults > /dev/null 2>&1
-- else
--  if test -d etc/rc.d/rc3.d
--  then
--    rm -f /etc/rc.d/rc3.d/S89oss
--    ln -s /etc/init.d/oss /etc/rc.d/rc3.d/S89oss
--  else
--    if test -d /etc/rc3.d
--    then
--      rm -f /etc/rc3.d/S89oss
--      ln -s /etc/init.d/oss /etc/rc3.d/S89oss
--    fi
--  fi
-- fi
--fi
--
- # Install ALSA interface module (Cuckoo)
- #(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1
- #if (cd $OSSLIBDIR/cuckoo && make install) > /var/log/cuckoo.log 2>&1
---- usr/lib/oss/scripts/restore_drv.sh.orig	2008-09-25 11:41:47.210168487 -0300
-+++ usr/lib/oss/scripts/restore_drv.sh	2008-09-25 11:41:47.210168487 -0300
-@@ -18,8 +18,6 @@
-   fi
- fi
- 
--rm -f /etc/init.d/oss
--
- if ! test -d /lib/modules/`uname -r`/kernel/sound
- then
-    if test -f /lib/modules/`uname -r`/sound-preoss.tar.bz2
diff --git a/abs/extra-testing/p7zip/PKGBUILD b/abs/extra-testing/p7zip/PKGBUILD
deleted file mode 100644
index 9ae5122..0000000
--- a/abs/extra-testing/p7zip/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 70413 2010-02-26 18:54:59Z thayer $
-# Maintainer: Thayer Williams <thayer@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-# Contributor: TuxSpirit<tuxspirit@archlinux.fr>  2007/11/17 21:22:36 UTC
-
-pkgname=p7zip
-pkgver=9.04
-pkgrel=2
-pkgdesc="A command-line port of the 7zip compression utility"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://p7zip.sourceforge.net"
-depends=('gcc-libs' 'bash')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}_${pkgver}_src_all.tar.bz2)
-options=(!emptydirs)
-
-build() {
-  cd ${srcdir}/${pkgname}_${pkgver}
-
-  #Arch64 fix
-  if [ "$CARCH" == "x86_64" ]; then
-      cp makefile.linux_amd64 makefile.machine
-  else
-      cp makefile.linux_x86_ppc_alpha_gcc_4.X makefile.machine
-  fi
-
-  sed -i "s|usr/local|usr|g" makefile
-
-  make all3 OPTFLAGS="${CXXFLAGS}" || return 1
-  make install DEST_HOME="${pkgdir}/usr" \
-	DEST_MAN="${pkgdir}/usr/share/man" \
-	DEST_SHARE_DOC="http://www.bugaco.com/7zip"
-
-  mkdir -p ${pkgdir}/usr/share/doc/p7zip/DOCS
-  install -m555 bin/7z.so ${pkgdir}/usr/lib/p7zip/
-
-  sed -i "s|${pkgdir}/usr|/usr|g" ${pkgdir}/usr/bin/7z
-  sed -i "s|${pkgdir}/usr|/usr|g" ${pkgdir}/usr/bin/7za
-  sed -i "s|${pkgdir}/usr|/usr|g" ${pkgdir}/usr/bin/7zr
-
-  # Install mc's virtual filesystem
-  install -m755 -D contrib/VirtualFileSystemForMidnightCommander/u7z \
-    ${pkgdir}/usr/share/mc/extfs/u7z
-}
-md5sums=('9194ebf9a2b3735d236aed001de5f6f8')
diff --git a/abs/extra-testing/perl-yaml/PKGBUILD b/abs/extra-testing/perl-yaml/PKGBUILD
deleted file mode 100644
index b2e093c..0000000
--- a/abs/extra-testing/perl-yaml/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Charles Mauch <cmauch@gmail.com>
-
-pkgname=perl-yaml
-_realname=YAML
-pkgver=0.66
-pkgrel=1
-pkgdesc="Perl/CPAN Module YAML : YAML Aint Markup Language tm"
-arch=(i686 x86_64)
-url="http://search.cpan.org/dist/${_realname}/"
-license=('GPL' 'PerlArtistic')
-depends=('perl>=5.10.0')
-options=(!emptydirs)
-source=(http://www.cpan.org/authors/id/I/IN/INGY/${_realname}-${pkgver}.tar.gz)
-md5sums=('33a0367cb343e1f0dce20f144d0167ba')
-
-build() {
-  cd ${startdir}/src/${_realname}-${pkgver}
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-  make  || return 1
-  make install DESTDIR=${startdir}/pkg || return 1
-
-  # remove perllocal.pod and .packlist
-  find ${startdir}/pkg -name perllocal.pod -delete
-  find ${startdir}/pkg -name .packlist -delete
-}
diff --git a/abs/extra-testing/phpmyadmin/PKGBUILD b/abs/extra-testing/phpmyadmin/PKGBUILD
deleted file mode 100755
index 41999db..0000000
--- a/abs/extra-testing/phpmyadmin/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-pkgname=phpmyadmin
-_dlversion=2.9.1.1
-pkgver=$(echo ${_dlversion} | sed 's/-//')
-pkgrel=35
-pkgdesc="A PHP and hence web-based tool to administrate MySQL over the WWW"
-arch=(i686 x86_64)
-url="http://www.phpmyadmin.net"
-depends=('php' 'mysql')
-backup=(data/srv/httpd/htdocs/phpMyAdmin/config.inc.php)
-source=(http://easynews.dl.sourceforge.net/sourceforge/${pkgname}/phpMyAdmin-${_dlversion}-all-languages.tar.bz2)
-
-build() {
-  _instdir=${startdir}/pkg/data/srv/httpd/htdocs/phpMyAdmin
-  mkdir -p ${_instdir}
-  cd ${_instdir}
-  cp -ra ${startdir}/src/phpMyAdmin-${_dlversion}-all-languages/* . 
-
-}
diff --git a/abs/extra-testing/pm-quirks/PKGBUILD b/abs/extra-testing/pm-quirks/PKGBUILD
deleted file mode 100644
index 4420a62..0000000
--- a/abs/extra-testing/pm-quirks/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id: PKGBUILD 83844 2010-06-23 08:48:25Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=pm-quirks
-_date=20100619
-pkgver=0.${_date}
-pkgrel=1
-pkgdesc="Quirks data for pm-utils"
-arch=(any)
-license=('GPL')
-url="http://pm-utils.freedesktop.org/wiki/"
-source=(http://pm-utils.freedesktop.org/releases/${pkgname}-${_date}.tar.gz)
-md5sums=('3b6ee39056b9ece0cd5e073a4c272b05')
-
-build() {
-  cd "${srcdir}"/video-quirks
-  install -m755 -d "${pkgdir}/usr/lib/pm-utils/video-quirks"
-  install -m644 *.quirkdb "${pkgdir}/usr/lib/pm-utils/video-quirks/" || return 1
-}
diff --git a/abs/extra-testing/pmount/PKGBUILD b/abs/extra-testing/pmount/PKGBUILD
deleted file mode 100644
index 2270b07..0000000
--- a/abs/extra-testing/pmount/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 29588 2009-03-10 06:17:31Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=pmount
-pkgver=0.9.19
-pkgrel=2
-pkgdesc="mount removable devices as normal user"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://pmount.alioth.debian.org/"
-backup=('etc/pmount.allow')
-depends=('sysfsutils>=2.0.0-1' 'bash' 'hal>=0.5.11')
-makedepends=('intltool')
-source=(http://alioth.debian.org/frs/download.php/2867/${pkgname}-${pkgver}.tar.gz
-	pmount-dbus-close.patch)
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # we have a shared connection! patch it to work correct
-  patch -Np1 -i ${srcdir}/pmount-dbus-close.patch || return 1
-  ./configure --prefix=/usr --with-cryptsetup-prog=/usr/sbin/cryptsetup || return 1
-  make || return 1 
-  make DESTDIR="${pkgdir}" install || return 1
-}
-
-md5sums=('2fd9fe103375dbd0c91af2f302250a8c'
-         'b7ea1afd82ffebf510dc89f74cd39f09')
diff --git a/abs/extra-testing/pmount/pmount-dbus-close.patch b/abs/extra-testing/pmount/pmount-dbus-close.patch
deleted file mode 100644
index 06ffa2b..0000000
--- a/abs/extra-testing/pmount/pmount-dbus-close.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN pmount-0.9.13/src/pmount-hal.c pmount-0.9.13-new/src/pmount-hal.c
---- pmount-0.9.13/src/pmount-hal.c	2006-08-15 22:31:02.000000000 +0200
-+++ pmount-0.9.13-new/src/pmount-hal.c	2007-02-05 12:01:09.000000000 +0100
-@@ -361,7 +361,6 @@
-     /* shut down hal connection */
-     libhal_ctx_shutdown( hal_ctx, &error );
-     libhal_ctx_free( hal_ctx );
--    dbus_connection_close( dbus_conn );
-     dbus_connection_unref( dbus_conn );
- 
-     /* go */
diff --git a/abs/extra-testing/polkit-gnome/PKGBUILD b/abs/extra-testing/polkit-gnome/PKGBUILD
deleted file mode 100644
index 06c375c..0000000
--- a/abs/extra-testing/polkit-gnome/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: onestep_ua <onestep@ukr.net>
-
-pkgname=polkit-gnome
-pkgver=0.96
-pkgrel=3
-pkgdesc="PolicyKit integration for the GNOME desktop"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/PolicyKit"
-license=('LGPL')
-depends=('polkit>=0.96' 'gtk2>=2.18.6')
-makedepends=('intltool')
-replaces=('policykit-gnome')
-options=(!libtool !makeflags)
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('611cf39fba2945320fc7a9ec49087e69')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's/OnlyShowIn=GNOME/NotShowIn=KDE/' src/polkit-gnome-authentication-agent-1.desktop.in.in || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/polkit-gnome --disable-static --disable-introspection || return 1
-  make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
-}
diff --git a/abs/extra-testing/polkit/PKGBUILD b/abs/extra-testing/polkit/PKGBUILD
deleted file mode 100644
index 78cbc77..0000000
--- a/abs/extra-testing/polkit/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 72186 2010-03-13 19:06:23Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=polkit
-pkgver=0.96
-pkgrel=2
-pkgdesc="Application development toolkit for controlling system-wide privileges"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://www.freedesktop.org/wiki/Software/Policykit"
-depends=('eggdbus>=0.6' 'pam')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
-replaces=('policykit')
-options=('!libtool')
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
-        polkit.pam)
-md5sums=('e0a06da501b04ed3bab986a9df5b5aa2'
-         '6564f95878297b954f0572bc1610dd15')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
-      --disable-static --enable-gtk-doc || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-
-  install -m644 "${srcdir}/polkit.pam" "${pkgdir}/etc/pam.d/polkit-1" || return 1
-}
diff --git a/abs/extra-testing/polkit/polkit.pam b/abs/extra-testing/polkit/polkit.pam
deleted file mode 100644
index 04f53e0..0000000
--- a/abs/extra-testing/polkit/polkit.pam
+++ /dev/null
@@ -1,7 +0,0 @@
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-password        required        pam_unix.so
diff --git a/abs/extra-testing/poppler-data/PKGBUILD b/abs/extra-testing/poppler-data/PKGBUILD
deleted file mode 100644
index 6b22ea3..0000000
--- a/abs/extra-testing/poppler-data/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 22380 2008-12-26 16:33:15Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=poppler-data
-pkgver=0.4.3
-pkgrel=1
-pkgdesc="Encoding data for the poppler PDF rendering library"
-arch=(any)
-license=('custom' 'GPL2')
-conflicts=('poppler<0.10.5')
-url="http://poppler.freedesktop.org/"
-source=(http://poppler.freedesktop.org/${pkgname}-${pkgver}.tar.gz)
-md5sums=('2d648047e5d0b315df1571b460ee6a96')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make prefix=/usr DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING COPYING.adobe \
-    "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/abs/extra-testing/poppler/PKGBUILD b/abs/extra-testing/poppler/PKGBUILD
deleted file mode 100644
index 092abab..0000000
--- a/abs/extra-testing/poppler/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 83716 2010-06-22 17:55:04Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=poppler
-pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.14.0
-pkgrel=2
-arch=(i686 x86_64)
-license=('GPL')
-makedepends=('libjpeg>=8.0.2' 'gcc-libs>=4.5.0' 'cairo>=1.8.10' 'libxml2>=2.7.7' 'fontconfig>=2.8.0' 'openjpeg>=1.3-3' 'gtk2>=2.20.1' 'qt>=4.6.3' 'pkgconfig' 'lcms>=1.18')
-options=('!libtool')
-url="http://poppler.freedesktop.org/"
-source=(http://poppler.freedesktop.org/${pkgname}-${pkgver}.tar.gz)
-md5sums=('76f003b8fa2b905674088c306aa857c5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  export CPPFLAGS=" $CPPFLAGS -I /usr/include/gdk -I /usr/include/glib-2.0 -I /usr/lib/glib/include/ -I /usr/include/cairo -I /usr/include/gtk-2.0/gdk/"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-cairo-output \
-      --enable-xpdf-headers \
-      --enable-libjpeg --enable-zlib \
-      --enable-poppler-qt4 \
-      --enable-poppler-glib 
-  make
-}
-
-package_poppler() {
-  pkgdesc="PDF rendering library based on xpdf 3.0"
-  depends=('libjpeg>=8.0.2' 'gcc-libs>=4.5.0' 'cairo>=1.8.10' 'libxml2>=2.7.7' 'fontconfig>=2.8.0' 'openjpeg>=1.3-3' 'lcms>=1.18' 'poppler-data>=0.4.2')
-  conflicts=("poppler-qt3<${pkgver}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/include/poppler/{glib,qt4}
-  rm -f "${pkgdir}"/usr/lib/libpoppler-{glib,qt4}.so*
-  rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc
-  rm -rf "${pkgdir}/usr/share/gtk-doc"
-}
-
-package_poppler-glib() {
-  pkgdesc="Poppler glib bindings"
-  depends=("poppler=${pkgver}" 'gtk2>=2.20.1')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
-  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  cd "${srcdir}/${pkgbase}-${pkgver}/glib"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/"
-  rm -f "${pkgdir}"/usr/lib/libpoppler.*
-}
-
-package_poppler-qt() {
-  pkgdesc="Poppler Qt bindings"
-  depends=("poppler=${pkgver}" 'qt>=4.6.3')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
-  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  cd "${srcdir}/${pkgbase}-${pkgver}/qt4"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/"
-  rm -f "${pkgdir}"/usr/lib/libpoppler.*
-}
diff --git a/abs/extra-testing/postfix/PKGBUILD b/abs/extra-testing/postfix/PKGBUILD
deleted file mode 100644
index 1b2fa06..0000000
--- a/abs/extra-testing/postfix/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 70372 2010-02-26 13:35:23Z paul $
-# Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
-# Maintainer: Paul Mattal <paul@archlinux.org>
-pkgname=postfix
-pkgver=2.7.0
-pkgrel=1
-pkgdesc="Secure, fast, easy to administer drop in replacement for Sendmail (MTA)"
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('pcre' 'libsasl'   'db>=4.7')
-backup=(etc/postfix/aliases etc/postfix/virtual etc/postfix/relocated \
-	etc/postfix/access etc/postfix/header_checks etc/postfix/transport \
-	etc/postfix/generic etc/postfix/canonical \
-	etc/postfix/main.cf etc/postfix/master.cf)
-install="${pkgname}.install"
-provides=('smtp-server' 'smtp-forwarder')
-replaces=('postfix-mysql' 'postfix-pgsql')
-conflicts=('postfix-mysql' 'postfix-pgsql' 'smtp-server' 'smtp-forwarder')
-url="http://www.postfix.org/"
-source=(ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz \
-        ${pkgname}.patch.bz2 \
-	${pkgname})
-md5sums=('df648f59421604e895cce56325f00bae'
-         'a3c45ff23ef036143711793fcf2478c3'
-         'c847b96f08925f08b0f610468a8e21f6')
-
-build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	
-	make makefiles \
-	        CCARGS="-DUSE_SASL_AUTH -I/usr/include/sasl \
-			-DUSE_CYRUS_SASL \
-			-DUSE_TLS" \
-	        AUXLIBS="-lsasl2 -lssl -lcrypto  -llber -lz -lm "
-	make OPT="${CFLAGS}" || return 1
-
-	sh postfix-install -non-interactive \
-		install_root="${pkgdir}" \
-		daemon_directory="/usr/lib/${pkgname}" \
-		sample_directory="/etc/${pkgname}/sample" \
-		manpage_directory="/usr/share/man"
-
-	cd ${pkgdir}
-	cat ${srcdir}/${pkgname}.patch |patch -Np0 || return 1
-	rm -f etc/${pkgname}/main.cf~
-
-	cd ${pkgdir}
-	mkdir etc/rc.d
-	install -m 0755 ${srcdir}/${pkgname} etc/rc.d/${pkgname}
-
-	install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/abs/extra-testing/postfix/__changelog b/abs/extra-testing/postfix/__changelog
deleted file mode 100644
index 25ca6b4..0000000
--- a/abs/extra-testing/postfix/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-remove ldap/mysql/pg support
diff --git a/abs/extra-testing/postfix/postfix b/abs/extra-testing/postfix/postfix
deleted file mode 100755
index 37dd6a8..0000000
--- a/abs/extra-testing/postfix/postfix
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pgrep -f /usr/lib/postfix/master`
-
-start() {
-  stat_busy "Starting Postfix"
-  [ -z "$PID" ] && /usr/sbin/postfix start &> /dev/null
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    add_daemon postfix
-    stat_done
-  fi
-}
-
-stop() {
-  stat_busy "Stopping Postfix"
-  [ ! -z "$PID" ]  && /usr/sbin/postfix stop &> /dev/null
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    rm_daemon postfix
-    stat_done
-  fi
-}
-
-reload() {
-  stat_busy "Reloading Postfix"
-  [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    stat_done
-  fi
-}
-
-case "$1" in
-  start)
-    start
-    ;;
-  stop)
-    stop
-    ;;
-  restart)
-    # calling 'stop' and 'start' without the $0 fails...
-    $0 stop
-    $0 start
-    ;;
-  reload)
-    reload
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload}"
-esac
-exit 0
diff --git a/abs/extra-testing/postfix/postfix.install b/abs/extra-testing/postfix/postfix.install
deleted file mode 100644
index bac3e1d..0000000
--- a/abs/extra-testing/postfix/postfix.install
+++ /dev/null
@@ -1,38 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-    if [ -z "`grep '^postdrop::' /etc/group`" ]; then
-	groupadd -g 75 postdrop >& /dev/null
-    fi
-    if [ -z "`grep '^postfix::' /etc/group`" ]; then
-	groupadd -g 73 postfix >& /dev/null
-    fi
-    if [ -z "`grep '^postfix:' /etc/passwd`" ]; then
-	useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix
-    else
-	# fix a packaging bug from before (postfix should have no shell)
-	usermod -s /bin/false postfix
-    fi
-
-    chown postfix var/spool/postfix/{active,bounce,corrupt,defer,deferred,\
-flush,hold,incoming,private,public,maildrop,trace,saved}
-    chown postfix var/lib/postfix
-    chgrp postdrop var/spool/postfix/{public,maildrop}
-    chgrp postdrop usr/sbin/postqueue
-    chgrp postdrop usr/sbin/postdrop
-    chmod g+s usr/sbin/{postqueue,postdrop}
-
-    newaliases
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-    post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-    userdel postfix &> /dev/null
-    groupdel postfix &> /dev/null
-    groupdel postdrop &> /dev/null
-}
diff --git a/abs/extra-testing/postfix/postfix.patch.bz2 b/abs/extra-testing/postfix/postfix.patch.bz2
deleted file mode 100644
index dbc0950..0000000
--- a/abs/extra-testing/postfix/postfix.patch.bz2
+++ /dev/null
diff --git a/abs/extra-testing/postgresql-libs/PKGBUILD b/abs/extra-testing/postgresql-libs/PKGBUILD
deleted file mode 100644
index ac037c7..0000000
--- a/abs/extra-testing/postgresql-libs/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 27764 2009-02-25 16:30:54Z douglas $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgname=postgresql-libs
-pkgver=8.3.6
-pkgrel=1
-pkgdesc="Libraries for use with PostgreSQL"
-arch=(i686 x86_64)
-license=('BSD')
-url="http://www.postgresql.org/"
-depends=('openssl>=0.9.8b' 'zlib' 'readline')
-options=('!makeflags')
-source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2)
-
-build() {
-  cd $startdir/src/postgresql-$pkgver || return 1
-
-  # configure
-  ./configure --prefix=/usr --with-openssl --datadir=/usr/share/postgresql \
-  --with-pam \
-  	|| return 1
-
-  # make and install
-  for dir in src/interfaces src/bin/pg_config; do
-    pushd ${dir} || return 1
-    make || return 1
-    make DESTDIR=${startdir}/pkg install || return 1
-    popd
-  done
-
-  cd src/include || return 1
-  make || return 1
-
-  set -e
-  mkdir -p $startdir/pkg/usr/include/postgresql/{internal,internal/libpq} \
-  	|| return 1
-  mkdir -p $startdir/pkg/usr/include/libpq || return 1
-
-  # These headers are needed by the public headers of the interfaces.
-  install -m644 pg_config.h $startdir/pkg/usr/include/ || return 1
-  install -m644 pg_config_os.h $startdir/pkg/usr/include/ || return 1
-  install -m644 postgres_ext.h $startdir/pkg/usr/include/ || return 1
-  install -m644 libpq/libpq-fs.h $startdir/pkg/usr/include/libpq/ || return 1
-  install -m644 pg_config_manual.h $startdir/pkg/usr/include/ || return 1
-
-  # These headers are needed by the not-so-public headers of the interfaces.
-  install -m644 c.h $startdir/pkg/usr/include/postgresql/internal/ || return 1
-  install -m644 port.h $startdir/pkg/usr/include/postgresql/internal/ \
-  	|| return 1
-  install -m644 postgres_fe.h $startdir/pkg/usr/include/postgresql/internal/ \
-  	|| return 1
-  install -m644 libpq/pqcomm.h $startdir/pkg/usr/include/postgresql/internal/libpq/ || return 1
- 
-  install -D -m644 ../../COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/LICENSE || return 1
-
-  set +e
-}
-md5sums=('4f8c67d802bd03b5b844e268bba7d44a')
diff --git a/abs/extra-testing/postgresql/PKGBUILD b/abs/extra-testing/postgresql/PKGBUILD
deleted file mode 100644
index 1fda9a4..0000000
--- a/abs/extra-testing/postgresql/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 27762 2009-02-25 16:29:49Z douglas $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgname=postgresql
-pkgver=8.3.6
-pkgrel=1
-pkgdesc="A sophisticated object-relational DBMS"
-arch=(i686 x86_64)
-license=('BSD')
-backup=('etc/conf.d/postgresql' '/etc/pam.d/postgresql')
-url="http://www.postgresql.org/"
-depends=("postgresql-libs>=$pkgver" "libxml2")
-options=('!makeflags')
-source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 \
-        postgresql postgresql.confd build.patch postgresql.pam)
-
-build() {
-  cd ${startdir}/src/$pkgname-$pkgver || return 1
-
-  # patch to remove regress/test make target (won't build with it present)
-  patch -Np1 -i ../build.patch || return 1
-
-  # configure
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-  --with-docdir=/usr/share/doc --with-openssl \
-  --datadir=/usr/share/postgresql --with-pam --with-libxml || return 1
-
-  sed -i -e '/interfaces/d' src/Makefile || return 1
-
-  # build
-  make || return 1
-
-  # install
-  make DESTDIR=${startdir}/pkg install || return 1
-
-  (
-  cd contrib/adminpack;
-  make || return 1;
-  make DESTDIR=${startdir}/pkg install || return 1;
-  );
-
-
-  # clean up unneeded installed items
-  rm -rf $startdir/pkg/usr/include/postgresql/internal || return 1
-  rm -rf $startdir/pkg/usr/include/libpq || return 1
-  # the below line is expected to produce an error; fix this one day
-  rm -f $startdir/pkg/usr/include/*
-  rm -f $startdir/pkg/usr/bin/pg_config || return 1
-  
-  # Maintaining the lib below because of qt
-  #rm -f $startdir/pkg/usr/lib/libpgport.a || return 1
-
-  # install launch script
-  install -D -m755 ../postgresql $startdir/pkg/etc/rc.d/postgresql \
-  	|| return 1
-
-  # install license
-  install -D -m644 COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/LICENSE || return 1
-
-  # install conf file
-  install -D -m644 $startdir/src/postgresql.confd \
-    $startdir/pkg/etc/conf.d/postgresql || return 1
-
-  install -D -m644 $startdir/src/postgresql.pam \
-    $startdir/pkg/etc/pam.d/postgresql
-
-  chown root:root $startdir/pkg/usr/share/doc/postgresql/html/*
-}
-
-md5sums=('4f8c67d802bd03b5b844e268bba7d44a'
-         '7d8ea2abb6a8cdacf35604bda659a34a'
-         'df6ddf9e2ab4700a3415f17c0f4f4172'
-         '4d74f4227dc5e12bf95b3490758d86c9'
-         '96f82c38f3f540b53f3e5144900acf17')
-md5sums=('4f8c67d802bd03b5b844e268bba7d44a'
-         '7d8ea2abb6a8cdacf35604bda659a34a'
-         'df6ddf9e2ab4700a3415f17c0f4f4172'
-         '4d74f4227dc5e12bf95b3490758d86c9'
-         '96f82c38f3f540b53f3e5144900acf17')
diff --git a/abs/extra-testing/postgresql/build.patch b/abs/extra-testing/postgresql/build.patch
deleted file mode 100644
index c8f665d..0000000
--- a/abs/extra-testing/postgresql/build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur postgresql-8.2.3-orig/src/Makefile postgresql-8.2.3/src/Makefile
---- postgresql-8.2.3-orig/src/Makefile	2006-06-22 16:50:35.000000000 -0700
-+++ postgresql-8.2.3/src/Makefile	2007-03-05 10:46:24.000000000 -0800
-@@ -23,7 +23,6 @@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
- 	$(MAKE) -C makefiles $@
--	$(MAKE) -C test/regress $@
- 
- install: install-local
- 
diff --git a/abs/extra-testing/postgresql/postgresql b/abs/extra-testing/postgresql/postgresql
deleted file mode 100755
index c6aedfb..0000000
--- a/abs/extra-testing/postgresql/postgresql
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/postgresql
-
-case "$1" in
-  start)
-    stat_busy "Starting PostgreSQL"
-    # initialization
-    if [ ! `egrep '^postgres:' /etc/group` ]; then
-      stat_busy "Adding postgres group"
-      groupadd -g 88 postgres
-      stat_done
-    fi
-    if [ ! `egrep '^postgres:' /etc/passwd` ]; then
-      stat_busy "Adding postgres user"
-      useradd -u 88 -g postgres -d $PGROOT -s /bin/bash postgres
-      [ -d $PGROOT ] && chown -R postgres.postgres $PGROOT
-      stat_done
-    fi
-    if [ ! -d $PGROOT ]; then
-      mkdir -p $PGROOT/data && chown postgres.postgres $PGROOT/data
-      su - postgres -c "/usr/bin/initdb -D $PGROOT/data"
-    fi
-    if [ ! -e /var/log/postgresql.log ]; then
-      touch /var/log/postgresql.log
-      chown postgres /var/log/postgresql.log
-    fi
-    # start the process
-    su - postgres -c \
-     "/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -W start"
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon postgresql
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping PostgreSQL"
-    su - postgres -c \
-      "/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -w stop"  
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon postgresql
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/abs/extra-testing/postgresql/postgresql.confd b/abs/extra-testing/postgresql/postgresql.confd
deleted file mode 100644
index 7bbf016..0000000
--- a/abs/extra-testing/postgresql/postgresql.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to postgresql
-#
-PGROOT="/var/lib/postgres"
\ No newline at end of file
diff --git a/abs/extra-testing/postgresql/postgresql.pam b/abs/extra-testing/postgresql/postgresql.pam
deleted file mode 100644
index 53724d1..0000000
--- a/abs/extra-testing/postgresql/postgresql.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
diff --git a/abs/extra-testing/powertop/ChangeLog b/abs/extra-testing/powertop/ChangeLog
deleted file mode 100644
index 811f87d..0000000
--- a/abs/extra-testing/powertop/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2007-06-28 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/abs/extra-testing/powertop/PKGBUILD b/abs/extra-testing/powertop/PKGBUILD
deleted file mode 100644
index 4d8c17b..0000000
--- a/abs/extra-testing/powertop/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD,v 1.10 2008/06/19 08:52:53 pizzapunk Exp $
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Xilon <xilonmu@gmail.com>
-
-pkgname=powertop
-pkgver=1.10
-pkgrel=1
-pkgdesc="Tool that finds the software that makes your laptop use more power than necessary"
-arch=('i686' 'x86_64')
-url="http://www.lesswatts.org/projects/powertop/"
-license=('GPL2')
-depends=('ncurses')
-source=(http://www.lesswatts.org/projects/powertop/download/powertop-$pkgver.tar.gz)
-md5sums=('e09f631f60d50299d8885193e6fd3756')
-
-build() {
-  cd $startdir/src/powertop-$pkgver
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
diff --git a/abs/extra-testing/procmail/PKGBUILD b/abs/extra-testing/procmail/PKGBUILD
deleted file mode 100644
index 356a147..0000000
--- a/abs/extra-testing/procmail/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 35774 2009-04-17 03:11:54Z eric $
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
-pkgname=procmail
-pkgver=3.22
-pkgrel=2
-pkgdesc="Highly configurable auto mail processing."
-arch=(i686 x86_64)
-url="http://www.procmail.org"
-license=('GPL' 'custom:Artistic')
-depends=('glibc')
-source=(http://www.procmail.org/${pkgname}-${pkgver}.tar.gz)
-source=(ftp://ftp.psg.com/pub/unix/procmail/procmail-3.22.tar.gz)
-md5sums=('1678ea99b973eb77eda4ecf6acae53f1')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  yes n | make LOCKINGTEST="/tmp ." || return 1
-  make BASENAME=$pkgdir/usr MANDIR=$pkgdir/usr/share/man install || return 1
-  install -D -m644 Artistic ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/abs/extra-testing/pth/PKGBUILD b/abs/extra-testing/pth/PKGBUILD
deleted file mode 100644
index 2e0f66b..0000000
--- a/abs/extra-testing/pth/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 35785 2009-04-17 05:07:12Z eric $
-# Maintainer: damir <damir@archlinux.org>
-
-pkgname=pth
-pkgver=2.0.7
-pkgrel=2
-pkgdesc="The GNU Portable Threads."
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/pth/"
-license=('LGPL')
-depends=('glibc')
-options=('!libtool' '!makeflags')
-source=(ftp://ftp.gnu.org/gnu/pth/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9cb4a25331a4c4db866a31cbe507c793')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-}
diff --git a/abs/extra-testing/pycrypto/PKGBUILD b/abs/extra-testing/pycrypto/PKGBUILD
deleted file mode 100644
index 2801337..0000000
--- a/abs/extra-testing/pycrypto/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id: PKGBUILD 17322 2008-10-28 12:29:19Z douglas $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Kritoke <kritoke@gamebox.net>
-
-pkgname=pycrypto
-pkgver=2.0.1
-pkgrel=3
-pkgdesc="A collection of cryptographic algorithms and protocols, implemented for use from Python."
-arch=(i686 x86_64)
-depends=('python' 'gmp')
-url="http://www.amk.ca/python/code/crypto.html"
-license=(GPL)
-source=(http://www.amk.ca/files/python/crypto/${pkgname}-${pkgver}.tar.gz)
-md5sums=('4d5674f3898a573691ffb335e8d749cd')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  python setup.py build install --root=${startdir}/pkg
-}
diff --git a/abs/extra-testing/pyopenssl/PKGBUILD b/abs/extra-testing/pyopenssl/PKGBUILD
deleted file mode 100644
index 6fb4ac1..0000000
--- a/abs/extra-testing/pyopenssl/PKGBUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-pkgname=pyopenssl
-pkgver=0.6
-pkgrel=4
-pkgdesc="pyOpenSSL is a Python interface to the OpenSSL library"
-arch=('i686' 'x86_64')
-url="http://pyopenssl.sourceforge.net"
-license="GPL"
-depends=('python' 'openssl')
-source=(http://easynews.dl.sourceforge.net/sourceforge/pyopenssl/pyOpenSSL-${pkgver}.tar.gz)
-
-build() {
-		cd $startdir/src/pyOpenSSL-${pkgver}
-			python setup.py build
-				python setup.py install --prefix=$startdir/pkg/usr
-			}
diff --git a/abs/extra-testing/pyorbit/PKGBUILD b/abs/extra-testing/pyorbit/PKGBUILD
deleted file mode 100644
index 60f8f34..0000000
--- a/abs/extra-testing/pyorbit/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 16716 2008-10-22 02:39:42Z allan $
-# Mantainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=pyorbit
-pkgver=2.24.0
-pkgrel=3
-pkgdesc="Python bindings for ORBit2"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://www.pygtk.org"
-depends=('python>=2.5.2' 'orbit2>=2.14.16')
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/pyorbit/2.24/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('574593815e75ee6e98062c75d6d1581f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/abs/extra-testing/pyqt/ChangeLog b/abs/extra-testing/pyqt/ChangeLog
deleted file mode 100644
index e20b55a..0000000
--- a/abs/extra-testing/pyqt/ChangeLog
+++ /dev/null
@@ -1,21 +0,0 @@
-
-2009-04-11  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Fixing the rpath issue, thanks Gerardo
-
-2008-11-22  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 4.4.4
-
-2008-10-22  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Rebuilt for python 2.6
-
-2008-08-09  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 4.4.3
-
-2008-07-06  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 4.4.2
-
diff --git a/abs/extra-testing/pyqt/PKGBUILD b/abs/extra-testing/pyqt/PKGBUILD
deleted file mode 100644
index f6645c7..0000000
--- a/abs/extra-testing/pyqt/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 47994 2009-07-30 10:33:54Z pierre $
-# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
-
-pkgname=pyqt
-pkgver=4.6
-pkgrel=1
-pkgdesc="A set of Python bindings for the Qt toolkit."
-arch=(i686 x86_64)
-url="http://riverbankcomputing.co.uk/software/pyqt/intro"
-depends=('sip>=4.8.2' 'qscintilla>=2.4.0' 'qt>=4.5.2' 'dbus-python' 'openssl')
-license=('GPL')
-provides=('pyqt4')
-replaces=('pyqt4')
-conflicts=('pyqt4')
-source=(http://riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-$pkgver.tar.gz)
-
-build() {
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-
-  python configure.py --confirm-license -b /usr/bin \
-  -d /usr/lib/python2.6/site-packages \
-  -v /usr/share/sip
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make || return 1
-  make DESTDIR=${pkgdir} install
-} 
diff --git a/abs/extra-testing/pyrex/ChangeLog b/abs/extra-testing/pyrex/ChangeLog
deleted file mode 100644
index 1b0e564..0000000
--- a/abs/extra-testing/pyrex/ChangeLog
+++ /dev/null
@@ -1,5 +0,0 @@
-
-2008-07-06  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updating for x86_64 - 0.9.8.4
-
diff --git a/abs/extra-testing/pyrex/PKGBUILD b/abs/extra-testing/pyrex/PKGBUILD
deleted file mode 100644
index 4242fb9..0000000
--- a/abs/extra-testing/pyrex/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 11841 2008-09-05 01:20:00Z douglas $
-# Contributor: Arjan timmerman <arjan@soulfly.nl>
-# Contributor: Link Dupont <link@subpop.net>
-# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=pyrex
-pkgver=0.9.8.5
-pkgrel=1
-pkgdesc="Language for writing Python extension modules"
-arch=("i686" "x86_64")
-url="http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/"
-license=""
-depends=('python>=2.5')
-source=(http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-${pkgver}.tar.gz)
-
-md5sums=('3b3d8397c2c9a58fc59a90e2b49c651a')
-
-build() {
-    cd ${startdir}/src/Pyrex-${pkgver}
-    python setup.py install --root=${startdir}/pkg --prefix=/usr
-}
diff --git a/abs/extra-testing/python-geoip/PKGBUILD b/abs/extra-testing/python-geoip/PKGBUILD
deleted file mode 100644
index 9def348..0000000
--- a/abs/extra-testing/python-geoip/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 29760 2009-03-12 10:07:44Z douglas $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=python-geoip
-pkgver=1.2.4
-pkgrel=1
-pkgdesc="Python bindings for the GeoIP IP-to-country resolver library."
-arch=(i686 x86_64)
-url="http://www.maxmind.com/app/python"
-license=('LGPL')
-depends=('python>=2.5' 'geoip')
-source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-${pkgver}.tar.gz)
-replaces=('geoip-python')
-provides=('geoip-python')
-
-build() {
-  cd ${startdir}/src/GeoIP-Python-${pkgver}
-  python setup.py build install --root=${startdir}/pkg
-}
-md5sums=('50f820d854476efaf3b7af733ffe4236')
diff --git a/abs/extra-testing/python-lxml/PKGBUILD b/abs/extra-testing/python-lxml/PKGBUILD
deleted file mode 100644
index c6fda1c..0000000
--- a/abs/extra-testing/python-lxml/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Guillem Rieu <guillemr@gmx.net>
-
-pkgname=python-lxml
-pkgver=2.2.6
-pkgrel=1
-pkgdesc="Python binding for the libxml2 and libxslt libraries"
-arch=('i686' 'x86_64')
-license=('BSD' 'GPL' 'custom')
-url="http://codespeak.net/lxml"
-depends=('python' 'libxslt')
-optdepends=("beautiful-soup: support for parsing not well formed HTML")
-conflicts=('lxml')
-replaces=('lxml')
-source=(http://codespeak.net/lxml/lxml-$pkgver.tgz)
-md5sums=('b1f700fb22d7ee9b977ee3eceb65b20c')
-
-build() {
-  /bin/true
-}
-
-package() {
-  cd ${srcdir}/lxml-$pkgver
-
-  python setup.py install --root=${pkgdir} || return 1
-
-  install -D -m644 LICENSES.txt ${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1
-  install -D -m644 doc/licenses/BSD.txt ${pkgdir}/usr/share/licenses/$pkgname/BSD.txt || return 1
-  install -D -m644 doc/licenses/elementtree.txt ${pkgdir}/usr/share/licenses/$pkgname/elementtree.txt || return 1
-}
diff --git a/abs/extra-testing/python-m2crypto/PKGBUILD b/abs/extra-testing/python-m2crypto/PKGBUILD
deleted file mode 100644
index 86a96d1..0000000
--- a/abs/extra-testing/python-m2crypto/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD,v 1.6 2008/11/13 16:04:12 sergej Exp $
-# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=python-m2crypto
-pkgver=0.19.1
-pkgrel=1
-pkgdesc="A crypto and SSL toolkit for Python"
-arch=('i686' 'x86_64')
-url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto"
-license=('BSD')
-depends=('python' 'swig' 'openssl')
-source=(http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-$pkgver.tar.gz)
-md5sums=('c92286fdf0a75f017e72122c2832d5ff')
-
-build() {
-  cd $srcdir/M2Crypto-$pkgver
-  python setup.py build
-  python setup.py install --root=$pkgdir/
-
-  install -D -m644 LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/abs/extra-testing/python-pybluez/PKGBUILD b/abs/extra-testing/python-pybluez/PKGBUILD
deleted file mode 100644
index 27b9b61..0000000
--- a/abs/extra-testing/python-pybluez/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD,v 1.11 2009/02/12 20:16:22 voidnull Exp $
-# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
-# Contributor: cs-cam - me.at.camdaniel.com
-
-pkgname=python-pybluez
-pkgver=0.18
-pkgrel=1
-pkgdesc="Python wrapper for the BlueZ Bluetooth stack"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/pybluez/"
-license=('GPL')
-provides=('pybluez')
-conflicts=('pybluez')
-replaces=('pybluez')
-depends=('python' 'bluez')
-source=(http://pybluez.googlecode.com/files/PyBluez-$pkgver.tar.gz)
-
-build() {
-  cd $srcdir/PyBluez-$pkgver
-  python setup.py install --root=$pkgdir && \
-  ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.6/site-packages/_bluetooth.so
-}
-
-md5sums=('be8c8ce615c3189fda1aaf3d568314b2')
diff --git a/abs/extra-testing/python-pymedia/PKGBUILD b/abs/extra-testing/python-pymedia/PKGBUILD
deleted file mode 100755
index a23d441..0000000
--- a/abs/extra-testing/python-pymedia/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=python-pymedia
-pkgver=1.3.5.0
-pkgrel=1
-pkgdesc="A Python library for accessing and manipulating media files"
-url="http://www.pymedia.org"
-license=""
-depends=('libvorbis' 'faad2' 'lame')
-makedepends=('python>=2.3')
-replaces=('pymedia')
-provides=('pymedia')
-arch=i686
-source=(http://easynews.dl.sourceforge.net/sourceforge/pymedia/pymedia-$pkgver.tar.gz)
-md5sums=('3b9efcd105707c6696579e3ca8852d0e')
-
-build() {
-	  cd $startdir/src/pymedia-$pkgver
-	    sed -i -e "s:/usr/local/include/lame:/usr/include/lame:g" setup.py
-	      yes "" | python setup.py install --root=$startdir/pkg --prefix=/usr
-      }
diff --git a/abs/extra-testing/python-pyserial/PKGBUILD b/abs/extra-testing/python-pyserial/PKGBUILD
deleted file mode 100644
index d90ee2d..0000000
--- a/abs/extra-testing/python-pyserial/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 82 2009-07-17 19:56:55Z aaron $
-# Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
-# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
-
-pkgname=python-pyserial
-pkgver=2.4
-pkgrel=1
-pkgdesc="Multiplatform Serial Port Module for Python"
-arch=('i686' 'x86_64')
-url="http://pyserial.sf.net"
-license=('custom:PYTHON')
-depends=('python')
-source=(http://downloads.sourceforge.net/sourceforge/pyserial/pyserial-$pkgver.tar.gz)
-
-build() {
-	cd $startdir/src/pyserial-$pkgver
-    python setup.py install --root=$startdir/pkg
-	install -D -m644 LICENSE.txt $startdir/pkg/usr/share/licenses/$pkgname/LICENSE.txt
-}
-md5sums=('eec19df59fd75ba5a136992897f8e468')
diff --git a/abs/extra-testing/pyusb/PKGBUILD b/abs/extra-testing/pyusb/PKGBUILD
deleted file mode 100644
index 1922cd8..0000000
--- a/abs/extra-testing/pyusb/PKGBUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-# Contributor: Jason Giangrande <jgiangrande@clarku.edu>
-pkgname=pyusb
-pkgver=0.4.1
-pkgrel=1
-pkgdesc="A native Python module written in C which provides USB access."
-arch=('i686' 'x86_64')
-url="http://pyusb.berlios.de/"
-license=('GPL')
-depends=('python' 'libusb')
-source=(http://downloads.sourceforge.net/pyusb/pyusb-$pkgver.tar.gz)
-md5sums=('9576c3e471e40e021fa44f36712bbd04')
-
-build() {
-	cd $startdir/src/$pkgname-$pkgver
-	python setup.py install -f --root=$startdir/pkg || return 1
-}
diff --git a/abs/extra-testing/qscintilla/ChangeLog b/abs/extra-testing/qscintilla/ChangeLog
deleted file mode 100644
index 8e78889..0000000
--- a/abs/extra-testing/qscintilla/ChangeLog
+++ /dev/null
@@ -1,13 +0,0 @@
-
-2008-11-22  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 2.3.2
-
-2008-10-15  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 2.3
-
-2008-07-06  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 2.2
-
diff --git a/abs/extra-testing/qscintilla/PKGBUILD b/abs/extra-testing/qscintilla/PKGBUILD
deleted file mode 100644
index 9b3bf94..0000000
--- a/abs/extra-testing/qscintilla/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 46926 2009-07-22 04:56:17Z pierre $
-# Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-# Contributor: Michal Krenek <mikos@sg1.cz>
-# Bug #8577 Modifications made by DaNiMoTh <jjdanimoth.aur@gmail.com>
-
-pkgname=qscintilla
-pkgver=2.4.0
-_pkgver=2.4
-pkgrel=1
-license=('GPL')
-pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class."
-arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.co.uk/software/qscintilla/download"
-depends=('qt')
-provides=('qscintilla2')
-conflicts=('qscintilla2')
-replaces=('qscintilla2')
-source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-$_pkgver.tar.gz)
-md5sums=('dd69520ec91f1acb97a4eb74ddde37c9')
-
-build() {
-    cd $srcdir/QScintilla-gpl-$_pkgver/Qt4
-    sed -i "s|DESTDIR = .*|DESTDIR = $pkgdir/usr/lib|g" qscintilla.pro
-    sed -i "s|header.path = .*|header.path = $pkgdir/usr/include|g" qscintilla.pro
-    sed -i "s|trans.path = .*|trans.path = $pkgdir/usr/share/qt/translations|g" qscintilla.pro
-    sed -i "s|qsci.path = .*|qsci.path = $pkgdir/usr/share/qt/translations|g" qscintilla.pro
-
-    qmake qscintilla.pro
-    sed -i 's|$(MOVE) $(TARGET)|$(COPY) $(TARGET)|g' Makefile
-    make || return 1
-    make DESTDIR=$pkgdir install
-    
-    cd ../designer-Qt4
-
-    # Qt4 designer qscintilla2 plugin
-    mkdir -p $pkgdir/usr/lib/qt/plugins/designer
-
-    echo "INCPATH += ../Qt4" >> designer.pro
-    sed -i "s|LIBS.*|LIBS += -L../Qt4 -lqscintilla2|g" designer.pro
-    qmake designer.pro
-    make || return 1
-    cp libqscintillaplugin.so $pkgdir/usr/lib/qt/plugins/designer/ || return 1
-
-    msg "Installing the libs to the right place"
-
-    cd ../Qt4
-
-    cp libqscintilla2.so.5.1.0 $pkgdir/usr/lib/ || return 1
-
-    pushd $pkgdir/usr/lib/
-        ln -s libqscintilla2.so.5.1.0 libqscintilla2.so
-        ln -s libqscintilla2.so.5.1.0 libqscintilla2.so.5
-        ln -s libqscintilla2.so.5.1.0 libqscintilla2.so.5.1
-    popd
-}
diff --git a/abs/extra-testing/quilt/PKGBUILD b/abs/extra-testing/quilt/PKGBUILD
deleted file mode 100644
index e5c50bc..0000000
--- a/abs/extra-testing/quilt/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD,v 1.3 2008/05/26 08:06:11 BaSh Exp $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
-
-pkgname=quilt
-pkgver=0.47
-pkgrel=1
-pkgdesc="Manage a series of patches by keeping track of the changes each patch makes."
-arch=('i686' 'x86_64')
-url="http://savannah.nongnu.org/projects/quilt"
-license=('GPL')
-depends=('perl' 'diffstat' 'gawk' 'patch' 'diffutils' 'mktemp' 'gettext')
-source=(http://savannah.nongnu.org/download/quilt/${pkgname}-${pkgver}.tar.gz)
-
-md5sums=('d33d2442bd34387260b1c1db3e623af0')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make prefix=${startdir}/pkg/usr mandir=${startdir}/pkg/usr/share/man install || return 1
-}
diff --git a/abs/extra-testing/rarian/PKGBUILD b/abs/extra-testing/rarian/PKGBUILD
deleted file mode 100644
index b83caff..0000000
--- a/abs/extra-testing/rarian/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 11986 2008-09-06 21:33:59Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=rarian
-pkgver=0.8.1
-pkgrel=1
-pkgdesc="Documentation meta-data library, designed as a replacement for Scrollkeeper."
-arch=('i686' 'x86_64')
-url="http://rarian.freedesktop.org/"
-license=('GPL')
-depends=('gcc-libs')
-makedepends=('libxslt')
-conflicts=('scrollkeeper')
-provides=('scrollkeeper')
-replaces=('scrollkeeper')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.8/${pkgname}-${pkgver}.tar.bz2
-        user-segfault.patch)
-md5sums=('75091185e13da67a0ff4279de1757b94'
-         '457e9827197009cfa360911fe49a5ad7')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -p0 -i ${srcdir}/user-segfault.patch || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc \
-     --localstatedir=/var --disable-static || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-}
diff --git a/abs/extra-testing/rarian/user-segfault.patch b/abs/extra-testing/rarian/user-segfault.patch
deleted file mode 100644
index 3311cec..0000000
--- a/abs/extra-testing/rarian/user-segfault.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- util/rarian-sk-get-cl.cpp~	2008-07-28 19:23:28.000000000 +0200
-+++ util/rarian-sk-get-cl.cpp	2008-07-28 19:23:28.000000000 +0200
-@@ -160,6 +160,11 @@
- {
-   char *filename = NULL;
-   char *user = getenv ("USERNAME");
-+
-+  if (user == NULL) {
-+    user = getenv ("USER");
-+  }
-+
-   char *basepath = NULL;
-   int i=0;
-   int last = 0;
diff --git a/abs/extra-testing/read-edid/PKGBUILD b/abs/extra-testing/read-edid/PKGBUILD
deleted file mode 100644
index 6e6b0b3..0000000
--- a/abs/extra-testing/read-edid/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Contributor: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=read-edid
-pkgver=2.0.0
-pkgrel=2
-pkgdesc="Program that can get information from a pnp monitor"
-arch=('i686' 'x86_64')
-url="http://www.polypux.org/projects/read-edid/"
-license=('GPL')
-depends=('libx86')
-source=(http://www.polypux.org/projects/read-edid/read-edid-$pkgver.tar.gz)
-md5sums=('586e7fa1167773b27f4e505edc93274b')
-
-build() {
-	cd $startdir/src/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR=$startdir/pkg install || return 1
-
-}
diff --git a/abs/extra-testing/recstat/PKGBUILD b/abs/extra-testing/recstat/PKGBUILD
deleted file mode 100644
index 023a0ed..0000000
--- a/abs/extra-testing/recstat/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=recstat
-pkgver=1
-pkgrel=20
-pkgdesc="pkg to help use the  System LEDs for Recording Status"
-arch=('i686' 'x86_64')
-url=""
-depends=('python' 'python-pyserial')
-license=('GPL')
-source=(recstat recstat.py run)
-md5sums=('626acb8cdd9e5cdb3a502bc12b828067')
-install=recstat.install
-build () {
-#  install -D $startdir/src/recstat $startdir/pkg/etc/rc.d/recstat
-  install -D $startdir/src/recstat.py $startdir/pkg/usr/bin/recstat.py
-  install -D $startdir/src/run $startdir/pkg/etc/sv/recstat/run
-}
-md5sums=('7f4ba41b65ed4d693d60d5ea00e8411b'
-         '7bc206d78a096e6ee80b9bb346619ed4'
-         '3a7cd3382212650e9233b910ed28d046')
diff --git a/abs/extra-testing/recstat/recstat b/abs/extra-testing/recstat/recstat
deleted file mode 100644
index 2d72c61..0000000
--- a/abs/extra-testing/recstat/recstat
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh
-
-set -e
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DESC="serial port encoder status script"
-NAME=recstat
-DAEMON=/usr/bin/$NAME.py
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Gracefully exit if the package has been removed.
-test -x $DAEMON || exit 0
-
-#
-#       Function that starts the daemon/service.
-#
-d_start() {
-        start-stop-daemon --start --quiet --make-pidfile --pidfile $PIDFILE \
-                --exec $DAEMON &
-}
-
-#
-#       Function that stops the daemon/service.
-#
-d_stop() {
-        kill -9 `cat $PIDFILE`
-}
-
-case "$1" in
-  start)
-        echo -n "Starting $DESC: $NAME"
-        d_start
-        echo "."
-        ;;
-  stop)
-        echo -n "Stopping $DESC: $NAME"
-        d_stop
-        echo "."
-        ;;
-  restart|force-reload)
-        echo -n "Stopping $DESC: $NAME"
-        d_stop
-        sleep 1
-        echo "."
-        echo -n "Starting $DESC: $NAME"
-        d_start
-        echo "."
-        ;;
-  *)
-        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
-        exit 1
-        ;;
-esac
-
-exit 0 
\ No newline at end of file
diff --git a/abs/extra-testing/recstat/recstat.install b/abs/extra-testing/recstat/recstat.install
deleted file mode 100644
index ecd58f0..0000000
--- a/abs/extra-testing/recstat/recstat.install
+++ /dev/null
@@ -1,13 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-    echo ""
-    echo ""
-    echo ""
-    echo " Edit /usr/bin/recstat.py  to fit your tuner setup"
-    echo " http://linhes.org/bugs/projects/lin-hes/wiki/_Using_System_LEDs_for_Recording_Status_"
-    echo " To start this program at boot run  add_service.sh recstat    "
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/recstat/recstat.py b/abs/extra-testing/recstat/recstat.py
deleted file mode 100644
index 8def041..0000000
--- a/abs/extra-testing/recstat/recstat.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/python 
-
-import httplib 
-import serial,time 
-
-mythStatus = "127.0.0.1:6544" 
-encoder1 = "Encoder 1 " 
-encoder2 = "Encoder 2 " 
-recording = "is local on mythtv and is recording" 
-watching = "is local on mythtv and is watching" 
-
-#Open COM2 
-s = serial.Serial(1) 
-#Turn off all lights 
-s.setDTR(0) 
-s.setRTS(0) 
-
-while(True): 
-    conn = httplib.HTTPConnection(mythStatus) 
-    conn.request("GET", "/") 
-    r1 = conn.getresponse() 
-    results = r1.read() 
-
-    if(results.find(encoder1+recording)!=-1): 
-        s.setDTR(1) 
-    elif (results.find(encoder1+watching) !=-1): 
-        s.setDTR(1) 
-    else: 
-        s.setDTR(0) 
-       
-    if(results.find(encoder2+recording)!=-1): 
-        s.setRTS(1) 
-    elif (results.find(encoder2+watching) !=-1): 
-        s.setRTS(1) 
-    else: 
-        s.setRTS(0) 
-
-    time.sleep(1)
diff --git a/abs/extra-testing/recstat/run b/abs/extra-testing/recstat/run
deleted file mode 100755
index 150fdb4..0000000
--- a/abs/extra-testing/recstat/run
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting recstat"
-exec /usr/bin/recstat.py
diff --git a/abs/extra-testing/rhino/PKGBUILD b/abs/extra-testing/rhino/PKGBUILD
deleted file mode 100644
index 27d7c46..0000000
--- a/abs/extra-testing/rhino/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=rhino
-pkgver=1.7R1
-pkgrel=1
-pkgdesc="Open-source implementation of JavaScript written entirely in Java"
-arch=('i686' 'x86_64')
-url="http://www.mozilla.org/rhino/"
-license=('MPL' 'GPL2')
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R1.zip)
-md5sums=('613eed8201d37be201805e5048ebb0c3')
-
-build() {
-  cd ${srcdir}/rhino1_7R1
-  install -m755 -d ${pkgdir}/usr/share/java
-  install -m644 js.jar ${pkgdir}/usr/share/java/ || return 1
-}
diff --git a/abs/extra-testing/romdb/PKGBUILD b/abs/extra-testing/romdb/PKGBUILD
deleted file mode 100644
index 9601fc6..0000000
--- a/abs/extra-testing/romdb/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $
-# Maintainer: Cecil Watson<knoppmyth@gmail.com>
-
-pkgname=romdb
-pkgver=20051116_02
-pkgrel=2
-pkgdesc="Table used by MythGame to store information about games."
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://linhes.org/"
-source=(ftp://ftp.knoppmyth.net/R6/sources/romdb-20051116-02.tgz)
-install=romdb.install
-build() {
-  cd $startdir/src/
-  mkdir -p $startdir/pkg/usr/LH/sql
-  cp -a *.sql $startdir/pkg/usr/LH/sql
-}
diff --git a/abs/extra-testing/romdb/romdb.install b/abs/extra-testing/romdb/romdb.install
deleted file mode 100644
index 4ef33d4..0000000
--- a/abs/extra-testing/romdb/romdb.install
+++ /dev/null
@@ -1,18 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-	mysql -D mythconverg -u mythtv -pmythtv < /usr/LH/sql/romdb-20051116-02.sql
-}
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	/bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-	/bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/rrd_stats/PKGBUILD b/abs/extra-testing/rrd_stats/PKGBUILD
deleted file mode 100644
index 1f987e4..0000000
--- a/abs/extra-testing/rrd_stats/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-pkgname=rrd_stats
-pkgver=1
-pkgrel=18
-pkgdesc="graph system stats"
-arch=('i686' 'x86_64')
-url=""
-license=('GPL')
-source=(rrd_stats.tgz)
-depends=('hddtemp'  'sysstat'  'xmbmon'  'rrdtool'  'perl'  'local-website')
-backup=('etc/rrdsettings.cfg' 'data/srv/httpd/htdocs/index-rrd.html')
-install=rrd_stats.install
-build() {
-  cd $startdir/src/$pkgname
-  cp -a * $startdir/pkg
-  mkdir -p $startdir/pkg/var/lib/rrd
-  echo "RRD files are used by rrd_stats" > $startdir/pkg/var/lib/rrd/README
-  mv $startdir/pkg/data/srv/httpd/htdocs/rrd/index.html $startdir/pkg/data/srv/httpd/htdocs/rrd/index-rrd.html
-  chown -R http:users $startdir/pkg/data/srv/httpd
-  chmod -R 755 $startdir/pkg/data/srv/httpd
-}
-md5sums=('e3d5f7d56fd1a3f26af0226ddcc53bfa')
diff --git a/abs/extra-testing/rrd_stats/rrd_stats.install b/abs/extra-testing/rrd_stats/rrd_stats.install
deleted file mode 100644
index 126e4f0..0000000
--- a/abs/extra-testing/rrd_stats/rrd_stats.install
+++ /dev/null
@@ -1,34 +0,0 @@
-post_install() {
-	PFIX="/data/srv/httpd/htdocs/rrd"
-	if [ ! -e $PFIX/index.html.orig ]
-	then
-		mv $PFIX/index.html  $PFIX/index.html.orig
-		ln -s $PFIX/index-rrd.html $PFIX/index.html
-	fi
-
-	ct=`crontab -l`
-	echo $ct | grep -q run_rrd.sh
-	if [ $? != 0 ]
-	then
-		line="*/5 * * * *       /usr/bin/run_rrd.sh > /dev/null"
-		(crontab -l; echo "$line") | crontab -
-	fi
-
-
-}
-
-post_upgrade() {
- 	post_install $1
-}
-
-
-pre_remove() {
-	crontab -l | grep -v run_rrd | crontab - 
-	PFIX="/data/srv/httpd/htdocs/rrd"
-	if [  -e $PFIX/index.html.orig ]
-	then
-		rm $PFIX/index.html
-		mv $PFIX/index.html.orig  $PFIX/index.html
-	fi
-
-}
diff --git a/abs/extra-testing/rrd_stats/rrd_stats.tgz b/abs/extra-testing/rrd_stats/rrd_stats.tgz
deleted file mode 100644
index 4f1f3f5..0000000
--- a/abs/extra-testing/rrd_stats/rrd_stats.tgz
+++ /dev/null
diff --git a/abs/extra-testing/rrd_stats/run_rrd.sh b/abs/extra-testing/rrd_stats/run_rrd.sh
deleted file mode 100644
index 19150a4..0000000
--- a/abs/extra-testing/rrd_stats/run_rrd.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-RRD='hddtemp disk traffic mem cpu usage ups'
-DIR='/usr/bin'
-#
-for x in $RRD 
-do
-	$DIR/rrd_${x}.pl >& /dev/null
-done
diff --git a/abs/extra-testing/rrdtool/ChangeLog b/abs/extra-testing/rrdtool/ChangeLog
deleted file mode 100644
index f289390..0000000
--- a/abs/extra-testing/rrdtool/ChangeLog
+++ /dev/null
@@ -1,13 +0,0 @@
-2009-01-21  Eric Belanger  <eric@archlinux.org>
-
-	* rrdtool 1.3.6-1
-	* Upstream update
-
-2009-01-02  Eric Belanger  <eric@archlinux.org>
-
-	* rrdtool 1.3.5-1
-	* Upstream update
-	* Replaced install scriptlet by optdepends
-	* Added libxml2 and pango depends
-	* Libtool slayed
-	* Added ChangeLog
diff --git a/abs/extra-testing/rrdtool/PKGBUILD b/abs/extra-testing/rrdtool/PKGBUILD
deleted file mode 100644
index 9d67224..0000000
--- a/abs/extra-testing/rrdtool/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 24808 2009-01-21 07:19:42Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Tom K <tom@archlinux.org>
-
-pkgname=rrdtool
-pkgver=1.3.6
-pkgrel=7
-pkgdesc="Data logging and graphing application"
-arch=('i686' 'x86_64')
-url="http://www.rrdtool.org"
-license=('GPL')
-depends=('libart-lgpl' 'libpng' 'freetype2' 'libxml2' 'pango' )
-makedepends=('python' 'tcl' 'ruby')
-optdepends=('tcl, python and/or ruby: to use corresponding binding')
-options=('!libtool' '!emptydirs')
-source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz)
-md5sums=('afaabd5a60115581e866efbac796d307')
-sha1sums=('4a8499ab58dfd37419bf1cb2429a29da9bc782c3')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-perl-site-install \
-    --with-perl-options='INSTALLDIRS=vendor' --enable-ruby-site-install || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-
-  find ${pkgdir} -name '.packlist' -delete
-  find ${pkgdir} -name 'perllocal.pod' -delete
-}
diff --git a/abs/extra-testing/rtmpdump/PKGBUILD b/abs/extra-testing/rtmpdump/PKGBUILD
deleted file mode 100644
index 33d90b1..0000000
--- a/abs/extra-testing/rtmpdump/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $
-# Maintainer: Cecil Watson<knoppmyth@gmail.com>
-
-pkgname=rtmpdump
-pkgver=1.2a
-pkgrel=2
-pkgdesc="A small dumper for media content streamed over the RTMP protocol."
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://sourceforge.net/projects/rtmpdump/"
-depends=('boost')
-source=('http://garr.dl.sourceforge.net/sourceforge/rtmpdump/rtmpdump-v1.2a.tar.gz')
-
-build() {
-	cd $startdir/src/rtmpdump
-	make
-	mkdir -p $startdir/pkg/usr/bin
-	cp -p rtmpdump $startdir/pkg/usr/bin
-}
diff --git a/abs/extra-testing/ruby/PKGBUILD b/abs/extra-testing/ruby/PKGBUILD
deleted file mode 100644
index 4a4cdd0..0000000
--- a/abs/extra-testing/ruby/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 26958 2009-02-14 23:32:24Z jgc $
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Contributors: John Proctor <jproctor@prium.net>
-#               Jeramy Rutley <jrutley@gmail.com>
-pkgname=ruby
-pkgver=1.8.7_p72
-_pkgver=1.8.7-p72
-pkgrel=3
-pkgdesc="An object-oriented language for quick and easy programming"
-arch=(i686 x86_64)
-license=('custom')
-url="http://www.ruby-lang.org/en/"
-depends=('gdbm>=1.8.3' 'db>=4.7.25' 'openssl>=0.9.8j' 'zlib>=1.2.3.3' 'readline>=5.2.013')
-makedepends=('tk>=8.5')
-source=(ftp://ftp.ruby-lang.org/pub/ruby/stable/${pkgname}-${_pkgver}.tar.bz2) 
-options=('!emptydirs' 'force')
-md5sums=('0b215c46b89b28d7ab8d56d96e72d5b9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  ./configure --prefix=/usr --enable-shared --enable-pthread || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  #generate the ri docs
-  make -j1 DESTDIR="${pkgdir}" install-doc || return 1
-  install -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
-}
diff --git a/abs/extra-testing/sample-media/PKGBUILD b/abs/extra-testing/sample-media/PKGBUILD
deleted file mode 100644
index 9851899..0000000
--- a/abs/extra-testing/sample-media/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-pkgname=sample-media
-pkgver=1
-pkgrel=5
-pkgdesc="sample media for testing"
-url=""
-license="public domain"
-depends=(media_dirs)
-makedepends=()
-conflicts=()
-replaces=()
-backup=()
-install=sample.install
-provides=("")
-source=()
-md5sums=()
-arch=('i686')
-
-build() {
-cd $startdir/src/
-mkdir -p  myth/music
-mkdir -p  myth/gallery
-mkdir -p  myth/video
-mkdir -p  myth/games/snes/roms
-
-
-cp -rp $startdir/audio/* myth/music
-cp -rp $startdir/images/*  myth/gallery
-cp -rp $startdir/video/* myth/video
-cp -rp $startdir/rom/* myth/games/snes/roms
-
-cd myth
-chown -R mythtv media
-chmod -R 777 media
-cd $startdir/src
-cp -rp myth $startdir/pkg/
-
-}
diff --git a/abs/extra-testing/sample-media/audio/05-Hush.mp3 b/abs/extra-testing/sample-media/audio/05-Hush.mp3
deleted file mode 100644
index e335abb..0000000
--- a/abs/extra-testing/sample-media/audio/05-Hush.mp3
+++ /dev/null
diff --git a/abs/extra-testing/sample-media/images/115_1573.jpg b/abs/extra-testing/sample-media/images/115_1573.jpg
deleted file mode 100644
index f626325..0000000
--- a/abs/extra-testing/sample-media/images/115_1573.jpg
+++ /dev/null
diff --git a/abs/extra-testing/sample-media/images/345-1217206791B81W.jpg b/abs/extra-testing/sample-media/images/345-1217206791B81W.jpg
deleted file mode 100644
index 646ae95..0000000
--- a/abs/extra-testing/sample-media/images/345-1217206791B81W.jpg
+++ /dev/null
diff --git a/abs/extra-testing/sample-media/images/classic-menugraph.png b/abs/extra-testing/sample-media/images/classic-menugraph.png
deleted file mode 100644
index bedbd93..0000000
--- a/abs/extra-testing/sample-media/images/classic-menugraph.png
+++ /dev/null
diff --git a/abs/extra-testing/sample-media/images/dvr_menugraph.png b/abs/extra-testing/sample-media/images/dvr_menugraph.png
deleted file mode 100644
index 712ab36..0000000
--- a/abs/extra-testing/sample-media/images/dvr_menugraph.png
+++ /dev/null
diff --git a/abs/extra-testing/sample-media/images/menu_diagram_color.png b/abs/extra-testing/sample-media/images/menu_diagram_color.png
deleted file mode 100644
index d364d94..0000000
--- a/abs/extra-testing/sample-media/images/menu_diagram_color.png
+++ /dev/null
diff --git a/abs/extra-testing/sample-media/rom/PACMAN.SMC b/abs/extra-testing/sample-media/rom/PACMAN.SMC
deleted file mode 100644
index 7a1f403..0000000
--- a/abs/extra-testing/sample-media/rom/PACMAN.SMC
+++ /dev/null
diff --git a/abs/extra-testing/sample-media/sample.install b/abs/extra-testing/sample-media/sample.install
deleted file mode 100644
index 123d060..0000000
--- a/abs/extra-testing/sample-media/sample.install
+++ /dev/null
@@ -1,41 +0,0 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-pre_install() {
-  /bin/true
-}
-
-# arg 1:  the new package version
-post_install() {
-  cd /
-  chown -R mythtv:users /myth
-
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  /bin/true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  depmod -A
-  /bin/true
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/sample-media/video/TripThe1939.mpeg b/abs/extra-testing/sample-media/video/TripThe1939.mpeg
deleted file mode 100644
index 84f9ba3..0000000
--- a/abs/extra-testing/sample-media/video/TripThe1939.mpeg
+++ /dev/null
diff --git a/abs/extra-testing/scanfw/PKGBUILD b/abs/extra-testing/scanfw/PKGBUILD
deleted file mode 100644
index 21d4f29..0000000
--- a/abs/extra-testing/scanfw/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Contributor: Michael Hanson <hansonorders@verizon.net>
-pkgname=scanfw
-pkgver=98d.beta
-pkgrel=1
-pkgdesc="A CCI scanner for MythTV"
-arch=('i686')
-url="https://help.ubuntu.com/community/MythTV_Firewire/scanfw"
-license=('GPL2')
-depends=('libraw1394' 'libiec61883' 'libavc1394')
-install=scanfw.install
-source=($pkgname-$pkgver.tar.gz)
-md5sums=('8b1da4fca459062f366232a3de6c7775')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make || return 1
-  mkdir -p "$pkgdir"/usr/bin
-  mkdir -p "$pkgdir"/usr/share/doc/"$pkgname"
-  cp "$srcdir"/"$pkgname"-"$pkgver"/scanfw "$pkgdir"/usr/bin/ || return 1
-  cp "$srcdir"/"$pkgname"-"$pkgver"/mythtv.firewire.channels.pl "$pkgdir"/usr/bin/ || return 1
-  cp "$srcdir"/"$pkgname"-"$pkgver"/SCAN_TIPS "$pkgdir"/usr/share/doc/"$pkgname" || return 1
-  cp "$srcdir"/"$pkgname"-"$pkgver"/README "$pkgdir"/usr/share/doc/"$pkgname" || return 1
-}
diff --git a/abs/extra-testing/scanfw/scanfw-98d.beta.tar.gz b/abs/extra-testing/scanfw/scanfw-98d.beta.tar.gz
deleted file mode 100644
index 7bd0ee9..0000000
--- a/abs/extra-testing/scanfw/scanfw-98d.beta.tar.gz
+++ /dev/null
diff --git a/abs/extra-testing/scanfw/scanfw.install b/abs/extra-testing/scanfw/scanfw.install
deleted file mode 100644
index d5695a9..0000000
--- a/abs/extra-testing/scanfw/scanfw.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_install() {
-   echo "==> Information on usage is in /usr/share/doc/scanfw/README."
-   echo "==> Scanning tips can be found in /usr/share/doc/scanfw/SCAN_TIPS."
-}
-
diff --git a/abs/extra-testing/scte65scan/PKGBUILD b/abs/extra-testing/scte65scan/PKGBUILD
deleted file mode 100644
index 221b7ba..0000000
--- a/abs/extra-testing/scte65scan/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Contributor: Michael Hanson <hansonorders@verizon.net>
-pkgname=scte65scan
-pkgver=0.2.1
-pkgrel=1
-pkgdesc="A reader and parser of SCTE-65 in-band SI data with HDHomerun support."
-arch=('i686')
-url="http://scte65scan.sourceforge.net/"
-license=('GPL')
-source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tgz http://download.silicondust.com/hdhomerun/libhdhomerun_20090830.tgz)
-md5sums=('1ab2d5f1895931c9c1192ee0dcc46f11'
-         '9c51200782c159703f3b32de24ae2608')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  tar zxf "$srcdir"/libhdhomerun_20090830.tgz
-  make -f Makefile.hdhr || return 1
-  mkdir -p "$pkgdir"/usr/bin || return 1
-  mkdir -p "$pkgdir"/usr/share/doc/"$pkgname" || return 1
-  cp "$srcdir"/"$pkgname"-"$pkgver"/scte65scan "$pkgdir"/usr/bin/ || return 1
-  cp "$srcdir"/"$pkgname"-"$pkgver"/Changelog "$pkgdir"/usr/share/doc/"$pkgname" || return 1
-  cp "$srcdir"/"$pkgname"-"$pkgver"/README "$pkgdir"/usr/share/doc/"$pkgname" || return 1
-  cp "$srcdir"/"$pkgname"-"$pkgver"/us-Cable-Standard-center-frequencies-QAM256 "$pkgdir"/usr/share/doc/"$pkgname" || return 1
-}
diff --git a/abs/extra-testing/sdl_gfx/PKGBUILD b/abs/extra-testing/sdl_gfx/PKGBUILD
deleted file mode 100644
index 884a80b..0000000
--- a/abs/extra-testing/sdl_gfx/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-
-# SONAME change rebuild: clanlib luola sdl_perl
-pkgname=sdl_gfx
-pkgver=2.0.16
-pkgrel=1
-pkgdesc="SDL Graphic Primitives"
-arch=(i686 x86_64)
-license=('LGPL')
-options=(!libtool)
-url="http://www.ferzkopp.net/joomla/content/view/19/14/"
-source=(http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${pkgver}.tar.gz)
-depends=('sdl')
-md5sums=('22dc2d9d916197829f9342c490d2d02b')
-
-build() {
-  cd ${startdir}/src/SDL_gfx-${pkgver}
-
-  if [ "${CARCH}" == "x86_64" ]; then
-    ./configure --prefix=/usr --disable-mmx
-  else
-    ./configure --prefix=/usr
-  fi
-
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
-}
diff --git a/abs/extra-testing/sdl_image/PKGBUILD b/abs/extra-testing/sdl_image/PKGBUILD
deleted file mode 100644
index f3ab8cb..0000000
--- a/abs/extra-testing/sdl_image/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-pkgname=sdl_image
-pkgver=1.2.6
-pkgrel=3
-pkgdesc="A simple library to load images of various formats as SDL surfaces"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('sdl>=1.2.13' 'libpng' 'libjpeg' 'libtiff' 'zlib')
-options=('!libtool')
-url="http://www.libsdl.org/projects/SDL_image/"
-source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz
-	SDL_image-IMG_lbm.patch
-	SDL_image-buffer-overflow.patch)
-md5sums=('b866dc4f647517bdaf57f6ffdefd013e'
-         '81424f716513845f27e1b69459343327'
-         'e774a12d1a07b788233f6c15aca05780')
-
-build() {
-  cd ${startdir}/src/SDL_image-${pkgver}
-  patch -Np2 -i ${startdir}/src/SDL_image-IMG_lbm.patch || return 1
-  patch -Np2 -i ${startdir}/src/SDL_image-buffer-overflow.patch || return 1
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
-}
diff --git a/abs/extra-testing/sdl_image/SDL_image-IMG_lbm.patch b/abs/extra-testing/sdl_image/SDL_image-IMG_lbm.patch
deleted file mode 100644
index cc4a29b..0000000
--- a/abs/extra-testing/sdl_image/SDL_image-IMG_lbm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- trunk/SDL_image/IMG_lbm.c	2007/07/20 04:37:11	3341
-+++ trunk/SDL_image/IMG_lbm.c	2008/01/03 20:05:34	3521
-@@ -28,6 +28,7 @@
-    EHB and HAM (specific Amiga graphic chip modes) support added by Marc Le Douarain
-    (http://www.multimania.com/mavati) in December 2003.
-    Stencil and colorkey fixes by David Raulo (david.raulo AT free DOT fr) in February 2004.
-+   Buffer overflow fix in RLE decompression by David Raulo in January 2008.
- */
- 
- #include <stdio.h>
-@@ -328,7 +329,7 @@
- 						count ^= 0xFF;
- 						count += 2; /* now it */
- 
--						if ( !SDL_RWread( src, &color, 1, 1 ) )
-+						if ( ( count > remainingbytes ) || !SDL_RWread( src, &color, 1, 1 ) )
- 						{
- 						   error="error reading BODY chunk";
- 							goto done;
-@@ -339,7 +340,7 @@
- 					{
- 						++count;
- 
--						if ( !SDL_RWread( src, ptr, count, 1 ) )
-+						if ( ( count > remainingbytes ) || !SDL_RWread( src, ptr, count, 1 ) )
- 						{
- 						   error="error reading BODY chunk";
- 							goto done;
diff --git a/abs/extra-testing/sdl_image/SDL_image-buffer-overflow.patch b/abs/extra-testing/sdl_image/SDL_image-buffer-overflow.patch
deleted file mode 100644
index 0be82dc..0000000
--- a/abs/extra-testing/sdl_image/SDL_image-buffer-overflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- trunk/SDL_image/IMG_gif.c	2007/12/28 08:17:23	3461
-+++ trunk/SDL_image/IMG_gif.c	2007/12/28 16:43:56	3462
-@@ -418,6 +418,10 @@
-     static int stack[(1 << (MAX_LWZ_BITS)) * 2], *sp;
-     register int i;
- 
-+    /* Fixed buffer overflow found by Michael Skladnikiewicz */
-+    if (input_code_size > MAX_LWZ_BITS)
-+        return -1;
-+
-     if (flag) {
- 	set_code_size = input_code_size;
- 	code_size = set_code_size + 1;
diff --git a/abs/extra-testing/sdl_mixer/PKGBUILD b/abs/extra-testing/sdl_mixer/PKGBUILD
deleted file mode 100644
index 702532c..0000000
--- a/abs/extra-testing/sdl_mixer/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 15782 2008-10-19 01:07:30Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Lukas Sabota <punkrockguy318@cocmast.net> (Timidity Patch)
-
-pkgname=sdl_mixer
-pkgver=1.2.8
-pkgrel=3
-pkgdesc="A simple multi-channel audio mixer"
-arch=('i686' 'x86_64')
-url="http://www.libsdl.org/projects/SDL_mixer/"
-license=('LGPL' 'GPL')
-depends=('sdl>=1.2.12' 'libvorbis' 'libmikmod' 'smpeg')
-options=('!libtool')
-source=(http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${pkgver}.tar.gz)
-md5sums=('0b5b91015d0f3bd9597e094ba67c4d65')
-
-build() {
-  cd ${srcdir}/SDL_mixer-${pkgver}
-  sed -i 's|/usr/local/lib/timidity|/usr/lib/timidity|' timidity/config.h || return 1
-  sed -i 's|/etc/timidity/timidity.cfg|/etc/timidity++/timidity.cfg|' timidity/config.h || return 1
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${pkgdir} install
-}
diff --git a/abs/extra-testing/sdl_net/PKGBUILD b/abs/extra-testing/sdl_net/PKGBUILD
deleted file mode 100644
index ac3073e..0000000
--- a/abs/extra-testing/sdl_net/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-pkgname=sdl_net
-pkgver=1.2.7
-pkgrel=2
-pkgdesc="A small sample cross-platform networking library"
-arch=(i686 x86_64)
-license=(GPL)
-depends=('sdl')
-options=('!libtool')
-url="http://www.libsdl.org/projects/SDL_net/"
-source=(http://www.libsdl.org/projects/SDL_net/release/SDL_net-${pkgver}.tar.gz)
-
-build() {
-  cd ${startdir}/src/SDL_net-${pkgver}
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
-}
-md5sums=('6bd4662d1423810f3140d4da21b6d912')
diff --git a/abs/extra-testing/sdl_pango/PKGBUILD b/abs/extra-testing/sdl_pango/PKGBUILD
deleted file mode 100644
index 705e900..0000000
--- a/abs/extra-testing/sdl_pango/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 8769 2008-08-16 05:40:38Z eric $
-#
-# Contributor: gyo <nucleogeek@gmail.com>
-
-pkgname=sdl_pango
-pkgver=0.1.2
-pkgrel=1
-pkgdesc="Pango SDL binding"
-arch=('i686' 'x86_64')
-url="http://sdlpango.sourceforge.net/"
-license=""
-depends=('pango' 'sdl')
-options=('!libtool')
-source=(http://switch.dl.sourceforge.net/sourceforge/sdlpango/SDL_Pango-$pkgver.tar.gz http://zarb.org/~gc/t/SDL_Pango-$pkgver-API-adds.patch)
-md5sums=('85bbf9bb7b1cee0538154dadd045418c' '5decf3d7eb724e27548af3142131a2f6')
-
-build() {
-  _prefixname=SDL_Pango
-  cd $startdir/src/$_prefixname-$pkgver
-  patch -Np0 < $startdir/src/$_prefixname-$pkgver-API-adds.patch
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
diff --git a/abs/extra-testing/sdl_pango/SDL_Pango-0.1.2-API-adds.patch b/abs/extra-testing/sdl_pango/SDL_Pango-0.1.2-API-adds.patch
deleted file mode 100644
index 1535a56..0000000
--- a/abs/extra-testing/sdl_pango/SDL_Pango-0.1.2-API-adds.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- src/SDL_Pango.c	2004-12-10 10:06:33.000000000 +0100
-+++ src/SDL_Pango.c	2006-09-24 22:46:24.000000000 +0200
-@@ -723,13 +723,8 @@
-     SDL_UnlockSurface(surface);

- }

- 

--/*!

--    Create a context which contains Pango objects.

--

--    @return A pointer to the context as a SDLPango_Context*.

--*/

- SDLPango_Context*

--SDLPango_CreateContext()

-+SDLPango_CreateContext_GivenFontDesc(const char* font_desc)

- {

-     SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context));

-     G_CONST_RETURN char *charset;

-@@ -743,8 +738,7 @@
-     pango_context_set_language (context->context, pango_language_from_string (charset));

-     pango_context_set_base_dir (context->context, PANGO_DIRECTION_LTR);

- 

--    context->font_desc = pango_font_description_from_string(

--	MAKE_FONT_NAME (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE));

-+    context->font_desc = pango_font_description_from_string(font_desc);

- 

-     context->layout = pango_layout_new (context->context);

- 

-@@ -762,6 +756,17 @@
- }

- 

- /*!

-+    Create a context which contains Pango objects.

-+

-+    @return A pointer to the context as a SDLPango_Context*.

-+*/

-+SDLPango_Context*

-+SDLPango_CreateContext()

-+{

-+     SDLPango_CreateContext_GivenFontDesc(MAKE_FONT_NAME(DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE));

-+}

-+

-+/*!

-     Free a context.

- 

-     @param *context [i/o] Context to be free

-@@ -1053,6 +1058,20 @@
-     pango_layout_set_font_description (context->layout, context->font_desc);

- }

- 

-+void

-+SDLPango_SetText_GivenAlignment(

-+    SDLPango_Context *context,

-+    const char *text,

-+    int length,

-+    SDLPango_Alignment alignment)

-+{

-+    pango_layout_set_attributes(context->layout, NULL);

-+    pango_layout_set_text (context->layout, text, length);

-+    pango_layout_set_auto_dir (context->layout, TRUE);

-+    pango_layout_set_alignment (context->layout, alignment);

-+    pango_layout_set_font_description (context->layout, context->font_desc);

-+}

-+

- /*!

-     Set plain text to context.

-     Text must be utf-8.

-@@ -1067,11 +1086,7 @@
-     const char *text,

-     int length)

- {

--    pango_layout_set_attributes(context->layout, NULL);

--    pango_layout_set_text (context->layout, text, length);

--    pango_layout_set_auto_dir (context->layout, TRUE);

--    pango_layout_set_alignment (context->layout, PANGO_ALIGN_LEFT);

--    pango_layout_set_font_description (context->layout, context->font_desc);

-+     SDLPango_SetText_GivenAlignment(context, text, length, SDLPANGO_ALIGN_LEFT);

- }

- 

- /*!

---- src/SDL_Pango.h	2004-12-10 10:06:33.000000000 +0100
-+++ src/SDL_Pango.h	2006-09-24 22:46:01.000000000 +0200
-@@ -109,12 +109,20 @@
-     SDLPANGO_DIRECTION_NEUTRAL	/*! Neutral */

- } SDLPango_Direction;

- 

--

-+/*!

-+    Specifies alignment of text. See Pango reference for detail

-+*/

-+typedef enum {

-+    SDLPANGO_ALIGN_LEFT,

-+    SDLPANGO_ALIGN_CENTER,

-+    SDLPANGO_ALIGN_RIGHT

-+} SDLPango_Alignment;

- 

- extern DECLSPEC int SDLCALL SDLPango_Init();

- 

- extern DECLSPEC int SDLCALL SDLPango_WasInit();

- 

-+extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext_GivenFontDesc(const char* font_desc);

- extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext();

- 

- extern DECLSPEC void SDLCALL SDLPango_FreeContext(

-@@ -157,6 +165,12 @@
-     const char *markup,

-     int length);

- 

-+extern DECLSPEC void SDLCALL SDLPango_SetText_GivenAlignment(

-+    SDLPango_Context *context,

-+    const char *text,

-+    int length,

-+    SDLPango_Alignment alignment);

-+

- extern DECLSPEC void SDLCALL SDLPango_SetText(

-     SDLPango_Context *context,

-     const char *markup,

diff --git a/abs/extra-testing/sdl_perl/PKGBUILD b/abs/extra-testing/sdl_perl/PKGBUILD
deleted file mode 100644
index 5824cd8..0000000
--- a/abs/extra-testing/sdl_perl/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgname=sdl_perl
-_realname=SDL_Perl
-pkgver=2.1.3
-pkgrel=2
-pkgdesc="A Perl wrapper for SDL"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://sdl.perl.org"
-depends=('perl>=5.10.0' 'sdl_net' 'sdl_ttf' 'sdl_image' 'sdl_mixer' 'mesa'
-'sdl_gfx' 'smpeg')
-makedepends=('perl-yaml')
-options=(!emptydirs)
-source=(http://search.cpan.org/CPAN/authors/id/D/DG/DGOEHRIG/${_realname}-${pkgver}.tar.gz)
-md5sums=('6ce26e1b710ce52def4ec22637cd5176')
-
-build() {
-  cd ${startdir}/src/${_realname}-${pkgver}
-  # install module in vendor directories.
-  perl Build.PL installdirs=vendor destdir=${startdir}/pkg \
-                --config man1ext=1p --config man3ext=3pm
-  perl Build
-  perl Build install
-
-  # Fix bad location of libraries.
-  cd ${startdir}/pkg/usr/lib/perl5/vendor_perl
-  mv -f auto/src/SDL* auto
-  rmdir auto/src
-}
diff --git a/abs/extra-testing/sdl_sound/PKGBUILD b/abs/extra-testing/sdl_sound/PKGBUILD
deleted file mode 100644
index 87885c2..0000000
--- a/abs/extra-testing/sdl_sound/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: dorphell <dorphell@archlinux.org>
-pkgname=sdl_sound
-pkgver=1.0.1
-pkgrel=7
-pkgdesc="A library to decode several popular sound file formats, such as .WAV and .MP3"
-arch=(i686 x86_64)
-depends=('sdl' 'libmikmod' 'libvorbis' 'flac>=1.1.4' 'speex')
-source=(http://icculus.org/SDL_sound/downloads/SDL_sound-$pkgver.tar.gz flac.patch)
-url="http://icculus.org/SDL_sound/"
-
-build() {
-  cd $startdir/src/SDL_sound-$pkgver
-  patch -Np1 -i ../flac.patch || return 1
-  aclocal
-  autoconf
-  automake --foreign
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  # libtoolslay
-  find $startdir/pkg -name '*.la' -exec rm {} \;
-}
-md5sums=('49e197ef7c8ab623d0640dc74be43160' '302aa9dc94cc71dd3339ca3177d36e1c')
diff --git a/abs/extra-testing/sdl_sound/flac.patch b/abs/extra-testing/sdl_sound/flac.patch
deleted file mode 100644
index d0ed491..0000000
--- a/abs/extra-testing/sdl_sound/flac.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -u -r SDL_sound-1.0.1/configure.in SDL_sound-1.0.1-flac/configure.in
---- SDL_sound-1.0.1/configure.in	2003-10-12 20:49:54.000000000 +0200
-+++ SDL_sound-1.0.1-flac/configure.in	2006-12-11 20:43:46.546583251 +0100
-@@ -155,9 +155,12 @@
- dnl  FLAC developers tend to break their API with every release, so we're
- dnl  checking for the latest-and-greatest here so we don't have to support
- dnl  obsolete versions.
-+dnl Starting with FLAC 1.1.3:
-+dnl   libFLAC supports Ogg FLAC (no more libOggFLAC) so we also need -logg
-+dnl   the libFLAC .so version is also #defined in FLAC/export.h
- 
- dnl Hooray for shitty autoconf bugs!
--x="C__seekable_stream_decoder_process_single"
-+x="C__stream_decoder_process_single"
- flcsym="FLA$x"
- dnl Check for libFLAC
- AC_ARG_ENABLE(flac,
-@@ -167,7 +170,7 @@
-   AC_CHECK_HEADER(FLAC/stream_decoder.h, have_flac_hdr=yes)
-   AC_CHECK_LIB(FLAC, $flcsym, have_flac_lib=yes)
-   if test x$have_flac_hdr = xyes -a x$have_flac_lib = xyes; then
--    LIBS="$LIBS -lFLAC"
-+    LIBS="$LIBS -lFLAC -logg"
-     AC_DEFINE(SOUND_SUPPORTS_FLAC)
-   fi
- fi
-diff -u -r SDL_sound-1.0.1/decoders/flac.c SDL_sound-1.0.1-flac/decoders/flac.c
---- SDL_sound-1.0.1/decoders/flac.c	2003-03-10 23:44:14.000000000 +0100
-+++ SDL_sound-1.0.1-flac/decoders/flac.c	2006-12-11 20:43:57.880097062 +0100
-@@ -44,6 +44,16 @@
- #define __SDL_SOUND_INTERNAL__
- #include "SDL_sound_internal.h"
- 
-+#include <FLAC/export.h>
-+
-+/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
-+#ifdef LEGACY_FLAC
- #include <FLAC/seekable_stream_decoder.h>
- 
- #define D_END_OF_STREAM               FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM
-@@ -80,6 +90,34 @@
- typedef FLAC__SeekableStreamDecoderSeekStatus   d_seek_status_t;
- typedef FLAC__SeekableStreamDecoderTellStatus   d_tell_status_t;
- typedef FLAC__SeekableStreamDecoderLengthStatus d_length_status_t;
-+#else
-+#include <FLAC/stream_decoder.h>
-+
-+#define D_END_OF_STREAM               FLAC__STREAM_DECODER_END_OF_STREAM
-+
-+#define d_new()                       FLAC__stream_decoder_new()
-+#define d_process_metadata(x)         FLAC__stream_decoder_process_until_end_of_metadata(x)
-+#define d_process_one_frame(x)        FLAC__stream_decoder_process_single(x)
-+#define d_get_state(x)                FLAC__stream_decoder_get_state(x)
-+#define d_finish(x)                   FLAC__stream_decoder_finish(x)
-+#define d_delete(x)                   FLAC__stream_decoder_delete(x)
-+
-+typedef FLAC__StreamDecoder           decoder_t;
-+typedef FLAC__StreamDecoderReadStatus d_read_status_t;
-+
-+#define D_SEEK_STATUS_OK              FLAC__STREAM_DECODER_SEEK_STATUS_OK
-+#define D_SEEK_STATUS_ERROR           FLAC__STREAM_DECODER_SEEK_STATUS_ERROR
-+#define D_TELL_STATUS_OK              FLAC__STREAM_DECODER_TELL_STATUS_OK
-+#define D_TELL_STATUS_ERROR           FLAC__STREAM_DECODER_TELL_STATUS_ERROR
-+#define D_LENGTH_STATUS_OK            FLAC__STREAM_DECODER_LENGTH_STATUS_OK
-+#define D_LENGTH_STATUS_ERROR         FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR
-+
-+#define d_seek_absolute(x, y)         FLAC__stream_decoder_seek_absolute(x, y)
-+
-+typedef FLAC__StreamDecoderSeekStatus   d_seek_status_t;
-+typedef FLAC__StreamDecoderTellStatus   d_tell_status_t;
-+typedef FLAC__StreamDecoderLengthStatus d_length_status_t;
-+#endif
- 
- #define D_WRITE_CONTINUE     FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE
- #define D_READ_END_OF_STREAM FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM
-@@ -141,9 +179,15 @@
- } /* free_flac */
- 
- 
-+#ifdef LEGACY_FLAC
- static d_read_status_t read_callback(
-     const decoder_t *decoder, FLAC__byte buffer[],
-     unsigned int *bytes, void *client_data)
-+#else
-+static d_read_status_t read_callback(
-+    const decoder_t *decoder, FLAC__byte buffer[],
-+    size_t *bytes, void *client_data)
-+#endif
- {
-     flac_t *f = (flac_t *) client_data;
-     Uint32 retval;
-@@ -400,6 +444,7 @@
-         BAIL_MACRO(ERR_OUT_OF_MEMORY, 0);
-     } /* if */       
- 
-+#ifdef LEGACY_FLAC
-     d_set_read_callback(decoder, read_callback);
-     d_set_write_callback(decoder, write_callback);
-     d_set_metadata_callback(decoder, metadata_callback);
-@@ -410,6 +455,7 @@
-     d_set_eof_callback(decoder, eof_callback);
- 
-     d_set_client_data(decoder, f);
-+#endif
- 
-     f->rw = internal->rw;
-     f->sample = sample;
-@@ -418,7 +464,12 @@
-     f->is_flac = 0 /* !!! FIXME: should be "has_extension", not "0". */;
- 
-     internal->decoder_private = f;
-+    /* really should check the init return value here: */
-+#ifdef LEGACY_FLAC
-     d_init(decoder);
-+#else
-+    FLAC__stream_decoder_init_stream(decoder, read_callback, seek_callback, tell_callback, length_callback, eof_callback, write_callback, metadata_callback, error_callback, f);
-+#endif
- 
-     sample->flags = SOUND_SAMPLEFLAG_NONE;
- 
diff --git a/abs/extra-testing/sdl_ttf/PKGBUILD b/abs/extra-testing/sdl_ttf/PKGBUILD
deleted file mode 100644
index 956b87f..0000000
--- a/abs/extra-testing/sdl_ttf/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 8788 2008-08-16 06:06:57Z eric $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-pkgname=sdl_ttf
-pkgver=2.0.9
-pkgrel=1
-pkgdesc="A library that allows you to use TrueType fonts in your SDL applications"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://www.libsdl.org/projects/SDL_ttf/"
-depends=('sdl>=1.2.12' 'freetype2')
-options=('!libtool')
-source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${pkgver}.tar.gz)
-md5sums=('6dd5a85e4924689a35a5fb1cb3336156')
-
-build() {
-  cd ${startdir}/src/SDL_ttf-${pkgver}
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
-}
diff --git a/abs/extra-testing/sdlmame/ChangeLog b/abs/extra-testing/sdlmame/ChangeLog
deleted file mode 100644
index 872c595..0000000
--- a/abs/extra-testing/sdlmame/ChangeLog
+++ /dev/null
@@ -1,5 +0,0 @@
-2008-02-13  JJDaNiMoTh <jjdanimoth.aur@gmail.com>
-	* 0.123 version
-
-2008-01-22  JJDaNiMoTh <jjdanimoth.aur@gmail.com>
-	* 0.122u6 version
diff --git a/abs/extra-testing/sdlmame/PKGBUILD b/abs/extra-testing/sdlmame/PKGBUILD
deleted file mode 100644
index 2718a57..0000000
--- a/abs/extra-testing/sdlmame/PKGBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id: PKGBUILD 12909 2010-03-15 11:46:58Z spupykin $
-# Contributor: robb_force <robb_force@holybuffalo.net>
-# Maintainer: JJDaNiMoTh <jjdanimoth@gmail.com>
-
-pkgname=sdlmame
-pkgver=0.137
-_basever=0137
-pkgrel=3
-pkgdesc="A port of the popular Multiple Arcade Machine Emulator using SDL with OpenGL support."
-url="http://mamedev.org/"
-license=('custom:MAME License')
-arch=('i686' 'x86_64')
-depends=('sdl>=1.2.11' 'libxinerama' 'gconf')
-makedepends=('unzip' 'nasm' 'mesa')
-DLAGENTS=('http::/usr/bin/wget -U "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.2) Gecko/20090804 Shiretoko/3.5.2" -c -t 3 --waitretry=3')
-options=('force')
-install=sdlmame.install
-source=("http://aarongiles.com/mirror/releases/mame0137s.zip"
-#"mame${_basever}s.zip::http://mamedev.org/downloader.php?&file=mame${_basever}s.zip"
-#	"http://mamedev.org/updates/0136u1_diff.zip"
-#	"http://mamedev.org/updates/0136u2_diff.zip"
-#	"http://mamedev.org/updates/0136u3_diff.zip"
-	"sdlmame.sh"
-	"extras.tar.gz"
-	"mame-0137-wiimote.diff")
-
-build() {
-  cd $srcdir/
-
-  if [ $NOEXTRACT -eq 0 ]; then
-    unzip mame.zip
-#    find . -type f -not -name uismall.png | xargs perl -pi -e 's/\r\n?/\n/g'
-#    patch -p0 -E <0136u1.diff
-#    patch -p0 -E <0136u2.diff
-#    patch -p0 -E <0136u3.diff
-    patch -p1 < ../mame-0137-wiimote.diff || return 1
-    sed -i 's/-Werror//' makefile || return 1
-  fi
-
-  # Modify the make options based on the user's architecture
-  if [ "$CARCH" == "x86_64" ]; then
-    echo "Compiling for AMD64..."
-    make AMD64=1 PTR64=1 || return 1
-    make tools AMD64=1 PTR64=1 || return 1
-  elif [ "$CARCH" == "i686" ]; then
-    make I686=1 || return 1
-    make tools I686=1 || return 1
-  else
-    echo "Compiling for i386..."
-    make PM=1 || return 1
-    make tools PM=1 || return 1
-  fi
-
-  # Install the sdlmame script
-  install -Dm755 $srcdir/${pkgname}.sh $pkgdir/usr/bin/${pkgname} || return 1
-
-  # Install the applications and the UI font in /usr/share
-  install -Dm755 mame $pkgdir/usr/share/${pkgname}/${pkgname} || \
-  install -Dm755 mame64 $pkgdir/usr/share/${pkgname}/${pkgname} || return 1
-
-  install -m755 chdman $pkgdir/usr/share/${pkgname}/chdman && \
-  install -m755 jedutil $pkgdir/usr/share/${pkgname}/jedutil && \
-  install -m755 regrep $pkgdir/usr/share/${pkgname}/regrep && \
-  install -m755 romcmp $pkgdir/usr/share/${pkgname}/romcmp && \
-  install -m755 testkeys $pkgdir/usr/share/${pkgname}/testkeys && \
-  install -m755 src2html $pkgdir/usr/share/${pkgname}/src2html && \
-  install -m755 srcclean $pkgdir/usr/share/${pkgname}/srcclean && \
-  install -m755 ldverify $pkgdir/usr/share/${pkgname}/ldverify && \
-  install -m755 ldresample $pkgdir/usr/share/${pkgname}/ldresample || return 1
-
-#  install -m755 makemeta $pkgdir/usr/share/${pkgname}/makemeta && \
-#  install -m755 runtest $pkgdir/usr/share/${pkgname}/runtest && \
-#  install -m644 ui.bdf $pkgdir/usr/share/${pkgname}/ui.bdf || return 1
-
-  # Install the extra bits
-  install -d $pkgdir/usr/share/${pkgname}/{artwork,ctrlr,keymaps} && \
-  install -m644 $srcdir/artwork/* $pkgdir/usr/share/${pkgname}/artwork/ && \
-  install -m644 $srcdir/ctrlr/* $pkgdir/usr/share/${pkgname}/ctrlr/ || return 1
-  install -m644 src/osd/sdl/keymaps/* $pkgdir/usr/share/${pkgname}/keymaps/ || return 1
-
-  # Include the license
-  install -Dm644 docs/license.txt $startdir/pkg/usr/share/licenses/${pkgname}/license.txt || return 1
-
-  find $pkgdir -type f -exec strip {} \;
-}
-md5sums=('ce9e5359e882d5a8219821e39bd4f27a'
-         '3119ccfa1e970eba4467df31208adaf0'
-         '420b61240bf5ae11615ba7c6100ee00d'
-         '07ba30c6054bf864f7c1300bfef03b81')
diff --git a/abs/extra-testing/sdlmame/extras.tar.gz b/abs/extra-testing/sdlmame/extras.tar.gz
deleted file mode 100644
index ae0bc2a..0000000
--- a/abs/extra-testing/sdlmame/extras.tar.gz
+++ /dev/null
diff --git a/abs/extra-testing/sdlmame/mame-0137-wiimote.diff b/abs/extra-testing/sdlmame/mame-0137-wiimote.diff
deleted file mode 100644
index 8f29b8e..0000000
--- a/abs/extra-testing/sdlmame/mame-0137-wiimote.diff
+++ /dev/null
@@ -1,424 +0,0 @@
-diff -BNburp mame-org/makefile mame-wiimote/makefile
-diff -BNburp mame-org/src/osd/sdl/input.c mame-wiimote/src/osd/sdl/input.c
---- mame-org/src/osd/sdl/input.c	2010-02-28 04:16:40.000000000 +0100
-+++ mame-wiimote/src/osd/sdl/input.c	2010-05-07 13:53:59.000000000 +0200
-@@ -17,6 +17,12 @@
- #include <ctype.h>

- #include <stddef.h>

- 

-+// for xinput
-+#include <X11/Xlib.h>
-+#include <X11/extensions/XInput.h>
-+#include <X11/Xutil.h>
-+
-+
- // MAME headers

- #include "emu.h"

- #include "ui.h"

-@@ -53,6 +59,16 @@ enum

- #define MAX_POV				4

- #define MAX_DEVMAP_ENTRIES	16

- 

-+//For xinput
-+#define INVALID_EVENT_TYPE	-1
-+static int           motion_type = INVALID_EVENT_TYPE;
-+static int           button_press_type = INVALID_EVENT_TYPE;
-+static int           button_release_type = INVALID_EVENT_TYPE;
-+static int           key_press_type = INVALID_EVENT_TYPE;
-+static int           key_release_type = INVALID_EVENT_TYPE;
-+static int           proximity_in_type = INVALID_EVENT_TYPE;
-+static int           proximity_out_type = INVALID_EVENT_TYPE;
-+
- //============================================================

- //  MACROS

- //============================================================

-@@ -86,6 +102,16 @@ struct _mouse_state

- 	INT32 buttons[MAX_BUTTONS];

- };

- 

-+// state information for a lightgun
-+typedef struct _lightgun_state lightgun_state;
-+struct _lightgun_state
-+{
-+	INT32 lX, lY;
-+	INT32 buttons[MAX_BUTTONS];
-+	XID deviceid; //Xinput device id
-+	INT32 maxx,maxy;
-+	INT32 minx,miny;
-+};
- 

- // state information for a joystick; DirectInput state must be first element

- typedef struct _joystick_state joystick_state;

-@@ -115,6 +141,7 @@ struct _device_info

- 		keyboard_state		keyboard;

- 		mouse_state		mouse;

- 		joystick_state		joystick;

-+		lightgun_state		lightgun;
- 	};

- };

- 

-@@ -164,10 +191,13 @@ struct _device_map_t

- 

- static device_map_t joy_map;

- static device_map_t mouse_map;

-+static device_map_t lightgun_map;
- static device_map_t keyboard_map;

- 

- static int sixaxis_mode;

- 

-+Display *XDisplay;
-+
- 

- //============================================================

- //  PROTOTYPES

-@@ -671,6 +703,244 @@ static device_info *devmap_class_registe
- 	return devinfo;

- }

- 

-+//============================================================
-+//  WiiMote lightgun stuff
-+//============================================================
-+
-+//Copypasted from xinfo
-+XDeviceInfo*
-+find_device_info(Display	*display,
-+		 char		*name,
-+		 Bool		only_extended)
-+{
-+    XDeviceInfo	*devices;
-+    XDeviceInfo *found = NULL;
-+    int		loop;
-+    int		num_devices;
-+    int		len = strlen(name);
-+    Bool	is_id = True;
-+    XID		id=0;
-+
-+    for(loop=0; loop<len; loop++) {
-+	if (!isdigit(name[loop])) {
-+	    is_id = False;
-+	    break;
-+	}
-+    }
-+
-+    if (is_id) {
-+	id = atoi(name);
-+    }
-+
-+    devices = XListInputDevices(display, &num_devices);
-+
-+    for(loop=0; loop<num_devices; loop++) {
-+	if ((!only_extended || (devices[loop].use >= IsXExtensionDevice)) &&
-+	    ((!is_id && strcmp(devices[loop].name, name) == 0) ||
-+	     (is_id && devices[loop].id == id))) {
-+	    if (found) {
-+	        fprintf(stderr,
-+	                "Warning: There are multiple devices named \"%s\".\n"
-+	                "To ensure the correct one is selected, please use "
-+	                "the device ID instead.\n\n", name);
-+	    } else {
-+		found = &devices[loop];
-+	    }
-+	}
-+    }
-+    return found;
-+}
-+
-+//Copypasted from xinfo
-+static int
-+register_events(Display		*dpy,
-+		XDeviceInfo	*info,
-+		char		*dev_name,
-+		Bool		handle_proximity)
-+{
-+    int			number = 0;	/* number of events registered */
-+    XEventClass		event_list[7];
-+    int			i;
-+    XDevice		*device;
-+    Window		root_win;
-+    unsigned long	screen;
-+    XInputClassInfo	*ip;
-+
-+    screen = DefaultScreen(dpy);
-+    root_win = RootWindow(dpy, screen);
-+
-+    device = XOpenDevice(dpy, info->id);
-+
-+    if (!device) {
-+	fprintf(stderr, "unable to open device %s\n", dev_name);
-+	return 0;
-+    }
-+
-+    if (device->num_classes > 0) {
-+	for (ip = device->classes, i=0; i<info->num_classes; ip++, i++) {
-+	    switch (ip->input_class) {
-+	    case KeyClass:
-+		DeviceKeyPress(device, key_press_type, event_list[number]); number++;
-+		DeviceKeyRelease(device, key_release_type, event_list[number]); number++;
-+		break;
-+
-+	    case ButtonClass:
-+		DeviceButtonPress(device, button_press_type, event_list[number]); number++;
-+		DeviceButtonRelease(device, button_release_type, event_list[number]); number++;
-+		break;
-+
-+	    case ValuatorClass:
-+		DeviceMotionNotify(device, motion_type, event_list[number]); number++;
-+		fprintf(stderr, "Motion = %i\n",motion_type);
-+		if (handle_proximity) {
-+		    ProximityIn(device, proximity_in_type, event_list[number]); number++;
-+		    ProximityOut(device, proximity_out_type, event_list[number]); number++;
-+		}
-+		break;
-+
-+	    default:
-+		fprintf(stderr, "unknown class\n");
-+		break;
-+	    }
-+	}
-+
-+	if (XSelectExtensionEvent(dpy, root_win, event_list, number)) {
-+	    fprintf(stderr, "error selecting extended events\n");
-+	    return 0;
-+	}
-+    }
-+    return number;
-+}
-+
-+
-+
-+static void sdlinput_register_lightguns(running_machine *machine)
-+{
-+	int index;
-+	XExtensionVersion	*version;
-+	
-+	lightgun_enabled = options_get_bool(mame_options(), OPTION_LIGHTGUN);
-+	devmap_init(machine, &lightgun_map, SDLOPTION_LIGHTGUNINDEX, 8, "Lightgun mapping");
-+	
-+	XDisplay = XOpenDisplay(NULL);
-+
-+	if (XDisplay == NULL) {
-+	    fprintf(stderr, "Unable to connect to X server\n");
-+	    return;
-+	}
-+
-+	version = XGetExtensionVersion(XDisplay, INAME);
-+
-+	if (!version || (version == (XExtensionVersion*) NoSuchExtension)) {
-+	    fprintf(stderr, "xinput extension not available!\n");
-+	    return;
-+	}
-+
-+
-+	for (index=0; index<8; index++) {
-+	    XDeviceInfo *info;
-+	    if (strlen(lightgun_map.map[index].name)!=0) {
-+		device_info *devinfo;
-+		char *name=lightgun_map.map[index].name;
-+		char defname[512];
-+		devinfo = devmap_class_register(machine, &lightgun_map, index, &lightgun_list, DEVICE_CLASS_LIGHTGUN);
-+		fprintf(stderr, "%i: %s\n",index, name);
-+		info=find_device_info(XDisplay, name, 0);
-+		if (!info) continue;
-+
-+		//Grab device info and translate to stuff mame can use
-+		if (info->num_classes > 0) {
-+		    XAnyClassPtr any = (XAnyClassPtr) (info->inputclassinfo);
-+		    int i;
-+		    for (i=0; i<info->num_classes; i++) {
-+			int button;
-+			XValuatorInfoPtr v;
-+			XAxisInfoPtr a;
-+			int j;
-+			XButtonInfoPtr b;
-+			switch (any->c_class) {
-+			case ButtonClass:
-+			    b = (XButtonInfoPtr) any;
-+			    for (button = 0; button < b->num_buttons; button++)
-+			    {
-+				input_item_id itemid;
-+				sprintf(defname, "B%d", button + 1);
-+				itemid=(input_item_id) (ITEM_ID_BUTTON1+button);
-+				input_device_item_add(devinfo->device, defname, &devinfo->lightgun.buttons[button], itemid, generic_button_get_state);
-+			    }
-+			    break;
-+			case ValuatorClass:
-+			    v = (XValuatorInfoPtr) any;
-+			    a = (XAxisInfoPtr) ((char *) v + sizeof (XValuatorInfo));
-+			    for (j=0; j<v->num_axes; j++, a++) {
-+				if (j==0) {
-+				    devinfo->lightgun.maxx=a->max_value;
-+				    devinfo->lightgun.minx=a->min_value;
-+				}
-+				if (j==1) {
-+				    devinfo->lightgun.maxy=a->max_value;
-+				    devinfo->lightgun.miny=a->min_value;
-+				}
-+			    }
-+			    break;
-+			}
-+		    any = (XAnyClassPtr) ((char *) any + any->length);
-+		    }
-+		}
-+
-+
-+		sprintf(defname, "X %s", devinfo->name);
-+		input_device_item_add(devinfo->device, defname, &devinfo->lightgun.lX, ITEM_ID_XAXIS, generic_axis_get_state);
-+		sprintf(defname, "Y %s", devinfo->name);
-+		input_device_item_add(devinfo->device, defname, &devinfo->lightgun.lY, ITEM_ID_YAXIS, generic_axis_get_state);
-+
-+
-+		devinfo->lightgun.deviceid=info->id;
-+		if (!info) {
-+		    fprintf(stderr, "Can't find device %s!\n", lightgun_map.map[index].name);
-+		} else {
-+		    fprintf(stderr, "Device %i: Registered %i events.\n",(int)info->id, register_events(XDisplay, info, lightgun_map.map[index].name, 0));
-+		}
-+	    }
-+	}
-+	mame_printf_verbose("Lightgun: End initialization\n");
-+}
-+
-+device_info *get_lightgun_info_for_deviceid(XID deviceid) {
-+    device_info *devinfo;
-+    int index;
-+    //Find lightgun according to device id
-+    for (index=0; ; index++) {
-+	devinfo = generic_device_find_index(lightgun_list, index);
-+	if (devinfo==NULL) break;
-+	if (devinfo->lightgun.deviceid==deviceid) break;
-+    }
-+    return devinfo;
-+}
-+
-+int normalize_absolute_axis(int raw, int rawmin, int rawmax)
-+{
-+	int center = (rawmax + rawmin) / 2;
-+
-+	// make sure we have valid data
-+	if (rawmin >= rawmax)
-+		return raw;
-+
-+	// above center
-+	if (raw >= center)
-+	{
-+		int result = (long)(raw - center) * (long)INPUT_ABSOLUTE_MAX / (long)(rawmax - center);
-+		return MIN(result, INPUT_ABSOLUTE_MAX);
-+	}
-+
-+	// below center
-+	else
-+	{
-+		int result = -((long)(center - raw) * (long)-INPUT_ABSOLUTE_MIN / (long)(center - rawmin));
-+		return MAX(result, INPUT_ABSOLUTE_MIN);
-+	}
-+}
-+
- 

- //============================================================

- //  sdlinput_register_joysticks

-@@ -1115,6 +1385,9 @@ void sdlinput_init(running_machine *mach
- 	// register the mice

- 	sdlinput_register_mice(machine);

- 

-+	// register the lightguns
-+	sdlinput_register_lightguns(machine);
-+
- 	if (machine->debug_flags & DEBUG_FLAG_OSD_ENABLED)

- 	{

- 		mame_printf_warning("Debug Build: Disabling input grab for -debug\n");

-@@ -1131,6 +1404,7 @@ void sdlinput_init(running_machine *mach
- 	device_list_reset_devices(keyboard_list);

- 	device_list_reset_devices(mouse_list);

- 	device_list_reset_devices(joystick_list);

-+	device_list_reset_devices(lightgun_list);
- 

- }

- 

-@@ -1248,6 +1522,7 @@ void sdlinput_poll(running_machine *mach
- 	device_info *devinfo;

- 	SDL_Event event;

- 	int index;

-+	XEvent xevent;
- 

- 	// only for SDLMAME_EVENTS_IN_WORKER_THREAD

- 	SDL_Event			loc_event_buf[MAX_BUF_EVENTS];

-@@ -1263,6 +1538,21 @@ void sdlinput_poll(running_machine *mach
- 		devinfo->mouse.lY = 0;

- 	}

- 

-+	//Get XInput events
-+	while (XPending(XDisplay)!=0) {
-+	    XNextEvent(XDisplay, &xevent);
-+	    if (xevent.type==motion_type) {
-+		XDeviceMotionEvent *motion = (XDeviceMotionEvent *) &xevent;
-+		devinfo=get_lightgun_info_for_deviceid(motion->deviceid);
-+		devinfo->lightgun.lX=normalize_absolute_axis(motion->axis_data[0], devinfo->lightgun.minx, devinfo->lightgun.maxx);
-+		devinfo->lightgun.lY=normalize_absolute_axis(motion->axis_data[1], devinfo->lightgun.miny, devinfo->lightgun.maxy);
-+	    } else if (xevent.type==button_press_type || xevent.type==button_release_type) {
-+		XDeviceButtonEvent *button = (XDeviceButtonEvent *) &xevent;
-+		devinfo=get_lightgun_info_for_deviceid(button->deviceid);
-+		devinfo->lightgun.buttons[button->button]=(xevent.type==button_press_type)?0x80:0;
-+	    }
-+	}
-+
- 	if (SDLMAME_EVENTS_IN_WORKER_THREAD)

- 	{

- 		osd_lock_acquire(input_lock);

-diff -BNburp mame-org/src/osd/sdl/osdsdl.h mame-wiimote/src/osd/sdl/osdsdl.h
---- mame-org/src/osd/sdl/osdsdl.h	2010-02-12 14:42:32.000000000 +0100
-+++ mame-wiimote/src/osd/sdl/osdsdl.h	2010-05-07 08:53:34.000000000 +0200
-@@ -130,3 +130,4 @@ void sdlaudio_init(running_machine *mach
- extern int sdl_num_processors;

- 

- #endif

-+#define SDLOPTION_LIGHTGUNINDEX			"lightgun_index"  
-diff -BNburp mame-org/src/osd/sdl/sdlmain.c mame-wiimote/src/osd/sdl/sdlmain.c
---- mame-org/src/osd/sdl/sdlmain.c	2010-02-13 12:19:16.000000000 +0100
-+++ mame-wiimote/src/osd/sdl/sdlmain.c	2010-05-07 08:54:03.000000000 +0200
-@@ -190,6 +190,17 @@ static const options_entry mame_sdl_opti
- 	{ SDLOPTION_JOYINDEX "8",                SDLOPTVAL_AUTO, 0,         "name of joystick mapped to joystick #8" },

- 	{ SDLOPTION_SIXAXIS,			         "0",	 OPTION_BOOLEAN,    "Use special handling for PS3 Sixaxis controllers" },

- 

-+	{ NULL, 		                         NULL,   OPTION_HEADER,     "SDL LIGHTGUN MAPPING" },
-+	{ SDLOPTION_LIGHTGUNINDEX "1",              SDLOPTVAL_AUTO, 0,         "name of lightgun mapped to lightgun #1" },
-+	{ SDLOPTION_LIGHTGUNINDEX "2",              SDLOPTVAL_AUTO, 0,         "name of lightgun mapped to lightgun #2" },
-+	{ SDLOPTION_LIGHTGUNINDEX "3",              SDLOPTVAL_AUTO, 0,         "name of lightgun mapped to lightgun #3" },
-+	{ SDLOPTION_LIGHTGUNINDEX "4",              SDLOPTVAL_AUTO, 0,         "name of lightgun mapped to lightgun #4" },
-+	{ SDLOPTION_LIGHTGUNINDEX "5",              SDLOPTVAL_AUTO, 0,         "name of lightgun mapped to lightgun #5" },
-+	{ SDLOPTION_LIGHTGUNINDEX "6",              SDLOPTVAL_AUTO, 0,         "name of lightgun mapped to lightgun #6" },
-+	{ SDLOPTION_LIGHTGUNINDEX "7",              SDLOPTVAL_AUTO, 0,         "name of lightgun mapped to lightgun #7" },
-+	{ SDLOPTION_LIGHTGUNINDEX "8",              SDLOPTVAL_AUTO, 0,         "name of lightgun mapped to lightgun #8" },
-+
-+
- #if (SDL_VERSION_ATLEAST(1,3,0))

- 	{ NULL, 		                         NULL,   OPTION_HEADER,     "SDL MOUSE MAPPING" },

- 	{ SDLOPTION_MOUSEINDEX "1",              SDLOPTVAL_AUTO, 0,         "name of mouse mapped to mouse #1" },

-diff -BNburp mame-org/src/osd/sdl/window.c mame-wiimote/src/osd/sdl/window.c
---- mame-org/src/osd/sdl/window.c	2010-02-12 07:40:12.000000000 +0100
-+++ mame-wiimote/src/osd/sdl/window.c	2010-05-07 08:54:54.000000000 +0200
-@@ -659,8 +659,17 @@ static void sdlwindow_update_cursor_stat
- 	}

- 

- #else

-+	//Hack for wii-lightguns: they stop working with a grabbed mouse; even a ShowCursor(SDL_DISABLE) already
-+	//does this. To make the cursor disappear, we'll just set an empty cursor image.
-+	unsigned char data[]={0,0,0,0,0,0,0,0};
-+	SDL_Cursor *c;
-+	c=SDL_CreateCursor(data, data, 8, 8, 0, 0);
-+	SDL_SetCursor(c);
-+
-+
- 	// do not do mouse capture if the debugger's enabled to avoid

- 	// the possibility of losing control

-+/*
- 	if (!(machine->debug_flags & DEBUG_FLAG_OSD_ENABLED))

- 	{

- 		if ( window->fullscreen || sdlinput_should_hide_mouse(machine) )

-@@ -680,6 +689,7 @@ static void sdlwindow_update_cursor_stat
- 			}

- 		}

- 	}

-+*/
- #endif

- }

- 

diff --git a/abs/extra-testing/sdlmame/sdlmame.install b/abs/extra-testing/sdlmame/sdlmame.install
deleted file mode 100644
index 6103018..0000000
--- a/abs/extra-testing/sdlmame/sdlmame.install
+++ /dev/null
@@ -1,29 +0,0 @@
-# Message displayed for a fresh install.
-post_install()
-{ 
-  echo ""
-  echo "***************************************************************"
-  echo " SDLMAME and the additional MAME utilities have been installed"
-  echo " in /usr/share/sdlmame However, SDLMAME can be run by" 
-  echo " typing sdlmame and it's options. Try running SDLMAME with"
-  echo " these options:"
-  echo " sdlmame <rom> -nowindow -noswitchres"
-  echo "***************************************************************"
-  echo ""
-}
-
-# Message for an update.
-post_upgrade()
-{
-  echo ""
-  echo "***************************************************************"
-  echo " SDLMAME has been updated. If you are upgrading directly from"
-  echo " 0.117 or earlier, you must delete all .cfg files and"
-  echo " re-configure your controllers. You should also run"
-  echo " 'SDLMAME --newini' to force the script to create a new ini" 
-  echo " file with default settings at ~/.mame/sdlmame.ini"
-  echo " since there may be new ini options."
-  echo "***************************************************************"
-  echo ""
-}
-
diff --git a/abs/extra-testing/sdlmame/sdlmame.sh b/abs/extra-testing/sdlmame/sdlmame.sh
deleted file mode 100644
index 38b4870..0000000
--- a/abs/extra-testing/sdlmame/sdlmame.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-# Create a variable equal to $HOME that will be used later in the ini creation
-home=('$HOME')
-
-if [ "$1" != "" ] && [ "$1" = "--newini" ]; then
-  echo "Rebuilding the ini file at $HOME/.mame/sdlmame.ini"
-  echo "Modify this file for permanent changes to your SDLMAME"
-  echo "options and paths before running SDLMAME again."
-  cd $HOME/.mame
-  if [ -e sdlmame.ini ]; then
-    echo "Your old ini file has been renamed to sdlmameini.bak"
-    mv sdlmame.ini sdlmameini.bak
-  fi
-  /usr/share/sdlmame/sdlmame \
-    -artpath "$home/.mame/artwork;artwork" \
-    -ctrlrpath "$home/.mame/ctrlr;ctrlr" \
-    -inipath $home/.mame/ini \
-    -rompath $home/.mame/roms \
-    -samplepath $home/.mame/samples \
-    -cfg_directory $home/.mame/cfg \
-    -comment_directory $home/.mame/comments \
-    -diff_directory $home/.mame/diff \
-    -input_directory $home/.mame/inp \
-    -memcard_directory $home/.mame/memcard \
-    -nvram_directory $home/.mame/nvram \
-    -snapshot_directory $home/.mame/snap \
-    -state_directory $home/.mame/sta \
-    -video opengl \
-    -createconfig
-elif [ ! -e $HOME/.mame ]; then
-  echo "Running SDLMAME for the first time..."
-  echo "Creating an ini file for SDLMAME at $HOME/.mame/sdlmame.ini"
-  echo "Modify this file for permanent changes to your SDLMAME"
-  echo "options and paths before running SDLMAME again."
-  mkdir $HOME/.mame
-  mkdir $HOME/.mame/{artwork,cfg,comments,ctrlr,diff,ini,inp,memcard,nvram,samples,snap,sta}
-  cd $HOME/.mame
-  /usr/share/sdlmame/sdlmame \
-    -artpath "$home/.mame/artwork;artwork" \
-    -ctrlrpath "$home/.mame/ctrlr;ctrlr" \
-    -inipath $home/.mame/ini \
-    -rompath $home/.mame/roms \
-    -samplepath $home/.mame/samples \
-    -cfg_directory $home/.mame/cfg \
-    -comment_directory $home/.mame/comments \
-    -diff_directory $home/.mame/diff \
-    -input_directory $home/.mame/inp \
-    -memcard_directory $home/.mame/memcard \
-    -nvram_directory $home/.mame/nvram \
-    -snapshot_directory $home/.mame/snap \
-    -state_directory $home/.mame/sta \
-    -video opengl \
-    -createconfig
-else
-  cd /usr/share/sdlmame
-  ./sdlmame "$@"
-fi
diff --git a/abs/extra-testing/serdisplib/PKGBUILD b/abs/extra-testing/serdisplib/PKGBUILD
deleted file mode 100644
index 454769b..0000000
--- a/abs/extra-testing/serdisplib/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributor: Bernhard Walle <bernhard.walle@gmx.de>
-pkgname=serdisplib
-pkgver=1.97.8
-pkgrel=1
-pkgdesc="Library for Certain Serial and Parallel LC Displays"
-url="http://serdisplib.sourceforge.net/"
-license="GPL"
-depends=(libusb gd)
-backup=(etc/LCDd.conf)
-arch=(i686 x86_64)
-source=(http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('2aa91c43d01d2dfc9fbc1116e3063ae1')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-libusb
-  make
-  make DESTDIR=$startdir/pkg includedir=$startdir/pkg/usr/include \
-        libdir=$startdir/pkg/usr/lib bindir=$startdir/pkg/usr/bin \
-        install
-}
-# :mode=shellscript:
diff --git a/abs/extra-testing/shepherd/PKGBUILD b/abs/extra-testing/shepherd/PKGBUILD
deleted file mode 100644
index f7b3048..0000000
--- a/abs/extra-testing/shepherd/PKGBUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-# $Id: PKGBUILD 23123 2009-01-03 02:43:02Z kevin $
-# Maintainer: Greg Frost <gregfrost1@bigpond.com>
-pkgname=shepherd
-pkgver=1
-pkgrel=2
-pkgdesc="Australian EPG Grabber."
-arch=i686
-depends=(perl-pathtools perl-digest-sha1 perl-algorithm-diff perl-javascript perl-list-compare)
-makedepends=()
-source=(http://www.whuffy.com/shepherd/shepherd)
-
-build() {
-    mkdir -p ${startdir}/pkg/usr/bin/
-    install -m 0755 shepherd ${startdir}/pkg/usr/bin/
-}
-md5sums=('2b826e4a08810d360e9f6843beb6aa42')
diff --git a/abs/extra-testing/sip/ChangeLog b/abs/extra-testing/sip/ChangeLog
deleted file mode 100644
index bb87e31..0000000
--- a/abs/extra-testing/sip/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-
-2008-11-22  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updating for i686: 4.7.9
-
-2008-10-06  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updating source_urls
-
-2008-08-09  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 4.7.7
-
-2008-07-06  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 4.7.6
-	
diff --git a/abs/extra-testing/sip/PKGBUILD b/abs/extra-testing/sip/PKGBUILD
deleted file mode 100644
index e3486f4..0000000
--- a/abs/extra-testing/sip/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 47992 2009-07-30 10:16:59Z pierre $
-# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
-
-pkgname=sip
-pkgver=4.9
-pkgrel=1
-pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries."
-arch=(i686 x86_64)
-url="http://www.riverbankcomputing.com/software/sip/"
-license=('custom:"sip"')
-depends=('python>=2.6' 'gcc-libs')
-source=(http://riverbankcomputing.com/static/Downloads/sip4/${pkgname}-${pkgver}.tar.gz)
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  python configure.py -b /usr/bin \
-    -d /usr/lib/python2.6/site-packages \
-    -e /usr/include/python2.6 \
-    -v /usr/share/sip
-
-  make || return 1
-  make DESTDIR=${pkgdir} install
-  # fix permissions
-  chmod 644 ${pkgdir}/usr/lib/python2.6/site-packages/sipdistutils.py
-
-  install -m 644 -D LICENSE  ${pkgdir}/usr/share/licenses/sip/LICENSE
-} 
diff --git a/abs/extra-testing/slang/ChangeLog b/abs/extra-testing/slang/ChangeLog
deleted file mode 100644
index 450a2a2..0000000
--- a/abs/extra-testing/slang/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-2008-12-19  Eric Belanger  <eric@archlinux.org>
-
-	* slang 2.1.4-1
-	* Upstream update
-	* Added pcre depends
-	* Added backup array
-	* Added ChangeLog
diff --git a/abs/extra-testing/slang/PKGBUILD b/abs/extra-testing/slang/PKGBUILD
deleted file mode 100644
index 16622d4..0000000
--- a/abs/extra-testing/slang/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 21963 2008-12-19 07:30:56Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=slang
-pkgver=2.1.4
-pkgrel=1
-pkgdesc="S-Lang is a powerful interpreted language"
-arch=('i686' 'x86_64')
-url="http://www.s-lang.org/"
-license=('GPL')
-depends=('glibc' 'pcre')
-backup=('etc/slsh.rc')
-options=('!makeflags')
-source=(ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3516f593bc04975844f26137c18275d2')
-sha1sums=('5c97698f7dcd91834ce64a4dac476a3587851ead')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc || return 1
-  make || return 1
-  make install-all DESTDIR=${pkgdir} || return 1
-}
diff --git a/abs/extra-testing/smartmontools/PKGBUILD b/abs/extra-testing/smartmontools/PKGBUILD
deleted file mode 100644
index dbee715..0000000
--- a/abs/extra-testing/smartmontools/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 6701 2008-07-27 13:29:59Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Jeff Mickey <jeff@archlinux.org>
-# Contributor: Jani Talikka <jani.talikka@gmail.com>
-
-pkgname=smartmontools
-pkgver=5.38
-pkgrel=1
-pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives."
-url="http://smartmontools.sourceforge.net"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('gcc-libs')
-backup=('etc/smartd.conf')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \
-        smartd)
-
-build()
-{
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
-  rm -rf ${startdir}/pkg/etc/rc.d
-  install -D -m 755 ../smartd ${startdir}/pkg/etc/rc.d/smartd
-}
-md5sums=('a282846532ecbd6b4a28072373b3a70b' '850f98b6792b7642ff193a49a2f1139d')
diff --git a/abs/extra-testing/smartmontools/smartd b/abs/extra-testing/smartmontools/smartd
deleted file mode 100644
index 5fcc414..0000000
--- a/abs/extra-testing/smartmontools/smartd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
- . /etc/rc.conf
- . /etc/rc.d/functions
-
- case "$1" in
-
-   start)
-     stat_busy "Starting smartd"
-     /usr/sbin/smartd &>/dev/null
-     if [ $? -ne 0 ]; then
-       stat_fail
-     else
-       add_daemon smartd
-       stat_done
-     fi
-   ;;
-
-   stop)
-     stat_busy "Stopping smartd"
-     kill -9 `pidof /usr/sbin/smartd` &>/dev/null
-     rm_daemon smartd
-     stat_done
-   ;;
-
-   restart)
-     stat_busy "Restarting smartd ..."
-     $0 stop
-     $0 start
-     stat_done
-   ;;
-
-   *)
-     echo "usage: $0 {start|stop|restart}"
- esac
diff --git a/abs/extra-testing/smpeg/PKGBUILD b/abs/extra-testing/smpeg/PKGBUILD
deleted file mode 100644
index 1b52434..0000000
--- a/abs/extra-testing/smpeg/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 19615 2008-11-28 13:17:01Z allan $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=smpeg
-pkgver=0.4.4
-pkgrel=4
-pkgdesc="SDL MPEG Player Library"
-arch=('i686' 'x86_64')
-url="http://icculus.org/smpeg/"
-license=('LGPL')
-depends=('sdl')
-makedepends=('gtk' 'mesa')
-options=('!libtool' '!makeflags')
-source=(http://mirrors.dotsrc.org/lokigames/open-source/smpeg/$pkgname-$pkgver.tar.gz smpeg-0.4.4-gcc41.patch)
-md5sums=('59c76ac704088ef5539210190c4e1fe3' '8b979a58307d7196655758bd3d2466c4')
-sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259' '7d9a2ad7f6b702dfe3adcb87601d9b55022bbd1e')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -p1 < ../smpeg-0.4.4-gcc41.patch
-  ./configure --prefix=/usr
-  make LDFLAGS+=-lstdc++ || return 1
-  make DESTDIR=$startdir/pkg install
-  
-  #fix aclocal warnings
-  sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" ${pkgdir}/usr/share/aclocal/smpeg.m4
-}
diff --git a/abs/extra-testing/smpeg/smpeg-0.4.4-gcc41.patch b/abs/extra-testing/smpeg/smpeg-0.4.4-gcc41.patch
deleted file mode 100644
index 4a0eeb4..0000000
--- a/abs/extra-testing/smpeg/smpeg-0.4.4-gcc41.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: MPEGaudio.h
-===================================================================
-RCS file: /cvs/cvsroot/smpeg/MPEGaudio.h,v
-retrieving revision 1.23
-diff -u -p -r1.23 MPEGaudio.h
---- smpeg/MPEGaudio.h	17 Jul 2001 19:52:24 -0000	1.23
-+++ smpeg/MPEGaudio.h	6 Dec 2005 06:10:43 -0000
-@@ -151,12 +151,6 @@ private:
- /* The actual MPEG audio class */
- class MPEGaudio : public MPEGerror, public MPEGaudioaction {
- 
--    friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
--    friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
--#ifdef THREADED_AUDIO
--    friend int Decode_MPEGaudio(void *udata);
--#endif
--
- public:
-     MPEGaudio(MPEGstream *stream, bool initSDL = true);
-     virtual ~MPEGaudio();
-@@ -367,6 +361,20 @@ public:
- #define N_TIMESTAMPS 5
- 
-   double timestamp[N_TIMESTAMPS];
-+
-+  /* Functions which access MPEGaudio internals */
-+  friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
-+  friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
-+#ifdef THREADED_AUDIO
-+  friend int Decode_MPEGaudio(void *udata);
-+#endif
- };
- 
-+/* Need to duplicate the prototypes, this is not a typo :) */
-+void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
-+int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
-+#ifdef THREADED_AUDIO
-+int Decode_MPEGaudio(void *udata);
-+#endif
-+
- #endif /* _MPEGAUDIO_H_ */
diff --git a/abs/extra-testing/snes9x/PKGBUILD b/abs/extra-testing/snes9x/PKGBUILD
deleted file mode 100644
index 928081b..0000000
--- a/abs/extra-testing/snes9x/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-pkgname=snes9x
-pkgver=1.51
-pkgrel=1
-pkgdesc="A portable Emulator for the Super Nintento Entertainment System"
-arch=(i686 x86_64)
-url="http://www.snes9x.com"
-license="Freeware"
-# remove nasm on non x86 platforms
-depends=('zlib' 'libpng' 'sdl' 'nasm' 'mesa')
-install=snes9x.install
-source=(http://www.geocities.co.jp/SiliconValley-PaloAlto/2560/release/${pkgname}-${pkgver}-src.tar.bz2 \
-        snes9x-fixes2.patch)
-build() {
-  mkdir -p ${startdir}/pkg/usr/bin
-
-  cd ${startdir}/src/${pkgname}-${pkgver}-src
-  #patch -Np1 -i ${startdir}/src/snes9x-fixes2.patch || return 1
-
-  # build snes9x with opengl
-  ./configure --prefix=/usr \
-              --with-sdd1-decomp \
-              --with-opengl \
-              --with-netplay
-  make || return 1
-  install -D ${startdir}/src/${pkgname}-${pkgver}-src/osnes9x ${startdir}/pkg/usr/bin/osnes9x
-
-  # build snes9x with glide
-  #cd $startdir/src/$pkgname-$pkgver-src
-  #./configure --prefix=/usr --with-sdd1-decomp --with-glide
-  #make || return 1
-  #install -D ${startdir}/src/${pkgname}-${pkgver}-src/osnes9x ${startdir}/pkg/usr/bin/3dfxsnes9x
-
-  # build snes9x without opengl
-  ./configure --prefix=/usr \
-              --with-sdd1-decomp \
-              --with-netplay
-  make clean || return 1
-  make || return 1
-  install -D ${startdir}/src/${pkgname}-${pkgver}-src/snes9x ${startdir}/pkg/usr/bin/snes9x
-}
-md5sums=('a1038cc761f400318cdced960972f8a7' '395bea78242afc82b3756225fe4ff954')
diff --git a/abs/extra-testing/snes9x/snes9x-fixes2.patch b/abs/extra-testing/snes9x/snes9x-fixes2.patch
deleted file mode 100644
index 6007bb6..0000000
--- a/abs/extra-testing/snes9x/snes9x-fixes2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- snes9x-1.5-src.orig/unix/opengl.cpp	2006-06-30 13:34:57.000000000 +0000
-+++ snes9x-1.5-src/unix/opengl.cpp	2006-09-01 08:48:39.000000000 +0000
-@@ -214,7 +214,7 @@
- 
- 	// Strip dots from the version string
- 	char *ptr;
--	while (ptr = strchr (ver, '.'))
-+	while ((ptr = strchr (ver, '.')))
- 	    memmove (ptr, ptr + 1, strlen (ptr + 1) + 1);
- 	
- 	// Pad the string with zeros to 4 digits
-@@ -381,7 +381,7 @@
-                 int i = 0;
-                 for (uint32 y = 0; y < pheight; y++)
-                 {
--                    uint16 *ptr = (uint16 *) (GFX.Screen + (y + startl) * GFX.Pitch2) + startx;
-+                    uint16 *ptr = (uint16 *) (GFX.Screen + (y + startl) * GFX.Pitch) + startx;
-                     for (uint32 x = 0; x < pwidth; x++)
-                     {
-                         int color = *ptr++;
-@@ -399,7 +399,7 @@
- 		for (uint32 y = 0; y < pheight; y++)
- 		{
- 		    memmove (basetexbuffer + sizeof (uint16) * texture_size * y,
--			     (GFX.Screen + (y + startl) * GFX.Pitch2) + startx,
-+			     (GFX.Screen + (y + startl) * GFX.Pitch) + startx,
- 			     sizeof (uint16) * texture_size);
- 		}
- 		data = basetexbuffer;
diff --git a/abs/extra-testing/snes9x/snes9x.install b/abs/extra-testing/snes9x/snes9x.install
deleted file mode 100755
index 1528f50..0000000
--- a/abs/extra-testing/snes9x/snes9x.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  echo ">> If you wish to use Snes9x with OpenGL try osnes9x" 
-  /bin/true
-}
-
-post_upgrade() {
-  echo ">> If you wish to use Snes9x with OpenGL try osnes9x"
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/speex/PKGBUILD b/abs/extra-testing/speex/PKGBUILD
deleted file mode 100644
index aac6749..0000000
--- a/abs/extra-testing/speex/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 7445 2008-08-02 03:05:20Z eduardo $
-# Contributer: Jason Chu <jason@archlinux.org>
-# Maintainer: Jason Chu <jason@archlinux.org>
-
-pkgname=speex
-pkgver=1.2rc1
-pkgrel=1
-pkgdesc="A free codec for free speech"
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('libogg')
-source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('c4438b22c08e5811ff10e2b06ee9b9ae')
-url="http://www.speex.org/"
-
-build() {
-   cd $startdir/src/speex-$pkgver
-   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-   make || return 1
-   make DESTDIR=$startdir/pkg install
-   #to fix kde detection
-   cp $startdir/pkg/usr/include/speex/* $startdir/pkg/usr/include/
-   #libtoolslay
-   find $startdir/pkg -name '*.la' -exec rm {} \;
-}
diff --git a/abs/extra-testing/spidermonkey/PKGBUILD b/abs/extra-testing/spidermonkey/PKGBUILD
deleted file mode 100644
index 3a44af3..0000000
--- a/abs/extra-testing/spidermonkey/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-pkgname=spidermonkey
-pkgver=1.7.0
-pkgrel=2
-pkgdesc="Mozilla's C implementation of JavaScript."
-arch=("i686" "x86_64")
-url="http://www.mozilla.org/js/spidermonkey/"
-license=('MPL' 'GPL' 'LGPL')
-depends=('nspr')
-options=('!makeflags' 'force')
-source=("http://ftp.mozilla.org/pub/mozilla.org/js/js-$pkgver.tar.gz" \
-	"spidermonkey-1.7-threadsafe.patch" "header.patch")
-md5sums=('5571134c3863686b623ebe4e6b1f6fe6' 'b2ef9be017b6aa1857354b5223975a4f')
-
-build()
-{
-  cd $startdir/src/js/src
-  # fix for the lib location
-  [ "$CARCH" = "x86_64" ] && (sed -i -e "s:lib64:lib:g" config.mk || return 1)
-  # patch Makefile for threadsafe support with native nspr
-  patch -p2 -i $startdir/src/spidermonkey-1.7-threadsafe.patch || return 1
-  patch -p2 -i $startdir/src/header.patch || return 1
-  # build - threadsafe
-  make -f Makefile.ref BUILD_OPT=1 JS_THREADSAFE=1 DIST=$startdir/pkg/usr all export || return 1
-  # install
-  mkdir -p $startdir/pkg/usr/include/js
-  mv $startdir/pkg/usr/include/*.h $startdir/pkg/usr/include/js/
-}
diff --git a/abs/extra-testing/spidermonkey/header.patch b/abs/extra-testing/spidermonkey/header.patch
deleted file mode 100644
index b69caae..0000000
--- a/abs/extra-testing/spidermonkey/header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur js.orig/src/Makefile.ref js/src/Makefile.ref
---- js.orig/src/Makefile.ref	2008-07-18 21:05:37.154351682 +0800
-+++ js/src/Makefile.ref	2008-07-18 21:06:39.291061725 +0800
-@@ -188,6 +188,8 @@
- 	jsstr.h		\
- 	jsxdrapi.h	\
- 	jsxml.h		\
-+	jsutil.h	\
-+	jsprf.h		\
- 	$(NULL)
- 
- API_HFILES =		\
diff --git a/abs/extra-testing/spidermonkey/spidermonkey-1.7-threadsafe.patch b/abs/extra-testing/spidermonkey/spidermonkey-1.7-threadsafe.patch
deleted file mode 100644
index da6c78d..0000000
--- a/abs/extra-testing/spidermonkey/spidermonkey-1.7-threadsafe.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- js/src/Makefile.ref.orig	2008-05-28 19:51:32.000000000 -0400
-+++ js/src/Makefile.ref	2008-05-28 19:52:17.000000000 -0400
-@@ -63,11 +63,11 @@
- 
- ifdef JS_THREADSAFE
- DEFINES += -DJS_THREADSAFE
--INCLUDES += -I$(DIST)/include/nspr
-+INCLUDES += -I/usr/include/nspr
- ifdef USE_MSVC
- OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib
- else
--OTHER_LIBS += -L$(DIST)/lib -lnspr$(NSPR_LIBSUFFIX)
-+OTHER_LIBS += -L/usr/$(LIBDIR)/nspr -lnspr${NSPR_LIBSUFFIX}
- endif
- endif
- 
diff --git a/abs/extra-testing/startup-notification/PKGBUILD b/abs/extra-testing/startup-notification/PKGBUILD
deleted file mode 100644
index 0d65123..0000000
--- a/abs/extra-testing/startup-notification/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id: PKGBUILD 21429 2008-12-13 03:30:02Z eric $
-# Maintainer: dorphell <dorphell@archlinux.org>
-pkgname=startup-notification
-pkgver=0.9
-pkgrel=1
-pkgdesc="Monitor and display application startup"
-arch=(i686 x86_64)
-depends=('libx11' 'libsm')
-options=('!libtool')
-url="http://www.freedesktop.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('624b42f1fac5a12c543a079e2cd3b366')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc
-  make || return 1
-  make DESTDIR=${startdir}/pkg install
-}
diff --git a/abs/extra-testing/strace/PKGBUILD b/abs/extra-testing/strace/PKGBUILD
deleted file mode 100644
index c965f24..0000000
--- a/abs/extra-testing/strace/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 13699 2008-09-27 22:25:37Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-pkgname=strace
-pkgver=4.5.18
-pkgrel=1
-pkgdesc="A useful diagnositic, instructional, and debugging tool"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://sourceforge.net/projects/strace/"
-depends=('glibc')
-source=(http://downloads.sourceforge.net/sourceforge/strace/strace-$pkgver.tar.bz2)
-md5sums=('e9449fcee97e6a8ed73934c883c870e0')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  install -Dm644 COPYRIGHT ${startdir}/pkg/usr/share/licenses/strace/COPYRIGHT
-}
diff --git a/abs/extra-testing/strace/no_linux_socket_h.patch b/abs/extra-testing/strace/no_linux_socket_h.patch
deleted file mode 100644
index f1c3598..0000000
--- a/abs/extra-testing/strace/no_linux_socket_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- strace-4.5.12.orig/configure.ac
-+++ strace-4.5.12/configure.ac
-@@ -193,8 +193,7 @@
- 
- AC_CHECK_FUNCS(sigaction strerror strsignal pread sys_siglist _sys_siglist getdents mctl prctl sendmsg inet_ntop if_indextoname)
- AC_CHECK_HEADERS([sys/reg.h sys/filio.h sys/acl.h sys/asynch.h sys/door.h stropts.h sys/conf.h sys/stream.h sys/tihdr.h sys/tiuser.h sys/sysconfig.h ioctls.h sys/ioctl.h sys/ptrace.h termio.h linux/ptrace.h asm/reg.h sys/uio.h sys/aio.h  poll.h sys/poll.h sys/vfs.h asm/sysmips.h linux/utsname.h sys/nscsys.h mqueue.h sys/epoll.h libaio.h], [], [])
--AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
--                 [], [], [#include <linux/socket.h>])
-+AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h])
- AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>])
- AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>])
- 
---- strace-4.5.12.orig/configure
-+++ strace-4.5.12/configure
-@@ -6945,7 +6945,6 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <linux/socket.h>
- 
- #include <$ac_header>
- _ACEOF
diff --git a/abs/extra-testing/subversion/ChangeLog b/abs/extra-testing/subversion/ChangeLog
deleted file mode 100644
index b223bd8..0000000
--- a/abs/extra-testing/subversion/ChangeLog
+++ /dev/null
@@ -1,66 +0,0 @@
-2009-12-27  Ionut Biru <ionut@archlinux.ro>
-
-	* subversion 1.6.6-3: adding svn bash completion script
-
-2009-08-07  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated to: 1.6.4
-
-2009-08-02  Eric Belanger  <eric@archlinux.org>
-
-	* subversion 1.6.3-2: Rebuilt against ruby 1.9
-
-2009-06-07  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Now hopefully fixed git issues
-
-2009-05-16  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Fixing wrong link against ruby 1.9
-
-2009-05-11  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 1.6.2
-
-2009-04-17  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Back to use svnmerge.py from trunk
-
-2009-04-11  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Removing libtool files
-
-2009-04-10  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 1.6.1
-	* Added gerardo patch to fix insecure rpaths
-
-2009-03-24  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Added sqlite3 as a dep
-
-2009-03-21  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 1.6.0
-
-2009-02-26  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 1.5.6
-
-2008-10-10  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 1.5.3
-
-2008-09-04  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* 1.5.2: Finally updated for i686 as it does not break the
-	  devtools.
-
-2008-08-13  Douglas Soares de Andrade  <dsa@aur.archlinux.org>
-
-	* Updated for i686: 1.5.1
-
-2008-07-23  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 1.5.0
-
diff --git a/abs/extra-testing/subversion/PKGBUILD b/abs/extra-testing/subversion/PKGBUILD
deleted file mode 100644
index dd24fd5..0000000
--- a/abs/extra-testing/subversion/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 77223 2010-04-11 14:13:33Z pierre $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=subversion
-pkgver=1.6.9
-pkgrel=5
-pkgdesc="Replacement for CVS, another versioning system (svn)"
-arch=('i686' 'x86_64')
-license=('apache' 'bsd')
-depends=('neon' 'apr-util')
-makedepends=('heimdal' 'apache' 'python' 'perl' 'swig' 'ruby' 'java-runtime' 
-             'autoconf' 'sqlite3' 'db' 'e2fsprogs' ) 
-source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2
-        svnserve svn svnserve.conf svnmerge.py
-        subversion.rpath.fix.patch
-	subversion.suppress.deprecation.warnings.patch)
-
-backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
-url="http://subversion.tigris.org/"
-provides=('svn')
-options=('!makeflags' '!libtool')
-optdepends=( 'bash-completion: for svn bash completion')
-
-build() {
-   cd ${srcdir}/${pkgname}-${pkgver} || return 1
-
-   # apply patches
-   patch -p0 < $srcdir/subversion.rpath.fix.patch || return 1
-   patch -p1 -i $srcdir/subversion.suppress.deprecation.warnings.patch \
-               || return 1
-
-   # configure
-   autoreconf || return 1
-   ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
-               --with-zlib=/usr --with-neon=/usr --with-apxs \
-               --with-sqlite=/usr \
-               --enable-javahl  || return 1
-
-   # build
-   (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) \
-               || return 1
-
-   # install
-   export LD_LIBRARY_PATH=${pkgdir}/usr/lib:$LD_LIBRARY_PATH
-   make DESTDIR=${pkgdir} install || return 1
-
-   make DESTDIR=${pkgdir} swig-py || return 1
-   make install-swig-py DESTDIR=${pkgdir} || return 1
-
-   mkdir -p ${pkgdir}/usr/lib/python2.6 || return 1
-   mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.6/site-packages \
-               || return 1
-
-   mkdir -p ${pkgdir}/usr/share/subversion || return 1
-   install -d -m 755 tools/hook-scripts ${pkgdir}/usr/share/subversion/ \
-               || return 1
-   rm -f ${pkgdir}/usr/share/subversion/hook-scripts/*.in || return 1
-
-   make DESTDIR=${pkgdir} swig-pl || return 1
-   make install-swig-pl DESTDIR=${pkgdir} INSTALLDIRS=vendor || return 1
-   rm -f ${pkgdir}/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist \
-               || return 1
-   rm -rf ${pkgdir}/usr/lib/perl5/core_perl || return 1
-
-   make DESTDIR=${pkgdir} swig-rb || return 1
-   make install-swig-rb DESTDIR=${pkgdir}  || return 1
-
-   make DESTDIR=${pkgdir} javahl || return 1
-   make DESTDIR=${pkgdir} install-javahl || return 1
-
-   mkdir -p ${pkgdir}/etc/rc.d || return 1
-   mkdir -p ${pkgdir}/etc/xinetd.d || return 1
-   mkdir -p ${pkgdir}/etc/conf.d || return 1
-
-   install -m 755 ${srcdir}/svnserve ${pkgdir}/etc/rc.d || return 1
-   install -m 644 ${srcdir}/svn ${pkgdir}/etc/xinetd.d || return 1
-   install -m 644 ${srcdir}/svnserve.conf ${pkgdir}/etc/conf.d/svnserve \
-               || return 1
-   install -m 755 ${srcdir}/svnmerge.py ${pkgdir}/usr/bin/svnmerge || return 1
-   install -D -m 644 ${srcdir}/subversion-$pkgver/COPYING \
-               ${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1
-
-   # bash completion
-   install -Dm 644 ${srcdir}/${pkgname}-${pkgver}/tools/client-side/bash_completion \
-               ${pkgdir}/etc/bash_completion.d/subversion || return 1
-}
-md5sums=('9c30a47b1d48664e7afef68bb4834c53'
-         'a2b029e8385007ffb99b437b30521c90'
-         'a0db6dd43af33952739b6ec089852630'
-         'c459e299192552f61578f3438abf0664'
-         '21bf3aa5b797ce98eba8307f30e9c070'
-         '6b4340ba9d8845cd8497e013ae01be3f'
-         '1166f3b7413d7e7450299b3525680bbe')
diff --git a/abs/extra-testing/subversion/__changelog b/abs/extra-testing/subversion/__changelog
deleted file mode 100644
index b91d08d..0000000
--- a/abs/extra-testing/subversion/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-removed kwallet and gnome
diff --git a/abs/extra-testing/subversion/subversion-neon.patch b/abs/extra-testing/subversion/subversion-neon.patch
deleted file mode 100644
index 7dc23c5..0000000
--- a/abs/extra-testing/subversion/subversion-neon.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: subversion-1.4.6/build/ac-macros/neon.m4
-===================================================================
---- subversion-1.4.6.orig/build/ac-macros/neon.m4
-+++ subversion-1.4.6/build/ac-macros/neon.m4
-@@ -50,14 +50,18 @@ AC_DEFUN(SVN_LIB_NEON,
-       NEON_VERSION=`cat $abs_srcdir/neon/.version`
-       AC_MSG_RESULT([$NEON_VERSION])
- 
--      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56]]\.'`" ; then
-+      if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[5-8]\.'`"] ; then
-         AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
-                            [Define to 1 if you have Neon 0.25 or later.])
-       fi
--      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then
-+      if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[6-8]\.'`"] ; then
-         AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1],
-                            [Define to 1 if you have Neon 0.26 or later.])
-       fi
-+      if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[7-8]\.'`"] ; then
-+        AC_DEFINE_UNQUOTED([SVN_NEON_0_27], [1],
-+                           [Define to 1 if you have Neon 0.27 or later.])
-+      fi
- 
-       for svn_allowed_neon in $NEON_ALLOWED_LIST; do
-         if test "$NEON_VERSION" = "$svn_allowed_neon" ||
-@@ -127,14 +131,18 @@ AC_DEFUN(SVN_NEON_CONFIG,
-       NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
-       AC_MSG_RESULT([$NEON_VERSION])
- 
--      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56]]\.'`" ; then
-+      if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[5-8]\.'`"] ; then
-         AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
-                            [Define to 1 if you have Neon 0.25 or later.])
-       fi
--      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then
-+      if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[6-8]\.'`"] ; then
-         AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1],
-                            [Define to 1 if you have Neon 0.26 or later.])
-       fi
-+      if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[7-8]\.'`"] ; then
-+        AC_DEFINE_UNQUOTED([SVN_NEON_0_27], [1],
-+                           [Define to 1 if you have Neon 0.27 or later.])
-+      fi
- 
-       for svn_allowed_neon in $NEON_ALLOWED_LIST; do
-         if test "$NEON_VERSION" = "$svn_allowed_neon" ||
-Index: subversion-1.4.6/subversion/libsvn_ra_dav/session.c
-===================================================================
---- subversion-1.4.6.orig/subversion/libsvn_ra_dav/session.c
-+++ subversion-1.4.6/subversion/libsvn_ra_dav/session.c
-@@ -575,7 +575,11 @@ typedef struct neonprogress_baton_t
- } neonprogress_baton_t;
- 
- static void
-+#ifdef SVN_NEON_0_27
-+ra_dav_neonprogress(void *baton, ne_off_t progress, ne_off_t total)
-+#else
- ra_dav_neonprogress(void *baton, off_t progress, off_t total)
-+#endif /* SVN_NEON_0_27 */
- {
-   const neonprogress_baton_t *neonprogress_baton = baton;
-   if (neonprogress_baton->progress_func)
diff --git a/abs/extra-testing/subversion/subversion.rpath.fix.patch b/abs/extra-testing/subversion/subversion.rpath.fix.patch
deleted file mode 100644
index ba6ee9e..0000000
--- a/abs/extra-testing/subversion/subversion.rpath.fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	2009-02-16 14:10:48.000000000 -0200
-+++ Makefile.in	2009-06-04 00:56:29.000000000 -0300
-@@ -678,6 +678,7 @@
- 
- $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
- 	cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
-+	cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}}
- 
- swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \
-   $(SWIG_PL_DIR)/native/Makefile
diff --git a/abs/extra-testing/subversion/subversion.suppress.deprecation.warnings.patch b/abs/extra-testing/subversion/subversion.suppress.deprecation.warnings.patch
deleted file mode 100644
index 94ce89b..0000000
--- a/abs/extra-testing/subversion/subversion.suppress.deprecation.warnings.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN subversion-1.6.9/subversion/bindings/swig/python/svn/core.py subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py
---- subversion-1.6.9/subversion/bindings/swig/python/svn/core.py	2009-02-13 11:22:26.000000000 -0500
-+++ subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py	2010-02-08 07:46:29.000000000 -0500
-@@ -19,6 +19,7 @@
- from libsvn.core import *
- import libsvn.core as _libsvncore
- import atexit as _atexit
-+import warnings
- 
- class SubversionException(Exception):
-   def __init__(self, message=None, apr_err=None, child=None,
-@@ -44,7 +45,9 @@
-     Exception.__init__(self, *args)
- 
-     self.apr_err = apr_err
--    self.message = message
-+    with warnings.catch_warnings():
-+        warnings.simplefilter("ignore", DeprecationWarning)
-+        self.message = message
-     self.child = child
-     self.file = file
-     self.line = line
diff --git a/abs/extra-testing/subversion/svn b/abs/extra-testing/subversion/svn
deleted file mode 100644
index 8988aaf..0000000
--- a/abs/extra-testing/subversion/svn
+++ /dev/null
@@ -1,11 +0,0 @@
-service svn
-{
-	flags			= REUSE
-	socket_type		= stream
-	wait			= no
-	user			= root
-	server			= /usr/bin/svnserve
-	server_args		= -i
-	log_on_failure		+= USERID
-	disable			= yes
-}
diff --git a/abs/extra-testing/subversion/svnmerge.py b/abs/extra-testing/subversion/svnmerge.py
deleted file mode 100644
index da05949..0000000
--- a/abs/extra-testing/subversion/svnmerge.py
+++ /dev/null
@@ -1,2370 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (c) 2005, Giovanni Bajo
-# Copyright (c) 2004-2005, Awarix, Inc.
-# All rights reserved.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-#
-# Author: Archie Cobbs <archie at awarix dot com>
-# Rewritten in Python by: Giovanni Bajo <rasky at develer dot com>
-#
-# Acknowledgments:
-#   John Belmonte <john at neggie dot net> - metadata and usability
-#     improvements
-#   Blair Zajac <blair at orcaware dot com> - random improvements
-#   Raman Gupta <rocketraman at fastmail dot fm> - bidirectional and transitive
-#     merging support
-#   Dustin J. Mitchell <dustin at zmanda dot com> - support for multiple
-#     location identifier formats
-#
-# $HeadURL$
-# $LastChangedDate$
-# $LastChangedBy$
-# $LastChangedRevision$
-#
-# Requisites:
-# svnmerge.py has been tested with all SVN major versions since 1.1 (both
-# client and server). It is unknown if it works with previous versions.
-#
-# Differences from svnmerge.sh:
-# - More portable: tested as working in FreeBSD and OS/2.
-# - Add double-verbose mode, which shows every svn command executed (-v -v).
-# - "svnmerge avail" now only shows commits in source, not also commits in
-#   other parts of the repository.
-# - Add "svnmerge block" to flag some revisions as blocked, so that
-#   they will not show up anymore in the available list.  Added also
-#   the complementary "svnmerge unblock".
-# - "svnmerge avail" has grown two new options:
-#   -B to display a list of the blocked revisions
-#   -A to display both the blocked and the available revisions.
-# - Improved generated commit message to make it machine parsable even when
-#   merging commits which are themselves merges.
-# - Add --force option to skip working copy check
-# - Add --record-only option to "svnmerge merge" to avoid performing
-#   an actual merge, yet record that a merge happened.
-# - Can use a variety of location-identifier formats
-#
-# TODO:
-#  - Add "svnmerge avail -R": show logs in reverse order
-#
-# Information for Hackers:
-#
-# Identifiers for branches:
-#  A branch is identified in three ways within this source:
-#  - as a working copy (variable name usually includes 'dir')
-#  - as a fully qualified URL
-#  - as a path identifier (an opaque string indicating a particular path
-#    in a particular repository; variable name includes 'pathid')
-#  A "target" is generally user-specified, and may be a working copy or
-#  a URL.
-
-import sys, os, getopt, re, types, tempfile, time, locale
-from bisect import bisect
-from xml.dom import pulldom
-
-NAME = "svnmerge"
-if not hasattr(sys, "version_info") or sys.version_info < (2, 0):
-    error("requires Python 2.0 or newer")
-
-# Set up the separator used to separate individual log messages from
-# each revision merged into the target location.  Also, create a
-# regular expression that will find this same separator in already
-# committed log messages, so that the separator used for this run of
-# svnmerge.py will have one more LOG_SEPARATOR appended to the longest
-# separator found in all the commits.
-LOG_SEPARATOR = 8 * '.'
-LOG_SEPARATOR_RE = re.compile('^((%s)+)' % re.escape(LOG_SEPARATOR),
-                              re.MULTILINE)
-
-# Each line of the embedded log messages will be prefixed by LOG_LINE_PREFIX.
-LOG_LINE_PREFIX = 2 * ' '
-
-# Set python to the default locale as per environment settings, same as svn
-# TODO we should really parse config and if log-encoding is specified, set
-# the locale to match that encoding
-locale.setlocale(locale.LC_ALL, '')
-
-# We want the svn output (such as svn info) to be non-localized
-# Using LC_MESSAGES should not affect localized output of svn log, for example
-if os.environ.has_key("LC_ALL"):
-    del os.environ["LC_ALL"]
-os.environ["LC_MESSAGES"] = "C"
-
-###############################################################################
-# Support for older Python versions
-###############################################################################
-
-# True/False constants are Python 2.2+
-try:
-    True, False
-except NameError:
-    True, False = 1, 0
-
-def lstrip(s, ch):
-    """Replacement for str.lstrip (support for arbitrary chars to strip was
-    added in Python 2.2.2)."""
-    i = 0
-    try:
-        while s[i] == ch:
-            i = i+1
-        return s[i:]
-    except IndexError:
-        return ""
-
-def rstrip(s, ch):
-    """Replacement for str.rstrip (support for arbitrary chars to strip was
-    added in Python 2.2.2)."""
-    try:
-        if s[-1] != ch:
-            return s
-        i = -2
-        while s[i] == ch:
-            i = i-1
-        return s[:i+1]
-    except IndexError:
-        return ""
-
-def strip(s, ch):
-    """Replacement for str.strip (support for arbitrary chars to strip was
-    added in Python 2.2.2)."""
-    return lstrip(rstrip(s, ch), ch)
-
-def rsplit(s, sep, maxsplits=0):
-    """Like str.rsplit, which is Python 2.4+ only."""
-    L = s.split(sep)
-    if not 0 < maxsplits <= len(L):
-        return L
-    return [sep.join(L[0:-maxsplits])] + L[-maxsplits:]
-
-###############################################################################
-
-def kwextract(s):
-    """Extract info from a svn keyword string."""
-    try:
-        return strip(s, "$").strip().split(": ")[1]
-    except IndexError:
-        return "<unknown>"
-
-__revision__ = kwextract('$Rev$')
-__date__ = kwextract('$Date$')
-
-# Additional options, not (yet?) mapped to command line flags
-default_opts = {
-    "svn": "svn",
-    "prop": NAME + "-integrated",
-    "block-prop": NAME + "-blocked",
-    "commit-verbose": True,
-    "verbose": 0,
-}
-logs = {}
-
-def console_width():
-    """Get the width of the console screen (if any)."""
-    try:
-        return int(os.environ["COLUMNS"])
-    except (KeyError, ValueError):
-        pass
-
-    try:
-        # Call the Windows API (requires ctypes library)
-        from ctypes import windll, create_string_buffer
-        h = windll.kernel32.GetStdHandle(-11)
-        csbi = create_string_buffer(22)
-        res = windll.kernel32.GetConsoleScreenBufferInfo(h, csbi)
-        if res:
-            import struct
-            (bufx, bufy,
-             curx, cury, wattr,
-             left, top, right, bottom,
-             maxx, maxy) = struct.unpack("hhhhHhhhhhh", csbi.raw)
-            return right - left + 1
-    except ImportError:
-        pass
-
-    # Parse the output of stty -a
-    if os.isatty(1):
-        out = os.popen("stty -a").read()
-        m = re.search(r"columns (\d+);", out)
-        if m:
-            return int(m.group(1))
-
-    # sensible default
-    return 80
-
-def error(s):
-    """Subroutine to output an error and bail."""
-    print >> sys.stderr, "%s: %s" % (NAME, s)
-    sys.exit(1)
-
-def report(s):
-    """Subroutine to output progress message, unless in quiet mode."""
-    if opts["verbose"]:
-        print "%s: %s" % (NAME, s)
-
-def prefix_lines(prefix, lines):
-    """Given a string representing one or more lines of text, insert the
-    specified prefix at the beginning of each line, and return the result.
-    The input must be terminated by a newline."""
-    assert lines[-1] == "\n"
-    return prefix + lines[:-1].replace("\n", "\n"+prefix) + "\n"
-
-def recode_stdout_to_file(s):
-    if locale.getdefaultlocale()[1] is None or not hasattr(sys.stdout, "encoding") \
-            or sys.stdout.encoding is None:
-        return s
-    u = s.decode(sys.stdout.encoding)
-    return u.encode(locale.getdefaultlocale()[1])
-
-class LaunchError(Exception):
-    """Signal a failure in execution of an external command. Parameters are the
-    exit code of the process, the original command line, and the output of the
-    command."""
-
-try:
-    """Launch a sub-process. Return its output (both stdout and stderr),
-    optionally split by lines (if split_lines is True). Raise a LaunchError
-    exception if the exit code of the process is non-zero (failure).
-
-    This function has two implementations, one based on subprocess (preferred),
-    and one based on popen (for compatibility).
-    """
-    import subprocess
-    import shlex
-
-    def launch(cmd, split_lines=True):
-        # Requiring python 2.4 or higher, on some platforms we get
-        # much faster performance from the subprocess module (where python
-        # doesn't try to close an exhorbitant number of file descriptors)
-        stdout = ""
-        stderr = ""
-        try:
-            if os.name == 'nt':
-                p = subprocess.Popen(cmd, stdout=subprocess.PIPE, \
-                                     close_fds=False, stderr=subprocess.PIPE)
-            else:
-                # Use shlex to break up the parameters intelligently,
-                # respecting quotes. shlex can't handle unicode.
-                args = shlex.split(cmd.encode('ascii'))
-                p = subprocess.Popen(args, stdout=subprocess.PIPE, \
-                                     close_fds=False, stderr=subprocess.PIPE)
-            stdoutAndErr = p.communicate()
-            stdout = stdoutAndErr[0]
-            stderr = stdoutAndErr[1]
-        except OSError, inst:
-            # Using 1 as failure code; should get actual number somehow? For
-            # examples see svnmerge_test.py's TestCase_launch.test_failure and
-            # TestCase_launch.test_failurecode.
-            raise LaunchError(1, cmd, stdout + " " + stderr + ": " + str(inst))
-
-        if p.returncode == 0:
-            if split_lines:
-                # Setting keepends=True for compatibility with previous logic
-                # (where file.readlines() preserves newlines)
-                return stdout.splitlines(True)
-            else:
-                return stdout
-        else:
-            raise LaunchError(p.returncode, cmd, stdout + stderr)
-except ImportError:
-    # support versions of python before 2.4 (slower on some systems)
-    def launch(cmd, split_lines=True):
-        if os.name not in ['nt', 'os2']:
-            import popen2
-            p = popen2.Popen4(cmd)
-            p.tochild.close()
-            if split_lines:
-                out = p.fromchild.readlines()
-            else:
-                out = p.fromchild.read()
-            ret = p.wait()
-            if ret == 0:
-                ret = None
-            else:
-                ret >>= 8
-        else:
-            i,k = os.popen4(cmd)
-            i.close()
-            if split_lines:
-                out = k.readlines()
-            else:
-                out = k.read()
-            ret = k.close()
-
-        if ret is None:
-            return out
-        raise LaunchError(ret, cmd, out)
-
-def launchsvn(s, show=False, pretend=False, **kwargs):
-    """Launch SVN and grab its output."""
-    username = password = configdir = ""
-    if opts.get("username", None):
-        username = "--username=" + opts["username"]
-    if opts.get("password", None):
-        password = "--password=" + opts["password"]
-    if opts.get("config-dir", None):
-        configdir = "--config-dir=" + opts["config-dir"]
-    cmd = ' '.join(filter(None, [opts["svn"], "--non-interactive",
-                                 username, password, configdir, s]))
-    if show or opts["verbose"] >= 2:
-        print cmd
-    if pretend:
-        return None
-    return launch(cmd, **kwargs)
-
-def svn_command(s):
-    """Do (or pretend to do) an SVN command."""
-    out = launchsvn(s, show=opts["show-changes"] or opts["dry-run"],
-                    pretend=opts["dry-run"],
-                    split_lines=False)
-    if not opts["dry-run"]:
-        print out
-
-def check_dir_clean(dir):
-    """Check the current status of dir for local mods."""
-    if opts["force"]:
-        report('skipping status check because of --force')
-        return
-    report('checking status of "%s"' % dir)
-
-    # Checking with -q does not show unversioned files or external
-    # directories.  Though it displays a debug message for external
-    # directories, after a blank line.  So, practically, the first line
-    # matters: if it's non-empty there is a modification.
-    out = launchsvn("status -q %s" % dir)
-    if out and out[0].strip():
-        error('"%s" has local modifications; it must be clean' % dir)
-
-class PathIdentifier:
-    """Abstraction for a path identifier, so that we can start talking
-    about it before we know the form that it takes in the properties (its
-    external_form).  Objects are referenced in the class variable 'locobjs',
-    keyed by all known forms."""
-    
-    # a map of UUID (or None) to repository root URL.
-    repo_hints = {}
-
-    # a map from any known string form to the corresponding PathIdentifier
-    locobjs = {}
-
-    def __init__(self, repo_relative_path, uuid=None, url=None, external_form=None):
-        self.repo_relative_path = repo_relative_path
-        self.uuid = uuid
-        self.url = url
-        self.external_form = external_form
-
-    def __repr__(self):
-        return "<PathIdentifier " + ', '.join('%s=%r' % i for i in self.__dict__.items()) + '>'
-
-    def __str__(self):
-        """Return a printable string representation"""
-        if self.external_form:
-            return self.external_form
-        if self.url:
-            return self.format('url')
-        if self.uuid:
-            return self.format('uuid')
-        return self.format('path')
-
-    def from_pathid(pathid_str):
-        """convert pathid_str to a PathIdentifier"""
-        if not PathIdentifier.locobjs.has_key(pathid_str):
-            if is_url(pathid_str):
-                # we can determine every form; PathIdentifier.hint knows how to do that
-                PathIdentifier.hint(pathid_str)
-            elif pathid_str[:7] == 'uuid://':
-                mo = re.match('uuid://([^/]*)(.*)', pathid_str)
-                if not mo:
-                    error("Invalid path identifier '%s'" % pathid_str)
-                uuid, repo_relative_path = mo.groups()
-                pathid = PathIdentifier(repo_relative_path, uuid=uuid)
-                # we can cache this by uuid:// pathid and by repo-relative path
-                PathIdentifier.locobjs[pathid_str] = PathIdentifier.locobjs[repo_relative_path] = pathid
-            elif pathid_str and pathid_str[0] == '/':
-                # strip any trailing slashes
-                pathid_str = pathid_str.rstrip('/')
-                pathid = PathIdentifier(repo_relative_path=pathid_str)
-                # we can only cache this by repo-relative path
-                PathIdentifier.locobjs[pathid_str] = pathid
-            else:
-                error("Invalid path identifier '%s'" % pathid_str)
-        return PathIdentifier.locobjs[pathid_str]
-    from_pathid = staticmethod(from_pathid)
-
-    def from_target(target):
-        """Convert a target (either a working copy path or an URL) into a
-        path identifier."""
-        # prime the cache first if we don't know about this target yet
-        if not PathIdentifier.locobjs.has_key(target):
-            PathIdentifier.hint(target)
-
-        try:
-            return PathIdentifier.locobjs[target]
-        except KeyError:
-            error("Could not recognize path identifier '%s'" % target)
-    from_target = staticmethod(from_target)
-
-    def hint(target):
-        """Cache some information about target, as it may be referenced by
-        repo-relative path in subversion properties; the cache can help to
-        expand such a relative path to a full path identifier."""
-        if PathIdentifier.locobjs.has_key(target): return
-        if not is_url(target) and not is_wc(target): return
-
-        url = target_to_url(target)
-
-        root = get_repo_root(url)
-        assert root[-1] != "/"
-        assert url[:len(root)] == root, "url=%r, root=%r" % (url, root)
-        repo_relative_path = url[len(root):]
-
-        try:
-            uuid = get_svninfo(target)['Repository UUID']
-            uuid_pathid = 'uuid://%s%s' % (uuid, repo_relative_path)
-        except KeyError:
-            uuid = None
-            uuid_pathid = None
-
-        locobj = PathIdentifier.locobjs.get(url) or \
-                 (uuid_pathid and PathIdentifier.locobjs.get(uuid_pathid))
-        if not locobj:
-            locobj = PathIdentifier(repo_relative_path, uuid=uuid, url=url)
-
-        PathIdentifier.repo_hints[uuid] = root # (uuid may be None)
-
-        PathIdentifier.locobjs[target] = locobj
-        PathIdentifier.locobjs[url] = locobj
-        if uuid_pathid:
-            PathIdentifier.locobjs[uuid_pathid] = locobj
-        if not PathIdentifier.locobjs.has_key(repo_relative_path):
-            PathIdentifier.locobjs[repo_relative_path] = locobj
-    hint = staticmethod(hint)
-
-    def format(self, fmt):
-        if fmt == 'path':
-            return self.repo_relative_path
-        elif fmt == 'uuid':
-            return "uuid://%s%s" % (self.uuid, self.repo_relative_path)
-        elif fmt == 'url':
-            return self.url
-        else:
-            error("Unkonwn path type '%s'" % fmt)
-
-    def match_substring(self, str):
-        """Test whether str is a substring of any representation of this
-        PathIdentifier."""
-        if self.repo_relative_path.find(str) >= 0:
-            return True
-
-        if self.uuid:
-            if ("uuid://%s%s" % (self.uuid, self.repo_relative_path)).find(str) >= 0:
-                return True
-
-        if self.url:
-            if (self.url + self.repo_relative_path).find(str) >= 0:
-                return True
-
-        return False
-
-    def get_url(self):
-        """Convert a pathid into a URL.  If this is not possible, error out."""
-        if self.url:
-            return self.url
-        # if we have a uuid and happen to know the URL for it, use that
-        elif self.uuid and PathIdentifier.repo_hints.has_key(self.uuid):
-            self.url = PathIdentifier.repo_hints[self.uuid] + self.repo_relative_path
-            PathIdentifier.locobjs[self.url] = self
-            return self.url
-        # if we've only seen one rep, use that (a guess, but an educated one)
-        elif not self.uuid and len(PathIdentifier.repo_hints) == 1:
-            uuid, root = PathIdentifier.repo_hints.items()[0]
-            if uuid:
-                self.uuid = uuid
-                PathIdentifier.locobjs['uuid://%s%s' % (uuid, self.repo_relative_path)] = self
-            self.url = root + self.repo_relative_path
-            PathIdentifier.locobjs[self.url] = self
-            report("Guessing that '%s' refers to '%s'" % (self, self.url))
-            return self.url
-        else:
-            error("Cannot determine URL for '%s'; " % self +
-                  "Explicit source argument (-S/--source) required.\n")
-
-class RevisionLog:
-    """
-    A log of the revisions which affected a given URL between two
-    revisions.
-    """
-
-    def __init__(self, url, begin, end, find_propchanges=False):
-        """
-        Create a new RevisionLog object, which stores, in self.revs, a list
-        of the revisions which affected the specified URL between begin and
-        end. If find_propchanges is True, self.propchange_revs will contain a
-        list of the revisions which changed properties directly on the
-        specified URL. URL must be the URL for a directory in the repository.
-        """
-        self.url = url
-
-        # Setup the log options (--quiet, so we don't show log messages)
-        log_opts = '--xml --quiet -r%s:%s "%s"' % (begin, end, url)
-        if find_propchanges:
-            # The --verbose flag lets us grab merge tracking information
-            # by looking at propchanges
-            log_opts = "--verbose " + log_opts
-
-        # Read the log to look for revision numbers and merge-tracking info
-        self.revs = []
-        self.propchange_revs = []
-        repos_pathid = PathIdentifier.from_target(url)
-        for chg in SvnLogParser(launchsvn("log %s" % log_opts,
-                                          split_lines=False)):
-            self.revs.append(chg.revision())
-            for p in chg.paths():
-                if p.action() == 'M' and p.pathid() == repos_pathid.repo_relative_path:
-                    self.propchange_revs.append(chg.revision())
-
-        # Save the range of the log
-        self.begin = int(begin)
-        if end == "HEAD":
-            # If end is not provided, we do not know which is the latest
-            # revision in the repository. So we set 'end' to the latest
-            # known revision.
-            self.end = self.revs[-1]
-        else:
-            self.end = int(end)
-
-        self._merges = None
-        self._blocks = None
-
-    def merge_metadata(self):
-        """
-        Return a VersionedProperty object, with a cached view of the merge
-        metadata in the range of this log.
-        """
-
-        # Load merge metadata if necessary
-        if not self._merges:
-            self._merges = VersionedProperty(self.url, opts["prop"])
-            self._merges.load(self)
-
-        return self._merges
-
-    def block_metadata(self):
-        if not self._blocks:
-            self._blocks = VersionedProperty(self.url, opts["block-prop"])
-            self._blocks.load(self)
-
-        return self._blocks
-
-
-class VersionedProperty:
-    """
-    A read-only, cached view of a versioned property.
-
-    self.revs contains a list of the revisions in which the property changes.
-    self.values stores the new values at each corresponding revision. If the
-    value of the property is unknown, it is set to None.
-
-    Initially, we set self.revs to [0] and self.values to [None]. This
-    indicates that, as of revision zero, we know nothing about the value of
-    the property.
-
-    Later, if you run self.load(log), we cache the value of this property over
-    the entire range of the log by noting each revision in which the property
-    was changed. At the end of the range of the log, we invalidate our cache
-    by adding the value "None" to our cache for any revisions which fall out
-    of the range of our log.
-
-    Once self.revs and self.values are filled, we can find the value of the
-    property at any arbitrary revision using a binary search on self.revs.
-    Once we find the last revision during which the property was changed,
-    we can lookup the associated value in self.values. (If the associated
-    value is None, the associated value was not cached and we have to do
-    a full propget.)
-
-    An example: We know that the 'svnmerge' property was added in r10, and
-    changed in r21. We gathered log info up until r40.
-
-    revs = [0, 10, 21, 40]
-    values = [None, "val1", "val2", None]
-
-    What these values say:
-    - From r0 to r9, we know nothing about the property.
-    - In r10, the property was set to "val1". This property stayed the same
-      until r21, when it was changed to "val2".
-    - We don't know what happened after r40.
-    """
-
-    def __init__(self, url, name):
-        """View the history of a versioned property at URL with name"""
-        self.url = url
-        self.name = name
-
-        # We know nothing about the value of the property. Setup revs
-        # and values to indicate as such.
-        self.revs = [0]
-        self.values = [None]
-
-        # We don't have any revisions cached
-        self._initial_value = None
-        self._changed_revs = []
-        self._changed_values = []
-
-    def load(self, log):
-        """
-        Load the history of property changes from the specified
-        RevisionLog object.
-        """
-
-        # Get the property value before the range of the log
-        if log.begin > 1:
-            self.revs.append(log.begin-1)
-            try:
-                self._initial_value = self.raw_get(log.begin-1)
-            except LaunchError:
-                # The specified URL might not exist before the
-                # range of the log. If so, we can safely assume
-                # that the property was empty at that time.
-                self._initial_value = { }
-            self.values.append(self._initial_value)
-        else:
-            self._initial_value = { }
-            self.values[0] = self._initial_value
-
-        # Cache the property values in the log range
-        old_value = self._initial_value
-        for rev in log.propchange_revs:
-            new_value = self.raw_get(rev)
-            if new_value != old_value:
-                self._changed_revs.append(rev)
-                self._changed_values.append(new_value)
-                self.revs.append(rev)
-                self.values.append(new_value)
-                old_value = new_value
-
-        # Indicate that we know nothing about the value of the property
-        # after the range of the log.
-        if log.revs:
-            self.revs.append(log.end+1)
-            self.values.append(None)
-
-    def raw_get(self, rev=None):
-        """
-        Get the property at revision REV. If rev is not specified, get
-        the property at revision HEAD.
-        """
-        return get_revlist_prop(self.url, self.name, rev)
-
-    def get(self, rev=None):
-        """
-        Get the property at revision REV. If rev is not specified, get
-        the property at revision HEAD.
-        """
-
-        if rev is not None:
-
-            # Find the index using a binary search
-            i = bisect(self.revs, rev) - 1
-
-            # Return the value of the property, if it was cached
-            if self.values[i] is not None:
-                return self.values[i]
-
-        # Get the current value of the property
-        return self.raw_get(rev)
-
-    def changed_revs(self, key=None):
-        """
-        Get a list of the revisions in which the specified dictionary
-        key was changed in this property. If key is not specified,
-        return a list of revisions in which any key was changed.
-        """
-        if key is None:
-            return self._changed_revs
-        else:
-            changed_revs = []
-            old_val = self._initial_value
-            for rev, val in zip(self._changed_revs, self._changed_values):
-                if val.get(key) != old_val.get(key):
-                    changed_revs.append(rev)
-                    old_val = val
-            return changed_revs
-
-    def initialized_revs(self):
-        """
-        Get a list of the revisions in which keys were added or
-        removed in this property.
-        """
-        initialized_revs = []
-        old_len = len(self._initial_value)
-        for rev, val in zip(self._changed_revs, self._changed_values):
-            if len(val) != old_len:
-                initialized_revs.append(rev)
-                old_len = len(val)
-        return initialized_revs
-
-class RevisionSet:
-    """
-    A set of revisions, held in dictionary form for easy manipulation. If we
-    were to rewrite this script for Python 2.3+, we would subclass this from
-    set (or UserSet).  As this class does not include branch
-    information, it's assumed that one instance will be used per
-    branch.
-    """
-    def __init__(self, parm):
-        """Constructs a RevisionSet from a string in property form, or from
-        a dictionary whose keys are the revisions. Raises ValueError if the
-        input string is invalid."""
-
-        self._revs = {}
-
-        revision_range_split_re = re.compile('[-:]')
-
-        if isinstance(parm, types.DictType):
-            self._revs = parm.copy()
-        elif isinstance(parm, types.ListType):
-            for R in parm:
-                self._revs[int(R)] = 1
-        else:
-            parm = parm.strip()
-            if parm:
-                for R in parm.split(","):
-                    rev_or_revs = re.split(revision_range_split_re, R)
-                    if len(rev_or_revs) == 1:
-                        self._revs[int(rev_or_revs[0])] = 1
-                    elif len(rev_or_revs) == 2:
-                        for rev in range(int(rev_or_revs[0]),
-                                         int(rev_or_revs[1])+1):
-                            self._revs[rev] = 1
-                    else:
-                        raise ValueError, 'Ill formatted revision range: ' + R
-
-    def sorted(self):
-        revnums = self._revs.keys()
-        revnums.sort()
-        return revnums
-
-    def normalized(self):
-        """Returns a normalized version of the revision set, which is an
-        ordered list of couples (start,end), with the minimum number of
-        intervals."""
-        revnums = self.sorted()
-        revnums.reverse()
-        ret = []
-        while revnums:
-            s = e = revnums.pop()
-            while revnums and revnums[-1] in (e, e+1):
-                e = revnums.pop()
-            ret.append((s, e))
-        return ret
-
-    def __str__(self):
-        """Convert the revision set to a string, using its normalized form."""
-        L = []
-        for s,e in self.normalized():
-            if s == e:
-                L.append(str(s))
-            else:
-                L.append(str(s) + "-" + str(e))
-        return ",".join(L)
-
-    def __contains__(self, rev):
-        return self._revs.has_key(rev)
-
-    def __sub__(self, rs):
-        """Compute subtraction as in sets."""
-        revs = {}
-        for r in self._revs.keys():
-            if r not in rs:
-                revs[r] = 1
-        return RevisionSet(revs)
-
-    def __and__(self, rs):
-        """Compute intersections as in sets."""
-        revs = {}
-        for r in self._revs.keys():
-            if r in rs:
-                revs[r] = 1
-        return RevisionSet(revs)
-
-    def __nonzero__(self):
-        return len(self._revs) != 0
-
-    def __len__(self):
-        """Return the number of revisions in the set."""
-        return len(self._revs)
-
-    def __iter__(self):
-        return iter(self.sorted())
-
-    def __or__(self, rs):
-        """Compute set union."""
-        revs = self._revs.copy()
-        revs.update(rs._revs)
-        return RevisionSet(revs)
-
-def merge_props_to_revision_set(merge_props, pathid):
-    """A converter which returns a RevisionSet instance containing the
-    revisions from PATH as known to BRANCH_PROPS.  BRANCH_PROPS is a
-    dictionary of pathid -> revision set branch integration information
-    (as returned by get_merge_props())."""
-    if not merge_props.has_key(pathid):
-        error('no integration info available for path "%s"' % pathid)
-    return RevisionSet(merge_props[pathid])
-
-def dict_from_revlist_prop(propvalue):
-    """Given a property value as a string containing per-source revision
-    lists, return a dictionary whose key is a source path identifier
-    and whose value is the revisions for that source."""
-    prop = {}
-
-    # Multiple sources are separated by any whitespace.
-    for L in propvalue.split():
-        # We use rsplit to play safe and allow colons in pathids.
-        pathid_str, revs = rsplit(L.strip(), ":", 1)
-
-        pathid = PathIdentifier.from_pathid(pathid_str)
-
-        # cache the "external" form we saw
-        pathid.external_form = pathid_str
-
-        prop[pathid] = revs
-    return prop
-
-def get_revlist_prop(url_or_dir, propname, rev=None):
-    """Given a repository URL or working copy path and a property
-    name, extract the values of the property which store per-source
-    revision lists and return a dictionary whose key is a source path
-    identifier, and whose value is the revisions for that source."""
-
-    # Note that propget does not return an error if the property does
-    # not exist, it simply does not output anything. So we do not need
-    # to check for LaunchError here.
-    args = '--strict "%s" "%s"' % (propname, url_or_dir)
-    if rev:
-        args = '-r %s %s' % (rev, args)
-    out = launchsvn('propget %s' % args, split_lines=False)
-
-    return dict_from_revlist_prop(out)
-
-def get_merge_props(dir):
-    """Extract the merged revisions."""
-    return get_revlist_prop(dir, opts["prop"])
-
-def get_block_props(dir):
-    """Extract the blocked revisions."""
-    return get_revlist_prop(dir, opts["block-prop"])
-
-def get_blocked_revs(dir, source_pathid):
-    p = get_block_props(dir)
-    if p.has_key(source_pathid):
-        return RevisionSet(p[source_pathid])
-    return RevisionSet("")
-
-def format_merge_props(props, sep=" "):
-    """Formats the hash PROPS as a string suitable for use as a
-    Subversion property value."""
-    assert sep in ["\t", "\n", " "]   # must be a whitespace
-    props = props.items()
-    props.sort()
-    L = []
-    for h, r in props:
-        L.append("%s:%s" % (h, r))
-    return sep.join(L)
-
-def _run_propset(dir, prop, value):
-    """Set the property 'prop' of directory 'dir' to value 'value'. We go
-    through a temporary file to not run into command line length limits."""
-    try:
-        fd, fname = tempfile.mkstemp()
-        f = os.fdopen(fd, "wb")
-    except AttributeError:
-        # Fallback for Python <= 2.3 which does not have mkstemp (mktemp
-        # suffers from race conditions. Not that we care...)
-        fname = tempfile.mktemp()
-        f = open(fname, "wb")
-
-    try:
-        f.write(value)
-        f.close()
-        report("property data written to temp file: %s" % value)
-        svn_command('propset "%s" -F "%s" "%s"' % (prop, fname, dir))
-    finally:
-        os.remove(fname)
-
-def set_props(dir, name, props):
-    props = format_merge_props(props)
-    if props:
-        _run_propset(dir, name, props)
-    else:
-        # Check if NAME exists on DIR before trying to delete it.
-        # As of 1.6 propdel no longer supports deleting a
-        # non-existent property.
-        out = launchsvn('propget "%s" "%s"' % (name, dir))
-        if out:
-            svn_command('propdel "%s" "%s"' % (name, dir))
-
-def set_merge_props(dir, props):
-    set_props(dir, opts["prop"], props)
-
-def set_block_props(dir, props):
-    set_props(dir, opts["block-prop"], props)
-
-def set_blocked_revs(dir, source_pathid, revs):
-    props = get_block_props(dir)
-    if revs:
-        props[source_pathid] = str(revs)
-    elif props.has_key(source_pathid):
-        del props[source_pathid]
-    set_block_props(dir, props)
-
-def is_url(url):
-    """Check if url looks like a valid url."""
-    return re.search(r"^[a-zA-Z][-+\.\w]*://[^\s]+$", url) is not None and url[:4] != 'uuid'
-
-def check_url(url):
-    """Similar to is_url, but actually invoke get_svninfo to find out"""
-    return get_svninfo(url) != {}
-
-def is_pathid(pathid):
-    return isinstance(pathid, PathIdentifier)
-
-def is_wc(dir):
-    """Check if a directory is a working copy."""
-    return os.path.isdir(os.path.join(dir, ".svn")) or \
-           os.path.isdir(os.path.join(dir, "_svn"))
-
-_cache_svninfo = {}
-def get_svninfo(target):
-    """Extract the subversion information for a target (through 'svn info').
-    This function uses an internal cache to let clients query information
-    many times."""
-    if _cache_svninfo.has_key(target):
-        return _cache_svninfo[target]
-    info = {}
-    for L in launchsvn('info "%s"' % target):
-        L = L.strip()
-        if not L:
-            continue
-        key, value = L.split(": ", 1)
-        info[key] = value.strip()
-    _cache_svninfo[target] = info
-    return info
-
-def target_to_url(target):
-    """Convert working copy path or repos URL to a repos URL."""
-    if is_wc(target):
-        info = get_svninfo(target)
-        return info["URL"]
-    return target
-
-_cache_reporoot = {}
-def get_repo_root(target):
-    """Compute the root repos URL given a working-copy path, or a URL."""
-    # Try using "svn info WCDIR". This works only on SVN clients >= 1.3
-    if not is_url(target):
-        try:
-            info = get_svninfo(target)
-            root = info["Repository Root"]
-            _cache_reporoot[root] = None
-            return root
-        except KeyError:
-            pass
-        url = target_to_url(target)
-        assert url[-1] != '/'
-    else:
-        url = target
-
-    # Go through the cache of the repository roots. This avoids extra
-    # server round-trips if we are asking the root of different URLs
-    # in the same repository (the cache in get_svninfo() cannot detect
-    # that of course and would issue a remote command).
-    assert is_url(url)
-    for r in _cache_reporoot:
-        if url.startswith(r):
-            return r
-
-    # Try using "svn info URL". This works only on SVN clients >= 1.2
-    try:
-        info = get_svninfo(url)
-        # info may be {}, in which case we'll see KeyError here
-        root = info["Repository Root"]
-        _cache_reporoot[root] = None
-        return root
-    except (KeyError, LaunchError):
-        pass
-
-    # Constrained to older svn clients, we are stuck with this ugly
-    # trial-and-error implementation. It could be made faster with a
-    # binary search.
-    while url:
-        temp = os.path.dirname(url)
-        try:
-            launchsvn('proplist "%s"' % temp)
-        except LaunchError:
-            _cache_reporoot[url] = None
-            return rstrip(url, "/")
-        url = temp
-
-    error("svn repos root of %s not found" % target)
-
-class SvnLogParser:
-    """
-    Parse the "svn log", going through the XML output and using pulldom (which
-    would even allow streaming the command output).
-    """
-    def __init__(self, xml):
-        self._events = pulldom.parseString(xml)
-    def __getitem__(self, idx):
-        for event, node in self._events:
-            if event == pulldom.START_ELEMENT and node.tagName == "logentry":
-                self._events.expandNode(node)
-                return self.SvnLogRevision(node)
-        raise IndexError, "Could not find 'logentry' tag in xml"
-
-    class SvnLogRevision:
-        def __init__(self, xmlnode):
-            self.n = xmlnode
-        def revision(self):
-            return int(self.n.getAttribute("revision"))
-        def author(self):
-            return self.n.getElementsByTagName("author")[0].firstChild.data
-        def paths(self):
-            return [self.SvnLogPath(n)
-                    for n in  self.n.getElementsByTagName("path")]
-
-        class SvnLogPath:
-            def __init__(self, xmlnode):
-                self.n = xmlnode
-            def action(self):
-                return self.n.getAttribute("action")
-            def pathid(self):
-                return self.n.firstChild.data
-            def copyfrom_rev(self):
-                try: return self.n.getAttribute("copyfrom-rev")
-                except KeyError: return None
-            def copyfrom_pathid(self):
-                try: return self.n.getAttribute("copyfrom-path")
-                except KeyError: return None
-
-def get_copyfrom(target):
-    """Get copyfrom info for a given target (it represents the
-    repository-relative path from where it was branched). NOTE:
-    repos root has no copyfrom info. In this case None is returned.
-
-    Returns the:
-        - source file or directory from which the copy was made
-        - revision from which that source was copied
-        - revision in which the copy was committed
-    """
-    repos_path = PathIdentifier.from_target(target).repo_relative_path
-    for chg in SvnLogParser(launchsvn('log -v --xml --stop-on-copy "%s"'
-                                      % target, split_lines=False)):
-        for p in chg.paths():
-            if p.action() == 'A' and p.pathid() == repos_path:
-                # These values will be None if the corresponding elements are
-                # not found in the log.
-                return p.copyfrom_pathid(), p.copyfrom_rev(), chg.revision()
-    return None,None,None
-
-def get_latest_rev(url):
-    """Get the latest revision of the repository of which URL is part."""
-    try:
-        info = get_svninfo(url)
-        if not info.has_key("Revision"):
-            error("Not a valid URL: %s" % url)
-        return info["Revision"]
-    except LaunchError:
-        # Alternative method for latest revision checking (for svn < 1.2)
-        report('checking latest revision of "%s"' % url)
-        L = launchsvn('proplist --revprop -r HEAD "%s"' % opts["source-url"])[0]
-        rev = re.search("revision (\d+)", L).group(1)
-        report('latest revision of "%s" is %s' % (url, rev))
-        return rev
-
-def get_created_rev(url):
-    """Lookup the revision at which the path identified by the
-    provided URL was first created."""
-    oldest_rev = -1
-    report('determining oldest revision for URL "%s"' % url)
-    ### TODO: Refactor this to use a modified RevisionLog class.
-    lines = None
-    cmd = "log -r1:HEAD --stop-on-copy -q " + url
-    try:
-        lines = launchsvn(cmd + " --limit=1")
-    except LaunchError:
-        # Assume that --limit isn't supported by the installed 'svn'.
-        lines = launchsvn(cmd)
-    if lines and len(lines) > 1:
-        i = lines[1].find(" ")
-        if i != -1:
-            oldest_rev = int(lines[1][1:i])
-    if oldest_rev == -1:
-        error('unable to determine oldest revision for URL "%s"' % url)
-    return oldest_rev
-
-def get_commit_log(url, revnum):
-    """Return the log message for a specific integer revision
-    number."""
-    out = launchsvn("log --incremental -r%d %s" % (revnum, url))
-    return recode_stdout_to_file("".join(out[1:]))
-
-def construct_merged_log_message(url, revnums):
-    """Return a commit log message containing all the commit messages
-    in the specified revisions at the given URL.  The separator used
-    in this log message is determined by searching for the longest
-    svnmerge separator existing in the commit log messages and
-    extending it by one more separator.  This results in a new commit
-    log message that is clearer in describing merges that contain
-    other merges. Trailing newlines are removed from the embedded
-    log messages."""
-    messages = ['']
-    longest_sep = ''
-    for r in revnums.sorted():
-        message = get_commit_log(url, r)
-        if message:
-            message = re.sub(r'(\r\n|\r|\n)', "\n", message)
-            message = rstrip(message, "\n") + "\n"
-            messages.append(prefix_lines(LOG_LINE_PREFIX, message))
-            for match in LOG_SEPARATOR_RE.findall(message):
-                sep = match[1]
-                if len(sep) > len(longest_sep):
-                    longest_sep = sep
-
-    longest_sep += LOG_SEPARATOR + "\n"
-    messages.append('')
-    return longest_sep.join(messages)
-
-def get_default_source(branch_target, branch_props):
-    """Return the default source for branch_target (given its branch_props).
-    Error out if there is ambiguity."""
-    if not branch_props:
-        error("no integration info available")
-
-    props = branch_props.copy()
-    pathid = PathIdentifier.from_target(branch_target)
-
-    # To make bidirectional merges easier, find the target's
-    # repository local path so it can be removed from the list of
-    # possible integration sources.
-    if props.has_key(pathid):
-        del props[pathid]
-
-    if len(props) > 1:
-        err_msg = "multiple sources found. "
-        err_msg += "Explicit source argument (-S/--source) required.\n"
-        err_msg += "The merge sources available are:"
-        for prop in props:
-          err_msg += "\n  " + str(prop)
-        error(err_msg)
-
-    return props.keys()[0]
-
-def should_find_reflected(branch_dir):
-    should_find_reflected = opts["bidirectional"]
-
-    # If the source has integration info for the target, set find_reflected
-    # even if --bidirectional wasn't specified
-    if not should_find_reflected:
-        source_props = get_merge_props(opts["source-url"])
-        should_find_reflected = source_props.has_key(PathIdentifier.from_target(branch_dir))
-
-    return should_find_reflected
-
-def analyze_revs(target_pathid, url, begin=1, end=None,
-                 find_reflected=False):
-    """For the source of the merges in the source URL being merged into
-    target_pathid, analyze the revisions in the interval begin-end (which
-    defaults to 1-HEAD), to find out which revisions are changes in
-    the url, which are changes elsewhere (so-called 'phantom'
-    revisions), optionally which are reflected changes (to avoid
-    conflicts that can occur when doing bidirectional merging between
-    branches), and which revisions initialize merge tracking against other
-    branches.  Return a tuple of four RevisionSet's:
-        (real_revs, phantom_revs, reflected_revs, initialized_revs).
-
-    NOTE: To maximize speed, if "end" is not provided, the function is
-    not able to find phantom revisions following the last real
-    revision in the URL.
-    """
-
-    begin = str(begin)
-    if end is None:
-        end = "HEAD"
-    else:
-        end = str(end)
-        if long(begin) > long(end):
-            return RevisionSet(""), RevisionSet(""), \
-                   RevisionSet(""), RevisionSet("")
-
-    logs[url] = RevisionLog(url, begin, end, find_reflected)
-    revs = RevisionSet(logs[url].revs)
-
-    if end == "HEAD":
-        # If end is not provided, we do not know which is the latest revision
-        # in the repository. So return the phantom revision set only up to
-        # the latest known revision.
-        end = str(list(revs)[-1])
-
-    phantom_revs = RevisionSet("%s-%s" % (begin, end)) - revs
-
-    if find_reflected:
-        reflected_revs = logs[url].merge_metadata().changed_revs(target_pathid)
-        reflected_revs += logs[url].block_metadata().changed_revs(target_pathid)
-    else:
-        reflected_revs = []
-
-    initialized_revs = RevisionSet(logs[url].merge_metadata().initialized_revs())
-    reflected_revs = RevisionSet(reflected_revs)
-
-    return revs, phantom_revs, reflected_revs, initialized_revs
-
-def analyze_source_revs(branch_target, source_url, **kwargs):
-    """For the given branch and source, extract the real and phantom
-    source revisions."""
-    branch_url = target_to_url(branch_target)
-    branch_pathid = PathIdentifier.from_target(branch_target)
-
-    # Extract the latest repository revision from the URL of the branch
-    # directory (which is already cached at this point).
-    end_rev = get_latest_rev(source_url)
-
-    # Calculate the base of analysis. If there is a "1-XX" interval in the
-    # merged_revs, we do not need to check those.
-    base = 1
-    r = opts["merged-revs"].normalized()
-    if r and r[0][0] == 1:
-        base = r[0][1] + 1
-
-    # See if the user filtered the revision set. If so, we are not
-    # interested in something outside that range.
-    if opts["revision"]:
-        revs = RevisionSet(opts["revision"]).sorted()
-        if base < revs[0]:
-            base = revs[0]
-        if end_rev > revs[-1]:
-            end_rev = revs[-1]
-
-    return analyze_revs(branch_pathid, source_url, base, end_rev, **kwargs)
-
-def minimal_merge_intervals(revs, phantom_revs):
-    """Produce the smallest number of intervals suitable for merging. revs
-    is the RevisionSet which we want to merge, and phantom_revs are phantom
-    revisions which can be used to concatenate intervals, thus minimizing the
-    number of operations."""
-    revnums = revs.normalized()
-    ret = []
-
-    cur = revnums.pop()
-    while revnums:
-        next = revnums.pop()
-        assert next[1] < cur[0]      # otherwise it is not ordered
-        assert cur[0] - next[1] > 1  # otherwise it is not normalized
-        for i in range(next[1]+1, cur[0]):
-            if i not in phantom_revs:
-                ret.append(cur)
-                cur = next
-                break
-        else:
-            cur = (next[0], cur[1])
-
-    ret.append(cur)
-    ret.reverse()
-    return ret
-
-def display_revisions(revs, display_style, revisions_msg, source_url):
-    """Show REVS as dictated by DISPLAY_STYLE, either numerically, in
-    log format, or as diffs.  When displaying revisions numerically,
-    prefix output with REVISIONS_MSG when in verbose mode.  Otherwise,
-    request logs or diffs using SOURCE_URL."""
-    if display_style == "revisions":
-        if revs:
-            report(revisions_msg)
-            print revs
-    elif display_style == "logs":
-        for start,end in revs.normalized():
-            svn_command('log --incremental -v -r %d:%d %s' % \
-                        (start, end, source_url))
-    elif display_style in ("diffs", "summarize"):
-        if display_style == 'summarize':
-            summarize = '--summarize '
-        else:
-            summarize = ''
-
-        for start, end in revs.normalized():
-            print
-            if start == end:
-                print "%s: changes in revision %d follow" % (NAME, start)
-            else:
-                print "%s: changes in revisions %d-%d follow" % (NAME,
-                                                                 start, end)
-            print
-
-            # Note: the starting revision number to 'svn diff' is
-            # NOT inclusive so we have to subtract one from ${START}.
-            svn_command("diff -r %d:%d %s %s" % (start - 1, end, summarize,
-                                                 source_url))
-    else:
-        assert False, "unhandled display style: %s" % display_style
-
-def action_init(target_dir, target_props):
-    """Initialize for merges."""
-    # Check that directory is ready for being modified
-    check_dir_clean(target_dir)
-
-    target_pathid = PathIdentifier.from_target(target_dir)
-    source_pathid = opts['source-pathid']
-    if source_pathid == target_pathid:
-        error("cannot init integration source path '%s'\nIts path identifier does not "
-              "differ from the path identifier of the current directory, '%s'."
-              % (source_pathid, target_pathid))
-
-    source_url = opts['source-url']
-
-    # If the user hasn't specified the revisions to use, see if the
-    # "source" is a copy from the current tree and if so, we can use
-    # the version data obtained from it.
-    revision_range = opts["revision"]
-    if not revision_range:
-        # If source was originally copied from target, and we are merging
-        # changes from source to target (the copy target is the merge source,
-        # and the copy source is the merge target), then we want to mark as
-        # integrated up to the rev in which the copy was committed which
-        # created the merge source:
-        cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(source_url)
-
-        cf_pathid = None
-        if cf_source:
-            cf_url = get_repo_root(source_url) + cf_source
-            if is_url(cf_url) and check_url(cf_url):
-                cf_pathid = PathIdentifier.from_target(cf_url)
-
-        if target_pathid == cf_pathid:
-            report('the source "%s" was copied from "%s" in rev %s and committed in rev %s' %
-                   (source_url, target_dir, cf_rev, copy_committed_in_rev))
-            revision_range = "1-" + str(copy_committed_in_rev)
-
-    if not revision_range:
-        # If the reverse is true: copy source is the merge source, and
-        # the copy target is the merge target, then we want to mark as
-        # integrated up to the specific rev of the merge target from
-        # which the merge source was copied.  (Longer discussion at:
-        # http://subversion.tigris.org/issues/show_bug.cgi?id=2810  )
-        cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(target_dir)
-
-        cf_pathid = None
-        if cf_source:
-            cf_url = get_repo_root(target_dir) + cf_source
-            if is_url(cf_url) and check_url(cf_url):
-                cf_pathid = PathIdentifier.from_target(cf_url)
-
-        source_pathid = PathIdentifier.from_target(source_url)
-        if source_pathid == cf_pathid:
-            report('the target "%s" was copied the source "%s" in rev %s and committed in rev %s' %
-                   (target_dir, source_url, cf_rev, copy_committed_in_rev))
-            revision_range = "1-" + cf_rev
-
-    # When neither the merge source nor target is a copy of the other, and
-    # the user did not specify a revision range, then choose a default which is
-    # the current revision; saying, in effect, "everything has been merged, so
-    # mark as integrated up to the latest rev on source url).
-    if not revision_range:
-        revision_range = "1-" + get_latest_rev(source_url)
-
-    revs = RevisionSet(revision_range)
-
-    report('marking "%s" as already containing revisions "%s" of "%s"' %
-           (target_dir, revs, source_url))
-
-    revs = str(revs)
-    # If the local svnmerge-integrated property already has an entry
-    # for the source-pathid, simply error out.
-    if not opts["force"] and target_props.has_key(source_pathid):
-        error('Repository-relative path %s has already been initialized at %s\n'
-              'Use --force to re-initialize' % (source_pathid, target_dir))
-    # set the pathid's external_form based on the user's options
-    source_pathid.external_form = source_pathid.format(opts['location-type'])
-
-    revs = str(revs)
-    target_props[source_pathid] = revs
-
-    # Set property
-    set_merge_props(target_dir, target_props)
-
-    # Write out commit message if desired
-    if opts["commit-file"]:
-        f = open(opts["commit-file"], "w")
-        print >>f, 'Initialized merge tracking via "%s" with revisions "%s" from ' \
-            % (NAME, revs)
-        print >>f, '%s' % source_url
-        f.close()
-        report('wrote commit message to "%s"' % opts["commit-file"])
-
-def action_avail(branch_dir, branch_props):
-    """Show commits available for merges."""
-    source_revs, phantom_revs, reflected_revs, initialized_revs = \
-               analyze_source_revs(branch_dir, opts["source-url"],
-                                   find_reflected=
-                                       should_find_reflected(branch_dir))
-    report('skipping phantom revisions: %s' % phantom_revs)
-    if reflected_revs:
-        report('skipping reflected revisions: %s' % reflected_revs)
-        report('skipping initialized revisions: %s' % initialized_revs)
-
-    blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"])
-    avail_revs = source_revs - opts["merged-revs"] - blocked_revs - \
-                 reflected_revs - initialized_revs
-
-    # Compose the set of revisions to show
-    revs = RevisionSet("")
-    report_msg = "revisions available to be merged are:"
-    if "avail" in opts["avail-showwhat"]:
-        revs |= avail_revs
-    if "blocked" in opts["avail-showwhat"]:
-        revs |= blocked_revs
-        report_msg = "revisions blocked are:"
-
-    # Limit to revisions specified by -r (if any)
-    if opts["revision"]:
-        revs = revs & RevisionSet(opts["revision"])
-
-    display_revisions(revs, opts["avail-display"],
-                      report_msg,
-                      opts["source-url"])
-
-def action_integrated(branch_dir, branch_props):
-    """Show change sets already merged.  This set of revisions is
-    calculated from taking svnmerge-integrated property from the
-    branch, and subtracting any revision older than the branch
-    creation revision."""
-    # Extract the integration info for the branch_dir
-    branch_props = get_merge_props(branch_dir)
-    revs = merge_props_to_revision_set(branch_props, opts["source-pathid"])
-
-    # Lookup the oldest revision on the branch path.
-    oldest_src_rev = get_created_rev(opts["source-url"])
-
-    # Subtract any revisions which pre-date the branch.
-    report("subtracting revisions which pre-date the source URL (%d)" %
-           oldest_src_rev)
-    revs = revs - RevisionSet(range(1, oldest_src_rev))
-
-    # Limit to revisions specified by -r (if any)
-    if opts["revision"]:
-        revs = revs & RevisionSet(opts["revision"])
-
-    display_revisions(revs, opts["integrated-display"],
-                      "revisions already integrated are:", opts["source-url"])
-
-def action_merge(branch_dir, branch_props):
-    """Record merge meta data, and do the actual merge (if not
-    requested otherwise via --record-only)."""
-    # Check branch directory is ready for being modified
-    check_dir_clean(branch_dir)
-
-    source_revs, phantom_revs, reflected_revs, initialized_revs = \
-               analyze_source_revs(branch_dir, opts["source-url"],
-                                   find_reflected=
-                                       should_find_reflected(branch_dir))
-
-    if opts["revision"]:
-        revs = RevisionSet(opts["revision"])
-    else:
-        revs = source_revs
-
-    blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"])
-    merged_revs = opts["merged-revs"]
-
-    # Show what we're doing
-    if opts["verbose"]:  # just to avoid useless calculations
-        if merged_revs & revs:
-            report('"%s" already contains revisions %s' % (branch_dir,
-                                                           merged_revs & revs))
-        if phantom_revs:
-            report('memorizing phantom revision(s): %s' % phantom_revs)
-        if reflected_revs:
-            report('memorizing reflected revision(s): %s' % reflected_revs)
-        if blocked_revs & revs:
-            report('skipping blocked revisions(s): %s' % (blocked_revs & revs))
-        if initialized_revs:
-            report('skipping initialized revision(s): %s' % initialized_revs)
-
-    # Compute final merge set.
-    revs = revs - merged_revs - blocked_revs - reflected_revs - \
-           phantom_revs - initialized_revs
-    if not revs:
-        report('no revisions to merge, exiting')
-        return
-
-    # When manually marking revisions as merged, we only update the
-    # integration meta data, and don't perform an actual merge.
-    record_only = opts["record-only"]
-
-    if record_only:
-        report('recording merge of revision(s) %s from "%s"' %
-               (revs, opts["source-url"]))
-    else:
-        report('merging in revision(s) %s from "%s"' %
-               (revs, opts["source-url"]))
-
-    # Do the merge(s). Note: the starting revision number to 'svn merge'
-    # is NOT inclusive so we have to subtract one from start.
-    # We try to keep the number of merge operations as low as possible,
-    # because it is faster and reduces the number of conflicts.
-    old_block_props = get_block_props(branch_dir)
-    merge_metadata = logs[opts["source-url"]].merge_metadata()
-    block_metadata = logs[opts["source-url"]].block_metadata()
-    for start,end in minimal_merge_intervals(revs, phantom_revs):
-        if not record_only:
-            # Preset merge/blocked properties to the source value at
-            # the start rev to avoid spurious property conflicts
-            set_merge_props(branch_dir, merge_metadata.get(start - 1))
-            set_block_props(branch_dir, block_metadata.get(start - 1))
-            # Do the merge
-            svn_command("merge --force -r %d:%d %s %s" % \
-                        (start - 1, end, opts["source-url"], branch_dir))
-            # TODO: to support graph merging, add logic to merge the property
-            # meta-data manually
-
-    # Update the set of merged revisions.
-    merged_revs = merged_revs | revs | reflected_revs | phantom_revs | initialized_revs
-    branch_props[opts["source-pathid"]] = str(merged_revs)
-    set_merge_props(branch_dir, branch_props)
-    # Reset the blocked revs
-    set_block_props(branch_dir, old_block_props)
-
-    # Write out commit message if desired
-    if opts["commit-file"]:
-        f = open(opts["commit-file"], "w")
-        if record_only:
-            print >>f, 'Recorded merge of revisions %s via %s from ' % \
-                  (revs, NAME)
-        else:
-            print >>f, 'Merged revisions %s via %s from ' % \
-                  (revs, NAME)
-        print >>f, '%s' % opts["source-url"]
-        if opts["commit-verbose"]:
-            print >>f
-            print >>f, construct_merged_log_message(opts["source-url"], revs),
-
-        f.close()
-        report('wrote commit message to "%s"' % opts["commit-file"])
-
-def action_block(branch_dir, branch_props):
-    """Block revisions."""
-    # Check branch directory is ready for being modified
-    check_dir_clean(branch_dir)
-
-    source_revs, phantom_revs, reflected_revs, initialized_revs = \
-               analyze_source_revs(branch_dir, opts["source-url"])
-    revs_to_block = source_revs - opts["merged-revs"]
-
-    # Limit to revisions specified by -r (if any)
-    if opts["revision"]:
-        revs_to_block = RevisionSet(opts["revision"]) & revs_to_block
-
-    if not revs_to_block:
-        error('no available revisions to block')
-
-    # Change blocked information
-    blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"])
-    blocked_revs = blocked_revs | revs_to_block
-    set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs)
-
-    # Write out commit message if desired
-    if opts["commit-file"]:
-        f = open(opts["commit-file"], "w")
-        print >>f, 'Blocked revisions %s via %s' % (revs_to_block, NAME)
-        if opts["commit-verbose"]:
-            print >>f
-            print >>f, construct_merged_log_message(opts["source-url"],
-                                                    revs_to_block),
-
-        f.close()
-        report('wrote commit message to "%s"' % opts["commit-file"])
-
-def action_unblock(branch_dir, branch_props):
-    """Unblock revisions."""
-    # Check branch directory is ready for being modified
-    check_dir_clean(branch_dir)
-
-    blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"])
-    revs_to_unblock = blocked_revs
-
-    # Limit to revisions specified by -r (if any)
-    if opts["revision"]:
-        revs_to_unblock = revs_to_unblock & RevisionSet(opts["revision"])
-
-    if not revs_to_unblock:
-        error('no available revisions to unblock')
-
-    # Change blocked information
-    blocked_revs = blocked_revs - revs_to_unblock
-    set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs)
-
-    # Write out commit message if desired
-    if opts["commit-file"]:
-        f = open(opts["commit-file"], "w")
-        print >>f, 'Unblocked revisions %s via %s' % (revs_to_unblock, NAME)
-        if opts["commit-verbose"]:
-            print >>f
-            print >>f, construct_merged_log_message(opts["source-url"],
-                                                    revs_to_unblock),
-        f.close()
-        report('wrote commit message to "%s"' % opts["commit-file"])
-
-def action_rollback(branch_dir, branch_props):
-    """Rollback previously integrated revisions."""
-
-    # Make sure the revision arguments are present
-    if not opts["revision"]:
-        error("The '-r' option is mandatory for rollback")
-
-    # Check branch directory is ready for being modified
-    check_dir_clean(branch_dir)
-
-    # Extract the integration info for the branch_dir
-    branch_props = get_merge_props(branch_dir)
-    # Get the list of all revisions already merged into this source-pathid.
-    merged_revs = merge_props_to_revision_set(branch_props,
-                                              opts["source-pathid"])
-
-    # At which revision was the src created?
-    oldest_src_rev = get_created_rev(opts["source-url"])
-    src_pre_exist_range = RevisionSet("1-%d" % oldest_src_rev)
-
-    # Limit to revisions specified by -r (if any)
-    revs = merged_revs & RevisionSet(opts["revision"])
-
-    # make sure there's some revision to rollback
-    if not revs:
-        report("Nothing to rollback in revision range r%s" % opts["revision"])
-        return
-
-    # If even one specified revision lies outside the lifetime of the
-    # merge source, error out.
-    if revs & src_pre_exist_range:
-        err_str  = "Specified revision range falls out of the rollback range.\n"
-        err_str += "%s was created at r%d" % (opts["source-pathid"],
-                                              oldest_src_rev)
-        error(err_str)
-
-    record_only = opts["record-only"]
-
-    if record_only:
-        report('recording rollback of revision(s) %s from "%s"' %
-               (revs, opts["source-url"]))
-    else:
-        report('rollback of revision(s) %s from "%s"' %
-               (revs, opts["source-url"]))
-
-    # Do the reverse merge(s). Note: the starting revision number
-    # to 'svn merge' is NOT inclusive so we have to subtract one from start.
-    # We try to keep the number of merge operations as low as possible,
-    # because it is faster and reduces the number of conflicts.
-    rollback_intervals = minimal_merge_intervals(revs, [])
-    # rollback in the reverse order of merge
-    rollback_intervals.reverse()
-    for start, end in rollback_intervals:
-        if not record_only:
-            # Do the merge
-            svn_command("merge --force -r %d:%d %s %s" % \
-                        (end, start - 1, opts["source-url"], branch_dir))
-
-    # Write out commit message if desired
-    # calculate the phantom revs first
-    if opts["commit-file"]:
-        f = open(opts["commit-file"], "w")
-        if record_only:
-            print >>f, 'Recorded rollback of revisions %s via %s from ' % \
-                  (revs , NAME)
-        else:
-            print >>f, 'Rolled back revisions %s via %s from ' % \
-                  (revs , NAME)
-        print >>f, '%s' % opts["source-url"]
-
-        f.close()
-        report('wrote commit message to "%s"' % opts["commit-file"])
-
-    # Update the set of merged revisions.
-    merged_revs = merged_revs - revs
-    branch_props[opts["source-pathid"]] = str(merged_revs)
-    set_merge_props(branch_dir, branch_props)
-
-def action_uninit(branch_dir, branch_props):
-    """Uninit SOURCE URL."""
-    # Check branch directory is ready for being modified
-    check_dir_clean(branch_dir)
-
-    # If the source-pathid does not have an entry in the svnmerge-integrated
-    # property, simply error out.
-    if not branch_props.has_key(opts["source-pathid"]):
-        error('Repository-relative path "%s" does not contain merge '
-              'tracking information for "%s"' \
-                % (opts["source-pathid"], branch_dir))
-
-    del branch_props[opts["source-pathid"]]
-
-    # Set merge property with the selected source deleted
-    set_merge_props(branch_dir, branch_props)
-
-    # Set blocked revisions for the selected source to None
-    set_blocked_revs(branch_dir, opts["source-pathid"], None)
-
-    # Write out commit message if desired
-    if opts["commit-file"]:
-        f = open(opts["commit-file"], "w")
-        print >>f, 'Removed merge tracking for "%s" for ' % NAME
-        print >>f, '%s' % opts["source-url"]
-        f.close()
-        report('wrote commit message to "%s"' % opts["commit-file"])
-
-###############################################################################
-# Command line parsing -- options and commands management
-###############################################################################
-
-class OptBase:
-    def __init__(self, *args, **kwargs):
-        self.help = kwargs["help"]
-        del kwargs["help"]
-        self.lflags = []
-        self.sflags = []
-        for a in args:
-            if a.startswith("--"):   self.lflags.append(a)
-            elif a.startswith("-"):  self.sflags.append(a)
-            else:
-                raise TypeError, "invalid flag name: %s" % a
-        if kwargs.has_key("dest"):
-            self.dest = kwargs["dest"]
-            del kwargs["dest"]
-        else:
-            if not self.lflags:
-                raise TypeError, "cannot deduce dest name without long options"
-            self.dest = self.lflags[0][2:]
-        if kwargs:
-            raise TypeError, "invalid keyword arguments: %r" % kwargs.keys()
-    def repr_flags(self):
-        f = self.sflags + self.lflags
-        r = f[0]
-        for fl in f[1:]:
-            r += " [%s]" % fl
-        return r
-
-class Option(OptBase):
-    def __init__(self, *args, **kwargs):
-        self.default = kwargs.setdefault("default", 0)
-        del kwargs["default"]
-        self.value = kwargs.setdefault("value", None)
-        del kwargs["value"]
-        OptBase.__init__(self, *args, **kwargs)
-    def apply(self, state, value):
-        assert value == ""
-        if self.value is not None:
-            state[self.dest] = self.value
-        else:
-            state[self.dest] += 1
-
-class OptionArg(OptBase):
-    def __init__(self, *args, **kwargs):
-        self.default = kwargs["default"]
-        del kwargs["default"]
-        self.metavar = kwargs.setdefault("metavar", None)
-        del kwargs["metavar"]
-        OptBase.__init__(self, *args, **kwargs)
-
-        if self.metavar is None:
-            if self.dest is not None:
-                self.metavar = self.dest.upper()
-            else:
-                self.metavar = "arg"
-        if self.default:
-            self.help += " (default: %s)" % self.default
-    def apply(self, state, value):
-        assert value is not None
-        state[self.dest] = value
-    def repr_flags(self):
-        r = OptBase.repr_flags(self)
-        return r + " " + self.metavar
-
-class CommandOpts:
-    class Cmd:
-        def __init__(self, *args):
-            self.name, self.func, self.usage, self.help, self.opts = args
-        def short_help(self):
-            return self.help.split(".")[0]
-        def __str__(self):
-            return self.name
-        def __call__(self, *args, **kwargs):
-            return self.func(*args, **kwargs)
-
-    def __init__(self, global_opts, common_opts, command_table, version=None):
-        self.progname = NAME
-        self.version = version.replace("%prog", self.progname)
-        self.cwidth = console_width() - 2
-        self.ctable = command_table.copy()
-        self.gopts = global_opts[:]
-        self.copts = common_opts[:]
-        self._add_builtins()
-        for k in self.ctable.keys():
-            cmd = self.Cmd(k, *self.ctable[k])
-            opts = []
-            for o in cmd.opts:
-                if isinstance(o, types.StringType) or \
-                   isinstance(o, types.UnicodeType):
-                    o = self._find_common(o)
-                opts.append(o)
-            cmd.opts = opts
-            self.ctable[k] = cmd
-
-    def _add_builtins(self):
-        self.gopts.append(
-            Option("-h", "--help", help="show help for this command and exit"))
-        if self.version is not None:
-            self.gopts.append(
-                Option("-V", "--version", help="show version info and exit"))
-        self.ctable["help"] = (self._cmd_help,
-            "help [COMMAND]",
-            "Display help for a specific command. If COMMAND is omitted, "
-            "display brief command description.",
-            [])
-
-    def _cmd_help(self, cmd=None, *args):
-        if args:
-            self.error("wrong number of arguments", "help")
-        if cmd is not None:
-            cmd = self._command(cmd)
-            self.print_command_help(cmd)
-        else:
-            self.print_command_list()
-
-    def _paragraph(self, text, width=78):
-        chunks = re.split("\s+", text.strip())
-        chunks.reverse()
-        lines = []
-        while chunks:
-            L = chunks.pop()
-            while chunks and len(L) + len(chunks[-1]) + 1 <= width:
-                L += " " + chunks.pop()
-            lines.append(L)
-        return lines
-
-    def _paragraphs(self, text, *args, **kwargs):
-        pars = text.split("\n\n")
-        lines = self._paragraph(pars[0], *args, **kwargs)
-        for p in pars[1:]:
-            lines.append("")
-            lines.extend(self._paragraph(p, *args, **kwargs))
-        return lines
-
-    def _print_wrapped(self, text, indent=0):
-        text = self._paragraphs(text, self.cwidth - indent)
-        print text.pop(0)
-        for t in text:
-            print " " * indent + t
-
-    def _find_common(self, fl):
-        for o in self.copts:
-            if fl in o.lflags+o.sflags:
-                return o
-        assert False, fl
-
-    def _compute_flags(self, opts, check_conflicts=True):
-        back = {}
-        sfl = ""
-        lfl = []
-        for o in opts:
-            sapp = lapp = ""
-            if isinstance(o, OptionArg):
-                sapp, lapp = ":", "="
-            for s in o.sflags:
-                if check_conflicts and back.has_key(s):
-                    raise RuntimeError, "option conflict: %s" % s
-                back[s] = o
-                sfl += s[1:] + sapp
-            for l in o.lflags:
-                if check_conflicts and back.has_key(l):
-                    raise RuntimeError, "option conflict: %s" % l
-                back[l] = o
-                lfl.append(l[2:] + lapp)
-        return sfl, lfl, back
-
-    def _extract_command(self, args):
-        """
-        Try to extract the command name from the argument list. This is
-        non-trivial because we want to allow command-specific options even
-        before the command itself.
-        """
-        opts = self.gopts[:]
-        for cmd in self.ctable.values():
-            opts.extend(cmd.opts)
-        sfl, lfl, _ = self._compute_flags(opts, check_conflicts=False)
-
-        lopts,largs = getopt.getopt(args, sfl, lfl)
-        if not largs:
-            return None
-        return self._command(largs[0])
-
-    def _fancy_getopt(self, args, opts, state=None):
-        if state is None:
-            state= {}
-        for o in opts:
-            if not state.has_key(o.dest):
-                state[o.dest] = o.default
-
-        sfl, lfl, back = self._compute_flags(opts)
-        try:
-            lopts,args = getopt.gnu_getopt(args, sfl, lfl)
-        except AttributeError:
-            # Before Python 2.3, there was no gnu_getopt support.
-            # So we can't parse intermixed positional arguments
-            # and options.
-            lopts,args = getopt.getopt(args, sfl, lfl)
-
-        for o,v in lopts:
-            back[o].apply(state, v)
-        return state, args
-
-    def _command(self, cmd):
-        if not self.ctable.has_key(cmd):
-            self.error("unknown command: '%s'" % cmd)
-        return self.ctable[cmd]
-
-    def parse(self, args):
-        if not args:
-            self.print_small_help()
-            sys.exit(0)
-
-        cmd = None
-        try:
-            cmd = self._extract_command(args)
-            opts = self.gopts[:]
-            if cmd:
-                opts.extend(cmd.opts)
-                args.remove(cmd.name)
-            state, args = self._fancy_getopt(args, opts)
-        except getopt.GetoptError, e:
-            self.error(e, cmd)
-
-        # Handle builtins
-        if self.version is not None and state["version"]:
-            self.print_version()
-            sys.exit(0)
-        if state["help"]: # special case for --help
-            if cmd:
-                self.print_command_help(cmd)
-                sys.exit(0)
-            cmd = self.ctable["help"]
-        else:
-            if cmd is None:
-                self.error("command argument required")
-        if str(cmd) == "help":
-            cmd(*args)
-            sys.exit(0)
-        return cmd, args, state
-
-    def error(self, s, cmd=None):
-        print >>sys.stderr, "%s: %s" % (self.progname, s)
-        if cmd is not None:
-            self.print_command_help(cmd)
-        else:
-            self.print_small_help()
-        sys.exit(1)
-    def print_small_help(self):
-        print "Type '%s help' for usage" % self.progname
-    def print_usage_line(self):
-        print "usage: %s <subcommand> [options...] [args...]\n" % self.progname
-    def print_command_list(self):
-        print "Available commands (use '%s help COMMAND' for more details):\n" \
-              % self.progname
-        cmds = self.ctable.keys()
-        cmds.sort()
-        indent = max(map(len, cmds))
-        for c in cmds:
-            h = self.ctable[c].short_help()
-            print "  %-*s   " % (indent, c),
-            self._print_wrapped(h, indent+6)
-    def print_command_help(self, cmd):
-        cmd = self.ctable[str(cmd)]
-        print 'usage: %s %s\n' % (self.progname, cmd.usage)
-        self._print_wrapped(cmd.help)
-        def print_opts(opts, self=self):
-            if not opts: return
-            flags = [o.repr_flags() for o in opts]
-            indent = max(map(len, flags))
-            for f,o in zip(flags, opts):
-                print "  %-*s :" % (indent, f),
-                self._print_wrapped(o.help, indent+5)
-        print '\nCommand options:'
-        print_opts(cmd.opts)
-        print '\nGlobal options:'
-        print_opts(self.gopts)
-
-    def print_version(self):
-        print self.version
-
-###############################################################################
-# Options and Commands description
-###############################################################################
-
-global_opts = [
-    Option("-F", "--force",
-           help="force operation even if the working copy is not clean, or "
-                "there are pending updates"),
-    Option("-n", "--dry-run",
-           help="don't actually change anything, just pretend; "
-                "implies --show-changes"),
-    Option("-s", "--show-changes",
-           help="show subversion commands that make changes"),
-    Option("-v", "--verbose",
-           help="verbose mode: output more information about progress"),
-    OptionArg("-u", "--username",
-              default=None,
-              help="invoke subversion commands with the supplied username"),
-    OptionArg("-p", "--password",
-              default=None,
-              help="invoke subversion commands with the supplied password"),
-    OptionArg("-c", "--config-dir", metavar="DIR",
-              default=None,
-              help="cause subversion commands to consult runtime config directory DIR"),
-]
-
-common_opts = [
-    Option("-b", "--bidirectional",
-           value=True,
-           default=False,
-           help="remove reflected and initialized revisions from merge candidates.  "
-                "Not required but may be specified to speed things up slightly"),
-    OptionArg("-f", "--commit-file", metavar="FILE",
-              default="svnmerge-commit-message.txt",
-              help="set the name of the file where the suggested log message "
-                   "is written to"),
-    Option("-M", "--record-only",
-           value=True,
-           default=False,
-           help="do not perform an actual merge of the changes, yet record "
-                "that a merge happened"),
-    OptionArg("-r", "--revision",
-              metavar="REVLIST",
-              default="",
-              help="specify a revision list, consisting of revision numbers "
-                   'and ranges separated by commas, e.g., "534,537-539,540"'),
-    OptionArg("-S", "--source", "--head",
-              default=None,
-              help="specify a merge source for this branch.  It can be either "
-                   "a working directory path, a full URL, or an unambiguous "
-                   "substring of one of the locations for which merge tracking was "
-                   "already initialized.  Needed only to disambiguate in case of "
-                   "multiple merge sources"),
-]
-
-command_table = {
-    "init": (action_init,
-    "init [OPTION...] [SOURCE]",
-    """Initialize merge tracking from SOURCE on the current working
-    directory.
-
-    If SOURCE is specified, all the revisions in SOURCE are marked as already
-    merged; if this is not correct, you can use --revision to specify the
-    exact list of already-merged revisions.
-
-    If SOURCE is omitted, then it is computed from the "svn cp" history of the
-    current working directory (searching back for the branch point); in this
-    case, %s assumes that no revision has been integrated yet since
-    the branch point (unless you teach it with --revision).""" % NAME,
-    [
-        "-f", "-r", # import common opts
-        OptionArg("-L", "--location-type",
-               dest="location-type",
-               default="path",
-               help="Use this type of location identifier in the new " +
-                    "Subversion properties; 'uuid', 'url', or 'path' " +
-                    "(default)"),
-    ]),
-
-    "avail": (action_avail,
-    "avail [OPTION...] [PATH]",
-    """Show unmerged revisions available for PATH as a revision list.
-    If --revision is given, the revisions shown will be limited to those
-    also specified in the option.
-
-    When svnmerge is used to bidirectionally merge changes between a
-    branch and its source, it is necessary to not merge the same changes
-    forth and back: e.g., if you committed a merge of a certain
-    revision of the branch into the source, you do not want that commit
-    to appear as available to merged into the branch (as the code
-    originated in the branch itself!).  svnmerge will automatically
-    exclude these so-called "reflected" revisions.""",
-    [
-        Option("-A", "--all",
-               dest="avail-showwhat",
-               value=["blocked", "avail"],
-               default=["avail"],
-               help="show both available and blocked revisions (aka ignore "
-                    "blocked revisions)"),
-        "-b",
-        Option("-B", "--blocked",
-               dest="avail-showwhat",
-               value=["blocked"],
-               help="show the blocked revision list (see '%s block')" % NAME),
-        Option("-d", "--diff",
-               dest="avail-display",
-               value="diffs",
-               default="revisions",
-               help="show corresponding diff instead of revision list"),
-        Option("--summarize",
-               dest="avail-display",
-               value="summarize",
-               help="show summarized diff instead of revision list"),
-        Option("-l", "--log",
-               dest="avail-display",
-               value="logs",
-               help="show corresponding log history instead of revision list"),
-        "-r",
-        "-S",
-    ]),
-
-    "integrated": (action_integrated,
-    "integrated [OPTION...] [PATH]",
-    """Show merged revisions available for PATH as a revision list.
-    If --revision is given, the revisions shown will be limited to
-    those also specified in the option.""",
-    [
-        Option("-d", "--diff",
-               dest="integrated-display",
-               value="diffs",
-               default="revisions",
-               help="show corresponding diff instead of revision list"),
-        Option("-l", "--log",
-               dest="integrated-display",
-               value="logs",
-               help="show corresponding log history instead of revision list"),
-        "-r",
-        "-S",
-    ]),
-
-    "rollback": (action_rollback,
-    "rollback [OPTION...] [PATH]",
-    """Rollback previously merged in revisions from PATH.  The
-    --revision option is mandatory, and specifies which revisions
-    will be rolled back.  Only the previously integrated merges
-    will be rolled back.
-
-    When manually rolling back changes, --record-only can be used to
-    instruct %s that a manual rollback of a certain revision
-    already happened, so that it can record it and offer that
-    revision for merge henceforth.""" % (NAME),
-    [
-        "-f", "-r", "-S", "-M", # import common opts
-    ]),
-
-    "merge": (action_merge,
-    "merge [OPTION...] [PATH]",
-    """Merge in revisions into PATH from its source. If --revision is omitted,
-    all the available revisions will be merged. In any case, already merged-in
-    revisions will NOT be merged again.
-
-    When svnmerge is used to bidirectionally merge changes between a
-    branch and its source, it is necessary to not merge the same changes
-    forth and back: e.g., if you committed a merge of a certain
-    revision of the branch into the source, you do not want that commit
-    to appear as available to merged into the branch (as the code
-    originated in the branch itself!).  svnmerge will automatically
-    exclude these so-called "reflected" revisions.
-
-    When manually merging changes across branches, --record-only can
-    be used to instruct %s that a manual merge of a certain revision
-    already happened, so that it can record it and not offer that
-    revision for merge anymore.  Conversely, when there are revisions
-    which should not be merged, use '%s block'.""" % (NAME, NAME),
-    [
-        "-b", "-f", "-r", "-S", "-M", # import common opts
-    ]),
-
-    "block": (action_block,
-    "block [OPTION...] [PATH]",
-    """Block revisions within PATH so that they disappear from the available
-    list. This is useful to hide revisions which will not be integrated.
-    If --revision is omitted, it defaults to all the available revisions.
-
-    Do not use this option to hide revisions that were manually merged
-    into the branch.  Instead, use '%s merge --record-only', which
-    records that a merge happened (as opposed to a merge which should
-    not happen).""" % NAME,
-    [
-        "-f", "-r", "-S", # import common opts
-    ]),
-
-    "unblock": (action_unblock,
-    "unblock [OPTION...] [PATH]",
-    """Revert the effect of '%s block'. If --revision is omitted, all the
-    blocked revisions are unblocked""" % NAME,
-    [
-        "-f", "-r", "-S", # import common opts
-    ]),
-
-    "uninit": (action_uninit,
-    "uninit [OPTION...] [PATH]",
-    """Remove merge tracking information from PATH. It cleans any kind of merge
-    tracking information (including the list of blocked revisions). If there
-    are multiple sources, use --source to indicate which source you want to
-    forget about.""",
-    [
-        "-f", "-S", # import common opts
-    ]),
-}
-
-
-def main(args):
-    global opts
-
-    # Initialize default options
-    opts = default_opts.copy()
-    logs.clear()
-
-    optsparser = CommandOpts(global_opts, common_opts, command_table,
-                             version="%%prog r%s\n  modified: %s\n\n"
-                                     "Copyright (C) 2004,2005 Awarix Inc.\n"
-                                     "Copyright (C) 2005, Giovanni Bajo"
-                                     % (__revision__, __date__))
-
-    cmd, args, state = optsparser.parse(args)
-    opts.update(state)
-
-    source = opts.get("source", None)
-    branch_dir = "."
-
-    if str(cmd) == "init":
-        if len(args) == 1:
-            source = args[0]
-        elif len(args) > 1:
-            optsparser.error("wrong number of parameters", cmd)
-    elif str(cmd) in command_table.keys():
-        if len(args) == 1:
-            branch_dir = args[0]
-        elif len(args) > 1:
-            optsparser.error("wrong number of parameters", cmd)
-    else:
-        assert False, "command not handled: %s" % cmd
-
-    # Validate branch_dir
-    if not is_wc(branch_dir):
-        if str(cmd) == "avail":
-            info = None
-            # it should be noted here that svn info does not error exit
-            # if an invalid target is specified to it (as is
-            # intuitive). so the try, except code is not absolutely
-            # necessary. but, I retain it to indicate the intuitive
-            # handling.
-            try:
-                info = get_svninfo(branch_dir)
-            except LaunchError:
-                pass
-            # test that we definitely targeted a subversion directory,
-            # mirroring the purpose of the earlier is_wc() call
-            if info is None or not info.has_key("Node Kind") or info["Node Kind"] != "directory":
-                error('"%s" is neither a valid URL, nor a working directory' % branch_dir)
-        else:
-            error('"%s" is not a subversion working directory' % branch_dir)
-
-    # give out some hints as to potential pathids
-    PathIdentifier.hint(branch_dir)
-    if source: PathIdentifier.hint(source)
-
-    # Extract the integration info for the branch_dir
-    branch_props = get_merge_props(branch_dir)
-
-    # Calculate source_url and source_path
-    report("calculate source path for the branch")
-    if not source:
-        if str(cmd) == "init":
-            cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(branch_dir)
-            if not cf_source:
-                error('no copyfrom info available. '
-                      'Explicit source argument (-S/--source) required.')
-            opts["source-url"] = get_repo_root(branch_dir) + cf_source
-            opts["source-pathid"] = PathIdentifier.from_target(opts["source-url"])
-
-            if not opts["revision"]:
-                opts["revision"] = "1-" + cf_rev
-        else:
-            opts["source-pathid"] = get_default_source(branch_dir, branch_props)
-            opts["source-url"] = opts["source-pathid"].get_url()
-
-        assert is_pathid(opts["source-pathid"])
-        assert is_url(opts["source-url"])
-    else:
-        # The source was given as a command line argument and is stored in
-        # SOURCE.  Ensure that the specified source does not end in a /,
-        # otherwise it's easy to have the same source path listed more
-        # than once in the integrated version properties, with and without
-        # trailing /'s.
-        source = rstrip(source, "/")
-        if not is_wc(source) and not is_url(source):
-            # Check if it is a substring of a pathid recorded
-            # within the branch properties.
-            found = []
-            for pathid in branch_props.keys():
-                if pathid.match_substring(source):
-                    found.append(pathid)
-            if len(found) == 1:
-                # (assumes pathid is a repository-relative-path)
-                source_pathid = found[0]
-                source = source_pathid.get_url()
-            else:
-                error('"%s" is neither a valid URL, nor an unambiguous '
-                      'substring of a repository path, nor a working directory'
-                      % source)
-        else:
-            source_pathid = PathIdentifier.from_target(source)
-
-        source_pathid = PathIdentifier.from_target(source)
-        if str(cmd) == "init" and \
-               source_pathid == PathIdentifier.from_target("."):
-            error("cannot init integration source path '%s'\n"
-                  "Its repository-relative path must differ from the "
-                  "repository-relative path of the current directory."
-                  % source_pathid)
-        opts["source-pathid"] = source_pathid
-        opts["source-url"] = target_to_url(source)
-
-    # Sanity check source_url
-    assert is_url(opts["source-url"])
-    # SVN does not support non-normalized URL (and we should not
-    # have created them)
-    assert opts["source-url"].find("/..") < 0
-
-    report('source is "%s"' % opts["source-url"])
-
-    # Get previously merged revisions (except when command is init)
-    if str(cmd) != "init":
-        opts["merged-revs"] = merge_props_to_revision_set(branch_props,
-                                                          opts["source-pathid"])
-
-    # Perform the action
-    cmd(branch_dir, branch_props)
-
-
-if __name__ == "__main__":
-    try:
-        main(sys.argv[1:])
-    except LaunchError, (ret, cmd, out):
-        err_msg = "command execution failed (exit code: %d)\n" % ret
-        err_msg += cmd + "\n"
-        err_msg += "".join(out)
-        error(err_msg)
-    except KeyboardInterrupt:
-        # Avoid traceback on CTRL+C
-        print "aborted by user"
-        sys.exit(1)
diff --git a/abs/extra-testing/subversion/svnserve b/abs/extra-testing/subversion/svnserve
deleted file mode 100755
index 670fee7..0000000
--- a/abs/extra-testing/subversion/svnserve
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/svnserve
-
-PID=`pidof -o %PPID /usr/bin/svnserve`
-case "$1" in
-  start)
-    stat_busy "Starting svnserve"
-    if [ -z "$PID" ]; then 
-      if [ -n "$SVNSERVE_USER" ]; then
-        su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" &
-      else
-        /usr/bin/svnserve -d $SVNSERVE_ARGS &
-      fi
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon svnserve
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping svnserve"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon svnserve
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/abs/extra-testing/subversion/svnserve.conf b/abs/extra-testing/subversion/svnserve.conf
deleted file mode 100644
index 37fb7ea..0000000
--- a/abs/extra-testing/subversion/svnserve.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Parameters to be passed to svnserve
-#
-#SVNSERVE_ARGS="-r /path/to/some/repos"
-SVNSERVE_ARGS=""
-
-#SVNSERVE_USER="svn"
diff --git a/abs/extra-testing/swh-plugins/PKGBUILD b/abs/extra-testing/swh-plugins/PKGBUILD
deleted file mode 100644
index 69157a1..0000000
--- a/abs/extra-testing/swh-plugins/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 8773 2008-08-16 05:51:00Z eric $
-#Maintainer: Damir Perisa <damir.perisa@bluewin.ch>
-#Contributor: Robert Emil Berge
-
-pkgname=swh-plugins
-pkgver=0.4.15
-pkgrel=1
-pkgdesc="LADSPA Plugin-Collection from plugin.org.uk"
-arch=(i686 x86_64)
-url="http://plugin.org.uk/"
-depends=('fftw' 'ladspa')
-groups=('ladspa-plugins')
-source=(http://plugin.org.uk/releases/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('2fbdccef2462ea553901acd429fa3573')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-
-#Arch64 fix, -fPIC seems to be the only option
-if [ "$CARCH" = "x86_64" ]; then
-      export CFLAGS="$CFLAGS -fPIC"
-      export CXXFLAGS="$CFLAGS"
-fi
-
- ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
diff --git a/abs/extra-testing/swig/PKGBUILD b/abs/extra-testing/swig/PKGBUILD
deleted file mode 100644
index e40f539..0000000
--- a/abs/extra-testing/swig/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 14415 2008-10-06 08:59:13Z douglas $
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Jason Chu <jason@archlinux.org>
-
-pkgname=swig
-pkgver=1.3.36
-pkgrel=1
-pkgdesc="SWIG is a compiler that makes it easy to integrate C and C++ code with scripting languages"
-arch=('i686' 'x86_64')
-license=('custom')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-url="http://www.swig.org/"
-depends=('gcc' 'guile')
-
-md5sums=('8f30aa4130b62404099bbcba1bf429b1')
-
-build() {
-	cd $startdir/src/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make DESTDIR=$startdir/pkg install
-	install -D -m644 LICENSE ${startdir}/pkg/usr/share/licenses/swig/license.txt
-}
diff --git a/abs/extra-testing/sysstat/PKGBUILD b/abs/extra-testing/sysstat/PKGBUILD
deleted file mode 100644
index 12f5afe..0000000
--- a/abs/extra-testing/sysstat/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD,v 1.24 2009/05/25 09:04:21 sergej Exp $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Martin Devera <devik@cdi.cz>
-
-pkgname=sysstat
-pkgver=9.0.3
-pkgrel=1
-pkgdesc="A collection of performance monitoring tools"
-arch=('i686' 'x86_64')
-url="http://pagesperso-orange.fr/sebastien.godard/"
-license=('GPL')
-depends=(glibc)
-options=(zipman)
-source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz
-        sysstat)
-md5sums=('0b464951596db934418259737cf50a31'
-         'ad46159609a2c13b4a46b506ff847bf6')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure --prefix=/usr \
-        --mandir=/usr/share/man \
-        --enable-install-isag \
-	--disable-man-group
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-
-  install -D -m 644 sysstat.sysconfig $pkgdir/etc/sysstat/sysstat && \
-  install -D -m 744 sysstat.cron.hourly $pkgdir/etc/cron.hourly/sysstat && \
-  install -D -m 744 sysstat.cron.daily $pkgdir/etc/cron.daily/sysstat && \
-  install -D -m 755 $srcdir/sysstat $pkgdir/etc/rc.d/sysstat || return 1
-
-  chown -R root:root $pkgdir
-}
diff --git a/abs/extra-testing/sysstat/sysstat b/abs/extra-testing/sysstat/sysstat
deleted file mode 100644
index d8e312a..0000000
--- a/abs/extra-testing/sysstat/sysstat
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Writing SysStat restart record"
-    /usr/lib/sa/sadc -L -F -
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-    ;;
-  stop)
-    ;;
-  *)
-    echo "usage: $0 {start|stop}"  
-esac
-exit 0
diff --git a/abs/extra-testing/tablet-encode/PKGBUILD b/abs/extra-testing/tablet-encode/PKGBUILD
deleted file mode 100644
index e547e82..0000000
--- a/abs/extra-testing/tablet-encode/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $
-# Maintainer: Cecil Watson<knoppmyth@gmail.com>
-
-pkgname=tablet-encode
-pkgver=2.30
-pkgrel=1
-pkgdesc="Transcodes videos for playback on a Nokia Internet Tablet"
-arch=('i686' 'x86_64')
-license=('ARTISTIC')
-depends=(mplayer)
-url="http://mediautils.garage.maemo.org/tablet-encode.html"
-source=(https://garage.maemo.org/frs/download.php/6892/tablet-encode-2.30.tar.gz)
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-  mkdir -p $startdir/pkg/usr/bin
-  mkdir -p $startdir/pkg/usr/share/doc/tablet-encode
-  install -D -m755 tablet-encode $startdir/pkg/usr/bin
-  cp README.txt $startdir/pkg/usr/share/doc/tablet-encode
-}
diff --git a/abs/extra-testing/tango-icon-theme/PKGBUILD b/abs/extra-testing/tango-icon-theme/PKGBUILD
deleted file mode 100644
index 21ec4e8..0000000
--- a/abs/extra-testing/tango-icon-theme/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: James Rayner <james@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-pkgname=tango-icon-theme
-pkgver=0.8.1
-pkgrel=2
-pkgdesc="The Tango Desktop Project exists to create a consistent user experience"
-arch=('i686' 'x86_64')
-url="http://tango.freedesktop.org"
-license="CCPL-Attribution-ShareAlike-2.5"
-depends=('librsvg')
-makedepends=('imagemagick' 'icon-naming-utils')
-source=(http://tango.freedesktop.org/releases/$pkgname-$pkgver.tar.gz)
-md5sums=('32d5258f448b5982af9cfa4364f31d41')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --enable-png-creation
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-
-  install -D COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING
-}
diff --git a/abs/extra-testing/tatir/PKGBUILD b/abs/extra-testing/tatir/PKGBUILD
deleted file mode 100644
index e9d8ab2..0000000
--- a/abs/extra-testing/tatir/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $
-# Maintainer: Cecil Watson<knoppmyth@gmail.com>
-
-pkgname=tatir
-pkgver=1
-pkgrel=4
-pkgdesc="TatIR, the Linux media remote control."
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://tatir.dropthetranny.com/"
-depends=('pyusb' 'xautomation')
-source=('tatir.tar.bz2')
-install=tatir.install
-build() {
-	mkdir -p $pkgdir/usr/bin
-	mkdir -p $pkgdir/etc/tatir
-#	mkdir -p $pkgdir/etc/sv/tatir/supervise
-	cp *.py $pkgdir/usr/bin
-	cp remote_xte.conf $pkgdir/etc/tatir/
-#	cp run $pkgdir/etc/sv/tatir/
-}
diff --git a/abs/extra-testing/tatir/tatir.install b/abs/extra-testing/tatir/tatir.install
deleted file mode 100644
index aef470a..0000000
--- a/abs/extra-testing/tatir/tatir.install
+++ /dev/null
@@ -1,19 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-#	add_service.sh tatir
-	/bin/true
-}
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	/bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-	remove_service.sh tatir
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/tatir/tatir.tar.bz2 b/abs/extra-testing/tatir/tatir.tar.bz2
deleted file mode 100644
index 1a16a46..0000000
--- a/abs/extra-testing/tatir/tatir.tar.bz2
+++ /dev/null
diff --git a/abs/extra-testing/terminal/PKGBUILD b/abs/extra-testing/terminal/PKGBUILD
deleted file mode 100644
index 857696e..0000000
--- a/abs/extra-testing/terminal/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 28221 2009-02-28 11:48:48Z andyrtr $
-# Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
-# Contributor: Aurelien Foret <orelien@chez.com>
-
-pkgname=terminal
-pkgver=0.2.10
-pkgrel=1
-pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://www.xfce.org/projects/terminal/"
-groups=('xfce4')
-depends=('exo>=0.3.100' "vte>=0.17.4-2" 'dbus-glib>=0.78'
-	 'startup-notification>=0.9' 'hicolor-icon-theme')
-makedepends=('pkgconfig')
-options=('!libtool')
-install=terminal.install
-source=(http://www.xfce.org/archive/xfce-4.6.0/src/Terminal-${pkgver}.tar.bz2
-	terminal-dont-die-on-dbus-kill.patch)
-md5sums=('f6cefa97cf5cad558187267783ffce8a'
-         '7cff5c513739737a0ed2109354538241')
-
-build() {
-  cd ${srcdir}/Terminal-${pkgver}
-  patch -Np0 -i ${srcdir}/terminal-dont-die-on-dbus-kill.patch || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
-    --localstatedir=/var --disable-static || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-}
diff --git a/abs/extra-testing/terminal/terminal-dont-die-on-dbus-kill.patch b/abs/extra-testing/terminal/terminal-dont-die-on-dbus-kill.patch
deleted file mode 100644
index e20e45c..0000000
--- a/abs/extra-testing/terminal/terminal-dont-die-on-dbus-kill.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- terminal/terminal-dbus.c.orig	2007-01-23 22:25:12.000000000 +0000
-+++ terminal/terminal-dbus.c	2007-01-23 22:25:50.000000000 +0000
-@@ -191,6 +191,7 @@ terminal_dbus_register_service (Terminal
- 
-   /* register DBus connection with GLib main loop */
-   dbus_connection_setup_with_g_main (connection, NULL);
-+  dbus_connection_set_exit_on_disconnect (connection, FALSE);
- 
-   if (dbus_bus_request_name (connection, TERMINAL_DBUS_SERVICE, 0, &derror) < 0)
-     {
diff --git a/abs/extra-testing/terminal/terminal.install b/abs/extra-testing/terminal/terminal.install
deleted file mode 100644
index 21b79d2..0000000
--- a/abs/extra-testing/terminal/terminal.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/abs/extra-testing/terminus-font/PKGBUILD b/abs/extra-testing/terminus-font/PKGBUILD
deleted file mode 100644
index c3be90c..0000000
--- a/abs/extra-testing/terminus-font/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Kristoffer Fossgård <kfs1@online.no>
-pkgname=terminus-font
-pkgver=4.30
-pkgrel=1
-pkgdesc="A superb, monospace bitmap font (for X11 and console)"
-depends=(xorg-fonts-encodings xorg-fonts-alias xorg-font-utils fontconfig)
-replaces=(xserver-terminus-fonts)
-arch=(i686 x86_64)
-source=(http://www.is-vn.bg/hamster/$pkgname-$pkgver.tar.gz)
-url="http://www.is-vn.bg/hamster/jimmy-en.html"
-install=terminus-font.install
-license=('GPL-2')
-
-build() { 
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --x11dir=/usr/share/fonts/local/ --psfdir=/usr/share/kbd/consolefonts/
-  make DESTDIR=$startdir/pkg install
-}
-md5sums=('6f8bd95b593851f9f5c210a9d33cbbf1')
diff --git a/abs/extra-testing/terminus-font/install.proto b/abs/extra-testing/terminus-font/install.proto
deleted file mode 100644
index 37f0b55..0000000
--- a/abs/extra-testing/terminus-font/install.proto
+++ /dev/null
@@ -1,27 +0,0 @@
-# arg 1: the new package version 
- post_install() {
- echo -n "Updating font cache... " 
- /usr/bin/fc-cache
- cd /usr/share/fonts/local
- /usr/bin/mkfontdir
- /usr/bin/mkfontscale
-# cp ../encodings/encodings.dir ./encodings.dir
- echo "done."
- echo "Note that local fonts are now (with xorg-7.0) in /usr/share/fonts/local/"
- }
-
-# # arg 1: the new package version 
-# # arg 2: the old package version 
- post_upgrade() { 
- post_install $1 
- } 
-#
-# # arg 1: the old package version 
- post_remove() { 
- /usr/bin/fc-cache
- } 
-
-op=$1 
-shift 
-
-$op $*
diff --git a/abs/extra-testing/terminus-font/terminus-font.install b/abs/extra-testing/terminus-font/terminus-font.install
deleted file mode 100644
index e17fb4f..0000000
--- a/abs/extra-testing/terminus-font/terminus-font.install
+++ /dev/null
@@ -1,21 +0,0 @@
-# arg 1: the new package version
-post_install() {
-  echo -n "Updating font cache... "
-  fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/local
-  mkfontdir /usr/share/fonts/local
-  echo "done."
-  echo "Note: terminus-font is in /usr/share/fonts/local/"
-}
-
-# # arg 1: the new package version
-# # arg 2: the old package version
-post_upgrade() {
-  post_install $1
-}
-#
-# # arg 1: the old package version
-post_remove() {
-  post_install $1
-}
-
diff --git a/abs/extra-testing/thunar/PKGBUILD b/abs/extra-testing/thunar/PKGBUILD
deleted file mode 100644
index 8086857..0000000
--- a/abs/extra-testing/thunar/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 28211 2009-02-28 11:12:20Z andyrtr $
-# Maintainer: tobias <tobias funnychar archlinux.org>
-# Contributor: Andrew Simmons <andrew.simmons@gmail.com>
-
-pkgname=thunar
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="new modern file manager for Xfce"
-arch=(i686 x86_64)
-license=('GPL2' 'LGPL2')
-url="http://thunar.xfce.org"
-groups=('xfce4')
-depends=('libexif>=0.6.17'  'hicolor-icon-theme' 'tango-icon-theme' )
-makedepends=('intltool' 'pkgconfig')
-optdepends=('gamin:   a fam replacement to make thunar monitor changes to files on the fly')
-options=('!libtool')
-install=${pkgname}.install
-source=(http://www.xfce.org/archive/xfce-4.6.0/src/Thunar-${pkgver}.tar.bz2)
-md5sums=('468c240a4f65a217ec2b6132e85cd84e')
-
-build() {
-  cd ${srcdir}/Thunar-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --disable-static \
-    --disable-gnome-thumbnailers --enable-exif --enable-pcre --disable-fam
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  sed -i 's:x-directory/gnome-default-handler;::' \
-    ${pkgdir}/usr/share/applications/Thunar-folder-handler.desktop
-}
diff --git a/abs/extra-testing/thunar/__changelog b/abs/extra-testing/thunar/__changelog
deleted file mode 100644
index 630ddfa..0000000
--- a/abs/extra-testing/thunar/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-remove dep for desktop-file-utils
diff --git a/abs/extra-testing/thunar/thunar.install b/abs/extra-testing/thunar/thunar.install
deleted file mode 100644
index 28fdb48..0000000
--- a/abs/extra-testing/thunar/thunar.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
diff --git a/abs/extra-testing/tightvnc/PKGBUILD b/abs/extra-testing/tightvnc/PKGBUILD
deleted file mode 100644
index ef3ea3e..0000000
--- a/abs/extra-testing/tightvnc/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-
-pkgname=tightvnc
-pkgver=1.3.10
-pkgrel=1
-pkgdesc="VNC Unix server && viewer"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.tightvnc.com"
-depends=('libjpeg' 'zlib' 'libxaw' 'libxp')
-makedepends=('imake')
-conflicts=('vnc')
-source=(http://easynews.dl.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2 tightvnc-fontpath-xcolors.patch)
-
-
-build() {
-  export MAKEFLAGS="-j1"
-  cd $startdir/src/vnc_unixsrc || return 1
-  patch -Np1 -i ../tightvnc-fontpath-xcolors.patch || return 1
-
-  xmkmf || return 1
-  make World || return 1
-  cd Xvnc || return 1
-  ./configure || return 1
-  sed 's|PROTO_DEFINES =|PROTO_DEFINES = -D_XOPEN_SOURCE=500L|' \
-  	-i programs/Xserver/os/Makefile lib/font/fc/Makefile || return 1
-  make || return 1
-  cd .. || return 1
-  mkdir -p $startdir/pkg/usr/bin $startdir/pkg/usr/man/man1 || return 1
-  ./vncinstall $startdir/pkg/usr/bin $startdir/pkg/usr/man || return 1
-  
-  # install java classes
-  mkdir -p $startdir/pkg/usr/share/vnc/classes || return 1
-  install -D -m644 $startdir/src/vnc_unixsrc/classes/* \
-  	$startdir/pkg/usr/share/vnc/classes || return 1
-}
-md5sums=('397b35faad32d5246b6d44b142f8304f'
-         '0bf967f2cdb94b432f9c7e1c121f7fbd')
diff --git a/abs/extra-testing/tightvnc/tightvnc-fontpath-xcolors.patch b/abs/extra-testing/tightvnc/tightvnc-fontpath-xcolors.patch
deleted file mode 100644
index 76c52a0..0000000
--- a/abs/extra-testing/tightvnc/tightvnc-fontpath-xcolors.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- vnc_unixsrc/vncserver.orig	2010-03-26 22:11:23.000000000 +0000
-+++ vnc_unixsrc/vncserver	2010-03-26 22:14:58.000000000 +0000
-@@ -34,9 +34,9 @@
- $desktopName = "X";
- $vncClasses = "/usr/local/vnc/classes";
- $vncUserDir = "$ENV{HOME}/.vnc";
--$fontPath = "unix/:7100";
-+$fontPath = "/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/";
-+$colorPath = "/usr/share/X11/rgb";
- $authType = "-rfbauth $vncUserDir/passwd";
--
- # Read configuration from the system-wide and user files if present.
- 
- $configFile = "/etc/tightvncserver.conf";
diff --git a/abs/extra-testing/tree/PKGBUILD b/abs/extra-testing/tree/PKGBUILD
deleted file mode 100644
index 8a26dbf..0000000
--- a/abs/extra-testing/tree/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 13718 2008-09-27 22:49:14Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-#
-
-pkgname=tree
-pkgver=1.5.2.1
-pkgrel=2
-pkgdesc="A directory listing program displaying a depth indented list of files"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('glibc')
-source=(ftp://mama.indstate.edu/linux/tree/$pkgname-$pkgver.tgz)
-md5sums=('73d5fa220dfef1ee9c1876c3966f1c18')
-url="http://mama.indstate.edu/users/ice/tree/"
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  make || return 1
-  make prefix=$startdir/pkg/usr MANDIR=$startdir/pkg/usr/share/man/man1 install
-}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/abs/extra-testing/ttf-ms-fonts/PKGBUILD b/abs/extra-testing/ttf-ms-fonts/PKGBUILD
deleted file mode 100644
index 00fd09d..0000000
--- a/abs/extra-testing/ttf-ms-fonts/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: dale <dale@archlinux.org>
-pkgname=ttf-ms-fonts
-pkgver=2.0
-pkgrel=1
-pkgdesc="Un-extracted TTF Fonts from Microsoft"
-arch=(i686 x86_64)
-url="http://corefonts.sourceforge.net/"
-sfpath="http://heanet.dl.sourceforge.net/sourceforge/corefonts/"
-depends=(cabextract xorg-fonts-encodings xorg-font-utils fontconfig)
-install=ttf-ms-fonts.install
-source=($sfpath/andale32.exe $sfpath/arial32.exe $sfpath/arialb32.exe \
-        $sfpath/comic32.exe $sfpath/courie32.exe $sfpath/georgi32.exe \
-        $sfpath/impact32.exe $sfpath/times32.exe $sfpath/trebuc32.exe \
-        $sfpath/verdan32.exe $sfpath/webdin32.exe $sfpath/wd97vwr32.exe)
-md5sums=('cbdc2fdd7d2ed0832795e86a8b9ee19a' '9637df0e91703179f0723ec095a36cb5'\
-         'c9089ae0c3b3d0d8c4b0a95979bb9ff0' '2b30de40bb5e803a0452c7715fc835d1'\
-         '4e412c772294403ab62fb2d247d85c60' '4d90016026e2da447593b41a8d8fa8bd'\
-         '7907c7dd6684e9bade91cff82683d9d7' 'ed39c8ef91b9fb80f76f702568291bd5'\
-         '0d7ea16cac6261f8513a061fbfcdb2b5' '12d2a75f8156e10607be1eaa8e8ef120'\
-         '230a1d13a365b22815f502eb24d9149b' 'efa72d3ed0120a07326ce02f051e9b42')
-
-build() {
-  mkdir -p $startdir/pkg/tmp/${pkgname}
-  chmod 1777 $startdir/pkg/tmp
-  install -m644 $startdir/src/*.exe $startdir/pkg/tmp/$pkgname
-}
diff --git a/abs/extra-testing/ttf-ms-fonts/ttf-ms-fonts.install b/abs/extra-testing/ttf-ms-fonts/ttf-ms-fonts.install
deleted file mode 100644
index 043cd88..0000000
--- a/abs/extra-testing/ttf-ms-fonts/ttf-ms-fonts.install
+++ /dev/null
@@ -1,55 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  echo -n "extracting fonts... "
-  for font in tmp/ttf-ms-fonts/*.exe
-  do
-        cabextract --lowercase --directory=tmp/ttf-ms-fonts/ $font -F '*.ttf' >/dev/null 2>&1
-  done
-  cabextract --lowercase --directory=tmp/ttf-ms-fonts/ tmp/ttf-ms-fonts/wd97vwr32.exe -F '*.cab' >/dev/null 2>&1
-  cabextract --lowercase --directory=tmp/ttf-ms-fonts/ tmp/ttf-ms-fonts/viewer1.cab -F '*.ttf' >/dev/null 2>&1
-  mkdir -p usr/share/fonts/TTF
-  : >usr/share/fonts/TTF/msfonts.txt
-  for i in `/bin/ls tmp/ttf-ms-fonts/*.ttf`; do
-    echo `basename $i` >>usr/share/fonts/TTF/msfonts.txt
-    cp $i usr/share/fonts/TTF
-  done
-  echo "done."
-  echo -n "rebuilding font cache... "
-  fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/TTF
-  mkfontdir /usr/share/fonts/TTF
-  echo "done."
-  rm -rf tmp/ttf-ms-fonts
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  # remove fonts from their old location
-  rm -rf usr/X11R6/lib/X11/fonts/ttf-ms-fonts
-  post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  #rm -f usr/X11R6/lib/X11/fonts/TTF/
-  [ -f usr/share/fonts/TTF/msfonts.txt ] || return
-  for i in `cat usr/share/fonts/TTF/msfonts.txt`; do
-    rm -f usr/share/fonts/TTF/$i
-  done
-  rm -f usr/share/fonts/TTF/msfonts.txt
-}
-
-# arg 1:  the old package version
-post_remove() {
-  echo -n "rebuilding font cache... "
-  fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/TTF
-  mkfontdir /usr/share/fonts/TTF
-  echo "done."
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/abs/extra-testing/unetbootin/PKGBUILD b/abs/extra-testing/unetbootin/PKGBUILD
deleted file mode 100644
index f676000..0000000
--- a/abs/extra-testing/unetbootin/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Godane aka Christopher Rogers <slaxemulator@gmail.com>
-pkgname=unetbootin
-pkgver=408
-pkgrel=1
-pkgdesc="UNetbootin allows for the installation of various Linux/BSD livecd distributions to a partition or USB drive."
-url="http://unetbootin.sourceforge.net/"
-license="GPL"
-arch=('i686' 'x86_64')
-depends=('syslinux' 'p7zip' 'qt')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-source-$pkgver.tar.gz)
-md5sums=('f248706e979a39d8799621e393912906')
-
-build() {
-	cd $startdir/src/
-	sed -i '/^RESOURCES/d' unetbootin.pro
-	lupdate unetbootin.pro
-	lrelease unetbootin.pro
-	qmake "DEFINES += NOSTATIC" "RESOURCES -= unetbootin.qrc"
-	make
-	mkdir -p $pkgdir/usr/sbin
-	install -m 744 $pkgname $pkgdir/usr/sbin/$pkgname
-	mkdir -p $pkgdir/usr/share/$pkgname
-	install -m 644 unetbootin_*.qm $pkgdir/usr/share/$pkgname
-	mkdir -p $pkgdir/usr/share/applications/
-	install -m 644 $pkgname.desktop $pkgdir/usr/share/applications/
-	sed -i 's|Exec=/usr/bin/unetbootin|Exec=su -c /usr/sbin/unetbootin|g' $pkgdir/usr/share/applications/$pkgname.desktop
-	sed -i 's|Terminal=false|Terminal=true|g' $pkgdir/usr/share/applications/$pkgname.desktop
-}
diff --git a/abs/extra-testing/unison/PKGBUILD b/abs/extra-testing/unison/PKGBUILD
deleted file mode 100644
index 6b3dc00..0000000
--- a/abs/extra-testing/unison/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 57697 2009-11-01 15:08:02Z tpowa $
-#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=unison
-pkgver=2.32.52
-pkgrel=1
-pkgdesc="Unison is a file-synchronization tool"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://www.cis.upenn.edu/~bcpierce/unison"
-depends=('glibc')
-#makedepends=('ocaml' 'lablgtk' 'lablgtk2' 'imagemagick')
-#makedepends=('ocaml' 'imagemagick')
-makedepends=('ocaml' )
-source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz \
-        $pkgname.desktop)
-options=(!makeflags)
-install=unison.install
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  CFLAGS=""
-  make clean
-  make UISTYLE=text DEBUGGING=false THREADS=true || return 1
-  mkdir -p $startdir/pkg/usr/bin 
-  install -Dm755 unison $startdir/pkg/usr/bin/unison
- # clean the builddir and rebuild with gtk support
-#  make clean
-#  make UISTYLE=gtk DEBUGGING=false THREADS=true || return 1
-#  install -Dm755 unison $startdir/pkg/usr/bin/unison-gtk
- # clean the builddir and rebuild with gtk2 support
-#  make clean
-#  make UISTYLE=gtk2 DEBUGGING=false THREADS=true || return 1
-#  install -Dm755 unison $startdir/pkg/usr/bin/unison-gtk2
- # install a .desktop file; create a compliant icon from ico file and install the png
- # install -Dm644 ../$pkgname.desktop $startdir/pkg/usr/share/applications/$pkgname.desktop
- # convert win32rc/U.ico unison.png
- # install -Dm644 ${pkgname}-1.png  $startdir/pkg/usr/share/pixmaps/$pkgname.png
- # make symlink for .desktop file
- # cd $startdir/pkg//usr/bin
- # ln -s unison-gtk2 unison-x11
-}
-md5sums=('0701f095c1721776a0454b94607eda48'
-         '2daecba7705455a8e4b769e48b059872')
diff --git a/abs/extra-testing/unison/unison.desktop b/abs/extra-testing/unison/unison.desktop
deleted file mode 100644
index 3a7e1d7..0000000
--- a/abs/extra-testing/unison/unison.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=unison
-Name[de]=unison
-Comment=File synchronisation tool for X11
-Comment[de]=Datei Abgleicher und Synchronisierer
-TryExec=unison-x11
-Exec=unison-x11
-Terminal=false
-Type=Application
-Categories=GTK;Application;Network;
-Icon=unison.png
-StartupNotify=true
diff --git a/abs/extra-testing/unison/unison.install b/abs/extra-testing/unison/unison.install
deleted file mode 100644
index 70e70b0..0000000
--- a/abs/extra-testing/unison/unison.install
+++ /dev/null
@@ -1,32 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  echo "NOTE:"
-  echo "  For gtk1 frontend please add 'gtk' package."
-  echo "  For gtk2 frontend please add 'gtk2' package."
-  echo "  Default X11 frontend is set to gtk2. "
-  echo ""
-  echo "  If you want to default to gtk1 unison:" 
-  echo "  'rm /usr/bin/unison-x11'"
-  echo "  'ln -s /usr/bin/unison-gtk /usr/bin/unison-x11'"
-  echo ""
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
- post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/unixodbc/PKGBUILD b/abs/extra-testing/unixodbc/PKGBUILD
deleted file mode 100644
index b8c2690..0000000
--- a/abs/extra-testing/unixodbc/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 9389 2008-08-17 06:44:49Z allan $
-# Maintainer: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=unixodbc
-pkgver=2.2.12
-pkgrel=2
-pkgdesc="ODBC is an open specification for providing application developers with a predictable API with which to access Data Sources"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://www.unixodbc.org/"
-backup=('etc/odbc.ini' 'etc/odbcinst.ini')
-depends=('readline')
-source=(http://www.unixodbc.org/unixODBC-$pkgver.tar.gz)
-md5sums=('9a116aad4059c31d231b626ffdf1869a')
-
-build() {
-  cd $startdir/src/unixODBC-$pkgver
-  sed -i 's/YY_FLUSH_BUFFER/yy_flush_buffer(YY_CURRENT_BUFFER)/' sqp/lex.l
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-gui=no
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  find $startdir/pkg -name '*.la' -exec rm {} \;
-}
diff --git a/abs/extra-testing/v4l-dvb-dvico2/PKGBUILD b/abs/extra-testing/v4l-dvb-dvico2/PKGBUILD
deleted file mode 100644
index 4886027..0000000
--- a/abs/extra-testing/v4l-dvb-dvico2/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $
-# Maintainer: Cecil Watson<knoppmyth@gmail.com>
-
-pkgname=v4l-dvb-dvico2
-_kernver=2.6.28-ARCH
-pkgver=1
-pkgrel=1
-pkgdesc="V4L-DVB drivers from mercurial for some dvico cards."
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://linuxtv.org/"
-depends=('kernel26')
-makedepends=(kernel-headers)
-install=v4l-dvb.install
-source=(http://linuxtv.org/hg/v4l-dvb/archive/401393656ebc.tar.bz2)
-
-build() {
-  cd $startdir/src/v4l*
-  make KERNDIR=/lib/modules/$_kernver/build \
-  DESTDIR=$startdir/pkg KERNELRELEASE=$_kernver all || return 1
-  make KERNDIR=/lib/modules/$_kernver/build \
-  DESTDIR=$startdir/pkg KERNELRELEASE=$_kernver install || return 1
-  rm -fr $startdir/pkg/lib/modules/$_kernver/modules*
-}
diff --git a/abs/extra-testing/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch b/abs/extra-testing/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch
deleted file mode 100644
index 8c603f6..0000000
--- a/abs/extra-testing/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Andrew Morton <akpm@linux-foundation.org>
-
-drivers/media/video/tvaudio.c:147: error: conflicting type qualifiers for 'addr_data'
-include/media/v4l2-i2c-drv-legacy.h:37: error: previous declaration of 'addr_data' was here
-
-Cc: Jean Delvare <khali@linux-fr.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
----
-
- include/media/v4l2-i2c-drv-legacy.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff -puN include/media/v4l2-i2c-drv-legacy.h~fix-jdelvare-i2c-i2c-constify-client-address-data include/media/v4l2-i2c-drv-legacy.h
---- a/include/media/v4l2-i2c-drv-legacy.h~fix-jdelvare-i2c-i2c-constify-client-address-data
-+++ a/include/media/v4l2-i2c-drv-legacy.h
-@@ -34,7 +34,7 @@ struct v4l2_i2c_driver_data {
- };
- 
- static struct v4l2_i2c_driver_data v4l2_i2c_data;
--static struct i2c_client_address_data addr_data;
-+static const struct i2c_client_address_data addr_data;
- static struct i2c_driver v4l2_i2c_driver_legacy;
- static char v4l2_i2c_drv_name_legacy[32];
- 
-_
diff --git a/abs/extra-testing/v4l-dvb-dvico2/v4l-dvb.install b/abs/extra-testing/v4l-dvb-dvico2/v4l-dvb.install
deleted file mode 100644
index c87bb82..0000000
--- a/abs/extra-testing/v4l-dvb-dvico2/v4l-dvb.install
+++ /dev/null
@@ -1,23 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  KERNEL_VERSION='2.6.26-ARCH'
-  depmod -ae -v $KERNEL_VERSION  > /dev/null 2>&1                
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  KERNEL_VERSION='2.6.26-ARCH'
-  depmod -ae -v $KERNEL_VERSION  > /dev/null 2>&1        
-
-}
-
-# arg 1:  the old package version
-post_remove() {
-  KERNEL_VERSION='2.6.26-ARCH'
-  depmod -ae -v $KERNEL_VERSION  > /dev/null 2>&1        
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/v4l-dvb-dvico2/xc-bluebird.patch b/abs/extra-testing/v4l-dvb-dvico2/xc-bluebird.patch
deleted file mode 100644
index c54594d..0000000
--- a/abs/extra-testing/v4l-dvb-dvico2/xc-bluebird.patch
+++ /dev/null
@@ -1,896 +0,0 @@
-[PATCH] Add support for FusionHDTV DVB-T NANO 2 / Dual Digital 4
-
-Firmware required:
-
-Mirror 1: http://konstantin.filtschew.de/v4l-firmware/
-
-Mirror 2: http://www.tuxamito.com.es/em2880/
-
-This patch is for users, and NOT meant to be merged into the kernel.
-
-For AU support, apply Rogers patch afterwards:
-http://linuxtv.org/~mkrufky/pending/xc/dd4.au.patch
-
-From: Michael Krufky <mkrufky@linuxtv.org>
----
- linux/drivers/media/dvb/dvb-usb/cxusb.c       |  157 +++++++
- linux/drivers/media/dvb/dvb-usb/cxusb.h       |    2 
- linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h |    2 
- linux/drivers/media/dvb/frontends/Kconfig     |    7 
- linux/drivers/media/dvb/frontends/Makefile    |    1 
- linux/drivers/media/dvb/frontends/xc3028-fe.c |  532 ++++++++++++++++++++++++++
- linux/drivers/media/dvb/frontends/xc3028.h    |   56 ++
- v4l/versions.txt                              |    1 
- 8 files changed, 757 insertions(+), 1 deletion(-)
-
---- v4l-dvb.orig/linux/drivers/media/dvb/dvb-usb/cxusb.c
-+++ v4l-dvb/linux/drivers/media/dvb/dvb-usb/cxusb.c
-@@ -30,6 +30,7 @@
- #include "mt352.h"
- #include "mt352_priv.h"
- #include "zl10353.h"
-+#include "xc3028.h"
- 
- /* debug */
- int dvb_usb_cxusb_debug;
-@@ -72,6 +73,28 @@
- 	st->gpio_write_state[GPIO_TUNER] = onoff;
- }
- 
-+static void cxusb_bluebird_gpio(struct dvb_usb_device *d, u8 pin)
-+{
-+	u8 o[2],i;
-+
-+	o[0] = 0xff & ~pin;
-+	o[1] = 0x00;
-+
-+	cxusb_ctrl_msg(d, CMD_BLUEBIRD_GPIO_WRITE, o, 2, &i, 1);
-+	msleep(140);
-+
-+	if ((i & pin) != 0x00)
-+		deb_info("gpio_write failed.\n");
-+
-+	o[1] = pin;
-+
-+	cxusb_ctrl_msg(d, CMD_BLUEBIRD_GPIO_WRITE, o, 2, &i, 1);
-+	msleep(140);
-+
-+	if ((i & pin) != pin)
-+		deb_info("gpio_write failed.\n");
-+}
-+
- /* I2C */
- static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
- 			  int num)
-@@ -351,6 +374,64 @@
- 	.demod_init    = cxusb_mt352_demod_init,
- };
- 
-+static struct zl10353_config cxusb_zl10353_dualdig4_config = {
-+	.demod_address = 0x0f,
-+	.no_tuner = 1,
-+	.parallel_ts = 1,
-+};
-+
-+struct bcode {
-+	int reg;
-+	char *txt;
-+	int len;
-+	int delay;
-+};
-+
-+static int cxusb_xc3028_zl353_gpio_reset(struct dvb_frontend* fe, int ptr)
-+{
-+	struct dvb_usb_adapter *adap = fe->dvb->priv;
-+	struct dvb_usb_device *d = adap->dev;
-+	int j;
-+	struct bcode zlconf[] = {
-+		/* borrowed from em2880-dvb
-+		 * this should be fixed in zl10353.c instead */
-+		{0x1e,"\x60\x00",2,0},
-+		{0x1e,"\x61\x4d",2,0},
-+
-+		{0x1e,"\x50\x0b",2,0},
-+		{0x1e,"\x51\x44",2,0},
-+		{0x1e,"\x52\x46",2,0},
-+		{0x1e,"\x53\x15",2,0},
-+		{0x1e,"\x54\x0f",2,0},
-+		{0x1e,"\x5e\x00",2,0},
-+		{0x1e,"\x5f\x12",2,0},
-+
-+
-+		{0x1e,"\x55\x80",2,0}, /* reset */
-+		{0x1e,"\xea\x01",2,0},
-+		{0x1e,"\xea\x00",2,0},
-+		{0x1e,"\x5a\xcd",2,0},
-+
-+
-+		{0x1e,"\x6c\xe6",2,0}, // set input frequency
-+		{0x1e,"\x6d\x09",2,0},
-+		{}
-+	};
-+
-+	if (ptr == 0 || ptr == 1)
-+		/* pulse the GPIO tuner reset pin  */
-+		cxusb_bluebird_gpio(d,0x01);
-+	else if (ptr == 2)
-+		for(j = 0; zlconf[j].txt; j++)
-+			d->adapter[0].fe->ops.write(d->adapter[0].fe, zlconf[j].txt,zlconf[j].len);
-+
-+	return 0;
-+}
-+
-+static struct xc3028_config cxusb_xc3028_config = {
-+	.gpio_reset = cxusb_xc3028_zl353_gpio_reset,
-+};
-+
- /* Callbacks for DVB USB */
- static int cxusb_fmd1216me_tuner_attach(struct dvb_usb_adapter *adap)
- {
-@@ -386,6 +467,12 @@
- 	return 0;
- }
- 
-+static int cxusb_xc3028_tuner_attach(struct dvb_usb_adapter *adap)
-+{
-+	dvb_attach(xc3028_attach,adap->fe, &adap->dev->i2c_adap, &cxusb_xc3028_config);
-+	return 0;
-+}
-+
- static int cxusb_cx22702_frontend_attach(struct dvb_usb_adapter *adap)
- {
- 	u8 b;
-@@ -401,6 +488,24 @@
- 	return -EIO;
- }
- 
-+static int cxusb_dualdig4_frontend_attach(struct dvb_usb_adapter *adap)
-+{
-+	if (usb_set_interface(adap->dev->udev, 0, 1) < 0)
-+		err("set interface failed");
-+
-+	cxusb_ctrl_msg(adap->dev, CMD_DIGITAL, NULL, 0, NULL, 0);
-+
-+	/* pulse the GPIO demod reset pin  */
-+	cxusb_bluebird_gpio(adap->dev,0x02);
-+
-+	if ((adap->fe = dvb_attach(zl10353_attach,
-+				   &cxusb_zl10353_dualdig4_config,
-+				   &adap->dev->i2c_adap)) != NULL)
-+		return 0;
-+
-+	return -EIO;
-+}
-+
- static int cxusb_lgdt3303_frontend_attach(struct dvb_usb_adapter *adap)
- {
- 	if (usb_set_interface(adap->dev->udev, 0, 7) < 0)
-@@ -479,6 +584,7 @@
- static struct dvb_usb_device_properties cxusb_bluebird_dee1601_properties;
- static struct dvb_usb_device_properties cxusb_bluebird_lgz201_properties;
- static struct dvb_usb_device_properties cxusb_bluebird_dtt7579_properties;
-+static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_properties;
- 
- static int cxusb_probe(struct usb_interface *intf,
- 		       const struct usb_device_id *id)
-@@ -487,7 +593,8 @@
- 		dvb_usb_device_init(intf,&cxusb_bluebird_lgh064f_properties,THIS_MODULE,NULL) == 0 ||
- 		dvb_usb_device_init(intf,&cxusb_bluebird_dee1601_properties,THIS_MODULE,NULL) == 0 ||
- 		dvb_usb_device_init(intf,&cxusb_bluebird_lgz201_properties,THIS_MODULE,NULL) == 0 ||
--		dvb_usb_device_init(intf,&cxusb_bluebird_dtt7579_properties,THIS_MODULE,NULL) == 0) {
-+		dvb_usb_device_init(intf,&cxusb_bluebird_dtt7579_properties,THIS_MODULE,NULL) == 0 ||
-+		dvb_usb_device_init(intf,&cxusb_bluebird_dualdig4_properties,THIS_MODULE,NULL) == 0) {
- 		return 0;
- 	}
- 
-@@ -508,6 +615,8 @@
- 	{ USB_DEVICE(USB_VID_DVICO, USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM) },
- 	{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_2_COLD) },
- 	{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM) },
-+	{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_4) },
-+	{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DVBT_NANO_2) },
- 	{}		/* Terminating entry */
- };
- MODULE_DEVICE_TABLE (usb, cxusb_table);
-@@ -766,6 +875,52 @@
- 	}
- };
- 
-+static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_properties = {
-+	.caps = DVB_USB_IS_AN_I2C_ADAPTER,
-+
-+	.usb_ctrl          = CYPRESS_FX2,
-+
-+	.size_of_priv     = sizeof(struct cxusb_state),
-+
-+	.num_adapters = 1,
-+	.adapter = {
-+		{
-+			.streaming_ctrl   = cxusb_streaming_ctrl,
-+			.frontend_attach  = cxusb_dualdig4_frontend_attach,
-+			.tuner_attach     = cxusb_xc3028_tuner_attach,
-+			/* parameter for the MPEG2-data transfer */
-+			.stream = {
-+				.type = USB_BULK,
-+				.count = 5,
-+				.endpoint = 0x02,
-+				.u = {
-+					.bulk = {
-+						.buffersize = 8192,
-+					}
-+				}
-+			},
-+		},
-+	},
-+
-+	.power_ctrl       = cxusb_bluebird_power_ctrl,
-+
-+	.i2c_algo         = &cxusb_i2c_algo,
-+
-+	.generic_bulk_ctrl_endpoint = 0x01,
-+
-+	.num_device_descs = 2,
-+	.devices = {
-+		{   "DViCO FusionHDTV DVB-T Dual Digital 4",
-+			{ NULL },
-+			{ &cxusb_table[13], NULL },
-+		},
-+		{   "DViCO FusionHDTV DVB-T NANO2",
-+			{ NULL },
-+			{ &cxusb_table[14], NULL },
-+		},
-+	}
-+};
-+
- static struct usb_driver cxusb_driver = {
- #if LINUX_VERSION_CODE <=  KERNEL_VERSION(2,6,15)
- 	.owner		= THIS_MODULE,
---- v4l-dvb.orig/linux/drivers/media/dvb/dvb-usb/cxusb.h
-+++ v4l-dvb/linux/drivers/media/dvb/dvb-usb/cxusb.h
-@@ -28,6 +28,8 @@
- #define CMD_ANALOG        0x50
- #define CMD_DIGITAL       0x51
- 
-+#define CMD_BLUEBIRD_GPIO_WRITE 0x05
-+
- struct cxusb_state {
- 	u8 gpio_write_state[3];
- };
---- v4l-dvb.orig/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
-+++ v4l-dvb/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
-@@ -142,6 +142,8 @@
- #define USB_PID_DVICO_BLUEBIRD_DUAL_1_WARM		0xdb51
- #define USB_PID_DVICO_BLUEBIRD_DUAL_2_COLD		0xdb58
- #define USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM		0xdb59
-+#define USB_PID_DVICO_BLUEBIRD_DUAL_4			0xdb78
-+#define USB_PID_DVICO_BLUEBIRD_DVBT_NANO_2		0xdb70
- #define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_COLD		0xdb54
- #define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM		0xdb55
- #define USB_PID_MEDION_MD95700				0x0932
---- v4l-dvb.orig/linux/drivers/media/dvb/frontends/Kconfig
-+++ v4l-dvb/linux/drivers/media/dvb/frontends/Kconfig
-@@ -353,6 +353,13 @@
- 	  This device is only used inside a SiP called togther with a
- 	  demodulator for now.
- 
-+config DVB_XC3028
-+	tristate "Xceive XC3028 silicon tuner"
-+	depends on I2C
-+	default m if DVB_FE_CUSTOMISE
-+	help
-+	  A driver for the silicon tuner XC3028 from Xceive.
-+
- comment "Miscellaneous devices"
- 	depends on DVB_CORE
- 
---- v4l-dvb.orig/linux/drivers/media/dvb/frontends/Makefile
-+++ v4l-dvb/linux/drivers/media/dvb/frontends/Makefile
-@@ -4,6 +4,7 @@
- 
- EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/
- 
-+obj-$(CONFIG_DVB_XC3028) += xc3028-fe.o
- obj-$(CONFIG_DVB_PLL) += dvb-pll.o
- obj-$(CONFIG_DVB_STV0299) += stv0299.o
- obj-$(CONFIG_DVB_SP8870) += sp8870.o
---- /dev/null
-+++ v4l-dvb/linux/drivers/media/dvb/frontends/xc3028-fe.c
-@@ -0,0 +1,532 @@
-+/*
-+
-+   Xceive -  xc3028 tuner interface (Firmware 2.7)
-+
-+   Copyright (c) 2007 Michael Krufky <mkrufky@linuxtv.org>
-+   Copyright (c) 2006 Markus Rechberger <mrechberger@gmail.com>
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+
-+*/
-+
-+#include <linux/i2c.h>
-+#include "compat.h"
-+#include <linux/firmware.h>
-+#include <linux/delay.h>
-+#include <media/tuner.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-+#include "i2c-compat.h"
-+#endif
-+#include "dvb_frontend.h"
-+#include "xc3028.h"
-+
-+
-+struct xc3028_priv {
-+	u8 tuning_code[12];
-+	enum v4l2_tuner_type type;
-+	v4l2_std_id std;
-+	//	unsigned int mode;
-+
-+	struct xc3028_config *cfg;
-+
-+	struct i2c_adapter *i2c_adap;
-+	u32 frequency;
-+	int bandwidth;
-+};
-+
-+MODULE_DESCRIPTION("Xceive xc3028 dvb frontend driver");
-+MODULE_AUTHOR("Michael Krufky <mkrufky@linuxtv.org>");
-+MODULE_AUTHOR("Markus Rechberger <mrechberger@gmail.com>");
-+MODULE_LICENSE("GPL");
-+
-+
-+/* hack */
-+#define V4L2_TUNER_DVBT_TV 19
-+#define V4L2_TUNER_DVBC_TV 29
-+#define V4L2_TUNER_ATSC_TV 39
-+
-+/* firmware functions */
-+#define XC3028_BYTECODE 0
-+#define XC3028_RESET 1
-+#define XC3028_SLEEP 2
-+
-+#define XC3028_BW8MHZ 0
-+#define XC3028_BW7MHZ 1
-+#define XC3028_BW6MHZ 2
-+#define XC3028_ATSC_BW6MHZ 3
-+#define XC3028_RADIO  4
-+
-+
-+#define XC3028_ANALOGUE_FW "xc3028_init0.i2c.fw"
-+#define XC3028_DIGITAL_FW  "xc3028_8MHz_init0.i2c.fw"
-+#define XC3028_RADIO_FW    "xc3028_FM_init0.i2c.fw"
-+#define XC3028_SPECIFIC_RADIO_FW "xc3028_specific_radio.fw"
-+
-+#define TUNING_GRANULARITY      15625
-+
-+static int firmware_loader(struct dvb_frontend *fe, const struct firmware *fw);
-+static int upload_firmware(struct dvb_frontend *fe);
-+static int xc3028_set_mode(struct dvb_frontend *fe, enum v4l2_tuner_type type);
-+
-+static struct _analogue_standards{
-+	v4l2_std_id standard;
-+	u8 filename[50];
-+} xc3028_standards[]={
-+	{V4L2_STD_PAL_BG,"xc3028_BG_PAL_A2_A.i2c.fw"},
-+	{V4L2_STD_PAL_I,"xc3028_I_PAL_NICAM.i2c.fw"},
-+	{V4L2_STD_PAL_DK,"xc3028_DK_PAL_A2.i2c.fw"},
-+	{V4L2_STD_MN,"xc3028_MN_NTSCPAL_A2.i2c.fw"},
-+	{V4L2_STD_PAL,  "xc3028_BG_PAL_A2_A.i2c.fw"},
-+
-+	{V4L2_STD_SECAM_DK,"xc3028_DK_SECAM_A2_DK1.i2c.fw"},
-+	{V4L2_STD_SECAM_L,"xc3028_L_SECAM_NICAM.i2c.fw"},
-+	{V4L2_STD_SECAM_LC,"xc3028_L'_SECAM_NICAM.i2c.fw"},
-+	{V4L2_STD_SECAM_K1,"xc3028_DK_SECAM_A2_DK1.i2c.fw"},
-+};
-+
-+/* TODO: add the other standards here
-+   The linux DVB framework sends us following values
-+   from 0..2 to set up the correct channel bandwidth
-+
-+   0 ... 8 mhz
-+   1 ... 7 mhz
-+   2 ... 6 mhz
-+
-+   we do not have any settings for 6MHz at least I haven't found one,
-+   feel free to complete this list
-+
-+ */
-+
-+static struct _digital_standards{
-+	unsigned int dvb:1;
-+	unsigned int atsc:1;
-+	int bandwidth;
-+	char filename[50];
-+} xc3028_dtv_standards[]={
-+	{1, 0, XC3028_BW8MHZ /* 8mhz  */, "xc3028_DTV8_2633.i2c.fw"     },
-+	{1, 0, XC3028_BW7MHZ /* 7mhz  */, "xc3028_DTV7_2633.i2c.fw"  },
-+	    /* 2    6mhz  */
-+	{0, 1, 0 /* ????  */, "xc3028_DTV6_ATSC_2620.i2c.fw"},
-+	{0, 1, 1 /* ????  */, "xc3028_DTV6_ATSC_2620.i2c.fw"},
-+	{0, 1, XC3028_ATSC_BW6MHZ, "xc3028_DTV6_ATSC_2620.i2c.fw"},
-+};
-+
-+/* ---------------------------------------------------------------------- */
-+#define XC3028_I2C_ADDR 0x61
-+
-+static int xc3028_i2c_xfer(struct i2c_adapter* adap, char *buf, int len)
-+{
-+	int ret;
-+	struct i2c_msg msg = { .addr = XC3028_I2C_ADDR, .flags = 0,
-+			       .buf = buf, .len = len };
-+
-+	ret = i2c_transfer(adap, &msg, 1);
-+
-+	/* If everything went ok (i.e. 1 msg transmitted), return #bytes
-+	   transmitted, else error code. */
-+	return (ret == 1) ? len : ret;
-+}
-+
-+/* ---------------------------------------------------------------------- */
-+
-+static int xc3028_set_params(struct dvb_frontend *fe,
-+			     struct dvb_frontend_parameters *params)
-+{
-+	struct xc3028_priv *priv = fe->tuner_priv;
-+	const struct firmware *fw = NULL;
-+	unsigned char chanbuf[4];
-+	unsigned long frequency=0;
-+	unsigned long value;
-+	int bandwidth;
-+	int i;
-+	enum v4l2_tuner_type type;
-+
-+	if (fe->ops.info.type == FE_ATSC) {
-+		type = V4L2_TUNER_ATSC_TV;
-+	} else { // if (fe->ops.info.type == FE_OFDM)
-+		type = V4L2_TUNER_DVBT_TV;
-+	}
-+
-+	xc3028_set_mode(fe, type);
-+
-+	if (priv->type == V4L2_TUNER_ATSC_TV) {
-+		bandwidth = XC3028_ATSC_BW6MHZ;
-+	} else {
-+		bandwidth = params->u.ofdm.bandwidth;
-+	}
-+
-+	if (priv->bandwidth != bandwidth) {
-+		switch(bandwidth) {
-+		case -1:
-+			/* analogue */
-+			priv->bandwidth = bandwidth;
-+			break;
-+		case XC3028_ATSC_BW6MHZ:
-+			for (i = 0; i < ARRAY_SIZE(xc3028_dtv_standards); i++) {
-+				if (xc3028_dtv_standards[i].bandwidth == XC3028_ATSC_BW6MHZ) {
-+					printk("Loading 6MHz Bandwidth settings: %s\n",xc3028_dtv_standards[i].filename);
-+					if (request_firmware(&fw, xc3028_dtv_standards[i].filename, &priv->i2c_adap->dev) == 0) {
-+						if (firmware_loader(fe,fw) != 0) {
-+							release_firmware(fw);
-+							printk("xc3028-tuner.c: error uploading firmware!\n");
-+							return -EINVAL;
-+						}
-+						release_firmware(fw);
-+						break;
-+					} else
-+						printk("Loading firmware from file failed!\n");
-+				}
-+			}
-+			priv->bandwidth = bandwidth;
-+			break;
-+		case XC3028_BW8MHZ: /* 8 MHz */
-+			for (i = 0; i < ARRAY_SIZE(xc3028_dtv_standards); i++) {
-+				if (xc3028_dtv_standards[i].bandwidth == XC3028_BW8MHZ) {
-+					printk("Loading 8MHz Bandwidth settings: %s\n",xc3028_dtv_standards[i].filename);
-+					if (request_firmware(&fw, xc3028_dtv_standards[i].filename, &priv->i2c_adap->dev) == 0) {
-+						if (firmware_loader(fe,fw) != 0) {
-+							release_firmware(fw);
-+							printk("xc3028-tuner.c: error uploading firmware!\n");
-+							return -EINVAL;
-+						}
-+						release_firmware(fw);
-+						break;
-+					} else
-+						printk("Loading firmware from file failed!\n");
-+				}
-+			}
-+			priv->bandwidth = bandwidth;
-+			break;
-+		case XC3028_BW7MHZ: /* 7 MHz */
-+			for (i = 0; i < ARRAY_SIZE(xc3028_dtv_standards); i++) {
-+				if (xc3028_dtv_standards[i].bandwidth == XC3028_BW7MHZ) {
-+					printk("Loading 7MHz Bandwidth settings: %s\n",xc3028_dtv_standards[i].filename);
-+					if (request_firmware(&fw, xc3028_dtv_standards[i].filename, &priv->i2c_adap->dev) == 0) {
-+						if (firmware_loader(fe,fw) != 0) {
-+							release_firmware(fw);
-+							printk("xc3028-tuner.c: error uploading firmware!\n");
-+							return -EINVAL;
-+						}
-+						release_firmware(fw);
-+						break;
-+					} else
-+						printk("Loading firmware from file failed!\n");
-+				}
-+			}
-+			priv->bandwidth = bandwidth;
-+			break;
-+		default:
-+			printk("xc3028-tuner.c: sorry [%d] bandwidth isn't supported (please report)\n",bandwidth);
-+		}
-+	}
-+	/* TODO: 7 MHz (1) has the same offset as 8 MHz -- this depends on the used firmware */
-+#if 0
-+	if(t->mode == V4L2_TUNER_RADIO){
-+		frequency=(unsigned long long)f->frequency*1000/16;
-+	} else { }
-+#endif
-+	switch(bandwidth) {
-+	case XC3028_BW8MHZ:
-+	case XC3028_BW7MHZ:
-+		frequency=(unsigned long long)params->frequency-2750000;
-+		break;
-+	case XC3028_BW6MHZ:
-+	case XC3028_ATSC_BW6MHZ:
-+		frequency=(unsigned long long)params->frequency-1750000;
-+		break;
-+	default:
-+		frequency=(unsigned long long)params->frequency;
-+	}
-+
-+	value=(frequency+(TUNING_GRANULARITY/2))/TUNING_GRANULARITY;
-+	chanbuf[0]=0;
-+	chanbuf[1]=0;
-+	chanbuf[2]=(value&0xff00)>>8;
-+	chanbuf[3]=value&0x00ff;
-+
-+#if 0
-+	/* seems like it's not needed! */
-+	rc=i2c_master_send(c,"\xa0\x00\x00\x00",4);
-+	if(priv && priv->tuning_code)
-+		i2c_master_send(c,priv->tuning_code,12);
-+	else
-+		printk("ERROR: *** NO TUNING CODE SET **\n");
-+	i2c_master_send(c,"\x00\x8c",2);
-+#endif
-+	xc3028_i2c_xfer(priv->i2c_adap,"\x80\x02\x00\x00",4);
-+	xc3028_i2c_xfer(priv->i2c_adap,chanbuf,4);
-+	return 0;
-+}
-+
-+static int firmware_loader(struct dvb_frontend *fe, const struct firmware *fw)
-+{
-+	int txtlen=0;
-+	int current_ptr=0;
-+	int version;
-+	int function;
-+	int x;
-+	struct xc3028_priv *priv = fe->tuner_priv;
-+
-+	if (fw->size == 0)
-+		return -EINVAL;
-+
-+	version = fw->data[current_ptr++];
-+
-+	switch (version) {
-+	case 1:
-+		while (current_ptr < fw->size) {
-+			function = fw->data[current_ptr++];
-+			switch (function) {
-+			case XC3028_BYTECODE:
-+				txtlen = fw->data[current_ptr++];
-+				if ((current_ptr + txtlen) > fw->size)
-+					return -EINVAL;
-+				if (fw->data[current_ptr]==0x1e && txtlen == 12){
-+					memcpy(priv->tuning_code, &fw->data[current_ptr], 12);
-+				}
-+				if (txtlen != xc3028_i2c_xfer(priv->i2c_adap,&fw->data[current_ptr],txtlen)) {
-+					printk("failed: %02x| ",txtlen);
-+					for(x=0; x < txtlen; x++) {
-+						printk("%02x ",(unsigned char)fw->data[current_ptr+x]);
-+					}
-+					printk("\n");
-+				}
-+
-+				current_ptr += txtlen;
-+				break;
-+			case XC3028_RESET:
-+				x = fw->data[current_ptr++];
-+
-+				if ((priv->cfg) && (priv->cfg->gpio_reset))
-+					priv->cfg->gpio_reset(fe,x);
-+				else
-+					printk("XC3028: NO GPIO CALLBACK FUNCTION PROVIDED - SWITCHING MODES WON'T WORK (GPIO FW ARG: %d)!\n",x);
-+				break;
-+			case XC3028_SLEEP:
-+				msleep(fw->data[current_ptr++]);
-+				break;
-+			default:
-+				printk("xc3028-tuner.c: error while loading firmware!\n");
-+				return -EINVAL;
-+			}
-+		}
-+		break;
-+	default:
-+		printk("xc3028-tuner.c: Firmware Loader: Unknown firmware version (%d)\n",version);
-+		return -EINVAL;
-+	}
-+	return 0;
-+}
-+
-+static int upload_firmware(struct dvb_frontend *fe) {
-+	struct xc3028_priv *priv = fe->tuner_priv;
-+	const struct firmware *fw = NULL;
-+	int i;
-+
-+	switch (priv->type) {
-+	case V4L2_TUNER_ANALOG_TV:
-+		printk("Loading base firmware: %s\n", XC3028_ANALOGUE_FW);
-+		if (request_firmware(&fw, XC3028_ANALOGUE_FW, &priv->i2c_adap->dev) == 0) {
-+			firmware_loader(fe,fw);
-+			release_firmware(fw);
-+		} else {
-+			printk("xc3028-tuner.c: Unable to load firmware\n");
-+			printk("xc3028-tuner.c: ** PLEASE HAVE A LOOK AT **\n");
-+			printk("xc3028-tuner.c: http://linuxtv.org/v4lwiki/index.php/Talk:Em2880#Firmware\n");
-+			return -EINVAL;
-+		}
-+		for (i = 0; i < ARRAY_SIZE(xc3028_standards); i++) {
-+			if (xc3028_standards[i].standard & priv->std) {
-+				printk("%s, Loading specific analogue TV settings: %s\n",__FUNCTION__, xc3028_standards[i].filename);
-+				if (request_firmware(&fw, xc3028_standards[i].filename, &priv->i2c_adap->dev) == 0){
-+					if(firmware_loader(fe,fw)==0){
-+						release_firmware(fw);
-+						return 0;
-+					}
-+					release_firmware(fw);
-+				} else {
-+					printk("Loading configuration from file failed!\n");
-+				}
-+				break;
-+			}
-+		}
-+		printk("Loading default analogue TV settings: %s\n",xc3028_standards[0].filename);
-+		priv->std=xc3028_standards[0].standard;
-+		if (request_firmware(&fw, xc3028_standards[0].filename, &priv->i2c_adap->dev) == 0) {
-+			if (firmware_loader(fe,fw) == 0) {
-+				release_firmware(fw);
-+				return 0;
-+			}
-+			release_firmware(fw);
-+		}
-+		printk("xc3028-tuner.c: error loading firmware (analogue TV)! (please report -> mrechberger@gmail.com)\n");
-+		break;
-+	case V4L2_TUNER_DVBT_TV:
-+	case V4L2_TUNER_DVBC_TV:
-+	case V4L2_TUNER_ATSC_TV:
-+		printk("Loading base firmware: %s\n", XC3028_DIGITAL_FW);
-+		/* reset analog standard */
-+		priv->std = 0;
-+		if (request_firmware(&fw, XC3028_DIGITAL_FW, &priv->i2c_adap->dev) == 0) {
-+			firmware_loader(fe,fw);
-+			release_firmware(fw);
-+		} else {
-+			printk("xc3028-tuner.c: Unable to load firmware\n");
-+			printk("xc3028-tuner.c: ** PLEASE HAVE A LOOK AT **\n");
-+			printk("xc3028-tuner.c: http://linuxtv.org/v4lwiki/index.php/Talk:Em2880#Firmware\n");
-+			return -EINVAL;
-+		}
-+		for( i = 0; i < ARRAY_SIZE(xc3028_dtv_standards); i++) {
-+			if ((xc3028_dtv_standards[i].dvb==1 &&
-+			     xc3028_dtv_standards[i].bandwidth == priv->bandwidth) ||
-+			    (priv->type == V4L2_TUNER_ATSC_TV &&
-+			     xc3028_dtv_standards[i].atsc == 1)) {
-+				printk("Loading specific dtv settings: %s\n",xc3028_dtv_standards[i].filename);
-+				if (request_firmware(&fw, xc3028_dtv_standards[i].filename, &priv->i2c_adap->dev) == 0) {
-+					if (firmware_loader(fe,fw) == 0) {
-+						release_firmware(fw);
-+						return 0;
-+					}
-+					release_firmware(fw);
-+				}
-+			}
-+			i++;
-+		}
-+
-+		/* this gets accessed if a switchover occures, t->bandwidth will be set to -1 */
-+		printk("Loading default dtv settings: %s\n",xc3028_dtv_standards[0].filename);
-+		priv->bandwidth = xc3028_dtv_standards[0].bandwidth;
-+		if (request_firmware(&fw, xc3028_dtv_standards[0].filename, &priv->i2c_adap->dev) == 0) {
-+			if (firmware_loader(fe,fw) == 0) {
-+				release_firmware(fw);
-+				return 0;
-+			}
-+			release_firmware(fw);
-+		}
-+		printk("xc3028-tuner.c: error loading firmware (analogue TV)! (please report -> mrechberger@gmail.com)\n");
-+		break;
-+	case V4L2_TUNER_RADIO:
-+		printk("Loading base firmware: %s\n", XC3028_RADIO_FW);
-+		if (request_firmware(&fw, XC3028_RADIO_FW, &priv->i2c_adap->dev) == 0) {
-+			firmware_loader(fe,fw);
-+			release_firmware(fw);
-+		} else {
-+			printk("xc3028-tuner.c: Unable to load (radio) firmware\n");
-+			printk("xc3028-tuner.c: ** PLEASE HAVE A LOOK AT **\n");
-+			printk("xc3028-tuner.c: http://linuxtv.org/v4lwiki/index.php/Talk:Em2880#Firmware\n");
-+			return -EINVAL;
-+		}
-+		printk("%s, Loading specific radio firmware: %s\n",__FUNCTION__, XC3028_SPECIFIC_RADIO_FW);
-+		if (request_firmware(&fw, XC3028_SPECIFIC_RADIO_FW, &priv->i2c_adap->dev) == 0) {
-+			if (firmware_loader(fe,fw) == 0) {
-+				release_firmware(fw);
-+				return 0;
-+			}
-+			release_firmware(fw);
-+		} else {
-+			printk("Loading configuration from file failed!\n");
-+		}
-+		return 0;
-+	default:
-+		printk("ERROR TUNER TYPE NOT SUPPORTED (%d)\n",priv->type);
-+		return -EINVAL;
-+	}
-+
-+	printk("xc3028-tuner.c: *********************************************************\n");
-+	printk("xc3028-tuner.c: no firmware uploaded\n" );
-+	printk("xc3028-tuner.c: ** please have a look at: **\n");
-+	printk("xc3028-tuner.c: http://linuxtv.org/v4lwiki/index.php/Talk:Em2880#Firmware\n");
-+	printk("xc3028-tuner.c: *********************************************************\n");
-+
-+	return -EINVAL;
-+}
-+
-+static int xc3028_set_mode(struct dvb_frontend *fe, enum v4l2_tuner_type type)
-+{
-+	struct xc3028_priv *priv = fe->tuner_priv;
-+
-+	priv->type = type;
-+
-+	upload_firmware(fe);
-+
-+	if (priv->cfg && priv->cfg->gpio_reset && (priv->type == V4L2_TUNER_DVBT_TV ||
-+						   priv->type == V4L2_TUNER_DVBC_TV ||
-+						   priv->type == V4L2_TUNER_ATSC_TV )) {
-+		printk("xc3028-tuner.c: sending extra call for DVB-T\n");
-+		priv->cfg->gpio_reset(fe,2);
-+	}
-+
-+	return 0;
-+}
-+
-+/* dvb tuner api */
-+static int xc3028_release(struct dvb_frontend *fe)
-+{
-+	kfree(fe->tuner_priv);
-+	fe->tuner_priv = NULL;
-+	return 0;
-+}
-+
-+static int xc3028_get_frequency(struct dvb_frontend *fe, u32 *frequency)
-+{
-+	struct xc3028_priv *priv = fe->tuner_priv;
-+
-+	*frequency = priv->frequency*1000/16*1000;
-+	return 0;
-+}
-+
-+static int xc3028_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
-+{
-+	struct xc3028_priv *priv = fe->tuner_priv;
-+
-+	*bandwidth = priv->bandwidth;
-+	return 0;
-+}
-+
-+static const struct dvb_tuner_ops xc3028_tuner_ops = {
-+	.info = {
-+		.name = "Xceive XC3028",
-+#if 0
-+		.frequency_min = ,
-+		.frequency_max =
-+#endif
-+	},
-+	.release       = xc3028_release,
-+	.set_params    = xc3028_set_params,
-+	.get_frequency = xc3028_get_frequency,
-+	.get_bandwidth = xc3028_get_bandwidth,
-+};
-+
-+struct dvb_frontend *xc3028_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct xc3028_config *cfg)
-+{
-+	struct xc3028_priv *priv = kzalloc(sizeof(struct xc3028_priv),GFP_KERNEL);
-+
-+	priv->i2c_adap = i2c;
-+	priv->bandwidth=XC3028_BW8MHZ;
-+	priv->cfg = cfg;
-+
-+	memcpy(&fe->ops.tuner_ops, &xc3028_tuner_ops, sizeof(struct dvb_tuner_ops));
-+	fe->tuner_priv = priv;
-+	return fe;
-+}
-+EXPORT_SYMBOL(xc3028_attach);
-+
-+/*
-+ * Overrides for Emacs so that we follow Linus's tabbing style.
-+ * ---------------------------------------------------------------------------
-+ * Local variables:
-+ * c-basic-offset: 8
-+ * End:
-+ */
---- /dev/null
-+++ v4l-dvb/linux/drivers/media/dvb/frontends/xc3028.h
-@@ -0,0 +1,56 @@
-+  /*
-+     Header for Xceive Silicon tuners
-+
-+     (c) 2007 Michael Krufky
-+
-+     This program is free software; you can redistribute it and/or modify
-+     it under the terms of the GNU General Public License as published by
-+     the Free Software Foundation; either version 2 of the License, or
-+     (at your option) any later version.
-+
-+     This program is distributed in the hope that it will be useful,
-+     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+
-+     GNU General Public License for more details.
-+
-+     You should have received a copy of the GNU General Public License
-+     along with this program; if not, write to the Free Software
-+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+
-+  */
-+
-+#ifndef __DVB_XC3028_H__
-+#define __DVB_XC3028_H__
-+
-+#include <linux/i2c.h>
-+#include "dvb_frontend.h"
-+
-+/**
-+ * Attach a xc3028 tuner to the supplied frontend structure.
-+ *
-+ * @param fe Frontend to attach to.
-+ * @param i2c i2c adapter to use.
-+ * @param cfg config struct with gpio reset callback.
-+ * @return FE pointer on success, NULL on failure.
-+ */
-+
-+struct xc3028_config {
-+	int (*gpio_reset) (struct dvb_frontend *fe, int ptr);
-+};
-+
-+#if defined(CONFIG_DVB_XC3028) || (defined(CONFIG_DVB_XC3028_MODULE) && defined(MODULE))
-+extern struct dvb_frontend* xc3028_attach(struct dvb_frontend *fe,
-+					  struct i2c_adapter *i2c,
-+					  struct xc3028_config *cfg);
-+#else
-+static inline struct dvb_frontend* xc3028_attach(struct dvb_frontend *fe,
-+						 struct i2c_adapter *i2c,
-+						 struct xc3028_config *cfg)
-+{
-+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
-+	return NULL;
-+}
-+#endif // CONFIG_DVB_XC3028
-+
-+#endif // __DVB_XC3028_H__
---- v4l-dvb.orig/v4l/versions.txt
-+++ v4l-dvb/v4l/versions.txt
-@@ -228,3 +228,4 @@
- USB_ZC0301
- USB_ET61X251
- USB_ZR364XX
-+DVB_XC3028
diff --git a/abs/extra-testing/vcdimager/PKGBUILD b/abs/extra-testing/vcdimager/PKGBUILD
deleted file mode 100644
index 9a97e31..0000000
--- a/abs/extra-testing/vcdimager/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: damir <damir@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=vcdimager
-pkgver=0.7.23
-pkgrel=6
-pkgdesc="GNU VCDImager is a full-featured mastering suite for authoring disassembling and analyzing Video CD's and Super Video CD's"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.vcdimager.org/"
-depends=('libcdio>=0.79' 'libxml2' 'popt')
-options=('!libtool' '!emptydirs')
-source=(ftp://ftp.gnu.org/gnu/vcdimager/${pkgname}-${pkgver}.tar.gz)
-md5sums=('5e7d80fdbf0037ad20e438f2a9573253')
-
-build() {
-    cd ${startdir}/src/${pkgname}-${pkgver}
-    ./configure --prefix=/usr
-    make || return 1
-    make DESTDIR=${startdir}/pkg install
-}
diff --git a/abs/extra-testing/vcdimager/__changelog b/abs/extra-testing/vcdimager/__changelog
deleted file mode 100644
index 701b6bb..0000000
--- a/abs/extra-testing/vcdimager/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-options=!noemptdir
diff --git a/abs/extra-testing/vcdimager/cdio.patch b/abs/extra-testing/vcdimager/cdio.patch
deleted file mode 100644
index f7f9e31..0000000
--- a/abs/extra-testing/vcdimager/cdio.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/image.c.org	2004-07-15 17:19:01.000000000 +0200
-+++ lib/image.c	2004-07-15 17:22:06.000000000 +0200
-@@ -76,7 +76,7 @@
- }
- 
- int
--vcd_image_sink_write (VcdImageSink *obj, void *buf, uint32_t lsn)
-+vcd_image_sink_write (VcdImageSink *obj, void *buf, lsn_t lsn)
- {
-   vcd_assert (obj != NULL);
- 
diff --git a/abs/extra-testing/vim/PKGBUILD b/abs/extra-testing/vim/PKGBUILD
deleted file mode 100644
index 7e3db29..0000000
--- a/abs/extra-testing/vim/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 17696 2008-10-31 17:28:10Z allan $
-# Maintainer: tobias [ tobias at archlinux org ]
-
-pkgname=vim
-_srcver=7.2
-_patchlevel=132
-pkgver=${_srcver}.${_patchlevel}
-pkgrel=1.5
-pkgdesc="a highly configurable, improved version of the vi text editor"
-arch=(i686 x86_64)
-license=('custom:vim')
-url="http://www.vim.org"
-depends=("vi>=${pkgver}" 'perl' 'python'  'acl' 'gpm>=1.20.4' 'libxt')
-makedepends=('wget' 'sed' 'grep')
-backup=(etc/vimrc)
-install=${pkgname}.install
-# we need the extra-stuff to get all patches applied smoothly
-source=(ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2 \
-        ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-extra.tar.gz \
-        ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-lang.tar.gz \
-        fetch_patches.sh)
-
-build()
-{
-  # pull in patches from vim.org (or the src cache alternatively)
-  . ${startdir}/src/fetch_patches.sh
-  get_patches || return 1
-  cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")
-  sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' src/feature.h
-  # build party
-  ./configure --prefix=/usr --localstatedir=/var/lib/vim --mandir=/usr/share/man \
-    --with-compiledby=ArchLinux --with-features=big \
-    --with-x=yes --disable-gui \
-    --with-global-runtime=/usr/share/vim --with-vim-name=vim \
-    --enable-multibyte --enable-cscope \
-    --enable-perlinterp --enable-pythoninterp 
-  make || return 1
-  make  VIMRCLOC=/etc DESTDIR=${startdir}/pkg VIMRTDIR= install
-  cd ${startdir}/pkg/usr/bin
-  rm -f ex view rview xxd vimtutor
-  ln -s vitutor vimtutor
-
-   # delete the manpages/symlinks provided by vi package
-  find ${startdir}/pkg/usr/share/man -type d -name 'man1' 2> /dev/null | \
-   while read mandir; do
-    cd ${mandir}
-    mv vimdiff.1 vimdiff.org
-    rm -f *.1
-    ln -s rvi.1.gz rvim.1.gz
-    ln -s vi.1.gz vim.1.gz
-    ln -s vitutor.1.gz vimtutor.1.gz
-    mv vimdiff.org vimdiff.1
-  done
-
-  # kill the nobackup parts
-  sed -i '/vms/,+4 d' ${startdir}/pkg/usr/share/vim/vimrc_example.vim
-  install -Dm644 ${startdir}/pkg/usr/share/vim/vimrc_example.vim \
-    ${startdir}/pkg/etc/vimrc
-  # clean all settings and controls -  served by vi package
-  rm -rf ${startdir}/pkg/usr/share/vim
-
-#               Changes to remove mouse support  VERY IMPORTANT!
-##############################################################
-   sed -i "s/mouse=a/mouse-=a/g" $startdir/pkg/etc/vimrc
-#################################################################
-}
diff --git a/abs/extra-testing/vim/__changelog b/abs/extra-testing/vim/__changelog
deleted file mode 100644
index 47cbb5f..0000000
--- a/abs/extra-testing/vim/__changelog
+++ /dev/null
@@ -1,3 +0,0 @@
-Remove mouse support from  /etc/vimrc.  This new found ability is truely annoying.
-
-
diff --git a/abs/extra-testing/vim/fetch_patches.sh b/abs/extra-testing/vim/fetch_patches.sh
deleted file mode 100644
index 2ce1019..0000000
--- a/abs/extra-testing/vim/fetch_patches.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-# the external logic for pulling in patches
-
-get_patches() {
-  _patchdir=${startdir}/src/patches
-  cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")
-  if [ -d ${_patchdir} ]; then
-    rm -rf ${_patchdir}
-    echo -e "\tremove patches from old build"
-  fi
-  mkdir ${_patchdir} && cd ${_patchdir}
-  _rpath=ftp://ftp.vim.org/pub/vim/patches/${_srcver}
-
-  # change IFS to loop line-by-line
-  _OLDIFS=$IFS
-  IFS="
-"
-  echo -e "\tfetching checksumfile for patches"
-  wget ${_rpath}/MD5SUMS >/dev/null 2>&1
-
-  downloads=-1
-  for _line in $(/bin/cat MD5SUMS); do
-    downloads=$((${downloads} + 1))
-    _md5=$(echo $_line | cut -d ' ' -f1)
-    _file=$(echo $_line | cut -d ' ' -f3)
-    if [ -f ${SRCDEST}/vim-${_srcver}/${_file} ]; then
-      echo -e "\thaving patch file:${_file}"
-      cp ${SRCDEST}/vim-${_srcver}/${_file} ./
-    else
-      echo -n -e "\t... fetching patch file: ${_file} ..."
-      wget ${_rpath}/${_file} >/dev/null 2>&1
-      if [ -w ${SRCDEST} ]; then
-        if [ ! -d ${SRCDEST}/vim-${_srcver} ]; then
-          mkdir -p ${SRCDEST}/vim-${_srcver}
-        fi
-        cp ${_file} ${SRCDEST}/vim-${_srcver}/
-        echo " done!"
-      fi
-    fi
-
-    if [ $(echo "${_md5}  ${_file}" | md5sum --status -c -) ]; then
-      echo ${_file} md5sums do not match
-      return 1
-    fi
-  done
-  cd $startdir/src/patches
-  rm 7.2.001-100.gz
-  ########
-
-  if [ ${downloads} != ${_patchlevel} ]; then
-    echo -e "Number of patches does not match the patchlevel!\nEdit the PKGBUILD accordingly!"
-    return 1
-  fi
-  IFS=$_OLDIFS
-  rm MD5SUMS
-  cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//")
-  for _patch in $(/bin/ls ${_patchdir}); do
-    patch -Np0 -i ${_patchdir}/${_patch} || return 1
-  done
-  rm -rf ${_patchdir}
-  return 0
-}
diff --git a/abs/extra-testing/vim/vim.install b/abs/extra-testing/vim/vim.install
deleted file mode 100644
index 1d46e19..0000000
--- a/abs/extra-testing/vim/vim.install
+++ /dev/null
@@ -1,38 +0,0 @@
-post_install() {
-  # if we have an existing gvim installation - relocate binaries and symlinks
-  if [ -f usr/bin/vim ] ; then
-    cd usr/bin
-    rm -f view rview
-    ln -s vim view
-    ln -s vim rview
-    cd ${OLDPWD}
-    echo "Create vim related symlinks..."
-  fi
-  echo -n "Updating vim help tags..."
-  usr/bin/vim --noplugins -u NONE -U NONE \
-    --cmd ":helptags usr/share/vim/doc" --cmd ":q" > /dev/null 2>&1
-  echo "done."
-}
-
-pre_remove() {
-  cd usr/bin
-  rm -f view rview
-  if [ -f usr/bin/vi ] ; then
-    ln -s vi view
-    ln -s vi rview
-    echo "Create vi related symlinks..."
-  fi
-  cd ${OLDPWD}
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_upgrade() {
-  pre_remove $2
-}
-
-op=$1
-shift
-[ "$(type -t "$op")" = "function" ] && $op "$@"
diff --git a/abs/extra-testing/vorbis-tools/ChangeLog b/abs/extra-testing/vorbis-tools/ChangeLog
deleted file mode 100644
index b4f8311..0000000
--- a/abs/extra-testing/vorbis-tools/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-2008-03-15 Travis Willard <travis@archlinux.org>
-
-	* 1.2.0-3
-	Removed explicit /usr/man usage
-
-2008-03-15 Travis Willard <travis@archlinux.org>
-
-	* 1.2.0-1
-	New upstream release.
-	Added ChangeLog
diff --git a/abs/extra-testing/vorbis-tools/PKGBUILD b/abs/extra-testing/vorbis-tools/PKGBUILD
deleted file mode 100644
index 4428e6a..0000000
--- a/abs/extra-testing/vorbis-tools/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Travis Willard <travis@archlinux.org>
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=vorbis-tools
-pkgver=1.2.0
-pkgrel=3
-pkgdesc="Extra tools for Ogg-Vorbis"
-arch=(i686 x86_64)
-url='http://www.xiph.org/vorbis/'
-license=('GPL')
-depends=('libao' 'libvorbis' 'curl>=7.16.2' 'flac>=1.1.4')
-source=(http://downloads.xiph.org/releases/vorbis/$pkgname-$pkgver.tar.gz)
-md5sums=('df976d24e51ef3d87cd462edf747bf9a')
-
-build() 
-{
-  cd $startdir/src/$pkgname-$pkgver
-  autoconf
-  ./configure --prefix=/usr --without-speex 
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
-
diff --git a/abs/extra-testing/vorbis-tools/curl.patch b/abs/extra-testing/vorbis-tools/curl.patch
deleted file mode 100644
index 2aabebe..0000000
--- a/abs/extra-testing/vorbis-tools/curl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- vorbis-tools-1.1.1/ogg123/http_transport.c.orig	2006-12-09 16:34:44.000000000 +1100
-+++ vorbis-tools-1.1.1/ogg123/http_transport.c	2006-12-09 16:39:46.000000000 +1100
-@@ -116,7 +116,6 @@
-   if (inputOpts.ProxyTunnel)
-     curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel);
-   */
--  curl_easy_setopt(handle, CURLOPT_MUTE, 1);
-   curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error);
-   curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback);
-   curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private);
diff --git a/abs/extra-testing/vorbis-tools/vorbis-tools-1.1.1-flac_gt_1.1.3_support.patch b/abs/extra-testing/vorbis-tools/vorbis-tools-1.1.1-flac_gt_1.1.3_support.patch
deleted file mode 100644
index 19f8e33..0000000
--- a/abs/extra-testing/vorbis-tools/vorbis-tools-1.1.1-flac_gt_1.1.3_support.patch
+++ /dev/null
@@ -1,500 +0,0 @@
-Add support for libFLAC-1.1.3. Original patch from Josh Coalson:
-http://lists.xiph.org/pipermail/vorbis-dev/2006-October/018561.html
-This patch updates that to build against svn trunk, and includes
-automatic detection of libFLAC version in ./configure.
-Tested against libFLAC versions 1.1.2 and 1.1.3. 
-
---- old/vorbis-tools-1.1.1/configure.ac	2005-06-27 10:25:51.000000000 +0100
-+++ vorbis-tools-1.1.1/configure.ac	2007-04-07 17:26:15.000000000 +0100
-@@ -169,17 +169,33 @@
- 
- FLAC_LIBS=""
- if test "x$build_flac" = xyes; then
-+
-   AC_CHECK_LIB(m,log,FLAC_LIBS="-lm")
--  AC_CHECK_LIB(FLAC, [FLAC__stream_decoder_process_single],
--    [have_libFLAC=yes; FLAC_LIBS="-lFLAC $FLAC_LIBS"],
--    AC_MSG_WARN([libFLAC missing])
--    have_libFLAC=no, [$FLAC_LIBS]
--  )
--  AC_CHECK_LIB(OggFLAC, [OggFLAC__stream_decoder_new],
--    [FLAC_LIBS="-lOggFLAC $FLAC_LIBS $OGG_LIBS"],
--    AC_MSG_WARN([libOggFLAC missing])
--    have_libFLAC=no, [$FLAC_LIBS $OGG_LIBS]
--  )
-+
-+  dnl First check for libFLAC-1.1.3 or later. As of libFLAC 1.1.3,
-+  dnl OggFLAC functionality has been rolled into libFLAC rather
-+  dnl than being in a separate libOggFLAC library.
-+
-+  AC_CHECK_LIB(FLAC, [FLAC__stream_decoder_init_ogg_stream],
-+    have_libFLAC=yes, have_libFLAC=no, [$FLAC_LIBS $OGG_LIBS])
-+
-+  if test "x$have_libFLAC" = xyes; then
-+    FLAC_LIBS="-lFLAC $FLAC_LIBS $OGG_LIBS"
-+  else
-+    dnl Check for libFLAC prior to 1.1.3
-+    AC_CHECK_LIB(FLAC, [FLAC__stream_decoder_process_single],
-+      [have_libFLAC=yes; FLAC_LIBS="-lFLAC $FLAC_LIBS"],
-+      AC_MSG_WARN([libFLAC missing])
-+      have_libFLAC=no, [$FLAC_LIBS]
-+    )
-+
-+    AC_CHECK_LIB(OggFLAC, [OggFLAC__stream_decoder_new],
-+      [FLAC_LIBS="-lOggFLAC $FLAC_LIBS $OGG_LIBS"],
-+      AC_MSG_WARN([libOggFLAC missing])
-+      have_libFLAC=no, [$FLAC_LIBS $OGG_LIBS]
-+    )
-+  fi
-+
-   AC_CHECK_HEADER(FLAC/stream_decoder.h,,
-     AC_MSG_WARN(libFLAC headers missing)
-     have_libFLAC=no,[ ])
---- old/vorbis-tools-1.1.1/ogg123/flac_format.c	2005-06-03 11:15:09.000000000 +0100
-+++ vorbis-tools-1.1.1/ogg123/flac_format.c	2007-04-07 17:25:14.000000000 +0100
-@@ -20,18 +20,26 @@
- #include <string.h>
- #include <sys/types.h>
- #include <math.h>
--#include <FLAC/metadata.h>
-+#include <FLAC/all.h>
- #include <ao/ao.h>
- #include "audio.h"
- #include "format.h"
- #include "i18n.h"
-+#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8)
-+#define NEED_EASYFLAC 1
-+#endif
-+#if NEED_EASYFLAC
- #include "easyflac.h"
-+#endif
- #include "vorbis_comments.h"
- 
--#define DEFAULT_FLAC_FRAME_SIZE 4608
--
- typedef struct {
-+#if NEED_EASYFLAC
-   EasyFLAC__StreamDecoder *decoder;
-+#else
-+  FLAC__StreamDecoder *decoder;
-+  int is_oggflac;
-+#endif
-   short channels;
-   int rate;
-   int bits_per_sample;
-@@ -67,10 +75,18 @@
- 
- 
- /* Private functions declarations */
--FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
--FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
--void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
--void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-+#if NEED_EASYFLAC
-+static FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
-+static FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-+static void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-+static void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-+#else
-+static FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data);
-+static FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-+static void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-+static void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-+static FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data);
-+#endif
- 
- void resize_buffer(flac_private_t *flac, int newchannels, int newsamples);
- /*void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments);*/
-@@ -155,6 +171,7 @@
-   private->buf_start = 0;
-   
-   /* Setup FLAC decoder */
-+#if NEED_EASYFLAC
-   if (oggflac_can_decode(source)) {
-     decoder->format = &oggflac_format;
-     private->decoder = EasyFLAC__stream_decoder_new(1);
-@@ -172,13 +189,40 @@
-   EasyFLAC__set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_STREAMINFO);
-   EasyFLAC__set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
-   EasyFLAC__init(private->decoder);
-+#else
-+  if (oggflac_can_decode(source)) {
-+    private->is_oggflac = 1;
-+    decoder->format = &oggflac_format;
-+  } else {
-+    private->is_oggflac = 0;
-+    decoder->format = &flac_format;
-+  }
-+  private->decoder = FLAC__stream_decoder_new();
-+
-+  FLAC__stream_decoder_set_md5_checking(private->decoder, false);
-+  FLAC__stream_decoder_set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_STREAMINFO);
-+  FLAC__stream_decoder_set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
-+  /*FLAC__stream_decoder_init(private->decoder);*/
-+  if(private->is_oggflac)
-+    FLAC__stream_decoder_init_ogg_stream(private->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, decoder);
-+  else
-+    FLAC__stream_decoder_init_stream(private->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, decoder);
-+#endif
-   
-   /* Callback will set the total samples and sample rate */
-+#if NEED_EASYFLAC
-   EasyFLAC__process_until_end_of_metadata(private->decoder);
-+#else
-+  FLAC__stream_decoder_process_until_end_of_metadata(private->decoder);
-+#endif
- 
-   /* Callback will set the number of channels and resize the 
-      audio buffer */
-+#if NEED_EASYFLAC
-   EasyFLAC__process_single(private->decoder);
-+#else
-+  FLAC__stream_decoder_process_single(private->decoder);
-+#endif
- 
-   /* FLAC API returns signed samples on all streams */
-   decoder->actual_fmt.signed_sample = 1;
-@@ -241,11 +285,19 @@
-       realsamples += copy;
-     }
-     else if (!priv->eos) {
-+#if NEED_EASYFLAC
-       ret = EasyFLAC__process_single(priv->decoder);
-       if (!ret ||
- 	  EasyFLAC__get_state(priv->decoder)
- 	  == FLAC__STREAM_DECODER_END_OF_STREAM)
- 	priv->eos = 1;  /* Bail out! */
-+#else
-+      ret = FLAC__stream_decoder_process_single(priv->decoder);
-+      if (!ret ||
-+	  FLAC__stream_decoder_get_state(priv->decoder)
-+	  == FLAC__STREAM_DECODER_END_OF_STREAM)
-+	priv->eos = 1;  /* Bail out! */
-+#endif
-     } else
-       break;
-   }
-@@ -311,8 +363,13 @@
-     free(priv->buf[i]);
-   
-   free(priv->buf);
-+#if NEED_EASYFLAC
-   EasyFLAC__finish(priv->decoder);
-   EasyFLAC__stream_decoder_delete(priv->decoder);
-+#else
-+  FLAC__stream_decoder_finish(priv->decoder);
-+  FLAC__stream_decoder_delete(priv->decoder);
-+#endif
- 
-   free(decoder->private);
-   free(decoder);
-@@ -342,7 +399,11 @@
- 
- 
- 
-+#if NEED_EASYFLAC
- FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data)
-+#else
-+FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
-+#endif
- {
-   decoder_t *e_decoder = client_data;
-   flac_private_t *priv = e_decoder->private;
-@@ -363,7 +424,11 @@
- }
- 
- 
-+#if NEED_EASYFLAC
- FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
-+#else
-+FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
-+#endif
- {
-   decoder_t *e_decoder = client_data;
-   flac_private_t *priv = e_decoder->private;
-@@ -389,7 +454,11 @@
- }
- 
- 
-+#if NEED_EASYFLAC
- void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
-+#else
-+void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
-+#endif
- {
-   decoder_t *e_decoder = client_data;
-   flac_private_t *priv = e_decoder->private;
-@@ -409,12 +478,26 @@
- }
- 
- 
-+#if NEED_EASYFLAC
- void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
-+#else
-+void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
-+#endif
- {
- 
- 
- }
- 
-+#if !NEED_EASYFLAC
-+FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data)
-+{
-+  decoder_t *e_decoder = client_data;
-+  flac_private_t *priv = e_decoder->private;
-+
-+  return priv->eos;
-+}
-+#endif
-+
- 
- void resize_buffer(flac_private_t *flac, int newchannels, int newsamples)
- {
-@@ -457,7 +540,11 @@
-     
- 
-   
-+#if NEED_EASYFLAC
-   if (EasyFLAC__is_oggflac(priv->decoder))
-+#else
-+  if (priv->is_oggflac)
-+#endif
-     cb->printf_metadata(decoder->callback_arg, 2,
- 			_("Ogg FLAC stream: %d bits, %d channel, %ld Hz"),
- 			priv->bits_per_sample,
---- old/vorbis-tools-1.1.1/ogg123/easyflac.c	2005-06-03 11:15:09.000000000 +0100
-+++ vorbis-tools-1.1.1/ogg123/easyflac.c	2007-04-07 17:25:26.000000000 +0100
-@@ -33,10 +33,12 @@
-  *
-  */
- 
-+#include <FLAC/export.h>
-+#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8)
-+
- #include <stdlib.h>
- #include "easyflac.h"
- 
--
- FLAC__bool EasyFLAC__is_oggflac(EasyFLAC__StreamDecoder *decoder)
- {
- 	return decoder->is_oggflac;
-@@ -373,3 +375,5 @@
- 	else
- 		return FLAC__stream_decoder_process_until_end_of_stream(decoder->flac);
- }
-+
-+#endif
---- old/vorbis-tools-1.1.1/oggenc/flac.c	2005-06-03 11:15:10.000000000 +0100
-+++ vorbis-tools-1.1.1/oggenc/flac.c	2007-04-07 18:17:27.000000000 +0100
-@@ -20,15 +20,25 @@
- #include "platform.h"
- #include "resample.h"
- 
--#define DEFAULT_FLAC_FRAME_SIZE 4608
-+#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8)
-+#define NEED_EASYFLAC 1
-+#endif
-+
-+#if NEED_EASYFLAC
-+static FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
-+static FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-+static void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-+static void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-+#else
-+static FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data);
-+static FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-+static void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-+static void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-+static FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data);
-+#endif
- 
--FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
--FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
--void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
--void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
--
--void resize_buffer(flacfile *flac, int newchannels, int newsamples);
--void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments);
-+static void resize_buffer(flacfile *flac, int newchannels, int newsamples);
-+static void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments);
- 
- 
- int flac_id(unsigned char *buf, int len)
-@@ -76,6 +86,7 @@
- 	flac->in = in;
- 
- 	/* Setup FLAC decoder */
-+#if NEED_EASYFLAC
- 	flac->decoder = EasyFLAC__stream_decoder_new(oggflac_id(oldbuf, buflen));
- 	EasyFLAC__set_client_data(flac->decoder, flac);
- 	EasyFLAC__set_read_callback(flac->decoder, &easyflac_read_callback);
-@@ -85,14 +96,32 @@
- 	EasyFLAC__set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_STREAMINFO);
- 	EasyFLAC__set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
- 	EasyFLAC__init(flac->decoder);
-+#else
-+    flac->decoder = FLAC__stream_decoder_new();
-+    FLAC__stream_decoder_set_md5_checking(flac->decoder, false);
-+    FLAC__stream_decoder_set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_STREAMINFO);
-+    FLAC__stream_decoder_set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
-+    if(oggflac_id(oldbuf, buflen))
-+        FLAC__stream_decoder_init_ogg_stream(flac->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, flac);
-+    else
-+        FLAC__stream_decoder_init_stream(flac->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, flac);
-+#endif
- 	
- 	/* Callback will set the total samples and sample rate */
-+#if NEED_EASYFLAC
- 	EasyFLAC__process_until_end_of_metadata(flac->decoder);
-+#else
-+    FLAC__stream_decoder_process_until_end_of_metadata(flac->decoder);
-+#endif
- 
- 	/* Callback will set the number of channels and resize the 
- 	   audio buffer */
-+#if NEED_EASYFLAC
- 	EasyFLAC__process_single(flac->decoder);
--	
-+#else
-+    FLAC__stream_decoder_process_single(flac->decoder);
-+#endif
-+
- 	/* Copy format info for caller */
- 	opt->rate = flac->rate;
- 	opt->channels = flac->channels;
-@@ -133,11 +162,19 @@
- 		}
- 		else if (!flac->eos)
- 		{
-+#if NEED_EASYFLAC
- 			ret = EasyFLAC__process_single(flac->decoder);
- 			if (!ret ||
- 			    EasyFLAC__get_state(flac->decoder)
- 			    == FLAC__STREAM_DECODER_END_OF_STREAM)
- 				flac->eos = 1;  /* Bail out! */
-+#else
-+            ret = FLAC__stream_decoder_process_single(flac->decoder);
-+            if (!ret ||
-+                FLAC__stream_decoder_get_state(flac->decoder)
-+                == FLAC__STREAM_DECODER_END_OF_STREAM)
-+                flac->eos = 1;  /* Bail out! */
-+#endif
- 		} else
- 			break;
- 	}
-@@ -157,13 +194,22 @@
- 	free(flac->buf);
- 	free(flac->oldbuf);
- 	free(flac->comments);
-+#if NEED_EASYFLAC
- 	EasyFLAC__finish(flac->decoder);
- 	EasyFLAC__stream_decoder_delete(flac->decoder);
-+#else
-+    FLAC__stream_decoder_finish(flac->decoder);
-+    FLAC__stream_decoder_delete(flac->decoder);
-+#endif
- 	free(flac);
- }
- 
- 
-+#if NEED_EASYFLAC
- FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data)
-+#else
-+FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
-+#endif
- {
- 	flacfile *flac = (flacfile *) client_data;
- 	int i = 0;
-@@ -200,7 +246,11 @@
- 	return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;	 
- }
- 
-+#if NEED_EASYFLAC
- FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
-+#else
-+FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
-+#endif
- {
- 	flacfile *flac = (flacfile *) client_data;
- 	int samples = frame->header.blocksize;
-@@ -221,7 +271,11 @@
- 	return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
- }
- 
-+#if NEED_EASYFLAC
- void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
-+#else
-+void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
-+#endif
- {
- 	flacfile *flac = (flacfile *) client_data;
- 
-@@ -240,11 +294,24 @@
- 	}
- }
- 
-+#if NEED_EASYFLAC
- void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
-+#else
-+void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
-+#endif
- {
--	flacfile *flac = (flacfile *) client_data;
-+    flacfile *flac = (flacfile *) client_data;
-+
-+}
-+
-+#if !NEED_EASYFLAC
-+FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data)
-+{
-+    flacfile *flac = (flacfile *) client_data;
- 
-+    return feof(flac->in)? true : false;
- }
-+#endif
- 
- 
- void resize_buffer(flacfile *flac, int newchannels, int newsamples)
---- old/vorbis-tools-1.1.1/oggenc/easyflac.c	2005-06-03 11:15:10.000000000 +0100
-+++ vorbis-tools-1.1.1/oggenc/easyflac.c	2007-04-07 17:25:56.000000000 +0100
-@@ -33,6 +33,9 @@
-  *
-  */
- 
-+#include <FLAC/export.h>
-+#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8)
-+
- #include <stdlib.h>
- #include "easyflac.h"
- 
-@@ -373,3 +376,5 @@
- 	else
- 		return FLAC__stream_decoder_process_until_end_of_stream(decoder->flac);
- }
-+
-+#endif
---- old/vorbis-tools-1.1.1/oggenc/flac.h	2005-06-03 11:15:10.000000000 +0100
-+++ vorbis-tools-1.1.1/oggenc/flac.h	2007-04-07 17:31:53.000000000 +0100
-@@ -5,10 +5,21 @@
- #include "encode.h"
- #include "audio.h"
- #include <stdio.h>
-+#include <FLAC/stream_decoder.h>
-+#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8)
-+#define NEED_EASYFLAC 1
-+#endif
-+#if NEED_EASYFLAC
-+#include <OggFLAC/stream_decoder.h>
- #include "easyflac.h"
-+#endif
- 
- typedef struct {
-+#if NEED_EASYFLAC
- 	EasyFLAC__StreamDecoder *decoder;
-+#else
-+	FLAC__StreamDecoder *decoder;
-+#endif
- 	short channels;
- 	int rate;
- 	long totalsamples; /* per channel, of course */
diff --git a/abs/extra-testing/vte/PKGBUILD b/abs/extra-testing/vte/PKGBUILD
deleted file mode 100644
index 569db33..0000000
--- a/abs/extra-testing/vte/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 16789 2008-10-22 03:33:22Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=vte
-pkgver=0.17.4
-pkgrel=2
-pkgdesc="VTE - Virtual Terminal Emulator"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gtk2>=2.11.3' 'libsm')
-options=('!libtool')
-makedepends=('pygtk>=2.11.0' 'pkgconfig' 'intltool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.17/vte-${pkgver}.tar.bz2
-	vte-0.16.0-reaper-python-bindings.patch)
-md5sums=('ec6cb2668db7146eae7cfc48af98f3ed' 'efe29cd40635e73fa3152f77d91a4f39')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/src/vte-0.16.0-reaper-python-bindings.patch || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --libexecdir=/usr/lib/vte \
-              --localstatedir=/var --disable-static || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-}
diff --git a/abs/extra-testing/vte/vte-0.16.0-reaper-python-bindings.patch b/abs/extra-testing/vte/vte-0.16.0-reaper-python-bindings.patch
deleted file mode 100644
index 47d6ce6..0000000
--- a/abs/extra-testing/vte/vte-0.16.0-reaper-python-bindings.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -NarU 3 vte-0.16.0.orig/python/vte.defs vte-0.16.0/python/vte.defs
---- vte-0.16.0.orig/python/vte.defs	2007-02-26 22:05:02.000000000 +0100
-+++ vte-0.16.0/python/vte.defs	2007-03-14 20:44:55.000000000 +0100
-@@ -7,6 +7,14 @@
-   (gtype-id "VTE_TYPE_TERMINAL")
- )
- 
-+(define-object Reaper
-+  (in-module "Vte")
-+  (parent "GObject")
-+  (c-name "VteReaper")
-+  (gtype-id "VTE_TYPE_REAPER")
-+)
-+
-+
- ;; Enumerations and flags ...
- 
- (define-enum TerminalEraseBinding
-@@ -701,4 +709,14 @@
-   (return-type "const-char*")
- )
- 
-+;; From ../src/reaper.h
-+(define-function vte_reaper_get_type
-+  (c-name "vte_reaper_get_type")
-+  (return-type "GtkType")
-+)
-+
-+(define-function reaper_get
-+  (c-name "vte_reaper_get")
-+  (return-type "VteReaper*")
-+)
- 
-diff -NarU 3 vte-0.16.0.orig/python/vte.override vte-0.16.0/python/vte.override
---- vte-0.16.0.orig/python/vte.override	2007-02-26 22:05:02.000000000 +0100
-+++ vte-0.16.0/python/vte.override	2007-03-14 20:46:12.000000000 +0100
-@@ -7,12 +7,14 @@
- #include <pygobject.h>
- #include <gtk/gtk.h>
- #include "../src/vte.h"
-+#include "../src/reaper.h"
- %%
- modulename vte
- %%
- import gtk.gdk.Pixbuf as PyGdkPixbuf_Type
- import gtk.MenuShell as PyGtkMenuShell_Type
- import gtk.Widget as PyGtkWidget_Type
-+import gobject.GObject as PyGObject_Type
- %%
- override vte_terminal_feed kwargs
- static PyObject *
-diff -NarU 3 vte-0.16.0.orig/python/vtemodule.c vte-0.16.0/python/vtemodule.c
---- vte-0.16.0.orig/python/vtemodule.c	2007-02-26 22:05:02.000000000 +0100
-+++ vte-0.16.0/python/vtemodule.c	2007-03-14 20:47:12.000000000 +0100
-@@ -25,6 +25,7 @@
- #include <pygobject.h>
- #include <pygtk/pygtk.h>
- #include "../src/vte.h"
-+#include "../src/reaper.h"
- 
- extern void pyvte_register_classes(PyObject * d);
- extern PyMethodDef pyvte_functions[];
diff --git a/abs/extra-testing/wavpack/PKGBUILD b/abs/extra-testing/wavpack/PKGBUILD
deleted file mode 100644
index c0ab01a..0000000
--- a/abs/extra-testing/wavpack/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 3456 2008-06-22 19:29:25Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
-# Contributor: Michal Hybner <dta081@gmail.com>
-pkgname=wavpack
-pkgver=4.50.0
-pkgrel=1
-pkgdesc="A completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode"
-arch=('i686' 'x86_64')
-url="http://www.wavpack.com/"
-license=('custom')
-depends=('glibc')
-options=('!libtool')
-source=(http://www.wavpack.com/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9cf854fc2e5757f6534a3a231ec6bfbc')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-mmx --disable-static || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 license.txt ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
-  rm -f ${startdir}/pkg/usr/lib/*.a
-}
diff --git a/abs/extra-testing/webmin/PKGBUILD b/abs/extra-testing/webmin/PKGBUILD
deleted file mode 100644
index 1ce083e..0000000
--- a/abs/extra-testing/webmin/PKGBUILD
+++ /dev/null
@@ -1,222 +0,0 @@
-# $Id: PKGBUILD 18672 2008-11-08 15:27:08Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=webmin
-pkgver=1.441
-pkgrel=2
-pkgdesc="a web-based interface for system administration"
-arch=(i686 x86_64)
-license=('custom:webmin')
-url="http://www.webmin.com/"
-depends=('perl')
-makedepends=('perl-net-ssleay')
-backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/config' 'etc/webmin/webmin.cats' \
-'etc/webmin/pacman/config' \
-'etc/webmin/at/config' \
-'etc/webmin/acl/config' \
-'etc/webmin/lvm/config' \
-'etc/webmin/net/config' \
-'etc/webmin/nis/config' \
-'etc/webmin/pam/config' \
-'etc/webmin/cron/config' \
-'etc/webmin/file/config' \
-'etc/webmin/grub/config' \
-'etc/webmin/init/config' \
-'etc/webmin/ipfw/config' \
-'etc/webmin/lilo/config' \
-'etc/webmin/proc/config' \
-'etc/webmin/raid/config' \
-'etc/webmin/spam/config' \
-'etc/webmin/sshd/config' \
-'etc/webmin/time/config' \
-'etc/webmin/cluster-passwd/config' \
-'etc/webmin/software/config' \
-'etc/webmin/webminlog/config' \
-'etc/webmin/cluster-webmin/config' \
-'etc/webmin/bind8/config' \
-'etc/webmin/dhcpd/config' \
-'etc/webmin/fdisk/config' \
-'etc/webmin/mount/config' \
-'etc/webmin/mysql/config' \
-'etc/webmin/quota/config' \
-'etc/webmin/samba/config' \
-'etc/webmin/shell/config' \
-'etc/webmin/squid/config' \
-'etc/webmin/adsl-client/config' \
-'etc/webmin/servers/config' \
-'etc/webmin/cluster-shell/config' \
-'etc/webmin/bandwidth/config' \
-'etc/webmin/ppp-client/config' \
-'etc/webmin/lpadmin/config' \
-'etc/webmin/apache/config' \
-'etc/webmin/firewall/config' \
-'etc/webmin/stunnel/config' \
-'etc/webmin/burner/config' \
-'etc/webmin/exports/config' \
-'etc/webmin/backup-config/config' \
-'etc/webmin/custom/config' \
-'etc/webmin/htaccess-htpasswd/config' \
-'etc/webmin/logrotate/config' \
-'etc/webmin/format/config' \
-'etc/webmin/fsdump/config' \
-'etc/webmin/passwd/config' \
-'etc/webmin/cluster-useradmin/config' \
-'etc/webmin/cluster-software/config' \
-'etc/webmin/cluster-copy/config' \
-'etc/webmin/cluster-cron/config' \
-'etc/webmin/telnet/config' \
-'etc/webmin/status/config' \
-'etc/webmin/syslog/config' \
-'etc/webmin/updown/config' \
-'etc/webmin/usermin/config' \
-'etc/webmin/webmin/config' \
-'etc/webmin/xinetd/config' \
-'etc/webmin/openslp/config' \
-'etc/webmin/procmail/config' \
-'etc/webmin/fetchmail/config' \
-'etc/webmin/postgresql/config' \
-'etc/webmin/useradmin/config' \
-'etc/webmin/mailboxes/config' \
-'etc/webmin/inittab/config' \
-'etc/webmin/change-user/config' \
-'etc/webmin/postfix/config' \
-'etc/webmin/proftpd/config' \
-'etc/webmin/pserver/config' \
-'etc/webmin/dnsadmin/config' )
-install=webmin.install
-source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz 
-	ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 
-	ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2
-	webmin.rc
-	run)
-
-build() {
-  # NOTE: USE --asroot build option to avoid fakeroot error!
-  cd $startdir/src/$pkgname-$pkgver
-  # add patches from webmin.com
-  #for i in ../*.wbm 
-  #do tar xvf $i
-  #done
-  #for i in ../*.wbt
-  #do tar xvf $i
-  #done
-  # delete stuff that's not needed
-  rm -f mount/freebsd-mounts*
-  rm -f mount/openbsd-mounts*
-  rm -f mount/macos-mounts*
-  
-  # remove modules we do not support
-  rm -rf {bacula-backup,ldap-useradmin,mon,sentry,frox,jabber,majordomo,qmail,sendmail,sarg,wuftpd,webalizer,inetd,ipsec,pap,pptp-client,pptp-server,shorewall,smart-status,vgetty,heartbeat,cfengine,cpan,sgiexports,hpuxexports,qmailadmin,bsdexports,dfsadmin}
-  
-  #remove config files from other distros
-  rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*')
-  
-  # remove caldera theme
-  rm -rf caldera
-
-  # remove init-scripts from other distros
-  rm webmin-gentoo-init
-  rm webmin-init
-  rm webmin-caldera-init
-  rm webmin-daemon
-
-  # remove update stuff to avoid problems with updating webmin,modules and themes without pacman
-  rm -f webmin/{update.cgi,update.pl,update_sched.cgi,upgrade.cgi,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi}
-  rm -f usermin/{upgrade.cgi,update.cgi,update.pl,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi}
-
-  # remove modules add because we don't want files installed without pacman control
-  rm -f webmin/{install_mod.cgi,delete_mod.cgi}  
-
-  # setting perl path
-  (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-  
-  # create dirs
-  mkdir -p $startdir/pkg/opt/webmin
-  mkdir -p $startdir/pkg/var/log/webmin
-  mkdir -p $startdir/pkg/etc/webmin
-  
-  # install pam stuff
-  install -D -m 644 webmin-pam $startdir/pkg/etc/pam.d/webmin
-  
-  # remove other distros and add only Archlinux don't change next line else it will not work!
-  rm os_list.txt
-  echo 'Archlinux			Any version	generic-linux	*	-d "/etc/pacman.d"' >> os_list.txt
-  
-  # Add rc.conf support to boot and shutdown menu and lock editing of this module
-  cd init/
-  sed -i -e 's:^local_down=.*:local_down=Archlinux RC.CONF,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*')
-  sed -i -e 's:^local_script=.*:local_script=Archlinux RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') 
-  sed -i -e 's:^index_downscript=.*:index_downscript=Archlinux RC.CONF:g' lang/*
-  sed -i -e 's:^index_script=.*:index_script=Archlinux RC.LOCAL:g' lang/*
-  sed -i -e 's:^noconfig=0:noconfig=1:g'  defaultacl
-
-  # Add pacman menu
-  cd $startdir/src/$pkgname-$pkgver
-  cp -rf custom/ pacman
-  cp -rf mscstyle3/custom mscstyle3/pacman
-  sed -i -e 's:^noconfig=0:noconfig=1:g' -e 's:^edit=1:edit=0:g' pacman/defaultacl
-  sed -i -e '/desc/d' -e '/longdesc/d' pacman/module.info
-  sed -i -e 's:^name=Custom:name=Pacman:g' pacman/module.info
-  echo 'category=system' >> pacman/module.info
-  echo 'desc=Pacman' >> pacman/module.info
-  sed -i -e 's:^index_title=.*:index_title=Pacman:g' pacman/lang/*
-
-  # copy stuff to right dirs
-  cd $startdir/src/$pkgname-$pkgver
-  cp -rp * $startdir/pkg/opt/webmin
-  cd $startdir/src/webmin-config
-  cp -rfp * $startdir/pkg/opt/webmin
-
-  # define parameters for setup.sh
-  config_dir=$startdir/pkg/etc/webmin
-  var_dir=$startdir/pkg/var/log/webmin
-  perl=/usr/bin/perl
-  autoos=1
-  port=10000
-  login=root
-  crypt="XXX"
-  ssl=1
-  atboot=0
-  nostart=1
-  nochown=1
-  autothird=1
-  nouninstall=1
-  noperlpath=1
-  atbootyn=n
-  tempdir=$startdir/pkg/tmp
-  export config_dir var_dir perl autoos port tempdir login crypt ssl nochown autothird nouninstall nostart noperlpath atbootyn
-  
-  # Fix setup.sh
-  sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' $startdir/pkg/opt/webmin/setup.sh
-  $startdir/pkg/opt/webmin/setup.sh
-  
-  # Fixup the config files to use their real locations
-  sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' $startdir/pkg/etc/webmin/miniserv.conf
-  find $startdir/pkg/etc/webmin -type f -exec sed -i "s:$startdir/pkg::g" {} \; 
-  
-  # make it only accessible by localhost and private networks
-  echo 'allow=127.0.0.1 192.168. 172.16. 10.' >> $startdir/pkg/etc/webmin/miniserv.conf
-
-  #Let not fork this bad boy.  We need to control it w/ runit.
-  echo 'nofork=1' >> $startdir/pkg/etc/webmin/miniserv.conf
-  
-  # install pacman menu
-  cd $startdir/src/webmin-pacman/config
-  cp -rfp * $startdir/pkg/etc/webmin/pacman
-
-  #install rc file
-  install -D -m 755 $startdir/src/webmin.rc $startdir/pkg/etc/rc.d/webmin
-
-  # delete temp dir
-  rm -r $startdir/pkg/tmp
-  # install license
-  install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE
-
-  #runit
-  mkdir -p $startdir/pkg/etc/sv/webmin/supervise
-  install -D -m 755 $startdir/src/run $startdir/pkg/etc/sv/webmin
-}
-md5sums=('b841af1b1a9f78795814ce8211e6ad81'
-         'da6bea412a5be8cf82a813078fec5847'
-         '4cf1139093ea59044be42a4f173fb8aa'
-         '0673e51af0e81418b4a6c1e205f7e5cd'
-	 'bc578b249e2090deb84119a626c53c48')
diff --git a/abs/extra-testing/webmin/run b/abs/extra-testing/webmin/run
deleted file mode 100644
index 659c6cd..0000000
--- a/abs/extra-testing/webmin/run
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-echo Starting Webmin server in /opt/webmin
-trap '' 1
-LANG=
-export LANG
-#PERLIO=:raw
-unset PERLIO
-export PERLIO
-PERLLIB=/opt/webmin
-export PERLLIB
-exec '/opt/webmin/miniserv.pl' /etc/webmin/miniserv.conf
diff --git a/abs/extra-testing/webmin/webmin-config.tar.bz2 b/abs/extra-testing/webmin/webmin-config.tar.bz2
deleted file mode 100644
index a51b43d..0000000
--- a/abs/extra-testing/webmin/webmin-config.tar.bz2
+++ /dev/null
diff --git a/abs/extra-testing/webmin/webmin-pacman.tar.bz2 b/abs/extra-testing/webmin/webmin-pacman.tar.bz2
deleted file mode 100644
index 548acc2..0000000
--- a/abs/extra-testing/webmin/webmin-pacman.tar.bz2
+++ /dev/null
diff --git a/abs/extra-testing/webmin/webmin.install b/abs/extra-testing/webmin/webmin.install
deleted file mode 100644
index ce5da6c..0000000
--- a/abs/extra-testing/webmin/webmin.install
+++ /dev/null
@@ -1,39 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
-  crypt=${crypt//\\/\\\\}
-  crypt=${crypt//\//\\\/}
-  sed -i "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users
-
-cat << EOF
-Note:
-==> It is not allowed to install 3rd party modules, or delete existing modules.
-==> Please write your own PKGBUILDS for 3rd party modules and additional themes.
-Setup:
-==> To make webmin start at boot time, add webmin to rc.conf daemons
-==> Point your web browser to http://localhost:10000 to use webmin.
-==> The access is restricted to localhost, if you want to connect from other locations
-==> change /etc/webmin/miniserv.conf to something like that: allow=127.0.0.1 <your-ip>
-==> If you want to have ssl encryption please install 'perl-net-ssleay' additional.
-EOF
-# fix man module
-  cd /opt/webmin/man
-  for i in $(find . -name '*.gz'); do
-  gzip -df $i
-  done
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  # uninstall unzipped files
-  rm -r /opt/webmin/man
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/webmin/webmin.rc b/abs/extra-testing/webmin/webmin.rc
deleted file mode 100644
index ee83fbe..0000000
--- a/abs/extra-testing/webmin/webmin.rc
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-start=/etc/webmin/start
-stop=/etc/webmin/stop
-lockfile=/var/lock/webmin
-
-case "$1" in
-'start')
-     stat_busy "Starting Webmin daemon"
-     $start >/dev/null 2>&1 </dev/null
-     RETVAL=$?
-     if [ "$RETVAL" = "0" ]; then
-     touch $lockfile >/dev/null 2>&1
-     stat_done
-     else
-     stat_fail
-fi
-;;
-
-'stop')
-     stat_busy "Stopping Webmin daemon"
-     $stop >/dev/null 2>&1 </dev/null
-     RETVAL=$?
-     if [ "$RETVAL" = "0" ]; then
-     rm -f $lockfile
-     stat_done
-     else
-     stat_fail
-fi
-;;
-
-'restart')
-     $stop && $start
-     RETVAL=$?
-;;
-*)
-echo "Usage: $0 { start | stop | restart }"
-RETVAL=1
-;;
-esac
-exit $RETVAL
\ No newline at end of file
diff --git a/abs/extra-testing/windowmaker/PKGBUILD b/abs/extra-testing/windowmaker/PKGBUILD
deleted file mode 100644
index c67bfda..0000000
--- a/abs/extra-testing/windowmaker/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 27785 2009-02-25 23:32:40Z eric $
-# Maintainer: aurelien <aurelien@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-pkgname=windowmaker
-pkgver=0.92.0
-pkgrel=7
-pkgdesc="An X11 window manager with a NEXTSTEP look and feel"
-arch=(i686 x86_64)
-url="http://www.windowmaker.info/"
-license=('GPL' 'custom')
-depends=('libxinerama' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib')
-options=('!libtool')
-source=(http://windowmaker.info/pub/source/release/WindowMaker-$pkgver.tar.bz2 windowmaker-gcc4.patch.tar.bz2)
-md5sums=('aaac5421b686ed2d3e6ab65229c98097' 'd9fb6a9c255f5c03d0e0c83dc3cd2320')
-
-build() {
-  cd $srcdir/WindowMaker-$pkgver
-  patch -Np1 -i ../windowmaker-gcc4.patch || return 1
-  libtoolize --force --copy || return 1
-  aclocal || return 1
-  autoconf || return 1
-  automake || return 1
-  [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --with-gnustepdir=/usr/share/GNUstep --with-nlsdir=/usr/share/locale \
-    --enable-xinerama  || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-  install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL
-}
-
diff --git a/abs/extra-testing/windowmaker/windowmaker
.build.log b/abs/extra-testing/windowmaker/windowmaker
.build.log
deleted file mode 100644
index 799b6ef..0000000
--- a/abs/extra-testing/windowmaker/windowmaker
.build.log
+++ /dev/null
@@ -1,1276 +0,0 @@
-bumped windowmaker release from 6 to 7

----------------

-==> Making package: windowmaker 0.92.0-7 i686 (Thu Oct  1 02:50:15 UTC 2009)

-==> WARNING: Running makepkg as root...

-==> Checking Runtime Dependencies...

-==> Checking Buildtime Dependencies...

-==> Retrieving Sources...

-  -> Using cached copy of WindowMaker-0.92.0.tar.bz2

-  -> Found windowmaker-gcc4.patch.tar.bz2 in build dir

-==> Validating source files with md5sums...

-    WindowMaker-0.92.0.tar.bz2 ... Passed

-    windowmaker-gcc4.patch.tar.bz2 ... Passed

-==> Extracting Sources...

-  -> bsdtar -x -f WindowMaker-0.92.0.tar.bz2

-  -> bsdtar -x -f windowmaker-gcc4.patch.tar.bz2

-==> Removing existing pkg/ directory...

-==> Starting build()...

-patching file ChangeLog

-patching file WINGs/Examples/server.c

-patching file WINGs/Makefile.am

-patching file WINGs/connection.c

-patching file WINGs/dragdestination.c

-patching file WINGs/po/de.po

-patching file WINGs/selection.c

-patching file WINGs/wapplication.c

-patching file WINGs/wcolor.c

-patching file WINGs/wfont.c

-patching file WINGs/wfontpanel.c

-patching file WINGs/widgets.c

-patching file WINGs/wtext.c

-patching file WINGs/wview.c

-patching file WPrefs.app/FontSimple.c

-patching file WPrefs.app/Makefile.am

-patching file WPrefs.app/main.c

-patching file WPrefs.app/po/de.po

-patching file configure.ac

-patching file po/de.po

-patching file src/actions.c

-patching file src/event.c

-patching file src/icon.c

-patching file src/misc.c

-patching file src/moveres.c

-patching file src/properties.c

-patching file src/startup.c

-patching file src/window.c

-patching file src/window.h

-patching file test/wtest.c

-patching file util/wmsetbg.c

-patching file wrlib/convert.c

-patching file wrlib/gradient.c

-patching file wrlib/ppm.c

-patching file wrlib/raster.c

-patching file wrlib/x86_specific.c

-libtoolize: putting auxiliary files in `.'.

-libtoolize: copying file `./ltmain.sh'

-libtoolize: You should add the contents of the following files to `aclocal.m4':

-libtoolize:   `/usr/share/aclocal/libtool.m4'

-libtoolize:   `/usr/share/aclocal/ltoptions.m4'

-libtoolize:   `/usr/share/aclocal/ltversion.m4'

-libtoolize:   `/usr/share/aclocal/ltsugar.m4'

-libtoolize:   `/usr/share/aclocal/lt~obsolete.m4'

-libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and

-libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.

-libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.

-libtoolize: `AC_PROG_RANLIB' is rendered obsolete by `LT_INIT'

-acinclude.m4:6: warning: underquoted definition of WM_CHECK_LIB

-acinclude.m4:6:   run info '(automake)Extending aclocal'

-acinclude.m4:6:   or see http://sources.redhat.com/automake/automake.html#Extending-aclocal

-configure: WARNING: unrecognized options: --with-gnustepdir

-checking for a BSD-compatible install... /bin/install -c

-checking whether build environment is sane... yes

-checking for a thread-safe mkdir -p... /bin/mkdir -p

-checking for gawk... gawk

-checking whether make sets $(MAKE)... yes

-checking build system type... i686-pc-linux-gnu

-checking host system type... i686-pc-linux-gnu

-checking for style of include used by make... GNU

-checking for gcc... gcc

-checking for C compiler default output file name... a.out

-checking whether the C compiler works... yes

-checking whether we are cross compiling... no

-checking for suffix of executables... 

-checking for suffix of object files... o

-checking whether we are using the GNU C compiler... yes

-checking whether gcc accepts -g... yes

-checking for gcc option to accept ISO C89... none needed

-checking dependency style of gcc... none

-checking for a sed that does not truncate output... /bin/sed

-checking for grep that handles long lines and -e... /bin/grep

-checking for egrep... /bin/grep -E

-checking for fgrep... /bin/grep -F

-checking for ld used by gcc... /usr/bin/ld

-checking if the linker (/usr/bin/ld) is GNU ld... yes

-checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B

-checking the name lister (/usr/bin/nm -B) interface... BSD nm

-checking whether ln -s works... yes

-checking the maximum length of command line arguments... 1572864

-checking whether the shell understands some XSI constructs... yes

-checking whether the shell understands "+="... yes

-checking for /usr/bin/ld option to reload object files... -r

-checking for objdump... objdump

-checking how to recognize dependent libraries... pass_all

-checking for ar... ar

-checking for strip... strip

-checking for ranlib... ranlib

-checking command to parse /usr/bin/nm -B output from gcc object... ok

-checking how to run the C preprocessor... gcc -E

-checking for ANSI C header files... yes

-checking for sys/types.h... yes

-checking for sys/stat.h... yes

-checking for stdlib.h... yes

-checking for string.h... yes

-checking for memory.h... yes

-checking for strings.h... yes

-checking for inttypes.h... yes

-checking for stdint.h... yes

-checking for unistd.h... yes

-checking for dlfcn.h... yes

-checking for objdir... .libs

-checking if gcc supports -fno-rtti -fno-exceptions... no

-checking for gcc option to produce PIC... -fPIC -DPIC

-checking if gcc PIC flag -fPIC -DPIC works... yes

-checking if gcc static flag -static works... yes

-checking if gcc supports -c -o file.o... yes

-checking if gcc supports -c -o file.o... (cached) yes

-checking whether the gcc linker (/usr/bin/ld) supports shared libraries... yes

-checking whether -lc should be explicitly linked in... no

-checking dynamic linker characteristics... GNU/Linux ld.so

-checking how to hardcode library paths into programs... immediate

-checking whether stripping libraries is possible... yes

-checking if libtool supports shared libraries... yes

-checking whether to build shared libraries... yes

-checking whether to build static libraries... yes

-checking for library containing strerror... none required

-checking for gcc... (cached) gcc

-checking whether we are using the GNU C compiler... (cached) yes

-checking whether gcc accepts -g... (cached) yes

-checking for gcc option to accept ISO C89... (cached) none needed

-checking dependency style of gcc... (cached) none

-checking whether ln -s works... yes

-checking whether gcc needs -traditional... no

-checking for vprintf... yes

-checking for _doprnt... no

-checking for working alloca.h... yes

-checking for alloca... yes

-checking for gethostname... yes

-checking for select... yes

-checking for poll... yes

-checking for strerror... yes

-checking for strcasecmp... yes

-checking for strncasecmp... yes

-checking for setsid... yes

-checking for atexit... yes

-checking for mallinfo... yes

-checking for mkstemp... yes

-checking for snprintf... yes

-checking for vsnprintf... yes

-checking for asprintf... yes

-checking for vasprintf... yes

-checking for C99 vsnprintf... yes

-checking for dlopen... no

-checking for dlopen in -ldl... yes

-checking for dlfcn.h... (cached) yes

-checking for cpp... /usr/bin/cpp

-checking for sys/wait.h that is POSIX.1 compatible... yes

-checking whether time.h and sys/time.h may both be included... yes

-checking fcntl.h usability... yes

-checking fcntl.h presence... yes

-checking for fcntl.h... yes

-checking limits.h usability... yes

-checking limits.h presence... yes

-checking for limits.h... yes

-checking sys/ioctl.h usability... yes

-checking sys/ioctl.h presence... yes

-checking for sys/ioctl.h... yes

-checking sys/time.h usability... yes

-checking sys/time.h presence... yes

-checking for sys/time.h... yes

-checking for sys/types.h... (cached) yes

-checking libintl.h usability... yes

-checking libintl.h presence... yes

-checking for libintl.h... yes

-checking sys/select.h usability... yes

-checking sys/select.h presence... yes

-checking for sys/select.h... yes

-checking poll.h usability... yes

-checking poll.h presence... yes

-checking for poll.h... yes

-checking malloc.h usability... yes

-checking malloc.h presence... yes

-checking for malloc.h... yes

-checking ctype.h usability... yes

-checking ctype.h presence... yes

-checking for ctype.h... yes

-checking for string.h... (cached) yes

-checking for strings.h... (cached) yes

-checking whether sys_siglist is declared... yes

-checking for an ANSI C-conforming const... yes

-checking return type of signal handlers... void

-checking whether gcc supports x86 inline asm... yes

-checking whether gcc supports MMX(tm) inline asm... yes

-checking for pkg-config... pkg-config

-checking for gettext... yes

-checking for xgettext... xgettext

-xgettext and gettext() exist; will build i18n support for be

-bg

-bs

-ca

-cs

-da

-de

-el

-es

-et

-fi

-fr

-gl

-hr

-hu

-it

-ja

-ko

-ms

-nl

-no

-pl

-pt

-ro

-ru

-sk

-sv

-tr

-zh_CN

-zh_TW

-checking for connect... yes

-checking for gethostbyname... yes

-checking for inet_aton... yes

-checking for X... libraries , headers 

-checking for gethostbyname... (cached) yes

-checking for connect... (cached) yes

-checking for remove... yes

-checking for shmat... yes

-checking for IceConnectionNumber in -lICE... yes

-checking for _Xsetlocale in -lX11... no

-checking for XInternAtoms in -lX11... yes

-checking for XConvertCase in -lX11... yes

-checking for XShapeSelectInput in -lXext... yes

-checking for the Xft2 library... found

-checking whether libXft is at least version 2.1.0... yes

-checking for XineramaQueryScreens in -lXinerama... yes

-checking for XineramaGetInfo in -lXext... no

-checking for XShmAttach in -lXext... yes

-checking for shmget... yes

-checking for XpmCreatePixmapFromData in -lXpm... yes

-checking X11/xpm.h usability... yes

-checking X11/xpm.h presence... yes

-checking for X11/xpm.h... yes

-checking for png_get_valid in -lpng... yes

-checking png.h usability... yes

-checking png.h presence... yes

-checking for png.h... yes

-checking for jpeg_destroy_compress in -ljpeg... yes

-checking jpeglib.h usability... yes

-checking jpeglib.h presence... yes

-checking for jpeglib.h... yes

-checking for DGifOpenFileName in -lungif... yes

-checking gif_lib.h usability... yes

-checking gif_lib.h presence... yes

-checking for gif_lib.h... yes

-checking for TIFFGetVersion in -ltiff... yes

-checking tiffio.h usability... yes

-checking tiffio.h presence... yes

-checking for tiffio.h... yes

-checking for stdlib.h... (cached) yes

-configure: creating ./config.status

-config.status: creating Makefile

-config.status: creating po/Makefile

-config.status: creating util/Makefile

-config.status: creating test/Makefile

-config.status: creating WINGs/Makefile

-config.status: creating WINGs/WINGs/Makefile

-config.status: creating WINGs/Documentation/Makefile

-config.status: creating WINGs/Examples/Makefile

-config.status: creating WINGs/Resources/Makefile

-config.status: creating WINGs/Tests/Makefile

-config.status: creating WINGs/Extras/Makefile

-config.status: creating WINGs/po/Makefile

-config.status: creating wmlib/Makefile

-config.status: creating wrlib/Makefile

-config.status: creating wrlib/tests/Makefile

-config.status: creating src/Makefile

-config.status: creating src/wconfig.h

-config.status: creating doc/Makefile

-config.status: creating doc/sk/Makefile

-config.status: creating WindowMaker/Makefile

-config.status: creating WindowMaker/Backgrounds/Makefile

-config.status: creating WindowMaker/Defaults/Makefile

-config.status: creating WindowMaker/IconSets/Makefile

-config.status: creating WindowMaker/Icons/Makefile

-config.status: creating WindowMaker/Pixmaps/Makefile

-config.status: creating WindowMaker/Styles/Makefile

-config.status: creating WindowMaker/Themes/Makefile

-config.status: creating WPrefs.app/Makefile

-config.status: creating WPrefs.app/tiff/Makefile

-config.status: creating WPrefs.app/xpm/Makefile

-config.status: creating WPrefs.app/po/Makefile

-config.status: creating contrib/Makefile

-config.status: creating contrib/WindowMaker.spec

-config.status: creating src/config.h

-config.status: executing depfiles commands

-config.status: executing libtool commands

-configure: WARNING: unrecognized options: --with-gnustepdir

-

-Window Maker was configured as follows:

-

-Installation path prefix            : /usr

-Installation path for binaries      : /usr/bin

-Installation path for WPrefs.app    : /usr/share/GNUstep/Applications

-Supported graphic format libraries  : XPM PNG JPEG GIF TIFF builtin-PPM

-Use assembly routines for wrlib     : yes

-Use inline MMX(tm) x86 assembly     : yes

-Antialiased text support in WINGs   : yes

-Xinerama extension support          : yes

-Translated message files to install : be.mo bg.mo bs.mo ca.mo cs.mo da.mo de.mo el.mo es.mo et.mo fi.mo fr.mo gl.mo hr.mo hu.mo it.mo ja.mo ko.mo ms.mo nl.mo no.mo pl.mo pt.mo ro.mo ru.mo sk.mo sv.mo tr.mo zh_CN.mo zh_TW.mo

-Installation path for translations  : /usr/share/locale

-

-Making all in wrlib

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'

-Making all in .

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'

-/bin/sh ../libtool --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I../src  -I/usr/include     -march=i686 -mtune=generic -O2 -pipe -c -o raster.lo raster.c

-/bin/sh ../libtool --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I../src  -I/usr/include     -march=i686 -mtune=generic -O2 -pipe -c -o gradient.lo gradient.c

-/bin/sh ../libtool --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I../src  -I/usr/include     -march=i686 -mtune=generic -O2 -pipe -c -o convert.lo convert.c

-`echo /bin/sh ../libtool --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I../src  -I/usr/include     -march=i686 -mtune=generic -O2 -pipe | sed -e s/-fomit-frame-pointer//` -O0 -c x86_specific.c

-/bin/sh ../libtool --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I../src  -I/usr/include     -march=i686 -mtune=generic -O2 -pipe -c -o ppm.lo ppm.c

-libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c convert.c  -fPIC -DPIC -o .libs/convert.o

-libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c ppm.c  -fPIC -DPIC -o .libs/ppm.o

-libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c raster.c  -fPIC -DPIC -o .libs/raster.o

-libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -O0 -c x86_specific.c  -fPIC -DPIC -o .libs/x86_specific.o

-libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -O0 -c x86_specific.c -o x86_specific.o >/dev/null 2>&1

-libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c gradient.c  -fPIC -DPIC -o .libs/gradient.o

-libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c ppm.c -o ppm.o >/dev/null 2>&1

-libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c raster.c -o raster.o >/dev/null 2>&1

-libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c gradient.c -o gradient.o >/dev/null 2>&1

-libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../src -I/usr/include -march=i686 -mtune=generic -O2 -pipe -c convert.c -o convert.o >/dev/null 2>&1

-/bin/sh ../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe -version-info 4:0:1  -o libwraster.la -rpath /usr/lib LookupCmap.lo StdCmap.lo CrCmap.lo DelCmap.lo CmapAlloc.lo raster.lo draw.lo color.lo load.lo save.lo gradient.lo xpixmap.lo convert.lo x86_specific.lo context.lo misc.lo scale.lo rotate.lo convolve.lo nxpm.lo xpm.lo xutil.lo ppm.lo png.lo jpeg.lo tiff.lo gif.lo -L/usr/lib  -ltiff  -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lX11  -lm 

-libtool: link: rm -fr  .libs/libwraster.a .libs/libwraster.la .libs/libwraster.lai .libs/libwraster.so .libs/libwraster.so.3 .libs/libwraster.so.3.1.0

-libtool: link: gcc -shared  .libs/LookupCmap.o .libs/StdCmap.o .libs/CrCmap.o .libs/DelCmap.o .libs/CmapAlloc.o .libs/raster.o .libs/draw.o .libs/color.o .libs/load.o .libs/save.o .libs/gradient.o .libs/xpixmap.o .libs/convert.o .libs/x86_specific.o .libs/context.o .libs/misc.o .libs/scale.o .libs/rotate.o .libs/convolve.o .libs/nxpm.o .libs/xpm.o .libs/xutil.o .libs/ppm.o .libs/png.o .libs/jpeg.o .libs/tiff.o .libs/gif.o   -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lX11 -lm  -march=i686 -mtune=generic   -Wl,-soname -Wl,libwraster.so.3 -o .libs/libwraster.so.3.1.0

-libtool: link: (cd ".libs" && rm -f "libwraster.so.3" && ln -s "libwraster.so.3.1.0" "libwraster.so.3")

-libtool: link: (cd ".libs" && rm -f "libwraster.so" && ln -s "libwraster.so.3.1.0" "libwraster.so")

-libtool: link: ar cru .libs/libwraster.a  LookupCmap.o StdCmap.o CrCmap.o DelCmap.o CmapAlloc.o raster.o draw.o color.o load.o save.o gradient.o xpixmap.o convert.o x86_specific.o context.o misc.o scale.o rotate.o convolve.o nxpm.o xpm.o xutil.o ppm.o png.o jpeg.o tiff.o gif.o

-libtool: link: ranlib .libs/libwraster.a

-libtool: link: ( cd ".libs" && rm -f "libwraster.la" && ln -s "../libwraster.la" "libwraster.la" )

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'

-Making all in tests

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib/tests'

-/bin/sh ../../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o testdraw testdraw.o ../../wrlib/libwraster.la 

-/bin/sh ../../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o testgrad testgrad.o ../../wrlib/libwraster.la 

-/bin/sh ../../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o testrot testrot.o ../../wrlib/libwraster.la 

-/bin/sh ../../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o view view.o ../../wrlib/libwraster.la 

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/testgrad testgrad.o  ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lX11 -lm

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/testdraw testdraw.o  ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lX11 -lm

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/testrot testrot.o  ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lX11 -lm

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/view view.o  ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lX11 -lm

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib/tests'

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'

-Making all in WINGs

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'

-Making all in WINGs

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/WINGs'

-make[2]: Nothing to be done for `all'.

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/WINGs'

-Making all in .

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'

-gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2   -I/usr/include  -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c connection.c

-gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2   -I/usr/include  -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c dragdestination.c

-gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2   -I/usr/include  -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c selection.c

-gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2   -I/usr/include  -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c wapplication.c

-gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2   -I/usr/include  -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c wcolor.c

-gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2   -I/usr/include  -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c wfont.c

-gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2   -I/usr/include  -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c wfontpanel.c

-gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2   -I/usr/include  -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c widgets.c

-gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2   -I/usr/include  -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c wtext.c

-gcc -DHAVE_CONFIG_H -I. -I../src -I../WINGs/WINGs -I../wrlib -I../src -I/usr/include/freetype2   -I/usr/include  -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/WINGs\" -DDEBUG  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c wview.c

-rm -f libWUtil.a

-ar cru libWUtil.a array.o bagtree.o connection.o data.o error.o findfile.o handlers.o hashtable.o host.o international.o memory.o misc.o notification.o proplist.o snprintf.o string.o tree.o userdefaults.o usleep.o wapplication.o wutil.o 

-ranlib libWUtil.a

-rm -f libWINGs.a

-ar cru libWINGs.a array.o bagtree.o configuration.o connection.o data.o dragcommon.o dragdestination.o dragsource.o error.o findfile.o handlers.o hashtable.o host.o international.o memory.o misc.o notification.o proplist.o selection.o snprintf.o string.o tree.o userdefaults.o usleep.o wapplication.o wappresource.o wballoon.o wbox.o wbrowser.o wbutton.o wcolor.o wcolorpanel.o wcolorwell.o wevent.o wfilepanel.o wframe.o wfont.o wfontpanel.o widgets.o winputmethod.o wlabel.o wlist.o wmenuitem.o wmisc.o wpanel.o wpixmap.o wpopupbutton.o wprogressindicator.o wruler.o wscroller.o wscrollview.o wslider.o wsplitview.o wtabview.o wtext.o wtextfield.o wview.o wwindow.o 

-ranlib libWINGs.a

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'

-Making all in po

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/po'

-msgfmt -c -o de.mo de.po

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/po'

-Making all in Documentation

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Documentation'

-make[2]: Nothing to be done for `all'.

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Documentation'

-Making all in Resources

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Resources'

-make[2]: Nothing to be done for `all'.

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Resources'

-Making all in Examples

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Examples'

-gcc -DHAVE_CONFIG_H -I. -I../../src -I../../WINGs -I../../wrlib -I../../src -DRESOURCE_PATH=\"/usr/share/WINGs\" -I/usr/include  -DDEBUG    -march=i686 -mtune=generic -O2 -pipe -c server.c

-/bin/sh ../../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o connect connect.o ../../WINGs/libWUtil.a -L/usr/lib  

-/bin/sh ../../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o fontl fontl.o ../../WINGs/libWINGs.a ../../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11    

-/bin/sh ../../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o puzzle puzzle.o ../../WINGs/libWINGs.a ../../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11    

-/bin/sh ../../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o colorpick colorpick.o ../../WINGs/libWINGs.a ../../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11    

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o connect connect.o  ../../WINGs/libWUtil.a -L/usr/lib

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/puzzle puzzle.o  ../../WINGs/libWINGs.a ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/colorpick colorpick.o  ../../WINGs/libWINGs.a ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/fontl fontl.o  ../../WINGs/libWINGs.a ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11

-/bin/sh ../../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o server server.o ../../WINGs/libWUtil.a -L/usr/lib  

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o server server.o  ../../WINGs/libWUtil.a -L/usr/lib

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Examples'

-Making all in Extras

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Extras'

-/bin/sh ../../libtool --tag=CC   --mode=link gcc -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe   -o test test.o wtableview.o wtabledelegates.o ../../WINGs/libWINGs.a ../../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11    

-libtool: link: gcc -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -o .libs/test test.o wtableview.o wtabledelegates.o  ../../WINGs/libWINGs.a ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Extras'

-Making all in Tests

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Tests'

-/bin/sh ../../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o wtest wtest.o ../../WINGs/libWINGs.a ../../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11    

-/bin/sh ../../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o wmquery wmquery.o ../../WINGs/libWINGs.a ../../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11    

-/bin/sh ../../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o wmfile wmfile.o ../../WINGs/libWINGs.a ../../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11    

-/bin/sh ../../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o testmywidget testmywidget.o mywidget.o ../../WINGs/libWINGs.a ../../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11    

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/wmquery wmquery.o  ../../WINGs/libWINGs.a ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/wmfile wmfile.o  ../../WINGs/libWINGs.a ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/wtest wtest.o  ../../WINGs/libWINGs.a ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/testmywidget testmywidget.o mywidget.o  ../../WINGs/libWINGs.a ../../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Tests'

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'

-Making all in src

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'

-cd .. && /bin/sh /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/missing --run autoheader

-rm -f stamp-h1

-touch config.h.in

-cd .. && /bin/sh ./config.status src/config.h

-config.status: creating src/config.h

-make  all-am

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'

-gcc -DHAVE_CONFIG_H -I. -I../wrlib -I../WINGs -I/usr/include    -DLOCALEDIR=\"/usr/share/locale\"  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c actions.c

-gcc -DHAVE_CONFIG_H -I. -I../wrlib -I../WINGs -I/usr/include    -DLOCALEDIR=\"/usr/share/locale\"  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c event.c

-gcc -DHAVE_CONFIG_H -I. -I../wrlib -I../WINGs -I/usr/include    -DLOCALEDIR=\"/usr/share/locale\"  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c icon.c

-gcc -DHAVE_CONFIG_H -I. -I../wrlib -I../WINGs -I/usr/include    -DLOCALEDIR=\"/usr/share/locale\"  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c misc.c

-gcc -DHAVE_CONFIG_H -I. -I../wrlib -I../WINGs -I/usr/include    -DLOCALEDIR=\"/usr/share/locale\"  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c moveres.c

-gcc -DHAVE_CONFIG_H -I. -I../wrlib -I../WINGs -I/usr/include    -DLOCALEDIR=\"/usr/share/locale\"  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c properties.c

-gcc -DHAVE_CONFIG_H -I. -I../wrlib -I../WINGs -I/usr/include    -DLOCALEDIR=\"/usr/share/locale\"  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c startup.c

-gcc -DHAVE_CONFIG_H -I. -I../wrlib -I../WINGs -I/usr/include    -DLOCALEDIR=\"/usr/share/locale\"  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c window.c

-/bin/sh ../libtool --tag=CC   --mode=link gcc -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe   -o wmaker actions.o appicon.o application.o appmenu.o balloon.o client.o colormap.o cycling.o defaults.o dialog.o dock.o dockedapp.o event.o framewin.o geomview.o icon.o main.o menu.o misc.o monitor.o motif.o moveres.o pixmap.o placement.o properties.o resources.o rootmenu.o screen.o session.o shutdown.o switchpanel.o stacking.o startup.o superfluous.o switchmenu.o texture.o usermenu.o xdnd.o xinerama.o xmodifier.o xutil.o wcore.o wdefaults.o window.o winmenu.o winspector.o wmspec.o workspace.o wsound.o text.o ../WINGs/libWINGs.a ../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11 -lXinerama -lXext -lX11 -ldl 

-libtool: link: gcc -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -o .libs/wmaker actions.o appicon.o application.o appmenu.o balloon.o client.o colormap.o cycling.o defaults.o dialog.o dock.o dockedapp.o event.o framewin.o geomview.o icon.o main.o menu.o misc.o monitor.o motif.o moveres.o pixmap.o placement.o properties.o resources.o rootmenu.o screen.o session.o shutdown.o switchpanel.o stacking.o startup.o superfluous.o switchmenu.o texture.o usermenu.o xdnd.o xinerama.o xmodifier.o xutil.o wcore.o wdefaults.o window.o winmenu.o winspector.o wmspec.o workspace.o wsound.o text.o  ../WINGs/libWINGs.a ../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lm -lXft -lXrender -lfontconfig -lfreetype -lXinerama -lXext -lX11 -ldl

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'

-Making all in util

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/util'

-/bin/sh ../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o wdwrite wdwrite.o ../WINGs/libWUtil.a -L/usr/lib   

-/bin/sh ../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o wdread wdread.o ../WINGs/libWUtil.a -L/usr/lib   

-/bin/sh ../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o getstyle getstyle.o fontconv.o ../WINGs/libWUtil.a -L/usr/lib   

-/bin/sh ../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o setstyle setstyle.o fontconv.o ../WINGs/libWUtil.a -lXinerama -lXext -lX11  -L/usr/lib   

-/bin/sh ../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o convertfonts convertfonts.o fontconv.o ../WINGs/libWUtil.a -L/usr/lib   

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o wdwrite wdwrite.o  ../WINGs/libWUtil.a -L/usr/lib

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o getstyle getstyle.o fontconv.o  ../WINGs/libWUtil.a -L/usr/lib

-/bin/sh ../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o seticons seticons.o ../WINGs/libWUtil.a -L/usr/lib   

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o convertfonts convertfonts.o fontconv.o  ../WINGs/libWUtil.a -L/usr/lib

-/bin/sh ../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o geticonset geticonset.o ../WINGs/libWUtil.a -L/usr/lib   

-gcc -DHAVE_CONFIG_H -I. -I../src  -I../WINGs -I../wrlib -I/usr/include -DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"    -march=i686 -mtune=generic -O2 -pipe -c wmsetbg.c

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o seticons seticons.o  ../WINGs/libWUtil.a -L/usr/lib

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o wdread wdread.o  ../WINGs/libWUtil.a -L/usr/lib

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o geticonset geticonset.o  ../WINGs/libWUtil.a -L/usr/lib

-/bin/sh ../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o wmsetup wmsetup.o ../WINGs/libWINGs.a ../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11    -ldl 

-/bin/sh ../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o wmagnify wmagnify.o ../WINGs/libWINGs.a ../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11    -ldl 

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o setstyle setstyle.o fontconv.o  ../WINGs/libWUtil.a -lXinerama -lXext -lX11 -L/usr/lib

-rm -f wmaker.inst

-sed -e "s|#pkgdatadir#|/usr/share/WindowMaker|" \

-		-e "s|#sysconfdir#|/etc/WindowMaker|" \

-		-e "s|#version#|0.92.0|" \

-		-e "s|#bindir#|/usr/bin|" \

-		-e "s|#LITE#||" \

-			./wmaker.inst.in >wmaker.inst

-chmod 755 wmaker.inst

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/wmsetup wmsetup.o  ../WINGs/libWINGs.a ../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11 -ldl

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/wmagnify wmagnify.o  ../WINGs/libWINGs.a ../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11 -ldl

-/bin/sh ../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o wmsetbg wmsetbg.o ../WINGs/libWINGs.a ../wrlib/libwraster.la -lXinerama -lXext -lX11  -lXft -lXrender -lfontconfig -lfreetype -lX11    -ldl 

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o .libs/wmsetbg wmsetbg.o  ../WINGs/libWINGs.a ../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lm -lXinerama -lXext -lXft -lXrender -lfontconfig -lfreetype -lX11 -ldl

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/util'

-Making all in po

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/po'

-msgfmt -c -o de.mo de.po

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/po'

-Making all in WindowMaker

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'

-Making all in Backgrounds

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Backgrounds'

-make[2]: Nothing to be done for `all'.

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Backgrounds'

-Making all in Defaults

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Defaults'

-make[2]: Nothing to be done for `all'.

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Defaults'

-Making all in IconSets

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/IconSets'

-make[2]: Nothing to be done for `all'.

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/IconSets'

-Making all in Icons

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Icons'

-make[2]: Nothing to be done for `all'.

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Icons'

-Making all in Pixmaps

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Pixmaps'

-make[2]: Nothing to be done for `all'.

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Pixmaps'

-Making all in Styles

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Styles'

-make[2]: Nothing to be done for `all'.

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Styles'

-Making all in Themes

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Themes'

-make[2]: Nothing to be done for `all'.

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Themes'

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'

-make[2]: Nothing to be done for `all-am'.

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'

-Making all in wmlib

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wmlib'

-make[1]: Nothing to be done for `all'.

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wmlib'

-Making all in test

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/test'

-gcc -DHAVE_CONFIG_H -I. -I../src -g -D_BSD_SOURCE  -I../wmlib     -march=i686 -mtune=generic -O2 -pipe -c wtest.c

-/bin/sh ../libtool --tag=CC   --mode=link gcc  -march=i686 -mtune=generic -O2 -pipe   -o wtest wtest.o ../wmlib/libWMaker.a  -lXinerama -lXext -lX11   

-libtool: link: gcc -march=i686 -mtune=generic -O2 -pipe -o wtest wtest.o  ../wmlib/libWMaker.a -lXinerama -lXext -lX11

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/test'

-Making all in WPrefs.app

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'

-Making all in xpm

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/xpm'

-make[2]: Nothing to be done for `all'.

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/xpm'

-Making all in tiff

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/tiff'

-make[2]: Nothing to be done for `all'.

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/tiff'

-Making all in po

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/po'

-msgfmt -c -o de.mo de.po

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/po'

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'

-gcc -DHAVE_CONFIG_H -I. -I../src -I../wrlib -I../WINGs -I/usr/include   -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/GNUstep/Applications/WPrefs.app\"  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c main.c

-gcc -DHAVE_CONFIG_H -I. -I../src -I../wrlib -I../WINGs -I/usr/include   -DLOCALEDIR=\"/usr/share/locale\" -DRESOURCE_PATH=\"/usr/share/GNUstep/Applications/WPrefs.app\"  -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -c FontSimple.c

-/bin/sh ../libtool --tag=CC   --mode=link gcc -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe   -o WPrefs main.o WPrefs.o Appearance.o Configurations.o Expert.o Focus.o FontSimple.o Icons.o KeyboardSettings.o KeyboardShortcuts.o Menu.o MenuPreferences.o MouseSettings.o Paths.o Preferences.o TexturePanel.o Themes.o WindowHandling.o Workspace.o double.o editmenu.o imagebrowser.o xmodifier.o ../WINGs/libWINGs.a ../wrlib/libwraster.la -lXft -lXrender -lfontconfig -lfreetype -lX11  

-libtool: link: gcc -fno-strict-aliasing -march=i686 -mtune=generic -O2 -pipe -o .libs/WPrefs main.o WPrefs.o Appearance.o Configurations.o Expert.o Focus.o FontSimple.o Icons.o KeyboardSettings.o KeyboardShortcuts.o Menu.o MenuPreferences.o MouseSettings.o Paths.o Preferences.o TexturePanel.o Themes.o WindowHandling.o Workspace.o double.o editmenu.o imagebrowser.o xmodifier.o  ../WINGs/libWINGs.a ../wrlib/.libs/libwraster.so -L/usr/lib -ltiff -lXpm -lpng -lz -ljpeg -lungif -lXinerama -lXext -lm -lXft -lXrender -lfontconfig -lfreetype -lX11

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'

-Making all in doc

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'

-Making all in sk

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc/sk'

-make[2]: Nothing to be done for `all'.

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc/sk'

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'

-make[2]: Nothing to be done for `all-am'.

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'

-Making all in contrib

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/contrib'

-make[1]: Nothing to be done for `all'.

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/contrib'

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0'

-make[1]: Nothing to be done for `all-am'.

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0'

-Making install in wrlib

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'

-Making install in .

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'

-test -z "/usr/bin" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin"

-/bin/sh ../mkinstalldirs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/pkgconfig

-test -z "/usr/lib" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib"

-test -z "/usr/include" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include"

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/pkgconfig

- /bin/install -c 'get-wraster-flags' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/get-wraster-flags'

-/bin/install -c -m 644 wrlib.pc /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/pkgconfig/

- /bin/sh ../libtool   --mode=install /bin/install -c  'libwraster.la' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libwraster.la'

- /bin/install -c -m 644 'wraster.h' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/wraster.h'

-libtool: install: /bin/install -c .libs/libwraster.so.3.1.0 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libwraster.so.3.1.0

-libtool: install: (cd /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib && { ln -s -f libwraster.so.3.1.0 libwraster.so.3 || { rm -f libwraster.so.3 && ln -s libwraster.so.3.1.0 libwraster.so.3; }; })

-libtool: install: (cd /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib && { ln -s -f libwraster.so.3.1.0 libwraster.so || { rm -f libwraster.so && ln -s libwraster.so.3.1.0 libwraster.so; }; })

-libtool: install: /bin/install -c .libs/libwraster.lai /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libwraster.la

-libtool: install: /bin/install -c .libs/libwraster.a /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libwraster.a

-libtool: install: chmod 644 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libwraster.a

-libtool: install: ranlib /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libwraster.a

-libtool: install: warning: remember to run `libtool --finish /usr/lib'

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'

-Making install in tests

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib/tests'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib/tests'

-make[3]: Nothing to be done for `install-exec-am'.

-make[3]: Nothing to be done for `install-data-am'.

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib/tests'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib/tests'

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wrlib'

-Making install in WINGs

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'

-Making install in WINGs

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/WINGs'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/WINGs'

-make[3]: Nothing to be done for `install-exec-am'.

-test -z "/usr/include/WINGs" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/WINGs"

- /bin/install -c -m 644 'WINGs.h' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/WINGs/WINGs.h'

- /bin/install -c -m 644 'WUtil.h' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/WINGs/WUtil.h'

- /bin/install -c -m 644 'WINGsP.h' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/WINGs/WINGsP.h'

- /bin/install -c -m 644 'proplist-compat.h' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/WINGs/proplist-compat.h'

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/WINGs'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/WINGs'

-Making install in .

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'

-test -z "/usr/bin" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin"

-/bin/sh ../mkinstalldirs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/pkgconfig

-test -z "/usr/lib" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib"

-make[3]: Nothing to be done for `install-data-am'.

-/bin/install -c -m 644 WINGs.pc /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/pkgconfig/

- /bin/install -c 'get-wings-flags' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/get-wings-flags'

- /bin/install -c -m 644 'libWINGs.a' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libWINGs.a'

- /bin/install -c 'get-wutil-flags' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/get-wutil-flags'

- /bin/install -c -m 644 'libWUtil.a' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libWUtil.a'

- ranlib '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libWINGs.a'

- ranlib '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libWUtil.a'

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'

-Making install in po

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/po'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/po'

-make[3]: Nothing to be done for `install-exec-am'.

-/bin/sh ../../mkinstalldirs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale

-chmod 755 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale 

-for n in bg.mo ca.mo cs.mo de.mo fr.mo sk.mo __DuMmY ; do \

-		if test "$n" -a "$n" != "__DuMmY" ; then \

-			l=`basename $n .mo`; \

-			/bin/sh ../../mkinstalldirs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l/LC_MESSAGES; \

-			chmod 755 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l; \

-			chmod 755 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l/LC_MESSAGES; \

-			/bin/install -c -m 644 -m 644 $n /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l/LC_MESSAGES/WINGs.mo; \

-		fi; \

-	done

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/bg

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/bg/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ca

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ca/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/cs

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/cs/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/de

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/de/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/fr

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/fr/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/sk

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/sk/LC_MESSAGES

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/po'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/po'

-Making install in Documentation

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Documentation'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Documentation'

-make[3]: Nothing to be done for `install-exec-am'.

-make[3]: Nothing to be done for `install-data-am'.

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Documentation'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Documentation'

-Making install in Resources

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Resources'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Resources'

-make[3]: Nothing to be done for `install-exec-am'.

-test -z "/usr/share/WINGs" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WINGs"

- /bin/install -c -m 644 'Images.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WINGs/Images.tiff'

- /bin/install -c -m 644 'Images.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WINGs/Images.xpm'

- /bin/install -c -m 644 'defaultIcon.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WINGs/defaultIcon.tiff'

- /bin/install -c -m 644 'defaultIcon.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WINGs/defaultIcon.xpm'

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Resources'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Resources'

-Making install in Examples

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Examples'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Examples'

-make[3]: Nothing to be done for `install-exec-am'.

-make[3]: Nothing to be done for `install-data-am'.

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Examples'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Examples'

-Making install in Extras

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Extras'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Extras'

-test -z "/usr/lib" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib"

-test -z "/usr/include/WINGs" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/WINGs"

- /bin/install -c -m 644 'libExtraWINGs.a' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libExtraWINGs.a'

- /bin/install -c -m 644 'wtableview.h' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/WINGs/wtableview.h'

- /bin/install -c -m 644 'wtabledelegates.h' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/WINGs/wtabledelegates.h'

- ranlib '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libExtraWINGs.a'

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Extras'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Extras'

-Making install in Tests

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Tests'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Tests'

-make[3]: Nothing to be done for `install-exec-am'.

-make[3]: Nothing to be done for `install-data-am'.

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Tests'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs/Tests'

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WINGs'

-Making install in src

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'

-make  install-am

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'

-test -z "/usr/bin" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin"

-make[3]: Nothing to be done for `install-data-am'.

-  /bin/sh ../libtool   --mode=install /bin/install -c 'wmaker' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wmaker'

-libtool: install: warning: `../wrlib/libwraster.la' has not been installed in `/usr/lib'

-libtool: install: /bin/install -c .libs/wmaker /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wmaker

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/src'

-Making install in util

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/util'

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/util'

-test -z "/usr/bin" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin"

-test -z "/usr/bin" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin"

-make[2]: Nothing to be done for `install-data-am'.

- /bin/install -c 'wmaker.inst' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wmaker.inst'

-  /bin/sh ../libtool   --mode=install /bin/install -c 'wxcopy' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wxcopy'

- /bin/install -c 'wm-oldmenu2new' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wm-oldmenu2new'

- /bin/install -c 'wkdemenu.pl' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wkdemenu.pl'

-libtool: install: /bin/install -c wxcopy /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wxcopy

-  /bin/sh ../libtool   --mode=install /bin/install -c 'wxpaste' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wxpaste'

-libtool: install: /bin/install -c wxpaste /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wxpaste

-  /bin/sh ../libtool   --mode=install /bin/install -c 'wdwrite' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wdwrite'

-libtool: install: /bin/install -c wdwrite /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wdwrite

-  /bin/sh ../libtool   --mode=install /bin/install -c 'wdread' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wdread'

-libtool: install: /bin/install -c wdread /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wdread

-  /bin/sh ../libtool   --mode=install /bin/install -c 'getstyle' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/getstyle'

-libtool: install: /bin/install -c getstyle /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/getstyle

-  /bin/sh ../libtool   --mode=install /bin/install -c 'setstyle' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/setstyle'

-libtool: install: /bin/install -c setstyle /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/setstyle

-  /bin/sh ../libtool   --mode=install /bin/install -c 'convertfonts' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/convertfonts'

-libtool: install: /bin/install -c convertfonts /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/convertfonts

-  /bin/sh ../libtool   --mode=install /bin/install -c 'seticons' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/seticons'

-libtool: install: /bin/install -c seticons /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/seticons

-  /bin/sh ../libtool   --mode=install /bin/install -c 'geticonset' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/geticonset'

-libtool: install: /bin/install -c geticonset /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/geticonset

-  /bin/sh ../libtool   --mode=install /bin/install -c 'wmsetbg' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wmsetbg'

-libtool: install: warning: `../wrlib/libwraster.la' has not been installed in `/usr/lib'

-libtool: install: /bin/install -c .libs/wmsetbg /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wmsetbg

-  /bin/sh ../libtool   --mode=install /bin/install -c 'wmsetup' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wmsetup'

-libtool: install: warning: `../wrlib/libwraster.la' has not been installed in `/usr/lib'

-libtool: install: /bin/install -c .libs/wmsetup /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wmsetup

-  /bin/sh ../libtool   --mode=install /bin/install -c 'wmagnify' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wmagnify'

-libtool: install: warning: `../wrlib/libwraster.la' has not been installed in `/usr/lib'

-libtool: install: /bin/install -c .libs/wmagnify /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/bin/wmagnify

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/util'

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/util'

-Making install in po

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/po'

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/po'

-make[2]: Nothing to be done for `install-exec-am'.

-/bin/sh ../mkinstalldirs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale

-chmod 755 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale 

-for n in be.mo bg.mo bs.mo ca.mo cs.mo da.mo de.mo el.mo es.mo et.mo fi.mo fr.mo gl.mo hr.mo hu.mo it.mo ja.mo ko.mo ms.mo nl.mo no.mo pl.mo pt.mo ro.mo ru.mo sk.mo sv.mo tr.mo zh_CN.mo zh_TW.mo __DuMmY ; do \

-		if test "$n" -a "$n" != "__DuMmY" ; then \

-			l=`basename $n .mo`; \

-			/bin/sh ../mkinstalldirs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l/LC_MESSAGES; \

-			chmod 755 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l; \

-			chmod 755 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l/LC_MESSAGES; \

-			/bin/install -c -m 644 -m 644 $n /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l/LC_MESSAGES/WindowMaker.mo; \

-		fi; \

-	done

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/be

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/be/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/bs

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/bs/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/da

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/da/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/el

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/el/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/es

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/es/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/et

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/et/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/fi

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/fi/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/gl

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/gl/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/hr

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/hr/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/hu

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/hu/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/it

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/it/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ja

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ja/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ko

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ko/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ms

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ms/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/nl

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/nl/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/no

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/no/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/pl

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/pl/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/pt

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/pt/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ro

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ro/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ru

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/ru/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/sv

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/sv/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/tr

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/tr/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/zh_CN

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/zh_CN/LC_MESSAGES

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/zh_TW

-mkdir /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/zh_TW/LC_MESSAGES

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/po'

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/po'

-Making install in WindowMaker

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'

-Making install in Backgrounds

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Backgrounds'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Backgrounds'

-make[3]: Nothing to be done for `install-exec-am'.

-test -z "/usr/share/WindowMaker/Backgrounds" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Backgrounds"

- /bin/install -c -m 644 'BlueImage.jpeg' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Backgrounds/BlueImage.jpeg'

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Backgrounds'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Backgrounds'

-Making install in Defaults

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Defaults'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Defaults'

-make[3]: Nothing to be done for `install-exec-am'.

-test -z "/etc/WindowMaker" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/etc/WindowMaker"

- /bin/install -c -m 644 'WMRootMenu' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/etc/WindowMaker/WMRootMenu'

- /bin/install -c -m 644 'WMWindowAttributes' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/etc/WindowMaker/WMWindowAttributes'

- /bin/install -c -m 644 'WindowMaker' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/etc/WindowMaker/WindowMaker'

- /bin/install -c -m 644 'WMState' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/etc/WindowMaker/WMState'

- /bin/install -c -m 644 'WMGLOBAL' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/etc/WindowMaker/WMGLOBAL'

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Defaults'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Defaults'

-Making install in IconSets

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/IconSets'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/IconSets'

-make[3]: Nothing to be done for `install-exec-am'.

-test -z "/usr/share/WindowMaker/IconSets" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/IconSets"

- /bin/install -c -m 644 'Default.iconset' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/IconSets/Default.iconset'

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/IconSets'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/IconSets'

-Making install in Icons

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Icons'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Icons'

-make[3]: Nothing to be done for `install-exec-am'.

-test -z "/usr/share/WindowMaker/Icons" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons"

- /bin/install -c -m 644 'BitchX.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/BitchX.tiff'

- /bin/install -c -m 644 'DefaultAppIcon.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/DefaultAppIcon.tiff'

- /bin/install -c -m 644 'Ftp.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Ftp.png'

- /bin/install -c -m 644 'GNUstep.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/GNUstep.tiff'

- /bin/install -c -m 644 'GNUstep3D.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/GNUstep3D.tiff'

- /bin/install -c -m 644 'GNUstepGlow.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/GNUstepGlow.tiff'

- /bin/install -c -m 644 'GNUterm.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/GNUterm.tiff'

- /bin/install -c -m 644 'GreenWilber.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/GreenWilber.png'

- /bin/install -c -m 644 'ICQ.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/ICQ.png'

- /bin/install -c -m 644 'Jabber.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Jabber.png'

- /bin/install -c -m 644 'Mozilla.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Mozilla.png'

- /bin/install -c -m 644 'Netscape.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Netscape.png'

- /bin/install -c -m 644 'Pen.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Pen.png'

- /bin/install -c -m 644 'Pencil.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Pencil.png'

- /bin/install -c -m 644 'Real.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Real.png'

- /bin/install -c -m 644 'Shell.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Shell.png'

- /bin/install -c -m 644 'Speaker.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Speaker.png'

- /bin/install -c -m 644 'Terminal.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Terminal.tiff'

- /bin/install -c -m 644 'TerminalGNUstep.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/TerminalGNUstep.tiff'

- /bin/install -c -m 644 'TerminalLinux.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/TerminalLinux.tiff'

- /bin/install -c -m 644 'XChat.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/XChat.png'

- /bin/install -c -m 644 'clip.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/clip.tiff'

- /bin/install -c -m 644 'defaultAppIcon.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/defaultAppIcon.tiff'

- /bin/install -c -m 644 'defaultterm.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/defaultterm.tiff'

- /bin/install -c -m 644 'draw.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/draw.tiff'

- /bin/install -c -m 644 'linuxterm.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/linuxterm.tiff'

- /bin/install -c -m 644 'mixer.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/mixer.tiff'

- /bin/install -c -m 644 'notepad.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/notepad.tiff'

- /bin/install -c -m 644 'pdf.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/pdf.tiff'

- /bin/install -c -m 644 'ps.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/ps.tiff'

- /bin/install -c -m 644 'real.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/real.tiff'

- /bin/install -c -m 644 'sgiterm.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/sgiterm.tiff'

- /bin/install -c -m 644 'sound.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/sound.tiff'

- /bin/install -c -m 644 'staroffice2.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/staroffice2.tiff'

- /bin/install -c -m 644 'timer.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/timer.tiff'

- /bin/install -c -m 644 'wilber.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/wilber.tiff'

- /bin/install -c -m 644 'write.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/write.tiff'

- /bin/install -c -m 644 'xdvi.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/xdvi.tiff'

- /bin/install -c -m 644 'xv.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/xv.tiff'

- /bin/install -c -m 644 'BitchX.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/BitchX.xpm'

- /bin/install -c -m 644 'GNUstep.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/GNUstep.xpm'

- /bin/install -c -m 644 'GNUstep3D.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/GNUstep3D.xpm'

- /bin/install -c -m 644 'GNUstepGlow.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/GNUstepGlow.xpm'

- /bin/install -c -m 644 'GNUterm.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/GNUterm.xpm'

- /bin/install -c -m 644 'Terminal.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/Terminal.xpm'

- /bin/install -c -m 644 'TerminalGNUstep.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/TerminalGNUstep.xpm'

- /bin/install -c -m 644 'TerminalLinux.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/TerminalLinux.xpm'

- /bin/install -c -m 644 'clip.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/clip.xpm'

- /bin/install -c -m 644 'defaultAppIcon.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/defaultAppIcon.xpm'

- /bin/install -c -m 644 'defaultterm.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/defaultterm.xpm'

- /bin/install -c -m 644 'draw.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/draw.xpm'

- /bin/install -c -m 644 'linuxterm.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/linuxterm.xpm'

- /bin/install -c -m 644 'mixer.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/mixer.xpm'

- /bin/install -c -m 644 'notepad.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/notepad.xpm'

- /bin/install -c -m 644 'pdf.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/pdf.xpm'

- /bin/install -c -m 644 'ps.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/ps.xpm'

- /bin/install -c -m 644 'real.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/real.xpm'

- /bin/install -c -m 644 'sgiterm.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/sgiterm.xpm'

- /bin/install -c -m 644 'sound.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/sound.xpm'

- /bin/install -c -m 644 'staroffice2.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/staroffice2.xpm'

- /bin/install -c -m 644 'timer.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/timer.xpm'

- /bin/install -c -m 644 'wilber.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/wilber.xpm'

- /bin/install -c -m 644 'write.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/write.xpm'

- /bin/install -c -m 644 'xdvi.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/xdvi.xpm'

- /bin/install -c -m 644 'xv.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Icons/xv.xpm'

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Icons'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Icons'

-Making install in Pixmaps

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Pixmaps'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Pixmaps'

-make[3]: Nothing to be done for `install-exec-am'.

-test -z "/usr/share/WindowMaker/Pixmaps" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Pixmaps"

- /bin/install -c -m 644 'tile.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Pixmaps/tile.tiff'

- /bin/install -c -m 644 'tile.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Pixmaps/tile.xpm'

- /bin/install -c -m 644 'swtile.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Pixmaps/swtile.png'

- /bin/install -c -m 644 'swback.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Pixmaps/swback.png'

- /bin/install -c -m 644 'swback2.png' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Pixmaps/swback2.png'

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Pixmaps'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Pixmaps'

-Making install in Styles

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Styles'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Styles'

-make[3]: Nothing to be done for `install-exec-am'.

-test -z "/usr/share/WindowMaker/Styles" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles"

- /bin/install -c -m 644 'Autumn.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Autumn.style'

- /bin/install -c -m 644 'Black.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Black.style'

- /bin/install -c -m 644 'BlackTexture.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/BlackTexture.style'

- /bin/install -c -m 644 'Blue.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Blue.style'

- /bin/install -c -m 644 'BlueDawn.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/BlueDawn.style'

- /bin/install -c -m 644 'BlueishGreen.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/BlueishGreen.style'

- /bin/install -c -m 644 'Brown.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Brown.style'

- /bin/install -c -m 644 'Brownish.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Brownish.style'

- /bin/install -c -m 644 'Chumbo.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Chumbo.style'

- /bin/install -c -m 644 'Copper.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Copper.style'

- /bin/install -c -m 644 'DarkBlue.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/DarkBlue.style'

- /bin/install -c -m 644 'DarkRed.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/DarkRed.style'

- /bin/install -c -m 644 'Emerald.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Emerald.style'

- /bin/install -c -m 644 'Fire.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Fire.style'

- /bin/install -c -m 644 'Food.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Food.style'

- /bin/install -c -m 644 'Golden.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Golden.style'

- /bin/install -c -m 644 'Green.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Green.style'

- /bin/install -c -m 644 'GreyBlue.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/GreyBlue.style'

- /bin/install -c -m 644 'Gtk.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Gtk.style'

- /bin/install -c -m 644 'Interlace.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Interlace.style'

- /bin/install -c -m 644 'IRednBlue.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/IRednBlue.style'

- /bin/install -c -m 644 'LightBlue.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/LightBlue.style'

- /bin/install -c -m 644 'NewBlue.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/NewBlue.style'

- /bin/install -c -m 644 'NightSky.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/NightSky.style'

- /bin/install -c -m 644 'Pastel.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Pastel.style'

- /bin/install -c -m 644 'Pink.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Pink.style'

- /bin/install -c -m 644 'Pumpkin.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Pumpkin.style'

- /bin/install -c -m 644 'Purple.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Purple.style'

- /bin/install -c -m 644 'Purplish.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Purplish.style'

- /bin/install -c -m 644 'Red.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Red.style'

- /bin/install -c -m 644 'RednBlue.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/RednBlue.style'

- /bin/install -c -m 644 'Spring.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Spring.style'

- /bin/install -c -m 644 'Summer.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Summer.style'

- /bin/install -c -m 644 'Traditional.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/Traditional.style'

- /bin/install -c -m 644 'VioletBlue.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Styles/VioletBlue.style'

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Styles'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Styles'

-Making install in Themes

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Themes'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Themes'

-make[3]: Nothing to be done for `install-exec-am'.

-test -z "/usr/share/WindowMaker/Themes" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Themes"

- /bin/install -c -m 644 'Default.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Themes/Default.style'

- /bin/install -c -m 644 'OpenStep.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Themes/OpenStep.style'

- /bin/install -c -m 644 'Pastel.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Themes/Pastel.style'

- /bin/install -c -m 644 'SteelBlueSilk.style' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/Themes/SteelBlueSilk.style'

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Themes'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker/Themes'

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'

-make[3]: Nothing to be done for `install-exec-am'.

-test -z "/usr/share/WindowMaker" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker"

- /bin/install -c -m 644 'README' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/README'

- /bin/install -c -m 644 'README.themes' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/README.themes'

- /bin/install -c -m 644 'autostart.sh' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/autostart.sh'

- /bin/install -c -m 644 'exitscript.sh' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/exitscript.sh'

- /bin/install -c -m 644 'menu' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu'

- /bin/install -c -m 644 'menu.bg' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.bg'

- /bin/install -c -m 644 'menu.ca' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.ca'

- /bin/install -c -m 644 'menu.cz' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.cz'

- /bin/install -c -m 644 'menu.da' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.da'

- /bin/install -c -m 644 'menu.de' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.de'

- /bin/install -c -m 644 'menu.el' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.el'

- /bin/install -c -m 644 'menu.es' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.es'

- /bin/install -c -m 644 'menu.fi' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.fi'

- /bin/install -c -m 644 'menu.fr' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.fr'

- /bin/install -c -m 644 'menu.gl' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.gl'

- /bin/install -c -m 644 'menu.he' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.he'

- /bin/install -c -m 644 'menu.hr' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.hr'

- /bin/install -c -m 644 'menu.hu' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.hu'

- /bin/install -c -m 644 'menu.it' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.it'

- /bin/install -c -m 644 'menu.ja' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.ja'

- /bin/install -c -m 644 'menu.ko' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.ko'

- /bin/install -c -m 644 'menu.nl' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.nl'

- /bin/install -c -m 644 'menu.no' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.no'

- /bin/install -c -m 644 'menu.pl' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.pl'

- /bin/install -c -m 644 'menu.pt' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.pt'

- /bin/install -c -m 644 'menu.ro' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.ro'

- /bin/install -c -m 644 'menu.ru' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.ru'

- /bin/install -c -m 644 'menu.se' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.se'

- /bin/install -c -m 644 'menu.sk' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.sk'

- /bin/install -c -m 644 'menu.sl' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.sl'

- /bin/install -c -m 644 'menu.tr' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.tr'

- /bin/install -c -m 644 'menu.zh_CN' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.zh_CN'

- /bin/install -c -m 644 'menu.zh_TW' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/menu.zh_TW'

- /bin/install -c -m 644 'plmenu' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu'

- /bin/install -c -m 644 'plmenu.bg' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.bg'

- /bin/install -c -m 644 'plmenu.da' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.da'

- /bin/install -c -m 644 'plmenu.de' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.de'

- /bin/install -c -m 644 'plmenu.es' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.es'

- /bin/install -c -m 644 'plmenu.fi' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.fi'

- /bin/install -c -m 644 'plmenu.fr' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.fr'

- /bin/install -c -m 644 'plmenu.hr' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.hr'

- /bin/install -c -m 644 'plmenu.it' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.it'

- /bin/install -c -m 644 'plmenu.ja' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.ja'

- /bin/install -c -m 644 'plmenu.ko' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.ko'

- /bin/install -c -m 644 'plmenu.pl' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.pl'

- /bin/install -c -m 644 'plmenu.ro' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.ro'

- /bin/install -c -m 644 'plmenu.sk' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.sk'

- /bin/install -c -m 644 'plmenu.zh_CN' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.zh_CN'

- /bin/install -c -m 644 'plmenu.zh_TW' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/plmenu.zh_TW'

- /bin/install -c -m 644 'wmmacros' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/wmmacros'

- /bin/install -c -m 644 'xtree.dat' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/WindowMaker/xtree.dat'

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WindowMaker'

-Making install in wmlib

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wmlib'

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wmlib'

-/bin/sh ../mkinstalldirs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/pkgconfig

-test -z "/usr/lib" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib"

-test -z "/usr/include" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include"

-/bin/install -c -m 644 wmlib.pc /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/pkgconfig/

- /bin/install -c -m 644 'libWMaker.a' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libWMaker.a'

- /bin/install -c -m 644 'WMaker.h' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/include/WMaker.h'

- ranlib '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/lib/libWMaker.a'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wmlib'

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/wmlib'

-Making install in test

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/test'

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/test'

-make[2]: Nothing to be done for `install-exec-am'.

-make[2]: Nothing to be done for `install-data-am'.

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/test'

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/test'

-Making install in WPrefs.app

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'

-Making install in xpm

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/xpm'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/xpm'

-make[3]: Nothing to be done for `install-exec-am'.

-if [ tiff = "xpm" -a x"" = "x" ] ; then\

-		make install-data XPM_FILES="advancetonewworkspace.xpm animations.xpm appearance.xpm clip.xpm configs.xpm cycleworkspaces.xpm dock.xpm dontlinkworkspaces.xpm ergonomic.xpm expert.xpm fonts.xpm iconprefs.xpm keyboard.xpm keyboardprefs.xpm keyshortcuts.xpm menualign1.xpm menualign2.xpm menuprefs.xpm menus.xpm moreanim.xpm mousesettings.xpm mousespeed.xpm msty1.xpm msty2.xpm msty3.xpm newstyle.xpm nonopaque.xpm oldstyle.xpm opaque.xpm paths.xpm smooth.xpm sound.xpm speed0.xpm speed0s.xpm speed1.xpm speed1s.xpm speed2.xpm speed2s.xpm speed3.xpm speed3s.xpm speed4.xpm speed4s.xpm tdel.xpm tedit.xpm textr.xpm theme.xpm timer0.xpm timer0s.xpm timer1.xpm timer1s.xpm timer2.xpm timer2s.xpm timer3.xpm timer3s.xpm timer4.xpm timer4s.xpm timer5.xpm timer5s.xpm tnew.xpm whandling.xpm windowfocus.xpm workspace.xpm workspacename.xpm xis.xpm ";\

-	fi

-test -z "/usr/share/GNUstep/Applications/WPrefs.app/xpm" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/xpm"

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/xpm'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/xpm'

-Making install in tiff

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/tiff'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/tiff'

-make[3]: Nothing to be done for `install-exec-am'.

-if [ tiff = "tiff" -a x"" = "x" ] ; then\

-		make install-data TIFF_FILES="advancetonewworkspace.tiff animations.tiff appearance.tiff clip.tiff configs.tiff cycleworkspaces.tiff dock.tiff dontlinkworkspaces.tiff ergonomic.tiff expert.tiff fonts.tiff iconprefs.tiff keyboard.tiff keyboardprefs.tiff keyshortcuts.tiff menualign1.tiff menualign2.tiff menuprefs.tiff menus.tiff moreanim.tiff mousesettings.tiff mousespeed.tiff msty1.tiff msty2.tiff msty3.tiff newstyle.tiff nonopaque.tiff oldstyle.tiff opaque.tiff paths.tiff smooth.tiff sound.tiff speed0.tiff speed0s.tiff speed1.tiff speed1s.tiff speed2.tiff speed2s.tiff speed3.tiff speed3s.tiff speed4.tiff speed4s.tiff tdel.tiff tedit.tiff textr.tiff theme.tiff timer0.tiff timer0s.tiff timer1.tiff timer1s.tiff timer2.tiff timer2s.tiff timer3.tiff timer3s.tiff timer4.tiff timer4s.tiff timer5.tiff timer5s.tiff tnew.tiff whandling.tiff windowfocus.tiff workspace.tiff workspacename.tiff xis.tiff ";\

-	fi

-test -z "/usr/share/GNUstep/Applications/WPrefs.app/tiff" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff"

-make[4]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/tiff'

-if [ tiff = "tiff" -a x"advancetonewworkspace.tiff animations.tiff appearance.tiff clip.tiff configs.tiff cycleworkspaces.tiff dock.tiff dontlinkworkspaces.tiff ergonomic.tiff expert.tiff fonts.tiff iconprefs.tiff keyboard.tiff keyboardprefs.tiff keyshortcuts.tiff menualign1.tiff menualign2.tiff menuprefs.tiff menus.tiff moreanim.tiff mousesettings.tiff mousespeed.tiff msty1.tiff msty2.tiff msty3.tiff newstyle.tiff nonopaque.tiff oldstyle.tiff opaque.tiff paths.tiff smooth.tiff sound.tiff speed0.tiff speed0s.tiff speed1.tiff speed1s.tiff speed2.tiff speed2s.tiff speed3.tiff speed3s.tiff speed4.tiff speed4s.tiff tdel.tiff tedit.tiff textr.tiff theme.tiff timer0.tiff timer0s.tiff timer1.tiff timer1s.tiff timer2.tiff timer2s.tiff timer3.tiff timer3s.tiff timer4.tiff timer4s.tiff timer5.tiff timer5s.tiff tnew.tiff whandling.tiff windowfocus.tiff workspace.tiff workspacename.tiff xis.tiff " = "x" ] ; then\

-		make install-data TIFF_FILES="advancetonewworkspace.tiff animations.tiff appearance.tiff clip.tiff configs.tiff cycleworkspaces.tiff dock.tiff dontlinkworkspaces.tiff ergonomic.tiff expert.tiff fonts.tiff iconprefs.tiff keyboard.tiff keyboardprefs.tiff keyshortcuts.tiff menualign1.tiff menualign2.tiff menuprefs.tiff menus.tiff moreanim.tiff mousesettings.tiff mousespeed.tiff msty1.tiff msty2.tiff msty3.tiff newstyle.tiff nonopaque.tiff oldstyle.tiff opaque.tiff paths.tiff smooth.tiff sound.tiff speed0.tiff speed0s.tiff speed1.tiff speed1s.tiff speed2.tiff speed2s.tiff speed3.tiff speed3s.tiff speed4.tiff speed4s.tiff tdel.tiff tedit.tiff textr.tiff theme.tiff timer0.tiff timer0s.tiff timer1.tiff timer1s.tiff timer2.tiff timer2s.tiff timer3.tiff timer3s.tiff timer4.tiff timer4s.tiff timer5.tiff timer5s.tiff tnew.tiff whandling.tiff windowfocus.tiff workspace.tiff workspacename.tiff xis.tiff ";\

-	fi

-test -z "/usr/share/GNUstep/Applications/WPrefs.app/tiff" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff"

- /bin/install -c -m 644 'advancetonewworkspace.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/advancetonewworkspace.tiff'

- /bin/install -c -m 644 'animations.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/animations.tiff'

- /bin/install -c -m 644 'appearance.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/appearance.tiff'

- /bin/install -c -m 644 'clip.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/clip.tiff'

- /bin/install -c -m 644 'configs.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/configs.tiff'

- /bin/install -c -m 644 'cycleworkspaces.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/cycleworkspaces.tiff'

- /bin/install -c -m 644 'dock.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/dock.tiff'

- /bin/install -c -m 644 'dontlinkworkspaces.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/dontlinkworkspaces.tiff'

- /bin/install -c -m 644 'ergonomic.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/ergonomic.tiff'

- /bin/install -c -m 644 'expert.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/expert.tiff'

- /bin/install -c -m 644 'fonts.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/fonts.tiff'

- /bin/install -c -m 644 'iconprefs.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/iconprefs.tiff'

- /bin/install -c -m 644 'keyboard.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/keyboard.tiff'

- /bin/install -c -m 644 'keyboardprefs.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/keyboardprefs.tiff'

- /bin/install -c -m 644 'keyshortcuts.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/keyshortcuts.tiff'

- /bin/install -c -m 644 'menualign1.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/menualign1.tiff'

- /bin/install -c -m 644 'menualign2.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/menualign2.tiff'

- /bin/install -c -m 644 'menuprefs.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/menuprefs.tiff'

- /bin/install -c -m 644 'menus.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/menus.tiff'

- /bin/install -c -m 644 'moreanim.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/moreanim.tiff'

- /bin/install -c -m 644 'mousesettings.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/mousesettings.tiff'

- /bin/install -c -m 644 'mousespeed.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/mousespeed.tiff'

- /bin/install -c -m 644 'msty1.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/msty1.tiff'

- /bin/install -c -m 644 'msty2.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/msty2.tiff'

- /bin/install -c -m 644 'msty3.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/msty3.tiff'

- /bin/install -c -m 644 'newstyle.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/newstyle.tiff'

- /bin/install -c -m 644 'nonopaque.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/nonopaque.tiff'

- /bin/install -c -m 644 'oldstyle.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/oldstyle.tiff'

- /bin/install -c -m 644 'opaque.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/opaque.tiff'

- /bin/install -c -m 644 'paths.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/paths.tiff'

- /bin/install -c -m 644 'smooth.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/smooth.tiff'

- /bin/install -c -m 644 'sound.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/sound.tiff'

- /bin/install -c -m 644 'speed0.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed0.tiff'

- /bin/install -c -m 644 'speed0s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed0s.tiff'

- /bin/install -c -m 644 'speed1.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed1.tiff'

- /bin/install -c -m 644 'speed1s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed1s.tiff'

- /bin/install -c -m 644 'speed2.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed2.tiff'

- /bin/install -c -m 644 'speed2s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed2s.tiff'

- /bin/install -c -m 644 'speed3.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed3.tiff'

- /bin/install -c -m 644 'speed3s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed3s.tiff'

- /bin/install -c -m 644 'speed4.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed4.tiff'

- /bin/install -c -m 644 'speed4s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/speed4s.tiff'

- /bin/install -c -m 644 'tdel.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/tdel.tiff'

- /bin/install -c -m 644 'tedit.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/tedit.tiff'

- /bin/install -c -m 644 'textr.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/textr.tiff'

- /bin/install -c -m 644 'theme.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/theme.tiff'

- /bin/install -c -m 644 'timer0.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer0.tiff'

- /bin/install -c -m 644 'timer0s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer0s.tiff'

- /bin/install -c -m 644 'timer1.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer1.tiff'

- /bin/install -c -m 644 'timer1s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer1s.tiff'

- /bin/install -c -m 644 'timer2.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer2.tiff'

- /bin/install -c -m 644 'timer2s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer2s.tiff'

- /bin/install -c -m 644 'timer3.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer3.tiff'

- /bin/install -c -m 644 'timer3s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer3s.tiff'

- /bin/install -c -m 644 'timer4.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer4.tiff'

- /bin/install -c -m 644 'timer4s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer4s.tiff'

- /bin/install -c -m 644 'timer5.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer5.tiff'

- /bin/install -c -m 644 'timer5s.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/timer5s.tiff'

- /bin/install -c -m 644 'tnew.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/tnew.tiff'

- /bin/install -c -m 644 'whandling.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/whandling.tiff'

- /bin/install -c -m 644 'windowfocus.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/windowfocus.tiff'

- /bin/install -c -m 644 'workspace.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/workspace.tiff'

- /bin/install -c -m 644 'workspacename.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/workspacename.tiff'

- /bin/install -c -m 644 'xis.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/tiff/xis.tiff'

-make[4]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/tiff'

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/tiff'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/tiff'

-Making install in po

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/po'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/po'

-make[3]: Nothing to be done for `install-exec-am'.

-/bin/sh ../../mkinstalldirs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale

-chmod 755 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale 

-for n in bg.mo ca.mo cs.mo de.mo es.mo et.mo fi.mo fr.mo hr.mo hu.mo it.mo ja.mo ko.mo pt.mo ru.mo sk.mo zh_CN.mo zh_TW.mo __DuMmY ; do \

-		if test "$n" -a "$n" != "__DuMmY" ; then \

-			l=`basename $n .mo`; \

-			/bin/sh ../../mkinstalldirs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l/LC_MESSAGES; \

-			chmod 755 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l; \

-			chmod 755 /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l/LC_MESSAGES; \

-			/bin/install -c -m 644 -m 644 $n /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/locale/$l/LC_MESSAGES/WPrefs.mo; \

-		fi; \

-	done

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/po'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app/po'

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'

-test -z "/usr/share/GNUstep/Applications/WPrefs.app" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app"

-test -z "/usr/share/GNUstep/Applications/WPrefs.app" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app"

-  /bin/sh ../libtool   --mode=install /bin/install -c 'WPrefs' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/WPrefs'

- /bin/install -c -m 644 'WPrefs.tiff' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/WPrefs.tiff'

- /bin/install -c -m 644 'WPrefs.xpm' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/WPrefs.xpm'

-libtool: install: warning: `../wrlib/libwraster.la' has not been installed in `/usr/lib'

-libtool: install: /bin/install -c .libs/WPrefs /data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/GNUstep/Applications/WPrefs.app/WPrefs

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/WPrefs.app'

-Making install in doc

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'

-Making install in sk

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc/sk'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc/sk'

-make[3]: Nothing to be done for `install-exec-am'.

-test -z "/usr/share/man/sk/man1" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1"

- /bin/install -c -m 644 'geticonset.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1/geticonset.1x'

- /bin/install -c -m 644 'setstyle.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1/setstyle.1x'

- /bin/install -c -m 644 'wxpaste.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1/wxpaste.1x'

- /bin/install -c -m 644 'getstyle.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1/getstyle.1x'

- /bin/install -c -m 644 'wdwrite.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1/wdwrite.1x'

- /bin/install -c -m 644 'wmsetbg.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1/wmsetbg.1x'

- /bin/install -c -m 644 'seticons.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1/seticons.1x'

- /bin/install -c -m 644 'wmaker.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1/wmaker.1x'

- /bin/install -c -m 644 'wxcopy.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/sk/man1/wxcopy.1x'

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc/sk'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc/sk'

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'

-make[3]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'

-make[3]: Nothing to be done for `install-exec-am'.

-test -z "/usr/share/man/man1" || /bin/mkdir -p "/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1"

- /bin/install -c -m 644 'geticonset.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1/geticonset.1x'

- /bin/install -c -m 644 'getstyle.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1/getstyle.1x'

- /bin/install -c -m 644 'seticons.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1/seticons.1x'

- /bin/install -c -m 644 'setstyle.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1/setstyle.1x'

- /bin/install -c -m 644 'wdwrite.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1/wdwrite.1x'

- /bin/install -c -m 644 'wmaker.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1/wmaker.1x'

- /bin/install -c -m 644 'wmsetbg.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1/wmsetbg.1x'

- /bin/install -c -m 644 'wxcopy.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1/wxcopy.1x'

- /bin/install -c -m 644 'wxpaste.1x' '/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/pkg/usr/share/man/man1/wxpaste.1x'

-make[3]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/doc'

-Making install in contrib

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/contrib'

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/contrib'

-make[2]: Nothing to be done for `install-exec-am'.

-make[2]: Nothing to be done for `install-data-am'.

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/contrib'

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0/contrib'

-make[1]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0'

-make[2]: Entering directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0'

-make[2]: Nothing to be done for `install-exec-am'.

-make[2]: Nothing to be done for `install-data-am'.

-make[2]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0'

-make[1]: Leaving directory `/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker/src/WindowMaker-0.92.0'

-==> Tidying install...

-  -> Removing info/doc files...

-  -> Compressing man pages...

-  -> Stripping debugging symbols from binaries and libraries...

-  -> Removing libtool .la files...

-==> Creating package...

-  -> Generating .PKGINFO file...

-  -> Compressing package...

-==> Finished making: windowmaker 0.92.0-7 i686 (Thu Oct  1 02:50:48 UTC 2009)

----------updating database ----------

-

-DOCROOT=/data/pkg_repo/i686/extra-testing

-

-Removing old packages from i686/extra-testing:

-removed `windowmaker-0.92.0-6-i686.pkg.tar.gz'

-

-Updating i686/extra-testing with windowmaker-0.92.0-7-i686.pkg.tar.gz

-==> Extracting database to a temporary location...

-==> Adding package '/data/pkg_repo/i686/extra-testing/windowmaker-0.92.0-7-i686.pkg.tar.gz'

-  -> Removing existing package 'windowmaker-0.92.0-6'...

-  -> Creating 'desc' db entry...

-  -> Computing md5 checksums...

-  -> Creating 'depends' db entry...

-==> Creating updated database file '/data/pkg_repo/i686/extra-testing/extra-testing.db.tar.gz'

-/data/LinHES-PKGBUILD/abs/extra-testing/windowmaker

-----------creating source package---------

-==> Making package: windowmaker 0.92.0-7 i686 (Thu Oct  1 02:50:49 UTC 2009)

-==> WARNING: Running makepkg as root...

-==> Creating source package...

-  -> Adding PKGBUILD...

-  -> Adding windowmaker-gcc4.patch.tar.bz2...

-  -> Compressing source package...

-==> Source package created: windowmaker (Thu Oct  1 02:50:49 UTC 2009)

-Removing old src pkg

-Creating src_pkg directory

-removed `/data/pkg_repo/src_packages/extra-testing/windowmaker-0.92.0-6.src.tar.gz'

-copying src_pkg  to /data/pkg_repo/src_packages/extra-testing

-0
\ No newline at end of file
diff --git a/abs/extra-testing/windowmaker/windowmaker-gcc4.patch.tar.bz2 b/abs/extra-testing/windowmaker/windowmaker-gcc4.patch.tar.bz2
deleted file mode 100644
index fae12a9..0000000
--- a/abs/extra-testing/windowmaker/windowmaker-gcc4.patch.tar.bz2
+++ /dev/null
diff --git a/abs/extra-testing/wireshark/PKGBUILD b/abs/extra-testing/wireshark/PKGBUILD
deleted file mode 100644
index 4b7a88c..0000000
--- a/abs/extra-testing/wireshark/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 34765 2009-04-11 14:17:32Z hugo $
-# Maintainer: Hugo Doria <hugo@archlinux.org>
-
-pkgname=wireshark
-pkgver=1.2.0
-pkgrel=3
-pkgdesc="A free network protocol analyzer for Unix/Linux and Windows"
-arch=('i686' 'x86_64')
-license=('GPL2')
-depends=('gtk2>=2.14.5' 'heimdal>=1.2.1' 'libpcap>=1.0.0' 'bash' 'gnutls>=2.4.1' 'libcap>=2.16')
-makedepends=('bison' 'flex')
-url="http://www.wireshark.org/"
-replaces=('ethereal')
-options=(!libtool)
-source=(http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.gz wireshark.desktop wireshark.png)
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  export CFLAGS="-fno-unit-at-a-time ${CFLAGS}"
-  ./configure --prefix=/usr --with-ssl || return 1
-  make all || return 1
-  make DESTDIR=${pkgdir} install || return 1
-
-  install -Dm644 ${srcdir}/wireshark.png ${pkgdir}/usr/share/icons/wireshark.png
-  install -Dm644 ${srcdir}/wireshark.desktop ${pkgdir}/usr/share/applications/wireshark.desktop
-}
diff --git a/abs/extra-testing/wireshark/wireshark.desktop b/abs/extra-testing/wireshark/wireshark.desktop
deleted file mode 100644
index f4317f6..0000000
--- a/abs/extra-testing/wireshark/wireshark.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-GenericName=Wireshark
-Comment=Network protocol analyzer
-Name=wireshark
-Exec=wireshark
-Icon=/usr/share/icons/wireshark.png
-Type=Application
-Terminal=false
-Categories=Application;Network;
diff --git a/abs/extra-testing/wireshark/wireshark.png b/abs/extra-testing/wireshark/wireshark.png
deleted file mode 100644
index 4e40263..0000000
--- a/abs/extra-testing/wireshark/wireshark.png
+++ /dev/null
diff --git a/abs/extra-testing/wol/PKGBUILD b/abs/extra-testing/wol/PKGBUILD
deleted file mode 100755
index a9bb4eb..0000000
--- a/abs/extra-testing/wol/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Contributor: Markus Volkmann <mcfock@counterstrike.de>
-pkgname=wol
-pkgver=0.7.1
-pkgrel=3
-pkgdesc="wol implements Wake On LAN functionality in a small program. It wakes up hardware that is Magic Packet compliant."
-license="GPL"
-url="http://ahh.sourceforge.net/wol/"
-arch=('i686')
-source=(http://easynews.dl.sourceforge.net/sourceforge/ahh/wol-$pkgver.tar.gz wakeonlan.sh)
-md5sums=('c2fa9d7e771134ac8c89d56b8197d4ca')
-
-build() {
-	cd $startdir/src/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make || return 1
-	make prefix=$startdir/pkg/usr install
-	install -m755 $startdir/src/wakeonlan.sh $startdir/pkg/usr/bin/wakeonlan.sh
-}
-
diff --git a/abs/extra-testing/wol/wakeonlan.sh b/abs/extra-testing/wol/wakeonlan.sh
deleted file mode 100755
index f87dd34..0000000
--- a/abs/extra-testing/wol/wakeonlan.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-DIR="/data/srv/hobbit/var/hostdata/$1"
-FILE=`ls -t --group-directories-first $DIR|tail -n 1`
-for mac in `grep HW "$DIR/$FILE" |awk '{ print $5 } '`
-do
-	/usr/bin/wol -v $mac
-done
-	
-
-
diff --git a/abs/extra-testing/wxgtk/ChangeLog b/abs/extra-testing/wxgtk/ChangeLog
deleted file mode 100644
index ac2030d..0000000
--- a/abs/extra-testing/wxgtk/ChangeLog
+++ /dev/null
@@ -1,40 +0,0 @@
-2009-10-20  Eric Belanger  <eric@archlinux.org>
-
-	* wxgtk 2.8.10.1-5
-	* Added mediactrl support (close FS#15377)
-	* Added glib2 build patch
-	* Improved description
-
-2009-07-11  Eric Belanger  <eric@archlinux.org>
-
-	* wxgtk 2.8.10.1-4
-	* Added security fix (close FS#15469)
-
-2009-05-21  Eric Belanger  <eric@archlinux.org>
-
-	* wxgtk 2.8.10.1-1
-	* Upstream update
-
-2009-05-05  Eric Belanger  <eric@archlinux.org>
-
-	* wxgtk 2.8.10-1
-	* Upstream update
-
-2009-03-06  Eric Belanger  <eric@archlinux.org>
-
-	* wxgtk 2.8.9.2-1
-	* Upstream update
-	* Switched to wxpython source tarball
-
-2008-09-26  Eric Belanger  <eric@archlinux.org>
-
-	* wxgtk 2.8.9-1
-	* Upstream update
-	* Added mediactrl support (close FS#11220)
-
-2008-07-05  Eric Belanger  <eric@archlinux.org>
-
-	* wxgtk 2.8.8-1
-	* Upstream update
-	* Enabled gnomeprint - needed for wxpython to build
-	* Added ChangeLog
diff --git a/abs/extra-testing/wxgtk/PKGBUILD b/abs/extra-testing/wxgtk/PKGBUILD
deleted file mode 100644
index c4a16be..0000000
--- a/abs/extra-testing/wxgtk/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 63766 2010-01-18 14:31:06Z pierre $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Original Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# New Version - Contributor: Bob Finch <w9ya@arrl.net>
-# with help from J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> aka Angelus
-
-pkgname=wxgtk
-pkgver=2.8.10.1
-pkgrel=6
-pkgdesc="GTK+ implementation of wxWidgets API for GUI"
-arch=('i686' 'x86_64')
-url="http://wxwidgets.org"
-license=('custom:wxWindows')
-depends=('gtk2' 'mesa' 'gstreamer0.10-base')
-makedepends=('gstreamer0.10-base-plugins' 'gconf' 'ccache')
-options=('ccache') # required to build libwx_gtk2u_mmedia
-#source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
-source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 \
-        overflow.patch gsocket.patch)
-md5sums=('65d5ef166f23fe8b4c67f58df164f93e' '325dba65152bc0cfbc1400a2bf54508e'\
-         'b56113a94125e4f9a3cc2680052bdfde')
-sha1sums=('6598fbafd979a91f20100171fa23a91779f6dc62' '7c4d1d507aad0b7c25a0de55234be42ea3e3f55f'\
-         '5b0e985afd77153e8e4b9e14987d4b1a9de53acc')
-
-build() {
-  cd "${srcdir}/wxPython-src-${pkgver}"
-#  cd "${srcdir}/wxGTK-${pkgver}"
-  patch -p4 < ../overflow.patch || return 1
-  patch -p1 < ../gsocket.patch || return 1
-  ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
-    --enable-graphics_ctx  --disable-optimize --enable-mediactrl || return 1
-  make || return 1
-  make -C locale allmo || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  cd contrib/src
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 ../../docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
-}
diff --git a/abs/extra-testing/wxgtk/__changelog b/abs/extra-testing/wxgtk/__changelog
deleted file mode 100644
index 3bf8bed..0000000
--- a/abs/extra-testing/wxgtk/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-remove libgnomeprint
diff --git a/abs/extra-testing/wxgtk/gsocket.patch b/abs/extra-testing/wxgtk/gsocket.patch
deleted file mode 100644
index 0f1fc7b..0000000
--- a/abs/extra-testing/wxgtk/gsocket.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: 2.8/src/gtk/gsockgtk.cpp
-===================================================================
---- 2.8/src/gtk/gsockgtk.cpp (revision 60599)
-+++ 2.8/src/gtk/gsockgtk.cpp (working copy)
-@@ -15,8 +15,13 @@
- #include <stdlib.h>
- #include <stdio.h>
-
-+// newer versions of glib define its own GSocket but we unfortunately use this
-+// name in our own (semi-)public header and so can't change it -- rename glib
-+// one instead
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
- #include <glib.h>
-+#undef GSocket
-
- #include "wx/gsocket.h"
- #include "wx/unix/gsockunx.h"
diff --git a/abs/extra-testing/wxgtk/overflow.patch b/abs/extra-testing/wxgtk/overflow.patch
deleted file mode 100644
index 543bdff..0000000
--- a/abs/extra-testing/wxgtk/overflow.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagpng.cpp
-===================================================================
---- /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagpng.cpp (revision 53479)
-+++ /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagpng.cpp (revision 60875)
-@@ -569,5 +569,7 @@
-         goto error;
- 
--    lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned char *)) );
-+    // initialize all line pointers to NULL to ensure that they can be safely
-+    // free()d if an error occurs before all of them could be allocated
-+    lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
-     if ( !lines )
-         goto error;
-@@ -576,9 +578,5 @@
-     {
-         if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL)
--        {
--            for ( unsigned int n = 0; n < i; n++ )
--                free( lines[n] );
-             goto error;
--        }
-     }
- 
-Index: /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagtiff.cpp
-===================================================================
---- /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagtiff.cpp (revision 48694)
-+++ /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagtiff.cpp (revision 60876)
-@@ -262,5 +262,4 @@
- 
-     uint32 w, h;
--    uint32 npixels;
-     uint32 *raster;
- 
-@@ -276,7 +275,18 @@
-                             samplesInfo[0] == EXTRASAMPLE_UNASSALPHA));
- 
--    npixels = w * h;
--
--    raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) );
-+    // guard against integer overflow during multiplication which could result
-+    // in allocating a too small buffer and then overflowing it
-+    const double bytesNeeded = w * h * sizeof(uint32);
-+    if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
-+    {
-+        if ( verbose )
-+            wxLogError( _("TIFF: Image size is abnormally big.") );
-+
-+        TIFFClose(tif);
-+
-+        return false;
-+    }
-+
-+    raster = (uint32*) _TIFFmalloc( bytesNeeded );
- 
-     if (!raster)
-Index: /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagtiff.cpp
-===================================================================
---- /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagtiff.cpp (revision 60876)
-+++ /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagtiff.cpp (revision 60897)
-@@ -277,5 +277,5 @@
-     // guard against integer overflow during multiplication which could result
-     // in allocating a too small buffer and then overflowing it
--    const double bytesNeeded = w * h * sizeof(uint32);
-+    const double bytesNeeded = (double)w * (double)h * sizeof(uint32);
-     if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
-     {
diff --git a/abs/extra-testing/x11vnc/PKGBUILD b/abs/extra-testing/x11vnc/PKGBUILD
deleted file mode 100644
index 543a7ab..0000000
--- a/abs/extra-testing/x11vnc/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: damir <damir@archlinux.org>
-
-pkgname=x11vnc
-pkgver=0.9.9
-pkgrel=1
-pkgdesc="a VNC server for real X displays"
-arch=("i686" "x86_64")
-license=("GPL2")
-#source=(http://dl.sourceforge.net/sourceforge/libvncserver/$pkgname-$pkgver.tar.gz)
-url="http://www.karlrunge.com/x11vnc/"
-source=("http://x11vnc.sourceforge.net/dev/$pkgname-$pkgver.tar.gz")
-depends=('openssl' 'libjpeg' 'zlib' 'libx11' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure
-  make || return 1
-  make prefix=$startdir/pkg/usr install || return 1
-}
-md5sums=('874008821a0588a73ec7fbe09b747bb0')
diff --git a/abs/extra-testing/xalan-java/PKGBUILD b/abs/extra-testing/xalan-java/PKGBUILD
deleted file mode 100644
index 634cb23..0000000
--- a/abs/extra-testing/xalan-java/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Hussam Al-Tayeb <ht990332@gmail.com>
-
-pkgname=xalan-java
-pkgver=2.7.1
-pkgrel=2
-pkgdesc="XSLT processor for transforming XML documents into HTML, text, or other XML document types"
-arch=('i686' 'x86_64')
-license=('APACHE')
-url="http://xml.apache.org/xalan-j"
-depends=('xerces2-java')
-source=(http://www.apache.org/dist/xml/xalan-j/xalan-j_${pkgver//./_}-bin-2jars.tar.gz)
-md5sums=('3ccda39bcd08b780436dfd2f22fb23d5')
-
-build() {
-  cd ${srcdir}/xalan-j_${pkgver//./_}
-  install -m755 -d ${pkgdir}/usr/share/java
-  install -m644 xalan.jar ${pkgdir}/usr/share/java/ || return 1
-  install -m644 xsltc.jar ${pkgdir}/usr/share/java/ || return 1
-}
diff --git a/abs/extra-testing/xautomation/PKGBUILD b/abs/extra-testing/xautomation/PKGBUILD
deleted file mode 100644
index 6151353..0000000
--- a/abs/extra-testing/xautomation/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Contributor: raubkopierer <mail[dot]sensenmann[at]gmail[dot]com>
-
-pkgname=xautomation
-pkgver=1.02
-pkgrel=2
-pkgdesc="Controls X from the command line for scripts, and do 'visual scraping' to find things on the screen."
-url="http://hoopajoo.net/projects/xautomation.html"
-arch=('i686' 'x86_64')
-license=('GPL')
-source=(http://hoopajoo.net/static/projects/$pkgname-$pkgver.tar.gz)
-md5sums=('523198135f7cf7a5324189aef20ac48d')
-
-build() {
-	cd $startdir/src/$pkgname-$pkgver
-	./configure --prefix=/usr 
-	make || return 1
-        make DESTDIR=$startdir/pkg install	
-}
diff --git a/abs/extra-testing/xbmc-svn/CHANGELOG b/abs/extra-testing/xbmc-svn/CHANGELOG
deleted file mode 100644
index ddcbd53..0000000
--- a/abs/extra-testing/xbmc-svn/CHANGELOG
+++ /dev/null
@@ -1,110 +0,0 @@
-xbmc-svn Change log:
---------------------
-2nd July 2009
-21333   haggy: updated to current svn head which has media flagging support if your skin
-               supports it (the shipped PM3HD does already, also Aeon and MediaStream redux)
-
-3rd June 2009
-20896   haggy: enabled external libs for every lib supported despite python and ffmpeg
-               enabling external python breaks python support in xbmc due to Arch's python
-               compiled with UCS2 support whereas xbmc expects UCS4. Enabling external ffmpeg
-               disables VDPAU and we don't want that for sure.
-
-               IMPORTANT NOTE: If compilation breaks at configure step with some message about
-               not being able to compute the size of int or size_t, try running makepkg as root
-               with 'sudo makepkg --asroot'. This is a known issue and happens only on systems
-               linked to nvidia's libgl which causes binaries to segfault within a fakeroot
-               environment. pacman 3.3 will fix this by splitting configure and installation steps.
-
-1st June 2009
-20818   haggy: this is the last revision before external-libs-support got patched
-               in. Unfortunately this will not compile with fakeroot. waiting for
-               pacman 3.3 which can split up configure and make install steps.
-
-30th May 2009
-20793   haggy: removed gcc44-fixes.patch - got merged into svn
-
-29th May 2009
-20755   haggy: pushed rev as requested
-
-27th May 2009
-20705   haggy: added a patch which fixed compilation with GCC 4.4.
-
-21th May 2009
-20509   haggy: xbmc got updates on goom due to the jaunty build system update. i
-               i wiped all goom specific hacks from the PKGBUILD and it compiled
-               fine, so let's see what you guys achieve.
-
-19th May 2009
-20449-1 richy: 1. Removed the autoreconf line as it didn't seem to help
-               2. Added !makeflags
-               3. Rev push :-)
-
-16th May 2009
-20343-1 richy: 1. added python as a depenency and removed x-server (namcap advised),
-               2. added autoreconf to goom before aclocal - another pot-shot at the goom compile prob.
-               3. added flax and bison to makedepends - I thought they were implicitely provided, but
-                    some users didn't have them.
-               4. Rev push to 20343
-               5. Removed the --quiet flag form SVN for now as sourcforge was timing out and
-                    failing silently.
- 
-               Note: namcap advised a number of other changes which I ignored for now.
-
-15th May 2009
-20231-3 - haggy: added libsamplerate as a dependency, it is needed for the recent smoothvideo patches
-
-14th May 2009
-20231-2 - haggy: another shot in the dark to fix that damn goom compilation error
-
-13th May 2009
-20231 - haggy: smoothvideo!
-
-12th May 2009
-20172 - haggy: a shot in the dark: try another autoreconf inside goom and see if it helps.
-
-11th May 2009
-20149 - haggy: pushed rev, removed 'hitting-o-breaks...'-patch - it got fixed in svn
-
-9th May 2009
-20101 - haggy: an updated PM3 skin made it into xbmc. added conflicts hint to this PKGBUILD
-
-8th May 2009
-20059 - haggy: minor push past 9.04, removed copying the source tree to a build tree which wastes space,
-               takes ages and stresses the hdd for no reason. instead we now use svn to revert to a 
-               clean build dir.
-
-5th May 2009
-19941 - rich: heaps more tickets closed, Mexican translation
-
-30th April 2009
-19841 - haggy: lots of closed tickets worth a release, removed xsession patch
-
-27th April 2009
-19753 - haggy: added patch for xsession file breaking installation into fakeroot.
-
-22nd April 2009
-19602 - richy: version bump to address problem with python scripts and plugins
-
-20th April 2009
-19550 - haggy: pushed rev, some .mov fixes and better i18n in xbmc
-
-17th April 2009
-19517 - haggy: pushed rev, re-added installfile
-19516-2- richy: Added back autoreconf -vif in libdvdcss - still required for some folk (me)
-19516 - haggy: pushed rev, moved patches to patchfiles, added 'safe fullscreen patch', several cleanups
-
-15th April 2009
-19484 - haggy: pushed rev, re-enabled MAKEFLAGS to allow a more streamlined package
-
-14th April 2009
-19463 - haggy: added install file 
-19463 - richy: moved _svn* back inside build() on Haggy's suggestion. Let's try and avoid broken releases!
-19463 - richy: makedepends 'subversion' instead of 'svn' because that's what's in the guidelines
-19463 - richy: changed licens from ('GPL' 'custom') to ('GPL', 'LGPL') - See: http://xbmc.org/about/
-
-13th April 2009 - initial upload to AUR, tested on 32bit and 64bit.
-19444 - richy: Moved _svn* outside of build so that users get the latest SVN.
-19444 - richy: Added a symlink for XBMCtex to usr/bin/XBMCtex
-19444 - richy: Moved libcdio into depends from opt-depends - right now it is a dependency.
-
diff --git a/abs/extra-testing/xbmc-svn/Lircmap.xml b/abs/extra-testing/xbmc-svn/Lircmap.xml
deleted file mode 100644
index 600567f..0000000
--- a/abs/extra-testing/xbmc-svn/Lircmap.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<!-- This file contains the mapping of LIRC keys to XBMC keys used in Keymap.xml  -->
-<!--                                                                              -->
-<!-- How to add remotes                                                           -->
-<!-- <remote device="name_Lirc_calls_the_remote">                                 -->
-<!--                                                                              -->
-<!-- For the commands the layout following layout is used                         -->
-<!-- <XBMC_COMMAND>LircButtonName</XBMC_COMMAND>                                  -->
-<!--                                                                              -->
-<!-- For a list of XBMC_COMMAND's check out the <remote> sections of keymap.xml   -->
-
-<lircmap>
-	<remote device="mceusb">
-		<pause>Pause</pause>
-		<stop>Stop</stop>
-		<forward>Forward</forward>
-		<reverse>Rewind</reverse>
-		<left>Left</left>
-		<right>Right</right>
-		<up>Up</up>
-		<down>Down</down>
-		<select>OK</select>
-		<pageplus>ChanUp</pageplus>
-		<pageminus>ChanDown</pageminus>
-		<back>Back</back>
-		<menu>PreviousMenu</menu>
-		<title>Play</title>
-		<info>More</info>
-		<skipplus>Skip</skipplus>
-		<skipminus>Replay</skipminus>
-		<display>Teletext</display>
-		<start>Home</start>
-		<record>Record</record>
-		<volumeplus>VolUp</volumeplus>
-		<volumeminus>VolDown</volumeminus>
-		<mute>Mute</mute>
-		<power>Power</power>
-		<myvideo>Videos</myvideo>
-		<mymusic>Music</mymusic>
-		<mypictures>Pictures</mypictures>
-		<mytv>TV</mytv>
-		<one>One</one>
-		<two>Two</two>
-		<three>Three</three>
-		<four>Four</four>
-		<five>Five</five>
-		<six>Six</six>
-		<seven>Seven</seven>
-		<eight>Eight</eight>
-		<nine>Nine</nine>
-		<zero>Zero</zero>
-		<mytv>Red</mytv>
-		<mymusic>Green</mymusic>
-		<mypictures>Yellow</mypictures>
-		<myvideo>Blue</myvideo>
-	</remote>
-	
-	<remote device="mceusb2">
-		<pause>Pause</pause>
-		<stop>Stop</stop>
-		<forward>Forward</forward>
-		<reverse>Rewind</reverse>
-		<left>Left</left>
-		<right>Right</right>
-		<up>Up</up>
-		<down>Down</down>
-		<select>OK</select>
-		<pageplus>ChanUp</pageplus>
-		<pageminus>ChanDown</pageminus>
-		<back>Back</back>
-		<menu>PreviousMenu</menu>
-		<title>Play</title>
-		<info>More</info>
-		<skipplus>Skip</skipplus>
-		<skipminus>Replay</skipminus>
-		<display>Teletext</display>
-		<start>Home</start>
-		<record>Record</record>
-		<volumeplus>VolUp</volumeplus>
-		<volumeminus>VolDown</volumeminus>
-		<mute>Mute</mute>
-		<power>Power</power>
-		<myvideo>Videos</myvideo>
-		<mymusic>Music</mymusic>
-		<mypictures>Pictures</mypictures>
-		<mytv>TV</mytv>
-		<one>One</one>
-		<two>Two</two>
-		<three>Three</three>
-		<four>Four</four>
-		<five>Five</five>
-		<six>Six</six>
-		<seven>Seven</seven>
-		<eight>Eight</eight>
-		<nine>Nine</nine>
-		<zero>Zero</zero>
-		<mytv>Red</mytv>
-		<mymusic>Green</mymusic>
-		<mypictures>Yellow</mypictures>
-		<myvideo>Blue</myvideo>
-	</remote>
-	
-	<remote device="XboxDVDDongle">
-		<play>PLAY</play>
-		<pause>PAUSE</pause>
-		<stop>STOP</stop>
-		<forward>FORWARD</forward>
-		<reverse>REVERSE</reverse>
-		<left>LEFT</left>
-		<right>RIGHT</right>
-		<up>UP</up>
-		<down>DOWN</down>
-		<select>SELECT</select>
-		<back>BACK</back>
-		<menu>MENU</menu>
-		<title>TITLE</title>
-		<info>INFO</info>
-		<skipplus>SKIP+</skipplus>
-		<skipminus>SKIP-</skipminus>
-		<display>DISPLAY</display>
-		<one>1</one>
-		<two>2</two>
-		<three>3</three>
-		<four>4</four>
-		<five>5</five>
-		<six>6</six>
-		<seven>7</seven>
-		<eight>8</eight>
-		<nine>9</nine>
-		<zero>0</zero>
-	</remote>
-
-	<remote device="Microsoft_Xbox">
-		<play>PLAY</play>
-		<pause>PAUSE</pause>
-		<stop>STOP</stop>
-		<forward>FORWARD</forward>
-		<reverse>REVERSE</reverse>
-		<left>LEFT</left>
-		<right>RIGHT</right>
-		<up>UP</up>
-		<down>DOWN</down>
-		<select>SELECT</select>
-		<back>BACK</back>
-		<menu>MENU</menu>
-		<title>TITLE</title>
-		<info>INFO</info>
-		<skipplus>SKIP+</skipplus>
-		<skipminus>SKIP-</skipminus>
-		<display>DISPLAY</display>
-		<one>1</one>
-		<two>2</two>
-		<three>3</three>
-		<four>4</four>
-		<five>5</five>
-		<six>6</six>
-		<seven>7</seven>
-		<eight>8</eight>
-		<nine>9</nine>
-		<zero>0</zero>
-	</remote>
-
-	<remote device="PinnacleSysPCTVRemote">
-		<play>Play</play>
-		<pause>pause</pause>
-		<stop>Stop</stop>
-		<forward>FForward</forward>
-		<reverse>Rewind</reverse>
-		<left>Vol-Rew</left>
-		<right>Vol+FF</right>
-		<up>Chan+Play</up>
-		<down>Chan-Stop</down>
-		<pageplus>channel+</pageplus>
-		<pageminus>channel-</pageminus>
-		<select>middle</select>
-		<back>undo</back>
-		<menu>Menu</menu>
-		<title>L</title>
-		<info>Info</info>
-		<skipplus>next</skipplus>
-		<display>Fullscreen</display>
-		<record>Record</record>
-		<volumeplus>vol+</volumeplus>
-		<volumeminus>vol-</volumeminus>
-		<mute>Mute</mute>
-		<power>Power</power>
-		<one>1</one>
-		<two>2</two>
-		<three>3</three>
-		<four>4</four>
-		<five>5</five>
-		<six>6</six>
-		<seven>7</seven>
-		<eight>8</eight>
-		<nine>9</nine>
-		<zero>0</zero>
-	</remote>
-
-        <remote device="Streamzap_PC_Remote">
-                <play>PLAY</play>
-                <pause>PAUSE</pause>
-                <stop>STOP</stop>
-                <forward>&gt;&gt;</forward>
-                <reverse>&lt;&lt;</reverse>
-                <left>LEFT</left>
-                <right>RIGHT</right>
-                <up>UP</up>
-                <down>DOWN</down>
-                <pageplus>CH_UP</pageplus>
-                <pageminus>CH_DOWN</pageminus>
-                <select>OK</select>
-                <back>EXIT</back>
-                <menu>MENU</menu>
-                <title>RED</title>
-                <info>GREEN</info>
-                <skipplus>&gt;&gt;|</skipplus>
-                <display>YELLOW</display>
-                <record>RECORD</record>
-                <volumeplus>VOL_UP</volumeplus>
-                <volumeminus>VOL_DOWN</volumeminus>
-                <mute>MUTE</mute>
-                <power>POWER</power>
-                <one>1</one>
-                <two>2</two>
-                <three>3</three>
-                <four>4</four>
-                <five>5</five>
-                <six>6</six>
-                <seven>7</seven>
-                <eight>8</eight>
-                <nine>9</nine>
-                <zero>0</zero>
-        </remote>
-</lircmap>
diff --git a/abs/extra-testing/xbmc-svn/PKGBUILD b/abs/extra-testing/xbmc-svn/PKGBUILD
deleted file mode 100644
index d7debbe..0000000
--- a/abs/extra-testing/xbmc-svn/PKGBUILD
+++ /dev/null
@@ -1,97 +0,0 @@
-# Contributors : Ralf Barth <archlinux dot org at haggy dot org>
-#                Richard Atkinson atkinsonr-at-gmail 
-#
-# Original credits go to Edgar Hucek <gimli at dark-green dot com>
-# for his xbmc-vdpau-vdr PKGBUILD at https://archvdr.svn.sourceforge.net/svnroot/archvdr/trunk/archvdr/xbmc-vdpau-vdr/PKGBUILD
-
-pkgname=xbmc-svn
-pkgver=25089
-pkgrel=1
-pkgdesc="XBMC Media Center from SVN"
-provides=('xbmc')
-conflicts=('xbmc')
-arch=('i686' 'x86_64')
-url="http://xbmc.org"
-license=('GPL' 'LGPL')
-depends=('alsa-lib' 'curl' 'enca' 'faac' 'freetype2' 'fribidi' 'gawk' 'glew'
-         'hal' 'jasper' 'libgl' 'libmad' 'libmysqlclient' 'libjpeg'
-         'libxinerama' 'libxrandr' 'lzo2' 'sdl_image' 'sdl_mixer' 'sqlite3'
-         'tre' 'unzip' 'libcdio' 'libsamplerate' 'python' 'avahi' 'libmad' 
-         'a52dec' 'libdca' 'faad2' 'libmpeg2' 'libvorbis' 'libogg' 'libmms'
-         'libmpcdec' 'flac' 'wavpack' 'xorg-utils' 'smbclient' 'libvdpau')
-makedepends=('subversion' 'autoconf' 'automake' 'boost' 'cmake' 'gcc' 'gperf' 
-             'libtool>=2.2.6a-1' 'make' 'nasm' 'patch' 'pkgconfig' 'zip' 'flex' 'bison')
-optdepends=('lirc: remote controller support'
-            'pmount: mount removable devices as normal user'
-            'unrar: access compressed files without unpacking them')
-install=("${pkgname}.install")
-source=(Lircmap.xml)
-noextract=()
-md5sums=()
-options=(makeflags)
-
-_svnmod=XBMC
-_prefix=/usr
-
-build() {
-
-    _svntrunk=http://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk
-
-    cd ${srcdir}/
-    if [ -d $_svnmod/.svn ]; then
-        msg "SVN tree found, reverting changes and updating to -r$pkgver"
-        (cd $_svnmod && svn revert -R . && svn up -r $pkgver) || return 1
-    else
-        msg "Checking out SVN tree of -r$pkgver"
-        svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod || return 1
-    fi
-
-    # Configure XBMC
-    #
-    # Note on external-libs:
-    #   - We cannot use external python because Arch's python was built with
-    #     UCS2 unicode support, whereas xbmc expects UCS4 support
-    #   - We cannot use Arch's libass because it's incompatible with XBMC's
-    #     subtitle rendering
-    #   - We cannot use external ffmpeg because we would loose VDPAU functionality
-    cd "$srcdir/$_svnmod" 
-    msg "Configuring XBMC" 
-    ./bootstrap
-    ./configure --prefix=${_prefix} \
-                --enable-external-liba52 \
-                --enable-external-libdts \
-                --enable-external-libmpeg2 \
-                --enable-external-libogg \
-                --enable-external-libwavpack \
-                --disable-external-libass \
-                --disable-external-ffmpeg \
-                --disable-external-python \
-                --disable-debug || return 1
-  
-    # Now (finally) build
-    msg "Running make" 
-    make || return 1
-
-    cd "$srcdir/$_svnmod"
-    msg "Running make install" 
-    make prefix=${pkgdir}${_prefix} install || return 1
-
-    # Install 
-    install -Dm755 ${srcdir}/$_svnmod/xbmc-xrandr \
-                   ${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr || return 1
-
-    install -Dm644 ${srcdir}/$_svnmod/tools/Linux/xbmc.desktop \
-                   ${pkgdir}${_prefix}/share/applications/xbmc.desktop || return 1
-
-    install -Dm644 ${srcdir}/$_svnmod/tools/Linux/xbmc.png \
-                   ${pkgdir}${_prefix}/share/pixmaps/xbmc.png || return 1
-
-    install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname}
-    for licensef in LICENSE.GPL README.linux copying.txt; do
-        mv ${pkgdir}${_prefix}/share/xbmc/${licensef} \
-           ${pkgdir}${_prefix}/share/licenses/${pkgname} || return 1
-    done
-
-    # Use custom Lircmap to support StreamZap remote
-    cp ${srcdir}/Lircmap.xml ${pkgdir}${_prefix}/share/xbmc/system/Lircmap.xml
-}
diff --git a/abs/extra-testing/xbmc-svn/__changelog b/abs/extra-testing/xbmc-svn/__changelog
deleted file mode 100644
index bbf1705..0000000
--- a/abs/extra-testing/xbmc-svn/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-Added Lircmap.xml to PKGBUILD to support MCE2 and StreamZap remotes
diff --git a/abs/extra-testing/xbmc-svn/xbmc-svn.install b/abs/extra-testing/xbmc-svn/xbmc-svn.install
deleted file mode 100644
index acf409c..0000000
--- a/abs/extra-testing/xbmc-svn/xbmc-svn.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  echo ">> If XBMC won't start, but just segfaults, double check your X.Org config"
-  echo ">> so that your display depth is at least 24-bit. Eg: change "
-  echo ">> \"DefaultDepth 16\" under the \"Screen\" section so it says 24 instead"
-  echo ">> of 16."
-  echo ">> If you have problems or suggestions for this PKGBUILD, have a look at its"
-  echo ">> dedicated forum thread: http://bbs.archlinux.org/viewtopic.php?pid=559107"
-  echo ">> or the wiki: http://xbmc.org/wiki/?title=XBMC_on_Arch_Linux_(Unofficial)"
-  echo
-  /bin/true
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/abs/extra-testing/xbmc/FEH.sh b/abs/extra-testing/xbmc/FEH.sh
deleted file mode 100644
index 9cbec63..0000000
--- a/abs/extra-testing/xbmc/FEH.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-function directRendering() {
-out=$(glxinfo | grep "direct rendering")
-direct=${out#"direct rendering: "}
-if [ "$direct" = "Yes" ]; then
-  return 0
-else
-  return 1
-fi
-}
-
-function colorDepth() {
-out=$(xdpyinfo | grep "depth of root")
-color=${out:27:2}
-if [ "$color" = "24" ]; then
-  return 0
-else
-  return 1
-fi
-}
-
-directRendering
-direct_ok=$?
-
-colorDepth
-color_ok=$?
-
-exit_val=0
-
-if [ $direct_ok -ne 0 ]; then
-  echo "XBMC needs hardware accelerated OpenGL rendering."
-  echo "Install an appropriate graphics driver."
-  echo " "
-  echo "Please consult XBMC Wiki for supported hardware"
-  echo "http://xbmc.org/wiki/?title=Supported_hardware"
-  exit_val=1
-fi
-
-if [ $color_ok -ne 0 ]; then
-  echo "XBMC cannot run unless the"
-  echo "screen color depth is atleast 24 bit."
-  echo " "
-  echo "Please reconfigure your screen."
-  exit_val=1
-fi
-
-exit $exit_val
diff --git a/abs/extra-testing/xbmc/Lircmap.xml b/abs/extra-testing/xbmc/Lircmap.xml
deleted file mode 100644
index 600567f..0000000
--- a/abs/extra-testing/xbmc/Lircmap.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<!-- This file contains the mapping of LIRC keys to XBMC keys used in Keymap.xml  -->
-<!--                                                                              -->
-<!-- How to add remotes                                                           -->
-<!-- <remote device="name_Lirc_calls_the_remote">                                 -->
-<!--                                                                              -->
-<!-- For the commands the layout following layout is used                         -->
-<!-- <XBMC_COMMAND>LircButtonName</XBMC_COMMAND>                                  -->
-<!--                                                                              -->
-<!-- For a list of XBMC_COMMAND's check out the <remote> sections of keymap.xml   -->
-
-<lircmap>
-	<remote device="mceusb">
-		<pause>Pause</pause>
-		<stop>Stop</stop>
-		<forward>Forward</forward>
-		<reverse>Rewind</reverse>
-		<left>Left</left>
-		<right>Right</right>
-		<up>Up</up>
-		<down>Down</down>
-		<select>OK</select>
-		<pageplus>ChanUp</pageplus>
-		<pageminus>ChanDown</pageminus>
-		<back>Back</back>
-		<menu>PreviousMenu</menu>
-		<title>Play</title>
-		<info>More</info>
-		<skipplus>Skip</skipplus>
-		<skipminus>Replay</skipminus>
-		<display>Teletext</display>
-		<start>Home</start>
-		<record>Record</record>
-		<volumeplus>VolUp</volumeplus>
-		<volumeminus>VolDown</volumeminus>
-		<mute>Mute</mute>
-		<power>Power</power>
-		<myvideo>Videos</myvideo>
-		<mymusic>Music</mymusic>
-		<mypictures>Pictures</mypictures>
-		<mytv>TV</mytv>
-		<one>One</one>
-		<two>Two</two>
-		<three>Three</three>
-		<four>Four</four>
-		<five>Five</five>
-		<six>Six</six>
-		<seven>Seven</seven>
-		<eight>Eight</eight>
-		<nine>Nine</nine>
-		<zero>Zero</zero>
-		<mytv>Red</mytv>
-		<mymusic>Green</mymusic>
-		<mypictures>Yellow</mypictures>
-		<myvideo>Blue</myvideo>
-	</remote>
-	
-	<remote device="mceusb2">
-		<pause>Pause</pause>
-		<stop>Stop</stop>
-		<forward>Forward</forward>
-		<reverse>Rewind</reverse>
-		<left>Left</left>
-		<right>Right</right>
-		<up>Up</up>
-		<down>Down</down>
-		<select>OK</select>
-		<pageplus>ChanUp</pageplus>
-		<pageminus>ChanDown</pageminus>
-		<back>Back</back>
-		<menu>PreviousMenu</menu>
-		<title>Play</title>
-		<info>More</info>
-		<skipplus>Skip</skipplus>
-		<skipminus>Replay</skipminus>
-		<display>Teletext</display>
-		<start>Home</start>
-		<record>Record</record>
-		<volumeplus>VolUp</volumeplus>
-		<volumeminus>VolDown</volumeminus>
-		<mute>Mute</mute>
-		<power>Power</power>
-		<myvideo>Videos</myvideo>
-		<mymusic>Music</mymusic>
-		<mypictures>Pictures</mypictures>
-		<mytv>TV</mytv>
-		<one>One</one>
-		<two>Two</two>
-		<three>Three</three>
-		<four>Four</four>
-		<five>Five</five>
-		<six>Six</six>
-		<seven>Seven</seven>
-		<eight>Eight</eight>
-		<nine>Nine</nine>
-		<zero>Zero</zero>
-		<mytv>Red</mytv>
-		<mymusic>Green</mymusic>
-		<mypictures>Yellow</mypictures>
-		<myvideo>Blue</myvideo>
-	</remote>
-	
-	<remote device="XboxDVDDongle">
-		<play>PLAY</play>
-		<pause>PAUSE</pause>
-		<stop>STOP</stop>
-		<forward>FORWARD</forward>
-		<reverse>REVERSE</reverse>
-		<left>LEFT</left>
-		<right>RIGHT</right>
-		<up>UP</up>
-		<down>DOWN</down>
-		<select>SELECT</select>
-		<back>BACK</back>
-		<menu>MENU</menu>
-		<title>TITLE</title>
-		<info>INFO</info>
-		<skipplus>SKIP+</skipplus>
-		<skipminus>SKIP-</skipminus>
-		<display>DISPLAY</display>
-		<one>1</one>
-		<two>2</two>
-		<three>3</three>
-		<four>4</four>
-		<five>5</five>
-		<six>6</six>
-		<seven>7</seven>
-		<eight>8</eight>
-		<nine>9</nine>
-		<zero>0</zero>
-	</remote>
-
-	<remote device="Microsoft_Xbox">
-		<play>PLAY</play>
-		<pause>PAUSE</pause>
-		<stop>STOP</stop>
-		<forward>FORWARD</forward>
-		<reverse>REVERSE</reverse>
-		<left>LEFT</left>
-		<right>RIGHT</right>
-		<up>UP</up>
-		<down>DOWN</down>
-		<select>SELECT</select>
-		<back>BACK</back>
-		<menu>MENU</menu>
-		<title>TITLE</title>
-		<info>INFO</info>
-		<skipplus>SKIP+</skipplus>
-		<skipminus>SKIP-</skipminus>
-		<display>DISPLAY</display>
-		<one>1</one>
-		<two>2</two>
-		<three>3</three>
-		<four>4</four>
-		<five>5</five>
-		<six>6</six>
-		<seven>7</seven>
-		<eight>8</eight>
-		<nine>9</nine>
-		<zero>0</zero>
-	</remote>
-
-	<remote device="PinnacleSysPCTVRemote">
-		<play>Play</play>
-		<pause>pause</pause>
-		<stop>Stop</stop>
-		<forward>FForward</forward>
-		<reverse>Rewind</reverse>
-		<left>Vol-Rew</left>
-		<right>Vol+FF</right>
-		<up>Chan+Play</up>
-		<down>Chan-Stop</down>
-		<pageplus>channel+</pageplus>
-		<pageminus>channel-</pageminus>
-		<select>middle</select>
-		<back>undo</back>
-		<menu>Menu</menu>
-		<title>L</title>
-		<info>Info</info>
-		<skipplus>next</skipplus>
-		<display>Fullscreen</display>
-		<record>Record</record>
-		<volumeplus>vol+</volumeplus>
-		<volumeminus>vol-</volumeminus>
-		<mute>Mute</mute>
-		<power>Power</power>
-		<one>1</one>
-		<two>2</two>
-		<three>3</three>
-		<four>4</four>
-		<five>5</five>
-		<six>6</six>
-		<seven>7</seven>
-		<eight>8</eight>
-		<nine>9</nine>
-		<zero>0</zero>
-	</remote>
-
-        <remote device="Streamzap_PC_Remote">
-                <play>PLAY</play>
-                <pause>PAUSE</pause>
-                <stop>STOP</stop>
-                <forward>&gt;&gt;</forward>
-                <reverse>&lt;&lt;</reverse>
-                <left>LEFT</left>
-                <right>RIGHT</right>
-                <up>UP</up>
-                <down>DOWN</down>
-                <pageplus>CH_UP</pageplus>
-                <pageminus>CH_DOWN</pageminus>
-                <select>OK</select>
-                <back>EXIT</back>
-                <menu>MENU</menu>
-                <title>RED</title>
-                <info>GREEN</info>
-                <skipplus>&gt;&gt;|</skipplus>
-                <display>YELLOW</display>
-                <record>RECORD</record>
-                <volumeplus>VOL_UP</volumeplus>
-                <volumeminus>VOL_DOWN</volumeminus>
-                <mute>MUTE</mute>
-                <power>POWER</power>
-                <one>1</one>
-                <two>2</two>
-                <three>3</three>
-                <four>4</four>
-                <five>5</five>
-                <six>6</six>
-                <seven>7</seven>
-                <eight>8</eight>
-                <nine>9</nine>
-                <zero>0</zero>
-        </remote>
-</lircmap>
diff --git a/abs/extra-testing/xbmc/PKGBUILD b/abs/extra-testing/xbmc/PKGBUILD
deleted file mode 100644
index fc068d4..0000000
--- a/abs/extra-testing/xbmc/PKGBUILD
+++ /dev/null
@@ -1,116 +0,0 @@
-# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
-# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
-# Contributor: BlackEagle < ike DOT devolder AT herecura DOT be >
-
-# python dependency or not
-_ext_python="disable"
-
-pkgname=xbmc
-pkgver=9.11
-pkgrel=5
-pkgdesc="XBMC Media Center"
-arch=('i686' 'x86_64')
-url="http://xbmc.org"
-license=('GPL' 'custom')
-conflicts=('xbmc-svn')
-depends=('alsa-lib' 'curl' 'enca' 'faac' 'freetype2' 'fribidi' 'gawk' 'glew'
-         'hal' 'jasper' 'libgl' 'libjpeg' 'libmad' 'libmysqlclient'
-         'libxinerama' 'libxrandr' 'lzo2' 'sdl_image' 'sdl_mixer' 'sqlite3'
-         'tre' 'unzip' 'x-server' 'libcdio' 'wavpack' 'libmpeg2' 'a52dec'
-         'libdca' 'smbclient' 'faad2' 'libsamplerate' 'libmms' 'xorg-utils')
-if [ "$_ext_python" != "disable" ]; then
-  depends=( '${depends[@]}' 'python' )
-fi
-makedepends=('autoconf' 'automake' 'boost' 'cmake' 'gcc' 'gperf'
-            'libtool>=2.2.6a-1' 'make' 'nasm' 'patch' 'pkgconfig' 'zip'
-            'libvdpau')
-optdepends=('lirc: remote controller support'
-            'smbclient: access windows shares'
-            'unrar: access compressed files without unpacking them')
-install=${pkgname}.install
-options=(force)
-source=(http://downloads.sourceforge.net/project/xbmc/XBMC%20Source%20Code/Camelot%20-%20$pkgver/xbmc-${pkgver/_/-}.tar.gz
-        use_cdio_system_headers_on_non_win32.patch
-        FEH.sh
-	Lircmap.xml)
-
-build() {
-  cd "${srcdir}/xbmc-${pkgver/_/-}"
-  _xbmcprefix=/usr
-
-  patch -N -p1 -i  ../use_cdio_system_headers_on_non_win32.patch || return 1
-  # fix lsb_release dependency
-  sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp || return 1
-  # fix faulty declaration in DllLaoder wrapper
-  sed -i 's: ftell64: dll_ftell64:' xbmc/cores/DllLoader/exports/wrapper.c || return 1
-  # fix libjpeg7 delays
-  sed -i 's|cinfo.scale_denom = GetJpegScale();|cinfo.scale_denom = GetJpegScale(); cinfo.scale_num = 1;|' xbmc/lib/cximage-6.0/CxImage/ximajpg.cpp || return 1
-
-  if [ $NOEXTRACT -ne 1 ]; then
-    # Archlinux Branding by SVN_REV
-    export SVN_REV="-ARCH"
-
-    ./bootstrap
-    ./configure --prefix=${_xbmcprefix} \
-    --enable-vdpau \
-    --disable-pulse \
-    --disable-avahi \
-    --enable-external-liba52 \
-    --enable-external-libdts \
-    --enable-external-libmpeg2 \
-    --enable-external-libogg \
-    --enable-external-libwavpack \
-    --disable-external-libass \
-    --disable-external-ffmpeg \
-    --${_ext_python}-external-python \
-    --disable-debug || return 1
-  fi
-
-  make || return 1
-  make prefix=${pkgdir}${_xbmcprefix} install || return 1
-
-  # Fix the shell script
-  sed -i '3iexport SDL_AUDIODRIVER=alsa' ${pkgdir}${_xbmcprefix}/bin/xbmc
-
-  # if disabled external python install bash script and fix startup script
-  if [ "$_ext_python" = "disable" ]; then
-    install -Dm755 ${srcdir}/FEH.sh \
-    ${pkgdir}${_xbmcprefix}/share/xbmc/FEH.sh || return 1
-    sed -i -e "s/python \\${_xbmcprefix}\/share\/xbmc\/FEH.py \"\$@\"/\\${_xbmcprefix}\/share\/xbmc\/FEH.sh/g" ${pkgdir}${_xbmcprefix}/bin/xbmc || return 1
-  fi
-
-  # bin/xbmc lsb_release fix in xmbc startup script
-  sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' ${pkgdir}${_xbmcprefix}/bin/xbmc || return 1
-  sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/    \/'/cat \/etc\/arch-release/g" ${pkgdir}${_xbmcprefix}/bin/xbmc || return 1
-
-  # Menu item
-  install -Dm644 ${srcdir}/xbmc-${pkgver/_/-}/tools/Linux/xbmc.desktop \
-  ${pkgdir}/usr/share/applications/xbmc.desktop || return 1
-  install -Dm644 ${srcdir}/xbmc-${pkgver/_/-}/tools/Linux/xbmc.png \
-  ${pkgdir}/usr/share/pixmaps/xbmc.png || return 1
-
-  # XBMCTex
-  #    install -Dm755 ${srcdir}/xbmc-${pkgver/_/-}/tools/XBMCTex/XBMCTex \
-  #                   ${pkgdir}${_xbmcprefix}/share/xbmc/tools/xbmctex || return 1
-
-  # License(s)
-  install -dm755 ${pkgdir}/usr/share/licenses/${pkgname}
-  for licensef in LICENSE.GPL README.linux copying.txt; do
-    mv ${pkgdir}${_xbmcprefix}/share/xbmc/${licensef} \
-    ${pkgdir}/usr/share/licenses/${pkgname} || return 1
-  done
-
-  # profile.d
-  mkdir -p $pkgdir/etc/profile.d/ && \
-  echo "export PATH=\$PATH:${_xbmcprefix}/bin" >$pkgdir/etc/profile.d/xbmc.sh && \
-  chmod 0755 $pkgdir/etc/profile.d/xbmc.sh || return 1
-
-  # fix .desktop
-  sed -i "s#Exec=xbmc#Exec=${_xbmcprefix}/bin/xbmc#" $pkgdir/usr/share/xsessions/XBMC.desktop $pkgdir/usr/share/applications/xbmc.desktop
-
-  # Use custom Lircmap to support StreamZap remote
-  cp ${srcdir}/Lircmap.xml ${pkgdir}${_xbmcprefix}/share/xbmc/system/Lircmap.xml
-}
-md5sums=('9a68ac1e2f44a54cc3803fcdb1265767'
-        '7b7403cdde791330b5ab70697d2054f2'
-        '0aa669eebaaf2a9f6e000e1f43869a7b')
diff --git a/abs/extra-testing/xbmc/__changelog b/abs/extra-testing/xbmc/__changelog
deleted file mode 100644
index bbf1705..0000000
--- a/abs/extra-testing/xbmc/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-Added Lircmap.xml to PKGBUILD to support MCE2 and StreamZap remotes
diff --git a/abs/extra-testing/xbmc/use_cdio_system_headers_on_non_win32.patch b/abs/extra-testing/xbmc/use_cdio_system_headers_on_non_win32.patch
deleted file mode 100644
index 71f3885..0000000
--- a/abs/extra-testing/xbmc/use_cdio_system_headers_on_non_win32.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
-index 9097519..9b6418d 100644
---- a/xbmc/Application.cpp
-+++ b/xbmc/Application.cpp
-@@ -236,7 +236,11 @@
- #endif
- 
- #ifdef HAS_DVD_DRIVE
-+#ifdef _WIN32
- #include "lib/libcdio/logging.h"
-+#else
-+#include <cdio/logging.h>
-+#endif
- #endif
- 
- #ifdef HAS_HAL
-diff --git a/xbmc/FileSystem/Makefile b/xbmc/FileSystem/Makefile
-index 782d57a..1e524ed 100644
---- a/xbmc/FileSystem/Makefile
-+++ b/xbmc/FileSystem/Makefile
-@@ -1,5 +1,4 @@
--INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
--INCLUDES+=-I../lib/libcdio/libcdio/include
-+INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I../lib
-
- CXXFLAGS+=-D__STDC_FORMAT_MACROS \
- 
-diff --git a/xbmc/FileSystem/cdioSupport.cpp b/xbmc/FileSystem/cdioSupport.cpp
-index 00e5fdd..21a0b67 100644
---- a/xbmc/FileSystem/cdioSupport.cpp
-+++ b/xbmc/FileSystem/cdioSupport.cpp
-@@ -26,7 +26,7 @@
- #include "cdioSupport.h"
- #include "utils/SingleLock.h"
- #include "utils/log.h"
--#ifndef _LINUX
-+#ifdef _WIN32
- #include "lib/libcdio/logging.h"
- #include "lib/libcdio/util.h"
- #include "lib/libcdio/mmc.h"
-diff --git a/xbmc/FileSystem/iso9660.cpp b/xbmc/FileSystem/iso9660.cpp
-index 6e1633f..58fbc50 100644
---- a/xbmc/FileSystem/iso9660.cpp
-+++ b/xbmc/FileSystem/iso9660.cpp
-@@ -44,7 +44,7 @@ ISO9660
- #include "utils/CharsetConverter.h"
- 
- #include "DetectDVDType.h"  // for MODE2_DATA_SIZE etc.
--#ifdef _LINUX
-+#ifndef _WIN32
- #include <cdio/bytesex.h>
- #else
- #include "lib/libcdio/bytesex.h" // for from_723 & from_733
-diff --git a/xbmc/Makefile b/xbmc/Makefile
-index abfbdcb..f55381a 100644
---- a/xbmc/Makefile
-+++ b/xbmc/Makefile
-@@ -8,8 +8,6 @@ INCLUDES+=-Ilib/libUPnP/Platinum/Source/Core \
-           -Ilib/libUPnP/Neptune/Source/System/Posix \
-           -Ilib/libUPnP/Neptune/Source/Core
- 
--INCLUDES+=-Ilib/libcdio/libcdio/include
--
- SRCS=Application.cpp \
-      CueDocument.cpp \
-      GUISettings.cpp \
-diff --git a/xbmc/cdrip/CDDAReader.cpp b/xbmc/cdrip/CDDAReader.cpp
-index c8b37b2..e3e9c0b 100644
---- a/xbmc/cdrip/CDDAReader.cpp
-+++ b/xbmc/cdrip/CDDAReader.cpp
-@@ -24,7 +24,11 @@
- #ifdef HAS_CDDA_RIPPER
- 
- #include "CDDAReader.h"
-+#ifdef _WIN32
- #include "lib/libcdio/cdio.h"
-+#else
-+#include <cdio/cdio.h>
-+#endif
- #include "utils/log.h"
- 
- #define SECTOR_COUNT 52
-diff --git a/xbmc/cores/paplayer/AC3CDDACodec.cpp b/xbmc/cores/paplayer/AC3CDDACodec.cpp
-index 20cded7..f2a077a 100644
---- a/xbmc/cores/paplayer/AC3CDDACodec.cpp
-+++ b/xbmc/cores/paplayer/AC3CDDACodec.cpp
-@@ -22,7 +22,11 @@
- #include "system.h"
- #include "AC3CDDACodec.h"
- #ifdef HAS_AC3_CDDA_CODEC
-+#ifdef _WIN32
- #include "lib/libcdio/sector.h"
-+#else
-+#include <cdio/sector.h>
-+#endif
- 
- AC3CDDACodec::AC3CDDACodec() : AC3Codec()
- {
-diff --git a/xbmc/cores/paplayer/CDDAcodec.cpp b/xbmc/cores/paplayer/CDDAcodec.cpp
-index ca8f1be..42460dc 100644
---- a/xbmc/cores/paplayer/CDDAcodec.cpp
-+++ b/xbmc/cores/paplayer/CDDAcodec.cpp
-@@ -20,7 +20,11 @@
-  */
- 
- #include "CDDAcodec.h"
-+#ifdef _WIN32
- #include "lib/libcdio/sector.h"
-+#else
-+#include <cdio/sector.h>
-+#endif
- 
- #define SECTOR_COUNT 55 // max. sectors that can be read at once
- #define MAX_BUFFER_SIZE 2*SECTOR_COUNT*CDIO_CD_FRAMESIZE_RAW
-diff --git a/xbmc/cores/paplayer/DTSCDDACodec.cpp b/xbmc/cores/paplayer/DTSCDDACodec.cpp
-index e64cc2e..9bc46c6 100644
---- a/xbmc/cores/paplayer/DTSCDDACodec.cpp
-+++ b/xbmc/cores/paplayer/DTSCDDACodec.cpp
-@@ -22,7 +22,11 @@
- #include "system.h"
- #include "DTSCDDACodec.h"
- #ifdef HAS_DTS_CODEC
-+#ifdef _WIN32
- #include "lib/libcdio/sector.h"
-+#else
-+#include <cdio/sector.h>
-+#endif
- 
- DTSCDDACodec::DTSCDDACodec() : DTSCodec()
- {
diff --git a/abs/extra-testing/xbmc/xbmc.install b/abs/extra-testing/xbmc/xbmc.install
deleted file mode 100644
index eb4e9d4..0000000
--- a/abs/extra-testing/xbmc/xbmc.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  echo ">> If XBMC won't start, but just segfaults, double check your X.Org config"
-  echo ">> so that your display depth is at least 24-bit. Eg: change "
-  echo ">> \"DefaultDepth 16\" under the \"Screen\" section so it says 24 instead"
-  echo ">> of 16."
-  /bin/true
-}
diff --git a/abs/extra-testing/xdg-utils/PKGBUILD b/abs/extra-testing/xdg-utils/PKGBUILD
deleted file mode 100644
index c707346..0000000
--- a/abs/extra-testing/xdg-utils/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xdg-utils
-pkgver=1.0.2
-pkgrel=1
-pkgdesc="Command line tools that assist applications with a variety of desktop integration tasks."
-arch=(i686 x86_64)
-url="http://portland.freedesktop.org/"
-license=(MIT)
-source=(http://portland.freedesktop.org/download/$pkgname-$pkgver.tgz)
-md5sums=('348a5b91dc66426505022c74a64b2940')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
diff --git a/abs/extra-testing/xe/PKGBUILD b/abs/extra-testing/xe/PKGBUILD
deleted file mode 100644
index 1ada156..0000000
--- a/abs/extra-testing/xe/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $
-# Maintainer: Cecil Watson<knoppmyth@gmail.com>
-
-pkgname=xe
-pkgver=2.16.2
-pkgrel=1
-pkgdesc="A multi system emulator, that emulates many console and handheld video game systems."
-arch=('i686' 'x86_64')
-depends=('gtk2>=2.10.11')
-url="http://www.xe-emulator.com"
-source=('http://www.xe-emulator.com/files/xe-x86-32-bin.2.16.2.tar.bz2' 'http://www.xe-emulator.com/files/bios.zip')
-install=xe.install
-build() {
-  cd $startdir/src/xe-x86
-  make
-  mkdir -p $startdir/pkg/usr/bin
-  mkdir -p $startdir/pkg/usr/lib/xe
-  mkdir -p $startdir/pkg/usr/lib/xe/bios
-  cp -rf xe modules rc manual.html $startdir/pkg/usr/lib/xe
-  cp -a ../bios/* $startdir/pkg/usr/lib/xe/bios
-}
diff --git a/abs/extra-testing/xe/xe.install b/abs/extra-testing/xe/xe.install
deleted file mode 100644
index d0dd63d..0000000
--- a/abs/extra-testing/xe/xe.install
+++ /dev/null
@@ -1,18 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-	ln -s /usr/lib/xe/xe /usr/bin/xe
-}
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	/bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-	rm -fr /usr/bin/xe
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/xerces2-java/PKGBUILD b/abs/extra-testing/xerces2-java/PKGBUILD
deleted file mode 100644
index 526115d..0000000
--- a/abs/extra-testing/xerces2-java/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xerces2-java
-pkgver=2.9.1
-pkgrel=2
-pkgdesc="High performance fully compliant Java XML parser"
-arch=('i686' 'x86_64')
-url="http://xml.apache.org/xerces2-j"
-license=('APACHE')
-provides=("java-xerces2=${pkgver}")
-conflicts=('java-xerces2')
-replaces=('java-xerces2')
-source=(http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.${pkgver}.tar.gz)
-md5sums=('32718d4cbe009f93d551ab8d3ef4b2aa')
-
-build() {
-  cd $startdir/src/xerces-${pkgver//./_}
-  install -m755 -d ${pkgdir}/usr/share/java
-  rm -f xercesSamples.jar
-  install -m644 *.jar ${pkgdir}/usr/share/java/ || return 1
-}
diff --git a/abs/extra-testing/xfsdump/PKGBUILD b/abs/extra-testing/xfsdump/PKGBUILD
deleted file mode 100644
index 1d40228..0000000
--- a/abs/extra-testing/xfsdump/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 26569 2009-02-09 18:40:22Z paul $
-# Maintainer: judd <jvinet@zeroflux.org>
-pkgname=xfsdump
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="Additional XFS filesystem utilities"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://oss.sgi.com/projects/xfs/"
-depends=('xfsprogs>=3.0.0' 'attr>=2.4.39' 'acl>=2.2.45' 'dmapi')
-options=('!makeflags')
-source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsdump-${pkgver}.tar.gz)
-md5sums=('')
-options=(!emptydirs)
-
-build() {
-  cd $startdir/src/xfsdump-$pkgver
-  autoconf
-  ./configure --prefix=/usr
-  make || return 1
-  make prefix=$startdir/pkg/usr install
-  # fixes
-  rm -f $startdir/pkg/usr/lib/*.la
-  rm -f $startdir/pkg/usr/bin/{xfsdump,xfsrestore}
-}
diff --git a/abs/extra-testing/xine-lib/ChangeLog b/abs/extra-testing/xine-lib/ChangeLog
deleted file mode 100644
index 7ac9d33..0000000
--- a/abs/extra-testing/xine-lib/ChangeLog
+++ /dev/null
@@ -1,43 +0,0 @@
-2009-02-11  Eric Belanger  <eric@archlinux.org>
-
-	* xine-lib 1.1.16.2-1
-	* Upstream update
-
-2009-02-02  Eric Belanger  <eric@archlinux.org>
-
-	* xine-lib 1.1.16.1-2
-	* Rebuilt against imagemagick 6.4.8.10
-
-2009-01-11  Eric Belanger  <eric@archlinux.org>
-
-	* xine-lib 1.1.16.1-1
-        * Upstream update
-
-2009-01-10  Eric Belanger  <eric@archlinux.org>
-
-	* xine-lib 1.1.16-1
-        * Upstream update
-
-2008-12-05  Eric Belanger  <eric@archlinux.org>
-
-	* xine-lib 1.1.15-4
-	* Rebuilt against heimdal 1.2.1
-	* Added xcb support
-
-2008-11-27  Eric Belanger  <eric@archlinux.org>
-
-	* xine-lib 1.1.15-3
-	* Added jack support (close FS#12020)
-	* Fixed several build issue (close FS#12117)
-
-2008-08-14  Eric Belanger  <eric@archlinux.org>
-
-	* xine-lib 1.1.15-1
-	* Upstream update
-
-2008-07-28  Eric Belanger  <eric@archlinux.org>
-
-	* xine-lib 1.1.14-2
-	* Switched to the more recent externel ffmpeg snapshot (close FS#10286)
-	* Updated win32 codecs directory location (close FS#11011)
-	* Added ChangeLog
diff --git a/abs/extra-testing/xine-lib/PKGBUILD b/abs/extra-testing/xine-lib/PKGBUILD
deleted file mode 100644
index aa15b8f..0000000
--- a/abs/extra-testing/xine-lib/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 26791 2009-02-12 02:31:16Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=xine-lib
-pkgver=1.1.16.3
-pkgrel=4
-pkgdesc="A free video player for Unix"
-arch=('i686' 'x86_64')
-url="http://xinehq.de/"
-install=xine.install
-license=('LGPL' 'GPL')
-depends=('libgl' 'libxvmc' 'flac>=1.1.4' 'libvorbis' 'sdl' 'libmng' 'libtheora'
-         'libxcb' 'wavpack' 'ffmpeg>=20081220' 'heimdal>=1.2.1')
-makedepends=('pkgconfig' 'libtool' 'imagemagick' 'smbclient' 'mesa' 'alsa-lib' 
-             'vcdimager' )
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.bz2
-        xine-lib-1.1.1-configure-no-mcpu-march.patch)
-md5sums=('4f508abf088cf427a731f85634c8260d'
-         '9776df4eb54d2f1f68d8268adbc3b5c2')
-optiona=(!emptydir)
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p0 < ../xine-lib-1.1.1-configure-no-mcpu-march.patch || return 1
-
-  libtoolize --force --copy || return 1
-  aclocal -I m4 || return 1
-  autoconf || return 1
-  automake --add-missing || return 1
-
-  ./configure --prefix=/usr --with-w32-path=/usr/lib/codecs \
-    --with-xv-path=/usr/lib --with-xxmc-path=/usr/lib --with-xvmc-path=/usr/lib \
-    --with-libflac --with-wavpack --with-xcb \
-    --without-arts --without-jack --without-speex \
-    --disable-gnomevfs --without-pulseaudio --disable-aalib \
-    --disable-modplug --with-external-ffmpeg --without-esd || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-}
diff --git a/abs/extra-testing/xine-lib/__changelog b/abs/extra-testing/xine-lib/__changelog
deleted file mode 100644
index 0f4719d..0000000
--- a/abs/extra-testing/xine-lib/__changelog
+++ /dev/null
@@ -1,3 +0,0 @@
-add xine.install
-disable jack
-disable esound
diff --git a/abs/extra-testing/xine-lib/xine-header.patch b/abs/extra-testing/xine-lib/xine-header.patch
deleted file mode 100644
index a37bfb9..0000000
--- a/abs/extra-testing/xine-lib/xine-header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/xine-engine/buffer.h	2008-07-16 23:01:56.000000000 +0200
-+++ src/xine-engine/buffer.h	2008-08-24 21:14:39.000000000 +0200
-@@ -676,7 +676,7 @@
- /* convert xine_waveformatex struct from little endian */
- void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED;
- 
--static inline _x_is_fourcc(void *ptr, void *tag) {
-+static __inline _x_is_fourcc(void *ptr, void *tag) {
-   return memcmp(ptr, tag, 4) == 0;
- }
- 
diff --git a/abs/extra-testing/xine-lib/xine-imagemagick.patch b/abs/extra-testing/xine-lib/xine-imagemagick.patch
deleted file mode 100644
index 9faa4ab..0000000
--- a/abs/extra-testing/xine-lib/xine-imagemagick.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xine-lib-1.1.15.orig/src/libxinevdec/image.c
-+++ xine-lib-1.1.15/src/libxinevdec/image.c
-@@ -110,7 +110,7 @@
-     width = MagickGetImageWidth(wand) & ~1; /* must be even for init_yuv_planes */
-     height = MagickGetImageHeight(wand);
-     img_buf = malloc(width * height * 3);
--    MagickGetImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf);
-+    MagickGetAuthenticPixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf);
-     DestroyMagickWand(wand);
- 
-     _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, width);
diff --git a/abs/extra-testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch b/abs/extra-testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch
deleted file mode 100644
index 4b6ba9e..0000000
--- a/abs/extra-testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- m4/optimizations.m4.orig	2005-11-27 01:20:08.000000000 +0100
-+++ m4/optimizations.m4	2005-11-27 01:22:56.000000000 +0100
-@@ -161,10 +161,6 @@
-                   ;;
- 
-               esac
--              if test x"$archopt_val" != x; then
--                  CFLAGS="$sarchopt=$archopt_val $CFLAGS"
--                  DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
--              fi
-             fi
-           else
-             dnl we have the Intel compiler
diff --git a/abs/extra-testing/xine-lib/xine.install b/abs/extra-testing/xine-lib/xine.install
deleted file mode 100755
index f9102ee..0000000
--- a/abs/extra-testing/xine-lib/xine.install
+++ /dev/null
@@ -1,27 +0,0 @@
-# arg 1: the new package version 
- post_install() {
-	 MYTHOME=` su - mythtv -c "echo ~" ` 
-	 if [ ! -f $MYTHOME/.xine/config ]
-	 then
-		 echo "Copying in standard config file for xine"
-		 mkdir  -p  $MYTHOME/.xine/
-		 cp -rp $TEMPLATES/xine.config.template $MYTHOME/.xine/config
-		 chown -R mythtv:mythtv $MYTHOME/.xine
-	 fi
- }
-
-# # arg 1: the new package version 
-# # arg 2: the old package version 
- post_upgrade() { 
- post_install $1 
- } 
-#
-# # arg 1: the old package version 
- post_remove() { 
- /bin/true
- } 
-
-op=$1 
-shift 
-
-$op $*
diff --git a/abs/extra-testing/xine-ui/ChangeLog b/abs/extra-testing/xine-ui/ChangeLog
deleted file mode 100644
index e5fb3e8..0000000
--- a/abs/extra-testing/xine-ui/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-2008-08-19  Eric Belanger  <eric@archlinux.org>
-
-	* xine-ui 0.99.5-4
-	* Added xine and xine-remote binaries (missing in 0.99.5-3)
-	* Added missing libxt makedepends
-	* Replaced .install file by an optdepends
-	* Added ChangeLog
diff --git a/abs/extra-testing/xine-ui/PKGBUILD b/abs/extra-testing/xine-ui/PKGBUILD
deleted file mode 100644
index 79ab3c3..0000000
--- a/abs/extra-testing/xine-ui/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 9858 2008-08-19 23:56:23Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-
-pkgname=xine-ui
-pkgver=0.99.5
-pkgrel=4
-pkgdesc="A free video player for Unix"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://xinehq.de/"
-depends=('xine-lib' 'curl>=7.16.2' 'libxtst' 'libxinerama' 'libxv' 'libpng' 'libxft' 'libsm' 'libxxf86vm' 'ncurses>=5.6-7')
-makedepends=('lirc' 'libxt')
-optdepends=('lirc')
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e643cd1fcad4d98a5ae4eb877ce5087b')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  #add missing constant (defined in xine.h from xine-lib cvs)
-  echo '#define XINE_MSG_AUDIO_OUT_UNAVAILABLE 11' >> src/xitk/common.h
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-    --with-curses --with-x --enable-lirc --without-aalib
-  make || return 1
-  make DESTDIR=${pkgdir} install
-  install -d ${pkgdir}/usr/share/applications
-  echo "Categories=Application;AudioVideo;" >> ${pkgdir}/usr/share/xine/desktop/xine.desktop
-  mv ${pkgdir}/usr/share/xine/desktop/xine.desktop ${pkgdir}/usr/share/applications
-}
diff --git a/abs/extra-testing/xinetd/PKGBUILD b/abs/extra-testing/xinetd/PKGBUILD
deleted file mode 100644
index af0e362..0000000
--- a/abs/extra-testing/xinetd/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 31124 2009-03-24 12:46:33Z allan $
-# Maintainer:  Judd <jvinet@zeroflux.org>
-pkgname=xinetd
-pkgver=2.3.14
-pkgrel=5
-pkgdesc="xinetd is a secure replacement for inetd"
-arch=('i686' 'x86_64')
-url="http://www.xinetd.org/"
-license=('custom')
-depends=('tcp_wrappers')
-optdepends=('perl: for xconv.pl script')
-backup=('etc/xinetd.conf' 'etc/xinetd.d/servers' 'etc/xinetd.d/services')
-source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz xinetd.conf xinetd \
-        servers services)
-md5sums=('567382d7972613090215c6c54f9b82d9' 'f109f699a07bc8cfb5791060f5e87f9e'\
-         'ea37a2794f202e6b953d9b6956dad16a' '21f47b4aa20921cfaddddd9f9a407f81'\
-         '9fa2061dc7dd738c8424251deb86f81e')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i "s#${prefix}/man#${prefix}/share/man#" configure
-  ./configure --prefix=/usr --with-libwrap
-  make || return 1
-  make prefix=$pkgdir/usr install
-  install -D -m755 ../xinetd $pkgdir/etc/rc.d/xinetd
-  install -D -m644 ../xinetd.conf $pkgdir/etc/xinetd.conf
-  install -D -m644 ../servers $pkgdir/etc/xinetd.d/servers
-  install -D -m644 ../services $pkgdir/etc/xinetd.d/services
-
-  # install license
-  install -D -m644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT
-}
diff --git a/abs/extra-testing/xinetd/servers b/abs/extra-testing/xinetd/servers
deleted file mode 100644
index f064c8d..0000000
--- a/abs/extra-testing/xinetd/servers
+++ /dev/null
@@ -1,10 +0,0 @@
-service servers
-{
-        type            = INTERNAL UNLISTED
-        port            = 9099
-        socket_type     = stream
-        protocol        = tcp
-        wait            = no
-        disable         = yes
-        only_from       = 127.0.0.1
-}
diff --git a/abs/extra-testing/xinetd/services b/abs/extra-testing/xinetd/services
deleted file mode 100644
index 4ea304c..0000000
--- a/abs/extra-testing/xinetd/services
+++ /dev/null
@@ -1,10 +0,0 @@
-service services
-{
-        type            = INTERNAL UNLISTED
-        port            = 9098
-        socket_type     = stream
-        protocol        = tcp
-        wait            = no
-        disable         = yes
-        only_from       = 127.0.0.1
-}
diff --git a/abs/extra-testing/xinetd/xinetd b/abs/extra-testing/xinetd/xinetd
deleted file mode 100755
index 4b8fa36..0000000
--- a/abs/extra-testing/xinetd/xinetd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/xinetd`
-case "$1" in
-  start)
-    stat_busy "Starting xinetd"
-    [ -z "$PID" ] && /usr/sbin/xinetd -stayalive -pidfile /var/run/xinetd.pid
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/xinetd.pid
-      add_daemon xinetd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping xinetd"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/xinetd.pid
-      rm_daemon xinetd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/abs/extra-testing/xinetd/xinetd-2.3.14.tar.gz b/abs/extra-testing/xinetd/xinetd-2.3.14.tar.gz
deleted file mode 100644
index d2050e3..0000000
--- a/abs/extra-testing/xinetd/xinetd-2.3.14.tar.gz
+++ /dev/null
diff --git a/abs/extra-testing/xinetd/xinetd.conf b/abs/extra-testing/xinetd/xinetd.conf
deleted file mode 100644
index b15d9f6..0000000
--- a/abs/extra-testing/xinetd/xinetd.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# /etc/xinetd.conf
-#
-
-defaults
-{
-        instances               = 60
-        log_type                = SYSLOG authpriv
-        log_on_success          = HOST PID
-        log_on_failure          = HOST
-        cps                     = 25 30
-}
-
-includedir /etc/xinetd.d
diff --git a/abs/extra-testing/xmbmon/Makefile.in.patch b/abs/extra-testing/xmbmon/Makefile.in.patch
deleted file mode 100644
index be3bf73..0000000
--- a/abs/extra-testing/xmbmon/Makefile.in.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ru xmbmon205.orig/Makefile.in xmbmon205/Makefile.in
---- xmbmon205.orig/Makefile.in	2004-08-13 17:04:21.000000000 +1000
-+++ xmbmon205/Makefile.in	2008-06-14 00:59:35.000000000 +1000
-@@ -37,11 +37,11 @@
- RM=rm -f
- INSTALL=install
- 
--INST_DIR=/usr/local/bin
--INST_MANDIR=/usr/local/man/man1
--INST_XDIR=/usr/X11R6/bin
--INST_MANXDIR=/usr/X11R6/man/man1
--INST_XRDIR=/usr/X11R6/lib/X11/app-defaults
-+INST_DIR=/usr/bin
-+INST_MANDIR=/usr/share/man/man1
-+INST_XDIR=/usr/bin
-+INST_MANXDIR=/usr/share/man/man1
-+INST_XRDIR=/usr/lib/X11/app-defaults
-  
- .c.o:
- 	$(CC) -c $(CFLAGS) $*.c
-@@ -133,12 +133,12 @@
- 	$(RM) Makefile config.cache config.log config.h config.status
- 
- install: $(PROGRAM)
--	$(INSTALL) -o root -g wheel -m 4555 -c -p mbmon $(INST_DIR)
--	$(INSTALL) -o root -g wheel -m 4555 -c -p xmbmon $(INST_XDIR)
-+	$(INSTALL) -o root -g wheel -m 4555 -c -p mbmon $(DESTDIR)$(INST_DIR)
-+	$(INSTALL) -o root -g wheel -m 4555 -c -p xmbmon $(DESTDIR)$(INST_XDIR)
- 
- install-man: $(MANPAGE)
--	$(INSTALL) -o root -g wheel -m 444 -c -p mbmon.1 $(INST_MANDIR)
--	$(INSTALL) -o root -g wheel -m 444 -c -p xmbmon.1x $(INST_MANXDIR)
-+	$(INSTALL) -o root -g wheel -m 444 -c -p mbmon.1 $(DESTDIR)$(INST_MANDIR)
-+	$(INSTALL) -o root -g wheel -m 444 -c -p xmbmon.1x $(DESTDIR)$(INST_MANXDIR)
- 
- lint:
- 	$(LINT) $(INCLUDES) $(DEFS) $(FONTDEFINES) $(SRCS) -lm
diff --git a/abs/extra-testing/xmbmon/PKGBUILD b/abs/extra-testing/xmbmon/PKGBUILD
deleted file mode 100644
index 348094b..0000000
--- a/abs/extra-testing/xmbmon/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Contributor: Jonathan Liu <net147@hotmail.com>
-pkgname=xmbmon
-pkgver=2.05
-pkgrel=2
-pkgdesc="X Motherboard Monitor"
-arch=('i686' 'x86_64')
-url="http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/download.html"
-license=('GPL')
-source=(http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/xmbmon205.tar.gz
-	Makefile.in.patch)
-md5sums=('ab6614c785f5b653fcc69fb9c02058f0'
-         'e417a1a04b95bc3505b74a52faa54c4a')
-
-build() {
-  cd $startdir/src/xmbmon205
-  patch -Np1 -i $startdir/src/Makefile.in.patch
-  ./configure
-  mkdir -p $startdir/pkg/usr/{bin,share/man/man1}
-  make DESTDIR=$startdir/pkg install install-man || return 1
-}
diff --git a/abs/extra-testing/xmlto/PKGBUILD b/abs/extra-testing/xmlto/PKGBUILD
deleted file mode 100644
index f9fc36e..0000000
--- a/abs/extra-testing/xmlto/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
-# Contributor: Robert Stoffers <rob1@ubuntu.com>
-
-pkgname=xmlto
-pkgver=0.0.23
-pkgrel=1
-pkgdesc="Convert xml to many other formats"
-arch=('i686' 'x86_64')
-url="http://cyberelk.net/tim/software/xmlto/"
-license=('GPL')
-depends=('libxslt>=1.1.24')
-makedepends=('docbook-xsl')
-source=(https://fedorahosted.org/releases/x/m/xmlto/${pkgname}-${pkgver}.tar.bz2)
-
-build() {
-  cd $srcdir/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-}
-md5sums=('3001d6bb2bbc2c8f6c2301f05120f074')
diff --git a/abs/extra-testing/xmms/PKGBUILD b/abs/extra-testing/xmms/PKGBUILD
deleted file mode 100644
index 533c227..0000000
--- a/abs/extra-testing/xmms/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD,v 1.3 2007/12/06 01:18:06 Snowman Exp $
-# Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
-
-pkgname=xmms
-pkgver=1.2.11
-pkgrel=1
-pkgdesc="The X MultiMedia System"
-arch=('i686' 'x86_64')
-url="http://www.xmms.org"
-license=('GPL')
-depends=('libsm' 'libxxf86vm' 'zlib' 'gtk' 'libvorbis' 'esd' 'alsa-lib' 'libgl')
-makedepends=('mesa')
-options=('!libtool')
-source=(http://www.xmms.org/files/1.2.x/$pkgname-$pkgver.tar.bz2 \
-	xmms-menu.patch \
-	xmms-1.2.10-crossfade-0.3.9.patch \
-	xmms-fix.diff)
-md5sums=('f3e6dbaf0b3f571a532ab575656be506' 'b7b6f1811bad8d14e4c4534240e45980'\
-         '4eb222111a82a2e1ebe63b5f6109133d' 'd7f9dc3712c486658149c4504f7478a7')
-sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d'
-          '27fb6e21bd6db923a425a8df8bd07a2a93867ddb'
-          'ff5c172752c8bee708d9a9ecd53864cc95a4bcc5'
-          'c227284955f2cc16f027dade670155c0f0fbc4ff')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-
-# Add id3v2 editing feature (doesn't apply atm, needs to be redone)
-#  patch -Np1 -i ../id3v2.patch || return 1
-# Fix xmms.desktop
-  patch -Np0 -i ../xmms-menu.patch || return 1
-# Patch for hang with xmms-crossfade 
-  patch -Np1 -i ../xmms-1.2.10-crossfade-0.3.9.patch || return 1
-# fix xmms not able to be shown double size,at least needed for x86_64
-  patch -Np1 -i ../xmms-fix.diff || return 1
-
-  if [ "$CARCH" == "x86_64" ]; then
-    ./configure --prefix=/usr --disable-mikmod --disable-simd	# for x86_64
-  else 
-    ./configure --prefix=/usr --disable-mikmod --enable-simd	# for i686
-  fi
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  mkdir -p ${startdir}/pkg/usr/share/{applications,pixmaps}
-  install -m 644 xmms/xmms.desktop ${startdir}/pkg/usr/share/applications
-  install -m 644 xmms/xmms_mini.xpm ${startdir}/pkg/usr/share/pixmaps/xmms.xpm
-  # don't want wmxmms
-  rm -rf $startdir/pkg/usr/bin/wmxmms $startdir/pkg/usr/share/xmms
-  rm -f $startdir/pkg/usr/man/man1/{gnomexmms.1,wmxmms.1}
-}
diff --git a/abs/extra-testing/xmms/id3v2.patch b/abs/extra-testing/xmms/id3v2.patch
deleted file mode 100644
index c8f8ba2..0000000
--- a/abs/extra-testing/xmms/id3v2.patch
+++ /dev/null
@@ -1,3379 +0,0 @@
-diff -Naur xmms-1.2.9-orig/Input/mpg123/charset.h xmms-1.2.9/Input/mpg123/charset.h
---- xmms-1.2.9-orig/Input/mpg123/charset.h	Wed Dec 31 19:00:00 1969
-+++ xmms-1.2.9/Input/mpg123/charset.h	Thu Jan 29 05:20:31 2004
-@@ -0,0 +1,420 @@
-+/* charset.h - 2001/12/04 */
-+/*
-+ *  EasyTAG - Tag editor for MP3 and OGG files
-+ *  Copyright (C) 2000-2002  Jerome Couderc <j.couderc@ifrance.com>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ */
-+
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+
-+/*
-+ * Standard gettext macros.
-+ */
-+#ifdef ENABLE_NLS
-+#  include <libintl.h>
-+#  define _(String) gettext (String)
-+#  ifdef gettext_noop
-+#    define N_(String) gettext_noop (String)
-+#  else
-+#    define N_(String) (String)
-+#  endif
-+#else
-+#  define textdomain(String) (String)
-+#  define gettext(String) (String)
-+#  define dgettext(Domain,Message) (Message)
-+#  define dcgettext(Domain,Message,Type) (Message)
-+#  define bindtextdomain(Domain,Directory) (Domain)
-+#  define _(String) (String)
-+#  define N_(String) (String)
-+#endif
-+
-+#ifndef DLL_H
-+#define DLL_H
-+typedef struct DLL_s
-+{
-+	void *prev;
-+	void *data;
-+	void *next;
-+} DLL;
-+#endif
-+
-+#ifndef __CHARSET_H__
-+#define __CHARSET_H__
-+
-+
-+/***************
-+ * Declaration *
-+ ***************/
-+
-+typedef struct {
-+	char *charset_title;
-+	char *charset_name;
-+} CharsetInfo;
-+
-+
-+/**************
-+ * Prototypes *
-+ **************/
-+
-+//static gchar* get_current_charset (void);
-+
-+/* Used for ogg tags */
-+char* convert_to_utf8   (const char *string);
-+char* convert_from_utf8 (const char *string);
-+
-+char* convert_from_file_to_user (const char *string);
-+char* convert_from_user_to_file (const char *string);
-+
-+DLL *Charset_Create_List (void);
-+char *Charset_Get_Name_From_Title (char *charset_title);
-+char *Charset_Get_Title_From_Name (char *charset_name);
-+
-+short int test_conversion_charset (char *from, char *to);
-+
-+
-+#endif /* __CHARSET_H__ */
-+
-+/*
-+ * Main part of code, written by:
-+ *
-+ * Copyright (C) 1999-2001  Håvard Kvålen <havardk@xmms.org>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+ * 02111-1307, USA.
-+ *
-+ */
-+
-+#include <stdlib.h>
-+#include <string.h>
-+#include <errno.h>
-+
-+#ifdef HAVE_ICONV_OPEN
-+#include <iconv.h>
-+#endif
-+
-+#ifdef HAVE_LANGINFO_CODESET
-+#include <langinfo.h>
-+#endif
-+
-+/****************
-+ * Declarations *
-+ ****************/
-+
-+#define CHARSET_TRANS_ARRAY_LEN ( sizeof(charset_trans_array) / sizeof((charset_trans_array)[0]) )
-+const CharsetInfo charset_trans_array[] = { 
-+    {N_("Arabic (IBM-864)"),                  "IBM864"        },
-+    {N_("Arabic (ISO-8859-6)"),               "ISO-8859-6"    },
-+    {N_("Arabic (Windows-1256)"),             "windows-1256"  },
-+    {N_("Baltic (ISO-8859-13)"),              "ISO-8859-13"   },
-+    {N_("Baltic (ISO-8859-4)"),               "ISO-8859-4"    },
-+    {N_("Baltic (Windows-1257)"),             "windows-1257"  },
-+    {N_("Celtic (ISO-8859-14)"),              "ISO-8859-14"   },
-+    {N_("Central European (IBM-852)"),        "IBM852"        },
-+    {N_("Central European (ISO-8859-2)"),     "ISO-8859-2"    },
-+    {N_("Central European (Windows-1250)"),   "windows-1250"  },
-+    {N_("Chinese Simplified (GB18030)"),      "gb18030"       },
-+    {N_("Chinese Simplified (GB2312)"),       "GB2312"        },
-+    {N_("Chinese Traditional (Big5)"),        "Big5"          },
-+    {N_("Chinese Traditional (Big5-HKSCS)"),  "Big5-HKSCS"    },
-+    {N_("Cyrillic (IBM-855)"),                "IBM855"        },
-+    {N_("Cyrillic (ISO-8859-5)"),             "ISO-8859-5"    },
-+    {N_("Cyrillic (ISO-IR-111)"),             "ISO-IR-111"    },
-+    {N_("Cyrillic (KOI8-R)"),                 "KOI8-R"        },
-+    {N_("Cyrillic (Windows-1251)"),           "windows-1251"  },
-+    {N_("Cyrillic/Russian (CP-866)"),         "IBM866"        },
-+    {N_("Cyrillic/Ukrainian (KOI8-U)"),       "KOI8-U"        },
-+    {N_("English (US-ASCII)"),                "us-ascii"      },
-+    {N_("Greek (ISO-8859-7)"),                "ISO-8859-7"    },
-+    {N_("Greek (Windows-1253)"),              "windows-1253"  },
-+    {N_("Hebrew (IBM-862)"),                  "IBM862"        },
-+    {N_("Hebrew (Windows-1255)"),             "windows-1255"  },
-+    {N_("Japanese (EUC-JP)"),                 "EUC-JP"        },
-+    {N_("Japanese (ISO-2022-JP)"),            "ISO-2022-JP"   },
-+    {N_("Japanese (Shift_JIS)"),              "Shift_JIS"     },
-+    {N_("Korean (EUC-KR)"),                   "EUC-KR"        },
-+    {N_("Nordic (ISO-8859-10)"),              "ISO-8859-10"   },
-+    {N_("South European (ISO-8859-3)"),       "ISO-8859-3"    },
-+    {N_("Thai (TIS-620)"),                    "TIS-620"       },
-+    {N_("Turkish (IBM-857)"),                 "IBM857"        },
-+    {N_("Turkish (ISO-8859-9)"),              "ISO-8859-9"    },
-+    {N_("Turkish (Windows-1254)"),            "windows-1254"  },
-+    {N_("Unicode (UTF-7)"),                   "UTF-7"         },
-+    {N_("Unicode (UTF-8)"),                   "UTF-8"         },
-+    {N_("Unicode (UTF-16BE)"),                "UTF-16BE"      },
-+    {N_("Unicode (UTF-16LE)"),                "UTF-16LE"      },
-+    {N_("Unicode (UTF-32BE)"),                "UTF-32BE"      },
-+    {N_("Unicode (UTF-32LE)"),                "UTF-32LE"      },
-+    {N_("Vietnamese (VISCII)"),               "VISCII"        },
-+    {N_("Vietnamese (Windows-1258)"),         "windows-1258"  },
-+    {N_("Visual Hebrew (ISO-8859-8)"),        "ISO-8859-8"    },
-+    {N_("Western (IBM-850)"),                 "IBM850"        },
-+    {N_("Western (ISO-8859-1)"),              "ISO-8859-1"    },
-+    {N_("Western (ISO-8859-15)"),             "ISO-8859-15"   },
-+    {N_("Western (Windows-1252)"),            "windows-1252"  }
-+
-+    /*
-+     * From this point, character sets aren't supported by iconv
-+     */
-+/*    {N_("Arabic (IBM-864-I)"),                "IBM864i"              },
-+    {N_("Arabic (ISO-8859-6-E)"),             "ISO-8859-6-E"         },
-+    {N_("Arabic (ISO-8859-6-I)"),             "ISO-8859-6-I"         },
-+    {N_("Arabic (MacArabic)"),                "x-mac-arabic"         },
-+    {N_("Armenian (ARMSCII-8)"),              "armscii-8"            },
-+    {N_("Central European (MacCE)"),          "x-mac-ce"             },
-+    {N_("Chinese Simplified (GBK)"),          "x-gbk"                },
-+    {N_("Chinese Simplified (HZ)"),           "HZ-GB-2312"           },
-+    {N_("Chinese Traditional (EUC-TW)"),      "x-euc-tw"             },
-+    {N_("Croatian (MacCroatian)"),            "x-mac-croatian"       },
-+    {N_("Cyrillic (MacCyrillic)"),            "x-mac-cyrillic"       },
-+    {N_("Cyrillic/Ukrainian (MacUkrainian)"), "x-mac-ukrainian"      },
-+    {N_("Farsi (MacFarsi)"),                  "x-mac-farsi"},
-+    {N_("Greek (MacGreek)"),                  "x-mac-greek"          },
-+    {N_("Gujarati (MacGujarati)"),            "x-mac-gujarati"       },
-+    {N_("Gurmukhi (MacGurmukhi)"),            "x-mac-gurmukhi"       },
-+    {N_("Hebrew (ISO-8859-8-E)"),             "ISO-8859-8-E"         },
-+    {N_("Hebrew (ISO-8859-8-I)"),             "ISO-8859-8-I"         },
-+    {N_("Hebrew (MacHebrew)"),                "x-mac-hebrew"         },
-+    {N_("Hindi (MacDevanagari)"),             "x-mac-devanagari"     },
-+    {N_("Icelandic (MacIcelandic)"),          "x-mac-icelandic"      },
-+    {N_("Korean (JOHAB)"),                    "x-johab"              },
-+    {N_("Korean (UHC)"),                      "x-windows-949"        },
-+    {N_("Romanian (MacRomanian)"),            "x-mac-romanian"       },
-+    {N_("Turkish (MacTurkish)"),              "x-mac-turkish"        },
-+    {N_("User Defined"),                      "x-user-defined"       },
-+    {N_("Vietnamese (TCVN)"),                 "x-viet-tcvn5712"      },
-+    {N_("Vietnamese (VPS)"),                  "x-viet-vps"           },
-+    {N_("Western (MacRoman)"),                "x-mac-roman"          },
-+    // charsets whithout posibly translatable names
-+    {"T61.8bit",                              "T61.8bit"             },
-+    {"x-imap4-modified-utf7",                 "x-imap4-modified-utf7"},
-+    {"x-u-escaped",                           "x-u-escaped"          },
-+    {"windows-936",                           "windows-936"          }
-+*/
-+};
-+
-+
-+
-+
-+/*************
-+ * Functions *
-+ *************/
-+// Return the last item of an doubly linked list
-+static DLL *
-+dll_last_c (DLL *list)
-+{
-+	DLL *item = list;
-+	
-+	while ( item->next )
-+		item = item->next;
-+	
-+	return item;
-+}
-+
-+// Append an item to the doubly linked list
-+static DLL *
-+dll_append_c (DLL *list, void *data)
-+{
-+	DLL *item = malloc (sizeof(DLL));
-+	
-+	item->data = data;
-+	item->prev = dll_last_c(list);
-+	item->next = NULL;
-+	
-+	return item;
-+}
-+
-+static char* get_current_charset (void)
-+{
-+    char *charset = getenv("CHARSET");
-+
-+#ifdef HAVE_LANGINFO_CODESET
-+    if (!charset)
-+        charset = nl_langinfo(CODESET);
-+#endif
-+    if (!charset)
-+        charset = "ISO-8859-1";
-+
-+    return charset;
-+}
-+
-+
-+#ifdef HAVE_ICONV_OPEN
-+static char* convert_string (const char *string, char *from, char *to)
-+{
-+    size_t outleft, outsize, length;
-+    iconv_t cd;
-+    char *out, *outptr;
-+    const char *input = string;
-+
-+    if (!string)
-+        return NULL;
-+
-+    length = strlen(string);
-+
-+    /*  g_message("converting %s from %s to %s", string, from, to); */
-+    if ((cd = iconv_open(to, from)) == (iconv_t)-1)
-+    {
-+		fprintf (stderr, "convert_string(): Conversion not supported. Charsets: %s -> %s", from, to);
-+        return strdup(string);
-+    }
-+
-+    /* Due to a GLIBC bug, round outbuf_size up to a multiple of 4 */
-+    /* + 1 for nul in case len == 1 */
-+    outsize = ((length + 3) & ~3) + 1;
-+    out = g_malloc(outsize);
-+    outleft = outsize - 1;
-+    outptr = out;
-+
-+ retry:
-+    if (iconv(cd, (char **)&input, &length, &outptr, &outleft) == -1)
-+    {
-+        int used;
-+        switch (errno)
-+        {
-+            case E2BIG:
-+                used = outptr - out;
-+                outsize = (outsize - 1) * 2 + 1;
-+                out = g_realloc(out, outsize);
-+                outptr = out + used;
-+                outleft = outsize - 1 - used;
-+                goto retry;
-+            case EINVAL:
-+                break;
-+            case EILSEQ:
-+                /* Invalid sequence, try to get the
-+                                   rest of the string */
-+                input++;
-+                length = strlen(input);
-+                goto retry;
-+            default:
-+                fprintf (stderr, "convert_string(): Conversion failed. Inputstring: %s; Error: %s", string, strerror(errno));
-+                break;
-+        }
-+    }
-+    *outptr = '\0';
-+
-+    iconv_close(cd);
-+    return out;
-+}
-+#else
-+static char* convert_string (const char *string, char *from, char *to)
-+{
-+    if (!string)
-+        return NULL;
-+    return strdup(string);
-+}
-+#endif
-+
-+
-+/*
-+ * Conversion with UTF-8 for ogg tags
-+ */
-+char* convert_to_utf8 (const char *string)
-+{
-+    char *charset = get_current_charset();
-+
-+    return convert_string(string, charset, "UTF-8");
-+}
-+
-+char* convert_from_utf8 (const char *string)
-+{
-+    char *charset = get_current_charset();
-+
-+    return convert_string(string, "UTF-8", charset);
-+}
-+
-+
-+DLL *Charset_Create_List (void)
-+{
-+    DLL *list = NULL;
-+    int i;
-+
-+    for (i=0; i<CHARSET_TRANS_ARRAY_LEN; i++)
-+        list = dll_append_c (list,_(charset_trans_array[i].charset_title));
-+    return list;
-+}
-+
-+
-+/*
-+ * Return charset_name from charset_title
-+ */
-+char *Charset_Get_Name_From_Title (char *charset_title)
-+{
-+    int i;
-+
-+    if (charset_title)
-+        for (i=0; i<CHARSET_TRANS_ARRAY_LEN; i++)
-+            if ( strcasecmp(_(charset_title),_(charset_trans_array[i].charset_title)) == 0 )
-+                return charset_trans_array[i].charset_name;
-+    return "";
-+}
-+
-+
-+/*
-+ * Return charset_title from charset_name
-+ */
-+char *Charset_Get_Title_From_Name (char *charset_name)
-+{
-+    int i;
-+
-+    if (charset_name)
-+        for (i=0; i<CHARSET_TRANS_ARRAY_LEN; i++)
-+            if ( strcasecmp(charset_name,charset_trans_array[i].charset_name) == 0 )
-+                return _(charset_trans_array[i].charset_title);
-+    return "";
-+}
-+
-+
-+
-+/*
-+ * Test if the conversion is supported between two character sets ('from' and 'to)
-+ */
-+#ifdef HAVE_ICONV_OPEN
-+short int test_conversion_charset (char *from, char *to)
-+{
-+    iconv_t cd;
-+
-+    if ((cd=iconv_open(to,from)) == (iconv_t)-1)
-+    {
-+        /* Conversion not supported */
-+        return FALSE;
-+    }
-+    iconv_close(cd);
-+    return TRUE;
-+}
-+#else
-+short int test_conversion_charset (char *from, char *to)
-+{
-+    return TRUE;
-+}
-+#endif
-diff -Naur xmms-1.2.9-orig/Input/mpg123/fileinfo.c xmms-1.2.9/Input/mpg123/fileinfo.c
---- xmms-1.2.9-orig/Input/mpg123/fileinfo.c	Thu Jan 29 06:43:24 2004
-+++ xmms-1.2.9/Input/mpg123/fileinfo.c	Thu Jan 29 06:39:47 2004
-@@ -25,28 +25,36 @@
- #include <errno.h>
- #include <libxmms/xentry.h>
- #include "mpg123.h"
-+#include "lib_id3v2.h"
-+
-+#define MAX_STR_LEN 100
-+#define MAX_ENTRY_LEN2 1023
- 
- static GtkWidget *window = NULL;
--static GtkWidget *filename_entry, *id3_frame;
--static GtkWidget *title_entry, *artist_entry, *album_entry, *year_entry;
--static GtkWidget *tracknum_entry, *comment_entry, *genre_combo;
-+static GtkWidget *notebook = NULL;
-+static GtkWidget *filename_entry, *id3v1_frame, *id3v2_frame;
-+static GtkWidget *v1_checkbox, *v2_checkbox;
-+static GtkWidget *v1_title_entry, *v1_artist_entry, *v1_album_entry, *v1_year_entry, *v1_tracknum_entry, *v1_comment_entry;
-+static GtkWidget *v2_title_entry, *v2_artist_entry, *v2_album_entry, *v2_year_entry, *v2_tracknum_entry, *v2_comment_entry,
-+				 *v2_composer_entry, *v2_orig_artist_entry, *v2_url_entry, *v2_encoded_by_entry;
-+static GtkWidget *v1_genre_combo, *v2_genre_combo;
- static GtkWidget *mpeg_level, *mpeg_bitrate, *mpeg_samplerate, *mpeg_flags;
- static GtkWidget *mpeg_fileinfo;
- 
-+static GPtrArray *v1_labels_list = NULL, *v2_labels_list = NULL;    // TODO: Where will these be freed?
- static GList *genre_list;
- struct genre_item {
- 	const char *name;
- 	int id;
- };
--static int current_genre;
-+static int v1_current_genre;
-+static int v2_current_genre;
- static char *current_filename;
- 
- extern char *mpg123_filename;
- extern int mpg123_bitrate, mpg123_frequency, mpg123_layer, mpg123_lsf, mpg123_mode;
- extern gboolean mpg123_stereo, mpg123_mpeg25;
- 
--#define MAX_STR_LEN 100
--
- static void label_set_text(GtkWidget * label, char *str, ...)
- G_GNUC_PRINTF(2, 3);
- 
-@@ -66,6 +74,12 @@
- 	strncpy(tag, gtk_entry_get_text(entry), length);
- }
- 
-+void copy_entry_tag(GtkEntry * src, GtkEntry * dest, int length)
-+{
-+	set_entry_tag(dest, gtk_entry_get_text(src), length);
-+	return;
-+}
-+
- static int genre_find_index(GList *genre_list, int id)
- {
- 	int idx = 0;
-@@ -80,15 +94,29 @@
- 	return idx;
- }
- 
-+static int genre_find_index_str(GList *genre_list, const char* str)
-+{
-+	int idx = 0;
-+	while (genre_list)
-+	{
-+		struct genre_item *item = genre_list->data;
-+		if (strcmp(item->name, str) == 0)
-+			break;
-+		idx++;
-+		genre_list = genre_list->next;
-+	}
-+	return idx;
-+}
-+
- static int genre_comp_func(gconstpointer a, gconstpointer b)
- {
- 	const struct genre_item *ga = a, *gb = b;
- 	return strcasecmp(ga->name, gb->name);
- }
- 
--static void save_cb(GtkWidget * w, gpointer data)
-+static void remove_id3v1(void)
- {
--	int fd;
-+	int fd, len;
- 	struct id3v1tag_t tag;
- 	char *msg = NULL;
- 
-@@ -97,71 +125,36 @@
- 
- 	if ((fd = open(current_filename, O_RDWR)) != -1)
- 	{
--		int tracknum;
--
--		lseek(fd, -128, SEEK_END);
-+		len = lseek(fd, -128, SEEK_END);
- 		read(fd, &tag, sizeof (struct id3v1tag_t));
- 
- 		if (!strncmp(tag.tag, "TAG", 3))
--			lseek(fd, -128, SEEK_END);
--		else
--			lseek(fd, 0, SEEK_END);
--		tag.tag[0] = 'T';
--		tag.tag[1] = 'A';
--		tag.tag[2] = 'G';
--		get_entry_tag(GTK_ENTRY(title_entry), tag.title, 30);
--		get_entry_tag(GTK_ENTRY(artist_entry), tag.artist, 30);
--		get_entry_tag(GTK_ENTRY(album_entry), tag.album, 30);
--		get_entry_tag(GTK_ENTRY(year_entry), tag.year, 4);
--		tracknum = atoi(gtk_entry_get_text(GTK_ENTRY(tracknum_entry)));
--		if (tracknum > 0)
- 		{
--			get_entry_tag(GTK_ENTRY(comment_entry),
--				      tag.u.v1_1.comment, 28);
--			tag.u.v1_1.__zero = 0;
--			tag.u.v1_1.track_number = MIN(tracknum, 255);
-+			if (ftruncate(fd, len))
-+				msg = g_strdup_printf(_("%s\n"
-+							"Unable to truncate file: %s"),
-+						      _("Couldn't remove tag!"),
-+						      strerror(errno));
- 		}
--		else
--			get_entry_tag(GTK_ENTRY(comment_entry),
--				      tag.u.v1_0.comment, 30);
--		tag.genre = current_genre;
--		if (write(fd, &tag, sizeof (tag)) != sizeof (tag))
--			msg = g_strdup_printf(_("%s\nUnable to write to file: %s"),
--					      _("Couldn't write tag!"),
--					      strerror(errno));
- 		close(fd);
- 	}
- 	else
- 		msg = g_strdup_printf(_("%s\nUnable to open file: %s"),
--				      _("Couldn't write tag!"),
-+				      _("Couldn't remove tag!"),
- 				      strerror(errno));
- 	if (msg)
- 	{
--		GtkWidget *mwin = xmms_show_message(_("File Info"), msg,
--						    _("Ok"), FALSE, NULL, NULL);
-+		GtkWidget *mwin = xmms_show_message(_("File Info"), msg, _("Ok"),
-+						    FALSE, NULL, NULL);
- 		gtk_window_set_transient_for(GTK_WINDOW(mwin),
- 					     GTK_WINDOW(window));
- 		g_free(msg);
- 	}
--	else
--		gtk_widget_destroy(window);
--}
--
--static void label_set_text(GtkWidget * label, char *str, ...)
--{
--	va_list args;
--	char tempstr[MAX_STR_LEN];
--
--	va_start(args, str);
--	g_vsnprintf(tempstr, MAX_STR_LEN, str, args);
--	va_end(args);
--
--	gtk_label_set_text(GTK_LABEL(label), tempstr);
- }
- 
--static void remove_id3_cb(GtkWidget * w, gpointer data)
-+static void save_cb(GtkWidget * w, gpointer data)
- {
--	int fd, len;
-+	int fd;
- 	struct id3v1tag_t tag;
- 	char *msg = NULL;
- 
-@@ -170,36 +163,95 @@
- 
- 	if ((fd = open(current_filename, O_RDWR)) != -1)
- 	{
--		len = lseek(fd, -128, SEEK_END);
--		read(fd, &tag, sizeof (struct id3v1tag_t));
-+		if (!GTK_TOGGLE_BUTTON(v1_checkbox)->active) {
-+			// Try to save id3v1 tag
-+			int tracknum;
- 
--		if (!strncmp(tag.tag, "TAG", 3))
--		{
--			if (ftruncate(fd, len))
--				msg = g_strdup_printf(
--					_("%s\n"
--					  "Unable to truncate file: %s"),
--					_("Couldn't remove tag!"),
--					strerror(errno));
-+			lseek(fd, -128, SEEK_END);
-+			read(fd, &tag, sizeof (struct id3v1tag_t));
-+
-+			if (!strncmp(tag.tag, "TAG", 3))
-+				lseek(fd, -128, SEEK_END);
-+			else
-+				lseek(fd, 0, SEEK_END);
-+			tag.tag[0] = 'T';
-+			tag.tag[1] = 'A';
-+			tag.tag[2] = 'G';
-+			get_entry_tag(GTK_ENTRY(v1_title_entry), tag.title, 30);
-+			get_entry_tag(GTK_ENTRY(v1_artist_entry), tag.artist, 30);
-+			get_entry_tag(GTK_ENTRY(v1_album_entry), tag.album, 30);
-+			get_entry_tag(GTK_ENTRY(v1_year_entry), tag.year, 4);
-+			tracknum = atoi(gtk_entry_get_text(GTK_ENTRY(v1_tracknum_entry)));
-+			if (tracknum > 0)
-+			{
-+				get_entry_tag(GTK_ENTRY(v1_comment_entry),
-+                        tag.u.v1_1.comment, 28);
-+				tag.u.v1_1.__zero = 0;
-+				tag.u.v1_1.track_number = MIN(tracknum, 255);
-+			}
-+			else
-+				get_entry_tag(GTK_ENTRY(v1_comment_entry),
-+                        tag.u.v1_0.comment, 30);
-+			tag.genre = v1_current_genre;
-+		    if (write(fd, &tag, sizeof (tag)) != sizeof (tag))
-+            	msg = g_strdup_printf(_("%s\nUnable to write to file: %s"),
-+					                 _("Couldn't write tag!"),
-+					                 strerror(errno));
-+		} else {
-+			// Remove the id3v1 tag from the file
-+            remove_id3v1();
- 		}
--		else
--			msg = strdup(_("No tag to remove!"));
--		close(fd);
-+
-+		if (!GTK_TOGGLE_BUTTON(v2_checkbox)->active) {
-+
-+            id3Tag v2_tag;
-+            strncpy(v2_tag.title, gtk_entry_get_text(GTK_ENTRY(v2_title_entry)), MAX_ENTRY_LEN2);
-+            strncpy(v2_tag.artist, gtk_entry_get_text(GTK_ENTRY(v2_artist_entry)), MAX_ENTRY_LEN2);
-+            strncpy(v2_tag.album, gtk_entry_get_text(GTK_ENTRY(v2_album_entry)), MAX_ENTRY_LEN2);
-+            strncpy(v2_tag.year, gtk_entry_get_text(GTK_ENTRY(v2_year_entry)), 4);
-+            strncpy(v2_tag.comment, gtk_entry_get_text(GTK_ENTRY(v2_comment_entry)), MAX_ENTRY_LEN2);
-+            strncpy(v2_tag.track, gtk_entry_get_text(GTK_ENTRY(v2_tracknum_entry)), 3);
-+            snprintf(v2_tag.genre, 6, "(%d)", v2_current_genre);
-+
-+            strncpy(v2_tag.composer, gtk_entry_get_text(GTK_ENTRY(v2_composer_entry)), MAX_ENTRY_LEN2);
-+            strncpy(v2_tag.url, gtk_entry_get_text(GTK_ENTRY(v2_url_entry)), MAX_ENTRY_LEN2);
-+            strncpy(v2_tag.orig_artist, gtk_entry_get_text(GTK_ENTRY(v2_orig_artist_entry)), MAX_ENTRY_LEN2);
-+            strncpy(v2_tag.enc_by, gtk_entry_get_text(GTK_ENTRY(v2_encoded_by_entry)), MAX_ENTRY_LEN2);
-+
-+            set_id3v2_tag(&v2_tag, current_filename);
-+
-+		} else {
-+			// remove the id3v2 tag from the file
-+            del_id3v2_tag(current_filename);
-+		}
-+
-+		if (fd)
-+			close(fd);
- 	}
- 	else
- 		msg = g_strdup_printf(_("%s\nUnable to open file: %s"),
--				      _("Couldn't remove tag!"),
-+				      _("Couldn't write tag!"),
- 				      strerror(errno));
- 	if (msg)
- 	{
--		GtkWidget *mwin = xmms_show_message(_("File Info"), msg,
--						    _("Ok"), FALSE, NULL, NULL);
-+		GtkWidget *mwin = xmms_show_message(_("File Info"), msg, _("Ok"),
-+						    FALSE, NULL, NULL);
- 		gtk_window_set_transient_for(GTK_WINDOW(mwin),
- 					     GTK_WINDOW(window));
- 		g_free(msg);
- 	}
--	else
--		gtk_widget_destroy(window);
-+}
-+
-+static void label_set_text(GtkWidget * label, char *str, ...)
-+{
-+	va_list args;
-+	char tempstr[MAX_STR_LEN];
-+
-+	va_start(args, str);
-+	g_vsnprintf(tempstr, MAX_STR_LEN, str, args);
-+	va_end(args);
-+
-+	gtk_label_set_text(GTK_LABEL(label), tempstr);
- }
- 
- static void set_mpeg_level_label(gboolean mpeg25, int lsf, int layer)
-@@ -222,28 +274,144 @@
- 
- static void file_info_http(char *filename)
- {
--	gtk_widget_set_sensitive(id3_frame, FALSE);
-+	gtk_widget_set_sensitive(id3v1_frame, FALSE);
-+	gtk_widget_set_sensitive(id3v2_frame, FALSE);
- 	if (mpg123_filename && !strcmp(filename, mpg123_filename) &&
- 	    mpg123_bitrate != 0)
- 	{
--		set_mpeg_level_label(mpg123_mpeg25, mpg123_lsf, mpg123_layer);
-+		set_mpeg_level_label(mpg123_mpeg25, mpg123_lsf,
-+                mpg123_layer);
- 		label_set_text(mpeg_bitrate, _("Bitrate: %d kb/s"),
--			       mpg123_bitrate);
-+                mpg123_bitrate);
- 		label_set_text(mpeg_samplerate, _("Samplerate: %d Hz"),
--			       mpg123_frequency);
-+                mpg123_frequency);
- 		label_set_text(mpeg_flags, "%s",
--			       channel_mode_name(mpg123_mode));
-+                channel_mode_name(mpg123_mode));
- 	}
- }
- 
--static void genre_selected(GtkList *list, GtkWidget *w, gpointer data)
-+void copy_v2_to_v1_cb(GtkButton *button, gpointer user_data)
-+{
-+    copy_entry_tag(GTK_ENTRY(v2_title_entry),   GTK_ENTRY(v1_title_entry), 30);
-+    copy_entry_tag(GTK_ENTRY(v2_artist_entry),  GTK_ENTRY(v1_artist_entry), 30);
-+    copy_entry_tag(GTK_ENTRY(v2_album_entry),   GTK_ENTRY(v1_album_entry), 30);
-+    copy_entry_tag(GTK_ENTRY(v2_year_entry),    GTK_ENTRY(v1_year_entry), 4);
-+    copy_entry_tag(GTK_ENTRY(v2_comment_entry), GTK_ENTRY(v1_comment_entry), 30);
-+    copy_entry_tag(GTK_ENTRY(v2_tracknum_entry), GTK_ENTRY(v1_tracknum_entry), 3);
-+
-+    gtk_list_select_item(GTK_LIST(GTK_COMBO(v1_genre_combo)->list), genre_find_index(genre_list, v2_current_genre));
-+    return;
-+}
-+
-+void copy_v1_to_v2_cb(GtkButton *button, gpointer user_data)
-+{
-+    copy_entry_tag(GTK_ENTRY(v1_title_entry),   GTK_ENTRY(v2_title_entry), MAX_ENTRY_LEN2);
-+    copy_entry_tag(GTK_ENTRY(v1_artist_entry),  GTK_ENTRY(v2_artist_entry), MAX_ENTRY_LEN2);
-+    copy_entry_tag(GTK_ENTRY(v1_album_entry),   GTK_ENTRY(v2_album_entry), MAX_ENTRY_LEN2);
-+    copy_entry_tag(GTK_ENTRY(v1_year_entry),    GTK_ENTRY(v2_year_entry), 4);
-+    copy_entry_tag(GTK_ENTRY(v1_comment_entry), GTK_ENTRY(v2_comment_entry), MAX_ENTRY_LEN2);
-+    copy_entry_tag(GTK_ENTRY(v1_tracknum_entry), GTK_ENTRY(v2_tracknum_entry), 3);
-+
-+    gtk_list_select_item(GTK_LIST(GTK_COMBO(v2_genre_combo)->list), genre_find_index(genre_list, v1_current_genre));
-+    //int genreID = find_genre_id(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(v1_genre_combo)->entry)));
-+	//gtk_list_select_item(GTK_LIST(GTK_COMBO(v2_genre_combo)->list), 
-+    //                     g_list_index(genre_list, (char *) mpg123_id3_genres[genreID]));
-+    return;
-+}
-+
-+void v1_toggle_cb (GtkWidget *widget, gpointer data)
-+{
-+    int i = 0;
-+    if (GTK_TOGGLE_BUTTON (widget)->active)
-+    {
-+        // If control reaches here, the toggle button is down
-+        // Gray out labels
-+        for (i = 0; i < v1_labels_list->len; i++) {
-+            gtk_widget_set_sensitive(GTK_WIDGET( g_ptr_array_index(v1_labels_list, i) ), FALSE);
-+        }
-+        gtk_widget_set_sensitive(v1_title_entry, FALSE);
-+        gtk_widget_set_sensitive(v1_artist_entry, FALSE);
-+        gtk_widget_set_sensitive(v1_album_entry, FALSE);
-+        gtk_widget_set_sensitive(v1_year_entry, FALSE);
-+        gtk_widget_set_sensitive(v1_tracknum_entry, FALSE);
-+        gtk_widget_set_sensitive(v1_comment_entry, FALSE);
-+        gtk_widget_set_sensitive(v1_genre_combo, FALSE);
-+    } else {
-+
-+        // If control reaches here, the toggle button is up
-+        // Enable labels
-+        for (i = 0; i < v1_labels_list->len; i++) {
-+            gtk_widget_set_sensitive(GTK_WIDGET( g_ptr_array_index(v1_labels_list, i) ), TRUE);
-+        }
-+        gtk_widget_set_sensitive(v1_title_entry, TRUE);
-+        gtk_widget_set_sensitive(v1_artist_entry, TRUE);
-+        gtk_widget_set_sensitive(v1_album_entry, TRUE);
-+        gtk_widget_set_sensitive(v1_year_entry, TRUE);
-+        gtk_widget_set_sensitive(v1_tracknum_entry, TRUE);
-+        gtk_widget_set_sensitive(v1_comment_entry, TRUE);
-+        gtk_widget_set_sensitive(v1_genre_combo, TRUE);
-+    }
-+}
-+
-+void v2_toggle_cb (GtkWidget *widget, gpointer data)
-+{
-+    int i = 0;
-+    if (GTK_TOGGLE_BUTTON (widget)->active)
-+    {
-+        // If control reaches here, the toggle button is down
-+        // Gray out labels
-+        for (i = 0; i < v2_labels_list->len; i++) {
-+            gtk_widget_set_sensitive(GTK_WIDGET( g_ptr_array_index(v2_labels_list, i) ), FALSE);
-+        }
-+        gtk_widget_set_sensitive(v2_title_entry, FALSE);
-+        gtk_widget_set_sensitive(v2_artist_entry, FALSE);
-+        gtk_widget_set_sensitive(v2_album_entry, FALSE);
-+        gtk_widget_set_sensitive(v2_year_entry, FALSE);
-+        gtk_widget_set_sensitive(v2_tracknum_entry, FALSE);
-+        gtk_widget_set_sensitive(v2_comment_entry, FALSE);
-+        gtk_widget_set_sensitive(v2_composer_entry, FALSE);
-+        gtk_widget_set_sensitive(v2_orig_artist_entry, FALSE);
-+        gtk_widget_set_sensitive(v2_url_entry, FALSE);
-+        gtk_widget_set_sensitive(v2_encoded_by_entry, FALSE);
-+        gtk_widget_set_sensitive(v2_genre_combo, FALSE);
-+    } else {
-+
-+        // If control reaches here, the toggle button is up
-+        // Enable labels
-+        for (i = 0; i < v2_labels_list->len; i++) {
-+            gtk_widget_set_sensitive(GTK_WIDGET( g_ptr_array_index(v2_labels_list, i) ), TRUE);
-+        }
-+        gtk_widget_set_sensitive(v2_title_entry, TRUE);
-+        gtk_widget_set_sensitive(v2_artist_entry, TRUE);
-+        gtk_widget_set_sensitive(v2_album_entry, TRUE);
-+        gtk_widget_set_sensitive(v2_year_entry, TRUE);
-+        gtk_widget_set_sensitive(v2_tracknum_entry, TRUE);
-+        gtk_widget_set_sensitive(v2_comment_entry, TRUE);
-+        gtk_widget_set_sensitive(v2_composer_entry, TRUE);
-+        gtk_widget_set_sensitive(v2_orig_artist_entry, TRUE);
-+        gtk_widget_set_sensitive(v2_url_entry, TRUE);
-+        gtk_widget_set_sensitive(v2_encoded_by_entry, TRUE);
-+        gtk_widget_set_sensitive(v2_genre_combo, TRUE);
-+    }
-+}
-+static void v1_genre_selected(GtkList *list, GtkWidget *w, gpointer data)
-+{
-+	void * p;
-+	p = gtk_object_get_data(GTK_OBJECT(w), "genre_id");
-+	if (p != NULL)
-+		v1_current_genre = GPOINTER_TO_INT(p);
-+	else
-+		v1_current_genre = 0;
-+}
-+
-+static void v2_genre_selected(GtkList *list, GtkWidget *w, gpointer data)
- {
- 	void * p;
- 	p = gtk_object_get_data(GTK_OBJECT(w), "genre_id");
- 	if (p != NULL)
--		current_genre = GPOINTER_TO_INT(p);
-+		v2_current_genre = GPOINTER_TO_INT(p);
- 	else
--		current_genre = 0;
-+		v2_current_genre = 0;
- }
- 
- static void genre_set_popdown(GtkWidget *combo, GList *genres)
-@@ -266,11 +434,12 @@
- void mpg123_file_info_box(char *filename)
- {
- 	int i;
--	struct id3v1tag_t tag;
-+	struct id3v1tag_t id3v1tag;
- 	FILE *fh;
- 	char *tmp, *title;
- 	const char *emphasis[4];
- 	const char *bool_label[2];
-+	struct id3tag_t id3v2tag;
- 
- 	emphasis[0] = _("None");
- 	emphasis[1] = _("50/15 ms");
-@@ -281,116 +450,123 @@
- 
- 	if (!window)
- 	{
--		GtkWidget *vbox, *hbox, *left_vbox, *table;
--		GtkWidget *mpeg_frame, *mpeg_box;
--		GtkWidget *label, *filename_hbox;
--		GtkWidget *bbox, *save, *remove_id3, *cancel;
--		
--		window = gtk_window_new(GTK_WINDOW_DIALOG);
--		gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
--		gtk_signal_connect(GTK_OBJECT(window), "destroy",
--				   gtk_widget_destroyed, &window);
--		gtk_container_set_border_width(GTK_CONTAINER(window), 10);
--
--		vbox = gtk_vbox_new(FALSE, 10);
--		gtk_container_add(GTK_CONTAINER(window), vbox);
-+	    GtkWidget *window_vbox, 
-+                  *id3v1_vbox, *id3v2_vbox, *id3v1_frame_vbox, *id3v2_frame_vbox, 
-+                  *mpeg_lvbox, *mpeg_rvbox, *mpeg_hbox, *mpeg_box, *mpeg_frame, 
-+	              *bbox, *save, *close, *copy_to, *copy_from,
-+                  *table, *label, *filename_hbox;
-+
-+	    v1_labels_list = g_ptr_array_new();
-+	    v2_labels_list = g_ptr_array_new();
-+
-+	    window = gtk_window_new(GTK_WINDOW_DIALOG);
-+	    //gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
-+	    gtk_signal_connect(GTK_OBJECT(window), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &window);
-+	    gtk_container_set_border_width(GTK_CONTAINER(window), 10);
- 
-+        window_vbox = gtk_vbox_new(FALSE,10);
- 		filename_hbox = gtk_hbox_new(FALSE, 5);
--		gtk_box_pack_start(GTK_BOX(vbox), filename_hbox,
--				   FALSE, TRUE, 0);
-+		gtk_box_pack_start(GTK_BOX(window_vbox), filename_hbox, FALSE, TRUE, 0);
- 
- 		label = gtk_label_new(_("Filename:"));
--		gtk_box_pack_start(GTK_BOX(filename_hbox), label,
--				   FALSE, TRUE, 0);
-+		gtk_box_pack_start(GTK_BOX(filename_hbox), label, FALSE, TRUE, 0);
- 		filename_entry = xmms_entry_new();
- 		gtk_editable_set_editable(GTK_EDITABLE(filename_entry), FALSE);
--		gtk_box_pack_start(GTK_BOX(filename_hbox),
--				   filename_entry, TRUE, TRUE, 0);
--		
--		hbox = gtk_hbox_new(FALSE, 10);
--		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
--		
--		left_vbox = gtk_vbox_new(FALSE, 10);
--		gtk_box_pack_start(GTK_BOX(hbox), left_vbox, FALSE, FALSE, 0);
--
--		id3_frame = gtk_frame_new(_("ID3 Tag:"));
--		gtk_box_pack_start(GTK_BOX(left_vbox), id3_frame,
--				   FALSE, FALSE, 0);
--
--		table = gtk_table_new(5, 5, FALSE);
--		gtk_container_set_border_width(GTK_CONTAINER(table), 5);
--		gtk_container_add(GTK_CONTAINER(id3_frame), table);
--
--		label = gtk_label_new(_("Title:"));
--		gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
--		gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1,
--				 GTK_FILL, GTK_FILL, 5, 5);
--
--		title_entry = gtk_entry_new_with_max_length(30);
--		gtk_table_attach(GTK_TABLE(table), title_entry, 1, 4, 0, 1,
--				 GTK_FILL | GTK_EXPAND | GTK_SHRINK,
--				 GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
--
--		label = gtk_label_new(_("Artist:"));
--		gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
--		gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2,
--				 GTK_FILL, GTK_FILL, 5, 5);
--
--		artist_entry = gtk_entry_new_with_max_length(30);
--		gtk_table_attach(GTK_TABLE(table), artist_entry, 1, 4, 1, 2,
--				 GTK_FILL | GTK_EXPAND | GTK_SHRINK,
--				 GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
--
--		label = gtk_label_new(_("Album:"));
--		gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
--		gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3,
--				 GTK_FILL, GTK_FILL, 5, 5);
--
--		album_entry = gtk_entry_new_with_max_length(30);
--		gtk_table_attach(GTK_TABLE(table), album_entry, 1, 4, 2, 3,
--				 GTK_FILL | GTK_EXPAND | GTK_SHRINK,
--				 GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
--
--		label = gtk_label_new(_("Comment:"));
--		gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
--		gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4,
--				 GTK_FILL, GTK_FILL, 5, 5);
--
--		comment_entry = gtk_entry_new_with_max_length(30);
--		gtk_table_attach(GTK_TABLE(table), comment_entry, 1, 4, 3, 4,
--				 GTK_FILL | GTK_EXPAND | GTK_SHRINK,
--				 GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
--
--		label = gtk_label_new(_("Year:"));
--		gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
--		gtk_table_attach(GTK_TABLE(table), label, 0, 1, 4, 5,
--				 GTK_FILL, GTK_FILL, 5, 5);
--
--		year_entry = gtk_entry_new_with_max_length(4);
--		gtk_widget_set_usize(year_entry, 40, -1);
--		gtk_table_attach(GTK_TABLE(table), year_entry, 1, 2, 4, 5,
--				 GTK_FILL | GTK_EXPAND | GTK_SHRINK,
--				 GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
--
--		label = gtk_label_new(_("Track number:"));
--		gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
--		gtk_table_attach(GTK_TABLE(table), label, 2, 3, 4, 5,
--				 GTK_FILL, GTK_FILL, 5, 5);
--
--		tracknum_entry = gtk_entry_new_with_max_length(3);
--		gtk_widget_set_usize(tracknum_entry, 40, -1);
--		gtk_table_attach(GTK_TABLE(table), tracknum_entry, 3, 4, 4, 5,
--				 GTK_FILL | GTK_EXPAND | GTK_SHRINK,
--				 GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
--
--		label = gtk_label_new(_("Genre:"));
--		gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
--		gtk_table_attach(GTK_TABLE(table), label, 0, 1, 5, 6,
--				 GTK_FILL, GTK_FILL, 5, 5);
--
--		genre_combo = gtk_combo_new();
--		gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(genre_combo)->entry),
--				       FALSE);
-+		gtk_box_pack_start(GTK_BOX(filename_hbox), filename_entry, TRUE, TRUE, 0);
-+
-+	    id3v1_vbox = gtk_vbox_new(FALSE, 10);
-+	    id3v1_frame = gtk_frame_new("ID3v1 Information");
-+	    gtk_box_pack_start(GTK_BOX(id3v1_vbox), id3v1_frame, TRUE, TRUE, 0);
-+
-+	    id3v1_frame_vbox = gtk_vbox_new(FALSE,10);
-+	    gtk_container_add(GTK_CONTAINER(id3v1_frame), id3v1_frame_vbox);
-+
-+	    table = gtk_table_new(6, 6, FALSE);
-+	    gtk_container_set_border_width(GTK_CONTAINER(table), 5);
-+	    //gtk_widget_set_usize(GTK_WIDGET(table), 325, -1);
-+	    //gtk_container_add(GTK_CONTAINER(id3v1_frame), table);
-+	    gtk_box_pack_start(GTK_BOX(id3v1_frame_vbox), table, FALSE, FALSE, 0);
-+
-+	    v1_checkbox = gtk_check_button_new_with_label ("Disable ID3v1 Tag");
-+	    gtk_signal_connect(GTK_OBJECT(v1_checkbox), "toggled", GTK_SIGNAL_FUNC(v1_toggle_cb), NULL);
-+	    gtk_table_attach(GTK_TABLE(table), v1_checkbox, 1, 3, 0, 1,
-+                GTK_FILL, GTK_FILL, 0, 2);
-+
-+	    label = gtk_label_new("Track number:"); 
-+	    g_ptr_array_add(v1_labels_list, (gpointer)label);
-+	    gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-+	    gtk_table_attach(GTK_TABLE(table), label, 3, 4, 0, 1,
-+                GTK_FILL, GTK_FILL, 5,5);
-+
-+	    v1_tracknum_entry = gtk_entry_new_with_max_length(3);
-+	    gtk_widget_set_usize(v1_tracknum_entry, 20, -1);
-+	    gtk_table_attach(GTK_TABLE(table), v1_tracknum_entry, 4, 5, 0, 1,
-+                GTK_FILL, GTK_FILL, 0, 2);
-+
-+	    label = gtk_label_new("Title:");
-+	    g_ptr_array_add(v1_labels_list, (gpointer)label);
-+	    gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-+	    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2,
-+                GTK_FILL, GTK_FILL, 5, 5);
-+
-+	    v1_title_entry = gtk_entry_new_with_max_length(30);
-+	    gtk_table_attach(GTK_TABLE(table), v1_title_entry, 1, 5, 1, 2,
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK,
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 2);
-+
-+	    label = gtk_label_new("Artist:");
-+	    g_ptr_array_add(v1_labels_list, (gpointer)label);
-+	    gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-+	    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3,
-+                GTK_FILL, GTK_FILL, 5, 5);
-+
-+	    v1_artist_entry = gtk_entry_new_with_max_length(30);
-+	    gtk_table_attach(GTK_TABLE(table), v1_artist_entry, 1, 5, 2, 3,
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK,
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 2);
-+
-+	    label = gtk_label_new("Album:");
-+	    g_ptr_array_add(v1_labels_list, (gpointer)label);
-+	    gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-+	    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4,
-+                GTK_FILL, GTK_FILL, 5, 5);
-+
-+	    v1_album_entry = gtk_entry_new_with_max_length(30);
-+	    gtk_table_attach(GTK_TABLE(table), v1_album_entry, 1, 5, 3, 4,
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK,
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 2);
-+
-+	    label = gtk_label_new("Comment:");
-+	    g_ptr_array_add(v1_labels_list, (gpointer)label);
-+	    gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-+	    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 4, 5,
-+                GTK_FILL, GTK_FILL, 5, 5);
-+
-+	    v1_comment_entry = gtk_entry_new_with_max_length(30);
-+	    gtk_table_attach(GTK_TABLE(table), v1_comment_entry, 1, 5, 4, 5,
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK,
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 2);
-+
-+	    label = gtk_label_new("Year:");
-+	    g_ptr_array_add(v1_labels_list, (gpointer)label);
-+	    gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-+	    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 5, 6,
-+                GTK_FILL, GTK_FILL, 5, 5);
-+
-+	    v1_year_entry = gtk_entry_new_with_max_length(4);
-+	    gtk_widget_set_usize(v1_year_entry, 45, -1);
-+	    gtk_table_attach(GTK_TABLE(table), v1_year_entry, 1, 2, 5, 6,
-+                GTK_FILL, GTK_FILL, 0, 2);
-+
-+	    label = gtk_label_new("Genre:");
-+	    g_ptr_array_add(v1_labels_list, (gpointer)label);
-+	    gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-+	    gtk_table_attach(GTK_TABLE(table), label, 2, 3, 5, 6,
-+                GTK_FILL, GTK_FILL, 5, 5);
-+
-+	    v1_genre_combo = gtk_combo_new();
-+	    gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(v1_genre_combo)->entry),
-+                FALSE);
- 		if (!genre_list)
- 		{
- 			struct genre_item *item;
-@@ -408,77 +584,278 @@
- 			genre_list = g_list_prepend(genre_list, item);
- 			genre_list = g_list_sort(genre_list, genre_comp_func);
- 		}
--		genre_set_popdown(genre_combo, genre_list);
--		gtk_signal_connect(GTK_OBJECT(GTK_COMBO(genre_combo)->list),
--				   "select-child", genre_selected, NULL);
--
--		gtk_table_attach(GTK_TABLE(table), genre_combo, 1, 4, 5, 6,
--				 GTK_FILL | GTK_EXPAND | GTK_SHRINK,
--				 GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
--
--		bbox = gtk_hbutton_box_new();
--		gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox),
--					  GTK_BUTTONBOX_END);
--		gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
--		gtk_box_pack_start(GTK_BOX(left_vbox), bbox, FALSE, FALSE, 0);
--
--		save = gtk_button_new_with_label(_("Save"));
--		gtk_signal_connect(GTK_OBJECT(save), "clicked", save_cb, NULL);
--		GTK_WIDGET_SET_FLAGS(save, GTK_CAN_DEFAULT);
--		gtk_box_pack_start(GTK_BOX(bbox), save, TRUE, TRUE, 0);
--		gtk_widget_grab_default(save);
--
--		remove_id3 = gtk_button_new_with_label(_("Remove ID3"));
--		gtk_signal_connect(GTK_OBJECT(remove_id3), "clicked",
--				   remove_id3_cb, NULL);
--		GTK_WIDGET_SET_FLAGS(remove_id3, GTK_CAN_DEFAULT);
--		gtk_box_pack_start(GTK_BOX(bbox), remove_id3, TRUE, TRUE, 0);
--
--		cancel = gtk_button_new_with_label(_("Cancel"));
--		gtk_signal_connect_object(GTK_OBJECT(cancel), "clicked",
--					  gtk_widget_destroy, GTK_OBJECT(window));
--		GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT);
--		gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 0);
--
--		mpeg_frame = gtk_frame_new(_("MPEG Info:"));
--		gtk_box_pack_start(GTK_BOX(hbox), mpeg_frame, FALSE, FALSE, 0);
--
--		mpeg_box = gtk_vbox_new(FALSE, 5);
--		gtk_container_add(GTK_CONTAINER(mpeg_frame), mpeg_box);
--		gtk_container_set_border_width(GTK_CONTAINER(mpeg_box), 10);
--		gtk_box_set_spacing(GTK_BOX(mpeg_box), 0);
--
--		mpeg_level = gtk_label_new("");
--		gtk_widget_set_usize(mpeg_level, 120, -2);
--		gtk_misc_set_alignment(GTK_MISC(mpeg_level), 0, 0);
--		gtk_box_pack_start(GTK_BOX(mpeg_box), mpeg_level, FALSE, FALSE, 0);
--
--		mpeg_bitrate = gtk_label_new("");
--		gtk_misc_set_alignment(GTK_MISC(mpeg_bitrate), 0, 0);
--		gtk_label_set_justify(GTK_LABEL(mpeg_bitrate),
--				      GTK_JUSTIFY_LEFT);
--		gtk_box_pack_start(GTK_BOX(mpeg_box),
--				   mpeg_bitrate, FALSE, FALSE, 0);
--
--		mpeg_samplerate = gtk_label_new("");
--		gtk_misc_set_alignment(GTK_MISC(mpeg_samplerate), 0, 0);
--		gtk_box_pack_start(GTK_BOX(mpeg_box), mpeg_samplerate,
--				   FALSE, FALSE, 0);
--
--		mpeg_flags = gtk_label_new("");
--		gtk_misc_set_alignment(GTK_MISC(mpeg_flags), 0, 0);
--		gtk_label_set_justify(GTK_LABEL(mpeg_flags), GTK_JUSTIFY_LEFT);
--		gtk_box_pack_start(GTK_BOX(mpeg_box), mpeg_flags,
--				   FALSE, FALSE, 0);
--
--		mpeg_fileinfo = gtk_label_new("");
--		gtk_misc_set_alignment(GTK_MISC(mpeg_fileinfo), 0, 0);
--		gtk_label_set_justify(GTK_LABEL(mpeg_fileinfo),
--				      GTK_JUSTIFY_LEFT);
--		gtk_box_pack_start(GTK_BOX(mpeg_box), mpeg_fileinfo,
--				   FALSE, FALSE, 0);
-+		genre_set_popdown(v1_genre_combo, genre_list);
-+		gtk_signal_connect(GTK_OBJECT(GTK_COMBO(v1_genre_combo)->list),
-+				   "select-child", v1_genre_selected, NULL);
-+
-+	    gtk_table_attach(GTK_TABLE(table), v1_genre_combo, 3, 5, 5, 6,
-+                GTK_FILL | GTK_SHRINK, GTK_FILL |
-+                GTK_SHRINK, 0, 2);
-+
-+	    bbox = gtk_hbutton_box_new();
-+        gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START);
-+        gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), 0);
-+	    gtk_container_set_border_width(GTK_CONTAINER(bbox), 5);
-+	    gtk_box_pack_start(GTK_BOX(id3v1_frame_vbox), bbox, FALSE, FALSE, 0);
-+
-+	    copy_from = gtk_button_new_with_label("ID3v1 to ID3v2");
-+	    gtk_signal_connect(GTK_OBJECT(copy_from), "clicked", GTK_SIGNAL_FUNC(copy_v1_to_v2_cb), NULL);
-+        // remove the next line to thicken the button width
-+        GTK_WIDGET_SET_FLAGS(copy_from, GTK_CAN_DEFAULT);
-+	    gtk_box_pack_start(GTK_BOX(bbox), copy_from, FALSE, TRUE, 0);
-+
-+				 
-+	    notebook = gtk_notebook_new ();
-+	    gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_TOP);
-+
-+	    label = gtk_label_new ("ID3v1");
-+	    gtk_notebook_append_page (GTK_NOTEBOOK (notebook), id3v1_vbox, label);
-+
-+
-+	    ////////////////////////////////////////////////////////////////////////////////////////////////////
-+	    ////////////////////////////////////////////////////////////////////////////////////////////////////
-+
-+	    id3v2_vbox = gtk_vbox_new(FALSE, 0);
-+
-+	    id3v2_frame = gtk_frame_new("ID3v2 Information");
-+	    gtk_box_pack_start(GTK_BOX(id3v2_vbox), id3v2_frame, FALSE, FALSE, 0);
-+
-+	    id3v2_frame_vbox = gtk_vbox_new(FALSE, 0);
-+	    gtk_container_add(GTK_CONTAINER(id3v2_frame), id3v2_frame_vbox);
-+
-+	    table = gtk_table_new(6, 6, FALSE);
-+	    gtk_container_set_border_width(GTK_CONTAINER(table), 5);
-+	    gtk_widget_set_usize(GTK_WIDGET(table), 400, -1);
-+	    //gtk_container_add(GTK_CONTAINER(id3v2_frame), table);
-+	    gtk_box_pack_start(GTK_BOX(id3v2_frame_vbox), table, FALSE, FALSE, 0);
-+
-+	    v2_checkbox = gtk_check_button_new_with_label ("Disable ID3v2 Tag");
-+	    gtk_signal_connect(GTK_OBJECT(v2_checkbox), "toggled", GTK_SIGNAL_FUNC(v2_toggle_cb), NULL);
-+	    gtk_table_attach(GTK_TABLE(table), v2_checkbox, 1, 3, 0, 1,
-+                GTK_FILL, GTK_FILL, 0, 2);
-+
-+	    label = gtk_label_new("Track number:"); 
-+	    g_ptr_array_add(v2_labels_list, (gpointer)label);
-+	    gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-+	    gtk_table_attach(GTK_TABLE(table), label, 3, 4, 0, 1,
-+                GTK_FILL, GTK_FILL, 5,5);
-+
-+	    v2_tracknum_entry = gtk_entry_new_with_max_length(3);
-+	    gtk_widget_set_usize(v2_tracknum_entry, 20, -1);
-+	    gtk_table_attach(GTK_TABLE(table), v2_tracknum_entry, 4, 5, 0, 1,
-+                GTK_FILL, GTK_FILL, 0, 2);
-+
-+	    label = gtk_label_new("Title:");
-+	    g_ptr_array_add(v2_labels_list, (gpointer)label);
-+	    gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-+	    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2,
-+                GTK_FILL, GTK_FILL, 5, 5);
-+
-+	    v2_title_entry = gtk_entry_new_with_max_length(MAX_ENTRY_LEN2);
-+	    gtk_table_attach(GTK_TABLE(table), v2_title_entry, 1, 5, 1, 2, 
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK,
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 2);
-+
-+	    label = gtk_label_new("Artist:");
-+	    g_ptr_array_add(v2_labels_list, (gpointer)label);
-+	    gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-+	    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3,
-+                GTK_FILL, GTK_FILL, 5, 5);
-+
-+	    v2_artist_entry = gtk_entry_new_with_max_length(MAX_ENTRY_LEN2);
-+	    gtk_table_attach(GTK_TABLE(table), v2_artist_entry, 1, 5, 2, 3, 
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK,
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 2);
-+
-+	    label = gtk_label_new("Album:");
-+	    g_ptr_array_add(v2_labels_list, (gpointer)label);
-+	    gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-+	    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4,
-+                GTK_FILL, GTK_FILL, 5, 5);
-+
-+	    v2_album_entry = gtk_entry_new_with_max_length(MAX_ENTRY_LEN2);
-+	    gtk_table_attach(GTK_TABLE(table), v2_album_entry, 1, 5, 3, 4, 
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK,
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 2);
-+
-+	    label = gtk_label_new("Comment:");
-+	    g_ptr_array_add(v2_labels_list, (gpointer)label);
-+	    gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-+	    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 4, 5,
-+                GTK_FILL, GTK_FILL, 5, 5);
-+
-+	    v2_comment_entry = gtk_entry_new_with_max_length(MAX_ENTRY_LEN2);
-+	    gtk_table_attach(GTK_TABLE(table), v2_comment_entry, 1, 5, 4, 5, 
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK,
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 2);
-+
-+	    label = gtk_label_new("Year:");
-+	    g_ptr_array_add(v2_labels_list, (gpointer)label);
-+	    gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-+	    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 5, 6,
-+                GTK_FILL, GTK_FILL, 5, 5);
-+
-+	    v2_year_entry = gtk_entry_new_with_max_length(4);
-+	    gtk_widget_set_usize(v2_year_entry, 45, -1);
-+	    gtk_table_attach(GTK_TABLE(table), v2_year_entry, 1, 2, 5, 6,
-+                GTK_FILL, GTK_FILL, 0, 2);
-+
-+	    label = gtk_label_new("Genre:");
-+	    g_ptr_array_add(v2_labels_list, (gpointer)label);
-+	    gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-+	    gtk_table_attach(GTK_TABLE(table), label, 2, 3, 5, 6,
-+                GTK_FILL, GTK_FILL, 5, 5);
-+
-+	    v2_genre_combo = gtk_combo_new();
-+	    gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(v2_genre_combo)->entry), FALSE);
-+		genre_set_popdown(v2_genre_combo, genre_list);
-+		gtk_signal_connect(GTK_OBJECT(GTK_COMBO(v2_genre_combo)->list),
-+				   "select-child", v2_genre_selected, NULL);
-+
-+	    gtk_table_attach(GTK_TABLE(table), v2_genre_combo, 3, 5, 5, 6, 
-+                GTK_FILL | GTK_SHRINK, GTK_FILL |
-+                GTK_SHRINK, 0, 2);
-+
-+	    label = gtk_label_new("Composer:");
-+	    g_ptr_array_add(v2_labels_list, (gpointer)label);
-+	    gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-+	    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 6, 7,
-+                GTK_FILL, GTK_FILL, 5, 5);
-+
-+	    v2_composer_entry = gtk_entry_new_with_max_length(MAX_ENTRY_LEN2);
-+	    gtk_table_attach(GTK_TABLE(table), v2_composer_entry, 1, 5, 6, 7, 
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK,
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 2);
-+
-+	    label = gtk_label_new("Orig. Artist:");
-+	    g_ptr_array_add(v2_labels_list, (gpointer)label);
-+	    gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-+	    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 7, 8,
-+                GTK_FILL, GTK_FILL, 5, 5);
-+
-+	    v2_orig_artist_entry = gtk_entry_new_with_max_length(MAX_ENTRY_LEN2);
-+	    gtk_table_attach(GTK_TABLE(table), v2_orig_artist_entry, 1, 5, 7, 8, 
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK,
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 2);
-+
-+	    label = gtk_label_new("URL:");
-+	    g_ptr_array_add(v2_labels_list, (gpointer)label);
-+	    gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-+	    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 8, 9,
-+                GTK_FILL, GTK_FILL, 5, 5);
-+
-+	    v2_url_entry = gtk_entry_new_with_max_length(MAX_ENTRY_LEN2);
-+	    gtk_table_attach(GTK_TABLE(table), v2_url_entry, 1, 5, 8, 9, 
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK,
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 2);
-+	    label = gtk_label_new("Encoded By:");
-+	    g_ptr_array_add(v2_labels_list, (gpointer)label);
-+	    gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
-+	    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 9, 10,
-+                GTK_FILL, GTK_FILL, 5, 5);
-+
-+	    v2_encoded_by_entry = gtk_entry_new_with_max_length(MAX_ENTRY_LEN2);
-+	    gtk_table_attach(GTK_TABLE(table), v2_encoded_by_entry, 1, 5, 9, 10, 
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK,
-+                GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 2);
-+
-+	    bbox = gtk_hbutton_box_new();
-+        gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START);
-+        gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), 0);
-+	    gtk_container_set_border_width(GTK_CONTAINER(bbox), 5);
-+	    gtk_box_pack_start(GTK_BOX(id3v2_frame_vbox), bbox, FALSE, FALSE, 0);
-+
-+	    copy_to = gtk_button_new_with_label("ID3v2 to ID3v1");
-+	    gtk_signal_connect(GTK_OBJECT(copy_to), "clicked", GTK_SIGNAL_FUNC(copy_v2_to_v1_cb), NULL);
-+        // remove the next line to thicken the button width
-+        GTK_WIDGET_SET_FLAGS(copy_to, GTK_CAN_DEFAULT);
-+	    gtk_box_pack_start(GTK_BOX(bbox), copy_to, FALSE, TRUE, 0);
-+        
-+	    label = gtk_label_new ("ID3v2");
-+	    gtk_notebook_append_page (GTK_NOTEBOOK (notebook), id3v2_vbox, label);
-+
-+
-+	    ////////////////////////////////////////////////////////////////////////////////////////////////////
-+	    ////////////////////////////////////////////////////////////////////////////////////////////////////
-+
-+	    mpeg_frame = gtk_frame_new("MPEG Information");
-+	    mpeg_hbox = gtk_hbox_new(FALSE,50);
-+	    gtk_container_add(GTK_CONTAINER(mpeg_frame), mpeg_hbox);
-+
-+	    mpeg_lvbox = gtk_vbox_new(FALSE, 5);
-+	    gtk_container_set_border_width(GTK_CONTAINER(mpeg_lvbox), 10);
-+	    gtk_box_pack_start(GTK_BOX(mpeg_hbox), mpeg_lvbox, FALSE, FALSE, 0);
-+
-+	    //gtk_container_set_border_width(GTK_CONTAINER(table), 5);
-+	    //gtk_widget_set_usize(GTK_WIDGET(table), 325, -1);
-+	    //gtk_container_add(GTK_CONTAINER(mpeg_frame), table);
-+
-+	    mpeg_box = gtk_vbox_new(FALSE, 5);
-+	    gtk_box_pack_start(GTK_BOX(mpeg_hbox), mpeg_box, FALSE, FALSE, 0);
-+	    gtk_container_set_border_width(GTK_CONTAINER(mpeg_box), 10);
-+	    gtk_box_set_spacing(GTK_BOX(mpeg_box), 0);
-+
-+	    mpeg_level = gtk_label_new("");
-+	    //gtk_widget_set_usize(mpeg_level, 120, -2);
-+	    gtk_label_set_justify (GTK_LABEL(mpeg_level), GTK_JUSTIFY_LEFT);
-+	    gtk_misc_set_alignment(GTK_MISC(mpeg_level), 0, 0.5);
-+	    gtk_box_pack_start(GTK_BOX(mpeg_lvbox), mpeg_level, FALSE, FALSE, 0);
-+
-+	    mpeg_samplerate = gtk_label_new("");
-+	    gtk_label_set_justify (GTK_LABEL(mpeg_samplerate), GTK_JUSTIFY_LEFT);
-+	    gtk_misc_set_alignment(GTK_MISC(mpeg_samplerate), 0, 0.5);
-+	    gtk_box_pack_start(GTK_BOX(mpeg_lvbox), mpeg_samplerate, FALSE, FALSE, 0);
-+
-+	    mpeg_fileinfo = gtk_label_new("");
-+	    gtk_label_set_justify (GTK_LABEL(mpeg_fileinfo), GTK_JUSTIFY_LEFT);
-+	    gtk_misc_set_alignment(GTK_MISC(mpeg_fileinfo), 0, 0.5);
-+	    gtk_box_pack_start(GTK_BOX(mpeg_lvbox), mpeg_fileinfo, FALSE, FALSE, 0);
-+
-+	    mpeg_rvbox = gtk_vbox_new(FALSE, 5);
-+	    gtk_box_pack_start(GTK_BOX(mpeg_hbox), mpeg_rvbox, FALSE, FALSE, 0);
-+	    gtk_container_set_border_width(GTK_CONTAINER(mpeg_rvbox), 10);
-+
-+	    mpeg_bitrate = gtk_label_new("");
-+	    gtk_label_set_justify (GTK_LABEL(mpeg_bitrate), GTK_JUSTIFY_LEFT);
-+	    gtk_misc_set_alignment(GTK_MISC(mpeg_bitrate), 0, 0.5);
-+	    gtk_box_pack_start(GTK_BOX(mpeg_rvbox), mpeg_bitrate, FALSE, FALSE, 0);
-+
-+	    mpeg_flags = gtk_label_new("");
-+	    gtk_label_set_justify (GTK_LABEL(mpeg_flags), GTK_JUSTIFY_LEFT);
-+	    gtk_misc_set_alignment(GTK_MISC(mpeg_flags), 0, 0.5);
-+	    gtk_box_pack_start(GTK_BOX(mpeg_rvbox), mpeg_flags, FALSE, FALSE, 0);
-+
-+	    label = gtk_label_new ("MPEG");
-+	    gtk_notebook_append_page (GTK_NOTEBOOK (notebook), mpeg_frame, label);
-+
-+        //////////////////////////////////////////////////////////////////
-+        //////////////////////////////////////////////////////////////////
-+        
-+        // add notebook to window vbox
-+        gtk_box_pack_start(GTK_BOX(window_vbox), notebook, FALSE, FALSE, 0);
-+
-+        // add button box to window vbox
-+	    bbox = gtk_hbutton_box_new();
-+	    gtk_box_pack_start(GTK_BOX(window_vbox), bbox, FALSE, FALSE, 0);
-+        
-+        gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
-+        gtk_button_box_set_spacing (GTK_BUTTON_BOX (bbox), 5);
-+        //gtk_button_box_set_child_size (GTK_BUTTON_BOX (bbox), child_w, child_h);
-+        
-+        save = gtk_button_new_with_label("Save");
-+        gtk_signal_connect(GTK_OBJECT(save), "clicked", GTK_SIGNAL_FUNC(save_cb), NULL);
-+        //GTK_WIDGET_SET_FLAGS(save, GTK_CAN_DEFAULT);
-+        gtk_box_pack_start(GTK_BOX(bbox), save, TRUE, TRUE, 5);
-+        //gtk_widget_grab_default(save);
-+
-+        close = gtk_button_new_with_label("Close");
-+        gtk_signal_connect_object(GTK_OBJECT(close), "clicked", 
-+                GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(window));
-+        //GTK_WIDGET_SET_FLAGS(close, GTK_CAN_DEFAULT);
-+        gtk_box_pack_start(GTK_BOX(bbox), close, TRUE, TRUE, 5);
- 
--		gtk_widget_show_all(window);
-+        gtk_container_add(GTK_CONTAINER(window), window_vbox);
-+	    gtk_widget_show_all(window);
- 	}
- 
- 	if (current_filename)
-@@ -495,29 +872,43 @@
- 	title = g_strdup(g_basename(filename));
- 	if ((tmp = strrchr(title, '.')) != NULL)
- 		*tmp = '\0';
--	gtk_entry_set_text(GTK_ENTRY(title_entry), title);
-+	gtk_entry_set_text(GTK_ENTRY(v1_title_entry), title);
-+	gtk_entry_set_text(GTK_ENTRY(v2_title_entry), title);
- 	g_free(title);
- 
--	gtk_entry_set_text(GTK_ENTRY(artist_entry), "");
--	gtk_entry_set_text(GTK_ENTRY(album_entry), "");
--	gtk_entry_set_text(GTK_ENTRY(year_entry), "");
--	gtk_entry_set_text(GTK_ENTRY(tracknum_entry), "");
--	gtk_entry_set_text(GTK_ENTRY(comment_entry), "");
--	gtk_list_select_item(GTK_LIST(GTK_COMBO(genre_combo)->list),
-+	gtk_entry_set_text(GTK_ENTRY(v1_artist_entry), "");
-+	gtk_entry_set_text(GTK_ENTRY(v1_album_entry), "");
-+	gtk_entry_set_text(GTK_ENTRY(v1_year_entry), "");
-+	gtk_entry_set_text(GTK_ENTRY(v1_tracknum_entry), "");
-+	gtk_entry_set_text(GTK_ENTRY(v1_comment_entry), "");
-+	gtk_list_select_item(GTK_LIST(GTK_COMBO(v1_genre_combo)->list),
-+			     genre_find_index(genre_list, 0xff));
-+
-+	gtk_entry_set_text(GTK_ENTRY(v2_artist_entry), "");
-+	gtk_entry_set_text(GTK_ENTRY(v2_album_entry), "");
-+	gtk_entry_set_text(GTK_ENTRY(v2_year_entry), "");
-+	gtk_entry_set_text(GTK_ENTRY(v2_tracknum_entry), "");
-+	gtk_entry_set_text(GTK_ENTRY(v2_comment_entry), "");
-+	gtk_entry_set_text(GTK_ENTRY(v2_composer_entry), "");
-+	gtk_entry_set_text(GTK_ENTRY(v2_orig_artist_entry), "");
-+	gtk_entry_set_text(GTK_ENTRY(v2_url_entry), "");
-+	gtk_entry_set_text(GTK_ENTRY(v2_encoded_by_entry), "");
-+	gtk_list_select_item(GTK_LIST(GTK_COMBO(v2_genre_combo)->list),
- 			     genre_find_index(genre_list, 0xff));
-+
- 	gtk_label_set_text(GTK_LABEL(mpeg_level), "MPEG ?, layer ?");
- 	gtk_label_set_text(GTK_LABEL(mpeg_bitrate), "");
- 	gtk_label_set_text(GTK_LABEL(mpeg_samplerate), "");
- 	gtk_label_set_text(GTK_LABEL(mpeg_flags), "");
- 	gtk_label_set_text(GTK_LABEL(mpeg_fileinfo), "");
--
- 	if (!strncasecmp(filename, "http://", 7))
- 	{
- 		file_info_http(filename);
- 		return;
- 	}
- 
--	gtk_widget_set_sensitive(id3_frame, TRUE);
-+	gtk_widget_set_sensitive(id3v1_frame, TRUE);
-+	gtk_widget_set_sensitive(id3v2_frame, TRUE);
- 
- 	if ((fh = fopen(current_filename, "rb")) != NULL)
- 	{
-@@ -525,40 +916,95 @@
- 		unsigned char tmp[4];
- 		struct frame frm;
- 		gboolean id3_found = FALSE;
-+		char *temp = NULL;
-+		struct id3_tag *id3 = NULL;
- 
--		fseek(fh, -sizeof (tag), SEEK_END);
--		if (fread(&tag, 1, sizeof (tag), fh) == sizeof (tag))
-+		/*
-+		 * Try reading ID3v2 tag.
-+		 */
-+		if (!mpg123_cfg.disable_id3v2)
- 		{
--			if (!strncmp(tag.tag, "TAG", 3))
-+			fseek(fh, 0, SEEK_SET);
-+			id3 = id3_open_fp(fh, 0);
-+			if (id3)
- 			{
--				id3_found = TRUE;
--				set_entry_tag(GTK_ENTRY(title_entry),
--					      tag.title, 30);
--				set_entry_tag(GTK_ENTRY(artist_entry),
--					      tag.artist, 30);
--				set_entry_tag(GTK_ENTRY(album_entry),
--					      tag.album, 30);
--				set_entry_tag(GTK_ENTRY(year_entry),
--					      tag.year, 4);
--				/* Check for v1.1 tags */
--				if (tag.u.v1_1.__zero == 0)
--				{
--					char *temp = g_strdup_printf("%d", tag.u.v1_1.track_number);
--					set_entry_tag(GTK_ENTRY(comment_entry),
--						      tag.u.v1_1.comment, 28);
--					gtk_entry_set_text(GTK_ENTRY(tracknum_entry), temp);
--					g_free(temp);
--				}
--				else
--				{
--					set_entry_tag(GTK_ENTRY(comment_entry),
--						      tag.u.v1_0.comment, 30);
--					gtk_entry_set_text(GTK_ENTRY(tracknum_entry), "");
--				}
-+				mpg123_get_id3v2(id3, &id3v2tag);
-+				set_entry_tag(GTK_ENTRY(v2_title_entry),
-+								id3v2tag.title, 128);
-+				set_entry_tag(GTK_ENTRY(v2_artist_entry),
-+								id3v2tag.artist, 128);
-+				set_entry_tag(GTK_ENTRY(v2_album_entry),
-+								id3v2tag.album, 128);
-+				set_entry_tag(GTK_ENTRY(v2_comment_entry),
-+								id3v2tag.comment, 256);
-+				set_entry_tag(GTK_ENTRY(v2_composer_entry),
-+								id3v2tag.composer, MAX_ENTRY_LEN2);
-+				set_entry_tag(GTK_ENTRY(v2_orig_artist_entry),
-+								id3v2tag.orig_artist, MAX_ENTRY_LEN2);
-+				set_entry_tag(GTK_ENTRY(v2_url_entry),
-+								id3v2tag.url, MAX_ENTRY_LEN2);
-+				set_entry_tag(GTK_ENTRY(v2_encoded_by_entry),
-+								id3v2tag.encoded_by, MAX_ENTRY_LEN2);
- 				
--				gtk_list_select_item(GTK_LIST(GTK_COMBO(genre_combo)->list), genre_find_index(genre_list, tag.genre));
-+				temp = g_strdup_printf("%d", id3v2tag.track_number);
-+				gtk_entry_set_text(GTK_ENTRY(v2_tracknum_entry), temp);
-+				g_free(temp);
-+
-+				temp = g_strdup_printf("%d", id3v2tag.year);
-+				gtk_entry_set_text(GTK_ENTRY(v2_year_entry), temp);
-+				g_free(temp);
-+				
-+                printf("Loading genre: %s", id3v2tag.genre);
-+				gtk_list_select_item(GTK_LIST(GTK_COMBO(v2_genre_combo)->list), genre_find_index_str(genre_list, id3v2tag.genre));
-+				id3_close(id3);
- 			}
-+            else
-+            {
-+                // Grey out the id3v2 tab
-+                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(v2_checkbox), TRUE);
-+            }
-+		}
-+
-+		/*
-+		 * Try reading ID3v1 tag.
-+		 */
-+		fseek(fh, -sizeof (id3v1tag), SEEK_END);
-+		if ( (fread(&id3v1tag, 1, sizeof (id3v1tag), fh) == sizeof (id3v1tag)) &&
-+              !strncmp(id3v1tag.tag, "TAG", 3))
-+		{
-+            id3_found = TRUE;
-+            set_entry_tag(GTK_ENTRY(v1_title_entry),
-+                    id3v1tag.title, 30);
-+            set_entry_tag(GTK_ENTRY(v1_artist_entry),
-+                    id3v1tag.artist, 30);
-+            set_entry_tag(GTK_ENTRY(v1_album_entry),
-+                    id3v1tag.album, 30);
-+            set_entry_tag(GTK_ENTRY(v1_year_entry),
-+                    id3v1tag.year, 4);
-+            /* Check for v1.1 tags */
-+            if (id3v1tag.u.v1_1.__zero == 0)
-+            {
-+                char *temp = g_strdup_printf("%d", id3v1tag.u.v1_1.track_number);
-+                set_entry_tag(GTK_ENTRY(v1_comment_entry),
-+                        id3v1tag.u.v1_1.comment, 28);
-+                gtk_entry_set_text(GTK_ENTRY(v1_tracknum_entry), temp);
-+                g_free(temp);
-+            }
-+            else
-+            {
-+                set_entry_tag(GTK_ENTRY(v1_comment_entry),
-+                        id3v1tag.u.v1_0.comment, 30);
-+                gtk_entry_set_text(GTK_ENTRY(v1_tracknum_entry), "");
-+            }
-+
-+			gtk_list_select_item(GTK_LIST(GTK_COMBO(v1_genre_combo)->list), genre_find_index(genre_list, id3v1tag.genre));
- 		}
-+        else
-+        {
-+            // Grey out id3v1 tab
-+            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(v1_checkbox), TRUE);
-+        }
-+
- 		rewind(fh);
- 		if (fread(tmp, 1, 4, fh) != 4)
- 		{
-diff -Naur xmms-1.2.9-orig/Input/mpg123/id3.h xmms-1.2.9/Input/mpg123/id3.h
---- xmms-1.2.9-orig/Input/mpg123/id3.h	Thu Jan 29 06:43:24 2004
-+++ xmms-1.2.9/Input/mpg123/id3.h	Thu Jan 29 05:20:31 2004
-@@ -351,6 +351,7 @@
- int id3_set_text(struct id3_frame *, char *);
- int id3_set_text_number(struct id3_frame *, int);
- gboolean id3_frame_is_text(struct id3_frame *frame);
-+char* id3_get_comm(struct id3_frame *frame);
- 
- /* From id3_frame_content.c */
- char *id3_get_content(struct id3_frame *);
-diff -Naur xmms-1.2.9-orig/Input/mpg123/id3_frame_text.c xmms-1.2.9/Input/mpg123/id3_frame_text.c
---- xmms-1.2.9-orig/Input/mpg123/id3_frame_text.c	Thu Jan 29 06:43:24 2004
-+++ xmms-1.2.9/Input/mpg123/id3_frame_text.c	Thu Jan 29 05:18:54 2004
-@@ -38,15 +38,15 @@
- 
- char *id3_utf16_to_ascii(void *utf16)
- {
--	char ascii[256];
--	char *uc = (char *) utf16 + 2;
--	int i;
--
--	for (i = 0; *uc != 0 && i < sizeof(ascii); i++, uc += 2)
--		ascii[i] = *uc;
--    
--	ascii[i] = 0;
--	return g_strdup(ascii);
-+    char ascii[256];
-+    char *uc = (char *) utf16 + 2;
-+    int i;
-+
-+    for (i = 0; *uc != 0 && i < sizeof(ascii); i++, uc += 2)
-+        ascii[i] = *uc;
-+
-+    ascii[i] = 0;
-+    return g_strdup(ascii);
- }
- 
- 
-@@ -59,25 +59,25 @@
-  */
- gint8 id3_get_encoding(struct id3_frame *frame)
- {
--	/* Type check */
--	if (!id3_frame_is_text(frame) &&
--	    frame->fr_desc->fd_id != ID3_WXXX &&
--	    frame->fr_desc->fd_id != ID3_IPLS &&
--	    frame->fr_desc->fd_id != ID3_USLT &&
--	    frame->fr_desc->fd_id != ID3_SYLT &&
--	    frame->fr_desc->fd_id != ID3_COMM &&
--	    frame->fr_desc->fd_id != ID3_APIC &&
--	    frame->fr_desc->fd_id != ID3_GEOB &&
--	    frame->fr_desc->fd_id != ID3_USER &&
--	    frame->fr_desc->fd_id != ID3_OWNE &&
--	    frame->fr_desc->fd_id != ID3_COMR)
--		return -1;
--
--	/* Check if frame is compressed */
--	if (id3_decompress_frame(frame) == -1)
--		return -1;
-+    /* Type check */
-+    if (!id3_frame_is_text(frame) &&
-+            frame->fr_desc->fd_id != ID3_WXXX &&
-+            frame->fr_desc->fd_id != ID3_IPLS &&
-+            frame->fr_desc->fd_id != ID3_USLT &&
-+            frame->fr_desc->fd_id != ID3_SYLT &&
-+            frame->fr_desc->fd_id != ID3_COMM &&
-+            frame->fr_desc->fd_id != ID3_APIC &&
-+            frame->fr_desc->fd_id != ID3_GEOB &&
-+            frame->fr_desc->fd_id != ID3_USER &&
-+            frame->fr_desc->fd_id != ID3_OWNE &&
-+            frame->fr_desc->fd_id != ID3_COMR)
-+        return -1;
-+
-+    /* Check if frame is compressed */
-+    if (id3_decompress_frame(frame) == -1)
-+        return -1;
- 
--	return *(gint8 *) frame->fr_data;
-+    return *(gint8 *) frame->fr_data;
- }
- 
- 
-@@ -92,25 +92,25 @@
- {
-     /* Type check */
-     if ( frame->fr_desc->fd_idstr[0] != 'T' &&
--	 frame->fr_desc->fd_id != ID3_WXXX &&
--	 frame->fr_desc->fd_id != ID3_IPLS &&
--	 frame->fr_desc->fd_id != ID3_USLT &&
--	 frame->fr_desc->fd_id != ID3_SYLT &&
--	 frame->fr_desc->fd_id != ID3_COMM &&
--	 frame->fr_desc->fd_id != ID3_APIC &&
--	 frame->fr_desc->fd_id != ID3_GEOB &&
--	 frame->fr_desc->fd_id != ID3_USER &&
--	 frame->fr_desc->fd_id != ID3_OWNE &&
--	 frame->fr_desc->fd_id != ID3_COMR )
--	return -1;
-+            frame->fr_desc->fd_id != ID3_WXXX &&
-+            frame->fr_desc->fd_id != ID3_IPLS &&
-+            frame->fr_desc->fd_id != ID3_USLT &&
-+            frame->fr_desc->fd_id != ID3_SYLT &&
-+            frame->fr_desc->fd_id != ID3_COMM &&
-+            frame->fr_desc->fd_id != ID3_APIC &&
-+            frame->fr_desc->fd_id != ID3_GEOB &&
-+            frame->fr_desc->fd_id != ID3_USER &&
-+            frame->fr_desc->fd_id != ID3_OWNE &&
-+            frame->fr_desc->fd_id != ID3_COMR )
-+        return -1;
- 
-     /* Check if frame is compressed */
-     if (id3_decompress_frame(frame) == -1)
--	    return -1;
-+        return -1;
- 
-     /* Changing the encoding of frames is not supported yet */
-     if ( *(gint8 *) frame->fr_data != encoding )
--	return -1;
-+        return -1;
- 
-     /* Set encoding */
-     *(gint8 *) frame->fr_data = encoding;
-@@ -128,44 +128,44 @@
- {
-     /* Type check */
-     if ( frame->fr_desc->fd_idstr[0] != 'T' )
--	return NULL;
-+        return NULL;
- 
-     /* Check if frame is compressed */
-     if (id3_decompress_frame(frame) == -1)
--	    return NULL;
-+        return NULL;
- 
-     if ( frame->fr_desc->fd_id == ID3_TXXX ) {
--	/*
--	 * This is a user defined text frame.  Skip the description.
--	 */
--	switch ( *(guint8 *) frame->fr_data ) {
--	case ID3_ENCODING_ISO_8859_1:
--	{
--	    char *text = (char *) frame->fr_data + 1;
--
--	    while ( *text != 0 )
--		text++;
--
--	    return g_strdup(++text);
--	}
--	case ID3_ENCODING_UTF16:
--	{
--	    char *text16 = (char *) frame->fr_data + 1;
--
--	    while (*text16 != 0 || *(text16 + 1) != 0)
--		text16 += 2;
--
--	    return id3_utf16_to_ascii(text16 + 2);
--	}
--	default:
--	    return NULL;
--	}
-+        /*
-+         * This is a user defined text frame.  Skip the description.
-+         */
-+        switch ( *(guint8 *) frame->fr_data ) {
-+            case ID3_ENCODING_ISO_8859_1:
-+                {
-+                    char *text = (char *) frame->fr_data + 1;
-+
-+                    while ( *text != 0 )
-+                        text++;
-+
-+                    return g_strdup(++text);
-+                }
-+            case ID3_ENCODING_UTF16:
-+                {
-+                    char *text16 = (char *) frame->fr_data + 1;
-+
-+                    while (*text16 != 0 || *(text16 + 1) != 0)
-+                        text16 += 2;
-+
-+                    return id3_utf16_to_ascii(text16 + 2);
-+                }
-+            default:
-+                return NULL;
-+        }
-     }
- 
-     if (*(guint8 *) frame->fr_data == ID3_ENCODING_ISO_8859_1)
--	return g_strdup((char *) frame->fr_data + 1);
-+        return g_strdup((char *) frame->fr_data + 1);
-     else
--	return id3_utf16_to_ascii(((char *) frame->fr_data + 1));
-+        return id3_utf16_to_ascii(((char *) frame->fr_data + 1));
- }
- 
- 
-@@ -179,20 +179,20 @@
- {
-     /* Type check */
-     if ( frame->fr_desc->fd_idstr[0] != 'T' )
--	return NULL;
-+        return NULL;
- 
-     /* If predefined text frame, return description. */
-     if ( frame->fr_desc->fd_id != ID3_TXXX )
--	return frame->fr_desc->fd_description;
-+        return frame->fr_desc->fd_description;
- 
-     /* Check if frame is compressed */
-     if (id3_decompress_frame(frame) == -1)
--	    return NULL;
-+        return NULL;
- 
-     if (*(guint8 *) frame->fr_data == ID3_ENCODING_ISO_8859_1)
--	return g_strdup((char *) frame->fr_data + 1);
-+        return g_strdup((char *) frame->fr_data + 1);
-     else
--	return id3_utf16_to_ascii((char *) frame->fr_data + 1);
-+        return id3_utf16_to_ascii((char *) frame->fr_data + 1);
- }
- 
- 
-@@ -209,42 +209,42 @@
- 
-     /* Check if frame is compressed */
-     if (id3_decompress_frame(frame) == -1)
--	    return -1;
-+        return -1;
- 
-     /*
-      * Generate integer according to encoding.
-      */
-     switch ( *(guint8 *) frame->fr_data ) {
--    case ID3_ENCODING_ISO_8859_1:
--    {
--	char *text = ((char *) frame->fr_data) + 1;
--
--	while ( *text >= '0' && *text <= '9' ) {
--	    number *= 10;
--	    number += *text - '0';
--	    text++;
--	}
-+        case ID3_ENCODING_ISO_8859_1:
-+            {
-+                char *text = ((char *) frame->fr_data) + 1;
-+
-+                while ( *text >= '0' && *text <= '9' ) {
-+                    number *= 10;
-+                    number += *text - '0';
-+                    text++;
-+                }
-+
-+                return number;
-+            }
-+        case ID3_ENCODING_UTF16:
-+            {
-+                char *text = ((char *) frame->fr_data) + 3;
-+
-+/*      if (*(gint16 *) frame->fr_data == 0xfeff) */
-+/*          text++; */
-+
-+                while ( *text >= '0' && *text <= '9' ) {
-+                    number *= 10;
-+                    number += *text - '0';
-+                    text++;
-+                }
- 
--	return number;
--    }
--    case ID3_ENCODING_UTF16:
--    {
--	char *text = ((char *) frame->fr_data) + 3;
--
--/*  	if (*(gint16 *) frame->fr_data == 0xfeff) */
--/*  	    text++; */
--
--	while ( *text >= '0' && *text <= '9' ) {
--	    number *= 10;
--	    number += *text - '0';
--	    text++;
--	}
-+                return number;
-+            }
- 
--	return number;
--    }
--
--    default:
--	return -1;
-+        default:
-+            return -1;
-     }
- }
- 
-@@ -260,7 +260,7 @@
- {
-     /* Type check */
-     if ( frame->fr_desc->fd_idstr[0] != 'T' )
--	return -1;
-+        return -1;
- 
-     /*
-      * Release memory occupied by previous data.
-@@ -289,6 +289,58 @@
- }
- 
- 
-+
-+
-+char* id3_get_comm(struct id3_frame *frame)
-+{
-+
-+    /* Type check */
-+    if ( frame->fr_desc->fd_id != ID3_COMM )
-+        return NULL;
-+
-+    /* Check if frame is compressed */
-+    if (id3_decompress_frame(frame) == -1)
-+        return NULL;
-+
-+    /*
-+     * <Header for 'Comment', ID: "COMM">
-+     * Text encoding          $xx
-+     * Language               $xx xx xx
-+     * Short content descrip. <text string according to encoding> $00 (00)
-+     * The actual text        <full text string according to encoding>
-+     *
-+     * Skip language and short description.
-+     */
-+    switch ( *(guint8 *) frame->fr_data ) {
-+        case ID3_ENCODING_ISO_8859_1:
-+            {
-+                char *text = (char *) frame->fr_data + 4;
-+
-+                while ( *text != 0 )
-+                    text++;
-+                
-+                return g_strdup(++text);
-+            }
-+        case ID3_ENCODING_UTF16:
-+            {
-+                char *text16 = (char *) frame->fr_data + 4;
-+
-+                while (*text16 != 0 || *(text16 + 1) != 0)
-+                    text16 += 2;
-+
-+                return id3_utf16_to_ascii(text16 + 2);
-+            }
-+        default:
-+            return NULL;
-+    }
-+
-+    if (*(guint8 *) frame->fr_data == ID3_ENCODING_ISO_8859_1)
-+        return g_strdup((char *) frame->fr_data + 1);
-+    else
-+        return id3_utf16_to_ascii(((char *) frame->fr_data + 1));
-+}
-+
-+
- /*
-  * Function id3_set_text_number (frame, number)
-  *
-@@ -304,25 +356,25 @@
- 
-     /* Type check */
-     if ( frame->fr_desc->fd_idstr[0] != 'T' )
--	return -1;
-+        return -1;
- 
-     /*
-      * Release memory occupied by previous data.
-      */
-     id3_frame_clear_data(frame);
--    
-+
-     /*
-      * Create a string with a reversed number.
-      */
-     pos = 0;
-     while ( number > 0 && pos < 64 ) {
--	buf[pos++] = (number % 10) + '0';
--	number /= 10;
-+        buf[pos++] = (number % 10) + '0';
-+        number /= 10;
-     }
-     if ( pos == 64 )
--	return -1;
-+        return -1;
-     if ( pos == 0 )
--	buf[pos++] = '0';
-+        buf[pos++] = '0';
- 
-     /*
-      * Allocate memory for new data.
-@@ -336,7 +388,7 @@
-     *(gint8 *) frame->fr_raw_data = ID3_ENCODING_ISO_8859_1;
-     text = (char *) frame->fr_raw_data + 1;
-     while ( --pos >= 0 ) 
--	*text++ = buf[pos];
-+        *text++ = buf[pos];
-     *text = '\0';
- 
-     frame->fr_altered = 1;
-@@ -350,9 +402,9 @@
- 
- gboolean id3_frame_is_text(struct id3_frame *frame)
- {
--	if (frame && frame->fr_desc &&
--	    (frame->fr_desc->fd_idstr[0] == 'T' ||
--	     frame->fr_desc->fd_idstr[0] == 'W' ))
--		return TRUE;
--	return FALSE;
-+    if (frame && frame->fr_desc &&
-+            (frame->fr_desc->fd_idstr[0] == 'T' ||
-+             frame->fr_desc->fd_idstr[0] == 'W' ))
-+        return TRUE;
-+    return FALSE;
- }
-diff -Naur xmms-1.2.9-orig/Input/mpg123/lib_id3v2.h xmms-1.2.9/Input/mpg123/lib_id3v2.h
---- xmms-1.2.9-orig/Input/mpg123/lib_id3v2.h	Wed Dec 31 19:00:00 1969
-+++ xmms-1.2.9/Input/mpg123/lib_id3v2.h	Thu Jan 29 05:20:31 2004
-@@ -0,0 +1,1280 @@
-+/* the id3v2.3 library.
-+ * (c)2002 by Samuel Abels (sam@manicsadness.com)
-+ * This project's homepage is: http://software.manicsadness.com/cantus
-+ *
-+ * This library is designed for easyest possible access to id3 V2 tags.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#ifndef DLL_H
-+#define DLL_H
-+typedef struct DLL_s
-+{
-+	void *prev;
-+	void *data;
-+	void *next;
-+} DLL;
-+#endif
-+
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+
-+#ifndef id3Tag_def
-+#define id3Tag_def
-+
-+typedef struct id3Tag_s
-+{
-+	char title[1024];
-+	char artist[1024];
-+	char album[1024];
-+	char year[5];
-+	char comment[1024];
-+	char track[3];
-+	char genre[512];
-+    char composer[1024];
-+    char url[1024];
-+    char orig_artist[1024];
-+    char enc_by[1024];
-+	unsigned int size;
-+	short int has_footer;
-+} id3Tag;
-+
-+typedef struct id3v2Tag_s
-+{
-+// header
-+	int tag_size;
-+	short int unsync;
-+	short int has_extheader;
-+	short int is_experimental;
-+//extheader
-+	int extheader_size;
-+	int padding_size;
-+	short int crc_data_present;
-+	char crc_data[4];
-+// frames
-+	DLL *frames;
-+} id3v2Tag;
-+
-+typedef struct id3v2Frame_s
-+{
-+	unsigned char id[4];
-+	int datasize;
-+	short int tagalter;
-+	short int filealter;
-+	short int readonly;
-+	short int compression;
-+	short int encryption;
-+	short int grouping;
-+	char *data;
-+} id3v2Frame;
-+
-+#endif
-+
-+/* the id3v2.3 library.
-+ * (c)2002 by Samuel Abels (sam@manicsadness.com)
-+ * This project's homepage is: http://software.manicsadness.com/cantus
-+ *
-+ * This library is designed for easyest possible access to id3 V2 tags.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
-+#include <ctype.h>
-+#include "charset.h"
-+
-+
-+
-+/***************************************************************************************
-+ * BELOW FOLLOW THE STATICS
-+ ***************************************************************************************/
-+// Return the last item of an doubly linked list
-+static DLL *
-+dll_last (DLL *list)
-+{
-+	if( list == NULL )
-+		return (NULL);
-+	
-+	while ( list->next != NULL )
-+		list = list->next;
-+	
-+	return (list);
-+}
-+
-+// Append an item to the doubly linked list
-+static DLL *
-+dll_append (DLL *list, void *data)
-+{
-+	DLL *item = malloc (sizeof(DLL));
-+	DLL *lastitem = dll_last(list);
-+	
-+	item->data = data;
-+	item->next = NULL;
-+	
-+	if ( lastitem == NULL )
-+	{
-+		item->prev = NULL;
-+		return (item);
-+	}
-+	else
-+	{
-+		item->prev = lastitem;
-+		lastitem->next = item;
-+	}
-+
-+	return list;
-+}
-+  
-+static DLL *
-+dll_remove (DLL *list, void *data)
-+{
-+	DLL *item = list;
-+	
-+	while ( item )
-+	{
-+		if ( item->data == data )
-+		{
-+			if ( item->prev == NULL 
-+				&& item->next == NULL )
-+			{
-+// No other items there? Then return a zero pointer.
-+				free (item);
-+				return (NULL);
-+			}
-+			if ( item->prev == NULL )
-+			{
-+// remove the first item of the list here...
-+				list = item->next;
-+				list->prev = NULL;
-+				free (item);
-+				
-+				break;
-+			}
-+			if ( item->next == NULL )
-+			{
-+// ...remove the last item of the list here...
-+				((DLL*)(item->prev))->next = NULL;
-+				free (item);
-+				
-+				break;
-+			}
-+// ...or other items here
-+			((DLL*)(item->prev))->next = item->next;
-+			((DLL*)(item->next))->prev = item->prev;
-+			free (item);
-+			
-+			break;
-+		}
-+		item = item->next;
-+	}
-+	
-+	return list;
-+}
-+
-+// Free a doubly linked list
-+static DLL *
-+dll_free (DLL *list)
-+{
-+	DLL *item = list;
-+	DLL *current = NULL;
-+	
-+	while (item)
-+	{
-+		current = item;
-+		item = item->next;
-+		
-+		free (current);
-+	}
-+	
-+	return NULL;
-+}
-+
-+/*
-+ * Converts all occurences of a CR/LF to LF
-+ */
-+static void
-+crlf2cr (char *source)
-+{
-+	char *psource = source;
-+	char destination[2048];
-+
-+	if(source != NULL)
-+	{
-+		memset (destination, 0, 2048);
-+		for (psource = source; *psource != '\0'; psource++)
-+		{
-+			if(*psource == 13
-+				&& *(psource+1) == 10 )
-+			{
-+				psource++;
-+			}
-+			destination[strlen(destination)] = *psource;
-+		}
-+	}
-+	
-+	strncpy (source, destination, strlen(destination)+1);
-+}
-+
-+
-+/*
-+ * Converts all occurences of a LF to CR/LF
-+ */
-+static void
-+cr2crlf (char *source)
-+{
-+	char *psource = source;
-+	char destination[2048];
-+	
-+	if( source != NULL )
-+	{
-+		memset (destination, 0, 2048);
-+		for (psource = source; *psource != '\0'; psource++)
-+		{
-+			if (*psource == 10)
-+				destination[strlen(destination)] = 13;
-+			destination[strlen(destination)] = *psource;
-+		}
-+	}
-+	
-+	strncpy (source, destination, strlen(destination)+1);
-+}
-+
-+
-+
-+
-+/*
-+ * Reads the first ten bytes of an file and checks, if it's a valid ID3 V2.3 file
-+ * If it is, the header flags are stored in the tag struct.
-+ * Returns TRUE on a valid header, otherwise FALSE.
-+ */
-+static short int
-+check_header (FILE *mp3file, id3v2Tag *v2)
-+{
-+	unsigned char buf[10];
-+	
-+// get header (=first ten bytes of the file)
-+	fseek (mp3file, 0, SEEK_SET);
-+	if ( fread (buf, 1, 10, mp3file) < 10 )
-+		return (FALSE);
-+
-+// a valid tag must begin with "ID3" followed by the version (checked below)
-+// followed by a flag byte, where the last five bytes are unused and must be FALSE
-+	if ( memcmp(buf, "ID3", 3) != 0
-+		|| (buf[5] & 31) != 0 )
-+		return (FALSE);
-+
-+// check if version is supported
-+	if ( buf[3] != 3
-+		|| buf[4] != 0 )
-+		return (FALSE);
-+
-+// The next thing to come is the tag size. These are 4 bytes, the MSB should always be set to zero. check!
-+	if ( (buf[6] & 128) != 0
-+		|| (buf[7] & 128) != 0
-+		|| (buf[8] & 128) != 0
-+		|| (buf[9] & 128) != 0 )
-+		return (FALSE);
-+	
-+// The tag size is encoded to be syncsave, so I got to decode it.
-+// The tag size is the size of the complete tag EXCLUDING the 10-byte header.
-+ 	v2->tag_size = buf[9] + (buf[8] << 7) + (buf[7] << 14) + (buf[6] << 21);
-+
-+// ok, so were save. put the flags in the nicer struct.
-+	v2->unsync = (buf[5] & 128) >> 7;
-+	v2->has_extheader = (buf[5] & 64) >> 6;
-+	v2->is_experimental = (buf[5] & 32) >> 5;
-+	
-+	return (TRUE);
-+}
-+
-+
-+
-+
-+
-+/*
-+ * Reads the extheader of a valid ID3V2.3 file and checks, if it's a valid.
-+ * If it is, the extheader flags are stored in the tag struct.
-+ * Returns TRUE on a valid extheader, otherwise FALSE.
-+ */
-+static short int
-+check_extheader (FILE *mp3file, id3v2Tag *v2)
-+{
-+	unsigned char buf[10];
-+
-+// Read id3 extheader intro (5 bytes)
-+	fseek (mp3file, 10, SEEK_SET);
-+	if ( fread(buf, 1, 5, mp3file) < 5 )
-+		return (FALSE);
-+	
-+// First comes the extheader size. These are 4 bytes, the MSB should always be set to zero. check!
-+	if( (buf[0] & 128) != 0
-+		|| (buf[1] & 128) != 0
-+		|| (buf[2] & 128) != 0
-+		|| (buf[3] & 128) != 0 )
-+		return (FALSE);
-+	
-+// OK. In ID3V2.3 only six byte or ten byte extheaders are allowed.
-+	if( v2->extheader_size != 6 
-+		&& v2->extheader_size != 10 )
-+		return (FALSE);
-+	
-+// The first four bytes specify the extheader size.
-+	v2->extheader_size = buf[3] + (buf[2] << 7) + (buf[1] << 14) + (buf[0] << 21);
-+	
-+// The fifth byte specifies extendened flags. (in fact, only one flag is used for ID3V2.3
-+// The MSB of the byte 5 specifies, if there is CRC data to come, appended to the extheader.
-+	if( (buf[4] & 127) != 0
-+		|| buf[5] != 0 )
-+		return (FALSE);
-+	
-+	v2->crc_data_present = (buf[4] & 128) >> 7;
-+	
-+// if crc data is present, the extheader size must be ten bytes, otherwise 6.
-+	if ( (v2->extheader_size == 6 && v2->crc_data_present == TRUE)
-+		|| (v2->extheader_size == 10 && v2->crc_data_present == FALSE) )
-+		return (FALSE);
-+	
-+// now come four bytes specifying the padding size
-+	if ( (buf[6] & 128) != 0
-+		|| (buf[7] & 128) != 0
-+		|| (buf[8] & 128) != 0
-+		|| (buf[9] & 128) != 0 )
-+		return (FALSE);
-+	
-+	v2->padding_size = buf[9] + (buf[8] << 7) + (buf[7] << 14) + (buf[6] << 21);
-+	
-+// Now to the optional crc data.
-+	if( v2->crc_data_present )
-+	{
-+		if( fread (buf, 1, 4, mp3file) < 4 )
-+			return (FALSE);
-+		
-+		memcpy (v2->crc_data, buf, 4);
-+	}
-+	
-+	return (TRUE);
-+}
-+
-+
-+
-+
-+
-+/*
-+ * Reads the complete frames of a valid ID3V2.3 file and checks, if they are valid.
-+ * If they are, the flags are stored in a DLL and appended to the tag struct.
-+ * Returns TRUE on success, otherwise FALSE.
-+ */
-+static short int
-+read_frames (FILE *mp3file, id3v2Tag *v2)
-+{
-+	unsigned char buf[10];
-+	int numframes = 0;
-+	unsigned int totalframesize = 0;
-+	id3v2Frame *frame = NULL;
-+	
-+// set the position to the first frame header (header = 10 bytes + extheadersize + 4 bytes "extheaderheader")
-+	if (v2->has_extheader)
-+		fseek (mp3file, 10 + v2->extheader_size + 4, SEEK_SET);
-+	else
-+		fseek (mp3file, 10, SEEK_SET);
-+
-+// If the tag size is too small for frames, return with an error.
-+	if ( ((v2->tag_size + 10) - v2->padding_size) <= ftell(mp3file) )
-+		return FALSE;
-+	
-+// now read all the frames
-+	numframes = 0;
-+	v2->frames = NULL;
-+	while ( ftell (mp3file) < ((v2->tag_size + 10) - v2->padding_size) )
-+	{
-+		frame = calloc (1, sizeof(id3v2Frame));
-+
-+// the frame header is ten bytes long
-+		if ( fread (buf, 1, 10, mp3file) < 10 )
-+			goto error;
-+
-+// if we are already in the padding, we must no longer look for frames...
-+		if ( buf[0] == 0 && buf[1] == 0 && buf[2] ==  0 && buf[3] == 0 )
-+		{
-+			if (numframes == 0)
-+				goto error;
-+			
-+			free (frame);
-+			break;
-+		}
-+		
-+// first come four characters identifying the frame. It must be alphanumeric.
-+		if ( !isalnum(buf[0]) || !isalnum(buf[1]) || !isalnum(buf[2]) || !isalnum(buf[3]) )
-+			goto error;
-+		
-+		*(frame->id) = buf[0];
-+		*(frame->id + 1) = buf[1];
-+		*(frame->id + 2) = buf[2];
-+		*(frame->id + 3) = buf[3];
-+		
-+// then, the frame size is to come. Again, the four MSBs must be zero.
-+		if ( (buf[4] & 128) != 0
-+			|| (buf[5] & 128) != 0
-+			|| (buf[6] & 128) != 0
-+			|| (buf[7] & 128) != 0 )
-+			goto error;
-+		
-+		frame->datasize = buf[7] + (buf[6] << 7) + (buf[5] << 14) + (buf[4] << 21);
-+		
-+// A minimum size must be present!
-+		if ( frame->datasize <= 0 )
-+			goto error;
-+		
-+// The two following frame header flags have the 5 LSBs not set.
-+		if ( (buf[8] & 31) != 0
-+			|| (buf[9] & 31) != 0 )
-+			goto error;
-+
-+// now, put the flags in the struct.
-+		frame->tagalter = (buf[8] & 128) >> 7;
-+		frame->filealter = (buf[8] & 64) >> 6;
-+		frame->readonly = (buf[8] & 32) >> 5;
-+		
-+		frame->compression = (buf[9] & 128) >> 7;
-+		frame->encryption = (buf[8] & 64) >> 6;
-+		frame->grouping = (buf[8] & 32) >> 5;
-+		
-+// ok, we are done with the frame header, so now we read the frame data.
-+		frame->data = calloc (1, frame->datasize + 1);
-+		if( fread (frame->data, 1, frame->datasize, mp3file) < frame->datasize )
-+			goto error;
-+		
-+		numframes++;
-+		totalframesize += 10 + frame->datasize;
-+		
-+// we append it to a glist, which is appended to the v2 struct.
-+		v2->frames = dll_append (v2->frames, frame);
-+	}
-+
-+// if we have no extheader, that means, we don't know how much padding we have!
-+// thus, i calculate it here.
-+	if ( !v2->has_extheader )
-+		v2->padding_size = v2->tag_size - totalframesize;
-+	
-+// A minimum of one frame is mandatory.
-+	if( numframes > 0 )
-+		return (TRUE);
-+	
-+error:
-+// cleanups in case of an error.
-+	if( frame && frame->data )
-+		free (frame->data);
-+	if( frame )
-+		free (frame);
-+	return (FALSE);
-+}
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+/*
-+ * Reads all tag information of a valid ID3V2.3 file.
-+ * When successful, the info is stored in the tag struct.
-+ * Returns:
-+ * 0 = success
-+ * 1 = Cannot open file.
-+ * 2 = No header or wrong version.
-+ * 3 = broken extheader.
-+ * 4 = broken frames.
-+ */
-+static int
-+get_id3v2tag_raw (id3v2Tag *v2, char *filename)
-+{
-+	FILE *mp3file = NULL;
-+	int error = 0;
-+
-+// open file
-+	error = 1;
-+	mp3file = fopen (filename, "rb");
-+	if (!mp3file)
-+		goto done;
-+	
-+// check/get header
-+	error = 2;
-+	if( !check_header (mp3file, v2) )
-+		goto done;
-+	
-+// check/get extheader
-+	error = 3;
-+	if( v2->has_extheader
-+		&& !check_extheader (mp3file, v2) )
-+		goto done;
-+
-+// get the content frames
-+	error = 4;
-+	if( !read_frames (mp3file, v2) )
-+		goto done;
-+
-+	error = 0;
-+done:
-+	fclose (mp3file);
-+	return (error);
-+}
-+	
-+	
-+	
-+	
-+	
-+/*
-+ * Find one frames data and give back its data in the correct format.
-+ * Returns TRUE on success, otherwise FALSE;
-+ */
-+static short int
-+frame_find (id3v2Tag *v2, char *name, char *value)
-+{
-+	DLL *curframe = NULL;
-+    id3v2Frame *frame = NULL;
-+
-+    // we parse through the whole list of frames, giving back the correct frame value.
-+    curframe = v2->frames;
-+    while ( curframe )
-+    {
-+        frame = (id3v2Frame *)curframe->data;
-+
-+        // Just to be sure...
-+        if( frame->datasize <= 0 )
-+            goto nextframe;
-+
-+        // Matches the users request? Otherwise try the next frame.
-+        if( memcmp (frame->id, name, 4) != 0 )
-+            goto nextframe;
-+
-+        // These types don't need much change, just give the whole data back to the user according to the encoding.
-+        // The first byte is the encoding.
-+        // TPE1: Artist
-+        // TIT2: Song Title
-+        // TALB: Album Title
-+        // TYER: Year
-+        // TRCK: Track
-+        // TCON: Genre
-+        // COMM: Comment
-+        // TCOM: Composer
-+        // TOPE: TOPE Original artist(s)/performer(s)
-+        // TENC: Encoded by
-+        if ( memcmp (frame->id, "TPE1", 4) == 0
-+                || memcmp (frame->id, "TIT2", 4) == 0
-+                || memcmp (frame->id, "TALB", 4) == 0
-+                || memcmp (frame->id, "TYER", 4) == 0
-+                || memcmp (frame->id, "TRCK", 4) == 0
-+                || memcmp (frame->id, "TCON", 4) == 0
-+                || memcmp (frame->id, "TCOM", 4) == 0
-+                || memcmp (frame->id, "TOPE", 4) == 0
-+                || memcmp (frame->id, "TENC", 4) == 0)
-+            //|| memcmp (frame->id, "WXXX", 4) == 0)
-+        {
-+            if ( *frame->data == 0 )
-+                memcpy(value, frame->data + 1, frame->datasize - 1);
-+            if ( *frame->data == 1 )
-+            {
-+                char nulltermvalue[frame->datasize];
-+                char *isovalue = NULL;
-+
-+                // the tag is not null terminated, so i have to create a null terminated string first.
-+                memset (nulltermvalue, 0, frame->datasize);
-+                memcpy (nulltermvalue, frame->data + 1, frame->datasize - 1);
-+
-+                // Convert from UTF to ISO and copy to the users variable.
-+                isovalue = convert_from_utf8 (nulltermvalue);
-+                strncpy (value, isovalue, sizeof(value) - 1);
-+                free (isovalue);
-+            }
-+
-+            // change linefeeds to a single "return" key.
-+            crlf2cr (value);
-+            return (TRUE);
-+        }
-+        if ( memcmp (frame->id, "WCOM", 4) == 0
-+                || memcmp (frame->id, "WCOP", 4) == 0
-+                || memcmp (frame->id, "WOAF", 4) == 0
-+                || memcmp (frame->id, "WOAR", 4) == 0
-+                || memcmp (frame->id, "WOAS", 4) == 0
-+                || memcmp (frame->id, "WPAY", 4) == 0
-+                || memcmp (frame->id, "WPUB", 4) == 0)
-+        {
-+            memcpy(value, frame->data, frame->datasize - 1);
-+            
-+            // change linefeeds to a single "return" key.
-+            crlf2cr (value);
-+            return (TRUE);
-+        }
-+
-+        // The comment requires special handling.
-+        // Its data has: One byte "encoding" (0 = ISO-8859-1, 1 = UNICODE)
-+        // followed by the language (three bytes, e.g. "eng"),
-+        // followed by a short description,
-+        // then a NULL,
-+        // and the full description
-+        // For now, i simply drop the short description
-+        if( memcmp(frame->id, "COMM", 4) == 0 )
-+        {
-+            // check for the right format. (minsize 5, must contain a "\0" after the language)
-+            if ( frame->datasize < 5 )
-+                goto nextframe;
-+            if ( !memchr (frame->data + 4, '\0', frame->datasize - 4) )
-+                goto nextframe;
-+
-+            // now, give the data back to the user, according to the encoding.
-+            if ( *frame->data == 0 )
-+                memcpy (value, frame->data + 5, frame->datasize - 5);
-+            if ( *frame->data == 1 )
-+            {
-+                char nulltermvalue[frame->datasize];
-+                char *isovalue = NULL;
-+
-+                // the tag is not null terminated, so i have to create a null terminated string first.
-+                memset (nulltermvalue, 0, frame->datasize);
-+                memcpy (nulltermvalue, frame->data + 5, frame->datasize - 5);
-+
-+                // Convert from UTF to ISO and copy to the users variable.
-+                isovalue = convert_from_utf8 (nulltermvalue);
-+                strncpy (value, isovalue, sizeof(value) - 1);
-+                free (isovalue);
-+            }
-+
-+            // change linefeeds to a single "return" key.
-+            crlf2cr (value);
-+            return TRUE;
-+        }
-+
-+nextframe:
-+        curframe = curframe->next;
-+    }
-+
-+    return FALSE;
-+}
-+	
-+
-+
-+
-+/*
-+ * Remove one frame out of the id3v2Tag struct
-+ * Returns TRUE on success, otherwise FALSE;
-+ */
-+static short int
-+frame_remove (id3v2Tag *v2, char *name)
-+{
-+	id3v2Frame *frame = NULL;
-+	DLL *curframe = NULL;
-+	DLL *tempframe = NULL;
-+	
-+// Parse through the list of frames.
-+	curframe = v2->frames;
-+	while ( curframe )
-+	{
-+		frame = (id3v2Frame *)curframe->data;
-+		tempframe = curframe;
-+		curframe = curframe->next;
-+		
-+		if ( memcmp (frame->id, name, 4) == 0 )
-+		{
-+// we have found the item! removing will NOT shrink the tag, but increase the padding.
-+			v2->padding_size += (frame->datasize + 10);
-+// and free memory.
-+			v2->frames = dll_remove (v2->frames, tempframe->data);
-+			free (frame->data);
-+			free (frame);
-+			
-+			return TRUE;
-+		}
-+	}
-+	
-+	return FALSE;
-+}
-+
-+
-+
-+/*
-+ * Add a frame to the framelist. If the frame name is already in the list, it will be replaced.
-+ * Returns:
-+ * TRUE: The tag size HAS BEEN increased.
-+ * FALSE: The tag size has NOT been increased.
-+ */
-+static short int
-+frame_set (id3v2Tag *v2, char *name, char *value)
-+{
-+	id3v2Frame *frame = NULL;
-+	short int sizechange = FALSE;
-+	
-+// prevent the user to send CR/LF, which is forbidden.
-+	cr2crlf (value);
-+// eventually remove an existing item!
-+	frame_remove (v2, name);
-+
-+// alloc space for the new frame.
-+	frame = malloc (sizeof(id3v2Frame));
-+	
-+	memcpy (frame->id, name, 4);
-+	frame->datasize = strlen (value);
-+	frame->tagalter = 0;
-+	frame->filealter = 0;
-+	frame->readonly = 0;
-+	frame->compression = 0;
-+	frame->encryption = 0;
-+	frame->grouping = 0;
-+
-+// The comment requires special handling. If you need to know why, look at the documentation
-+// of the "frame_find" function above.
-+    if( memcmp (frame->id, "COMM", 4) == 0 )
-+    {
-+        char fullvalue[frame->datasize + 6];
-+
-+        sprintf(fullvalue, "%ceng%c%s", 0, 0, value);
-+
-+        frame->datasize += 5;
-+        frame->data = malloc (frame->datasize);
-+        memcpy (frame->data, fullvalue, frame->datasize);
-+    } 
-+    else if ((memcmp(frame->id, "WCOM", 4) == 0)
-+            || memcmp (frame->id, "WCOP", 4) == 0
-+            || memcmp (frame->id, "WOAF", 4) == 0
-+            || memcmp (frame->id, "WOAR", 4) == 0
-+            || memcmp (frame->id, "WOAS", 4) == 0
-+            || memcmp (frame->id, "WPAY", 4) == 0
-+            || memcmp (frame->id, "WPUB", 4) == 0)
-+    {
-+        frame->data = malloc (frame->datasize);
-+        memcpy (frame->data, value, frame->datasize);
-+    }
-+    else 
-+    {
-+        char fullvalue[frame->datasize + 2];
-+
-+        // Put encoding type just before the value
-+        sprintf (fullvalue, "%c%s", 0, value);
-+
-+        frame->datasize += 1;
-+        frame->data = malloc (frame->datasize);
-+        memcpy (frame->data, fullvalue, frame->datasize);
-+    }
-+	
-+// Ok. This decreases the available padding. If we have no padding left, we must increase the padding (and thus, the tag).
-+	if( v2->padding_size - (frame->datasize + 10) <= 0 )
-+	{
-+// add: framesize + frameheadersize + padding.
-+		v2->padding_size += frame->datasize + 10 + 1024;
-+		v2->tag_size += frame->datasize + 10 + 1024;
-+		
-+		sizechange = TRUE;
-+	}
-+	
-+// In every case, we must subtract the new allocated space from the padding.
-+	v2->padding_size -= frame->datasize + 10;
-+	
-+	v2->frames = dll_append (v2->frames, frame);
-+	
-+	return sizechange;
-+}
-+
-+
-+
-+/*
-+ * Create raw header.
-+ * Returns:
-+ * TRUE: successful.
-+ * FALSE: unsuccessful.
-+ */
-+static int
-+create_header_raw (char *raw, id3v2Tag *v2)
-+{
-+// now we are going to write the tags raw data into the raw string
-+	memset (raw, 0, v2->tag_size + 10);
-+// ID3 identifier bytes
-+	memcpy (raw, "ID3", 3);
-+	raw += 3;
-+// major version byte
-+	*raw++ = 3;
-+// minor version byte
-+	*raw++ = 0;
-+// Flags byte
-+	*raw++ = ((v2->unsync & 1) << 7)
-+		| ((v2->has_extheader & 1) << 6)
-+		| ((v2->is_experimental & 1) << 5);
-+// Tag size. It must be syncsafe!
-+	*raw++ = ((v2->tag_size & 0x800000) >> 23) | (((v2->tag_size & 0x7f000000) >> 24) << 1);
-+	*raw++ = ((v2->tag_size & 0x8000) >> 15) | (((v2->tag_size & 0x7f0000) >> 16) << 1);
-+	*raw++ = ((v2->tag_size & 0x80) >> 7) | (((v2->tag_size & 0x7f00) >> 8) << 1);
-+	*raw++ = (v2->tag_size & 0x7f);
-+	
-+	return TRUE;
-+}
-+
-+
-+
-+
-+/*
-+ * Generates the frames. btw.: ID3 sucks!
-+ * Returns: TRUE if succesful, otherwise FALSE.
-+ */
-+static short int
-+create_frames_raw (char *raw, id3v2Tag *v2)
-+{
-+	id3v2Frame *frame = NULL;
-+	DLL *curframe = NULL;
-+	
-+// if we have no frames, just quit.
-+	if ( v2->frames == NULL )
-+		return FALSE;
-+	
-+// the header and extheader have already been written.
-+	raw += 10;
-+	if ( v2->has_extheader )
-+		raw += 4 + v2->extheader_size;
-+	
-+	curframe = v2->frames;
-+	while ( curframe )
-+	{
-+		frame = (id3v2Frame *)curframe->data;
-+
-+// secure is secure
-+		if ( frame->datasize <= 0 )
-+			goto nextframe;
-+		
-+// add the frame id
-+		memcpy(raw, frame->id, 4);
-+		raw += 4;
-+// add the frame size (syncsafe)
-+		*raw++ = ((frame->datasize & 0x800000) >> 23) | (((frame->datasize & 0x7f000000) >> 24) << 1);
-+		*raw++ = ((frame->datasize & 0x8000) >> 15) | (((frame->datasize & 0x7f0000) >> 16) << 1);
-+		*raw++ = ((frame->datasize & 0x80) >> 7) | (((frame->datasize & 0x7f00) >> 8) << 1);
-+		*raw++ = (frame->datasize & 0x7f);
-+
-+// The two flagbytes
-+		*raw++ = ((frame->tagalter & 1) << 7)
-+			| ((frame->filealter & 1) << 6)
-+			| ((frame->readonly & 1) << 5);
-+		
-+		*raw++ = ((frame->compression & 1) << 7)
-+			| ((frame->encryption & 1) << 6)
-+			| ((frame->grouping & 1) << 5);
-+
-+// now the frame data.
-+		memcpy(raw, frame->data, frame->datasize);
-+		raw += frame->datasize;
-+
-+nextframe:
-+		curframe = curframe->next;
-+	}
-+	
-+	return TRUE;
-+}
-+
-+/***************************************************************************************
-+ * END OF STATICS
-+ ***************************************************************************************/
-+
-+
-+
-+
-+
-+
-+
-+/*
-+ * Purpose: Reads the ID3 tag from a file.
-+ * Parameters: tag - The structure to store the tag in, filename - The name of the file to operate on.
-+ * Returns:
-+ * 0 if successful,
-+ * 1 if an error occured when opening the file
-+ * 2 if error while reading tag.
-+ * 3 if no TAG found.
-+ */
-+int
-+get_id3v2_tag (id3Tag *tag, char *filename)
-+{
-+	id3v2Tag *v2 = calloc (1, sizeof(id3v2Tag));
-+	DLL *curframe = NULL;
-+	int error = 0;
-+	
-+// Read the tag.
-+	error = get_id3v2tag_raw (v2, filename);
-+	
-+// Init the users tag
-+	memset (tag, 0, sizeof (id3Tag));
-+	
-+	if( error == 0 )
-+	{
-+// if we have a valid tag we copy the raw data to the users struct
-+		tag->size = v2->tag_size;
-+		
-+		frame_find (v2, "TPE1", tag->artist);
-+		frame_find (v2, "TIT2", tag->title);
-+		frame_find (v2, "TALB", tag->album);
-+		frame_find (v2, "TYER", tag->year);
-+		frame_find (v2, "COMM", tag->comment);
-+		frame_find (v2, "TRCK", tag->track);
-+		frame_find (v2, "TCON", tag->genre);
-+		frame_find (v2, "TCOM", tag->composer);     // Composer
-+		frame_find (v2, "TOPE", tag->orig_artist);  // Original artist(s)/performer(s)
-+		frame_find (v2, "WCOM", tag->url);          // URL
-+		frame_find (v2, "TENC", tag->enc_by);       // Encoded by
-+	}
-+	
-+// Free all the stuff
-+	if (v2->frames)
-+	{
-+		id3v2Frame *frame = NULL;
-+		
-+		curframe = v2->frames;
-+		while ( curframe )
-+		{
-+			frame = (id3v2Frame *)curframe->data;
-+			
-+			free (frame->data);
-+			free (frame);
-+			
-+			curframe = curframe->next;
-+		}
-+		v2->frames = dll_free (v2->frames);
-+	}
-+	
-+	free (v2);
-+	return (error);
-+}
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+/*
-+ * Purpose: Clear the ID3 tag of a file.
-+ * Parameters: a filename.
-+ * Returns:
-+ * 0 if successful,
-+ * 1 if an error occured when opening the file
-+ * 2 if an error while reading/writing the tag.
-+ */
-+int
-+del_id3v2_tag (char *filename)
-+{
-+	id3v2Tag *v2 = calloc (1, sizeof(id3v2Tag));
-+	long file_len;
-+	FILE *file;
-+	void *ptr;
-+
-+// check if an valid old id3v2 tag is present
-+// In these two error-cases we don't know how big the tag is.
-+	if( get_id3v2tag_raw (v2, filename) == 1
-+		|| get_id3v2tag_raw (v2, filename) == 2 )
-+		return(0);
-+	
-+	ptr =  malloc (4096);
-+
-+// open file read/write
-+	file = fopen (filename, "r+b");
-+	if (!file)
-+		return (1);
-+
-+	fseek (file, 0, SEEK_END);
-+	file_len = ftell (file);
-+	if ( file_len < 11
-+		|| v2->tag_size < 11 )
-+		return (2);
-+
-+// set anything but the header in tag to zero. I'll not really remove the tag,
-+// because this would be much slower and if we write a new tag, this would mean we´d have to
-+// rewrite the complete tag.
-+/*
-+	fseek (file, 10, SEEK_SET);
-+	for (read = 0; read < v2->tag_size - 10; read++)
-+		fputc (0, file);
-+
-+*/
-+    {
-+        FILE *file = NULL;
-+        FILE *tempfile = NULL;
-+        char *tempfilename = NULL;
-+        int read = 0;
-+        char buf[4096];
-+	    int error = 0;
-+
-+        // Open a tempfile
-+        error = 2;
-+        tempfilename = malloc (strlen (filename) + 11);
-+        sprintf (tempfilename, "%s%s", filename, ".tempXXXXX");
-+        if( !(tempfile = fopen(tempfilename, "wb")) )
-+        {
-+            remove (tempfilename);
-+            free (tempfilename);
-+            goto done;
-+        }
-+
-+        // Write the tag to the tempfile.
-+
-+        // Open the mp3file.
-+        error = 4;
-+        if( !(file = fopen(filename, "r+b")) )
-+        {
-+            fclose (file);
-+            remove (tempfilename);
-+            free (tempfilename);
-+            goto done;
-+        }
-+        // skip the old tag (if one existed)
-+        fseek (file, v2->tag_size + 10, SEEK_SET);
-+
-+        // copy the rest of the file to the tempfile.
-+        while ( !feof(file) )
-+        {
-+            error = 5;
-+            read = fread (buf, 1, 4096, file);
-+            if( fwrite (buf, 1, read, tempfile) != read
-+                    && !feof (file) )
-+            {
-+                remove (tempfilename);
-+                free (tempfilename);
-+                fflush (tempfile);
-+                fclose (tempfile);
-+                fflush (file);
-+                fclose (file);
-+                goto done;
-+            }
-+        }
-+
-+        fflush (file);
-+        fclose (file);
-+        fflush (tempfile);
-+        fclose (tempfile);
-+
-+        // rename the tempfile, so it is the mp3file.
-+        rename (tempfilename, filename);
-+        free (tempfilename);
-+	}
-+
-+done:
-+	if (v2) free (v2);
-+	if (ptr) free (ptr);
-+	
-+	return(0);
-+}
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+int
-+set_id3v2_tag (id3Tag *tag, char *filename)
-+{
-+	id3v2Tag *v2 = malloc (sizeof(id3v2Tag));
-+	id3v2Frame *frame = NULL;
-+	unsigned char *rawdata = NULL;
-+	DLL *curframe = NULL;
-+	int oldsize = 0;
-+	char track[3];
-+	int error = 0;
-+
-+// Try to get the content of an old tag
-+	error = 1;
-+	memset (v2, 0, sizeof(id3v2Tag));
-+	get_id3v2tag_raw (v2, filename);
-+	
-+	oldsize = v2->tag_size;
-+
-+// If the old tag had an extheader, I'll add its size to my tag, because i don't plan to add it again.
-+	if ( v2->has_extheader )
-+	{
-+		v2->padding_size += v2->extheader_size;
-+		v2->has_extheader = FALSE;
-+		v2->extheader_size = 0;
-+	}
-+	
-+// first of all I'll generate a valid id3v2 tag struct out of the tag struct we got by the user.
-+// Set the flags...
-+	v2->unsync = FALSE;
-+	v2->is_experimental = FALSE;
-+	v2->crc_data_present = FALSE;
-+	
-+// Set the contentframes
-+	frame_set (v2, "TIT2", tag->title);
-+	frame_set (v2, "TPE1", tag->artist);
-+	frame_set (v2, "TALB", tag->album);
-+	frame_set (v2, "TYER", tag->year);
-+	frame_set (v2, "COMM", tag->comment);
-+	frame_set (v2, "TCON", tag->genre);
-+    frame_set (v2, "TCOM", tag->composer);     // Composer
-+    frame_set (v2, "TOPE", tag->orig_artist);  // TOPE Original artist(s)/performer(s)
-+    frame_set (v2, "WCOM", tag->url);          // URL
-+    frame_set (v2, "TENC", tag->enc_by);       // Encoded by
-+	if ( atoi (tag->track) < 10 )
-+		snprintf (track, 3, "0%i", atoi(tag->track));
-+	else
-+		snprintf (track, 3, "%i", atoi(tag->track));
-+	frame_set (v2, "TRCK", track);
-+	
-+// Create a header in the raw data string
-+	rawdata = calloc (1, v2->tag_size + 10);
-+	create_header_raw (rawdata, v2);
-+
-+// Create frames raw data.
-+	create_frames_raw (rawdata, v2);
-+	
-+// is the new tag bigger than the old one? Then we'll have to completely rewrite the file...
-+	if ( v2->tag_size > oldsize )
-+	{
-+		FILE *file = NULL;
-+		FILE *tempfile = NULL;
-+		char *tempfilename = NULL;
-+		int read = 0;
-+		char buf[4096];
-+
-+// Open a tempfile
-+		error = 2;
-+		tempfilename = malloc (strlen (filename) + 11);
-+		sprintf (tempfilename, "%s%s", filename, ".tempXXXXX");
-+		if( !(tempfile = fopen(tempfilename, "wb")) )
-+		{
-+			remove (tempfilename);
-+			free (tempfilename);
-+			goto done;
-+		}
-+		
-+// Write the tag to the tempfile.
-+		error = 3;
-+		fseek (tempfile, 0, SEEK_SET);
-+		if( fwrite (rawdata, 1, v2->tag_size + 10, tempfile) < v2->tag_size )
-+		{
-+			fclose (tempfile);
-+			remove (tempfilename);
-+			free (tempfilename);
-+			goto done;
-+		}
-+		
-+// Open the mp3file.
-+		error = 4;
-+		if( !(file = fopen(filename, "r+b")) )
-+		{
-+			fclose (file);
-+			remove (tempfilename);
-+			free (tempfilename);
-+			goto done;
-+		}
-+// skip the old tag (if one existed)
-+		fseek (file, oldsize? oldsize + 10 : oldsize, SEEK_SET);
-+		
-+// copy the rest of the file to the tempfile.
-+		while ( !feof(file) )
-+		{
-+			error = 5;
-+			read = fread (buf, 1, 4096, file);
-+			if( fwrite (buf, 1, read, tempfile) != read
-+				&& !feof (file) )
-+			{
-+				remove (tempfilename);
-+				free (tempfilename);
-+				fflush (tempfile);
-+				fclose (tempfile);
-+				fflush (file);
-+				fclose (file);
-+				goto done;
-+			}
-+		}
-+
-+		fflush (file);
-+		fclose (file);
-+		fflush (tempfile);
-+		fclose (tempfile);
-+		
-+// rename the tempfile, so it is the mp3file.
-+		rename (tempfilename, filename);
-+		free (tempfilename);
-+	}
-+	else
-+	{
-+		FILE *file = NULL;
-+		
-+// If the old tag was bigger than the new one, we can simply overwrite it!
-+// open.
-+		error = 10;
-+		if( !(file = fopen(filename, "r+b")) )
-+			goto done;
-+
-+// write.
-+		error = 11;
-+		fseek (file, 0, SEEK_SET);
-+		if( fwrite (rawdata, 1, v2->tag_size + 10, file) < v2->tag_size )
-+		{
-+			fflush (file);
-+			fclose (file);
-+			goto done;
-+		}
-+		
-+		fflush (file);
-+		fclose (file);
-+	}
-+	
-+	error = 0;
-+	
-+done:
-+// Free all the stuff
-+	curframe = v2->frames;
-+	while ( curframe )
-+	{
-+		frame = (id3v2Frame *)curframe->data;
-+		
-+		free (frame->data);
-+		free (frame);
-+		
-+		curframe = curframe->next;
-+	}
-+	dll_free (v2->frames);
-+
-+	if ( rawdata != NULL )
-+		free (rawdata);
-+	free (v2);
-+	return (error);
-+}
-diff -Naur xmms-1.2.9-orig/Input/mpg123/mpg123.c xmms-1.2.9/Input/mpg123/mpg123.c
---- xmms-1.2.9-orig/Input/mpg123/mpg123.c	Thu Jan 29 06:43:24 2004
-+++ xmms-1.2.9/Input/mpg123/mpg123.c	Thu Jan 29 05:18:54 2004
-@@ -607,8 +607,13 @@
- {									\
- 	id3frm = id3_get_frame( id3d, _tid, 1 );			\
- 	if (id3frm) {							\
--		txt = _tid == ID3_TCON ? id3_get_content(id3frm)	\
--		    : id3_get_text(id3frm);				\
-+        if (_tid == ID3_COMM)                           \
-+            txt = id3_get_comm(id3frm);                          \
-+        else if (id3frm->fr_desc->fd_idstr[0] == 'W')        \
-+            txt = id3_get_url(id3frm);                   \
-+        else                                            \
-+            txt = _tid == ID3_TCON ? id3_get_content(id3frm)	\
-+		        : id3_get_text(id3frm);				\
- 		if(txt)							\
- 		{							\
- 			tlen = strlen(txt);				\
-@@ -644,6 +649,10 @@
- 	ID3_SET_NUM	(ID3_TRCK, track_number);
- 	ID3_SET		(ID3_COMM, comment);
- 	ID3_SET		(ID3_TCON, genre);
-+	ID3_SET		(ID3_TCOM, composer);
-+	ID3_SET		(ID3_TOPE, orig_artist);
-+	ID3_SET		(ID3_WCOM, url);
-+	ID3_SET		(ID3_TENC, encoded_by);
- }
- 
- /*
-diff -Naur xmms-1.2.9-orig/Input/mpg123/mpg123.h xmms-1.2.9/Input/mpg123/mpg123.h
---- xmms-1.2.9-orig/Input/mpg123/mpg123.h	Thu Jan 29 06:43:24 2004
-+++ xmms-1.2.9/Input/mpg123/mpg123.h	Thu Jan 29 05:20:31 2004
-@@ -78,6 +78,10 @@
- 	char genre[256];
- 	int year;
- 	int track_number;
-+    char composer[1024];
-+    char orig_artist[1024];
-+    char url[1024];
-+    char encoded_by[1024];
- };
- 
- typedef struct
diff --git a/abs/extra-testing/xmms/xmms-1.2.10-crossfade-0.3.9.patch b/abs/extra-testing/xmms/xmms-1.2.10-crossfade-0.3.9.patch
deleted file mode 100644
index 51c5167..0000000
--- a/abs/extra-testing/xmms/xmms-1.2.10-crossfade-0.3.9.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -ur xmms-1.2.10/xmms/input.c xmms-1.2.10.patched/xmms/input.c
---- xmms-1.2.10/xmms/input.c	2003-08-08 19:10:44.000000000 +0200
-+++ xmms-1.2.10.patched/xmms/input.c	2005-11-25 00:12:36.000000000 +0100
-@@ -285,6 +285,14 @@
- 	}
- }
- 
-+gboolean input_stopped_for_restart = FALSE;  /* crossfade */
-+void input_stop_for_restart()  /* crossfade */
-+{
-+	input_stopped_for_restart = TRUE;
-+	input_stop();
-+	input_stopped_for_restart = FALSE;
-+}
-+
- void input_stop(void)
- {
- 	if (ip_data->playing && get_current_input_plugin())
-diff -ur xmms-1.2.10/xmms/input.h xmms-1.2.10.patched/xmms/input.h
---- xmms-1.2.10/xmms/input.h	2000-02-16 22:05:57.000000000 +0100
-+++ xmms-1.2.10.patched/xmms/input.h	2005-11-25 00:12:36.000000000 +0100
-@@ -34,6 +34,7 @@
- gboolean input_check_file(gchar * filename);
- void input_play(char *filename);
- void input_stop(void);
-+void input_stop_for_restart(void);
- void input_pause(void);
- int input_get_time(void);
- void input_set_eq(int on, float preamp, float *bands);
-diff -ur xmms-1.2.10/xmms/main.c xmms-1.2.10.patched/xmms/main.c
---- xmms-1.2.10/xmms/main.c	2004-02-23 21:31:43.000000000 +0100
-+++ xmms-1.2.10.patched/xmms/main.c	2005-11-25 00:12:36.000000000 +0100
-@@ -881,8 +881,10 @@
- 	mainwin_set_shade(!cfg.player_shaded);
- }
- 
-+gboolean is_quitting = FALSE;  /* crossfade */
- void mainwin_quit_cb(void)
- {
-+	is_quitting = TRUE;  /* crossfade */
- 	input_stop();
- 	gtk_widget_hide(equalizerwin);
- 	gtk_widget_hide(playlistwin);
-@@ -1523,7 +1525,8 @@
- 		int *pos;
- 
- 		if (get_input_playing())
--			input_stop();
-+			input_stop_for_restart();
-+		
- 		pos = gtk_clist_get_row_data(clist, GPOINTER_TO_INT(clist->selection->data));
- 		playlist_set_position(*pos);
- 		playlist_play();
-diff -ur xmms-1.2.10/xmms/playlist.c xmms-1.2.10.patched/xmms/playlist.c
---- xmms-1.2.10/xmms/playlist.c	2004-02-23 21:31:43.000000000 +0100
-+++ xmms-1.2.10.patched/xmms/playlist.c	2005-11-25 00:12:36.000000000 +0100
-@@ -124,7 +124,7 @@
- 		if (get_input_playing())
- 		{
- 			PL_UNLOCK();
--			input_stop();
-+			input_stop_for_restart();
- 			PL_LOCK();
- 			*restart_playing = TRUE;
- 		}
-@@ -570,7 +570,7 @@
- 	}
- 
- 	if (get_input_playing())
--		input_stop();
-+		input_stop_for_restart();
- 
- 	vis_clear_data(mainwin_vis);
- 	vis_clear_data(playlistwin_vis);
-@@ -668,7 +668,7 @@
- 	{
- 		/* We need to stop before changing playlist_position */
- 		PL_UNLOCK();
--		input_stop();
-+		input_stop_for_restart();
- 		PL_LOCK();
- 		restart_playing = TRUE;
- 	}
-@@ -723,7 +723,7 @@
- 	{
- 		/* We need to stop before changing playlist_position */
- 		PL_UNLOCK();
--		input_stop();
-+		input_stop_for_restart();
- 		PL_LOCK();
- 		restart_playing = TRUE;
- 	}
-@@ -852,7 +852,7 @@
- 	{
- 		/* We need to stop before changing playlist_position */
- 		PL_UNLOCK();
--		input_stop();
-+		input_stop_for_restart();
- 		PL_LOCK();
- 		restart_playing = TRUE;
- 	}
diff --git a/abs/extra-testing/xmms/xmms-fix.diff b/abs/extra-testing/xmms/xmms-fix.diff
deleted file mode 100644
index a810aa2..0000000
--- a/abs/extra-testing/xmms/xmms-fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- xmms-1.2.10+cvs20060429/xmms/util.c.orig	2006-11-05 12:29:59.000000000 +0800
-+++ xmms-1.2.10+cvs20060429/xmms/util.c	2006-11-05 12:30:01.000000000 +0800
-@@ -175,7 +175,7 @@ GdkImage *create_dblsize_image(GdkImage 
- 	 * This needs to be optimized
- 	 */
- 
--	dblimg = gdk_image_new(GDK_IMAGE_NORMAL, gdk_visual_get_best(), img->width << 1, img->height << 1);
-+	dblimg = gdk_image_new(GDK_IMAGE_NORMAL, gdk_visual_get_best_with_depth(img->depth), img->width << 1, img->height << 1);
- 	if (dblimg->bpp == 1)
- 	{
- 		register guint8 *srcptr, *ptr, *ptr2, pix;
diff --git a/abs/extra-testing/xmms/xmms-menu.patch b/abs/extra-testing/xmms/xmms-menu.patch
deleted file mode 100644
index 39304f9..0000000
--- a/abs/extra-testing/xmms/xmms-menu.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- xmms/xmms.desktop	2002-02-11 23:15:56.000000000 +0000
-+++ xmms.desktop	2006-02-25 14:21:03.000000000 +0000
-@@ -1,21 +1,16 @@
- [Desktop Entry]
- Name=XMMS
- Comment=X Multimedia System
--comment[az]=X Multimedya Sistemi
--comment[ca]=Sistema Multimèdia per a X
--comment[cs]=Multimediální pøehrávaè
--comment[es]=Sistema Multimedia para X
--comment[gl]=Sistema Multimedia para X
--comment[hr]=X Multimedijski Sustav
--comment[nn]=X Multimedia-system
--comment[pt_BR]=X Multimedia System
--comment[ro]=X MultiMedia Sistem
--comment[th]=ÃкºÁÑŵÔÁÕà´Õº¹ X
--comment[tr]=X Multimedya Sistem
--comment[zh_TW]=X ¦h´CÅé¨t²Î
--Encoding=Legacy-Mixed
-+Comment[es]=Sistema Multimedia para X
-+Comment[gl]=Sistema Multimedia para X
-+Comment[hr]=X Multimedijski Sustav
-+Comment[pt_BR]=X Multimedia System
-+Comment[ro]=X MultiMedia Sistem
-+Comment[tr]=X Multimedya Sistem
-+Encoding=UTF-8
- Exec=xmms
--Icon=xmms_mini.xpm
--MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg
--Terminal=0
-+Icon=xmms
- Type=Application
-+Categories=Application;AudioVideo;
-+MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg
-+Terminal=false
diff --git a/abs/extra-testing/xscreensaver/ChangeLog b/abs/extra-testing/xscreensaver/ChangeLog
deleted file mode 100644
index f972cf0..0000000
--- a/abs/extra-testing/xscreensaver/ChangeLog
+++ /dev/null
@@ -1,20 +0,0 @@
-2009-01-02  Eric Belanger  <eric@archlinux.org>
-
-	* xscreensaver 5.08-1
-	* Upstream update
-
-2008-08-11  Eric Belanger  <eric@archlinux.org>
-
-	* xscreensaver 5.07-1
-	* Upstream update
-
-2008-07-18  Eric Belanger  <eric@archlinux.org>
-
-	* xscreensaver 5.06-1
-	* Upstream update
-
-2008-03-02  Eric Belanger  <eric@archlinux.org>
-
-	* xscreensaver 5.05-1
-	* Upstream update
-	* FHS man pages
diff --git a/abs/extra-testing/xscreensaver/LICENSE b/abs/extra-testing/xscreensaver/LICENSE
deleted file mode 100644
index 4f587b5..0000000
--- a/abs/extra-testing/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/abs/extra-testing/xscreensaver/PKGBUILD b/abs/extra-testing/xscreensaver/PKGBUILD
deleted file mode 100644
index 2eb7b7c..0000000
--- a/abs/extra-testing/xscreensaver/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 23065 2009-01-02 07:24:36Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Sean Middleditch <elanthis@awesomeplay.com>
-
-pkgname=xscreensaver
-pkgver=5.08
-pkgrel=6
-pkgdesc="Screen saver and locker for the X Window System"
-arch=('i686' 'x86_64')
-url="http://www.jwz.org/xscreensaver/"
-license=('BSD')
-depends=('libxxf86misc' 'libglade' 'mesa' 'pam' 'xorg-res-utils')
-makedepends=('bc')
-install=xscreensaver.install
-backup=('etc/pam.d/xscreensaver')
-source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \
-	xscreensaver.pam LICENSE)
-md5sums=('79dea708c915341f205e00318a699be9' '367a3538f54db71f108b34cfa31088ac'\
-         '5e7f3f2a63d20a484742f5b4cb5d572c')
-sha1sums=('4e6889d7171eaf18b856c484a87d5701787e5dc6'
-          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-          '4209ea586b204fd1d81c382a0522c654f9fd9134')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-       --libexecdir=/usr/lib \
-       --with-x-app-defaults=/usr/share/X11/app-defaults \
-       --with-pam --without-motif \
-       --with-gtk --without-gnome --with-xml --with-gl \
-       --without-gle --with-xpm --with-pixbuf --with-jpeg \
-       --with-fortune="/bin/cat /etc/LinHES-release" || return 1
-  make || return 1
-  make install_prefix=${pkgdir} install || return 1
-  install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
-  install -D -m644 ${srcdir}/xscreensaver.pam ${pkgdir}/etc/pam.d/xscreensaver || return 1
-  chmod 755 ${pkgdir}/usr/bin/xscreensaver || return 1
-  echo "NotShowIn=KDE;GNOME;" >> ${pkgdir}/usr/share/applications/xscreensaver-properties.desktop || return 1
-  ls  $pkgdir/usr/lib/xscreensaver > $startdir/xscreensavers
-}
diff --git a/abs/extra-testing/xscreensaver/__changelog b/abs/extra-testing/xscreensaver/__changelog
deleted file mode 100644
index ca14a40..0000000
--- a/abs/extra-testing/xscreensaver/__changelog
+++ /dev/null
@@ -1,3 +0,0 @@
-print out list of screensavers to xscreensaver
-  ls  $pkgdir/usr/lib/xscreensaver > $startdir/xscreensavers
-
diff --git a/abs/extra-testing/xscreensaver/xscreensaver b/abs/extra-testing/xscreensaver/xscreensaver
deleted file mode 100644
index 887bef9..0000000
--- a/abs/extra-testing/xscreensaver/xscreensaver
+++ /dev/null
@@ -1,198 +0,0 @@
-abstractile
-anemone
-anemotaxis
-antinspect
-antmaze
-antspotlight
-apollonian
-apple2
-atlantis
-attraction
-atunnel
-barcode
-blaster
-blinkbox
-blitspin
-blocktube
-boing
-bouboule
-bouncingcow
-boxed
-boxfit
-braid
-bsod
-bubble3d
-bumps
-cage
-carousel
-ccurve
-celtic
-circuit
-cloudlife
-compass
-coral
-crackberg
-crystal
-cube21
-cubenetic
-cubestorm
-cubicgrid
-cwaves
-cynosure
-dangerball
-decayscreen
-deco
-deluxe
-demon
-discrete
-distort
-drift
-endgame
-engine
-epicycle
-eruption
-euler2d
-fadeplot
-fiberlamp
-fireworkx
-flame
-flipflop
-flipscreen3d
-fliptext
-flow
-fluidballs
-flurry
-flyingtoasters
-fontglide
-fuzzyflakes
-galaxy
-gears
-gflux
-glblur
-glcells
-gleidescope
-glhanoi
-glknots
-glmatrix
-glplanet
-glschool
-glslideshow
-glsnake
-gltext
-goop
-grav
-greynetic
-halftone
-halo
-helix
-hopalong
-hyperball
-hypercube
-hypertorus
-hypnowheel
-ifs
-imsmap
-interaggregate
-interference
-intermomentary
-jigglypuff
-jigsaw
-juggle
-juggler3d
-julia
-kaleidescope
-klein
-kumppa
-lament
-lavalite
-lcdscrub
-ljlatest
-lockward
-loop
-m6502
-maze
-memscroller
-menger
-metaballs
-mirrorblob
-moebius
-moebiusgears
-moire
-moire2
-molecule
-morph3d
-mountain
-munch
-nerverot
-noof
-noseguy
-pacman
-pedal
-penetrate
-penrose
-petri
-phosphor
-photopile
-piecewise
-pinion
-pipes
-polyhedra
-polyominoes
-polytopes
-pong
-popsquares
-providence
-pulsar
-pyro
-qix
-queens
-rd-bomb
-ripples
-rocks
-rorschach
-rotzoomer
-rubik
-sballs
-shadebobs
-sierpinski
-sierpinski3d
-skytentacles
-slidescreen
-slip
-sonar
-speedmine
-spheremonics
-spotlight
-sproingies
-squiral
-stairs
-starfish
-starwars
-stonerview
-strange
-substrate
-superquadrics
-swirl
-tangram
-thornbird
-timetunnel
-topblock
-triangle
-truchet
-twang
-vermiculate
-vidwhacker
-voronoi
-wander
-webcollage
-webcollage-helper
-whirlwindwarp
-wormhole
-xanalogtv
-xflame
-xjack
-xlyap
-xmatrix
-xrayswarm
-xspirograph
-zoom
diff --git a/abs/extra-testing/xscreensaver/xscreensaver.install b/abs/extra-testing/xscreensaver/xscreensaver.install
deleted file mode 100644
index a64ab36..0000000
--- a/abs/extra-testing/xscreensaver/xscreensaver.install
+++ /dev/null
@@ -1,30 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-	if grep xscreensaver-command /home/mythtv/.mplayer/config
-	then
-		echo "Nothing to do here..."
-	else
-	echo "heartbeat-cmd=\"xscreensaver-command -deactivate &\"" >> /home/mythtv/.mplayer/config
-fi
-}
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	 if grep xscreensaver-command /home/mythtv/.mplayer/config
-         then
-                 echo "Nothing to do here..."
-         else
-         echo "heartbeat-cmd=\"xscreensaver-command -deactivate &\"" >> /home/mythtv/.mplayer/config
-fi
-}
-
-# arg 1:  the old package version
-post_remove() {
-	grep -v xscreensaver /home/mythtv/.mplayer/config > /tmp/mp-config
-	mv /tmp/mp-config /home/mythtv/.mplayer/config
-	chown mythtv.mythtv /home/mythtv/.mplayer/config
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra-testing/xscreensaver/xscreensaver.pam b/abs/extra-testing/xscreensaver/xscreensaver.pam
deleted file mode 100644
index b4d80c2..0000000
--- a/abs/extra-testing/xscreensaver/xscreensaver.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth		required	pam_unix_auth.so
diff --git a/abs/extra-testing/xscreensaver/xscreensavers b/abs/extra-testing/xscreensaver/xscreensavers
deleted file mode 100644
index 887bef9..0000000
--- a/abs/extra-testing/xscreensaver/xscreensavers
+++ /dev/null
@@ -1,198 +0,0 @@
-abstractile
-anemone
-anemotaxis
-antinspect
-antmaze
-antspotlight
-apollonian
-apple2
-atlantis
-attraction
-atunnel
-barcode
-blaster
-blinkbox
-blitspin
-blocktube
-boing
-bouboule
-bouncingcow
-boxed
-boxfit
-braid
-bsod
-bubble3d
-bumps
-cage
-carousel
-ccurve
-celtic
-circuit
-cloudlife
-compass
-coral
-crackberg
-crystal
-cube21
-cubenetic
-cubestorm
-cubicgrid
-cwaves
-cynosure
-dangerball
-decayscreen
-deco
-deluxe
-demon
-discrete
-distort
-drift
-endgame
-engine
-epicycle
-eruption
-euler2d
-fadeplot
-fiberlamp
-fireworkx
-flame
-flipflop
-flipscreen3d
-fliptext
-flow
-fluidballs
-flurry
-flyingtoasters
-fontglide
-fuzzyflakes
-galaxy
-gears
-gflux
-glblur
-glcells
-gleidescope
-glhanoi
-glknots
-glmatrix
-glplanet
-glschool
-glslideshow
-glsnake
-gltext
-goop
-grav
-greynetic
-halftone
-halo
-helix
-hopalong
-hyperball
-hypercube
-hypertorus
-hypnowheel
-ifs
-imsmap
-interaggregate
-interference
-intermomentary
-jigglypuff
-jigsaw
-juggle
-juggler3d
-julia
-kaleidescope
-klein
-kumppa
-lament
-lavalite
-lcdscrub
-ljlatest
-lockward
-loop
-m6502
-maze
-memscroller
-menger
-metaballs
-mirrorblob
-moebius
-moebiusgears
-moire
-moire2
-molecule
-morph3d
-mountain
-munch
-nerverot
-noof
-noseguy
-pacman
-pedal
-penetrate
-penrose
-petri
-phosphor
-photopile
-piecewise
-pinion
-pipes
-polyhedra
-polyominoes
-polytopes
-pong
-popsquares
-providence
-pulsar
-pyro
-qix
-queens
-rd-bomb
-ripples
-rocks
-rorschach
-rotzoomer
-rubik
-sballs
-shadebobs
-sierpinski
-sierpinski3d
-skytentacles
-slidescreen
-slip
-sonar
-speedmine
-spheremonics
-spotlight
-sproingies
-squiral
-stairs
-starfish
-starwars
-stonerview
-strange
-substrate
-superquadrics
-swirl
-tangram
-thornbird
-timetunnel
-topblock
-triangle
-truchet
-twang
-vermiculate
-vidwhacker
-voronoi
-wander
-webcollage
-webcollage-helper
-whirlwindwarp
-wormhole
-xanalogtv
-xflame
-xjack
-xlyap
-xmatrix
-xrayswarm
-xspirograph
-zoom
diff --git a/abs/extra-testing/xulrunner/PKGBUILD b/abs/extra-testing/xulrunner/PKGBUILD
deleted file mode 100644
index da6d8cd..0000000
--- a/abs/extra-testing/xulrunner/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 36430 2009-04-22 12:03:12Z pierre $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-pkgname=xulrunner
-pkgver=1.9.1.1
-_ffoxver=3.5.1
-pkgrel=5
-pkgdesc="Mozilla Runtime Environment"
-arch=(i686 x86_64)
-license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2>=2.16.0' 'gcc-libs>=4.3.3' 'libidl2>=0.8.13' 'mozilla-common' 'nss>=3.12.3' 'libxt' 'lcms' 
-         'hunspell>=1.2.8' 'startup-notification>=0.9')
-makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui>=2.24.1')
-provides=(gecko-sdk)
-replaces=(gecko-sdk)
-url="http://wiki.mozilla.org/XUL:Xul_Runner"
-source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}/source/firefox-${_ffoxver}-source.tar.bz2
-        mozconfig)
-md5sums=('18169e189785d680827d4fce94524449'
-         '6509d12e6b17bfc51c09e1dc35259035')
-install=xulrunner.install
-
-build() {
-  cd ${startdir}/src/mozilla-1.9.1
-  cp ${startdir}/src/mozconfig .mozconfig
-
-  unset CFLAGS
-  unset CXXFLAGS
-  export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-1.9"
-
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" || return 1
-  make -j1 DESTDIR=${startdir}/pkg install || return 1
-
-  ln -sf xulrunner-${pkgver} ${pkgdir}/usr/lib/xulrunner-1.9
-  ln -sf xulrunner-devel-${pkgver} ${pkgdir}/usr/lib/xulrunner-devel-1.9
-  ln -sf xulrunner-${pkgver} ${pkgdir}/usr/include/xulrunner-1.9
-  ln -sf xulrunner-${pkgver} ${pkgdir}/usr/share/idl/xulrunner-1.9
-
-  # The ubuntu patch adds these... get rid of it, NSS/NSPR has it.
-  rm -f ${startdir}/pkg/usr/lib/pkgconfig/mozilla-ns{s,pr}.pc || return 1
-
-  sed -i -e "s/xulrunner-${pkgver}/xulrunner-1.9/g" -e "s/xulrunner-devel-${pkgver}/xulrunner-devel-1.9/g" ${pkgdir}/usr/lib/pkgconfig/*.pc || return 1
-}
diff --git a/abs/extra-testing/xulrunner/mozconfig b/abs/extra-testing/xulrunner/mozconfig
deleted file mode 100644
index 22212cb..0000000
--- a/abs/extra-testing/xulrunner/mozconfig
+++ /dev/null
@@ -1,33 +0,0 @@
-. $topsrcdir/xulrunner/config/mozconfig
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --enable-system-lcms
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-cairo
-ac_add_options --with-pthreads
-ac_add_options --enable-strip
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-pango
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --disable-javaxpcom
-ac_add_options --disable-crashreporter
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-startup-notification
-
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
diff --git a/abs/extra-testing/xulrunner/xulrunner.install b/abs/extra-testing/xulrunner/xulrunner.install
deleted file mode 100644
index 0b4cf9c..0000000
--- a/abs/extra-testing/xulrunner/xulrunner.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  # Ensure that the ld.so.conf file contains the xulrunner libs.
-  cp -f /etc/ld.so.conf /tmp/ld.so.conf
-  grep -v xulrunner /tmp/ld.so.conf > /etc/ld.so.conf
-  echo /usr/lib/xulrunner-1.9.1.1 >> /etc/ld.so.conf
-  /sbin/ldconfig
-}
-
-post_upgrade() {
-  post_install $*
-}
diff --git a/abs/extra-testing/zip/ChangeLog b/abs/extra-testing/zip/ChangeLog
deleted file mode 100644
index 29ec4d1..0000000
--- a/abs/extra-testing/zip/ChangeLog
+++ /dev/null
@@ -1,5 +0,0 @@
-
-2008-07-27  Douglas Soares de Andrade  <douglas@archlinux.org>
-	
-	* Updating for i686: 3.0
-
diff --git a/abs/extra-testing/zip/PKGBUILD b/abs/extra-testing/zip/PKGBUILD
deleted file mode 100644
index 30cec8b..0000000
--- a/abs/extra-testing/zip/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 6705 2008-07-27 14:04:19Z douglas $
-# Maintainer: dorphell <dorphell@archlinux.org>
-
-pkgname=zip
-pkgver=3.0
-pkgrel=1
-pkgdesc="Creates PKZIP-compatible .zip files"
-arch=(i686 x86_64)
-url="http://www.info-zip.org/pub/infozip/Zip.html"
-depends=('glibc')
-makedepends=('unzip')
-source=(ftp://ftp.info-zip.org/pub/infozip/src/zip30.zip
-        ftp://ftp.info-zip.org/pub/infozip/src/zcrypt.zip
-	zip-3.0-build.patch	  zip-3.0-no-crypt.patch
-	zip-3.0-exec-stack.patch  zip-3.0-pic.patch
-	)
-
-
-md5sums=('e88492c8abd68fa9cfba72bc08757dba'
-         '0c969ba1661183b041a142945ed2710e')
-
-build() {
-   cd $startdir/src/${pkgname}30
-#   echo "A"| unzip ../zcrypt.zip
-   patch -p1 < $startdir/src/zip-3.0-build.patch	  
-   patch -p0 < $startdir/src/zip-3.0-no-crypt.patch || return 1
-  patch -p1 < $startdir/src/zip-3.0-exec-stack.patch  
-  patch -p0 < $startdir/src/zip-3.0-pic.patch
-
-   make -f unix/Makefile LOCAL_ZIP="$CFLAGS" prefix=/usr generic_gcc || return 1
-   make -f unix/Makefile INSTALL=`which install` prefix=$startdir/pkg/usr install
-}
diff --git a/abs/extra-testing/zip/zip-3.0-build.patch b/abs/extra-testing/zip/zip-3.0-build.patch
deleted file mode 100644
index 880b49e..0000000
--- a/abs/extra-testing/zip/zip-3.0-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- zip/unix/configure
-+++ zip/unix/configure
-@@ -18,7 +18,7 @@
- 
- CC=${1-cc}
- CFLAGS=${2-"-I. -DUNIX"}
--LFLAGS1=''
-+LFLAGS1="${LDFLAGS}"
- LFLAGS2=''
- LN="ln -s"
- 
-@@ -118,7 +118,7 @@ _EOF_
- fi
- 
- # optimization flags
--if test -n "${CFLAGS_OPT}"; then
-+if false; then
-   CFLAGS="${CFLAGS} ${CFLAGS_OPT}"
-   CFLAGS_BZ="${CFLAGS_BZ} ${CFLAGS_OPT}"
- fi
-@@ -220,13 +220,6 @@ fi
- echo Check for the C preprocessor
- # on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp.
- CPP="${CC} -E"
--# solaris as(1) needs -P, maybe others as well ?
--[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
--[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
--[ -f /lib/cpp ] && CPP=/lib/cpp
--[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
--[ -f /xenix ] && CPP="${CC} -E"
--[ -f /lynx.os ] && CPP="${CC} -E"
- 
- echo "#include <stdio.h>" > conftest.c
- $CPP conftest.c >/dev/null 2>/dev/null || CPP="${CC} -E"
diff --git a/abs/extra-testing/zip/zip-3.0-exec-stack.patch b/abs/extra-testing/zip/zip-3.0-exec-stack.patch
deleted file mode 100644
index 2eb1acf..0000000
--- a/abs/extra-testing/zip/zip-3.0-exec-stack.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- zip-2.31/crc_i386.S
-+++ zip-2.31/crc_i386.S
-@@ -238,3 +238,7 @@
- #endif /* i386 || _i386 || _I386 || __i386 */
- 
- #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */
-+
-+#if defined __ELF__ && defined __linux__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- zip-2.31/match.S
-+++ zip-2.31/match.S
-@@ -405,3 +405,7 @@
- #endif /* i386 || _I386 || _i386 || __i386  */
- 
- #endif /* !USE_ZLIB */
-+
-+#if defined __ELF__ && defined __linux__
-+.section .note.GNU-stack,"",@progbits
-+#endif
diff --git a/abs/extra-testing/zip/zip-3.0-no-crypt.patch b/abs/extra-testing/zip/zip-3.0-no-crypt.patch
deleted file mode 100644
index 301c289..0000000
--- a/abs/extra-testing/zip/zip-3.0-no-crypt.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- zip.c
-+++ zip.c
-@@ -3452,6 +3452,9 @@ char **argv;            /* command line tokens */
- 
-   /* Key not yet specified.  If needed, get/verify it now. */
-   if (key_needed) {
-+#if !CRYPT
-+    ZIPERR(ZE_PARMS, "encryption not supported");
-+#else /* CRYPT */
-     if ((key = malloc(IZ_PWLEN+1)) == NULL) {
-       ZIPERR(ZE_MEM, "was getting encryption password");
-     }
-@@ -3478,6 +3481,7 @@ char **argv;            /* command line tokens */
-     if (r) {
-       ZIPERR(ZE_PARMS, "password verification failed");
-     }
-+#endif
-   }
-   if (key) {
-     /* if -P "" could get here */
---- zipcloak.c
-+++ zipcloak.c
-@@ -744,6 +744,28 @@ struct option_struct far options[] = {
- 
- int main OF((void));
- 
-+void zipmessage_nl(a, nl)
-+ZCONST char *a;
-+int nl;
-+{
-+}
-+
-+void zipmessage(a, b)
-+ZCONST char *a, *b;
-+{
-+}
-+
-+int set_filetype(out_path)
-+  char *out_path;
-+{
-+}
-+
-+int rename_split(temp_name, out_path)
-+  char *temp_name;
-+  char *out_path;
-+{
-+}
-+
- void zipwarn(msg1, msg2)
- ZCONST char  *msg1, *msg2;
- {
diff --git a/abs/extra-testing/zip/zip-3.0-pic.patch b/abs/extra-testing/zip/zip-3.0-pic.patch
deleted file mode 100644
index d37e5ed..0000000
--- a/abs/extra-testing/zip/zip-3.0-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- unix/configure
-+++ unix/configure
-@@ -29,6 +29,9 @@
- echo Check if we can use asm code
- OBJA=""
- OCRCU8=""
-+piclib="$(echo | $CPP -dM $CFLAGS - | grep -i __pic__)"
-+echo "Checking if compiler wants to create pic code"
-+[ "$piclib" == "" ] && \
- if eval "$CPP match.S > _match.s 2>/dev/null"; then
-   if test ! -s _match.s || grep error < _match.s > /dev/null; then
-     :