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

Conflicts:
	community-staging/widelands/PKGBUILD
	community/bird/PKGBUILD
	community/hwinfo/PKGBUILD
	community/pdnsd/PKGBUILD
	community/spectrwm/PKGBUILD
	community/xmlrpc-c/PKGBUILD
	core/wireless_tools/PKGBUILD
	extra/proftpd/PKGBUILD
	libre/grub/PKGBUILD
	multilib-testing/lib32-libdrm/PKGBUILD
	multilib-testing/lib32-libdrm/no-pthread-stubs.patch
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	testing/pkg-config/PKGBUILD
	testing/systemd/PKGBUILD
	testing/systemd/systemd.install

15 files changed, 160 insertions, 43 deletions

diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD
index 914a7be95..fc91e0526 100644
--- a/extra/audacity/PKGBUILD
+++ b/extra/audacity/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164991 2012-08-08 01:06:53Z eric $
+# $Id: PKGBUILD 165559 2012-08-24 02:38:00Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=audacity
-pkgver=2.0.1
-pkgrel=2
+pkgver=2.0.2
+pkgrel=1
 pkgdesc="A program that lets you manipulate digital audio waveforms"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://audacity.sourceforge.net/"
@@ -13,7 +13,7 @@ depends=('libmad' 'libid3tag' 'wxgtk' 'lame' 'hicolor-icon-theme'
 options=('!makeflags')
 install=audacity.install
 source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}.tar.bz2)
-sha1sums=('366a10f3bd71c4d84c29437fff1e27a8560f691b')
+sha1sums=('c5e4058346c96713a0d39fcd6b33f27137589b06')
 
 build() {
   cd "${srcdir}/${pkgname}-src-${pkgver}"
diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD
index a45484063..aadd6e702 100644
--- a/extra/libindi/PKGBUILD
+++ b/extra/libindi/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libindi
-pkgver=0.9.1
+pkgver=0.9.5
 pkgrel=1
 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation"
 url="http://www.indilib.org/index.php?title=Main_Page"
@@ -11,12 +11,9 @@ license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libnova' 'cfitsio' 'boost-libs' 'libusb-compat')
 makedepends=('pkgconfig' 'cmake' 'boost')
-provides=('indilib')
-replaces=('indilib')
-conflicts=('indilib')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/indi/${pkgname}_${pkgver}.tar.gz")
-md5sums=('546ab197a4311d03f566747e425de0d2')
+md5sums=('357aed5dd2f2d713bb243120f022763a')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD
index e1f986bc9..c78d08cbf 100644
--- a/extra/libmtp/PKGBUILD
+++ b/extra/libmtp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 155970 2012-04-10 11:26:59Z tomegun $
+# $Id: PKGBUILD 165552 2012-08-23 17:48:12Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 
 pkgname=libmtp
-pkgver=1.1.3
+pkgver=1.1.4
 pkgrel=1
 pkgdesc="Library implementation of the Media Transfer Protocol"
 arch=("i686" "x86_64" "mips64el")
@@ -24,4 +24,4 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('11529eedaf0e1fc00cdd6119eec525f0')
+md5sums=('27d9bcbc925c1ef84869eb27fdda54e8')
diff --git a/extra/misdnuser/PKGBUILD b/extra/misdnuser/PKGBUILD
index 8f82702c4..18b7cc919 100644
--- a/extra/misdnuser/PKGBUILD
+++ b/extra/misdnuser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 164669 2012-08-02 12:42:25Z tpowa $
+# $Id: PKGBUILD 165546 2012-08-23 12:30:42Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=misdnuser
-pkgver=2.0.14_20120802
+pkgver=2.0.15_20120823
 pkgrel=1
 pkgdesc="Tools and library for mISDN"
 arch=('i686' 'x86_64')
@@ -44,7 +44,7 @@ package() {
   install -D -m644 ${srcdir}/mISDNcapid.conf ${pkgdir}/usr/lib/tmpfiles.d/mISDNcapid.conf
 }
 
-md5sums=('ea4c4b55eb2f5914bceb17b648e8f879'
+md5sums=('df5013bcaf5ee320a58eb6dfe0cd4673'
          '2009563b144de037ecb20f8d727a772e'
          '8f305ee6e35fa12a8bec0632bfe7a076'
          '32ead7f063e007c784aa883d441f33c2'
diff --git a/extra/nacl-toolchain-newlib/PKGBUILD b/extra/nacl-toolchain-newlib/PKGBUILD
new file mode 100644
index 000000000..e75369387
--- /dev/null
+++ b/extra/nacl-toolchain-newlib/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 165539 2012-08-23 08:55:39Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Gustavo Alvarez <sl1pkn07@gmail.com>
+
+pkgname=nacl-toolchain-newlib
+pkgver=8989
+pkgrel=2
+_binutilsver=2.20.1
+_newlibver=1.20.0
+_gccver=4.4.3
+pkgdesc="Native Client newlib-based toolchain (only for compiling IRT)"
+arch=('i686' 'x86_64')
+url="http://code.google.com/chrome/nativeclient/"
+license=('BSD' 'GPL3' 'LGPL3' 'GPL2' 'FDL' 'custom')
+depends=('zlib' 'mpfr')
+options=('!strip')
+source=(http://ftp.gnu.org/gnu/binutils/binutils-$_binutilsver.tar.bz2
+        ftp://sources.redhat.com/pub/newlib/newlib-$_newlibver.tar.gz
+        http://ftp.gnu.org/gnu/gcc/gcc-$_gccver/gcc-$_gccver.tar.bz2
+        http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/nacltoolchain-buildscripts-r$pkgver.tar.gz
+        http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclbinutils-$_binutilsver-r$pkgver.patch.bz2
+        http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclnewlib-$_newlibver-r$pkgver.patch.bz2
+        http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclgcc-$_gccver-r$pkgver.patch.bz2)
+sha256sums=('71d37c96451333c5c0b84b170169fdcb138bbb27397dc06281905d9717c8ed64'
+            'c644b2847244278c57bec2ddda69d8fab5a7c767f3b9af69aa7aa3da823ff692'
+            '97ed664694b02b4d58ac2cafe443d02a388f9cb3645e7778843b5086a5fec040'
+            '985f12e30192a2aaceeff874a08d2bac997136b704dc2efa8728ab898562d7bd'
+            '2e8977a7a8b596fb7dbd22f09901b186a159b347f3d8b15dead3f8a694a52e09'
+            '312520d6cda73df83b943282ff264c0a29d8dfebda8409f681690f5e33c1d249'
+            'fbfaf4ade5d95abd67d557fcc15219f2dd0292f356fc5f96d687c954424b6420')
+
+build() {
+  cd "$srcdir"
+
+  mkdir SRC
+  mv binutils-$_binutilsver SRC/binutils
+  mv newlib-$_newlibver SRC/newlib
+  mv gcc-$_gccver SRC/gcc
+
+  for _patch in *.patch; do
+    patch -d SRC -Np0 -i "$srcdir/$_patch"
+  done
+
+  make PREFIX="$srcdir/$pkgname" CANNED_REVISION="yes" build-with-newlib
+}
+
+package() {
+  cd "$srcdir"
+
+  install -d "$pkgdir/usr/lib"
+  mv $pkgname "$pkgdir/usr/lib/$pkgname"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD
index 81eaf4599..801981082 100644
--- a/extra/proftpd/PKGBUILD
+++ b/extra/proftpd/PKGBUILD
@@ -1,25 +1,28 @@
-# $Id: PKGBUILD 165441 2012-08-19 15:31:22Z andrea $
+# $Id: PKGBUILD 165550 2012-08-23 12:54:55Z andrea $
 # Maintainer:
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=proftpd
 pkgver=1.3.4b
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="A high-performance, scalable FTP server"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.proftpd.org"
+url="http://www.proftpd.org/"
 license=('GPL')
 depends=('libmysqlclient' 'postgresql-libs')
 backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
+install=${pkgname}.install
 source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc}
-        'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service')
+        'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service'
+        'proftpd.tmpfiles')
 md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2'
          'e5b9bd78029a15f82994efcb7ed2e9fb'
          'c439a0a1dbc21b604d8382da87aa021b'
          'ddb09eb13131becdf0e081eef413116b'
          '71d5932b0461c318ed68c2c0c2660736'
-         '2c446f531948c8cc0a1e0fae28f8dfda')
+         '5709f27ebcbe906e52963ea75e4fde64'
+         '907b149a120b046f05647c73502e23c9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -53,4 +56,9 @@ package() {
 
   install -d "${pkgdir}/usr/lib/systemd/system/"
   install -m644 "${srcdir}"/proftpd.service "${pkgdir}/usr/lib/systemd/system/"
+  install -Dm644 "${srcdir}"/proftpd.tmpfiles \
+    "${pkgdir}"/usr/lib/tmpfiles.d/proftpd.conf
+
+  # /run is tmpfs
+  rmdir "${pkgdir}"/run/{proftpd,}
 }
diff --git a/extra/proftpd/proftpd.install b/extra/proftpd/proftpd.install
new file mode 100644
index 000000000..6d9888496
--- /dev/null
+++ b/extra/proftpd/proftpd.install
@@ -0,0 +1,3 @@
+post_install() {
+  systemd-tmpfiles --create proftpd.conf
+}
diff --git a/extra/proftpd/proftpd.service b/extra/proftpd/proftpd.service
index c202a2fdf..a07d17f46 100644
--- a/extra/proftpd/proftpd.service
+++ b/extra/proftpd/proftpd.service
@@ -1,14 +1,12 @@
 [Unit]
-Description = ProFTPD FTP Server
-After = network.target nss-lookup.target local-fs.target remote-fs.target
+Description=ProFTPD FTP Server
+After=network.target
 
 [Service]
-Type = forking
-PIDFile = /run/proftpd/proftpd.pid
-Environment = PROFTPD_ARGS=
-EnvironmentFile = -/etc/conf.d/proftpd
-ExecStart = /usr/sbin/proftpd $PROFTPD_ARGS
-ExecReload = /bin/kill -HUP $MAINPID
+Type=forking
+PIDFile=/run/proftpd/proftpd.pid
+ExecStart=/usr/sbin/proftpd
+ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
 WantedBy = multi-user.target
diff --git a/extra/proftpd/proftpd.tmpfiles b/extra/proftpd/proftpd.tmpfiles
new file mode 100644
index 000000000..241dc7cb1
--- /dev/null
+++ b/extra/proftpd/proftpd.tmpfiles
@@ -0,0 +1 @@
+d /run/proftpd 0755 root root
diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD
index 027cf9793..826220077 100644
--- a/extra/snd/PKGBUILD
+++ b/extra/snd/PKGBUILD
@@ -1,31 +1,36 @@
-# $Id: PKGBUILD 148636 2012-02-04 16:33:10Z schiv $
+# $Id: PKGBUILD 165577 2012-08-25 16:01:55Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: see .contrib
 
 pkgname=snd
-pkgver=12.7
+pkgver=13.0
 pkgrel=1
 pkgdesc="An advanced sound editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ccrma.stanford.edu/software/snd/"
 license=('custom')
-depends=('lesstif' 'jack' 'gamin' 'gsl' 'fftw')
-makedepends=('ladspa' 'wavpack' 'flac' 'speex' 'libxpm'
-             'timidity++' 'mpg123' 'vorbis-tools' 'gmp')
-optdepends=('ladspa' 'wavpack' 'flac' 'speex'
-            'timidity++' 'mpg123' 'vorbis-tools')
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('5edb4ee488c3406c9aa582c5f11a4492')
+depends=('jack' 'gamin' 'gsl' 'fftw' 'gtk2' 'libmpc')
+makedepends=('ladspa' 'wavpack' 'flac' 'speex' 'gmp'
+             'timidity++' 'mpg123' 'vorbis-tools')
+optdepends=('wavpack' 'flac' 'speex' 'mpg123'
+            'timidity++' 'vorbis-tools')
+install=$pkgname.install
+source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz")
+md5sums=('2288933fdaf012ed92c850d6dba90c54')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  export LDFLAGS="${LDFLAGS/--as-needed,}"
+  # execstack is probably due to gmp; this is here just for a reminder
+  #LDFLAGS+=" -Wl,-z,noexecstack"
 
   ./configure --prefix=/usr \
               --with-alsa \
-              --with-jack
+              --with-jack \
+              --with-gtk \
+              --with-ladspa \
+              --with-gmp
   make
 }
 
diff --git a/extra/snd/snd.install b/extra/snd/snd.install
new file mode 100644
index 000000000..57b42ddff
--- /dev/null
+++ b/extra/snd/snd.install
@@ -0,0 +1,3 @@
+post_upgrade() {
+	echo "  > snd GUI is now GTK+ due to lesstif/libxpm build issues"
+}
diff --git a/extra/ypserv/PKGBUILD b/extra/ypserv/PKGBUILD
index 148a126c5..1c6adc54e 100644
--- a/extra/ypserv/PKGBUILD
+++ b/extra/ypserv/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 151791 2012-03-03 01:11:12Z tomegun $
+# $Id: PKGBUILD 165551 2012-08-23 17:48:09Z 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=ypserv
-pkgver=2.27
+pkgver=2.28
 pkgrel=1
 pkgdesc='Linux NIS Server'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,10 @@ depends=('gdbm' 'openslp' 'inetutils')
 optdepends=('gawk: for printcap support')
 backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets')
 source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	confpost.patch
+	'confpost.patch'
+        'ypxfrd.service'
+        'yppasswdd.service'
+	'ypserv.service'
         'yppasswd'
         'ypserv')
 
@@ -35,8 +38,17 @@ package() {
 	install -D -m644 etc/securenets "${pkgdir}"/var/yp/securenets
 	install -D -m755 ../ypserv "${pkgdir}"/etc/rc.d/ypserv
 	install -D -m755 ../yppasswd "${pkgdir}"/etc/rc.d/yppasswd
+	install -D -m644 ../ypxfrd.service "${pkgdir}"/usr/lib/systemd/system/ypxfrd.service
+	install -D -m644 ../ypserv.service "${pkgdir}"/usr/lib/systemd/system/ypserv.service
+	install -D -m644 ../yppasswdd.service "${pkgdir}"/usr/lib/systemd/system/yppasswdd.service
+
+	# Provide native service for arch-daemons generator
+	ln -s yppasswdd.service "$pkgdir/usr/lib/systemd/system/yppasswd.service"
 }
-md5sums=('fd9c43aec932a92be07b723c647b02a4'
+md5sums=('ed64f489bab494218fc5c5942b95d5b6'
          '8acb314f30d6e531ac9efa8655f68ccb'
+         'c80e253756446d59a90c4c21b1cb8740'
+         '7cba3dd3544436c3c1f05e36c0018e92'
+         '3398271c3e0a054e64b06b99aa2dc63d'
          '4bc84c48ed1bb9659698853acb5cfd76'
          'c40befe5932f1b42efaced6b46809303')
diff --git a/extra/ypserv/yppasswdd.service b/extra/ypserv/yppasswdd.service
new file mode 100644
index 000000000..9a7068b6c
--- /dev/null
+++ b/extra/ypserv/yppasswdd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=NIS/YP (Network Information Service) Users Passwords Change Server
+Requires=rpcbind.service
+After=network.target rpcbind.service
+
+[Service]
+Type=forking
+PIDFile=/run/yppasswdd.pid
+ExecStart=/usr/sbin/rpc.yppasswdd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/ypserv/ypserv.service b/extra/ypserv/ypserv.service
new file mode 100644
index 000000000..024a92e5a
--- /dev/null
+++ b/extra/ypserv/ypserv.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=NIS/YP (Network Information Service) Server
+Requires=rpcbind.service
+After=network.target rpcbind.service 
+
+[Service]
+Type=forking
+PIDFile=/run/ypserv.pid
+ExecStart=/usr/sbin/ypserv
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/ypserv/ypxfrd.service b/extra/ypserv/ypxfrd.service
new file mode 100644
index 000000000..322ef559f
--- /dev/null
+++ b/extra/ypserv/ypxfrd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=NIS/YP (Network Information Service) Maps Transferring Accelerator
+Requires=rpcbind.service
+After=network.target rpcbind.service
+
+[Service]
+Type=forking
+PIDFile=/run/ypxfrd.pid
+ExecStart=/usr/sbin/rpc.ypxfrd
+
+[Install]
+WantedBy=multi-user.target