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

1 files changed, 14 insertions, 47 deletions

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
 }