Fix pkg_postinst/postrm error when USE=-python (bug #413723, thanks to Ilya Gordeev).

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

5 files changed, 37 insertions, 25 deletions

diff --git a/app-editors/gedit-plugins/ChangeLog b/app-editors/gedit-plugins/ChangeLog
index 0c4efdb88045..75da8b73a91c 100644
--- a/app-editors/gedit-plugins/ChangeLog
+++ b/app-editors/gedit-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/gedit-plugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/ChangeLog,v 1.23 2012/04/22 23:29:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/ChangeLog,v 1.24 2012/05/02 01:36:15 tetromino Exp $
+
+  02 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gedit-plugins-2.32.0.ebuild, gedit-plugins-3.2.1-r1.ebuild,
+  gedit-plugins-3.4.0.ebuild:
+  Fix pkg_postinst/postrm error when USE=-python (bug #413723, thanks to Ilya
+  Gordeev).
 
 *gedit-plugins-3.4.0 (22 Apr 2012)
 
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index c0fb4964d2e2..02b176e93f36 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -11,19 +11,19 @@ AUX gedit-plugins-2.30.0-replace-all.patch 1305 RMD160 97e01de393390f8642398c8c6
 DIST gedit-plugins-2.32.0.tar.bz2 616927 RMD160 a7540bfd57bdc15546eea802c68719ac71f85c10 SHA1 78339867bcc159cc14ef45effc35fa52c3854ce4 SHA256 2ef7bf48e9500556d84ae4c2950f4eadcc3f9cb9c58c90f2c83956b0ddad1107
 DIST gedit-plugins-3.2.1.tar.xz 1434840 RMD160 a248bd2529bf8be93d3d9b980c4323331392b0d7 SHA1 759295aa00e8e15f4e3ee44330ca5e890d8a4b20 SHA256 45dee01a196a7d5e87027187e76d57643b146ea1c313cad2686ebd369890f841
 DIST gedit-plugins-3.4.0.tar.xz 1454320 RMD160 e90495733442a7b741424d6266226ad79e5409ba SHA1 21897d31de59489f9fe869fa4bba4b895bea4767 SHA256 a66138b43e1a77f39258f04936be35163b4c6bfd49643791ca445cb3c3d60e0a
-EBUILD gedit-plugins-2.32.0.ebuild 2255 RMD160 49f7be73274b479cacf8616e79426e73c60b549b SHA1 118eae17146236f7d0f110857ab88b555eb2d274 SHA256 82076452a6bdf38eb0a18af5c653a51747613dedf6dcb80c4f862acb4a1738f9
-EBUILD gedit-plugins-3.2.1-r1.ebuild 2636 RMD160 95b3c5a77afc1a6d09ffbbeb27ed4332658458b9 SHA1 735cb6ce9980cd0950473136f001e5723dabbbfa SHA256 fc41b4bb4d79c58d2370d14febba9da4fd62bf7117d94f478debd85b6b95c2ce
-EBUILD gedit-plugins-3.4.0.ebuild 2492 RMD160 ac3ed4b73bc384c441c9edae370b2f98545e16f5 SHA1 5ff07ecce64f749d5d9cc706f487b5bdc8de6969 SHA256 8fbfa77b71df1ad24ebcb247da571d2760f98d429ab4fd2fd8ccf845cf519bc5
-MISC ChangeLog 5005 RMD160 e35348a9bfc922648f55f0c212e37e5d24a0e2ca SHA1 7f5529895455c334438058b45a40e67cdad21d53 SHA256 24ac5857796d6ca38319a92bb98ca6368748fd4f6e334f4f8cf48eb2fafcaee9
+EBUILD gedit-plugins-2.32.0.ebuild 2295 RMD160 bce877e33c5ee7a8670a773e3c316363aa62afbc SHA1 8466751dbb38660697278310ee6abe06516821de SHA256 f8794286ebea78d63d00866de00b2ffaef9cdea8ac05898bdb4226aeeb82d683
+EBUILD gedit-plugins-3.2.1-r1.ebuild 2677 RMD160 a9e663ddef497cb5f56ef44cd0713876f94544af SHA1 5b9b746ce07352677efb34d6519fb4b1d32afe9a SHA256 d75ade2eb394ea377e06721e1e0cf3c343bbd451a58cae9dd086863f801d18f0
+EBUILD gedit-plugins-3.4.0.ebuild 2533 RMD160 591a4f44815fbe798036cb325624f0cc2e5aaf86 SHA1 f896b3fa6158578ecd5ad16068b46b7a2c11162a SHA256 1bf61ae79b0750436b9dc43380a7bed6b8226acb86fe51662ee0a8b1f7053b49
+MISC ChangeLog 5247 RMD160 d6c11b7a1228c70ffe049099e4b51df0d11f4516 SHA1 90c460e585fc4572089c3ec734b7ad349fb1182b SHA256 026f5c256ffd7d00794422c96930e3057b6b4ed34791860a85ae58fcaae48fa3
 MISC metadata.xml 482 RMD160 a9ccc9935bca24dbcb82df8cd39104186a19888d SHA1 3bc0ea8b11853ea59eec7d57716e8486709aff95 SHA256 f842b0e12beea9918cdef5f9d9aa5dd70a5bff42790692e1b873fd0b3899b7fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPlJRyAAoJEJ0WA1zPCt1hsgkIALh6hXnhGH+4x0VJ0bL3W/1w
-1F8smg175qB5GB4ArTz6z1TQhnZC0PPhEj7ViPttWR2uLtDcgskEmoZYaG1/bEvk
-4G4J34nE1b4tVgHgcAjBXejd6Ki6ZW95lvTqooN/2gpVNZENUCrxjJhvs9czt8tQ
-GxUQuP1BsyaS++MpQ9tnTNt1QAjk2LKTSncQK8iebEfpmmyVsOH3k/N0zVE094oo
-Gcy57ZarBKRV9STADJf1WEVUN01KJTapoHRtLNU9RQb/2gh8gWULxzmuhWb2qbcj
-8pGK46ycM86OTehTKO7h1iaYefh2pF5LgAGOyiwfso+Z1ee4+OnVauOr2eG4U7A=
-=BC/a
+iQEcBAEBAgAGBQJPoI+UAAoJEJ0WA1zPCt1h5XYH/3UrQ/JNALzlpkr0CEsMBbnn
+tPdXOiFuSUBfqXzkDOFEVjSz2OtMlR9MgD+ZglV+8EtfSk0TtiVKEnKvm/juXAOz
+W01kfNvWDacNezcHBDT9p4wCDz5ZY2kQiZTcUZb5xnSoDZ0rtAGZvFQhQ46hKEu0
+G57c0iTAa5K2SW2qGrTyK5xqx2Zl2iTwEEPESy2KVJgyDsAujaem0/MoYP3/CXfC
+Pm8GkqL7UtdpGdLWzYK/M5jb3MwSMewl4ecpCn6HP8KrEqrM9gH53Y5vCxllcaT+
+k66r75KSl3uO3SZkYZ3NkF9H2uqZFEJe17v6xfCe929dU3FVwxFaTetFXrZqaeI=
+=9Yk1
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gedit-plugins/gedit-plugins-2.32.0.ebuild b/app-editors/gedit-plugins/gedit-plugins-2.32.0.ebuild
index c42a27a74536..7deebadb0bec 100644
--- a/app-editors/gedit-plugins/gedit-plugins-2.32.0.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-2.32.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-2.32.0.ebuild,v 1.4 2011/10/21 13:02:47 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-2.32.0.ebuild,v 1.5 2012/05/02 01:36:15 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -77,11 +77,13 @@ src_prepare() {
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	python_need_rebuild
-	python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins
+	if use python; then
+		python_need_rebuild
+		python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins
+	fi
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/gedit-2/plugins
+	use python && python_mod_cleanup /usr/$(get_libdir)/gedit-2/plugins
 }
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.2.1-r1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.2.1-r1.ebuild
index c0bf2af9b7fd..ea9f6273f37b 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.2.1-r1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.2.1-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/app-editors/gedit-plugins/gedit-plugins-3.2.1-r1.ebuild,v 1.2 2012/01/13 17:41:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.2.1-r1.ebuild,v 1.3 2012/05/02 01:36:15 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -90,11 +90,13 @@ src_test() {
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	python_need_rebuild
-	python_mod_optimize /usr/{$(get_libdir),share}/gedit/plugins
+	if use python; then
+		python_need_rebuild
+		python_mod_optimize /usr/{$(get_libdir),share}/gedit/plugins
+	fi
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/{$(get_libdir),share}/gedit/plugins
+	use python && python_mod_cleanup /usr/{$(get_libdir),share}/gedit/plugins
 }
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.4.0.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.4.0.ebuild
index ebbc5bafede0..0539d56cd78d 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.4.0.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.4.0.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/app-editors/gedit-plugins/gedit-plugins-3.4.0.ebuild,v 1.1 2012/04/22 23:29:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.4.0.ebuild,v 1.2 2012/05/02 01:36:15 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -83,11 +83,13 @@ src_test() {
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	python_need_rebuild
-	python_mod_optimize /usr/{$(get_libdir),share}/gedit/plugins
+	if use python; then
+		python_need_rebuild
+		python_mod_optimize /usr/{$(get_libdir),share}/gedit/plugins
+	fi
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/{$(get_libdir),share}/gedit/plugins
+	use python && python_mod_cleanup /usr/{$(get_libdir),share}/gedit/plugins
 }