Do not call python.eclass functions when USE=-python (bug #447916, thanks to MJJoker).

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 33 insertions, 28 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index eb6da98c9613..6fa8edf27a06 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.226 2012/12/18 17:51:39 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.227 2012/12/20 15:58:46 tetromino Exp $
+
+  20 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  rhythmbox-0.12.8-r1.ebuild, rhythmbox-0.13.3.ebuild, rhythmbox-2.97.ebuild,
+  rhythmbox-2.98.ebuild:
+  Do not call python.eclass functions when USE=-python (bug #447916, thanks to
+  MJJoker).
 
   18 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   rhythmbox-0.12.8-r1.ebuild, rhythmbox-0.13.3.ebuild, rhythmbox-2.97.ebuild:
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 45c9c5273195..09e9e24920fb 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -7,24 +7,24 @@ AUX rhythmbox-0.12.8-namespace-conflict.patch 2155 SHA256 538b36af3824aa45b215b2
 AUX rhythmbox-2.95-fix-db-dbus-interface.patch 2044 SHA256 453a22767e3d8512bc99e9a1c0a5f93718a724c4fd04d2259ffe27f50bcf1a5e SHA512 4918d056ba4e6fdc0eeae5898ee3fdc5ab03d63457b9f9ece3aae3e3262ba73534e75dc78e040a5a5186f67ec5345a7951fc5b302127ed8c11e37bc1b5db22df WHIRLPOOL d5ec5432540936c78b5ffacc16ffad04846d0908ef01adcaf19112659eeb169c472df8a39e4716ebb64c2603466bce963811f3893afdf49ca758ca4045eff473
 AUX rhythmbox-2.95-port-im-status-plugin.patch 9115 SHA256 a2c291af6e6a0941f7868de6a5bc4bc9e2b529718a5cb7cfb70e711d5278c98a SHA512 5c4465e8fccae0efd8107baeb11d3f7172150354867327f2cefd637263707c42cc401a19f1aaedb324c37eab3977d6533880c70a88d0631e8370c35eac9b603f WHIRLPOOL 4cc11bd06ec02bbc6e90296600389d758ba9542c41e18764c49179f7614d699b68ecbc4a802782faa3dfe060aa8df8268a427bade5eb96e08c72832b08c08f20
 AUX rhythmbox-2.95-port-rb-set-rating-py-example.patch 1462 SHA256 044727d28e8552e019be9fa9fa11462a833dd2cd4485e7319cc4afbd9dbe902f SHA512 d70ecf77d4eb4b2031c3d61b399089f44229bbf528caa8e5fbb0a29f789bc6d0db0d27d71b0e1628bb176c256da459d6a21bb4d2dff13c3aff9c68d7ca680e64 WHIRLPOOL a9338b3d13c85fea7956dd71e2a020b31428e3de1157301779b813ece929fb389f0c1008920b7428b7ce162b1b9b23e06c6245ee73f29a3113f902cefeb53565
-DIST rhythmbox-0.12.8.tar.bz2 5358950 SHA256 1752fab135808aa78a9afde78448e992020c58c07701f43c989fbabfc6352213
+DIST rhythmbox-0.12.8.tar.bz2 5358950 SHA256 1752fab135808aa78a9afde78448e992020c58c07701f43c989fbabfc6352213 SHA512 12a462086724ceb19f037f9b10dcf87d81f1c948b6ce27416d37e1b700e4c2a226e18b8ae05550587dd5bcb79e2824836f100fa6901a0b13ccc560bcafbbcae1 WHIRLPOOL 23a002621c9c6e4a49fbe865f0eecebbacea9ca3de18f3db98bb3fd849cbdb95438b2e348a0fffa0781eced2ec52e9b0bd0e78000595e3ca766b99e9ad839e99
 DIST rhythmbox-0.13.3.tar.bz2 9978135 SHA256 ad6532864bb4df30f1014ec81ddc0d2d3f69241235627f46abe5578cf629052a SHA512 a38edfb87473c6ea8088b5662d39b95e74f6c3166dc3c3c1d6417b62b1d3e27662143fd9f7a3aeebea096e54058d178c38ba3be89e3bc24d10f2903e3719417e WHIRLPOOL db4fb3073de17d884f3a6fb7f55666673d48316f1aa6a00e9f8a05349f4569606a7bbaf14e15826659e27890f538e9c92a2090f37d1364d74f127ce09e6ee819
 DIST rhythmbox-2.97.tar.xz 6027128 SHA256 b52567cf45bf13c0452593da7f907920bd4cf31916ca8dcd15d555336b4947e4 SHA512 0bc7869a32a3df91952583ac71aba3e967f9b1f6d38ee717dcd9d6d8f9837fec53985cd44dcdd60aa3f6db573903922e770c7e20af41385f7321a52e680db534 WHIRLPOOL 314071a0f2e6c3a5569237b7b817c4e9ab0fef48bd83424652ff53dc924074c0ed883c46bd4f8600cbe310196d22fdf2fd70bea6a8bac847290147cac6f56658
 DIST rhythmbox-2.98.tar.xz 5945988 SHA256 a5c0a18a7c76133d36c7dcbdc37e304eae8272703985b17b540d68603b0c76d5 SHA512 f2bafd858694e5b5f1c87da26d7232fb02d923020375b83ac90f091101ede52d646c3a71b0759d1b2630363391d5e764b520a25a17d22df743975ba973b7a111 WHIRLPOOL 23d4b2b43888bf503b99ddeef2595908647739bbd85b34d80b9a0ea74a4c539f4e588815a54919a85a57047c6f9b44dc896a9a31e2a4214816067d68dbf5f282
-EBUILD rhythmbox-0.12.8-r1.ebuild 5073 SHA256 c7fbf2629fb6ec96d4520fe4ec3d7dd50e7ba5bde82dd17ef5ca052cdabd9d0c SHA512 f5966fc2f3c97e36b3aa70d2afacc19d362b1b068d13d5cb86c5fc8cb2c1dfc26cf22b2adc9538ce929dd412521007248d6ffec659ece76d0a74d7652a808d90 WHIRLPOOL b226029771cf3d90420f554627e8ed4e9a038427d650405335552c4ab797a93b468a2bba13b384680c04af8a70790e96100671c3174924133dd21806d21fdeda
-EBUILD rhythmbox-0.13.3.ebuild 4860 SHA256 1de88a6e2f7a1363249646be993a347f4b705638bb8cd1241f179aea9f69b1fa SHA512 853b5e404ff02ed24f4882817938d0fd18c2c0af4413e2be3259954241b796bf9b29ba883dcf009ff0f86c2fe7e4a8cdc30e2e9291aa1d47d78449176e5cbe9e WHIRLPOOL 0b53a6b0e56455df0d1eb13b08654bc14cdbaf647aa264ed90791f8ed849560a1a8a2985d2dd031fd40f5a106903de7ff37e0a7a771eba8357d418935ddea059
-EBUILD rhythmbox-2.97.ebuild 4678 SHA256 27f151835d590dc5e658aa7ef2d6db9edf0b4e3de31e7865edcca84613c342b3 SHA512 f47aff967f37d31d1524720a93117223d77f6f809091be5379998ee3594b0d068fc04d131cc82592791e1890809f99bde43522bf9020fc797e791f7e791e8dff WHIRLPOOL d0fb4f74ab3a56549313e204edce464a4741e7c4ff03b1d3921deb44bc0323ebd61ce9806de59e5d5272eeb8387769bb0fc3eb91d5abed2a0dc34c052c345c89
-EBUILD rhythmbox-2.98.ebuild 4594 SHA256 a592c1135cb35d6fce1bea59ab966adb6c3c29bbb57dc5ef552a1f1b4871fef4 SHA512 38546842efec2d996406a48873f2cc4264a5d3b4fd59f5176194be3295397103b987f341b134e5c1556bb4872dff2f0db1b118fc9d8032852687b0e475e68844 WHIRLPOOL cb92fe6fc772030e4f1f9742d944ca7644a510ceed74a48c14072f263d44d94e26336b10091ae6ba97286e7aa10f55949c50511b845771eb922b6b35640329d3
-MISC ChangeLog 36039 SHA256 f75f221a78fff31e1a1a77fa08ddb4309eb127c57beeced341882d91c640faad SHA512 957cda4ff6696a7fcf8ebdea84ba560a155d46c059a6a34c3f33289f33fb06da9425901beaa8c704c50de8a63cf05f7ce41c4866a4ac6140a6accb142bae777e WHIRLPOOL 88250283fbafc79d3e102ba48b17c247f4d1fa4dc4374e823f3389df3d685a61475dcb93c3cccd18d771e20f6f2bc21916adbc3ba7c77467d491df24a944a220
+EBUILD rhythmbox-0.12.8-r1.ebuild 5085 SHA256 9796175a12654c07ebbbeec0893e8d661d740d453a4c6201ffa6873a86626151 SHA512 3a6ade1f61e76c5d540dcfed8680650a717e663970ecc33b973ad6d3dbc65412e957d4b36020d9c68764c925d40c7d6a2b33182501566445de30225f8f5f1d09 WHIRLPOOL dbf012ae18e1dc3ad98ba4ac66f16e3f4138f5fdcf54adbbfbbcff10e61751bd67f02199585323f4dcf5145da7508c319f2b31700f262778c87e4ecf3b45316f
+EBUILD rhythmbox-0.13.3.ebuild 4860 SHA256 9eb0a76104cb59c802dd8a9827509dbe7f6cb0c22b820e1b5e3d2b6841f043da SHA512 8c4ff7d5c9a81dacf5066aa44c61d871f3e98fe6b3741f2cda14905f3890ef3034e788a3bdd75522d03abee88a6c150411740a048325ffb93707894e75dcc616 WHIRLPOOL 21d450f87132529c5f333470461ee78ea510a463da4526b6ff5fc4b90536429f6a2b29bcf6ce50325fd8c422db35143535f32987533bf954bd123d0867ce4002
+EBUILD rhythmbox-2.97.ebuild 4718 SHA256 f49f6b897e413b9010d8b4491ad0445a7086a8a6fa51bf799da06a988b028f96 SHA512 c8909356012605877fef760b5c7e903e267330a27fa703741e8adefe521964d5b1090a9f07cc49725e068a389e190b215352ba2bc745be8333c50b76c5cf6946 WHIRLPOOL 4ed9292ffc4c6d9446caaf5ed2596043f6fd5bb80decdf6149c2ad5c882afa6247546cf6ff90ec88bf5e62ad7643af8c183b5cce5c485a34ff6aa5e2b52193a1
+EBUILD rhythmbox-2.98.ebuild 4622 SHA256 c86e395c277b9a4daa1fd8cd61acfb8774f0fdaecfea23a5636d6494fecf047c SHA512 b826421e05260ca04b574c7df03a3dd230a22dedac2a04c011cb16f83b48f7e317b26f07480186c52a2d66ee98ca98e2fa28f49c458b191f56a58e2557bd06a5 WHIRLPOOL d89366f68ddd1f01f5944a98af19e9b79e33a2b0ba2e2a1edb4d224723485f5da169dda088ac93ffe3f8ef537d8ab65af44ef1c0dc6ae6d5983953438971420d
+MISC ChangeLog 36293 SHA256 5ff894282656ee7dd95cd96621a83d8a6b3e417282cefa5b7bf5bfe30ee4495b SHA512 76abc9a10bf6d2e5021ac68b670f70b3a2e199d319cc677a0e87f026309c72875132f45bda09fac5020f61e29819473ef541347a626453592772d806d7778dfd WHIRLPOOL a47a5c9402267bcf6a5fbe6efdca1e300cf38fe3210be616643fb1f2dd69f21bdd259ac4b78bb7251966c24fcf5ffa4eefa4b50af3eb1c03071545f37285028f
 MISC metadata.xml 786 SHA256 f08c2066e0f23e0c8990023c59d0d871bbecd9d8eb6281fa03b7474df5c64b34 SHA512 d19863ac9a7ad2fb1d2ffa87c16d6719d289ef8cbdd82281a041faf2f02eaf7a3fbb3c6a412cc18cf064fdd011f5376d42b61a366a105f881107c7b3e90b9c9f WHIRLPOOL fade3e98d12a79ac4d2716044a7be7464af1b15e940d06492f1dade1b7aeea0d2683f0f72fb80f7de8f9c9174b3b359002f09b671e3705f1a31cec2c3fc65409
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ0K0tAAoJEJ0WA1zPCt1hzCIH/ii4Ssib6A3JXPTZB9iuth3c
-4keFlMYxR8Rv1Sdvs27YP9QYSiEidKVAQ7rYHpZ9xs/vaeKIAoxgTr8dPk1z7Uxc
-pkp6UItuauKDx69cqxJhoZzqvfj7MgVPBAprJf1nansfTP9++dPexT6POsryCQaY
-LpHbj8dlLPpWOa7+h8SO/7dpYBDlyT8G7xurqQxF8ly4n9hH6EcQiL9He5ZyI28X
-JbKHTduUM2nJze0h0dzq+2Yj23c51eLqAwLx5PPRrUrS7PZRNqvUl4/gAq3dxkHk
-e8n7tkAi1lyDXyOAywrBYtNBxrX2VpmYQCdlGcDFqO9+4DvywGVSs6UR+ZU2KZ4=
-=Tri0
+iQEcBAEBCAAGBQJQ0zW3AAoJEJ0WA1zPCt1hlPQIAIgKXzNRVB3ljVJGv9nz5sh0
+fouU20qBHKNGPyuxOzdtLQdvswFzIBUBKanGT9LwYTJiI+IkAvaijZ7uw1z8rdv4
+CNc0okJ7/RtzkeDGLx8sYYvQtVezx/atoQRvcS7/MNh7XPHKaq1RyBQwegZbiwEF
+M1tQYfPvf8UEnS2UZb4YwDOYSfCM7ClLHRrQPcSDH/Ox4A/HO918h7iY6iO83pqX
+Iyjj7kyGMmp3GUmrbcpP6ETDiUPBrxTm4M5SrjC7lvsshMfbgIS39dInIUCg9D6R
+9dJgzOJ2fcksXpy4J7bpoIu0yOr1rah/fGDnFZjPl355Q2rKVWJufPVkupPUXCo=
+=8nA4
 -----END PGP SIGNATURE-----
diff --git a/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
index 7d74cc6c6de7..8bf361f096a3 100644
--- a/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.25 2012/12/18 17:51:39 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.26 2012/12/20 15:58:46 tetromino Exp $
 
 EAPI="4"
 GNOME_TARBALL_SUFFIX="bz2"
@@ -148,15 +148,16 @@ src_prepare() {
 
 	gnome2_src_prepare
 
-	python_clean_py-compile_files
-
 	# Fix python initialization problems, bug #318333
 	epatch "${FILESDIR}/${PN}-0.12-python-initialization.patch"
 
 	# Fix building with recent glibc, bug #333373
 	epatch "${FILESDIR}/${P}-namespace-conflict.patch"
 
-	use python && python_convert_shebangs -r 2 .
+	if use python; then
+		python_convert_shebangs -r 2 .
+		python_clean_py-compile_files
+	fi
 }
 
 src_compile() {
diff --git a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild b/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
index 1513f4d085d6..857ae338bd10 100644
--- a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild,v 1.13 2012/12/18 17:51:39 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild,v 1.14 2012/12/20 15:58:46 tetromino Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -148,9 +148,7 @@ pkg_setup() {
 
 src_prepare() {
 	gnome2_src_prepare
-
-	# disable pyc compiling
-	echo > py-compile
+	use python && python_clean_py-compile_files
 }
 
 src_compile() {
diff --git a/media-sound/rhythmbox/rhythmbox-2.97.ebuild b/media-sound/rhythmbox/rhythmbox-2.97.ebuild
index 80d1cd82b69e..c0b93811b7df 100644
--- a/media-sound/rhythmbox/rhythmbox-2.97.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-2.97.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.97.ebuild,v 1.6 2012/12/18 17:51:39 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.97.ebuild,v 1.7 2012/12/20 15:58:46 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -142,7 +142,7 @@ pkg_setup() {
 
 src_prepare() {
 	gnome2_src_prepare
-	echo > py-compile
+	use python && python_clean_py-compile_files
 }
 
 src_test() {
@@ -166,5 +166,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/rhythmbox/plugins
+	use python && python_mod_cleanup /usr/$(get_libdir)/rhythmbox/plugins
 }
diff --git a/media-sound/rhythmbox/rhythmbox-2.98.ebuild b/media-sound/rhythmbox/rhythmbox-2.98.ebuild
index 02b4a6c6b351..ddfd9e59f0dc 100644
--- a/media-sound/rhythmbox/rhythmbox-2.98.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-2.98.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.98.ebuild,v 1.3 2012/12/15 18:43:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-2.98.ebuild,v 1.4 2012/12/20 15:58:46 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -146,7 +146,7 @@ src_configure() {
 
 src_prepare() {
 	gnome2_src_prepare
-	python_clean_py-compile_files
+	use python && python_clean_py-compile_files
 }
 
 src_test() {
@@ -170,5 +170,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/rhythmbox/plugins
+	use python && python_mod_cleanup /usr/$(get_libdir)/rhythmbox/plugins
 }