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

Conflicts:
	community-testing/freewrl/PKGBUILD
	community-testing/gambas2/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/gnash/PKGBUILD
	community-testing/gource/PKGBUILD
	community-testing/gpac/PKGBUILD
	community-testing/rss-glx/PKGBUILD
	community-testing/smc/PKGBUILD
	community/blobby2/PKGBUILD
	community/jack2/PKGBUILD
	community/kleansweep/PKGBUILD
	core/gcc/PKGBUILD
	extra/at/PKGBUILD
	extra/maxima/PKGBUILD
	extra/nicotine/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/sqlite/PKGBUILD
	gnome-unstable/gnome-control-center/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	gnome-unstable/gst-plugins-base/PKGBUILD
	gnome-unstable/gstreamer/PKGBUILD
	multilib-testing/gcc-multilib/PKGBUILD
	multilib-testing/libtool-multilib/PKGBUILD
	multilib/jack2-multilib/PKGBUILD
	staging/mesa/PKGBUILD
	testing/bzflag/PKGBUILD
	testing/cabal-install/PKGBUILD
	testing/cairo/PKGBUILD
	testing/gcc/PKGBUILD
	testing/glew/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/libreoffice/PKGBUILD
	testing/libtool/PKGBUILD
	testing/mesa/PKGBUILD
	testing/nx/PKGBUILD
	testing/xf86-video-ati/PKGBUILD
	testing/xf86-video-intel/PKGBUILD
	testing/xf86-video-intel/xf86-video-intel.install
	testing/xf86-video-nouveau/PKGBUILD
	testing/xine-lib/PKGBUILD
	testing/xorg-server/PKGBUILD

11 files changed, 350 insertions, 0 deletions

diff --git a/community-staging/cython/PKGBUILD b/community-staging/cython/PKGBUILD
new file mode 100644
index 000000000..3966cdda6
--- /dev/null
+++ b/community-staging/cython/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 77132 2012-10-05 11:24:38Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Igor Scabini <furester @ gmail.com>
+
+pkgname=('cython' 'cython2')
+pkgbase=cython
+pkgver=0.17
+pkgrel=2
+pkgdesc="C-Extensions for Python "
+arch=(i686 x86_64)
+url="http://www.cython.org"
+license=('APACHE')
+makedepends=('python-distribute' 'python2-distribute')
+source=("http://cython.org/release/Cython-$pkgver.tar.gz")
+md5sums=('d6b669956b25babf7dd86db0a98539e4')
+
+build() {
+  true
+}
+
+package_cython() {
+  depends=('python')
+
+  cd $srcdir/Cython-$pkgver
+  python setup.py install --root=$pkgdir
+
+  sed -i 's|#!.*python|#!/usr/bin/python3|' $pkgdir/usr/bin/*
+}
+
+package_cython2() {
+  depends=('python2')
+
+  cd $srcdir/Cython-$pkgver
+  python2 setup.py install --root=$pkgdir
+
+  mv $pkgdir/usr/bin/cygdb $pkgdir/usr/bin/cygdb2
+  mv $pkgdir/usr/bin/cython $pkgdir/usr/bin/cython2
+}
diff --git a/community-staging/ktoblzcheck/PKGBUILD b/community-staging/ktoblzcheck/PKGBUILD
new file mode 100644
index 000000000..0b7caeec1
--- /dev/null
+++ b/community-staging/ktoblzcheck/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 77312 2012-10-08 16:11:32Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de>
+
+pkgname=ktoblzcheck
+pkgver=1.39
+pkgrel=3
+pkgdesc="A library to check account numbers and bank codes of German banks"
+arch=(i686 x86_64)
+url="http://ktoblzcheck.sourceforge.net"
+options=('!libtool')
+license=("LGPL")
+depends=('gcc-libs' 'python')
+optdepends=('perl')
+source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz
+	ktoblzcheck-python3.patch)
+md5sums=('ef5efd6e2c31aaf6405060ec477c200c'
+         'a81a697bb3aaeffb7fac0ad7d9166e3f')
+
+build() {
+  cd "$srcdir/ktoblzcheck-$pkgver"
+  ./configure --prefix=/usr
+  patch -p1 <$srcdir/ktoblzcheck-python3.patch
+  make
+}
+
+package() {
+  cd "$srcdir/ktoblzcheck-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community-staging/ktoblzcheck/ktoblzcheck-python3.patch b/community-staging/ktoblzcheck/ktoblzcheck-python3.patch
new file mode 100644
index 000000000..5bfc53275
--- /dev/null
+++ b/community-staging/ktoblzcheck/ktoblzcheck-python3.patch
@@ -0,0 +1,57 @@
+diff -ur ktoblzcheck-1.28/src/python/ktoblzcheck.py ktoblzcheck-1.28.my/src/python/ktoblzcheck.py
+--- ktoblzcheck-1.28/src/python/ktoblzcheck.py	2008-08-12 16:48:54.000000000 +0000
++++ ktoblzcheck-1.28.my/src/python/ktoblzcheck.py	2010-09-20 09:08:36.000000000 +0000
+@@ -197,35 +197,35 @@
+ 
+ def test():
+     a = AccountNumberCheck()
+-    print 'Number of Banks:', a.bankCount
+-    print 'find 20010020:', a.findBank('20010020')
+-    print 'find 20010033:', a.findBank('20010033')
+-    print 'check 20070024/9291394:', a.check('20070024','9291394')
+-    print 'check 20070024/9291394:', a.check('20070024','9291394023')
+-    print
++    print('Number of Banks:', a.bankCount)
++    print('find 20010020:', a.findBank('20010020'))
++    print('find 20010033:', a.findBank('20010033'))
++    print('check 20070024/9291394:', a.check('20070024','9291394'))
++    print('check 20070024/9291394:', a.check('20070024','9291394023'))
++    print()
+     ck = IbanCheck()
+     if not kto.IbanCheck_selftest(ck):  # not publicly defined
+-	print "Self-Test failed!"
++        print("Self-Test failed!")
+ 	raise SystemExit
+     s = " iban fr14 2004 1010 0505 0001 3m02 606"
+-    print "test for iban    :", s
++    print("test for iban    :", s)
+     iban = Iban(s)
+-    print "transmission form:", iban.transmissionForm()
++    print("transmission form:", iban.transmissionForm())
+     res = ck.check(iban)
+-    print "check result     :", res, "("+IbanCheck.resultText(res)+")"
+-    print "printable form   :", iban.printableForm()
+-    print
+-    print "expect bad checksum:"
++    print("check result     :", res, "("+IbanCheck.resultText(res)+")")
++    print("printable form   :", iban.printableForm())
++    print()
++    print("expect bad checksum:")
+     s = "FR1420041010050500013X02606"
+     res = ck.check(s)
+-    print s + ":", res, "("+IbanCheck.resultText(res)+")"
+-    print
++    print(s + ":", res, "("+IbanCheck.resultText(res)+")")
++    print()
+     s = "IBAN DE66 2007 0024 0929 1394 00"
+-    print s
++    print(s)
+     s = Iban(s).transmissionForm()
+     start, end = ck.bic_position(s)
+-    print "prefix, checksum, BIC, account:"
+-    print ', '.join((s[:2], s[2:4], s[start:end], s[end:].lstrip('0')))
++    print("prefix, checksum, BIC, account:")
++    print(', '.join((s[:2], s[2:4], s[start:end], s[end:].lstrip('0'))))
+ 
+ 
+ if __name__ == '__main__':
diff --git a/community-staging/python-psycopg2/ChangeLog b/community-staging/python-psycopg2/ChangeLog
new file mode 100644
index 000000000..f31be0aaa
--- /dev/null
+++ b/community-staging/python-psycopg2/ChangeLog
@@ -0,0 +1,25 @@
+
+2009-08-05  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updated to: 2.0.11
+
+2009-03-24  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updated for i686: 2.0.9
+
+2009-01-11  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Rebuilt for python 2.6
+
+2008-04-25  Mateusz Herych <heniekk@gmail.com>
+
+	* Built for x86_64 - 2.0.7
+
+2008-04-23  Douglas Soares de Andrade  <dsa@aur.archlinux.org>
+
+	* Built for i686 - 2.0.7
+
+2007-06-27  tardo  <tardo@nagi-fanboi.net>
+	
+	* Built for x86_64
+
diff --git a/community-staging/python-psycopg2/PKGBUILD b/community-staging/python-psycopg2/PKGBUILD
new file mode 100644
index 000000000..88b74f129
--- /dev/null
+++ b/community-staging/python-psycopg2/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 77314 2012-10-08 16:12:05Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
+
+pkgbase=python-psycopg2
+pkgname=('python-psycopg2' 'python2-psycopg2')
+pkgver=2.4.5
+pkgrel=2
+pkgdesc="A PostgreSQL database adapter for the Python programming language."
+arch=('i686' 'x86_64')
+url="http://initd.org/psycopg/"
+license=('LGPL3')
+makedepends=('python2' 'python' 'postgresql-libs>=8.4.1')
+source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-4/psycopg2-$pkgver.tar.gz)
+md5sums=('075e4df465e9a863f288d5bdf6e6887e')
+
+build() {
+  cd "$srcdir/psycopg2-$pkgver"
+  sed -i 's/,PSYCOPG_DEBUG$//' setup.cfg
+}
+
+package_python-psycopg2() {
+  depends=('python' 'postgresql-libs>=8.4.1')
+
+  cd "$srcdir/psycopg2-$pkgver"
+  python setup.py install --root="$pkgdir"
+}
+
+package_python2-psycopg2() {
+  depends=('python2' 'postgresql-libs>=8.4.1')
+
+  cd "$srcdir/psycopg2-$pkgver"
+  python2 setup.py install --root="$pkgdir"
+}
diff --git a/community-staging/python-pyzmq/PKGBUILD b/community-staging/python-pyzmq/PKGBUILD
new file mode 100644
index 000000000..e771c2ad5
--- /dev/null
+++ b/community-staging/python-pyzmq/PKGBUILD
@@ -0,0 +1,20 @@
+# $Id: PKGBUILD 77143 2012-10-05 13:37:01Z kkeen $
+# Maintainer: Kyle Keen <keenerd at gmail dot com>
+pkgname=python-pyzmq
+pkgver=2.2.0.1
+pkgrel=2
+pkgdesc="Python3 bindings for zeromq, written in Cython"
+arch=(i686 x86_64)
+url="http://www.zeromq.org/bindings:python"
+license=('LGPL')
+depends=(zeromq python)
+source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz)
+md5sums=('f2f80709e84c8ac72d6671eee645d804')
+
+build() {
+  cd "$srcdir/pyzmq-$pkgver"
+  # py3 errors added in 2.2.0.1 
+  sed -i 's|except socket.error, e:|except socket.error as e:|' zmq/eventloop/ioloop.py
+  sed -i 's|except gevent.Timeout, t:|except gevent.Timeout as t:|' zmq/green/core.py
+  python3 setup.py install --root="$pkgdir" --optimize=0
+} 
diff --git a/community-staging/python-yaml/PKGBUILD b/community-staging/python-yaml/PKGBUILD
new file mode 100644
index 000000000..c9457fde7
--- /dev/null
+++ b/community-staging/python-yaml/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 77316 2012-10-08 16:12:37Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Michal Bozon <michal.bozon__at__gmail.com>
+
+pkgbase=python-yaml
+pkgname=(python2-yaml python-yaml)
+pkgver=3.10
+pkgrel=3
+pkgdesc="Python bindings for YAML, using fast libYAML library"
+arch=('i686' 'x86_64')
+url="http://pyyaml.org"
+license=('MIT')
+makedepends=('python' 'python2' 'libyaml')
+install='python-yaml.install'
+source=(http://pyyaml.org/download/pyyaml/PyYAML-$pkgver.tar.gz)
+md5sums=('74c94a383886519e9e7b3dd1ee540247')
+
+build() {
+  true
+}
+
+package_python2-yaml() {
+  depends=('python2' 'libyaml')
+
+  cd $srcdir/PyYAML-$pkgver
+  python2 setup.py install --prefix=/usr --root=$pkgdir
+  install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
+
+package_python-yaml() {
+  depends=('python' 'libyaml')
+
+  cd $srcdir/PyYAML-$pkgver
+  python setup.py install --prefix=/usr --root=$pkgdir
+  install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/community-staging/python-yaml/python-yaml.install b/community-staging/python-yaml/python-yaml.install
new file mode 100644
index 000000000..e2ae0674b
--- /dev/null
+++ b/community-staging/python-yaml/python-yaml.install
@@ -0,0 +1,7 @@
+post_install() {
+  cat << EOT
+==> Note that even though this package uses libyaml library,
+==> slower pure python implementation is used by default.
+==> See http://pyyaml.org/wiki/PyYAMLDocumentation
+EOT
+}
diff --git a/community-staging/sdcc/PKGBUILD b/community-staging/sdcc/PKGBUILD
new file mode 100644
index 000000000..fd9c0b002
--- /dev/null
+++ b/community-staging/sdcc/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 77318 2012-10-08 16:13:13Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Jose Negron <josenj.arch@mailnull.net>
+
+pkgname=sdcc
+pkgver=3.2.0
+pkgrel=2
+pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('bash' 'gcc-libs' 'boost-libs')
+makedepends=('gputils' 'flex' 'bison' 'patch' 'boost')
+optdepends=('python')
+url="http://sdcc.sourceforge.net/"
+options=(!strip)
+source=(http://downloads.sourceforge.net/sourceforge/sdcc/$pkgname-src-$pkgver.tar.bz2)
+md5sums=('0808a9b4109d2ba6046ddd7b679a0012')
+
+build() {
+  cd $srcdir/$pkgname
+  ./configure \
+	--prefix=/usr \
+	--includedir=/usr/include/sdcc \
+	--libdir=/usr/lib/sdcc
+  make
+  make install DESTDIR=$pkgdir
+
+  if [ -d $pkgdir/usr/lib/lib ]; then
+    mv $pkgdir/usr/lib/lib/* $pkgdir/usr/lib/sdcc/
+    rm -rf $pkgdir/usr/lib/lib
+  fi
+
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|' $pkgdir/usr/bin/as2gbmap
+}
diff --git a/community-staging/tix/PKGBUILD b/community-staging/tix/PKGBUILD
new file mode 100644
index 000000000..8aa00c521
--- /dev/null
+++ b/community-staging/tix/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 77320 2012-10-08 16:13:53Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Brice Méalier <mealier_brice@yahoo.fr>
+
+pkgname=tix
+pkgver=8.4.3
+pkgrel=4
+pkgdesc="Tk Interface eXtension, a powerful set of user interface components"
+arch=(i686 'x86_64')
+url="http://tix.sourceforge.net/"
+license=("BSD")
+depends=('tk' 'libx11')
+source=(http://downloads.sourceforge.net/tix/Tix$pkgver-src.tar.gz
+	tcl-tk-path.patch)
+md5sums=('2b8bf4b10a852264678182652f477e59'
+         'd4df48da39dd51872d58706a51bab505')
+
+build() {
+  cd $srcdir/Tix$pkgver
+
+  patch -p1 <$srcdir/tcl-tk-path.patch
+
+  export CFLAGS="$CFLAGS -DERR_IN_PROGRESS=2"
+
+  ./configure --prefix=/usr
+  make
+  make DESTDIR=$pkgdir install
+  # move things around
+
+  install -m755 tools/tixindex $pkgdir/usr/bin/tixindex
+  rm -rf $pkgdir/usr/lib/Tix8.4/html
+  rm -f $pkgdir/usr/lib/Tix8.4/{README.txt,license.terms}
+  ln -s Tix$pkgver/libTix$pkgver.so $pkgdir/usr/lib/libTix$pkgver.so
+
+  mkdir -p $pkgdir/usr/share/man/man1
+  mkdir -p $pkgdir/usr/share/man/man3
+  cp -p man/tixwish.1 $pkgdir/usr/share/man/man1
+  cd $srcdir/Tix$pkgver/man
+  for i in *.n; do
+	  cp -p $i $pkgdir/usr/share/man/man3/${i%n}3
+  done
+
+  mkdir -p $pkgdir/usr/share/licenses/tix
+  cp $srcdir/Tix$pkgver/license.terms  $pkgdir/usr/share/licenses/tix/
+}
+
diff --git a/community-staging/tix/tcl-tk-path.patch b/community-staging/tix/tcl-tk-path.patch
new file mode 100644
index 000000000..2fc12671e
--- /dev/null
+++ b/community-staging/tix/tcl-tk-path.patch
@@ -0,0 +1,22 @@
+diff -wbBur Tix8.4.3/configure Tix8.4.3.my/configure
+--- Tix8.4.3/configure	2008-02-28 04:35:01.000000000 +0000
++++ Tix8.4.3.my/configure	2009-12-28 10:57:33.000000000 +0000
+@@ -6645,7 +6645,7 @@
+ 	        ;;
+ 	esac
+     else
+-	if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then
++	if test ! -f "${TCL_SRC_DIR}/tclInt.h" ; then
+ 	    { { echo "$as_me:$LINENO: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&5
+ echo "$as_me: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&2;}
+    { (exit 1); exit 1; }; }
+@@ -6700,7 +6700,7 @@
+ 	        ;;
+ 	esac
+     else
+-	if test ! -f "${TK_SRC_DIR}/generic/tkInt.h" ; then
++	if test ! -f "${TK_SRC_DIR}/tk-private/generic/tkInt.h" ; then
+ 	    { { echo "$as_me:$LINENO: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&5
+ echo "$as_me: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&2;}
+    { (exit 1); exit 1; }; }
+