mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
Sanitize virtual namespace of python packages
Rename virtual/MODULE to virtual/python-MODULE Signed-off-by: Justin Lecher <jlec@gentoo.org>
This commit is contained in:
@@ -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(-)]
|
||||
|
||||
@@ -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(-)]
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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? (
|
||||
|
||||
@@ -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? (
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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}] )"
|
||||
|
||||
|
||||
@@ -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}] )"
|
||||
|
||||
|
||||
@@ -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}]
|
||||
|
||||
@@ -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}"
|
||||
|
||||
@@ -19,7 +19,7 @@ IUSE="test"
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( virtual/funcsigs[${PYTHON_USEDEP}] )
|
||||
test? ( virtual/python-funcsigs[${PYTHON_USEDEP}] )
|
||||
"
|
||||
|
||||
# Missing something:
|
||||
|
||||
@@ -19,7 +19,7 @@ IUSE="test"
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( virtual/funcsigs[${PYTHON_USEDEP}] )
|
||||
test? ( virtual/python-funcsigs[${PYTHON_USEDEP}] )
|
||||
"
|
||||
|
||||
# Missing something:
|
||||
|
||||
@@ -19,7 +19,7 @@ IUSE="test"
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( virtual/funcsigs[${PYTHON_USEDEP}] )
|
||||
test? ( virtual/python-funcsigs[${PYTHON_USEDEP}] )
|
||||
"
|
||||
|
||||
# Missing something:
|
||||
|
||||
@@ -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}]
|
||||
)
|
||||
)"
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ IUSE="doc"
|
||||
|
||||
RDEPEND="
|
||||
|| (
|
||||
virtual/dnspython[${PYTHON_USEDEP}]
|
||||
virtual/python-dnspython[${PYTHON_USEDEP}]
|
||||
dev-python/pydns[${PYTHON_USEDEP}]
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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}] )
|
||||
|
||||
@@ -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}]
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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}]
|
||||
|
||||
@@ -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 )
|
||||
"
|
||||
|
||||
@@ -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 )
|
||||
|
||||
@@ -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}]
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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=""
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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}]
|
||||
|
||||
@@ -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}]
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -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}]
|
||||
|
||||
@@ -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}]
|
||||
|
||||
@@ -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}]
|
||||
|
||||
Reference in New Issue
Block a user