gentoo auto-resync : 20:02:2025 - 00:15:26

20 files changed, 181 insertions, 487 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f24a96507ca2..2e676f160789 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ROPgadget/Manifest b/dev-util/ROPgadget/Manifest
index 1abf80d600a0..0f99e18fd015 100644
--- a/dev-util/ROPgadget/Manifest
+++ b/dev-util/ROPgadget/Manifest
@@ -1,6 +1,8 @@
 DIST ROPgadget-7.4.gh.tar.gz 10110520 BLAKE2B 1c5dc52d377b4b580aa72351ce7863c9f819b39cbf0732b33eb8330d0229166250978fde123f8bf1e3a45d5fe791b17da1a93a49c8c45755d5dc1b7f8e05bf52 SHA512 0906cf7e916967ac5f446778ddc4ffdca78b8cf23c584968c116fdd43bc8488624104fbb78380516a54356dc4c4d50c5d10cc462bdd507435d5f70f8b9d51fa7
 DIST ROPgadget-7.5.gh.tar.gz 11015501 BLAKE2B 03bb469bdc0ee6d885f5caf6742dfb8ad29323eead9f3e2bc5bdc2729902b111c405443860249fb3d2e86e9e150ea8135217a761b6071d522eeab0db4171300b SHA512 441e55bae44eec67ac1080ed5be40c861e9ed1fe8296ea5dba8b62dba1e9294e7ffedb016357f52618459e190c70ca526632cd9794d47654812fb0fd68e3ffdb
+DIST ROPgadget-7.6.gh.tar.gz 11024630 BLAKE2B 237b0cee0b2496959648862543611078a75fae65f6e2b163f213299745b11688cae72d5390960d41a390a060533969c987e10976c4a896e10e8c792e85175138 SHA512 1eae4021e40e805c3a8e41a5dbca54a8cf0712d72ba189fc18f8f02ddc855c0828d0efe86e07d1c2faafc639dc10a78d5d2fadd3fb8510d50f8ea06c0d89c1d2
 EBUILD ROPgadget-7.4.ebuild 802 BLAKE2B 5377f358acd82615a36644d809b4fb1ef63b6e0b41e5da416a92cb1af42f07222759efc6d0a038041397456ae10e6a908eddd75c313492f1dc08d3fa54c37118 SHA512 12d7b2421d256c593f557832c3ac7107ea8ad8625b3b95cf98d041d2468ec0d8fe3a20f4f6f34051644aae63ea73fa76af69a9ca8e537690cf92e4623689fd3b
 EBUILD ROPgadget-7.5.ebuild 802 BLAKE2B f6d2c94a5d94270a825c997951cc4a66e082886d19708cebbba1a3475014f42e612c9512e8b9dd937e04a95cafea8b9a7a8031ca5fe99377481b85604c54bcbc SHA512 6170336f191cfa30ef9da0b70bbda3f4f004e6a91d1482053d6e931175d229e16402e1a0a0f1365b4ee0c1d71cdc2ebf1e86528ba2f9c31d77f563923c544bd7
+EBUILD ROPgadget-7.6.ebuild 805 BLAKE2B 1b70547101a582b7860fa3bc8ddbcae208ea33cb7c8655823836428ab48dd11cbae153c0fa495b4aabdf3ce4985b5791e45920e67c3ba52c0f70cb352685798c SHA512 49a6c1b0977e6c9c8907e0b46431929c4b039156d9b90fe5a8d308c72fa6f1d458431c155da23ca2f170159d616490fb7da9433da5231dc7e2ccbcb5a5acda49
 EBUILD ROPgadget-9999.ebuild 805 BLAKE2B 246d7b18a223a67839abdc11f623f7c680d55abe23b558c4a9a6cf70a5c90c7735e3f5be9a21ee7d5b015c3a030c78fd7329d916d7faf0274639ec720d3759e1 SHA512 8e90682c83a68878ae4925bce797231354f328820b60e4030b8c853b7a6025cba1c0c78bca6ce0afce5a4fcd3743e3b23d936e28ef09e9c21584c1e5e50bdd65
 MISC metadata.xml 894 BLAKE2B 5b46ce7117f8bf1adc0fcae940bcb693b2efe1d46469627e28cf2b6375d9c0952968c69dbda53e4d6190c13e47010127caffa63f3f9a68fd28ede9970d841445 SHA512 2c198345cebbd725e2ba634d8b72efb7e62209fc38c12c05e3cb2ce949e9ed870e0b937096a16e2e75bbbd298a1ec5376e49d79b6992ed775061742ca60a088c
diff --git a/dev-util/ROPgadget/ROPgadget-7.6.ebuild b/dev-util/ROPgadget/ROPgadget-7.6.ebuild
new file mode 100644
index 000000000000..b2fb99e26189
--- /dev/null
+++ b/dev-util/ROPgadget/ROPgadget-7.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Search for gadgets in binaries to facilitate your ROP exploitation"
+HOMEPAGE="https://shell-storm.org/project/ROPgadget/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/JonathanSalwan/ROPgadget"
+else
+	SRC_URI="https://github.com/JonathanSalwan/ROPgadget/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/capstone-5.0.1[python,${PYTHON_USEDEP}]
+"
+
+src_test() {
+	pushd test-suite-binaries || die
+	./test.sh || die
+	popd || die
+}
diff --git a/dev-util/intel_clc/Manifest b/dev-util/intel_clc/Manifest
index 9988371a5ab9..c34f5cf821df 100644
--- a/dev-util/intel_clc/Manifest
+++ b/dev-util/intel_clc/Manifest
@@ -1,14 +1,6 @@
 DIST mesa-24.1.7.tar.xz 29206724 BLAKE2B b3102fcf96c032d07826186c2d60dc93e5c17b26f725c20cf1e402d1cfbaaba9809bff7a04d3df0179d2ec8606bc9fb391761d17a148671b9270cf2aaca0324d SHA512 890f6387963bbb86a85305ea963cca326a3b3f8f8758ae2082fd62c52df77c2883a359341e91f36614fea59219394ef78f799a334080699a0bb71d984a68cb01
-DIST mesa-24.2.8.tar.xz 29622208 BLAKE2B f71a1663f9637883b4c442ba8c68f7960c48c4f8a02412738404386bfb962052923b40c1412198bd29f2ab6cf11654f8c63d4c14a400b89d99229680bc96eaae SHA512 3aa1051a72e1428e42f9537d8f6a26f2ebddc78894e0f71d2cdcc9ed555ea4d6489ad8e74d4c59b8cdf7ea1c629fa725ac2fe1e385db5d3a582d8fe8186392d6
-DIST mesa-24.3.1.tar.xz 30611028 BLAKE2B d3efc322388e29f651b15b0396fef8a6acc0cf24881165900845e429dd6cb53d51511f174d6a4017f48962b764b9a42f069825196af9f4ca969a4b46e1108a0e SHA512 deecf58e2c31e35d7c1943bb21184b52133a83fa472925128d3a03a57b26c92a476a6d3f7140ef2b78475b66affdabf97436ee8b324be204ce5bb940f78119c8
-DIST mesa-24.3.2.tar.xz 30640276 BLAKE2B d5973506983a23a95c360801a591e13945695e9a0c6f9f3bbb953865aa39ccfabaae624f4cd1edc8ecf479710856f5cc08e4f6374b107a06870906e934ecc5b8 SHA512 ea1065f7b466f1b2b3570c87585d6de15e3784a60d920c9f991c22720197d5947b598ac2c76773bed8150c91360ee5bbc77f3b48780a19502a8c4224baa728b9
-DIST mesa-24.3.3.tar.xz 30657916 BLAKE2B b973227885b3fd5fa6267c150a5e174f5e8a1c6378cf9326845ba75332084d7c914917c8e3b6d7b89f49ede0f5a5b453eb1ce42591e98b0cbad3f85bd3040035 SHA512 280d7a6dd64503ec398d449430270c78b5558c03bfeed3a42346573fd2db1aa3f96f5a212e49288718a7fe27447ee40235b066517622d68b0dfdd7b251a4e85f
 DIST mesa-24.3.4.tar.xz 30691532 BLAKE2B a5cf1f49c6d809d19510793f5d1dcec1a3842495d3b4166e303d7f2d4744d179811697d264c5c9b39f2819ebc64a76357195b3eae6b1d2a83128de141354e3c2 SHA512 9c23cd86fda4cf0289c5a78b08ceea8b01e5b141d86ee3e659fa46e62ff9586ff92a4984d2a340b5bf209c4c7f3414bf99f3ced19feee8fb39ef99fe572dbd55
 EBUILD intel_clc-24.1.7.ebuild 1747 BLAKE2B 8a0dffc4956003c1733c89c3013b5925613105ba33208f9e6bc16cfa1487b152fb395771210cdd3cd18ad6ddc8b381ae785b2733e2a34e2ed1ddaaaf4fd94b08 SHA512 970d65bf629fe1ecf2a32a3bf1e88fe4b24e981dfa8adfa98b6293eaf3051ec73914138caa706e4739a684704b8a1c329e4080fd8bd9c9412e97f58702ff3f7a
-EBUILD intel_clc-24.2.8.ebuild 1978 BLAKE2B 5410b17d82458168271043ec8c7b6cd6683963823deb67b9f274d4605f66674af763055bbf903956158ab102cacce37d029f72109936f3c5d3b7bef8bbda1839 SHA512 5ddf57de8fff6cef5066eb269970ea18a71470c46833ad2a2ae76fb3af096fd72a244025e14abd4007849cd65eaf7ef54aa2ab2b42607c992ff94fb97d11a4c6
-EBUILD intel_clc-24.3.1.ebuild 1980 BLAKE2B 12dfea8459a491e46762d978d5551b4c666735516039a24a277f47a3fe4a20b380bb1bd80b269f5d328ee653b3e9a63be5de76fe827332102b03aeb6f71a5d82 SHA512 b61fa29738abf600d084cbeb4ebedc854bdae924866b74afef3c5e04af50eab5ecab645ae5360f42cf2f35ba559b4c337df7195e489e2f449d5c7f6aa72a4939
-EBUILD intel_clc-24.3.2.ebuild 1980 BLAKE2B 597318dac629baddd32d5c02693c258570ae86635c011f225475fc618897ac30b1b50ad428d38a3071d1beeff123850cfcbb11aff35895d634fc28c6b70553d1 SHA512 d402f0f6c3cd95fe626e3d0c9d652f38a7b79630bea95e2fe71068bd01bd787b9da593902e3cda006b1aa5e94656f3ad053635c3d5046cf57d055bae9adeb238
-EBUILD intel_clc-24.3.3.ebuild 1994 BLAKE2B 0dad9e42ce7472a364a2e7d7e3a1c19f484d24cdb7fdf4fd8c5e4bcfa57281ced1f42d2a20339daa547d8ce70a08ce706dfc95ff5ba24e634f504d6a80ce5d0e SHA512 8ae1e3ef2aa81f01e065f7ea02c57ae71f90f188fadc745c199c36382c1dfb41105b94ea7ef764c759131f192b0cc8f73855c1be3a4e4ea522e55e6dc0d9325f
-EBUILD intel_clc-24.3.4.ebuild 1996 BLAKE2B 8758857f6dd5b0b239a8362d33fae8aae432a202ea450b0970e28a873f2d1f0a883add79678bf88b04ccc9a3ef374d271920199564572c8ca5f476585109f812 SHA512 18a6600b15ba01d961180a9ae22f05693bbe49b1627c7ff9bea22fe7343d11ded540357634f72fe4edf6630c26873a623efcc62f516ae76ee266dc7fda0aead3
+EBUILD intel_clc-24.3.4.ebuild 1994 BLAKE2B 0dad9e42ce7472a364a2e7d7e3a1c19f484d24cdb7fdf4fd8c5e4bcfa57281ced1f42d2a20339daa547d8ce70a08ce706dfc95ff5ba24e634f504d6a80ce5d0e SHA512 8ae1e3ef2aa81f01e065f7ea02c57ae71f90f188fadc745c199c36382c1dfb41105b94ea7ef764c759131f192b0cc8f73855c1be3a4e4ea522e55e6dc0d9325f
 EBUILD intel_clc-9999.ebuild 1996 BLAKE2B 8758857f6dd5b0b239a8362d33fae8aae432a202ea450b0970e28a873f2d1f0a883add79678bf88b04ccc9a3ef374d271920199564572c8ca5f476585109f812 SHA512 18a6600b15ba01d961180a9ae22f05693bbe49b1627c7ff9bea22fe7343d11ded540357634f72fe4edf6630c26873a623efcc62f516ae76ee266dc7fda0aead3
 MISC metadata.xml 388 BLAKE2B 0558cfe706987a93605fb383bc2c30ff4f4cf5837ca19afd3e16d9702ea7dcd3d575579d53aacb531e1d421c8b1692eb4607d713793a89240223c031d7781a31 SHA512 e0375912a94fa92b49ed78d9a88c4eacc8b441d8b2fa117a48df2d8a958f1cf91279299aca109e24f76b27ca04f0067f83e5b8e4141f85ac64d379bca0945d2a
diff --git a/dev-util/intel_clc/intel_clc-24.2.8.ebuild b/dev-util/intel_clc/intel_clc-24.2.8.ebuild
deleted file mode 100644
index 2aaece98baf5..000000000000
--- a/dev-util/intel_clc/intel_clc-24.2.8.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {16..18} )
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit llvm-r1 meson python-any-r1
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="intel_clc tool used for building OpenCL C to SPIR-V"
-HOMEPAGE="https://mesa3d.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}/intel_clc-${MY_PV}"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/mesa-${MY_PV}"
-	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND="
-	llvm-core/libclc
-	dev-util/spirv-tools
-	>=sys-libs/zlib-1.2.8:=
-	x11-libs/libdrm
-	$(llvm_gen_dep '
-		dev-util/spirv-llvm-translator:${LLVM_SLOT}
-		llvm-core/clang:${LLVM_SLOT}=
-		llvm-core/llvm:${LLVM_SLOT}=
-	')
-"
-DEPEND="${RDEPEND}
-	dev-libs/expat
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	virtual/pkgconfig
-"
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-}
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	local emesonargs=(
-		-Dllvm=enabled
-		-Dshared-llvm=enabled
-		-Dintel-clc=enabled
-
-		-Dgallium-drivers=''
-		-Dvulkan-drivers=''
-
-		# Set platforms empty to avoid the default "auto" setting. If
-		# platforms is empty meson.build will add surfaceless.
-		-Dplatforms=''
-
-		-Dglx=disabled
-		-Dlibunwind=disabled
-		-Dzstd=disabled
-
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/src/intel/compiler/intel_clc
-}
diff --git a/dev-util/intel_clc/intel_clc-24.3.1.ebuild b/dev-util/intel_clc/intel_clc-24.3.1.ebuild
deleted file mode 100644
index 3471067099a7..000000000000
--- a/dev-util/intel_clc/intel_clc-24.3.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {16..18} )
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit llvm-r1 meson python-any-r1
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="intel_clc tool used for building OpenCL C to SPIR-V"
-HOMEPAGE="https://mesa3d.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}/intel_clc-${MY_PV}"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/mesa-${MY_PV}"
-	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND="
-	llvm-core/libclc
-	dev-util/spirv-tools
-	>=sys-libs/zlib-1.2.8:=
-	x11-libs/libdrm
-	$(llvm_gen_dep '
-		dev-util/spirv-llvm-translator:${LLVM_SLOT}
-		llvm-core/clang:${LLVM_SLOT}=
-		llvm-core/llvm:${LLVM_SLOT}=
-	')
-"
-DEPEND="${RDEPEND}
-	dev-libs/expat
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	virtual/pkgconfig
-"
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-}
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	local emesonargs=(
-		-Dllvm=enabled
-		-Dshared-llvm=enabled
-		-Dintel-clc=enabled
-
-		-Dgallium-drivers=''
-		-Dvulkan-drivers=''
-
-		# Set platforms empty to avoid the default "auto" setting. If
-		# platforms is empty meson.build will add surfaceless.
-		-Dplatforms=''
-
-		-Dglx=disabled
-		-Dlibunwind=disabled
-		-Dzstd=disabled
-
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/src/intel/compiler/intel_clc
-}
diff --git a/dev-util/intel_clc/intel_clc-24.3.2.ebuild b/dev-util/intel_clc/intel_clc-24.3.2.ebuild
deleted file mode 100644
index fcc63b3f4a53..000000000000
--- a/dev-util/intel_clc/intel_clc-24.3.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {16..19} )
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit llvm-r1 meson python-any-r1
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="intel_clc tool used for building OpenCL C to SPIR-V"
-HOMEPAGE="https://mesa3d.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}/intel_clc-${MY_PV}"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/mesa-${MY_PV}"
-	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND="
-	dev-util/spirv-tools
-	llvm-core/libclc
-	>=sys-libs/zlib-1.2.8:=
-	x11-libs/libdrm
-	$(llvm_gen_dep '
-		dev-util/spirv-llvm-translator:${LLVM_SLOT}
-		llvm-core/clang:${LLVM_SLOT}=
-		llvm-core/llvm:${LLVM_SLOT}=
-	')
-"
-DEPEND="${RDEPEND}
-	dev-libs/expat
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	virtual/pkgconfig
-"
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-}
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	local emesonargs=(
-		-Dllvm=enabled
-		-Dshared-llvm=enabled
-		-Dintel-clc=enabled
-
-		-Dgallium-drivers=''
-		-Dvulkan-drivers=''
-
-		# Set platforms empty to avoid the default "auto" setting. If
-		# platforms is empty meson.build will add surfaceless.
-		-Dplatforms=''
-
-		-Dglx=disabled
-		-Dlibunwind=disabled
-		-Dzstd=disabled
-
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/src/intel/compiler/intel_clc
-}
diff --git a/dev-util/intel_clc/intel_clc-24.3.3.ebuild b/dev-util/intel_clc/intel_clc-24.3.3.ebuild
deleted file mode 100644
index 87573bd206de..000000000000
--- a/dev-util/intel_clc/intel_clc-24.3.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {16..19} )
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit llvm-r1 meson python-any-r1
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="intel_clc tool used for building OpenCL C to SPIR-V"
-HOMEPAGE="https://mesa3d.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}/intel_clc-${MY_PV}"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/mesa-${MY_PV}"
-	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND="
-	dev-util/spirv-tools
-	>=sys-libs/zlib-1.2.8:=
-	x11-libs/libdrm
-	$(llvm_gen_dep '
-		dev-util/spirv-llvm-translator:${LLVM_SLOT}
-		llvm-core/clang:${LLVM_SLOT}=
-		=llvm-core/libclc-${LLVM_SLOT}*
-		llvm-core/llvm:${LLVM_SLOT}=
-	')
-"
-DEPEND="${RDEPEND}
-	dev-libs/expat
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	virtual/pkgconfig
-"
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-}
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	local emesonargs=(
-		-Dllvm=enabled
-		-Dshared-llvm=enabled
-		-Dintel-clc=enabled
-
-		-Dgallium-drivers=''
-		-Dvulkan-drivers=''
-
-		# Set platforms empty to avoid the default "auto" setting. If
-		# platforms is empty meson.build will add surfaceless.
-		-Dplatforms=''
-
-		-Dglx=disabled
-		-Dlibunwind=disabled
-		-Dzstd=disabled
-
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/src/intel/compiler/intel_clc
-}
diff --git a/dev-util/intel_clc/intel_clc-24.3.4.ebuild b/dev-util/intel_clc/intel_clc-24.3.4.ebuild
index b577e985b4b4..87573bd206de 100644
--- a/dev-util/intel_clc/intel_clc-24.3.4.ebuild
+++ b/dev-util/intel_clc/intel_clc-24.3.4.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	S="${WORKDIR}/mesa-${MY_PV}"
 	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="MIT SGI-B-2.0"
diff --git a/dev-util/kafkactl/Manifest b/dev-util/kafkactl/Manifest
index 25b5fcc339c9..23f89a1f3c2f 100644
--- a/dev-util/kafkactl/Manifest
+++ b/dev-util/kafkactl/Manifest
@@ -1,4 +1,7 @@
 DIST kafkactl-5.4.0-vendor.tar.xz 2645464 BLAKE2B 6da25f50feff135c1c364d44fb9467f506aebfbb2b92325bfc604b47bda616b6b1337916d27ca5610f0a90e5a0795bcaa82312e75e78548c84609d849bd2cc62 SHA512 37ed3058bdc91e71701443b79889a59a580f1a5e2c897a40549a0efb7ae0f212271f7f0147705460c3b859a4f1eb93683a5a3dc3bc9bdb6dd64fbcefe6f3e063
 DIST kafkactl-5.4.0.tar.gz 129136 BLAKE2B c0d31087cdba16569b80a105b4dacfdf8623e13e48329deb6ef3ccb43841f9c2d8871d04bd0f0f49c4dbf3b35b0a1e006a6facf67b63ccfb6ae3055b13db8d26 SHA512 d7dd628fafb665a86f9a86599244338ce625673a9f1cc53d4bac49e6e833c5f04de139ffb3856ff40fc87b62b0a64680a29756ae0a38f28d3a47bfa6e5a4a819
+DIST kafkactl-5.5.0-vendor.tar.xz 2656444 BLAKE2B b04fbaad0e4f7d500507eac0efe08519a463e6aea50f544a388a799b1af66b7164aa2daae32795cd71d338502cfbeb5b348f8b65d56cd2d934f403f28f97c257 SHA512 e64190da554340eeedbe17c434ae060bea5dc0f3931e374b12535921d2e4406fe75e5e151ee6133124469b71db1318968ed728d0aafd04f9e89c930b852d68a4
+DIST kafkactl-5.5.0.tar.gz 130020 BLAKE2B 1c4e26f3ce306c40e7885157f299b3433cafafc328b84c62e4530fdb5f80a29e99d3dbc4d365117e44fb2332966f9b4ad78db649eea89e58722f553195989b41 SHA512 3a67e9034359d5651ce41585d4c792adcb3d73318764ecccd2ae7199a24c4a5eff960d5bd7daa34ec9684f436d143128238363b71134fb827e3ac6db13513d96
 EBUILD kafkactl-5.4.0.ebuild 595 BLAKE2B 40d148f66f81a21fcfb9ab2c26c9b7a61c7772a121506a58f5992d1eb611308b384d42822492eb2ecf2e6cf4707f74edbfdea0a4e197bdf9fb4fc51d17136c54 SHA512 911fa96742137a7b50a883fffbd316a0d0cdc3a4f4db6461edbd98a2e6094949a5429725121d61f0f1f0a92c6233d1b0b2d3fc71958c35197648083b3f1b2216
+EBUILD kafkactl-5.5.0.ebuild 595 BLAKE2B c60f9b8685d87494576f78bbb26606da8e2ea468a38aec71061f237c2b2733307c0d37a6ca8d4d0ee61d494d06cf0584966ee7a5678ff5f6a435be507f4c08cb SHA512 865375ba5a02ad02fb97cdd9cbaa676f8774485babe44e5566bc3734b339325e2ab739fccb952dc80cbf12253c09f23b0cf2e2d81775ee44e2ea1c61e4ea5e3c
 MISC metadata.xml 335 BLAKE2B 0251c767bc8e4d1f0605727ea0e58f092144458ea012ba76baa73fd39ddbcd3d6f6d11fff26e7c56cb64123e6c4bf935531b5d83d06a29640afb6260da86d3dd SHA512 6d67c7e30c5a56c30030e94dc289243d8fb66f043459d9778dc3d232b57bab95bb88086a50963c02f23171bff65029d39389ad47f1551943e362797da0c9733e
diff --git a/dev-util/kafkactl/kafkactl-5.5.0.ebuild b/dev-util/kafkactl/kafkactl-5.5.0.ebuild
new file mode 100644
index 000000000000..9be5d6161a88
--- /dev/null
+++ b/dev-util/kafkactl/kafkactl-5.5.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="CLI for interacting with Kafka"
+HOMEPAGE="https://github.com/deviceinsight/kafkactl"
+
+SRC_URI="https://github.com/deviceinsight/kafkactl/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	http://dev.gentoo.org/~patrick/${P}-vendor.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	ego build
+
+	touch empty.yaml
+	./kafkactl docs --single-page --config-file=empty.yaml
+}
+
+src_install() {
+	dobin kafkactl
+	dodoc README.adoc kafkactl_docs.md
+}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index d5458e00372d..732e3f7dc5dd 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,5 @@
 DIST kdevelop-24.08.3.tar.xz 8819060 BLAKE2B e15dc7ac0808c04e2d7752b6ceb984286be5ba43a183acafd68d60a53308d02cbf3e9b281bb2029754e41f107237c811395a8b9e27cb5b8b13141536cf3207ae SHA512 1a1ffc4186efec19e7dfca403c6b327bfda0ed96793186a44aaf52e0f8eab2e070dc4452c632f112f0a296f4182bd8d1ab38dbdd5fbd2a1c982ec694a10eae2a
 DIST kdevelop-24.12.2.tar.xz 8833936 BLAKE2B 92f7e413b9d47e5c6eb6b5e57afe88adc544ba7ce5edd7b856ab98780b6bd66af38b4e6013a0da1b4d91c21c1704d862d251cb4c546dee4e2f9a2b20f82f8015 SHA512 fadfa1b6f9ec83ae45bb9d5f909d33af15184a2f24e8a525b64c73f7e1f3c0534fa16b897ac59ce383c77780a5b182b55b924204ded373109227e0adb4715a98
 EBUILD kdevelop-24.08.3.ebuild 3700 BLAKE2B 538018aa5502928d015bdd80d757d81fb80f4bd46104bb9fea76036512fe1e3890de3193af7ab8cbd0821693b6602e9c1c8c59995e3c62b91d367878dd3445be SHA512 bbc7b8fd68985bcf62b2de47c6da8d2fb31ec276f79862248f76df7f750184c8ae70c0a14c75112ccbc9e521c10425d770da2c992b324bfc4039bf5e10f8ebfa
-EBUILD kdevelop-24.12.2.ebuild 3709 BLAKE2B a82df014899f057e81df05d146258c1009e3805770f83d6907926f5b24d2b13443e1ca6599a0f59378ee2dbbed3b161f51d0ad338d222aa87783d89ba3ea40db SHA512 b11dc23a2fedee73f10eef6bca4c6e6884d4e08eeeb848c2bfd16978249a877ad135c0998ea8b91b95980453a892111990ec57793d8a7b1c0ac96d25c17c8dbe
+EBUILD kdevelop-24.12.2-r1.ebuild 3712 BLAKE2B b2e9f04df051b34c9dbc3d36da57c88dcc4c7284d58e2f169f86064c370ac5e7495fb8ff79717e7e621fd7010e7375135be91c4dc44b4b372e9c7740c80154bf SHA512 024dd9f98cc56e911ba0644ded420f824dbd19ac762ac74055f3426e7bd47f9d371713c0853aea72a25b03bae710f6c81ee665b71b15737d3e9c4e8e85bd8015
 MISC metadata.xml 671 BLAKE2B a67a7998eea115188a188dc7e225226f6b8ce68168ed1d43bf452cc7fd26f343d6d7c61367df45ddb5fea674c0aa3c5028287e16e791311bfb0d89488eed8935 SHA512 9ad5e98671886e809fe69e8ca9bedf05e417535798bd855a19b8a69ba510324862d5fd0d236c7827c4d4952305468709abf7a9d7ed1fe36e2b9bee6a4663179a
diff --git a/dev-util/kdevelop/kdevelop-24.12.2.ebuild b/dev-util/kdevelop/kdevelop-24.12.2-r1.ebuild
index 3d5c61dd635f..dfa91cbf7875 100644
--- a/dev-util/kdevelop/kdevelop-24.12.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-24.12.2-r1.ebuild
@@ -7,9 +7,9 @@ ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 KDE_ORG_CATEGORY="kdevelop"
 KFMIN=6.7.0
-LLVM_COMPAT=( 15 16 17 18 )
+LLVM_COMPAT=( 15 16 17 18 19 )
 QTMIN=6.7.2
-inherit ecm gear.kde.org llvm-r1 optfeature
+inherit ecm gear.kde.org llvm-r2 optfeature
 
 DESCRIPTION="Integrated Development Environment, supporting KF6/Qt, C/C++ and much more"
 HOMEPAGE="https://kdevelop.org/"
@@ -90,7 +90,7 @@ RDEPEND="${COMMON_DEPEND}
 
 pkg_setup() {
 	ecm_pkg_setup
-	llvm-r1_pkg_setup
+	llvm-r2_pkg_setup
 }
 
 src_configure() {
diff --git a/dev-util/mesa_clc/Manifest b/dev-util/mesa_clc/Manifest
index 8d5f034f7b8a..bfb56a2d29ed 100644
--- a/dev-util/mesa_clc/Manifest
+++ b/dev-util/mesa_clc/Manifest
@@ -1,6 +1,4 @@
-DIST mesa-25.0.0-rc2.tar.xz 46570616 BLAKE2B bd85d30d1d3e674dae38c476ef1df774df1699963d1c105b336da77f5c271d8ab823d24af9763e5a85643e4794fa4dd041de16b27359799fad3aac7c99b94077 SHA512 67eec93fbe24cb3fa26b062539453326b3237bd8c6ac111061142dae69b81fe7da000728d9bc2c0e2ec46f122011cbde9b99141f6333828016efb3eaa87b27f7
-DIST mesa-25.0.0-rc3.tar.xz 46584588 BLAKE2B 5da789412c797b13e99c73f09493473a6ab1bc495d675069b7181f8da7230941834165e470359c53abc3f422ef031398a67e897fa1caa715429c9aa38681e36d SHA512 4ece5a2804c58396d7a6e09877ab52cc5086290e9e96a61a27b78706b83bd955a57097fe37c5cb5002e9522c49c2b444ea12373038fbc902a29dc52ebec6015c
-EBUILD mesa_clc-25.0.0_rc2.ebuild 2059 BLAKE2B e5187b79f4204d2f3df946950f9987505657b08fa0d3948940614f505dfe1d3fd97cbe6cb993da78585744ec8df1d76de16f37a9804bf3fea22e330908046b10 SHA512 8965f2d0e7557c379b592f8ccc22527b03392bcb229af96cf48856a1a1000735580bc188efbc630c2571dc278ebd642212986912fa3dcfca6dd0ae7d7cddd109
-EBUILD mesa_clc-25.0.0_rc3.ebuild 2059 BLAKE2B e5187b79f4204d2f3df946950f9987505657b08fa0d3948940614f505dfe1d3fd97cbe6cb993da78585744ec8df1d76de16f37a9804bf3fea22e330908046b10 SHA512 8965f2d0e7557c379b592f8ccc22527b03392bcb229af96cf48856a1a1000735580bc188efbc630c2571dc278ebd642212986912fa3dcfca6dd0ae7d7cddd109
+DIST mesa-25.0.0.tar.xz 46643728 BLAKE2B 9aca2416ea4e304d46fda648cb9b8e04caa053458b91893fb874e9a30d8293722c3bed1098c2720b04b0c7278eba3b0387900b56e13b6133a23c0f6be705025c SHA512 7f5b6674c40b6c8dcab7934512ff754b40a6a8a466422c90236f614d322033d4d465307ddcd983f9f3afb1310e132ec3186a085d261c95493a0c460b2ec59ce8
+EBUILD mesa_clc-25.0.0.ebuild 2059 BLAKE2B e5187b79f4204d2f3df946950f9987505657b08fa0d3948940614f505dfe1d3fd97cbe6cb993da78585744ec8df1d76de16f37a9804bf3fea22e330908046b10 SHA512 8965f2d0e7557c379b592f8ccc22527b03392bcb229af96cf48856a1a1000735580bc188efbc630c2571dc278ebd642212986912fa3dcfca6dd0ae7d7cddd109
 EBUILD mesa_clc-9999.ebuild 2060 BLAKE2B 53249247ab646c625067bf2661ecdaaafb296f931dffa2f893a2b9c3bd0d532e6f8274ae6781318728c65dc7d6ac3104fbac3fefec39c1430f42c74cf77cc047 SHA512 72ff0944b11ca465c6d915c56cd5cd1e3fa949317222d8df1f648c5c18307443603f4dcdd077972fdc1c4f915c38aef388b8de1e23bc9f9570adfdece25c14e4
 MISC metadata.xml 388 BLAKE2B 0558cfe706987a93605fb383bc2c30ff4f4cf5837ca19afd3e16d9702ea7dcd3d575579d53aacb531e1d421c8b1692eb4607d713793a89240223c031d7781a31 SHA512 e0375912a94fa92b49ed78d9a88c4eacc8b441d8b2fa117a48df2d8a958f1cf91279299aca109e24f76b27ca04f0067f83e5b8e4141f85ac64d379bca0945d2a
diff --git a/dev-util/mesa_clc/mesa_clc-25.0.0_rc2.ebuild b/dev-util/mesa_clc/mesa_clc-25.0.0.ebuild
index 2d0b93cf95fb..2d0b93cf95fb 100644
--- a/dev-util/mesa_clc/mesa_clc-25.0.0_rc2.ebuild
+++ b/dev-util/mesa_clc/mesa_clc-25.0.0.ebuild
diff --git a/dev-util/mesa_clc/mesa_clc-25.0.0_rc3.ebuild b/dev-util/mesa_clc/mesa_clc-25.0.0_rc3.ebuild
deleted file mode 100644
index 2d0b93cf95fb..000000000000
--- a/dev-util/mesa_clc/mesa_clc-25.0.0_rc3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {18..19} )
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit llvm-r1 meson python-any-r1
-
-MY_PV="${PV/_/-}"
-
-DESCRIPTION="mesa_clc tool used for building OpenCL C to SPIR-V"
-HOMEPAGE="https://mesa3d.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}/mesa_clc-${MY_PV}"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/mesa-${MY_PV}"
-	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND="
-	dev-util/spirv-tools
-	$(llvm_gen_dep '
-		dev-util/spirv-llvm-translator:${LLVM_SLOT}
-		llvm-core/clang:${LLVM_SLOT}=
-		=llvm-core/libclc-${LLVM_SLOT}*
-		llvm-core/llvm:${LLVM_SLOT}=
-	')
-"
-DEPEND="${RDEPEND}
-	dev-libs/expat
-	>=sys-libs/zlib-1.2.8:=
-	x11-libs/libdrm
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep "
-		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
-		dev-python/packaging[\${PYTHON_USEDEP}]
-		dev-python/pyyaml[\${PYTHON_USEDEP}]
-	")
-	virtual/pkgconfig
-"
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
-}
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
-
-	use debug && EMESON_BUILDTYPE=debug
-
-	local emesonargs=(
-		-Dllvm=enabled
-		-Dshared-llvm=enabled
-		-Dmesa-clc=enabled
-		-Dinstall-mesa-clc=true
-
-		-Dgallium-drivers=''
-		-Dvulkan-drivers=''
-
-		# Set platforms empty to avoid the default "auto" setting. If
-		# platforms is empty meson.build will add surfaceless.
-		-Dplatforms=''
-
-		-Dglx=disabled
-		-Dlibunwind=disabled
-		-Dzstd=disabled
-
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/src/compiler/clc/mesa_clc
-	dobin "${BUILD_DIR}"/src/compiler/spirv/vtn_bindgen
-}
diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest
index be6a17f11bc8..cca17750cacd 100644
--- a/dev-util/unicorn/Manifest
+++ b/dev-util/unicorn/Manifest
@@ -1,12 +1,14 @@
 AUX unicorn-2.0.1-configure.patch 894 BLAKE2B ee4ae97b7f462287dac96fb446c58ea83d73f206659e88b5ac663482c3b38eb96551bc5e93a72144b768b8c7ca069b53190710000f0b6a0c379f6986aa3ef050 SHA512 fd6e15ae9ff4143d48155ac0774ffece13a36c7be8841532a66188de9f928e62dbbe9a4352559e316cdc57791b86eaeb13f2c45d461fbd5dad9e2092670ee0eb
 AUX unicorn-2.0.1-old-style-declaration.patch 1387 BLAKE2B 43d01ea5aa2a2cddca38955786e424805fe4620153d8953f8a52282878acf2a5dc81787fe848567fbafad052e645146a202f0d91036eae50134ee413af9b908d SHA512 3be01281c68b285b72376e518f3fc438fa585af682338f99483594268321803b660513d1e62a8872fefac0538c9206a8bb9b6d710879f796819b3e6c027e8c29
 AUX unicorn-2.0.1-strict-prototypes.patch 7529 BLAKE2B c66d6ff669e214e752c44611159b1829c6f06ec75974dcf53616cb1e889b8141b2cd025af9df9a81c80f9e1730e549894826a5e03b6a5babcbb6f94fbc658b02 SHA512 d94a42c55b8f1d9206bfed16d559d221d86941ba022312b7f3dc043d8e5b0002166329218ed1f5b047e30de67a1d2fd1bb0041e4d07635a8895ebf77c728ef8e
+AUX unicorn-2.1.2-return.patch 1587 BLAKE2B 2c7647531b050ff69a3314f4a699c51781d28b08c20e8ac6b19e89e3cf6d280ada0c1685ff538ba1644c9acdac49fd5ea946d822583884a1329872c1fa3c2ba7 SHA512 743ac0cb07574707a4336adc7720b00fce4bb8ac7f962d6cb174df291550b19e1c4fd57858249d7665caafc2b8ef92d24390acdd3bb2460a556b78ae019fe2c5
+AUX unicorn-2.1.2-versioningit.patch 1309 BLAKE2B f8918986e2404d87f365f04cf3b2e4ee7dee3042a89147f43edc3019969b9721e902ad1e3151b51973005927bff7ebf4f43d1988a433960b84a3b47e5e0cc74a SHA512 9a06d057c0550050170f52d85e4bc889cfeafa45eb4be49d6f457c9edb77e3df820d71697268e8478e6fe4215a78363f098108cf3c8246928b2b5c0af0e44aeb
 DIST unicorn-2.0.1.gh.tar.gz 4070004 BLAKE2B 4ab8f92367e7df5762d29ed58dfff524f59053e28548b170b982d16988eea16df46851d2ea559d8beabb4f1315e5ee627f9ded755a4f3b1cfd6d863a50c633b6 SHA512 4249d33d38614ea1ca51e38c7838cb276306100aa44c65ad1b3e39304e4b856ac643a9c6f9d13678fc07bea58989a08b64653d17afe9e62bcef2936ba63e1b1f
 DIST unicorn-2.1.1.gh.tar.gz 4176172 BLAKE2B 3dd434121418b9a4eb69683cfca6ec0cd019b632492fbfff421eaf26f4907a2f30bf78699b3afe28df624037e3973a5110a6ea21bd233e66a04a689d3e3e5d1c SHA512 d6184b87a0fb729397ec2ac2cb8bfd9d10c9d4276e49efa681c66c7c54d1a325305a920332a708e68989cc299d0d1a543a1ceeaf552a9b44ec93084f7bf85ef2
 DIST unicorn-2.1.2.gh.tar.gz 4196820 BLAKE2B 3e97c0f0b6dccd157222d473ef51f28fbcaf72eda056713fe1463a3f741f1abe6fbf73d770f391c3730c02e94ede2de4f25c0bf460c80dcc560a79258a7338b2 SHA512 f05e16f02fbf527875f7246811307b8b224cecd4d305dd59490a2a51444672c7ec769153545c857b5425111c19b8c0c33abbb51fcc8d49c0777771d31cf32630
 EBUILD unicorn-2.0.1-r1.ebuild 1962 BLAKE2B 6f9c80d5099842284d8bb09573c23f310e9a96220d4a0fc1b7be3ddd73a2194b835940bf3fc0c1397c32183b6a166578d5a1d7e232b44ca749a2f5415fc4b214 SHA512 88008c916adce75fa2b4fc36f1068ebd982b191ee1457f819c44f877a83986baa7456dce371566286f0f840d021fcb230f74b6f6b253159f64eb6df0bb258722
 EBUILD unicorn-2.0.1.ebuild 1868 BLAKE2B ceb48894a9104fcb8e75a9353aa76751e1940039727c516435307b807aa0970f58f4070fa9f457022d983a3b54c20169f505395378a959c6a2cc4f7f1afa2655 SHA512 0d8da0ab68c7584f0976b504d3c56011fcc14ef3d45262d17bb91768a8ecd0874def9c15d21a7661f45c75f09557e631d45f57bf3e301b38170085d33c6c5c45
 EBUILD unicorn-2.1.1.ebuild 1932 BLAKE2B afb31039c958f36eefabf968b76f9abe2a68c0f8a3def7ef573566bf9ac79cf82a5589cf667854f8d42954dabc71f34c3591f630d516ff9f0dd7a370037c9fe0 SHA512 ab93d78802f826108c482211ed3df3a8151be1c165a0927d2f363e2ef9dec350e3f7ac554c274b9a0ef2f3e358c31e0fa10eed3a171d731496dbaa50f97d0120
-EBUILD unicorn-2.1.2.ebuild 2142 BLAKE2B cedf19add0e5ac75779ba2c1fff96ad660a97565d9aac525d3d6441557ce4d9f67fecbc6a90b4f7da4d958c793a1db2b755f73d741f3dd8fc0854bd8ff40e2bf SHA512 ede7a7469d5d1ecc0a652aa3601ce360c23d2017e17b16d6a633733f03bd3498fa6a07207027cdb1ece2a72814e45a1eb1232760c7545e8691eb10638341e952
+EBUILD unicorn-2.1.2.ebuild 2339 BLAKE2B 6c2e599d5ececb378a8855e6f189766041271d05d2b6fa84ba6ddcc2b3f051d97fec15f2761967ded9dd2e7d0ef8b15ce4b42aa95eadc181bede6d31361f5c9a SHA512 5115d2546eeec9be309d49e8062b62cac1c3cdb0e7615b5f78b37617d0852f2d29cd0c0246c1528737ec90766a329d6a959c961b21716d2bc786e0e5544eaa96
 EBUILD unicorn-9999.ebuild 2142 BLAKE2B cedf19add0e5ac75779ba2c1fff96ad660a97565d9aac525d3d6441557ce4d9f67fecbc6a90b4f7da4d958c793a1db2b755f73d741f3dd8fc0854bd8ff40e2bf SHA512 ede7a7469d5d1ecc0a652aa3601ce360c23d2017e17b16d6a633733f03bd3498fa6a07207027cdb1ece2a72814e45a1eb1232760c7545e8691eb10638341e952
 MISC metadata.xml 570 BLAKE2B 1d58bd235b5016d23d7e0733765cf9c5996fec700e2d48735ebb97d7093c864ebc6ae551db9b252ed3fa1ea083aa48fde1fb64ad68f37ae05011a63a2ba13e30 SHA512 bb9f43b9a653f5d0664df11b7d151c74b885f420a378632bae0e4726b70bbe7692cc443e3d93f44645356a6ea7438d9d75b35fbca7f97de620445add248ed314
diff --git a/dev-util/unicorn/files/unicorn-2.1.2-return.patch b/dev-util/unicorn/files/unicorn-2.1.2-return.patch
new file mode 100644
index 000000000000..79e5f2f57197
--- /dev/null
+++ b/dev-util/unicorn/files/unicorn-2.1.2-return.patch
@@ -0,0 +1,57 @@
+From d03c0922e6c86741001ff8f40140be37c99eb83a Mon Sep 17 00:00:00 2001
+From: Disconnect3d <dominik.b.czarnota@gmail.com>
+Date: Fri, 14 Feb 2025 18:04:30 +0100
+Subject: [PATCH] Fix #2103: qemu/target/ppc/mem_helper.c remove redundant
+ return statements (#2104)
+Upstream: https://github.com/unicorn-engine/unicorn/pull/2104
+
+--- a/qemu/target/ppc/mem_helper.c
++++ b/qemu/target/ppc/mem_helper.c
+@@ -387,7 +387,6 @@ uint64_t helper_lq_le_parallel(CPUPPCState *env, target_ulong addr,
+     return int128_getlo(ret);
+ #else
+     g_assert_not_reached();
+-    return 0;
+ #endif
+ }
+ 
+@@ -404,7 +403,6 @@ uint64_t helper_lq_be_parallel(CPUPPCState *env, target_ulong addr,
+     return int128_getlo(ret);
+ #else
+     g_assert_not_reached();
+-    return 0;
+ #endif
+ }
+ 
+@@ -420,7 +418,6 @@ void helper_stq_le_parallel(CPUPPCState *env, target_ulong addr,
+     helper_atomic_sto_le_mmu(env, addr, val, opidx, GETPC());
+ #else
+     g_assert_not_reached();
+-    return 0;
+ #endif
+ }
+ 
+@@ -436,7 +433,6 @@ void helper_stq_be_parallel(CPUPPCState *env, target_ulong addr,
+     helper_atomic_sto_be_mmu(env, addr, val, opidx, GETPC());
+ #else
+     g_assert_not_reached();
+-    return 0;
+ #endif
+ }
+ #endif
+@@ -465,7 +461,6 @@ uint32_t helper_stqcx_le_parallel(CPUPPCState *env, target_ulong addr,
+     return env->so + success * CRF_EQ_BIT;
+ #else
+     g_assert_not_reached();
+-    return 0;
+ #endif
+ }
+ 
+@@ -492,7 +487,6 @@ uint32_t helper_stqcx_be_parallel(CPUPPCState *env, target_ulong addr,
+     return env->so + success * CRF_EQ_BIT;
+ #else
+     g_assert_not_reached();
+-    return 0;
+ #endif
+ }
+ 
diff --git a/dev-util/unicorn/files/unicorn-2.1.2-versioningit.patch b/dev-util/unicorn/files/unicorn-2.1.2-versioningit.patch
new file mode 100644
index 000000000000..9be0f31e8478
--- /dev/null
+++ b/dev-util/unicorn/files/unicorn-2.1.2-versioningit.patch
@@ -0,0 +1,35 @@
+From 0f45f15e303b4a7b15eb4ca61860452f0a071a3e Mon Sep 17 00:00:00 2001
+From: "@Antelox" <anteloxrce@gmail.com>
+Date: Tue, 18 Feb 2025 09:28:06 +0100
+Subject: [PATCH] Python bindings: (#2112)
+Upstream: https://github.com/unicorn-engine/unicorn/pull/2112
+
+- Switch from versioningit to setuptools-scm
+- Disable building of tests via DUNICORN_BUILD_TESTS var
+--- a/bindings/python/pyproject.toml
++++ b/bindings/python/pyproject.toml
+@@ -1,5 +1,5 @@
+ [build-system]
+-requires = ["setuptools", "build", "wheel", "versioningit"]
++requires = ["setuptools>=64", "build", "wheel", "setuptools-scm>=8"]
+ build-backend = "setuptools.build_meta"
+ 
+ [project]
+@@ -40,4 +40,5 @@ test = [
+ [tool.setuptools.packages.find]
+ include = ["unicorn*"]
+ 
+-[tool.versioningit]
++[tool.setuptools_scm]
++root = '../../'
+--- a/bindings/python/setup.py
++++ b/bindings/python/setup.py
+@@ -102,7 +102,7 @@ def build_libraries():
+ 
+     has_msbuild = shutil.which('msbuild') is not None
+     conf = 'Debug' if int(os.getenv('DEBUG', 0)) else 'Release'
+-    cmake_args = ['cmake', '-B', BUILD_DIR, "-DCMAKE_BUILD_TYPE=" + conf]
++    cmake_args = ['cmake', '-B', BUILD_DIR, "-DCMAKE_BUILD_TYPE=" + conf, "-DUNICORN_BUILD_TESTS=off"]
+     if os.getenv("UNICORN_TRACER"):
+         cmake_args += ["-DUNICORN_TRACER=on"]
+     if conf == 'Debug':
diff --git a/dev-util/unicorn/unicorn-2.1.2.ebuild b/dev-util/unicorn/unicorn-2.1.2.ebuild
index 6afc0cd70a64..a66c7bbbd255 100644
--- a/dev-util/unicorn/unicorn-2.1.2.ebuild
+++ b/dev-util/unicorn/unicorn-2.1.2.ebuild
@@ -33,12 +33,22 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/glib:2"
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 BDEPEND="virtual/pkgconfig
-	python? ( ${DISTUTILS_DEPS} )"
+	python? (
+		${DISTUTILS_DEPS}
+		>=dev-python/setuptools-scm-8[${PYTHON_USEDEP}]
+	)"
 
 RESTRICT="!test? ( test )"
 
 UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.2-return.patch"
+	"${FILESDIR}/${PN}-2.1.2-versioningit.patch"
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
 wrap_python() {
 	if use python; then
 		# src_prepare