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

Conflicts:
	community-staging/gambas3/PKGBUILD
	community-staging/luminancehdr/PKGBUILD
	community-staging/luxrays/PKGBUILD
	community-staging/luxrender/PKGBUILD
	community-staging/performous/PKGBUILD
	community-staging/widelands/PKGBUILD
	community/chmsee/PKGBUILD
	community/flac123/PKGBUILD
	community/pam-krb5/PKGBUILD
	community/python-pyxattr/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/python-lxml/PKGBUILD
	extra/usbview/PKGBUILD
	extra/vlc/PKGBUILD
	extra/xorg-server/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-util-linux/PKGBUILD
	staging/bzflag/PKGBUILD
	staging/calligra/PKGBUILD
	staging/enblend-enfuse/PKGBUILD
	staging/gegl/PKGBUILD
	staging/hugin/PKGBUILD
	staging/inkscape/PKGBUILD
	testing/btrfs-progs/PKGBUILD
	testing/btrfs-progs/initcpio-hook-btrfs
	testing/btrfs-progs/initcpio-install-btrfs
	testing/cryptsetup/PKGBUILD
	testing/cryptsetup/encrypt_hook
	testing/empathy/PKGBUILD
	testing/evolution/PKGBUILD
	testing/glibmm/PKGBUILD
	testing/gtkglext/PKGBUILD
	testing/ibus/PKGBUILD
	testing/kmod/PKGBUILD
	testing/udisks2/PKGBUILD
	testing/xf86-video-intel/PKGBUILD

1 files changed, 19 insertions, 21 deletions

diff --git a/extra/pygobject2/PKGBUILD b/extra/pygobject2/PKGBUILD
index 6df4b19cc..45c687042 100644
--- a/extra/pygobject2/PKGBUILD
+++ b/extra/pygobject2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169003 2012-10-17 10:19:49Z allan $
+# $Id: PKGBUILD 169377 2012-10-20 09:01:36Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=7
+pkgrel=8
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pygtk.org/"
 license=('LGPL')
@@ -20,9 +20,15 @@ sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8'
             '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a')
 
 build() {
-  cd "${srcdir}"
+  cd pygobject-$pkgver
+
+  # patches available in 2.28 branch but unreleased.
+  patch -Np1 -i "${srcdir}/python2-fix-type.patch"
+  patch -Np1 -i "${srcdir}/python3-fix-build.patch"
+  patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch"
+
+  cd ..
   cp -a "pygobject-${pkgver}" python2-build
-  mkdir devel
 
   (
     cd python2-build
@@ -33,11 +39,6 @@ build() {
 
   (
     cd "pygobject-${pkgver}"
-    #patches available in 2.28 branch but unreleased.
-    patch -Np1 -i "${srcdir}/python2-fix-type.patch"
-    patch -Np1 -i "${srcdir}/python3-fix-build.patch"
-    patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch"
-
     ./configure --prefix=/usr --disable-introspection
     make
   )
@@ -49,7 +50,7 @@ package_python-gobject2() {
   replaces=('py3gobject')
   provides=("py3gobject=$pkgver")
 
-  cd "${srcdir}/pygobject-${pkgver}"
+  cd pygobject-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   # Delete devel stuff
@@ -62,25 +63,22 @@ package_python2-gobject2() {
   replaces=('pygobject')
   provides=("pygobject=$pkgver")
 
-  cd "${srcdir}/python2-build"
+  cd python2-build
   make DESTDIR="${pkgdir}" install
 
   find "$pkgdir"/usr/share/pygobject -name '*.py' | \
     xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
 
   # Split devel stuff
-  mv "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} \
-    "$srcdir/devel/"
+  cd ..
+  mkdir -p devel/usr/{lib,share/pygobject}
+  mv {"$pkgdir",devel}/usr/include
+  mv {"$pkgdir",devel}/usr/lib/pkgconfig
+  mv {"$pkgdir",devel}/usr/share/gtk-doc
+  mv {"$pkgdir",devel}/usr/share/pygobject/xsl
 }
 
 package_pygobject2-devel() {
   pkgdesc="Development files for the pygobject bindings"
-
-  cd "${srcdir}/devel"
-  mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject}
-
-  mv include   "$pkgdir/usr/"
-  mv pkgconfig "$pkgdir/usr/lib/"
-  mv gtk-doc   "$pkgdir/usr/share/"
-  mv xsl       "$pkgdir/usr/share/pygobject/"
+  mv devel/* "$pkgdir"
 }