summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-10-08 11:52:07 +0100
committerSam James <sam@gentoo.org>2022-10-08 11:52:15 +0100
commitfbc9830cd2661f6214eec57c4c864fae589133c6 (patch)
treef0d48836ca95a2e2d73064c02150e13067751e97 /sci-libs/cartopy
parentsys-power/thermald: drop 2.4.9 (diff)
downloadgentoo-fbc9830cd2661f6214eec57c4c864fae589133c6.tar.gz
gentoo-fbc9830cd2661f6214eec57c4c864fae589133c6.tar.bz2
gentoo-fbc9830cd2661f6214eec57c4c864fae589133c6.zip
sci-libs/cartopy: simplify gdal dep
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sci-libs/cartopy')
-rw-r--r--sci-libs/cartopy/cartopy-0.20.3-r3.ebuild (renamed from sci-libs/cartopy/cartopy-0.20.3-r2.ebuild)2
-rw-r--r--sci-libs/cartopy/cartopy-0.21.0-r1.ebuild (renamed from sci-libs/cartopy/cartopy-0.21.0.ebuild)2
2 files changed, 2 insertions, 2 deletions
diff --git a/sci-libs/cartopy/cartopy-0.20.3-r2.ebuild b/sci-libs/cartopy/cartopy-0.20.3-r3.ebuild
index 7761eefa2010..926f138d6ada 100644
--- a/sci-libs/cartopy/cartopy-0.20.3-r2.ebuild
+++ b/sci-libs/cartopy/cartopy-0.20.3-r3.ebuild
@@ -25,6 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
+ sci-libs/gdal[python,${PYTHON_SINGLE_USEDEP}]
sci-libs/geos
>=sci-libs/proj-8
$(python_gen_cond_dep '
@@ -35,7 +36,6 @@ RDEPEND="
dev-python/scipy[${PYTHON_USEDEP}]
dev-python/pillow[jpeg,${PYTHON_USEDEP}]
dev-python/pyproj[${PYTHON_USEDEP}]
- sci-libs/gdal[python,${PYTHON_USEDEP}]
sci-libs/pyshp[${PYTHON_USEDEP}]
')
"
diff --git a/sci-libs/cartopy/cartopy-0.21.0.ebuild b/sci-libs/cartopy/cartopy-0.21.0-r1.ebuild
index e8fbb387686c..37196a73aff3 100644
--- a/sci-libs/cartopy/cartopy-0.21.0.ebuild
+++ b/sci-libs/cartopy/cartopy-0.21.0-r1.ebuild
@@ -25,6 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
+ sci-libs/gdal[python,${PYTHON_SINGLE_USEDEP}]
sci-libs/geos
$(python_gen_cond_dep '
>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
@@ -34,7 +35,6 @@ RDEPEND="
dev-python/scipy[${PYTHON_USEDEP}]
dev-python/pillow[jpeg,${PYTHON_USEDEP}]
dev-python/pyproj[${PYTHON_USEDEP}]
- sci-libs/gdal[python,${PYTHON_USEDEP}]
sci-libs/pyshp[${PYTHON_USEDEP}]
')
"