generate .pyc/.pyo files properly (bug 176612)

Package-Manager: portage-2.1.3_rc6

5 files changed, 56 insertions, 47 deletions

diff --git a/dev-python/dbus-python/ChangeLog b/dev-python/dbus-python/ChangeLog
index 606cba742593..bd7837ffcd24 100644
--- a/dev-python/dbus-python/ChangeLog
+++ b/dev-python/dbus-python/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/dbus-python
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/ChangeLog,v 1.25 2007/06/22 18:27:24 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/ChangeLog,v 1.26 2007/07/06 17:32:48 hawking Exp $
+
+  06 Jul 2007; Ali Polatel <hawking@gentoo.org> dbus-python-0.71.ebuild,
+  dbus-python-0.80.2.ebuild, dbus-python-0.81.0.ebuild:
+  generate .pyc/.pyo files properly, use python & multilib instead of
+  distutils (bug 176612)
 
   22 Jun 2007; Raúl Porcel <armin76@gentoo.org> dbus-python-0.80.2.ebuild:
   alpha stable wrt #174810
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index 4ed1978d6342..069096205d29 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -1,25 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST dbus-python-0.71.tar.gz 137613 RMD160 89e0999b725aea4ec1a4d703a27b34d119b27ab5 SHA1 18e71b7bf3513d14f2113ccd05e8bc930a46baa5 SHA256 4af7a60f65cb02dabbcdf0cb6ca6f659932eb13c2533f6e1dbdab6e3700a2c57
 DIST dbus-python-0.80.2.tar.gz 453499 RMD160 b422731e8a4250fe57271f29e96dafd214e31385 SHA1 fac7fb250bb4edc682cd8a86c6b0acb8047b6e86 SHA256 501485c24c4b3e92c5db44081633cebf39689dbfdf676c25b1cb6e061438ebe4
 DIST dbus-python-0.81.0.tar.gz 473680 RMD160 bcfdf67c4af46b77ca1bba2735c7aeea96102639 SHA1 e50697a4ab83903d4838308e9852d902e4ea9d6c SHA256 7e837cda207511e12b31faac8cfefcfe1216758e92c86da278279d1c145861ef
-EBUILD dbus-python-0.71.ebuild 844 RMD160 62d0245de986221e96b93119e4eb6e47b781ba6d SHA1 c82d6f54bb202d3380b6cc79b77a9d32bef8721b SHA256 6190efce20c8db04a95d64c36287594bde4230f4f90cb7d57f43e7460952f9f1
-MD5 51aff19992e4ef4c6b50528d81fdbd25 dbus-python-0.71.ebuild 844
-RMD160 62d0245de986221e96b93119e4eb6e47b781ba6d dbus-python-0.71.ebuild 844
-SHA256 6190efce20c8db04a95d64c36287594bde4230f4f90cb7d57f43e7460952f9f1 dbus-python-0.71.ebuild 844
-EBUILD dbus-python-0.80.2.ebuild 1155 RMD160 94f5ecbbb8191b88ec4ab708a44286f004f5b0e4 SHA1 12b1aac1fe9282c393778b2a5435c06c946bbb6d SHA256 5869f3e152795f804baae77a21ca64c7cb5ff9ddee58f2871dc63b6076ae7d31
-MD5 619943ee48f25191db66ea2b17dc4fba dbus-python-0.80.2.ebuild 1155
-RMD160 94f5ecbbb8191b88ec4ab708a44286f004f5b0e4 dbus-python-0.80.2.ebuild 1155
-SHA256 5869f3e152795f804baae77a21ca64c7cb5ff9ddee58f2871dc63b6076ae7d31 dbus-python-0.80.2.ebuild 1155
-EBUILD dbus-python-0.81.0.ebuild 1159 RMD160 d4ba0791171d0e38f706223333a69c637c69e8c2 SHA1 32e39ac30e52c29c7d24c7bfc3986c7cff33e793 SHA256 5651af5120895632b3fd176e4a462d6f3cddbdd95c573f8d849928fb7e81b2b0
-MD5 3dd135264c3144455d4c65858538aba4 dbus-python-0.81.0.ebuild 1159
-RMD160 d4ba0791171d0e38f706223333a69c637c69e8c2 dbus-python-0.81.0.ebuild 1159
-SHA256 5651af5120895632b3fd176e4a462d6f3cddbdd95c573f8d849928fb7e81b2b0 dbus-python-0.81.0.ebuild 1159
-MISC ChangeLog 1720 RMD160 09701a31dc202a6a318f3f30968465a279175753 SHA1 57dbb054359b7a72cd5b8cc6835a725d61c59ab6 SHA256 18dfaec953570d313a60f538a5564fb8e4288b79f03aaa03c8accf6b78309c54
-MD5 ab8be8bad5285dcff49f705eee892674 ChangeLog 1720
-RMD160 09701a31dc202a6a318f3f30968465a279175753 ChangeLog 1720
-SHA256 18dfaec953570d313a60f538a5564fb8e4288b79f03aaa03c8accf6b78309c54 ChangeLog 1720
+EBUILD dbus-python-0.71.ebuild 700 RMD160 fc0ad04cf86773cc697d865425de77e311213cf4 SHA1 228c09f51330205ed22f6b30fac1baef24115b2a SHA256 1912615e29c2b456bd1d85461f43af8dad6d3d1bb82aff2fc46f09ee837f4490
+MD5 ceff52168a6512bfac9f9cc3b1cd8c15 dbus-python-0.71.ebuild 700
+RMD160 fc0ad04cf86773cc697d865425de77e311213cf4 dbus-python-0.71.ebuild 700
+SHA256 1912615e29c2b456bd1d85461f43af8dad6d3d1bb82aff2fc46f09ee837f4490 dbus-python-0.71.ebuild 700
+EBUILD dbus-python-0.80.2.ebuild 1319 RMD160 5a44edc17aa042fb1829d51ffba949952c55e4ad SHA1 61aad3e7270a4b9e24363097633991acc7d830b1 SHA256 c84c24887ab42448b206be1052f2e6094696c726d778cac4e7d7a53d649d85f1
+MD5 6f5138567d5283a62c679e80adba138e dbus-python-0.80.2.ebuild 1319
+RMD160 5a44edc17aa042fb1829d51ffba949952c55e4ad dbus-python-0.80.2.ebuild 1319
+SHA256 c84c24887ab42448b206be1052f2e6094696c726d778cac4e7d7a53d649d85f1 dbus-python-0.80.2.ebuild 1319
+EBUILD dbus-python-0.81.0.ebuild 1323 RMD160 aec4bd5701c3fae5f0f59162e8cf471d1b457749 SHA1 85d8b7331695837d1a1c1934f69c9145c85364a6 SHA256 4ec657254431e30ce2c4808c31327ca1f4a669a5a3731db84562eceaeff020b7
+MD5 04d0f0d8c8ca70f583ad46e03dc9e229 dbus-python-0.81.0.ebuild 1323
+RMD160 aec4bd5701c3fae5f0f59162e8cf471d1b457749 dbus-python-0.81.0.ebuild 1323
+SHA256 4ec657254431e30ce2c4808c31327ca1f4a669a5a3731db84562eceaeff020b7 dbus-python-0.81.0.ebuild 1323
+MISC ChangeLog 1946 RMD160 48f8dca0e4b5d0ddaaef59c533447a2e429764da SHA1 e98b45b101dd99b4fab892332a8b9154e249383d SHA256 2c2c0f22eadd7d64aa6bca91c432edef2ab83fb8d86c851309f2f5542db36f90
+MD5 0b4c85aedd4a7028b4cf55b180339c5a ChangeLog 1946
+RMD160 48f8dca0e4b5d0ddaaef59c533447a2e429764da ChangeLog 1946
+SHA256 2c2c0f22eadd7d64aa6bca91c432edef2ab83fb8d86c851309f2f5542db36f90 ChangeLog 1946
 MISC metadata.xml 282 RMD160 6780744b78e69d1fae59ae400753ee1cd26dd36e SHA1 695ff9872a5496c7c0f1e33b294578856810f5d7 SHA256 2d2a06940a1d457df1f9d52ddad536246f9d9aad667c1df181eda4ee2554eb2a
 MD5 86f7623410b434b3afb338ac6167e843 metadata.xml 282
 RMD160 6780744b78e69d1fae59ae400753ee1cd26dd36e metadata.xml 282
@@ -33,10 +30,3 @@ SHA256 2c16826ce5aaf6e90ae0e722673c1652f3c68cf4c657873745091c36160daac2 files/di
 MD5 85ca6c3813bff7e2cff20a612b23fdaf files/digest-dbus-python-0.81.0 256
 RMD160 322089f07bed8c08928f264a6f2d95fe8bca2871 files/digest-dbus-python-0.81.0 256
 SHA256 8d562c9b6e6074695b83379f7c77a0c4154dd139f9e4245763e3379d162ae6a9 files/digest-dbus-python-0.81.0 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGfuM5p/wUKkr7RBoRArf2AKCmdxY2BBW2Qc55zlL+/1/NODZ0CwCfaXNx
-zRWHTZXtmVCnIPxqZR2Wkzc=
-=9oYh
------END PGP SIGNATURE-----
diff --git a/dev-python/dbus-python/dbus-python-0.71.ebuild b/dev-python/dbus-python/dbus-python-0.71.ebuild
index 84292fc3d231..f9d24914cbc2 100644
--- a/dev-python/dbus-python/dbus-python-0.71.ebuild
+++ b/dev-python/dbus-python/dbus-python-0.71.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-0.71.ebuild,v 1.13 2007/05/13 07:22:45 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-0.71.ebuild,v 1.14 2007/07/06 17:32:48 hawking Exp $
 
 inherit distutils
 
@@ -19,10 +19,4 @@ RDEPEND=">=dev-lang/python-2.4
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-pkg_postrm() {
-	python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/dbus
-}
-
-pkg_postinst() {
-	python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/dbus
-}
+PYTHON_MODNAME="dbus"
diff --git a/dev-python/dbus-python/dbus-python-0.80.2.ebuild b/dev-python/dbus-python/dbus-python-0.80.2.ebuild
index 7809116f6ead..9ab7d5070075 100644
--- a/dev-python/dbus-python/dbus-python-0.80.2.ebuild
+++ b/dev-python/dbus-python/dbus-python-0.80.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-0.80.2.ebuild,v 1.11 2007/06/24 21:33:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-0.80.2.ebuild,v 1.12 2007/07/06 17:32:48 hawking Exp $
 
-inherit distutils
+inherit python multilib
 
 DESCRIPTION="Python bindings for the D-Bus messagebus."
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/DBusBindings \
@@ -22,6 +22,16 @@ DEPEND="${RDEPEND}
 	test? ( dev-python/pygobject )
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# don't run py-compile
+	sed -i \
+		-e '/if test -n "$$dlist"; then/,/else :; fi/d' \
+		dbus/Makefile.in Makefile.in || die "sed in Makefile.in failed"
+}
+
 src_compile() {
 	econf --docdir=/usr/share/doc/dbus-python-${PV} || die "econf failed"
 	emake || die "emake failed"
@@ -31,10 +41,10 @@ src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 }
 
-pkg_postrm() {
-	python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/dbus
+pkg_postinst() {
+	python_mod_optimize ${ROOT}usr/$(get_libdir)/python*/site-packages/dbus
 }
 
-pkg_postinst() {
-	python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/dbus
+pkg_postrm() {
+	python_mod_cleanup
 }
diff --git a/dev-python/dbus-python/dbus-python-0.81.0.ebuild b/dev-python/dbus-python/dbus-python-0.81.0.ebuild
index 4cab0baf9fcf..a63d1d66f3e8 100644
--- a/dev-python/dbus-python/dbus-python-0.81.0.ebuild
+++ b/dev-python/dbus-python/dbus-python-0.81.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-0.81.0.ebuild,v 1.2 2007/06/22 18:27:24 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-0.81.0.ebuild,v 1.3 2007/07/06 17:32:48 hawking Exp $
 
-inherit distutils
+inherit python multilib
 
 DESCRIPTION="Python bindings for the D-Bus messagebus."
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/DBusBindings \
@@ -22,6 +22,16 @@ DEPEND="${RDEPEND}
 	test? ( dev-python/pygobject )
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# don't run py-compile
+	sed -i \
+		-e '/if test -n "$$dlist"; then/,/else :; fi/d' \
+		dbus/Makefile.in Makefile.in || die "sed in Makefile.in failed"
+}
+
 src_compile() {
 	econf --docdir=/usr/share/doc/dbus-python-${PV} || die "econf failed"
 	emake || die "emake failed"
@@ -31,10 +41,10 @@ src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 }
 
-pkg_postrm() {
-	python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/dbus
+pkg_postinst() {
+	python_mod_optimize ${ROOT}usr/$(get_libdir)/python*/site-packages/dbus
 }
 
-pkg_postinst() {
-	python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/dbus
+pkg_postrm() {
+	python_mod_cleanup
 }