gentoo auto-resync : 23:06:2024 - 00:11:30

7 files changed, 79 insertions, 2 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 14caff43465d..6aab495b02f1 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/folium/Manifest b/sci-geosciences/folium/Manifest
index 36cef92f9ada..3b9b973aca87 100644
--- a/sci-geosciences/folium/Manifest
+++ b/sci-geosciences/folium/Manifest
@@ -1,6 +1,8 @@
 AUX folium-0.15.1-gentoo.patch 281 BLAKE2B 1a2642e75865fbd0d03bbab2da133c1e205bec1f43fc7ac39c54ddfab330c4acc10da0d81be68a81d3da9937fd3e613f6c0f776b9fdb231c20fc7f66129cece2 SHA512 174145f6db6136c400f1ad0012f928bc042e683d5d564a67f1e2e0adfdb985fa0fb5cd05f04a355af3578dac727f0c06db5a815741ce58e684c46dc9891b1920
 DIST folium-0.15.1.tar.gz 8400799 BLAKE2B c01c4029882aed5c1390be05a358c6c9e321e1562573bb1ae7246b462bc9183c21ba7631ca6b9a0e51311375f90f06bac5651c28505fa0d73c65942267ab2ce4 SHA512 fdc0b7bb0c864337b10d92e60090382d67d29e9158bb92c22ae53e749612d88427db95d34990c8895a04017ca1a5870330c6d9da3abb94e19ff6141b94f503c0
 DIST folium-0.16.0.tar.gz 8403284 BLAKE2B 443d8fc54ecdad8921d4467623ea4b8f6c22744df79ed25071e7937d38b1204f076432fc99f10ae23ddfebf89d4f7db19101e4aa54ceb1902bdad01af6f3ba2b SHA512 7dbaf3acdc0f5efbee8332bbc33ee002f1af22d53c662d434ace50e091dbaa9dde190d1f5f212be2a9d8abdcd5e5dbce0a916033c672c2327cc8b72f74eb69f4
+DIST folium-0.17.0.tar.gz 8212314 BLAKE2B aac66b49fee5633e6c5d097094cc4ff21d835f87c5017384f2e39236aece1f4820c0dad80b87abcbce30ddb2a3c48332656b0ad07cecdd5b2dbf81c9329eb852 SHA512 2f45237064ea0bd07f95c53ab482bb33bd1786cd431237df23f1d2b9f5f063c43a0f590236b408d257e2567c16444651e9fe1a4ec9c13e6f4934a0330c7d86cc
 EBUILD folium-0.15.1-r2.ebuild 1285 BLAKE2B 06e2dc98a5c1c9fb94724435c613d93add5368325c5128664439b43d5b03a00e1513dec516ecf8e700401905bd0d0f36c06136048ed86e3b2c84e2685fa37029 SHA512 7800e89530c1b59b64bffbc6fe5ade9aa50699058c62855fd34f20a4d1e7e38d53cecf9af21b971cc8ca7b4591e00f635af2deb6373921280b4f81f30df6c429
 EBUILD folium-0.16.0.ebuild 1293 BLAKE2B b3009e0a28eca0ca623008ef04773fe25f472a5ddc3de450d97f454198df350fd3142b84464e26c8a047cf1a06e82796f7c2c21a47df89c097ea751f88475af9 SHA512 474a4f038c90bfee8a1be6d6c88d1879987200a9185875ac25bf302cdebca4a9e81ac226f16fb99bcfa77c38ece5b6a57cdf19e2f47b556d842a87d92e1b85fe
+EBUILD folium-0.17.0.ebuild 1293 BLAKE2B b3009e0a28eca0ca623008ef04773fe25f472a5ddc3de450d97f454198df350fd3142b84464e26c8a047cf1a06e82796f7c2c21a47df89c097ea751f88475af9 SHA512 474a4f038c90bfee8a1be6d6c88d1879987200a9185875ac25bf302cdebca4a9e81ac226f16fb99bcfa77c38ece5b6a57cdf19e2f47b556d842a87d92e1b85fe
 MISC metadata.xml 630 BLAKE2B a22785187ee548da6b47df938a5db21a6778d5bcb22988de11ba54d080dcc03e3702b7f0529dfc4de9fad12973e526af118bbd1b04dddd6f3ad3d7f0163f96e5 SHA512 7ad7009474c3a357a0e4c0b526aa66c96c8b91e39fe3fa3da1dbaf27564d4f15988f0898a13f77d8d93be6567c0533ddf6402279882ca4ea62da96051afe7209
diff --git a/sci-geosciences/folium/folium-0.17.0.ebuild b/sci-geosciences/folium/folium-0.17.0.ebuild
new file mode 100644
index 000000000000..6182bf93caf4
--- /dev/null
+++ b/sci-geosciences/folium/folium-0.17.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+HOMEPAGE="https://github.com/python-visualization/folium"
+SRC_URI="https://github.com/python-visualization/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.15.1-gentoo.patch
+)
+
+RDEPEND="sci-geosciences/xyzservices[${PYTHON_USEDEP}]
+	sci-libs/branca[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/setuptools-scm
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	rm -r tests/selenium || die # require chromedriver
+	rm tests/test_folium.py || die # require geopandas
+	rm tests/test_raster_layers.py || die # require xyzservices
+	rm tests/plugins/test_time_slider_choropleth.py || die # require geopandas
+	rm tests/test_repr.py || die # require geckodriver
+	default
+}
+
+python_test() {
+	epytest -m 'not web'
+}
diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index c53e6603d1b0..28517b0f8403 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -2,6 +2,6 @@ DIST josm-snapshot-19039.jar 16767506 BLAKE2B fe5fe056771c17179bd0480792c0cccb96
 DIST josm-snapshot-19067.jar 18350764 BLAKE2B c4341e1f1442887b490d8118e6bdad72bcacaf437017f251b3a167622b75360434c57df5ef2631eb57bf747af5ec313c5a3029b9c2aed9134f2c8080904cbf6c SHA512 0300e21f494748ca3a4b8792ed671a5f9b9106f83ebe65e108c4d58b15e9312fa7323a016d0d4e55ee1ea9ea7bc201c1f209db9860cce026e66530d725357ae9
 DIST josm-snapshot-19096.jar 18349420 BLAKE2B 0423ccd0cad224168a1c88cc1bffb6643a65b837a9a0715aa867e0ece55d7d6d69530adb2ee32e65cc3a9364daaba0ca7a9d6edb8807e809913f145f8e554269 SHA512 6005dd32a2ca0aa1f7367b181b99d13d000d98282420d3119569b9fb148407191a1a8dccc81734b3c2e40715ee813599305dcadd5e3cf2af040ba312f75a0467
 EBUILD josm-bin-19039.ebuild 1193 BLAKE2B 72ac4adcb57a503336c4ef0b309b015de45b57c7598a67fbc05231f7ee9d2dce71b53ae8d57477350718251a0028df2eb9a83390ad04fa9c9e88388b41148065 SHA512 160da9353ea4dfed9e7b42e2c7e9b4972ad74a7dd1edc5bb8cc7be44dfae11822ab690055c3b8ad00c95276735ba2a0770ad600eb59cc590a631d702cf701781
-EBUILD josm-bin-19067.ebuild 1194 BLAKE2B 4d3baae83ce1ec9b343eaf3223cfa0f0dc15fb32674a50ca13eac19f64c906d9d3bdcf5f494d2bfd9c985a32db6e23e838d4fd992233040714ddcd7a8b2487b2 SHA512 3824da326ecef5d2a7faad42ba89061dcb5d00f12387b42c3ad46a8647b1a9a23e33c4a7298e5a7b9bea6a46926da96b428af81eb07fcd2525369620361d7a5c
+EBUILD josm-bin-19067.ebuild 1193 BLAKE2B 72ac4adcb57a503336c4ef0b309b015de45b57c7598a67fbc05231f7ee9d2dce71b53ae8d57477350718251a0028df2eb9a83390ad04fa9c9e88388b41148065 SHA512 160da9353ea4dfed9e7b42e2c7e9b4972ad74a7dd1edc5bb8cc7be44dfae11822ab690055c3b8ad00c95276735ba2a0770ad600eb59cc590a631d702cf701781
 EBUILD josm-bin-19096.ebuild 1194 BLAKE2B 4d3baae83ce1ec9b343eaf3223cfa0f0dc15fb32674a50ca13eac19f64c906d9d3bdcf5f494d2bfd9c985a32db6e23e838d4fd992233040714ddcd7a8b2487b2 SHA512 3824da326ecef5d2a7faad42ba89061dcb5d00f12387b42c3ad46a8647b1a9a23e33c4a7298e5a7b9bea6a46926da96b428af81eb07fcd2525369620361d7a5c
 MISC metadata.xml 645 BLAKE2B 53c16632c20c6f6c592d340c5dd466632489b9427c30ce13a427241e6e5e366120cbef12692363918e4ed0c4c0e26f3b0e55ec762d9d9c375ac2170674b2f55e SHA512 a87e8be8d5a9c404f1acde4c9fc77c820b4c1c97d9b3a9c42a92b5ef497c45d3cf3c4f33fa7226ae32370381de9c5373e65e2560246cf597120d2b8557c4258a
diff --git a/sci-geosciences/josm-bin/josm-bin-19067.ebuild b/sci-geosciences/josm-bin/josm-bin-19067.ebuild
index 6303fb8bbeed..3c2c192c743d 100644
--- a/sci-geosciences/josm-bin/josm-bin-19067.ebuild
+++ b/sci-geosciences/josm-bin/josm-bin-19067.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"
 
 LICENSE="Apache-2.0 GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8"
 BDEPEND="app-arch/unzip"
diff --git a/sci-geosciences/xyzservices/Manifest b/sci-geosciences/xyzservices/Manifest
index b18c05eca8f5..cf5d1a728da0 100644
--- a/sci-geosciences/xyzservices/Manifest
+++ b/sci-geosciences/xyzservices/Manifest
@@ -1,5 +1,7 @@
 DIST xyzservices-2023.10.1.tar.gz 1113019 BLAKE2B c239c244c7ffea836acfc2fdba284c2b2b0b8fbd7e915ddcc004f7735898760f8bac626c7f58329d5c5555753dbbfe13731494ef5948ffaf2cd36d1eb28e014d SHA512 5ab57caa160bbf926014da83f81108c7ae6c509831a94d38c2dde73067cb2cd624697902166eb5a0af5f55faef1b8f1d0786db4766f80b1bfe5cad889d9dc627
 DIST xyzservices-2024.4.0.tar.gz 1126163 BLAKE2B d725799b668ac0cbdc88fbd8a9f14db70d45b5ca665fe899b4cc57197321b6639590c29f47fb10e420b9f8ccfbfe4b867a9a9c8e090403f0c023c0e69295f5f9 SHA512 1fb991578275914a7b3ef8202dcb049116a423f2b645bbc52717485c76089615f988f9eb592e13399c30b2901630089188c4ed30276c68015a7f12661ac62331
+DIST xyzservices-2024.6.0.tar.gz 1127473 BLAKE2B 0c5f99cd8efb5290f9e84abe824578da2c49075ebba72d48920c22da762e4b1e3225709602325f562669835cab39fe4df3556057c454c263d15dbccdf237c950 SHA512 628e0c50149792515051120e3a300bb6d5338fca8bfd40f4ecd7c8a2e5d0ffa43e5d9affd4c979739d61f5140b3331fb4f15aef061075763957abfed7f77c5d2
 EBUILD xyzservices-2023.10.1.ebuild 592 BLAKE2B 57ab00e7446df8d90126563b05983d1be5cc9c8fa3f386a0911b7b13725a05f9762b6ab651b4091fe2853815a328beb8453ef7d9e55c0f57c8de1756184d6988 SHA512 dfffcc0fa5f48edd7ab61d55e975287553ce13b8ab1f560db0c3953af8006202a552b16377c65534b2f4d2f2fd73ca18c097d88c4c84288aa537e3ede522ffe5
 EBUILD xyzservices-2024.4.0.ebuild 592 BLAKE2B 57ab00e7446df8d90126563b05983d1be5cc9c8fa3f386a0911b7b13725a05f9762b6ab651b4091fe2853815a328beb8453ef7d9e55c0f57c8de1756184d6988 SHA512 dfffcc0fa5f48edd7ab61d55e975287553ce13b8ab1f560db0c3953af8006202a552b16377c65534b2f4d2f2fd73ca18c097d88c4c84288aa537e3ede522ffe5
+EBUILD xyzservices-2024.6.0.ebuild 592 BLAKE2B 57ab00e7446df8d90126563b05983d1be5cc9c8fa3f386a0911b7b13725a05f9762b6ab651b4091fe2853815a328beb8453ef7d9e55c0f57c8de1756184d6988 SHA512 dfffcc0fa5f48edd7ab61d55e975287553ce13b8ab1f560db0c3953af8006202a552b16377c65534b2f4d2f2fd73ca18c097d88c4c84288aa537e3ede522ffe5
 MISC metadata.xml 334 BLAKE2B 125827255982a5609c4692d89b1ffdcbd3f8c8d159b79c96f93a384953b110c391d278c565b58015608329592240c0609540a2aa749f1f7b54fd1975ac43636c SHA512 a1378f8cb8430ba5be57af9d80cb50593ec2c1346c4142170508835230976a9795e110b9e0836f2f3a83793b5af4d93ec1e8ec9d8fe6383402a4265940b0b8b1
diff --git a/sci-geosciences/xyzservices/xyzservices-2024.6.0.ebuild b/sci-geosciences/xyzservices/xyzservices-2024.6.0.ebuild
new file mode 100644
index 000000000000..14e1cb70572f
--- /dev/null
+++ b/sci-geosciences/xyzservices/xyzservices-2024.6.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+inherit distutils-r1
+
+DESCRIPTION="Source of XYZ tiles providers"
+HOMEPAGE="https://github.com/geopandas/xyzservices"
+SRC_URI="https://github.com/geopandas/${PN}/archive/refs/tags/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+BDEPEND="dev-python/setuptools-scm"
+
+# Need mercantile module
+# distutils_enable_tests pytest