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

Conflicts:
	community-testing/hostapd/PKGBUILD
	community/discid/PKGBUILD
	community/dumb/PKGBUILD
	community/dynamite/PKGBUILD
	community/echat/PKGBUILD
	community/fbdump/PKGBUILD
	community/fldiff/PKGBUILD
	community/flightgear/PKGBUILD
	community/fonteditfs/PKGBUILD
	community/freehdl/PKGBUILD
	community/unclutter/PKGBUILD
	community/unpaper/PKGBUILD
	community/wmii/PKGBUILD
	community/xkeycaps/PKGBUILD
	community/xl2tpd/PKGBUILD
	community/xmmsctrl/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/inkscape/PKGBUILD
	extra/ntp/PKGBUILD
	extra/transmission/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	testing/libreoffice/PKGBUILD

21 files changed, 0 insertions, 1270 deletions

diff --git a/community-testing/courier-authlib/PKGBUILD b/community-testing/courier-authlib/PKGBUILD
deleted file mode 100644
index 1e80603f7..000000000
--- a/community-testing/courier-authlib/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 64621 2012-02-17 12:32:40Z spupykin $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=courier-authlib
-pkgver=0.63.0
-pkgrel=8
-pkgdesc="Authentification library for the courier mailserver(s)"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://courier-mta.org/authlib/"
-backup=('etc/authlib/authdaemonrc' 'etc/authlib/authldaprc' \
-        'etc/authlib/authmysqlrc' 'etc/authlib/authpgsqlrc')
-depends=('openssl' 'gdbm' 'perl' 'libtool' 'expect')
-makedepends=('pam' 'expect' 'libldap' 'libmysqlclient' 'postgresql-libs>=8.3.0')
-optdepends=('libmysqlclient' 'libldap' 'postgresql-libs')
-conflicts=('courier-imap-mysql' 'courier-imap-pgsql' 'courier-imap-ldap')
-provides=('courier-imap-mysql' 'courier-imap-pgsql' 'courier-imap-ldap')
-options=(!libtool)
-install=${pkgname}.install
-source=(http://downloads.sourceforge.net/project/courier/authlib/${pkgver}/${pkgname}-${pkgver}.tar.bz2
-        authdaemond.rc.d)
-md5sums=('411a927d178f783a1e8fab9964ce0dd2'
-         '7de75a9a74796f4fd2e81fd3ca16ed8d')
-
-build() {
-  #export MAKEFLAGS="-j1"
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libdir=/usr/lib \
-    --libexecdir=/usr/lib \
-    --with-db=gdbm \
-    --with-mailuser=courier --with-mailgroup=courier \
-    --with-authpam --with-authpwd --with-authshadow \
-    --with-authldap --with-authmysql --with-authpgsql \
-    --with-authuserdb --with-authcram --with-authdaemon \
-    --with-authdaemonvar=/var/run/authdaemon
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  ###############################################################################
-  # post_installation ---- rename the config file and change ownerschip
-  for distfile in ${pkgdir}/etc/authlib/*.dist; do
-    chown 72:72 ${distfile}
-    mv ${distfile} ${pkgdir}/etc/authlib/`basename ${distfile} .dist`
-  done
-   # copy the .schema; mostly refered to as courier.schema -> rename it
-  install -Dm 444 authldap.schema \
-    ${pkgdir}/etc/openldap/schema/courier.schema
-  ###############################################################################
-  # Install daemon, that wraps couriers bashscript
-  install -Dm 755 ${srcdir}/authdaemond.rc.d ${pkgdir}/etc/rc.d/authdaemond
-  #mkdir -p ${pkgdir}/var/spool/authdaemon
-  #chown -R 72:72 ${pkgdir}/var/spool/authdaemon
-  mkdir -p ${pkgdir}/var/spool/courier
-  chown -R 72:72 ${pkgdir}/var/spool/courier
-  chown -R 72:72 ${pkgdir}/var/run/authdaemon
-  # docs say we can remove .a files after make
-  find ${pkgdir} -name '*\.a' -exec rm -f {} \;
-  # Make libs available to /usr/lib
-  cd $pkgdir/usr/lib
-  for lib in courier-authlib/*.so; do
-      ln -s $lib .
-  done
-}
diff --git a/community-testing/courier-authlib/authdaemond.rc.d b/community-testing/courier-authlib/authdaemond.rc.d
deleted file mode 100644
index 791c3d122..000000000
--- a/community-testing/courier-authlib/authdaemond.rc.d
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-start() {
-  [ -d /var/run/authdaemon ] || mkdir -p /var/run/authdaemon
-  chown courier:courier /var/run/authdaemon
-
-  stat_busy "Starting Authdaemond"
-  /usr/sbin/authdaemond start &> /dev/null
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    add_daemon authdaemond
-    stat_done
-  fi
-}
-
-stop() {
-  stat_busy "Stopping Authdaemond"
-  /usr/sbin/authdaemond stop &> /dev/null
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    rm -f /var/run/authdaemon/{pid.lock,pid,socket} &> /dev/null
-
-    # TODO: Take these out at some point, they're only cleanup for old way
-    rm -f /var/run/authdaemond.pid &> /dev/null
-    rm -f /var/spool/authdaemon/{pid.lock,pid,socket} &> /dev/null
-
-    rm_daemon authdaemond
-    stat_done
-  fi
-}
-
-case "$1" in
-  start)
-    start
-    ;;
-  stop)
-    stop
-    ;;
-  restart)
-    # calling 'stop' and 'start' without the $0 fails...
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/courier-authlib/courier-authlib.install b/community-testing/courier-authlib/courier-authlib.install
deleted file mode 100644
index cbccc636b..000000000
--- a/community-testing/courier-authlib/courier-authlib.install
+++ /dev/null
@@ -1,32 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-   # creates group and user on virgin systems
-  if [ -z "`grep '^courier::' /etc/group`" ]; then
-    groupadd -g 72 courier >& /dev/null
-  fi
-  if [ -z "`grep '^courier:' /etc/passwd`" ]; then
-    useradd -u 72 -d /var/spool/courier -g courier -s /bin/false courier &>/dev/null
-  fi
-}
-
-# 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 courier &> /dev/null
-    groupdel courier &> /dev/null
-}
-
-
-post_remove() {
- /bin/true
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/community-testing/freeradius/PKGBUILD b/community-testing/freeradius/PKGBUILD
deleted file mode 100644
index 205bd828b..000000000
--- a/community-testing/freeradius/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 64623 2012-02-17 12:33:33Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Jason R Begley (jayray@digitalgoat.com>
-
-pkgname=freeradius
-pkgver=2.1.12
-pkgrel=4
-pkgdesc="The premier open source RADIUS server"
-arch=('i686' 'x86_64')
-url="http://www.freeradius.org/"
-license=("GPL")
-depends=('openssl' 'krb5' 'pth' 'libldap>=2.4.18' 'net-snmp' 'pam'
-	 'postgresql-libs>=9.0.3' 'libtool' 'libmysqlclient' 'gdbm' 'shadow')
-makedepends=('libpcap' 'unixodbc' 'python2')
-optdepends=('libpcap' 'unixodbc' 'python2')
-options=('!libtool' 'emptydirs' '!makeflags')
-install=$pkgname.install
-source=(ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2
-	radiusd
-	krb5-build-fix.patch)
-md5sums=('862d3a2c11011e61890ba84fa636ed8c'
-         'f1a6530b1b69d2fa793aa45b2de379bb'
-         'c6a61de7576933f59154a53bfc12a2d2')
-
-build() {
-  cd $srcdir/freeradius-server-$pkgver
-  export CFLAGS="$CFLAGS -fno-strict-aliasing"
-  sed -i 's/ -DKRB5_DEPRECATED//' src/modules/rlm_krb5/Makefile.in
-  patch -p1 <$srcdir/krb5-build-fix.patch
-  ./configure --with-system-libtool --with-system-libltdl \
-	      --prefix=/usr --enable-heimdal-krb5 \
-	      --localstatedir=/var \
-	      --sysconfdir=/etc \
-	      --libdir=/usr/lib/freeradius
-  make
-}
-
-package() {
-  cd $srcdir/freeradius-server-$pkgver
-  make install R=$pkgdir
-  install -D -m755 ../radiusd $pkgdir/etc/rc.d/radiusd
-  chmod o+r $pkgdir/etc/raddb/*
-  mv $pkgdir/etc/raddb $pkgdir/etc/raddb.default
-  rm -rf $pkgdir/var/run
-}
diff --git a/community-testing/freeradius/freeradius.install b/community-testing/freeradius/freeradius.install
deleted file mode 100644
index c3b9f9415..000000000
--- a/community-testing/freeradius/freeradius.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-    groupadd -r radiusd
-    useradd -r -m -d /var/lib/radiusd -g radiusd -s /bin/false radiusd
-
-    touch /var/log/radius/radius.log
-    chown -R radiusd.radiusd /var/log/radius/radius.log
-
-    [ -d /etc/raddb ] || cp -a /etc/raddb.default /etc/raddb
-
-    /bin/true
-}
-
-pre_remove() {
-    /etc/rc.d/radiusd stop
-    /bin/true
-}
-
-post_remove() {
-    userdel radiusd
-    groupdel radiusd
-    /bin/true
-}
diff --git a/community-testing/freeradius/krb5-build-fix.patch b/community-testing/freeradius/krb5-build-fix.patch
deleted file mode 100644
index 11dae7090..000000000
--- a/community-testing/freeradius/krb5-build-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -wbBur freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c
---- freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c	2010-09-28 11:03:56.000000000 +0000
-+++ freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c	2011-04-29 09:26:10.000000000 +0000
-@@ -375,7 +375,7 @@
- 	 * Heimdal krb5 verification
- 	 */
- 	radlog(L_AUTH, "rlm_krb5: Parsed name is: %s@%s\n",
--	       *userP->name.name_string.val,
-+	       "-" /* *userP->name.name_string.val*/,
- 	       userP->realm);
- 
- 	krb5_cc_default(context, &id);
-@@ -390,7 +390,7 @@
- 
-        radlog(L_AUTH, "rlm_krb5: failed verify_user: %s (%s@%s )",
- 	      error_message(ret),
--	      *userP->name.name_string.val,
-+	      "-" /* *userP->name.name_string.val */,
- 	      userP->realm);
- 
-        return RLM_MODULE_REJECT;
diff --git a/community-testing/freeradius/radiusd b/community-testing/freeradius/radiusd
deleted file mode 100644
index bf872b6f2..000000000
--- a/community-testing/freeradius/radiusd
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/radiusd`
-case "$1" in
-  start)
-    stat_busy "Starting radiusd Server"
-
-    [ -d /var/run/radiusd ] || mkdir -p /var/run/radiusd
-    [ -f /var/run/radiusd/radiusd.pid ] || touch /var/run/radiusd/radiusd.pid
-    chown -R radiusd.radiusd /var/run/radiusd
-
-    [ -z "$PID" ] && /usr/sbin/radiusd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/radiusd.pid
-      add_daemon radiusd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping radiusd Server"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/radiusd.pid
-      rm_daemon radiusd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/ipvsadm/01-fix-not-showing-all-server.patch b/community-testing/ipvsadm/01-fix-not-showing-all-server.patch
deleted file mode 100644
index dea23bf76..000000000
--- a/community-testing/ipvsadm/01-fix-not-showing-all-server.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN ipvsadm-1.26.vanilla/libipvs/ip_vs.h ipvsadm-1.26/libipvs/ip_vs.h
---- ipvsadm-1.26.vanilla/libipvs/ip_vs.h	2011-02-06 18:38:57.000000000 -0800
-+++ ipvsadm-1.26/libipvs/ip_vs.h	2011-08-23 15:03:59.000000000 -0700
-@@ -413,7 +413,7 @@
- 	__IPVS_CMD_ATTR_MAX,
- };
-
--#define IPVS_CMD_ATTR_MAX (__IPVS_SVC_ATTR_MAX - 1)
-+#define IPVS_CMD_ATTR_MAX (__IPVS_CMD_ATTR_MAX - 1)
-
- /*
-  * Attributes used to describe a service
-diff -urN ipvsadm-1.26.vanilla/libipvs/ip_vs_nl_policy.c
-ipvsadm-1.26/libipvs/ip_vs_nl_policy.c
---- ipvsadm-1.26.vanilla/libipvs/ip_vs_nl_policy.c	2008-09-18
-08:57:37.000000000 -0700
-+++ ipvsadm-1.26/libipvs/ip_vs_nl_policy.c	2011-08-23 14:45:34.000000000 -0700
-@@ -26,6 +26,8 @@
- 	[IPVS_SVC_ATTR_TIMEOUT]		= { .type = NLA_U32 },
- 	[IPVS_SVC_ATTR_NETMASK]		= { .type = NLA_U32 },
- 	[IPVS_SVC_ATTR_STATS]		= { .type = NLA_NESTED },
-+	[IPVS_SVC_ATTR_PE_NAME]		= { .type = NLA_STRING,
-+					    .maxlen = IP_VS_PENAME_MAXLEN},
- };
diff --git a/community-testing/libvirt/PKGBUILD b/community-testing/libvirt/PKGBUILD
deleted file mode 100644
index c537ce978..000000000
--- a/community-testing/libvirt/PKGBUILD
+++ /dev/null
@@ -1,88 +0,0 @@
-# $Id: PKGBUILD 64585 2012-02-16 20:41:38Z heftig $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Jonathan Wiersma <archaur at jonw dot org>
-
-pkgname=libvirt
-pkgver=0.9.10
-pkgrel=1
-pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
-arch=('i686' 'x86_64')
-url="http://libvirt.org/"
-license=('LGPL')
-depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2'
-	 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap'
-	 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs'
-	 'iproute2' 'netcf' 'libnl1')
-makedepends=('pkgconfig' 'lvm2')
-optdepends=('bridge-utils: for briged networking (default)'
-	    'dnsmasq: for NAT/DHCP for guests'
-	    'kvm'
-	    'openbsd-netcat: for remote management over ssh'
-	    'qemu'
-	    'radvd'
-	    'dmidecode')
-options=('emptydirs' '!libtool')
-backup=('etc/conf.d/libvirtd'
-	'etc/conf.d/libvirtd-guests'
-	'etc/libvirt/libvirtd.conf'
-	'etc/libvirt/libvirt.conf'
-	'etc/libvirt/qemu.conf'
-	'etc/sasl2/libvirt.conf')
-install="libvirt.install"
-source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
-	libvirtd.rc.d
-	libvirtd.conf.d
-	libvirtd-guests.rc.d
-	libvirtd-guests.conf.d
-	openbsd-netcat-default.patch
-	unixperms.patch
-	yajl-2.x.patch)
-md5sums=('a424bb793521e637349da47e93dd5fff'
-         'c43244c40a0437038c82089618e7beaa'
-         '3ed0e24f5b5e25bf553f5427d64915e6'
-         '737ec24aa56871fbabfa892789457db4'
-         'bc2971dacdbac967fc3474e50affc345'
-         'b0be50eb9dfe4d133decf23b60880f7d'
-         'db95aecdf2ccf3693fef5821cdcb7eba'
-         '5745bb8d0b254abb7a3528c66e03b0f9')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # python2 fix
-  export PYTHON=`which python2`
-  for file in $(find . -name '*.py' -print); do
-    sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file
-    sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
-  done
-
-#  for more information on authentication see http://libvirt.org/auth.html
-#  If you wish to have unix-permissions based access rather than only polkit
-#  access, create a group called libvirt and uncomment the line below:
-#  patch -Np1 -i "$srcdir"/unixperms.patch
-
-  [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch
-
-  # fixes for yajl 2.0 API changes
-#  [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir/yajl-2.x.patch"
-
-  export LDFLAGS=-lX11
-  [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \
-	--with-storage-lvm --without-xen --with-udev --without-hal --disable-static
-  find -name Makefile -exec sed -i 's#-L /usr#-L/usr#' {} \;
-  make -j1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  install -D -m755 "$srcdir"/libvirtd.rc.d "$pkgdir"/etc/rc.d/libvirtd
-  install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd
-
-  install -D -m755 "$srcdir"/libvirtd-guests.rc.d "$pkgdir"/etc/rc.d/libvirtd-guests
-  install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirtd-guests
-
-  rm -rf $pkgdir/var/run
-}
diff --git a/community-testing/libvirt/libvirt.install b/community-testing/libvirt/libvirt.install
deleted file mode 100644
index 3881386d2..000000000
--- a/community-testing/libvirt/libvirt.install
+++ /dev/null
@@ -1,38 +0,0 @@
-_libvirt_setup() {
-  rm -f /usr/lib/python?.?/site-packages/libvirt.pyc
-  echo ">>> To use libvirt as a non-root user:"
-  echo ">>>  Use polkit to grant access."
-  echo ">>>  ...or change the access model in /etc/libvirt/libvirtd.conf."
-  echo ">>>     (see unixperms.patch in PKGBUILD for help)"
-  echo ""
-}
-
-post_install() {
-  _libvirt_setup || return 1
-  echo ">>> Be sure to see optdepends as you may find some of them helpfull."
-  echo ">>>  Especially: bridge-utils, dnsmasq, and hal."
-  echo ""
-  echo ">>> To start libvirtd run: '/etc/rc.d/libvirtd start' as root."
-  echo ">>> Add 'libvirtd' to daemons in /etc/rc.conf if you want it to load upon"
-  echo ">>>  booting."
-  echo ""
-  /bin/true
-}
-
-post_upgrade() {
-  _libvirt_setup || return 1
-  echo ">>> To finish the upgrade, restart libvirtd by running the command:"
-  echo ">>>  '/etc/rc.d/libvirtd restart' as root or rebooting."
-  echo ">>> You may also need to run 'rm -rf ~/.libvirt'"
-  echo ""
-  /bin/true
-}
-
-post_remove() {
-   rm -f /usr/lib/python[0-9].[0-9]/site-packages/libvirt.pyc
-   echo ">>> You may wish to delete the group 'libvirt' if it still exists."
-   echo ">>>  It can be removed by running 'groupdel libvirt' as root."
-   echo ""
-   depmod -a
-   /bin/true
-}
diff --git a/community-testing/libvirt/libvirtd-guests.conf.d b/community-testing/libvirt/libvirtd-guests.conf.d
deleted file mode 100644
index 02a933715..000000000
--- a/community-testing/libvirt/libvirtd-guests.conf.d
+++ /dev/null
@@ -1,11 +0,0 @@
-LIBVIRTD_STOP_ACTION=suspend
-
-#LIBVIRTD_URI="-c qemu+ssh://user@host/system"
-LIBVIRTD_URI=""
-
-#LIBVIRTD_BYPASS_CACHE="--bypass-cache"
-LIBVIRTD_BYPASS_CACHE=""
-
-LIBVIRTD_START_DELAY=0
-
-LIBVIRTD_SHUTDOWN_TIMEOUT=3
diff --git a/community-testing/libvirt/libvirtd-guests.rc.d b/community-testing/libvirt/libvirtd-guests.rc.d
deleted file mode 100644
index b4331964a..000000000
--- a/community-testing/libvirt/libvirtd-guests.rc.d
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/bash
-
-. /etc/conf.d/libvirtd-guests
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-LIBVIRTD_LISTFILE="/var/state/libvirtd/vm-list"
-
-# get guest state by name
-libvirt_get_guest_state()
-{
-	virsh $LIBVIRTD_URI dominfo "$1" | grep -E '^State:' | awk '{print $2}'
-}
-
-# list IDs of running guests
-libvirt_list()
-{
-	virsh $LIBVIRTD_URI list | awk 'NR > 2 {print $2}'
-}
-
-# suspend guest by name
-libvirt_suspend()
-{
-	virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE managedsave "$1" >/dev/null
-	timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT
-	while [ "$timeout" -gt 0 ]; do
-		sleep 1
-		timeout=$((timeout - 1))
-		state=`libvirt_get_guest_state "$1"`
-		[ "x$state" == "xshut" ] && return 0
-	done
-	return 1
-}
-
-# shutdown guest by name
-libvirt_shutdown()
-{
-	virsh $LIBVIRTD_URI shutdown "$1" >/dev/null
-	timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT
-	while [ "$timeout" -gt 0 ]; do
-		sleep 1
-		timeout=$((timeout - 1))
-		state=`libvirt_get_guest_state "$1"`
-		[ "x$state" != "xshut" ] && return 0
-	done
-	return 1
-}
-
-# start guest by name
-libvirt_start()
-{
-	virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE start "$1" >/dev/null
-}
-
-# stop all guests
-libvirt_stop_all()
-{
-	mkdir -p `dirname $LIBVIRTD_LISTFILE`
-	echo -n >$LIBVIRTD_LISTFILE
-	for i in `libvirt_list`; do
-		if [ "x$LIBVIRTD_STOP_ACTION" == "xsuspend" ]; then
-			stat_busy "Suspending libvirtd/$i guest"
-			libvirt_suspend "$i"
-		else
-			stat_busy "Shutting libvirtd/$i guest down"
-			libvirt_shutdown "$i"
-		fi
-		[ $? -eq 0 ] && stat_done || stat_fail
-		echo $i >>$LIBVIRTD_LISTFILE
-	done
-}
-
-# start all guests
-libvirt_start_all()
-{
-	if [ -f $LIBVIRTD_LISTFILE ]; then
-		for i in `cat $LIBVIRTD_LISTFILE`; do
-			stat_busy "Starting/resuming libvirtd/$i guest"
-			libvirt_start "$i"
-			[ $? -eq 0 ] && { sleep $LIBVIRTD_START_DELAY; stat_done; } || stat_fail
-		done
-	fi
-	rm -f $LIBVIRTD_LISTFILE
-}
-
-# main
-LC_ALL=C
-LANG=C
-case "$1" in
-    start)
-		libvirt_start_all
-		add_daemon libvirtd-guests
-	;;
-    stop)
-		libvirt_stop_all
-		rm_daemon libvirtd-guests
-	;;
-    restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-    *)
-        echo $"Usage: $0 {start|stop|restart}"
-        ;;
-esac
-exit 0
diff --git a/community-testing/libvirt/libvirtd.conf.d b/community-testing/libvirt/libvirtd.conf.d
deleted file mode 100644
index d4d25b47a..000000000
--- a/community-testing/libvirt/libvirtd.conf.d
+++ /dev/null
@@ -1,3 +0,0 @@
-LIBVIRTD_CONFIG="/etc/libvirt/libvirtd.conf"
-LIBVIRTD_ARGS="-p /var/run/libvirtd.pid"
-KRB5_KTNAME="/etc/libvirt/krb5.tab"
diff --git a/community-testing/libvirt/libvirtd.rc.d b/community-testing/libvirt/libvirtd.rc.d
deleted file mode 100644
index 193bffa9c..000000000
--- a/community-testing/libvirt/libvirtd.rc.d
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/conf.d/libvirtd
-. /etc/rc.d/functions
-
-LIBVIRTD_CONFIG_ARGS=
-if [ -n "$LIBVIRTD_CONFIG" ]
-then
-	LIBVIRTD_CONFIG_ARGS="--config $LIBVIRTD_CONFIG"
-fi
-
-PID=`pidof -o %PPID /usr/sbin/libvirtd`
-case "$1" in
-    start)
-	stat_busy "Starting libvirtd"
-	export RADVD=/usr/sbin/radvd
-	for i in /var/run/libvirt/qemu /var/run/libvirt/lxc /var/run/libvirt/uml /var/run/libvirt/network; do
-		[ -d $i ] || mkdir -p $i
-	done
-	[ -z "$PID" ] && (
-		mkdir -p /var/{cache,run}/libvirt
-		rm -rf /var/cache/libvirt/*
-		KRB5_KTNAME=$KRB5_KTNAME \
-			/usr/sbin/libvirtd --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS
-	)
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		add_daemon libvirtd
-		stat_done
-	fi
-	;;
-    stop)
-	stat_busy "Stopping libvirtd"
-	[ ! -z "$PID" ]  && (
-		kill $PID &> /dev/null
-		rm -rf /var/cache/libvirt/*
-		rm -f /var/run/libvirtd.pid
-	)
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		rm_daemon libvirtd
-		stat_done
-	fi
-	;;
-    restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-    reload)
-	stat_busy "Reloading libvirtd configuration"
-	[ ! -z "$PID" ]  && kill -HUP $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		stat_done
-	fi
-	;;
-    *)
-        echo $"Usage: $0 {start|stop|restart|reload}"
-        ;;
-esac
-exit 0
diff --git a/community-testing/libvirt/openbsd-netcat-default.patch b/community-testing/libvirt/openbsd-netcat-default.patch
deleted file mode 100644
index a01b4f14e..000000000
--- a/community-testing/libvirt/openbsd-netcat-default.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -wbBur libvirt-0.9.7/src/qemu/qemu_migration.c libvirt-0.9.7.my/src/qemu/qemu_migration.c
---- libvirt-0.9.7/src/qemu/qemu_migration.c	2011-10-31 07:46:04.000000000 +0400
-+++ libvirt-0.9.7.my/src/qemu/qemu_migration.c	2011-11-08 15:46:10.000000000 +0400
-@@ -1589,7 +1589,7 @@
-                                            spec->dest.unix_socket.file);
-         } else {
-             const char *args[] = {
--                "nc", "-U", spec->dest.unix_socket.file, NULL
-+                "nc.openbsd", "-U", spec->dest.unix_socket.file, NULL
-             };
-             ret = qemuMonitorMigrateToCommand(priv->mon, migrate_flags, args);
-         }
-diff -wbBur libvirt-0.9.7/src/remote/remote_driver.c libvirt-0.9.7.my/src/remote/remote_driver.c
---- libvirt-0.9.7/src/remote/remote_driver.c	2011-11-08 07:53:30.000000000 +0400
-+++ libvirt-0.9.7.my/src/remote/remote_driver.c	2011-11-08 15:46:10.000000000 +0400
-@@ -614,7 +614,7 @@
-                                                 username,
-                                                 !tty,
-                                                 !verify,
--                                                netcat ? netcat : "nc",
-+                                                netcat ? netcat : "nc.openbsd",
-                                                 keyfile,
-                                                 sockname)))
-             goto failed;
-diff -wbBur libvirt-0.9.7/src/rpc/virnetsocket.c libvirt-0.9.7.my/src/rpc/virnetsocket.c
---- libvirt-0.9.7/src/rpc/virnetsocket.c	2011-11-08 07:53:30.000000000 +0400
-+++ libvirt-0.9.7.my/src/rpc/virnetsocket.c	2011-11-08 15:46:31.000000000 +0400
-@@ -642,7 +642,7 @@
-         virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL);
- 
-     if (!netcat)
--        netcat = "nc";
-+        netcat = "nc.openbsd";
- 
-     virCommandAddArgList(cmd, nodename, "sh", "-c", NULL);
- 
diff --git a/community-testing/libvirt/unixperms.patch b/community-testing/libvirt/unixperms.patch
deleted file mode 100644
index b3fb86cf5..000000000
--- a/community-testing/libvirt/unixperms.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ur libvirt-0.7.4-orig/daemon/libvirtd.conf libvirt-0.7.4-patched/daemon/libvirtd.conf
---- libvirt-0.7.4-orig/daemon/libvirtd.conf	2009-11-23 03:10:33.398655655 -0800
-+++ libvirt-0.7.4-patched/daemon/libvirtd.conf	2009-11-23 03:09:37.831189671 -0800
-@@ -78,14 +78,14 @@
- # without becoming root.
- #
- # This is restricted to 'root' by default.
--#unix_sock_group = "libvirt"
-+unix_sock_group = "libvirt"
- 
- # Set the UNIX socket permissions for the R/O socket. This is used
- # for monitoring VM status only
- #
- # Default allows any user. If setting group ownership may want to
- # restrict this to:
--#unix_sock_ro_perms = "0777"
-+unix_sock_ro_perms = "0770"
- 
- # Set the UNIX socket permissions for the R/W socket. This is used
- # for full management of VMs
-@@ -95,7 +95,7 @@
- #
- # If not using PolicyKit and setting group ownership for access
- # control then you may want to relax this to:
--#unix_sock_rw_perms = "0770"
-+unix_sock_rw_perms = "0770"
- 
- # Set the name of the directory in which sockets will be found/created.
- #unix_sock_dir = "/var/run/libvirt"
-@@ -126,7 +126,7 @@
- #
- # To restrict monitoring of domains you may wish to enable
- # an authentication mechanism here
--#auth_unix_ro = "none"
-+auth_unix_ro = "none"
- 
- # Set an authentication scheme for UNIX read-write sockets
- # By default socket permissions only allow root. If PolicyKit
-@@ -135,7 +135,7 @@
- #
- # If the unix_sock_rw_perms are changed you may wish to enable
- # an authentication mechanism here
--#auth_unix_rw = "none"
-+auth_unix_rw = "none"
- 
- # Change the authentication scheme for TCP sockets.
- #
diff --git a/community-testing/libvirt/yajl-2.x.patch b/community-testing/libvirt/yajl-2.x.patch
deleted file mode 100644
index 80d3edce0..000000000
--- a/community-testing/libvirt/yajl-2.x.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/src/util/json.c	2011-03-24 03:10:26.000000000 -0400
-+++ b/src/util/json.c	2011-04-25 20:01:29.354939116 -0400
-@@ -709,7 +709,7 @@
- 
- static int virJSONParserHandleNumber(void * ctx,
-                                      const char * s,
--                                     unsigned int l)
-+                                     size_t l)
- {
-     virJSONParserPtr parser = ctx;
-     char *str = strndup(s, l);
-@@ -735,7 +735,7 @@
- 
- static int virJSONParserHandleString(void * ctx,
-                                      const unsigned char * stringVal,
--                                     unsigned int stringLen)
-+                                     size_t stringLen)
- {
-     virJSONParserPtr parser = ctx;
-     virJSONValuePtr value = virJSONValueNewStringLen((const char *)stringVal,
-@@ -756,7 +756,7 @@
- 
- static int virJSONParserHandleMapKey(void * ctx,
-                                      const unsigned char * stringVal,
--                                     unsigned int stringLen)
-+                                     size_t stringLen)
- {
-     virJSONParserPtr parser = ctx;
-     virJSONParserStatePtr state;
-@@ -894,14 +894,14 @@
- /* XXX add an incremental streaming parser - yajl trivially supports it */
- virJSONValuePtr virJSONValueFromString(const char *jsonstring)
- {
--    yajl_parser_config cfg = { 1, 1 };
-     yajl_handle hand;
-     virJSONParser parser = { NULL, NULL, 0 };
-     virJSONValuePtr ret = NULL;
- 
-     VIR_DEBUG("string=%s", jsonstring);
- 
--    hand = yajl_alloc(&parserCallbacks, &cfg, NULL, &parser);
-+    hand = yajl_alloc(&parserCallbacks, NULL, &parser);
-+    yajl_config(hand, yajl_allow_comments, 1);
- 
-     if (yajl_parse(hand,
-                    (const unsigned char *)jsonstring,
-@@ -1002,15 +1002,16 @@
- 
- char *virJSONValueToString(virJSONValuePtr object)
- {
--    yajl_gen_config conf = { 0, " " }; /* Turns off pretty printing since QEMU can't cope */
-     yajl_gen g;
-     const unsigned char *str;
-     char *ret = NULL;
--    unsigned int len;
-+    size_t len;
- 
-     VIR_DEBUG("object=%p", object);
- 
--    g = yajl_gen_alloc(&conf, NULL);
-+    g = yajl_gen_alloc(NULL);
-+    yajl_gen_config(g, yajl_gen_beautify, 0);
-+    yajl_gen_config(g, yajl_gen_indent_string, " ");
- 
-     if (virJSONValueToStringOne(object, g) < 0) {
-         virReportOOMError();
diff --git a/community-testing/netcf/PKGBUILD b/community-testing/netcf/PKGBUILD
deleted file mode 100644
index 1498f4623..000000000
--- a/community-testing/netcf/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 64587 2012-02-16 20:41:45Z heftig $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Aurélien Wailly <aurelien.wailly@gmail.com>
-
-pkgname=netcf
-pkgver=0.1.7
-pkgrel=3
-pkgdesc="A library for configuring network interfaces"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="https://fedorahosted.org/netcf/"
-depends=('augeas>=0.7.4' 'netcfg' 'libxslt' 'libxml2' 'libnl1')
-makedepends=('gcc')
-options=(!libtool)
-source=("https://fedorahosted.org/released/netcf/$pkgname-$pkgver.tar.gz"
-        netcf-0.1.7.patch)
-md5sums=('8e313b623c907eb035cf3948b71fecc2'
-         '0e88ee6813219e9e75a943444fe439f5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/netcf-0.1.7.patch
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/netcf/netcf-0.1.7.patch b/community-testing/netcf/netcf-0.1.7.patch
deleted file mode 100644
index d4a4d31b7..000000000
--- a/community-testing/netcf/netcf-0.1.7.patch
+++ /dev/null
@@ -1,426 +0,0 @@
-diff -ur netcf-0.1.7.ori//data/xml/initscripts-get.xsl netcf-0.1.7/data/xml/initscripts-get.xsl
---- netcf-0.1.7.ori//data/xml/initscripts-get.xsl	2009-10-04 08:18:41.000000000 +0200
-+++ netcf-0.1.7/data/xml/initscripts-get.xsl	2010-12-08 14:54:28.891813397 +0100
-@@ -47,9 +47,12 @@
-   <xsl:template name="vlan-interface-common">
-     <xsl:variable name="iface" select="concat(vlan/interface/@name, '.', vlan/@tag)"/>
- 
--    <xsl:attribute name="path">/files/etc/sysconfig/network-scripts/ifcfg-<xsl:value-of select="$iface"/></xsl:attribute>
--    <node label="DEVICE" value="{$iface}"/>
--    <node label="VLAN" value="yes"/>
-+    <xsl:attribute name="path">/files/etc/network.d/ifcfg-<xsl:value-of select="$iface"/></xsl:attribute>
-+    <node label="INTERFACE" value="{$iface}"/>
-+    <node label="PHYS_INTERFACE" value="{vlan/interface/@name}"/>
-+    <node label="VLAN" value="{vlan/@tag}"/>
-+    <node label="CONNECTION" value="ethernet-iproute-vlan"/>
-+    <node label="FLAG" value="false"/>
-   </xsl:template>
- 
-   <xsl:template name='bare-vlan-interface'>
-@@ -68,6 +71,7 @@
-       <xsl:call-template name="startmode"/>
-       <xsl:call-template name="mtu"/>
-       <node label="TYPE" value="Bridge"/>
-+      <node label="CONNECTION" value="bridge"/>
-       <xsl:call-template name="interface-addressing"/>
-       <xsl:if test="bridge/@stp">
-         <node label="STP" value="{bridge/@stp}"/>
-@@ -75,7 +79,11 @@
-       <xsl:if test="bridge/@delay">
-         <node label="DELAY" value="{bridge/@delay}"/>
-       </xsl:if>
-+      <node label="DHCP_TIMEOUT" value="0"/>
-+    <!--
-+    We don't have to define interfaces separately
-     </tree>
-+    
-     <xsl:for-each select='bridge/interface'>
-       <tree>
-         <xsl:if test="@type = 'ethernet'">
-@@ -87,12 +95,29 @@
-         <xsl:if test="@type = 'bond'">
-           <xsl:call-template name="bare-bond-interface"/>
-         </xsl:if>
-+
-+        BRIDGE_INTERFACES= is defined with all interfaces
-         <node label="BRIDGE" value="{../../@name}"/>
-+
-+        <xsl:variable name="bridgeifaces" select="concat($bridgeifaces, '.', @name)"/>
-       </tree>
-       <xsl:if test="@type = 'bond'">
-         <xsl:call-template name="bond-slaves"/>
-       </xsl:if>
-     </xsl:for-each>
-+    -->
-+    <!-- <xsl:if test="count(ip) > 1"> -->
-+    <node label="BRIDGE_INTERFACES">
-+    <xsl:attribute name="value">
-+      <xsl:text></xsl:text>
-+      <xsl:for-each select="bridge/interface">
-+        <xsl:value-of select="@name"/><xsl:value-of select="string(' ')"/>
-+      </xsl:for-each>
-+      <xsl:text></xsl:text>
-+    </xsl:attribute>
-+    </node>
-+    <!-- </xsl:if> -->
-+    </tree>
-   </xsl:template>
- 
-   <!--
-@@ -138,8 +163,8 @@
-        Named templates, following the Relax NG syntax
-   -->
-   <xsl:template name="name-attr">
--    <xsl:attribute name="path">/files/etc/sysconfig/network-scripts/ifcfg-<xsl:value-of select="@name"/></xsl:attribute>
--    <node label="DEVICE" value="{@name}"/>
-+    <xsl:attribute name="path">/files/etc/network.d/ifcfg-<xsl:value-of select="@name"/></xsl:attribute>
-+    <node label="INTERFACE" value="{@name}"/>
-   </xsl:template>
- 
-   <xsl:template name="mtu">
-@@ -153,6 +178,7 @@
-     <xsl:if test="mac">
-       <node label="HWADDR" value="{mac/@address}"/>
-     </xsl:if>
-+    <node label="CONNECTION" value="{@type}"/>
-     <xsl:call-template name="startmode"/>
-     <xsl:call-template name="mtu"/>
-   </xsl:template>
-@@ -184,14 +210,14 @@
-   <xsl:template name="protocol-ipv4">
-     <xsl:choose>
-       <xsl:when test="dhcp">
--        <node label="BOOTPROTO" value="dhcp"/>
-+        <node label="IP" value="dhcp"/>
-         <xsl:if test="dhcp/@peerdns">
-           <node label="PEERDNS" value="{dhcp/@peerdns}"/>
-         </xsl:if>
-       </xsl:when>
-       <xsl:when test="ip">
--        <node label="BOOTPROTO" value="none"/>
--        <node label="IPADDR" value="{ip/@address}"/>
-+        <node label="IP" value="static"/>
-+        <node label="ADDR" value="{ip/@address}"/>
-         <xsl:if test="ip/@prefix">
-           <node label="NETMASK" value="{ipcalc:netmask(ip/@prefix)}"/>
-         </xsl:if>
-diff -ur netcf-0.1.7.ori//data/xml/initscripts-put.xsl netcf-0.1.7/data/xml/initscripts-put.xsl
---- netcf-0.1.7.ori//data/xml/initscripts-put.xsl	2009-10-04 08:18:41.000000000 +0200
-+++ netcf-0.1.7/data/xml/initscripts-put.xsl	2010-11-26 10:44:46.133757628 +0100
-@@ -47,7 +47,7 @@
-   </xsl:template>
- 
-   <xsl:template name="bare-vlan-interface">
--    <xsl:variable name="name" select="node[@label = 'DEVICE']/@value"/>
-+    <xsl:variable name="name" select="node[@label = 'INTERFACE']/@value"/>
-     <interface type="vlan">
-       <xsl:call-template name="name-attr"/>
-       <xsl:call-template name="vlan-device"/>
-@@ -55,7 +55,7 @@
-   </xsl:template>
- 
-   <xsl:template name="vlan-device">
--    <xsl:variable name="name" select="node[@label = 'DEVICE']/@value"/>
-+    <xsl:variable name="name" select="node[@label = 'INTERFACE']/@value"/>
-     <xsl:variable name="device" select="substring-before($name, '.')"/>
-     <xsl:variable name="tag" select="substring-after($name, '.')"/>
-     <vlan tag="{$tag}">
-@@ -70,7 +70,7 @@
-                 match="tree[node[@label = 'TYPE' and @value = 'Bridge']]">
-     <interface type="bridge">
-       <!-- the bridge node itself -->
--      <xsl:variable name="iface" select="node[@label= 'DEVICE']/@value"/>
-+      <xsl:variable name="iface" select="node[@label= 'INTERFACE']/@value"/>
-       <xsl:call-template name="name-attr"/>
-       <xsl:call-template name="startmode"/>
-       <xsl:call-template name="mtu"/>
-@@ -101,17 +101,17 @@
-       Bond
-   -->
-   <xsl:template name="bond-element">
--    <xsl:variable name="iface" select="node[@label= 'DEVICE']/@value"/>
-+    <xsl:variable name="iface" select="node[@label= 'INTERFACE']/@value"/>
-     <bond>
-       <xsl:variable name="opts" select="node[@label = 'BONDING_OPTS']/@value"/>
-       <xsl:call-template name="bonding-opts">
-         <xsl:with-param name="opts" select="$opts"/>
-       </xsl:call-template>
-       <xsl:variable name="primary" select="bond:option($opts, 'primary')"/>
--      <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'DEVICE' and @value = $primary]]">
-+      <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'INTERFACE' and @value = $primary]]">
-         <xsl:call-template name='bare-ethernet-interface'/>
-       </xsl:for-each>
--      <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'DEVICE' and @value != $primary]]">
-+      <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'INTERFACE' and @value != $primary]]">
-         <xsl:call-template name='bare-ethernet-interface'/>
-       </xsl:for-each>
-     </bond>
-@@ -125,7 +125,7 @@
-   </xsl:template>
- 
-   <xsl:template name="bond-interface"
--                match="tree[node[@label = 'DEVICE'][@value = //tree/node[@label = 'MASTER']/@value]][count(node[@label = 'BRIDGE']) = 0]">
-+                match="tree[node[@label = 'INTERFACE'][@value = //tree/node[@label = 'MASTER']/@value]][count(node[@label = 'BRIDGE']) = 0]">
-     <interface type="bond">
-       <xsl:call-template name="name-attr"/>
-       <xsl:call-template name="startmode"/>
-@@ -154,7 +154,7 @@
- 
-   <xsl:template name="name-attr">
-     <xsl:attribute name="name">
--      <xsl:value-of select="node[@label= 'DEVICE']/@value"/>
-+      <xsl:value-of select="node[@label= 'INTERFACE']/@value"/>
-     </xsl:attribute>
-   </xsl:template>
- 
-@@ -173,7 +173,7 @@
-     <xsl:variable name="uses_dhcp"
-                   select="node[@label = 'BOOTPROTO']/@value = 'dhcp'"/>
-     <xsl:variable name="uses_static"
--                  select="count(node[@label = 'IPADDR']) > 0"/>
-+                  select="count(node[@label = 'ADDR']) > 0"/>
-     <xsl:variable name="uses_ipv4" select="$uses_dhcp or $uses_static"/>
-     <xsl:if test="$uses_ipv4">
-     <protocol family="ipv4">
-@@ -186,7 +186,7 @@
-           </dhcp>
-         </xsl:when>
-         <xsl:when test="$uses_static">
--          <ip address="{node[@label = 'IPADDR']/@value}">
-+          <ip address="{node[@label = 'ADDR']/@value}">
-             <xsl:choose>
-               <xsl:when test="node[@label = 'PREFIX']">
-                 <xsl:attribute name="prefix"><xsl:value-of select="node[@label = 'PREFIX']/@value"/></xsl:attribute>
-diff -ur netcf-0.1.7.ori//src/drv_initscripts.c netcf-0.1.7/src/drv_initscripts.c
---- netcf-0.1.7.ori//src/drv_initscripts.c	2010-09-23 14:13:13.000000000 +0200
-+++ netcf-0.1.7/src/drv_initscripts.c	2010-12-08 13:57:02.027361706 +0100
-@@ -49,17 +49,20 @@
- #include <libexslt/exslt.h>
- 
- static const char *const network_scripts_path =
--    "/files/etc/sysconfig/network-scripts";
-+    //"/files/etc/sysconfig/network-scripts";
-+    "/files/etc/network.d/*";
- 
- static const char *const ifcfg_path =
--    "/files/etc/sysconfig/network-scripts/*";
-+    //"/files/etc/sysconfig/network-scripts/*";
-+    "/files/etc/network.d/*";
- 
- /* Augeas should only load the files we are interested in */
- static const struct augeas_pv augeas_xfm_common_pv[] = {
-     /* Ifcfg files */
-     { "/augeas/load/Ifcfg/lens", "Sysconfig.lns" },
-     { "/augeas/load/Ifcfg/incl",
--      "/etc/sysconfig/network-scripts/ifcfg-*" },
-+      "/etc/network.d/ifcfg-*" },
-+      //"/etc/sysconfig/network-scripts/ifcfg-*" },
-     { "/augeas/load/Ifcfg/excl[1]", "*~" },
-     { "/augeas/load/Ifcfg/excl[2]", "*.bak" },
-     { "/augeas/load/Ifcfg/excl[3]", "*.orig" },
-@@ -107,10 +110,10 @@
-     int nmatches;
- 
-     nmatches = aug_fmt_match(ncf, NULL,
--                             "%s[ DEVICE = '%s'"
-+                             "%s[ INTERFACE = '%s'"
-                              "    or BRIDGE = '%s'"
-                              "    or MASTER = '%s'"
--                             "    or MASTER = ../*[BRIDGE = '%s']/DEVICE ]/DEVICE",
-+                             "    or MASTER = ../*[BRIDGE = '%s']/INTERFACE ]/INTERFACE",
-                              ifcfg_path, name, name, name, name);
-     return nmatches > 0;
- }
-@@ -173,7 +176,7 @@
-     aug = get_augeas(ncf);
-     ERR_BAIL(ncf);
- 
--    ndevs = aug_fmt_match(ncf, &devs, "%s[DEVICE = '%s']",
-+    ndevs = aug_fmt_match(ncf, &devs, "%s[INTERFACE = '%s']",
-                           ifcfg_path, name);
-     ERR_COND_BAIL(ndevs < 0, ncf, EOTHER);
- 
-@@ -296,7 +299,8 @@
-     int result = 0, ndevs;
-     char **devs = NULL;
- 
--    ndevs = aug_fmt_match(ncf, &devs, "%s/DEVICE", ifcfg_path);
-+    ndevs = aug_fmt_match(ncf, &devs, "%s/INTERFACE", ifcfg_path);
-+    printf("%i\n", ndevs);
-     ERR_COND_BAIL(ndevs < 0, ncf, EOTHER);
- 
-     result = uniq_ifcfg_paths(ncf, ndevs, devs, intf);
-@@ -453,11 +457,11 @@
- 
- int drv_list_interfaces(struct netcf *ncf, int maxnames, char **names,
-         unsigned int flags) {
--    return list_interface_ids(ncf, maxnames, names, flags, "DEVICE");
-+    return list_interface_ids(ncf, maxnames, names, flags, "INTERFACE");
- }
- 
- int drv_num_of_interfaces(struct netcf *ncf, unsigned int flags) {
--    return list_interface_ids(ncf, 0, NULL, flags, "DEVICE");
-+    return list_interface_ids(ncf, 0, NULL, flags, "INTERFACE");
- }
- 
- struct netcf_if *drv_lookup_by_name(struct netcf *ncf, const char *name) {
-@@ -599,8 +603,8 @@
- 
-     ncf = nif->ncf;
-     ndevs = aug_fmt_match(ncf, &devs,
--              "%s[ DEVICE = '%s' or BRIDGE = '%s' or MASTER = '%s'"
--              "    or MASTER = ../*[BRIDGE = '%s']/DEVICE ]/DEVICE",
-+              "%s[ INTERFACE = '%s' or BRIDGE = '%s' or MASTER = '%s'"
-+              "    or MASTER = ../*[BRIDGE = '%s']/INTERFACE ]/INTERFACE",
-               ifcfg_path, nif->name, nif->name, nif->name, nif->name);
-     ERR_BAIL(ncf);
- 
-@@ -745,7 +749,7 @@
-     int nmatches = 0;
- 
-     nmatches = aug_fmt_match(ncf, NULL,
--                             "%s[ DEVICE = '%s' and TYPE = 'Bridge']",
-+                             "%s[ INTERFACE = '%s' and TYPE = 'Bridge']",
-                              ifcfg_path, name);
-     return nmatches > 0;
- }
-@@ -758,7 +762,7 @@
-     ERR_BAIL(ncf);
- 
-     nslaves = aug_fmt_match(ncf, slaves,
--                            "%s[ BRIDGE = '%s' ]/DEVICE", ifcfg_path, name);
-+                            "%s[ BRIDGE = '%s' ]/INTERFACE", ifcfg_path, name);
-     ERR_BAIL(ncf);
-     for (int i=0; i < nslaves; i++) {
-         char *p = (*slaves)[i];
-@@ -790,8 +794,8 @@
-     /* The last or clause catches slaves of a bond that are enslaved to
-      * a bridge NAME */
-     r = xasprintf(&path,
--          "%s[ DEVICE = '%s' or BRIDGE = '%s' or MASTER = '%s' "
--          "    or MASTER = ../*[BRIDGE = '%s']/DEVICE ]",
-+          "%s[ INTERFACE = '%s' or BRIDGE = '%s' or MASTER = '%s' "
-+          "    or MASTER = ../*[BRIDGE = '%s']/INTERFACE ]",
-                   ifcfg_path, name, name, name, name);
-     ERR_NOMEM(r < 0, ncf);
- 
-@@ -967,7 +971,7 @@
-     for (int i = 0; i < nmatches; i++) {
-         if (!has_ifcfg_file(ncf, matches[i]))
-             continue;
--        r = xasprintf(&ifcfg, "%s[DEVICE = '%s']", ifcfg_path, matches[i]);
-+        r = xasprintf(&ifcfg, "%s[INTERFACE = '%s']", ifcfg_path, matches[i]);
-         ERR_NOMEM(r < 0, ncf);
- 
-         if (! is_slave(ncf, ifcfg))
-@@ -1023,7 +1027,10 @@
-  */
- 
- int drv_if_up(struct netcf_if *nif) {
--    static const char *const ifup = "ifup";
-+    //static const char *const ifup = "ifup";
-+    static const char *const ifup = "netcfg";
-+    static const char *const ifprefix = "ifcfg-";
-+    char ifname[strlen(nif->name) + sizeof(ifprefix)];
-     struct netcf *ncf = nif->ncf;
-     char **slaves = NULL;
-     int nslaves = 0;
-@@ -1035,11 +1042,24 @@
-         ERR_BAIL(ncf);
- 
-         for (int i=0; i < nslaves; i++) {
--            run1(ncf, ifup, slaves[i]);
-+            //run1(ncf, ifup, slaves[i]);
-+            const char *const argv[] = {
-+                ifup, "-u", slaves[i], NULL
-+            };
-+
-+            run_program(ncf, argv);
-             ERR_BAIL(ncf);
-         }
-     }
--    run1(ncf, ifup, nif->name);
-+    //run1(ncf, ifup, nif->name);
-+    /* Interfaces name have to be equal to script under /etc/network.d */
-+    strcpy(ifname, ifprefix);
-+    strcat(ifname, nif->name);
-+    const char *const argv[] = {
-+                ifup, "-u", ifname, NULL
-+            };
-+
-+    run_program(ncf, argv);
-     ERR_BAIL(ncf);
-     result = 0;
-  error:
-@@ -1048,13 +1068,23 @@
- }
- 
- int drv_if_down(struct netcf_if *nif) {
--    static const char *const ifdown = "ifdown";
-+    //static const char *const ifdown = "ifdown";
-+    static const char *const ifdown = "netcfg";
-+    static const char *const ifprefix = "ifcfg-";
-+    char ifname[strlen(nif->name) + sizeof(ifprefix)];
-     struct netcf *ncf = nif->ncf;
-     char **slaves = NULL;
-     int nslaves = 0;
-     int result = -1;
- 
--    run1(ncf, ifdown, nif->name);
-+    //run1(ncf, ifdown, nif->name);
-+    strcpy(ifname, ifprefix);
-+    strcat(ifname, nif->name);
-+    const char *const argv[] = {
-+        ifdown, "-d", ifname, NULL
-+    };
-+
-+    run_program(ncf, argv);
-     ERR_BAIL(ncf);
-     if (is_bridge(ncf, nif->name)) {
-         /* Bring up bridge slaves after the bridge */
-@@ -1062,7 +1092,12 @@
-         ERR_BAIL(ncf);
- 
-         for (int i=0; i < nslaves; i++) {
--            run1(ncf, ifdown, slaves[i]);
-+            //run1(ncf, ifdown, slaves[i]);
-+            const char *const argvs[] = {
-+                ifdown, "-d", slaves[i], NULL
-+            };
-+
-+            run_program(ncf, argvs);
-             ERR_BAIL(ncf);
-         }
-     }
-diff -ur netcf-0.1.7.ori//tests/interface/bridge.xml~ netcf-0.1.7/tests/interface/bridge.xml~
---- netcf-0.1.7.ori//tests/interface/bridge.xml~	2009-10-13 19:14:53.000000000 +0200
-+++ netcf-0.1.7/tests/interface/bridge.xml~	2009-10-14 05:09:05.000000000 +0200
-@@ -2,10 +2,12 @@
-   <start mode="onboot"/>
-   <mtu size="1500"/>
-   <protocol family="ipv4">
--    <ip address="192.168.80.5" prefix="24"/>
-+    <dhcp/>
-   </protocol>
-   <bridge stp="off" delay="0.01">
-     <interface type="ethernet" name="eth0">
-+      <mac address="ab:bb:cc:dd:ee:ff"/>
-     </interface>
-+    <interface type="ethernet" name="eth1"/>
-   </bridge>
- </interface>
-diff -ur netcf-0.1.7.ori//tests/interface/vlan.xml~ netcf-0.1.7/tests/interface/vlan.xml~
---- netcf-0.1.7.ori//tests/interface/vlan.xml~	2010-07-30 06:02:39.000000000 +0200
-+++ netcf-0.1.7/tests/interface/vlan.xml~	2010-09-07 18:26:22.000000000 +0200
-@@ -1,9 +1,9 @@
--<interface type="vlan" name="eth1.42">
-+<interface type="vlan" name="eth0.42">
-   <start mode="onboot"/>
-   <protocol family="ipv4">
-     <dhcp peerdns="no"/>
-   </protocol>
-   <vlan tag="42">
--    <interface name="eth1"/>
-+    <interface name="eth0"/>
-   </vlan>
- </interface>
diff --git a/community-testing/pigeonhole/PKGBUILD b/community-testing/pigeonhole/PKGBUILD
deleted file mode 100644
index 687c90522..000000000
--- a/community-testing/pigeonhole/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Peter Lewis <plewis@aur.archlinux.org>
-# Contributor: Sebastian Köhler <sebkoehler@whoami.org.uk>
-
-# This must be built against the version of dovecot being used,
-# else mail delivery will fail.
-# Specify the version of dovecot to be used here:
-_dcpkgver=2.1.0
-# Make sure to bump pkgrel if changing this.
-
-pkgname=pigeonhole
-pkgver=0.3.0
-pkgrel=1
-pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1"
-arch=('i686' 'x86_64')
-url="http://pigeonhole.dovecot.org/"
-license=('LGPL')
-depends=('dovecot='$_dcpkgver)
-conflicts=('dovecot-sieve' 'pigeonhole-hg')
-source=("http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-$pkgname-$pkgver.tar.gz"{,.sig}
-        "dovecot.conf")
-options=('!libtool')
-sha256sums=('2aeee8aa6dc700483b0a5a3d31f535abce71698ed1d467f11e931aeace2b0ada'
-            '181213cd4af854966ff5bb6b5052b49b0b40c0c21999939b8451658053fa396d'
-            'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858')
-
-build() {
-  cd "$srcdir/dovecot-2.1-$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --with-dovecot=/usr/lib/dovecot
-  make
-}
-
-package() {
-  cd "$srcdir/dovecot-2.1-$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  install -m 644 -D "$srcdir/dovecot.conf" "$pkgdir/etc/ld.so.conf.d/dovecot.conf"
-}
-
diff --git a/community-testing/pigeonhole/dovecot.conf b/community-testing/pigeonhole/dovecot.conf
deleted file mode 100644
index 061a50c90..000000000
--- a/community-testing/pigeonhole/dovecot.conf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/dovecot