diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2010-10-17 20:18:57 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2010-10-17 20:18:57 +0000 |
| commit | 4233a36d85afd8b95c71d3943cdf7b6bc0a2f951 (patch) | |
| tree | b363b455202b9d5da0cbc0c06636a0d9eee6b399 /dev-util/meld | |
| parent | Version bump. (diff) | |
| download | gentoo-2-4233a36d85afd8b95c71d3943cdf7b6bc0a2f951.tar.gz gentoo-2-4233a36d85afd8b95c71d3943cdf7b6bc0a2f951.tar.bz2 gentoo-2-4233a36d85afd8b95c71d3943cdf7b6bc0a2f951.zip | |
Fix python eclass usage, per Arfrever comments, bug #326101.
(Portage version: 2.2_rc89/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/meld')
| -rw-r--r-- | dev-util/meld/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/meld/meld-1.4.0.ebuild | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index c5c08bd433cc..5c153e16bcf6 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.113 2010/10/13 20:35:34 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.114 2010/10/17 20:18:57 eva Exp $ + + 17 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org> meld-1.4.0.ebuild: + Fix python eclass usage, per Arfrever comments, bug #326101. 13 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org> meld-1.4.0.ebuild: Improve support of python eclass, bug #326101. diff --git a/dev-util/meld/meld-1.4.0.ebuild b/dev-util/meld/meld-1.4.0.ebuild index 1b86285333aa..310e42de18e9 100644 --- a/dev-util/meld/meld-1.4.0.ebuild +++ b/dev-util/meld/meld-1.4.0.ebuild @@ -1,6 +1,6 @@ # 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.3 2010/10/13 20:35:34 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.4.0.ebuild,v 1.4 2010/10/17 20:18:57 eva Exp $ EAPI="3" GCONF_DEBUG="no" @@ -32,6 +32,11 @@ DEPEND="${RDEPEND} DOCS="AUTHORS NEWS help/ChangeLog" +pkg_setup() { + # Needed for optimizing python modules against proper interpreter + python_set_active_version 2 +} + src_prepare() { gnome2_src_prepare @@ -86,7 +91,6 @@ src_install() { pkg_postinst() { gnome2_pkg_postinst - PYTHON_ABI=$(PYTHON -2 --ABI) python_mod_optimize /usr/$(get_libdir)/meld } |