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

Conflicts:
	community-testing/cdfs/PKGBUILD
	community-testing/vhba-module/PKGBUILD
	community-testing/vhba-module/vhba-module.install
	community/apcupsd/PKGBUILD
	community/aspell-ca/PKGBUILD
	core/systemd/PKGBUILD
	extra/dhcp/PKGBUILD
	libre/virtualbox-libre/PKGBUILD
	staging/calligra/PKGBUILD
	testing/bison/PKGBUILD

14 files changed, 79 insertions, 47 deletions

diff --git a/community/apcupsd/PKGBUILD b/community/apcupsd/PKGBUILD
index 48ac0bbe0..d7f6516bd 100644
--- a/community/apcupsd/PKGBUILD
+++ b/community/apcupsd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55548 2011-09-14 08:57:52Z spupykin $
+# $Id: PKGBUILD 74550 2012-07-30 13:54:14Z mtorromeo $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Todd Musall <tmusall@comcast.net>
 
 pkgname=apcupsd
 pkgver=3.14.10
-pkgrel=1
+pkgrel=2
 pkgdesc="power mangement and controlling most of APC's UPS models"
 arch=(i686 x86_64 mips64el)
 url="http://www.apcupsd.org"
@@ -17,21 +17,24 @@ makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2')
 backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf
         etc/apcupsd/multimon.conf)
 source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz
-	apcupsd)
+	apcupsd
+	apcupsd.service)
 md5sums=('5928822d855c5cf7ac29655e3e0b8c23'
-         '8bc674da24188c69b0ad5d7fe7510f73')
+         '8bc674da24188c69b0ad5d7fe7510f73'
+         '3baf366b2cfabf83a206a1cb0c8f4c26')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --build=$CHOST --libexecdir=/usr/lib/$pkgname \
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr  --libexecdir=/usr/lib/$pkgname \
 		--enable-cgi --enable-usb --enable-net \
 		--with-upstype=usb --with-upscable=usb \
 		--with-serial-dev=/dev/usb/hid/hiddev[0-9] \
 		--enable-pthreads --enable-gapcmon
   make
-  make DESTDIR=$pkgdir install
-  install -D -m755 ../apcupsd $pkgdir/etc/rc.d/apcupsd
-  chmod 755 $pkgdir/sbin/*
-  mkdir -p $pkgdir/usr/lib/$pkgname/cgi-bin
-  mv $pkgdir/etc/apcupsd/*.cgi $pkgdir/usr/lib/$pkgname/cgi-bin
+  make DESTDIR="$pkgdir" install
+  install -Dm755 "$srcdir/apcupsd" "$pkgdir/etc/rc.d/apcupsd"
+  install -Dm644 "$srcdir/apcupsd.service" "$pkgdir/usr/lib/systemd/system/apcupsd.service"
+  chmod 755 "$pkgdir"/sbin/*
+  install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin"
+  mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin"
 }
diff --git a/community/apcupsd/apcupsd.service b/community/apcupsd/apcupsd.service
new file mode 100644
index 000000000..9cec6e441
--- /dev/null
+++ b/community/apcupsd/apcupsd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=APC UPS Monitor
+
+[Service]
+ExecStart=/sbin/apcupsd -b
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/aspell-ca/PKGBUILD b/community/aspell-ca/PKGBUILD
index 87800c619..bc4e820a6 100644
--- a/community/aspell-ca/PKGBUILD
+++ b/community/aspell-ca/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 67433 2012-03-11 19:08:53Z lcarlier $
-#Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# $Id: PKGBUILD 74578 2012-07-30 19:39:10Z jlichtblau $
+#Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+#Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 
 pkgname=aspell-ca
-pkgver=2.1.5
-pkgrel=4
-arch=('i686' 'x86_64' 'mips64el')
+pkgver=2.3.0
+pkgrel=1
 pkgdesc="Catalan dictionary for aspell"
-depends=('aspell')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://aspell.net/"
 license=('GPL2')
-source=("ftp://ftp.gnu.org/gnu/aspell/dict/ca/aspell6-ca-$pkgver-1.tar.bz2")
-md5sums=('153d26f724866909c6faf49eecefe8b3')
+depends=('aspell')
+source=(http://www.softcatala.org/pub/softcatala/aspell/$pkgver/aspell6-ca-$pkgver.tar.bz2)
+sha256sums=('61db978261c9edabadf9d247fdbecac284ee92980b1aea478f72facaae950c52')
 
 build() {
-  cd aspell6-ca-${pkgver}-1
+  cd aspell6-ca-${pkgver}
 
   ./configure
-
   make
 }
 
 package() {
-  cd aspell6-ca-${pkgver}-1
+  cd aspell6-ca-${pkgver}
 
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD
index fe854547f..e40031472 100644
--- a/community/audit/PKGBUILD
+++ b/community/audit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 68379 2012-03-23 14:35:57Z mtorromeo $
+# $Id: PKGBUILD 74552 2012-07-30 13:59:54Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Connor Behan <connor.behan@gmail.com>
 # Contributor: henning mueller <henning@orgizm.net>
 
 pkgname=audit
 pkgver=2.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.'
 url=http://people.redhat.com/sgrubb/$pkgname
 arch=(i686 x86_64 mips64el)
@@ -28,10 +28,12 @@ backup=(
 source=(
 	$url/$pkgname-$pkgver.tar.gz
 	auditd.rc
+	auditd.service
 	python2.patch
 )
 md5sums=('dc099fcb2f9242d47ecc35b46d71dfd1'
          '5f86e87354d0c3b9b408a26daed7a906'
+         '67f6c51891120da038cb790693d8eba1'
          '45a33c6bef84f8e1701cb0b5e187336b')
 
 build() {
@@ -51,6 +53,8 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 
+	install -Dm755 "$srcdir/auditd.service" "$pkgdir/usr/lib/systemd/system/auditd.service"
+
 	cd "$pkgdir"
 	install -m755 "$srcdir/auditd.rc" etc/rc.d/auditd
 	install -d var/log/audit
diff --git a/community/audit/auditd.service b/community/audit/auditd.service
new file mode 100644
index 000000000..199b0dcbe
--- /dev/null
+++ b/community/audit/auditd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Audit Daemon
+
+[Service]
+ExecStartPre=/sbin/auditctl -R /etc/audit/audit.rules
+ExecStart=/sbin/auditd -n
+ExecStop=/bin/kill -15 $MAINPID
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD
index 081942518..f5b795f13 100644
--- a/community/gambas2/PKGBUILD
+++ b/community/gambas2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74496 2012-07-29 17:53:21Z lcarlier $
+# $Id: PKGBUILD 74537 2012-07-30 05:08:23Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Biru Ionut <ionut@archlinux.ro>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2
          'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
          'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
 pkgver=2.24.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net"
@@ -432,7 +432,7 @@ package_gambas2-gb-desktop() {
 }
 
 package_gambas2-gb-form() {
-  depends=('gambas2-gb-runtime')
+  depends=('gambas2-runtime')
   pkgdesc="Gambas2 form component"
 
   ## workaround for splitting
diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD
index b950c18df..e07883740 100644
--- a/community/gtranslator/PKGBUILD
+++ b/community/gtranslator/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70590 2012-05-12 10:14:49Z jlichtblau $
+# $Id: PKGBUILD 74570 2012-07-30 18:54:46Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Contributor: Christer Solskogen (solskogen@carebears.mine.nu)
 
 pkgname=gtranslator
-pkgver=2.91.4
+pkgver=2.91.5
 pkgrel=1
 pkgdesc="An enhanced gettext po file editor for the GNOME"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ options=('!libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz)
-sha256sums=('0e398cf7909d1fbaf9db66e20913553b38d1af7cad097f5bc8cc229d9ffbc594')
+sha256sums=('7dcdabd5c2156bef98f35d2ec31798287d1721e400ea738fb3ccc2ff2ef186e6')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -32,4 +32,3 @@ package() {
 
   make DESTDIR=${pkgdir} install
 }
-sha256sums=('af4ede1495c0c52ecc1e7bd36c8ee6ce0bb35525144d687d1ce7cb4bf6630826')
diff --git a/community/gtranslator/gtranslator.changelog b/community/gtranslator/gtranslator.changelog
index 712c1cb22..49dbfa714 100644
--- a/community/gtranslator/gtranslator.changelog
+++ b/community/gtranslator/gtranslator.changelog
@@ -1,4 +1,7 @@
-2011-10-28 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
+2012-07-30 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
+	* gtranslator 2.91.5-1
+
+2012-05-12 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
 	* gtranslator 2.91.4-1
 
 2012-04-23 Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD
index 6606bb974..e509458b5 100644
--- a/community/incron/PKGBUILD
+++ b/community/incron/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 69436 2012-04-16 10:50:17Z spupykin $
+# $Id: PKGBUILD 74562 2012-07-30 14:14:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 # Contributor: scj <scj(at)archlinux(dot)us>
 
 pkgname=incron
 pkgver=0.5.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://incron.aiken.cz/"
diff --git a/community/incron/incron.install b/community/incron/incron.install
index de4de3742..fa42d9cdc 100644
--- a/community/incron/incron.install
+++ b/community/incron/incron.install
@@ -1,7 +1,7 @@
 post_install () {
   # Check user/group incron exists
-  getent group incron > /dev/null || groupadd incron
-  getent passwd incron > /dev/null || useradd -c "Incron system" -g incron -s /bin/false -d /var/spool/incron incron
+  getent group incron > /dev/null || groupadd -r incron
+  getent passwd incron > /dev/null || useradd -r -c "Incron system" -g incron -s /bin/false -d /var/spool/incron incron
   # Fix permissions
   chown incron.incron -R /var/spool/incron
 }
diff --git a/community/libhx/PKGBUILD b/community/libhx/PKGBUILD
index 284cd0901..348046f9b 100644
--- a/community/libhx/PKGBUILD
+++ b/community/libhx/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id$
+# $Id: PKGBUILD 74564 2012-07-30 14:15:35Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Max Roder <maxroder@web.de>
 # Contributor: Nathan Owe <ndowens.aur at gmail dot com>
 
 pkgname='libhx'
-pkgver='3.12.1'
-pkgrel='1'
+pkgver=3.13
+pkgrel=1
 pkgdesc='A library providing queue, tree, I/O and utility functions'
 arch=('i686' 'x86_64')
 url=('http://libhx.sourceforge.net/')
@@ -13,7 +13,7 @@ license=('GPL')
 depends=()
 options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname}/libHX-${pkgver}.tar.xz")
-md5sums=('de66ebb98e73ffd4831090257a7b9533')
+md5sums=('3cfb6983e2e7eea20f295c5f2c2c9b03')
 
 build() {
   cd ${srcdir}/libHX-${pkgver}
diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD
index 2f68394b9..6cf3f28db 100644
--- a/community/qmmp/PKGBUILD
+++ b/community/qmmp/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 73485 2012-07-08 09:31:35Z ibiru $
+#$Id: PKGBUILD 74573 2012-07-30 19:10:22Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=qmmp
-pkgver=0.6.0
-pkgrel=2
+pkgver=0.6.2
+pkgrel=1
 pkgdesc="Qt4 based audio-player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://qmmp.ylsoftware.com/"
@@ -22,7 +22,7 @@ optdepends=('flac: native FLAC support'
             'ffmpeg' 'libsamplerate' 'wavpack')
 install=$pkgname.install
 source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('4e2c9cdfd630bb90b2c92cb3e2f95ac4239c7cf8f91c47ca4a5038dd519755fe')
+sha256sums=('c7638521e2ffb91beda11010a3f27958fc446b7e582e3d5e92c7dc5a751aa096')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog
index bfd002e57..ca63f9574 100644
--- a/community/qmmp/qmmp.changelog
+++ b/community/qmmp/qmmp.changelog
@@ -1,3 +1,6 @@
+2012-07-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qmmp 0.6.2-1
+
 2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* qmmp 0.6.0-2 ffmpeg 0.11 rebuild
 
diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD
index d8580657e..daf196737 100644
--- a/community/sysstat/PKGBUILD
+++ b/community/sysstat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 70821 2012-05-17 08:59:42Z spupykin $
+# $Id: PKGBUILD 74566 2012-07-30 14:16:23Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Martin Devera <devik@cdi.cz>
 
 pkgname=sysstat
-pkgver=10.0.5
+pkgver=10.1.1
 pkgrel=1
 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ backup=('etc/conf.d/sysstat'
 	'etc/conf.d/sysstat.ioconf')
 source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz
 	sysstat)
-md5sums=('208dd236d726d20591d53d3a20124dd4'
+md5sums=('8250cdcbc4a959c8a05e4186fbd13d84'
          '3ce41ebf7330aba01e70b38658afed1f')
 
 build() {