From 2c7847ba31e591ac37abc9c1f7df82666404e6b1 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Tue, 12 Mar 2024 15:44:23 +0100
Subject: [PATCH 01/34] games-arcade/taisei: drop 1.3.2-r2

Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
---
 games-arcade/taisei/Manifest               |  1 -
 games-arcade/taisei/taisei-1.3.2-r2.ebuild | 63 ----------------------
 2 files changed, 64 deletions(-)
 delete mode 100644 games-arcade/taisei/taisei-1.3.2-r2.ebuild

diff --git a/games-arcade/taisei/Manifest b/games-arcade/taisei/Manifest
index ce0718fe91..35fb7293ca 100644
--- a/games-arcade/taisei/Manifest
+++ b/games-arcade/taisei/Manifest
@@ -1,3 +1,2 @@
 DIST taisei-1.4.1.tar.xz 219550456 BLAKE2B 640b4e53b4ee4784173a8ba0ea435a75aa547a788e549f56c3dff99f9a36997a3c7c73d857fc86bf7aa10d6c22f3bf826991d3a61147e2ec24771fb96c987ed6 SHA512 7c11ed1c7a7898ca4f43854224c8e55305fcef8312f0d32b488c85fbf16cceaa84fd52948bb81e311095b93254d95ea7eaa8f85c42bbbe54cf81d2702242cb2b
 DIST taisei-1.4.tar.xz 219573588 BLAKE2B c5a3300f3274ccc13e1beef9eb673affc223d761dfb632d9b067bc7cf401c3ed0422a78e0dba5334ab003044dae2cb24efb892edc955ee417ebc6c0477617314 SHA512 5715fd7dca868a3987941f24e26fb8ddc507ca5cb4e3c6a2b9c021bc0742d164e6ff2410f7b8de85907baa90f2c4b34925ac1196b163474047bee60141befb86
-DIST taisei-v1.3.2.tar.xz 70481856 BLAKE2B 608b5db6f17e2693539ce0742a1812633e91e901b3935b9e54f91514827642334f6cb6f0217aff713f1ff9dd01d971ae895ac8c98b0360f254b52d3e49bfae61 SHA512 9304c082106dfa1ffcf6c8fb7333e64755b1246ef50b9f49d3e64d167eb15575ac667ca658b1d7e247582e164e703e5817384556dd633f5516670d975817717d
diff --git a/games-arcade/taisei/taisei-1.3.2-r2.ebuild b/games-arcade/taisei/taisei-1.3.2-r2.ebuild
deleted file mode 100644
index 093a2e66ae..0000000000
--- a/games-arcade/taisei/taisei-1.3.2-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10,11} )
-
-inherit meson python-any-r1 xdg
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/taisei-project/taisei.git"
-else
-	SRC_URI="https://github.com/taisei-project/taisei/releases/download/v${PV}/${PN}-v${PV}.tar.xz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-DESCRIPTION="Clone of the Touhou series, written in C using SDL/OpenGL/OpenAL."
-HOMEPAGE="https://taisei-project.org/"
-LICENSE="MIT CC-BY-4.0 CC0-1.0 public-domain"
-SLOT="0"
-
-IUSE="doc lto zip"
-
-RDEPEND="
-	media-libs/freetype:2
-	media-libs/opusfile
-	>=media-libs/libpng-1.5
-	media-libs/libsdl2
-	media-libs/sdl2-mixer[opus]
-	media-libs/libwebp
-	sys-libs/zlib
-	dev-libs/openssl:=
-	zip? ( dev-libs/libzip )
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-libs/cglm-0.7.8
-"
-BDEPEND="
-	>=dev-build/meson-0.53
-	${PYTHON_DEPS}
-	doc? ( dev-python/docutils )"
-
-src_prepare() {
-	if use doc; then
-		sed -i "s/doc_path = join.*/doc_path = join_paths(datadir, \'doc\', \'${PF}\')/" \
-			meson.build || die "Failed changing doc_path"
-	fi
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc docs)
-		$(meson_use lto b_lto)
-		$(meson_use zip enable_zip)
-		-Dstrip=false
-		-Duse_libcrypto=true
-	)
-	meson_src_configure
-}

From 7f27033c869b607e91c37f4081710043ce5bf96c Mon Sep 17 00:00:00 2001
From: Henri Gasc <gasc@eurecom.fr>
Date: Tue, 12 Mar 2024 16:25:57 +0100
Subject: [PATCH 02/34] dev-python/moderngl: add 5.10.0, drop 5.8.2

Signed-off-by: Henri Gasc <gasc@eurecom.fr>
---
 dev-python/moderngl/Manifest                  |  2 +-
 ...gl-5.8.2.ebuild => moderngl-5.10.0.ebuild} | 27 +++++++++----------
 2 files changed, 13 insertions(+), 16 deletions(-)
 rename dev-python/moderngl/{moderngl-5.8.2.ebuild => moderngl-5.10.0.ebuild} (67%)

diff --git a/dev-python/moderngl/Manifest b/dev-python/moderngl/Manifest
index a85f4f822c..c1b87a6bca 100644
--- a/dev-python/moderngl/Manifest
+++ b/dev-python/moderngl/Manifest
@@ -1 +1 @@
-DIST moderngl-5.8.2.gh.tar.gz 2611498 BLAKE2B 9a04c9e7554cb0e96ad497edc0fb9ee533f8a9b9399cd13e6e4a8546a22d626fde0165fdf7e888b9b55ca4ad3bc010ccf6d20904f64ac233b34b32af8d035b72 SHA512 fa9a36d826755ceef8609c8ee2330da12f46be9ff8c3dbaa326447134237f7e303999f1d835ed6db65640a63ebdc3c300fb2cc85bc5c74d51f14cd9bb477b871
+DIST moderngl-5.10.0.gh.tar.gz 2310879 BLAKE2B 4077ad238012a0f9b43bf7b3b691d9ee4019d6b97fd38e64ef87e1c5ce04e71b4cf64cf3f55faeb3275b2c7052e1c6d95839ba5bfd602fa2daffc3a0f31077ed SHA512 1fa59410462bcdea881e295874ea1c5dc6b1ccc6c0914e1955c7465a363e597c487de17ade649f5f25372275d05e0e2314d81020441c4890c51912742b61ae37
diff --git a/dev-python/moderngl/moderngl-5.8.2.ebuild b/dev-python/moderngl/moderngl-5.10.0.ebuild
similarity index 67%
rename from dev-python/moderngl/moderngl-5.8.2.ebuild
rename to dev-python/moderngl/moderngl-5.10.0.ebuild
index 73fd01c5ad..520b562e14 100644
--- a/dev-python/moderngl/moderngl-5.8.2.ebuild
+++ b/dev-python/moderngl/moderngl-5.10.0.ebuild
@@ -1,13 +1,20 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+DOCS_BUILDER="sphinx"
+DOCS_DIR="docs"
+DOCS_DEPEND="
+	dev-python/furo
+	dev-python/sphinx-copybutton
+"
+
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
-inherit distutils-r1 virtualx
+inherit distutils-r1 virtualx docs
 
 DESCRIPTION="Modern OpenGL binding for python"
 HOMEPAGE="https://github.com/moderngl/moderngl https://pypi.org/project/moderngl"
@@ -22,8 +29,8 @@ RESTRICT="test"
 
 BDEPEND="
 	x11-libs/libX11
-	media-libs/mesa
-	>=dev-python/glcontext-2.3.6[${PYTHON_USEDEP}]
+	virtual/opengl
+	>=dev-python/glcontext-2.5.0[${PYTHON_USEDEP}]
 	<dev-python/glcontext-3[${PYTHON_USEDEP}]
 	test? (
 		dev-python/numpy[${PYTHON_USEDEP}]
@@ -31,21 +38,11 @@ BDEPEND="
 		dev-python/scipy[${PYTHON_USEDEP}]
 		dev-python/pycodestyle[${PYTHON_USEDEP}]
 	)
-	doc? (
-		dev-python/furo[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-copybutton[${PYTHON_USEDEP}]
-	)
 "
 DEPEND="${BDEPEND}"
 
 # distutils_enable_tests pytest
-distutils_enable_sphinx docs
 
 src_test() {
 	virtx distutils-r1_src_test
 }
-
-pkg_postinst() {
-	use doc && elog "The documentation is installed as html pages"
-}

From 3fcbbad074a82f087af5e6e7eecefda8c28ebf16 Mon Sep 17 00:00:00 2001
From: Henri Gasc <gasc@eurecom.fr>
Date: Tue, 12 Mar 2024 18:21:15 +0100
Subject: [PATCH 03/34] dev-python/PyWavefront: Add python3.12

Signed-off-by: Henri Gasc <gasc@eurecom.fr>
---
 ...3.3.ebuild => PyWavefront-1.3.3-r1.ebuild} | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)
 rename dev-python/PyWavefront/{PyWavefront-1.3.3.ebuild => PyWavefront-1.3.3-r1.ebuild} (56%)

diff --git a/dev-python/PyWavefront/PyWavefront-1.3.3.ebuild b/dev-python/PyWavefront/PyWavefront-1.3.3-r1.ebuild
similarity index 56%
rename from dev-python/PyWavefront/PyWavefront-1.3.3.ebuild
rename to dev-python/PyWavefront/PyWavefront-1.3.3-r1.ebuild
index ccbe0ef687..168632f97c 100644
--- a/dev-python/PyWavefront/PyWavefront-1.3.3.ebuild
+++ b/dev-python/PyWavefront/PyWavefront-1.3.3-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 2023 Gentoo Authors
+# 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..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
-inherit distutils-r1
+inherit distutils-r1 virtualx
 
 DESCRIPTION="Python library for importing Wavefront .obj files"
 HOMEPAGE="https://github.com/pywavefront/PyWavefront https://pypi.org/project/PyWavefront"
@@ -15,27 +15,15 @@ SRC_URI="https://github.com/pywavefront/PyWavefront/archive/refs/tags/${PV}.tar.
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-RDEPEND=""
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 	 )
 "
 DEPEND="${BDEPEND}"
 
 distutils_enable_tests pytest
-
-# src_test() {
-# 	virtx distutils-r1_src_test
-# }
-# python_test() {
-# 	rm "${S}/tests/test_local.py"
-# 	cd "${T}" || die
-# 	epytest "${S}"/tests
-# }
+src_test() {
+	virtx distutils-r1_src_test
+}

From 02ee6bb432ceab3ba7277f73efe8370034f5c878 Mon Sep 17 00:00:00 2001
From: Henri Gasc <gasc@eurecom.fr>
Date: Tue, 12 Mar 2024 18:24:35 +0100
Subject: [PATCH 04/34] dev-python/moderngl-window: add 2.4.5, drop 2.4.4

Signed-off-by: Henri Gasc <gasc@eurecom.fr>
---
 dev-python/moderngl-window/Manifest           |  2 +-
 .../moderngl-window-2.4.4.ebuild              | 80 -------------------
 .../moderngl-window-2.4.5.ebuild              | 56 +++++++++++++
 3 files changed, 57 insertions(+), 81 deletions(-)
 delete mode 100644 dev-python/moderngl-window/moderngl-window-2.4.4.ebuild
 create mode 100644 dev-python/moderngl-window/moderngl-window-2.4.5.ebuild

diff --git a/dev-python/moderngl-window/Manifest b/dev-python/moderngl-window/Manifest
index ab5201f614..c53988d8e5 100644
--- a/dev-python/moderngl-window/Manifest
+++ b/dev-python/moderngl-window/Manifest
@@ -1 +1 @@
-DIST moderngl-window-2.4.4.gh.tar.gz 30989161 BLAKE2B 9c4c8bea6a69cf0df4e5967f28be8766c89206a2a9315f86f8b1c4fb2dd30dfddaac82a40cf28bcf6e2337811135daf389367fe8eefbfb7b93c61f1de1db6406 SHA512 8c8f027c2be4d9acfed3ac0f299e0d27bd0a0f2b7ad7f87d5309c276fa3a8ff4afd417e94f808a22a8ff683ae2465aba6a8d09dc07d621dff2b9f8606ceb3ccd
+DIST moderngl-window-2.4.5.gh.tar.gz 30982181 BLAKE2B 784cdbd1c5a8cb1bee3387e80c0e3663135997a40498325d5b7f9c58092cc1c4813d26b1aad756e6364f97f7742da39a16e8b7bb4cb368de019aa00ad6c3b438 SHA512 4305951d9753696ad2caa259af52c45eda8e02fee061d45cd364899942d2d00cf9ba23b8193a5a52e249f88da21df260efcd49e5f756f3743fdfbcf70144d405
diff --git a/dev-python/moderngl-window/moderngl-window-2.4.4.ebuild b/dev-python/moderngl-window/moderngl-window-2.4.4.ebuild
deleted file mode 100644
index dbac06c132..0000000000
--- a/dev-python/moderngl-window/moderngl-window-2.4.4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="A cross platform utility library for ModernGL"
-HOMEPAGE="https://github.com/moderngl/moderngl-window https://pypi.org/project/moderngl-window"
-SRC_URI="https://github.com/moderngl/moderngl-window/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples"
-
-NEEDED_FOR_TESTS_AND_RUN="
-	>dev-python/numpy-1.16[${PYTHON_USEDEP}]
-	>=dev-python/PyWavefront-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/PyWavefront-2[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.3.2[${PYTHON_USEDEP}]
-	>=dev-python/trimesh-3.2.6[${PYTHON_USEDEP}]
-"
-
-RDEPEND="
-	dev-python/glfw[${PYTHON_USEDEP}]
-	dev-python/imgui[glfw,sdl,opengl,${PYTHON_USEDEP}]
-	<dev-python/moderngl-6[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	>=dev-python/pygame-2.0.1[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	>=dev-python/pyopengl-3.1.0[${PYTHON_USEDEP},tk]
-	<dev-python/PyQt5-6[${PYTHON_USEDEP}]
-	>=dev-python/pyrr-0.10[${PYTHON_USEDEP}]
-	<dev-python/PySDL2-1[${PYTHON_USEDEP}]
-	<dev-python/pyside2-6[${PYTHON_USEDEP}]
-	${NEEDED_FOR_TESTS_AND_RUN}
-"
-
-BDEPEND="
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/glcontext[${PYTHON_USEDEP}]
-		${NEEDED_FOR_TESTS_AND_RUN}
-	)
-	doc? (
-		<dev-python/moderngl-6[${PYTHON_USEDEP}]
-		>dev-python/numpy-1.16[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		>=dev-python/pyrr-0.10[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-python_compile_all() {
-	if use doc; then
-		find "${S}/docs" -type f -exec sed -i 's/sphinxcontrib.napoleon/sphinx\.ext\.napoleon/g' {} \;
-		emake man -C docs
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use doc && doman "${S}/docs/_build/man/${PN}.1"
-	if use examples; then
-        dodoc -r examples
-        docompress -x /usr/share/doc/${PF}/examples
-    fi
-}
-
-distutils_enable_tests pytest
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/moderngl-window/moderngl-window-2.4.5.ebuild b/dev-python/moderngl-window/moderngl-window-2.4.5.ebuild
new file mode 100644
index 0000000000..0589fa448a
--- /dev/null
+++ b/dev-python/moderngl-window/moderngl-window-2.4.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="sphinx"
+DOCS_DIR="docs"
+DOCS_DEPEND="
+	dev-python/moderngl
+	dev-python/sphinx-rtd-theme
+"
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 virtualx docs
+
+DESCRIPTION="A cross platform utility library for ModernGL"
+HOMEPAGE="https://github.com/moderngl/moderngl-window https://pypi.org/project/moderngl-window"
+SRC_URI="https://github.com/moderngl/moderngl-window/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples"
+
+RDEPEND="
+	<dev-python/moderngl-6[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	>=dev-python/pyrr-0.10[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/glcontext[${PYTHON_USEDEP}]
+		>=dev-python/PyWavefront-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/PyWavefront-2[${PYTHON_USEDEP}]
+		>=dev-python/trimesh-3.2.6[${PYTHON_USEDEP}]
+
+	)
+"
+DEPEND="${RDEPEND}"
+
+python_install_all() {
+	default
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+distutils_enable_tests pytest
+src_test() {
+	virtx distutils-r1_src_test
+}

From 86902e9281636a10995cac33345611ab8c0f82bf Mon Sep 17 00:00:00 2001
From: Henri Gasc <gasc@eurecom.fr>
Date: Tue, 12 Mar 2024 18:34:05 +0100
Subject: [PATCH 05/34] dev-python/imgui: treeclean

Signed-off-by: Henri Gasc <gasc@eurecom.fr>
---
 dev-python/imgui/Manifest           |  2 -
 dev-python/imgui/imgui-2.0.0.ebuild | 59 -----------------------------
 dev-python/imgui/metadata.xml       | 21 ----------
 profiles/package.mask               |  8 ----
 4 files changed, 90 deletions(-)
 delete mode 100644 dev-python/imgui/Manifest
 delete mode 100644 dev-python/imgui/imgui-2.0.0.ebuild
 delete mode 100644 dev-python/imgui/metadata.xml

diff --git a/dev-python/imgui/Manifest b/dev-python/imgui/Manifest
deleted file mode 100644
index 76592741d9..0000000000
--- a/dev-python/imgui/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST imgui-1.82.gh.tar.gz 1433525 BLAKE2B 2bdb34b020390ee36a23dc674dabbb946e048099f47492fe9ebc1f142e40ceb58a0b89e49b70d2db4e2929c50f127fd8a70519171cd9007f91db23ccdb24375d SHA512 210076c2b04c09e63a4924e1f874bfe240668f4d2656511c96dd5499efe04d795ad01d5af8e2aa2543849d3ca5ef1a6c6555a9232d4d92f95bf98c41e8505b58
-DIST imgui-2.0.0.gh.tar.gz 230722 BLAKE2B 298b169e0ee8cb3f4eadad151475f13226203c77eea2f517ca1209fd39cac6880c5ba247253b37fd676c14b6706151ee14b3e5d384dcac581a44c4ef537eda4f SHA512 30d81462829daab8d760bdae18e470a0bb781a05086c9e93d3c891e38df1a8451800d3118266f6938ee838c081b192697b8669eac8a404ed9497b923ac52fe34
diff --git a/dev-python/imgui/imgui-2.0.0.ebuild b/dev-python/imgui/imgui-2.0.0.ebuild
deleted file mode 100644
index 92b087ab54..0000000000
--- a/dev-python/imgui/imgui-2.0.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 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..11} )
-
-inherit distutils-r1
-
-IMGUI_VERSION="1.82" # The version of imgui that pyimgui is using
-
-DESCRIPTION="Cython-based Python bindings for dear imgui"
-HOMEPAGE="https://github.com/pyimgui/pyimgui https://pypi.org/project/imgui"
-SRC_URI="
-	https://github.com/pyimgui/pyimgui/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
-	https://github.com/ocornut/imgui/archive/v${IMGUI_VERSION}.tar.gz -> imgui-${IMGUI_VERSION}.gh.tar.gz
-"
-S="${WORKDIR}/pyimgui-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="allegro glfw glut opengl sdl vulkan doc"
-
-RDEPEND="media-libs/imgui[bindings,allegro?,glfw?,glut?,opengl?,sdl?,vulkan?]"
-BDEPEND="
-	<dev-python/cython-3[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/pyopengl[${PYTHON_USEDEP}]
-		~dev-python/pypandoc-1.4[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)
-"
-
-src_unpack() {
-	default
-	rm -r "${S}/imgui-cpp"
-	mv "${WORKDIR}/imgui-${IMGUI_VERSION}" "${S}/imgui-cpp"
-}
-
-distutils_enable_tests pytest
-
-python_compile_all() {
-	use doc && emake man -C "${S}/doc"
-	use test && rm -rf "${S}/${PN}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use doc && doman "${S}/doc/build/man/pyimgui.1"
-}
-
-python_test() {
-	epytest "${S}/tests" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/imgui/metadata.xml b/dev-python/imgui/metadata.xml
deleted file mode 100644
index 437a9ab21e..0000000000
--- a/dev-python/imgui/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gasc@eurecom.fr</email>
-		<name>Gasc Henri</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">imgui</remote-id>
-		<remote-id type="github">pyimgui/pyimgui</remote-id>
-		<doc>https://pyimgui.readthedocs.io</doc>
-	</upstream>
-	<use>
-		<flag name="allegro">Enable allegro backend and renderer</flag>
-		<flag name="glfw">Enable glfw backend</flag>
-		<flag name="glut">Enable glut backen</flag>
-		<flag name="opengl">Enable opengl renderer</flag>
-		<flag name="sdl">Enable sdl backend</flag>
-		<flag name="vulkan">Enable vulkan renderer</flag>
-	</use>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index 0c9c1d4c01..994027dfe2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -18,14 +18,6 @@
 # Duplicated, we already have media-video/ffmpeg-chromium
 www-plugins/yandex-browser-ffmpeg-codecs-bin
 
-# Julien Roy <julien@jroy.ca> (2024-03-10)
-# <dev-python-cython-3 no longer in ::gentoo
-=dev-python/imgui-2.0.0
-# rdeps
-dev-python/moderngl-window
-dev-util/gftools
-media-video/manimgl
-
 # Julien Roy <julien@jroy.ca> (2024-03-09)
 # Dracut fails to boot with Clevis 20
 # https://github.com/latchset/clevis/issues/456

From 4f5bc62c59da59234550327b8b09bb59a8a28a5c Mon Sep 17 00:00:00 2001
From: Oliver Freyermuth <o.freyermuth@googlemail.com>
Date: Tue, 12 Mar 2024 20:18:57 +0100
Subject: [PATCH 06/34] x11-misc/gromit-mpx: add 1.6.0

Signed-off-by: Oliver Freyermuth <o.freyermuth@googlemail.com>
---
 x11-misc/gromit-mpx/Manifest                |  1 +
 x11-misc/gromit-mpx/gromit-mpx-1.6.0.ebuild | 40 +++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 x11-misc/gromit-mpx/gromit-mpx-1.6.0.ebuild

diff --git a/x11-misc/gromit-mpx/Manifest b/x11-misc/gromit-mpx/Manifest
index 568e0ffb1d..77a00b0326 100644
--- a/x11-misc/gromit-mpx/Manifest
+++ b/x11-misc/gromit-mpx/Manifest
@@ -1,3 +1,4 @@
 DIST gromit-mpx-1.4.3.tar.gz 1861824 BLAKE2B f8337adf400b40e10dd32dfc702be73039e2cc3da9430b4d911794b6e0a9f16b6862948c9573d189445f47ec23a6bde2126765cf8df61af0a46b7dcb94c951d4 SHA512 9da94c3aed4d9c52c62317373ae1ca6dd6ece1adf3c48b95126b6f40ebe6ae8ede45c7c8c93732bcaafbb7ba85b66677b100cb0115fa989661e1e9c8f489ae25
 DIST gromit-mpx-1.5.0.tar.gz 1878498 BLAKE2B db4e7ef12dd9abad7968d412b221d6a48348a1eb5bcd791787cb99bdb400674126bb9902b77825d260ddd26731bd9b674bf806d7a856ece2bd5f417ad45323f7 SHA512 5da359c1d25dcb8797096a905072c59f1fc7aafd60b3624908e90a5388bdd928f81bde615c46acfe2d51c0b869ee70c271c561396cd992d3a18e389ba6b281a7
 DIST gromit-mpx-1.5.1.tar.gz 1879207 BLAKE2B 1c4a74bad52547ac5c37de8ad7cae1d8b5fdf8b17dd1f7d0e5ce6ffbbd1610e719bf26172d53967951e7083a4a0405763c4e650a7a521a06b105bbc96ecc8e18 SHA512 42b27a2753b5345d791a4b67e6746de7f2225c823c048c5cbbea86f4c3499bb373eb97e2f7e93f098e6657c551db6053698ce73aec648d62341071c8100c6455
+DIST gromit-mpx-1.6.0.tar.gz 1883341 BLAKE2B 184b6f70e620325f23213c38782e808f90e6b4bad0c786a586df854cf3a391037a3d3b56e504a7261120682b2119e535fcc7af9b87022fb280d34900c0655ed8 SHA512 6afac0f1c0cf0b4ef62b8811b6903b2fdfbc41f1377abd582fee606e90ce66abaf5d9ab2b34cb4797795f40cca6043334ca71bfdc8a5547551aa480d489ecbc7
diff --git a/x11-misc/gromit-mpx/gromit-mpx-1.6.0.ebuild b/x11-misc/gromit-mpx/gromit-mpx-1.6.0.ebuild
new file mode 100644
index 0000000000..3b827169fc
--- /dev/null
+++ b/x11-misc/gromit-mpx/gromit-mpx-1.6.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Gromit-MPX is a multi-pointer GTK3 port of the Gromit desktop annotation tool"
+HOMEPAGE="https://github.com/bk138/gromit-mpx"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bk138/${PN}.git"
+else
+	SRC_URI="https://github.com/bk138/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+SLOT="0"
+LICENSE="GPL-2"
+
+RDEPEND="
+	x11-libs/gtk+:3
+	dev-libs/libappindicator:3
+	x11-libs/libX11
+	>=x11-apps/xinput-1.3
+"
+DEPEND="${RDEPEND}"
+
+src_prepare () {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc
+	)
+
+	cmake_src_configure
+}

From 098f7ccd10e3442e6d253122bc5f69dbfa06d672 Mon Sep 17 00:00:00 2001
From: Oliver Freyermuth <o.freyermuth@googlemail.com>
Date: Tue, 12 Mar 2024 20:19:46 +0100
Subject: [PATCH 07/34] x11-misc/gromit-mpx: drop 1.4.3, 1.5.0

Signed-off-by: Oliver Freyermuth <o.freyermuth@googlemail.com>
---
 x11-misc/gromit-mpx/Manifest                  |  2 -
 ...mpx-1.4.3-fwd-declare-app_parse_args.patch | 16 -------
 x11-misc/gromit-mpx/gromit-mpx-1.4.3.ebuild   | 44 -------------------
 x11-misc/gromit-mpx/gromit-mpx-1.5.0.ebuild   | 40 -----------------
 4 files changed, 102 deletions(-)
 delete mode 100644 x11-misc/gromit-mpx/files/gromit-mpx-1.4.3-fwd-declare-app_parse_args.patch
 delete mode 100644 x11-misc/gromit-mpx/gromit-mpx-1.4.3.ebuild
 delete mode 100644 x11-misc/gromit-mpx/gromit-mpx-1.5.0.ebuild

diff --git a/x11-misc/gromit-mpx/Manifest b/x11-misc/gromit-mpx/Manifest
index 77a00b0326..ed9c45ffc3 100644
--- a/x11-misc/gromit-mpx/Manifest
+++ b/x11-misc/gromit-mpx/Manifest
@@ -1,4 +1,2 @@
-DIST gromit-mpx-1.4.3.tar.gz 1861824 BLAKE2B f8337adf400b40e10dd32dfc702be73039e2cc3da9430b4d911794b6e0a9f16b6862948c9573d189445f47ec23a6bde2126765cf8df61af0a46b7dcb94c951d4 SHA512 9da94c3aed4d9c52c62317373ae1ca6dd6ece1adf3c48b95126b6f40ebe6ae8ede45c7c8c93732bcaafbb7ba85b66677b100cb0115fa989661e1e9c8f489ae25
-DIST gromit-mpx-1.5.0.tar.gz 1878498 BLAKE2B db4e7ef12dd9abad7968d412b221d6a48348a1eb5bcd791787cb99bdb400674126bb9902b77825d260ddd26731bd9b674bf806d7a856ece2bd5f417ad45323f7 SHA512 5da359c1d25dcb8797096a905072c59f1fc7aafd60b3624908e90a5388bdd928f81bde615c46acfe2d51c0b869ee70c271c561396cd992d3a18e389ba6b281a7
 DIST gromit-mpx-1.5.1.tar.gz 1879207 BLAKE2B 1c4a74bad52547ac5c37de8ad7cae1d8b5fdf8b17dd1f7d0e5ce6ffbbd1610e719bf26172d53967951e7083a4a0405763c4e650a7a521a06b105bbc96ecc8e18 SHA512 42b27a2753b5345d791a4b67e6746de7f2225c823c048c5cbbea86f4c3499bb373eb97e2f7e93f098e6657c551db6053698ce73aec648d62341071c8100c6455
 DIST gromit-mpx-1.6.0.tar.gz 1883341 BLAKE2B 184b6f70e620325f23213c38782e808f90e6b4bad0c786a586df854cf3a391037a3d3b56e504a7261120682b2119e535fcc7af9b87022fb280d34900c0655ed8 SHA512 6afac0f1c0cf0b4ef62b8811b6903b2fdfbc41f1377abd582fee606e90ce66abaf5d9ab2b34cb4797795f40cca6043334ca71bfdc8a5547551aa480d489ecbc7
diff --git a/x11-misc/gromit-mpx/files/gromit-mpx-1.4.3-fwd-declare-app_parse_args.patch b/x11-misc/gromit-mpx/files/gromit-mpx-1.4.3-fwd-declare-app_parse_args.patch
deleted file mode 100644
index 90367cfb48..0000000000
--- a/x11-misc/gromit-mpx/files/gromit-mpx-1.4.3-fwd-declare-app_parse_args.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fixes compilation with -Werror,-Wimplicit-function-declaration.
-
-Bug: https://bugs.gentoo.org/888149
-Bug: https://github.com/bk138/gromit-mpx/pull/173
-
---- gromit-mpx-1.4.3/src/gromit-mpx.c	2022-09-25 14:43:43.000000000 +0200
-+++ gromit-mpx-1.4.3/src/gromit-mpx.c	2022-12-24 18:32:23.629233288 +0100
-@@ -696,7 +696,7 @@
- }
- 
- 
--
-+int app_parse_args (int argc, char **argv, GromitData *data);
- 
- 
- void setup_main_app (GromitData *data, int argc, char ** argv)
diff --git a/x11-misc/gromit-mpx/gromit-mpx-1.4.3.ebuild b/x11-misc/gromit-mpx/gromit-mpx-1.4.3.ebuild
deleted file mode 100644
index 1d64637ab5..0000000000
--- a/x11-misc/gromit-mpx/gromit-mpx-1.4.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Gromit-MPX is a multi-pointer GTK3 port of the Gromit desktop annotation tool"
-HOMEPAGE="https://github.com/bk138/gromit-mpx"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bk138/${PN}.git"
-else
-	SRC_URI="https://github.com/bk138/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND="
-	x11-libs/gtk+:3
-	dev-libs/libappindicator:3
-	x11-libs/libX11
-	>=x11-apps/xinput-1.3
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.3-fwd-declare-app_parse_args.patch
-)
-
-src_prepare () {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc
-	)
-
-	cmake_src_configure
-}
diff --git a/x11-misc/gromit-mpx/gromit-mpx-1.5.0.ebuild b/x11-misc/gromit-mpx/gromit-mpx-1.5.0.ebuild
deleted file mode 100644
index 95600ede05..0000000000
--- a/x11-misc/gromit-mpx/gromit-mpx-1.5.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Gromit-MPX is a multi-pointer GTK3 port of the Gromit desktop annotation tool"
-HOMEPAGE="https://github.com/bk138/gromit-mpx"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bk138/${PN}.git"
-else
-	SRC_URI="https://github.com/bk138/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND="
-	x11-libs/gtk+:3
-	dev-libs/libappindicator:3
-	x11-libs/libX11
-	>=x11-apps/xinput-1.3
-"
-DEPEND="${RDEPEND}"
-
-src_prepare () {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc
-	)
-
-	cmake_src_configure
-}

From e9ec4a0db0f62974d327d8bb1633667fd455a531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?=
 <gonegrier.duarte@gmail.com>
Date: Tue, 12 Mar 2024 20:39:25 +0000
Subject: [PATCH 08/34] sys-firmware/lenovolegionlinux: add new legiond daemon
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte@gmail.com>
---
 .../lenovolegionlinux/lenovolegionlinux-9999.ebuild    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild b/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild
index 8507d75b41..672fcb964b 100644
--- a/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild
+++ b/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 		dev-python/darkdetect
 	)
 	downgrade-nvidia? ( <=x11-drivers/nvidia-drivers-525 )
-	acpi? ( sys-power/acpid )
+	sys-power/acpid
 	radeon-dgpu? ( dev-util/rocm-smi )
 	ryzenadj? ( sys-power/RyzenAdj )
 	undervolt-intel? ( dev-python/undervolt )
@@ -67,6 +67,8 @@ src_compile() {
 		#Define build dir (fix sandboxed)
 		cd "${WORKDIR}/${P}/python/legion_linux"
 		distutils-r1_src_compile --build-dir "${WORKDIR}/${P}/python/legion_linux/build"
+		cd "legion_linux/extra/service/legiond"
+		emake || die
 	fi
 }
 
@@ -84,7 +86,11 @@ src_install() {
 		cd "${WORKDIR}/${P}/extra"
 
 		if use systemd; then
-			systemd_dounit service/legion-linux.service service/legion-linux.path service/legion-linux-onresume.service
+			systemd_dounit service/legiond.service service/legiond-onresume.service
+			insinto /usr/share/legion_linux/acpi/events
+			doins acpi/events/{legion_ppd,legion_ac}
+			dobin service/legiond/legiond
+			dobin service/legiond/legiond-cli
 		fi
 
 		if use acpi; then

From cf4e040545077b2edc0dd4b10cffc0ea5436982b Mon Sep 17 00:00:00 2001
From: Artemis Everfree <artemis@artemis.sh>
Date: Tue, 12 Mar 2024 15:16:31 -0700
Subject: [PATCH 09/34] www-apps/forgejo: add 1.21.7.0, drop 1.21.5.0

Signed-off-by: Artemis Everfree <artemis@artemis.sh>
---
 www-apps/forgejo/Manifest                                       | 2 +-
 .../{forgejo-1.21.5.0.ebuild => forgejo-1.21.7.0.ebuild}        | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename www-apps/forgejo/{forgejo-1.21.5.0.ebuild => forgejo-1.21.7.0.ebuild} (100%)

diff --git a/www-apps/forgejo/Manifest b/www-apps/forgejo/Manifest
index 73ae572849..9b0291dd93 100644
--- a/www-apps/forgejo/Manifest
+++ b/www-apps/forgejo/Manifest
@@ -1,3 +1,3 @@
 DIST forgejo-1.20.6.0.tar.gz 55539743 BLAKE2B d44fcaec52b164099a221f2172faab8fe078b5fdaf8c9910042278f6276f4ff557d2a527a5159a0bb157f773ffcc91595d2183e1be53b97187cb35ee684fa7ce SHA512 047b41b3192053df8c0f37675c087bc5fbed9967e8f23cab35bede76071129e6f18ec0561a0415a2eaa2010877dedfd15a231f050a1738fca1a5e437f89e93b5
-DIST forgejo-1.21.5.0.tar.gz 58775082 BLAKE2B 05b5ee8a394ad2968769cda82b0caa368d6a0fa81686c67e3384ad8b69b43acfd53702af3ff383f05c6b2a4a2e191fb77ca7bd4755ce231451c21c97cc79e270 SHA512 947870af1601dcad9ed08157c0dc8971e333646b1ff1312592f408896e6a87804ed4dc1a22af87d1948fd64a34ec5af0209bad23fb742bb585244588b11062cf
 DIST forgejo-1.21.6.0.tar.gz 58787727 BLAKE2B 7d3b77b05771261986a7623a79f9eee1525c723eb5bb2cdb9c7a66ee12bc5fb352ab5857aece92359d397ded4b57cb5ce31ca98cba0d45871f237a27bb009bb7 SHA512 298544a8301bc2415b0cbad943316ac4b2b17b3ab15927d707a34e48fe04d327756c8febe3a8e942c1fd1edd3c92109ddcaf6a12e31d360d4fc82575e9f18565
+DIST forgejo-1.21.7.0.tar.gz 58802779 BLAKE2B da03bc3fead3b477a6a5492c02223f546275145531843f9301de914e054e35e22cb2a1decf573f874467bd03689abf79a2b898174359ee5e5483463d4857329b SHA512 dbcb43b0e36c19e20e09c594b84656f06ae901cb4d298827c48fccdd0879383a1da8119c7bd3ce4f832a1588673c33e1bd382813bc37d1ffda41f3f7a22ec538
diff --git a/www-apps/forgejo/forgejo-1.21.5.0.ebuild b/www-apps/forgejo/forgejo-1.21.7.0.ebuild
similarity index 100%
rename from www-apps/forgejo/forgejo-1.21.5.0.ebuild
rename to www-apps/forgejo/forgejo-1.21.7.0.ebuild

From 9d899f201218564f31627636b69529c493c5ff40 Mon Sep 17 00:00:00 2001
From: Denis Strizhkin <strdenis02@gmail.com>
Date: Wed, 13 Mar 2024 03:13:38 +0300
Subject: [PATCH 10/34] sci-physics/ovito: add dev-libs/c-blosc dependency

Signed-off-by: Denis Strizhkin <strdenis02@gmail.com>
---
 sci-physics/ovito/ovito-3.10.1.ebuild | 7 ++++---
 sci-physics/ovito/ovito-3.10.3.ebuild | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sci-physics/ovito/ovito-3.10.1.ebuild b/sci-physics/ovito/ovito-3.10.1.ebuild
index 9449df6239..ed9d83dd60 100644
--- a/sci-physics/ovito/ovito-3.10.1.ebuild
+++ b/sci-physics/ovito/ovito-3.10.1.ebuild
@@ -19,12 +19,13 @@ S="${WORKDIR}/${PN}-v${PV}"
 inherit cmake desktop
 
 DEPEND="
+	dev-libs/boost
+	dev-libs/c-blosc
 	dev-qt/qtbase:6[gui]
 	dev-qt/qtsvg:6
-	sci-libs/hdf5
-	dev-libs/boost
-	sci-libs/netcdf
 	media-video/ffmpeg
+	sci-libs/hdf5
+	sci-libs/netcdf
 	virtual/opengl
 "
 
diff --git a/sci-physics/ovito/ovito-3.10.3.ebuild b/sci-physics/ovito/ovito-3.10.3.ebuild
index 9449df6239..ed9d83dd60 100644
--- a/sci-physics/ovito/ovito-3.10.3.ebuild
+++ b/sci-physics/ovito/ovito-3.10.3.ebuild
@@ -19,12 +19,13 @@ S="${WORKDIR}/${PN}-v${PV}"
 inherit cmake desktop
 
 DEPEND="
+	dev-libs/boost
+	dev-libs/c-blosc
 	dev-qt/qtbase:6[gui]
 	dev-qt/qtsvg:6
-	sci-libs/hdf5
-	dev-libs/boost
-	sci-libs/netcdf
 	media-video/ffmpeg
+	sci-libs/hdf5
+	sci-libs/netcdf
 	virtual/opengl
 "
 

From bd1948c13170168f2d5bada8bf71bc2466f0643c Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Wed, 13 Mar 2024 02:31:39 +0100
Subject: [PATCH 11/34] dev-qt/kdsingleapplication: treeclean, moved to
 ::gentoo

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 dev-qt/kdsingleapplication/Manifest           |  1 -
 .../kdsingleapplication-1.1.0.ebuild          | 96 -------------------
 dev-qt/kdsingleapplication/metadata.xml       | 11 ---
 3 files changed, 108 deletions(-)
 delete mode 100644 dev-qt/kdsingleapplication/Manifest
 delete mode 100644 dev-qt/kdsingleapplication/kdsingleapplication-1.1.0.ebuild
 delete mode 100644 dev-qt/kdsingleapplication/metadata.xml

diff --git a/dev-qt/kdsingleapplication/Manifest b/dev-qt/kdsingleapplication/Manifest
deleted file mode 100644
index 934377590f..0000000000
--- a/dev-qt/kdsingleapplication/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdsingleapplication-1.1.0.tar.gz 73558 BLAKE2B 26eda1d7a9a48f6167db9d2d7cd143ab45a08e96eef277cf1099c1ed24528f56ec54e8ab44671e7584937dc21d3437b15c033991e48fafd8b9fab10473e07864 SHA512 61b34a36b05c58ede881f38d78c767726f8e23dc230e292568013fa428f50ff674f7eb12bc4d76ceaa9ef444264b2e86d95ab14cc41c6a275bf917edb8832c1f
diff --git a/dev-qt/kdsingleapplication/kdsingleapplication-1.1.0.ebuild b/dev-qt/kdsingleapplication/kdsingleapplication-1.1.0.ebuild
deleted file mode 100644
index 87116dadbf..0000000000
--- a/dev-qt/kdsingleapplication/kdsingleapplication-1.1.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake multibuild
-
-DESCRIPTION="KDAB's helper class for single-instance policy applications"
-HOMEPAGE="https://github.com/KDAB/KDSingleApplication"
-SRC_URI="https://github.com/KDAB/KDSingleApplication/releases/download/v${PV}/kdsingleapplication-${PV}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="doc examples test qt6"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	qt6? (
-		dev-qt/qtbase:6[network,widgets]
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	doc? (
-		app-text/doxygen[dot]
-		dev-qt/qthelp:5
-		qt6? (
-			dev-qt/qttools:6[assistant]
-		)
-	)
-	examples? (
-		dev-util/patchelf
-	)
-	dev-qt/qttest:5
-"
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( qt5 $(usev qt6) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DINSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		)
-		if [[ ${MULTIBUILD_VARIANT} == qt6 ]]; then
-			mycmakeargs+=(
-				-DKDSingleApplication_DOCS=OFF
-				-DKDSingleApplication_EXAMPLES=OFF
-				-DKDSingleApplication_QT6=ON
-				-DKDSingleApplication_TESTS=OFF
-			)
-		else
-			mycmakeargs+=(
-				-DKDSingleApplication_DOCS=$(usex doc)
-				-DKDSingleApplication_EXAMPLES=$(usex examples)
-				-DKDSingleApplication_QT6=OFF
-				-DKDSingleApplication_TESTS=$(usex test)
-			)
-		fi
-		cmake_src_configure
-	}
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_test() {
-	mytest() {
-		[[ ${MULTIBUILD_VARIANT} == qt5 ]] && cmake_src_test
-	}
-	multibuild_foreach_variant mytest
-}
-
-src_install() {
-	myinstall() {
-		cmake_src_install
-		if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then
-			rm -rf "${BUILD_DIR}"/docs/api/html/examples || die
-			use doc && HTML_DOCS="${BUILD_DIR}/docs/api/html/*"
-			if use examples; then
-				patchelf --remove-rpath "${BUILD_DIR}"/bin/widgetsingleapplication || die
-				dobin "${BUILD_DIR}"/bin/widgetsingleapplication
-			fi
-		fi
-	}
-	multibuild_foreach_variant myinstall
-	einstalldocs
-}
diff --git a/dev-qt/kdsingleapplication/metadata.xml b/dev-qt/kdsingleapplication/metadata.xml
deleted file mode 100644
index 3c770d13ee..0000000000
--- a/dev-qt/kdsingleapplication/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@tastytea.de</email>
-		<name>tastytea</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">KDAB/KDSingleApplication</remote-id>
-	</upstream>
-</pkgmetadata>

From 5cdc43f7d64966c19a10e96f7a4c1e63cb52a5d6 Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Wed, 13 Mar 2024 02:35:06 +0100
Subject: [PATCH 12/34] www-plugins/yandex-browser-ffmpeg-codecs-bin: treeclean

Closes: https://bugs.gentoo.org/915540
Closes: https://bugs.gentoo.org/915539
Signed-off-by: David Roman <davidroman96@gmail.com>
---
 profiles/package.mask                         |  4 ---
 .../yandex-browser-ffmpeg-codecs-bin/Manifest |  2 --
 ...ser-ffmpeg-codecs-bin-112.0.5615.49.ebuild | 33 -------------------
 3 files changed, 39 deletions(-)
 delete mode 100644 www-plugins/yandex-browser-ffmpeg-codecs-bin/Manifest
 delete mode 100644 www-plugins/yandex-browser-ffmpeg-codecs-bin/yandex-browser-ffmpeg-codecs-bin-112.0.5615.49.ebuild

diff --git a/profiles/package.mask b/profiles/package.mask
index 994027dfe2..8e9dce7499 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -14,10 +14,6 @@
 
 # New entries go on top.
 
-# David Roman <davidroman96@gmail.com> (2024-03-11)
-# Duplicated, we already have media-video/ffmpeg-chromium
-www-plugins/yandex-browser-ffmpeg-codecs-bin
-
 # Julien Roy <julien@jroy.ca> (2024-03-09)
 # Dracut fails to boot with Clevis 20
 # https://github.com/latchset/clevis/issues/456
diff --git a/www-plugins/yandex-browser-ffmpeg-codecs-bin/Manifest b/www-plugins/yandex-browser-ffmpeg-codecs-bin/Manifest
deleted file mode 100644
index d484e7bd0d..0000000000
--- a/www-plugins/yandex-browser-ffmpeg-codecs-bin/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST chromium-codecs-ffmpeg-extra_112.0.5615.49-0ubuntu0.18.04.1_amd64.deb 1113644 BLAKE2B f189ff98c5720497b7a2cd22f3f234e1f4ea9a14ae619176b68aa6a67ff2b9948e37f3684b5a954c6d3886ca5b921879c7850957580d9946e0786446c38deab3 SHA512 1e1cdceff1d9e1c585b4d33cf8afeb8f35ebbe9bbda2044b4e3538e832bddb170917b32e321bbed7936e14f40721ad4d4d89f4c4371e32e8e69f60ea6cda9c5e
-DIST chromium-codecs-ffmpeg-extra_112.0.5615.49-0ubuntu0.18.04.1_i386.deb 1095040 BLAKE2B 9fa82d21d4abfa50eec7453c9e895b71f11ceb5c7761ee94455be1b714d3ce3b5754231cbcac3a5e51a205eab7ee4b9df75c8572c578138affc0be6dc7a3ca63 SHA512 4ba7817102820f17f3b9d4ebf4f6d3f64135798ce7f0cc333712a27e0c1838c88dc314c8e01fd161368d6fadfde3e8c5003242233a1a45c50c5160d72d64578c
diff --git a/www-plugins/yandex-browser-ffmpeg-codecs-bin/yandex-browser-ffmpeg-codecs-bin-112.0.5615.49.ebuild b/www-plugins/yandex-browser-ffmpeg-codecs-bin/yandex-browser-ffmpeg-codecs-bin-112.0.5615.49.ebuild
deleted file mode 100644
index 9aa81e4871..0000000000
--- a/www-plugins/yandex-browser-ffmpeg-codecs-bin/yandex-browser-ffmpeg-codecs-bin-112.0.5615.49.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit unpacker
-
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="Multi-threaded ffmpeg codecs needed for the HTML5 <audio> and <video> tags"
-HOMEPAGE="http://www.chromium.org/Home"
-SLOT="0"
-LICENSE="BSD"
-RESTRICT="bindist strip mirror"
-
-DEBIAN_REVISION="0ubuntu0.18.04.1"
-_FULL_VERSION="${PV}-${DEBIAN_REVISION}"
-BASE_URI="http://security.ubuntu.com/ubuntu/pool/universe/c/chromium-browser"
-SRC_URI="
-	x86? ( ${BASE_URI}/chromium-codecs-ffmpeg-extra_${_FULL_VERSION}_i386.deb )
-	amd64? ( ${BASE_URI}/chromium-codecs-ffmpeg-extra_${_FULL_VERSION}_amd64.deb )
-"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_install() {
-	insinto /opt/yandex/browser-beta
-	doins usr/lib/chromium-browser/libffmpeg.so
-	insinto /opt/yandex/browser
-	doins usr/lib/chromium-browser/libffmpeg.so
-}

From 50a28d5e0392804bd6706d0a307ce668cf21545c Mon Sep 17 00:00:00 2001
From: Takuya Wakazono <pastalian46@gmail.com>
Date: Wed, 13 Mar 2024 18:54:56 +0900
Subject: [PATCH 13/34] app-crypt/pinentry-bemenu: add 0.13.1

Signed-off-by: Takuya Wakazono <pastalian46@gmail.com>
---
 app-crypt/pinentry-bemenu/Manifest            |  1 +
 .../pinentry-bemenu-0.13.1.ebuild             | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 app-crypt/pinentry-bemenu/pinentry-bemenu-0.13.1.ebuild

diff --git a/app-crypt/pinentry-bemenu/Manifest b/app-crypt/pinentry-bemenu/Manifest
index 21554c504e..6703223df4 100644
--- a/app-crypt/pinentry-bemenu/Manifest
+++ b/app-crypt/pinentry-bemenu/Manifest
@@ -1,2 +1,3 @@
 DIST pinentry-bemenu-0.11.0.tar.gz 34352 BLAKE2B 54059a506fbc3e5034af7ffdf6fdac8f131abbac94662a35d487072f292b380a8b81d5a2916a8ef85ac3ae0c4f479119fadac541eb6bd32eb3033ce762ea5679 SHA512 3c35733b52d1b096904585ee0f37b0a2c7390158a94b2f13fe387fd738c004a2f1f474e3ca66d35f364ad057dc6b4520700d2a71f4d1c431bb428b6de513313a
 DIST pinentry-bemenu-0.12.0.tar.gz 34781 BLAKE2B 58268a7c6bbe9d49a93f4d0b0bc7c2caa5a8cac2a6d54243d42f533b18bad36bf6177d742f4525a2199fe9f5d891ebd1cdb8c24880e13ef0283cf0b7d997760d SHA512 243b0572ae80f9fe95269545f13f71a85a84afd75f212872ccb7f34c078b86ba92faca2cdf772e333390bd1367b9e5272247ba1dfb40fc86a1bbd0efb5da2991
+DIST pinentry-bemenu-0.13.1.tar.gz 34933 BLAKE2B 3e71ca3ddd7836149e7dd6b208ac2664ccd4b00b914112e767cc659c3da8dcf22219f85029ea095d0096caccb3fa48402a724318941631b5454fd031228c8ac7 SHA512 9cdb4a3876c96900dc5ae31ad8520e0f5bc337a7e97e30c35fc0898c5f25dea322b9f41afa191a75eb3502455a96f2cb03f3699802ac38dcd1af67445fb8a3b2
diff --git a/app-crypt/pinentry-bemenu/pinentry-bemenu-0.13.1.ebuild b/app-crypt/pinentry-bemenu/pinentry-bemenu-0.13.1.ebuild
new file mode 100644
index 0000000000..299cc1efbd
--- /dev/null
+++ b/app-crypt/pinentry-bemenu/pinentry-bemenu-0.13.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Pinentry based on bemenu"
+HOMEPAGE="https://github.com/t-8ch/pinentry-bemenu"
+SRC_URI="https://github.com/t-8ch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-libs/bemenu
+	dev-libs/libgpg-error
+	dev-libs/libassuan
+	dev-libs/popt
+"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	elog "To use pinentry-bemenu, edit your gpg-agent.conf file to include:"
+	elog "pinentry-program /usr/bin/pinentry-bemenu"
+}

From 53cd08cfefc40b90a9776662873989129615a608 Mon Sep 17 00:00:00 2001
From: Takuya Wakazono <pastalian46@gmail.com>
Date: Wed, 13 Mar 2024 18:55:08 +0900
Subject: [PATCH 14/34] app-crypt/pinentry-bemenu: drop 0.11.0, 0.12.0

Signed-off-by: Takuya Wakazono <pastalian46@gmail.com>
---
 app-crypt/pinentry-bemenu/Manifest            |  2 --
 .../pinentry-bemenu-0.11.0.ebuild             | 28 -------------------
 .../pinentry-bemenu-0.12.0.ebuild             | 27 ------------------
 3 files changed, 57 deletions(-)
 delete mode 100644 app-crypt/pinentry-bemenu/pinentry-bemenu-0.11.0.ebuild
 delete mode 100644 app-crypt/pinentry-bemenu/pinentry-bemenu-0.12.0.ebuild

diff --git a/app-crypt/pinentry-bemenu/Manifest b/app-crypt/pinentry-bemenu/Manifest
index 6703223df4..dfb0aa29bd 100644
--- a/app-crypt/pinentry-bemenu/Manifest
+++ b/app-crypt/pinentry-bemenu/Manifest
@@ -1,3 +1 @@
-DIST pinentry-bemenu-0.11.0.tar.gz 34352 BLAKE2B 54059a506fbc3e5034af7ffdf6fdac8f131abbac94662a35d487072f292b380a8b81d5a2916a8ef85ac3ae0c4f479119fadac541eb6bd32eb3033ce762ea5679 SHA512 3c35733b52d1b096904585ee0f37b0a2c7390158a94b2f13fe387fd738c004a2f1f474e3ca66d35f364ad057dc6b4520700d2a71f4d1c431bb428b6de513313a
-DIST pinentry-bemenu-0.12.0.tar.gz 34781 BLAKE2B 58268a7c6bbe9d49a93f4d0b0bc7c2caa5a8cac2a6d54243d42f533b18bad36bf6177d742f4525a2199fe9f5d891ebd1cdb8c24880e13ef0283cf0b7d997760d SHA512 243b0572ae80f9fe95269545f13f71a85a84afd75f212872ccb7f34c078b86ba92faca2cdf772e333390bd1367b9e5272247ba1dfb40fc86a1bbd0efb5da2991
 DIST pinentry-bemenu-0.13.1.tar.gz 34933 BLAKE2B 3e71ca3ddd7836149e7dd6b208ac2664ccd4b00b914112e767cc659c3da8dcf22219f85029ea095d0096caccb3fa48402a724318941631b5454fd031228c8ac7 SHA512 9cdb4a3876c96900dc5ae31ad8520e0f5bc337a7e97e30c35fc0898c5f25dea322b9f41afa191a75eb3502455a96f2cb03f3699802ac38dcd1af67445fb8a3b2
diff --git a/app-crypt/pinentry-bemenu/pinentry-bemenu-0.11.0.ebuild b/app-crypt/pinentry-bemenu/pinentry-bemenu-0.11.0.ebuild
deleted file mode 100644
index e2b75bf1b6..0000000000
--- a/app-crypt/pinentry-bemenu/pinentry-bemenu-0.11.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Pinentry based on bemenu"
-HOMEPAGE="https://github.com/t-8ch/pinentry-bemenu"
-SRC_URI="https://github.com/t-8ch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	dev-libs/bemenu
-	dev-libs/libgpg-error
-	dev-libs/libassuan
-	dev-libs/popt
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-pkg_postinst() {
-	elog "To use pinentry-bemenu, edit your gpg-agent.conf file to include:"
-	elog "pinentry-program /usr/bin/pinentry-bemenu"
-}
diff --git a/app-crypt/pinentry-bemenu/pinentry-bemenu-0.12.0.ebuild b/app-crypt/pinentry-bemenu/pinentry-bemenu-0.12.0.ebuild
deleted file mode 100644
index 034b576068..0000000000
--- a/app-crypt/pinentry-bemenu/pinentry-bemenu-0.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Pinentry based on bemenu"
-HOMEPAGE="https://github.com/t-8ch/pinentry-bemenu"
-SRC_URI="https://github.com/t-8ch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	dev-libs/bemenu
-	dev-libs/libgpg-error
-	dev-libs/libassuan
-	dev-libs/popt
-"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
-	elog "To use pinentry-bemenu, edit your gpg-agent.conf file to include:"
-	elog "pinentry-program /usr/bin/pinentry-bemenu"
-}

From a89e76200f65404b2d1e9a4aa8526fb3ffc92f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?=
 <gonegrier.duarte@gmail.com>
Date: Wed, 13 Mar 2024 11:08:38 +0000
Subject: [PATCH 15/34] sys-firmware/lenovolegionlinux: Improving ebuild
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte@gmail.com>
---
 .../lenovolegionlinux-9999.ebuild             | 31 ++++++-------------
 sys-firmware/lenovolegionlinux/metadata.xml   |  1 -
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild b/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild
index 672fcb964b..3346d2ff6b 100644
--- a/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild
+++ b/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild
@@ -21,7 +21,8 @@ fi
 DESCRIPTION="Lenovo Legion Linux kernel module"
 HOMEPAGE="https://github.com/johnfanv2/LenovoLegionLinux"
 
-BDEPEND="sys-kernel/linux-headers
+BDEPEND="
+	sys-kernel/linux-headers
 	sys-apps/lm-sensors
 	sys-apps/dmidecode
 	sys-apps/sed
@@ -35,7 +36,7 @@ RDEPEND="
 		dev-python/darkdetect
 	)
 	downgrade-nvidia? ( <=x11-drivers/nvidia-drivers-525 )
-	sys-power/acpid
+	systemd? ( sys-power/acpid )
 	radeon-dgpu? ( dev-util/rocm-smi )
 	ryzenadj? ( sys-power/RyzenAdj )
 	undervolt-intel? ( dev-python/undervolt )
@@ -45,8 +46,8 @@ DEPEND="${RDEPEND}"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="gui acpi systemd radeon-dgpu downgrade-nvidia ryzenadj undervolt-intel"
-REQUIRED_USE="|| ( systemd acpi radeon-dgpu downgrade-nvidia ryzenadj gui undervolt-intel ) acpi? ( gui ) radeon-dgpu? ( !downgrade-nvidia gui ) downgrade-nvidia? ( !radeon-dgpu gui ) undervolt-intel? ( !ryzenadj gui ) ryzenadj? ( !undervolt-intel gui )"
+IUSE="+gui systemd radeon-dgpu downgrade-nvidia ryzenadj undervolt-intel"
+REQUIRED_USE="|| ( systemd radeon-dgpu downgrade-nvidia ryzenadj gui undervolt-intel ) radeon-dgpu? ( !downgrade-nvidia gui ) downgrade-nvidia? ( !radeon-dgpu gui ) undervolt-intel? ( !ryzenadj gui ) ryzenadj? ( !undervolt-intel gui )"
 
 MODULES_KERNEL_MIN=5.10
 
@@ -65,25 +66,21 @@ src_compile() {
 			sed -i "s/version = _VERSION/version = ${PV}/g" "${WORKDIR}/${P}/python/legion_linux/setup.cfg"
 		fi
 		#Define build dir (fix sandboxed)
-		cd "${WORKDIR}/${P}/python/legion_linux"
+		cd "${WORKDIR}/${P}/python/legion_linux" || die
 		distutils-r1_src_compile --build-dir "${WORKDIR}/${P}/python/legion_linux/build"
-		cd "legion_linux/extra/service/legiond"
-		emake || die
+		cd "legion_linux/extra/service/legiond" || die
+		emake
 	fi
 }
 
 src_install() {
 	linux-mod-r1_src_install
-	#Load the module without reboot
-	pushd python/legion_linux/ || die
-	make forcereloadmodule
-	popd || die
 	if use gui; then
 		#Define build dir (fix sandboxed)
-		cd "${WORKDIR}/${P}/python/legion_linux/"
+		cd "${WORKDIR}/${P}/python/legion_linux/" || die
 		distutils-r1_src_install --build-dir "${WORKDIR}/${P}/python/legion_linux/build"
 
-		cd "${WORKDIR}/${P}/extra"
+		cd "${WORKDIR}/${P}/extra" || die
 
 		if use systemd; then
 			systemd_dounit service/legiond.service service/legiond-onresume.service
@@ -92,13 +89,6 @@ src_install() {
 			dobin service/legiond/legiond
 			dobin service/legiond/legiond-cli
 		fi
-
-		if use acpi; then
-			insinto /usr/share/legion_linux/acpi/events
-			doins acpi/events/{ac_adapter_legion-fancurve,novo-button,PrtSc-button,fn-r-refrate}
-			insinto /usr/share/legion_linux/acpi/actions
-			doins acpi/actions/{battery-legion-quiet.sh,snipping-tool.sh,fn-r-refresh-rate.sh}
-		fi
 	fi
 }
 
@@ -115,7 +105,6 @@ pkg_postinst() {
 			ewarn "Note: Edit /etc/legion_linux/.env to enable nvidia TDP control\n"
 		fi
 	fi
-	use acpi && ewarn "Acpi exemples are included in /usr/share/legion_linux/acpi\n"
 	ewarn "Note for 2023-2023 Legion user: It need help for testing the features"
 	ewarn "Pls test the feature how is decribe in the README of the project!"
 	ewarn "and also go to this issue in github: https://github.com/johnfanv2/LenovoLegionLinux/issues/46"
diff --git a/sys-firmware/lenovolegionlinux/metadata.xml b/sys-firmware/lenovolegionlinux/metadata.xml
index 0bf12c93d9..bd4ddf3020 100644
--- a/sys-firmware/lenovolegionlinux/metadata.xml
+++ b/sys-firmware/lenovolegionlinux/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<use>
 		<flag name="gui">Build and install legion_gui and legion_cli</flag>
-		<flag name="acpi">Provide acpi exemple /usr/share/legion_linux/acpi </flag>
 		<flag name="radeon-dgpu">Enable AMD GPU TDP control (systemd-service)</flag>
 		<flag name="downgrade-nvidia">Downgrade nvidia for 525 to enable TDP control (systemd-service)</flag>
 		<flag name="ryzenadj">[AMD] CPU and APU control using ryzenadj (systemd-service)</flag>

From 95b5b2723bbfa25180955032f9df2917ba9571ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?=
 <gonegrier.duarte@gmail.com>
Date: Wed, 13 Mar 2024 11:24:08 +0000
Subject: [PATCH 16/34] sys-firmware/lenovolegionlinux: remove systemd useflag
 * small changes to the ebuild
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte@gmail.com>
---
 .../lenovolegionlinux-9999.ebuild             | 39 +++++++++----------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild b/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild
index 3346d2ff6b..a98d9f643f 100644
--- a/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild
+++ b/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild
@@ -34,9 +34,9 @@ RDEPEND="
 		dev-python/pyyaml
 		dev-python/argcomplete
 		dev-python/darkdetect
+		sys-power/acpid
 	)
 	downgrade-nvidia? ( <=x11-drivers/nvidia-drivers-525 )
-	systemd? ( sys-power/acpid )
 	radeon-dgpu? ( dev-util/rocm-smi )
 	ryzenadj? ( sys-power/RyzenAdj )
 	undervolt-intel? ( dev-python/undervolt )
@@ -46,8 +46,8 @@ DEPEND="${RDEPEND}"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+gui systemd radeon-dgpu downgrade-nvidia ryzenadj undervolt-intel"
-REQUIRED_USE="|| ( systemd radeon-dgpu downgrade-nvidia ryzenadj gui undervolt-intel ) radeon-dgpu? ( !downgrade-nvidia gui ) downgrade-nvidia? ( !radeon-dgpu gui ) undervolt-intel? ( !ryzenadj gui ) ryzenadj? ( !undervolt-intel gui )"
+IUSE="+gui radeon-dgpu downgrade-nvidia ryzenadj undervolt-intel"
+REQUIRED_USE="|| ( radeon-dgpu downgrade-nvidia ryzenadj gui undervolt-intel ) radeon-dgpu? ( !downgrade-nvidia gui ) downgrade-nvidia? ( !radeon-dgpu gui ) undervolt-intel? ( !ryzenadj gui ) ryzenadj? ( !undervolt-intel gui )"
 
 MODULES_KERNEL_MIN=5.10
 
@@ -82,28 +82,25 @@ src_install() {
 
 		cd "${WORKDIR}/${P}/extra" || die
 
-		if use systemd; then
-			systemd_dounit service/legiond.service service/legiond-onresume.service
-			insinto /usr/share/legion_linux/acpi/events
-			doins acpi/events/{legion_ppd,legion_ac}
-			dobin service/legiond/legiond
-			dobin service/legiond/legiond-cli
-		fi
+		systemd_dounit service/legiond.service service/legiond-onresume.service
+		insinto /etc/acpi/events
+		doins acpi/events/{legion_ppd,legion_ac}
+		dobin service/legiond/legiond
+		dobin service/legiond/legiond-cli
 	fi
 }
 
 pkg_postinst() {
-	if use systemd; then
-		ewarn "Default config files are present in /usr/share/legion_linux"
-		ewarn "Copy folder /usr/share/legion_linux to /etc/legion_linux"
-		ewarn "Note:Fancurve can edit using the gui app"
-		ewarn "Dont forget to edit /etc/legion_linux/.env to enable and disable extra features"
-		ewarn "Note the CPU and APU control command both for undervolt an ryzenadj are edit in /etc/legion_linux/.env command"
-		if !use downgrade-nvidia; then
-			ewarn "Note: use flag downgrade-nvidia if you need for nvidia TDP control (requires driver 525 to work)\n"
-		else
-			ewarn "Note: Edit /etc/legion_linux/.env to enable nvidia TDP control\n"
-		fi
+	ewarn "Default config files are present in /usr/share/legion_linux"
+	ewarn "Copy folder /usr/share/legion_linux to /etc/legion_linux"
+	ewarn "Note: Fancurve can be edit using the gui app"
+	ewarn "Dont forget to edit /etc/legion_linux/.env to enable and disable extra features"
+	ewarn "Note the CPU and APU control command both for undervolt an ryzenadj are edit in /etc/legion_linux/.env"
+	if !use downgrade-nvidia; then
+		ewarn "Note: use flag downgrade-nvidia if you need for nvidia TDP control (requires driver 525 to work)\n"
+		ewarn "This useflag will be drop soon since 525 is almost 6 months old"
+	else
+		ewarn "Note: Edit /etc/legion_linux/.env to enable nvidia TDP control\n"
 	fi
 	ewarn "Note for 2023-2023 Legion user: It need help for testing the features"
 	ewarn "Pls test the feature how is decribe in the README of the project!"

From 6ce490692752e0531008a479aba7b4ddea9b06f1 Mon Sep 17 00:00:00 2001
From: Michael Egger <egger.m@protonmail.com>
Date: Wed, 13 Mar 2024 14:16:57 +0100
Subject: [PATCH 17/34] app-portage/portage-lostfiles: add 0.5.5, drop 0.5.4

Signed-off-by: Michael Egger <egger.m@protonmail.com>
---
 app-portage/portage-lostfiles/Manifest                          | 2 +-
 ...ge-lostfiles-0.5.4.ebuild => portage-lostfiles-0.5.5.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename app-portage/portage-lostfiles/{portage-lostfiles-0.5.4.ebuild => portage-lostfiles-0.5.5.ebuild} (100%)

diff --git a/app-portage/portage-lostfiles/Manifest b/app-portage/portage-lostfiles/Manifest
index 4afe784d56..30cb443f85 100644
--- a/app-portage/portage-lostfiles/Manifest
+++ b/app-portage/portage-lostfiles/Manifest
@@ -1 +1 @@
-DIST portage-lostfiles-0.5.4.tar.gz 12495 BLAKE2B bcf3af787978ba604c0fd6348f4ec2352398790d68f1d2e7e8b5de159820be13807a83cd98255d4f7fe7f0224079d3c9edc22b744bb39ba236aed2607020f7c2 SHA512 a1fd0229b9fd6913982d2c41015364ac1ee78cbee9e0d213cfc7e280fee920c4c8e2b3bfe29979f2110ceb744978d8f255b67b63cd8ff73b1b2cb7ed45a11c74
+DIST portage-lostfiles-0.5.5.tar.gz 12496 BLAKE2B 99d16719ef3065a3284603743c408d69a4db40f901dde2d89025ea403c6e9531128d49978fdd087bf919e961f7f4777b6317e59e251a9c1953a812adb81efd58 SHA512 30062820b9365d4ca7b6303e4732e55dba020d99efe3f0b4bd4023b9f70b03cc151700679710f998939363060d666a1c44460e958a80d7a4397ffa1da4fda331
diff --git a/app-portage/portage-lostfiles/portage-lostfiles-0.5.4.ebuild b/app-portage/portage-lostfiles/portage-lostfiles-0.5.5.ebuild
similarity index 100%
rename from app-portage/portage-lostfiles/portage-lostfiles-0.5.4.ebuild
rename to app-portage/portage-lostfiles/portage-lostfiles-0.5.5.ebuild

From 96cee1499ed4784aed28043cf74ae803bdb73ee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@gentoo.org>
Date: Wed, 13 Mar 2024 17:36:56 +0100
Subject: [PATCH 18/34] app-text/klogg: Add missing include
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The cstdio header is not included indirectly with some compilers, e.g.
GCC 14, therefore it needs to be included explicitly. The patch is
adapted from upstream commit.

Closes: https://bugs.gentoo.org/921739
Signed-off-by: Petr Vaněk <arkamar@gentoo.org>
---
 .../klogg-22.06.0.1289-missing-include.patch  | 20 +++++++++++++++++++
 app-text/klogg/klogg-22.06.0.1289.ebuild      |  4 ++++
 2 files changed, 24 insertions(+)
 create mode 100644 app-text/klogg/files/klogg-22.06.0.1289-missing-include.patch

diff --git a/app-text/klogg/files/klogg-22.06.0.1289-missing-include.patch b/app-text/klogg/files/klogg-22.06.0.1289-missing-include.patch
new file mode 100644
index 0000000000..d8a045ba8f
--- /dev/null
+++ b/app-text/klogg/files/klogg-22.06.0.1289-missing-include.patch
@@ -0,0 +1,20 @@
+From 6b5df18387316a706eb5f1fd05e049871eb6d153 Mon Sep 17 00:00:00 2001
+From: Anton Filimonov <anton.filimonov@gmail.com>
+Date: Thu, 8 Jun 2023 01:01:27 +0200
+Subject: [PATCH] build: fix arch aur builds
+
+Taken from upstream commit
+https://github.com/variar/klogg/commit/6b5df18387316a706eb5f1fd05e049871eb6d153
+
+diff --git a/src/crash_handler/src/memory_info.cpp b/src/crash_handler/src/memory_info.cpp
+index 670918163..06ef8b75f 100644
+--- a/src/crash_handler/src/memory_info.cpp
++++ b/src/crash_handler/src/memory_info.cpp
+@@ -89,6 +89,7 @@ uint64_t usedMemory()
+ #include <unistd.h>
+ 
+ #include <array>
++#include <cstdio>
+ 
+ uint64_t systemPhysicalMemory()
+ {
diff --git a/app-text/klogg/klogg-22.06.0.1289.ebuild b/app-text/klogg/klogg-22.06.0.1289.ebuild
index 7f2ec907e6..50d88b1cf7 100644
--- a/app-text/klogg/klogg-22.06.0.1289.ebuild
+++ b/app-text/klogg/klogg-22.06.0.1289.ebuild
@@ -42,6 +42,10 @@ BDEPEND="
 	test? ( dev-qt/qttest:5 >=dev-cpp/catch-2.13.8 )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-missing-include.patch"
+)
+
 src_unpack() {
 	unpack ${P}.tar.gz
 	mv "${WORKDIR}/${PN}-${MAJOR_VERSION}" "${WORKDIR}/${P}"

From 5c8623aaeddabe50edef89e0dfcdcc3b3231a40c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@gentoo.org>
Date: Wed, 13 Mar 2024 17:40:29 +0100
Subject: [PATCH 19/34] app-text/klogg: switch to dev-libs/vectorscan
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

dev-libs/hyperscan is deprecated and it needs to be replaced with
dev-libs/vectorscan.

Signed-off-by: Petr Vaněk <arkamar@gentoo.org>
---
 .../{klogg-22.06.0.1289.ebuild => klogg-22.06.0.1289-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename app-text/klogg/{klogg-22.06.0.1289.ebuild => klogg-22.06.0.1289-r1.ebuild} (98%)

diff --git a/app-text/klogg/klogg-22.06.0.1289.ebuild b/app-text/klogg/klogg-22.06.0.1289-r1.ebuild
similarity index 98%
rename from app-text/klogg/klogg-22.06.0.1289.ebuild
rename to app-text/klogg/klogg-22.06.0.1289-r1.ebuild
index 50d88b1cf7..2e0f3cd108 100644
--- a/app-text/klogg/klogg-22.06.0.1289.ebuild
+++ b/app-text/klogg/klogg-22.06.0.1289-r1.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtxml:5
 	dev-qt/qtconcurrent:5
-	>=dev-libs/hyperscan-5.4.0
+	dev-libs/vectorscan:=
 	>=dev-libs/xxhash-0.8.0
 	>=app-i18n/uchardet-0.0.7
 	>=dev-cpp/tbb-2021.5

From 98e100ba369802009023564bf17506ae00984789 Mon Sep 17 00:00:00 2001
From: Henri Gasc <gasc@eurecom.fr>
Date: Wed, 13 Mar 2024 22:04:15 +0100
Subject: [PATCH 20/34] dev-python/textual-dev: add 1.5.1, drop 1.4.0

Signed-off-by: Henri Gasc <gasc@eurecom.fr>
---
 dev-python/textual-dev/Manifest                          | 2 +-
 ...textual-dev-1.4.0.ebuild => textual-dev-1.5.1.ebuild} | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename dev-python/textual-dev/{textual-dev-1.4.0.ebuild => textual-dev-1.5.1.ebuild} (77%)

diff --git a/dev-python/textual-dev/Manifest b/dev-python/textual-dev/Manifest
index 46d729dc02..31ebc51a44 100644
--- a/dev-python/textual-dev/Manifest
+++ b/dev-python/textual-dev/Manifest
@@ -1 +1 @@
-DIST textual-dev-1.4.0.gh.tar.gz 60050 BLAKE2B 8af83ef31445a2ef7d82ecad6fa9893d1312e83b45753138e291c8ee0786dd50b738eb7032cc7e0cbb41d5c2f0ad293a240d691ba340d3322bfd5ac4e78f5a16 SHA512 2dac7e8d8ed33c783a1a1fb84fc27404c22074ab5bbbf5390d8a8e0a4ebdaafa9d22eac556b66a7d207d59b0367dba8f627a575c7117909a857066a11c0c3e78
+DIST textual-dev-1.5.1.gh.tar.gz 61043 BLAKE2B 9c208e8eb61121dadbae450d7027c436634796d428eed31d9550da738a60e1eb02a5a2ae45be1898595228776e73c8003ece652439fc81aa65f5bbbaf61118d7 SHA512 d34100a0bf92a43088f3f5ac7c911cc9e8aaa9f5eb04b9aab328518e66fb54e29ed47617323cc3c39fd77255f08b3f33087909f97d0e60d987706d991caca8b1
diff --git a/dev-python/textual-dev/textual-dev-1.4.0.ebuild b/dev-python/textual-dev/textual-dev-1.5.1.ebuild
similarity index 77%
rename from dev-python/textual-dev/textual-dev-1.4.0.ebuild
rename to dev-python/textual-dev/textual-dev-1.5.1.ebuild
index 8a569ff1df..d0cecdd30a 100644
--- a/dev-python/textual-dev/textual-dev-1.4.0.ebuild
+++ b/dev-python/textual-dev/textual-dev-1.5.1.ebuild
@@ -17,20 +17,19 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="
+	>=dev-python/textual-0.36.0[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-3.8.1[${PYTHON_USEDEP}]
 	>=dev-python/click-8.1.2[${PYTHON_USEDEP}]
-	dev-python/importlib-metadata[${PYTHON_USEDEP}]
 	>=dev-python/msgpack-1.0.3[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	>=dev-python/textual-0.32.0[${PYTHON_USEDEP}]
 	=dev-python/typing-extensions-4*[${PYTHON_USEDEP}]
 "
 
 BDEPEND="
 	test? (
 		${RDEPEND}
-		=dev-python/pytest-aiohttp-1*[${PYTHON_USEDEP}]
-		=dev-python/time-machine-2*[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		>=dev-python/time-machine-2.6.0[${PYTHON_USEDEP}]
+		<dev-python/time-machine-3[${PYTHON_USEDEP}]
 	)
 "
 

From 90e2471b4309ac9100b4a5cec87628bd5db6f4a8 Mon Sep 17 00:00:00 2001
From: Henri Gasc <gasc@eurecom.fr>
Date: Wed, 13 Mar 2024 23:05:32 +0100
Subject: [PATCH 21/34] dev-python/screeninfo: update SRC_URI

Signed-off-by: Henri Gasc <gasc@eurecom.fr>
---
 dev-python/screeninfo/Manifest                |  2 +-
 dev-python/screeninfo/screeninfo-0.8.1.ebuild | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/dev-python/screeninfo/Manifest b/dev-python/screeninfo/Manifest
index b30016dd6a..44a9fd72ba 100644
--- a/dev-python/screeninfo/Manifest
+++ b/dev-python/screeninfo/Manifest
@@ -1 +1 @@
-DIST v0.8.1.gh.tar.gz 26498 BLAKE2B 4e67c6dab4638871247771329f7daf788015df591e03d4f02fb3950a9551c00c3cdff7c2e4d19a33930ec535a9bbaa1f67c5326830292e4ef93f3b9aaa788d18 SHA512 cbcffbd708bf3d2788efe67d9df2bcb99fdf09f91b6e9f40c024e4b1e372417bf6d3c61188a198c4b760302fe1e3ab16e2747cf7a7e14ce7ba82bda77334995c
+DIST screeninfo-0.8.1.gh.tar.gz 26498 BLAKE2B 4e67c6dab4638871247771329f7daf788015df591e03d4f02fb3950a9551c00c3cdff7c2e4d19a33930ec535a9bbaa1f67c5326830292e4ef93f3b9aaa788d18 SHA512 cbcffbd708bf3d2788efe67d9df2bcb99fdf09f91b6e9f40c024e4b1e372417bf6d3c61188a198c4b760302fe1e3ab16e2747cf7a7e14ce7ba82bda77334995c
diff --git a/dev-python/screeninfo/screeninfo-0.8.1.ebuild b/dev-python/screeninfo/screeninfo-0.8.1.ebuild
index 6e25aa4940..5d270350ad 100644
--- a/dev-python/screeninfo/screeninfo-0.8.1.ebuild
+++ b/dev-python/screeninfo/screeninfo-0.8.1.ebuild
@@ -1,24 +1,19 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
 DESCRIPTION="Fetch location and size of physical screens."
 HOMEPAGE="https://github.com/rr-/screeninfo https://pypi.org/project/screeninfo"
-SRC_URI="https://github.com/rr-/screeninfo/archive/refs/tags/${PV}.tar.gz -> v${PV}.gh.tar.gz"
+SRC_URI="https://github.com/rr-/screeninfo/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-BDEPEND="dev-python/poetry-core[${PYTHON_USEDEP}]"
-DEPEND="${BDEPEND}"
 
 distutils_enable_tests pytest

From e78fbb2ee1dddb372ebc6bce55095a1d138baa0d Mon Sep 17 00:00:00 2001
From: Henri Gasc <gasc@eurecom.fr>
Date: Thu, 14 Mar 2024 00:07:45 +0100
Subject: [PATCH 22/34] media-video/manimgl: Update ebuild funcs and deps

Signed-off-by: Henri Gasc <gasc@eurecom.fr>
---
 media-video/manimgl/manimgl-9999.ebuild | 29 ++++++++++---------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/media-video/manimgl/manimgl-9999.ebuild b/media-video/manimgl/manimgl-9999.ebuild
index dfc646d1e5..f574a2feeb 100644
--- a/media-video/manimgl/manimgl-9999.ebuild
+++ b/media-video/manimgl/manimgl-9999.ebuild
@@ -3,10 +3,18 @@
 
 EAPI=8
 
+DOCS_BUILDER="sphinx"
+DOCS_DIR="docs/source"
+DOCS_DEPEND="
+	dev-python/furo
+	dev-python/jinja2-cli
+	dev-python/sphinx-copybutton
+"
+
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit distutils-r1 git-r3
+inherit distutils-r1 git-r3 docs
 
 DESCRIPTION="Animation engine for explanatory math videos"
 HOMEPAGE="https://github.com/3b1b/manim https://pypi.org/project/manimgl/"
@@ -21,7 +29,6 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="doc"
 
 RDEPEND="
 	dev-python/colour[${PYTHON_USEDEP}]
@@ -55,28 +62,14 @@ RDEPEND="
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
 	' python3_{7..10})
 "
-# typing-extensions is needed for python < 3.11
+# typing-extensions is only needed for python < 3.11
 # so, only python3.10 should work too (because of PYTHON_COMPAT)
 
-BDEPEND="
-	doc? (
-		dev-python/furo[${PYTHON_USEDEP}]
-		dev-python/jinja2-cli[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-copybutton[${PYTHON_USEDEP}]
-	)
-"
-
 DEPEND="${RDEPEND}"
 
-python_compile_all() {
-	use doc && emake -C "${S}/docs" man && mv "${S}/docs/build/man/manim.1" "${S}/docs/build/man/${PN}.1"
-}
-
 python_install_all() {
-	distutils-r1_python_install_all
+	default
 	if use doc; then
-		doman "${S}/docs/build/man/${PN}.1"
 		docinto examples
 		dodoc example_scenes.py
 		dodoc docs/example.py

From 875c66a5a603d0e315c986425bae1e2fab67bbcf Mon Sep 17 00:00:00 2001
From: Piotr Kubaj <pkubaj@anongoth.pl>
Date: Thu, 14 Mar 2024 00:17:58 +0100
Subject: [PATCH 23/34] dev-cpp/rang: keyword 3.2 for ~ppc64

Signed-off-by: Piotr Kubaj <pkubaj@anongoth.pl>
---
 dev-cpp/rang/rang-3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-cpp/rang/rang-3.2.ebuild b/dev-cpp/rang/rang-3.2.ebuild
index a06d69c754..323b239753 100644
--- a/dev-cpp/rang/rang-3.2.ebuild
+++ b/dev-cpp/rang/rang-3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/agauniyal/rang/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64"
 
 IUSE="test"
 RESTRICT="!test? ( test )"

From 81420fffd1c25c391cba075edc4c2382b78c3915 Mon Sep 17 00:00:00 2001
From: Piotr Kubaj <pkubaj@anongoth.pl>
Date: Thu, 14 Mar 2024 00:22:46 +0100
Subject: [PATCH 24/34] dev-games/liblcf: keyword 0.8 for ~ppc64

Signed-off-by: Piotr Kubaj <pkubaj@anongoth.pl>
---
 dev-games/liblcf/liblcf-0.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-games/liblcf/liblcf-0.8.ebuild b/dev-games/liblcf/liblcf-0.8.ebuild
index b71de5a296..e61fee2861 100644
--- a/dev-games/liblcf/liblcf-0.8.ebuild
+++ b/dev-games/liblcf/liblcf-0.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://easyrpg.org/
 SRC_URI="https://easyrpg.org/downloads/player/${PV}/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64"
 
 IUSE="doc tools"
 

From 21a544fe33bebefeeff61557c5cbe142c0278521 Mon Sep 17 00:00:00 2001
From: Piotr Kubaj <pkubaj@anongoth.pl>
Date: Thu, 14 Mar 2024 00:23:41 +0100
Subject: [PATCH 25/34] media-libs/dr_wav: keyword 0.13.16-r1 for ~ppc64

Signed-off-by: Piotr Kubaj <pkubaj@anongoth.pl>
---
 media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild b/media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild
index cb5955edd6..274907ba47 100644
--- a/media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild
+++ b/media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mackron/dr_libs/archive/${COMMIT}.tar.gz -> ${P}.gh.
 
 LICENSE="|| ( MIT-0 public-domain )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64"
 
 IUSE="test"
 RESTRICT="!test? ( test )"

From a6721d46297a71ebb2d6ccdc887ca0858cb7b069 Mon Sep 17 00:00:00 2001
From: Piotr Kubaj <pkubaj@anongoth.pl>
Date: Thu, 14 Mar 2024 00:31:54 +0100
Subject: [PATCH 26/34] games-arcade/SpaceCadetPinball: keyword 2.1.0 for
 ~ppc64

Signed-off-by: Piotr Kubaj <pkubaj@anongoth.pl>
---
 games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.1.0.ebuild b/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.1.0.ebuild
index 8a905a8510..673101364d 100644
--- a/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.1.0.ebuild
+++ b/games-arcade/SpaceCadetPinball/SpaceCadetPinball-2.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/k4zmu2a/${PN}/archive/refs/tags/Release_${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 
 DEPEND="
 	media-libs/libsdl2

From 925b709ee61fdb53d7fa04c0bf9efd133ca1b6ff Mon Sep 17 00:00:00 2001
From: Xin Yang <yangmame@icloud.com>
Date: Wed, 13 Mar 2024 09:55:08 +0800
Subject: [PATCH 27/34] net-vpn/candy: version bump to 5.3 and clean patches

Signed-off-by: Xin Yang <yangmame@icloud.com>
Signed-off-by: David Roman <davidroman96@gmail.com>
---
 net-vpn/candy/Manifest                        |  2 +-
 .../{candy-4.1.ebuild => candy-5.3.ebuild}    |  3 +-
 .../candy-3.9.1-use-system-ixwebsocket.patch  | 60 --------------
 ...-4.0-show-version-and-use-cflags-env.patch | 80 -------------------
 4 files changed, 2 insertions(+), 143 deletions(-)
 rename net-vpn/candy/{candy-4.1.ebuild => candy-5.3.ebuild} (94%)
 delete mode 100644 net-vpn/candy/files/candy-3.9.1-use-system-ixwebsocket.patch
 delete mode 100644 net-vpn/candy/files/candy-4.0-show-version-and-use-cflags-env.patch

diff --git a/net-vpn/candy/Manifest b/net-vpn/candy/Manifest
index 8691142b70..bb4dcc22a2 100644
--- a/net-vpn/candy/Manifest
+++ b/net-vpn/candy/Manifest
@@ -1 +1 @@
-DIST candy-4.1.tar.gz 43205 BLAKE2B c999099302690f759bfb877fdd9213e7b4d5a2cce649936913a3c6a40e79a72149a1dc971649ff9773fd0bfc1d56c1a8b97edffeaa724c2656bb846ee26827d9 SHA512 f019de51cec3942b854d7ffd35f9f7a669a26a967e78383bab6c5f2c58fca02f40e8fe9f502bd6e395623f917f2ccc6c8a2f05b96d4f164de4f018f763913cda
+DIST candy-5.3.tar.gz 48212 BLAKE2B 599b9ab1629f291b791bff51fc9059ed41228389d4c52d880b5efd40c31849906c5122da555fcfa5be3fb0b7c1ec6f3ce4c0f1a62e050ea00891bd89309873a4 SHA512 943f6ab211ba737dc706b2a7c09c50f1b6a00276d4ac937ed0c04df7d40078d41a0b71f0a132e8a1b532d0ec21e78fffc696d7d75b8398201456f64b920f4c86
diff --git a/net-vpn/candy/candy-4.1.ebuild b/net-vpn/candy/candy-5.3.ebuild
similarity index 94%
rename from net-vpn/candy/candy-4.1.ebuild
rename to net-vpn/candy/candy-5.3.ebuild
index 4067f7cd8d..ebaa4a53eb 100644
--- a/net-vpn/candy/candy-4.1.ebuild
+++ b/net-vpn/candy/candy-5.3.ebuild
@@ -16,9 +16,8 @@ KEYWORDS="~amd64"
 DEPEND="
 	dev-libs/uriparser
 	dev-libs/libconfig
-	net-libs/ixwebsocket[ws]
+	dev-libs/poco
 	dev-libs/openssl
-	sys-libs/zlib
 	dev-libs/libfmt
 	dev-libs/spdlog
 "
diff --git a/net-vpn/candy/files/candy-3.9.1-use-system-ixwebsocket.patch b/net-vpn/candy/files/candy-3.9.1-use-system-ixwebsocket.patch
deleted file mode 100644
index 445d5ad080..0000000000
--- a/net-vpn/candy/files/candy-3.9.1-use-system-ixwebsocket.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 317538a145784eb28b530a7969e941dc047cbf06 Mon Sep 17 00:00:00 2001
-From: lanthora <lanthora@outlook.com>
-Date: Wed, 21 Feb 2024 06:20:29 +0000
-Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=85=88=E4=BD=BF=E7=94=A8=E7=B3=BB?=
- =?UTF-8?q?=E7=BB=9F=E7=9A=84=20ixwebsocket?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- CMakeLists.txt | 20 +++++++++++++++++---
- 1 file changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2da4334..160cfa1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,9 +20,13 @@ pkg_check_modules(
-     liburiparser
- )
- 
-+pkg_check_modules(IXWEBSOCKET ixwebsocket)
-+
- find_library(ARGP_LIB argp)
- 
--include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/ixwebsocket.cmake)
-+if (NOT IXWEBSOCKET_FOUND)
-+    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/ixwebsocket.cmake)
-+endif()
- 
- if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-     include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/wintun.cmake)
-@@ -30,7 +34,12 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- endif()
- 
- include_directories(${DEPENDENCIES_INCLUDEDIR})
--include_directories(${ixwebsocket_SOURCE_DIR})
-+
-+if (IXWEBSOCKET_FOUND)
-+    include_directories(${IXWEBSOCKET_INCLUDEDIR})
-+else()
-+    include_directories(${ixwebsocket_SOURCE_DIR})
-+endif()
- 
- add_subdirectory(${SOURCE}/core)
- add_subdirectory(${SOURCE}/websocket)
-@@ -43,7 +52,12 @@ target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE websocket)
- target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE tun)
- target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE peer)
- target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE utility)
--target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ixwebsocket)
-+
-+if (IXWEBSOCKET_FOUND)
-+    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ${IXWEBSOCKET_LIBRARIES})
-+else()
-+    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ixwebsocket)
-+endif()
- 
- if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-     target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE iphlpapi)
diff --git a/net-vpn/candy/files/candy-4.0-show-version-and-use-cflags-env.patch b/net-vpn/candy/files/candy-4.0-show-version-and-use-cflags-env.patch
deleted file mode 100644
index c0e0121f14..0000000000
--- a/net-vpn/candy/files/candy-4.0-show-version-and-use-cflags-env.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From de8f5a3109ee3bdc472fbc7fcb1572aaad0b8cb9 Mon Sep 17 00:00:00 2001
-From: lanthora <lanthora@outlook.com>
-Date: Thu, 29 Feb 2024 05:16:53 +0000
-Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=98=BE=E7=A4=BA=E7=89=88?=
- =?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- CMakeLists.txt   | 10 ++++++----
- src/main/main.cc | 13 +++++++++++++
- 2 files changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1ebf2c0..dffc31d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,10 +1,12 @@
- cmake_minimum_required(VERSION 3.18.4)
- 
--project(candy CXX)
-+project(candy LANGUAGES CXX VERSION 4.0)
- 
--set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++2b -Wall -Werror -Wfatal-errors -Wno-unknown-pragmas")
--set(CMAKE_CXX_FLAGS_DEBUG_INIT "-g -fsanitize=address")
--set(CMAKE_CXX_FLAGS_RELEASE_INIT "-O2")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++2b -Wall -Werror -Wfatal-errors -Wno-unknown-pragmas")
-+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address")
-+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2")
-+
-+add_compile_definitions(VERSION="${CMAKE_PROJECT_VERSION}")
- 
- include_directories(${CMAKE_SOURCE_DIR}/src)
- 
-diff --git a/src/main/main.cc b/src/main/main.cc
-index 286d24d..65cdc4f 100644
---- a/src/main/main.cc
-+++ b/src/main/main.cc
-@@ -21,6 +21,10 @@
- 
- #include <argp.h>
- 
-+#ifndef VERSION
-+#define VERSION "unknown"
-+#endif
-+
- namespace {
- 
- struct arguments {
-@@ -54,6 +58,7 @@ struct argp_option options[] = {
-     {"config", 'c', "PATH", 0, "Configuration file path"},
-     {"discovery", OPT_DISCOVERY_INTERVAL, "SECONDS", 0, "Active discovery broadcast interval"},
-     {"route", 'r', "COST", 0, "Cost of routing"},
-+    {"version", 'v', 0, 0, "Show version"},
-     {"no-timestamp", OPT_NO_TIMESTAMP, 0, 0, "Log does not show time"},
-     {"debug", OPT_LOG_LEVEL_DEBUG, 0, 0, "Show debug level logs"},
-     {"auto-restart", OPT_AUTO_RESTART, 0, 0, "Automatic restart"},
-@@ -72,6 +77,11 @@ int setLogLevelDebug() {
-     return 0;
- }
- 
-+void showVersion() {
-+    std::cout << VERSION << std::endl;
-+    exit(0);
-+}
-+
- bool needShowUsage(struct arguments *arguments, struct argp_state *state) {
-     if (state->arg_num > 0)
-         return true;
-@@ -141,6 +151,9 @@ int parseOption(int key, char *arg, struct argp_state *state) {
-     case 'c':
-         parseConfigFile(arguments, arg);
-         break;
-+    case 'v':
-+        showVersion();
-+        break;
-     case OPT_NO_TIMESTAMP:
-         disableLogTimestamp();
-         break;

From 7277aebcdce95566c721ddfd58c4fc35d78a7e5a Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Thu, 14 Mar 2024 10:40:09 +0100
Subject: [PATCH 28/34] dev-embedded/esp-idf: add 5.2.1

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 dev-embedded/esp-idf/Manifest             |   1 +
 dev-embedded/esp-idf/esp-idf-5.2.1.ebuild | 146 ++++++++++++++++++++++
 2 files changed, 147 insertions(+)
 create mode 100644 dev-embedded/esp-idf/esp-idf-5.2.1.ebuild

diff --git a/dev-embedded/esp-idf/Manifest b/dev-embedded/esp-idf/Manifest
index 6bbd06ed71..6385383b8b 100644
--- a/dev-embedded/esp-idf/Manifest
+++ b/dev-embedded/esp-idf/Manifest
@@ -1,4 +1,5 @@
 DIST esp-idf-5.1.2.zip 1200519153 BLAKE2B d8714163e3a449e24bec8a93ce666d269ddb7d406d7e3dc0b5db0845b7a9c05f6a5186796f8bbda68bb0a8e40a2743a88792eb341e72a276e4ec1e3e8b04c34d SHA512 46e96419b5f58d8b41d5b7b35f6e96beee94f6c1e20ba22eaf48a7f3d3cf4f3c9b8aa79468e6ea95718f598f6e30e7b72be616d1fb856045758191eb244151c8
+DIST esp-idf-5.2.1.zip 1300409360 BLAKE2B a55ee7852165bd14fcc72fd0bc9c8f1dbfeb3a0f86766b5354112c54d3081709d192b87e368bf31502629e6a85cd9a75055fb0a20ee20a755f9d3951fb14b3ce SHA512 bbcfcbbec38ffc0f7d07c57bb8a3431e0237d0f61a02b176bfb222b71cff0f3065fadbdcf43221b33f14565fc646a3e287ce5fde7d5d7dae2d036b2e11d113e4
 DIST esp-idf-5.2.zip 1287699728 BLAKE2B d91d69da49423afa1c5345053af1da65d0c2d610f72a9a0c30a56bf9d4d2a9f10d2d30a2187e6db63953d5b9547877240cda8ff2d31032e7b4b9f2fad74c21e9 SHA512 fbbdd08aff3fe310638312d46a61466f97a039906a7766cc4ab5343b41a66f742b065b375695f8b2e749104bb7214eb31a1357e24c231048fc03fc81a615c90e
 DIST openocd-esp32-linux-amd64-0.12.0-esp32-20230921.tar.gz 2193783 BLAKE2B 8f94d628bb415ab75daa85d51c94e8d2a9a1d9399b706963b8bd663d145e440a9e86d7f29000f196d1c9e2585c24882739a80ba29c5b83a96ada384f262f0941 SHA512 8ca3c932c5b7b236133c2a305d95b8059d9db14640efc077e34c256390da05e177479a973aa974005f34fba4a74119dcdb59d876344bdef8940b58c3c948c9f7
 DIST riscv32-esp-elf-12.2.0_20230208-x86_64-linux-gnu.tar.xz 131410024 BLAKE2B 6961ddad1570aa69cbe7a4b1cd6722831d725b83a2d865b5babeea9b2d1762e4dda3cf35bdd4c5137758e15267a229136439387ff72577d5d558a924cd6161aa SHA512 dd0a95408fb487d444cb2c1efc9a0d21404eba2080b16cd9958dd9a9d22c5bf36f3c5e0309b082a226b39e4aeaf9a07ac89af740e2d5c01f85147d26dff7d233
diff --git a/dev-embedded/esp-idf/esp-idf-5.2.1.ebuild b/dev-embedded/esp-idf/esp-idf-5.2.1.ebuild
new file mode 100644
index 0000000000..6036f9efe5
--- /dev/null
+++ b/dev-embedded/esp-idf/esp-idf-5.2.1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11,12} )
+
+VER="13.2.0_20230928"
+
+CROSSTOOL_URL="https://github.com/espressif/crosstool-NG/releases/download/esp-${VER}"
+
+inherit python-r1
+
+DESCRIPTION="Espressif IoT Development Framework"
+HOMEPAGE="https://www.espressif.com/"
+
+#	https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32ulp-linux-amd64-2.28.51-esp-20191205.tar.gz
+SRC_URI="https://dl.espressif.com/github_assets/espressif/${PN}/releases/download/v${PV}/${PN}-v${PV}.zip -> ${P}.zip
+	https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230921/openocd-esp32-linux-amd64-0.12.0-esp32-20230921.tar.gz
+	https://github.com/espressif/binutils-gdb/releases/download/esp-gdb-v12.1_20231023/xtensa-esp-elf-gdb-12.1_20231023-x86_64-linux-gnu.tar.gz"
+SRC_URI+=" ${CROSSTOOL_URL}/xtensa-esp-elf-${VER}-x86_64-linux-gnu.tar.xz"
+SRC_URI+=" riscv32? ( ${CROSSTOOL_URL}/riscv32-esp-elf-${VER}-x86_64-linux-gnu.tar.xz )"
+
+#https://dl.espressif.com/dl/toolchains/preview/riscv32-esp-elf-gcc8_4_0-crosstool-ng-1.24.0-123-g64eb9ff-linux-amd64.tar.gz
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+IUSE="riscv32"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+SLOT="0"
+
+BDEPEND="app-arch/unzip"
+RDEPEND="
+	${PYTHON_DEPS}
+
+	dev-libs/libusb:1
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/pyelftools[${PYTHON_USEDEP}]
+	dev-embedded/esp-coredump[${PYTHON_USEDEP}]
+	dev-embedded/esptool
+	dev-embedded/esp-idf-kconfig[${PYTHON_USEDEP}]
+	dev-embedded/esp-idf-monitor[${PYTHON_USEDEP}]
+	dev-embedded/esp-idf-panic-decoder[${PYTHON_USEDEP}]
+	dev-embedded/esp-idf-size[${PYTHON_USEDEP}]
+	dev-embedded/freertos-gdb[${PYTHON_USEDEP}]
+	dev-embedded/idf-component-manager[${PYTHON_USEDEP}]
+"
+
+RESTRICT="strip"
+
+QA_PREBUILT="opt/* usr/lib* usr/share/esp-idf/*"
+QA_PRESTRIPPED="opt/*"
+
+PATCHES=(
+	"${FILESDIR}/allow-system-install-${PN}-5.1.2.patch"
+)
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+install_tool() {
+	shopt -s globstar
+
+	into /opt/${1}
+
+	if [[ -d "../${1}/lib" ]]; then
+		if stat *.so &>/dev/null; then
+		for i in ../${1}/lib/**/*.so*; do
+			dolib.so ${i}
+		done
+		fi
+
+		if stat *.a &>/dev/null; then
+		for i in ../${1}/lib/**/*.a*; do
+			dolib.a ${i}
+		done
+		fi
+
+		insinto /opt/${1}/lib
+		doins -r ../${1}/lib/*
+	fi
+
+	exeinto /opt/${1}/bin
+	doexe ../${1}/bin/*
+	(
+	cd ../${1}
+	for i in libexec/**/*; do
+		exeinto /opt/${1}/$(dirname ${i})
+		if [[ -x "${i}" && ! -d "${i}" ]]; then
+			doexe ${i}
+		fi
+	done
+
+	if [[ -d "include" ]]; then
+		insinto /opt/${1}
+		doins -r include
+	fi
+
+	if [[ -d "share" ]]; then
+		insinto /opt/${1}
+		doins -r share
+	fi
+	)
+
+	(
+		cd "${D}"/opt/${1}/bin/ || die
+		for i in *; do
+			dodir /opt/bin
+			cd "${D}"/opt/bin || die
+			dosym ../${1}/bin/${i} /opt/bin/${i}
+		done
+	)
+
+	shopt -u globstar
+}
+
+src_install() {
+	echo -e "#!/bin/sh\npython /usr/share/${PN}/tools/idf.py \"\$@\"" > idf
+	dobin idf
+
+	install_tool xtensa-esp-elf
+	install_tool xtensa-esp-elf/xtensa-esp-elf
+
+	if use riscv32; then
+		install_tool riscv32-esp-elf
+		install_tool riscv32-esp-elf/riscv32-esp-elf
+	fi
+
+	install_tool openocd-esp32
+
+	# Remove unsupported python versions
+	rm "${WORKDIR}"/xtensa-esp-elf-gdb/bin/xtensa-esp-elf-gdb-3.{6..10} || die
+	install_tool xtensa-esp-elf-gdb
+
+	echo "IDF_PATH=/usr/share/${PN}" > 99esp-idf || die
+	doenvd 99esp-idf
+
+	insinto /usr/share/${PN}
+
+	rm -r .git || die
+	find . -name ".git" -exec rm -rf {} \; || die
+	doins -r .
+}

From 01f2c2154b84b1f0f865c01c478f86880104deae Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Thu, 14 Mar 2024 10:43:19 +0100
Subject: [PATCH 29/34] dev-embedded/idf-component-manager: add 1.5.2

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 dev-embedded/idf-component-manager/Manifest   |  1 +
 .../idf-component-manager-1.5.2.ebuild        | 49 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 dev-embedded/idf-component-manager/idf-component-manager-1.5.2.ebuild

diff --git a/dev-embedded/idf-component-manager/Manifest b/dev-embedded/idf-component-manager/Manifest
index 7eb190add5..554fc4b5bf 100644
--- a/dev-embedded/idf-component-manager/Manifest
+++ b/dev-embedded/idf-component-manager/Manifest
@@ -1,2 +1,3 @@
 DIST idf-component-manager-1.4.1.gh.tar.gz 222994 BLAKE2B 659272939460a95f67156aaa978ad78e00f9dd138a63310559e8229927e6328d0c2939a9df15dd5c54af2f7f2527e10ac90211974c90c9cc4b127e000ac5b653 SHA512 fe1205728b6dd91dbc158a2112b0b216b3631fae8982b4f51e2905bdcf45cf5ad697201b56cac9413b72c663d61ce55c831a758453a4c0c904a29f5b1d64cfbf
 DIST idf-component-manager-1.5.1.gh.tar.gz 318162 BLAKE2B a373ba089216effa9b770d21f567b50283876f81b670e46a5d86b7a11f16e67e23172d3d2a869a07282500c49d33fc67a28251a24e76f6916088310bf870a210 SHA512 9502ed5dfd19ee07ee2f222675cdc8537b72b554402c43a0dee2ae6c71aa69affe89e11c24b77c9374ce1a98e901845d92b5b51be7d6ec781a9798dcbba5ea8d
+DIST idf-component-manager-1.5.2.gh.tar.gz 318633 BLAKE2B 13064fdbebf672dee91b764c83ee07bebf64504676ec25ec9c40d181425c177e4080e6da2b3435115afeeff2608bc2a2a5545dc64d0e5d01e1e817c88fcdc0a9 SHA512 113d750956ce5935483f54884ea7290d6ebcc463ffaab5ae602a8ea341326ea1dffde5c929de155514fbd8692964801c787bc962d0c78dc87a27d841e004bd99
diff --git a/dev-embedded/idf-component-manager/idf-component-manager-1.5.2.ebuild b/dev-embedded/idf-component-manager/idf-component-manager-1.5.2.ebuild
new file mode 100644
index 0000000000..436be49355
--- /dev/null
+++ b/dev-embedded/idf-component-manager/idf-component-manager-1.5.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11,12} )
+DISTUTILS_USE_PEP517=poetry
+
+inherit distutils-r1
+
+DESCRIPTION="Tool for installing ESP-IDF components"
+HOMEPAGE="https://github.com/espressif/idf-component-manager"
+SRC_URI="https://github.com/espressif/${PN}/archive/refs/tags/v${PV}.tar.gz	-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/vcrpy[${PYTHON_USEDEP}]
+		dev-python/filelock[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+RDEPEND="
+	dev-python/cachecontrol[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+	dev-python/requests-file[${PYTHON_USEDEP}]
+	dev-python/schema[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+	<dev-python/urllib3-2.0.0[${PYTHON_USEDEP}]
+"
+
+# Requires additional files not available in the tarball
+EPYTEST_DESELECT=(
+	tests/test_component_manager.py::test_pack_component_with_examples_errors
+	tests/test_component_manager.py::test_pack_component_with_dest_dir
+)
+
+distutils_enable_tests pytest

From 4732e9bda65886ea3366022754de1f03b586d40d Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Thu, 14 Mar 2024 10:43:32 +0100
Subject: [PATCH 30/34] dev-embedded/idf-component-manager: drop 1.5.1

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 dev-embedded/idf-component-manager/Manifest   |  1 -
 .../idf-component-manager-1.5.1.ebuild        | 49 -------------------
 2 files changed, 50 deletions(-)
 delete mode 100644 dev-embedded/idf-component-manager/idf-component-manager-1.5.1.ebuild

diff --git a/dev-embedded/idf-component-manager/Manifest b/dev-embedded/idf-component-manager/Manifest
index 554fc4b5bf..f9a0eba845 100644
--- a/dev-embedded/idf-component-manager/Manifest
+++ b/dev-embedded/idf-component-manager/Manifest
@@ -1,3 +1,2 @@
 DIST idf-component-manager-1.4.1.gh.tar.gz 222994 BLAKE2B 659272939460a95f67156aaa978ad78e00f9dd138a63310559e8229927e6328d0c2939a9df15dd5c54af2f7f2527e10ac90211974c90c9cc4b127e000ac5b653 SHA512 fe1205728b6dd91dbc158a2112b0b216b3631fae8982b4f51e2905bdcf45cf5ad697201b56cac9413b72c663d61ce55c831a758453a4c0c904a29f5b1d64cfbf
-DIST idf-component-manager-1.5.1.gh.tar.gz 318162 BLAKE2B a373ba089216effa9b770d21f567b50283876f81b670e46a5d86b7a11f16e67e23172d3d2a869a07282500c49d33fc67a28251a24e76f6916088310bf870a210 SHA512 9502ed5dfd19ee07ee2f222675cdc8537b72b554402c43a0dee2ae6c71aa69affe89e11c24b77c9374ce1a98e901845d92b5b51be7d6ec781a9798dcbba5ea8d
 DIST idf-component-manager-1.5.2.gh.tar.gz 318633 BLAKE2B 13064fdbebf672dee91b764c83ee07bebf64504676ec25ec9c40d181425c177e4080e6da2b3435115afeeff2608bc2a2a5545dc64d0e5d01e1e817c88fcdc0a9 SHA512 113d750956ce5935483f54884ea7290d6ebcc463ffaab5ae602a8ea341326ea1dffde5c929de155514fbd8692964801c787bc962d0c78dc87a27d841e004bd99
diff --git a/dev-embedded/idf-component-manager/idf-component-manager-1.5.1.ebuild b/dev-embedded/idf-component-manager/idf-component-manager-1.5.1.ebuild
deleted file mode 100644
index 436be49355..0000000000
--- a/dev-embedded/idf-component-manager/idf-component-manager-1.5.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11,12} )
-DISTUTILS_USE_PEP517=poetry
-
-inherit distutils-r1
-
-DESCRIPTION="Tool for installing ESP-IDF components"
-HOMEPAGE="https://github.com/espressif/idf-component-manager"
-SRC_URI="https://github.com/espressif/${PN}/archive/refs/tags/v${PV}.tar.gz	-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	test? (
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-		dev-python/filelock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-RDEPEND="
-	dev-python/cachecontrol[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-	dev-python/requests-file[${PYTHON_USEDEP}]
-	dev-python/schema[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-	<dev-python/urllib3-2.0.0[${PYTHON_USEDEP}]
-"
-
-# Requires additional files not available in the tarball
-EPYTEST_DESELECT=(
-	tests/test_component_manager.py::test_pack_component_with_examples_errors
-	tests/test_component_manager.py::test_pack_component_with_dest_dir
-)
-
-distutils_enable_tests pytest

From 3578c4e7b7cc410bed7122f84b899749d6e501fc Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Thu, 14 Mar 2024 10:44:28 +0100
Subject: [PATCH 31/34] dev-embedded/esp-idf-kconfig: drop 2.0.1

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 dev-embedded/esp-idf-kconfig/Manifest         |  1 -
 .../esp-idf-kconfig-2.0.1.ebuild              | 25 -------------------
 2 files changed, 26 deletions(-)
 delete mode 100644 dev-embedded/esp-idf-kconfig/esp-idf-kconfig-2.0.1.ebuild

diff --git a/dev-embedded/esp-idf-kconfig/Manifest b/dev-embedded/esp-idf-kconfig/Manifest
index fdb827e44a..6b7e0b8de6 100644
--- a/dev-embedded/esp-idf-kconfig/Manifest
+++ b/dev-embedded/esp-idf-kconfig/Manifest
@@ -1,3 +1,2 @@
 DIST esp-idf-kconfig-1.4.1.tar.gz 39687 BLAKE2B aa4500a1d9ebf9cae5e0d1daa47549a5f4730e907f0963b485c4e019bf9d88103da41e49b48a381450b4000d92a9f4b87fe9bf23064457b9a4c66a39f7198746 SHA512 e710c4b8015d0b321a20d32d20735d48991d97c718469dee0096da19de451aaa3f22774669d1f39dd979a037f94bdb5ad59a9d9e02f4e3a2a7e9e4ccc00f4191
-DIST esp-idf-kconfig-2.0.1.tar.gz 25516 BLAKE2B fc771546608fb4d1c720e2d4fccdf8aa17d08a9fdf6d40cc809a3a0b87a82cd5e4e24de6276149e0049d6abad45ab35f5326304ef9e1f0966aedaf25afe6e254 SHA512 8d502bb8fe0c140beb66c002b578e3de07376720217450c20ee29548875e22c3e8e25b435f10bd48d02724711c8895d142ec9e24e1e5193d1627745a5a7b3386
 DIST esp-idf-kconfig-2.1.0.tar.gz 40056 BLAKE2B 88a2bdc81b1b500e4db4fc7be3dc1bd2c62f2cda02aae902c0adfc3c1e3fdfee3a9a7ef3d1f8f9fd2e7f610c48c3926cd310851a3851bdfbe9785fd0288328f2 SHA512 d2028d781428a3861fa85d826cf3693425b6f4c79c44c380d484572196a5bc40e28a9a47e32a73251ae63c64439bf26987db811943ce34ab49f4276a7f3f16ec
diff --git a/dev-embedded/esp-idf-kconfig/esp-idf-kconfig-2.0.1.ebuild b/dev-embedded/esp-idf-kconfig/esp-idf-kconfig-2.0.1.ebuild
deleted file mode 100644
index 56678fca27..0000000000
--- a/dev-embedded/esp-idf-kconfig/esp-idf-kconfig-2.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Kconfig tooling for esp-idf"
-HOMEPAGE="https://github.com/espressif/esp-idf-kconfig"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/kconfiglib[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"

From e836fca52ad7562fafaad64ebcec0a94f2d281d3 Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Thu, 14 Mar 2024 10:47:42 +0100
Subject: [PATCH 32/34] dev-embedded/freertos-gdb: add 1.0.3

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 dev-embedded/freertos-gdb/Manifest            |  1 +
 .../freertos-gdb/freertos-gdb-1.0.3.ebuild    | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 dev-embedded/freertos-gdb/freertos-gdb-1.0.3.ebuild

diff --git a/dev-embedded/freertos-gdb/Manifest b/dev-embedded/freertos-gdb/Manifest
index ef54760fc5..616b8476b1 100644
--- a/dev-embedded/freertos-gdb/Manifest
+++ b/dev-embedded/freertos-gdb/Manifest
@@ -1 +1,2 @@
 DIST freertos-gdb-1.0.2.tar.gz 13895 BLAKE2B 75535e5bc4de49074504cd6369a6b9f1be00b7dce7485ebfb2f5e1d628b092fe6f02579ef04db7db6bd9d9b910dc98d23cba79484809c16b350840730c75df9e SHA512 142afc1a24e3583b28873386ad6d903666eceaaa32581cd1fba7da1a82af7336f960b8e72d741cad05acff7031434b34bfc794ae2fdec2ee99de7694d38217b7
+DIST freertos-gdb-1.0.3.tar.gz 14057 BLAKE2B e5e251e8e51b9a2f631c7efd8934a1699d84036e0895f11040e51785a680ac011f91bdc9f775690fd2b8a1de0f59fe38ec7a55b25cfe10b48bc439aff74bd6e4 SHA512 d6dc4ece08fd7a9b6e07679133b851c5c21105efd2044d9a9edbf3d38c03ab87ba342fe07b5a424aca26277266aaae774158b806e7f4176b80d9e546f4d728d7
diff --git a/dev-embedded/freertos-gdb/freertos-gdb-1.0.3.ebuild b/dev-embedded/freertos-gdb/freertos-gdb-1.0.3.ebuild
new file mode 100644
index 0000000000..8c71ae210c
--- /dev/null
+++ b/dev-embedded/freertos-gdb/freertos-gdb-1.0.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python module for operating with freeRTOS-kernel objects in GDB"
+HOMEPAGE="https://github.com/espressif/freertos-gdb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"

From 65049d6a7ddf7bf0e6de9ab5278e9f3f4bd56fee Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Thu, 14 Mar 2024 10:57:17 +0100
Subject: [PATCH 33/34] dev-python/termynal: update ruff dependency

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 dev-python/termynal/termynal-0.12.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/termynal/termynal-0.12.1.ebuild b/dev-python/termynal/termynal-0.12.1.ebuild
index 3b1323e30f..8b8b8f8ea9 100644
--- a/dev-python/termynal/termynal-0.12.1.ebuild
+++ b/dev-python/termynal/termynal-0.12.1.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
 		<dev-python/pytest-mock-4.0.0[${PYTHON_USEDEP}]
 		>=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
 		<dev-python/pyyaml-7.0.0[${PYTHON_USEDEP}]
-		dev-util/ruff[${PYTHON_USEDEP}]
+		dev-util/ruff
 	)
 "
 DEPEND="${RDEPEND}"

From 3a3602866699aa3b33edfe25836fda4256a913bd Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Thu, 14 Mar 2024 11:16:16 +0100
Subject: [PATCH 34/34] net-vpn/candy: remove unneeded dependency

Closes: https://github.com/gentoo/guru/pull/152
Signed-off-by: David Roman <davidroman96@gmail.com>
---
 net-vpn/candy/candy-5.3.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-vpn/candy/candy-5.3.ebuild b/net-vpn/candy/candy-5.3.ebuild
index ebaa4a53eb..8dc55f6ff3 100644
--- a/net-vpn/candy/candy-5.3.ebuild
+++ b/net-vpn/candy/candy-5.3.ebuild
@@ -18,7 +18,6 @@ DEPEND="
 	dev-libs/libconfig
 	dev-libs/poco
 	dev-libs/openssl
-	dev-libs/libfmt
 	dev-libs/spdlog
 "
 RDEPEND="${DEPEND}"