Make catalyst use python2

(Portage version: 2.1.10.53/cvs/Linux ia64)

4 files changed, 40 insertions, 19 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index b647d25152a9..2127d92dcf44 100644
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/catalyst
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.238 2012/04/22 04:26:30 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.239 2012/04/22 16:49:11 armin76 Exp $
+
+  22 Apr 2012; Raúl Porcel <armin76@gentoo.org> catalyst-2.0.8.ebuild,
+  catalyst-2.9999.ebuild, catalyst-9999.ebuild:
+  Make catalyst use python2
 
 *catalyst-2.0.8 (22 Apr 2012)
 
diff --git a/dev-util/catalyst/catalyst-2.0.8.ebuild b/dev-util/catalyst/catalyst-2.0.8.ebuild
index 42ab28a3aa91..2c4773b46f36 100644
--- a/dev-util/catalyst/catalyst-2.0.8.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.8.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.8.ebuild,v 1.1 2012/04/22 04:26:30 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.8.ebuild,v 1.2 2012/04/22 16:49:11 armin76 Exp $
 
 # catalyst-9999         -> latest Git
 # catalyst-2.9999       -> catalyst_2 branch from Git
 # catalyst-VER          -> normal catalyst release
 
-EAPI=2
+EAPI=3
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
@@ -19,7 +22,7 @@ else
 		http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2"
 	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 fi
-inherit eutils multilib
+inherit eutils multilib python
 
 DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
 HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
@@ -30,8 +33,7 @@ RESTRICT=""
 IUSE="ccache"
 
 DEPEND="app-text/asciidoc"
-RDEPEND="dev-lang/python
-	app-crypt/shash
+RDEPEND="app-crypt/shash
 	virtual/cdrtools
 	ccache? ( dev-util/ccache )
 	ia64? ( sys-fs/dosfstools )
@@ -60,6 +62,10 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+        python_convert_shebangs -r 2 .
+}
+
 src_install() {
 	insinto /usr/$(get_libdir)/${PN}
 	exeinto /usr/$(get_libdir)/${PN}
diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
index b97fc999b5de..8e1a5e34ff94 100644
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.9999.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.9999.ebuild,v 1.1 2011/07/17 00:29:56 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.9999.ebuild,v 1.2 2012/04/22 16:49:11 armin76 Exp $
 
 # catalyst-9999         -> latest Git
 # catalyst-2.9999       -> catalyst_2 branch from Git
 # catalyst-VER          -> normal catalyst release
 
-EAPI=2
+EAPI=3
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
-	EGIT_BRANCH="catalyst_2"
 	inherit git-2
 	SRC_URI=""
 	S="${WORKDIR}/${PN}"
@@ -20,7 +22,7 @@ else
 		http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2"
 	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 fi
-inherit eutils multilib
+inherit eutils multilib python
 
 DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
 HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
@@ -31,8 +33,7 @@ RESTRICT=""
 IUSE="ccache"
 
 DEPEND="app-text/asciidoc"
-RDEPEND="dev-lang/python
-	app-crypt/shash
+RDEPEND="app-crypt/shash
 	virtual/cdrtools
 	ccache? ( dev-util/ccache )
 	ia64? ( sys-fs/dosfstools )
@@ -61,6 +62,10 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+        python_convert_shebangs -r 2 .
+}
+
 src_install() {
 	insinto /usr/$(get_libdir)/${PN}
 	exeinto /usr/$(get_libdir)/${PN}
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 6274ab1fb119..b2c3b0fbed12 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild,v 1.15 2011/07/17 00:29:56 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild,v 1.16 2012/04/22 16:49:11 armin76 Exp $
 
 # catalyst-9999         -> latest Git
 # catalyst-2.9999       -> catalyst_2 branch from Git
 # catalyst-VER          -> normal catalyst release
 
-EAPI=2
+EAPI=3
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
@@ -19,7 +22,7 @@ else
 		http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2"
 	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 fi
-inherit eutils multilib
+inherit eutils multilib python
 
 DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
 HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
@@ -30,8 +33,7 @@ RESTRICT=""
 IUSE="ccache"
 
 DEPEND="app-text/asciidoc"
-RDEPEND="dev-lang/python
-	app-crypt/shash
+RDEPEND="app-crypt/shash
 	virtual/cdrtools
 	ccache? ( dev-util/ccache )
 	ia64? ( sys-fs/dosfstools )
@@ -60,6 +62,10 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+        python_convert_shebangs -r 2 .
+}
+
 src_install() {
 	insinto /usr/$(get_libdir)/${PN}
 	exeinto /usr/$(get_libdir)/${PN}