diff options
| author |   Paul Varner <fuzzyray@gentoo.org> | 2011-01-10 21:43:12 +0000 |
|---|---|---|
| committer | Paul Varner <fuzzyray@gentoo.org> | 2011-01-10 21:43:12 +0000 |
| commit | 908a8de06e028bfe7409b36c45285f164d5140a8 (patch) | |
| tree | 9f0a41651d03643a70293f01ba7befa1d46d661a /app-portage | |
| parent | version bump (diff) | |
| download | gentoo-2-908a8de06e028bfe7409b36c45285f164d5140a8.tar.gz gentoo-2-908a8de06e028bfe7409b36c45285f164d5140a8.tar.bz2 gentoo-2-908a8de06e028bfe7409b36c45285f164d5140a8.zip | |
Adjust the gentoolkit-0.2.4.6.1-r1.ebuild to only use python2. This fixes bug
350979 which occurs when python is set to python3.
(Portage version: 2.1.9.30/cvs/Linux i686)
Diffstat (limited to 'app-portage')
| -rw-r--r-- | app-portage/gentoolkit/ChangeLog | 9 | ||||
| -rw-r--r-- | app-portage/gentoolkit/gentoolkit-0.2.4.6.1-r1.ebuild | 14 |
2 files changed, 18 insertions, 5 deletions
diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog index 8794231f0714..4db70241a2c4 100644 --- a/app-portage/gentoolkit/ChangeLog +++ b/app-portage/gentoolkit/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-portage/gentoolkit -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.204 2010/12/27 16:35:20 idl0r Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.205 2011/01/10 21:43:12 fuzzyray Exp $ + + 10 Jan 2011; Paul Varner <fuzzyray@gentoo.org> + gentoolkit-0.2.4.6.1-r1.ebuild: + Adjust the gentoolkit-0.2.4.6.1-r1.ebuild to only use python2. This fixes bug + 350979 which occurs when python is set to python3. 27 Dec 2010; Christian Ruppert <idl0r@gentoo.org> gentoolkit-9999.ebuild: Update the live ebuild to use git from now on. diff --git a/app-portage/gentoolkit/gentoolkit-0.2.4.6.1-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.2.4.6.1-r1.ebuild index 61d71d6cfe87..fc61d450c252 100644 --- a/app-portage/gentoolkit/gentoolkit-0.2.4.6.1-r1.ebuild +++ b/app-portage/gentoolkit/gentoolkit-0.2.4.6.1-r1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.2.4.6.1-r1.ebuild,v 1.4 2010/04/14 18:46:23 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.2.4.6.1-r1.ebuild,v 1.5 2011/01/10 21:43:12 fuzzyray Exp $ EAPI=2 +PYTHON_DEPEND="2" +PYTHON_USE_WITH="xml" inherit eutils python @@ -18,7 +20,6 @@ IUSE="" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" DEPEND="sys-apps/portage - dev-lang/python[xml] dev-lang/perl sys-apps/grep" RDEPEND="${DEPEND} @@ -29,6 +30,9 @@ src_prepare() { # Avoid deprecation warnings with >=sys-apps/portage-2.1.8. sed -e 's:virtuals = portage.db\[portage.root\]\["virtuals"\]::' \ -i "$S/src/gentoolkit/__init__.py" || die "sed failed" + + # We only work with python2 + python_convert_shebangs -r 2 . } src_install() { @@ -41,6 +45,10 @@ src_install() { fperms 0700 /var/cache/revdep-rebuild } +pkg_setup() { + python_set_active_version 2 +} + pkg_postinst() { # Make sure that our ownership and permissions stuck chown root:root "${ROOT}/var/cache/revdep-rebuild" |