Merge updates from master

39 files changed, 832 insertions, 511 deletions

diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 3a029089e3cc..518d913f3104 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1 +1,2 @@
 DIST ipykernel-6.29.0.tar.gz 160814 BLAKE2B 4f5c650fda125a477ae7f16fad07e968f0f31a97375159ff5d3917181f31ecac3a618927e492332e5d5f69321c43fad69daa4c9bdfc67acc3756775ef855ceec SHA512 f924d8c4471f04349e1c8d0b980f8759e55c37585a4a44e61ba01ed1b96e3aa3897ec6e953e91f8f881debf5e599ab95b679075dcd413e43b8ed0263e8c9ca44
+DIST ipykernel-6.29.1.tar.gz 161082 BLAKE2B f5f5d4f15d08594fbab78675cdc1575a5579b69adeb393fa35d3ef57f56ad642999e5d17a901287a7924d8f7d1b62625d1c81dd96c821ce43bc694a277c63389 SHA512 8691394e76b151561248f66802622a4e4863c51bc26b4cf44e468155ff0f82405b92e69c37ecca8181d4b71736f61658fbf59937e7607a94288c107ea4cbfd74
diff --git a/dev-python/ipykernel/ipykernel-6.29.1.ebuild b/dev-python/ipykernel/ipykernel-6.29.1.ebuild
new file mode 100644
index 000000000000..1bd0e3b093fe
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.29.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi virtualx
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="
+	https://github.com/ipython/ipykernel/
+	https://pypi.org/project/ipykernel/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
+	!elibc_Darwin? (
+		$(python_gen_cond_dep '
+			>=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-8[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.12[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/nest-asyncio[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-24[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.4.0[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
+
+src_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_debugger.py::test_attach_debug
+		tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+		tests/test_debugger.py::test_rich_inspect_at_breakpoint
+		tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+		tests/test_debugger.py::test_set_breakpoints
+		tests/test_debugger.py::test_stop_on_breakpoint
+		tests/test_debugger.py::test_copy_to_globals
+		# hangs?
+		tests/test_eventloop.py::test_tk_loop
+		# doesn't like pyside2?
+		tests/test_eventloop.py::test_qt_enable_gui
+	)
+
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index 33d14cc78e65..2072a2cfe556 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1 +1,2 @@
 DIST jc-1.24.0.gh.tar.gz 13413929 BLAKE2B 22090ee1629dac7add0fd4fbf149f01354dc2e8a9b9603b4106c15f878fbfcb28e7b6cce17bb4bb018f73d4889e23c437cf1db2776356a84958a73d39305576b SHA512 00a70ea0e7e7153bafcc35877cb871d9c6c7659e323010c4fe5174134f5357d6e32d87cd7ab935133fed4f5e59f5cfc3ae3f679881b28ba9ff861467054f1961
+DIST jc-1.25.0.gh.tar.gz 13455054 BLAKE2B 4aca450c1549a1aa83cd20b9aed70072418a08d62c4d95c152e5d1b2cfd2d0f86945fcd0b39fffa16decfa3c844fafa684c38dfe9b06ec3c3c269467e2a4d696 SHA512 2ada59f25eb915405792830fe2bb5bf05f060c5a382459da5f226323c095e88abee1e18db51aa40a230a42021faa66949a9b535372070c8c419fd47fbbea8856
diff --git a/dev-python/jc/jc-1.25.0.ebuild b/dev-python/jc/jc-1.25.0.ebuild
new file mode 100644
index 000000000000..3d8d793333ec
--- /dev/null
+++ b/dev-python/jc/jc-1.25.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
+HOMEPAGE="
+	https://github.com/kellyjonbrazil/jc/
+	https://pypi.org/project/jc/
+"
+# no tests in sdist, as of 1.23.2
+SRC_URI="
+	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index efa210cd9e1c..4bbeef8f6cc0 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,2 +1,3 @@
 DIST jupyterlab-4.0.11.tar.gz 18348142 BLAKE2B 6a2676504a6475d02965ef7b6e393a52c19b3c6af8e58938a189f6bf22693ec754be6c165029f7b9f68b1b80a9f8c20fb67600cb4e9c526da5ae386b3bf728d3 SHA512 b02d18d0e0ecffc9a5d847efe4ce7c7258c741fd6ae0842f25c2c446b16af7cb11ac422dff7807a1a19f4536b514914e098c4fd04a58ceadb8296ce9aca3e2f3
 DIST jupyterlab-4.0.12.tar.gz 18352336 BLAKE2B afa406372cabd740dc09b354e626d4b87c3143e258294d48f82a816002f43e3d22e43bb0cae9eb34f1754d6ed947923c7fb60fbdaec9c82db162422c6057ec7c SHA512 2a84d2d2e6c64e8fa469b7c5b144b364743d2def1c278aff13e5a9380aca0075b49b31370fed368df951208014a0737380966ab6171a13ff07246ad2b4eca996
+DIST jupyterlab-4.1.0.tar.gz 21806195 BLAKE2B f525cab21a92958bd756f873fdd7d5cd3d0166e6ed1aa974d48c7038f7994f5356b18786464d3eaf41b8fa6e4a107e3904e9f3f2d3f1f22047fed5cd1f8b17e3 SHA512 fb5df4e149c0862fba726a88c07c6a96856743279d018b474c527c34f526a23ff49bfdcdd307834f110cb8ff4517c5867131ff7feadea85606212fddb09ff9ea
diff --git a/dev-python/jupyterlab/jupyterlab-4.1.0.ebuild b/dev-python/jupyterlab/jupyterlab-4.1.0.ebuild
new file mode 100644
index 000000000000..9e3f5902f2f5
--- /dev/null
+++ b/dev-python/jupyterlab/jupyterlab-4.1.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi xdg
+
+DESCRIPTION="JupyterLab computational environment"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyterlab/jupyterlab/
+	https://pypi.org/project/jupyterlab/
+"
+
+LICENSE="BSD MIT GPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/async-lru[${PYTHON_USEDEP}]
+	>=dev-python/httpx-0.25.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	dev-python/jupyter-core[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-server-2.19[${PYTHON_USEDEP}]
+	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
+	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	net-libs/nodejs
+"
+
+BDEPEND="
+	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		>=dev-python/pytest-jupyter-0.5.3[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-cache[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# These tests call npm and want internet
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
+)
+
+EPYTEST_IGNORE=(
+	jupyterlab/tests/test_announcements.py
+)
+
+distutils_enable_tests pytest
+# TODO: package sphinx_copybutton
+#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 6bb995265f9e..f898445b8447 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1 +1,2 @@
 DIST nbconvert-7.14.2.tar.gz 852202 BLAKE2B 195a4f8088ec82d7fcb56b7450878d8e769027bedf64dec82adfb2683936400c74b62ceb2a24d47724584df0cfa0e9c773e53357b412eda0958aa2c4256cb3fd SHA512 79a91b2cacb50af8eb584668b070bf233de4cdf783fa0d9d256c2204de4a97efc5224088811b6f2b5f89015e4180a24da63c5b79a026b1966df157de325114cd
+DIST nbconvert-7.15.0.tar.gz 853363 BLAKE2B c417428708279099d8a966ab61d044be1deebbb37757b75a248b8bf50302db8a7ba39a25c0d255777d695f9af93f43f420727c33bdad0a4a239660b7f74cc49a SHA512 bf598cc776ceadadecdec816ec8fd78502cffae399175d22cf184d6e45974fcd0d5e731ef8aa032aec251dcd2a8e5d6077c585c5f70786d4cbe72979e1ad8503
diff --git a/dev-python/nbconvert/nbconvert-7.15.0.ebuild b/dev-python/nbconvert/nbconvert-7.15.0.ebuild
new file mode 100644
index 000000000000..90b36a68a170
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-7.15.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi virtualx
+
+DESCRIPTION="Converting Jupyter Notebooks"
+HOMEPAGE="
+	https://nbconvert.readthedocs.io/
+	https://github.com/jupyter/nbconvert/
+	https://pypi.org/project/nbconvert/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
+	dev-python/jupyterlab-pygments[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
+	<dev-python/mistune-4[${PYTHON_USEDEP}]
+	>=dev-python/nbclient-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.7[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4.1[${PYTHON_USEDEP}]
+	dev-python/tinycss2[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		>=dev-python/ipywidgets-7.5[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_nbconvertapp.py::TestNbConvertApp::test_convert_full_qualified_name
+		tests/test_nbconvertapp.py::TestNbConvertApp::test_post_processor
+		# crazy qtweb* stuff, perhaps permissions
+		tests/exporters/test_qtpdf.py::TestQtPDFExporter::test_export
+		tests/exporters/test_qtpng.py::TestQtPNGExporter::test_export
+	)
+
+	# virtx implies nonfatal, make it explicit to avoid confusion
+	nonfatal epytest || die
+}
+
+pkg_postinst() {
+	if ! has_version virtual/pandoc; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc or app-text/pandoc-bin."
+	fi
+}
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 66ea900af6be..30274da60626 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1 +1,2 @@
 DIST peewee-3.17.0.gh.tar.gz 915412 BLAKE2B 531a021f925f41ce62822fe9a0f28dd9505c1890e02b42b6b9efb9ced15e56f531c564e3412104d5d10f5ef578c728d64e3f57d9c72a03e2c4b7f7d22d639647 SHA512 978a911aa0236246abcc3cc2ef54d418dc8f94bf78ce6eeeeaf43352d92ccb4238c66972b78a904d3ceed47736a2c509fbdde837e7660290faf220e5744b1cfa
+DIST peewee-3.17.1.gh.tar.gz 918980 BLAKE2B 192bdb4c8ba40c0d65f8182c4d87b6917d7758a8017977144b3455a0abdc96e6dfc2299cb9dfb967092c2619666816886b2f1fc163ee1e0607fb6ddfb6f2ae75 SHA512 7b3515949f862c96c9509edf2b1e7c8fc4947f3371421c5df8ca066f8456000471b0c2af8b906c9d826ea3bdc187b4e8676299b328160bda91ffd7f5a1b95435
diff --git a/dev-python/peewee/peewee-3.17.1.ebuild b/dev-python/peewee/peewee-3.17.1.ebuild
new file mode 100644
index 000000000000..bfa4dad11710
--- /dev/null
+++ b/dev-python/peewee/peewee-3.17.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Small Python ORM"
+HOMEPAGE="
+	https://github.com/coleifer/peewee/
+	https://pypi.org/project/peewee/
+"
+SRC_URI="
+	https://github.com/coleifer/peewee/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="examples +native-extensions test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	native-extensions? ( dev-db/sqlite:3= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
+
+src_compile() {
+	if ! use native-extensions; then
+		local -x NO_SQLITE=1
+	fi
+
+	distutils-r1_src_compile
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v 2 || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index d468cdfd18f6..4655af63e53b 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -1,2 +1,3 @@
 DIST python-engineio-4.8.1.gh.tar.gz 313165 BLAKE2B 3d3b87b7fba18d2315c2ef20c404a49ada7b4ac3ade33c11ef7ecaa3271000d4d6fdef3b92e65f39e4eed28425efb7d264b9b63e6262722ad0bb998924f05af4 SHA512 071fea8ffc2bc08322bf16953a8aba956af9fef583168c04d47c893fe99424709b66cf2dd780b00faf6c973eb40a96eb42d62bb15417057ec3f248ea091533d0
 DIST python-engineio-4.8.2.gh.tar.gz 313823 BLAKE2B a985466a661c1ad1995999c1792758bc6a412097911f64cbb8a38af362b19f5a2abd7aa0fb1e6806310f766db0fc4486ae2793ad4fc8804fe580540daff73a3a SHA512 ad61794f4ebabdaca86e049f378818506f6d2dc0bc52a4a7687185c2ef11788652d55e397a7e45f666f8c4233e46be5b16b7fda38440e96d0a66116e9327c172
+DIST python-engineio-4.9.0.gh.tar.gz 314185 BLAKE2B e14bb11f5762c42a77d782b0e1ce20c30f0f5599ba0c4577699d53f085464ce588660805d1b8c18a147b3bf01a2e255980f21e36003127e17351c28bd42f433e SHA512 24838cb71ca3beda6a28deaa37208fae0e673bb0a00696594aa638af95e49af479b0088809f093ace9b2a8f5f7a4dcc95bbd2aa5c97938137b6e594ac1a7950d
diff --git a/dev-python/python-engineio/python-engineio-4.9.0.ebuild b/dev-python/python-engineio/python-engineio-4.9.0.ebuild
new file mode 100644
index 000000000000..bc862843428a
--- /dev/null
+++ b/dev-python/python-engineio/python-engineio-4.9.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Engine.IO realtime server"
+HOMEPAGE="
+	https://python-engineio.readthedocs.io/
+	https://github.com/miguelgrinberg/python-engineio/
+	https://pypi.org/project/python-engineio/"
+SRC_URI="
+	https://github.com/miguelgrinberg/python-engineio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/simple-websocket-0.10.0[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+# Can use eventlet, werkzeug, or gevent, but no tests for werkzeug
+BDEPEND="
+	test? (
+		dev-python/tornado[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# eventlet is masked for removal
+		tests/common/test_async_eventlet.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# also eventlet
+		tests/common/test_server.py::TestServer::test_async_mode_eventlet
+		tests/common/test_server.py::TestServer::test_connect
+		tests/common/test_server.py::TestServer::test_service_task_started
+		tests/common/test_server.py::TestServer::test_upgrades
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
index 3a92a43e306a..bbee2a419dfc 100644
--- a/eclass/gnome2-utils.eclass
+++ b/eclass/gnome2-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: gnome2-utils.eclass
@@ -363,11 +363,6 @@ gnome2_gdk_pixbuf_update() {
 	local updater="${EROOT%/}/usr/bin/${CHOST}-gdk-pixbuf-query-loaders"
 	[[ -x ${updater} ]] || updater="${EROOT%/}/usr/bin/gdk-pixbuf-query-loaders"
 
-	if [[ -z ${GNOME2_ECLASS_GDK_PIXBUF_LOADERS} ]]; then
-		debug-print "gdk-pixbuf loader cache does not need an update"
-		return
-	fi
-
 	if tc-is-cross-compiler ; then
 		ewarn "Updating of gdk-pixbuf loader cache skipped due to cross-compilation."
 		ewarn "You might want to run gdk-pixbuf-query-loaders manually on the target"
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 00188fd7889c..66de2df97f9f 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -214,7 +214,9 @@ gnome2_pkg_postinst() {
 		gnome2_schemas_update
 	fi
 	gnome2_scrollkeeper_update
-	gnome2_gdk_pixbuf_update
+	if [[ -n ${GNOME2_ECLASS_GDK_PIXBUF_LOADERS} ]]; then
+		gnome2_gdk_pixbuf_update
+	fi
 
 	if [[ ${#GNOME2_ECLASS_GIO_MODULES[@]} -gt 0 ]]; then
 		gnome2_giomodule_cache_update
diff --git a/media-libs/libjxl/libjxl-0.9.1.ebuild b/media-libs/libjxl/libjxl-0.9.1.ebuild
index 7eef87e2a5e0..8931805b007a 100644
--- a/media-libs/libjxl/libjxl-0.9.1.ebuild
+++ b/media-libs/libjxl/libjxl-0.9.1.ebuild
@@ -101,10 +101,6 @@ multilib_src_install() {
 	find "${ED}" -name '*.a' -delete || die
 }
 
-pkg_preinst() {
-	gnome2_gdk_pixbuf_savelist
-}
-
 pkg_postinst() {
 	use gdk-pixbuf && gnome2_gdk_pixbuf_update
 }
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index e4ef4dc5ec32..32ace9dbb58b 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -93,10 +93,6 @@ multilib_src_install() {
 	find "${ED}" -name '*.a' -delete || die
 }
 
-pkg_preinst() {
-	gnome2_gdk_pixbuf_savelist
-}
-
 pkg_postinst() {
 	use gdk-pixbuf && gnome2_gdk_pixbuf_update
 }
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index 84abb1e70a6e..4b98f80e744c 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1,3 +1 @@
-DIST nvme-cli-2.6.gh.tar.gz 837964 BLAKE2B cd8b0442d58d94d6c402e252e98d81da209fbbd34d3d9eb8d570caedb7e56107d8cb4f9bd774b72eea688fc00678fc24c5f3f8cf46875e6dedadccca3c8e6f68 SHA512 da4daef2d7c554455e0c195c03f92188e0e946409a3bd8a5b421d9a106746e82fb1309901d2893639b1a3447bda094c80a9f49f59bf43cf2b00402f82beea3fc
 DIST nvme-cli-2.7.1.gh.tar.gz 902081 BLAKE2B 7d14838f7f0fd6d1ab1cb30041f862fe2db6f40fe72c13cb4ce227831cac6e141ff5cec2924c846f30629188754b0ce0630ad9009d2a490c193da20e8b8a45d1 SHA512 6a9f3574dfd4375e6f7a76ed95f698efb26da5b72a490579caeba9d46c4811ae31650844e0a0e1047dc627158d5ffbdc020112a5059d3195e7eadff902b70b19
-DIST nvme-cli-2.7.gh.tar.gz 902149 BLAKE2B 4e9d63f002480f60b76b4c7ca5dfefe0f5c8a1acf37eaeab91d4f0844aa43448b0a79cd906d33a09d6546c0ce5ed17f7a7a104d4f607e0a99c4ebd5b4125b0a3 SHA512 fcdd6598b004287b90b9fdea2948434f288113a9e41b36c2f44731ac51b7acbda9481bf60d0a183b4a8d79b06a1faaf71bd66f47e641d8eb229f1c05c281b2ae
diff --git a/sys-apps/nvme-cli/files/nvme-cli-2.5-no-hugetlbfs-automatic-dep.patch b/sys-apps/nvme-cli/files/nvme-cli-2.5-no-hugetlbfs-automatic-dep.patch
deleted file mode 100644
index df32c2c13332..000000000000
--- a/sys-apps/nvme-cli/files/nvme-cli-2.5-no-hugetlbfs-automatic-dep.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/meson.build b/meson.build
-index af79bd4d..90c4d6ad 100644
---- a/meson.build
-+++ b/meson.build
-@@ -69,9 +69,9 @@ endif
- conf.set('CONFIG_JSONC', json_c_dep.found(), description: 'Is json-c available?')
- 
- # Check for libhugetlbfs availability (optional)
--if cc.has_header('hugetlbfs.h')
-+if get_option('hugepages') and cc.has_header('hugetlbfs.h')
-   libhugetlbfs_dep = cc.find_library('hugetlbfs',
--                                     required : false)
-+                                     required : true)
- else
-   libhugetlbfs_dep = dependency('', required: false)
- endif
-diff --git a/meson_options.txt b/meson_options.txt
-index c61dae0f..a05a7e0f 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -70,3 +70,9 @@ option(
-   type : 'string',
-   description : 'override the git version string'
- )
-+option(
-+  'hugepages',
-+  type: 'boolean',
-+  value : false,
-+  description : 'Enable support for hugetlbfs'
-+)
diff --git a/sys-apps/nvme-cli/metadata.xml b/sys-apps/nvme-cli/metadata.xml
index 37ce8bf89548..727194bfa429 100644
--- a/sys-apps/nvme-cli/metadata.xml
+++ b/sys-apps/nvme-cli/metadata.xml
@@ -10,6 +10,5 @@
 	</upstream>
 	<use>
 		<flag name="json">Support JSON output via <pkg>dev-libs/json-c</pkg></flag>
-		<flag name="hugepages">Use huge pages for memory allocations via <pkg>sys-libs/libhugetlbfs</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-apps/nvme-cli/nvme-cli-2.6.ebuild b/sys-apps/nvme-cli/nvme-cli-2.6.ebuild
deleted file mode 100644
index b5740f1e6b1f..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-2.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson systemd udev
-
-DESCRIPTION="NVM-Express user space tooling for Linux"
-HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
-SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc x86"
-IUSE="hugepages +json"
-
-RDEPEND="
-	>=sys-libs/libnvme-1.6:=[json?]
-	hugepages? ( sys-libs/libhugetlbfs:= )
-	json? ( dev-libs/json-c:= )
-	sys-libs/zlib:=
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/nvme-cli-2.5-no-hugetlbfs-automatic-dep.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dversion-tag="${PV}"
-		-Ddocs=all
-		-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		-Dsystemddir="$(systemd_get_systemunitdir)"
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		$(meson_use hugepages)
-		$(meson_feature json json-c)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-apps/nvme-cli/nvme-cli-2.7.ebuild b/sys-apps/nvme-cli/nvme-cli-2.7.ebuild
deleted file mode 100644
index 0ee6bdafbc3b..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-2.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson systemd udev
-
-DESCRIPTION="NVM-Express user space tooling for Linux"
-HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
-SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
-IUSE="+json"
-
-RDEPEND="
-	>=sys-libs/libnvme-1.7:=[json?]
-	json? ( dev-libs/json-c:= )
-	sys-libs/zlib:=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dversion-tag="${PV}"
-		-Ddocs=all
-		-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		-Dsystemddir="$(systemd_get_systemunitdir)"
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		$(meson_feature json json-c)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-libs/libnvme/Manifest b/sys-libs/libnvme/Manifest
index b16d9619e035..6dc88ed7d023 100644
--- a/sys-libs/libnvme/Manifest
+++ b/sys-libs/libnvme/Manifest
@@ -1,3 +1 @@
-DIST libnvme-1.6-ubsan.patch.xz 5800 BLAKE2B 8603311c44a475bd09a31a6bebe96f29f2b18b6d0917cb02b680fc20861a71688f1c5b3f618d6f38e7c105c8a00b8818b2ffa67289371fd0ab62354d318bebb9 SHA512 74f1a86c4011ce6650b54ec50422fe98ec64a65b50e3aa6c3d57f3715713f85ef7c84451416bb8d136dff646b3eba00d415208c98a16c562bf5d258d51b0d006
-DIST libnvme-1.6.tar.gz 597676 BLAKE2B 8b47b268154574688a909d0664df55eda38d9f133373fabcffe987ede03e0c531f88126e0dc50204d74fb2fa665af6379aa5205757bfc5863926db8402fbab27 SHA512 ae6a95ed75bbdc6f8c5c5608eaad8bcaf60a08348ddff356bd47258da2bd2470bdaa45747cdb7ba24f10db093fc0ab95f8bda076a45cbb87e155e3158ef726f8
 DIST libnvme-1.7.1.tar.gz 604220 BLAKE2B b02bf0914be73f5877f418bebdbed31dfb019484fb9f6e169c3474d90306706b8e787003a472f13bedb72e90eff39a30ba35df252a3cdf4ea08a362c3f9e221b SHA512 aea986ae35eafa17482e07015228d5a7d529d41148f4cee9e4619adc2460abb5460d60cd91177462cbcaf2e94e5870026ff9e45548f91d9f90b65a6268eb3abb
diff --git a/sys-libs/libnvme/files/libnvme-1.6-lld-17.patch b/sys-libs/libnvme/files/libnvme-1.6-lld-17.patch
deleted file mode 100644
index c64b4a80cbfb..000000000000
--- a/sys-libs/libnvme/files/libnvme-1.6-lld-17.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/linux-nvme/libnvme/pull/725
-
-From a5cc9074765bf400336f78a05c8374b9788ad670 Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Tue, 10 Oct 2023 04:22:48 +0300
-Subject: [PATCH] build: remove symbol which doesn't exist in libnvme-mi.so
-
-* Added in bb70b874dac13a15c37ce1dd1de866d6a5dd428d, but was never used.
-
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
----
- src/libnvme-mi.map | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/libnvme-mi.map b/src/libnvme-mi.map
-index f1ce7125..41e81106 100644
---- a/src/libnvme-mi.map
-+++ b/src/libnvme-mi.map
-@@ -49,7 +49,6 @@ LIBNVME_MI_1_1 {
- 		nvme_mi_admin_security_send;
- 		nvme_mi_admin_security_recv;
- 		nvme_mi_endpoint_desc;
--		nvme_mi_root_close;
- 		nvme_mi_first_endpoint;
- 		nvme_mi_next_endpoint;
- 		nvme_mi_first_ctrl;
diff --git a/sys-libs/libnvme/files/libnvme-1.6-musl.patch b/sys-libs/libnvme/files/libnvme-1.6-musl.patch
deleted file mode 100644
index bc1037820311..000000000000
--- a/sys-libs/libnvme/files/libnvme-1.6-musl.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-https://github.com/linux-nvme/libnvme/pull/724
-
-From f78a97acf9cdec1031d81f0e8a3956fc8f28c33c Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 30 Sep 2023 06:38:53 +0100
-Subject: [PATCH 1/2] test: handle POSIX ioctl prototype
-
-glibc has the following prototype for ioctl: int ioctl(int fd, unsigned long request, ...)
-POSIX (inc. musl) has the following for ioctl: int ioctl(int fd, int request, ...)
-
-Check which prototype is used in <sys/ioctl.h> to avoid a conflict and conditionally
-define the right one for the system.
-
-Bug: https://bugs.gentoo.org/914921
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/meson.build
-+++ b/meson.build
-@@ -230,6 +230,16 @@ conf.set(
-     ),
-     description: 'Is network address and service translation available'
- )
-+conf.set(
-+    'HAVE_GLIBC_IOCTL',
-+    cc.compiles(
-+        '''#include <sys/ioctl.h>
-+        int ioctl(int fd, unsigned long request, ...);
-+        ''',
-+        name: 'ioctl has glibc-style prototype'
-+    ),
-+    description: 'Is ioctl the glibc interface (rather than POSIX)'
-+)
- 
- if cc.has_function_attribute('fallthrough')
-   conf.set('fallthrough', '__attribute__((__fallthrough__))')
---- a/test/ioctl/mock.c
-+++ b/test/ioctl/mock.c
-@@ -114,7 +114,11 @@ void end_mock_cmds(void)
- 	} \
- })
- 
-+#ifdef HAVE_GLIBC_IOCTL
- int ioctl(int fd, unsigned long request, ...)
-+#else
-+int ioctl(int fd, int request, ...)
-+#endif
- {
- 	struct mock_cmds *mock_cmds;
- 	bool result64;
-@@ -141,7 +145,7 @@ int ioctl(int fd, unsigned long request, ...)
- 		result64 = true;
- 		break;
- 	default:
--		fail("unexpected %s %lu", __func__, request);
-+		fail("unexpected %s %lu", __func__, (unsigned long) request);
- 	}
- 	check(mock_cmds->remaining_cmds,
- 	      "unexpected %s command", mock_cmds->name);
-
-From 149c006d23da60e168485ede722730dc2b725e6b Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 30 Sep 2023 06:43:39 +0100
-Subject: [PATCH 2/2] meson: make building tests conditional
-
-Just like we do for docs.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/meson.build
-+++ b/meson.build
-@@ -273,7 +273,9 @@ subdir('internal')
- subdir('ccan')
- subdir('src')
- subdir('libnvme')
--subdir('test')
-+if get_option('tests')
-+    subdir('test')
-+endif
- subdir('examples')
- subdir('doc')
- 
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -6,6 +6,7 @@ option('rstdir', type : 'string', value : '', description : 'directory for ReST
- 
- option('docs', type : 'combo', choices : ['false', 'html', 'man', 'rst', 'all'], description : 'install documentation')
- option('docs-build', type : 'boolean', value : false,  description : 'build documentation')
-+option('tests', type : 'boolean', value : true, description : 'build tests')
- 
- option('python', type : 'feature', value: 'auto', description : 'Generate libnvme python bindings')
- option('openssl', type : 'feature', value: 'auto', description : 'OpenSSL support')
-
diff --git a/sys-libs/libnvme/libnvme-1.6-r1.ebuild b/sys-libs/libnvme/libnvme-1.6-r1.ebuild
deleted file mode 100644
index 14169a41d0d8..000000000000
--- a/sys-libs/libnvme/libnvme-1.6-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit python-r1 meson
-
-DESCRIPTION="C Library for NVM Express on Linux"
-HOMEPAGE="https://github.com/linux-nvme/libnvme"
-SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv x86"
-IUSE="dbus +json keyutils python ssl test +uuid"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-DEPEND="
-	json? ( dev-libs/json-c:= )
-	keyutils? ( sys-apps/keyutils:= )
-	dbus? ( sys-apps/dbus:= )
-	python? ( ${PYTHON_DEPS} )
-	ssl? ( >=dev-libs/openssl-1.1:= )
-	uuid? ( sys-apps/util-linux:= )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-lang/swig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6-musl.patch
-	"${FILESDIR}"/${P}-lld-17.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dpython=false
-		$(meson_use test tests)
-		$(meson_feature json json-c)
-		$(meson_feature dbus libdbus)
-		$(meson_feature keyutils)
-		$(meson_feature ssl openssl)
-	)
-	meson_src_configure
-}
-
-python_compile() {
-	local emesonargs=(
-		-Dpython=enabled
-	)
-	meson_src_configure --reconfigure
-	meson_src_compile
-}
-
-src_compile() {
-	meson_src_compile
-
-	if use python; then
-		python_copy_sources
-		python_foreach_impl python_compile
-	fi
-}
-
-python_install() {
-	meson_src_install
-	use python && python_optimize
-}
-
-src_install() {
-	use python && python_foreach_impl python_install
-
-	meson_src_install
-}
diff --git a/sys-libs/libnvme/libnvme-1.6-r2.ebuild b/sys-libs/libnvme/libnvme-1.6-r2.ebuild
deleted file mode 100644
index ea83a7bc434b..000000000000
--- a/sys-libs/libnvme/libnvme-1.6-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit python-r1 meson
-
-DESCRIPTION="C Library for NVM Express on Linux"
-HOMEPAGE="https://github.com/linux-nvme/libnvme"
-SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-ubsan.patch.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="dbus +json keyutils python ssl test +uuid"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-DEPEND="
-	json? ( dev-libs/json-c:= )
-	keyutils? ( sys-apps/keyutils:= )
-	dbus? ( sys-apps/dbus:= )
-	python? ( ${PYTHON_DEPS} )
-	ssl? ( >=dev-libs/openssl-1.1:= )
-	uuid? ( sys-apps/util-linux:= )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-lang/swig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6-musl.patch
-	"${FILESDIR}"/${P}-lld-17.patch
-	"${WORKDIR}"/${P}-ubsan.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dpython=false
-		$(meson_use test tests)
-		$(meson_feature json json-c)
-		$(meson_feature dbus libdbus)
-		$(meson_feature keyutils)
-		$(meson_feature ssl openssl)
-	)
-	meson_src_configure
-}
-
-python_compile() {
-	local emesonargs=(
-		-Dpython=enabled
-	)
-	meson_src_configure --reconfigure
-	meson_src_compile
-}
-
-src_compile() {
-	meson_src_compile
-
-	if use python; then
-		python_copy_sources
-		python_foreach_impl python_compile
-	fi
-}
-
-python_install() {
-	meson_src_install
-	use python && python_optimize
-}
-
-src_install() {
-	use python && python_foreach_impl python_install
-
-	meson_src_install
-}
diff --git a/sys-libs/libnvme/libnvme-1.6.ebuild b/sys-libs/libnvme/libnvme-1.6.ebuild
deleted file mode 100644
index 8f1a33ea55fa..000000000000
--- a/sys-libs/libnvme/libnvme-1.6.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit python-r1 meson
-
-DESCRIPTION="C Library for NVM Express on Linux"
-HOMEPAGE="https://github.com/linux-nvme/libnvme"
-SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="dbus +json keyutils python ssl test +uuid"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-DEPEND="
-	json? ( dev-libs/json-c:= )
-	keyutils? ( sys-apps/keyutils:= )
-	dbus? ( sys-apps/dbus:= )
-	python? ( ${PYTHON_DEPS} )
-	ssl? ( >=dev-libs/openssl-1.1:= )
-	uuid? ( sys-apps/util-linux:= )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-lang/swig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6-musl.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dpython=false
-		$(meson_use test tests)
-		$(meson_feature json json-c)
-		$(meson_feature dbus libdbus)
-		$(meson_feature keyutils)
-		$(meson_feature ssl openssl)
-	)
-	meson_src_configure
-}
-
-python_compile() {
-	local emesonargs=(
-		-Dpython=enabled
-	)
-	meson_src_configure --reconfigure
-	meson_src_compile
-}
-
-src_compile() {
-	meson_src_compile
-
-	if use python; then
-		python_copy_sources
-		python_foreach_impl python_compile
-	fi
-}
-
-python_install() {
-	meson_src_install
-	use python && python_optimize
-}
-
-src_install() {
-	use python && python_foreach_impl python_install
-
-	meson_src_install
-}
diff --git a/sys-libs/libnvme/libnvme-1.7.1.ebuild b/sys-libs/libnvme/libnvme-1.7.1-r1.ebuild
index 5dce034744c3..5dce034744c3 100644
--- a/sys-libs/libnvme/libnvme-1.7.1.ebuild
+++ b/sys-libs/libnvme/libnvme-1.7.1-r1.ebuild
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
index f842fb345080..33a549378a99 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -1,2 +1,4 @@
 DIST garcon-4.18.1.tar.bz2 554562 BLAKE2B 395cc8f7c7029196f25ecb52d393989ab0df0d9ddd34ec1fc4b0a2ee46b1a059a87c75797adb84d7557523e8e0c464278344fe3d793f05941a90874bdc8e036d SHA512 8e6d091beaf1aaa85cc16cd5e562191e0e6858a47444a23d95066f9afa3f8a70f7a61bc9fec33fe401945637e810441cbd6f961f41b40e2d2ce7a1ce4fce78a0
+DIST garcon-4.18.2.tar.bz2 579345 BLAKE2B 2c2c66bb5e53a6dce01cf9dbb8458794f42c06c8db6b526a8ba5c37b73298a7d1fb3f64ef7f9c2036e87903cc6e2afd49fdaedddaec7ecaf8a4b711547945b52 SHA512 f74547a29dbf47469e9448ea0fb89a297d02c7a5d2f7ec1a1f05706f89160730e04743ce84de29de21f32a2d2e4e4410f6c12fd14777c65944529f5104973cee
 DIST garcon-4.19.0.tar.bz2 648551 BLAKE2B 0084bf8b72fe1e3e2ac492c4639f84eb330ba37660adf0d5c3c41a4d9e6db3b063e4875f20dbe0a62b0c72bbb06072cb6cd37df057f6e5feb6431f35f87ea045 SHA512 c49304bc69528475318d934a4c565ade7171022f3887c7292e573ccd846137db1e7e325213a73b5a8003869adc35fa73cf5682ec646b2114f4614ae1c076ee9a
+DIST garcon-4.19.1.tar.bz2 655347 BLAKE2B 609403c108638fcbc10485d18d2a0564d8a1137bc9b92e4be0bbafb1615ea1d2f919da2871df22ebdbe3910ceed7f042cfa261df3243910276f9a144124f0125 SHA512 85f3c8991a143636ffd257115f749cb687cfebeeb29ed29a0d6e751bdfe26d0cd121feaad52b16ca2b017d2f2824b1da050db8638c5d6d5e72c7f62934d7f250
diff --git a/xfce-base/garcon/garcon-4.18.2.ebuild b/xfce-base/garcon/garcon-4.18.2.ebuild
new file mode 100644
index 000000000000..494678c3ea40
--- /dev/null
+++ b/xfce-base/garcon/garcon-4.18.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/garcon/start
+	https://gitlab.xfce.org/xfce/garcon/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="introspection"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+	>=x11-libs/gtk+-3.24.0:3
+	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
+	>=xfce-base/libxfce4ui-4.15.7:=[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	introspection? ( >=dev-libs/gobject-introspection-1.66 )
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/garcon/garcon-4.19.1.ebuild b/xfce-base/garcon/garcon-4.19.1.ebuild
new file mode 100644
index 000000000000..aa205c9731cb
--- /dev/null
+++ b/xfce-base/garcon/garcon-4.19.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/garcon/start
+	https://gitlab.xfce.org/xfce/garcon/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="introspection"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+	>=x11-libs/gtk+-3.24.0:3
+	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
+	>=xfce-base/libxfce4ui-4.15.7:=[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	introspection? ( >=dev-libs/gobject-introspection-1.66 )
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index 6685706f162f..ed1ba96df2ef 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,2 +1,4 @@
 DIST libxfce4ui-4.18.4.tar.bz2 907248 BLAKE2B 785ec91bcb2995d289423ac666832b642e1cd1c2685e9bb5b6781ca6c7272d7e85e163a55b137602401ed9a18f1b8e29492e3b7bd1d74951544e71a4338860ae SHA512 e931d38319bcc0dcfa854642f604fcd782ffb27a160ae7e2625d7a276625635131b0451c12ccd502b68366283c503ad21536389e70da6912e46eb16b97f28642
+DIST libxfce4ui-4.18.5.tar.bz2 906155 BLAKE2B 2fb977ecbb6c02c485ed2575d189140c5cdce4090529aabbd6a220986cb53241aecfa3a1d1ed79ae873a53d14fa6af80c0732050c6d6aace949e47ba2d71bf8f SHA512 b8b64bf2b71bc327a94c9292b6e1ad5647c6f91b3a806faad894d9973955ec3b05f14a28c0486604c518f7cef1f676337c1405f7d04a8b7b8698f1725346c0f5
 DIST libxfce4ui-4.19.3.tar.bz2 1169903 BLAKE2B 175e88fa58712933c681a8851c787d7322d806005cd450e3db3d3a7744ea08a599ddba071944c031e047365c4fec70b0144f84a3ed491b9bd5efb7a359233303 SHA512 3361de52cd48318cdd5a61d26a741336f4168fa98a284faee5ac53460dc875625df73084aec65e8203cea7438f9b8bd64cfd456ab9803c330a554aa6f444529a
+DIST libxfce4ui-4.19.4.tar.bz2 1177397 BLAKE2B e73cb1d8fb8ba12e71fcf100888b2e9fe26ae08a1bb09edba6f0dc8ad7db0d872722c44812c9dc65be0c2331b9364fe668aeb9bd16dce138e8cca0dcb771400e SHA512 81ce96954bc70b5d2dfbe3311c969ad36247057a5caed13c002a994140ba8a56f5c49cb7a12aaf41a7edc0986b06c1eb22cf3f3c67d02312a47356bd99767c8e
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.18.5.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.18.5.ebuild
new file mode 100644
index 000000000000..e3eda5880a06
--- /dev/null
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.18.5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils vala
+
+DESCRIPTION="Unified widget and session management libs for Xfce"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/libxfce4ui/start
+	https://gitlab.xfce.org/xfce/libxfce4ui/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="glade +introspection startup-notification system-info vala"
+REQUIRED_USE="vala? ( introspection )"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+	>=x11-libs/gtk+-3.24.0:3[introspection?,X]
+	x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM
+	>=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?]
+	>=xfce-base/xfconf-4.12:=
+	glade? ( dev-util/glade:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+	startup-notification? ( x11-libs/startup-notification )
+	system-info? (
+		dev-libs/libgudev
+		gnome-base/libgtop
+		>=media-libs/libepoxy-1.2
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-lang/perl
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable system-info glibtop)
+		$(use_enable system-info epoxy)
+		$(use_enable system-info gudev)
+		$(use_enable startup-notification)
+		$(use_enable vala)
+		$(use_enable glade gladeui2)
+		--with-vendor-info=Gentoo
+	)
+
+	use vala && vala_setup
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.19.4.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.19.4.ebuild
new file mode 100644
index 000000000000..ebdb8fd87e75
--- /dev/null
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.19.4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils vala
+
+DESCRIPTION="Unified widget and session management libs for Xfce"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/libxfce4ui/start
+	https://gitlab.xfce.org/xfce/libxfce4ui/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="glade +introspection startup-notification system-info vala wayland X"
+REQUIRED_USE="vala? ( introspection )"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+	>=x11-libs/gtk+-3.24.0:3[introspection?,wayland?,X?]
+	>=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?]
+	>=xfce-base/xfconf-4.12.0:=
+	glade? ( >=dev-util/glade-3.5.0:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+	system-info? (
+		>=dev-libs/libgudev-232
+		>=gnome-base/libgtop-2.24.0
+		>=media-libs/libepoxy-1.2
+	)
+	X? (
+		x11-libs/libICE
+		>=x11-libs/libSM-1.2.3
+		>=x11-libs/libX11-1.6.7
+		startup-notification? ( >=x11-libs/startup-notification-0.4 )
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-lang/perl
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable glade gladeui2)
+		$(use_enable introspection)
+		$(use_enable system-info glibtop)
+		$(use_enable system-info epoxy)
+		$(use_enable system-info gudev)
+		$(use_enable startup-notification)
+		$(use_enable vala)
+		$(use_enable wayland)
+		$(use_enable X x11)
+		--with-vendor-info=Gentoo
+	)
+
+	use vala && vala_setup
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index 663f4c3b36a8..7c335ba43678 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,2 +1,4 @@
 DIST libxfce4util-4.18.1.tar.bz2 527167 BLAKE2B b5d16b4e6ce541a7de559eb2801cf800dab26c45e83b0c562974f18218fd9ad0d70e40219b573a90f1ea1b9e15a8111cfae6200f581335f305a7e7f6eb07adc9 SHA512 e1459e2268948c8329394bdca56f7e7bef7739b56559c00ce6d70dfbedd038cd73a4873be34b91dbd94a80afc16e2b0e1cc256d3ff4d8fdeef9162fbdb3772cd
+DIST libxfce4util-4.18.2.tar.bz2 514157 BLAKE2B 4c0479d3df308956cecb321783823c3d1f07622260a19b2e7c633a5de6d87a779f1196c10cc5078b01bfabc7ca0cac9a819084414f2dcfbaef3d6d9a69ef3df8 SHA512 94c7371bcfd4ea8dca68a2dc2fe029ce8b232b2b906247bb45a830f13a27833e80831bb6df029d634e6cd8496d4cdcbb9691b6c4344aa51292477f2ebf56bac0
 DIST libxfce4util-4.19.2.tar.bz2 622588 BLAKE2B addee65233ce7f6a335b9c072066ea1a4d357e4dce62ecb75cce56aa3d7c27916c141d1124951821f1d4234813a54e51ed933829937adcf0f6c906a4fb65e907 SHA512 85521be421abb3f3c37d7608eae96cb9b2f7ba5b0ac599d2a7501b3b201603fd36ccb13840bd5a3462771e32d81e5814a008baf22df46df7b3b46e4ac8d7e3eb
+DIST libxfce4util-4.19.3.tar.bz2 622911 BLAKE2B 0bbe4b6085762d7ab53cb54228cf153e96d6d7c1987bd14fd0f5b0697a0bbf06aa4e969760104b650cc27bfd5a502750e5d1a5b2af7813746bb76528a1c6693d SHA512 0e869f0b850d6454c52a5e43b42ef5f56432ed69774bbf5ba8883d6d2fd8c2e9fccf471c684eb7577617f6286696dfd60ae4f5803c8d45002236289a5d4e5bff
diff --git a/xfce-base/libxfce4util/libxfce4util-4.18.2.ebuild b/xfce-base/libxfce4util/libxfce4util-4.18.2.ebuild
new file mode 100644
index 000000000000..ed4e10c4de0d
--- /dev/null
+++ b/xfce-base/libxfce4util/libxfce4util-4.18.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vala
+
+DESCRIPTION="A basic utility library for the Xfce desktop environment"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/libxfce4util/start
+	https://gitlab.xfce.org/xfce/libxfce4util/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable vala)
+	)
+
+	use vala && vala_setup
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-base/libxfce4util/libxfce4util-4.19.3.ebuild b/xfce-base/libxfce4util/libxfce4util-4.19.3.ebuild
new file mode 100644
index 000000000000..c84608bc4853
--- /dev/null
+++ b/xfce-base/libxfce4util/libxfce4util-4.19.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vala
+
+DESCRIPTION="A basic utility library for the Xfce desktop environment"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/libxfce4util/start
+	https://gitlab.xfce.org/xfce/libxfce4util/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable vala)
+	)
+
+	use vala && vala_setup
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-base/tumbler/Manifest b/xfce-base/tumbler/Manifest
index 223340943d3c..425d5ceba8fc 100644
--- a/xfce-base/tumbler/Manifest
+++ b/xfce-base/tumbler/Manifest
@@ -1,2 +1,3 @@
 DIST tumbler-4.18.2.tar.bz2 619513 BLAKE2B d93b6dc3b0da1b8ed04af740dec4979daba376572f36e80e6f33c791552a8615fc9f6d6452b0008030a83b322179d1a6f8daa6e5a60344ba09706d0d34de270a SHA512 043e4e7058d1bf0eb4f037924161387042111c7a1bfbf78f8417d0b6463d6b7e72506741f395ca14d6150e2cc0b79d97b2ee3270a30e0d18a0161f639627e255
 DIST tumbler-4.19.0.tar.bz2 692513 BLAKE2B 6b391cf11670dc0dca582ae5052e9d5dc0f8e240c75f14a52ee17f6779a9f0ccc1daf43cb4fad6eff92d6ac52424c769b3e21785b7c743a003340303d9a2d76c SHA512 62fb373f9f9b6d186d9d64a8f4d94a4dc57840e231749b6a0458d582bd205f29c837983901caf53a698ed44667b9e12a000d8dfbbbe9c2e3224622ae41a560e7
+DIST tumbler-4.19.1.tar.bz2 704299 BLAKE2B e6b24c5f9393d661b409001d02db29c36c74ae241279c2880e20cd2935eb16429ab105023ec918014e8899abe0dfa1fe199d2cb7ba22fefda3f0a4db58aded62 SHA512 ed38c9263741dc8c621974eb058a970b8e50c9e0efa551945a12e836fabc8015a4d70c2a558271b11a9783d6778bbacb886c0925618ff0f7850a5680580e2e4d
diff --git a/xfce-base/tumbler/tumbler-4.19.1.ebuild b/xfce-base/tumbler/tumbler-4.19.1.ebuild
new file mode 100644
index 000000000000..38c64f347a48
--- /dev/null
+++ b/xfce-base/tumbler/tumbler-4.19.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A thumbnail service for Thunar"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/tumbler/start
+	https://gitlab.xfce.org/xfce/tumbler/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="curl epub ffmpeg gstreamer jpeg odf pdf raw"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+	media-libs/freetype:2=
+	media-libs/libpng:0=
+	>=sys-apps/dbus-1.6
+	>=xfce-base/libxfce4util-4.17.1:=
+	>=x11-libs/gdk-pixbuf-2.40.0
+	curl? ( >=net-misc/curl-7.32.0:= )
+	epub? ( app-text/libgepub )
+	ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jpeg? ( media-libs/libjpeg-turbo:0= )
+	odf? ( >=gnome-extra/libgsf-1.14.20:= )
+	pdf? ( >=app-text/poppler-0.12.4[cairo] )
+	raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] )
+"
+RDEPEND="
+	${DEPEND}
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable curl cover-thumbnailer)
+		$(use_enable epub gepub-thumbnailer)
+		$(use_enable jpeg jpeg-thumbnailer)
+		$(use_enable ffmpeg ffmpeg-thumbnailer)
+		$(use_enable gstreamer gstreamer-thumbnailer)
+		$(use_enable odf odf-thumbnailer)
+		$(use_enable pdf poppler-thumbnailer)
+		$(use_enable raw raw-thumbnailer)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}