Sanitize virtual namespace of python packages

Rename virtual/MODULE to virtual/python-MODULE

Signed-off-by: Justin Lecher <jlec@gentoo.org>

41 files changed, 37 insertions, 34 deletions

diff --git a/app-text/calibre/calibre-2.35.0-r1.ebuild b/app-text/calibre/calibre-2.35.0-r1.ebuild
index 6192ca9ccc19..8094919e3d76 100644
--- a/app-text/calibre/calibre-2.35.0-r1.ebuild
+++ b/app-text/calibre/calibre-2.35.0-r1.ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="
 	>=dev-libs/icu-4.4:=
 	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
 	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
-	virtual/dnspython[python_targets_python2_7(-)]
+	virtual/python-dnspython[python_targets_python2_7(-)]
 	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
 	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
 	>=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)]
diff --git a/app-text/calibre/calibre-2.35.0.ebuild b/app-text/calibre/calibre-2.35.0.ebuild
index 8a2a6eeb5fc7..016c26c90f92 100644
--- a/app-text/calibre/calibre-2.35.0.ebuild
+++ b/app-text/calibre/calibre-2.35.0.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND="
 	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
 	|| (
 		>=dev-python/dnspython-1.6.0:0[python_targets_python2_7(-)]
-		virtual/dnspython[python_targets_python2_7(-)]
+		virtual/python-dnspython[python_targets_python2_7(-)]
 	)
 	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
 	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
diff --git a/dev-python/formencode/formencode-1.3.0-r2.ebuild b/dev-python/formencode/formencode-1.3.0-r2.ebuild
index a81fffa4a0e4..87966c02812e 100644
--- a/dev-python/formencode/formencode-1.3.0-r2.ebuild
+++ b/dev-python/formencode/formencode-1.3.0-r2.ebuild
@@ -23,7 +23,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pycountry[${PYTHON_USEDEP}]
-		virtual/dnspython[${PYTHON_USEDEP}] )"
+		virtual/python-dnspython[${PYTHON_USEDEP}] )"
 RDEPEND=""
 
 RESTRICT="test"
diff --git a/dev-python/mock/mock-1.2.0.ebuild b/dev-python/mock/mock-1.2.0.ebuild
index 65b2714d0490..c37bd46936df 100644
--- a/dev-python/mock/mock-1.2.0.ebuild
+++ b/dev-python/mock/mock-1.2.0.ebuild
@@ -19,7 +19,7 @@ IUSE="doc test"
 
 CDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	virtual/funcsigs[${PYTHON_USEDEP}]"
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
 DEPEND="
 	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/mock/mock-1.3.0-r1.ebuild b/dev-python/mock/mock-1.3.0-r1.ebuild
index 4724bd742a89..5359b19e847e 100644
--- a/dev-python/mock/mock-1.3.0-r1.ebuild
+++ b/dev-python/mock/mock-1.3.0-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="doc test"
 
 CDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	virtual/funcsigs[${PYTHON_USEDEP}]"
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
 DEPEND="
 	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/numba/numba-0.18.2.ebuild b/dev-python/numba/numba-0.18.2.ebuild
index 73c7b3185742..49c04d5aa70e 100644
--- a/dev-python/numba/numba-0.18.2.ebuild
+++ b/dev-python/numba/numba-0.18.2.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	dev-python/llvmlite[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
-	virtual/funcsigs[${PYTHON_USEDEP}]"
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND} )"
 
 # test phase is pointless since it errors in circa 60% of 1984 tests
diff --git a/dev-python/numba/numba-0.19.2.ebuild b/dev-python/numba/numba-0.19.2.ebuild
index 4200848b93bb..9ba53af356b1 100644
--- a/dev-python/numba/numba-0.19.2.ebuild
+++ b/dev-python/numba/numba-0.19.2.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	dev-python/llvmlite[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
-	virtual/funcsigs[${PYTHON_USEDEP}]"
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND} )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/numba/numba-0.20.0.ebuild b/dev-python/numba/numba-0.20.0.ebuild
index 2631c41c658e..cbd0b4239074 100644
--- a/dev-python/numba/numba-0.20.0.ebuild
+++ b/dev-python/numba/numba-0.20.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	dev-python/llvmlite[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
-	virtual/funcsigs[${PYTHON_USEDEP}]"
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND} )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/python-sipsimple/python-sipsimple-2.5.1-r3.ebuild b/dev-python/python-sipsimple/python-sipsimple-2.5.1-r3.ebuild
index e6c2594f70e0..0da7d320e9b2 100644
--- a/dev-python/python-sipsimple/python-sipsimple-2.5.1-r3.ebuild
+++ b/dev-python/python-sipsimple/python-sipsimple-2.5.1-r3.ebuild
@@ -30,7 +30,7 @@ CDEPEND="
 	virtual/ffmpeg
 "
 RDEPEND="${CDEPEND}
-	virtual/dnspython[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
 	dev-python/python-cjson[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/python-eventlib[${PYTHON_USEDEP}]
diff --git a/dev-python/pythong/pythong-2.1.5-r2.ebuild b/dev-python/pythong/pythong-2.1.5-r2.ebuild
index 989a5417abaa..a1b6459eba58 100644
--- a/dev-python/pythong/pythong-2.1.5-r2.ebuild
+++ b/dev-python/pythong/pythong-2.1.5-r2.ebuild
@@ -27,7 +27,7 @@ IUSE="doc"
 
 RDEPEND="
 	>=dev-lang/tk-8.3.4:0=
-	virtual/pmw[${PYTHON_USEDEP}]"
+	virtual/python-pmw[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${MY_PV}"
diff --git a/dev-python/tabulate/tabulate-0.7.2.ebuild b/dev-python/tabulate/tabulate-0.7.2.ebuild
index 916d1514d585..1f39c8867b86 100644
--- a/dev-python/tabulate/tabulate-0.7.2.ebuild
+++ b/dev-python/tabulate/tabulate-0.7.2.ebuild
@@ -19,7 +19,7 @@ IUSE="test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( virtual/funcsigs[${PYTHON_USEDEP}] )
+	test? ( virtual/python-funcsigs[${PYTHON_USEDEP}] )
 "
 
 # Missing something:
diff --git a/dev-python/tabulate/tabulate-0.7.3.ebuild b/dev-python/tabulate/tabulate-0.7.3.ebuild
index 7776a856ad53..8d04363a9b0c 100644
--- a/dev-python/tabulate/tabulate-0.7.3.ebuild
+++ b/dev-python/tabulate/tabulate-0.7.3.ebuild
@@ -19,7 +19,7 @@ IUSE="test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( virtual/funcsigs[${PYTHON_USEDEP}] )
+	test? ( virtual/python-funcsigs[${PYTHON_USEDEP}] )
 "
 
 # Missing something:
diff --git a/dev-python/tabulate/tabulate-0.7.5.ebuild b/dev-python/tabulate/tabulate-0.7.5.ebuild
index 7776a856ad53..8d04363a9b0c 100644
--- a/dev-python/tabulate/tabulate-0.7.5.ebuild
+++ b/dev-python/tabulate/tabulate-0.7.5.ebuild
@@ -19,7 +19,7 @@ IUSE="test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( virtual/funcsigs[${PYTHON_USEDEP}] )
+	test? ( virtual/python-funcsigs[${PYTHON_USEDEP}] )
 "
 
 # Missing something:
diff --git a/dev-python/twill/twill-0.9-r1.ebuild b/dev-python/twill/twill-0.9-r1.ebuild
index d69c8f747792..3c54b5d90643 100644
--- a/dev-python/twill/twill-0.9-r1.ebuild
+++ b/dev-python/twill/twill-0.9-r1.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 		$(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' python2_7)
 		|| (
 			dev-python/dnspython:0[${PYTHON_USEDEP}]
-			virtual/dnspython:0[${PYTHON_USEDEP}]
+			virtual/python-dnspython:0[${PYTHON_USEDEP}]
 		)
 	)"
 
diff --git a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild
index c9cc7fab7fdd..28e388b68587 100644
--- a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild
+++ b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild
@@ -21,7 +21,7 @@ IUSE="doc"
 
 RDEPEND="
 	|| (
-		virtual/dnspython[${PYTHON_USEDEP}]
+		virtual/python-dnspython[${PYTHON_USEDEP}]
 		dev-python/pydns[${PYTHON_USEDEP}]
 	)"
 DEPEND="${RDEPEND}
diff --git a/media-radio/wspr/wspr-2.00-r2.ebuild b/media-radio/wspr/wspr-2.00-r2.ebuild
index a1580669162a..8bb695f1a1d5 100644
--- a/media-radio/wspr/wspr-2.00-r2.ebuild
+++ b/media-radio/wspr/wspr-2.00-r2.ebuild
@@ -22,7 +22,7 @@ IUSE=""
 RDEPEND="
 	virtual/python-imaging[tk,${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	virtual/pmw[${PYTHON_USEDEP}]
+	virtual/python-pmw[${PYTHON_USEDEP}]
 	sci-libs/fftw:3.0
 	media-libs/hamlib
 	media-libs/portaudio
diff --git a/media-radio/wspr/wspr-3.01-r1.ebuild b/media-radio/wspr/wspr-3.01-r1.ebuild
index a1db0042a6aa..b53cc7014c81 100644
--- a/media-radio/wspr/wspr-3.01-r1.ebuild
+++ b/media-radio/wspr/wspr-3.01-r1.ebuild
@@ -22,7 +22,7 @@ IUSE=""
 RDEPEND="
 	virtual/python-imaging[tk,${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
-	virtual/pmw[${PYTHON_USEDEP}]
+	virtual/python-pmw[${PYTHON_USEDEP}]
 	sci-libs/fftw:3.0
 	media-libs/hamlib
 	media-libs/portaudio
diff --git a/media-radio/wspr/wspr-3.01.ebuild b/media-radio/wspr/wspr-3.01.ebuild
index daa7124d9107..33e302e2933c 100644
--- a/media-radio/wspr/wspr-3.01.ebuild
+++ b/media-radio/wspr/wspr-3.01.ebuild
@@ -22,7 +22,7 @@ IUSE=""
 RDEPEND="
 	virtual/python-imaging[tk,${PYTHON_USEDEP}]
 	<dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
-	virtual/pmw[${PYTHON_USEDEP}]
+	virtual/python-pmw[${PYTHON_USEDEP}]
 	sci-libs/fftw:3.0
 	media-libs/hamlib
 	media-libs/portaudio
diff --git a/net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild b/net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild
index a85d6a4b8e4d..3c62c61da0a1 100644
--- a/net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild
@@ -24,7 +24,7 @@ IUSE="gnome sqlite X"
 RDEPEND="
 	|| (
 		dev-python/dnspython:0[${PYTHON_USEDEP}]
-		virtual/dnspython[${PYTHON_USEDEP}]
+		virtual/python-dnspython[${PYTHON_USEDEP}]
 		)
 	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
 	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
diff --git a/net-analyzer/linkchecker/linkchecker-9999.ebuild b/net-analyzer/linkchecker/linkchecker-9999.ebuild
index bf7f343fbf46..01653b19b942 100644
--- a/net-analyzer/linkchecker/linkchecker-9999.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9999.ebuild
@@ -22,7 +22,7 @@ KEYWORDS=""
 IUSE="gnome sqlite X"
 
 RDEPEND="
-	virtual/dnspython[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
 	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
 	X? (
 		dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
diff --git a/net-analyzer/namebench/namebench-1.3.1-r2.ebuild b/net-analyzer/namebench/namebench-1.3.1-r2.ebuild
index b840a5e1117e..133f6b0a7e5f 100644
--- a/net-analyzer/namebench/namebench-1.3.1-r2.ebuild
+++ b/net-analyzer/namebench/namebench-1.3.1-r2.ebuild
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
 	>=dev-python/graphy-1.0[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.2.1[${PYTHON_USEDEP}]
 	>=dev-python/simplejson-2.1.2[${PYTHON_USEDEP}]
-	virtual/dnspython[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
 "
 
 python_prepare_all() {
diff --git a/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
index 8fb61bfb181d..f2c2d28fedf5 100644
--- a/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
+++ b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/ipaddr[$PYTHON_USEDEP]
 	dev-python/m2crypto[$PYTHON_USEDEP]
 	net-dns/unbound[python,$PYTHON_USEDEP]
-	virtual/dnspython[$PYTHON_USEDEP]
+	virtual/python-dnspython[$PYTHON_USEDEP]
 	ipsec? ( net-misc/libreswan[dnssec] )
 	openpgp? ( dev-python/python-gnupg[$PYTHON_USEDEP] )
 	ssh? ( net-misc/openssh )
diff --git a/net-im/err/err-1.7.1-r1.ebuild b/net-im/err/err-1.7.1-r1.ebuild
index d48befef4a52..158cc5b670c5 100644
--- a/net-im/err/err-1.7.1-r1.ebuild
+++ b/net-im/err/err-1.7.1-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/python-daemon[${PYTHON_USEDEP}]
 	dev-python/xmpppy
 	dev-python/yapsy[${PYTHON_USEDEP}]
-	virtual/dnspython[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
 	irc? (
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/twisted-core[${PYTHON_USEDEP}]
diff --git a/net-mail/mailman/mailman-2.1.20-r1.ebuild b/net-mail/mailman/mailman-2.1.20-r1.ebuild
index 41ffb9e301e1..ff129e507fe9 100644
--- a/net-mail/mailman/mailman-2.1.20-r1.ebuild
+++ b/net-mail/mailman/mailman-2.1.20-r1.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 	virtual/mta
 	virtual/cron
 	virtual/httpd-cgi
-	virtual/dnspython[${PYTHON_USEDEP}]"
+	virtual/python-dnspython[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-mailman )
 "
diff --git a/net-mail/mailman/mailman-2.1.20.ebuild b/net-mail/mailman/mailman-2.1.20.ebuild
index 33a25bc5f07d..4d08ceae1f32 100644
--- a/net-mail/mailman/mailman-2.1.20.ebuild
+++ b/net-mail/mailman/mailman-2.1.20.ebuild
@@ -22,7 +22,7 @@ DEPEND="virtual/mta
 	virtual/httpd-cgi
 	|| (
 		dev-python/dnspython:0
-		virtual/dnspython
+		virtual/python-dnspython
 	)"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-mailman )
diff --git a/net-misc/electrum/electrum-2.5.1.ebuild b/net-misc/electrum/electrum-2.5.1.ebuild
index a02b80682018..3de216065624 100644
--- a/net-misc/electrum/electrum-2.5.1.ebuild
+++ b/net-misc/electrum/electrum-2.5.1.ebuild
@@ -50,7 +50,7 @@ RDEPEND="
 	dev-python/socksipy[${PYTHON_USEDEP}]
 	dev-python/tlslite[${PYTHON_USEDEP}]
 	dev-libs/protobuf[python,${PYTHON_USEDEP}]
-	virtual/dnspython[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
 	qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] )
 	gtk3? (
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
diff --git a/profiles/updates/4Q-2015 b/profiles/updates/4Q-2015
index 6e925ab3ddb9..2e7926fbb502 100644
--- a/profiles/updates/4Q-2015
+++ b/profiles/updates/4Q-2015
@@ -7,3 +7,6 @@ move media-libs/libkface kde-apps/libkface
 move media-libs/libkgeomap kde-apps/libkgeomap
 move media-fonts/nanumfont media-fonts/nanum
 slotmove =dev-python/pyfltk-1.3.3 1 0
+move virtual/dnspython virtual/python-dnspython
+move virtual/funcsigs virtual/python-funcsigs
+move virtual/pmw virtual/python-pmw
diff --git a/sci-chemistry/pymol-plugins-promol/pymol-plugins-promol-3.0.2-r1.ebuild b/sci-chemistry/pymol-plugins-promol/pymol-plugins-promol-3.0.2-r1.ebuild
index e2d6430c01e1..f11e45564deb 100644
--- a/sci-chemistry/pymol-plugins-promol/pymol-plugins-promol-3.0.2-r1.ebuild
+++ b/sci-chemistry/pymol-plugins-promol/pymol-plugins-promol-3.0.2-r1.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	virtual/pmw[${PYTHON_USEDEP}]
+	virtual/python-pmw[${PYTHON_USEDEP}]
 	sci-chemistry/pymol[${PYTHON_USEDEP}]"
 DEPEND=""
 
diff --git a/sci-chemistry/pymol/pymol-1.7.0.1.ebuild b/sci-chemistry/pymol/pymol-1.7.0.1.ebuild
index f43ba4fd4c4e..af90249823f2 100644
--- a/sci-chemistry/pymol/pymol-1.7.0.1.ebuild
+++ b/sci-chemistry/pymol/pymol-1.7.0.1.ebuild
@@ -31,7 +31,7 @@ DEPEND="
 	media-libs/libpng:0=
 	media-video/mpeg-tools
 	sys-libs/zlib
-	virtual/pmw[${PYTHON_USEDEP}]
+	virtual/python-pmw[${PYTHON_USEDEP}]
 	apbs? (
 		sci-chemistry/apbs
 		sci-chemistry/pdb2pqr
diff --git a/sci-chemistry/pymol/pymol-1.7.4.0.ebuild b/sci-chemistry/pymol/pymol-1.7.4.0.ebuild
index 6e3f8c8e9664..54729a02c672 100644
--- a/sci-chemistry/pymol/pymol-1.7.4.0.ebuild
+++ b/sci-chemistry/pymol/pymol-1.7.4.0.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 	media-libs/libpng:0=
 	media-video/mpeg-tools
 	sys-libs/zlib
-	virtual/pmw[${PYTHON_USEDEP}]
+	virtual/python-pmw[${PYTHON_USEDEP}]
 	apbs? (
 		sci-chemistry/apbs[${PYTHON_USEDEP}]
 		sci-chemistry/pdb2pqr[${PYTHON_USEDEP}]
diff --git a/sci-chemistry/pymol/pymol-1.7.6.0.ebuild b/sci-chemistry/pymol/pymol-1.7.6.0.ebuild
index c119920fb183..a16c696f2cf6 100644
--- a/sci-chemistry/pymol/pymol-1.7.6.0.ebuild
+++ b/sci-chemistry/pymol/pymol-1.7.6.0.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 	media-libs/libpng:0=
 	media-video/mpeg-tools
 	sys-libs/zlib
-	virtual/pmw[${PYTHON_USEDEP}]
+	virtual/python-pmw[${PYTHON_USEDEP}]
 	apbs? (
 		sci-chemistry/apbs[${PYTHON_USEDEP}]
 		sci-chemistry/pdb2pqr[${PYTHON_USEDEP}]
diff --git a/sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild b/sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild
index ac330e0dea6a..a8160b4e8e46 100644
--- a/sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild
+++ b/sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild
@@ -25,7 +25,7 @@ COMMON_DEPEND=">=sci-libs/netcdf-4.0.1
 	>=sci-libs/hdf5-1.6.4
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/wxpython:2.8[${PYTHON_USEDEP}]
-	virtual/pmw[${PYTHON_USEDEP}]"
+	virtual/python-pmw[${PYTHON_USEDEP}]"
 DEPEND="${COMMON_DEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${COMMON_DEPEND}
diff --git a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
index 7f2e53f6de4d..987724461b1c 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.17.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/numpy-1.6.1[lapack,${PYTHON_USEDEP}]
 	sci-libs/scikits[${PYTHON_USEDEP}]
 	>=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
-	virtual/funcsigs[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
 	"
 DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
diff --git a/sys-cluster/swift/swift-2.3.0-r1.ebuild b/sys-cluster/swift/swift-2.3.0-r1.ebuild
index 285996a1b6de..04b002ac46fe 100644
--- a/sys-cluster/swift/swift-2.3.0-r1.ebuild
+++ b/sys-cluster/swift/swift-2.3.0-r1.ebuild
@@ -40,7 +40,7 @@ DEPEND="
 RDEPEND="
 	|| (
 		>=dev-python/dnspython-1.9.4:0[${PYTHON_USEDEP}]
-		virtual/dnspython[${PYTHON_USEDEP}]
+		virtual/python-dnspython[${PYTHON_USEDEP}]
 	)
 	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
 	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
diff --git a/sys-cluster/swift/swift-2.5.0-r1.ebuild b/sys-cluster/swift/swift-2.5.0-r1.ebuild
index b67b7554da6c..1a8cc831d636 100644
--- a/sys-cluster/swift/swift-2.5.0-r1.ebuild
+++ b/sys-cluster/swift/swift-2.5.0-r1.ebuild
@@ -40,7 +40,7 @@ DEPEND="
 
 RDEPEND="
 	${CDEPEND}
-	virtual/dnspython[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
 	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
diff --git a/virtual/dnspython/metadata.xml b/virtual/python-dnspython/metadata.xml
index ee7e8b2450a8..ee7e8b2450a8 100644
--- a/virtual/dnspython/metadata.xml
+++ b/virtual/python-dnspython/metadata.xml
diff --git a/virtual/dnspython/dnspython-1.ebuild b/virtual/python-dnspython/python-dnspython-1.ebuild
index 14cf6ee264d7..14cf6ee264d7 100644
--- a/virtual/dnspython/dnspython-1.ebuild
+++ b/virtual/python-dnspython/python-dnspython-1.ebuild
diff --git a/virtual/funcsigs/metadata.xml b/virtual/python-funcsigs/metadata.xml
index 6c90e346eb69..6c90e346eb69 100644
--- a/virtual/funcsigs/metadata.xml
+++ b/virtual/python-funcsigs/metadata.xml
diff --git a/virtual/funcsigs/funcsigs-0-r1.ebuild b/virtual/python-funcsigs/python-funcsigs-0-r1.ebuild
index 67548ae14cc1..67548ae14cc1 100644
--- a/virtual/funcsigs/funcsigs-0-r1.ebuild
+++ b/virtual/python-funcsigs/python-funcsigs-0-r1.ebuild
diff --git a/virtual/pmw/metadata.xml b/virtual/python-pmw/metadata.xml
index 6c90e346eb69..6c90e346eb69 100644
--- a/virtual/pmw/metadata.xml
+++ b/virtual/python-pmw/metadata.xml
diff --git a/virtual/pmw/pmw-1.ebuild b/virtual/python-pmw/python-pmw-1.ebuild
index f16cf1185864..f16cf1185864 100644
--- a/virtual/pmw/pmw-1.ebuild
+++ b/virtual/python-pmw/python-pmw-1.ebuild