* fix python eclass use, bug #207667

Package-Manager: portage-2.1.4.1

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index 37891af2ceca04a17aebbfc1764039d21713e7f2..6c90308f0593fde42339ece3f402b48752afedfe 100644 (file)
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.254 2008/02/04 04:50:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.255 2008/02/11 22:57:56 eva Exp $
+
+  11 Feb 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-applets-2.20.1.ebuild:
+  fix python eclass use, bug #207667
 
   04 Feb 2008; Jeroen Roovers <jer@gentoo.org> gnome-applets-2.20.1.ebuild:
   Stable for HPPA (bug #208366).

diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index 8ef545a3632c676d74a57d59f31a82c7ba043da5..e5860a525ba3d2921b93107d334f925f47223f8c 100644 (file)
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-applets-2.18.0-acpi-procfs.patch 3883 RMD160 751021e9ff5c587f2c199d9cb4f8a04f985b9448 SHA1 10017b8ab2822195e9a84187a2f3b527d6dbb26c SHA256 1918684dc294bd1c3a398e660860248a13a8b209cf6274af4d03419c34a4b367
 AUX gnome-applets-2.18.0-gtk+-2.12-compat.patch 349 RMD160 7f72430d3bc86fb099662b3d0f838e868dbb6cbd SHA1 28ebe99d4d9f62ef5e0e1eadd6563c985dd01d80 SHA256 b5456d210beb75a2ba1cdcb96ee88a6e02c2af80fe61a7a5e5d89db00524d38d
 DIST gnome-applets-2.18.0.tar.bz2 7133902 RMD160 c9a18c717fd01ede9476a70784a8522968e52211 SHA1 7bec1f642e827634f74859e81e1502799d3c05a2 SHA256 f8f23e0c5e156afb0811d7a7fcbfec8dc667b8e35fa8a1cfff0b4866014c2157
@@ -5,6 +8,13 @@ DIST gnome-applets-2.20.0.tar.bz2 7488862 RMD160 47cf69002d88d6905ade68a18e457d8
 DIST gnome-applets-2.20.1.tar.bz2 7490737 RMD160 f8e10ebccd43fbb147f580fcb2a949e9e5331063 SHA1 de6258cae42a827dbd4c3f1479d80157838dacc7 SHA256 d9ac9c48c007aa1444a60e947bd95359ac3e4998b074d8613082755aa22c87a8
 EBUILD gnome-applets-2.18.0-r3.ebuild 2971 RMD160 6b443fa5322fb0d98a0e15b01adc79047d04d752 SHA1 189b6a319e5ca4b41624a3ecf51b4ad4a0b15ff7 SHA256 244b53ddcae0869d199b3d9885153526ce1fc534eb92646d68e38fc726d744ab
 EBUILD gnome-applets-2.20.0.ebuild 2858 RMD160 ecb232b62ca20c3ca99906f7366815ca01ffb183 SHA1 5e6d995b9d03cd165fd26c226bc214ae36a4250f SHA256 e60549dbdc21bff5eeea83652fed346921acc5cb68e591a7ef165115deb71f49
-EBUILD gnome-applets-2.20.1.ebuild 2858 RMD160 cf26fb3bf693477947b49953ce18beb4edba4260 SHA1 9a4e3bb61b17a352ed892d67fda7147872220224 SHA256 7d85cfa4e41e85a253c9fc280c04a03c01a89fdb371279d0cb0fbd566fc80710
-MISC ChangeLog 35667 RMD160 8847748a45c71dbcab2a9633ab6738b12837baf9 SHA1 f7709a565f8e5482183de1795482d6af1c638399 SHA256 91d4a31095f2e0c9b01b718b20fb9024739fbb835a7c1e5ebb00fd71c813e32b
+EBUILD gnome-applets-2.20.1.ebuild 3216 RMD160 8fa9d7adfa3e57f2b4b503945aeaf4e63e4ce521 SHA1 68b9eefbed587b34f66df989b68079913e8cd11c SHA256 36a722811fe3210342320928aed93b3cc35ce62d6b9fdcac4c898ae99b2eb200
+MISC ChangeLog 35790 RMD160 a0d775d30ed0b609a731a151618daca8bbcb61f4 SHA1 d4eccb8469c38472ce3054f84d52da2c51cb54b5 SHA256 f717d81f8e05942ba23cfd21ca6591c8ff7d3b46ef224bf759c9b89af54ae0d3
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHsNL91fmVwcYIWAYRAvXGAJ93iLMI0+dcmOWhJj+FfDlCD4H7cQCgg1FW
+eA9OeePLNgUZzfOzuQ1S0uY=
+=iGls
+-----END PGP SIGNATURE-----

diff --git a/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild
index 4c91f44e2194a21dcd031dfe4ee50d8d14ba20cd..c0874d08ea787b1f7461c9126963d3ff21c56a3d 100644 (file)
--- a/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild,v 1.7 2008/02/04 04:50:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.20.1.ebuild,v 1.8 2008/02/11 22:57:56 eva Exp $
 
-inherit eutils gnome2 autotools
+inherit eutils gnome2 autotools python
 
 DESCRIPTION="Applets for the GNOME Desktop and Panel"
 HOMEPAGE="http://www.gnome.org/"
@@ -62,13 +62,22 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
+# to double check on next release
 MAKEOPTS="${MAKEOPTS} -j1"
 
+src_unpack() {
+       gnome2_src_unpack
+
+       # disable pyc compiling
+       mv py-compile py-compile.orig
+       ln -s $(type -P true) py-compile
+}
+
 pkg_setup() {
-       G2CONF="--disable-scrollkeeper --enable-flags \
+       G2CONF="${G2CONF}
+               --disable-scrollkeeper --enable-flags
                $(use_with hal)
-               $(use_enable ipv6)
-               $(use_enable doc gtk-doc)"
+               $(use_enable ipv6)"
 
        if use gstreamer; then
                G2CONF="${G2CONF} --with-gstreamer=0.10"
@@ -107,4 +116,14 @@ pkg_postinst() {
                elog "battstat applet to prevent any issues with other applications "
                elog "trying to read acpi information."
        fi
+
+       # check for new python modules on bumps
+       python_version
+       python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/invest
+}
+
+pkg_postrm() {
+       gnome2_pkg_postrm
+       python_version
+       python_mod_cleanup
 }