[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

[Sam James]

commit:     fbc9830cd2661f6214eec57c4c864fae589133c6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 10:52:07 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 10:52:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbc9830c

sci-libs/cartopy: simplify gdal dep

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/cartopy/{cartopy-0.20.3-r2.ebuild => cartopy-0.20.3-r3.ebuild} | 2 +-
 sci-libs/cartopy/{cartopy-0.21.0.ebuild => cartopy-0.21.0-r1.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
similarity index 97%
rename from sci-libs/cartopy/cartopy-0.20.3-r2.ebuild
rename to 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
similarity index 97%
rename from sci-libs/cartopy/cartopy-0.21.0.ebuild
rename to 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}]
        ')
 "