commit: ab0afda12a94a22da7afdfb42bcd6f2f6c0742f8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 8 11:26:34 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 15:54:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab0afda1
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 <AT> gentoo.org>
...map-1.0.7-r1.ebuild => basemap-1.0.7-r2.ebuild} | 28 ++++++++++++----------
...map-1.0.7-r3.ebuild => basemap-1.0.7-r4.ebuild} | 28 ++++++++++++----------
2 files changed, 30 insertions(+), 26 deletions(-)
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 21c1f248697..f6f47617922 100644
--- 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 97bcfc3f839..38c0bfb4645 100644
--- 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 )"
