Use python_gen_cond_dep.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 15 insertions, 23 deletions

diff --git a/dev-python/pytest/ChangeLog b/dev-python/pytest/ChangeLog
index 00bdf2492a84..1cf86bdf9a40 100644
--- a/dev-python/pytest/ChangeLog
+++ b/dev-python/pytest/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pytest
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.90 2014/07/06 12:49:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.91 2014/07/19 18:59:11 floppym Exp $
+
+  19 Jul 2014; Mike Gilbert <floppym@gentoo.org> pytest-2.4.2.ebuild,
+  pytest-2.5.2.ebuild:
+  Use python_gen_cond_dep.
 
   06 Jul 2014; Michał Górny <mgorny@gentoo.org> pytest-2.4.2.ebuild,
   pytest-2.5.2.ebuild:
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index ee53c4be904a..f725d419a171 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -9,26 +9,14 @@ DIST pytest-2.4.2.tar.gz 553004 SHA256 bccbbed432b1e95381fbb958c27aabcb751ccc337
 DIST pytest-2.5.2.tar.gz 608703 SHA256 962452611799878616d6df5e7674cc2c356f902ed005dc4dae9d4e79bb8abda4 SHA512 d291f229f4c0a2132c437dde6ca04bf87701fe270c2fa314104badad9221ab866251890c66387d23fefd3ab1f928ee3b290dac21e3d62e7660af8903e85a2f36 WHIRLPOOL 47588d3a2b62f9a8f4df248b2f8b4c8b4b86365839e766bf644ea6c54d0f75c92ae139050cd6a5db080c076b9f867be48fe9c81da19db5285a382c1cda918310
 EBUILD pytest-2.3.4.ebuild 1604 SHA256 d91949eea7f8041bb7c693bfa96880e58e0d5062d224df8800d35b2520672db3 SHA512 11d41756e876dbec4e57ca10e1431d60fd3fe4fcbe258d37ee264a99b4894338e2951334f8b30bcd28f71e4d76040e624cb094fc347b151b2536a7e9295f9b8d WHIRLPOOL 6ac6be6e6e349a64a9a722073a9654c9d01819dcf9bff5c2e917c823827da6a6a4fe74d88cc04583a241076e44675d8bde5b65b33192912162c33d3d10418c62
 EBUILD pytest-2.3.5.ebuild 1563 SHA256 fedfd81744d3fae14868c6559a0a8fc6299a77b050bacc098b869cdd0fc33b40 SHA512 62a2b7ddd9e37bfce33203a62469fc3b1bd385ecbdf9de3d9852327a8223593abe03628de48bc164f090977c4409f6d766f75103c95e2647440ff734479d8199 WHIRLPOOL 84e3e96b12bd2e7ba41ec8a09c41961c37c29ae72e97caecfa97b29a99681d04f03f5ae10639760a6e1b0a6bc022e598940ad2d59dafa4d1b5dadd3d6da89162
-EBUILD pytest-2.4.2.ebuild 1902 SHA256 0ebd43f3b5f31425d248dace6e5e8853ad92080c422174e288922f069ee70ffe SHA512 0b0170492da11747e089a91e4afcf18c18f0408dd732b8df38fb3e1960402828d6c41338a35b0f735c47027c5d993d9759f0ccb161373db55bbc4f7bdc0e2ab1 WHIRLPOOL e7d09fc6c53b5a17ddd35933f4d7662b9c476eba4548a6a4d169963354faa440c163e3b5063ae608a2f561aef9cdcc6ade069e113119846b0b8caebe2ef53ff6
-EBUILD pytest-2.5.2.ebuild 1850 SHA256 19a52b0fb9d2cf163c95780f6f88b49acd41b3ed0754394007da109dbd7c0d0c SHA512 0f01c10c9a21182470f032af45994109fa1e4dc48ad8b6cade34321009f1f5c649697821f65a35e75213c6dc1c676030b8274e6d7ab83285353b30665ebdbdb6 WHIRLPOOL d9057d33d25284bdafb96c9fadd754916c9198b55e48186a77f6df2db1b85e4a3137b7a2241b50fbd09c94c3cf9b53d412e504a3cf8495a759f698f6d7c52d36
-MISC ChangeLog 11770 SHA256 d9918c365bd6b21cd268c7cbcccbd3bc65bee853b065a1f4750be0e23bcfeda0 SHA512 d1a02e9742c7adde244a269c843aa275c841d4503c7680881ecd0d130b6c91458ed0233867dba0e87c2635016e3089a69ae94886759f41aaddb3020306018b49 WHIRLPOOL 9b1f1642a7d279f5d3930cf6e74236aad701cdff7ee755f44c8939345be0c33f492b4e42750adfb57241f8226c422fed04094395799c429301be77f999f3878b
+EBUILD pytest-2.4.2.ebuild 1910 SHA256 c2d23db5c2dacf04903ad2c72c07b812af1a62f96f131f5357f67d80440749c8 SHA512 b5c962876d39177b7fcd6e89be9f85be2410b93b9491c33a223e5e4eb08270fb36b89339c8bcf4ba734fe8bf000992306c698eb2dff2fd8ec563125eb3b25536 WHIRLPOOL 63f6be051b6a163abf4680780377f904aa73bf02707413917fbdae9c7393ef2f8138e2ea9679a798169761d71907d9e37e2d0253665367ec64ee18a2681dffce
+EBUILD pytest-2.5.2.ebuild 1854 SHA256 eb4fc2c6a853e6b64bd095797fa301d54616355890556c9abc5db6028aa30d9b SHA512 912f51b9de5c7be2a1a0480ecc74d7b283df1b1afcf26df37f1c4a450234481e83eebbb17e58991c5d6c621aef9012a33bf01641c4edf5e902987d36a546a990 WHIRLPOOL 8a7a3da263b6acb2afb41df09584129a6e0ee6b94f8564cbab5726616d3f58d0be5dd857057173b0bcccb03e6c490f3ee15f7276af2c5e7fa4d8f302565e1af7
+MISC ChangeLog 11892 SHA256 2d6465f75e3a877595efade9a062647ee4baf757e9ed7b17ceb2c25dd44fdf88 SHA512 b97a16ff287afc22a4e6834beced92738ebd526152862c0bee0df7392ca3c73437bbb315a70dd1483a2b3236dd76513d02209250621630a53b65e4c1bf1437d6 WHIRLPOOL 9dc9fd8c0bf5ca0505f1c666d6eebcb0e367fbda799021ed190512bcae5b852ebb7434b1226ad7246505078aa8f71b51d4f56d9b44a70e2586f1edcf26b0bf4e
 MISC metadata.xml 229 SHA256 d84d28d5adf361bcc2b76c4b2c47920c5b06472add64c47c790522f180f93dce SHA512 9ad7198911f7c6318bcca718f8ab1d436ea14df3edefab5d5b20e36f9ab2c06f3d7d1d3a89ace9b6485b36a93bae88db28d443f51a375c8c2b8f4fe750657139 WHIRLPOOL 0aa5c9b1a9e5f07dfff7cd90a8ecb9ba54820d13261b822a8978492ff3a22369d27cafae2f772f76aac0f55f42e4b636b7c5190677eb6404be6002782ee79925
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTuUXVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOK2QP/2HzhCL1JxareXsfQtWQle9Y
-nv0pKnBI9Z0qDKp8B4N5qH28G6AO3MByvWueMa4methKQgbNs6FDRW/zVUSScAY3
-yMumxHp5lpDKNDU3eUj0kfZEgJ1wjknypjTeDtSicI80ajyUzcgjtM52u/NzCEsy
-8ay9RI9e9VSfwYp43MKWr8KZhrGVbL5yGziSrvJ6ZpupCkNqlz9umHRmSF0zPP0S
-OfuOP65buyf1yS2fpPU4Kwvdax/h7vr8ErtsLvcFRZz3BjVmYEHgbJvEKi39+85k
-pUhCe/W8wbUyqCuJGg10h5aNVaMoqkoIYL91+ohYYl/I+O4bkRwu7uE57HeHdp6l
-0+av2nAVNzQ0wKnYwGLco0TdyuwwnYfI1lx/fDKNEkNFSv3KDkB5Pbv4rDfjIYs8
-Z0YG493Mfm4cWwk8cuLtVYS06dIAyYJ6XkspJ+Ga1bhBqtEsc6TOPsDDHcKoqx/3
-C/BJygbGhjQgcYu3+8gew9pwtbHNU5xwf/S8Eu7dxmePkuD3jtYLQoIw1gYBmwSZ
-lRD4BZuyrpWrLqFYiKWc89i01ktUEIG9TAwyAOqYtfgBBuE5J3k7rqjGZd80sTde
-WeIpUxCRk4hbrciYR6Un8aGYx9iwV/x5zxOILyDmO23l1yNKCAqXo3EApW/PV8dc
-N8W9ntUJdodl88oWm8Lu
-=8nXU
+iF4EAREIAAYFAlPKwAAACgkQC77qH+pIQ6RqpAEAoM85mW2S48BcdWeKPbH9nn2o
+LolwZwAfp9juvgGHDooA/1mn+fUq8Xp7HH1dXExp5mBnZWpw2NFkaNNkDaI2Zw6Y
+=8LYJ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pytest/pytest-2.4.2.ebuild b/dev-python/pytest/pytest-2.4.2.ebuild
index 8468dd8f9960..10dd81d73268 100644
--- a/dev-python/pytest/pytest-2.4.2.ebuild
+++ b/dev-python/pytest/pytest-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.4.2.ebuild,v 1.10 2014/07/06 12:49:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.4.2.ebuild,v 1.11 2014/07/19 18:59:11 floppym Exp $
 
 EAPI="5"
 
@@ -24,7 +24,7 @@ RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		dev-python/pexpect[$(python_gen_usedep python{2_6,2_7,3_2,3_3})]
+		$(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python*')
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	)
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pytest/pytest-2.5.2.ebuild b/dev-python/pytest/pytest-2.5.2.ebuild
index a6b1f9c465df..b731bf76c695 100644
--- a/dev-python/pytest/pytest-2.5.2.ebuild
+++ b/dev-python/pytest/pytest-2.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.5.2.ebuild,v 1.5 2014/07/06 12:49:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.5.2.ebuild,v 1.6 2014/07/19 18:59:11 floppym Exp $
 
 EAPI="5"
 
@@ -24,7 +24,7 @@ RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		dev-python/pexpect[$(python_gen_usedep python{2_6,2_7,3_2,3_3,3_4})]
+		$(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python*')
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	)
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"