Move {sci-libs → dev-python}/shapely

Shapely is really primarily a Python package, and it seems that
the Python team is effectively going to maintain it going forward,
so it fits more naturally in dev-python than sci-libs.

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

16 files changed, 13 insertions, 12 deletions

diff --git a/dev-python/plotly/plotly-5.8.2.ebuild b/dev-python/plotly/plotly-5.8.2.ebuild
index 727c95cffca9..e1e8c3e4f454 100644
--- a/dev-python/plotly/plotly-5.8.2.ebuild
+++ b/dev-python/plotly/plotly-5.8.2.ebuild
@@ -40,11 +40,11 @@ BDEPEND="
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/shapely[${PYTHON_USEDEP}]
 		dev-python/statsmodels[${PYTHON_USEDEP}]
 		dev-python/xarray[${PYTHON_USEDEP}]
 		sci-libs/pyshp[${PYTHON_USEDEP}]
 		sci-libs/scikit-image[${PYTHON_USEDEP}]
-		sci-libs/shapely[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/pyproj/pyproj-3.3.1.ebuild b/dev-python/pyproj/pyproj-3.3.1.ebuild
index f3f32a5b8852..93c1f69f34cc 100644
--- a/dev-python/pyproj/pyproj-3.3.1.ebuild
+++ b/dev-python/pyproj/pyproj-3.3.1.ebuild
@@ -33,8 +33,8 @@ BDEPEND="
 	test? (
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/shapely[${PYTHON_USEDEP}]
 		dev-python/xarray[${PYTHON_USEDEP}]
-		sci-libs/shapely[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/sci-libs/shapely/Manifest b/dev-python/shapely/Manifest
index 0145b67b8f00..0145b67b8f00 100644
--- a/sci-libs/shapely/Manifest
+++ b/dev-python/shapely/Manifest
diff --git a/sci-libs/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch b/dev-python/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch
index 18b6c5ad9a46..18b6c5ad9a46 100644
--- a/sci-libs/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch
+++ b/dev-python/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch
diff --git a/sci-libs/shapely/metadata.xml b/dev-python/shapely/metadata.xml
index 6432c651184e..6432c651184e 100644
--- a/sci-libs/shapely/metadata.xml
+++ b/dev-python/shapely/metadata.xml
diff --git a/sci-libs/shapely/shapely-1.7.1-r1.ebuild b/dev-python/shapely/shapely-1.7.1-r1.ebuild
index 749e53b1ac3e..c3f37aa5b3d8 100644
--- a/sci-libs/shapely/shapely-1.7.1-r1.ebuild
+++ b/dev-python/shapely/shapely-1.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sci-libs/shapely/shapely-1.8.2.ebuild b/dev-python/shapely/shapely-1.8.2.ebuild
index e123057db79a..e123057db79a 100644
--- a/sci-libs/shapely/shapely-1.8.2.ebuild
+++ b/dev-python/shapely/shapely-1.8.2.ebuild
diff --git a/dev-python/trimesh/trimesh-3.12.5.ebuild b/dev-python/trimesh/trimesh-3.12.5.ebuild
index 3d5249af810b..14d069dd9082 100644
--- a/dev-python/trimesh/trimesh-3.12.5.ebuild
+++ b/dev-python/trimesh/trimesh-3.12.5.ebuild
@@ -37,11 +37,11 @@ RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/shapely[${PYTHON_USEDEP}]
 	dev-python/svg-path[${PYTHON_USEDEP}]
 	dev-python/sympy[${PYTHON_USEDEP}]
 	dev-python/xxhash[${PYTHON_USEDEP}]
 	sci-libs/rtree[${PYTHON_USEDEP}]
-	sci-libs/shapely[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/trimesh/trimesh-3.12.6.ebuild b/dev-python/trimesh/trimesh-3.12.6.ebuild
index ab4e31971d7a..0a7ff2563d4d 100644
--- a/dev-python/trimesh/trimesh-3.12.6.ebuild
+++ b/dev-python/trimesh/trimesh-3.12.6.ebuild
@@ -37,11 +37,11 @@ RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/shapely[${PYTHON_USEDEP}]
 	dev-python/svg-path[${PYTHON_USEDEP}]
 	dev-python/sympy[${PYTHON_USEDEP}]
 	dev-python/xxhash[${PYTHON_USEDEP}]
 	sci-libs/rtree[${PYTHON_USEDEP}]
-	sci-libs/shapely[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/trimesh/trimesh-3.12.7.ebuild b/dev-python/trimesh/trimesh-3.12.7.ebuild
index 3f0d690d3a99..11e1a73dfac5 100644
--- a/dev-python/trimesh/trimesh-3.12.7.ebuild
+++ b/dev-python/trimesh/trimesh-3.12.7.ebuild
@@ -37,11 +37,11 @@ RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
 	dev-python/svg-path[${PYTHON_USEDEP}]
 	dev-python/sympy[${PYTHON_USEDEP}]
 	dev-python/xxhash[${PYTHON_USEDEP}]
 	sci-libs/rtree[${PYTHON_USEDEP}]
-	>=sci-libs/shapely-1.8.2[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/uranium/uranium-4.13.0-r1.ebuild b/dev-python/uranium/uranium-4.13.0-r1.ebuild
index 74a3c5608c9a..24acdf4ea25e 100644
--- a/dev-python/uranium/uranium-4.13.0-r1.ebuild
+++ b/dev-python/uranium/uranium-4.13.0-r1.ebuild
@@ -38,7 +38,7 @@ DEPEND="${PYTHON_DEPS}
 		dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-		sci-libs/shapely[${PYTHON_USEDEP}]
+		dev-python/shapely[${PYTHON_USEDEP}]
 	')"
 
 RDEPEND="${DEPEND}
diff --git a/media-gfx/cura/cura-4.13.1-r1.ebuild b/media-gfx/cura/cura-4.13.1-r1.ebuild
index b9234606b66a..45093e5443a5 100644
--- a/media-gfx/cura/cura-4.13.1-r1.ebuild
+++ b/media-gfx/cura/cura-4.13.1-r1.ebuild
@@ -49,8 +49,8 @@ RDEPEND="${PYTHON_DEPS}
 			dev-python/PyQt5-sip[${PYTHON_USEDEP}]
 			dev-python/requests[${PYTHON_USEDEP}]
 			dev-python/sentry-sdk[${PYTHON_USEDEP}]
+			dev-python/shapely[${PYTHON_USEDEP}]
 			dev-python/trimesh[${PYTHON_USEDEP}]
-			sci-libs/shapely[${PYTHON_USEDEP}]
 			usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
 			zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )
 	')"
diff --git a/profiles/updates/3Q-2020 b/profiles/updates/3Q-2020
index d7e42a928724..301c1cb83c70 100644
--- a/profiles/updates/3Q-2020
+++ b/profiles/updates/3Q-2020
@@ -143,4 +143,4 @@ slotmove dev-haskell/network 3 0
 move sci-libs/scipy dev-python/scipy
 move dev-perl/frontier-rpc dev-perl/Frontier-RPC
 move sci-libs/Rtree sci-libs/rtree
-move sci-libs/Shapely sci-libs/shapely
+move sci-libs/Shapely dev-python/shapely
diff --git a/profiles/updates/3Q-2022 b/profiles/updates/3Q-2022
index 33cdd115ac9d..6b221dc50924 100644
--- a/profiles/updates/3Q-2022
+++ b/profiles/updates/3Q-2022
@@ -3,3 +3,4 @@ move dev-python/configargparse dev-python/ConfigArgParse
 move dev-python/dbutils dev-python/DBUtils
 move dev-python/frozen-flask dev-python/Frozen-Flask
 move dev-python/ipy dev-python/IPy
+move sci-libs/shapely dev-python/shapely
diff --git a/sci-libs/cartopy/cartopy-0.20.1-r1.ebuild b/sci-libs/cartopy/cartopy-0.20.1-r1.ebuild
index d1c4f0d5d167..b160723004be 100644
--- a/sci-libs/cartopy/cartopy-0.20.1-r1.ebuild
+++ b/sci-libs/cartopy/cartopy-0.20.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,7 @@ RDEPEND="
 	sci-libs/geos
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/pyshp[${PYTHON_USEDEP}]
-	sci-libs/shapely[${PYTHON_USEDEP}]
+	dev-python/shapely[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]
diff --git a/sci-libs/cartopy/cartopy-0.20.2.ebuild b/sci-libs/cartopy/cartopy-0.20.2.ebuild
index 10493288f17e..b160723004be 100644
--- a/sci-libs/cartopy/cartopy-0.20.2.ebuild
+++ b/sci-libs/cartopy/cartopy-0.20.2.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	sci-libs/geos
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/pyshp[${PYTHON_USEDEP}]
-	sci-libs/shapely[${PYTHON_USEDEP}]
+	dev-python/shapely[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]