dev-python/basemap: Switch to python-single-r1

basemap needs to be single-r1 since its dependency sci-libs/geos is.

Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/dev-python/basemap/basemap-1.0.7-r1.ebuild b/dev-python/basemap/basemap-1.0.7-r2.ebuild
similarity index 79%
rename from dev-python/basemap/basemap-1.0.7-r1.ebuild
rename to dev-python/basemap/basemap-1.0.7-r2.ebuild
index 21c1f248697ebc5b7076e4efd06a94208c285d79..f6f4761792236e13e913348310aefaf7bdbb7220 100644 (file)
--- a/dev-python/basemap/basemap-1.0.7-r1.ebuild
+++ b/dev-python/basemap/basemap-1.0.7-r2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=5
 
+DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 flag-o-matic
@@ -16,20 +17,21 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 LICENSE="MIT GPL-2"
 
-CDEPEND="sci-libs/shapelib
-       || (
-               >=dev-python/matplotlib-python2-0.98[${PYTHON_USEDEP}]
-               >=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]
-       )
-       >=sci-libs/geos-3.3.1[python(-),${PYTHON_USEDEP}]"
+DEPEND="sci-libs/shapelib
+       $(python_gen_cond_dep '
+               || (
+                       >=dev-python/matplotlib-python2-0.98[${PYTHON_MULTI_USEDEP}]
+                       >=dev-python/matplotlib-0.98[${PYTHON_MULTI_USEDEP}]
+               )
+       ')
+       >=sci-libs/geos-3.3.1[python(-),${PYTHON_SINGLE_USEDEP}]"
 
-DEPEND="${CDEPEND}
-       dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="${CDEPEND}
-       >=dev-python/pupynere-1.0.8[${PYTHON_USEDEP}]
-       dev-python/httplib2[${PYTHON_USEDEP}]
-       dev-python/dap[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+       $(python_gen_cond_dep '
+               >=dev-python/pupynere-1.0.8[${PYTHON_MULTI_USEDEP}]
+               dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+               dev-python/dap[${PYTHON_MULTI_USEDEP}]
+       ')"
 
 DOCS="FAQ API_CHANGES"
 #REQUIRED_USE="test? ( examples )"

diff --git a/dev-python/basemap/basemap-1.0.7-r3.ebuild b/dev-python/basemap/basemap-1.0.7-r4.ebuild
similarity index 79%
rename from dev-python/basemap/basemap-1.0.7-r3.ebuild
rename to dev-python/basemap/basemap-1.0.7-r4.ebuild
index 97bcfc3f839b384be27ab35832de85f5ee61212b..38c0bfb4645e205d4ca8d205147e542937d2ec68 100644 (file)
--- a/dev-python/basemap/basemap-1.0.7-r3.ebuild
+++ b/dev-python/basemap/basemap-1.0.7-r4.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=5
 
+DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 flag-o-matic
@@ -16,20 +17,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="MIT GPL-2"
 
-CDEPEND="sci-libs/shapelib
-       || (
-               >=dev-python/matplotlib-python2-0.98[${PYTHON_USEDEP}]
-               >=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]
-       )
-       >=sci-libs/geos-3.3.1[python(-),${PYTHON_USEDEP}]"
+DEPEND="sci-libs/shapelib
+       $(python_gen_cond_dep '
+               || (
+                       >=dev-python/matplotlib-python2-0.98[${PYTHON_MULTI_USEDEP}]
+                       >=dev-python/matplotlib-0.98[${PYTHON_MULTI_USEDEP}]
+               )
+       ')
+       >=sci-libs/geos-3.3.1[python(-),${PYTHON_SINGLE_USEDEP}]"
 
-DEPEND="${CDEPEND}
-       dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="${CDEPEND}
-       >=dev-python/pupynere-1.0.8[${PYTHON_USEDEP}]
-       dev-python/httplib2[${PYTHON_USEDEP}]
-       dev-python/dap[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+       $(python_gen_cond_dep '
+               >=dev-python/pupynere-1.0.8[${PYTHON_MULTI_USEDEP}]
+               dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+               dev-python/dap[${PYTHON_MULTI_USEDEP}]
+       ')"
 
 DOCS="FAQ API_CHANGES"
 #REQUIRED_USE="test? ( examples )"