fix python eclass use, bug #207667

Package-Manager: portage-2.1.4.4

diff --git a/gnome-extra/libgsf/ChangeLog b/gnome-extra/libgsf/ChangeLog
index 3915177d154c34ed28b1dc224316e7aeae934e5f..934a8f07091a900dd7d6b040b4e88dd4c61e1578 100644 (file)
--- a/gnome-extra/libgsf/ChangeLog
+++ b/gnome-extra/libgsf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/libgsf
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.114 2008/01/30 16:02:59 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.115 2008/02/17 22:45:15 eva Exp $
+
+  17 Feb 2008; Gilles Dartiguelongue <eva@gentoo.org> libgsf-1.14.7.ebuild:
+  fix python eclass use, bug #207667
 
   30 Jan 2008; Daniel Gryniewicz <dang@gentoo.org> libgsf-1.14.7.ebuild:
   Fix imagemagick circular dep; bug #206491

diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index 7954f013088cb9763d1f75b5914905c7f544d372..8a3dc9880c54cadfcfdb28d1db8e4bb58995f1df 100644 (file)
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 DIST libgsf-1.14.3.tar.bz2 543791 RMD160 b575e55b23152c292ae6d67f906bccd95ca89030 SHA1 c0bfc3595a47d8425afcee7a90352c179677c452 SHA256 906139a86ddadc125d5ade3ebbbd0f2bf0749f12e08592157e4228cd17d318e4
 DIST libgsf-1.14.7.tar.bz2 585860 RMD160 09e2d07c922e6f43868dabbcfa2af2021ca5707a SHA1 9950e42db36007591af2d5783bdf68dc73f47d1b SHA256 182e442630d5a1acae3852539b52f3343f6b6c7ba2b2d4b8c7636da56456a86d
 EBUILD libgsf-1.14.3.ebuild 2121 RMD160 1788af66a92dcca6213b0d0b9e80885b28e2d41e SHA1 f8ef63430179c7f5a5639ed74048c0593a7ea93b SHA256 3d84f593e16f2e48e6e1cb329067624561683c49526e69a2bea11900f7bb2c26
-EBUILD libgsf-1.14.7.ebuild 1760 RMD160 f2a6783369695055bad684fe4b1ec06d7c9ed60a SHA1 b88a505f6fe2a7513a9842c2357ec087bca1ea9c SHA256 14ff5333a8c5866e61398bdb2b7e3150df73f088328e1989cec6bed5ba8689c4
-MISC ChangeLog 13635 RMD160 d7952a199aef640422bb5887067218e1c66a4a4b SHA1 b3ce7bb21b132b962e5d70a448b63cb42570b507 SHA256 5679ad71a8a43eeb9056f222ffc17cbe46ff6cd2343f12e170ae6d567f30137e
+EBUILD libgsf-1.14.7.ebuild 1965 RMD160 3d7e9c3d46fd391e7c68745f3a7f9d75ea15f6d8 SHA1 1f666e441194d1b8b3252ce0aa39ffadf2283a51 SHA256 687b5b9d52b14164d56222ec2f145548bc7541de114635f65c28033c44092a1c
+MISC ChangeLog 13748 RMD160 c7d53eb71cb8daca2933a9efbb4333708de566b1 SHA1 43974fd3414b7f524e3dc4597f13d6d694a3787e SHA256 7672fb65b25d180304642008d93f28b254b90d1535ad4b974a55de957aa5f6b4
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkejtioACgkQkeYb6olFHJcdqQCg/xO7GmwhY/Tc6QyBT6809wuo
-5P8AoK52cefYqT1SYjMEBSfUCEsjPVs3
-=To9o
+iD8DBQFHuLkC1fmVwcYIWAYRAiztAJ4+7sx8al5u2qe1DvvYhhVJHlFZywCdFt6F
+UXDx2Zn/ZzOu185RvEgcVVQ=
+=JnEa
 -----END PGP SIGNATURE-----

diff --git a/gnome-extra/libgsf/libgsf-1.14.7.ebuild b/gnome-extra/libgsf/libgsf-1.14.7.ebuild
index e5b5bc57c5a5cc386354b274e82d1faab8b9143d..1ecf9615b9e3bc5b043b1910c3a805de818226aa 100644 (file)
--- a/gnome-extra/libgsf/libgsf-1.14.7.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.7.ebuild,v 1.8 2008/01/30 16:02:59 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.7.ebuild,v 1.9 2008/02/17 22:45:15 eva Exp $
 
 inherit eutils gnome2 python multilib
 
@@ -30,13 +30,23 @@ DEPEND="${RDEPEND}
 
 PDEPEND="gnome? ( media-gfx/imagemagick )"
 
-G2CONF="${G2CONF} \
-       $(use_with bzip2 bz2) \
-       $(use_with gnome) \
-       $(use_with python)"
-
 DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
 
+pkg_setup() {
+       G2CONF="${G2CONF}
+               $(use_with bzip2 bz2)
+               $(use_with gnome)
+               $(use_with python)"
+}
+
+src_unpack() {
+       gnome2_src_unpack
+
+       # disable pyc compiling
+       mv py-compile py-compile.orig
+       ln -s $(type -P true) py-compile
+}
+
 pkg_preinst() {
        preserve_old_lib /usr/$(get_libdir)/libgsf-1.so.1
        preserve_old_lib /usr/$(get_libdir)/libgsf-gnome-1.so.1
@@ -46,7 +56,10 @@ pkg_preinst() {
 
 pkg_postinst() {
        gnome2_pkg_postinst
-       use python && python_mod_optimize "${ROOT}"usr/$(get_libdir)/python*/site-packages/gsf
+       if use python; then
+               python_version
+               python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/gsf
+       fi
 
        preserve_old_lib_notify /usr/$(get_libdir)/libgsf-1.so.1
        preserve_old_lib_notify /usr/$(get_libdir)/libgsf-gnome-1.so.1
@@ -56,5 +69,8 @@ pkg_postinst() {
 
 pkg_postrm() {
        gnome2_pkg_postrm
-       use python && python_mod_cleanup "${ROOT}"usr/$(get_libdir)/python*/site-packages/gsf
+       if use python; then
+               python_version
+               python_mod_cleanup "${ROOT}"usr/$(get_libdir)/python${PYVER}/site-packages/gsf
+       fi
 }