dev-util/gdbus-codegen: sync with gx86 for python3 support

Update to python-distutils-ng.eclass to make it easier to add python3
support, which is coming in 2.33.4.

5 files changed, 68 insertions, 81 deletions

diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 4d2cd01f..b10488ca 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,3 +1,5 @@
-DIST glib-2.33.3.tar.xz 6188368 RMD160 c23083ed1734ee24df0b9f7b05d5a0bd89abdaf1 SHA1 329bff878af6d7b8deadc80e16dbdca04dc59f8a SHA256 4ae2695dff7f075e746c5dbcbed9e5f7afb7b11918201dc8e82609a610db0990
-EBUILD gdbus-codegen-2.33.3.ebuild 1798 RMD160 f0e066125c5de6cabade286a2ad4584aad2febeb SHA1 19e259465d9149d4ccdce2a30b42f5b022d4df3b SHA256 3a57b911304e7c83127ea55d28f3a2fd7ee86541468785aed92f0a50ad2ee859
-EBUILD gdbus-codegen-9999.ebuild 1798 RMD160 f0e066125c5de6cabade286a2ad4584aad2febeb SHA1 19e259465d9149d4ccdce2a30b42f5b022d4df3b SHA256 3a57b911304e7c83127ea55d28f3a2fd7ee86541468785aed92f0a50ad2ee859
+AUX gdbus-codegen-2.32.4-sitedir.patch 834 SHA256 9cf9232ac3e5b4447a93e6ad6ed9f0db83f255c13aa0c8fcc69495da6c26200b SHA512 9ed5dbba55ddeeea1779de1675dbe4abdd4e4cb8d2273b1d01a3b10bc5ff295ab24e7200b1480fbaac6b14708ade0ff779f3089c500bf149a5aa62981e1ba2f2 WHIRLPOOL 17fda9d10ecb16b022b5e053e8b07dd742c47a5684caf19a89a9a0de2121ea4884c7467af4baf84b5510da5a0edbb02cfeff5358b7f59fefe2ef21ee3fd6e823
+AUX setup.py-2.32.4 192 SHA256 1b65204a147672a3d4ed17bea9e8dd8b8fa6230c17ea30bfb883be34be01c230 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa WHIRLPOOL d7969e4bd317b382a756b70e7010c9619e98bd91c11a8c46a2514086e5123c9f23d28b1c5b302e2c0569b39480a00c95a24eda6561081890161f68a1d541093e
+DIST glib-2.33.3.tar.xz 6188368 SHA256 4ae2695dff7f075e746c5dbcbed9e5f7afb7b11918201dc8e82609a610db0990 SHA512 24371a7b5f52bb5f181fd2d2d8140869dd858e2659e925a869ae788676b74db7eb71a7bc40aa3a907c2b68a8fa3a5e3b9f90163558033034a23559ef9202c03c WHIRLPOOL c99617259d3be847d247604d809ebefd045bf418df11e43735917d53acd296ac4e43096d2e87c05f09a316ca9bdfba4a819e1c8a7b66e9a3a9c0a1abfec3f96b
+EBUILD gdbus-codegen-2.33.3-r1.ebuild 1713 SHA256 04d0f7d4f7702475709f5ec4030c041b9e48cbe5d1501e8de2d1badd57964ef5 SHA512 4ced79b20857cbf290fc0919f3bbe101057eb4522cda396797ef2ea673aa5f9bba9246d6ab9381059ff75e9db9cc8a753131100cb5509ad4c8f204a2b690accb WHIRLPOOL 94139e9a4b72641094ecc134d598fe45640b03380bbea9c85dd7878b8239c1bfa63675078e391ca759da22f3189689057a01bc706dd29443db714faf05a1736d
+EBUILD gdbus-codegen-9999.ebuild 1697 SHA256 7ae71a24a771b5ba9aab991e0067e277ee2630ddf4cf263307999a2b1c71a3fa SHA512 f4363044b1cfe1e246d9c1014b9babaa1dc4aac99f9ae4059baa801230814ca1bd87d75e3795fbd7de170910ac388753cbde4ed1f1b240c375d3f1fd6e043797 WHIRLPOOL b4d0f398dfa7ce1da70912ae51a7088ada1c6b78a04bb3ed997a7b6bdc13d71e6728da614fc9f84d793f5ac32b8768327ef503e84a280575473032895d41bfdc
diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.32.4-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.32.4-sitedir.patch
new file mode 100644
index 00000000..84b91f4c
--- /dev/null
+++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.32.4-sitedir.patch
@@ -0,0 +1,21 @@
+diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+index 217c755..8520bb8 100644
+--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
++++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+@@ -29,13 +29,9 @@ srcdir = os.getenv('UNINSTALLED_GLIB_SRCDIR', None)
+ 
+ if srcdir is not None:
+     path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
+-elif os.name == 'nt':
+-    # Makes gdbus-codegen 'relocatable' at runtime on Windows.
+-    path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gdbus-2.0')
++    sys.path.insert(0, os.path.abspath(path))
++    from codegen import codegen_main
+ else:
+-    path = os.path.join('@libdir@', 'gdbus-2.0')
+-
+-sys.path.insert(0, os.path.abspath(path))
+-from codegen import codegen_main
++    from gdbus_codegen import codegen_main
+ 
+ sys.exit(codegen_main.codegen_main())
diff --git a/dev-util/gdbus-codegen/files/setup.py-2.32.4 b/dev-util/gdbus-codegen/files/setup.py-2.32.4
new file mode 100644
index 00000000..c5318e30
--- /dev/null
+++ b/dev-util/gdbus-codegen/files/setup.py-2.32.4
@@ -0,0 +1,6 @@
+from distutils.core import setup
+setup(name="gdbus_codegen",
+      version="@PV@",
+      packages=["gdbus_codegen"],
+      package_dir={"gdbus_codegen" : ""},
+      scripts=["gdbus-codegen"])
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.33.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.33.3-r1.ebuild
index ff2d6f4f..9c65f0d3 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.33.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.33.3-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="4"
 GNOME_ORG_MODULE="glib"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
+PYTHON_COMPAT="python2_5 python2_6 python2_7" # python3_1 python3_2 in >=2.33.4
 
-inherit multilib python
+inherit eutils python-distutils-ng
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="git://git.gnome.org/${GNOME_ORG_MODULE}"
 	inherit git-2
@@ -23,28 +22,31 @@ SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 IUSE=""
 
+RDEPEND="python_targets_python2_5? ( dev-lang/python:2.5[xml] )
+	python_targets_python2_6? ( dev-lang/python:2.6[xml] )
+	python_targets_python2_7? ( dev-lang/python:2.7[xml] )
+"
+#	python_targets_python3_1? ( dev-lang/python:3.1[xml] )
+#	python_targets_python3_2? ( dev-lang/python:3.2[xml] )
 DEPEND=""
-RDEPEND="${DEPEND}"
+
 # To prevent circular dependencies with glib[test]
 PDEPEND=">=dev-libs/glib-${PV}:2"
 
 S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs 2 gdbus-codegen.in
-	sed -e "s:@libdir@:${EPREFIX}/usr/$(get_libdir):" \
-		-i gdbus-codegen.in || die "sed gdbus-codegen.in failed"
+python_prepare_all() {
+	epatch "${FILESDIR}/${PN}-2.32.4-sitedir.patch"
 	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
 		-i config.py || die "sed config.py failed"
+
+	mv gdbus-codegen.in gdbus-codegen || die "mv failed"
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
 }
 
 src_test() {
@@ -52,29 +54,6 @@ src_test() {
 	elog "when merged with FEATURES=test"
 }
 
-src_install() {
-	insinto "/usr/$(get_libdir)/gdbus-2.0/codegen"
-
-	# Keep in sync with gio/gdbus-2.0/codegen/Makefile.am!
-	doins __init__.py \
-		codegen.py \
-		codegen_main.py \
-		codegen_docbook.py \
-		config.py \
-		dbustypes.py \
-		parser.py \
-		utils.py
-
-	newbin gdbus-codegen.in gdbus-codegen
-
+python_install_all() {
 	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
 }
-
-pkg_postinst() {
-	python_need_rebuild
-	python_mod_optimize /usr/$(get_libdir)/gdbus-2.0/codegen
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/gdbus-2.0/codegen
-}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
index ff2d6f4f..5e66e1b0 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="4"
 GNOME_ORG_MODULE="glib"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
+PYTHON_COMPAT="python2_5 python2_6 python2_7 python3_1 python3_2"
 
-inherit multilib python
+inherit eutils python-distutils-ng
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="git://git.gnome.org/${GNOME_ORG_MODULE}"
 	inherit git-2
@@ -23,28 +22,31 @@ SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 IUSE=""
 
+RDEPEND="python_targets_python2_5? ( dev-lang/python:2.5[xml] )
+	python_targets_python2_6? ( dev-lang/python:2.6[xml] )
+	python_targets_python2_7? ( dev-lang/python:2.7[xml] )
+	python_targets_python3_1? ( dev-lang/python:3.1[xml] )
+	python_targets_python3_2? ( dev-lang/python:3.2[xml] )
+"
 DEPEND=""
-RDEPEND="${DEPEND}"
+
 # To prevent circular dependencies with glib[test]
 PDEPEND=">=dev-libs/glib-${PV}:2"
 
 S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs 2 gdbus-codegen.in
-	sed -e "s:@libdir@:${EPREFIX}/usr/$(get_libdir):" \
-		-i gdbus-codegen.in || die "sed gdbus-codegen.in failed"
+python_prepare_all() {
+	epatch "${FILESDIR}/${PN}-2.32.4-sitedir.patch"
 	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
 		-i config.py || die "sed config.py failed"
+
+	mv gdbus-codegen.in gdbus-codegen || die "mv failed"
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
 }
 
 src_test() {
@@ -52,29 +54,6 @@ src_test() {
 	elog "when merged with FEATURES=test"
 }
 
-src_install() {
-	insinto "/usr/$(get_libdir)/gdbus-2.0/codegen"
-
-	# Keep in sync with gio/gdbus-2.0/codegen/Makefile.am!
-	doins __init__.py \
-		codegen.py \
-		codegen_main.py \
-		codegen_docbook.py \
-		config.py \
-		dbustypes.py \
-		parser.py \
-		utils.py
-
-	newbin gdbus-codegen.in gdbus-codegen
-
+python_install_all() {
 	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
 }
-
-pkg_postinst() {
-	python_need_rebuild
-	python_mod_optimize /usr/$(get_libdir)/gdbus-2.0/codegen
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/gdbus-2.0/codegen
-}