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

Conflicts:
	community-testing/qtcurve-kde4/PKGBUILD
	community-testing/r8168-lts/PKGBUILD
	multilib/lib32-libphobos/PKGBUILD
	testing/bison/PKGBUILD
	testing/flex/PKGBUILD
	testing/logrotate/PKGBUILD

9 files changed, 56 insertions, 106 deletions

diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD
index 3e1f4f5f7..d92115239 100644
--- a/community/conntrack-tools/PKGBUILD
+++ b/community/conntrack-tools/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 72966 2012-06-25 17:24:52Z seblu $
+# $Id: PKGBUILD 74777 2012-08-04 01:09:31Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Valere Monseur <valere_monseur@hotmail.com>
 # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 
 pkgname=conntrack-tools
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=1
 pkgdesc='Userspace tools to interact with the Netfilter connection tracking system'
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.b
         'conntrackd.conf'
         'conntrackd.service'
         '01-config-file-path.patch')
-md5sums=('48d414cb7a354001babf184ae6c16db9'
+md5sums=('a8afc813e16265655f83991fc0df35b6'
          '478fe76da0202fcb5249bf65968d1c26'
          'd3e73e81b54e3e8166d357d434680684'
          'bd135eaefb47923bb8e8d26f084d3e9d'
diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD
index 840f9311c..ecdb153f1 100644
--- a/community/dmd/PKGBUILD
+++ b/community/dmd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72013 2012-06-05 15:38:07Z svenstaro $
+# $Id: PKGBUILD 74747 2012-08-03 04:26:36Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -7,15 +7,15 @@
 
 pkgname=('dmd' 'libphobos')
 pkgbase=dmd
-pkgver=2.059
-pkgrel=3
+pkgver=2.060
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.digitalmars.com/d/2.0/"
 source=(http://ftp.digitalmars.com/$pkgname.$pkgver.zip
         tools-${pkgver}.tar.gz::https://github.com/D-Programming-Language/tools/tarball/v${pkgver})
-md5sums=('803b182e71c4b021dfd1811066201140'
-         '1605a9cff8ac7b2228dad5f4f217dfec')
 license=('custom')
+md5sums=('6cf237d16625bf37a757a413963fa999'
+         '1e75b64dbf725dc8f6fc9e60ded5bef8')
 
 [[ $CARCH == "x86_64" ]] && _archbits="64"
 [[ $CARCH == "i686" ]] && _archbits="32"
@@ -84,6 +84,5 @@ package_libphobos() {
 
   find $pkgdir/usr -type f | xargs chmod 0644
 
-  install -Dm644 $srcdir/dmd2/src/druntime/LICENSE_1_0.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-druntime
-  install -Dm644 $srcdir/dmd2/src/phobos/phoboslicense.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-phobos
+  install -Dm644 $srcdir/dmd2/src/druntime/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/community/ecryptfs-utils/PKGBUILD b/community/ecryptfs-utils/PKGBUILD
index f76d31142..ca3be0926 100644
--- a/community/ecryptfs-utils/PKGBUILD
+++ b/community/ecryptfs-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 73892 2012-07-16 14:01:48Z tredaelli $
+# $Id: PKGBUILD 74760 2012-08-03 12:32:39Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Richard Murri <admin@richardmurri.com>
 # Contributor: Michal Krenek <mikos@sg1.cz>
 
 pkgname=ecryptfs-utils
-pkgver=99
+pkgver=100
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Enterprise-class stacked cryptographic filesystem for Linux"
@@ -14,7 +14,7 @@ makedepends=('swig' 'intltool' 'gettext')
 depends=('keyutils' 'nss' 'python2')
 source=("http://launchpad.net/ecryptfs/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz")
 options=(!libtool)
-md5sums=('17ef9190c6d078845e19d3e9a7d8ef7a')
+md5sums=('efaa5eabbd368268874536036397f73b')
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index 255e6c36f..12fe6ed17 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70246 2012-05-03 01:48:06Z foutrelis $
+# $Id: PKGBUILD 74752 2012-08-03 10:54:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: farid <farid at archlinuc-br.org>
@@ -6,18 +6,18 @@
 
 pkgbase=gmic
 pkgname=('gmic' 'gimp-plugin-gmic')
-pkgver=1.5.1.2
-pkgrel=2
+pkgver=1.5.1.7
+pkgrel=1
 pkgdesc="image procession framework"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:CeCILL')
 url="http://gmic.sourceforge.net"
-makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagemagick')
+makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagemagick' 'qt')
 options=('docs' '!emptydirs')
 source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz"
 	opencv-buildfix.patch)
-md5sums=('1599803b0c60aa834cdc4f6200db5335'
-         '62515a0e477e71e11ee24f66b5799937')
+md5sums=('da53449144f0edc9431358118e574e7c'
+         '8d1cf5000239099255d25c7d3dbe5728')
 
 build() {
   cd "$srcdir/gmic-$pkgver"
@@ -32,9 +32,6 @@ package_gmic() {
   cd "$srcdir/gmic-$pkgver"
   make -C src install DESTDIR="$pkgdir" USR=/usr
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/gmic/LICENSE"
-  mkdir -p $pkgdir/usr/share/bash-completion/completions/
-  mv $pkgdir/etc/bash_completion.d/gmic $pkgdir/usr/share/bash-completion/completions/gmic
-  rm -rf $pkgdir/etc/bash_completion.d
 }
 
 package_gimp-plugin-gmic() {
diff --git a/community/gmic/opencv-buildfix.patch b/community/gmic/opencv-buildfix.patch
index 69778ac93..b204cb721 100644
--- a/community/gmic/opencv-buildfix.patch
+++ b/community/gmic/opencv-buildfix.patch
@@ -1,79 +1,32 @@
-diff -wbBur gmic-1.5.1.1/src/CImg.h gmic-1.5.1.1.my/src/CImg.h
---- gmic-1.5.1.1/src/CImg.h	2012-04-06 17:47:06.000000000 +0400
-+++ gmic-1.5.1.1.my/src/CImg.h	2012-04-10 02:10:19.000000000 +0400
-@@ -243,7 +243,11 @@
- #define _cimg_redefine_False
- #endif
- #include <cstddef>
-+#undef True
-+#undef False
- #include "cv.h"
-+#define True 1
-+#define False 0
- #include "highgui.h"
- #endif
- 
-diff -wbBur gmic-1.5.1.1/src/Makefile gmic-1.5.1.1.my/src/Makefile
---- gmic-1.5.1.1/src/Makefile	2012-04-06 17:47:05.000000000 +0400
-+++ gmic-1.5.1.1.my/src/Makefile	2012-04-10 02:39:09.000000000 +0400
-@@ -164,12 +164,12 @@
- # Flags to enable native support of webcams, using the OpenCV library.
- # This requires the presence of the OpenCV include and library files.
- # (package 'libcv3-2-dev' on Debian).
--OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
-+OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include/opencv `pkg-config --cflags opencv`
- ifeq ($(OS),Darwin)
--OPENCV_LDFLAGS = `pkg-config opencv --libs`   # Use this for OpenCV 2.2.0 !
-+OPENCV_LDFLAGS = `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui
- else
--OPENCV_LDFLAGS = -lcv -lhighgui
--# OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui   # Use this for OpenCV 2.2.0 !
-+OPENCV_LDFLAGS = `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui
-+# OPENCV_LDFLAGS = `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui
- endif
- 
- # Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library.
-@@ -270,7 +270,6 @@
- 	$(MAKE) bashcompletion
- 	$(MAKE) gimp
- 	$(MAKE) lib
--	$(MAKE) zart
- else
- ifeq ($(OS),Darwin)
- 	@echo "**"
-@@ -297,7 +296,7 @@
+diff -wbBur gmic-1.5.1.7/src/Makefile gmic-1.5.1.7.q/src/Makefile
+--- gmic-1.5.1.7/src/Makefile	2012-07-26 12:59:34.000000000 +0400
++++ gmic-1.5.1.7.q/src/Makefile	2012-08-03 14:03:10.000000000 +0400
+@@ -296,7 +296,7 @@
  
  zart: lib
  ifneq ($(OS),Darwin)
 -	cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart
 +	cd ../zart && qmake zart.pro && $(MAKE) && strip zart
  else
- 	cd ../zart && qmake zart_mac.pro && $(MAKE) 
+ 	cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)"
  endif
-@@ -386,16 +385,13 @@
- # Install/uninstall/clean.
- install:
- 	mkdir -p $(DESTDIR)$(PLUGINDIR)/
--	cp -f gmic_gimp $(DESTDIR)$(PLUGINDIR)/
-+	
- 	mkdir -p $(DESTDIR)$(USR)/bin/
- 	cp -f gmic $(DESTDIR)$(USR)/bin/
- 	mkdir -p $(DESTDIR)$(USR)/include/
- 	cp -f gmic.h $(DESTDIR)$(USR)/include/
- ifneq ($(OS),Darwin)
- 	mkdir -p $(DESTDIR)$(USR)/share
--	mkdir -p $(DESTDIR)$(USR)/share/zart
--	cp -f ../zart/haar*.xml $(DESTDIR)$(USR)/share/zart
--	cp -f ../zart/zart $(DESTDIR)$(USR)/bin/zart
- 	mkdir -p $(DESTDIR)$(USR)/lib
- 	cp -f libgmic.so $(DESTDIR)$(USR)/lib/libgmic.so.1.5.1.1
- 	ln -s libgmic.so.1.5.1.1 $(DESTDIR)$(USR)/lib/libgmic.so.1.5.1
-@@ -420,8 +416,6 @@
- 	rm -rf $(DESTDIR)$(USR)/share/doc/gmic/
- 	rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
- 	rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
--	rm -f $(DESTDIR)$(USR)/bin/zart
--	rm -rf $(DESTDIR)$(USR)/share/zart/
+@@ -403,6 +403,7 @@
+ 	mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
+ 	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
+ 	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
++	if test -d /usr/share/bash-completion/completions; then mkdir -p $(DESTDIR)/usr/share/bash-completion/completions/; cp -f gmic_bashcompletion.sh $(DESTDIR)/usr/share/bash-completion/completions/gmic; fi
+ 	if test -d /etc/bash_completion.d/; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi
+ 	if test -d /opt/local/etc/bash_completion.d/; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
  
- distclean: clean
+diff -wbBur gmic-1.5.1.7/zart/zart.pro gmic-1.5.1.7.q/zart/zart.pro
+--- gmic-1.5.1.7/zart/zart.pro	2012-07-26 12:59:33.000000000 +0400
++++ gmic-1.5.1.7.q/zart/zart.pro	2012-08-03 12:32:27.000000000 +0400
+@@ -34,7 +34,7 @@
+ FORMS = ui/MainWindow.ui ui/DialogAbout.ui ui/DialogLicence.ui
  
+ !macx {
+-	LIBS += -lX11 ../src/libgmic.a -lcxcore -lcv -lml -lhighgui -lml -lfftw3
++	LIBS += -lX11 ../src/libgmic.a `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui -lfftw3
+ } else {
+ 	LIBS += -lX11 ../src/libgmic.a `pkg-config opencv --libs` -lfftw3
+ }
diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD
index dfa6b51df..a818d85c4 100644
--- a/community/keepalived/PKGBUILD
+++ b/community/keepalived/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 73694 2012-07-14 12:56:44Z seblu $
+# $Id: PKGBUILD 74779 2012-08-04 01:16:35Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 
 pkgname=keepalived
-pkgver=1.2.3
+pkgver=1.2.4
 pkgrel=1
 pkgdesc='Failover and monitoring daemon for LVS clusters'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz"
         'keepalived.rc'
         'keepalived.service'
         'keepalived.conf')
-md5sums=('1516a2fa0793184ff5c7ad77bac79460'
+md5sums=('86d39fb62be4e2eef4417af4298dec48'
          '0d7ea6296bce403a5d24be305a0a9d73'
          '7a327df915700dcd45a049d099c9c42b'
          '9c8142da8730ad27a345587dea83ced7')
diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD
index 923548cc8..7ad92a44d 100644
--- a/community/libcec/PKGBUILD
+++ b/community/libcec/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 74248 2012-07-23 06:33:04Z idevolder $
+# $Id: PKGBUILD 74756 2012-08-03 11:00:41Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: Philippe Cherel <philippe.cherel@mayenne.org>
 
 pkgname=libcec
-pkgver=1.7.1
-pkgrel=2
+pkgver=1.8.0
+pkgrel=1
 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter"
 arch=('i686' 'x86_64')
 url="https://github.com/Pulse-Eight/libcec"
 license=('GPL')
 depends=('udev' 'lockdev')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver")
-_srcfolder=Pulse-Eight-libcec-cd67a27
-sha256sums=('a560a792376bce73526f32ede89985b923d899cdf2f739be99e466b322b3211d')
+_srcfolder=Pulse-Eight-libcec-b0a5e4f
+sha256sums=('3725d19cabec4bbd4142fd735bda43d33aad2a4a62b20ef337f395b549e7adec')
 options=(!libtool)
 
 build() {
diff --git a/community/pari/PKGBUILD b/community/pari/PKGBUILD
index f635331b3..f1387e718 100644
--- a/community/pari/PKGBUILD
+++ b/community/pari/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 64451 2012-02-13 22:53:47Z bisson $
+# $Id: PKGBUILD 74773 2012-08-04 00:52:49Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=pari
-pkgver=2.5.1
+pkgver=2.5.2
 pkgrel=1
 pkgdesc='Computer algebra system designed for fast computations in number theory'
 url='http://pari.math.u-bordeaux.fr/'
@@ -12,10 +12,11 @@ depends=('gmp' 'readline' 'libx11')
 makedepends=('perl' 'texlive-core')
 optdepends=('perl: gphelp, tex2mail')
 source=("${url}pub/pari/unix/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('c83314bb993161a60e1e46ae7616072858414354')
+sha1sums=('3efe590e885a7dde521b8553762d3207b919e69f')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed 's/\$addlib64/ /' -i config/get_libpth
 	./Configure --prefix=/usr --with-gmp --with-readline
 	make all
 }
diff --git a/community/pd/PKGBUILD b/community/pd/PKGBUILD
index 07e31708e..142d55d81 100644
--- a/community/pd/PKGBUILD
+++ b/community/pd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 74397 2012-07-26 14:58:32Z speps $
+# $Id: PKGBUILD 74762 2012-08-03 14:09:42Z speps $
 # Maintainer : speps <speps at aur dot archlinux dot org>
 # Contributor:  TDY <tdy@gmx.com>
 # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
 # Contributor: Andrea Scarpino <bash.lnx@gmail.com>
 
 pkgname=pd
-pkgver=0.43.3
+pkgver=0.43.4
 _ver=${pkgver%.*}-${pkgver##*.}
 pkgrel=1
 pkgdesc="The Pure Data real-time music and multimedia environment"
@@ -15,7 +15,7 @@ license=('custom:BSD')
 depends=('jack' 'fftw' 'tk')
 provides=('puredata')
 source=("http://crca.ucsd.edu/~msp/Software/pd-$_ver.src.tar.gz")
-md5sums=('c0a565d3be92844780a86524598a5137')
+md5sums=('9f174836ad5715ff3f65fd9b9f9a18ce')
 
 build() {
   cd "$srcdir/pd-$_ver/src"