From 71e47363c77e6bcd78feb7eac1c5b0b34f741c92 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 29 Jan 2014 09:42:02 +0100
Subject: [PATCH] dbus-python: split dbus-python3 into its own srcpkg;
 dbus-python can be cross compiled now.

---
 srcpkgs/dbus-python/template         | 50 +++++++---------------------
 srcpkgs/dbus-python3                 |  1 -
 srcpkgs/dbus-python3/template        | 22 ++++++++++++
 srcpkgs/py2cairo/files/python-config |  2 +-
 4 files changed, 35 insertions(+), 40 deletions(-)
 delete mode 120000 srcpkgs/dbus-python3
 create mode 100644 srcpkgs/dbus-python3/template

diff --git a/srcpkgs/dbus-python/template b/srcpkgs/dbus-python/template
index 32add74e54c..a8910a1a22a 100644
--- a/srcpkgs/dbus-python/template
+++ b/srcpkgs/dbus-python/template
@@ -1,9 +1,10 @@
 # Template file for 'dbus-python'
 pkgname=dbus-python
 version=1.2.0
-revision=1
-hostmakedepends="pkg-config"
-makedepends="glib-devel dbus-glib-devel python-devel python3-devel>=3.3.2_2"
+revision=2
+build_style=gnu-configure
+hostmakedepends="pkg-config python-devel"
+makedepends="glib-devel dbus-glib-devel python-devel"
 depends="python"
 pycompile_module="dbus"
 short_desc="D-Bus Python bindings"
@@ -14,50 +15,23 @@ distfiles="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.g
 checksum=e12c6c8b2bf3a9302f75166952cbe41d6b38c3441bbc6767dbd498942316c6df
 
 do_configure() {
-	mkdir build-python2 build-python3
-
-	cd $wrksrc/build-python2
-	PYTHON=python2 ../configure --prefix=/usr
-
-	cd $wrksrc/build-python3
-	PYTHON=python3 ../configure --prefix=/usr
+	if [ "$CROSS_BUILD" ]; then
+		# create a python-config wrapper to fake --includes
+		install -m755 ${XBPS_SRCPKGDIR}/py2cairo/files/python-config ${wrksrc}
+		export PATH=${wrksrc}:$PATH
+	fi
+	env PYTHON=python ./configure ${configure_args}
 }
 
-do_build() {
-	cd $wrksrc/build-python2
-	make ${makejobs}
-
-	cd $wrksrc/build-python3
-	make ${makejobs}
-}
-
-do_install() {
-	cd $wrksrc/build-python2
-	make DESTDIR=${DESTDIR} install
-
+post_install() {
 	rm -rf ${DESTDIR}/usr/share/doc
 }
 
 dbus-python-devel_package() {
-	depends="python-devel
-		 python3-devel>=3.3.2_2
-		 dbus-python>=${version}
-		 dbus-python3>=${version}"
+	depends="python-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 	}
 }
-
-dbus-python3_package() {
-	short_desc="D-Bus Python3 bindings"
-	depends="python3"
-	pkg_install() {
-		cd $wrksrc/build-python3
-		make DESTDIR=${PKGDESTDIR} install
-		rm -rf ${PKGDESTDIR}/usr/include
-		rm -rf ${PKGDESTDIR}/usr/lib/pkgconfig
-		rm -rf ${PKGDESTDIR}/usr/share/doc
-	}
-}
diff --git a/srcpkgs/dbus-python3 b/srcpkgs/dbus-python3
deleted file mode 120000
index 906753c2972..00000000000
--- a/srcpkgs/dbus-python3
+++ /dev/null
@@ -1 +0,0 @@
-dbus-python
\ No newline at end of file
diff --git a/srcpkgs/dbus-python3/template b/srcpkgs/dbus-python3/template
new file mode 100644
index 00000000000..169faba5d9f
--- /dev/null
+++ b/srcpkgs/dbus-python3/template
@@ -0,0 +1,22 @@
+# Template file for 'dbus-python3'
+pkgname=dbus-python3
+version=1.2.0
+revision=2
+wrksrc="${pkgname/3/}-${version}"
+build_style=gnu-configure
+configure_args="PYTHON=python3"
+hostmakedepends="pkg-config python3-devel"
+makedepends="glib-devel dbus-glib-devel python3-devel"
+depends="python3"
+short_desc="D-Bus Python bindings"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2, LGPL-2.1"
+homepage="http://www.freedesktop.org/wiki/Software/DBusBindings"
+distfiles="http://dbus.freedesktop.org/releases/${pkgname/3/}/${pkgname/3/}-${version}.tar.gz"
+checksum=e12c6c8b2bf3a9302f75166952cbe41d6b38c3441bbc6767dbd498942316c6df
+
+post_install() {
+	rm -rf ${DESTDIR}/usr/share/doc
+	# Remove development files, provided by dbus-python-devel.
+	rm -rf ${DESTDIR}/usr/include ${DESTDIR}/usr/lib/pkgconfig
+}
diff --git a/srcpkgs/py2cairo/files/python-config b/srcpkgs/py2cairo/files/python-config
index 18a00e1a4da..ee6ce9e04a2 100644
--- a/srcpkgs/py2cairo/files/python-config
+++ b/srcpkgs/py2cairo/files/python-config
@@ -6,4 +6,4 @@ if [ "$1" = "--includes" ]; then
 	echo "-I${XBPS_CROSS_BASE}/usr/include/python2.7"
 fi
 
-return 0
+exit 0