Don't set SUPPORT_PYTHON_ABIS; call python_set_active_version instead.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

5 files changed, 19 insertions, 18 deletions

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index 5866b1d46f77..eaad31bb7a65 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.240 2012/04/22 16:52:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.241 2012/04/22 21:27:14 floppym Exp $
+
+  22 Apr 2012; Mike Gilbert <floppym@gentoo.org> catalyst-2.0.8.ebuild,
+  catalyst-2.9999.ebuild, catalyst-9999.ebuild:
+  Don't set SUPPORT_PYTHON_ABIS; call python_set_active_version instead.
 
   22 Apr 2012; Raúl Porcel <armin76@gentoo.org> catalyst-2.0.8.ebuild,
   catalyst-2.9999.ebuild, catalyst-9999.ebuild:
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 89b40d0758d6..1205ec66cb3d 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 0001-Add-new-T-purgetmponly-option.patch 2970 RMD160 e57f148dc4cd26bc5221fe29e7c1c2faf16bc1d9 SHA1 7ca45cc0a33dfb3df21706b0a9ae5b12822e2465 SHA256 94c247c848c3e2ded833802ddabd297e7f9af961c19a6fe3dd9b0ab3d5ea3c1b
 AUX 0001-add-etc-make.profile-to-cleanables-too.patch 782 RMD160 0a0819a282d2100a7d1e84d2c62b2489a0a8646c SHA1 106b467e214c21200f45858586600eec95ea09f2 SHA256 6d68579676276cb0dc75b5d40157be96529927cbf0f11c5798640dde89098b46
@@ -15,15 +15,15 @@ EBUILD catalyst-2.0.6.918.ebuild 3180 RMD160 fdf5b91dc30a64663117bef23b91fc4b506
 EBUILD catalyst-2.0.6.ebuild 2596 RMD160 e3e85df411a895936ab972bf95a2a1bf9511c4d0 SHA1 2d6fa109ee0438ccf27a927b7aee8fcb5e6a8b24 SHA256 de3a642e7bf39eb3d25dee7d531a537a68573a47dea7759a5de0352c2f9c5207
 EBUILD catalyst-2.0.7.1-r1.ebuild 3244 RMD160 67c99f393508a1f20dd236d37f3d04b921a0f4c7 SHA1 db72f4a027f10646a2647df57e70ecd06fed48a2 SHA256 6633095167f608848eae82c03bd164cba7a00645debf33b629222d3f4d56c50d
 EBUILD catalyst-2.0.7.1.ebuild 3181 RMD160 6210cf250e77fc184edec3855db4385107485e9f SHA1 65cbc46f3bc91f404f0a080a8d009c8aecdf3fc5 SHA256 bed1f31ebc1e4295988c5051a83a91f949901a32c249f7b27ff230e9b253c493
-EBUILD catalyst-2.0.8.ebuild 3285 RMD160 07f7ab620e668752062408a73041fdf5608501b2 SHA1 03af838e5202256744cfe3693c350e852c4905f1 SHA256 0688ec2081d2cf33692a04ae526cc8690510d8734c1c3f1b1a1ee3faf16e28d9
-EBUILD catalyst-2.9999.ebuild 3286 RMD160 7f8f0b447bc96aaac6f05485cc5ae7393b6fef5a SHA1 6fbeb292dfb7f05a4af5636390c359d23d43fa49 SHA256 c1339307fd5de4ef7212a438bbd19b05ffa079b61c67152a24d9ce78b4d02ae7
-EBUILD catalyst-9999.ebuild 3285 RMD160 ee5539c14c7a4f662466d6bc0123530e2441a6f9 SHA1 83a7e423f60c394928bf1117c0511da5766ce7df SHA256 ce264aaac07570defde607561f2039d93c447c5ddfeaba528ae4541236d72f8a
-MISC ChangeLog 51559 RMD160 2a165313b89e675742f220216b078bb41af2a22e SHA1 e11302fa7e6e7b29cf5e5ce4a5cf0ff981bf0ef2 SHA256 163cdd939cb57be4d6e2efcf96b3d5ee2f4352309b43cba30e5656063a5c1f4f
+EBUILD catalyst-2.0.8.ebuild 3263 RMD160 be5b99f381c2869db2b73d37c0d75a8f4ec0946a SHA1 27712df7c063022efa1f4d740ad4b98f7b0202ee SHA256 eea8f919122e0f245bb558cc19db2bffceaadb853e4f5ea1377ded5cea81c1ca
+EBUILD catalyst-2.9999.ebuild 3264 RMD160 9f04a355a381beed5d038f8722379ca6d1f9ce6f SHA1 89c3f1e372271330047280963dbdda02e8a1addf SHA256 f3f5df6b2b1076188a78a76095c321b3a0877d3c346b0a4cef064c67b002e60e
+EBUILD catalyst-9999.ebuild 3263 RMD160 c6a24380cbab33d44f1c77dca828b8f5ab76db64 SHA1 6d1596ba14c5f883a57e6f64389c9dcc183c4472 SHA256 7bee66d3e34065da5241c58d0b3fedd005653157f300128c19e32885ff0a4f22
+MISC ChangeLog 51753 RMD160 bcb1b65f3ebf96073f77fb5e78471b9bc29cfbb4 SHA1 0cad3c2fdf924ddcacd11d16693320bdcc2667cc SHA256 3969e583ca7787222ddd55328d8caa8a078f9b3caaa99735ed3d452f8e28bb18
 MISC metadata.xml 302 RMD160 963f1d00b35f824f4ebb4ecbe565b5d9603ee3ee SHA1 61841e2ff22153be6bd9cb5cacc34fbb6f391b37 SHA256 52c8f4e22cff9920c9a11b04ee574b28cd6fbf71a8212259d9d19122e0ddf955
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+UNz8ACgkQuQc30/atMkApsQCgsFREwPeVXiIBeJfg8gytJ82Q
-d2MAoIRxJYobBVySOSFVFpRNoKT8AC0n
-=rPgU
+iF4EAREIAAYFAk+Ud7gACgkQC77qH+pIQ6S1OAD/WzNxMbEAdgDPrYYDXSo3r7m6
+v56XyRMj0X9F3ophySsA/ic3HQDJWjcmwgv9LncpZ058B9gT6+nLruFpnJp9cqcf
+=vD7r
 -----END PGP SIGNATURE-----
diff --git a/dev-util/catalyst/catalyst-2.0.8.ebuild b/dev-util/catalyst/catalyst-2.0.8.ebuild
index 28724cd74e9e..b60e81c54b24 100644
--- a/dev-util/catalyst/catalyst-2.0.8.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.8.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2012/04/22 16:52:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.8.ebuild,v 1.4 2012/04/22 21:27:14 floppym Exp $
 
 # catalyst-9999         -> latest Git
 # catalyst-2.9999       -> catalyst_2 branch from Git
@@ -8,8 +8,6 @@
 
 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"
@@ -60,6 +58,7 @@ pkg_setup() {
 		ewarn "until you have posted on the gentoo-catalyst mailing list and we"
 		ewarn "have asked you to do so."
 	fi
+	python_set_active_version 2
 }
 
 src_prepare() {
diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
index bbccd7db5cde..3296753bc854 100644
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.9999.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2012/04/22 16:52:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.9999.ebuild,v 1.4 2012/04/22 21:27:14 floppym Exp $
 
 # catalyst-9999         -> latest Git
 # catalyst-2.9999       -> catalyst_2 branch from Git
@@ -8,8 +8,6 @@
 
 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"
@@ -60,6 +58,7 @@ pkg_setup() {
 		ewarn "until you have posted on the gentoo-catalyst mailing list and we"
 		ewarn "have asked you to do so."
 	fi
+	python_set_active_version 2
 }
 
 src_prepare() {
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index ac724a59d0ea..ed95d34ab112 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.17 2012/04/22 16:52:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild,v 1.18 2012/04/22 21:27:14 floppym Exp $
 
 # catalyst-9999         -> latest Git
 # catalyst-2.9999       -> catalyst_2 branch from Git
@@ -8,8 +8,6 @@
 
 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"
@@ -60,6 +58,7 @@ pkg_setup() {
 		ewarn "until you have posted on the gentoo-catalyst mailing list and we"
 		ewarn "have asked you to do so."
 	fi
+	python_set_active_version 2
 }
 
 src_prepare() {