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

Conflicts:
	extra/qt/PKGBUILD
	gnome-unstable/dconf/PKGBUILD
	libre/kdelibs-libre/PKGBUILD
	testing/subversion/PKGBUILD

12 files changed, 106 insertions, 48 deletions

diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD
index f8cf2d474..4eca423b8 100644
--- a/community/cegui/PKGBUILD
+++ b/community/cegui/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64313 2012-02-11 23:19:28Z allan $
+# $Id: PKGBUILD 67327 2012-03-08 18:15:45Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org> 
 # Contributor: William Rea <sillywilly@gmail.com>, 
@@ -6,26 +6,34 @@
 
 pkgname=cegui
 pkgver=0.7.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://crayzedsgui.sourceforge.net"
 #options=('!libtool')
 license=("MIT")
 depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly')
-makedepends=('python2' 'doxygen')
-source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz)
+makedepends=('python2' 'doxygen' 'ogre' 'irrlicht' 'gtk2' 'boost' 'graphviz')
+optdepends=("python2: python bindings"
+            "ogre: ogre module"
+            "irrlicht: irrlicht module")
 options=(!libtool)
-md5sums=('7ddb5145dc94fb7daf9aea1d30a6ffa3')
+source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz
+        cegui-0.7.6-python-detection.patch)
+md5sums=('7ddb5145dc94fb7daf9aea1d30a6ffa3'
+         '4600775f78b7349621a8a314ade8c902')
 
 build() {
   cd $srcdir/CEGUI-${pkgver}
 
-  sed -i '1i#include <cstddef>' cegui/include/CEGUIString.h
+  patch -Np0 < $srcdir/cegui-0.7.6-python-detection.patch
+
+  ./bootstrap
+
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
-    --disable-xerces-c \
-    --enable-null-renderer
+    --enable-null-renderer \
+    --with-gtk2
 
   make
 }
@@ -35,8 +43,7 @@ package() {
  
   make DESTDIR=${pkgdir} install
 
-  #build docs                                                                                                                                 
-  cd doc/doxygen && doxygen                                                                                                                   
+  cd doc/doxygen && doxygen
   cd .. && make DESTDIR=${pkgdir} install-html
 
   install -Dm644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
diff --git a/community/cegui/cegui-0.7.6-python-detection.patch b/community/cegui/cegui-0.7.6-python-detection.patch
new file mode 100644
index 000000000..e14cd812e
--- /dev/null
+++ b/community/cegui/cegui-0.7.6-python-detection.patch
@@ -0,0 +1,11 @@
+--- acinclude.m4.original	2012-01-24 10:42:16.066632295 +0100
++++ acinclude.m4	2012-01-24 10:43:15.800274030 +0100
+@@ -1411,7 +1411,7 @@
+ if test x$ax_python_bin != x; then
+    AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no)
+    AC_CHECK_HEADER([$ax_python_bin/Python.h],
+-   [[ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]],
++   [[ax_python_header="/usr/include/$ax_python_bin"]],
+    ax_python_header=no)
+    if test x$ax_python_lib != xno; then
+      if test x$ax_python_header != xno; then
diff --git a/community/ext4magic/PKGBUILD b/community/ext4magic/PKGBUILD
index 60b39ffdc..d229cb03f 100644
--- a/community/ext4magic/PKGBUILD
+++ b/community/ext4magic/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 61407 2011-12-30 10:27:27Z seblu $
-# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+# $Id: PKGBUILD 67335 2012-03-09 01:54:07Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgname=ext4magic
-pkgver=0.2.4
+pkgver=0.3.0
 pkgrel=1
 pkgdesc='Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems'
 arch=('i686' 'x86_64')
 url='http://developer.berlios.de/projects/ext4magic/'
 license=('GPL2')
-depends=('util-linux' 'e2fsprogs')
+depends=('bzip2' 'file' 'util-linux' 'e2fsprogs')
 source=("http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz") 
-md5sums=('460b6642ee050d02b87395cc3ac6d4b6')
+md5sums=('54ed503730b7e279c5cddc99a8821de3')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/ht/PKGBUILD b/community/ht/PKGBUILD
index 3c5a3368a..ecf626536 100644
--- a/community/ht/PKGBUILD
+++ b/community/ht/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 65560 2012-02-21 08:56:47Z spupykin $
+# $Id: PKGBUILD 67315 2012-03-08 16:30:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: tardo <tardo@nagi-fanboi.net>
 # Contributor: Simon Morgan <"mra84964@mra.pb.hx".decode('rot-13')>
 
 pkgname=ht
-pkgver=2.0.18
-pkgrel=2
+pkgver=2.0.20
+pkgrel=1
 pkgdesc="A file editor/viewer/analyzer for executables"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hte.sourceforge.net/"
 license=('GPL')
 depends=('gcc-libs' 'ncurses' 'lzo2')
 source=(http://downloads.sourceforge.net/sourceforge/hte/$pkgname-$pkgver.tar.gz)
-md5sums=('ce7698b80035bce297374b338045dadd')
+md5sums=('22d5a30470032ec8b858d4a3a24f8d02')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/medit/PKGBUILD b/community/medit/PKGBUILD
index 728f962c3..4bc379d55 100644
--- a/community/medit/PKGBUILD
+++ b/community/medit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 60108 2011-12-05 11:28:47Z spupykin $
+# $Id: PKGBUILD 67317 2012-03-08 16:31:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=medit
-pkgver=1.0.5
-pkgrel=2
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="A GTK text editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mooedit.sourceforge.net"
@@ -16,13 +16,13 @@ makedepends=(pkgconfig perlxml intltool gcc-objc)
 install=medit.install
 source=(http://downloads.sourceforge.net/mooedit/medit-$pkgver.tar.bz2
 	medit-terminal.patch)
-md5sums=('ca790a6153eab7e2a47ac965940c0c7d'
+md5sums=('3c561ceb0edebea916f322e5049d9465'
          'fc4c193506901379cf2978aba950179b')
 
 build() {
   cd $srcdir/medit-$pkgver
   export PYTHON=/usr/bin/python2
-  patch -p0 <$srcdir/medit-terminal.patch
+#  patch -p0 <$srcdir/medit-terminal.patch
   [ -f Makefile ] || ./configure --prefix=/usr
   make
 }
diff --git a/community/optipng/PKGBUILD b/community/optipng/PKGBUILD
index 73c31acad..68a499a0f 100644
--- a/community/optipng/PKGBUILD
+++ b/community/optipng/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 59287 2011-11-22 15:27:27Z lfleischer $
+# $Id: PKGBUILD 67303 2012-03-08 12:19:11Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Aaron Schaefer <aaron@elasticdog.com>
 
 pkgname=optipng
-pkgver=0.6.5
-pkgrel=2
+pkgver=0.7
+pkgrel=1
 pkgdesc='Compresses PNG files to a smaller size, without losing any information.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://optipng.sourceforge.net/'
 license=('ZLIB')
 depends=('glibc')
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('9df5fa7bb45ae096ed6c6e0d8dc43dc7')
+md5sums=('9b2f526ce79ea779c7004c7964ee8bcc')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/pdnsd/PKGBUILD b/community/pdnsd/PKGBUILD
index 2d3439434..9b8cfd281 100644
--- a/community/pdnsd/PKGBUILD
+++ b/community/pdnsd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65623 2012-02-21 12:15:26Z spupykin $
+# $Id: PKGBUILD 67319 2012-03-08 16:32:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Henrik Nymann Jensen <h@henriknj.dk>
 
 pkgname=pdnsd
-pkgver=1.2.8
-pkgrel=3
+pkgver=1.2.9
+pkgrel=1
 pkgdesc="Is a proxy DNS server with permanent caching"
 arch=(i686 x86_64 'mips64el')
 url="http://www.phys.uu.nl/~rombouts/pdnsd/"
@@ -13,7 +13,7 @@ depends=('glibc')
 #backup=('etc/pdnsd.conf')
 source=(http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-$pkgver-par.tar.gz
 	pdnsd)
-md5sums=('779c5d19576e561fbf2455de435e5597'
+md5sums=('037f79d191b98974ffc2c9649727bf66'
          '3670bd47c9303fbb655d9216715512de')
 
 build() {
@@ -21,9 +21,5 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc
   make
   make DESTDIR=$pkgdir install
-
-  mkdir -p $pkgdir/etc/rc.d
   install -Dm0755 $srcdir/pdnsd $pkgdir/etc/rc.d/pdnsd
-  mkdir -p $pkgdir/usr/share/
-  mv $pkgdir/usr/man $pkgdir/usr/share/
 }
diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD
new file mode 100644
index 000000000..f525225be
--- /dev/null
+++ b/community/python-sqlalchemy/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 67332 2012-03-09 00:22:36Z seblu $ 
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
+
+pkgbase=python-sqlalchemy
+pkgname=('python-sqlalchemy' 'python2-sqlalchemy')
+pkgver=0.7.5
+pkgrel=1
+arch=('i686' 'x86_64') # python2 package contain .so
+url="http://www.sqlalchemy.org/"
+license=('custom: MIT')
+makedepends=('python' 'python2' 'python-distribute' 'python2-distribute')
+source=("http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz")
+md5sums=('52e71dddfdb8ca8c5049558a23d26557')
+
+build() {
+  cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver
+  cd SQLAlchemy-$pkgver
+  python setup.py build
+  cd ../SQLAlchemy2-$pkgver
+  python2 setup.py build
+}
+
+package_python-sqlalchemy() {
+  pkgdesc='Python SQL toolkit and Object Relational Mapper'
+  depends=('python')
+
+  cd SQLAlchemy-${pkgver}
+  python setup.py install --root="${pkgdir}"
+  install -D -m644 LICENSE \
+	  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_python2-sqlalchemy() {
+  pkgdesc='Python 2 SQL toolkit and Object Relational Mapper'
+  depends=('python2')
+
+  cd SQLAlchemy2-$pkgver
+  python2 setup.py install --root="$pkgdir"
+  install -D -m644 LICENSE \
+	  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index faaca7ee4..808c0704d 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64617 2012-02-17 07:14:41Z spupykin $
+# $Id: PKGBUILD 67321 2012-03-08 16:32:59Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
-pkgver=2.4.7
+pkgver=2.4.8
 pkgrel=1
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ backup=("etc/redis.conf"
 source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
 	"redis.d"
 	"redis.logrotate")
-md5sums=('6afffb6120724183e40f1cac324ac71c'
+md5sums=('ac776d25f238b142d3d526cfcdc621ab'
          '9726d06d0a0c60cb5d55a31b3dc1e55d'
          '9e2d75b7a9dc421122d673fe520ef17f')
 
diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD
index 2ac60989e..01a82c843 100644
--- a/community/tea/PKGBUILD
+++ b/community/tea/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61545 2012-01-02 13:41:07Z spupykin $
+# $Id: PKGBUILD 67323 2012-03-08 16:33:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu>
 
 pkgname=tea
-pkgver=31.2.0
+pkgver=32.0.0
 pkgrel=1
 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions."
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ depends=('qt' 'aspell' 'hunspell')
 install=tea.install
 source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2
         tea.desktop)
-md5sums=('720a9b586d0ae3f73f83dc954bd17a21'
+md5sums=('42414e1e429d9dd20f4dcda1bedc1163'
          '377ace3363124f4c086de0babb820761')
 
 build() {
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index 58321e66f..dbaaa736e 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 66834 2012-02-29 07:29:58Z ibiru $
+# $Id: PKGBUILD 67305 2012-03-08 13:29:02Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-modules' 'virtualbox-archlinux-modules')
 pkgver=4.1.8
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/community/xvkbd/PKGBUILD b/community/xvkbd/PKGBUILD
index 7ffaa8d2a..631d31c17 100644
--- a/community/xvkbd/PKGBUILD
+++ b/community/xvkbd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 63496 2012-02-05 11:51:10Z ibiru $
+# $Id: PKGBUILD 67325 2012-03-08 16:34:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Benjamin Andresen <benny@klapmuetz.org>
 # Contributor: Mikko Seppдlд <t-r-a-y@mbnet.fi>
 
 pkgname=xvkbd
-pkgver=3.2
-pkgrel=3
+pkgver=3.3
+pkgrel=1
 pkgdesc="virtual (graphical) keyboard program for X Window System"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://homepage3.nifty.com/tsato/xvkbd/"
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('libxmu' 'xaw3d' 'glibc' 'libxt' 'libxtst' 'libxp' 'libxpm')
 makedepends=('imake')
 source=(http://homepage3.nifty.com/tsato/xvkbd/xvkbd-$pkgver.tar.gz)
-md5sums=('1bce8d6c27e6e7df92ec09b414f82dad')
+md5sums=('8495402211a610293563a749bb45a0f0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"