gentoo auto-resync : 19:05:2024 - 00:01:59

12 files changed, 69 insertions, 136 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 1084a2831e93..d3b3b2afa635 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/castxml/Manifest b/dev-libs/castxml/Manifest
index b4dc781ffc7f..657b8740fd8d 100644
--- a/dev-libs/castxml/Manifest
+++ b/dev-libs/castxml/Manifest
@@ -3,6 +3,6 @@ DIST CastXML-0.6.5.tar.gz 121667 BLAKE2B 820a96dfb9f2763c00f22028ff4c232c15bf587
 DIST CastXML-0.6.6.tar.gz 122349 BLAKE2B ab2d928386e3128cd05fcc60c02799508e671883cffd33f952eb81167672e4c76057be21d3ba6b3f327051b015894914c83ad66b5ce87e43fa1b251dea5c5371 SHA512 6ba62b91193eb3458cbd0a0838a626528f66972661cc33c6ef87b760f8baa985afe998a467d07fd7d28c1363f5ba74300f5d49c182830d217a4e051a97a4a913
 DIST castxml-0.5.1.tar.gz 106918 BLAKE2B 9268f149ea5a511d24cbbd0c7faec5bff5eade5a511961d3bb120409691bf2b8aca7f2978e048a759419c097d9d97219a61a122bd37d4f835c1d86827bfb07e3 SHA512 1dff8f5cc6932a159e1132c0b283a28414ea6007c942cac4ae15a1c31789f5bd29efd65a6b5b63d7bc48b3d68c3550804f31bee2658e51082269fc5ecc15590e
 EBUILD castxml-0.5.1-r1.ebuild 1050 BLAKE2B cdcd6465f0e262f29207746ceab9a078cca51ee5d3ebc61dba4dc3e59211c1eacf1a3086cd2be4aecb5809c9946692f5f93112c5eb95edeac553de3eff38c263 SHA512 afef30f626dfca77c2822dbea14136f67f9f21d6869e6cf3e5601b96d2602229eafe359b8b00b36e7b8e1eb054ff6019ca687e86da99208ddc27e40960f8e187
-EBUILD castxml-0.6.5.ebuild 1187 BLAKE2B 6dac0c95865b2beeaf172091fde3ab9d57f5c9a0c714d2e0e8c697552101a7c38ed973ade0948da740857c14073b2ea290864a8c432743af4ac6b1fd5ec4a203 SHA512 67a101468e82bd12fdec2f35bd004aa1393e40f3f23c4a6061dd07e0cde92b46d409cb09d2f66f718c9f87e7e321c24bac9cfaacabdec031becd651f871b7b90
+EBUILD castxml-0.6.5.ebuild 1186 BLAKE2B 0c8a6330f8a6ecf3d328fc1b88693d3ef425b0ef8d23434864eac0e36958e85d0a71226bda33283956ba9ca0261d99f58ab71a68911818aaacb2e3b628439420 SHA512 07c2ea36fe3523b1a361619f30459b2ec9b0908f3255b34f209048388c5f2236577c3367f6cf8d775785325d0c4bed68a74d5b053899f337ff4d3008ef6a0b88
 EBUILD castxml-0.6.6.ebuild 1187 BLAKE2B 6dac0c95865b2beeaf172091fde3ab9d57f5c9a0c714d2e0e8c697552101a7c38ed973ade0948da740857c14073b2ea290864a8c432743af4ac6b1fd5ec4a203 SHA512 67a101468e82bd12fdec2f35bd004aa1393e40f3f23c4a6061dd07e0cde92b46d409cb09d2f66f718c9f87e7e321c24bac9cfaacabdec031becd651f871b7b90
 MISC metadata.xml 593 BLAKE2B dd9a10d726b1d46a88ca87601f17372ad6a10e8cd3ad6a7463c0aa7753dc7103694ac5d3120fc009cfcd3ddcfd4290d1ddd61763018addf1639520eaca493396 SHA512 5b01620d07eb9d11894a599515e70ea8d61862c4bdeae85aa2965801c26cde2b32461ba6c52b3019ae80cb05b975806bca302b6d01f7f51bd94a500dc13c77a2
diff --git a/dev-libs/castxml/castxml-0.6.5.ebuild b/dev-libs/castxml/castxml-0.6.5.ebuild
index 894410252a94..4334249f655f 100644
--- a/dev-libs/castxml/castxml-0.6.5.ebuild
+++ b/dev-libs/castxml/castxml-0.6.5.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~riscv ~x86"
 IUSE="+man test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/inih/Manifest b/dev-libs/inih/Manifest
index 73939b99889c..88bf1e1a79f0 100644
--- a/dev-libs/inih/Manifest
+++ b/dev-libs/inih/Manifest
@@ -1,5 +1,5 @@
 DIST inih-57.tar.gz 18954 BLAKE2B df2e2a14b4186616071f6ad2a64e0423148fb9a4624a74d4b16845a4a12eb72b1965f1314b92a710b80cc68d85dbe4ef09d6db159b76be856a4041f21a8c520c SHA512 9f758df876df54ed7e228fd82044f184eefbe47e806cd1e6d62e1b0ea28e2c08e67fa743042d73b4baef0b882480e6afe2e72878b175822eb2bdbb6d89c0e411
 DIST inih-58.tar.gz 19964 BLAKE2B ba71b21b30c039df026adbd29b422b064934046ced21a37479421e866b73969826dc1fea4e3bc0c5ea427248c774d8f80b83056c54769d454bafa2f336d08024 SHA512 d69f488299c1896e87ddd3dd20cd9db5848da7afa4c6159b8a99ba9a5d33f35cadfdb9f65d6f2fe31decdbadb8b43bf610ff2699df475e1f9ff045e343ac26ae
 EBUILD inih-57-r1.ebuild 765 BLAKE2B cfae9595103362d7773146f371ec9ba197e8d9ce1c694af85c41d8a50bfc5999709928131b08b905c1c6abab583c6f76a5e7961501f64a666d009a1d28799cbf SHA512 93e97a12c39bd08516c78584230ff31a21c75007047def432eec29bad220c7eaeffcf5ba5612026d8ba2069d8a9c728f9db7a6105b14cccd1ca7a2d8b69d6e66
-EBUILD inih-58.ebuild 766 BLAKE2B 031d0e5c080e78d1452714ddf3c1cdf54881ad17c6abb2f54640955df63319d103b8805397b6620241c5bd838db71af6e5b6c66631668b2d6945624d453fe5da SHA512 447b78d03f5f0330bdf4ae15d4a30f648473f119f855f604cad49b881b7fa9018c8380397a403b56f770f6a7e199f7bb6a3a83b83e5182ee256d460c2a9bb966
+EBUILD inih-58.ebuild 765 BLAKE2B cfae9595103362d7773146f371ec9ba197e8d9ce1c694af85c41d8a50bfc5999709928131b08b905c1c6abab583c6f76a5e7961501f64a666d009a1d28799cbf SHA512 93e97a12c39bd08516c78584230ff31a21c75007047def432eec29bad220c7eaeffcf5ba5612026d8ba2069d8a9c728f9db7a6105b14cccd1ca7a2d8b69d6e66
 MISC metadata.xml 520 BLAKE2B d067b0d423cb2ecdeee888a8b6588c1ee3a47d9080a83d0288736fd31d2521956e6dfb970d612ca27f3c9da8103f37e3dd3245eba9b57f9a1ce4d8631695da14 SHA512 47fafee9e35a1827b8d68ab35fea44e8895658dbdd77628f03d31160bbeb915e2cdad81a17c0530d3b0de713fd141999949992feb4c98fabf2ed9bcf717e6b1f
diff --git a/dev-libs/inih/inih-58.ebuild b/dev-libs/inih/inih-58.ebuild
index 24cf8b3e6eba..98e9528ea2d5 100644
--- a/dev-libs/inih/inih-58.ebuild
+++ b/dev-libs/inih/inih-58.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/inih-r${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 DOCS=( README.md )
 
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 147a5b8fb559..563a3c547bb4 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -6,6 +6,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.5.src.tar.xz 132061072 BLAKE2B bfdd987d5992a4d94ae8b14792df3be67a8e8fdf1daef9834cdaa2132df1b7ddb72ba0aabbb34b171a73d0f3b2b0f61e7160f0b278a67fd4850e3f501fd21531 SHA512 9e2f1e251b3754a24a0b39676d78c98692887c05c85cf0bee50fd44d9635290019930d4dabd1ff4ba3c9c1067e7e0e09aa1bbcd3d76687f919a1d44ba85eee20
 DIST llvm-project-18.1.5.src.tar.xz.sig 566 BLAKE2B ad935db71ec3b9fc885d696af440764a71fe7cafc5b3ca0b25a2963100d9cb3790392daebcac1341716c95a8da3c6243f5a8667fea1ed18b93fc8baa495414c9 SHA512 3cbca1059d940f3bd7bd72d68f2828039b66304980cc5f43769649e5494fc7d71117bf8aba5cc7f7a2ffca52f60ba30fadf3b28f984fd49ddb14300e30b45237
+DIST llvm-project-702198fc9ac5dba392f9d9ba7c56467996343c0a.tar.gz 211764675 BLAKE2B b28203faf5c4e51236da3e3abac969cffe6f93ce6757a81b5a577187ec236fc0b124fe6a370d1f4e803deab781606a7caf0b411780cc84ee08a8de942c4fc479 SHA512 b4217403abf4166eb8eccfd304bcaa2e15d5b67c4f996d51e0745d197e4b9eda1dd5a5b1d7c384effc25f53bb1229edda9618e172abe3be1a94a9569f7c5b0b7
 DIST llvm-project-a7ee81e8279e0bf6e05617a4a638e5f2f8e45022.tar.gz 210384692 BLAKE2B 28b85b08a42c173e1c3bf530483112b1629c7e6684a83a016fbe9f132774f7b864d793581873a6529defeabb4479ad9a3d7c025b781b2fa4952c239b6d567b11 SHA512 1d593818347452f96611a62fa3aa22ce4355a4ee5d5dcfcb54a286a1aa980e9531d5fb6cbee3b0ee5943c6d0f4e2ba2245e13262fe7859e5b114f9c5d5cf1417
 EBUILD libclc-15.0.7.ebuild 1668 BLAKE2B ac2bd589fb3c29662799f97b1f649fd22b1b7ce5701879815bc01a05ae88421a830a6a3507b4dead181f24eb4e45c451e8ea1ebbdac2a2de51ddbc3cd9f53c66 SHA512 a3e39fbaddb322360f6362ef21713f375d04e02b2b9a3d43a3d47b26d5d43643a8c654181aef9518aee5f9805d09c446bbbf13342b74f09622e5e1b0c59470b1
 EBUILD libclc-16.0.6.ebuild 1665 BLAKE2B 27ffe7083936c466a749550797d109c7a48fc6aaf110977c53ae2d4c5edd558c958a4981020b2c74c6b0c47aeee184edc6e1f192da93f57972fe9cc9abfaa762 SHA512 5007264c688588ec9fd7e74e88a1c1810be2602b744a64d8927275bc8ceaf278d9598222c5d2e3d3fa64504364625b03951752ef7221fd1bf16cc26fbd54ad80
@@ -13,4 +14,5 @@ EBUILD libclc-17.0.6.ebuild 1749 BLAKE2B 0b083103fc48654357f621bd3c40002fe903059
 EBUILD libclc-18.1.5.ebuild 1305 BLAKE2B 22e8374609ba2d88b3cf9979dcd328e533f233afe6f95a6512ccd6e4911dd410eeedb4942c9cf153f965e738f1de16410db5b794b8f19cc45203bec4529864ba SHA512 f891105882023e252dd5f983a64d9c2c1eaa31dbcd27923ed173531a28068b79f2b6cd8844badbb3ddd5f17b569e46e118f2cb2e8f8e096f343f1102db959915
 EBUILD libclc-19.0.0.9999.ebuild 1268 BLAKE2B 5b6d00090f748b17f2a947c66f8b835732bd230b87317a521235d32548c619ad146bfe0f21dd2b09b97eed462f5cfde72b6b7b0ac57d1facfec3b4fad059c152 SHA512 e786a3c97902ec99df63daebfcb2bbff20533cc2fd96b858c460fc1a4e1ae55dbe865aa8e53649a69539508445de00c042bfee4841221bfbc5a4fb3375a6d59c
 EBUILD libclc-19.0.0_pre20240509.ebuild 1268 BLAKE2B 5b6d00090f748b17f2a947c66f8b835732bd230b87317a521235d32548c619ad146bfe0f21dd2b09b97eed462f5cfde72b6b7b0ac57d1facfec3b4fad059c152 SHA512 e786a3c97902ec99df63daebfcb2bbff20533cc2fd96b858c460fc1a4e1ae55dbe865aa8e53649a69539508445de00c042bfee4841221bfbc5a4fb3375a6d59c
+EBUILD libclc-19.0.0_pre20240518.ebuild 1268 BLAKE2B 5b6d00090f748b17f2a947c66f8b835732bd230b87317a521235d32548c619ad146bfe0f21dd2b09b97eed462f5cfde72b6b7b0ac57d1facfec3b4fad059c152 SHA512 e786a3c97902ec99df63daebfcb2bbff20533cc2fd96b858c460fc1a4e1ae55dbe865aa8e53649a69539508445de00c042bfee4841221bfbc5a4fb3375a6d59c
 MISC metadata.xml 362 BLAKE2B 768f93d0058e4da4b420569f3f1771dfa7385ad89540bbc18cf53b5a71e3f060a8afa1112ff37570d7fc9dc3e71619fa3fd8d0cf7b5d3954f5110b19e146df30 SHA512 e6335424da09f668953acd39dcd9b03a30e3b509b34b1de5c72644a3740a5b6b287f10e08405b79bafc8104cc4dc1324b7b9d7990c3b560b0235ae82da8c68a5
diff --git a/dev-libs/libclc/libclc-19.0.0_pre20240518.ebuild b/dev-libs/libclc/libclc-19.0.0_pre20240518.ebuild
new file mode 100644
index 000000000000..d57c9ec1fe3a
--- /dev/null
+++ b/dev-libs/libclc/libclc-19.0.0_pre20240518.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {17..18} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake llvm.org llvm-r1 python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
+	')
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use spirv && libclc_targets+=(
+		"spirv-mesa3d-"
+		"spirv64-mesa3d-"
+	)
+	use video_cards_nvidia && libclc_targets+=(
+		"nvptx--"
+		"nvptx64--"
+		"nvptx--nvidiacl"
+		"nvptx64--nvidiacl"
+	)
+	use video_cards_r600 && libclc_targets+=(
+		"r600--"
+	)
+	use video_cards_radeonsi && libclc_targets+=(
+		"amdgcn--"
+		"amdgcn-mesa-mesa3d"
+		"amdgcn--amdhsa"
+	)
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 03aca4505e8d..a3e94de4b09f 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -6,7 +6,6 @@ AUX libffi-3.4.4-sparc-float-typo.patch 830 BLAKE2B cdec73bd227f0bcfb077ae0383bd
 AUX libffi-3.4.4-trampoline-c99.patch 1174 BLAKE2B da7990d940b5b0e6944c5b87d599c4955b75224c4f679477fd89cafdfa2ec7cab175986b25db08f0674c56f012456a20bcfce4cdabca1feb224ebd6ebf741e40 SHA512 5ba4e178d4d15a6149bd0bfa44542329812a8c98bae6350b0d2c760c5d4c376cb789c1f313bc6004f458578b18718f23f35c900fb14e5e697b43a2ebd02d7e57
 DIST libffi-3.4.4.tar.gz 1362394 BLAKE2B 189fe1ffe9507f204581b0ab09995dc7e7b761bb4eac7e338e9f5ff81431aebcef6c182c1839c9f9acb2706697a260c67e6d1351cf7e2aed7c4eb5d694f6f8fd SHA512 88680aeb0fa0dc0319e5cd2ba45b4b5a340bc9b4bcf20b1e0613b39cd898f177a3863aa94034d8e23a7f6f44d858a53dcd36d1bb8dee13b751ef814224061889
 DIST libffi-3.4.6.tar.gz 1391684 BLAKE2B af8402a09bdbd59b4e9400d2d71bd5ce98f6f1d981d35d1ab40d77a831b13b32c5bd34ca54ff75999e39f0d8a9c066381fae7a8d6c5216d955e064f929f08b88 SHA512 033d2600e879b83c6bce0eb80f69c5f32aa775bf2e962c9d39fbd21226fa19d1e79173d8eaa0d0157014d54509ea73315ad86842356fc3a303c0831c94c6ab39
-EBUILD libffi-3.4.4-r3.ebuild 2505 BLAKE2B f19bc8a8647c27b43adcac916b0f3777ba09cdd08375eb5625ab5754fb691f56f05d49cf2dbad764bcb99cee93088c4ceaf8c0cd30e4e0565b7aa8382098a607 SHA512 0d7b3114383901960e8bf5b054bab7631910933e51f0faa0de41ba7e9ccba2c8f714770cdf744b65c7f1aa517469a42ecb48ffc91c517b38a568b00d3b2ffcd4
 EBUILD libffi-3.4.4-r4.ebuild 2546 BLAKE2B 08bf9ad645d6bddbf45b08ae05f54e201de8fe3f2ae0053af8751eefc95ef1f1d45d1494cc547de0c0898f72d83ead578d3cbe6d1167da4e3eb712824ea6bc9b SHA512 68924a71d8d0137c1f071cbd5cd6d385d1f710bbe527522d5ce96089a9df3b275b384faa3904da31fb3c98f787d701bcd5d629d71ac94c8559ff839ca9fbfcec
 EBUILD libffi-3.4.6.ebuild 2284 BLAKE2B 6bbe0dff74bb200acc138490e997874bbc04d51ef94f07f62d9b70989e56af36c159488fc4dabce93a7b807dd588184c64099e2ebc460eb6c0f548812cb3a613 SHA512 35db3a0397c54acc79e657991144cbfc19e39dd4deba63cecec3eaf256a315b3b599aa28c8c6929a6b1841124d28323402b352937f7df8a4109fa16f47e960bc
 MISC metadata.xml 2110 BLAKE2B 2653be2cf09c047e45e489d7265d00165ddab2f94744988e4e8bca449bd1e40eeab74cb0b8d7d47a2d8b73563869460fcccb06e1fbccad697a9f213be362cb03 SHA512 e1a280792b929d38451fea1eb360053ed3a452592094f3e327ce4a4ff7eb8e0119435e8ee98f215585d8d98440512b5b68f92d1cd472a3bfd12e2f382e1981a1
diff --git a/dev-libs/libffi/libffi-3.4.4-r3.ebuild b/dev-libs/libffi/libffi-3.4.4-r3.ebuild
deleted file mode 100644
index 835adbe61215..000000000000
--- a/dev-libs/libffi/libffi-3.4.4-r3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-minimal preserve-libs
-
-MY_PV=${PV/_rc/-rc}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Portable, high level programming interface to various calling conventions"
-HOMEPAGE="https://sourceware.org/libffi/"
-SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-# This is a core package which is depended on by e.g. Python
-# Please use preserve-libs.eclass in pkg_{pre,post}inst to cover users
-# with FEATURES="-preserved-libs" or another package manager if SONAME
-# changes.
-SLOT="0/8" # SONAME=libffi.so.8
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="debug exec-static-trampoline pax-kernel static-libs test"
-
-RESTRICT="!test? ( test )"
-BDEPEND="test? ( dev-util/dejagnu )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-hppa-large-struct.patch
-	"${FILESDIR}"/${P}-hppa-closure-function-ptrs.patch
-	"${FILESDIR}"/${P}-hppa-jump-table.patch
-	"${FILESDIR}"/${P}-sparc-float-typo.patch
-	"${FILESDIR}"/${P}-lld-17.patch
-)
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == arm64-*-darwin* ]] ; then
-		# ensure we use aarch64 asm, not x86 on arm64
-		sed -i -e 's/aarch64\*-\*-\*/arm64*-*-*|&/' \
-			configure configure.host || die
-	fi
-}
-
-multilib_src_configure() {
-	# --includedir= path maintains a few properties:
-	# 1. have stable name across libffi versions: some packages like
-	#    dev-lang/ghc or kde-frameworks/networkmanager-qt embed
-	#    ${includedir} at build-time. Don't require those to be
-	#    rebuilt unless SONAME changes. bug #695788
-	#
-	#    We use /usr/.../${PN} (instead of former /usr/.../${P}).
-	#
-	# 2. have ${ABI}-specific location as ffi.h is target-dependent.
-	#
-	#    We use /usr/$(get_libdir)/... to have ABI identifier.
-	ECONF_SOURCE="${S}" econf \
-		--includedir="${EPREFIX}"/usr/$(get_libdir)/${PN}/include \
-		--disable-multi-os-directory \
-		$(use_enable static-libs static) \
-		$(use_enable exec-static-trampoline exec-static-tramp) \
-		$(use_enable pax-kernel pax_emutramp) \
-		$(use_enable debug)
-}
-
-multilib_src_test() {
-	emake -Onone check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libffi.so.7
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libffi.so.7
-}
diff --git a/dev-libs/libunique/Manifest b/dev-libs/libunique/Manifest
index 99fbb8d052e3..6345f036e656 100644
--- a/dev-libs/libunique/Manifest
+++ b/dev-libs/libunique/Manifest
@@ -6,6 +6,5 @@ AUX run-tests 500 BLAKE2B ff93701e0eb4c78416581d5758e83654d1c3ce197a1c6834ce1170
 DIST libunique-1.1.6.tar.bz2 335534 BLAKE2B 79f04c514620c5247609660bf58fa207589e9d1a011837f31d782864bdb5f6dd2ee8a44dddbce746cdb5e62df28d1ab20ee0e069cf21ab3d36e8edb2db06a5fc SHA512 82893e1d51a553b3c1413498e48a3a132e2c05779b4442c3732b5429d698e133741615657432a3d05c82a05c79bb59acc13df500bb08010212155db5e4ee6bde
 DIST libunique-3.0.2.tar.xz 294712 BLAKE2B 6045abb17862188940c81389883eeea88b75166b0dc64aba93dbd59c94cc117dc4d410dcb855fd6f3bc7eaf6d918aafb1a0683ca03315f5df0f2f2cde3790aca SHA512 b053b9f265c751bd581d15bf73246fb087075eaf75760565671c09a4ab80db342b4d2185050a877c4e25276d24f7895f4325ca60b918a7c4acd9d1591e97a8b4
 EBUILD libunique-1.1.6-r3.ebuild 1536 BLAKE2B 4ed19f658177a8fa72132a265fc3ad23e399392719a2aa1b545193b331128ae4042740005bbb86495fbf5afda80029b6aa3de7bba3aec05abb947839c94a2dbf SHA512 6e28941c20acdbed435b166223b5b45451f5e6369b012ba0d31c43fa4e25dd8a2ee61a9ad479d724f1f3fca8ec067c25525ee265e43ede660aa92a0aa7683ecc
-EBUILD libunique-3.0.2-r1.ebuild 1115 BLAKE2B 42cdc5a5e1bf44a76a30a7a53cff70f94627b5681fc81edb87a4d513652ddf4e9f409fd40f0593c8881127bb88484af3ed60157f71115b9ce3287359ab796d34 SHA512 167f6533339e1e11545e7f0e52a56b66c1d5461339df0966cbb367568b4320d33d8a83b09ad6df8d895dad2c6b94497abd1f9a624e0a7b8e0db9eebdd2351f5a
-EBUILD libunique-3.0.2-r2.ebuild 1102 BLAKE2B 7d06133bbdbd22e9bfe1ba506bfcf9c97ed372078bf1260cb6c03bd6cf197829c09d9478f2a87652027c1e7d7a2bbaeb4eb255b28e64236fd0d84ab5c897cf27 SHA512 c7faf30860236bb31dea6794d9cd70015f1a929a9fd0b2ccfc12eea2fc0843ac3a0355bd8e6f614c4a932a93828143d66fb0fe13790bf0192b97a5c1a745b96b
+EBUILD libunique-3.0.2-r2.ebuild 1101 BLAKE2B 0fda6891bb393fab5fb7e1a325dd1eec291210c5a6bf07015465cc35ec29e2e815d140fb4bcc948eb3f511e9b86d48a9aca84c06913fe9b7a73c854649698d95 SHA512 b809dc96dfccb5f40821fdc0936840b2b05d2827c10d6ab9a417bb576933b30c81c2126752f89f94c492fd8a2199c0696eae520d4cc9091faadd49d8c969f767
 MISC metadata.xml 501 BLAKE2B 2011b06d9822fd69c74656ea1fb89ea29e2e0571170f5867114aa0cf1bfb854964813840421d160bce63e64695659130ccd074aa4cdb8a6db54376a3ea12ac08 SHA512 d6b924ef04de15bd3e1e14aad6dd60de17d2c6a96e9e04b5820b302f152801781258623c21f77d0336c6211eb14c542f8ed1d430f4e52425549c882ce0800934
diff --git a/dev-libs/libunique/libunique-3.0.2-r1.ebuild b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
deleted file mode 100644
index 973d210fa476..000000000000
--- a/dev-libs/libunique/libunique-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 virtualx
-
-DESCRIPTION="A library for writing single instance application"
-HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
-
-LICENSE="LGPL-2.1"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.25.7:2
-	sys-apps/dbus[X]
-	>=x11-libs/gtk+-2.90.0:3[introspection?]
-	x11-libs/libX11
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-build/gtk-doc-am-1.11
-	virtual/pkgconfig
-"
-# For eautoreconf
-#	dev-build/gtk-doc-am
-
-src_configure() {
-	# --disable-dbus means gdbus is used instead of dbus-glib
-	gnome2_src_configure \
-		--disable-static \
-		--disable-maintainer-flags \
-		--disable-dbus \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection)
-}
-
-src_test() {
-	cd "${S}/tests"
-	cp "${FILESDIR}/run-tests" . || die "Unable to cp \${FILESDIR}/run-tests"
-	virtx emake -f run-tests
-}
diff --git a/dev-libs/libunique/libunique-3.0.2-r2.ebuild b/dev-libs/libunique/libunique-3.0.2-r2.ebuild
index fdfb9ba07816..8d2bab6fbd94 100644
--- a/dev-libs/libunique/libunique-3.0.2-r2.ebuild
+++ b/dev-libs/libunique/libunique-3.0.2-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
 
 LICENSE="LGPL-2.1"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug +introspection"
 
 RDEPEND="