Merged upstream, mesa needs revision

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

Conflicts:
	community-staging/gigi/PKGBUILD
	community-staging/lxdm/PKGBUILD
	community-staging/lxdm/lxdm-pam
	community-staging/lxdm/lxdm.install
	community-staging/lxdm/service
	community-testing/gigi/PKGBUILD
	community/calf/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gmic/PKGBUILD
	community/gnash/PKGBUILD
	community/prboom/PKGBUILD
	community/scorched3d/PKGBUILD
	community/tmux/PKGBUILD
	community/torcs/PKGBUILD
	core/curl/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit/PKGBUILD
	extra/akonadi/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/ftgl/PKGBUILD
	extra/gcin/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/mesa/PKGBUILD
	extra/python-telepathy/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/ruby/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-xkb-plugin/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/baobab/PKGBUILD
	gnome-unstable/epiphany/PKGBUILD
	gnome-unstable/gdm/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-games/PKGBUILD
	gnome-unstable/gnome-screensaver/PKGBUILD
	gnome-unstable/gnome-session/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/libpeas/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/mutter/PKGBUILD
	gnome-unstable/networkmanager/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-gnutls/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/lib32-sqlite/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine_gecko/PKGBUILD
	staging/calligra/PKGBUILD
	staging/inkscape/PKGBUILD
	staging/kdebase-workspace/PKGBUILD
	staging/kdebase-workspace/kde-np.pam
	staging/kdebase-workspace/kde.pam
	staging/kdebase-workspace/kdm.service
	staging/libreoffice/PKGBUILD
	staging/libreoffice/libreoffice-common.csh
	staging/libreoffice/libreoffice-common.sh
	staging/poppler/PKGBUILD
	testing/dbus-python/PKGBUILD
	testing/e2fsprogs/PKGBUILD
	testing/iproute2/PKGBUILD
	testing/iptables/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/kdebase-workspace/kde-np.pam
	testing/kdebase-workspace/kde.pam
	testing/kdebindings-python/PKGBUILD
	testing/lvm2/PKGBUILD
	testing/lvm2/lvm-on-crypt.service
	testing/lvm2/lvm.service
	testing/miro/PKGBUILD
	testing/postgresql/PKGBUILD
	testing/postgresql/postgresql.install
	testing/postgresql/postgresql.service
	testing/ppp/PKGBUILD
	testing/ppp/ip-down
	testing/pyqt/PKGBUILD
	testing/qscintilla/PKGBUILD
	testing/sip/PKGBUILD
	testing/systemd/PKGBUILD
	testing/systemd/systemd.install
	testing/util-linux/PKGBUILD
	testing/wpa_supplicant/PKGBUILD
	testing/wpa_supplicant/config
	testing/xf86-video-intel/PKGBUILD

2 files changed, 87 insertions, 0 deletions

diff --git a/community-testing/ktoblzcheck/PKGBUILD b/community-testing/ktoblzcheck/PKGBUILD
new file mode 100644
index 000000000..da749e7bd
--- /dev/null
+++ b/community-testing/ktoblzcheck/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 78059 2012-10-16 11:51:20Z allan $
+# 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-testing/ktoblzcheck/ktoblzcheck-python3.patch b/community-testing/ktoblzcheck/ktoblzcheck-python3.patch
new file mode 100644
index 000000000..5bfc53275
--- /dev/null
+++ b/community-testing/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__':