summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.46.3-r410.ebuild2
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.46.3-r600.ebuild2
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.46.3.ebuild2
-rw-r--r--profiles/package.mask7
-rw-r--r--sci-geosciences/folium/Manifest3
-rw-r--r--sci-geosciences/folium/folium-0.15.1-r2.ebuild49
-rw-r--r--sci-geosciences/folium/folium-0.18.0.ebuild (renamed from sci-geosciences/folium/folium-0.16.0.ebuild)0
-rw-r--r--sci-geosciences/xyzservices/Manifest3
-rw-r--r--sci-geosciences/xyzservices/xyzservices-2024.4.0.ebuild24
-rw-r--r--sci-geosciences/xyzservices/xyzservices-2024.9.0.ebuild (renamed from sci-geosciences/xyzservices/xyzservices-2023.10.1.ebuild)0
10 files changed, 5 insertions, 87 deletions
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.3-r410.ebuild
index bebba1c1ac51..7f0d8baf875a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.46.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.3-r410.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-2+ BSD"
SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64"
IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.3-r600.ebuild
index 47d64a4da39e..6e9c087b477c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.46.3-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.3-r600.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-2+ BSD"
SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64"
IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.3.ebuild
index d3b68f9e5291..daca322d737a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.46.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-2+ BSD"
SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64"
IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/profiles/package.mask b/profiles/package.mask
index 891725703b36..523aee39a4d6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -317,13 +317,6 @@ app-i18n/fcitx-unikey:4
app-i18n/fcitx:4
app-i18n/kcm-fcitx
-# Michael Orlitzky <mjo@gentoo.org> (2024-10-09)
-# This is the new stable series of webkit-gtk, but it has a new
-# less-portable rendering engine, and doesn't yet build on ~riscv for
-# reasons unrelated to that. It's easier to play around with it in
-# the tree, but it's not ready for end users yet.
->=net-libs/webkit-gtk-2.46.0
-
# Ionen Wolkens <ionen@gentoo.org> (2024-10-08)
# Masked for testing, and odds are (at this point) that 6.8.0 will
# never be unmasked and will skip to 6.8.1 instead given the large
diff --git a/sci-geosciences/folium/Manifest b/sci-geosciences/folium/Manifest
index 2e58c7aa1750..64f4846142f1 100644
--- a/sci-geosciences/folium/Manifest
+++ b/sci-geosciences/folium/Manifest
@@ -1,3 +1,2 @@
-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
+DIST folium-0.18.0.tar.gz 8193343 BLAKE2B d36bedfc8038bd71bc0f22ab0c998bab8b32f8e521c32a6a9b0f6f0cc8d1804310346d7531d83e96efc3f804de1eeef5e2ec851b67b9a5e79ab64d42d5410e60 SHA512 a37dfa47b5bd256298df151ad48d71dfeaf5170c6b4e02d28a3f73aa749cfaf931e4ee91110dd3d027f047d46f309111beeca52dfcfafebe5f38597421ecb3c2
diff --git a/sci-geosciences/folium/folium-0.15.1-r2.ebuild b/sci-geosciences/folium/folium-0.15.1-r2.ebuild
deleted file mode 100644
index 0342b39e6783..000000000000
--- a/sci-geosciences/folium/folium-0.15.1-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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}"/${P}-gentoo.patch
-)
-
-RDEPEND="sci-geosciences/xyzservices[${PYTHON_USEDEP}]
- sci-libs/branca[${PYTHON_USEDEP}]
- dev-python/jinja2[${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/folium/folium-0.16.0.ebuild b/sci-geosciences/folium/folium-0.18.0.ebuild
index 4aa2aa656206..4aa2aa656206 100644
--- a/sci-geosciences/folium/folium-0.16.0.ebuild
+++ b/sci-geosciences/folium/folium-0.18.0.ebuild
diff --git a/sci-geosciences/xyzservices/Manifest b/sci-geosciences/xyzservices/Manifest
index e4246bd039a6..654a05848493 100644
--- a/sci-geosciences/xyzservices/Manifest
+++ b/sci-geosciences/xyzservices/Manifest
@@ -1,3 +1,2 @@
-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
+DIST xyzservices-2024.9.0.tar.gz 1127998 BLAKE2B d7c4f102984b678daf673e0066065140ecd222e999893ed6b72038e976fd33ef54a2d11fdd23ee9d7ccc75cd5eb79d3cd28d72bb9fd98d149adb84dd73ed46dd SHA512 8234b8eef07200563e5dd34c6a2c1e979137dbe3541238cd5f9d4de87675ab6abe9a69778794612a5962eb4d45a354300372233125bf75a5d9a6bfbb828dce5f
diff --git a/sci-geosciences/xyzservices/xyzservices-2024.4.0.ebuild b/sci-geosciences/xyzservices/xyzservices-2024.4.0.ebuild
deleted file mode 100644
index 14e1cb70572f..000000000000
--- a/sci-geosciences/xyzservices/xyzservices-2024.4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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
diff --git a/sci-geosciences/xyzservices/xyzservices-2023.10.1.ebuild b/sci-geosciences/xyzservices/xyzservices-2024.9.0.ebuild
index 14e1cb70572f..14e1cb70572f 100644
--- a/sci-geosciences/xyzservices/xyzservices-2023.10.1.ebuild
+++ b/sci-geosciences/xyzservices/xyzservices-2024.9.0.ebuild