1 files changed, 42 insertions, 53 deletions
diff --git a/abs/core/python_modules/pygobject2/PKGBUILD b/abs/core/python_modules/pygobject2/PKGBUILD
index 0f03bda..f4e921e 100644
--- a/abs/core/python_modules/pygobject2/PKGBUILD
+++ b/abs/core/python_modules/pygobject2/PKGBUILD
@@ -1,86 +1,75 @@
-# $Id: PKGBUILD 158678 2012-05-06 22:44:32Z bisson $
+# $Id$
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=pygobject2
 pkgname=(python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=6
-arch=('i686' 'x86_64')
+pkgrel=9
+arch=(i686 x86_64)
 url="http://www.pygtk.org/"
-license=('LGPL')
-makedepends=( 'python2')
-source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz
-        python2-fix-type.patch
-        python3-fix-build.patch
-        python3-fix-maketrans.patch)
+license=(LGPL)
+makedepends=(python2 git)
 options=('!libtool')
-sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8'
-            'b7b415499ffc0817cf551edf76a3fe47938db2c9f6240046eae681e6ef9b37ea'
-            'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca'
-            '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a')
 
-build() {
-  cd "${srcdir}"
-  cp -a "pygobject-${pkgver}" python2-build
-  mkdir devel
+# pygobject-2-28 branch: https://git.gnome.org/browse/pygobject/log/?h=pygobject-2-28
+source=('git://git.gnome.org/pygobject#commit=9456ba7')
+sha256sums=('SKIP')
+
+prepare() {
+  cd pygobject
+  autoreconf -fi
 
-  (
-    cd python2-build
-    export PYTHON=/usr/bin/python2
-    ./configure --prefix=/usr --disable-introspection
-    make
-  )
+  cd ..
+  cp -a pygobject python2-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"
+build() {
+  cd python2-build
+  ./configure --prefix=/usr --disable-introspection \
+    PYTHON=/usr/bin/python2
+  make
 
-    ./configure --prefix=/usr --disable-introspection
-    make
-  )
+  cd ../pygobject
+  ./configure --prefix=/usr --disable-introspection
+  make
 }
 
 package_python-gobject2() {
   pkgdesc="Python 3 bindings for GObject2"
-#  depends=('glib2' 'pygobject2-devel' 'python')
-  replaces=('py3gobject')
+  depends=(glib2 pygobject2-devel python)
+  replaces=(py3gobject)
   provides=("py3gobject=$pkgver")
 
-  cd "${srcdir}/pygobject-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd pygobject
+  make DESTDIR="$pkgdir" install
 
   # Delete devel stuff
-  rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}}
+  rm -r "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}}
 }
 
 package_python2-gobject2() {
   pkgdesc="Python 2 bindings for GObject2"
-  depends=('glib2' 'pygobject2-devel' 'python2')
-  replaces=('pygobject')
+  depends=(glib2 pygobject2-devel python2)
+  replaces=(pygobject)
   provides=("pygobject=$pkgver")
 
-  cd "${srcdir}/python2-build"
-  make DESTDIR="${pkgdir}" install
+  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|"
+  find "$pkgdir"/usr/share/pygobject -name '*.py' -exec \
+    sed -i '1s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|' {} +
+
+  rm -r "$pkgdir"/usr/share/gtk-doc
 
   # 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/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"
 }