Update to eapi5 an python-single-r1.

Package-Manager: portage-2.2.0_alpha157/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

4 files changed, 34 insertions, 34 deletions

diff --git a/net-irc/weechat/ChangeLog b/net-irc/weechat/ChangeLog
index c1aff25416ee..5c08e96e12ab 100644
--- a/net-irc/weechat/ChangeLog
+++ b/net-irc/weechat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/weechat
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.125 2013/01/21 12:53:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.126 2013/01/21 13:38:17 scarabeus Exp $
+
+  21 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> weechat-0.4.0.ebuild,
+  weechat-9999.ebuild:
+  Update to eapi5 an python-single-r1.
 
 *weechat-0.4.0 (21 Jan 2013)
 
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 7feadfd62f13..3f3eb07db0f9 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -4,24 +4,24 @@ Hash: SHA256
 DIST weechat-0.3.9.2.tar.bz2 2721004 SHA256 5e9cb967be7d6496c37d4b05dbff5144796954a7abdd21f3f5e4305f772f7532 SHA512 a34a72204e289fe7ebb5441214b5256471af54e13198ce5dbb58dade043090fb09042ef35e672ef3d3174d0e48744c4d103644fbbea743b32b2b65bd982da965 WHIRLPOOL 6ef454e9d4b0b89554b0c055b6dd5677004064638f958a0871e5401fa5da612c9fec2c7dc4e84f0b483f51f7b73b9e5c18e0ca4a717d0b3c11a1bf9e1f4fc0e0
 DIST weechat-0.4.0.tar.bz2 1740361 SHA256 1df12201d8b0ac25f62ddbfb675e8f3d978e52bc5b644d55ccf4c755956fa60d SHA512 41e8a6d0714c6b821b5fd1e9feb0b95be7f142c081ccdcd0e107ce817a5630598c0a91ab0393d8243c3ef41c6f54b62d2ee056924272b389076af20ec99de495 WHIRLPOOL 95a2d5a87d5d27a96c24f2346c4c34d2cc8a0ec45672df3ca7889dfaa6d8fed8b0fe436c2f6c24b011cc8fd9795e59b84215d27852e34566b6d4c0f7b8fb36c8
 EBUILD weechat-0.3.9.2.ebuild 2904 SHA256 4cf53493a791efdf12a4228dbfd9a4074f62214d5ef455ea82218c3d3573d4d8 SHA512 5f2096c133f701849e6bf4db88f5e0585103f6e304ca0e593bf85d07226dfd744bf44bd30dc85d10c6fd6803bd225fe975c5edb661adf6692208ee1d1222ab96 WHIRLPOOL 4956fbf3c0f006129ca863b9072d31eaabfba4be46964943cd9b1a88f47eeee1af2d0410f9c74c131bbe322983347ec8b6fa42b262decc280719c4d3f51cdd61
-EBUILD weechat-0.4.0.ebuild 2911 SHA256 d93c9b5e094ebc5585ba0b983d01b1e0d607580bd755b4ea74ea0e325c40ffef SHA512 6c76de3ee04e0ff5fee107a7a70cf604931ac43fd7fc8681b348980e7b8a2e3ab58fc92bc7730a80a189dd07ccfc5906d216758ac14f42b6b00465eec7867b08 WHIRLPOOL 581cb6439d388fe3b95892078daf7f857642852b6f62545663d1dfa9d8aa95fa1816ea378c08ddff14b2690d4555256d420fadbf44524c963466f02a3ee82317
-EBUILD weechat-9999.ebuild 2911 SHA256 b830799fac9d468c7bebabb46a7711d6e7cec9e24f56b3070c93e8f55ce48b41 SHA512 c9a2287152597d4ef6a345534e5ab8bb896ec58a6d14c8fa5a5468999169d070e7d22aa67120ef88353d750eae20df4f7ff6ac23c8a170c43299d6612fd89495 WHIRLPOOL 28978c7a0ca12e11372b5da84881f731474432dfcbc4153e38d5455972211cadd98cc311757aaf7d480f718c5fe3e9a7d3521abf4b4f582ea23a6c594cab04bc
-MISC ChangeLog 17081 SHA256 fa1a2589c8859415326652a118517b124c6ea3083755a1ec77fd127394fba4b2 SHA512 2e42b8d533121a4ce66819b615dbd1c9be3b3245c48a4cab86c1f7dee924602b9276f168d8324619f0c18cac251f96b3d8c0983cd3785d7a95f6f84d3cf0a970 WHIRLPOOL d3ef76825f987b0ccf185c9680c3d04b5cd849f5d5ee911c5626e187237d64a44f4505d30171dde70c9309ff2d003ed5419fabbeb2b42f393e8e7677624b93fd
+EBUILD weechat-0.4.0.ebuild 2883 SHA256 dbd4276f2a96848ed2b3da66feec005310cd5f8f6543ee91682b72c69ab9283b SHA512 fc68a2944b3e143761e400a7727d591840e97f14bdfadbea7d866795ac6deef827f06553c8b747d7f85b09780d692488f6332c39a3325b214156529981d7e005 WHIRLPOOL cd42ab92608ce7245df5b8350e4c2268aa230ac40f369e35f257f89798de5baaa40288b2c0721dd5768f8afc75866a6cc15d9c3aaeeff178f7ffa5898c29240b
+EBUILD weechat-9999.ebuild 2883 SHA256 e44e62d4c08ceb46792727a6abcd8a13b936e8a6e99741405cbd6844f8dec906 SHA512 0d36a26d79582fc38b2659cea06bece084c398c36d82195fe4891c00ad5536f6f5bd8f7668e7bf199a7a9fa55279320ca7d7049b3ee1645a247bed40d74f0556 WHIRLPOOL 6d295aebbbe9844723be60449358908582d74812519730e8e0919f450ba092f47f9d3573d9308404f53264e9611b360a7d46203a2891658c4ee03a0da9c2ee00
+MISC ChangeLog 17221 SHA256 65f8768f5ef7082fe0ba8bc49a6842c1a8be9c98385b818caf904eaab848f74b SHA512 b9b030bbe95f31b27b2103b925a0b154f0b1fd31d2233c98a4dddc50837438b836a253c238397b5824de4d6057e079b510f3c1ddb6883c48522b3fbd96b70269 WHIRLPOOL b8a6e40c72f8c54d1e6d554ede1d3af58bffbbcc95e2d172b8d6cfc12bd58f3310b21f74f886ad8b4a5daa055013e48b3230fdb8da7b8188e3904905b1d4b3b3
 MISC metadata.xml 775 SHA256 baddf6a8f9e77502d45119a96455031b564e19a864c8540e5c44500aeb1ddc54 SHA512 2aad4ad5d7b4634bf06078f62e8bb6a53e19df95257b150b43e82b2fe8487ed37c5311dc15d364cb1f5d5fc3eb04ae933e54cc9e44fcf06a471348021feb4d4e WHIRLPOOL 0a21b77e3c62b2e3e2ce4ee935a7212aee8517ef83445710855823e5a5c146255dc15e369f049ca20503205afac611957394494a857ea2f40371ebc50c87d25a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ/TtKAAoJEOSiRoyO7jvo0pMQAJE6sGWvRFKkk3ROqpXq4aaK
-mCo/mgJ7dMOZFtw7t0AL8y3dyAxuWaezkuM7CJkL9bMEULeR5swlbcf9QCPguPpn
-9lQKKahvzENLVFPk7vscjZQmEZAnsueULwSeahkx3aT+ZYYLSICAjqCUfi3ChXXG
-kgMkUKwbNBpL2AsfxSrMNPg0nfv4qAj59bwPK61nQpqvwBT8daquzAYwb8tYEYR+
-Eqio1A9H+GjinU/Rne2Kn1fZ6dT9pi0iZ7xb0QgngYM2smDMSPWc+aKA8mgn/hGj
-W5DajdeN6CFGk9nDuQ6I2t8Ax9NhJu4AVykXeGW7Z/WvINY1s1FiLUWAExZA8Gpt
-u2MfS3VrODh4AGu9tzTf5rQpU8CK+XEgnZtEYK+9jOykLGTrhOk7brAOvlYlVznr
-l7jIASkgNPCpHPyztZtqAppiILOxQs4dAmY8b0GVg/SC20kNQzdymUepIRhgT5xA
-uGv57VmeHO8kBLb/Cs2TOqwrz1t8Xz3z/E7vl4PdCBCeFZ+rOoZJLvvFOjrSdWYu
-hN57YSFjb1kQ+YcgCwZI6j9ddaUvuuq8ddWcrXQMn4Mglk/W71iAxfZ/ZzWnDzE8
-CRhrKnu+oIlgsK0DZdk/3xjTjwJGMCnBAryAsxMCfAlY8Oy8cnmrvx2tuTAo/e8s
-M/PkKnpwQual0P8gluTK
-=MXYu
+iQIcBAEBCAAGBQJQ/US6AAoJEOSiRoyO7jvoh6IP/iT10qzz4zuAROp/VINNUgV2
+cCgyDPTUDnIGeoY/bsgg/1zksgzl97pXgVkGobcYFobRPfqV3V43G7R6/FjIm+tb
+8/FpskxWIsA5V2JjZ/N4UpOnYDPmH08wqzu72da0YKddk6OahjtneuRf87rFbTCo
+2+ZUG1UUCpREdH2ClwLo0oLdiavbgzolrudypzLHipE8VyvOqbyEBUQkzHXp881n
+z4RH2x02Yf2NJnFuo/kpaCrS4dtrkn94jxsOggzEOTHy1r/pGpkyBb4utrKpU+TS
+2ZqFhAX6QcA7RkAmASADrIsbw9MJoqy9iY61cOYXnpFNiCvwIC87cAR/+ktQk1oR
+xHAeJgr/zRg2xiA490njCP6GfxCF4S/hogYRKd7FaTSwjH3X+oID/Efj99IiZ17X
+A4hj0unFWp+2VgfCYnwurdn1GMacAf7w17lnZOf9WHltHTZ0FPA9bqCdzFnzyORX
+7pJJUSDiZ8BfeCmSURPJVklLNaVlmpUgf0GeaAMxYYhJfq/vNtUlZvF+52C5JICR
+cHDiKgAWZwhS5R+l+cZx33KH7Y+ApkUUptDft946JsO7VodNO9K4CfrRosnlWxif
+ZejbMLnD2PLRWtJXst2z4Yt13WvynoQRdt5rV0QwGp8+phiIiEcT7m4b6I0KZ7c1
+2fM2EPQue6Y4bop+0BSc
+=z3gR
 -----END PGP SIGNATURE-----
diff --git a/net-irc/weechat/weechat-0.4.0.ebuild b/net-irc/weechat/weechat-0.4.0.ebuild
index 75b0aaca4358..ce1395fe2910 100644
--- a/net-irc/weechat/weechat-0.4.0.ebuild
+++ b/net-irc/weechat/weechat-0.4.0.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.4.0.ebuild,v 1.1 2013/01/21 12:53:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.4.0.ebuild,v 1.2 2013/01/21 13:38:17 scarabeus Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="python? 2" # it can use only ONE python, so stick with two for now
+PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
 
 EGIT_REPO_URI="git://git.sv.gnu.org/weechat.git"
 [[ ${PV} == "9999" ]] && GIT_ECLASS="git-2"
-inherit python multilib cmake-utils ${GIT_ECLASS}
+inherit python-single-r1 multilib cmake-utils ${GIT_ECLASS}
 
 DESCRIPTION="Portable and multi-interface IRC client."
 HOMEPAGE="http://weechat.org/"
@@ -36,6 +36,7 @@ RDEPEND="
 	irc? ( dev-libs/libgcrypt )
 	lua? ( dev-lang/lua[deprecated] )
 	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
 	ruby? ( >=dev-lang/ruby-1.9 )
 	ssl? ( net-libs/gnutls )
 	spell? ( app-text/aspell )
@@ -57,10 +58,7 @@ for X in "${LANGS[@]}" ; do
 done
 
 pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
+	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 9eeb20d7429b..f82a550aa7b1 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-9999.ebuild,v 1.23 2012/11/19 17:37:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-9999.ebuild,v 1.24 2013/01/21 13:38:17 scarabeus Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="python? 2" # it can use only ONE python, so stick with two for now
+PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
 
 EGIT_REPO_URI="git://git.sv.gnu.org/weechat.git"
 [[ ${PV} == "9999" ]] && GIT_ECLASS="git-2"
-inherit python multilib cmake-utils ${GIT_ECLASS}
+inherit python-single-r1 multilib cmake-utils ${GIT_ECLASS}
 
 DESCRIPTION="Portable and multi-interface IRC client."
 HOMEPAGE="http://weechat.org/"
@@ -36,6 +36,7 @@ RDEPEND="
 	irc? ( dev-libs/libgcrypt )
 	lua? ( dev-lang/lua[deprecated] )
 	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
 	ruby? ( >=dev-lang/ruby-1.9 )
 	ssl? ( net-libs/gnutls )
 	spell? ( app-text/aspell )
@@ -57,10 +58,7 @@ for X in "${LANGS[@]}" ; do
 done
 
 pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
+	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {