Use python_gen_cond_dep and python_gen_usedep. This guarantees clean upgrade after disabling old implementations.

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

7 files changed, 56 insertions, 59 deletions

diff --git a/virtual/python-argparse/ChangeLog b/virtual/python-argparse/ChangeLog
index 9f2290f53bec..98e9674d6bbc 100644
--- a/virtual/python-argparse/ChangeLog
+++ b/virtual/python-argparse/ChangeLog
@@ -1,6 +1,11 @@
 # 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.13 2013/09/05 19:33:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/ChangeLog,v 1.14 2013/09/13 21:41:27 mgorny Exp $
+
+  13 Sep 2013; Michał Górny <mgorny@gentoo.org> python-argparse-0.ebuild,
+  python-argparse-1.ebuild:
+  Use python_gen_cond_dep and python_gen_usedep. This guarantees clean upgrade
+  after disabling old implementations.
 
   05 Sep 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 6e32d46f9761..0a6c79dc62f2 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 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
+EBUILD python-argparse-0.ebuild 747 SHA256 22f67d2f852d2ddbe070ad3f34af558c4911d919f8d0599989cfdbc8f50b21d1 SHA512 85f1eec2eb8fed3d276f327241b450062e9269c59503e623f91821a8ed5483a68a15fa4ff28c95c0061d1614c569771d96f58bcaf02057b4b4f33a3bd05b4b27 WHIRLPOOL dd0550cc5fcabe733763f0c0aa82066e47f71e0466ba0fe64d9559f31d4086dfedf24c5d21bfc10839e44db5a745d4e96c60ee23ecbf84e13c7b6ce692494043
+EBUILD python-argparse-1.ebuild 789 SHA256 0764b426e2f75d08fb72090245c388fc241bc63e34cb395bc9499243cba65220 SHA512 3cb718a080a29ae28e74fc939769b3334ca40cf12abb03d6ed2c83a8589328d8e467174031deb5da84c7aa6d534d73510551ce1e21e710b97e3c417a69a36ac0 WHIRLPOOL f145c664e44c40fbbd1ba9335d145a2aa8c50a3fdf754cfdc558d6c9389b84f47b6e98ad2ace1787cc230404ed84740748005032dad110f433e6e313c8cc65e9
+MISC ChangeLog 2258 SHA256 1950831bf9ecd20971fbd2f7b7311d61ea9d2dbb28302cfd6d912833fa754a4e SHA512 f1079600eb125ed5975ad785a0d7043eca1d7f1552bec9a590a4edecaab8c052eddac2507edeb1090f442f3f5452e4a8a5950ba9934e7d2fc53b94ec4282cfa0 WHIRLPOOL f1c40cc05a0e2c96a01189c0ea0046df98f5dfae03883e8daf06309edf11c9d3c294fe07eb406eaa0dafa147eb8913e335ab0fb59c918ae7b5c774e4cc68f495
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKNyZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSM4apXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 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
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOqREP/RGethZpJp+hT/5s4LFT8WTc
++LbyRXQuLSyY3bTLaUg40cNOpeTc/P90fO99w6gTMALSm5hKY2ZUauZs5k163i2v
+Bfkdci88jJVZDyyVVv69SnaTYHRVgDK10lf1H8z3wkol23xFlAmRrGgpQxBGW/Co
+bRBIb8Ddczq3OPu5scjS1QrZU/BYZbJz7CWbcvf4HMGapN/44t04TG4tRro6jmtm
+Q5mc3BdoBqH8IjBcBF81htcbNb4k0prq7oY9ZCoOccNcMOB77VwKK6fXX9nGDzfA
+unsItkvjKaBF9uJ5OkgpFrKArQopDDZCoiPRgg3rDhx+NnpYFmSV6YIWOn08JMeu
+dzdiS9eKThhhyDO6efqNkKIwPthK+jHoyitvDPLYHXc2Pr+Y0qeltPCUS5RchqjN
+Malb8OijQtJw7HFIwMjdU+Agq3XVFuumR2AHXk+on9zO+ddQyM5oKOJaE/Wg/WZX
+xHoLyWAOg9OzHtd67WTUdZWv8HjlyR+RNN5112L1fDOSEPyzb4F8gimMPmkV2mTJ
+uJzIOmP+tI2414M4ArQ3baS0xdJC01ZViz/kmdDR9VvxiKgm+VgnnfvtJ1rn3lH4
+PwsgZtih8LYBuQcYnZfFtG3FWiztnoG7IAyzWaLH0WPq/bl6t9RK+8xI65ZTvD8u
+kXqKYRjLhwD3DCGdJtsr
+=pBUS
 -----END PGP SIGNATURE-----
diff --git a/virtual/python-argparse/python-argparse-0.ebuild b/virtual/python-argparse/python-argparse-0.ebuild
index 63de114c3c66..98afeacefa5c 100644
--- a/virtual/python-argparse/python-argparse-0.ebuild
+++ b/virtual/python-argparse/python-argparse-0.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2013/09/05 19:33:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/python-argparse-0.ebuild,v 1.6 2013/09/13 21:41:27 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -15,20 +15,5 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE=""
 
-setup_globals() {
-	local i
-
-	RDEPEND=
-	for i in "${PYTHON_COMPAT[@]}"; do
-		case "${i}" in
-			python2_5|python2_6|python3_1|jython2_5)
-				# Note: add USE-deps when dev-python/argparse starts
-				# supporting PYTHON_TARGETS
-				RDEPEND+=" python_targets_${i}? ( dev-python/argparse )"
-				;;
-			*)
-				;;
-		esac
-	done
-}
-setup_globals
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep "dev-python/argparse" python2_6)"
diff --git a/virtual/python-argparse/python-argparse-1.ebuild b/virtual/python-argparse/python-argparse-1.ebuild
index b59de33158ec..633e5e6e7891 100644
--- a/virtual/python-argparse/python-argparse-1.ebuild
+++ b/virtual/python-argparse/python-argparse-1.ebuild
@@ -1,6 +1,6 @@
 # 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.12 2013/09/05 19:33:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/python-argparse-1.ebuild,v 1.13 2013/09/13 21:41:27 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
@@ -16,5 +16,6 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
-	python_targets_python2_6? (
-		dev-python/argparse[python_targets_python2_6] )"
+	$(python_gen_cond_dep \
+		"dev-python/argparse[$(python_gen_usedep python2_6)]" \
+		python2_6)"
diff --git a/virtual/python-unittest2/ChangeLog b/virtual/python-unittest2/ChangeLog
index fed4f694a273..058ba231f689 100644
--- a/virtual/python-unittest2/ChangeLog
+++ b/virtual/python-unittest2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for virtual/python-unittest2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/python-unittest2/ChangeLog,v 1.19 2013/09/05 19:44:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-unittest2/ChangeLog,v 1.20 2013/09/13 21:45:20 mgorny Exp $
+
+  13 Sep 2013; Michał Górny <mgorny@gentoo.org> python-unittest2-1-r2.ebuild:
+  Use python_gen_cond_dep and python_gen_usedep. This guarantees clean upgrade
+  after disabling old implementations.
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> python-unittest2-1-r1.ebuild,
   python-unittest2-1.ebuild:
diff --git a/virtual/python-unittest2/Manifest b/virtual/python-unittest2/Manifest
index 50a585159903..a81c04d3b4e2 100644
--- a/virtual/python-unittest2/Manifest
+++ b/virtual/python-unittest2/Manifest
@@ -2,26 +2,26 @@
 Hash: SHA256
 
 EBUILD python-unittest2-1-r1.ebuild 698 SHA256 b11c89b8fbdecd7746190bd598bd29fe6097d597dd90634302e591fe9fe21edf SHA512 3d5ca2183e03f8e4492009c9fcd1b7c3c00da3a4d3b4e4f29069d33e0c06d0fbd7a9a550899734fa538afd2c6f547aca50ee4ad58d5b834e34bebecc0817db96 WHIRLPOOL 09357ddea2299467be4debb0edbdfe94f509d1fb7fd53ffe6b1f080938e9e5160cae379f7d6f64a29e832303d73cc9340ce82db30f0a9c7d306ebef00f539882
-EBUILD python-unittest2-1-r2.ebuild 743 SHA256 0fbe0eaf7333b04c482eb77593f52b82ad662ee5e3cd4f6bd45f9453a6f1fadb SHA512 d8eaa8b933919b08f130754ce26d91f8f725be236edb4b43f3af189b195f60c0915c4b721dea2c2779e7bf0efc029a09712e6206415c8e55462486c683ad0266 WHIRLPOOL 7d7159e255968dc8146b729da6dc4837d5fcd20072136d2b8f57d80fb26042cccb59fcc3ac3eac386423816cfd7ba91f75910e0a230a338a0a6b96f557ca385e
+EBUILD python-unittest2-1-r2.ebuild 757 SHA256 f20225d295187254f5ac3bc78590b085db9006a4021869f2946045a959e04618 SHA512 8d5db933dc65aada4dd4f278ca3f33789fc5e51c2d09ca2b6cdc622efecb1ea7271afb0738e5e586cf0c0a1838c99d101ca2aa6dcd8dc65e9879efa38bf07bc5 WHIRLPOOL eec2054aef49c394b0841b30a60cd91ded7d147b4c0a382fd83183ada01705946ece22aab4f564c199828417db16a5093ca36a203fd7882da652a22c917f2ac4
 EBUILD python-unittest2-1.ebuild 620 SHA256 e30158116ce914336cb02796ce54bfa5a6e09c916e838cac600593c41739099f SHA512 20fcd05d3d5bf9ae4adce36e9d57be0558a48295f4386e50ed3a4f29d292c44eaa86d075d562688517d3e32f91363307b08053a9bb5ed64cd096dc2bac5c7210 WHIRLPOOL b5e09d1c8dbdc5fb76227e2d92c56bf7bfa7dee606c760a4c55dfeefe0ef6702d97b19415fe15bf1adffca3140c89ff5ea3b5a9975b1fc900ffd3138fc73d35b
-MISC ChangeLog 2832 SHA256 efd7a79c205f44cea320302503d75db5136c4c1580db5e1873f73f3dfc245d31 SHA512 93ae2b4106b914a86e2c2737a42bfdbe81e502613e097a35abccdcf38afca35d23d3ead8e236d767af25b2952227c10b62283ca83b9a799286d9f855b2dc6586 WHIRLPOOL 8dcfd0a62470f9126ac7275bcf70a87454866f3f8195ae3be5c98a014b510dbf7968decce185a5149fa8b253413f6c1d5ba036e46393ebc99a863e58e39e9882
+MISC ChangeLog 3031 SHA256 02404562d975d45c3a01b06b63914a053b0661d9a5465db3d07dc851f4030cc0 SHA512 dc4a6c11a8dfd2173aa325e7fdf25c691c94dc6b05dbea93949a1121ae83ecfad4db2a677e066be22970b1a72482711c634df12a0930fa8f9fa5be309ccb00df WHIRLPOOL 016253b8fd4c033afb63b89c9acbcdbe7a8e13ed3933e0822d37b6a1e622c24198454967244c69d97f68d662de6e13595c01124e59931c2247672e0d544d56f5
 MISC metadata.xml 161 SHA256 54c4e6d783f2571466c7b03622195c255b95cf06209e59ab6653a6366cdfde6e SHA512 b306d222517e4eae525f6a79634f26eff2068f85911b7904c52c485a004d1d5401300808da67f9a1e3f102d65aebd1e0d21cd18145ea0bfec156f2aa3785b104 WHIRLPOOL f9c8e8d23bde25f4b14031f83dcc09e8437fdbcbb27199c1e9d8109fb2ccc7589cabf8240256dbbe6e080d04d2c444d115c66f82fc9b479e1e70d1ef0fe60fe2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKN+DXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSM4eTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOcAQP/0rxv+Ffirv7Hxo0pIIJj+uo
-O3xIzTEOy3qgpgphw8Mo0HloWh203avimCJBAkV+T2YSbLNEGJx8LL14gL9lNuPA
-aTWajj+GEosXCq+fXHANlK38/JO5pqHiPsLzZa9CrErtiI5Q54uQy4rQkIfupUh9
-Lo+N+aqgf2PGFer1r8AJpYvLa4imM+k7M89U3euAtlJJT3WTg//uUzlLHoVOiZ6+
-W2ZpRU6C6ZgKnSZNw9YkNFpNYe7HiJEMZYLoifOo8lgGQEt820go3PPsSanYBZF8
-BHvuyCmwWUdRn3ziojGhV16MsKEN3Bw3Trh//xL+96nV7wzcy9ut1V1A50BLav6f
-Rkbe+CSHNS1iZlJr6F51v+giG3ii95995+P6e15dHph01h0/Npbw0xETjKmkLPeo
-oxgn/8pmC/ewTi00/jbk4Xld/0j3zEUBallZN/+X6DZ7/YnLkDmfT6jzlSpHQ2TA
-9byD0t+xsbfTOhJmBPSe5CABvC71ijTuyxD6QhGdWZzoRooBvyoAdOfqkcDVnHfA
-UfgDeaThZFO7kpW9e9r2FhOdrm+DxKHZeIMdOhZf1fybrs8Z9TO3BpG3DMYfk4Ij
-XbMQewtYmI//d0966cs7/i7abU584rPdAjaXm/5/ZrE0B+hok/x52LgAFIgip4Ld
-cU+Vlf+cPoDNqNqFzzNV
-=X2oq
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOFJcP/39ikCyfI9OXi5YkVxYKvgpA
+BuZQh4xf8YEQ02LhYUI0V1xWhYovBDrna8/cFq6R7OZlvEYgzQ+r73tK17H9XDwR
+WGPl6pGeOt9r6gNwvtsnqA6wJJK5TP1O6m/oO/VCm/b7dKUOmUWx99MjJUvUFIVO
+2XapjeDB7oamvxKNnnmi8H8DCc+BwD/A8vVD/Qhw3juHTIfgWjsybNtcPJoFeZfu
+svCrJ+gvbu4IrUY+hCxSXu9TLkTfFqe5qQLCCla+6w7v0o6jQo54KIbHufmOBq7A
+4HCLMRKCu4vlEBWMGH0u+EWceVNhr6tn/WTkiSzwNRXnWPCmCoTYv4tfRo1yUCBC
+wCeT0TZFAxZxAEkF0JfFz+K/WkXuHBX0U/fwj0nfjwMRrihVCsodq5gIv3CBhMCO
+6WquDS+QZWFkYv+Wrys5cIOlkffZMqSP2aBJMz9pgJNJUC3hC6fN5NLZh1ZTSbyr
+qxrOnd3N7BITHXF63J2X5gdeNUL8eOjA31KR54h7QImMHy95YHOtTdrUwLrgd6Ii
+AzWqLWphifFhco67YZLcCPE2jBBluPHzbnzW0Y3SybOAEdYxgBWoygsSbpR6Rbsl
+pXVPuWh7kzfDpdYoJThT+2Z/U383q3fEPTwb8zoHENcfaj+KeJ3vtFpIA/vofdNR
+AtxrPCgTmaxtJ7OWTOz1
+=No7T
 -----END PGP SIGNATURE-----
diff --git a/virtual/python-unittest2/python-unittest2-1-r2.ebuild b/virtual/python-unittest2/python-unittest2-1-r2.ebuild
index 9fcdbb5192e6..e65f3da439ea 100644
--- a/virtual/python-unittest2/python-unittest2-1-r2.ebuild
+++ b/virtual/python-unittest2/python-unittest2-1-r2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/python-unittest2/python-unittest2-1-r2.ebuild,v 1.2 2013/09/05 14:13:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-unittest2/python-unittest2-1-r2.ebuild,v 1.3 2013/09/13 21:45:20 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit python-r1
 
-DESCRIPTION="A virtual for packages needing unittest2 in Python 2.5, 2.6, 3.1"
+DESCRIPTION="A virtual for packages needing unittest2 only in Python 2.6"
 HOMEPAGE=""
 SRC_URI=""
 
@@ -18,4 +18,6 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	python_targets_python2_6? ( dev-python/unittest2[python_targets_python2_6] )"
+	$(python_gen_cond_dep \
+		"dev-python/unittest2[$(python_gen_usedep python2_6)]" \
+		python2_6)"