From: Paul Varner <fuzzyray@gentoo.org>
Date: Fri, 12 Mar 2010 20:19:12 +0000 (+0000)
Subject: Update gentoolkit-9999 to support python 3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ac33a67781b038b199d2873161eaf2a28cee29e7;p=gentoo.git

Update gentoolkit-9999 to support python 3
Package-Manager: portage-2.2_rc67/cvs/Linux i686
---

diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog
index ccfd83daefa6..e70da02198c4 100644
--- a/app-portage/gentoolkit/ChangeLog
+++ b/app-portage/gentoolkit/ChangeLog
@@ -1,6 +1,9 @@
 # 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.182 2010/03/11 22:32:46 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.183 2010/03/12 20:19:12 fuzzyray Exp $
+
+  12 Mar 2010; Paul Varner <fuzzyray@gentoo.org> gentoolkit-9999.ebuild:
+  Update gentoolkit-9999 to support the python3 ABI
 
 *gentoolkit-0.2.4.6.1 (11 Mar 2010)
 
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index bbcd958069fc..cafec53d2d5b 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -9,6 +9,6 @@ EBUILD gentoolkit-0.3.0_rc7.ebuild 2391 RMD160 bd43add56b5e20a451f56bf67161bf3c7
 EBUILD gentoolkit-0.3.0_rc8-r1.ebuild 2493 RMD160 09703bee7703e25cd2c81392a3b6f6491c9d11cf SHA1 953aa72db6936dfbbbd943d9ea0490d7b38c61fd SHA256 a561b63597f927271fa2e1a6d19785b15cbc8c04a1bccaedb941edf6a4572924
 EBUILD gentoolkit-0.3.0_rc8.ebuild 2311 RMD160 e380a8a5955d84a36b4a5f02645645cae5134d9a SHA1 9f76ebe7af4527942d283ded239b63b3c45106a0 SHA256 0a4868be93c3b796ea6a8e2aeba984d75ea49ed815b7e1f1c809a8fe71cabac5
 EBUILD gentoolkit-0.3.0_rc9.ebuild 2490 RMD160 a7f152b7e1e2656f86095b3c61d79beab28307f6 SHA1 a20dc852d5a1fb19fbf53121cdfed42000df22c5 SHA256 d0086d840269ffb49dd6e780203c125077f64dd5c6b455bee0677d33cf6aa452
-EBUILD gentoolkit-9999.ebuild 1912 RMD160 eb050e3ef74cce526969faea3d1f6c3845e24f92 SHA1 ff2e05f7455294a306772f40359381641ba3bd09 SHA256 eae8e361c8b790acf2c518ff7f9058920abe59a914df23de8ba2e217e47f2b2e
-MISC ChangeLog 54882 RMD160 af80b394cae08d299178e9127983fd5faadd6bca SHA1 668469cdaceb3e1d9f5ce1aa72b17d4f41973eb9 SHA256 f007e42040915e4a5601949ef52fd16ef5019d3ccca0c3cf8aa8848f13055445
+EBUILD gentoolkit-9999.ebuild 1882 RMD160 51cf8e3f4a0805024ac4521d3985d7e200c86901 SHA1 8e0e5ec5f5605a13f9e9dbbddd943f790303a8d2 SHA256 12dc44f34ad874e4e7feb450edc690e96fd32df549ffef868df8d4574ea0c804
+MISC ChangeLog 55008 RMD160 9e51e677a9b85c2f6c9503292e88991bbb8e8407 SHA1 7e05749d860d30c92bd7076cd0433874eba3b361 SHA256 f70a6f3f1eaee28287f98696b4ff9ade7f9df1ca7f17d6572f816e1e7a77e364
 MISC metadata.xml 451 RMD160 b1cce9123da273149c731793696937f9b3d02c60 SHA1 6126c34edcb6ed5f4274e060881378cc1cf10757 SHA256 1a2def4d28f69d6bffeb0b09e97ce53e6822e457d5d9308000a1010dca32abeb
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index 1dfd625a5ddd..f63f70a94a21 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild,v 1.6 2010/01/11 18:57:19 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild,v 1.7 2010/03/12 20:19:12 fuzzyray Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
+DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS="1"
+RESTRICT_PYTHON_ABIS="2.[45]"
 
 inherit distutils subversion
 
@@ -20,14 +22,13 @@ IUSE=""
 
 KEYWORDS=""
 
-DEPEND="sys-apps/portage
-	dev-lang/python[xml]
+DEPEND=">=dev-lang/python-2.6[xml]
+	sys-apps/portage
 	dev-lang/perl
 	sys-apps/grep
 	sys-apps/gawk"
 RDEPEND="${DEPEND}
 	app-misc/realpath"
-RESTRICT_PYTHON_ABIS="3.*"
 
 distutils_src_compile_pre_hook() {
 	echo VERSION="9999-r${ESVN_WC_REVISION}" "$(PYTHON)" setup.py set_version
@@ -40,6 +41,7 @@ src_compile() {
 }
 
 src_install() {
+	python_convert_shebangs -r "" build-*/scripts-*
 	distutils_src_install
 
 	# Create cache directory for revdep-rebuild
@@ -49,8 +51,8 @@ src_install() {
 	fperms 0700 /var/cache/revdep-rebuild
 
 	# Can distutils handle this?
-	dosym eclean-$(PYTHON --ABI -f) /usr/bin/eclean-dist
-	dosym eclean-$(PYTHON --ABI -f) /usr/bin/eclean-pkg
+	dosym eclean /usr/bin/eclean-dist
+	dosym eclean /usr/bin/eclean-pkg
 }
 
 pkg_postinst() {
@@ -60,13 +62,13 @@ pkg_postinst() {
 	chown root:root "${ROOT}/var/cache/revdep-rebuild"
 	chmod 0700 "${ROOT}/var/cache/revdep-rebuild"
 
-	einfo
-	elog "The default location for revdep-rebuild files has been moved"
-	elog "to /var/cache/revdep-rebuild when run as root."
-	einfo
-	einfo "Another alternative to equery is app-portage/portage-utils"
 	einfo
 	einfo "For further information on gentoolkit, please read the gentoolkit"
 	einfo "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
 	einfo
+	einfo "Another alternative to equery is app-portage/portage-utils"
+}
+
+pkg_info() {
+	eselect python show
 }