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

Conflicts:
	core/openssl/PKGBUILD
	testing/at-spi2-core/PKGBUILD
	testing/brasero/PKGBUILD
	testing/brasero/brasero.install
	testing/cheese/PKGBUILD
	testing/cheese/cheese.install
	testing/clutter/PKGBUILD
	testing/eog/PKGBUILD
	testing/gdm/PKGBUILD
	testing/gdm/gdm-autologin.pam
	testing/gdm/gdm-fingerprint.pam
	testing/gdm/gdm-password.pam
	testing/gdm/gdm-smartcard.pam
	testing/gedit/PKGBUILD
	testing/gedit/gedit.install
	testing/glib-networking/PKGBUILD
	testing/glib-networking/glib-networking.install
	testing/gnome-online-accounts/PKGBUILD
	testing/gnome-screenshot/PKGBUILD
	testing/gnome-system-log/PKGBUILD
	testing/gnome-system-monitor/PKGBUILD
	testing/gnome-system-monitor/gnome-system-monitor.install
	testing/gobject-introspection/PKGBUILD
	testing/gucharmap/PKGBUILD
	testing/gucharmap/gucharmap.install
	testing/libsoup/PKGBUILD
	testing/nautilus/PKGBUILD
	testing/nautilus/nautilus.install
	testing/tomboy/PKGBUILD
	testing/tomboy/tomboy.install
	testing/vinagre/PKGBUILD
	testing/vinagre/vinagre.install
	testing/vino/PKGBUILD
	testing/vino/vino.install

7 files changed, 66 insertions, 56 deletions

diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD
index 01aeeea8e..0dc8c8e87 100644
--- a/extra/cabal-install/PKGBUILD
+++ b/extra/cabal-install/PKGBUILD
@@ -3,29 +3,31 @@
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=cabal-install
-pkgver=0.10.4
-pkgrel=3
+pkgver=0.14.0
+pkgrel=1
 pkgdesc="The command-line interface for Cabal and Hackage."
 url="http://hackage.haskell.org/package/cabal-install"
 license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('haskell-http=4000.2.2-1' 'haskell-zlib=0.5.3.3-3' 'haskell-mtl=2.0.1.0-4' 'haskell-network=2.3.0.11-1' 'haskell-random=1.0.1.1-1')
 depends=('ghc' 'gmp' 'zlib')
-#source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz)
-# switch back to regular cabal-install once it gets updated...
-source=("http://hackage.haskell.org/packages/archive/cabal-install-ghc74/${pkgver}/cabal-install-ghc74-${pkgver}.tar.gz")
-md5sums=('49b3301cc80775ebf19fe9d949f15df5')
+source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz)
+md5sums=('638514bd1a5792d75866481852148ae5')
 
 build() {
-    cd cabal-install-ghc74-${pkgver}
+    cd cabal-install-${pkgver}
     runhaskell Setup configure --enable-shared --enable-split-objs --enable-executable-stripping --prefix=/usr
     runhaskell Setup build
 }
 
 package() {
-    cd cabal-install-ghc74-${pkgver}
+    cd cabal-install-${pkgver}
     runhaskell Setup copy --destdir=$pkgdir
-    #install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+
+    # rm license installed to wrong location
+    rm -rf ${pkgdir}/usr/share/doc
+
+    install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
     
     # add bash completion
     install -d ${pkgdir}/usr/share/bash-completion/completions
diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD
index d284831b3..08a0e8859 100644
--- a/extra/freeciv/PKGBUILD
+++ b/extra/freeciv/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 143020 2011-11-21 02:06:36Z eric $
+# $Id: PKGBUILD 156372 2012-04-17 18:59:36Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=freeciv
-pkgver=2.3.1
+pkgver=2.3.2
 pkgrel=1
 pkgdesc="A multiuser clone of the famous Microprose game of Civilization"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,11 +12,11 @@ depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme')
 options=('!libtool')
 install=freeciv.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('9d9ee9f48f4c945fc6525139d340443d5a25aac4')
+sha1sums=('e6267b5e0483cf9c29d01793d2f9433e73d62191')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-client=gtk --enable-shared
+  ./configure --prefix=/usr --enable-client=gtk2 --enable-shared --without-ggz-client
   make
 }
 
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 911ba9b54..3003bdf52 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154479 2012-03-29 01:47:21Z eric $
+# $Id: PKGBUILD 156324 2012-04-17 04:29:39Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.6.2
+pkgver=6.7.6.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.imagemagick.org/"
@@ -12,7 +12,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
              'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper')
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         perlmagick.rpath.patch)
-sha1sums=('5411be21304520ae6a24d3f3e6d5c60eabdd57af'
+sha1sums=('ecb6d2614ca8f44c1857ff28a88feb083403f7be'
           '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {
diff --git a/extra/lua/PKGBUILD b/extra/lua/PKGBUILD
index 2b567ab04..1c3d9ee33 100644
--- a/extra/lua/PKGBUILD
+++ b/extra/lua/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153491 2012-03-14 23:43:56Z eric $
+# $Id: PKGBUILD 156332 2012-04-17 10:35:09Z bluewind $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=lua 
 pkgver=5.1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A powerful light-weight programming language designed for extending applications" 
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lua.org/"
@@ -14,7 +14,7 @@ options=('!makeflags' '!emptydirs')
 source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz
         lua-arch.patch lua-5.1-cflags.diff)
 md5sums=('2e115fe26e435e33b0d5c022e4490567'
-         '6c5953f63904bf20a0183cdab05b80de'
+         'fa25feb70ef9fec975b1c20da5098b3c'
          '249582bf1fd861ccf492d2c35a9fe732')
 
 build() { 
@@ -23,14 +23,14 @@ build() {
   patch -p1 -i "${srcdir}/lua-5.1-cflags.diff"
   export CFLAGS="$CFLAGS -fPIC"
 
-  make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \
+  make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" \
     INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
     linux
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \
+  make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.$pkgver" \
     INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
     install
   install -D -m644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc"
diff --git a/extra/lua/lua-arch.patch b/extra/lua/lua-arch.patch
index cc1f3ce1b..d8650c3a2 100644
--- a/extra/lua/lua-arch.patch
+++ b/extra/lua/lua-arch.patch
@@ -1,8 +1,7 @@
-diff -ur lua-5.1.orig/etc/lua.pc lua-5.1/etc/lua.pc
---- lua-5.1.orig/etc/lua.pc	2006-03-21 11:51:53.000000000 +0100
-+++ lua-5.1/etc/lua.pc	2006-03-21 11:52:05.000000000 +0100
-@@ -6,7 +6,7 @@
- V= 5.1
+diff -ur lua-5.1.4/etc/lua.pc lua-5.1.4-new/etc/lua.pc
+--- lua-5.1.4/etc/lua.pc	2008-08-08 14:46:11.000000000 +0200
++++ lua-5.1.4-new/etc/lua.pc	2012-02-23 18:25:34.000000000 +0100
+@@ -8,6 +8,6 @@
  
  # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
 -prefix= /usr/local
@@ -10,11 +9,23 @@ diff -ur lua-5.1.orig/etc/lua.pc lua-5.1/etc/lua.pc
  INSTALL_BIN= ${prefix}/bin
  INSTALL_INC= ${prefix}/include
  INSTALL_LIB= ${prefix}/lib
-diff -ur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile
---- lua-5.1.orig/src/Makefile	2006-03-21 11:51:53.000000000 +0100
-+++ lua-5.1/src/Makefile	2006-03-21 11:52:09.000000000 +0100
+diff -ur lua-5.1.4/src/luaconf.h lua-5.1.4-new/src/luaconf.h
+--- lua-5.1.4/src/luaconf.h	2008-02-11 17:25:08.000000000 +0100
++++ lua-5.1.4-new/src/luaconf.h	2012-02-23 18:25:34.000000000 +0100
+@@ -94,7 +94,7 @@
+ 	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
+ 
+ #else
+-#define LUA_ROOT	"/usr/local/"
++#define LUA_ROOT	"/usr/"
+ #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
+ #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
+ #define LUA_PATH_DEFAULT  \
+diff -ur lua-5.1.4/src/Makefile lua-5.1.4-new/src/Makefile
+--- lua-5.1.4/src/Makefile	2008-01-19 20:37:58.000000000 +0100
++++ lua-5.1.4-new/src/Makefile	2012-02-23 18:26:43.000000000 +0100
 @@ -23,6 +23,7 @@
- PLATS= aix ansi bsd generic linux macosx mingw posix solaris
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
  
  LUA_A=	liblua.a
 +LUA_SO=	liblua.so
@@ -30,26 +41,26 @@ diff -ur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile
  ALL_A= $(LUA_A)
  
  default: $(PLAT)
-@@ -51,6 +52,10 @@
+@@ -51,6 +52,11 @@
  	$(AR) $@ $?
  	$(RANLIB) $@
  
 +$(LUA_SO): $(CORE_O) $(LIB_O)
-+	$(CC) -shared -ldl -Wl,-soname,liblua.so -o $@.5.1 $? -lm $(MYLDFLAGS)
-+	ln -s $@.5.1 $@
++	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
++	ln -sf $(LUA_SO).$(R) $(LUA_SO)
 +
  $(LUA_T): $(LUA_O) $(LUA_A)
  	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
  
-diff -ur lua-5.1.orig/src/luaconf.h lua-5.1/src/luaconf.h
---- lua-5.1.orig/src/luaconf.h	2006-03-21 11:51:53.000000000 +0100
-+++ lua-5.1/src/luaconf.h	2006-03-21 11:52:05.000000000 +0100
-@@ -82,7 +82,7 @@
- 	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
+--- lua-5.1.4/Makefile	2008-08-12 02:40:48.000000000 +0200
++++ lua-5.1.4-new/Makefile	2012-02-23 19:06:32.000000000 +0100
+@@ -53,7 +53,7 @@
+ all:	$(PLAT)
  
- #else
--#define LUA_ROOT	"/usr/local/"
-+#define LUA_ROOT	"/usr/"
- #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
- #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
- #define LUA_PATH_DEFAULT  \
+ $(PLATS) clean:
+-	cd src && $(MAKE) $@
++	cd src && $(MAKE) $@ V=$(V) R=$(R)
+ 
+ test:	dummy
+ 	src/lua test/hello.lua
diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD
index 34064fd85..5571989e1 100644
--- a/extra/mpg123/PKGBUILD
+++ b/extra/mpg123/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 154304 2012-03-26 01:26:00Z eric $
+# $Id: PKGBUILD 156357 2012-04-17 16:57:42Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=mpg123
-pkgver=1.13.7
+pkgver=1.13.8
 pkgrel=1
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,8 +17,8 @@ conflicts=('mpg321')
 provides=('mpg321')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('33b71c932b87004f3c8fed527b1f9a4b5f4337b2'
-          '6f7593c0c14647c61cd57d1a03fe89eb6528aebe')
+sha1sums=('ae6fe5f60502fb694527113dd7508ce042b7256b'
+          '6895e5e3120579418007d705836ae1d3b786e771')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD
index 8f8f8bbbf..241dee6e1 100644
--- a/extra/sox/PKGBUILD
+++ b/extra/sox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149755 2012-02-10 04:38:45Z eric $
+# $Id: PKGBUILD 156376 2012-04-17 19:41:18Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=sox
-pkgver=14.3.2
-pkgrel=6
+pkgver=14.4.0
+pkgrel=1
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sox.sourceforge.net/"
@@ -17,14 +17,11 @@ optdepends=('libao: for ao plugin'
             'wavpack: for wavpack plugin'
             'libpulse: for pulse plugin')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        sox-14.3.2-ffmpeg.patch)
-sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3'
-          '86caa6aa86a0bf7a048522114d4efd11acbbda70')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/sox-14.3.2-ffmpeg.patch"
   sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in
   ./configure --prefix=/usr --sysconfdir=/etc \
     --with-dyn-default --with-distro="Arch Linux"