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

Conflicts:
	core/systemd/PKGBUILD
	core/sysvinit/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/lynx/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/sip/PKGBUILD
	libre/kdelibs-libre/PKGBUILD
	testing/libdrm/PKGBUILD
	testing/xf86-video-ati/PKGBUILD

10 files changed, 99 insertions, 54 deletions

diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD
index 323a033ce..1b6183e7d 100644
--- a/community/john/PKGBUILD
+++ b/community/john/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgname=john
 pkgver=1.7.9
-pkgrel=3
-_jumbover=5
+pkgrel=4
+_jumbover=6
 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openwall.com/$pkgname/"
@@ -17,12 +17,13 @@ optdepends=("perl: for executing some of the scripts at /usr/share/john"
             "ruby: for executing some of the scripts at /usr/share/john"
             "python: for executing some of the scripts at /usr/share/john")
 backup=('etc/john/john.conf')
-source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2 
-	http://www.openwall.com/john/g/john-$pkgver-jumbo-$_jumbover.diff.gz 
-	ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz
-	params.h.patch)
+install=john.install
+source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2
+        http://www.openwall.com/john/g/john-$pkgver-jumbo-$_jumbover.diff.gz
+        ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz
+        params.h.patch)
 md5sums=('45f54fc59386ecd67daaef9f19781d93'
-         '68cacb612f20c71eed6c24cbaf28148a'
+         '685c759ec6f865ea81f40a487cd56882'
          'c8d5c69f86c2eedb485583b0305284a1'
          'f69ed632eba8fb9e45847a4b4a323787')
 
@@ -58,32 +59,46 @@ package() {
 	# config file
 	sed -i 's|$JOHN|/usr/share/john|g' ${srcdir}/john-$pkgver/run/john.conf
 	install -Dm644 ${srcdir}/john-$pkgver/run/john.conf ${pkgdir}/etc/john/john.conf
-	
+
 	# docs
 	install -d ${pkgdir}/usr/share/doc/john
 	install -m644 ${srcdir}/john-$pkgver/doc/* ${pkgdir}/usr/share/doc/john/
 	install -Dm644 ${srcdir}/john-$pkgver/doc/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 
-	# install password list, charset files and other stuff
+	# install password list, charset files
 	install -d ${pkgdir}/usr/share/john/
 	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/password.lst ${pkgdir}/usr/share/john/
+	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/dictionary.rfc2865 ${pkgdir}/usr/share/john/
 	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/stats ${pkgdir}/usr/share/john/
 	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{all,alnum,alpha,digits,lanman}.chr \
-          ${pkgdir}/usr/share/john/
+ 			${pkgdir}/usr/share/john/
 	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{dumb16,dumb32,dynamic}.conf \
-          ${pkgdir}/usr/share/john/
-	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{cmpt_cp,ldif2john,lion2john-alt,lion2john}.pl \
-          ${pkgdir}/usr/share/john
-	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{netntlm,radius2john,sap_prepare,sha-dump}.pl \
-          ${pkgdir}/usr/share/john
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/run/sha-test.pl \
-          ${pkgdir}/usr/share/john
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/run/genincstats.rb \
-          ${pkgdir}/usr/share/john
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/run/netscreen.py \
-          ${pkgdir}/usr/share/john
+			${pkgdir}/usr/share/john/
+
+	# install scripts
+	john_scripts=(benchmark-unify \
+		cracf2john.py \
+		genincstats.rb \
+		ldif2john.pl \
+		lion2john-alt.pl \
+		lion2john.pl \
+		netntlm.pl \
+		netscreen.py \
+		odf2john.py \
+		pass_gen.pl \
+		radius2john.pl \
+		sap2john.pl \
+		sha-dump.pl \
+		sha-test.pl \
+		sipdump2john.py)
+	for john_script in "${john_scripts[@]}"; do
+		install -m755 ${srcdir}/${pkgname}-${pkgver}/run/${john_script} \
+			${pkgdir}/usr/share/john
+	done
 
 	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/dynamic.conf ${pkgdir}/etc/john/
+	install -Dm644 ${srcdir}/${pkgname}-${pkgver}/run/john.bash_completion \
+		${pkgdir}/etc/bash_completion.d/john
 
 	# install binaries
 	install -Dm755 ${srcdir}/john-$pkgver/run/john ${pkgdir}/usr/bin/john
@@ -93,16 +108,21 @@ package() {
 	install -Dm755 ${srcdir}/john-$pkgver/run/relbench ${pkgdir}/usr/bin/relbench
 	install -Dm755 ${srcdir}/john-$pkgver/run/tgtsnarf ${pkgdir}/usr/bin/tgtsnarf
 	install -Dm755 ${srcdir}/john-$pkgver/run/mailer ${pkgdir}/usr/bin/john-mailer
-	
-  # create links
-  cd ${pkgdir}/usr/bin
+	install -Dm755 ${srcdir}/john-$pkgver/run/raw2dyna ${pkgdir}/usr/bin/raw2dyna
+
+	# create links
+	cd ${pkgdir}/usr/bin
+	ln -s john hccap2john
+	ln -s john keepass2john
+	ln -s john pdf2john
+	ln -s john pwsafe2john
+	ln -s john racf2john
+	ln -s john rar2john
+	ln -s john ssh2john
 	ln -s john unafs
 	ln -s john unique
 	ln -s john unshadow
 	ln -s john undrop
-	ln -s john pdf2john
-	ln -s john rar2john
-	ln -s john ssh2john
 	ln -s john zip2john
 }
 
diff --git a/community/john/john.install b/community/john/john.install
new file mode 100644
index 000000000..21bc51c70
--- /dev/null
+++ b/community/john/john.install
@@ -0,0 +1,10 @@
+post_install() {
+  touch /etc/john/john.local.conf 2> /dev/null
+}
+
+
+post_upgrade() {
+  post_install $1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/minitube/PKGBUILD b/community/minitube/PKGBUILD
index 4cdeafce2..38aab9086 100644
--- a/community/minitube/PKGBUILD
+++ b/community/minitube/PKGBUILD
@@ -1,20 +1,25 @@
-# $Id: PKGBUILD 68258 2012-03-20 19:50:34Z andrea $
+# $Id: PKGBUILD 73056 2012-06-29 18:18:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=minitube
-pkgver=1.7.1
-pkgrel=3
+pkgver=1.8
+pkgrel=1
 pkgdesc="A native YouTube client in QT. Watch YouTube videos without Flash Player"
 arch=('i686' 'x86_64')
 url='http://flavio.tordini.org/minitube'
 license=('GPL')
 depends=('phonon')
 install="${pkgname}.install"
-source=("http://flavio.tordini.org/files/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('ce336b8cca8294f85d8e34b6a7828e38')
+source=("http://flavio.tordini.org/files/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'fix-build.patch')
+md5sums=('dabfe4776ab6a19eff14e644f68714bb'
+         'b6d67acdfc5ef17235449ca13575ba97')
 
 build() {
   cd "${srcdir}"/${pkgname}
+
+  patch -p1 -i "${srcdir}"/fix-build.patch
+
   qmake
 }
 
diff --git a/community/minitube/fix-build.patch b/community/minitube/fix-build.patch
new file mode 100644
index 000000000..9ac61d21b
--- /dev/null
+++ b/community/minitube/fix-build.patch
@@ -0,0 +1,11 @@
+--- minitube/src/qtsingleapplication/qtlocalpeer.cpp~	2012-06-29 18:13:35.133070928 +0000
++++ minitube/src/qtsingleapplication/qtlocalpeer.cpp	2012-06-29 18:14:16.359420453 +0000
+@@ -57,6 +57,8 @@
+ static PProcessIdToSessionId pProcessIdToSessionId = 0;
+ #endif
+ #if defined(Q_OS_UNIX)
++#include <sys/types.h>
++#include <unistd.h>
+ #include <time.h>
+ #endif
+ 
diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD
index 070f23417..ff4edb976 100644
--- a/community/picard/PKGBUILD
+++ b/community/picard/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 71898 2012-06-03 04:13:02Z bisson $
+# $Id: PKGBUILD 73038 2012-06-29 11:35:44Z andrea $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 # Contributor: sysrq
 
 pkgname=picard
 pkgver=1.0
-pkgrel=1
+pkgrel=3
 pkgdesc='Official MusicBrainz tagger'
 url='http://musicbrainz.org/doc/MusicBrainz_Picard'
 license=('GPL')
diff --git a/community/python2-matplotlib/PKGBUILD b/community/python2-matplotlib/PKGBUILD
index 72c1d053e..65f6c9303 100644
--- a/community/python2-matplotlib/PKGBUILD
+++ b/community/python2-matplotlib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73010 2012-06-27 23:33:52Z stephane $
+# $Id: PKGBUILD 73039 2012-06-29 11:35:49Z andrea $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
@@ -6,12 +6,13 @@
 
 pkgname=python2-matplotlib
 pkgver=1.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A python plotting library, making publication quality plots"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://matplotlib.sourceforge.net/"
+license=('custom')
 backup=(usr/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc)
-depends=('python2-pytz' 'python2-numpy' 'python2-pyparsing' 'python2-pyqt')
+depends=('python2-dateutil' 'python2-pytz' 'python2-numpy' 'python2-pyparsing' 'python2-pyqt')
 optdepends=('pygtk: for use with the GTK or GTKAgg backend'
             'tk: used by the TkAgg backend'
             'wxpython: for use with the WXAgg backend')
@@ -22,8 +23,7 @@ conflicts=('python-matplotlib')
 source=("http://downloads.sourceforge.net/matplotlib/matplotlib-${pkgver}.tar.gz"
          setup.cfg)
 sha1sums=('435b4f04a7e099b79f66451d69ad0b5ce66030ae'
-          'bcb5a83db9d95c96a57ca518fa6bd1897b23558f')
-license=('custom')
+          'f074495fc965298e0372751b34c8edb319437c5f')
 
 build() {
    cd "${srcdir}/matplotlib-${pkgver}"
@@ -34,6 +34,9 @@ build() {
    rm lib/matplotlib/pyparsing.py
    sed -i "s/matplotlib.pyparsing/pyparsing/g" lib/matplotlib/{mathtext,fontconfig_pattern}.py
 
+   # remove internal copy of dateutil
+   rm -r lib/dateutil
+
    # python2 fix
    for file in $(find . -name '*.py' -print); do
       sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \
diff --git a/community/python2-matplotlib/setup.cfg b/community/python2-matplotlib/setup.cfg
index 4b82986e9..778b04ccc 100644
--- a/community/python2-matplotlib/setup.cfg
+++ b/community/python2-matplotlib/setup.cfg
@@ -28,7 +28,7 @@ tag_svn_revision = 1
 #
 ## Date/timezone support:
 #pytz = False
-#dateutil = False
+dateutil = False
 
 [gui_support]
 # Matplotlib supports multiple GUI toolkits, including Cocoa,
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index 2d9bf6474..2029bd920 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71108 2012-05-24 08:34:09Z spupykin $
+# $Id: PKGBUILD 73047 2012-06-29 15:41:01Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
-pkgver=2.4.14
+pkgver=2.4.15
 pkgrel=1
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ backup=("etc/redis.conf"
 source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
 	"redis.d"
 	"redis.logrotate")
-md5sums=('1bc8f833b955ef119d643da08084433f'
+md5sums=('ef273152151c3f905d284cbdbbdb234c'
          '4f2c02b481283d1336508c988e60e8d8'
          '9e2d75b7a9dc421122d673fe520ef17f')
 
diff --git a/community/supercollider/PKGBUILD b/community/supercollider/PKGBUILD
index 1dd29b70b..e9f6cde95 100644
--- a/community/supercollider/PKGBUILD
+++ b/community/supercollider/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72057 2012-06-07 14:10:55Z speps $
+# $Id: PKGBUILD 73052 2012-06-29 16:50:17Z speps $
 # Maintainer : speps <speps at aur dot archlinux dot org>
 # Contributor:  <farid at archlinux-br.org>
 
 _name=SuperCollider
 pkgname=supercollider
-pkgver=3.5.2
+pkgver=3.5.3
 pkgrel=1
 pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ optdepends=('emacs: emacs interface'
             'ruby: vim support')
 install="$pkgname.install"
 source=("http://download.sourceforge.net/project/$pkgname/Source/$pkgver/$_name-$pkgver-Source-linux.tar.bz2")
-md5sums=('2bf4399ec9a7e37f155bafd018913bac')
+md5sums=('84fde920c32e9644902f989136a35b91')
 
 build() {
   cd "$srcdir/$_name-Source"
diff --git a/community/sylpheed/PKGBUILD b/community/sylpheed/PKGBUILD
index e9bb68bf9..46feb657f 100644
--- a/community/sylpheed/PKGBUILD
+++ b/community/sylpheed/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71851 2012-06-02 10:42:33Z speps $
+# $Id: PKGBUILD 73041 2012-06-29 12:56:08Z speps $
 # Maintainer: speps <speps at aur dot archlinux dot org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=sylpheed
-pkgver=3.1.4
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="Lightweight and user-friendly e-mail client"
 arch=('i686' 'x86_64')
@@ -14,15 +14,11 @@ depends=('gpgme' 'gtkspell' 'desktop-file-utils')
 makedepends=('compface' 'openssl')
 options=('!libtool')
 install="$pkgname.install"
-source=("http://sylpheed.sraoss.jp/$pkgname/v3.1/$pkgname-$pkgver.tar.bz2")
-md5sums=('4e0e41f05607e5c2542a7dfd166aee77')
+source=("http://sylpheed.sraoss.jp/$pkgname/v3.2/$pkgname-$pkgver.tar.bz2")
+md5sums=('bbb691cf2bb11f84b329e68b58a62918')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
-  # glib2 fix
-  sed -i 's/glibconfig/glib/' libsylph/defs.h
-
   ./configure --prefix=/usr \
               --enable-ldap
   make