Clean up after py2.5+3.1 removal. Inline the deps.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 31 insertions, 33 deletions

diff --git a/virtual/python-argparse/ChangeLog b/virtual/python-argparse/ChangeLog
index aa5863f0c7b9..9f2290f53bec 100644
--- a/virtual/python-argparse/ChangeLog
+++ b/virtual/python-argparse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for virtual/python-argparse
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/ChangeLog,v 1.12 2013/08/07 11:55:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/ChangeLog,v 1.13 2013/09/05 19:33:16 mgorny Exp $
+
+  05 Sep 2013; Michał Górny <mgorny@gentoo.org> python-argparse-0.ebuild,
+  python-argparse-1.ebuild:
+  Clean up after py2.5+3.1 removal. Inline the deps.
 
   07 Aug 2013; Michał Górny <mgorny@gentoo.org> python-argparse-0.ebuild,
   python-argparse-1.ebuild:
diff --git a/virtual/python-argparse/Manifest b/virtual/python-argparse/Manifest
index 173af655a56c..6e32d46f9761 100644
--- a/virtual/python-argparse/Manifest
+++ b/virtual/python-argparse/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD python-argparse-0.ebuild 1016 SHA256 1340fe863053b78d930a16e86690936dd16b738dd9471031d66cb24308aab9c3 SHA512 ac2fcbc8e7dba98ba35aad82cf1b9b2f38505452f148e648ca69b3753dfdff145943889b77b6ed325c582b19c2cee170daa8bba4b4a503b3cf6c9fc7d181a11f WHIRLPOOL a80a6278caecd879a3254d43e326ccf59bc5f1fb72870a74a784948d3dfb3d1669baa165b8e4f17248e9f2c7c505f1770cb38f5842af8252f7098fa42f0e65a7
-EBUILD python-argparse-1.ebuild 869 SHA256 faae35a22fb930a55b8c9cd1dd61b335eb8ca3bb5f670e8523cd684fa5bacb73 SHA512 aaf42a50685cf638f74703fc0788cf3ba682215d3bb5399f366f0c4d82ed7cbf7a740459b0b3fdca61dee7a5fe5c113ddf9d76a1753d80409d7874f86fe0e89b WHIRLPOOL 273d86e2086ca83ebbec0edb91165542413af123bb202762ae08b7419c8e218a3a4f618736fd95d50d0f84675d9a59f29b42ae3bae6688e2081eee3a935bf06b
-MISC ChangeLog 1877 SHA256 4841e45cae5478008a7940dcd0d13cc1a9aabc3d317ec2e2f69de367a61655a7 SHA512 06eecf43f33ab95929612470414e4387ef8fefcc86869d1b5a8fe6e5157bb73c5890429feb26d7d3c93e47f4e35fba72814594d0b5148693a55b721ad4cff534 WHIRLPOOL 70f2a671d1d3b08b2bd0711a664f255b8fd157917bf45fddaeeff0310695c9828481fc36a8867cd0ddf6989ecfe6ccf8e1fde2f44038cae9457d854315a1961d
+EBUILD python-argparse-0.ebuild 1000 SHA256 102effd29819cad76cf5be48535216ddf1a89385fa26789302e59199eb4deb73 SHA512 29da1c16aa5bd9d2922549039e5ea1be5d6692b275e2fe18fedd0c8a3b84f97964b9124006077f4e52eb9c7f100dd6287c7a251ae5789cf22cac4f4af1d986a7 WHIRLPOOL 588998b450b4c7a2a3d5244f1575a957a144ecbd0bd251877acb66285e7c8f81ce4ea8275e262d073f0984635269df5de423ea2219d8eea2d3563da72f8848e5
+EBUILD python-argparse-1.ebuild 772 SHA256 e7a7af88e349b8f66c7ba104474d1fe3047612f0bf96d2edc390644a4781f58f SHA512 9e257c9fab52da348f680fea4a802fb4bc7336dda8f05c6ca820c36d91ff036a6822113704336a774c08c22db362c2ae08c1fd49bb93233b7b335c77fd376a0f WHIRLPOOL adc678e9556f281d2351fa406f070d2512086d501d68f8c57281b22f743b902b46d4da62bd6b12a0cf44edbd6530c9802c29f2187e71741250f202d69de8d14f
+MISC ChangeLog 2035 SHA256 14db9c4db198cd0389cdeba67f3caab7e65e041fd8259e4f86ce210f74243dac SHA512 60b1054d0285d04e1a20e1be9c03e15b959dcf144e08f79e27cd6f835fae785883a0557bddbfe7ee55de4aafc8db1169642768daa11f48d70ed788d9af2662e2 WHIRLPOOL da937801e0c296c9ce66235ecc909b705a86027918f5b31486dfc7e54acf46f34ff35dbe56b8f3302dec6a8d97a0b3083c254c4a154577a3cad54fa815c937a7
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSAjXCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDKwsP+QGjGeEpd8O5hOO2mLwYXhhB
-Fujdz4T2zCoLrOs/tM7qLBKey3EsCXE2Ixbk4raS3tagxpRNUMyB/X4sXyelzkPR
-ERrNpAvq+wLAE/WvZ8TAlv2qYnZVmFcIq5wsPvGns/egB+e1W6r+x54EX1fAHtxX
-JkggnOd6M1GjfF5Kh9Lks6cFMByTefrqpfiz497kQj0FZj0rz7+TIpN5u83/JBTx
-a1XfapNnqgTrjKBD3GRynKjAqJNes9yAk+fJekxZE9XtBuz3xfbO5KoFIzhJ4b0P
-CfoRF6SKF68W7lrTvQaCrdgS8CKTeyhNBBlpweJXF8ww23Oy45Sa5fMU46cFqDo+
-NM6wr/s6oV/BcdkqTmOtT7IlM9Nre9yfWF5FGp6771p1ErlCM4hNfnwdwYPZZzS2
-hKSMtNpFjR5l1GpDaJ2/MFJ81ho72oOjkcCXS82AzWw70FhaZrdRz8XNjwcVgasJ
-yMesPxyrRJuaPQElEc3VA1dHDVvTcwFiPr0aTk8aKv0zRMZOdL7z6JB24UVOx1zm
-oXRtiSgelO4UTRj3reN6fSbUjbFV1n5kpA/mSc7zIl6bsZQHQOFU+c1BUTkh3m3S
-20q1vtPQxMjSXB5kTap8uJzOgS7D9gYsn8cwh5z2tXkxsFNU5NIDTJk79B/UoGq3
-QziuhXwZKUMuzsGNh26k
-=I0NC
+iQJ8BAEBCABmBQJSKNyZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOeYsP/1G+cp+eDHRwRqmZQ+0WYwGb
+UnDd3RuseVVaqOS/OCRVVRStfnm7Zz71gwB18m1j7Vs7BdNjCBmOcjs/joBtsB0P
+sbuJi03nXXg9OeKWQnhO9BW7xtPx6+2XgADZD/5/oZLz4KJs52TKdVm1xJ0U6YQD
+KYGA6+sQRzDRvXnbGjjUj+ZmgttD8R+l2RXVUKfmO5lK/xn3/SloazFv0OyzKXhz
+jp/mXqouUZqZ1fCdgaP04Mz9uj/jlv5idnzX8bPn6bry+1/vAr41sgOW7IUkXChg
+sNoRapYTO/qfDk3WIuUczEsoAi7nfnAdHbxPM0PHLJm+/wgXTg3fe/MY1Ly7Mwnr
+dKmMaGr1+GJLDoYXfoO0Fwa4HcJIgbetShm/Fc01o5IeJ/zPkK7ZyzxWAy63TYTE
+1qPF9HXP+Dn26wZy6XTDl6sY9D62MuZ20HDsiX9E9jEg/O7z83gEJa5iz57v5aWs
+TmuDiH5sYtV7LPo59fIwuUvCEQq3P3zWwaTAzojqQcq4bdjKWVp7o86gq/DMICXI
+YU2H+qDsc7E+brODKCeDLXMYIeG4uma+e86Ba5n/ssvizKQ2cPNpDgn43Zx9ho/n
+5ODileV3KeqON161WX5fO6YrpnBBsQ/nhvT/pWSB2w7UlKV1FHnOmvf0efL6U+Pf
+kF11BjbwjJn1Eg8P9gLy
+=oeSX
 -----END PGP SIGNATURE-----
diff --git a/virtual/python-argparse/python-argparse-0.ebuild b/virtual/python-argparse/python-argparse-0.ebuild
index b041c8c43b61..63de114c3c66 100644
--- a/virtual/python-argparse/python-argparse-0.ebuild
+++ b/virtual/python-argparse/python-argparse-0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/python-argparse-0.ebuild,v 1.4 2013/08/07 11:55:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/python-argparse-0.ebuild,v 1.5 2013/09/05 19:33:16 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy1_9 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit python-r1
 
 DESCRIPTION="A virtual for the Python argparse module"
diff --git a/virtual/python-argparse/python-argparse-1.ebuild b/virtual/python-argparse/python-argparse-1.ebuild
index 0e7f795fd96d..b59de33158ec 100644
--- a/virtual/python-argparse/python-argparse-1.ebuild
+++ b/virtual/python-argparse/python-argparse-1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/python-argparse-1.ebuild,v 1.11 2013/08/07 11:55:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/python-argparse-1.ebuild,v 1.12 2013/09/05 19:33:16 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit python-r1
 
 DESCRIPTION="A virtual for the Python argparse module"
@@ -15,12 +15,6 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE=""
 
-setup_globals() {
-	local flag
-
-	RDEPEND="${PYTHON_DEPS}"
-	for flag in python_targets_python{2_5,2_6,3_1}; do
-		RDEPEND+=" ${flag}? ( dev-python/argparse[${flag}] )"
-	done
-}
-setup_globals
+RDEPEND="${PYTHON_DEPS}
+	python_targets_python2_6? (
+		dev-python/argparse[python_targets_python2_6] )"