Don't run python_mod_cleanup in pkg_postrm if python was disabled (prevents _python_check_python_pkg_setup_execution errors).

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

4 files changed, 16 insertions, 11 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index b3c0acba1def..a91cc23ced8f 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.329 2012/01/22 01:25:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.330 2012/01/22 01:34:18 tetromino Exp $
+
+  22 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  totem-2.32.0-r2.ebuild, totem-3.2.1.ebuild:
+  Don't run python_mod_cleanup in pkg_postrm if python was disabled (prevents
+  _python_check_python_pkg_setup_execution errors).
 
   22 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   totem-2.32.0-r2.ebuild:
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 747ac17deb16..109f8a22ef87 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -6,14 +6,14 @@ AUX totem-2.32.0-smclient-target-detection.patch 1546 RMD160 d26dad41d63e3ce2c81
 DIST totem-2.32.0-patches.tar.bz2 13355 RMD160 9974653c46247d37d14f441c8d6f458e2e8fbd2f SHA1 1c575377a610ca672b670107c822970f90edc356 SHA256 fdf1d04e5c2325ba5b982a4fb59b9c70bbdf018418dfc7d0fa8bd28929335a30
 DIST totem-2.32.0.tar.bz2 3278758 RMD160 5312aa67e3ff611be0626fd72da66e1c26d6eb4d SHA1 46589181aee29e021d686a4804bbbb04149a61dc SHA256 982d6aaeca3e4844694fc0a2540d792bea753e24b55cf33203188b32b5914f47
 DIST totem-3.2.1.tar.xz 3132760 RMD160 d4283ba926f57cd253ae305cd6f67b161e9ae8c8 SHA1 36370da6475652526facd8511a8be0d615058060 SHA256 e3af3281bde6666af4c7f9594b090087657b06c98e96212b11531269e2ee40a4
-EBUILD totem-2.32.0-r2.ebuild 5911 RMD160 a050a327004364eaf4e97f41b8ac8b8e288065a3 SHA1 7ff760478c7d4e717221b53597c7b570f94628c0 SHA256 2aaba9b6fbc0da3f6733aa0c7a357598f690b68ec3427b875e8ecaa87341ba3f
-EBUILD totem-3.2.1.ebuild 5039 RMD160 f99a2bd876a8839450ea1a44f266c2ecf74a6b40 SHA1 9c4e0f440d2731871880ddc4ee84aba63c720d8c SHA256 a299068ff8a2f394475326fbadd2b3833ba61834556f9276d7342fdeaa08ccae
-MISC ChangeLog 48974 RMD160 71d6f65d1390281bd4435e093d168bac474d5792 SHA1 de189eae982cef7d81f6e32834b0406e891ff4c7 SHA256 f87f89df4fd5af3574079cea5cb5045a09bb2e865bf099830a5f1ae737aee72f
+EBUILD totem-2.32.0-r2.ebuild 5926 RMD160 9943f3238018a66691f177d860b33a3ce412f00b SHA1 6a292e39e7ffe577e3ab1e47b3b72e5c52208fe7 SHA256 d6455c769d0ced73796a298227fe5e1d431c7beed49fc8818b7fa6beb52bdd09
+EBUILD totem-3.2.1.ebuild 5053 RMD160 7f18685ef985218c1e8224e52c75efc35f0e2621 SHA1 ccfef2b34d7505a75299d0653ea1cded3ded67b2 SHA256 9d5c0ddd8fecbf728a68a5442005b618727ec86d60bf4bde1cd1c7f379ae049f
+MISC ChangeLog 49210 RMD160 01a3c6dc7b5dc724e55761025812b9fa383f58d4 SHA1 aa456327f6ec676d07e4e485ab2563f2979fd8f0 SHA256 3b56bbb53d4b0baf519919859c951cdad05c7f4e1f49eb2be997f6cd33e3fbb3
 MISC metadata.xml 1677 RMD160 59d7896204f7ec816dfb328963ee5b778183444a SHA1 83e27c979fe6052f731f0fcb279cdf1079f01a9d SHA256 1d1ade7ca3b0fca0d74ae45fa77521ac58481bac8cba3345d662ecc80fd2c3d1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8bZXIACgkQdjK8w9WeBnAqGAD+Nw076j3FJ/ydDFMfA3a6Swgf
-ZtuldFAYjv2RgXD+xJEA/3wD+cexnQ9oEXvBDL4YL/dlFwT/IBJwb3FIg+AxhTXu
-=f4IH
+iF4EAREIAAYFAk8bZ6AACgkQdjK8w9WeBnC+XwD/cDgY7kucU708covqAwbg83Xl
+L9RMbIQ8IF+RGIl0hssA/26kUlQM3H1PzJFzu8HUR4S+ZOyvtdCLcLmj+3NxYYri
+=4NHE
 -----END PGP SIGNATURE-----
diff --git a/media-video/totem/totem-2.32.0-r2.ebuild b/media-video/totem/totem-2.32.0-r2.ebuild
index 9cd86c7e4402..bbee53bdc92f 100644
--- a/media-video/totem/totem-2.32.0-r2.ebuild
+++ b/media-video/totem/totem-2.32.0-r2.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-video/totem/totem-2.32.0-r2.ebuild,v 1.9 2012/01/22 01:25:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.32.0-r2.ebuild,v 1.10 2012/01/22 01:34:18 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -198,5 +198,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/totem/plugins
+	use python && python_mod_cleanup /usr/$(get_libdir)/totem/plugins
 }
diff --git a/media-video/totem/totem-3.2.1.ebuild b/media-video/totem/totem-3.2.1.ebuild
index 6e39486cc795..0921b3eb5f8e 100644
--- a/media-video/totem/totem-3.2.1.ebuild
+++ b/media-video/totem/totem-3.2.1.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-video/totem/totem-3.2.1.ebuild,v 1.2 2012/01/05 08:06:19 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.2.1.ebuild,v 1.3 2012/01/22 01:34:18 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -170,5 +170,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/totem/plugins
+	use python && python_mod_cleanup /usr/$(get_libdir)/totem/plugins
 }