Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/ocaml-findlib/PKGBUILD
	gnome-unstable/clutter/PKGBUILD
	gnome-unstable/gcalctool/PKGBUILD
	gnome-unstable/gnome-screensaver/PKGBUILD
	gnome-unstable/gnome-screensaver/gnome-screensaver.pam
	gnome-unstable/pygobject/PKGBUILD
	kde-unstable/calligra/PKGBUILD

40 files changed, 173 insertions, 2023 deletions

diff --git a/community/deja-dup/PKGBUILD b/community/deja-dup/PKGBUILD
index f46b20b60..53062db49 100644
--- a/community/deja-dup/PKGBUILD
+++ b/community/deja-dup/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 68245 2012-03-20 16:27:46Z bgyorgy $
+# $Id: PKGBUILD 68348 2012-03-22 18:06:16Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=deja-dup
-pkgver=20.2
-pkgrel=3
+pkgver=22.0
+pkgrel=1
 pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/deja-dup"
@@ -13,12 +13,12 @@ makedepends=('vala' 'intltool' 'itstool' 'nautilus')
 optdepends=('nautilus: backup extension')
 options=('!libtool')
 install=$pkgname.install
-source=(http://launchpad.net/$pkgname/20/$pkgver/+download/$pkgname-$pkgver.tar.bz2)
-md5sums=('678530be84f00af19c837f134613af21')
+source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz)
+md5sums=('b8a71a26cdf3c460a9e5104212527d29')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's/\"python\"/\"python2\"/' common/PythonChecker.c
+  sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' common/PythonChecker.vala
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
               --disable-static --disable-schemas-compile --without-unity
diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD
index 8d988dcf2..452f0cb2e 100644
--- a/community/glfw/PKGBUILD
+++ b/community/glfw/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64506 2012-02-15 10:24:29Z svenstaro $
+# $Id: PKGBUILD 68357 2012-03-22 23:04:26Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: philefou <tuxication AT gmail DOT com>
 # Contributor: lindquist <tomas@famolsen.dk>
@@ -7,7 +7,7 @@
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=glfw
-pkgver=2.7.3
+pkgver=2.7.4
 pkgrel=1
 pkgdesc="A free, open source, portable framework for OpenGL application development"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ license=('custom:ZLIB')
 depends=('libgl' 'libxrandr')
 makedepends=('mesa')
 source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('f0e40049cc3ef30cb145047a7631ab3f')
+md5sums=('cf3843ff6b4324a3e8003252f6b20cd0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gnome-web-photo/PKGBUILD b/community/gnome-web-photo/PKGBUILD
new file mode 100644
index 000000000..e354d0386
--- /dev/null
+++ b/community/gnome-web-photo/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 68361 2012-03-23 03:17:03Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Phillip Smith <fukawi2@NO-SPAM.gmail.com>
+# Contributor: Adam <adam@russ.co.il>
+
+pkgname=gnome-web-photo
+pkgver=0.10.5
+pkgrel=2
+pkgdesc="Generate full-size image files and thumbnails from HTML files and web pages"
+arch=('i686' 'x86_64')
+url="http://git.gnome.org/browse/gnome-web-photo/"
+license=('LGPL')
+depends=('libwebkit3')
+makedepends=('intltool')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('b76a116af977e0b30ed82e50dc5c41827f257502c357eeda42347ebfabcdd7f5')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/ocaml-findlib/PKGBUILD b/community/ocaml-findlib/PKGBUILD
index 215a4ffb7..63334910f 100644
--- a/community/ocaml-findlib/PKGBUILD
+++ b/community/ocaml-findlib/PKGBUILD
@@ -1,35 +1,36 @@
-# Maintainer: Thomas S Hatch <thatch45 at gmail dot com>
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Thomas S Hatch <thatch45 at gmail dot com>
 # Contributor: Sebastian Wiesner <lunaryorn googlemail com>
 # Contributor: Benjamin Andresen <benny(at)klapmuetz(dot)org>
-#              scj <scj archlinux us>
+# Contributor: scj <scj archlinux us>
+
 pkgname=ocaml-findlib
-pkgver=1.2.7
-pkgrel=2
+pkgver=1.2.8
+pkgrel=1
 license=('MIT')
 arch=('i686' 'x86_64' 'mips64el')
-pkgdesc="Objective Caml (OCaml) package manager"
-url="http://projects.camlcity.org/projects/findlib.html"
+pkgdesc='Objective Caml (OCaml) package manager'
+url='http://projects.camlcity.org/projects/findlib.html'
 depends=('ocaml')
 source=("http://download.camlcity.org/download/findlib-$pkgver.tar.gz")
-md5sums=('000bff723e8d3d727a7edd5b5901b540')
+md5sums=('a1da0fddf589ae62fa9b50799cd04c17')
 options=('!strip' 'zipman') # otherwise the bytecode gets broken
 
 build() {
-  cd $srcdir/findlib-$pkgver
-  ./configure\
-      -config /etc/findlib.conf \
-      -sitelib /usr/lib/ocaml \
-      -mandir /usr/share/man
+  cd "$srcdir/findlib-$pkgver"
+
+  ./configure -config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man
   make all opt
 }
 
 package () {
-  cd $srcdir/findlib-$pkgver
-  make prefix=$pkgdir install 
+  cd "$srcdir/findlib-$pkgver"
+
+  make prefix="$pkgdir" install 
 
-  # Add the old site-lib to the path to maintain compatability with old style
-  # packages.
-  sed -i 's/path=\"\/usr\/lib\/ocaml\"/path="\/usr\/lib\/ocaml:\/usr\/lib\/ocaml\/site-lib"/' ${pkgdir}/etc/findlib.conf
+  # add the old site-lib to the path to maintain compatibility with old style packages
+  sed -i 's/path=\"\/usr\/lib\/ocaml\"/path="\/usr\/lib\/ocaml:\/usr\/lib\/ocaml\/site-lib"/' \
+    "${pkgdir}/etc/findlib.conf"
 
   install -m755 src/findlib/ocamlfind_opt "$pkgdir/usr/bin/"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/community/sensors-applet/PKGBUILD b/community/sensors-applet/PKGBUILD
new file mode 100644
index 000000000..3c9da15c1
--- /dev/null
+++ b/community/sensors-applet/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 68359 2012-03-23 01:09:57Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=sensors-applet
+pkgver=3.0.0
+pkgrel=2
+pkgdesc="Applet for GNOME Panel to display readings from hardware sensors, including CPU temperature, fan speeds and voltage readings"
+arch=('i686' 'x86_64')
+url="http://sensors-applet.sourceforge.net/"
+license=('GPL')
+depends=('gnome-panel' 'libatasmart' 'lm_sensors' 'xdg-utils')
+makedepends=('intltool' 'gnome-doc-utils')
+optdepends=('hddtemp: get HDD temperatures'
+            'udisks: get HDD temperatures')
+options=('!libtool')
+install=$pkgname.install
+source=(http://downloads.sourceforge.net/sensors-applet/$pkgname-$pkgver.tar.gz)
+md5sums=('425078fc1ff5a98af1547e039002a73f')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+              --disable-static --disable-scrollkeeper --with-nvidia=no
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/sensors-applet/sensors-applet.install b/community/sensors-applet/sensors-applet.install
new file mode 100644
index 000000000..a23a623cc
--- /dev/null
+++ b/community/sensors-applet/sensors-applet.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+
+post_remove() {
+  post_install $1
+}
diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD
index 972a970dc..ff840454c 100644
--- a/extra/banshee/PKGBUILD
+++ b/extra/banshee/PKGBUILD
@@ -3,25 +3,24 @@
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=banshee
-pkgver=2.2.1
-pkgrel=2
+pkgver=2.4.0
+pkgrel=1
 pkgdesc="Music management and playback for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://banshee.fm/"
 license=('MIT')
-depends=(libxxf86vm gstreamer0.10-base-plugins mono-addins dbus-sharp-glib boo libwebkit libsoup-gnome gdata-sharp taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme xdg-utils media-player-info)
+depends=(libxxf86vm gstreamer0.10-base-plugins mono-addins dbus-sharp-glib boo libwebkit libsoup-gnome gdata-sharp taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme xdg-utils media-player-info gstreamer0.10-bad-plugins mono-upnp)
 makedepends=('intltool' 'gnome-doc-utils' 'gtk-sharp-beans')
 optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
             'gstreamer0.10-ugly-plugins: Extra media codecs'
-            'gstreamer0.10-bad-plugins: Extra media codecs'
             'gstreamer0.10-ffmpeg: Extra media codecs'
             'brasero: CD burning')
 options=('!libtool')
 install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/2.2/$pkgname-$pkgver.tar.xz
+source=(http://download.gnome.org/sources/$pkgname/2.4/$pkgname-$pkgver.tar.xz
         banshee-recent-gpod.patch)
-sha256sums=('55c03ddf9732199b9f83d4ff375af99ae5a4eea46b8a198695427e5c48f1b9a5'
-            '018eeb00d1b4e625d13f1184863e499be5b5dde050a7513e012d5898125073d9')
+md5sums=('a719717d02ed26cccf4e6432edd48a31'
+         'e988bb83e1a49e5f0da5958e8af6508e')
 
 build() {
   export MONO_SHARED_DIR="$srcdir/.wabi"
@@ -29,7 +28,7 @@ build() {
 
   cd "$srcdir/$pkgname-$pkgver"
   patch -Np1 -i "$srcdir/banshee-recent-gpod.patch"
-
+  
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-docs \
               --disable-static \
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index fac601cd0..5791027e3 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153994 2012-03-21 08:34:14Z giovanni $
+# $Id: PKGBUILD 154061 2012-03-22 12:43:43Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.03.20
+pkgver=2012.03.22
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('5b91e1bba1431be1ec6abef526bf86bd')
+md5sums=('95d757a15026eb1c91556b80a18193ee')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/mono-upnp/PKGBUILD b/extra/mono-upnp/PKGBUILD
new file mode 100644
index 000000000..02b0d806b
--- /dev/null
+++ b/extra/mono-upnp/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 154079 2012-03-22 17:57:25Z daniel $
+# Maintainer: Daniel Isenmann <daniel@archlinux.org>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=mono-upnp
+pkgver=0.1.1
+pkgrel=1
+pkgdesc="UPNP binding for Mono/.NET"
+arch=('i686' 'x86_64')
+url="https://github.com/mono/mono-upnp"
+license=('MIT')
+depends=('gtk-sharp-2' 'mono-addins' 'taglib-sharp')
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('35b3e2ab07407eed018a5b24c22241aa')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./autogen.sh --help
+  
+  sed -i 's/nunit/mono-nunit/' configure tests/*/Makefile.in
+  ./configure --prefix=/usr
+
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
diff --git a/gnome-unstable/epiphany/fix-infinite-loop b/gnome-unstable/epiphany/fix-infinite-loop
deleted file mode 100644
index 7322a0a4c..000000000
--- a/gnome-unstable/epiphany/fix-infinite-loop
+++ /dev/null
@@ -1,38 +0,0 @@
-From 087cb32d81fd8ef1cf3f493fce9e80e7217dbf04 Mon Sep 17 00:00:00 2001
-From: Xan Lopez <xan@igalia.com>
-Date: Wed, 21 Mar 2012 14:41:36 +0100
-Subject: [PATCH] profile-migrator: do not freak out if the history is empty
-
-If the old history file exists but has no actual visits we'll enter
-into an infinite loop.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=672547
----
- lib/ephy-profile-migrator.c |   10 ++++++----
- 1 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/lib/ephy-profile-migrator.c b/lib/ephy-profile-migrator.c
-index f7a3406..a37638c 100644
---- a/lib/ephy-profile-migrator.c
-+++ b/lib/ephy-profile-migrator.c
-@@ -594,11 +594,13 @@ migrate_history ()
-   g_input_stream_close (G_INPUT_STREAM (input), NULL, NULL);
-   g_object_unref (input);
- 
--  ephy_history_service_add_visits (history_service, parse_data.visits, NULL, (EphyHistoryJobCallback)visit_cb, NULL);
--  ephy_history_page_visit_list_free (parse_data.visits);
-+  if (parse_data.visits) {
-+    ephy_history_service_add_visits (history_service, parse_data.visits, NULL, (EphyHistoryJobCallback)visit_cb, NULL);
-+    ephy_history_page_visit_list_free (parse_data.visits);
- 
--  while (!all_done)
--    g_main_context_iteration (NULL, FALSE);
-+    while (!all_done)
-+      g_main_context_iteration (NULL, FALSE);
-+  }
- 
-   g_object_unref (history_service);
- }
--- 
-1.7.7.6
-
diff --git a/gnome-unstable/gdm/PKGBUILD b/gnome-unstable/gdm/PKGBUILD
deleted file mode 100644
index 1baaf27b2..000000000
--- a/gnome-unstable/gdm/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 153911 2012-03-20 13:36:40Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gdm
-pkgver=3.3.92.1
-pkgrel=2
-pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org"
-backup=('etc/pam.d/gdm-autologin' 'etc/pam.d/gdm-fingerprint' 'etc/pam.d/gdm' 'etc/pam.d/gdm-password'
-        'etc/pam.d/gdm-smartcard' 'etc/pam.d/gdm-welcome' 'etc/gdm/custom.conf')
-groups=('gnome-extra')
-options=('!libtool')
-depends=('libcanberra' 'libxklavier' 'gnome-session' 'gnome-settings-daemon' 'metacity' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss')
-makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection')
-optdepends=('gnome-shell: new login interface'
-            'fprintd: fingerprint authentication')
-install=gdm.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*.*}/$pkgname-$pkgver.tar.xz
-        fix_external_program_directories.patch
-        gdm-vt-allocation-hack.patch
-        gdm
-        gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam)
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/fix_external_program_directories.patch"
-  patch -Np1 -i "$srcdir/gdm-vt-allocation-hack.patch"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gdm \
-      --localstatedir=/var \
-      --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \
-      --disable-scrollkeeper \
-      --disable-static \
-      --without-tcp-wrappers \
-      --disable-schemas-compile \
-      --with-systemd=no
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  for i in gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam;do
-      install -m644 "$srcdir/$i" "$pkgdir/etc/pam.d/${i%.pam}"
-  done
-
-  install -Dm755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/gdm"
-
-  chmod 1770 "$pkgdir/var/log/gdm"
-  chmod 700 "$pkgdir/var/lib/gdm/.config/dconf"
-  rm -rf "$pkgdir/var/run" "$pkgdir/var/gdm"
-}
-sha256sums=('957456fa8f3c5243c45d5f0be89931a515b79efd881a0423e8552a8f46c5379c'
-            'f68600ccf80f475deb417d58ab3306c4a1ba4622688e2901996c8549c85a9ee6'
-            '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
-            '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
-            'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d'
-            '5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e'
-            'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
-            '92aded0804bad8a609fd150448ad4a2edb8166c17cb4e2b581559e80603bbb6c'
-            'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd'
-            '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834')
diff --git a/gnome-unstable/gdm/fix_external_program_directories.patch b/gnome-unstable/gdm/fix_external_program_directories.patch
deleted file mode 100644
index b3a0f0cf6..000000000
--- a/gnome-unstable/gdm/fix_external_program_directories.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Nur gdm-3.3.92.orig/daemon/gdm-server.c gdm-3.3.92/daemon/gdm-server.c
---- gdm-3.3.92.orig/daemon/gdm-server.c	2012-03-19 22:30:05.311490006 +0000
-+++ gdm-3.3.92/daemon/gdm-server.c	2012-03-19 22:30:17.004732251 +0000
-@@ -139,7 +139,7 @@
-         g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
- 
-         error = NULL;
--        command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s",
-+        command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s",
-                                    server->priv->display_name);
- 
-         g_debug ("GdmServer: Running helper %s", command);
-diff -Nur gdm-3.3.92.orig/data/gdm-shell.session.in gdm-3.3.92/data/gdm-shell.session.in
---- gdm-3.3.92.orig/data/gdm-shell.session.in	2012-03-19 22:30:05.311490006 +0000
-+++ gdm-3.3.92/data/gdm-shell.session.in	2012-03-19 22:30:17.004732251 +0000
-@@ -1,5 +1,5 @@
- [GNOME Session]
- Name=Display Manager
- RequiredComponents=gnome-shell;gnome-settings-daemon;
--IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
-+IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && /usr/lib/gnome-session/gnome-session-check-accelerated'
- FallbackSession=gdm-fallback
-diff -Nur gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c
---- gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c	2012-03-19 22:30:05.304823391 +0000
-+++ gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c	2012-03-19 22:30:17.004732251 +0000
-@@ -131,7 +131,7 @@
-         ret = FALSE;
- 
-         error = NULL;
--        g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error);
-+        g_spawn_command_line_async ("/usr/lib/gnome-settings-daemon/gnome-settings-daemon", &error);
-         if (error != NULL) {
-                 g_warning ("Error starting settings daemon: %s", error->message);
-                 g_error_free (error);
diff --git a/gnome-unstable/gdm/gdm b/gnome-unstable/gdm/gdm
deleted file mode 100755
index c3e635a6d..000000000
--- a/gnome-unstable/gdm/gdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting GDM"
-    /usr/sbin/gdm &
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      
-      add_daemon gdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping GDM"
-    [ -f /var/run/gdm.pid ] && kill `cat /var/run/gdm.pid` &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon gdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/gnome-unstable/gdm/gdm-autologin.pam b/gnome-unstable/gdm/gdm-autologin.pam
deleted file mode 100644
index c77c78917..000000000
--- a/gnome-unstable/gdm/gdm-autologin.pam
+++ /dev/null
@@ -1,18 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_permit.so
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_unix.so
-
-password        required        pam_deny.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
diff --git a/gnome-unstable/gdm/gdm-fingerprint.pam b/gnome-unstable/gdm/gdm-fingerprint.pam
deleted file mode 100644
index 5b74bf6d6..000000000
--- a/gnome-unstable/gdm/gdm-fingerprint.pam
+++ /dev/null
@@ -1,18 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_fprintd.so
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_unix.so
-
-password        required        pam_deny.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
diff --git a/gnome-unstable/gdm/gdm-password.pam b/gnome-unstable/gdm/gdm-password.pam
deleted file mode 100644
index aa4d4dd47..000000000
--- a/gnome-unstable/gdm/gdm-password.pam
+++ /dev/null
@@ -1,20 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_unix.so nullok
-auth            optional        pam_gnome_keyring.so
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_unix.so
-
-password        required        pam_unix.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so force revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_gnome_keyring.so auto_start
diff --git a/gnome-unstable/gdm/gdm-smartcard.pam b/gnome-unstable/gdm/gdm-smartcard.pam
deleted file mode 100644
index baacb8bed..000000000
--- a/gnome-unstable/gdm/gdm-smartcard.pam
+++ /dev/null
@@ -1,18 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_pkcs11.so wait_for_card card_only
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_unix.so
-
-password        required        pam_pkcs11.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
diff --git a/gnome-unstable/gdm/gdm-vt-allocation-hack.patch b/gnome-unstable/gdm/gdm-vt-allocation-hack.patch
deleted file mode 100644
index 56fa5a151..000000000
--- a/gnome-unstable/gdm/gdm-vt-allocation-hack.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
-index 39def47..03488fd 100644
---- a/daemon/gdm-server.c
-+++ b/daemon/gdm-server.c
-@@ -33,6 +33,8 @@
- #include <grp.h>
- #include <signal.h>
- #include <sys/resource.h>
-+#include <sys/ioctl.h>
-+#include <sys/vt.h>
- 
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server)
-         return out;
- }
- 
-+#ifndef O_NOCTTY
-+# define O_NOCTTY 0
-+#endif
-+
-+static int
-+open_vt (int vtno)
-+{
-+	char *vtname;
-+	int fd;
-+
-+	vtname = g_strdup_printf ("/dev/tty%d", vtno);
-+
-+	do {
-+		errno = 0;
-+		fd = open (vtname, O_RDWR | O_NOCTTY, 0);
-+	} while (errno == EINTR);
-+
-+	g_free (vtname);
-+	return fd;
-+}
-+
-+static gint
-+find_first_probably_free_vt (void)
-+{
-+	int fd, fdv;
-+	int vtno;
-+	unsigned short vtmask;
-+	struct vt_stat vtstat;
-+	guint v_state;
-+
-+	fdv = -1;
-+
-+	do {
-+		errno = 0;
-+		fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0);
-+	} while (errno == EINTR);
-+
-+	if (fd >= 0) {
-+		if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) {
-+			v_state = vtstat.v_state;
-+		} else {
-+			close (fd);
-+			v_state = 0;
-+			fd = -1;
-+		}
-+	} else {
-+		v_state = 0;
-+	}
-+
-+	if (fd < 0) {
-+		do {
-+			errno = 0;
-+			fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0);
-+		} while (errno == EINTR);
-+
-+		if (fd >= 0) {
-+			if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0)
-+				v_state = vtstat.v_state;
-+		}
-+	}
-+
-+	for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) {
-+		/* Is this console in use? */
-+		if (v_state & vtmask)
-+			continue;
-+
-+		/* No, try to open it */
-+		fdv = open_vt (vtno);
-+		if (fdv >= 0)
-+			break;
-+
-+		/* If we're here, kernel indicated that the console was free,
-+		 * but we failed to open it. Just go on to higher VTs. */
-+	}
-+
-+        if (fdv >= 0)
-+                close (fdv);
-+        else
-+		vtno = -1;
-+
-+	if (fd >= 0)
-+		close (fd);
-+
-+	return vtno;
-+}
-+
- char *
- gdm_server_get_display_device (GdmServer *server)
- {
-@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer  *server,
- 
-         if (vtarg != NULL && ! gotvtarg) {
-                 argv[len++] = g_strdup (vtarg);
-+        } else if (!query_in_arglist && !gotvtarg) {
-+                gint vtnum = find_first_probably_free_vt ();
-+
-+                if (vtnum > 0)
-+                        argv [len++] = g_strdup_printf ("vt%d", vtnum);
-         }
- 
-         argv[len++] = NULL;
diff --git a/gnome-unstable/gdm/gdm-welcome.pam b/gnome-unstable/gdm/gdm-welcome.pam
deleted file mode 100644
index cc3811c19..000000000
--- a/gnome-unstable/gdm/gdm-welcome.pam
+++ /dev/null
@@ -1,12 +0,0 @@
-#%PAM-1.0
-auth            required        pam_env.so
-auth            required        pam_permit.so
-
-account         required        pam_nologin.so
-account         required        pam_unix.so
-
-password        required        pam_deny.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so force revoke
diff --git a/gnome-unstable/gdm/gdm.install b/gnome-unstable/gdm/gdm.install
deleted file mode 100644
index c48faf4ae..000000000
--- a/gnome-unstable/gdm/gdm.install
+++ /dev/null
@@ -1,30 +0,0 @@
-pkgname=gdm
-
-post_install() {
-  getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm
-  getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
-  passwd -l gdm > /dev/null
-  chown -R gdm:gdm /var/lib/gdm > /dev/null
-
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  dconf update
-}
-
-pre_upgrade() {
-  if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    gconfpkg --uninstall ${pkgname}
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  dconf update
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  getent passwd gdm >/dev/null 2>&1 && userdel gdm
-  getent group gdm >/dev/null 2>&1 && groupdel gdm
-}
diff --git a/gnome-unstable/gdm/gdm.pam b/gnome-unstable/gdm/gdm.pam
deleted file mode 100644
index 655299cb7..000000000
--- a/gnome-unstable/gdm/gdm.pam
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-auth            optional        pam_gnome_keyring.so
-account         required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_gnome_keyring.so auto_start
-password        required        pam_unix.so
diff --git a/gnome-unstable/nautilus-sendto/PKGBUILD b/gnome-unstable/nautilus-sendto/PKGBUILD
deleted file mode 100644
index 163f518c8..000000000
--- a/gnome-unstable/nautilus-sendto/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 154032 2012-03-21 18:44:49Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Eduardo Romero <eduardo@archlinux.org>
-# Contributor: Tor Krill <tor@krill.nu>
-
-pkgname=nautilus-sendto
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="Nautilus context menu for sending files."
-arch=('i686' 'x86_64')
-url="http://download.gnome.org/sources/nautilus-sendto/"
-license=('GPL')
-groups=('gnome-extra')
-depends=('evolution-data-server' 'nautilus' 'dconf')
-makedepends=('pidgin' 'gajim' 'gettext' 'intltool')
-options=('!libtool' '!emptydirs')
-install=nautilus-sendto.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('03265d7063212717773bd6a1f85c25ec24066ca8424b658c5fa30ec0fb074b44')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/nautilus-sendto/nautilus-sendto.install b/gnome-unstable/nautilus-sendto/nautilus-sendto.install
deleted file mode 100644
index d33a1b261..000000000
--- a/gnome-unstable/nautilus-sendto/nautilus-sendto.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD
new file mode 100644
index 000000000..1422f451f
--- /dev/null
+++ b/libre/linux-libre-manpages/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer: Thomas Baechler <thomas@archlinux.org>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+pkgname=linux-libre-manpages
+pkgver=3.1
+pkgrel=1
+pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux-libre kernel."
+arch=('any')
+url="http://linux-libre.fsfla.org/"
+license=('GPL2')
+makedepends=('xmlto' 'docbook-xsl')
+replaces=('kernel26-manpages' 'linux-manpages')
+conflicts=('kernel26-manpages' 'linux-manpages')
+provides=('kernel26-manpages' 'linux-manpages')
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/linux-libre-${pkgver}-gnu.tar.xz")
+md5sums=('38703cdbb0b9107e7220bc094c5e36b1')
+
+build() {
+  cd "${srcdir}/linux-$pkgver"
+  make mandocs
+}
+
+package() {
+  install -d "${pkgdir}/usr/share/man/man9/"
+  install "${srcdir}"/linux-$pkgver/Documentation/DocBook/man/*.9.gz \
+    "${pkgdir}/usr/share/man/man9/"
+
+  find "${pkgdir}" -type f -exec chmod 644 {} \;
+}
diff --git a/testing/bootchart/PKGBUILD b/testing/bootchart/PKGBUILD
deleted file mode 100644
index d8f606056..000000000
--- a/testing/bootchart/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 153849 2012-03-19 21:13:34Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-pkgname="bootchart"
-pkgver=1.15
-pkgrel=1
-pkgdesc="a 'startup' graphing tool"
-url="https://meego.gitorious.org/meego-developer-tools/bootchart"
-license=('GPL2')
-arch=(i686 x86_64)
-depends=('glibc')
-source=("http://foo-projects.org/~sofar/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-	'build.patch')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -p1 -i ../build.patch
-
-  make
-}
-
-package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('e24cad9db140521fca5193a88589e669'
-         '5546709bc77b775290cb54a29affa6ec')
diff --git a/testing/bootchart/build.patch b/testing/bootchart/build.patch
deleted file mode 100644
index 82c6e1bfd..000000000
--- a/testing/bootchart/build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 4fe62e6b4c072676d246be02ba92a1df3a9d0feb Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Fri, 16 Mar 2012 01:34:10 +0100
-Subject: [PATCH] Makefile: move binary and avoid empty dirs
-
-Install to /usr/bin by default, and don't install an empty /etc.
----
- Makefile |   10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 566a848..c017509 100644
---- a/Makefile
-+++ b/Makefile
-@@ -6,12 +6,10 @@ CC := gcc
- all: bootchartd
- 
- install: bootchartd
--	mkdir -p $(DESTDIR)/sbin
--	mkdir -p $(DESTDIR)/etc
--	mkdir -p $(DESTDIR)/usr/share/doc/bootchart/
--	install -m0755 bootchartd $(DESTDIR)/sbin/
--	install -m0644 bootchartd.conf.example $(DESTDIR)/usr/share/doc/bootchart/
--	install -m0644 README COPYING $(DESTDIR)/usr/share/doc/bootchart/
-+	install -d $(DESTDIR)/usr/bin
-+	install -d $(DESTDIR)/usr/share/doc/bootchart
-+	install -m0755 bootchartd $(DESTDIR)/usr/bin/
-+	install -m0644 README COPYING bootchartd.conf.example $(DESTDIR)/usr/share/doc/bootchart/
- 
- OBJS := log.o svg.o bootchart.o
- 
--- 
-1.7.9.4
-
diff --git a/testing/capi4hylafax/PKGBUILD b/testing/capi4hylafax/PKGBUILD
deleted file mode 100644
index ff9680255..000000000
--- a/testing/capi4hylafax/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 153867 2012-03-20 08:29:04Z tpowa $
-#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=capi4hylafax
-pkgver=010300
-pkgrel=6
-pkgdesc="capi plugin for hylafax to enable isdn faxing"
-arch=(i686 x86_64)
-url="ftp://ftp.avm.de/tools"
-license=('GPL')
-depends=('glibc' 'isdn4k-utils' 'hylafax' 'gcc-libs' 'libtiff' 'dialog')
-source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz
-	config.faxCAPI capi4hylafax.rc)
-md5sums=('d37dc652ac80d1525ef8693be55ee67f'
-         '653b60695d21c128f020a86274ca9192'
-         '1fe40c58289fa3ba625ce6fe2fdb3d07')
-install=capi4hylafax.install
-backup=(var/spool/hylafax/etc/config.faxCAPI)
-
-build() {
-  cd "$srcdir"/$pkgname-01.03.00
-# fix config file
-  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in
-  autoreconf --force --install
-  ./configure
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-01.03.00
-  install -m755 -D src/faxsend/c2faxsend "$pkgdir"/usr/bin/c2faxsend
-  install -m755 -D src/faxrecv/c2faxrecv "$pkgdir"/usr/bin/c2faxrecv
-  install -m755 -D setupconffile "$pkgdir"/usr/bin/c2faxaddmodem
-  install -m644 -D "$srcdir"/config.faxCAPI "$pkgdir"/var/spool/hylafax/etc/config.faxCAPI
-  install -m755 -D "$srcdir"/capi4hylafax.rc "$pkgdir"/etc/rc.d/capi4hylafax
-# adding FIFO
-  mkfifo "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
-  chown 10 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
-  chgrp 14 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
-  chmod 0600 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI
-# fix /var/spool/hylafax permission
-  chown 10 "$pkgdir"/var/spool/hylafax
-  chgrp 14 "$pkgdir"/var/spool/hylafax
-# adding udev rule
-  mkdir -p "$pkgdir"/lib/udev/rules.d
-cat << EOF >> "$pkgdir"/lib/udev/rules.d/53-capi4hylafax.rules
-# CAPI devices
-SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20", GROUP="uucp"
-SUBSYSTEM=="tty" KERNEL=="capi[0-9]*", NAME="capi/%n", GROUP="uucp"
-
-EOF
-# fix c2faxadd
-  sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' "$pkgdir"/usr/bin/c2faxaddmodem
-  echo "main_config_dialog" >>  "$pkgdir"/usr/bin/c2faxaddmodem
-}
diff --git a/testing/capi4hylafax/capi4hylafax.install b/testing/capi4hylafax/capi4hylafax.install
deleted file mode 100644
index 20c2d8f63..000000000
--- a/testing/capi4hylafax/capi4hylafax.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-cat << EOF
-For more information about setting up the package, please have a look here:
-"http://wiki.archlinux.org/index.php/capi4hylafax"
-EOF
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-cat << EOF
-Please remove your additions to /var/spool/hylafax/etc/config
-EOF
-}
diff --git a/testing/capi4hylafax/capi4hylafax.rc b/testing/capi4hylafax/capi4hylafax.rc
deleted file mode 100755
index 51025b020..000000000
--- a/testing/capi4hylafax/capi4hylafax.rc
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/c2faxrecv`
-case "$1" in
-  start)
-    stat_busy "Starting capi4hylafax"
-    if [ -z "$PID" ]; then
-    /usr/bin/c2faxrecv > /dev/null &
-       faxmodem faxCAPI
-    fi
-    if [ ! -f /var/run/faxq.pid ]; then
-       stat_fail
-       echo "ERROR: hylafax is not running"
-       exit 1
-    fi
-    if [ ! -f /var/run/hfaxd.pid ]; then
-    stat_fail
-    echo "ERROR: hylafax is not running"
-    exit 1
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon capi4hylafax
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping capi4hylafax"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon capi4hylafax
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/capi4hylafax/config.faxCAPI b/testing/capi4hylafax/config.faxCAPI
deleted file mode 100644
index b2137757a..000000000
--- a/testing/capi4hylafax/config.faxCAPI
+++ /dev/null
@@ -1,397 +0,0 @@
-#
-# EDIT THIS CONFIGURATION TO REFLECT YOUR SETUP
-#
-
-# Grundsätzliches:
-# - Es gibt für jeden Wert einen Standardzustand (default), sodass jede Zeile
-#   der Datei oder auch das komplette Configfile ausgelassen werden kann.
-# - Es gibt ausschließlich ein Configfile, in dem alle nötigen Angaben für
-#   "c2faxsend/-receive" eingetragen werden können.
-# - Werden für HylaFAX mehrere virtuelle Geräte (devices) angelegt, muss es
-#   für jedes Device ein Configfile im Format config.[DeviceName] geben.
-#   Dessen Existenz wird von HylaFAX überprüft. Ohne dieses File kann die
-#   Arbeit mit dem Device nicht aufgenommen werden. Die Existenz einer
-#   solchen Datei kann am einfachsten durch einen Link auf dieses ConfigFile
-#   oder ein minimales "dummy"-ConfigFile nachgewiesen werden.
-#
-# Basics:
-# - There is a default condition for each value, such that each line of the
-#   file or the complete configfile can be left out.
-# - There is only one configfile in which all information required for
-#   "c2faxsend/-receive" can be entered.
-# - If multiple virtual devices are created for HylaFAX, there must be a
-#   Configfile in the format config.[DeviceName] for each device. HylaFAX
-#   checks that this file exists. Without this file, it is not possible to
-#   start working with the device. The easiest way to establish the existence
-#   of such a file is to create a link to this ConfigFile or a minimum
-#   "dummy" ConfigFile.
-
-
-# "SpoolDir" gibt den Pfad an, unter dem im HylaFAX-kompatiblen Betrieb die
-# HylaFAX-Dateien zu finden sind oder unter dem im Stand-Alone-Betrieb die
-# empfangenen Faxe gespeichert werden sollen. Im HylaFAX-kompatiblen Betrieb
-# werden die Faxe im Verzeichnis $(SpoolDir)/recvq gespeichert.
-#
-# "SpoolDir" indicates the path in which the HylaFAX are located in HylaFAX-
-# compatible operation or in which received faxes are to be saved in
-# stand-alone operation. In HylaFAX-compatible operation, faxes are saved in
-# the directory $(SpoolDir)/recvq.
-#
-# default   /var/spool/hylafax
-#
-SpoolDir:               /var/spool/hylafax
-
-
-# "FaxRcvdCmd" gibt das Skript an, das ausgeführt wird, sobald ein Fax
-# empfangen wurde. Im Stand-Alone-Betrieb werden andere Parameter
-# übergeben als für HylaFAX (mehr dazu im sample_faxrcvd).
-#
-# "FaxRcvdCmd" indicates the script performed whenever a fax is
-# received. Parameters other than the ones for HylaFAX are returned in
-# stand-alone operation (see sample_faxrcvd for more information).
-#
-# default   /var/spool/hylafax/bin/faxrcvd
-#
-FaxRcvdCmd:             /var/spool/hylafax/bin/faxrcvd
-
-
-# "PollRcvdCmd" gibt das Skript an, das ausgeführt wird, sobald ein
-# Fax per Faxabruf empfangen wurde. Im Stand-Alone-Betrieb werden
-# andereParameter übergeben als für HylaFAX (mehr dazu im
-# sample_faxrcvd).
-#
-# "PollRcvdCmd" indicates the script performed whenever a fax was
-# received by fax polling. Parameters other than the ones for HylaFAX
-# are returned in stand-alone operation (see sample_faxrcvd for more
-# information).
-#
-# default   /var/spool/hylafax/bin/pollrcvd
-#
-PollRcvdCmd:             /var/spool/hylafax/bin/pollrcvd
-
-
-# "FaxReceiveUser" ist der User, als der c2faxrecv ausgeführt wird.
-# Die Änderung des Users kann nur vom Superuser bzw. "root" erfolgen. Sollte
-# c2faxrecv von einem anderen User gestartet werden, wird dieser Eintrag
-# ignoriert. Hier einen anderen als den Hylafax-Standardwert "uucp"
-# einzutragen ist dann sinnvoll, wenn beispielsweise die Rechte von
-# /dev/capi20 nicht geändert werden sollen oder Ihre Linux-Distribution einen
-# anderen User voraussetzt.
-#
-# "FaxReceiveUser" is the user when c2faxrecv is run. This user can be
-# changed only by the Superuser or "root" user. If c2faxrecv is started by
-# another user, this entry will be ignored. Here it is a good idea to enter a
-# value other than the hylafax default value "uucp", for instance, if the
-# rights of /dev/capi20 are not to be changed or your Linux distribution
-# requires another user.
-#
-# default   ""
-#
-FaxReceiveUser:         uucp
-FaxReceiveGroup:	uucp
-
-
-# Im "LogFile" werden Informationen über den Faxablauf abgespeichert.
-#
-# Information about the order of events in faxing are saved in the "LogFile".
-#
-# default   ""
-#
-LogFile:                /var/spool/hylafax/log/capi4hylafax
-
-
-# Der Befehl "LogTraceLevel" gibt die Menge der Daten an, die in ein LogFile
-# geschrieben werden. Die Spanne reicht von 0 = nichts bis 4 = vieles.
-#
-# The "LogTraceLevel" command indicates the amount of data written in a
-# LogFile. The range goes from 0 = nothing to 4 = many.
-#
-# default   0
-#
-LogTraceLevel:          0
-
-
-# "LogFileMode" sind die Angaben (mode), aufgrund derer sowohl das gerade
-# erwähnte LogFile als auch die LogFiles für HylaFAX angelegt werden.
-#
-# "LogFileMode" is the mode, on the basis of which both the LogFile just
-# mentioned and the LogFiles for HylaFAX are generated.
-#
-# default   0600
-#
-LogFileMode:            0600
-
-
-# Die geschweiften Klammern geben Anfang und Ende einer Section an.
-# Jede Section darf eine oder mehrere SubSections enthalten.
-# SubSubSections sind nicht erlaubt.
-# Dabei enthält die Section Angaben zu einem virtuellen Device;
-# die Subsection die Angaben für die Rufannahme jedes Controllers.
-# Es können beliebig viele Sections und, darin enthalten, jeweils beliebig
-# viele Subsections erzeugt werden.
-# Jede Section muss aber einen anderen HylafaxDeviceName erhalten;
-# zusätzlich muss in jeder Subsection innerhalb einer Section ein anderer
-# Controller aufgeführt werden. Beim Stand-Alone-Betrieb ist eine Section mit
-# entsprechend vielen Subsections ausreichend, da in diesem Betriebsmodus die
-# virtuellen DeviceNamen keine Rolle spielen.
-#
-# The curved brackets indicate the beginning and end of a section.
-# Each section may contain one or more subsections.
-# SubSubSections are not permitted.
-# The section contains information about a virtual device; the subsection the
-# call acceptance information for each controller.
-# Any number of sections containing any number of subsections may be
-# generated, but each section must receive a different HylafaxDeviceName; and
-# a different controller must be listed in every subsection within a section.
-# For stand-alone operation, it is sufficient to have just one section with
-# as many subsections as required, since virtual DeviceNames do not play
-# any role in this mode of operation.
-#
-{
-
-    # "HylafaxDeviceName" ist der Name, unter dem sich C4H bei HylaFAX als
-    # "virtuelles Modem" anmeldet. Sollen für HylaFAX mehrere dieser "Modems"
-    # erzeugt werden, legen Sie einfach eine neue Section mit einem anderen
-    # HylafaxDeviceName an.
-    #
-    # "HylafaxDeviceName" is the name, under which C4H registers in HylaFAX as
-    # a "virtual modem". If multiple "modems" are to be generated for HylaFAX,
-    # simply create a new section with another HylafaxDeviceName.
-    #
-    # default   faxCAPI
-    #
-    HylafaxDeviceName:          faxCAPI
-
-
-    # "RecvFileMode" ist der Mode, in dem empfangene Faxe abgespeichert
-    # werden. User und Group der Datei wird durch FaxReceiveUser (s.o.)
-    # festgelegt.
-    #
-    # "RecvFileMode" is the mode, in which received faxes are saved. User and
-    # Group of the file are determined by the FaxReceiveUser (see above).
-    #
-    # default   0600
-    #
-    RecvFileMode:               0600
-
-
-    # "FAXNumber" ist die eigene Nummer des Computers und wird der Gegenseite
-    # mitgeteilt (sichtbar z. B. im Fax-Journal).
-    #
-    # "FAXNumber" is the fax number of the computer itself and is transmitted
-    # to the remote site (visible in the Fax Journal).
-    #
-    # default   ""
-    #
-    FAXNumber:                  +49.00.00000
-
-
-    # "LocalIdentifier" ist der von CAPI aus konfigurierbare Teil der
-    # Kopfzeile. Ein leerer Eintrag führt dazu, dass keine Fax-Kopfzeile
-    # eingefügt wird.
-    #
-    # "LocalIdentifier" is the part of the fax header which can be configured
-    # from CAPI. An empty entry specifies an empty header.
-    #
-    # default   ""
-    #
-    LocalIdentifier:            "AVM CAPI4HylaFAX"
-
-
-    # Die maximale Anzahl von gleichzeitig empfangbaren Faxen kann
-    # durch "MaxConcurrentRecvs" angepaßt werden. Diese Anzahl wird
-    # durch die Anzahl der durch die Hardware zur Verfügung
-    # gestellten B-Kanäle begrenzt.
-    #
-    # The maximum number of faxes that can be received at the same
-    # time can be adjusted using "MaxConcurrentRecvs". This number
-    # is limited by the number of B channels provided by the hardware.
-    #
-    # default   2
-    #
-    MaxConcurrentRecvs:         2
-
-
-    # ----------- outgoing params -----------
-
-    # "OutgoingController" gibt den Controller an, über den eine externe
-    # Verbindung aufgebaut werden soll.
-    #
-    # "OutgoingController" indicates the controller which is to be used to
-    # establish an external connection.
-    #
-    # default   1
-    #
-    OutgoingController:         1
-
-
-    # Die "OutgoingMSN" ist die MSN, die für ausgehenden Faxe benutzt wird.
-    #
-    # The "OutgoingMSN" is the MSN used for outgoing faxes.
-    #
-    # default   ""
-    #
-    OutgoingMSN:
-
-
-    # CLIR (Rufnummernunterdrückung) kann über "SuppressMSN" und den Wert (0)
-    # abgeschaltet oder mit dem Wert (1) erneut angeschaltet werden.
-    #
-    # CLIR (Calling Line Identification Restriction) can be switched off using
-    # the value (0) or switched back on by entering the value (1).
-    #
-    # default   0
-    #
-    SuppressMSN:                0
-
-
-    # "NumberPrefix" wird vor jede Telefonnummer gestellt. Dies ist bei
-    # Nebenstellenanlagen wichtig, bei denen für den Aufbau einer externen
-    # Verbindung eine Ziffer vorgewählt werden muss.
-    #
-    # "NumberPrefix" is set to precede each telephone number. This is
-    # important for PBX systems which require that a number be dialed to
-    # obtain an outside line.
-    #
-    # default   ""
-    #
-    NumberPrefix:
-
-
-    # Wenn der Wert in "UseISDNFaxService" = 1 ist, wird ein ausgehender Ruf
-    # mit der ISDN-FAX-G3 Dienstekennung aufgebaut. Bei 0 wird eine 3.1kHz
-    # Audio-Verbindung hergestellt.
-    #
-    # When in "UseISDNFaxService" the value is = 1, an outoing call will be
-    # established using the ISDN-FAX-G3 service indicator. For 0, a 3.1kHz
-    # audio connection is established.
-    #
-    # default   0
-    #
-    UseISDNFaxService:          0
-
-
-    # Gibt die Dauer in Sekunden an, die auf eine Verbindungsannahme durch die
-    # Gegenseite gewartet wird. So wird beim Faxversand nicht automatisch die
-    # gesamte von der Telekom vorgegebene Wartezeit genutzt. Eine Angabe des
-    # Wertes 0 nutzt die gesamte Wartezeit.
-    #
-    # The duration in seconds you wait for the remote site to accept your
-    # outgoing call In this way you do not have to use the entire ringing
-    # duration preset by the telephone company. The default value 0 uses the
-    # entire ringing duration.
-    #
-    # default   0
-    #
-    RingingDuration:            0
-
-
-    # ----------- incoming params -----------
-    {
-
-        # Controller, für den diese Subsection gilt.
-        #
-        # Controller for which this subsection is valid.
-        #
-        # default   1
-        #
-        Controller:             1
-
-
-        # Wenn "AcceptSpeech" auf 1 steht, wird auch die Dienstekennung
-        # "Sprache" angenommen.
-        #
-        # If "AcceptSpeech" is set to 1, the service indicator "Voice" also
-        # will be accepted.
-        #
-        # default   0
-        #
-        AcceptSpeech:           1
-
-
-        # Sofern man DDI nutzen will, sollte man "UseDDI" auf 1 stellen.
-        #
-        # If DDI is to be used, "UseDDI" should be set to a value of 1.
-        #
-        # default   0
-        #
-        UseDDI:                 0
-
-
-        # Die DDI-Stammnummer wird bei "DDIOffset" eingetragen.
-        # Der Standardwert führt zu keinem korrekten Ergebnis und
-        # sollte, sofern "UseDDI" auf 1 gestellt wurde, immer
-        # verändert werden.
-        #
-        # "DDIOffset" indicates the DDI offset number which precedes
-        # extension number. Because the default value can't guarantee
-        # a correct result, this value should be modified whenever
-        # "UseDDI" is set to 1.
-        #
-        # default   ""
-        #
-        DDIOffset:              "12345"
-
-
-        # "DDILength" gibt die Anzahl der Durchwahlziffern an. (Diese Ziffern
-        # werden lediglich als Teil der Empfängernummer mitgeteilt.) Der
-        # Standardwert sollte bei Verwendung von DDI ebenfalls angepasst
-        # werden.
-        #
-        # "DDILength" indicates the number of digits in the extension. (These
-        # numbers are only used as a component of the recipient's number.) The
-        # default value should be adapted whenever DDI is used.
-        #
-        # default   0
-        #
-        DDILength:              3
-
-
-        # Bei "IncomingDDIs" können in einer durch Komma getrennten Liste alle
-        # Durchwahlziffern (DDIs) angegeben werden, für die Rufe angenommen
-        # werden sollen. Eine Bereichsangabe ist auch möglich (z.B. 100-300),
-        # wobei aber keine offenen Bereiche (z.B. -100) erlaubt sind.
-        # Sofern IncommingDDIs gesetzt ist, wird DDILength ignoriert.
-        #
-        # In "IncomingDDIs", all extension numbers (DDIs) for which calls are
-        # to be accepted may be listed, separated by commas. It is also
-        # possible to specify a range (e.g. 100-300); here no open ranges are
-        # permitted (e.g. -100). When the "IncomingDDIs" switch is set, the
-        # parameters for DDILength will be ignored.
-        #
-        # default   ""
-        #
-        IncomingDDIs:
-
-
-        # Bei "IncomingMSNs" können in einer durch Komma getrennten Liste alle
-        # MSNs angegeben werden, für die Rufe angenommen werden sollen. Ist
-        # die Liste leer, werden alle Rufe auf ISDN FAX G3, 3,1kHz Audio und
-        # eventuell "Sprache" angenommen.
-        # Wenn "UseDDI" auf 1 gestellt ist, wird "IncomingMSNs" ignoriert.
-        #
-        # In "IncomingMSNs", all MSNs for which calls are to be accepted may
-        # be listed, separated by commas. When the list is empty, all calls
-        # are accepted for ISDN FAX G3, 3,1kHz audio and perhaps "Voice".
-        # When "UseDDI" is set to 1, "IncomingMSNs" is ignored.
-        #
-        # default   ""
-        #
-        IncomingMSNs:
-
-
-        # Wenn "AcceptGlobalCall" auf 1 steht, werden auch Calls ohne
-        # Zielrufnummer (ohne MSN) angenommen.
-        # Notwendig hinter einigen Telefonanlagen, die keine Zielrufnummer
-        # senden.
-        #
-        # If "AcceptGlobalCall" is set to 1, calls without Called Party
-        # Number also will be accepted.
-        # Needed on internal ports of some PBX.
-        #
-        # default   1
-        #
-        AcceptGlobalCall:   1
-    }
-}
-
diff --git a/testing/mpd/PKGBUILD b/testing/mpd/PKGBUILD
deleted file mode 100644
index 3452276cc..000000000
--- a/testing/mpd/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 154008 2012-03-21 11:58:11Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=mpd
-pkgver=0.16.7
-pkgrel=2
-pkgdesc='Flexible, powerful, server-side application for playing music'
-url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
-         'sqlite3' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag'
-         'libpulse')
-makedepends=('doxygen')
-source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
-        'rc.d') 
-sha1sums=('878f3ce82d4f00f6cbad63a625b2c0274c4a704a'
-          '3777bdb4fff4b7911be3b1242aabae9d2912ef18')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--enable-lastfm \
-		--enable-jack \
-		--enable-pulse \
-		--enable-documentation \
-		--disable-libwrap \
-		--disable-cue \
-		--disable-sidplay \
-		--with-systemdsystemunitdir=/lib/systemd/system
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	sed \
-		-e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \
-		-e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \
-		-e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \
-		-e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \
-		-e '/^#user/c user "mpd"' \
-		-i doc/mpdconf.example
-
-	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/mpd
-	install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists
-	install -Dm644 doc/mpdconf.example "${pkgdir}"/usr/share/mpd/mpd.conf.example
-
-	cd "${pkgdir}"/usr/share/doc/mpd
-	tar cfJ api.tar.xz --remove-files api
-	rmdir developer protocol user
-}
diff --git a/testing/mpd/install b/testing/mpd/install
deleted file mode 100644
index 655645716..000000000
--- a/testing/mpd/install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-	getent group mpd &>/dev/null || groupadd -r -g 45 mpd >/dev/null
-	getent passwd mpd &>/dev/null || useradd -r -u 45 -g mpd -d /var/lib/mpd -s /bin/true -G audio mpd >/dev/null
-	echo '==> Now create a /etc/mpd.conf file; see: /usr/share/mpd/mpd.conf.example'
-}
-
-post_remove() {
-	getent passwd mpd &>/dev/null && userdel mpd >/dev/null
-	getent group mpd &>/dev/null && groupdel mpd >/dev/null
-}
diff --git a/testing/mpd/rc.d b/testing/mpd/rc.d
deleted file mode 100755
index 86f77419f..000000000
--- a/testing/mpd/rc.d
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[[ -d /run/mpd ]] || install -d -g mpd -o mpd /run/mpd
-
-case "$1" in
-	start)
-		stat_busy 'Starting Music Player Daemon'
-		/usr/bin/mpd /etc/mpd.conf &> /dev/null &&
-		{ add_daemon mpd; stat_done; } || stat_fail
-		;;
-	stop)
-		stat_busy 'Stopping Music Player Daemon'
-		/usr/bin/mpd --kill /etc/mpd.conf &> /dev/null &&
-		{ rm_daemon mpd; stat_done; } || stat_fail
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/msmtp/PKGBUILD b/testing/msmtp/PKGBUILD
deleted file mode 100644
index 14ab7906d..000000000
--- a/testing/msmtp/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 153973 2012-03-21 06:27:24Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: Ben Mazer <blm@groknil.org>
-
-pkgbase=msmtp
-pkgname=('msmtp' 'msmtp-mta')
-pkgver=1.4.27
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://msmtp.sourceforge.net"
-makedepends=('texlive-core' 'gsasl' 'libgnome-keyring')
-source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgbase}-${pkgver}.tar.bz2)
-sha1sums=('e335745133b4729fe84c49f836b4d2fa9281e040')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --with-ssl=gnutls
-  make
-  make -C doc html pdf
-}
-
-package_msmtp() {
-  pkgdesc="A mini smtp client"
-  depends=('gsasl' 'libgnome-keyring')
-  install=msmtp.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install 
-  make DESTDIR="${pkgdir}" -C doc install-html install-pdf
-
-# Installing example configs and scripts to /usr/share/doc/msmtp
-# as they are not installed by default (Debian and Gentoo do it this way)
-  install -d "${pkgdir}/usr/share/doc/msmtp"
-  cp -r scripts/{find_alias,msmtp-gnome-tool,msmtpqueue,msmtpq,set_sendmail} "${pkgdir}/usr/share/doc/msmtp/"
-  install -D -m644 doc/*.example "${pkgdir}/usr/share/doc/msmtp/"
-
-  install -D -m644 scripts/vim/msmtp.vim "${pkgdir}/usr/share/vim/vimfiles/syntax/msmtp.vim"
-}
-
-package_msmtp-mta() {
-  pkgdesc="A mini smtp client - the regular MTA"
-  depends=('msmtp')
-  provides=('smtp-forwarder')
-
-  install -d "${pkgdir}/usr/sbin"
-  ln -s /usr/bin/msmtp "${pkgdir}/usr/sbin/sendmail"
-}
diff --git a/testing/msmtp/msmtp.install b/testing/msmtp/msmtp.install
deleted file mode 100644
index c4dd76476..000000000
--- a/testing/msmtp/msmtp.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(msmtp.info)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/openssh/sshd.close-sessions b/testing/openssh/sshd.close-sessions
deleted file mode 100644
index be2a709fc..000000000
--- a/testing/openssh/sshd.close-sessions
+++ /dev/null
@@ -1,17 +0,0 @@
-# Close sshd sessions before shutting down the network; see FS#17389.
-
-sshd_close_sessions () {
-	if ck_daemon sshd; then
-		return
-	fi
-	/etc/rc.d/sshd stop
-	stat_busy "Stopping Secure Shell Sessions"
-	for i in $(pgrep sshd); do
-		if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then
-			kill $i
-		fi
-	done &>/dev/null
-	stat_done
-}
-
-add_hook shutdown_start sshd_close_sessions
diff --git a/testing/sqlite3/PKGBUILD b/testing/sqlite3/PKGBUILD
deleted file mode 100644
index 85996bf3c..000000000
--- a/testing/sqlite3/PKGBUILD
+++ /dev/null
@@ -1,88 +0,0 @@
-# $Id: PKGBUILD 154034 2012-03-21 19:28:02Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgbase="sqlite3"
-pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') 
-_amalgamationver=3071100
-_amalgamationver2=${_amalgamationver/00/}
-_docver=${_amalgamationver}	#3070700
-#pkgver=${_amalgamationver2//0/.}
-pkgver=3.7.11
-pkgrel=1
-pkgdesc="A C library that implements an SQL database engine"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.sqlite.org/"
-makedepends=('tcl' 'readline>=6.0.00')
-source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
-	http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
-	#http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip
-	http://www.sqlite.org/sqlite-doc-${_docver}.zip
-	license.txt)
-options=('!libtool' '!emptydirs')
-md5sums=('0552d71bda98ebdcaea305cd6058221b'
-         'c1fb48beff33612b2c7f5ae6ab17a601'
-         'c1cdbc5544034d9012e421e75a5e4890')
-
-build() {
-  export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE"
-
-  # build sqlite
-  cd "$srcdir"/sqlite-autoconf-$_amalgamationver
-  ./configure --prefix=/usr \
-	--disable-static
-  make
-  
-  # build the tcl extension    
-  cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea
-  ./configure --prefix=/usr \
-	--with-system-sqlite
-  make
-
-}
-
-package_sqlite3() {
- 
- pkgdesc="A C library that implements an SQL database engine"
- depends=('readline>=6.0.00')
- conflicts=('sqlite')
- replaces=('sqlite')
- 
-  cd ${srcdir}/sqlite-autoconf-$_amalgamationver
-  make DESTDIR=${pkgdir} install
-  
-  # license
-  install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
-}
-
-package_sqlite3-tcl() {
- 
- pkgdesc="sqlite3 Tcl Extension Architecture (TEA)"
- depends=('sqlite3>=3.7.5')
-
-  cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea
-  make DESTDIR=${pkgdir} install
-}
-
-package_sqlite3-doc() {
- pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation"
- #arch=('any') - not yet supported
-
-  #cd ${srcdir}/sqlite-doc-${_amalgamationver}
-  cd ${srcdir}/sqlite-doc-${_docver}
-  mkdir -p ${pkgdir}/usr/share/doc/${pkgbase}
-  cp -R *  ${pkgdir}/usr/share/doc/${pkgbase}/
-  
-  # fix permissions and remove obsolete files; https://bugs.archlinux.org/task/24605
-  find ${pkgdir} -type f -perm 755 -exec ls -lha {} \;
-  find ${pkgdir} -type f -perm 755 -exec chmod 644 {} \;
-
-  find ${pkgdir} -type f -name '*~' -exec ls -lha {} \;
-  find ${pkgdir} -type d -name '*~' -exec ls -lha {} \;
-  find ${pkgdir} -name '*~' -exec rm -f {} \;
-
-  find ${pkgdir} -type f -name '.~*' -exec ls -lha {} \; # /build/pkg/sqlite3-doc/usr/share/doc/sqlite3/images/fileformat/.~lock.indexpage.odg#
-  find ${pkgdir} -type d -name '.~*' -exec ls -lha {} \;
-  find ${pkgdir} -name '.~*' -exec rm -f {} \;
-}
diff --git a/testing/sqlite3/license.txt b/testing/sqlite3/license.txt
deleted file mode 100644
index 118c5d5e6..000000000
--- a/testing/sqlite3/license.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-SQLite Copyright
-SQLite is in the
-Public Domain 
-
-
-All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. 
-
-The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library. 
-
-All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects. 
-Obtaining An Explicit License To Use SQLite
-
-Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include: 
-You are using SQLite in a jurisdiction that does not recognize the public domain. 
-You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain. 
-You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite. 
-Your legal department tells you that you have to purchase a license. 
-
-If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one. 
-Contributed Code
-
-In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement: 
-The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law. 
-
-We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to:
-Hwaci
-6200 Maple Cove Lane
-Charlotte, NC 28269
-USA 
-
-A template copyright release is available in PDF or HTML. You can use this release to make future changes.
-
-see http://www.sqlite.org/copyright.html
\ No newline at end of file
diff --git a/testing/wpa_actiond/PKGBUILD b/testing/wpa_actiond/PKGBUILD
deleted file mode 100644
index 69f44daa1..000000000
--- a/testing/wpa_actiond/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 153826 2012-03-19 19:35:14Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-pkgname=wpa_actiond
-pkgver=1.2
-pkgrel=1
-pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events"
-arch=('i686' 'x86_64')
-url="http://projects.archlinux.org/wpa_actiond.git/"
-license=('GPL')
-depends=('glibc' 'wpa_supplicant')
-source=(ftp://ftp.archlinux.org/other/wpa_actiond/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('578efa1141fbf1acb56efff8061f4ac7ab99f257f8a3e1588db51a8ce77ac2b5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  install -D -m755 wpa_actiond "${pkgdir}/usr/sbin/wpa_actiond"
-}
-# vim:set ts=2 sw=2 et:
diff --git a/testing/xf86-video-neomagic/git-fixes.diff b/testing/xf86-video-neomagic/git-fixes.diff
deleted file mode 100644
index dafba0b2f..000000000
--- a/testing/xf86-video-neomagic/git-fixes.diff
+++ /dev/null
@@ -1,616 +0,0 @@
-From eba90ed039416fa5db1800ce695d2a970f43b0e0 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Tue, 20 Jul 2010 20:15:29 +0000
-Subject: config: upgrade to util-macros 1.8 for additional man page support
-
-Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
-The value of MAN_SUBST is the same for all X.Org packages.
----
-diff --git a/configure.ac b/configure.ac
-index 38cba3a..a80955b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -34,10 +34,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
- 
- AM_MAINTAINER_MODE
- 
--# Require xorg-macros: XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
--          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.3)
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
- # Checks for programs.
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 8f2454b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
--
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
--
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-+
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-+
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
---
-cgit v0.9.0.2-2-gbebe
-From 9ad3e98825d45208ed2754f592527a05949f676d Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Tue, 20 Jul 2010 22:45:19 +0000
-Subject: config: update AC_PREREQ statement to 2.60
-
-Unrelated to the previous patches, the new value simply reflects
-the reality that the minimum level for autoconf to configure
-all x.org modules is 2.60 dated June 2006.
-
-ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index a80955b..1c7ff1a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,7 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-neomagic],
-         1.2.5,
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
---
-cgit v0.9.0.2-2-gbebe
-From 788fa461f40c320c3b9a67ab9bc914e987eefd42 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Tue, 20 Jul 2010 23:41:31 +0000
-Subject: config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
-
-XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
-AC_PROG_C_C99. This sets gcc with -std=gnu99.
-If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 1c7ff1a..aa17100 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -43,7 +43,6 @@ XORG_DEFAULT_OPTIONS
- # Checks for programs.
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- AH_TOP([#include "xorg-server.h"])
- 
---
-cgit v0.9.0.2-2-gbebe
-From adb592292e40a5e5f032ca95f3371c6b77227c40 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 00:24:42 +0000
-Subject: config: remove unrequired AC_HEADER_STDC
-
-Autoconf says:
-"This macro is obsolescent, as current systems have conforming
-header files. New programs need not use this macro".
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index aa17100..30c0e86 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -79,8 +79,6 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
- 	      [#include "xorg-server.h"])
- CPPFLAGS="$SAVE_CPPFLAGS"
- 
--# Checks for header files.
--AC_HEADER_STDC
- 
- if test "x$XSERVER_LIBPCIACCESS" = xyes; then
-     PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
---
-cgit v0.9.0.2-2-gbebe
-From 5759eca769091518fd54e0d70193edc3c099e9bb Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 01:44:57 +0000
-Subject: config: remove unrequired AC_SUBST([XORG_CFLAGS])
-
-This macro is called by PKG_CHECK_MODULES
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 30c0e86..86f016f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -86,7 +86,6 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=neomagic
---
-cgit v0.9.0.2-2-gbebe
-From bcfba240265ecd633fcba051591b6c50b9373a53 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 13:27:42 +0000
-Subject: config: complete AC_INIT m4 quoting
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 86f016f..46cb0cc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,9 +22,9 @@
- 
- AC_PREREQ([2.60])
- AC_INIT([xf86-video-neomagic],
--        1.2.5,
-+        [1.2.5],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-neomagic)
-+        [xf86-video-neomagic])
- 
- AC_CONFIG_SRCDIR([Makefile.am])
- AM_CONFIG_HEADER([config.h])
---
-cgit v0.9.0.2-2-gbebe
-From 2f60a6e4c3be390d4cf0648bdffbdbff67def7ee Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 18:05:22 +0000
-Subject: config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 46cb0cc..7261ed5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,7 +27,7 @@ AC_INIT([xf86-video-neomagic],
-         [xf86-video-neomagic])
- 
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
---
-cgit v0.9.0.2-2-gbebe
-From 8486ae164b462d50817b84340af13dccc26384ab Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 18:37:41 +0000
-Subject: config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 7261ed5..1d0a3d3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -47,7 +47,7 @@ AC_PROG_LIBTOOL
- AH_TOP([#include "xorg-server.h"])
- 
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
---
-cgit v0.9.0.2-2-gbebe
-From 5e0d301758b15fc1916dd0318f2a5549e3482ccf Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 20:07:00 +0000
-Subject: config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 1d0a3d3..73dde93 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -91,8 +91,9 @@ AC_SUBST([moduledir])
- DRIVER_NAME=neomagic
- AC_SUBST([DRIVER_NAME])
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
---
-cgit v0.9.0.2-2-gbebe
-From dd32df772bdf4462b816bfc2f98ccd18dbb4b930 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 20:49:04 +0000
-Subject: config: add comments for main statements
-
----
-diff --git a/configure.ac b/configure.ac
-index 73dde93..befac41 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,18 +20,18 @@
- #
- # Process this file with autoconf to produce a configure script
- 
-+# Initialize Autoconf
- AC_PREREQ([2.60])
- AC_INIT([xf86-video-neomagic],
-         [1.2.5],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
-         [xf86-video-neomagic])
--
- AC_CONFIG_SRCDIR([Makefile.am])
- AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
- 
- # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-@@ -40,12 +40,13 @@ m4_ifndef([XORG_MACROS_VERSION],
- XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
-             AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-@@ -53,14 +54,14 @@ AC_ARG_WITH(xorg-module-dir,
-             [moduledir="$libdir/xorg/modules"])
- 
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
- 
- save_CFLAGS="$CFLAGS"
---
-cgit v0.9.0.2-2-gbebe
-From a9d69f6d0ab4f66b954949cca016ee7b5b6f7adf Mon Sep 17 00:00:00 2001
-From: Jesse Adkins <jesserayadkins@gmail.com>
-Date: Tue, 28 Sep 2010 20:29:51 +0000
-Subject: Purge cvs tags.
-
-Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/man/neomagic.man b/man/neomagic.man
-index 9daffe5..af8181c 100644
---- a/man/neomagic.man
-+++ b/man/neomagic.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.man,v 1.5 2003/05/29 21:48:09 herrb Exp $ 
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH NEOMAGIC __drivermansuffix__ __vendorversion__
---
-cgit v0.9.0.2-2-gbebe
-From c3cf7e328d7e9c276a3e237dbf9d1772b57a370e Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Tue, 11 Oct 2011 17:43:51 +0000
-Subject: Use malloc/calloc/realloc/free directly
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/neo_dga.c b/src/neo_dga.c
-index 4227da6..3e2a02e 100644
---- a/src/neo_dga.c
-+++ b/src/neo_dga.c
-@@ -86,10 +86,10 @@ NEODGAInit(ScreenPtr pScreen)
- 
-    while(pMode) {
- 
--	newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
-+	newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
- 
- 	if(!newmodes) {
--	   xfree(modes);
-+	   free(modes);
- 	   return FALSE;
- 	}
- 	modes = newmodes;
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index b12c125..c51dad4 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -475,7 +475,7 @@ NEOFreeRec(ScrnInfoPtr pScrn)
- {
-     if (pScrn->driverPrivate == NULL)
- 	return;
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -551,7 +551,7 @@ NEOProbe(DriverPtr drv, int flags)
- 		    foundScreen = TRUE;
- 		}
- 	    }
--	    xfree(usedChips);
-+	    free(usedChips);
- 	}
-     }
- 
-@@ -584,11 +584,11 @@ NEOProbe(DriverPtr drv, int flags)
- 	    foundScreen = TRUE;
- 	}
-       }
--      xfree(usedChips);
-+      free(usedChips);
-     }
- #endif
- 
--    xfree(devSections);
-+    free(devSections);
-     return foundScreen;
- }
- 
-@@ -940,11 +940,11 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
-     xf86CollectOptions(pScrn, NULL);
-     /* Process the options */
-     if (nPtr->NeoChipset == NM2070) {
--	if (!(nPtr->Options = xalloc(sizeof(NEO_2070_Options))))
-+	if (!(nPtr->Options = malloc(sizeof(NEO_2070_Options))))
- 	    return FALSE;
- 	memcpy(nPtr->Options, NEO_2070_Options, sizeof(NEO_2070_Options));
-     } else {
--	if (!(nPtr->Options = xalloc(sizeof(NEOOptions))))
-+	if (!(nPtr->Options = malloc(sizeof(NEOOptions))))
- 	    return FALSE;
- 	memcpy(nPtr->Options, NEOOptions, sizeof(NEOOptions));
-     }
-@@ -1476,7 +1476,7 @@ NEOScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     
-     if(nPtr->shadowFB) {
- 	nPtr->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
--	nPtr->ShadowPtr = xalloc(nPtr->ShadowPitch * height);
-+	nPtr->ShadowPtr = malloc(nPtr->ShadowPitch * height);
- 	displayWidth = nPtr->ShadowPitch / (pScrn->bitsPerPixel >> 3);
- 	FBStart = nPtr->ShadowPtr;
-     } else {
-@@ -1789,7 +1789,7 @@ NEOCloseScreen(int scrnIndex, ScreenPtr pScreen)
-     if (nPtr->CursorInfo)
- 	xf86DestroyCursorInfoRec(nPtr->CursorInfo);
-     if (nPtr->ShadowPtr)
--	xfree(nPtr->ShadowPtr);
-+	free(nPtr->ShadowPtr);
- 
-     pScrn->vtSema = FALSE;
-     pScreen->CloseScreen = nPtr->CloseScreen;
-@@ -2860,7 +2860,7 @@ neoModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     if (NeoNew->reg) {
- 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- 		   "Non-NULL reg in NeoInit: reg=%p\n", (void *)NeoNew->reg);
--	xfree(NeoNew->reg);
-+	free(NeoNew->reg);
- 	NeoNew->reg = NULL;
-     }
- 
-diff --git a/src/neo_video.c b/src/neo_video.c
-index a9e1e25..0edae30 100644
---- a/src/neo_video.c
-+++ b/src/neo_video.c
-@@ -99,7 +99,7 @@ NEOInitVideo(ScreenPtr pScreen)
- 	    numAdaptors = 1;
- 	    overlayAdaptors = &newAdaptor;
- 	} else {
--	    newAdaptors = xalloc((numAdaptors + 1) 
-+	    newAdaptors = malloc((numAdaptors + 1) 
- 				 * sizeof(XF86VideoAdaptorPtr*));
- 	    if (newAdaptors){
- 		memcpy(newAdaptors, overlayAdaptors, 
-@@ -114,7 +114,7 @@ NEOInitVideo(ScreenPtr pScreen)
- 	xf86XVScreenInit(pScreen, overlayAdaptors, numAdaptors);
- 
-     if (newAdaptors)
--	xfree(newAdaptors);
-+	free(newAdaptors);
- }
- 
- static XF86VideoEncodingRec NEOVideoEncodings[] =
-@@ -211,7 +211,7 @@ NEOSetupVideo(ScreenPtr pScreen)
- #ifdef DEBUG
-     xf86DrvMsg(pScrn->scrnIndex,X_INFO,"NEOSetupVideo\n");
- #endif
--    if ((overlayAdaptor = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+    if ((overlayAdaptor = calloc(1, sizeof(XF86VideoAdaptorRec) +
- 			      sizeof(DevUnion) + 
- 			      sizeof(NEOPortRec))) == NULL){
- 	return (NULL);
-@@ -918,7 +918,7 @@ NEOInitOffscreenImages(ScreenPtr pScreen)
- #ifdef DEBUG
-     xf86DrvMsg(xf86Screens[pScreen->myNum]->scrnIndex,X_INFO,"NEOInitOffscreenImages\n");
- #endif
--    if ((offscreenImages = xalloc(sizeof(XF86OffscreenImageRec))) == NULL){
-+    if ((offscreenImages = malloc(sizeof(XF86OffscreenImageRec))) == NULL){
- 	return;
-     }
- 
-@@ -1017,19 +1017,19 @@ NEOAllocSurface(ScrnInfoPtr pScrn, int id,
- 
-     surface->width = width;
-     surface->height = height;
--    if ((surface->pitches = xalloc(sizeof(int))) == NULL){
-+    if ((surface->pitches = malloc(sizeof(int))) == NULL){
- 	xf86FreeOffscreenLinear(linear);
- 	return (BadAlloc);
-     }
--    if ((surface->offsets = xalloc(sizeof(int))) == NULL){
--	xfree(surface->pitches);
-+    if ((surface->offsets = malloc(sizeof(int))) == NULL){
-+	free(surface->pitches);
- 	xf86FreeOffscreenLinear(linear);
- 	return (BadAlloc);
-     }
- 
--    if ((pPriv = xalloc(sizeof(NEOOffscreenRec))) == NULL){
--	xfree(surface->pitches);
--	xfree(surface->offsets);
-+    if ((pPriv = malloc(sizeof(NEOOffscreenRec))) == NULL){
-+	free(surface->pitches);
-+	free(surface->offsets);
- 	xf86FreeOffscreenLinear(linear);
- 	return (BadAlloc);
-     }
-@@ -1057,9 +1057,9 @@ NEOFreeSurface(XF86SurfacePtr surface)
- 	NEOStopSurface(surface);
- 
-     xf86FreeOffscreenLinear(pPriv->linear);
--    xfree(surface->pitches);
--    xfree(surface->offsets);
--    xfree(surface->devPrivate.ptr);
-+    free(surface->pitches);
-+    free(surface->offsets);
-+    free(surface->devPrivate.ptr);
-     return (Success);
- }
- 
---
-cgit v0.9.0.2-2-gbebe
-From f2a771c6d2a2308245a0d46301e579b50fb2b6bd Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Tue, 11 Oct 2011 17:45:11 +0000
-Subject: Include <stdlib.h> for abs()
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index c51dad4..f8bca2c 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -107,6 +107,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #include "scrnintstr.h"
- #include "servermd.h"
- 
-+#include <stdlib.h>
- #include <unistd.h>
- 
- /* Mandatory functions */
---
-cgit v0.9.0.2-2-gbebe
-From 07845a120a674380b6b499961e6c81accfdd6a2e Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 19 Dec 2011 21:50:28 +0000
-Subject: Fall back to shadowfb when XAA is unavailable
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index f8bca2c..a034f86 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -1089,6 +1089,18 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
-     if (nPtr->showcache)
- 	xf86DrvMsg(pScrn->scrnIndex,X_CONFIG,
- 		   "Show chache for debugging\n");
-+
-+    if (!xf86LoadSubModule(pScrn, "xaa")) {
-+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadow\n");
-+	nPtr->shadowFB = 1;
-+    }
-+
-+    if (nPtr->shadowFB) {
-+	if (!xf86LoadSubModule(pScrn, "shadow")) {
-+	    RETURN;
-+	}
-+    }
-+
-     if (nPtr->shadowFB) {
-         nPtr->noAccel = TRUE;
-         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, 
-@@ -1314,15 +1326,6 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
- 	RETURN;
-     }
- 
--    if (!xf86LoadSubModule(pScrn, "xaa")) 
--        RETURN;
--
--    if (nPtr->shadowFB) {
--	if (!xf86LoadSubModule(pScrn, "shadow")) {
--	    RETURN;
--	}
--    }
--    
-     if (!nPtr->swCursor) {
- 	if (!xf86LoadSubModule(pScrn, "ramdac"))
- 	    RETURN;
---
-cgit v0.9.0.2-2-gbebe
-From 819c8f2119b8db10a6a9e4553cf88d66cff6eb8e Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 19 Dec 2011 21:51:31 +0000
-Subject: Fix for new vgahw ABI
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index a034f86..509a77f 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -660,6 +660,7 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
-     if (!vgaHWGetHWRec(pScrn))
- 	return FALSE;
-     hwp = VGAHWPTR(pScrn);
-+    vgaHWSetStdFuncs(hwp);
- 
-     /* Allocate the NeoRec driverPrivate */
-     if (!NEOGetRec(pScrn)) {
---
-cgit v0.9.0.2-2-gbebe