Use virtual/python-unittest2.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

30 files changed, 156 insertions, 117 deletions

diff --git a/dev-python/celery/ChangeLog b/dev-python/celery/ChangeLog
index d2eadc6bd04a..4f4f18627ac0 100644
--- a/dev-python/celery/ChangeLog
+++ b/dev-python/celery/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/celery
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/ChangeLog,v 1.13 2012/12/31 12:58:43 mgorny Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/ChangeLog,v 1.14 2013/01/06 19:26:45 mgorny Exp $
+
+  06 Jan 2013; Michał Górny <mgorny@gentoo.org> celery-3.0.11-r1.ebuild,
+  celery-3.0.12.ebuild:
+  Use virtual/python-unittest2.
 
   31 Dec 2012; Michał Górny <mgorny@gentoo.org> celery-3.0.11-r1.ebuild,
   celery-3.0.12.ebuild, celery-3.0.9.ebuild:
diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
index 095ff6d25dd0..1f0b172ea1b5 100644
--- a/dev-python/celery/Manifest
+++ b/dev-python/celery/Manifest
@@ -8,17 +8,17 @@ AUX celery.initd 6011 SHA256 f7d870cf9d9eb80395448281f7be645686f3dfcb62385b74fd7
 DIST celery-3.0.11.tar.gz 1218453 SHA256 cf21361896a095bc602fe531b56fe6b58961233053fac43952abdeaa569e4951 SHA512 ddb2bddb6170670d6e95541c84ab5c7567f208ff347352e08303c309c4572baf4182f5220833fdae72f5cbe3b672d3e5373e9fc6d3250d7aaa5bf882f6f14abb WHIRLPOOL 09ec8aa9edc7d66ba21fd1ebba13177e9aaa9f2f822b9c7ae1dbcd0dd972cdb88c6e33f0b05692c34e85b9884499c98732e15bc10024a43a38094b797a1ac869
 DIST celery-3.0.12.tar.gz 1218262 SHA256 716a465327ded5048893d518eafdade5eb09eb9d941e6efdbdaaac73b0251d3d SHA512 4ce7da636b52b0f87d46444c27ac1c6ba2e6afc1cd3378829e1a01c01f18adf6ed91e64e08ff19a52833071df58dbf6d452ffcfd008a4fe1ce57ccbff0bb0ed6 WHIRLPOOL 5d045eb19394d09b6816d60a745508565d75775b814225939ee9e252b0690cca2b4b73850a970ba98a6c3ad21bede1747d297b7a8e757bb0cb8d366ced275650
 DIST celery-3.0.9.tar.gz 1213486 SHA256 5ca0156feb7de5fec47e0aa8e275039cb78e1f32842b59635c786a877e45b1de SHA512 df38f0cacec52bb146dbd538eef1cc548aca71e36c4db9f94ddc84bbc8dd226d89898a6ccbc3a2799afef2a8a1c79d2aca5591e6b4c7fa3b858983ce4058927c WHIRLPOOL e62f8e899b90d77297240433210cef129890b64dd27c1669d0ca95334c231d4f6bcc4bf3e842c1b27a41da9dbe8adb19113db9b86c6e50fb886a7deadff4319f
-EBUILD celery-3.0.11-r1.ebuild 2410 SHA256 22a6c01e26d654fef686aa378c43c7cc51004fb80dc320f303482132c822f6bb SHA512 8810134cdd1b42eda66d11d8ec84254fbf3968a13bbbab9d3bf2701d69899b7feac24132df3179f8a18afe343d900095fded687a215cb75dfdaeac737fcb7e9a WHIRLPOOL 3a4f33bd8f90fb2c65ab778839ea6046ac77355512ce11840b5214a782af6c05f188e90860a305cf75c692c70a1d0affe1389d1ce63d9dfd82c2cabd95105257
-EBUILD celery-3.0.12.ebuild 2407 SHA256 7e1480fd8ac1fd7eab094f07451237fe79888fe83b53c881455d671a31107f09 SHA512 316ad60a80fb796245238a89fd2640b2eb6c9b4b2bfcaeb37837ddaea517a1bc41063d0756bdcb0ea6cbc6c060a120ca96ef77b99d1dc3735b62ed6979fa65b5 WHIRLPOOL c3d98bee76b7443506a6326e83826114ee3645ee6134a140e57b93dd6e8f92888837f720a0649c6b40169e9c6b21a6e15901f3685bb001082791423c52b4760c
+EBUILD celery-3.0.11-r1.ebuild 2406 SHA256 d6fa042004285ea192323fff4758d74e17ded4560f900491f231c556e8ff146c SHA512 e48a9a1806bbe8c88047e322515537c95c680376a547a05ea9846970910f044f0dbb2063fe2cf3ba951528c99b5e0161ace03c8e59499b4d226e1eb72c4ac036 WHIRLPOOL a5a4cf46980ffa8add2d3b7aba2e48ec6db39563eb456669ab06acd6260962382d1368a2bdf49a8233c3c8d07217ed8d56b99e8d37e8ef79e1d6f5f0b0c74044
+EBUILD celery-3.0.12.ebuild 2403 SHA256 d6d7fa7389eedbffce042c6cfc07eccc2aa9a89240d0bd52b3e6ed85b5f48c02 SHA512 2202a4ebebd335bbfea505f31874bd6f70f3535cdbcbf10acc44475ceaecd1effc36b2aa4eaf83e6ee9676f1ce5832d149574fb973f97450edf2f94e4b2a9355 WHIRLPOOL ab6bd5c08c766a5a7552432fd9f1a8611719f839d08b4e261744f4fe3b8c3d7a42767868b73591632ea32ebfa60de5712ad862ea310c9bd12c16a2e5e7e05730
 EBUILD celery-3.0.9.ebuild 2271 SHA256 85491bdd9e1a667dbe3b1f7564412d58b19e1de0bc6227b4d112aed9e5d499af SHA512 d223af4f44521a98dcb2ab24acab0202dc222acc1d56996b7bcc30a36ce1e263db7dfed0f64e9381f6a6a55dc8cedd829c80c6fd1239ad9179d38eabc7bb7ba5 WHIRLPOOL 5069670c85fa38bdda7db1a6a676725fdbbe17f46c979e6b0def6871adee76ddf8527348023f145d8f1c42518ec57ab50657dc8e86aea231cac028bbc41d2aa5
-MISC ChangeLog 2453 SHA256 789b48e413dfede12afd2a3311507aa2e7229d4dfd3e8a3f914784cf53172076 SHA512 d1b3c6a31a2b7c9b2b84ca7ef9738d5f3a796b6d6f01d8303bbbbe2d60d8ed588a4064ec6abdd1dd26f3ac7611b6559b63d302d34fac15b1d12da7506ee4db92 WHIRLPOOL a78fde7b24a7a28f8685e518eb8725b311388962f49153b8beec79e2202a11d53fe60f7405f547c4a1de44e0fab64646ff09331ab0e2220d387ad2f5467eba21
+MISC ChangeLog 2585 SHA256 f361775f1acf32bf72d56fba32aaf46d5776f2c10d8ea695633f7d9420cce343 SHA512 dceef9455c19d66427d50101179375fa4f42fb2d4eb4f5351e29172dac73bd53dc8c6258163a8dcddfd6a49f0ce525e3fb1770f417683d8c1ff5760c98e137f5 WHIRLPOOL 0435f432416d0ad79ac566cdee1dc6736e1a157d691d874428531d4122100e8617ac3579c60ba02cae4130f23fe0f74f568a939be5f8de83edc3b0f135a6e9cc
 MISC metadata.xml 381 SHA256 af2b8d52964a565630562f79dccd36e499b18854c2b4499d2a2a66b1b66aae37 SHA512 2f532aa222dffbe5f93b4e0a1d8e7e17a63c4bf5b0e9d0401ecc2b61285f94aa8c4b43c9963bfc8424bab1f480837bae0d7e22ab737d539028c15080d79cc35e WHIRLPOOL 47eb9c001c00807a6fa27b637875300fa3741f87e0966cbf319502ad085edd9cbe8fda0543e619bc4671b1650a99671e3a6fdfe18ffd096cf96d05a08994a185
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlDhjBcACgkQfXuS5UK5QB3nIAP/VRuJTOP5xEBzKjRHLARrnGMw
-dUMIn0p6Mx0WLnqqcJcdlToUY1s95qnhPTYTL9gcmrrqGLUDm0Hc5CYUNE3Wfusf
-EF54nvDsF8Ezs0xvexH1mdOBx8mfNvfhZ+rm/RTIDNX2EK+d3Dix26iNkDGV2PRl
-08NHZwiFcyQw0TiQwYw=
-=ARw0
+iJwEAQEIAAYFAlDp0BAACgkQfXuS5UK5QB2MBAP/VPiyfhZGc2tOakFpK3Mwfbip
+14Gbdc81W1S7ZG7uleWfOPzMGuz1D2pCUxLckHQXDPmPFfISu34zIkIPbRZIDDmJ
+GHNd6PFvleaaj9zYXjWz+iKzrXuxgBB2LGOJEXP/XjKcNLu9oegu4iOezlt29GGx
+795yG+zitRHQA5EiIkY=
+=ErrQ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/celery/celery-3.0.11-r1.ebuild b/dev-python/celery/celery-3.0.11-r1.ebuild
index a99269ab7eb0..c5329cc58be6 100644
--- a/dev-python/celery/celery-3.0.11-r1.ebuild
+++ b/dev-python/celery/celery-3.0.11-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-python/celery/celery-3.0.11-r1.ebuild,v 1.2 2012/12/31 12:58:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.0.11-r1.ebuild,v 1.3 2013/01/06 19:26:45 mgorny Exp $
 
 EAPI="4"
 
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/gevent
 		>=dev-python/mock-0.7.0
-		>=dev-python/unittest2-0.4.0
+		virtual/python-unittest2
 		dev-python/pyopenssl
 		dev-python/nose-cover3
 		dev-python/sqlalchemy
diff --git a/dev-python/celery/celery-3.0.12.ebuild b/dev-python/celery/celery-3.0.12.ebuild
index 67424aaf9114..1089a70ccfa5 100644
--- a/dev-python/celery/celery-3.0.12.ebuild
+++ b/dev-python/celery/celery-3.0.12.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-python/celery/celery-3.0.12.ebuild,v 1.3 2012/12/31 12:58:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.0.12.ebuild,v 1.4 2013/01/06 19:26:45 mgorny Exp $
 
 EAPI="4"
 
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/gevent
 		>=dev-python/mock-0.7.0
-		>=dev-python/unittest2-0.4.0
+		virtual/python-unittest2
 		dev-python/pyopenssl
 		dev-python/nose-cover3
 		dev-python/sqlalchemy
diff --git a/dev-python/django-celery/ChangeLog b/dev-python/django-celery/ChangeLog
index 0ee6083c8c71..08e59c126a69 100644
--- a/dev-python/django-celery/ChangeLog
+++ b/dev-python/django-celery/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/django-celery
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-celery/ChangeLog,v 1.7 2012/10/25 10:59:48 iksaif Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-celery/ChangeLog,v 1.8 2013/01/06 19:28:37 mgorny Exp $
+
+  06 Jan 2013; Michał Górny <mgorny@gentoo.org> django-celery-3.0.10.ebuild,
+  django-celery-3.0.11.ebuild:
+  Use virtual/python-unittest2.
 
 *django-celery-3.0.11 (25 Oct 2012)
 
diff --git a/dev-python/django-celery/Manifest b/dev-python/django-celery/Manifest
index fab298ca36fa..7dd0ba4ba8f4 100644
--- a/dev-python/django-celery/Manifest
+++ b/dev-python/django-celery/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST django-celery-3.0.10.tar.gz 77983 SHA256 f7ded3d59ef9e5a1922bb4365a7a2c1fea82d84b70278fe6d695025a03279042 SHA512 e9a76831941984dd4431ad3f7d3a25faa5977e959b2b19a7233bd7e50be69b0a9abb3208795fd96b935613884bb18bf013de352dd5a2ab373ebd43ce4ff69305 WHIRLPOOL fc882e1a8def2cf6df490cb8f84fbf927d9d56e7bf5cbf8f144f2d5ed8cd2df075b629f7451185d54d90e17e6dc1a85c88249a9b7ad2a5dacb49247a51e04731
 DIST django-celery-3.0.11.tar.gz 78162 SHA256 0d48b2d270a4192c6f6ccb8a3675e2866cf9e6ed2beeea0af3746821d093ec30 SHA512 ad33b59eb7b69b6334245c369ca3dcde667b3772f06ff91cb5c3ed440e6f1376ca49e6ed880763f85b277445e675cdcc272d1b54351bee0d1a3dca242fb5dc80 WHIRLPOOL b6fa28e885ea77c8098ae20ae7d62775e095b51ad6ba04d039c4a8414da2c2e498ed6c6fdf5fcfdb98a066f637031e285619e2af242ad68f88c385b9d04a0a4c
 DIST django-celery-3.0.9.tar.gz 77694 SHA256 aae0b12f39f1533e3510780417edf1116e7ab4fb711a3b91157ca3828499f62f SHA512 a20f2800560d4e053b4252dbc06818b2d0a120db84e65af03efd26a1e87e3f1f906ff063730bc57f19f7c9fb86d640250e24f5f702cdf313df251ea411c5866d WHIRLPOOL d58e7c69fd25b985676dd09555b30fc87c2f8b82e66331c704e93a844e238812724bbd8363456cb0e93ee3684c18b8837ffd167c274870244fcb84aed7deccf1
-EBUILD django-celery-3.0.10.ebuild 765 SHA256 9639984b062a9e4ac5c27db3af782564047c66420ee247e841e46dc67fa3ea49 SHA512 18e272430cbc5cb2726fc8e89c0fb741abd56b424d17e3fbed4ae9c4ad4d71615352d8208b6d15365ec75896f2cd5612e1259d3ab55a1943fe5e29a5f8c5f47e WHIRLPOOL 24f93d1016be997307aa0b9afc4b0ec22c491342104767792a0b541beebe3910ec1b4ea512a5f44dfd02b6a435734fbc607cc28758f460a4e58fcdf862363982
-EBUILD django-celery-3.0.11.ebuild 782 SHA256 c384f7805c5aec392d2f4b2fda4ab9d1f777fe196d281d796106c9059bd36715 SHA512 1d8daf53ee519ba900d4ad65a5200104bcb7403e2c2c8cf5f35438a25aeb9b2a8669292d114b74f4e9872ca88a23d2254bbae96a178e90798d69a450baeb5d3b WHIRLPOOL c640b827cc6e3649d41750e3bfa3ca923dcf94dc4dd442a336b2e3f29a067524b22676bcf92c0aaa37134a2c44cb998652bfe31b974e3af94e1673c09bd0129f
+EBUILD django-celery-3.0.10.ebuild 761 SHA256 1fbb0fcafafe12769fc725cee0062b79a57cda8105ee5b309686f1f740f410a6 SHA512 f792289a0a0b0ae730b85a9214f2aaac5f490b020fff51051b1c372b098b091b869a249a31d3d29d4349878831b88d46c6540e9b2318d89ae10a195a0eb7a2c6 WHIRLPOOL 4e0adc4a28d04761261da95283a632b1848cac0f6c00a287dafb441f5d9b184851ba77f26eb5f1f31523470b74b293cb40392442cf60f6eb99691f759844b52d
+EBUILD django-celery-3.0.11.ebuild 778 SHA256 fdb62bd68137150cce670660c0f5e698399ae4c38b495d5067b4927e8c19cd63 SHA512 32443bfe2fb2c83a8c6ef90b1f63e3e970d99a8510029b30210210ffdc4a1865a4cf53e730756d3828a60e75aaf8f0dd9f3e8d453ae1462ece569971c9407025 WHIRLPOOL 103b4d55049e7cd4f88e28d9c7e09cdfcc42334833f34a69a2fadce52e2bd0647d2e7a92f358650792bc5a2178dc2855a6b93b9aa4fadc5d11cba625957d1a41
 EBUILD django-celery-3.0.9.ebuild 674 SHA256 eeadbf2b69d804d78bf4937d8d470f469114f43c646430bc1ab5ed29e0cc8eb6 SHA512 4483c704a4f878d175e586783809e4a561a750c5fa0639b39e47c7c671f1531e82fb2f4d9bfffbd9f7928ffe1d1ebe6002e15fcbde97a01df7f1038a50ad7407 WHIRLPOOL bff44237a8d7a2367e25452578e63681eb791f5c549bbc3e1a9bdc84e27f7c8869b2fb1990be7afea5445f736d52f2e7571a2091f3a66381ce2c7ac64aeb32e5
-MISC ChangeLog 1249 SHA256 605798e6f0ca2973c3732770868671622923f881dd7a09a92340602806dea7b7 SHA512 e36bf010e4bbf04b85a2a4f6fdccebbab2cc4ffdf6553f2c6f05a16a00b9ec51ff185fdeefc5b516849853b7a83b42245457a6d075c084314907d4a6980c16a4 WHIRLPOOL d8c120afe08c428764f645ca557f3e5a2875ccb95003ff7aa1afa25f9b2a5d613e9b001572381d31c95da6b508e8dcb2fc2de2c41a92f9ef50302318f624f1a9
+MISC ChangeLog 1392 SHA256 6ad77da6c2eb52ff7de903867ff5a99a4ae61d9bb22cf6290eaa977abdca9d14 SHA512 9a991c0582bab53569ea3fceb7a0b64866a069b5ed3da88433edff9f77a3ec662a848b987472748e9ee3ee240c831dc83befa5d3ba1b969318d8d5f29be468c9 WHIRLPOOL 7e5e5aa809f9035ffaa57e8b15986d53e6ec09b86ecbc8335b4e8d022abaaf3de29b9904ac5c0817197bd5f8c0d999ffe18ad00619949985ccccc2d91e5a8115
 MISC metadata.xml 390 SHA256 0b325b08f55a48fdbf87cc6e04805ecd761f362ca56c32d5b68aecc3f806e764 SHA512 2ca507fae5da34e35dbaa4b600bf0bc86d6872e56cf3a5701b2bb82b769ce3f89b8d7dbfa42cb6268a2575ea2934fd8bfc0ddbb7e9a724b45a28e2b0205229f4 WHIRLPOOL 4427db2d36b0bffaaff579c0d10d4bcd44ab484ec110bd74e3e73f8fbe672fd0ab7dff937ffac7941767c550ad4e8a61de370c5e760a0e920c4bc297b2f2bee4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iJwEAQEIAAYFAlDp0H8ACgkQfXuS5UK5QB082gQAsZTh25lTRXilB/GS8/Fx5F+S
+6kziWLaI54XuG+ZUztv4EOgyrDaav5Obnye8O4v4KFKR+CHwbZJvLUn6smU54GUK
+FbmEp7IGtTc9zCngrrsvEJnf3hrQdTdxVforTqwPExYYmX43iDmmKj9TUXyU3xcN
+uVUZzKltD/zMpEYD4Pc=
+=4fb7
+-----END PGP SIGNATURE-----
diff --git a/dev-python/django-celery/django-celery-3.0.10.ebuild b/dev-python/django-celery/django-celery-3.0.10.ebuild
index d4fd99bb6a23..9f0c40f167bd 100644
--- a/dev-python/django-celery/django-celery-3.0.10.ebuild
+++ b/dev-python/django-celery/django-celery-3.0.10.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-python/django-celery/django-celery-3.0.10.ebuild,v 1.1 2012/09/28 10:39:38 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-celery/django-celery-3.0.10.ebuild,v 1.2 2013/01/06 19:28:37 mgorny Exp $
 
 EAPI="4"
 PYTHON_COMPAT="python2_7"
@@ -20,7 +20,7 @@ RDEPEND=">=dev-python/celery-3.0.10
 	>=dev-python/django-1.3"
 DEPEND="${RDEPEND}
 	test? (
-		>=dev-python/unittest2-0.4.0
+		virtual/python-unittest2
 		dev-python/django-nose
 		dev-python/nose-cover3
 		dev-python/python-memcached
diff --git a/dev-python/django-celery/django-celery-3.0.11.ebuild b/dev-python/django-celery/django-celery-3.0.11.ebuild
index 610249b66421..6799dd7501bd 100644
--- a/dev-python/django-celery/django-celery-3.0.11.ebuild
+++ b/dev-python/django-celery/django-celery-3.0.11.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-python/django-celery/django-celery-3.0.11.ebuild,v 1.1 2012/10/25 10:59:48 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-celery/django-celery-3.0.11.ebuild,v 1.2 2013/01/06 19:28:37 mgorny Exp $
 
 EAPI="4"
 PYTHON_COMPAT="python2_7"
@@ -21,7 +21,7 @@ RDEPEND=">=dev-python/celery-3.0.11
 	dev-python/pytz"
 DEPEND="${RDEPEND}
 	test? (
-		>=dev-python/unittest2-0.4.0
+		virtual/python-unittest2
 		dev-python/django-nose
 		dev-python/nose-cover3
 		dev-python/python-memcached
diff --git a/dev-python/dulwich/ChangeLog b/dev-python/dulwich/ChangeLog
index f12dae4b7918..c8f58686aa1f 100644
--- a/dev-python/dulwich/ChangeLog
+++ b/dev-python/dulwich/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/dulwich
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dulwich/ChangeLog,v 1.57 2012/12/31 10:50:39 djc Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dulwich/ChangeLog,v 1.58 2013/01/06 19:31:54 mgorny Exp $
+
+  06 Jan 2013; Michał Górny <mgorny@gentoo.org> dulwich-0.8.5.ebuild,
+  dulwich-0.8.6.ebuild, dulwich-0.8.7.ebuild:
+  Use virtual/python-unittest2.
 
 *dulwich-0.8.7 (31 Dec 2012)
 
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 712bea27f624..ee7885a2856d 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -5,15 +5,17 @@ AUX dulwich-0.8.0-darwin.patch 869 SHA256 9d255f480852d56486d9f5f939c77e623bb7e8
 DIST dulwich-0.8.5.tar.gz 203727 SHA256 546d2840199500dc270da5bda456df68de4d1733f8b184bf425c5e560f988b6a SHA512 9914b711dc0f699097a65cb4fe137d1b4e0ae9b3c0e1bb75791e891fa0f9a6bd25433523c5d7a70c65697b1e6c12d79bc82a8da3104f513198924fd32373defb WHIRLPOOL 0eb443c9ba6be4f6b6465f49363de0aaa42362ca159287f990e6310ef168c33bcf7adaf3098ce089f0df25c5debb5a82b2611383187870fc4ba570af76472a3c
 DIST dulwich-0.8.6.tar.gz 208467 SHA256 fd7337656ac304e295771b9fa655e7f417015ad6d071553bc3e5ba876efc35c7 SHA512 fc49dbd468ee67bd8589db246445a4ab636c3c4ba522b50653f69446395b9273279b65691076924572d3615f4cacbfb9e37d2a6c51fdc8dac5aaff52ea209887 WHIRLPOOL 7dac9aa728e27fbff254649d22f1389acac2923fe491354d3df3d3e553a0517d3db0787634ae29d41910f6e69231a96ed0dbc6221b7780e570d00613827392fa
 DIST dulwich-0.8.7.tar.gz 208639 SHA256 7ba336d0100b90baf843b20d71fedc8a92e36de41c1acdebe4cba12e76b93810 SHA512 0ce47c8c9d9cd386c42d6b1f20e7101810b13efca8902f29b67150ebd2f936768b4db81c35a750624850db72f220eaa224100c534624c2f50f722f5334ba9788 WHIRLPOOL f7afa22cc0f29076954026e2d425df3cb1d7dbfd99f4b32f70e720d42a8c2157b8a7c1379e4fe5a9ded2aa5146c1420426004ad70498dbdbc15ba3f24db7094c
-EBUILD dulwich-0.8.5.ebuild 1434 SHA256 3d0fd1a4c8a090650dcd20eb81670829353d36539427d5cfe4611abf3c471022 SHA512 634ce459ebbc0468ff8ec88d15143eff33089d461f56a7736b4bd59767e8437e1c0cc3cebd18f236ad918d5858aa2925a0a234396d9862c9fa8d0a44101ae163 WHIRLPOOL 4defd612ee943a854026eb40709d42a4f50ef959c9c498b3e235a4393dd92580a011f67ab3726b244c97897f80f4ecc063fc9a4783c3878ba242e88530feaa4d
-EBUILD dulwich-0.8.6.ebuild 1436 SHA256 57a25a3352304d2e716c3ae3b36c61f98d180a5c25c8e87bda72afc0a75971ed SHA512 09bdbbf4a07d14dd2608c997e2f0ca0166e5432055313c78cd1bbbece1d7e9d7215a1f591263e35b01c37f9d2c65762b830a78354878d44abedfcf50acd22510 WHIRLPOOL de436824aa6b8cf96d0332cf04590bef848c29a3f29764cae835b8edf13fac3d69b0e75012822f2107f087f0e63a7305d7d5ec463c848019273ab8e668168a45
-EBUILD dulwich-0.8.7.ebuild 1432 SHA256 c14824265ab72b49225a99ab53bad76a4ec67d5c720afe0fee60e29048f62aac SHA512 48d08cea9f35f2d4a7b819a5cf357fb2d1ef729bfb04485ba2569e209d54cb0e5a6aa20722bd4fd689812f8300f537dbed9765b59e310da7959d1c38b6358c8e WHIRLPOOL 7809d3c8eac1c4c0b1c1869adba6e8678b389560c9bb5a0eb87199bdf638293babacd4a856447713512de01613b0e4e089344d7ea6b0d628884d49c5efb2798e
-MISC ChangeLog 6946 SHA256 e8ea4fae3d13f4429dbac6ebe803223b8048aba18601f4060497713fb1adc65d SHA512 3d6f39dfcee2f733505e30ad7267794df90810bb7730878cd722c1c30948874a0c1c8462ec0a5684361f92640835cb6df14e901e55404f3f90f6beec78f3ddcf WHIRLPOOL 8df2e6ca50754b736845073ac8e9881cf7ac8a6b6f54fde37b9a87cd6251337bf69560dbd1ff66b274895e40e6695150676e001b5de0f0c8fb459be4f97c8649
+EBUILD dulwich-0.8.5.ebuild 1410 SHA256 5dd4b69157744ad3638d4cbdd9672e9f46a80fcaba8e3434101f7e7fb6f28c6b SHA512 8a68bdb38be589e0889b5eb05a5d1414e4f8b0d7c845aad4065a4f890fb4f085180984bc0453b6b0e833c65890e68927989bf9291d4489dfb6c98e9ae15ebfda WHIRLPOOL 10a3b1cd4575ca31b5d26067db7b3397b1342137fd1d835f9f25e4b194705dd5f9b688276d0324458ef4a0ad1f719e4bb47a3a9ece8e7b13f5652a4828929799
+EBUILD dulwich-0.8.6.ebuild 1412 SHA256 14dbe5175c27ce656b413ffaab9b286697eeae9830cd43f8bb06eaeace486ec7 SHA512 21ea0f7b21264d8661f1e8d84980bf6e0aa6dc83989281b44c1ad565f0411fb807a14d932e226085e340aa678a9a34bef8009a449a0ace6a7bbaf0dc4ae99849 WHIRLPOOL cc2476517c4b01e9e0f381e690e0cda38a5c11f214c349c9bb5abc2aea3bd1a57b53a4e4b48c784bc3de6f87347cc4021ad3e777e3e7c070fd723bb3f5251e32
+EBUILD dulwich-0.8.7.ebuild 1412 SHA256 445e0537dc667a6fe01d094ac052946103f766f3ead0132c94d264f60c748b38 SHA512 cddde68eb1434eb74caffc951833b5e75620566f944f2f55794d84e3773b5d86c7f410b165d9cb978db0b478b27aa2d937c05a8fe3e41dc9b995c21b95d15f37 WHIRLPOOL 68ac21774a06ab824a7528aaf09100e01d1f93d193b9fed3586c7e557d4320126c710c83423166a6a99d8686fd6dc9dcfd9a2083ffab5e160185bf336437931b
+MISC ChangeLog 7100 SHA256 5c6334155ceed29fde5b333fdac9351dff697e09554aab284d045798d6faf1f3 SHA512 942727f8f5d0115ea1407951618908e57281e4e1311ad8204e360682374ab564ce4e8b634af8ad0ad3815dce0d01cd748076893dacb680c5c725f0da3601779a WHIRLPOOL 15d5996d7a711bf0eff771eac6a0926bee401de4c2dd913bf342351f4bd61865c31f4e6fcd16de823fde506dff54db3135186da70854c4500100bf50b358225a
 MISC metadata.xml 360 SHA256 8ce45bf5319217c8027a2f8a0fe3b5814be8851264b969d1b232d446cf9770a7 SHA512 95a27bc5d7fd73d055cf6e42eba1d8f2ba04565908c0e7fa7ff13f9a8e30935cdf08c955c6739a21a0274f7a6be4cdbceaf260fdcd0b31a19ed8d9513bb8d4c9 WHIRLPOOL c229e0c47e9549ba4e97c3b8f4d8a11b69fb3d4002d165a712e7ed2b8550e2a73f729001a2fed789989b779a81b665a7f53dfc9f2e361f7ececfe94bb7c3e7b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDhbiEACgkQxeMuLWsGW/vkNQCcDLLlftWzAFzwdqQsMh8y5Etm
-FIIAn3Mv5uIHO4YuHb1X/Ol7oMe3bt5S
-=aKVx
+iJwEAQEIAAYFAlDp0UUACgkQfXuS5UK5QB3z1AP/fDQpENdNbcsQtJjds5rUhlpg
+ClaiAuWVSuySJhT29zOeoYj9/awGum1L9ccMxk8wOuVsMoxs2Xt7K6webJsX3tTS
+ooaTYdqswwuzPCAMX2kgmLE/xHVAtaFnWea8NlNft6x36Inx6pXqUC4aaiuQ/b9q
+e1IzqIWr6MydqXdIGA4=
+=+70r
 -----END PGP SIGNATURE-----
diff --git a/dev-python/dulwich/dulwich-0.8.5.ebuild b/dev-python/dulwich/dulwich-0.8.5.ebuild
index aa014bc9129c..c0621e312b24 100644
--- a/dev-python/dulwich/dulwich-0.8.5.ebuild
+++ b/dev-python/dulwich/dulwich-0.8.5.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-python/dulwich/dulwich-0.8.5.ebuild,v 1.4 2012/09/30 18:18:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dulwich/dulwich-0.8.5.ebuild,v 1.5 2013/01/06 19:31:54 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -20,7 +20,7 @@ KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-maco
 IUSE=""
 
 DEPEND="dev-python/setuptools
-	test? ( || ( dev-lang/python:2.7 dev-python/unittest2 ) )"
+	test? ( virtual/python-unittest2 )"
 RDEPEND=""
 
 src_prepare() {
diff --git a/dev-python/dulwich/dulwich-0.8.6.ebuild b/dev-python/dulwich/dulwich-0.8.6.ebuild
index 5ecdb8572037..9bec396fa5e4 100644
--- a/dev-python/dulwich/dulwich-0.8.6.ebuild
+++ b/dev-python/dulwich/dulwich-0.8.6.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-python/dulwich/dulwich-0.8.6.ebuild,v 1.1 2012/11/13 08:27:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dulwich/dulwich-0.8.6.ebuild,v 1.2 2013/01/06 19:31:54 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-ma
 IUSE=""
 
 DEPEND="dev-python/setuptools
-	test? ( || ( dev-lang/python:2.7 dev-python/unittest2 ) )"
+	test? ( virtual/python-unittest2 )"
 RDEPEND=""
 
 src_prepare() {
diff --git a/dev-python/dulwich/dulwich-0.8.7.ebuild b/dev-python/dulwich/dulwich-0.8.7.ebuild
index 53e09e2caf39..c69a167713a0 100644
--- a/dev-python/dulwich/dulwich-0.8.7.ebuild
+++ b/dev-python/dulwich/dulwich-0.8.7.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-python/dulwich/dulwich-0.8.7.ebuild,v 1.1 2012/12/31 10:50:39 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dulwich/dulwich-0.8.7.ebuild,v 1.2 2013/01/06 19:31:54 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-ma
 IUSE=""
 
 DEPEND="dev-python/setuptools
-	test? ( || ( dev-lang/python:2.7 dev-python/unittest2 ) )"
+	test? ( virtual/python-unittest2 )"
 RDEPEND=""
 
 src_prepare() {
diff --git a/dev-python/keyring/ChangeLog b/dev-python/keyring/ChangeLog
index 99a09b10758a..2fe1c2dd5b83 100644
--- a/dev-python/keyring/ChangeLog
+++ b/dev-python/keyring/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/keyring
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/ChangeLog,v 1.3 2013/01/01 00:30:29 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/ChangeLog,v 1.4 2013/01/06 19:36:42 mgorny Exp $
+
+  06 Jan 2013; Michał Górny <mgorny@gentoo.org> keyring-1.0.ebuild:
+  Use virtual/python-unittest2.
 
   01 Jan 2013; Matthew Thode <prometheanfire@gentoo.org> keyring-1.0.ebuild:
   update to eapi5 and distutils-r1
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 6e91a9ced429..7db454001320 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -3,23 +3,15 @@ Hash: SHA256
 
 AUX setup-1.0.patch 866 SHA256 17b780756f442bd1e4cb8bb0100015921f15ad60ef499d1048b7cb50f2ae12bc SHA512 9c12013472dab8541454353cb68aca2dcf5d5624ec51f81d9d31245d5c156693de4d058ee90a32aaa8366e8eede806b1c43656d567bf8f8db3bccb7189453d8f WHIRLPOOL 1a6b999e9940f6d32b354ad10768bf45f01065c4fdf0023beeb39cf69c9d39cf8d052a768f6c9a0778dda27e573c28e05a25c38b8cbb14890b87d1a3d7916643
 DIST keyring-1.0.zip 61370 SHA256 628070bfb2daa080c98ddb3057a2f802cd1d15720ca40e54bdb2aa39d97485f9 SHA512 6b5002b06c5aa420786e4114c3fdaa75eb79ff72af460dcefba5909224bded2ccd9bd19a7a3847395403283f29d2108ba7679adbc97af5717a539c9f14439dd0 WHIRLPOOL 670e6420001defecbf17f1430fd62b48196d89d5ac4f5bf585c5116fec06bc028ca0c18f64fcf5d0c4dcc10e77674d17e75ce3ba29fb5e14877fa61c4f05ffd0
-EBUILD keyring-1.0.ebuild 1059 SHA256 e27b251f236b8ff0f252c52465137ad959136901ab244f466f43107de83f8029 SHA512 7714a7a319abb458db78111db7f4a7505c7a70693b77c85df24e4d2f51986e9a1fc45371ebb4b656b32ac3725db8600d2e147d644d46acf27e1f4c81637f5277 WHIRLPOOL da538bc6fb9e007064e34d630664868407f61b5e588974ead1b4b385c980654fbd4673aa98fa8731e8e73a9cb18107b3b36710a918adeb6dcfbf44603f7f3832
-MISC ChangeLog 620 SHA256 9306ddf2d97b3a3add18604e3a83c043563751ceaa2811f5073d860c4b57382d SHA512 98c56ebdf43da96188b9540372a6e73d00dceabb1c59224919c320892a4b9d42d56e2f543af2313190a6b4a4df42fef6b9ba80818702fb3188c0c27bf034cc48 WHIRLPOOL 0f748e2f41d249da656dfc3faad279a9ea7d33101358c323552c0676d0882ec255f47d1031769f3c8e0f288c91e7b7a0c41d2e7c94c36f306e193903f627c0f4
+EBUILD keyring-1.0.ebuild 1073 SHA256 063227b7bc1c759cd2b205d7f253a924336c5ab7568519254b2250d391fc7365 SHA512 f1eccf55f0a5ae61e22769ced7699d3e3287db56a9dc8697ea3aa40ded51ecc4a06f1acb1b4e960bf7a134a3b51b0e3aff5e91a77aedef8062f0e44e64e14903 WHIRLPOOL 307dea55104f3bbd06b936c4cc28f36eb3186ce8d2a300ddd45e023cd2dbc0cf67b89b524b10d07190dafba84f8eff723d96cb2ef6df200287c1ee4336ae8ace
+MISC ChangeLog 715 SHA256 ce5adf67c49cc97595102cd58846bad4ff2d06a0c4107a6d93c93ec05f7aaeeb SHA512 934f47ce3785e3ff4ff4e5b63a4cb721a1956229160dab6f0edb2a9d2f2730f49ecceefa11bc796331cfb055c9043faf6696bff5dc85e3cc42550bed912dfd21 WHIRLPOOL c6956933faaf5198ed94d7726efd9bcc025277358144d63b140f3620349b17b9ad019dea8ef2a49b1f9d426e220fe7a0030f43d9d0285d69befaee19665f04f5
 MISC metadata.xml 818 SHA256 26e48739ec45104788c764f494c012611307ec0885e53fe8c481398e4edf47be SHA512 0d0caa868c0c398228a1af7496c6d5fdcc81bc9382a5f401aa15e31e1e320635939e4b00ed1c981a06ec2e670ae1cf69662782305d568f90ca41fabca549973f WHIRLPOOL d263c499eeac15898c134a16d118f0d7af46a4883c668a96fffe900f0422bce7df44cce6199b7b25d92cdc4ec0ef91d130576b708f84b491c46c792d33bdbc3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ4i4tAAoJECRx6z5ArFrD17QP/1pDW8Jq3J3RhiFkZPgFSspW
-g4aq3B+R7tmV7bWIliEhp8pdqkxYUcX5BLouoQw56T1RissybUON8yl3o+o5gsbE
-FbPGO84Dmr5Qbcvc/sL0saSnClAvRflhBvBdhMMxFGzvsP1S2nUFmWy6jgB7ap/M
-GBw31b8NSl1P9xDQsy+yOj68dnsVGQvDDi0+efIPekhWxQuGdzzI8QOcLsxovUEP
-COPXO7uOLmf376pxCzZRxCgUFWqfzxDHaV68zMfChNQ4iEo7adWbkKkcjwyv4d9V
-TwyNFV19FWlo2EvhAPHiq5QWlig5SdlTQ9lIaG1plF3BXjMkL+yozvL4ZmQj8iYT
-JpoHNQBf7G45al64jGD/77ChMzBSL9pETFtrxltz3K/iRTeta7LayToqK2Z7GVSs
-BZV7F1v0T8q4TCeujtakW9i+FGrVhXZvhL+41KFHTE0GqwiTUXmRXLytlpdve6bE
-dLCYeguMVol2YRq8HQrMGou5V+MoBQUx5rKqqJrh4suaSiP47htk4TdyRdznaFMn
-GPHymdH1IrVO60R9TzELcNAuP3ochZK6b1V5StQx2hp2qXjyWJP+HQZIMKuJ6/rp
-NPs0MipCHQehV8e2Oq0eSYoi/lr7sC3rzpjUWhZcks2fU08susUdBG89Zff8PpuE
-WJkbWm4qL3ONo+Bvqgwq
-=dylr
+iJwEAQEIAAYFAlDp0mQACgkQfXuS5UK5QB0wmgP+PvM905shSuUTqAY8JpbFGvSr
+IDcHRP9KTjRzDvAa4nTmHjyu89b9NnBLTo9eTkpKfbSlvVuVS2Yg4LAUx09HFC8Z
+OP9qTRdgaCq5K9ls7xwi+a5ukaYdjAo56WLE2frEOF5RhxFvb+p/H0Oia6j6lV+D
+sAjCIFGaHLGmsAPNmq4=
+=FMOL
 -----END PGP SIGNATURE-----
diff --git a/dev-python/keyring/keyring-1.0.ebuild b/dev-python/keyring/keyring-1.0.ebuild
index 5775c012630c..0fd3cb2da428 100644
--- a/dev-python/keyring/keyring-1.0.ebuild
+++ b/dev-python/keyring/keyring-1.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/dev-python/keyring/keyring-1.0.ebuild,v 1.3 2013/01/01 00:30:29 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-1.0.ebuild,v 1.4 2013/01/06 19:36:42 mgorny Exp $
 # Ebuild generated by g-pypi 0.2.2 (rev. 214)
 
 EAPI=5
@@ -21,7 +21,7 @@ IUSE="test"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		test? ( dev-python/pytest
 				dev-python/pytest-runner
-				dev-python/unittest2 )"
+				virtual/python-unittest2[${PYTHON_USEDEP}] )"
 RDEPEND=""
 PATCHES=( "${FILESDIR}/setup-1.0.patch" )
 
diff --git a/dev-python/kombu/ChangeLog b/dev-python/kombu/ChangeLog
index 0bb155ff0b9a..603c881a38e1 100644
--- a/dev-python/kombu/ChangeLog
+++ b/dev-python/kombu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/kombu
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.13 2012/12/10 12:20:04 idella4 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/ChangeLog,v 1.14 2013/01/06 19:40:16 mgorny Exp $
+
+  06 Jan 2013; Michał Górny <mgorny@gentoo.org> kombu-2.4.10.ebuild,
+  kombu-2.4.8.ebuild, kombu-2.4.9.ebuild:
+  Use virtual/python-unittest2.
 
   11 Dec 2012; Ian Delaney <idella4@gentoo.org> kombu-2.4.10.ebuild:
   Improved 'variation on the theme' to build docs avoiding use of die with
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 887b8f6c024a..e42b75d2efdb 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -5,15 +5,17 @@ AUX kombu-2.1.1-add-assertIsInstance-with-unittest.patch 467 SHA256 a38902c382db
 DIST kombu-2.4.10.tar.gz 291204 SHA256 211cb68b133578338aac0990d31d9255ed54b5f1861fb2cd54c1bb28bdbc8a6e SHA512 e2d10d2d3c13072b079e29f12094b9a88e55f58e1368da1ebc0eedface3c1e0bdd5d3d7ac00469027051b61c3285a30f7b6d47a0fe8345d8bf04cb2a7b1f8748 WHIRLPOOL 6e4324dbabc1a61c7f4596e6bd54d750fc6f39f28e364c13213f130149a070153bd36fd76e2fef3ceaea4ded4cd79b3cc1c3708a2da20be4c5f1d06a2fa3bc6c
 DIST kombu-2.4.8.tar.gz 290975 SHA256 c6613158dcb21d630300dbb53fb76dabdc28c21ba2b13386ce39fda136c5907e SHA512 cc340c14e7d081ebfb59c439db39b13aeceb62e803c8738072e4626ee8f23cf1ea73e012f25dd972b11a06520b86831261ace8ff878b0a1ee8e905e3f3f9f5a0 WHIRLPOOL c7a41aea5e99ed4a8f33fb620e8ff177b764484112b1c7ad980f7cb8bcc8bffe8c1a6df5ea7a904e7135e9c53e5ae3393b3591d0056bbf930c6b74e05fffa698
 DIST kombu-2.4.9.tar.gz 291187 SHA256 94ee2160adbc377fccfa9dc156056103ba566536b831e75c9569815b9f4a9598 SHA512 695aa7750542136227f00e39713de24397ad58279c510afd49070ae1f3d1fec470a64abe8bf67be75800c70ba03adeb40c6cf1f9e412434e4d039eb51acb3e6f WHIRLPOOL a66e5638fcd9404fbe95f282b68ada58e19b509f0240592b10ffcea369839dd4417bd7be3297a94174119c7758c93317f60c7f0c054fc80f376170dac1c8fae3
-EBUILD kombu-2.4.10.ebuild 1720 SHA256 fa00cafaa8d5cfa94c8a991bdd77b38e36670a60137f96bb13c4e9f031e29159 SHA512 8db903eba7b3be1be001b605858b4408aa738a98887de846a9bca1b70af5a66c7ac6dea06c1de8caee93980ecf0f00b39ee9afd12e438ade5d6d27a1d015ec47 WHIRLPOOL c0fadd802acc644e970fd1129b1f11ff18285722e99521a93c91702c0c8af3ae2f483b7f8f34260de6e7f3dd5ccf46ec2ac254836f6bb5c128a45cc4804af15b
-EBUILD kombu-2.4.8.ebuild 1550 SHA256 7febe50e5f3bf05afc03218a4ccdce0b488bf99ac41b46b8f51ff3f7c379e48f SHA512 45946f459a395f1887ed16d6d6db64440d451a0a2658b64b58947164c295c75803ca92fbb2f7da3012fdac9de0b8fa0f8ea61e7e54fe0553ff518873ae215cf4 WHIRLPOOL 0f2978bb43f5cf045bdff362504e022f70810ec40f44ff3cfdf7119f23772645cdd78cde9f20fab59fd8d6ebf2ddbd4bc60f1306ca2ce09d7b8643ef637dcff3
-EBUILD kombu-2.4.9.ebuild 1427 SHA256 85c3134b7d24b3a3196ae2649b02648633dbc2ca99bd8c4a916b2aa028f98c99 SHA512 35beb98476c9770cadff72427f8a34c3301b8731cc4abb40386f2a87520793ac366df5921c7db57500dc2193e3c0b4129a44223dd99aa9ceb5bce20c70de08ee WHIRLPOOL 70b6aafdc4410b4bfbe6ddf39c51fdb9a71dd5e0664c0f1fdfa1c9ff0f87379a08f5f234a8338a34ab0a9882aa370e7f3bb3e7a6d12c45c7f7ffe6e77b633178
-MISC ChangeLog 2235 SHA256 fd61fe5ffa44f44c197de6c98faa52785d691147e3571ef40f6b3b31447b4a0c SHA512 736d93102fb4d33e446cde31f4cef0a4665ffe27acdd043f63d757b6362f16f565a947a6c7fe0e6221ce8645464d144dd35f74f34b2b24e8c29459e9dbf6d284 WHIRLPOOL 65b54acb1526617bcc9430ccbe9ab852d0bd5beca9a9b6f143f91283bcaa033402588306f53e7347b70d5d875f80edc2b29cf4a98f9d8c0a9e0b2ac4fa7a0fe3
+EBUILD kombu-2.4.10.ebuild 1715 SHA256 37a80da2922453deeb6c3cf390a8e06f116044480aa1f4fd5f3072f80fe2941b SHA512 d6120508d00395133937902690e8157bec9c54f8ca694f4a5ba71f98f9417ee320f7287979addbb03dc8a9858209acdb7d98cd964524f54843c10662350c8fb2 WHIRLPOOL 92595c85039176a899ea037d712f6016b03cff64fa38611fdba9009d437afa103ba1a364d823e526a1fe40c88c143d6a778e9550337b1347e31e4c591bc05c28
+EBUILD kombu-2.4.8.ebuild 1545 SHA256 c507ed2223215b4da4fd75b6b79e5e4f9fd1ec4caae394f23ce5da4b531db622 SHA512 db27d028796f62441bd49df528a87fe0ce4c4297c838c9316f27a723751b3083c1cf0f49aac7c493ac85bf508a15b7f84cf43a75d748eaa2a295e8f04ee457b0 WHIRLPOOL 9756cb7eaeacd1eb53ad4e90010e685cac2980346f9027839e72d52d68674f7f5030e8903c8e32a4f610ec06340cd9f249fd2663c7f371efb4a512d1e47857e4
+EBUILD kombu-2.4.9.ebuild 1423 SHA256 22a26c69b89258668ecf655f7f45b8d5701357a3aac37ff3e2dae1dbb53b44aa SHA512 53e85c1022b24bf9765c0cda048ed991b4095cf9c4fa52516f59527a4903890e1e36c6cf7af77379517256dba2d986014c388a5c48ac774a5001a2e84321a0e8 WHIRLPOOL 759dcecd2d6a921bb7ebdf67583c1e36aa6d6aaa7735770fb13f84c031ba27cf593e13f225e3e29dbad95073afbf3ee235e11d3b4aef84447590db338a693686
+MISC ChangeLog 2380 SHA256 9624a056760d24aa99558f906006ca8648a786736e0ad4cefc7b7a62604eee10 SHA512 e3e1245415ce96e6c09e9fe9046665d1d60252a7d5434f2a1be87cdae7af1222c9512d8e56330b36c163619f2c63e80b548c04d05ff185dbfebb1c3ab9ff9e35 WHIRLPOOL 50414ef4c8aa2053cd9b4765fd878f7dc6ab0d6f51a48fe0e53b0479766ce10d1e2ec55beca69673902e00b0fb21b5feea3b5c35fca63c49122e6b645480902b
 MISC metadata.xml 374 SHA256 d9e8e1c0078fef43de27867f490457b1e43953d73e38c5bfcada7b798b754463 SHA512 001b8178c44cb7f838331829e77cbabfa0cecdabe8d84e5dcf240e3ed27eceb19e47685e99a9301848d315666ba7238f8990dbb1067f731e9dceeaa2a6608220 WHIRLPOOL 27a4d2e6d310f811a892367f109aed7a9f4ca0f052161956ec6d1eef3570f31d30fd4aabe2b16bae2ede04a081273cb8c1f07bb96f361f9afcea9b6875242b62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDGtHUACgkQso7CE7gHKw0iYQCeNYpHU/+8L7VtYR/AZX1Nh8Xc
-fqYAoIxo5a3WVOIuX7r9Cru5woQjmNQ/
-=sJgL
+iJwEAQEIAAYFAlDp0zsACgkQfXuS5UK5QB3T3gQAlb8TZ1zIT1V8KBjGyNDu3U/k
+AnnHdLyKF3CpD1Bx/llbpLbtmelyUmz2yAVIryrj7ZHecOFLOM1tpsx3ZbzmDccG
+bhJE8M9OlIG3llw4DS4/wF3wyXiIW8cLv7Jfys/wCRNa3XMw/6GjJ6V5OSfv6FsA
+IuN0FbSe3Ic0K0YZQog=
+=RQ+t
 -----END PGP SIGNATURE-----
diff --git a/dev-python/kombu/kombu-2.4.10.ebuild b/dev-python/kombu/kombu-2.4.10.ebuild
index 742d23922761..91cb9045f7dc 100644
--- a/dev-python/kombu/kombu-2.4.10.ebuild
+++ b/dev-python/kombu/kombu-2.4.10.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-python/kombu/kombu-2.4.10.ebuild,v 1.3 2012/12/10 12:20:04 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.4.10.ebuild,v 1.4 2013/01/06 19:40:16 mgorny Exp $
 
 EAPI="4"
 
@@ -26,7 +26,7 @@ RDEPEND=">=dev-python/anyjson-0.3.3
 DEPEND="${RDEPEND}
 	test? ( dev-python/nose-cover3
 	dev-python/mock
-	>=dev-python/unittest2-0.5.0
+	virtual/python-unittest2
 	dev-python/simplejson
 	dev-python/anyjson
 	dev-python/redis-py
diff --git a/dev-python/kombu/kombu-2.4.8.ebuild b/dev-python/kombu/kombu-2.4.8.ebuild
index 71f28647ccdb..420f4c4acc95 100644
--- a/dev-python/kombu/kombu-2.4.8.ebuild
+++ b/dev-python/kombu/kombu-2.4.8.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-python/kombu/kombu-2.4.8.ebuild,v 1.1 2012/11/13 09:59:08 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.4.8.ebuild,v 1.2 2013/01/06 19:40:16 mgorny Exp $
 
 EAPI="4"
 
@@ -26,7 +26,7 @@ RDEPEND=">=dev-python/anyjson-0.3.3
 DEPEND="${RDEPEND}
 	test? ( dev-python/nose-cover3
 	dev-python/mock
-	>=dev-python/unittest2-0.5.0
+	virtual/python-unittest2
 	dev-python/simplejson
 	dev-python/anyjson
 	dev-python/redis-py
diff --git a/dev-python/kombu/kombu-2.4.9.ebuild b/dev-python/kombu/kombu-2.4.9.ebuild
index 74c7bec77b1d..fcb7044f71d5 100644
--- a/dev-python/kombu/kombu-2.4.9.ebuild
+++ b/dev-python/kombu/kombu-2.4.9.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-python/kombu/kombu-2.4.9.ebuild,v 1.1 2012/11/26 22:47:19 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kombu/kombu-2.4.9.ebuild,v 1.2 2013/01/06 19:40:16 mgorny Exp $
 
 EAPI="4"
 
@@ -26,7 +26,7 @@ RDEPEND=">=dev-python/anyjson-0.3.3
 DEPEND="${RDEPEND}
 	test? ( dev-python/nose-cover3
 	dev-python/mock
-	>=dev-python/unittest2-0.5.0
+	virtual/python-unittest2
 	dev-python/simplejson
 	dev-python/anyjson
 	dev-python/redis-py
diff --git a/dev-python/oauthlib/ChangeLog b/dev-python/oauthlib/ChangeLog
index 906148f1ca3a..82fb8c719155 100644
--- a/dev-python/oauthlib/ChangeLog
+++ b/dev-python/oauthlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/oauthlib
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/ChangeLog,v 1.19 2012/11/20 20:38:35 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/ChangeLog,v 1.20 2013/01/06 19:43:52 mgorny Exp $
+
+  06 Jan 2013; Michał Górny <mgorny@gentoo.org> oauthlib-0.1.3.ebuild,
+  oauthlib-0.3.0.ebuild, oauthlib-0.3.4.ebuild:
+  Use virtual/python-unittest2.
 
   20 Nov 2012; Agostino Sarubbo <ago@gentoo.org> oauthlib-0.3.0.ebuild:
   Stable for x86, wrt bug #441282
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index 96f9666b6a6e..935618942f18 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST oauthlib-0.1.3.tar.gz 24684 SHA256 6066c9c0ab07953f98870bc97d29f6defd066b6c215de74b9976666f3f6c3d40 SHA512 08153dfbad31616e6ee88d748c50626fcf62d72148c623a6589ab3124e9d2108fe37cf283db7f2116dd163fc45d8d4fa244a462a2fd9f13671a92eec42f08fb7 WHIRLPOOL d8e698de73626921f127895950d526bcb15749d5caed3405883fb6790d73732ea25fce24bf4b51da918866ceda484f2db64e2da2be74b4830f0a4fae4115bb56
 DIST oauthlib-0.3.0.tar.gz 43581 SHA256 8c62a18370b87fda3299bad4d4af2949e1bcb2d65519887ffcdcbcd00dfa9bf0 SHA512 7f69cc80cbaa9161e7b562bef475ea912373a0a1c2a84ee7d19d724db6e0f9d0f38cc9cf95672efcbf9e9200f7b4650a75ab8205fe004e6cdebf65fbddef7771 WHIRLPOOL 37e6e892fc451ad28ae650a6da89109c17495ca7a2453b4fddc99fd5773fb19d1f16f0889f181e7de17032156a5fe3c56751c50b8bc380287b330c0278ede7c9
 DIST oauthlib-0.3.4.tar.gz 54799 SHA256 7f3a2bc708c9667aa9e5071bde10bcaa1c07218b4f0c777383a98478ef47bdd3 SHA512 8cefd8120df5e1bc97de057c9771882d56afc0cfe2bf0025452c8f25a43723935b34edd108c5de3a54acb141577ee57e294d4621ef83a0bbf981788b7f89eaca WHIRLPOOL 92abbf92e68ca1f9b593d062f61bd18f9c16ac1796b1eee3257bf3620e607191e984d4760195a9671dc8fe3924df4acdbc1673456e84c4731a91ac14f67add53
-EBUILD oauthlib-0.1.3.ebuild 1009 SHA256 3f3ad7fbc00c829b768f50503508c638158ab46d20cc119ba674a343fab1d7d5 SHA512 d743abd9db8e8519b6d13fc3977bbf59f954b52eaead76c92cee2d7451b5f05811ff9ce7291165aba720a1baca486d4f9c5537cc6a7b2478778faca779dd5d92 WHIRLPOOL 1b2755afe20b5b1f704b4a794a973e00459d3e36e1259e105b2080f4730b7175e5e16bb91c00f954a50acf67a31094e5fdbd36dde1e2a4121114379bbb914d89
-EBUILD oauthlib-0.3.0.ebuild 1010 SHA256 2f9a01271119745279ec8f2bbb87b56b9464a96a126acb31e7955792532f4f67 SHA512 afa0830804d30ee8b3ac5494df6c18d0be9d344261d0b99369ecb068cafef47bdd9d43c7172c0264eeac4e93e51e8ea81649548b1c4254269237f91967ac0156 WHIRLPOOL cf5c13509924ad63918cebd418db37c2d3eff57994f1d9c8d64c9675cd568312e0a4f31a1e153896210959ce3a856759d8084accae9549a2867e7b784732b26e
-EBUILD oauthlib-0.3.4.ebuild 863 SHA256 e937198ee8e58ca180608bff3acdd4430ceef02ee775064f86475bdd7eff6a01 SHA512 328bf13895d41f7c2a759167f1d49f2325553809691fbacf9cf0462987a1e5c688a91ec64d4f730eb669ab9f6134088bb6fa02e941c8e7fa23d5c07dfbfddbd1 WHIRLPOOL 8500ba34299ba84cdb0547a188247632517461f21b5b9daf3b91b4befb3fbc55488720fa4a38e4642c3071746f68357bcbb7a40488c2d660a2fa6e3bf65ec986
-MISC ChangeLog 2713 SHA256 1fcbe6a1186292ba3b134da97bc7f232fda2d4f4dffc3121916d429e709020c9 SHA512 be553e30a3816465bf06bb23c88364fd81ccb98ab2a76914877431e0202b7ab6389713a2238dd4687f0b816e9802a6f3940fb2127f02fe3215aed0b42adebfbe WHIRLPOOL a575388d195828d5c4d0a7a6b5513ec5355e0ae9a8c952349806de6f1be8f663261621ddc331f70526c52dbe3426a9d4c2cabf591dd28624b014993babae0c42
+EBUILD oauthlib-0.1.3.ebuild 1013 SHA256 6514b861a361684f6d5cf94114022f984f236d4f47e416a1805912d53dfdad8f SHA512 8ee6eab35ba91a4dd3e0858e5ea2d922e5f6607c253faff702e0d0cafb47fe45ff6e1aa1ec814289fceecd6dd31fb0b1f473d396b157e20b0af3cdf3e87cda91 WHIRLPOOL 132e4807c1b53f5375e55071938a52bb93a2ab5cb556f037751cf6ae1a077fe19cd1ced8f521d39fb0737a47a11e450481de5c17fd0b58629ebdb9bab058a366
+EBUILD oauthlib-0.3.0.ebuild 1017 SHA256 3fdc977186d7d5a6643fc61c3396ea101c73e52c9ca19b31dc552e5e1ae5208a SHA512 f139ee6416072142068f54d184c616ea38a51d495899c93ea3df912d6745bf01c1e768db02b31cf3dfc268a692addf3ec92f113af2de6f182e5842fce743f724 WHIRLPOOL ff3a92600d93ab66190db4627ef39e6b744e1a9b72bac5843885627306be6883bb9e45de5cd33dc662a606ab9024e346f9c50428b5f09f6f8b1c610a7fa1d919
+EBUILD oauthlib-0.3.4.ebuild 866 SHA256 95c1c9cde861652d9dff255ed51ceb1f98135d119cecd8deb71af2f40a6daba0 SHA512 eb435e43453b36526217b6ea86297024461f13a920f817a55de19a41e3b7198dccbc78f8074d47afb8d11e45e8d2559beba02f94980e0f5bdf5271435d27d18e WHIRLPOOL 53c4c02aa5513644df74361d1ecfc15e271cc8d44c83a0708dad8f4471fccfe7e323109233eb793d3b4a1e6c0ee97ba39cd02bce5a1219118632678eacf6bae6
+MISC ChangeLog 2870 SHA256 5761094622b78f22c7d6c5566c6e17567a4c6b68a9667fb6d0cc74c6fd6bdf11 SHA512 6dd8c7aec87cc110b58c88ead9d9a2c2034b734a627741afbc958ef9f39ffac34a6402770a8e6fe89370df4ba60899c70ad24e5315aee5fc7d226564032a4113 WHIRLPOOL 187c529e2f5bcd11132d7891e70b2ab3616b53d67eb734099f7f27fa07afbe1dc546d8f4bc1bf64347587ad3e7b3e310f5615b4c57637ffd23589e086e9e0579
 MISC metadata.xml 231 SHA256 790deee3a5490e8bec583624beec13a4929551495c9851369c6778fd21f9a5f2 SHA512 06078030df4698e68ad85ba5ca30d0720dc41c40cb4e3f4201a3a7d8ce345e2580c59506f14aaf1c66e30b1d92e7b2576dd8e4b21ede4354ea02d87528bacbba WHIRLPOOL d5483755d91bf8e879310ac21a64c38d316235e208174a49740a74e2224878ea4149be1885bccad27d08ce52ae12135021f8686041ce1acd976af9549c11d483
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iJwEAQEIAAYFAlDp1BMACgkQfXuS5UK5QB0C5QP/Z3N54VM0a1enPSCtpFvrC1QM
+K8BZ47njQ2jpy4Gx9OcZH8qaT4S2MZjBL5T/sqN3tfhrUhHPWfUWzB0gu5HjspmH
+/1gnuZ/E1LnE/RRXvsN38dljxUwa2VVlesJXc7ZGVSFm9ZJA8nRezwANwKX82qIV
+ru39sE87cLpmlJrsQ/4=
+=p8DZ
+-----END PGP SIGNATURE-----
diff --git a/dev-python/oauthlib/oauthlib-0.1.3.ebuild b/dev-python/oauthlib/oauthlib-0.1.3.ebuild
index d13f948eca35..b9d2686bbf5a 100644
--- a/dev-python/oauthlib/oauthlib-0.1.3.ebuild
+++ b/dev-python/oauthlib/oauthlib-0.1.3.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-python/oauthlib/oauthlib-0.1.3.ebuild,v 1.9 2012/08/27 16:02:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.1.3.ebuild,v 1.10 2013/01/06 19:43:52 mgorny Exp $
 
 EAPI="4"
 
@@ -26,7 +26,7 @@ IUSE="test"
 RDEPEND="dev-python/rsa"
 DEPEND="${RDEPEND}
 	dev-python/setuptools
-	test? ( dev-python/unittest2 )"
+	test? ( virtual/python-unittest2 )"
 
 src_test() {
 	touch tests/__init__.py
diff --git a/dev-python/oauthlib/oauthlib-0.3.0.ebuild b/dev-python/oauthlib/oauthlib-0.3.0.ebuild
index fa04bb978e16..bcc02841e5e0 100644
--- a/dev-python/oauthlib/oauthlib-0.3.0.ebuild
+++ b/dev-python/oauthlib/oauthlib-0.3.0.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-python/oauthlib/oauthlib-0.3.0.ebuild,v 1.5 2012/11/20 20:38:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.3.0.ebuild,v 1.6 2013/01/06 19:43:52 mgorny Exp $
 
 EAPI="4"
 
@@ -26,7 +26,7 @@ IUSE="test"
 RDEPEND="dev-python/pycrypto"
 DEPEND="${RDEPEND}
 	dev-python/setuptools
-	test? ( dev-python/unittest2 )"
+	test? ( virtual/python-unittest2 )"
 
 src_test() {
 	touch tests/__init__.py
diff --git a/dev-python/oauthlib/oauthlib-0.3.4.ebuild b/dev-python/oauthlib/oauthlib-0.3.4.ebuild
index 14f4c0d6e1ea..553c89a67b4a 100644
--- a/dev-python/oauthlib/oauthlib-0.3.4.ebuild
+++ b/dev-python/oauthlib/oauthlib-0.3.4.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-python/oauthlib/oauthlib-0.3.4.ebuild,v 1.2 2012/11/19 20:33:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.3.4.ebuild,v 1.3 2013/01/06 19:43:52 mgorny Exp $
 
 EAPI="4"
 
@@ -27,6 +27,6 @@ RDEPEND=">=dev-python/pycrypto-2.6-r1"
 DEPEND="${RDEPEND}
 	dev-python/setuptools
 	test? (
-		dev-python/unittest2
+		virtual/python-unittest2
 		dev-python/mock
 	)"
diff --git a/dev-python/python-novaclient/ChangeLog b/dev-python/python-novaclient/ChangeLog
index 9448ff69c997..d629098f486f 100644
--- a/dev-python/python-novaclient/ChangeLog
+++ b/dev-python/python-novaclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/python-novaclient
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-novaclient/ChangeLog,v 1.3 2013/01/01 08:57:05 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-novaclient/ChangeLog,v 1.4 2013/01/06 19:47:46 mgorny Exp $
+
+  06 Jan 2013; Michał Górny <mgorny@gentoo.org> python-novaclient-2.10.0.ebuild,
+  python-novaclient-9999.ebuild:
+  Use virtual/python-unittest2.
 
 *python-novaclient-2.10.0 (01 Jan 2013)
 
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 111af9f29624..85badeb3117b 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -2,24 +2,16 @@
 Hash: SHA256
 
 DIST python-novaclient-2.10.0.tar.gz 201808 SHA256 0e67598b514972b7481dd088ed8de14da57f09d316868afc3d60fc444665ee46 SHA512 baf5946a100844484b2e1992009c2a0b2566e678fc03ddde809d18847f31d206097ed8e5666d3b5e3b0035e6b0dcedc637660eaebb342e42c671dc508cd352a9 WHIRLPOOL 6e69fc2f313da6f47a5d69df5d52ae0424d2c32bf21498b0b22ba3363cb8a332f62fbd195b8bae1ada638b9f3cdabc6c15c68071ebde2e4d99d7dc7da709a79e
-EBUILD python-novaclient-2.10.0.ebuild 1001 SHA256 2504e656d68c8b64297b63c3a6f0a79cf06daef6ee901d76a82eb4889f262994 SHA512 1fdedbfb610cc11fa73960ce4b7e5a69ff23e9c75b3613fe30d75dc577a5ce0f6545719afb90eb428dce25c9d339db300729bb85da400ec659a2f4a6ad577b9f WHIRLPOOL 86b7c2d18ae0e752350f1d0fbd5f8e098f7a32804f9905ea17ac85b32621261ebf25fe4582eee85b411df2f1293f33dacecfc6ba81a59a8e1d952d5b357487e5
-EBUILD python-novaclient-9999.ebuild 1096 SHA256 38287b8fb1053edb516344136c4f9c0fa3e69ceac3a5a54a497e6acc38c42a1e SHA512 a9bb72a7298254e682367be2e813e5c4e29a090ab3dc61fe6d87c5a15e1b09bf1a4ce379d1ebe0f3a1ea7b217d98d4923364e876b63177301afc5e088453195c WHIRLPOOL 207a3546501892ba16c70eb2b590a2fe7c459d8b5e6c2278ba649a4e30fc0c31e0c726ca056f3c38c1166def297a6e4df54bfdadbe191c9e4f5bb026cf9a2c03
-MISC ChangeLog 737 SHA256 d792b1ecce792961ee1cb7e7b1590a5c78460316647168a1f0a1db3bebd052b2 SHA512 26475f994cb29b784b90a995f5d218d5bde4f592e0e3d010008a1351e1c790cb4ff494c1dba3e61941da0a36abfd2541da5caa5bce0cb77502803bd2af0cf296 WHIRLPOOL 5f41201562e8fcf0f4b55388b3f0633da5636f511836053df740cd003d6ac1fb6c58f84e1ef168091defcc84827aa56a9d9c5a829fa30c8ee51bf65f5574fa87
+EBUILD python-novaclient-2.10.0.ebuild 997 SHA256 d65f1a0e98fe1a3f85493a45afabaed1188562676b0dea8f4d4964c4fd5e999a SHA512 93f9aa9326f9d4b06addffc1efff4ef82afa76bb10d6ed522c875df5e71d60e75792875c33dd680f52ee21fbaa25e6da1f7bc3c2c894337975b9ff1679443eba WHIRLPOOL 81db4b5036b38646346860642257ea54299eafb0442ffebf36b21156d74cc557736965b2aea19b770c1453573e548a3f31ee7150abaee3bbc46021fe00ea6116
+EBUILD python-novaclient-9999.ebuild 1092 SHA256 e5b4d549c36e43169dc6d6742134fdd8f430a5381f54af80db018bdc29237219 SHA512 c62fe9cacd99dccd272a1524ae15b416521dd1cc125fe396e53b79e9acf28a99f821bba1f03a3aa8453a23d9f87f73d0d753c7ab29703843cfd8c57201a4f52f WHIRLPOOL dd7a9b670b833d99f86fc884151270e8f319de849326dfbf9a3d142de153da01b1a2a58945eac436d9ce101e375286a5e1c469803fb2543b925cb63ef89ba67b
+MISC ChangeLog 878 SHA256 cb95dc6b0861b4d24f3bb365979a550d889194f899a5e424824eeca4d9f2bb37 SHA512 de24e40b5525c008d8d4955646cf9fd67fac1c1048318d8b13ef515254f164101242a9023d0e3a873ea1f104501bd64d5e988b4fae3b6fa4db47d87d98da6ad6 WHIRLPOOL c48b3b7e7be004c8b26d5a86c19757dfe836ca3854b6c2b490d0be6303c9d8f923c66c1b735b5c0b9c0baf6a5a88ef55c1001d5bdd9ad324398e030fc9516720
 MISC metadata.xml 478 SHA256 7aa5a971f1411199b889ac210d529fca453d280ae551fdf0494290cc42120830 SHA512 d27d16038faf6282dd465390b2deeac8d8e0ef656e7b1807a631b04fa7ab3c915b18fd241344f449218085aaed745040770958bc1bd969df7d9059fba615cd50 WHIRLPOOL 01dcd155d5e74651c5086b15f90a2278bf7ec95827a4cfb2a5cfa48806ddee36a1e43d5b982fccb0cab04f1ea84c7a216e1f50d263e3839dc63c4a49128ec5ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ4qTnAAoJECRx6z5ArFrDIYoP/RZGv37X8fjwbEPbrXEAlu2N
-AkoAKI2yLbTlSA66c1lnkvtY8RWDsS/YfMswNhLsW9OZ1nKJflUiiu8dyuM18FBV
-o0MXhju0HhU2HSbASIvXs+zMGGbbKX7ioP3zD0BRvjSSOZzFglWmvZTVOctiLHmJ
-wZ9KtsQzS+U0DhWDsfgvW/f504gjPv9IDxKMRDI3vYgERTiO8sugU05P7tQURaVh
-I0xUcoxoacSURRhQ28aceSbOMYWHdlLk3IThMixpno53jNdo4wE64hLqqc2PfAdy
-0lKiheW+vgYb5YBFU2H/ITEE0UtTtl7kfcrcnZchWC+F5STRssARH7GIhiAm/tPZ
-Gh5bkIneqwnxHaHJBABMUs8MxY8A7P/JuC59B2QNXFY2VHfEEUJ14pBU5GoUs4Us
-+Eg4SRSKayCf9wsooYQO25y9Csxe9J3Ps4wQeuDAh9RrfUWVD9RY3IFdPNbMV8vA
-TNs4PX7DXRUkDSVl5twTYBXN0SEFCZDbp1J9+zZl5EUinOaaLDp6HpXhAmHUehJK
-sgKGl3h4zMLo/PFyoRHdNq3GKtgs/Hdcsd7RUrTdNs3E4nkBZGn7X5N5GuXp5Kiz
-NAFeTfOqL4ftqkeLzXTTDMhZZaA8p5Qgw/nh1qAk9UQ505krikNRoX7EiVW1hcpL
-bgUZvLZ3abdZHqwkj6Xw
-=IIi9
+iJwEAQEIAAYFAlDp1P0ACgkQfXuS5UK5QB25KQP/Rrh30FHBOIoQN6DkcnwuwPht
+//NR/o+fydjGdMG9tXiLQNDp9hCVWrcTFWn6vi0CgD+F6JlefxWi6apjDiUcUKtN
+GmtUNs/NmDZY2meKkmFPkU/d1I/tXK1yPwnNhDIvfdBwzQWKw4JnCKZbAC7hEi2m
+qD46mjFbkR8PpxbxA8g=
+=WRbp
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-novaclient/python-novaclient-2.10.0.ebuild b/dev-python/python-novaclient/python-novaclient-2.10.0.ebuild
index a1b476f475c1..1ecccde795b4 100644
--- a/dev-python/python-novaclient/python-novaclient-2.10.0.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-2.10.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/dev-python/python-novaclient/python-novaclient-2.10.0.ebuild,v 1.1 2013/01/01 08:57:05 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-novaclient/python-novaclient-2.10.0.ebuild,v 1.2 2013/01/06 19:47:46 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
@@ -25,7 +25,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 				dev-python/pytest-runner
 				dev-python/requests
 				dev-python/simplejson
-				dev-python/unittest2 )"
+				virtual/python-unittest2 )"
 RDEPEND="virtual/python-argparse
 		dev-python/httplib2
 		dev-python/prettytable
diff --git a/dev-python/python-novaclient/python-novaclient-9999.ebuild b/dev-python/python-novaclient/python-novaclient-9999.ebuild
index 94ba1e5d27f5..26a363e3214a 100644
--- a/dev-python/python-novaclient/python-novaclient-9999.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-9999.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/dev-python/python-novaclient/python-novaclient-9999.ebuild,v 1.2 2013/01/01 06:45:42 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-novaclient/python-novaclient-9999.ebuild,v 1.3 2013/01/06 19:47:46 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
@@ -28,7 +28,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 				dev-python/pytest-runner
 				dev-python/requests
 				dev-python/simplejson
-				dev-python/unittest2 )"
+				virtual/python-unittest2 )"
 RDEPEND="virtual/python-argparse
 		dev-python/httplib2
 		dev-python/prettytable