remove useless die, use emake in 0.83 and add call to python_need_rebuild per bug #244560.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

6 files changed, 36 insertions, 54 deletions

diff --git a/dev-python/dbus-python/ChangeLog b/dev-python/dbus-python/ChangeLog
index 59ec9199856e..ecb3ef3e8938 100644
--- a/dev-python/dbus-python/ChangeLog
+++ b/dev-python/dbus-python/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/dbus-python
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/ChangeLog,v 1.42 2009/01/13 15:51:30 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/ChangeLog,v 1.43 2009/01/18 18:59:43 eva Exp $
+
+  18 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -dbus-python-0.71.ebuild, dbus-python-0.80.2.ebuild,
+  dbus-python-0.82.4.ebuild, dbus-python-0.83.0.ebuild:
+  remove useless die, use emake in 0.83 and add call to python_need_rebuild
+  per bug #244560.
 
   13 Jan 2009; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   gentopia is becoming freedesktop
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index bbb5aba1a391..89d4f104756d 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -1,20 +1,18 @@
 -----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.82.4.tar.gz 473346 RMD160 c934c38c7b6681aa419d005a4a73ab05ffdddac1 SHA1 6675106364c3865a38a9196e314508e7aae2f8b6 SHA256 e34e30a4c0ea405f9e830aa0026e9c0632f526f242e90526ff0a7da8dd7f5e2e
 DIST dbus-python-0.83.0.tar.gz 494281 RMD160 a0b49521199320992b83834feccaa537b61ae8e2 SHA1 c2a6edaf69b52066e8fb205ebee96a1aae141944 SHA256 89dd1d5aa5c2ba04677d1aa2616caa50274d8c08f3d6bc164e6f7b9930776191
-EBUILD dbus-python-0.71.ebuild 700 RMD160 fc0ad04cf86773cc697d865425de77e311213cf4 SHA1 228c09f51330205ed22f6b30fac1baef24115b2a SHA256 1912615e29c2b456bd1d85461f43af8dad6d3d1bb82aff2fc46f09ee837f4490
-EBUILD dbus-python-0.80.2.ebuild 1348 RMD160 a51d0b367857b8656d7e08352d8a59028d0f1d5f SHA1 f4f94be248c7b1fb41b21838aeefc72b4b520dfa SHA256 a74bc521f7b3c35eadb42c49e282b407e50042a1301276e2049ae2c5ad91b104
-EBUILD dbus-python-0.82.4.ebuild 1312 RMD160 bc099336db0e7f5aa56b7244df3edcc476011d96 SHA1 5a918a8b41eca6da5537a332f24e2c8018e4fb3e SHA256 64c300adc11aad3d7931d954cdd7b812cc997e0562ce8ec178e9ebc824ecf4cf
-EBUILD dbus-python-0.83.0.ebuild 1323 RMD160 fcea90a6eca8c078931815e8e2c6a7c680f46b6a SHA1 966c8e2537266c0ed0800edec7e4e7770ef49030 SHA256 51db3a2a1174db5d14c3c12cf5cf9de1232e9bde7b482b03b198bcf52483f286
-MISC ChangeLog 4231 RMD160 6d51d7af0e1b317ddc95099fdf2c0576afe4230b SHA1 38cb81f8c30b217bc36e23d5b1d6ba3406b34113 SHA256 925cfab803f26057e1e7413f1567a8e3c87186b14f49ca9165da05f0d91fc254
+EBUILD dbus-python-0.80.2.ebuild 1302 RMD160 7e96e6b4e8ae6b5c8593e752a3a010df3321ed70 SHA1 9bcd885a322b4156518e2d761a366db2b57fd27d SHA256 2e5196be3453f31ab7e5587f3860ba24d48464faac0302347fb2bf7c1c3df052
+EBUILD dbus-python-0.82.4.ebuild 1284 RMD160 2679f29a22f507311e7d6c971f59afbe3a416e23 SHA1 b653cf11337704b0302066a464de9eda0361471c SHA256 89ae023f9186432213f2cf29b1fb5579ed5d50e9c6f6472c0767957c7827bc7e
+EBUILD dbus-python-0.83.0.ebuild 1296 RMD160 e5910b7de34349d748b22c459491194273a6520d SHA1 bc591263f801004b5812cca10874e9924dcae2aa SHA256 c8656fc5577d889e53b582600cd359074fdfa43740ddc5e2b3a10267ba972b17
+MISC ChangeLog 4489 RMD160 f8756b8e9e5d03260d8204e3b2c292beb0be912d SHA1 c2f76d4b3a60a1fa61afd3091365e2a737e79526 SHA256 5ab074aa9f8b749137b09798c0f844c4c84f9357c4ccc928ff0936461e36e053
 MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklsuIcACgkQoeSe8B0zEfwyiACcCvjLIZ0H4qNTtDDc4rm64/iD
-M2oAnjbI7kCBVLm7kgQdI7UTKLnHKAKV
-=etUg
+iEYEARECAAYFAklzfCQACgkQ1fmVwcYIWAYnpQCfcCzRU05jn1TlxyurZN+vPehV
++AkAoOGCqCDYku/mW6rMdrPAz05OPSgF
+=hBCe
 -----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
deleted file mode 100644
index f9d24914cbc2..000000000000
--- a/dev-python/dbus-python/dbus-python-0.71.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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.14 2007/07/06 17:32:48 hawking Exp $
-
-inherit distutils
-
-DESCRIPTION="Python bindings for the D-Bus messagebus"
-HOMEPAGE="http://dbus.freedesktop.org/"
-SRC_URI="http://dbus.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 AFL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-RDEPEND=">=dev-lang/python-2.4
-	>=dev-python/pyrex-0.9.3-r2
-	>=dev-libs/dbus-glib-0.71
-	>=sys-apps/dbus-0.91"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-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 83ee04fea0c5..00da7341eafa 100644
--- a/dev-python/dbus-python/dbus-python-0.80.2.ebuild
+++ b/dev-python/dbus-python/dbus-python-0.80.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.14 2008/05/29 16:09:46 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-0.80.2.ebuild,v 1.15 2009/01/18 18:59:43 eva Exp $
 
 inherit python multilib
 
@@ -27,14 +27,13 @@ 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"
+	# disable pyc compiling
+	mv "${S}"/py-compile "${S}"/py-compile.orig
+	ln -s $(type -P true) "${S}"/py-compile
 }
 
 src_compile() {
-	econf --docdir=/usr/share/doc/dbus-python-${PV} || die "econf failed"
+	econf --docdir=/usr/share/doc/dbus-python-${PV}
 	emake || die "emake failed"
 }
 
@@ -44,6 +43,7 @@ src_install() {
 
 pkg_postinst() {
 	python_version
+	python_need_rebuild
 	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/dbus
 }
 
diff --git a/dev-python/dbus-python/dbus-python-0.82.4.ebuild b/dev-python/dbus-python/dbus-python-0.82.4.ebuild
index db68029ec537..c952f6f490d6 100644
--- a/dev-python/dbus-python/dbus-python-0.82.4.ebuild
+++ b/dev-python/dbus-python/dbus-python-0.82.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.82.4.ebuild,v 1.11 2008/11/09 11:59:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-0.82.4.ebuild,v 1.12 2009/01/18 18:59:43 eva Exp $
 
 inherit python multilib
 
@@ -27,14 +27,13 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# don't run py-compile
-	sed -i \
-		-e '/if test -n "$$dlist"; then/,/else :; fi/d' \
-		Makefile.in || die "sed in Makefile.in failed"
+	# disable pyc compiling
+	mv "${S}"/py-compile "${S}"/py-compile.orig
+	ln -s $(type -P true) "${S}"/py-compile
 }
 
 src_compile() {
-	econf --docdir=/usr/share/doc/dbus-python-${PV} || die "econf failed"
+	econf --docdir=/usr/share/doc/dbus-python-${PV}
 	emake || die "emake failed"
 }
 
@@ -44,6 +43,7 @@ src_install() {
 
 pkg_postinst() {
 	python_version
+	python_need_rebuild
 	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/dbus
 }
 
diff --git a/dev-python/dbus-python/dbus-python-0.83.0.ebuild b/dev-python/dbus-python/dbus-python-0.83.0.ebuild
index 2339b1392fc5..fd0b03d99d93 100644
--- a/dev-python/dbus-python/dbus-python-0.83.0.ebuild
+++ b/dev-python/dbus-python/dbus-python-0.83.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.83.0.ebuild,v 1.1 2008/08/15 04:10:20 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dbus-python/dbus-python-0.83.0.ebuild,v 1.2 2009/01/18 18:59:43 eva Exp $
 
 inherit python multilib
 
@@ -27,23 +27,23 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# don't run py-compile
-	sed -i \
-		-e '/if test -n "$$dlist"; then/,/else :; fi/d' \
-		Makefile.in || die "sed in Makefile.in failed"
+	# disable pyc compiling
+	mv "${S}"/py-compile "${S}"/py-compile.orig
+	ln -s $(type -P true) "${S}"/py-compile
 }
 
 src_compile() {
-	econf --docdir=/usr/share/doc/dbus-python-${PV} || die "econf failed"
+	econf --docdir=/usr/share/doc/dbus-python-${PV}
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 }
 
 pkg_postinst() {
 	python_version
+	python_need_rebuild
 	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/dbus
 }