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

Conflicts:
	community/erlang/PKGBUILD
	extra/swig/PKGBUILD

9 files changed, 56 insertions, 66 deletions

diff --git a/community/erlang-nox/PKGBUILD b/community/erlang-nox/PKGBUILD
index 80316cc85..792ea7184 100644
--- a/community/erlang-nox/PKGBUILD
+++ b/community/erlang-nox/PKGBUILD
@@ -7,8 +7,8 @@
 # Contributor: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
 
 pkgname=erlang-nox
-pkgver=R15B03
-pkgrel=2
+pkgver=R15B03_1
+pkgrel=1
 pkgdesc='General-purpose concurrent functional programming language developed by Ericsson (headless version)'
 arch=('x86_64' 'i686')
 url='http://www.erlang.org'
@@ -20,13 +20,13 @@ makedepends=('perl' 'lksctp-tools')
 optdepends=('unixodbc: for database support'
             'java-environment: for Java support'
             'lksctp-tools: for SCTP support')
-source=("http://www.erlang.org/download/otp_src_$pkgver.tar.gz"
-        "http://www.erlang.org/download/otp_doc_man_$pkgver.tar.gz")
-sha256sums=('d1ee5dd3833537ad7533f2deaf164936508c55c992c2b930f0c4c4559d40aa12'
-            '0a5a01f8c6050551c1ba0591de42731a6640370e7527fae81cdfe3d3d6af0a6b')
+source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz"
+        "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz")
+sha256sums=('4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c'
+            '07980d8014c7cf8194b7078c137353f5083992add4663ced3dcba2ff91f228d8')
 
 build() {
-  cd "$srcdir/otp_src_$pkgver"
+  cd "$srcdir/otp_src_${pkgver/_1/}"
 
   msg2 'Configuring...'
   ./configure --prefix=/usr --enable-smp-support
@@ -35,13 +35,13 @@ build() {
 }
 
 package() {
-  cd "$srcdir/otp_src_$pkgver"
+  cd "$srcdir/otp_src_${pkgver/_1/}"
 
   make DESTDIR="$pkgdir" install
 
   # Install documentation
   install -d "$pkgdir/usr/share/doc/erlang"
-  install -m0644 "$srcdir/otp_src_$pkgver/README.md" \
+  install -m0644 "$srcdir/otp_src_${pkgver/_1/}/README.md" \
     "$srcdir"/{README,COPYRIGHT} \
     "$pkgdir/usr/share/doc/erlang"
 
@@ -50,7 +50,7 @@ package() {
   cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang"
 
   # Install license
-  install -Dm0644 "$srcdir/otp_src_$pkgver/EPLICENCE" \
+  install -Dm0644 "$srcdir/otp_src_${pkgver/_1/}/EPLICENCE" \
     "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
 }
 
diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD
index bcf6533f0..ce845a996 100644
--- a/community/erlang/PKGBUILD
+++ b/community/erlang/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80874 2012-12-05 00:54:45Z arodseth $
+# $Id: PKGBUILD 81307 2012-12-17 09:59:36Z arodseth $
 # Maintainer:  Lukas Fleischer <archlinux@cryptocrack.de>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
@@ -7,8 +7,8 @@
 # Contributor: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
 
 pkgname=erlang
-pkgver=R15B03
-pkgrel=3
+pkgver=R15B03_1
+pkgrel=1
 pkgdesc='General-purpose concurrent functional programming language developed by Ericsson'
 arch=(i686 x86_64 mips64el)
 url='http://www.erlang.org'
@@ -17,16 +17,13 @@ depends=('ncurses' 'glu' 'wxgtk' 'openssl')
 makedepends=('perl' 'mesa' 'lksctp-tools')
 optdepends=('unixodbc: for database support'
             'lksctp-tools: for SCTP support')
-if [ "$CARCH" != "mips64el" ]; then
-  optdepends+=('java-environment: for Java support')
-fi
-source=("http://www.erlang.org/download/otp_src_$pkgver.tar.gz"
-        "http://www.erlang.org/download/otp_doc_man_$pkgver.tar.gz")
-sha256sums=('d1ee5dd3833537ad7533f2deaf164936508c55c992c2b930f0c4c4559d40aa12'
-            '0a5a01f8c6050551c1ba0591de42731a6640370e7527fae81cdfe3d3d6af0a6b')
+source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz"
+        "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz")
+sha256sums=('4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c'
+            '07980d8014c7cf8194b7078c137353f5083992add4663ced3dcba2ff91f228d8')
 
 build() {
-  cd "$srcdir/otp_src_$pkgver"
+  cd "$srcdir/otp_src_${pkgver/_1/}"
 
   msg2 'Configuring...'
   ./configure --prefix=/usr --enable-smp-support
@@ -35,13 +32,13 @@ build() {
 }
 
 package() {
-  cd "$srcdir/otp_src_$pkgver"
+  cd "$srcdir/otp_src_${pkgver/_1/}"
 
   make DESTDIR="$pkgdir" install
 
   # Install documentation
   install -d "$pkgdir/usr/share/doc/erlang"
-  install -m0644 "$srcdir/otp_src_$pkgver/README.md" \
+  install -m0644 "$srcdir/otp_src_${pkgver/_1/}/README.md" \
     "$srcdir"/{README,COPYRIGHT} \
     "$pkgdir/usr/share/doc/erlang"
 
@@ -50,7 +47,7 @@ package() {
   cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang"
 
   # Install license
-  install -Dm0644 "$srcdir/otp_src_$pkgver/EPLICENCE" \
+  install -Dm0644 "$srcdir/otp_src_${pkgver/_1/}/EPLICENCE" \
     "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
 }
 
diff --git a/community/gogglesmm/PKGBUILD b/community/gogglesmm/PKGBUILD
index c11484565..bb3df682f 100644
--- a/community/gogglesmm/PKGBUILD
+++ b/community/gogglesmm/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 77644 2012-10-13 11:43:35Z allan $
+# $Id: PKGBUILD 81309 2012-12-17 10:05:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sander Jansen <sander@knology.net>
 
 pkgname=gogglesmm
-pkgver=0.12.6
-pkgrel=2
+pkgver=0.12.7
+pkgrel=1
 pkgdesc="Music Manager and Player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/gogglesmm/"
 license=('GPL3')
 install=gogglesmm.install
 depends=('fox>=1.6.0' 'xine-lib>=1.0' 'sqlite>=3.4.0' 'taglib' 'dbus-core' 'curl' 'expat' 'libgcrypt')
-makedepends=('pkgconfig' 'glproto' 'dri2proto' 'glu')
+makedepends=('pkgconfig' 'glproto' 'dri2proto' 'glu' 'mesa')
 replaces=('musicmanager')
 conflicts=('musicmanager')
 source=(http://gogglesmm.googlecode.com/files/gogglesmm-$pkgver.tar.bz2)
-md5sums=('19505ee514690fe3372621685666db4c')
+md5sums=('9ca337ab496b57d79e66d0541c7da970')
 
 build() {
   cd $srcdir/gogglesmm-$pkgver
diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD
index 7871f776a..7418a0219 100644
--- a/community/ldc/PKGBUILD
+++ b/community/ldc/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 76840 2012-10-01 01:55:21Z svenstaro $
+# $Id: PKGBUILD 81323 2012-12-17 23:11:03Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=ldc
-pkgver=20121001
+pkgver=20121218
 pkgrel=1
 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2"
 arch=('i686' 'x86_64')
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index bc8c7b1b5..28126b601 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80336 2012-11-20 10:54:00Z spupykin $
+# $Id: PKGBUILD 81314 2012-12-17 10:10:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
-pkgver=1.0.0
-pkgrel=4
+pkgver=1.0.1
+pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libvirt.org/"
@@ -12,7 +12,7 @@ license=('LGPL')
 depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2'
 	 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap'
 	 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs'
-	 'iproute2' 'netcf' 'libnl')
+	 'iproute2' 'netcf' 'libnl' 'libx11')
 makedepends=('pkgconfig' 'lvm2' 'linux-api-headers')
 optdepends=('bridge-utils: for briged networking (default)'
 	    'dnsmasq: for NAT/DHCP for guests'
@@ -36,7 +36,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	libvirtd-guests.conf.d
 	libvirt.tmpfiles.d
 	openbsd-netcat-default.patch)
-md5sums=('7c8b006de7338e30866bb56738803b21'
+md5sums=('86a8c0acabb01e11ac84fe00624dc54e'
          'c43244c40a0437038c82089618e7beaa'
          '3ed0e24f5b5e25bf553f5427d64915e6'
          '0ee5b6c58590ff392a266f20f7928d1f'
diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD
index 1a8045db8..a993a84d4 100644
--- a/community/mlt/PKGBUILD
+++ b/community/mlt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79557 2012-11-07 13:12:21Z spupykin $
+# $Id: PKGBUILD 81311 2012-12-17 10:05:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com>
 # Contributor: funkyou <spamopfer@nickname.berlin.de>
@@ -7,8 +7,8 @@
 
 pkgbase=mlt
 pkgname=('mlt' 'mlt-python-bindings')
-pkgver=0.8.2
-pkgrel=3
+pkgver=0.8.6
+pkgrel=1
 pkgdesc="An open source multimedia framework"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mltframework.org"
@@ -17,14 +17,14 @@ makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ff
 	     'frei0r-plugins' 'swig' 'python2' "jack" "ladspa")
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
 	ffmpeg.patch)
-md5sums=('c7a8c4ca7485bb615cbcf851d8742a1c'
+md5sums=('8d2c5b0f24a8b90fb44961920e3770ff'
          'c28b4691d1715432d4de0055f4e2f5eb')
 
 build() {
   # mlt
   cd "$srcdir/mlt-$pkgver"
 
-  patch -p1 <$srcdir/ffmpeg.patch
+#  patch -p1 <$srcdir/ffmpeg.patch
 
   [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2=
 #  SSE2=--disable-sse2
diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD
index 27553a621..cb6afd3b8 100644
--- a/community/passenger/PKGBUILD
+++ b/community/passenger/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 75886 2012-09-04 15:32:16Z spupykin $
+# $Id: PKGBUILD 81317 2012-12-17 13:56:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=passenger
 pkgver=3.0.17
-pkgrel=1
+pkgrel=2
 _pkgdlnr=76398
 pkgdesc="mod_rails passenger"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,14 +14,14 @@ depends=('ruby' 'ruby-rack' 'curl')
 makedepends=('apache')
 install=passenger.install
 options=('!emptydirs')
-source=(http://rubyforge.org/frs/download.php/${_pkgdlnr}/passenger-$pkgver.tar.gz
-	build-fix.patch)
-md5sums=('4ce8cac20e3c857bad621a6113d7268f'
-         'ee4699596dffb5357fdac4e3b2c98ee1')
+source=(http://rubyforge.org/frs/download.php/${_pkgdlnr}/passenger-$pkgver.tar.gz)
+md5sums=('4ce8cac20e3c857bad621a6113d7268f')
 
 build(){
   cd $srcdir/passenger-$pkgver
-#  patch -p1 <$srcdir/build-fix.patch
+
+  sed -i 's/env python/env python2/' lib/phusion_passenger/wsgi/request_handler.py
+
   ./bin/passenger-install-apache2-module -a
   rake nginx
 
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 919e9eeba..cf6ac1c10 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 169751 2012-10-27 23:42:02Z eric $
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
+# $Id: PKGBUILD 173270 2012-12-18 01:27:21Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Tobias Kieslich <tobias@justdreams.de>
+# Contributor: tobias <tobias@archlinux.org>
 
 pkgname=inkscape
-pkgver=0.48.3.1
-pkgrel=7
+pkgver=0.48.4
+pkgrel=1
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 license=('GPL' 'LGPL')
@@ -20,12 +20,8 @@ optdepends=('pstoedit: latex formulas'
             'pyxml: some extensions'
             'uniconvertor: reading/writing to some proprietary formats')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'poppler20.patch'
-        'libpng15.patch')
-sha1sums=('9a09a97d184e09c2ee7f9956bfe073b7313e919e'
-          '7316c2903c157781838cce289a709d100dc40fec'
-          'd6512f3cb38ca8e2436dc485aa652490d17b3a52')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c')
 
 install=install
 
@@ -38,9 +34,6 @@ build() {
 	sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
 	sed -i 's|"python"|"python2"|g' src/main.cpp
 
-	patch -p1 -i ../poppler20.patch
-	patch -p1 -i ../libpng15.patch
-
 	./configure \
 		--prefix=/usr \
 		--with-python \
diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD
index 311351345..cb2f95646 100644
--- a/extra/swig/PKGBUILD
+++ b/extra/swig/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 165493 2012-08-20 23:08:36Z stephane $
+# $Id: PKGBUILD 173268 2012-12-17 16:30:15Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=swig
-pkgver=2.0.8
-pkgrel=1.1
+pkgver=2.0.9
+pkgrel=1
 pkgdesc="Generate scripting interfaces to C/C++ code"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.swig.org/"
 license=('custom')
 depends=('zlib' 'pcre')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('763305da320163903c69c1cdfbf9a942117d9ace')
+sha1sums=('7984bf1043f522e88ea51d4bd21c97d3c68342be')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"