Call Python-specific functions only when "python" USE flag is enabled.

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/x11-libs/hippo-canvas/Manifest b/x11-libs/hippo-canvas/Manifest
index acf604a83352766e3db70b286734452fbcfd327b..825ac5fe8330ed9eb57b292a694fedfea5627e33 100644 (file)
--- a/x11-libs/hippo-canvas/Manifest
+++ b/x11-libs/hippo-canvas/Manifest
@@ -1,6 +1,6 @@
 AUX hippo-canvas-python-override.patch 349 RMD160 4ea0179de43e270fef27ec1d9b8ba701e17f8e08 SHA1 d8fa18a04b6b57402bc4a2e2d281781d97665f28 SHA256 6c251e142c0cb591e27c0637f3a521f62b5664c1d709021c74683fd3f4af241e
 DIST hippo-canvas-0.3.0.tar.bz2 376859 RMD160 05a3efbc568d900c43be97cf1d2f8759ad60cfc5 SHA1 840c8d1e45ee48a4804b80704d2639bf2eca9da1 SHA256 21d0f3f7eb1c448fd6eaec1979b1474011b541249edaaab6e1dfb772ac8eb514
-EBUILD hippo-canvas-0.3.0-r1.ebuild 1108 RMD160 589a2264c71c454bcd3a3b2c8864b7f8715e140c SHA1 9ed80a406f57121eadbfc4bbf347ef23ea601cf0 SHA256 ee94363b5b676ad6f6d4536f189d9c8d7f1474a45806e4b7041045147e7c5eb9
+EBUILD hippo-canvas-0.3.0-r1.ebuild 1153 RMD160 beeaf234648c6a834929929f761bd30e4c9434f9 SHA1 eb4bbd0cb1a40e712375f4bb80b23df871d6c30b SHA256 a03fa96c161974a88f98fcc847a1e5c25464b532b02ce12a2f4e87daf6a4b7aa
 EBUILD hippo-canvas-0.3.0.ebuild 767 RMD160 2729b62aae32dad7e4ef4d3a5b6bd81929bfdb4a SHA1 9d8be4890be630853900b16a45b7ba5ecc5bfdc8 SHA256 d1d007cdd87e2623e76c827f94e37baf3c1198b1f4d9102a0f7c0bb288115a1b
 MISC ChangeLog 2245 RMD160 7bc5eba6ab45736cf49a3aca6b383900e195a15c SHA1 45e103fc0b390da8ba29b5b673784796ea5d408a SHA256 cdf033d0dbc3d22f501d36ccd44079a0fdc4512203e4d32d40912154a24c5c82
 MISC metadata.xml 582 RMD160 041367dafab41c91be554984562771e01721ed85 SHA1 57407cd0157ae4a8994db0dbe4d9f9ac4421edee SHA256 0b517ba8113dbc4234f7aeff73785289f731ad60d8a3b1ab4d5642d7a9700095

diff --git a/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r1.ebuild b/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r1.ebuild
index a991fa7a5b98ed31a7660b7dfae894e1fee9f3d4..2a8f82e1c584e8a2e42d1e745335d005e6bad49d 100644 (file)
--- a/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r1.ebuild
+++ b/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r1.ebuild,v 1.5 2010/05/23 21:13:45 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r1.ebuild,v 1.6 2010/05/24 17:16:51 arfrever Exp $
 
 EAPI="2"
 
@@ -32,7 +32,9 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS README TODO"
 
 pkg_setup() {
-       python_set_active_version 2
+       if use python; then
+               python_set_active_version 2
+       fi
        G2CONF="$(use_enable python)"
 }
 
@@ -47,6 +49,8 @@ src_configure() {
 
 src_install() {
        gnome2_src_install
-       rm "${D}$(python_get_sitedir)/hippo.la"
+       if use python; then
+               python_clean_installation_image
+       fi
        rm "${D}/usr/$(get_libdir)/libhippocanvas-1.la"
 }