Improve support of python eclass, bug #326101.

Package-Manager: portage-2.2_rc89/cvs/Linux x86_64

3 files changed, 31 insertions, 14 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 689ec61fc5a1..c5c08bd433cc 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/meld
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.112 2010/10/10 07:52:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.113 2010/10/13 20:35:34 eva Exp $
+
+  13 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org> meld-1.4.0.ebuild:
+  Improve support of python eclass, bug #326101.
 
   10 Oct 2010; Justin Lecher <jlec@gentoo.org> meld-1.4.0.ebuild:
   Added prefix support, EAPI=3, keyworded for ~-linux prefix
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 7bfe2e7c8496..06e2cdcdc150 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -10,13 +10,13 @@ EBUILD meld-1.3.0.ebuild 1852 RMD160 8d28d2e8bfd76f4a27d788ca5f660bdc1a421eaa SH
 EBUILD meld-1.3.1.ebuild 1874 RMD160 7ee313ceca2f9ffd4dfc772a70adc9657bd7dad6 SHA1 70d7204d2906ee698d821f235ed6aff047e593e0 SHA256 9764fbe9bbf6c1457409d246371119070e6b011f86294f02571c8050ee263d56
 EBUILD meld-1.3.2.ebuild 2044 RMD160 657d3857938b8f04f309e25b80bebcea003e6bfb SHA1 09a8879daa9c23c896712a4ccf9c8bb5d95d27ae SHA256 51b7815794b423ec17e21779dae411fbeb241195ac0a392e505102681486e617
 EBUILD meld-1.3.3.ebuild 2038 RMD160 6fdb490c7572f2069b11d7b39d19f08febb80fc5 SHA1 8856d59afa9ea52594ccba282c4b1f6a1eca93de SHA256 019e1aa6a8f79b4c4bd9b354526a7badda2a3cbada2f74f1e3cfa953d3a96076
-EBUILD meld-1.4.0.ebuild 2062 RMD160 fd947c0b307ac54ae0e8f7bafd21ee477329e194 SHA1 c963f30ecfd250c081bde28f14d812b93674edae SHA256 c9e3daf2563fa8a0e57addfbc4281f92fc71fd2e5b0424aa763fc1ac3f40fb80
-MISC ChangeLog 14952 RMD160 21f656bf952f2c6439445ce49bee0d8d95485229 SHA1 aa9a71c5985a11af9d2c103064ee20dc1f1e515c SHA256 8a5a274e681cf35a9fd6eeb15863de08bed68ae82822513c57620939f6560293
+EBUILD meld-1.4.0.ebuild 2403 RMD160 980407bbf64278d569efdc965ea9d305eec31ceb SHA1 32bc7b6ce9de35748a4f41453553f9ecd75e878e SHA256 e47fe450184b5cc8bee4016253b7f4b603a0454cb71f0213d8363d3cbfe84b4d
+MISC ChangeLog 15074 RMD160 79f988fef72afffa5d9a298ddc8a6cd5ede409e2 SHA1 fea0ebeb4715d63f1aa458e2902ff8c42ba38094 SHA256 6d1b5c3e25cd5c114cc86e76a3a440daaff82a402511eaf9d13908d3d7ea1328
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyxcOoACgkQgAnW8HDreRYQJQCeO6oqOSke/J9Hrbeb5fQnM9aQ
-c3sAoMro4FCQ6DGRd3p6v7G/BwRJRBnz
-=NkNQ
+iEYEARECAAYFAky2GCgACgkQ1fmVwcYIWAaTxQCgtKdR31rK0S57DHOIs/Ra/maw
+1HQAnRUBNUMnl+RU8yqkbajgSh2L2PV1
+=mj1f
 -----END PGP SIGNATURE-----
diff --git a/dev-util/meld/meld-1.4.0.ebuild b/dev-util/meld/meld-1.4.0.ebuild
index d2f5a64d9ded..1b86285333aa 100644
--- a/dev-util/meld/meld-1.4.0.ebuild
+++ b/dev-util/meld/meld-1.4.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.4.0.ebuild,v 1.2 2010/10/10 07:52:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.4.0.ebuild,v 1.3 2010/10/13 20:35:34 eva Exp $
 
 EAPI="3"
-
 GCONF_DEBUG="no"
+PYTHON_DEPEND="2:2.4"
 
 inherit python gnome2 eutils multilib
 
@@ -16,16 +16,16 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc gnome"
 
-RDEPEND=">=dev-lang/python-2.4
+RDEPEND="
 	>=gnome-base/libglade-2
+	>=dev-python/pygtk-2.8
+	>=dev-python/pygobject-2.8
 	gnome? (
 		>=gnome-base/libgnome-2
 		>=dev-python/libgnome-python-2.22
 		>=dev-python/gconf-python-2.22
 		>=dev-python/gnome-vfs-python-2.22 )
-	>=dev-python/pygtk-2.8
-	>=dev-python/pygobject-2.8"
-
+"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	app-text/scrollkeeper"
@@ -36,7 +36,7 @@ src_prepare() {
 	gnome2_src_prepare
 
 	# fix the prefix so its not in */local/*
-	sed -e 's:/usr/local:${EPREFIX}/usr:' \
+	sed -e "s:/usr/local:${EPREFIX}/usr:" \
 		-e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" \
 		-i INSTALL || die "sed 1 failed"
 
@@ -48,7 +48,8 @@ src_prepare() {
 	sed -e '/$(PYTHON) .* .import compileall;/s/\t/&#/g' \
 		-i Makefile || die "sed 3 failed"
 
-	# don't run scrollkeeper (with the wrong path), leave that to gnome2.eclass #145833
+	# don't run scrollkeeper (with the wrong path),
+	# leave that to gnome2.eclass #145833
 	sed -e '/scrollkeeper-update/s/\t/&#/' \
 		-i help/*/Makefile || die "sed 4 failed"
 
@@ -57,6 +58,11 @@ src_prepare() {
 		-e 's,\(open("\)\(meldapp.py")\),\1meld/\2,' \
 		-i tools/check_release || die "sed 5 failed"
 
+	# replace all calls to python by specific major version
+	sed -e "s/\(PYTHON ?= \).*/\1$(PYTHON -2)/" \
+		-i INSTALL || die "sed 6 failed"
+	python_convert_shebangs 2 "${S}"/tools/*
+
 	strip-linguas -i "${S}/po"
 	local mylinguas=""
 	for x in ${LINGUAS}; do
@@ -73,10 +79,18 @@ src_configure() {
 	:
 }
 
+src_install() {
+	gnome2_src_install
+	python_convert_shebangs 2 "${ED}"usr/bin/meld
+}
+
 pkg_postinst() {
+	gnome2_pkg_postinst
+	PYTHON_ABI=$(PYTHON -2 --ABI)
 	python_mod_optimize /usr/$(get_libdir)/meld
 }
 
 pkg_postrm() {
+	gnome2_pkg_postrm
 	python_mod_cleanup /usr/$(get_libdir)/meld
 }