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

Conflicts:
	community/midori/PKGBUILD
	extra/libffado/PKGBUILD
	gnome-unstable/eog/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	testing/util-linux/PKGBUILD

4 files changed, 26 insertions, 24 deletions

diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD
index 3a36888a5..95af79fdc 100644
--- a/community/freeradius/PKGBUILD
+++ b/community/freeradius/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 76105 2012-09-11 14:05:16Z spupykin $
+# $Id: PKGBUILD 76509 2012-09-20 10:48:44Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jason R Begley (jayray@digitalgoat.com>
 
 pkgname=freeradius
 pkgver=2.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The premier open source RADIUS server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freeradius.org/"
@@ -16,10 +16,12 @@ options=('!libtool' '!makeflags')
 install=$pkgname.install
 source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{,.sig}
 	radiusd
+	freeradius.tmpfiles
 	krb5-build-fix.patch)
 md5sums=('0fb333fe6a64eb2b1dd6ef67f7bca119'
          '5dd57af81ba075102581fec45316ba7b'
          'f1a6530b1b69d2fa793aa45b2de379bb'
+         'f959e89812bedfc9f8308076f78cd74e'
          'c6a61de7576933f59154a53bfc12a2d2')
 
 build() {
@@ -42,4 +44,5 @@ package() {
   chmod o+r $pkgdir/etc/raddb/*
   mv $pkgdir/etc/raddb $pkgdir/etc/raddb.default
   rm -rf $pkgdir/var/run
+  install -Dm0644 $srcdir/freeradius.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
 }
diff --git a/community/freeradius/freeradius.tmpfiles b/community/freeradius/freeradius.tmpfiles
new file mode 100644
index 000000000..e4e056a36
--- /dev/null
+++ b/community/freeradius/freeradius.tmpfiles
@@ -0,0 +1 @@
+d /run/radiusd 0755 radiusd radiusd -
diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD
index f1c8cc0a7..e61a9cd9d 100644
--- a/community/gtkwave/PKGBUILD
+++ b/community/gtkwave/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72340 2012-06-12 09:32:15Z kkeen $
+# $Id: PKGBUILD 76513 2012-09-20 19:33:36Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Jared Casper <jaredcasper@gmail.com>
 
 pkgname=gtkwave
-pkgver=3.3.37
+pkgver=3.3.40
 pkgrel=1
 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('bzip2' 'xz' 'gtk2')
 makedepends=('gperf')
 install='gtkwave.install'
 source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz")
-md5sums=('8747205c6cf1abb34b5a8b2f157f37e0')
+md5sums=('f7b4cd0d056084f6725173b7f939152c')
 
 build() {
   cd "${srcdir}/gtkwave-${pkgver}"
diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD
index d5f878be8..7b58c4acc 100644
--- a/community/midori/PKGBUILD
+++ b/community/midori/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73311 2012-07-06 07:26:16Z bpiotrowski $
+# $Id: PKGBUILD 76505 2012-09-20 05:16:42Z bpiotrowski $
 # Maintainer:  Alexander Rødseth <rodseth@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
@@ -7,11 +7,11 @@
 # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
 
 pkgname=midori
-pkgver=0.4.6
-pkgrel=2
-pkgdesc="Lightweight web browser based on Gtk WebKit"
+pkgver=0.4.7
+pkgrel=1
+pkgdesc='Lightweight web browser based on Gtk WebKit'
 arch=('x86_64' 'i686' 'mips64el')
-url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
+url='http://www.twotoasts.de/index.php?/pages/midori_summary.html'
 license=('LGPL2.1')
 install=midori.install
 depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss')
@@ -19,31 +19,29 @@ makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala')
 optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support')
 options=('!emptydirs')
 source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea')
+md5sums=('06db7b88a41e9b2265728960d5e98f35')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $srcdir/$pkgname-$pkgver
   
   # python2 
   export PYTHON=/usr/bin/python2
   sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf
   
-  ./configure \
-    --prefix=/usr \
-    --jobs=${MAKEFLAGS/-j/} \
-	  --enable-addons \
-	  --disable-hildon \
-	  --enable-unique \
-	  --enable-nls \
-	  --enable-docs \
-	  --enable-apidocs
+  ./configure --prefix=/usr \
+              --jobs=${MAKEFLAGS/-j/} \
+              --enable-addons \
+              --disable-hildon \
+              --enable-unique \
+              --enable-nls \
+              --enable-docs \
+              --enable-apidocs
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
 }
 
 # vim:set ts=2 sw=2 et: