diff -ur catalyst.orig/catalyst-2.0.6.916.ebuild catalyst/catalyst-2.0.6.916.ebuild
--- catalyst.orig/catalyst-2.0.6.916.ebuild	2011-07-17 08:31:12.000000000 +0800
+++ catalyst/catalyst-2.0.6.916.ebuild	2011-11-12 23:27:03.849793021 +0800
@@ -6,7 +6,7 @@
 # catalyst-2.9999       -> catalyst_2 branch from Git
 # catalyst-VER          -> normal catalyst release
 
-EAPI=2
+EAPI=3
 
 if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
@@ -18,7 +18,8 @@
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
 	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 fi
-inherit eutils multilib
+PYTHON_DEPEND="*:2.6"
+inherit eutils multilib python
 
 DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
 HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
@@ -29,14 +30,14 @@
 IUSE="ccache"
 
 DEPEND=""
-RDEPEND="dev-lang/python
-	app-crypt/shash
+RDEPEND="app-crypt/shash
 	virtual/cdrtools
 	ccache? ( dev-util/ccache )
 	ia64? ( sys-fs/dosfstools )
 	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
 
 pkg_setup() {
+	python_pkg_setup
 	if use ccache ; then
 		einfo "Enabling ccache support for catalyst."
 	else
@@ -85,6 +86,7 @@
 		/etc/catalyst/catalyst.conf
 	dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
 		/etc/catalyst/catalyst.conf
+	python_convert_shebangs -r 2 "${ED}"
 }
 
 pkg_postinst() {
diff -ur catalyst.orig/catalyst-2.0.6.918.ebuild catalyst/catalyst-2.0.6.918.ebuild
--- catalyst.orig/catalyst-2.0.6.918.ebuild	2011-07-17 08:31:12.000000000 +0800
+++ catalyst/catalyst-2.0.6.918.ebuild	2011-11-12 23:30:31.433792944 +0800
@@ -6,7 +6,7 @@
 # catalyst-2.9999       -> catalyst_2 branch from Git
 # catalyst-VER          -> normal catalyst release
 
-EAPI=2
+EAPI="3"
 
 if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
@@ -19,7 +19,9 @@
 		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
+
+PYTHON_DEPEND="*:2.6"
+inherit eutils multilib python
 
 DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
 HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
@@ -38,6 +40,7 @@
 	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
 
 pkg_setup() {
+	python_pkg_setup
 	if use ccache ; then
 		einfo "Enabling ccache support for catalyst."
 	else
@@ -93,4 +96,5 @@
 	einfo "catalyst project page at:"
 	einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
 	echo
+	python_convert_shebangs -r 2 "${ED}"
 }
diff -ur catalyst.orig/catalyst-2.0.6.ebuild catalyst/catalyst-2.0.6.ebuild
--- catalyst.orig/catalyst-2.0.6.ebuild	2011-07-17 08:31:12.000000000 +0800
+++ catalyst/catalyst-2.0.6.ebuild	2011-11-12 23:34:52.217792962 +0800
@@ -6,7 +6,10 @@
 # catalyst-2.9999       -> catalyst_2 branch from Git
 # catalyst-VER          -> normal catalyst release
 
-inherit eutils multilib
+EAPI="3"
+PYTHON_DEPEND="*:2.6"
+inherit eutils multilib python
+
 SRC_URI="mirror://gentoo/${P}.tar.bz2
 	http://wolf31o2.org/sources/${PN}/${P}.tar.bz2"
 
@@ -22,14 +25,14 @@
 IUSE="ccache"
 
 DEPEND=""
-RDEPEND="dev-lang/python
-	app-crypt/shash
+RDEPEND="app-crypt/shash
 	virtual/cdrtools
 	ccache? ( dev-util/ccache )
 	ia64? ( sys-fs/dosfstools )
 	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
 
 pkg_setup() {
+	python_pkg_setup
 	if use ccache ; then
 		einfo "Enabling ccache support for catalyst."
 	else
@@ -71,6 +74,7 @@
 		/etc/catalyst/catalyst.conf
 	dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
 		/etc/catalyst/catalyst.conf
+	python_convert_shebangs -r 2 "${ED}"
 }
 
 pkg_postinst() {