| 1 |
commit: ab0afda12a94a22da7afdfb42bcd6f2f6c0742f8 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 8 11:26:34 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 15:54:17 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab0afda1 |
| 7 |
|
| 8 |
dev-python/basemap: Switch to python-single-r1 |
| 9 |
|
| 10 |
basemap needs to be single-r1 since its dependency sci-libs/geos is. |
| 11 |
|
| 12 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 13 |
|
| 14 |
...map-1.0.7-r1.ebuild => basemap-1.0.7-r2.ebuild} | 28 ++++++++++++---------- |
| 15 |
...map-1.0.7-r3.ebuild => basemap-1.0.7-r4.ebuild} | 28 ++++++++++++---------- |
| 16 |
2 files changed, 30 insertions(+), 26 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-python/basemap/basemap-1.0.7-r1.ebuild b/dev-python/basemap/basemap-1.0.7-r2.ebuild |
| 19 |
similarity index 79% |
| 20 |
rename from dev-python/basemap/basemap-1.0.7-r1.ebuild |
| 21 |
rename to dev-python/basemap/basemap-1.0.7-r2.ebuild |
| 22 |
index 21c1f248697..f6f47617922 100644 |
| 23 |
--- a/dev-python/basemap/basemap-1.0.7-r1.ebuild |
| 24 |
+++ b/dev-python/basemap/basemap-1.0.7-r2.ebuild |
| 25 |
@@ -3,6 +3,7 @@ |
| 26 |
|
| 27 |
EAPI=5 |
| 28 |
|
| 29 |
+DISTUTILS_SINGLE_IMPL=1 |
| 30 |
PYTHON_COMPAT=( python2_7 ) |
| 31 |
|
| 32 |
inherit distutils-r1 flag-o-matic |
| 33 |
@@ -16,20 +17,21 @@ SLOT="0" |
| 34 |
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
| 35 |
LICENSE="MIT GPL-2" |
| 36 |
|
| 37 |
-CDEPEND="sci-libs/shapelib |
| 38 |
- || ( |
| 39 |
- >=dev-python/matplotlib-python2-0.98[${PYTHON_USEDEP}] |
| 40 |
- >=dev-python/matplotlib-0.98[${PYTHON_USEDEP}] |
| 41 |
- ) |
| 42 |
- >=sci-libs/geos-3.3.1[python(-),${PYTHON_USEDEP}]" |
| 43 |
+DEPEND="sci-libs/shapelib |
| 44 |
+ $(python_gen_cond_dep ' |
| 45 |
+ || ( |
| 46 |
+ >=dev-python/matplotlib-python2-0.98[${PYTHON_MULTI_USEDEP}] |
| 47 |
+ >=dev-python/matplotlib-0.98[${PYTHON_MULTI_USEDEP}] |
| 48 |
+ ) |
| 49 |
+ ') |
| 50 |
+ >=sci-libs/geos-3.3.1[python(-),${PYTHON_SINGLE_USEDEP}]" |
| 51 |
|
| 52 |
-DEPEND="${CDEPEND} |
| 53 |
- dev-python/setuptools[${PYTHON_USEDEP}]" |
| 54 |
- |
| 55 |
-RDEPEND="${CDEPEND} |
| 56 |
- >=dev-python/pupynere-1.0.8[${PYTHON_USEDEP}] |
| 57 |
- dev-python/httplib2[${PYTHON_USEDEP}] |
| 58 |
- dev-python/dap[${PYTHON_USEDEP}]" |
| 59 |
+RDEPEND="${DEPEND} |
| 60 |
+ $(python_gen_cond_dep ' |
| 61 |
+ >=dev-python/pupynere-1.0.8[${PYTHON_MULTI_USEDEP}] |
| 62 |
+ dev-python/httplib2[${PYTHON_MULTI_USEDEP}] |
| 63 |
+ dev-python/dap[${PYTHON_MULTI_USEDEP}] |
| 64 |
+ ')" |
| 65 |
|
| 66 |
DOCS="FAQ API_CHANGES" |
| 67 |
#REQUIRED_USE="test? ( examples )" |
| 68 |
|
| 69 |
diff --git a/dev-python/basemap/basemap-1.0.7-r3.ebuild b/dev-python/basemap/basemap-1.0.7-r4.ebuild |
| 70 |
similarity index 79% |
| 71 |
rename from dev-python/basemap/basemap-1.0.7-r3.ebuild |
| 72 |
rename to dev-python/basemap/basemap-1.0.7-r4.ebuild |
| 73 |
index 97bcfc3f839..38c0bfb4645 100644 |
| 74 |
--- a/dev-python/basemap/basemap-1.0.7-r3.ebuild |
| 75 |
+++ b/dev-python/basemap/basemap-1.0.7-r4.ebuild |
| 76 |
@@ -3,6 +3,7 @@ |
| 77 |
|
| 78 |
EAPI=5 |
| 79 |
|
| 80 |
+DISTUTILS_SINGLE_IMPL=1 |
| 81 |
PYTHON_COMPAT=( python2_7 ) |
| 82 |
|
| 83 |
inherit distutils-r1 flag-o-matic |
| 84 |
@@ -16,20 +17,21 @@ SLOT="0" |
| 85 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 86 |
LICENSE="MIT GPL-2" |
| 87 |
|
| 88 |
-CDEPEND="sci-libs/shapelib |
| 89 |
- || ( |
| 90 |
- >=dev-python/matplotlib-python2-0.98[${PYTHON_USEDEP}] |
| 91 |
- >=dev-python/matplotlib-0.98[${PYTHON_USEDEP}] |
| 92 |
- ) |
| 93 |
- >=sci-libs/geos-3.3.1[python(-),${PYTHON_USEDEP}]" |
| 94 |
+DEPEND="sci-libs/shapelib |
| 95 |
+ $(python_gen_cond_dep ' |
| 96 |
+ || ( |
| 97 |
+ >=dev-python/matplotlib-python2-0.98[${PYTHON_MULTI_USEDEP}] |
| 98 |
+ >=dev-python/matplotlib-0.98[${PYTHON_MULTI_USEDEP}] |
| 99 |
+ ) |
| 100 |
+ ') |
| 101 |
+ >=sci-libs/geos-3.3.1[python(-),${PYTHON_SINGLE_USEDEP}]" |
| 102 |
|
| 103 |
-DEPEND="${CDEPEND} |
| 104 |
- dev-python/setuptools[${PYTHON_USEDEP}]" |
| 105 |
- |
| 106 |
-RDEPEND="${CDEPEND} |
| 107 |
- >=dev-python/pupynere-1.0.8[${PYTHON_USEDEP}] |
| 108 |
- dev-python/httplib2[${PYTHON_USEDEP}] |
| 109 |
- dev-python/dap[${PYTHON_USEDEP}]" |
| 110 |
+RDEPEND="${DEPEND} |
| 111 |
+ $(python_gen_cond_dep ' |
| 112 |
+ >=dev-python/pupynere-1.0.8[${PYTHON_MULTI_USEDEP}] |
| 113 |
+ dev-python/httplib2[${PYTHON_MULTI_USEDEP}] |
| 114 |
+ dev-python/dap[${PYTHON_MULTI_USEDEP}] |
| 115 |
+ ')" |
| 116 |
|
| 117 |
DOCS="FAQ API_CHANGES" |
| 118 |
#REQUIRED_USE="test? ( examples )" |
Archives