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

Conflicts:
	community-testing/cegui/PKGBUILD
	community-testing/darktable/PKGBUILD
	community-testing/freewrl/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/gource/PKGBUILD
	community-testing/luminancehdr/PKGBUILD
	community-testing/luxrays/PKGBUILD
	community-testing/luxrender/PKGBUILD
	community-testing/megaglest/PKGBUILD
	community-testing/openimageio/PKGBUILD
	community-testing/performous/PKGBUILD
	community-testing/projectm/PKGBUILD
	community-testing/rss-glx/PKGBUILD
	community-testing/sfml/PKGBUILD
	community-testing/spring/PKGBUILD
	community-testing/supertux/PKGBUILD
	community-testing/widelands/PKGBUILD
	community-testing/xbmc/PKGBUILD
	community-testing/xbmc/xbmc.install
	community/plan9port/PKGBUILD
	community/v8/PKGBUILD
	multilib/dev86/PKGBUILD
	testing/binutils/PKGBUILD
	testing/bzflag/PKGBUILD
	testing/calligra/PKGBUILD
	testing/cinepaint/PKGBUILD
	testing/coreutils/PKGBUILD
	testing/enblend-enfuse/PKGBUILD
	testing/gcc/PKGBUILD
	testing/gegl/PKGBUILD
	testing/glew/PKGBUILD
	testing/glibc/PKGBUILD
	testing/glibc/glibc.install
	testing/glibc/nscd.service
	testing/gnome-documents/PKGBUILD
	testing/hugin/PKGBUILD
	testing/inkscape/PKGBUILD
	testing/opencv/PKGBUILD
	testing/systemd/PKGBUILD
	testing/systemd/systemd.install
	testing/tracker/PKGBUILD
	testing/transcode/PKGBUILD
	testing/transcode/ffmpeg-0.11.patch
	testing/xf86-video-nouveau/PKGBUILD
	testing/xine-lib/PKGBUILD

6 files changed, 32 insertions, 18 deletions

diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index 0814a9b6d..34cc4f141 100644
--- a/extra/cifs-utils/PKGBUILD
+++ b/extra/cifs-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 164812 2012-08-06 16:16:22Z tpowa $
+# $Id: PKGBUILD 169599 2012-10-24 07:18:13Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=cifs-utils
-pkgver=5.6
-pkgrel=2
+pkgver=5.7
+pkgrel=1
 pkgdesc="CIFS filesystem user-space tools"
 arch=(i686 x86_64 'mips64el')
 url="http://wiki.samba.org/index.php/LinuxCIFS_utils"
@@ -24,4 +24,4 @@ package() {
   # set mount.cifs uid, to enable none root mounting form fstab
   chmod +s $pkgdir/usr/bin/mount.cifs
 }
-md5sums=('89c94ff512e375b92899b79622604c39')
+md5sums=('4215f12be8663f65d2c21dbbbafbc7f8')
diff --git a/extra/cups-pk-helper/PKGBUILD b/extra/cups-pk-helper/PKGBUILD
index 405874d97..b07530b05 100644
--- a/extra/cups-pk-helper/PKGBUILD
+++ b/extra/cups-pk-helper/PKGBUILD
@@ -1,7 +1,7 @@
-#$Id: PKGBUILD 156732 2012-04-23 09:04:15Z ibiru $
+#$Id: PKGBUILD 169617 2012-10-24 17:03:25Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=cups-pk-helper
-pkgver=0.2.2
+pkgver=0.2.4
 pkgrel=1
 pkgdesc="A helper that makes system-config-printer use PolicyKit"
 arch=(i686 x86_64 'mips64el')
@@ -10,17 +10,17 @@ license=('GPL')
 depends=(polkit libcups)
 makedepends=(intltool)
 source=(http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.xz)
-sha256sums=('56a10efbc0f37db39a940d99d549c7f37fa95f1af4745b30b79c240b0f37cfd7')
+sha256sums=('d187dc994ff64621aa090d114170b292daa11122481d8b8adb7613b32ca4e3c3')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib/cups-pk-helper
   make
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index a22fdf1ac..b83b9babd 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169448 2012-10-21 11:01:54Z ibiru $
+# $Id: PKGBUILD 169612 2012-10-24 12:56:39Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libtorrent-rasterbar
-pkgver=0.16.4
+pkgver=0.16.5
 pkgrel=1
 epoch=1
 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
@@ -14,7 +14,7 @@ depends=('boost-libs' 'geoip' 'python2')
 makedepends=('boost')
 options=('!libtool' '!emptydirs')
 source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('f8695373c574a6801b4dfe7030e0a0c4bb610abd')
+sha1sums=('dde29c7a51392d9098de23e2e69a993a5c380016')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/usermin/PKGBUILD b/extra/usermin/PKGBUILD
index 33e1931ab..ec40288ad 100644
--- a/extra/usermin/PKGBUILD
+++ b/extra/usermin/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167307 2012-09-30 20:46:00Z tpowa $
+# $Id: PKGBUILD 169610 2012-10-24 12:47:17Z tomegun $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=usermin
 pkgver=1.520
-pkgrel=1
+pkgrel=2
 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding"
 arch=(i686 x86_64 'mips64el')
 license=('custom:usermin')
@@ -45,6 +45,7 @@ backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' 'etc/usermin/co
 install=usermin.install
 source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz 
 	usermin.rc 
+	usermin.service
 	ftp://ftp.archlinux.org/other/usermin/usermin-config.tar.bz2) 
 
 build() {
@@ -116,7 +117,10 @@ build() {
   # enable user and password login
   sed -i -e '/localauth/d' $startdir/pkg/etc/usermin/miniserv.conf
 
-  #install rc file
+  #install systemd service file
+  install -D -m 644 $startdir/src/usermin.service $startdir/pkg/usr/lib/systemd/system/usermin.service
+ 
+ #install rc file
   install -D -m 755 $startdir/src/usermin.rc $startdir/pkg/etc/rc.d/usermin
 
   # delete temp dir
@@ -126,4 +130,5 @@ build() {
 }
 md5sums=('5819ba87796d9373a92116e90d1a35d4'
          'cfef4490cd1ef9517c0b39a7bd75c968'
+         'a5bd5e5ee779f8a3cf3d776ca77ee36e'
          'ec37a79f948f778224550930d2a7ca07')
diff --git a/extra/usermin/usermin.service b/extra/usermin/usermin.service
new file mode 100644
index 000000000..e91164c63
--- /dev/null
+++ b/extra/usermin/usermin.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Usermin
+
+[Service]
+Type=forking
+ExecStart=/opt/usermin/miniserv.pl /etc/usermin/miniserv.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index d0f433cbe..e26c2b5aa 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168924 2012-10-16 15:02:37Z andyrtr $
+# $Id: PKGBUILD 169622 2012-10-24 19:19:13Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=284
+pkgver=285
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
         LICENSE)
-md5sums=('fa6bd90b91365f41c6bb895bee054c12'
+md5sums=('8863bb871edcaf84560bb37eaedd4bee'
          '10ecc3f8ee91e3189863a172f68282d2')
 
 build() {