fix python eclass use, bug #207667

Package-Manager: portage-2.1.4.4

3 files changed, 52 insertions, 25 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index f750c8c8b8af..3ecc7df25f0e 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.116 2008/01/29 18:22:35 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.117 2008/02/24 21:02:40 eva Exp $
+
+  24 Feb 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  rhythmbox-0.11.2-r1.ebuild:
+  fix python eclass use, bug #207667
 
   29 Jan 2008; Daniel Gryniewicz <dang@gentoo.org>
   rhythmbox-0.10.1-r1.ebuild, rhythmbox-0.11.2-r1.ebuild:
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 531e722fae48..9aae6fe61876 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST rhythmbox-0.10.1.tar.bz2 3408309 RMD160 b2fdfc48aba957623ca141d45e8e1291a556bbf7 SHA1 ed20d528c24c1447a2f4597f334cd74466139d2e SHA256 a303076477a9a7b6a226613a6f3b43f4641ce977357c9aa9652932dc0b9bbd16
 DIST rhythmbox-0.11.2.tar.bz2 3536270 RMD160 8fb9c756b7b36c947cde32e3a38c85cecea73a96 SHA1 139bd8dcc046533670d1c8d167d921f9c06ae7a3 SHA256 f3dbc104831688ea6dfbf3ac807200a5c4f094d13a861f932e488992a8c89ae5
 EBUILD rhythmbox-0.10.1-r1.ebuild 3151 RMD160 4420e73a8840b397e646a82fe88bb43bcc89cd5a SHA1 c5dfb3f4ee9be4f254286bbf3d9f2be4de3950bc SHA256 749e9e86e8cf0949a817c0277e4a93826487e1a81f248ade1f6cebb9a8ab9a1d
-EBUILD rhythmbox-0.11.2-r1.ebuild 3248 RMD160 129f3a65157e6032482a07741c8ff7dce3d3c839 SHA1 85c79f2270fda93f7ae48fae27d1fb4313ac075f SHA256 aab1ef83523c415d9a5699c1713dd92a27f24ace24528ec9c4832a2589249a71
-MISC ChangeLog 16539 RMD160 9e4e8a3925b089bb5d61d413f5da9e49596a192a SHA1 cef5cc8c42888f4107f62053bac748b09d20d51b SHA256 c8c1e7dc581e30711fc0700d03c539a0ab690599a856c893c2db521955133f95
+EBUILD rhythmbox-0.11.2-r1.ebuild 3528 RMD160 ff5686883cba1e800c3b7e0b72fd2786ffe3694a SHA1 4ff0c5c0bbdb48e25302e2c61322d8f25c8a12fa SHA256 d65a3e2a8df937bf9390af0e8a542ad679b450cb3eef168f0e36ae3b8e646e67
+MISC ChangeLog 16660 RMD160 62e6e280fae4b60122506a60b21c670a1e4fda47 SHA1 a3990804216f0f2e798e7703f04ae25b3739882f SHA256 39d44a6e74b30a65d6fa94b658cf35e1ede92f1474b805c031d6dc97866a4df2
 MISC metadata.xml 200 RMD160 bca17f66c909b846452eb76b2d2c9a2eec429db0 SHA1 9d3b582b967a1030b95428758f25fe33cb5a25fd SHA256 2e1eafdbf68047687a24f6a4ad8d519ec193805e347bf17d1d00f7771353e39b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHwdt41fmVwcYIWAYRAiZpAJ9MNMXfNMRqmbMJ/a6LYq+d7ijoJACcDZ6W
+VuaYsi+D7By2b/0KIikdSSs=
+=yhz7
+-----END PGP SIGNATURE-----
diff --git a/media-sound/rhythmbox/rhythmbox-0.11.2-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.11.2-r1.ebuild
index 09de5d45be3a..59a271df8c49 100644
--- a/media-sound/rhythmbox/rhythmbox-0.11.2-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.11.2-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.11.2-r1.ebuild,v 1.4 2008/01/29 18:22:35 dang Exp $
-EAPI="1"
-
-inherit gnome2 eutils
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.11.2-r1.ebuild,v 1.5 2008/02/24 21:02:40 eva Exp $
 
 EAPI="1"
 
+inherit gnome2 eutils python
+
 DESCRIPTION="Music management and playback software for GNOME"
 HOMEPAGE="http://www.rhythmbox.org/"
 LICENSE="GPL-2"
@@ -67,29 +66,36 @@ pkg_setup() {
 		G2CONF="${G2CONF} --disable-daap"
 	fi
 
-	G2CONF="${G2CONF} \
-	$(use_enable tagwriting tag-writing) \
-	$(use_with ipod) \
-	$(use_enable ipod ipod-writing) \
-	$(use_enable musicbrainz) \
-	$(use_with dbus) \
-	$(use_enable python) \
-	$(use_enable libnotify) \
-	$(use_enable lirc) \
-	$(use_with keyring gnome-keyring)
-	--with-playback=gstreamer-0-10 \
-	--with-cd-burning
-	--enable-mmkeys \
-	--enable-audioscrobbler \
-	--enable-track-transfer \
-	--with-metadata-helper \
-	--disable-schemas-install"
+	G2CONF="${G2CONF}
+		$(use_enable tagwriting tag-writing)
+		$(use_with ipod)
+		$(use_enable ipod ipod-writing)
+		$(use_enable musicbrainz)
+		$(use_with dbus)
+		$(use_enable python)
+		$(use_enable libnotify)
+		$(use_enable lirc)
+		$(use_with keyring gnome-keyring)
+		--with-playback=gstreamer-0-10
+		--with-cd-burning
+		--enable-mmkeys
+		--enable-audioscrobbler
+		--enable-track-transfer
+		--with-metadata-helper
+		--disable-schemas-install"
 
 DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
 	  MAINTAINERS NEWS README README.iPod THANKS TODO"
 
 export GST_INSPECT=/bin/true
-USE_DESTDIR=1
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
 }
 
 src_compile() {
@@ -100,8 +106,15 @@ src_compile() {
 
 pkg_postinst() {
 	gnome2_pkg_postinst
+	use python && python_mod_optimize /usr/$(get_libdir)/rhythmbox/plugins
+
 	elog "The aac flag has been removed from rhythmbox."
 	elog "This is due to stabilization issues with any gst-bad plugins."
 	elog "Please emerge gst-plugins-bad and gst-plugins-faad to be able to play m4a files"
 	elog "See bug #159538 for more information"
 }
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	use python && python_mod_cleanup /usr/$(get_libdir)/rhythmbox/plugins
+}