gentoo auto-resync : 23:02:2024 - 23:40:53

4 files changed, 5 insertions, 16 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 87c25d43b3b8..a240dadffdf7 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/folium/Manifest b/sci-geosciences/folium/Manifest
index 4fbbaa76df57..0f7d9ee8f48e 100644
--- a/sci-geosciences/folium/Manifest
+++ b/sci-geosciences/folium/Manifest
@@ -1,5 +1,4 @@
-AUX folium-0.12.1-scm.patch 439 BLAKE2B 58d054e56a0ea38d63c75fa43a5cdbbf671abbf5f7c67649dc1037ca83a8bce6f388a904666b89681a4ffc3f5c517cb2eb5e7b37f2f3e577b7bdbe5f0fe80130 SHA512 aad8a6c22441d593b7895565f7cb37621da4882123e4d40ec4370d707a58c38cf9de4b5fedc9b2e229138fde5e33eef914431e0f9f7761c5a1b9d8b0f6414b04
 AUX folium-0.15.1-gentoo.patch 281 BLAKE2B 1a2642e75865fbd0d03bbab2da133c1e205bec1f43fc7ac39c54ddfab330c4acc10da0d81be68a81d3da9937fd3e613f6c0f776b9fdb231c20fc7f66129cece2 SHA512 174145f6db6136c400f1ad0012f928bc042e683d5d564a67f1e2e0adfdb985fa0fb5cd05f04a355af3578dac727f0c06db5a815741ce58e684c46dc9891b1920
 DIST folium-0.15.1.tar.gz 8400799 BLAKE2B c01c4029882aed5c1390be05a358c6c9e321e1562573bb1ae7246b462bc9183c21ba7631ca6b9a0e51311375f90f06bac5651c28505fa0d73c65942267ab2ce4 SHA512 fdc0b7bb0c864337b10d92e60090382d67d29e9158bb92c22ae53e749612d88427db95d34990c8895a04017ca1a5870330c6d9da3abb94e19ff6141b94f503c0
-EBUILD folium-0.15.1-r2.ebuild 1241 BLAKE2B 7e4cb1debfa195115f961055b7153ca91711921119325d75424ab2b9765f7fc7be3174809bf007e013d8620fea3e579488c6ad8319cbfebe8914729d7b7be171 SHA512 0225455290ffa4390518e11a2ff599c657856f6d9c740941f42c1b2d605fa66a3132493d97969126cdc882124cfd192565ac94dc9a9372b0451a1ceccc4a9701
+EBUILD folium-0.15.1-r2.ebuild 1285 BLAKE2B 06e2dc98a5c1c9fb94724435c613d93add5368325c5128664439b43d5b03a00e1513dec516ecf8e700401905bd0d0f36c06136048ed86e3b2c84e2685fa37029 SHA512 7800e89530c1b59b64bffbc6fe5ade9aa50699058c62855fd34f20a4d1e7e38d53cecf9af21b971cc8ca7b4591e00f635af2deb6373921280b4f81f30df6c429
 MISC metadata.xml 630 BLAKE2B a22785187ee548da6b47df938a5db21a6778d5bcb22988de11ba54d080dcc03e3702b7f0529dfc4de9fad12973e526af118bbd1b04dddd6f3ad3d7f0163f96e5 SHA512 7ad7009474c3a357a0e4c0b526aa66c96c8b91e39fe3fa3da1dbaf27564d4f15988f0898a13f77d8d93be6567c0533ddf6402279882ca4ea62da96051afe7209
diff --git a/sci-geosciences/folium/files/folium-0.12.1-scm.patch b/sci-geosciences/folium/files/folium-0.12.1-scm.patch
deleted file mode 100644
index 78992bafa059..000000000000
--- a/sci-geosciences/folium/files/folium-0.12.1-scm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/setup.py	2021-07-30 23:29:57.320896714 +0200
-+++ b/setup.py	2021-07-30 23:30:05.608787963 +0200
-@@ -89,9 +89,4 @@
-     extras_require={"testing": ["pytest"]},
-     install_requires=install_requires,
-     zip_safe=False,
--    use_scm_version={
--        "write_to": "folium/_version.py",
--        "write_to_template": '__version__ = "{version}"',
--        "tag_regex": r"^(?P<prefix>v)?(?P<version>[^\+]+)(?P<suffix>.*)?$",
--    },
- )
diff --git a/sci-geosciences/folium/folium-0.15.1-r2.ebuild b/sci-geosciences/folium/folium-0.15.1-r2.ebuild
index 22eaed0b7b88..43b520782e7b 100644
--- a/sci-geosciences/folium/folium-0.15.1-r2.ebuild
+++ b/sci-geosciences/folium/folium-0.15.1-r2.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 inherit distutils-r1
 
 DESCRIPTION="Python Data, Leaflet.js Maps"
@@ -16,7 +17,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.12.1-scm.patch
 	"${FILESDIR}"/${P}-gentoo.patch
 )
 
@@ -25,7 +25,9 @@ RDEPEND="sci-geosciences/xyzservices[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/setuptools-scm
 	test? (
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/pandas[${PYTHON_USEDEP}]