gentoo auto-resync : 26:12:2022 - 14:07:48

23 files changed, 23 insertions, 425 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index a70db79b6e5d..522d28fb05e6 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/atcore/Manifest b/dev-libs/atcore/Manifest
index 15b12e5116f0..dc760dbe401f 100644
--- a/dev-libs/atcore/Manifest
+++ b/dev-libs/atcore/Manifest
@@ -1,3 +1,3 @@
 DIST atcore-1.0.0.tar.xz 169116 BLAKE2B 8aaafe18edfbb0dcbe08b99c9cfba2d2390a9e9aaf5ed8ebbc61b6320c37ac4e893a7c64e5c56a131e32ec112fa0d9e253749e634661834de3d03e2cced97dea SHA512 8be63850d939aa9b89651252e91cd3295d52d2d0603f88b846783cca25fc0e29dd3569bfef97aeaf6c115a3bc3328fb127e126b20aaf67faf1c319ac8be7b88b
-EBUILD atcore-1.0.0.ebuild 1005 BLAKE2B a9d87bf968c6a3ab5254dda8c41179dcf82643e44db9cefbc3f57c3fc43c90126d6a9ee53895263ba37ecf07d30eb5b7ee37bd1d88b718229ab2eee66a30bd9e SHA512 01891209c823292dac3b336ea18fd4ca75f404ae96f7cd27e474b73cd3ba7330aee1f87353c9c24e1f163d9d2dc898a8f5d6e7999f1cf74ea7defb3591a0146c
+EBUILD atcore-1.0.0.ebuild 1001 BLAKE2B 04f34ef45b0286de76046297d198ae6a09b9c40f3b7ea4104e74a25fe94ff1057345659763aec9656311bb651d10879893d18577db28256da2b8061adf2ebcda SHA512 8504938d51fc01d5d3604917c67a5d2c192bea563d032d2e6f8e4711e229c6e8fc801474a9e10ca3587fa68ca5176d3c2d75ac1204b16345da24eb1bec51e194
 MISC metadata.xml 374 BLAKE2B 7afd2d43bf044c0ab9d41a82f880753b910b32c8ed6913154615abb3a1051e2605ef5d2a0f6fc28d8e415bcd788e8806463d2ea9fbfe213d1d43e18c173cf303 SHA512 f31e5c958606d9881b0a9107b45d24c928609ed384dafe2e2d2b0165813c6ded59f543c006d8905ddb9326e7bbf7c27ee6c985874a48150672e5a81468de1033
diff --git a/dev-libs/atcore/atcore-1.0.0.ebuild b/dev-libs/atcore/atcore-1.0.0.ebuild
index dabc43053436..5f1724ce84ba 100644
--- a/dev-libs/atcore/atcore-1.0.0.ebuild
+++ b/dev-libs/atcore/atcore-1.0.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="forceoptional"
 QTMIN=5.12.3
@@ -16,10 +16,6 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc gui test"
 
-BDEPEND="
-	>=dev-qt/linguist-tools-${QTMIN}:5
-	doc? ( app-doc/doxygen[dot] )
-"
 DEPEND="
 	>=dev-qt/qtserialport-${QTMIN}:5
 	gui? (
@@ -29,13 +25,17 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}"
+BDEPEND="
+	>=dev-qt/linguist-tools-${QTMIN}:5
+	doc? ( app-doc/doxygen[dot] )
+"
 
 src_prepare() {
 	ecm_src_prepare
 
 	sed -e "s/${PN}/${PF}/" -i doc/CMakeLists.txt || die
 
-	use gui || ecm_punt_bogus_dep Qt5 Charts
+	use gui || ecm_punt_qt_module Charts
 	use test || cmake_comment_add_subdirectory unittests
 }
 
diff --git a/dev-libs/cereal/Manifest b/dev-libs/cereal/Manifest
index 6c70f3a20038..73c037ca52ed 100644
--- a/dev-libs/cereal/Manifest
+++ b/dev-libs/cereal/Manifest
@@ -1,7 +1,3 @@
-DIST cereal-1.3.0-fix-doctest.patch 148684 BLAKE2B 6ab6263db5b787b3ae41b9c177df19554f17837d5bb496de887f1d2d2df28c280e038fe64f0986ce3a32cedb709249a9986f6869b6e21b7c3a4b27058739496f SHA512 6389bead42f2f8008e6296f3d5ff5fc7a94920972c774003080fd3ae24ea0fd8fa1c4ab940ab800ab6b3249db003e452fd98a9ed77e5ffbdb301311fc2972a6f
-DIST cereal-1.3.0.tar.gz 374585 BLAKE2B 67bcdf8715585d8913c6ae4ff1a20d77df0eb95816b37a77620a3f08000b6e911afbd295236a6cd0394d3242ae0a3b2619f6e168503724517c9c66bc20f1d07c SHA512 2bb640a222d4efe7c624c6ec3e755fecae00ef59e91c4db462e233546c5afe73c065ba1d16d9600f7cd3cc185593109148008b0b2b870208e2f1d6984fd40c72
 DIST cereal-1.3.2.tar.gz 385903 BLAKE2B a52e035f31766846dbea86ecb0071d73450bc481967221268717d46112eab1c6618d9cda627610aa1bf35308940d9408c37bd4ebb73c9ee9358334542d8ed810 SHA512 98d306d6292789129675f1c5c5aedcb90cfcc1029c4482893a8f9b23f3c9755e5ed4762d7a528f215345cae6392e87cd8d89467115b6f031b41c8673d6b4b109
-EBUILD cereal-1.3.0-r2.ebuild 1006 BLAKE2B 8199a733804ab6badcbbe8b84051869ecfb109a7c165f6a04d5a9b1fb788e5e8dfe36ed176cb3bea75c6fb957c5a14453b4bafecc75cb15aed7bfd6b2f7dbcd0 SHA512 d131e01315e9bd21ba9dda25e06e7775a766c50bd20ce0faf8e60dbd5065a86bc7dbc4fdb00b73c632ae15ccb27f2479ea7b4d1125af345591664ee7c8266f44
 EBUILD cereal-1.3.2-r2.ebuild 1184 BLAKE2B 523d8c7cc93d38dacf4a4bf280284bb011f60aca4e4737d9331bdb68db0eaa5a8ce09856910eb01ced869df1298ef0c253c81315e47a64ffd0ee6d6ecd0dd80d SHA512 c80d7d204a1d2e85ec02a6b3f123a8769c8fecb8c9e9c6e4159ff7bcb1a1d8b337613a24ee97089e9912b51c1f969893314fb7ca22192875a06ce433a9f21132
-EBUILD cereal-1.3.2.ebuild 822 BLAKE2B 4599c212ad8eb6f2d8354355fcfce5b8cb8732b4bcce8e12c5dd3afbaa4358d57cb1177d70e0bc8a0fe05a232488903cfc1269cdfe27e08648fea3bd4cf82b61 SHA512 b8420176989887f0f13f857710095050c687cc56bb532a4e9e14c9a21e2a8b700e65cb109b1fcb96603557791a6ea497734e2985b72d06be872096f563e0d568
 MISC metadata.xml 395 BLAKE2B 6a5de4941e400c48ca8148af6748f2054614eb28337e6f8ea6f282c4fa961c8f60a57fe2e98f87cefd32cd72de32c4cbe2d13f8f7bfc91d6ba1cbdc42adcf200 SHA512 344f769d49106b234ccaa39934eb2531f2161a018c302efd27bad57f072e7ee41501f8b3c189694a9059a6ef24053ea80219307a910f64838e9c0ff51588c850
diff --git a/dev-libs/cereal/cereal-1.3.0-r2.ebuild b/dev-libs/cereal/cereal-1.3.0-r2.ebuild
deleted file mode 100644
index 585358628ca0..000000000000
--- a/dev-libs/cereal/cereal-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Header-only C++11 serialization library"
-HOMEPAGE="https://uscilab.github.io/cereal/"
-SRC_URI="
-	https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~expeditioneer/patches/${P}-fix-doctest.patch"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+doc test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-libs/boost )"
-
-PATCHES=( "${DISTDIR}/${P}-fix-doctest.patch" )
-
-src_prepare() {
-	sed -i -e '/set(CMAKE_CXX_FLAGS "-Wall -g -Wextra -Wshadow -pedantic -Wold-style-cast ${CMAKE_CXX_FLAGS}")/d' CMakeLists.txt || die
-
-	if ! use doc ; then
-		sed -i -e '/add_subdirectory(doc/d' CMakeLists.txt || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local CMAKE_BUILD_TYPE="Release"
-
-	local mycmakeargs=(
-		-DJUST_INSTALL_CEREAL=$(usex !test)
-		-DSKIP_PORTABILITY_TEST=ON
-		-DWITH_WERROR=OFF
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/cereal/cereal-1.3.2.ebuild b/dev-libs/cereal/cereal-1.3.2.ebuild
deleted file mode 100644
index f342726f1ea8..000000000000
--- a/dev-libs/cereal/cereal-1.3.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Header-only C++11 serialization library"
-HOMEPAGE="https://uscilab.github.io/cereal/"
-SRC_URI="https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	if ! use doc ; then
-		sed -i -e '/add_subdirectory(doc/d' CMakeLists.txt || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# TODO: drop bundled doctest, rapidjson, rapidxml (bug #792444)
-
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-
-		# Avoid Boost dependency
-		-DSKIP_PERFORMANCE_COMPARISON=ON
-
-		-DWITH_WERROR=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index 79ff9fdc8c9f..2877040eb86e 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,8 +1,6 @@
 AUX flatbuffers-2.0.6-locales-detection-fixup.patch 1183 BLAKE2B ab4612ff9cfd3a9c96b71d349a801bd359c62588946053dcc3dbfb32345d352d60d08778b998f32cea33aa3a20e74a29602afb4721d21b2a3dffaade8d473658 SHA512 d9b5ad550a363ab73025179c416cbb0d613e4be8a6307e3bf4fe40c64fd6757168c49b12a073351bc5d041c6bf0ccc4d297db87575215de0b3abdb1a21213975
-DIST flatbuffers-2.0.0.tar.gz 1538022 BLAKE2B ccd827a43da39cf831727b439beed0cea216cdf50dbfe70954854bbe388b2c47ed4e78cc87e3fc0d5568034b13baa2ea96480914cc8129747bccbf8ea928847c SHA512 26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89
 DIST flatbuffers-2.0.6.tar.gz 1724250 BLAKE2B b6969b28dba753c4551b33d27409d9925c10a640ae860264f8054c19a470ce3da366c0bf7917bf7fe4f6cb57acbfbe1837f175fde40b84d311df6d1378d146ce SHA512 be631f34064c28d81876bf137c796e9736623cf2cc4f2a05dd45372e7195729c99fad1fa795f8ce71a408756a842edbdc0c3bc714a7cf63203a1de8681d86fb6
 DIST flatbuffers-22.12.06.gh.tar.gz 2172096 BLAKE2B 92bf0c56c10fa369e7a8a53a7f903af6b5f17560a3558587914c29ab8a655f3ee078c3e261426ca5d9ad0587419d4f0049459edc552e25958f80b80ba9539d59 SHA512 1b2c8eaa2ebeb92c3ebc363888b34b817d7b62a568e40bce2b037814f1f0103d4cb7db8507ec9ca05421be61b0b2be3edd6c4d564f75d1ce39278d73f8442ac1
-EBUILD flatbuffers-2.0.0-r1.ebuild 831 BLAKE2B 68d76c63ca1b7e7952029c697401b27d3d16917a1bace1b98df7ca5a4751f4e6d0c9be6f85a655c517add23d13b60c804004f243854a46cd2bf9feef71bc956a SHA512 dd77a7b4ede065ae9e6e8494a85f47f7350cb31cf5d861369f0e0f1f233b3e05847ab03ab528f52134caccae90b63dd8bf02f6e4672785592044eef5229d9435
 EBUILD flatbuffers-2.0.6-r1.ebuild 920 BLAKE2B e8c13808ce448b216769c24434f84a9d4a0ff22e0c2399b7e42ae5b8a76ce96225c937b15e733821ff2d93a56759ce7a33b8ec24409e5df73ce4c21ddded859c SHA512 6bd3bbbe3f2cf3ac988193ce8aef16627dd78fcc19e1faf0aff1aeea5c2fd0cb17d4cdd97043f5ab1aacac401829fd44337be33b71f2ded846a089cd604c3af2
 EBUILD flatbuffers-22.12.06.ebuild 742 BLAKE2B b0de01e3b69a08eb7cc1c55e1a3186bd9164608526a944a1afc3240ac12270bebf641590cdb340b35793dbb44915723516e68c0fdf78b5eb7a2471674e8bfb0b SHA512 62514b164c3c685d465cab33c3a5fa88179b32bc7e4ba9a9fa88e7ee2e9c99a139e5974e7ffefcf29d2f2d24ffe4fe0e9fbbf0a421ab6d556fddad70f5b04f6f
 MISC metadata.xml 331 BLAKE2B 6808287f0f9c9f882f52d65ed13a634ddb184341a565d561c120ec451e5414e9ff48c3d7aebe0c240671e514af83cb5e8ee7bdb8b47f57fb323dc5bc5fe37b5c SHA512 bc40060a61a79ffc86bf6d1bc6a058bd05f35c765a530e5153ffe6213ef486235aa6caf4eb43c36a66b995ea35e43f4c3bbf6a3b4591b73bd7f8b6511b962d23
diff --git a/dev-libs/flatbuffers/flatbuffers-2.0.0-r1.ebuild b/dev-libs/flatbuffers/flatbuffers-2.0.0-r1.ebuild
deleted file mode 100644
index 66d76389cfc2..000000000000
--- a/dev-libs/flatbuffers/flatbuffers-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Memory efficient serialization library"
-HOMEPAGE="https://google.github.io/flatbuffers/"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-# From 1.2.0->2.0.0, incremented SONAME, although the interface didn't actually change.
-# (Apparently to adopt semver.)
-SLOT="0/2"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="static-libs test"
-
-RESTRICT="!test? ( test )"
-
-DOCS=( readme.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
-		-DFLATBUFFERS_BUILD_SHAREDLIB=ON
-		-DFLATBUFFERS_BUILD_TESTS=$(usex test)
-	)
-
-	use elibc_musl && mycmakeargs+=( -DFLATBUFFERS_LOCALE_INDEPENDENT=0 )
-
-	cmake_src_configure
-}
diff --git a/dev-libs/kasync/Manifest b/dev-libs/kasync/Manifest
index f635e481154e..b0e229c3b56f 100644
--- a/dev-libs/kasync/Manifest
+++ b/dev-libs/kasync/Manifest
@@ -1,3 +1,3 @@
 DIST kasync-0.3.0.tar.xz 29060 BLAKE2B 0d2eeeeb296db7162426848c5467ee51e3530f0cef97cc345231fbde3225bc29736458c7e62938c7c9773742a9e4d3ed1f9545ac9d570cc5324321bc4e694e3a SHA512 a521862bafdff2931a3f01ef4393c6ae8f3c4655bb58dc2ddb4fde5f443d67b1a23d0c21491b2099ad6dae53d8894588b49299c45d334956b36ccedf94b17f9d
-EBUILD kasync-0.3.0.ebuild 429 BLAKE2B eda08e14d792f8b6f543028cbb4aa66860d276f9f6b8c89576e31114150d2fb69805774bf6627b89c256c82b9dbbd92f53ad438d4716dd01cf48a2ef7c32c016 SHA512 b312f7a35a084a5ab0837dd100f0f633aaefb9e04089b7461905953cbdf36b1d42deccb47925c7af0ab98a2cdc6f76cd3ecade9a59d1f6f02661fd06df2c6c50
+EBUILD kasync-0.3.0.ebuild 429 BLAKE2B ddd8f992b368755fd52899e46ac4253824956e08aa5ff17dc35fefce5779a9326527b8736354a04c2c556d50a76b82219e20c6aaaf8d7d7e3c57f4c64a1c86ac SHA512 8d91728eb1451d21c4f6bceaa8b940f7b70deada543eb2d431eebcdd09b564ceb742b90382d975108541f16a1baab209f44e1541be9546283950271daeba8cd1
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/kasync/kasync-0.3.0.ebuild b/dev-libs/kasync/kasync-0.3.0.ebuild
index d0bffd7cf58e..2823530b43bc 100644
--- a/dev-libs/kasync/kasync-0.3.0.ebuild
+++ b/dev-libs/kasync/kasync-0.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="forceoptional"
 inherit ecm kde.org
diff --git a/dev-libs/kdiagram/Manifest b/dev-libs/kdiagram/Manifest
index 554593655fa5..e7df397c40e2 100644
--- a/dev-libs/kdiagram/Manifest
+++ b/dev-libs/kdiagram/Manifest
@@ -1,3 +1,3 @@
 DIST kdiagram-2.8.0.tar.xz 691044 BLAKE2B c7b3a4ba992192b34d8cda90bb50a495cb88f8456ca1109140841fd885b710ce1193868be148c25f813c2d26dd7365999bdd8572e66163f0d5d1a169afc3e448 SHA512 d981bce4feeb65038772125e5af1c096537ec87991fdb93d9a91dd5c9f089b1001647c8a63b209683a67b2d7b3aadeb7dd6279261eefaf6b6e046d0ab72723ec
-EBUILD kdiagram-2.8.0.ebuild 867 BLAKE2B 40a6269065e810334ff954497a94c21dfcf0641c5089832070ff561266931486bf26e1a50f9d82b4130d10791f9fb8c973023d3c76b405a7ed0fd16565b1490a SHA512 d3e1c6b4d30e5b491a924bca1305beb70f278f36905c970a724349fcbe5d4c39ad25f4df60f2f2354d249fc9664f19734df354154759407f134785fa9e45a67f
+EBUILD kdiagram-2.8.0.ebuild 864 BLAKE2B 8cc04382f63e8a0c8c6fd396d6412179b24109ad5787e58dc95e9a9dfcc2d6ebe6d026b7ae5e5eb5d1e4e65e463b60c04ffbe13d5ddfb73bb40c5de3d8a54395 SHA512 7ba7dfe132fca80736ed06afb4a287f5ffa89a69e844946f21a7bdc6dc71b0e747fcb84ed141b7dbc0d9c08b9e7d1494183881a0910c267c9f414dd4d831115b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/kdiagram/kdiagram-2.8.0.ebuild b/dev-libs/kdiagram/kdiagram-2.8.0.ebuild
index 0beab250c973..38d7c295dada 100644
--- a/dev-libs/kdiagram/kdiagram-2.8.0.ebuild
+++ b/dev-libs/kdiagram/kdiagram-2.8.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_EXAMPLES="true"
 ECM_QTHELP="true"
@@ -25,9 +25,6 @@ SLOT="5"
 
 REQUIRED_USE="test? ( examples )"
 
-BDEPEND="
-	>=dev-qt/linguist-tools-${QTMIN}:5
-"
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtprintsupport-${QTMIN}:5
@@ -35,3 +32,4 @@ DEPEND="
 	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
diff --git a/dev-libs/kproperty/Manifest b/dev-libs/kproperty/Manifest
index 7bed8cece3ca..fbd1889c4998 100644
--- a/dev-libs/kproperty/Manifest
+++ b/dev-libs/kproperty/Manifest
@@ -1,3 +1,3 @@
 DIST kproperty-3.2.0.tar.xz 130208 BLAKE2B 22f5b4aafde41d285968f99579b757b8a88dbb12f7ed5e062e44f74c72765b915195961f5ab20e7ef9735a5f82f6c568fa807aa9bb061bfdf64ecfdfc0775793 SHA512 2d7fe5a18fd3520f0dc146ec844cf284c52eb330404666fa1400342c1489a88e1f72834d813cf52f2fd90c8312b5122f542acad7d86ae10a8d1a023c72c368ee
-EBUILD kproperty-3.2.0.ebuild 856 BLAKE2B aa7f1dd97907f14cb3f013a61c661ff6e66dc98dd0e77f80fc0d7d24422256ae3966ee64bcfa1545a387087e8327c3f290c3f597d700aaac4e4918f20f7c1821 SHA512 d1a2fd2644165d639b52d191a320c58d3de972f97a5789c70aec8e518343009fd184ca92888caed8f282c1f19d763ae2f9107dfe255a512d15afe70a3c48a134
+EBUILD kproperty-3.2.0.ebuild 854 BLAKE2B 2033b8bce49972b8c41c18e40b546163ac6f66ae2d482f5f664eafda30919e8eca23fb6bbcd53a7251d8e9e1bd54c1736bab847bb077ef5a85a9aa2f03f8ad73 SHA512 c34506bc00e697dd460ebb7fb2b80e3a4ccf4aa143c76e4d35434fb9a4dc427ba531a3bdd918e526ded32b5f3351551caa43aa06e9d663b640436881429ee422
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/kproperty/kproperty-3.2.0.ebuild b/dev-libs/kproperty/kproperty-3.2.0.ebuild
index d0bd58ebea0e..5772edfe9e63 100644
--- a/dev-libs/kproperty/kproperty-3.2.0.ebuild
+++ b/dev-libs/kproperty/kproperty-3.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_QTHELP="true"
 ECM_TEST="true" # build system adds autotests dir based on BUILD_TESTING value
@@ -20,6 +20,9 @@ fi
 LICENSE="LGPL-2+"
 SLOT="5/4"
 
+# tests require installed headers, bug 636108
+RESTRICT="test"
+
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
@@ -29,6 +32,3 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
-
-# tests require installed headers, bug 636108
-RESTRICT+=" test"
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 10c2035ccea3..92902bde4b5c 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,7 +1,5 @@
 AUX libgpg-error-1.44-remove_broken_check.patch 811 BLAKE2B ff90643ba8afe80393ae0328590ba161c5a68c6b1d6e3ab771a9b295e2827d4cb02d620315e0437647d36698d539c911aa572a9d57393feed9818986440dd437 SHA512 29dbad17b3626eab56ecc352479f55aeb54958245558716134e1da5c8581c0713d53463caa778ebd6c33ea3281072d7aa2d6fd62630bfa973a41bd3e76ca1a57
-DIST libgpg-error-1.45.tar.bz2 1015954 BLAKE2B 277892df6691ff2807335954fa786c1d452d58e6f15aa2f73bffd1ddc97b9276646afe8831c0b67107ac768e0590f046030da6d370eb2871e94154f50dabf67b SHA512 882f2dd617e89137d7a9d61b60488dac32321dd4fdb699e9687b6bd9380c056c027da502837f4482289c0fe00e7de01210e804428f05a0843ae2ca23fdcc6457
 DIST libgpg-error-1.46.tar.bz2 1014291 BLAKE2B 6748c463256b7d0a05fe89a63c5f3abda1975d861c35821248664f2f09cd2273ef619d12408b6107a99519939ca7214f492e705c29f52f7bbdc422237281c1ca SHA512 b06223bb2b0f67d3db5d0d9ab116361a0eda175d4667352b5c0941408d37f2b0ba8e507297e480ccebb88cbba9d0a133820b896914b07d264fb3edaac7b8c99d
 DIST libgpg-error-1.46.tar.bz2.sig 238 BLAKE2B c9f48969dc5b51c4d6c0c643a510e442b883af319f4bd9db3d1f9d9b56e4003f020131ace28d5e6d3db1d3f62c63ac083f159d545e601e7c47391bd16e4411d6 SHA512 c71be3ab3b2fe6c0932faad3df42c67a861a789a09e0b084da06fbf723c37e3bf28047ff4475a9b26bf622434517235c2677a832eebb611a47330ccc7887a7cf
-EBUILD libgpg-error-1.45.ebuild 1924 BLAKE2B a082e0038c6372f379492fbbd381fff2c1ede5eb56077b14eeba019fdde88cd3978c35d4f08bcf31e3f814c25cd95b1db91511f57d1c3be691d7b61a23803354 SHA512 a0f50c1e76f2ecf9c1550e2b95dd27d888ffa96bf3cf13abe5a0f4514ef973534ff75fe6e3449c7624ac23dff32dfd1d925ffe0e40c69dae02fef57d39df43ce
 EBUILD libgpg-error-1.46-r1.ebuild 2614 BLAKE2B 7068c72655a6cdb8556922a7cb85938f47f4d707cd51aa1d579ad90451e47f980648945886fa4e9a6ea48ada093e096edb60ae9cc766bcec1563351ad5215cc9 SHA512 e327602d979126d5ae940d986fc13d4cbe66cd254c4f731928a5c1685f0df3edc1569475235551057d0eb32a2b1b0c4cb333705098fcbeb7e8327fcbd721c053
 MISC metadata.xml 420 BLAKE2B 0b469c533336497584faf0c8a5531c54dd242817d46fb78f1369997b77ec3ea49da3a0ae869488c17639fdee26bc4dee94fb20605db6fa8f6f3dbaeab77d3072 SHA512 22259311b2c83f7b63e859a7196a3fd586c85afbd777327d9a6172a359500160807866b74051836717c42145ed0e289152fb0a374a05bcc7e982d4df3e94b305
diff --git a/dev-libs/libgpg-error/libgpg-error-1.45.ebuild b/dev-libs/libgpg-error/libgpg-error-1.45.ebuild
deleted file mode 100644
index 9fa4a0eb08bd..000000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.45.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools multilib-minimal toolchain-funcs prefix
-
-DESCRIPTION="Contains error handling functions used by GnuPG software"
-HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp nls static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gpg-error-config
-)
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/gpg-error.h
-	/usr/include/gpgrt.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.44-remove_broken_check.patch"
-)
-
-src_prepare() {
-	default
-
-	if use prefix ; then
-		# don't hardcode /usr/xpg4/bin/sh as shell on Solaris
-		sed -i -e 's/solaris\*/disabled/' configure.ac || die
-	fi
-
-	# only necessary for as long as we run eautoreconf, configure.ac
-	# uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
-	# not a pure /bin/sh script, so it fails on some hosts
-	hprefixify -w 1 autogen.sh
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(multilib_is_native_abi || echo --disable-languages)
-		$(use_enable common-lisp languages)
-		$(use_enable nls)
-		# required for sys-power/suspend[crypt], bug 751568
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--enable-threads
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index aa65e8f9e7d3..537d80f8468c 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -1,8 +1,5 @@
 AUX libintl-0.21.1-java-autoconf.patch 2280 BLAKE2B 79605c0ea6c5a56be1a6d586210ed40d913e30fd56c955c49a796a78e2f7d068ccdfdeb2b13ee68458612a40e6a7130e4e8d30661136cee888e7319cecce6899 SHA512 60948e0e45ea8628d6041448d4152696e3026e9d8d7dd4441977a0f8496976fb16cb8578d549287ab9d1a783cc764c9d7c3041d1e47bf1c789b5ff9a34a66dc1
 DIST gettext-0.21.1.tar.xz 10054564 BLAKE2B e994924284b3fd5b3e3bf59d4bf43eb30c9b21cc213dc3b98616b4a9fc321c90911d94d314f323cfffd0d2c3e9371b5b8f7985b9a785adc61617dd042b6f4df5 SHA512 61e93bc9876effd3ca1c4e64ff6ba5bd84b24951ec2cc6f40a0e3248410e60f887552f29ca1f70541fb5524f6a4e8191fed288713c3e280e18922dd5bff1a2c9
 DIST gettext-0.21.1.tar.xz.sig 833 BLAKE2B f673436d315e972f9e110a1b5c8d1b2f20a32fc1b7ce027fcd3bc2fe7a81af183fb8db744cbed1a8c3a6ce1a13d55e19a8e8829fc944960fbfc7efcd9aaed91c SHA512 fba912830c57d0616fb66cf81da0cb7a3ab1e27497c45daa63249d3c9f85182a4f42dfeb1591d8f31c2a340ba0c519f04fd2f05429d1cf26a3ea316d047993d0
-DIST gettext-0.21.tar.xz 9714352 BLAKE2B e36418323c79f582d13777083b455ae76ccb29e41a8259a2f4d6d9f5d8e2ac7c8ecc4df1b1fa2e9838c819cb27345fe254772398bdb88b3315410866048f755a SHA512 f7e2968651879f8444d43a176a149db9f9411f4a03132a7f3b37c2ed97e3978ae6888169c995c1953cb78943b6e3573811abcbb8661b6631edbbe067b2699ddf
-DIST gettext-0.21.tar.xz.sig 819 BLAKE2B 22a6e5f6e8a6322e24db9c1f575754bccbf6c7cff7cd14cb51ae8f5cf17cd7b677d8ecfc6b876e1b6f8d62077d568cbf57930e1d8accc5306e6869d3c6560bf4 SHA512 67c9515ad5e11773a28599d517dd84131e4afd878d67e97f505cd024e290518ca9cffff7446c62f88b56aea2c7234d11811738e8e2a076b2159f24c2f6809703
-EBUILD libintl-0.21.1.ebuild 2769 BLAKE2B 186e5c51991920dfed079ee3be3ab0d975c6706d33d10198b20afbcc41e5e02c74c8266e35ada082062e059e81a6856d519a9381c05ef49573b38b6748eb24f1 SHA512 08d3510710471ccc8d32a3236ba9e688bd691d6faac64a496c4acaf64a07185a29562f7dd123242eb1ca17eb63ccfc2c1fc8b2599c52cea7f991d98969db5e35
-EBUILD libintl-0.21.ebuild 2306 BLAKE2B 60a9ddab1a16c75d69c68469a519bb15a2da78915584b034e619765f9b8dfd9d566702dff32b9f796860ce69feb58252ed53ee96c44af4740ae5f04d4d36075d SHA512 3e3135769c793b7077c188f1122e15a19cbb1f8d92ab734549dae85e2cb5c52b3457db814674a802f85a9c885aed9fcdc8ee00cb7143bcd3f8d3e09078835be5
+EBUILD libintl-0.21.1.ebuild 2768 BLAKE2B ba7943b373470fbbe3bed9bf8cc7e59ac1046a027a384ba6114391f7dad5b167eee031fb76d6ec2861fca903a9d85a8c3c61ec25f48be0e93d9e23654e838169 SHA512 5603f68d1b8071049e0d87ca1b8cf6a217396ba0989800fa260cac1322811b94f45af92e251d10f144bdd056a897cb1fdd1bfee0d4d679e4bfcef44c473c7f51
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/dev-libs/libintl/libintl-0.21.1.ebuild b/dev-libs/libintl/libintl-0.21.1.ebuild
index c96124d7a3b9..bf61c562db4c 100644
--- a/dev-libs/libintl/libintl-0.21.1.ebuild
+++ b/dev-libs/libintl/libintl-0.21.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}/gettext-runtime"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.21.ebuild b/dev-libs/libintl/libintl-0.21.ebuild
deleted file mode 100644
index c0d55f3fb99d..000000000000
--- a/dev-libs/libintl/libintl-0.21.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: Keep version bumps in sync with sys-devel/gettext.
-
-EAPI=7
-
-MY_P="gettext-${PV}"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gettext.asc
-inherit multilib-minimal libtool usr-ldscript verify-sig
-
-DESCRIPTION="the GNU international library (split out of gettext)"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/gettext/${MY_P}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://gnu/gettext/${MY_P}.tar.xz.sig )"
-S="${WORKDIR}/${MY_P}/gettext-runtime"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="static-libs +threads"
-
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
-# Block C libraries known to provide libintl.
-RDEPEND="${DEPEND}
-	!sys-libs/glibc
-	!sys-libs/musl
-	!<sys-devel/gettext-0.19.6-r1"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gettext )"
-
-src_prepare() {
-	default
-
-	# The libtool files are stored higher up, so make sure we run in the
-	# whole tree and not just the subdir we build.
-	elibtoolize "${WORKDIR}"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--cache-file="${BUILD_DIR}"/config.cache
-
-		# Emacs support is now in a separate package.
-		--without-emacs
-		--without-lispdir
-		# Normally this controls nls behavior in general, but the libintl
-		# subdir is skipped unless this is explicitly set.  ugh.
-		--enable-nls
-		# This magic flag enables libintl.
-		--with-included-gettext
-		# The gettext package provides this library.
-		--disable-c++
-		--disable-libasprintf
-		# No Java until someone cares.
-		--disable-java
-
-		$(use_enable static-libs static)
-		$(use_enable threads)
-	)
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	# We only need things in the intl/ subdir.
-	emake -C intl
-}
-
-multilib_src_install() {
-	# We only need things in the intl/ subdir.
-	emake DESTDIR="${D}" install -C intl
-
-	gen_usr_ldscript -a intl
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}" -type f -name "*.la" -delete || die
-	fi
-
-	rm -r "${ED}"/usr/share/locale || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-libs/libusb-compat/Manifest b/dev-libs/libusb-compat/Manifest
index 9d190393c250..3ebefc4f763e 100644
--- a/dev-libs/libusb-compat/Manifest
+++ b/dev-libs/libusb-compat/Manifest
@@ -1,8 +1,6 @@
 AUX libusb-0.1-ansi.patch 4390 BLAKE2B c64a22623907ee5432d7f636642214221840df3721f226fedbe97da998e3503f9b6eb808e99a58f115f4bc1ac04a75b55928abd30786b9a6b5e3baa4b0f1edd9 SHA512 a3745567934bb8551b1fb0c7e43d5f749334ac763b05a23e15fb77af85034ca76fa6c65121c83cbfc44d82d6a879a43249148b1b894425956deb8eed3cf39e95
 DIST libusb-compat-0.1.5.tar.bz2 276769 BLAKE2B 66fa89c507d0454a587fa84d2ee2c34428963fa1770b44038fa45063466611ae263a3c790a167e5049393ef4d87073d1b16135d63cd0666256c3430bf36dae49 SHA512 fe63bd1c65e67588a83ebfdd329025ecf75f33f877fb80dd83eb528df057efb591e010416027f9054294504562299166e8e2811a7681fa1967a03baae9b88857
-DIST libusb-compat-0.1.7.tar.bz2 301821 BLAKE2B 9ee79024204b752147da0c49819523c072acd1237dc426aa19a2c2a3673ec2da6f39f62ec27b1b39b1cef2a7e9513ddc7a6149766c8af93cef933d81574dc07c SHA512 94ba2a767959a40a5fe41760d7c20968fb99456de3f5b7547414bd061ab5155d88ca382b6aa1cf4961e15f1bc4890134351902e719ce5aa15dd0202f72417d55
 DIST libusb-compat-0.1.8.tar.bz2 32845 BLAKE2B f590afd539ad20613647b923d69b9fe8ea60b3f5162766a1d840f35e8f56a949f3defa8b1c40ceb8932cf0bf45b3b5097b9ac04a339242a2b906d4ba320e4245 SHA512 817a16a2c7268e0d73add97c06ec3f6e4fc4b8697bd3129bb6f907f138c2a5dccb662096c4cd0385341053b216afd398b21dfef14676777b906972c9e3af4e3e
 EBUILD libusb-compat-0.1.5-r3.ebuild 1097 BLAKE2B c40b3e590197a02fa915856f9815a392a9f66f0f057da8a12cddc890b7b4a76b4dd1789f94cade0344e59ea2f1e63dedbb398a61d4645fa276251ccbe3bb9290 SHA512 37bc0dd695b4b9b5f4891b011cb22c563e2f9b1de8c837fa05f4fe6f7dccc857949e4a001aa610c9f87a8b24f82247b8aa8ba1df68fc75fddc557bcbd1b68c43
-EBUILD libusb-compat-0.1.7.ebuild 1109 BLAKE2B 6bc4bfd399cea1755e07c72cdbaf47f818ea110d840fff87b788d8f3ff8c2537caf206c8d46550ee21e4848d06eeb03792ddd85d369eca502b6f46a410101945 SHA512 92c8bb0511eb126ef19e61c0bc047ca482a08066e2d1fa3a2b03d09d06ee2f6d73f783aa19a25811b5200d70ee7726651b946786c624d106e710a9d45fb0df46
 EBUILD libusb-compat-0.1.8.ebuild 1144 BLAKE2B 5b0364d6b2ba9bd400c033ae644851fdc50448dafab1ac5591474f5f89b7b9919cff3ef856a5b23cc11d7b360b586cebff80ae98642626960c0027bfcc30d99e SHA512 4da4dbdd682c307e852c2f8cc5dd67fde49b11e3b2ae8cbe297add035b50c89035aed7274194267acd201c59b1c98e81e1bfc82758813a2ee8e9a41e98a02d78
 MISC metadata.xml 398 BLAKE2B 7f22097243db16d87b86af0aa73d25834e168a1075df11ba2c49a7a288c7bf0313158b49af0ffbc456189ba4b8a4920f03ed45b233c3ce7b15c95ed207845c91 SHA512 0e81fc17b1323d5d2707dc24dbec8554ea2f49fdb178baa86da70834eeb4fc7b97be6ade5f83510c8720e64ab17d270c5a0eed074d4f71e3544df3f9b804c930
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.7.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.7.ebuild
deleted file mode 100644
index ac7268e523f6..000000000000
--- a/dev-libs/libusb-compat/libusb-compat-0.1.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit usr-ldscript multilib-minimal
-
-DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)"
-HOMEPAGE="https://libusb.info"
-SRC_URI="https://github.com/libusb/libusb-compat-0.1/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug examples"
-
-RDEPEND="
-	>=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
-	!dev-libs/libusb:0"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/libusb-config
-)
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-static
-		$(use_enable debug debug-log)
-	)
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	gen_usr_ldscript -a usb
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index f60b24b3f70f..e612ca81bba4 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,6 +1,4 @@
-DIST nettle-3.7.3.tar.gz 2383985 BLAKE2B 8d8efbbff98fc1f3eff3296681d3d72346e78392f356aebfe80138ae6ae1ebf3695bd7f74b906beef0cf3625ba6d84bdb43c0f6707f54f4d98870d50c90ac9a3 SHA512 9901eba305421adff6d551ac7f478dff3f68a339d444c776724ab0b977fe6be792b1d2950c8705acbe76bd924fd6d898a65eded546777884be3b436d0e052437
 DIST nettle-3.8.1.tar.gz 2406251 BLAKE2B 22b4ec81645b579504356597ba87b637e46285682020c90e03ecaea386ac9b48eaf91ee76ae3b86b6060be355de20c320ab3b74958074ad23fc08ad9ab6a4cbb SHA512 a405da3438d185d96917b03b00abb9ab43e04f58f770f657f716c25d64bb258ee170a71328e74736caa7121f50c0c89d3cc840c1201d2a92cfaf1357d24bdc6a
 DIST nettle-3.8.1.tar.gz.sig 374 BLAKE2B e2bfce4aaa1be114fb9bf8724f25db75c69c3b98538df46e9b1428ce615f7db3b9e9f9240d232fddac195db4568439b3f58989c20beca82aa6db79f4956db547 SHA512 978304b1faa5adc3b0d6ea7e9597af6154ad5d6e328913ac19184ece94771fdb2a7d5ce0af535ae8d28cb6ccd94fb3d4ef2613c0356df9e08b5d4c26ea646e09
-EBUILD nettle-3.7.3.ebuild 1859 BLAKE2B 7c27c8dbb8baa219b6c48a396874cd0fce5be353d1588a9c7da28d9c7b0a2337ca7fb5b655244e69dc56e43e8c34aeb7a480a5ea58d273cbd1413683fc6641e0 SHA512 9351f5eaedb516a80e74266c8f34df473d9480aeec753801cfbb85192b3d0c89ebb74742777ee2498f486ded124b287348ab3c121c278c80c4f819212f21a8ee
 EBUILD nettle-3.8.1.ebuild 2635 BLAKE2B 1170edd553873f5cdbe1bc431c9474120772f624bdbc0031d77d83751103b506708a0a2b138f857e078de5f3722a10c549ba324e2b811d8a465142abd8ef9920 SHA512 fb6a59e46bd577f4c42d129bef36511e2dba201f1ae3647f82922c65670e1d22c293d799ec7fc8fdccdb42d9d088c7692c9b8d0c93471a5f16b8120217660990
 MISC metadata.xml 514 BLAKE2B 4834f1c438d59a8af0e1c158e09a6d200746575f19ebb03a6ca6c2df5bf6f515ab4fda9efad9db27d7dece6a0cb760119a134a82a313f636a884d976e959c9eb SHA512 5ca3957b9fdc44dae6bb03596ba5aebe92464e5839dcbe5e3fabc83f1b8e76e9572c5bf9dfb16b465248f11007cf1e6b9d8956ea1b817d33aabcf5766ff860fb
diff --git a/dev-libs/nettle/nettle-3.7.3.ebuild b/dev-libs/nettle/nettle-3.7.3.ebuild
deleted file mode 100644
index 755887dee959..000000000000
--- a/dev-libs/nettle/nettle-3.7.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-build multilib-minimal toolchain-funcs
-
-DESCRIPTION="Low-level cryptographic library"
-HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-3 LGPL-2.1 )"
-SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
-RESTRICT="!test? ( test )"
-
-DEPEND="gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-BDEPEND="doc? ( sys-apps/texinfo )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/nettle/version.h
-)
-
-DOCS=()
-HTML_DOCS=()
-
-pkg_setup() {
-	use doc && DOCS+=(
-		nettle.pdf
-	)
-	use doc && HTML_DOCS+=(
-		nettle.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# I do not see in config.sub reference to sunldsolaris.
-	# if someone complains readd
-	# -e 's/solaris\*)/sunldsolaris*)/' \
-	sed -e '/CFLAGS=/s: -ggdb3::' \
-		-i configure.ac || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		$(tc-is-static-only && echo --disable-shared)
-		$(use_enable cpu_flags_x86_aes x86-aesni)
-		$(use_enable cpu_flags_x86_sha x86-sha-ni)
-		$(use_enable asm assembler)
-		$(multilib_native_use_enable doc documentation)
-		$(use_enable gmp public-key)
-		$(use_enable cpu_flags_arm_neon arm-neon)
-		$(use_enable static-libs static)
-		--disable-fat
-		# --disable-openssl bug #427526
-		--disable-openssl
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}