fix python eclass use, bug #207667

Package-Manager: portage-2.1.4.4

3 files changed, 41 insertions, 5 deletions

diff --git a/www-client/epiphany-extensions/ChangeLog b/www-client/epiphany-extensions/ChangeLog
index 742fdc3c81e7..e602dc58f9ce 100644
--- a/www-client/epiphany-extensions/ChangeLog
+++ b/www-client/epiphany-extensions/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/epiphany-extensions
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.71 2008/01/30 14:58:14 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.72 2008/02/17 23:17:49 eva Exp $
+
+  17 Feb 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  epiphany-extensions-2.20.3.ebuild:
+  fix python eclass use, bug #207667
 
   30 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
   epiphany-extensions-2.20.3.ebuild:
diff --git a/www-client/epiphany-extensions/Manifest b/www-client/epiphany-extensions/Manifest
index 4774983dde12..3273a1af9b9e 100644
--- a/www-client/epiphany-extensions/Manifest
+++ b/www-client/epiphany-extensions/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX epiphany-extensions-2.18.0-sessionsaver-v4.patch.gz 9992 RMD160 397765c966f94c38e513f80adb73478abedeb0b0 SHA1 6fc87dcf3d261f2b024ff35f6b67e5d7dd026b85 SHA256 c6e9f279ae93495f4633903ff3fcdfc18bfcfd04ff727b9dc2d5c20917c3f32b
 DIST epiphany-extensions-2.18.2.tar.bz2 892954 RMD160 dd32a147060ff01c8ea63262c00f0c6b6fbcf12c SHA1 fb803511ef92fbe3a5316a3e8f635fe5d1ee10d8 SHA256 b2864dcaba10e208e3b43a42279d50b96520b8e3d7c713c1439244f8c7808536
 DIST epiphany-extensions-2.20.1.tar.bz2 908577 RMD160 643e3d70c845157ed795350bfd8086c6a2ee9312 SHA1 c53d454a5dd78c85746aff4e75edc1ae87b1d597 SHA256 35a66aa9151f0cbd492435077f4bef30ecb8728e990e29da3e4a5f275a5875d0
 DIST epiphany-extensions-2.20.3.tar.bz2 909040 RMD160 f3fac0a4cc17b3120f0414f0467ff36c24e77dd2 SHA1 201232b2d94576478dddc94daa49d19bc1487305 SHA256 3b19652c6717d9f1dbfc2b855e9777e58623247765accbe8cfc7b86cb840aea2
 EBUILD epiphany-extensions-2.18.2.ebuild 1933 RMD160 06fe03aab4cdf15a258a7aae964255158b9808ff SHA1 5f525ba7caf63aefbb5d53c77209b62d962e0b3b SHA256 8f06600c59065d64648fb556b61ece4d4a61ca1978bc28d187e0ed9001e12362
 EBUILD epiphany-extensions-2.20.1.ebuild 2085 RMD160 5df091175f34fb8391f3546f46a05692275df286 SHA1 40e3bc36a2ea835262918024974d9082004ffeea SHA256 8e51c5cfdbd7ee9047915cf8ccb43ca93d231689697567d5e7ea8175a196a4cc
-EBUILD epiphany-extensions-2.20.3.ebuild 2059 RMD160 986666d59dbd2333938290fa54d50d85257e473e SHA1 fd684ce9a636d27b2361f8de4126d5d2f0a9d39b SHA256 8088ee360a885d10fbdd13ce016df6059f405ab14790878bac251db803d75881
-MISC ChangeLog 12698 RMD160 68fe7a4f10a42fb8d41e101fd0a8fb47a2517be2 SHA1 79f65f271a4a554efb91f057441f56c381305ef3 SHA256 07d495ec9bcdce8ef00c15e2425f4da09eb9a5b87b2de231ec93e0d33218ea33
+EBUILD epiphany-extensions-2.20.3.ebuild 2524 RMD160 745b907afde494dd09ff9b41265326c57fe65724 SHA1 59dabc27673ff13e20758204b7620dbd5ca69f6d SHA256 5fcfbb8fb3d9a1d2a623f77de0d85d5f7331e39e73fcd2b3a084f1de778f6aad
+MISC ChangeLog 12827 RMD160 babaf1581f91a8669b383b9a8f31ca6372c7ecad SHA1 35fad5f68e87694aafd6f052aee45cdf4068add2 SHA256 3bedce0ef32cf5895645bb3dc32320b4a730b2c2ede7a07e49810a41c81e9f6a
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHuMCk1fmVwcYIWAYRAokXAJ9nl21wwxIBsUA8ynqMopt4Mr28+gCeM/DN
+Mn4qiae4VZ1QT85my+Y/mr8=
+=Fxx5
+-----END PGP SIGNATURE-----
diff --git a/www-client/epiphany-extensions/epiphany-extensions-2.20.3.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.20.3.ebuild
index 0f78f2d5d30f..52be9f4a9335 100644
--- a/www-client/epiphany-extensions/epiphany-extensions-2.20.3.ebuild
+++ b/www-client/epiphany-extensions/epiphany-extensions-2.20.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-2.20.3.ebuild,v 1.2 2008/01/30 14:58:14 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-2.20.3.ebuild,v 1.3 2008/02/17 23:17:49 eva Exp $
 
 WANT_AUTOMAKE="1.10"
-inherit eutils gnome2 autotools
+inherit eutils gnome2 autotools python versionator
 
 DESCRIPTION="Extensions for the Epiphany web browser"
 HOMEPAGE="http://www.gnome.org/projects/epiphany/extensions.html"
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
+MY_MAJORV=$(get_version_component_range 1-2)
+
 src_unpack() {
 	gnome2_src_unpack
 
@@ -42,6 +44,10 @@ src_unpack() {
 	echo "extensions/epilicious/progress.py" >> po/POTFILES.in
 	echo "extensions/sessionsaver/ephy-sessionsaver-extension.c" >> po/POTFILES.in
 
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
 	AT_M4DIR="m4" eautoreconf
 }
 
@@ -70,3 +76,19 @@ pkg_setup() {
 		G2CONF="${G2CONF} --with-gecko=firefox"
 	fi
 }
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if use python; then
+		python_version
+		python_mod_optimize	/usr/$(get_libdir)/epiphany/${MY_MAJORV}/extensions
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	if use python; then
+		python_version
+		python_mod_cleanup /usr/$(get_libdir)/epiphany/${MY_MAJORV}/extensions
+	fi
+}