Bug #316993.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/x11-libs/hippo-canvas/ChangeLog b/x11-libs/hippo-canvas/ChangeLog
index ab6621efd286d86df327fb6f4230622064c5eaf6..40d6f6139e11282df5b11667174487c00066fbf6 100644 (file)
--- a/x11-libs/hippo-canvas/ChangeLog
+++ b/x11-libs/hippo-canvas/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/hippo-canvas
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/hippo-canvas/ChangeLog,v 1.5 2010/05/22 13:45:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/hippo-canvas/ChangeLog,v 1.6 2010/05/23 21:13:45 elvanor Exp $
+
+  23 May 2010; Jean-Noël Rivasseau <elvanor@gentoo.org>
+  hippo-canvas-0.3.0-r1.ebuild:
+  Improvements for #316993.
 
   22 May 2010; Pacho Ramos <pacho@gentoo.org> hippo-canvas-0.3.0-r1.ebuild:
   stable amd64, bug 292066

diff --git a/x11-libs/hippo-canvas/Manifest b/x11-libs/hippo-canvas/Manifest
index d4eafb585555b933111cb604c4eb4694add1fc76..acf604a83352766e3db70b286734452fbcfd327b 100644 (file)
--- a/x11-libs/hippo-canvas/Manifest
+++ b/x11-libs/hippo-canvas/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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 1054 RMD160 098dd5824c8335262748ba61dcdc32ea6de43721 SHA1 fa8e7721619da8323dc0bc7c58ef3e3b3047019d SHA256 f6d9e5c8708775c4b147c42958f142151c3e3637e3c2388168bfa6b7c22296d5
+EBUILD hippo-canvas-0.3.0-r1.ebuild 1108 RMD160 589a2264c71c454bcd3a3b2c8864b7f8715e140c SHA1 9ed80a406f57121eadbfc4bbf347ef23ea601cf0 SHA256 ee94363b5b676ad6f6d4536f189d9c8d7f1474a45806e4b7041045147e7c5eb9
 EBUILD hippo-canvas-0.3.0.ebuild 767 RMD160 2729b62aae32dad7e4ef4d3a5b6bd81929bfdb4a SHA1 9d8be4890be630853900b16a45b7ba5ecc5bfdc8 SHA256 d1d007cdd87e2623e76c827f94e37baf3c1198b1f4d9102a0f7c0bb288115a1b
-MISC ChangeLog 2125 RMD160 cac07b09eb8ff54f82b86c0de4823960345e26ed SHA1 4e715ec92a735c06cddae8f5b9c738f80987c97a SHA256 940b506034c5f9a81a73d450cbd5f714912350b6cef906d2d25ff7fb586f7ac7
+MISC ChangeLog 2245 RMD160 7bc5eba6ab45736cf49a3aca6b383900e195a15c SHA1 45e103fc0b390da8ba29b5b673784796ea5d408a SHA256 cdf033d0dbc3d22f501d36ccd44079a0fdc4512203e4d32d40912154a24c5c82
 MISC metadata.xml 582 RMD160 041367dafab41c91be554984562771e01721ed85 SHA1 57407cd0157ae4a8994db0dbe4d9f9ac4421edee SHA256 0b517ba8113dbc4234f7aeff73785289f731ad60d8a3b1ab4d5642d7a9700095
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkv34AwACgkQCaWpQKGI+9T0fACfQf1v161XVb7qBxsqsIHfG/Gd
-i+YAn0UbkuWEoL8pVD7aXT618v2LHISX
-=UJxr
------END PGP SIGNATURE-----

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 7818f403e71f4bb6d82eded15a41cb3a067ff5c9..a991fa7a5b98ed31a7660b7dfae894e1fee9f3d4 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,12 +1,13 @@
 # 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.4 2010/05/22 13:45:41 pacho Exp $
+# $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 $
 
 EAPI="2"
 
 GCONF_DEBUG="no"
 G2PUNT_LA="yes"
-inherit eutils gnome2
+PYTHON_DEPEND="python? 2"
+inherit eutils gnome2 multilib python
 
 DESCRIPTION="A canvas library based on GTK+-2, Cairo, and Pango"
 HOMEPAGE="http://live.gnome.org/HippoCanvas"
@@ -22,8 +23,7 @@ RDEPEND=">=dev-libs/glib-2.6
        >=x11-libs/gtk+-2.6
        x11-libs/pango
        gnome-base/librsvg
-       python? ( dev-lang/python
-               dev-python/pycairo
+       python? ( dev-python/pycairo
                dev-python/pygtk )"
 DEPEND="${RDEPEND}
        dev-util/pkgconfig
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS README TODO"
 
 pkg_setup() {
+       python_set_active_version 2
        G2CONF="$(use_enable python)"
 }
 
@@ -46,6 +47,6 @@ src_configure() {
 
 src_install() {
        gnome2_src_install
-       rm "${D}/usr/lib/python2.6/site-packages/hippo.la"
-       rm "${D}/usr/lib/libhippocanvas-1.la"
+       rm "${D}$(python_get_sitedir)/hippo.la"
+       rm "${D}/usr/$(get_libdir)/libhippocanvas-1.la"
 }