pygobject-patched 3.20.0-3

2 files changed, 25 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4c08e449e6ba..df28fe7a1f47 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,37 +1,33 @@
 # Generated by mksrcinfo v8
-# Fri Jun 10 11:13:12 UTC 2016
+# Sun Jun 19 01:37:42 UTC 2016
 pkgbase = pygobject-patched
+	pkgdesc = Python Bindings for GLib/GObject/GIO/GTK+
 	pkgver = 3.20.0
-	pkgrel = 2
-	url = https://live.gnome.org/PyGObject
+	pkgrel = 3
+	url = https://wiki.gnome.org/Projects/PyGObject
 	arch = i686
 	arch = x86_64
 	license = LGPL
-	makedepends = python
-	makedepends = python2
 	makedepends = python-cairo-git
 	makedepends = python2-cairo
 	makedepends = gobject-introspection
+	depends = gobject-introspection-runtime
+	optdepends = cairo: Cairo bindings
 	source = https://download.gnome.org/sources/pygobject/3.20/pygobject-3.20.0.tar.xz
 	source = 01_cairo_region.patch
 	sha256sums = 31ab4701f40490082aa98af537ccddba889577abe66d242582f28577e8807f46
 	sha256sums = f6f57ccf195c0c8c654edaab0bf09940a15d14ac72bca0b6c1272a0e22792e8e
 
 pkgname = python-gobject-patched
-	pkgdesc = Python 3 bindings for GObject, with a patch for cairo
-	depends = gobject-introspection-runtime
 	depends = pygobject-devel=3.20.0
 	depends = python
-	depends = cairo
 	provides = python-gobject=3.20.0
 	conflicts = python-gobject
 
 pkgname = python2-gobject-patched
-	pkgdesc = Python 2 bindings for GObject, with a patch for cairo
-	depends = gobject-introspection-runtime
+	pkgdesc = Python2 Bindings for GLib/GObject/GIO/GTK+
 	depends = pygobject-devel=3.20.0
 	depends = python2
-	depends = cairo
 	provides = python2-gobject=3.20.0
 	conflicts = python2-gobject
 
diff --git a/PKGBUILD b/PKGBUILD
index 4aecd6ab34c5..3dccfbe2daa3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,37 +5,39 @@ _pkgbase=pygobject
 pkgbase=pygobject-patched
 pkgname=(python-gobject-patched python2-gobject-patched)
 pkgver=3.20.0
-pkgrel=2
+pkgrel=3
+pkgdesc="Python Bindings for GLib/GObject/GIO/GTK+"
+url="https://wiki.gnome.org/Projects/PyGObject"
 arch=(i686 x86_64)
-url="https://live.gnome.org/PyGObject"
 license=(LGPL)
-makedepends=(python python2 python-cairo-git python2-cairo gobject-introspection)
+depends=(gobject-introspection-runtime)
+makedepends=(python-cairo-git python2-cairo gobject-introspection)
+optdepends=('cairo: Cairo bindings')
 source=("https://download.gnome.org/sources/${_pkgbase}/${pkgver:0:4}/${_pkgbase}-${pkgver}.tar.xz"
 		"01_cairo_region.patch")
 sha256sums=('31ab4701f40490082aa98af537ccddba889577abe66d242582f28577e8807f46'
             'f6f57ccf195c0c8c654edaab0bf09940a15d14ac72bca0b6c1272a0e22792e8e')
 
 prepare() {
-  mkdir -p build-py2 build-py3
+  mkdir -p build-py{2,3}
   cd ${_pkgbase}-${pkgver}
   patch -Np1 -i "$srcdir/01_cairo_region.patch"
 }
 
-build() {
-  cd build-py2
-  ../${_pkgbase}-${pkgver}/configure --prefix=/usr --with-python=/usr/bin/python2
+_build() (
+  cd build-py$1
+  ../${_pkgbase}-${pkgver}/configure --prefix=/usr --with-python=/usr/bin/python$1
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
+)
 
-  cd ../build-py3
-  ../${_pkgbase}-${pkgver}/configure --prefix=/usr --with-python=/usr/bin/python
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
+build() {
+  _build 2
+  _build 3
 }
 
 package_python-gobject-patched() {
-  pkgdesc="Python 3 bindings for GObject, with a patch for cairo"
-  depends=('gobject-introspection-runtime' "pygobject-devel=$pkgver" 'python' 'cairo')
+  depends=("pygobject-devel=$pkgver" python)
   provides=("python-gobject=$pkgver")
   conflicts=('python-gobject')
 
@@ -45,13 +47,13 @@ package_python-gobject-patched() {
 }
 
 package_python2-gobject-patched() {
-  pkgdesc="Python 2 bindings for GObject, with a patch for cairo"
-  depends=('gobject-introspection-runtime' "pygobject-devel=$pkgver" 'python2' 'cairo')
+  pkgdesc="${pkgdesc/Python/Python2}"
+  depends=("pygobject-devel=$pkgver" python2)
   provides=("python2-gobject=$pkgver")
   conflicts=('python2-gobject')
 
   cd build-py2
   make DESTDIR="$pkgdir" install
+  python2 -m compileall "$pkgdir"/usr/lib/python2.7/site-packages/gi
   rm -r "$pkgdir"/usr/{include,lib/pkgconfig}
-  python2 -m compileall "$pkgdir"//usr/lib/python2.7/site-packages/gi
 }