Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/beye/PKGBUILD
	community/xmlrpc-c/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/libvpx/PKGBUILD
	extra/libxfce4menu/PKGBUILD
	extra/libxml2/PKGBUILD
	extra/pixman/PKGBUILD
	extra/thunar-archive-plugin/PKGBUILD
	extra/thunar-volman/PKGBUILD
	extra/vdpau-video/PKGBUILD
	extra/xfce4-appfinder/PKGBUILD
	extra/xfce4-battery-plugin/PKGBUILD
	extra/xfce4-cpufreq-plugin/PKGBUILD
	extra/xfce4-cpugraph-plugin/PKGBUILD
	extra/xfce4-dict/PKGBUILD
	extra/xfce4-diskperf-plugin/PKGBUILD
	extra/xfce4-eyes-plugin/PKGBUILD
	extra/xfce4-fsguard-plugin/PKGBUILD
	extra/xfce4-mixer/PKGBUILD
	extra/xfce4-mount-plugin/PKGBUILD
	extra/xfce4-mpc-plugin/PKGBUILD
	extra/xfce4-power-manager/PKGBUILD
	extra/xfce4-systemload-plugin/PKGBUILD
	extra/xfce4-taskmanager/PKGBUILD
	extra/xfce4-time-out-plugin/PKGBUILD
	extra/xfce4-timer-plugin/PKGBUILD
	extra/xfce4-wavelan-plugin/PKGBUILD
	extra/xorg-luit/PKGBUILD
	extra/xorg-xfontsel/PKGBUILD
	extra/xulrunner/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/mplayer-vaapi-libre/PKGBUILD
	testing/systemd/PKGBUILD

5 files changed, 115 insertions, 0 deletions

diff --git a/testing/iw/PKGBUILD b/testing/iw/PKGBUILD
new file mode 100644
index 000000000..c28a67688
--- /dev/null
+++ b/testing/iw/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD 149342 2012-02-06 21:31:23Z thomas $
+# Maintainer: Thomas Bächler <thomas@archlinux.org>
+
+pkgname=iw
+pkgver=3.3
+pkgrel=1
+pkgdesc="nl80211 based CLI configuration utility for wireless devices"
+arch=("i686" "x86_64")
+url="http://wireless.kernel.org/en/users/Documentation/iw"
+license=("GPL")
+depends=("libnl")
+makedepends=("kernel-headers")
+source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha256sums=('567f0d389dd7c9919832101aaa8e3863a463cb505545534eb46b4ddab4400e60')
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/testing/ypbind-mt/PKGBUILD b/testing/ypbind-mt/PKGBUILD
new file mode 100644
index 000000000..c78f6d1dd
--- /dev/null
+++ b/testing/ypbind-mt/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 149344 2012-02-06 23:02:05Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+
+pkgname=ypbind-mt
+pkgver=1.33
+pkgrel=4
+pkgdesc='Linux NIS daemon'
+url='http://www.linux-nis.org/nis/ypbind-mt/'
+license=('GPL2')
+arch=('i686' 'x86_64')
+makedepends=('networkmanager')
+depends=('rpcbind' 'openslp' 'dbus-glib')
+optdepends=('yp-tools: to set a domain name')
+backup=('etc/yp.conf' 'etc/conf.d/ypbind' 'etc/conf.d/nisdomainname')
+#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz"
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'nisdomainname.conf'
+        'ypbind.conf'
+        'ypbind')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	./configure \
+		--prefix=/usr \
+		--enable-dbus-nm \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	make DESTDIR="${pkgdir}" install
+
+	install -D -m644 etc/yp.conf "${pkgdir}"/etc/yp.conf
+	install -D -m755 ../ypbind "${pkgdir}"/etc/rc.d/ypbind
+	install -D -m644 ../ypbind.conf "${pkgdir}"/etc/conf.d/ypbind
+	install -D -m644 ../nisdomainname.conf "${pkgdir}"/etc/conf.d/nisdomainname
+	install -d -m755 "${pkgdir}"/var/yp/binding
+}
+md5sums=('692f68ed0476762be4228ce543a5b791'
+         'e83a85291ea2ee152a78f2c16b0b1185'
+         '229309a989abad27703ac2e6d07dc7ae'
+         '1f7a4c80414d580c9afb3a08267beed0')
diff --git a/testing/ypbind-mt/nisdomainname.conf b/testing/ypbind-mt/nisdomainname.conf
new file mode 100644
index 000000000..bbbbf8fc7
--- /dev/null
+++ b/testing/ypbind-mt/nisdomainname.conf
@@ -0,0 +1,4 @@
+#
+# NIS domain to be set in /etc/rc.d/ypbind
+#
+NISDOMAINNAME=""
diff --git a/testing/ypbind-mt/ypbind b/testing/ypbind-mt/ypbind
new file mode 100755
index 000000000..6a5ef11e3
--- /dev/null
+++ b/testing/ypbind-mt/ypbind
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+. /etc/conf.d/ypbind
+. /etc/conf.d/nisdomainname
+
+name=ypbind
+PID=$(pidof -o %PPID /usr/sbin/ypbind)
+
+case "$1" in
+start)
+	stat_busy "Starting $name daemon"
+	[[ -n $NISDOMAINNAME ]] && /usr/bin/domainname "$NISDOMAINNAME" &>/dev/null
+	[[ -z "$PID" ]] && /usr/sbin/ypbind $YPBIND_ARGS &>/dev/null \
+	&& { add_daemon $name; stat_done; } \
+	|| { stat_fail; exit 1; }
+	;;
+stop)
+	stat_busy "Stopping $name daemon"
+	[[ -n "$PID" ]] && kill $PID &>/dev/null \
+	&& { rm_daemon $name; stat_done; } \
+	|| { stat_fail; exit 1; }
+	;;
+restart)
+	$0 stop
+	sleep 1
+	$0 start
+	;;
+*)
+	echo "usage: $0 {start|stop|restart}"
+	exit 1
+	;;
+esac
diff --git a/testing/ypbind-mt/ypbind.conf b/testing/ypbind-mt/ypbind.conf
new file mode 100644
index 000000000..fd0ebd491
--- /dev/null
+++ b/testing/ypbind-mt/ypbind.conf
@@ -0,0 +1,4 @@
+#
+# Parameters to be passed to ypbind
+#
+YPBIND_ARGS=""