Version bump, now with python3 support. Drop old.

Package-Manager: portage-2.2.0_alpha118/cvs/Linux x86_64

5 files changed, 66 insertions, 47 deletions

diff --git a/dev-util/gdbus-codegen/ChangeLog b/dev-util/gdbus-codegen/ChangeLog
index 2c2c8ea2ebc5..286e4dd75000 100644
--- a/dev-util/gdbus-codegen/ChangeLog
+++ b/dev-util/gdbus-codegen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/gdbus-codegen
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/ChangeLog,v 1.26 2012/07/15 17:04:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/ChangeLog,v 1.27 2012/07/16 04:26:48 tetromino Exp $
+
+*gdbus-codegen-2.32.4 (16 Jul 2012)
+
+  16 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gdbus-codegen-2.32.2.ebuild, +files/setup.py-2.32.4,
+  +gdbus-codegen-2.32.4.ebuild, +files/gdbus-codegen-2.32.4-sitedir.patch:
+  Version bump, now with python3 support. Drop old.
 
   15 Jul 2012; Raúl Porcel <armin76@gentoo.org> gdbus-codegen-2.30.3.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #410611
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index dd61d9141106..b8bffe1a4ea7 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,20 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+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.30.2.tar.xz 5818860 SHA256 f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82 SHA512 803f5de2d0c14c1631e59b618880ec32f060c2e475411ad662635f168013f2a5a5e1e38703d6f16894f5435e12268d961bba5bbf955a6e1d8279968f06f192dc WHIRLPOOL 7f3d3d99897c1fc3fbb89ed14a5829a4bf88649ea70fbe7aaab0eef774c20ac7508129ef1558e3a074d36c7e5a913f556ebaac1b2f0eeba9bbddce3fcaed24f3
 DIST glib-2.30.3.tar.xz 5642448 SHA256 e6cbb27c71c445993346e785e8609cc75cea2941e32312e544872feba572dd27 SHA512 9f212b2c94c8c76ed619a1a97515ffc4c71dd39a982852cc9db600ca3034be1fb646d657dd39831f2fe80a81972400b977ea59fa81923dfe646158c9f1ab8843 WHIRLPOOL 145e20955b0ce2b44e05833bd508ac03a0399fc4d4c1c551c6a05809e6922cd57c37c5b32ebbe80f7ba0a21660059d7cb4837fa233de37af6c12cd0bc3a7afeb
-DIST glib-2.32.2.tar.xz 6117764 SHA256 b1764abf00bac96e0e93e29fb9715ce75f3583579acac40648e18771d43d6136 SHA512 6b18e2cdf4c832acc78703a155b27eda363e5ee5b4c4524c3a1b9e9e5e3e6228f48096dc52d10247b4ea7214989fab1429be14c313af0e9922534ad91c57bc76 WHIRLPOOL 221afffbba5bd394560cc7912854d8be081be7d6bc564dd656ae8a8f4efc6748b1ec28e898ec33f15a775c97edaa6257766e22209d8cb2345bfec5d372c78979
 DIST glib-2.32.3.tar.xz 6164984 SHA256 b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e40363ff4d SHA512 e730231f45cff9a1e2041d26bda0eaaf71af27daae054884860e625768a53ca74cf75b30b86a82a12b804820513a12b156e8e023528956dbb8e7cda4aef5f318 WHIRLPOOL 2ac21548bb1b514ef552f0a254618127342ec87e76e1bee71a121cd754fca5b81395b53aef0ad451bc975572970c9b32cbb3560c5f18927341a2fa2bffabeea8
+DIST glib-2.32.4.tar.xz 6178556 SHA256 a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2 SHA512 bc8b2d6afae7635f940065eca3e854ee171812c7b582d55313db11d28875495dbf41fc0a260347b30f7490daa65ccc377d8a2d60bb3a26d07997606d8e3d989f WHIRLPOOL 35aec94088acff460685c0b1bb2e6fcffadb0f9f0044b93f3fa042ed82dd52efb5e56022575c0ebcfda4230d38edc26a916623f0bfcbfc8e1c6b76a3133d43bc
 EBUILD gdbus-codegen-2.30.2.ebuild 1724 SHA256 d23e18d59b4ed94c7a510490eb689791e39f58508e54d29f1a8a0d94cef25efb SHA512 2f2a5114190b56b84f136ba97c3956301c24d89fa59f6360bc1e66a3b485d939b728a3353f2abf749dc2d07ad761661079f701761e788045b8d8f87ad4ab4930 WHIRLPOOL 02dd659b0d2107a3b58e25a90db1a85ecec6be030eaf0e4ec45bdb78b3a898151b41dbf1b5430597c29cff000c8c5697f848a15c90e5d462a8252c1a2615fe6d
 EBUILD gdbus-codegen-2.30.3.ebuild 1723 SHA256 ff0481f488185f3cda05f1b5e4d042a9baccbf6d7a06c703b2f7f71488d31adc SHA512 622a3db7b5eadb9b50fee868ee7a3d09efcf92588c46382924cd701957d0db2b1b57b9d4c1cb5f67d9be70092f0aab07b6e3360323c1190be4ef1a7d8aca35dd WHIRLPOOL 135ec5596eebb4c138275f883148b66d940762726d2a2b0798da8b1d9fd6a25c50707a6a5cd48385e70578195c1cdd3be47397be8008e8ec4268aeac25389b52
-EBUILD gdbus-codegen-2.32.2.ebuild 1767 SHA256 d46f5096c4f481004c1916e187b0ad582bf0eb4eaaef252007d3630683d34adc SHA512 cf0d05fa02fc7b0dca62ffd5cd8581e172d6f4298415ce3c1ca0d8942bc71a24794aa5d3ec93c1389645f0c6066e56895c1ae5c7c3837c766ffea191a12d4d11 WHIRLPOOL 6dc0ca529135c04152fd8fcef08109e4723f280f89b5b4c8b5ed09fa47d41fd94243ebf297e09b4a781000cf41792771b40d4e86f2c21e39f0d3a9d6d649bbec
 EBUILD gdbus-codegen-2.32.3.ebuild 1771 SHA256 d3eb2b1bc25c9f040e0725854d22b4859b35831379ae64b1229ef54d6bd69b57 SHA512 17a8efc528ec29a9a458343179ab4b6b6288ddf9e00a6a9d2755dfa5c303c78413b40e51aa8d78d9c0aafb3f175bcce3b41d8c33a333b5f9815c81c9379d7c3a WHIRLPOOL 13eeb5430a4c64254a8d84b212db417c1c5f1c8cf3af1e1ab4e0b92c7794d8a3f7c87268cfa13b9d33d3aca31ca72621ee949aed2fcdc9ff06a64da2d085a16c
-MISC ChangeLog 3838 SHA256 f4c416ed861a48d66042e381b76cd6e5cf08084181500189ca4e1c9afcda1bfc SHA512 1cd66822be7b0bfc0fd686dbe1a28461a5a746c8a29883c060058bdca1f162693fecf6db40162bfd8ffad646c6fdb49cc5a7dd0612a86c1ea5f1add71506ea41 WHIRLPOOL 51adcdb77148cd96ad491b4f09e253936de848677bdb5f1f660a8e1d6f6db0daf6bb70f0f5ed7f76c56818ea141deae2eed6317a831ce1fdd4c2db755401c914
+EBUILD gdbus-codegen-2.32.4.ebuild 1645 SHA256 7a677ac30212cc93f32baead531c597f93cc8adf8f0785331cc1fed0fd115f1c SHA512 3d7f32b6b130bb64dbd16de63d2f42b79f0c24179c5329f3ca7670bc7180d18788ee2149f942f3e6ac4b00d0b96315b4f880fd25194311041f85dc27ac17caa8 WHIRLPOOL 1b4c0d2ad54b63dae234db31803a90d91210e5a8a9e83ebb58da46f0fa9f4b372daa503477fe38c3fee403865288073c7a790c5699e9f33a1de104818e7b4a7b
+MISC ChangeLog 4120 SHA256 8270fa3a1997f9c74bde7814af752c99adf7a965af49cefb3f989efcffeee710 SHA512 ae968794e2268c1b28200327e4319a0ae743093e9496bdcaa7e2b597175d0b77cacf2b1d84d45c90634e808581dc30f86e619ad12249c16284be376a9a736dd6 WHIRLPOOL 20bd23c764cc6a16d73b17b4f63804da9d6073fc095ef0237a3b4ca7cae3e256d77a577c68769b0bb94b886a1f1f90dbb551591fb15d2fb7c20805976c454c0e
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAC+CsACgkQuQc30/atMkBeIgCghBOQgtmoEggBenHc6498B9tU
-D6gAnRWv+DBt/1byAm4s1E3eLuzxSSeb
-=qQ6U
+iQEcBAEBCAAGBQJQA5gNAAoJEJ0WA1zPCt1hivsH/jVSWIXxp6I2lAtjjmYW1KBQ
+gi4Jm+2sk/XWiuOl+wynaGPR6v3YWsJxJp2geELOeiJvgXe3OfwD2Si4bddeeMIK
+EzD317qxPChuQxYqy1NIEq6U9tMP/Ug/tpJaszhzhCPF2RHnmLgk5nNQu7OpIQ1v
+BRCYMDmMn25vqJsl+q6i2NG0aXeGAN1kjcv5cM06feKvWTmz/D6DhscoqV1SXy0M
+cRFXpB1lkivgtcge/O9FcYWbmPuzfl4a7pD6//tVXtBOCyLwDZ+ddS9fgiwih/ly
+qdnx7SiJBL1L/iUS1ZQ5y8QVFRhlFd1Myyf9MFXaN2FeouxTnlYOrWP88PtHydA=
+=s0dO
 -----END PGP SIGNATURE-----
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 000000000000..84b91f4c6a1c
--- /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 000000000000..c5318e30588b
--- /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.32.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.32.4.ebuild
index 307b3ab98106..d321687971d4 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.32.2.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.32.4.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.32.2.ebuild,v 1.1 2012/05/01 20:21:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.32.4.ebuild,v 1.1 2012/07/16 04:26:48 tetromino Exp $
 
 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 gnome.org multilib python
+inherit eutils gnome.org python-distutils-ng
 
 DESCRIPTION="GDBus code and documentation generator"
 HOMEPAGE="http://www.gtk.org/"
@@ -17,24 +16,27 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 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() {
@@ -42,29 +44,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
-}