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

Conflicts:
	community-staging/kadu/PKGBUILD
	extra/libgsf/PKGBUILD
	libre/linux-libre/PKGBUILD
	staging/kdelibs/PKGBUILD
	testing/glibc/PKGBUILD

5 files changed, 47 insertions, 79 deletions

diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index 4aacf4e32..7452d0fd5 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 136355 2011-08-27 09:31:43Z ibiru $
+# $Id: PKGBUILD 145133 2011-12-17 10:30:04Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=gdk-pixbuf2
-pkgver=2.24.0
+pkgver=2.24.1
 pkgrel=1
 pkgdesc="An image loading library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,22 +11,23 @@ depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11')
 makedepends=('gtk-doc' 'gobject-introspection')
 options=('!libtool')
 install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-${pkgver}.tar.xz)
-sha256sums=('67c11d3aa40441c1cea42c365bf2d6a9a9dd52fae2d359a707ad5e8abb4d28a7')
+source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-$pkgver.tar.xz)
+sha256sums=('da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1')
 
 build() {
-  cd "${srcdir}/gdk-pixbuf-${pkgver}"
+  cd "$srcdir/gdk-pixbuf-$pkgver"
 
   ./configure --prefix=/usr \
     --without-libjasper \
+    --with-x11 \
     --with-included-loaders=png
   make
 }
 
 package() {
-  cd "${srcdir}/gdk-pixbuf-${pkgver}"
+  cd "$srcdir/gdk-pixbuf-$pkgver"
 
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD
index 96177510c..b55be0e9b 100644
--- a/extra/gmime/PKGBUILD
+++ b/extra/gmime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142226 2011-11-06 17:01:40Z ibiru $
+# $Id: PKGBUILD 145137 2011-12-17 18:24:13Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=gmime
-pkgver=2.4.28
+pkgver=2.4.29
 pkgrel=1
 pkgdesc="Core mime parsing library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,24 +14,24 @@ makedepends=('gtk-sharp-2' 'pkgconfig')
 [ "$CARCH" = "mips64el" ] && \
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('8487faf949ca60c7fb814338e6457d4b4260fcba361158667e1f3fe3e7cce13e')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('c85dd7b2ac19754bf687fe8653c3631415b3a2ce70b4365268f03a1bd002ffa5')
 
 build() {
   # get rid of that .wapi errors in fakeroot
-  export MONO_SHARED_DIR="${srcdir}/weird"
-  mkdir -p "${MONO_SHARED_DIR}"
+  export MONO_SHARED_DIR="$srcdir/weird"
+  mkdir -p "$MONO_SHARED_DIR"
 
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 
   # These are gmime alternatives for the same shareutils tools
-  mv "${pkgdir}/usr/bin/uuencode" "${pkgdir}/usr/bin/guuencode"
-  mv "${pkgdir}/usr/bin/uudecode" "${pkgdir}/usr/bin/guudecode"
+  mv "$pkgdir/usr/bin/uuencode" "$pkgdir/usr/bin/guuencode"
+  mv "$pkgdir/usr/bin/uudecode" "$pkgdir/usr/bin/guudecode"
 }
diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD
index d5343da70..84999e42b 100644
--- a/extra/libgsf/PKGBUILD
+++ b/extra/libgsf/PKGBUILD
@@ -1,61 +1,28 @@
-# $Id: PKGBUILD 124392 2011-05-20 13:18:16Z heftig $
+# $Id: PKGBUILD 145141 2011-12-17 20:36:05Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
-pkgbase=libgsf
-pkgname=('libgsf' 'libgsf-gnome')
-pkgver=1.14.21
+pkgname=libgsf
+pkgver=1.14.22
 pkgrel=1
 arch=(i686 x86_64 'mips64el')
+pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats"
 url="http://www.gnome.org/"
 license=('GPL' 'LGPL')
-makedepends=('libxml2' 'glib2' 'bzip2' 'intltool' 'pkgconfig'
-             'python2' 'libbonobo' 'gconf' 'pygtk')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/1.14/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('eef0a9d6eca4e6af6c16b208947e3c958c428b94d22792bdd0b80c08a4b301db')
+options=('!libtool')
+depends=('libxml2' 'gdk-pixbuf2' 'bzip2')
+makedepends=('intltool' 'pygtk')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz)
+sha256sums=('a5f23be3cab72abd91bb443a32f41d6adc73250285b53787460750b6d60b783f')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --mandir=/usr/share/man --disable-static
+  cd "$srcdir/$pkgname-$pkgver"
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static
   make
 }
 
 package_libgsf() {
-  pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats"
-  depends=('libxml2' 'glib2' 'bzip2')
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-  rm -f "${pkgdir}/usr/share/man/man1/gsf-office-thumbnailer.1"
-  rm -f "${pkgdir}/usr/lib/libgsf-gnome"*
-  rm -rf "${pkgdir}/usr/include/libgsf-1/gsf-gnome/"
-  rm -rf "${pkgdir}/etc/gconf"
-  rm -f "${pkgdir}/usr/lib/pkgconfig/libgsf-gnome-1.pc"
-  rm -f "${pkgdir}/usr/bin/gsf-office-thumbnailer"
-  rm -f "${pkgdir}"/usr/lib/python*/site-packages/gsf/gnomemodule.so
-}
-
-package_libgsf-gnome() {
-  pkgdesc="Libgsf GNOME components"
-  depends=("libgsf=${pkgver}" 'libbonobo' 'gconf')
-  install=libgsf-gnome.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gsf DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  make -C gsf-gnome DESTDIR="${pkgdir}" install
-  make -C thumbnailer DESTDIR="${pkgdir}" install
-  make -C python DESTDIR="${pkgdir}" install
-  make -C doc DESTDIR="${pkgdir}" install-manpageDATA
-
-  rm -f "${pkgdir}/usr/share/man/man1/gsf.1"
-  rm -f "${pkgdir}/usr/share/man/man1/gsf-vba-dump.1"
-  rm -f "${pkgdir}"/usr/lib/python*/site-packages/gsf/_*
-  rm -f "${pkgdir}"/usr/lib/libgsf-1.so*
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 libgsf-gnome-1.pc "${pkgdir}/usr/lib/pkgconfig/"
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/libgsf-gnome.schemas" --domain libgsf "${pkgdir}/etc/gconf/schemas/"*.schemas
-  rm -f "${pkgdir}/etc/gconf/schemas/"*.schemas
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD
index 55850a084..f42dd8ab0 100644
--- a/extra/twisted/PKGBUILD
+++ b/extra/twisted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 126682 2011-06-06 14:53:30Z ibiru $
+# $Id: PKGBUILD 145135 2011-12-17 16:20:46Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor:  Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=twisted
-pkgver=11.0.0
+pkgver=11.1.0
 pkgrel=1
 pkgdesc="Asynchronous networking framework written in Python."
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,21 +14,21 @@ depends=('python2' 'pycrypto' 'zope-interface')
 optdepends=('python2-pyopenssl'
             'python-soappy:for twisted.web.soap')
 install=twisted.install
-source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-${pkgver}.tar.bz2)
-md5sums=('d7f94a1609a1b8f3b8c8d0146d4cfe54')
+source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2)
+md5sums=('972f3497e6e19318c741bf2900ffe31c')
 
 build() {
-    cd "${srcdir}/Twisted-${pkgver}"
+    cd "$srcdir/Twisted-$pkgver"
     python2 setup.py build
 }
 
 package() {
-    cd "${srcdir}/Twisted-${pkgver}"
-    python2 setup.py install --prefix=/usr --root=${pkgdir} --optimize=1
-    install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    cd "$srcdir/Twisted-$pkgver"
+    python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+    install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
     sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-        -i ${pkgdir}/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py
+        -i "$pkgdir"/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py
     sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-        -i ${pkgdir}/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py
+        -i "$pkgdir"/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py
 }
diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index d11a75e9f..94123ad2b 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144599 2011-12-07 15:40:43Z pierre $
+# $Id: PKGBUILD 145146 2011-12-18 00:41:44Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=zsh
-pkgver=4.3.14
-pkgrel=2
+pkgver=4.3.15
+pkgrel=1
 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.zsh.org/'
@@ -13,7 +13,7 @@ install=zsh.install
 source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2"
         'zprofile')
 backup=('etc/zsh/zprofile')
-md5sums=('1c819a3ff7302b42eba988e333e76109'
+md5sums=('11766b0dd674a513810903cd33ffcac4'
          '24a9335edf77252a7b5f52e079f7aef7')
 
 build() {