21 files changed, 114 insertions, 317 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 5b63ad29d2f8..435ef3a22d7d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 0c13f66d9441..fc4f477c24b6 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -11,5 +11,5 @@ AUX boost-1.84.0-signals2-patch2.patch 783 BLAKE2B 76e989e7df011ecce99e5747ca739
 DIST boost_1_82_0.tar.bz2 121325129 BLAKE2B 16ee164ce7114d8134c861b3652c842750cec63ab0e79e4386d8cb9c56f7a454f9a9cfa75f25d9132a8d8d9e6f39d32a8e7535f83f52f355bbc40ef530163fa5 SHA512 6fddc452ca67f99f5c181e21c73d96feb7346e10886477c91b4abc2cdf447750599e0d42f935ef591222200ef6c033de078a7ad2bb577c81fa56a249b17420cb
 DIST boost_1_84_0.tar.bz2 123110547 BLAKE2B a872ee00402be0383726020f4d13a7df6c2765c52eac2e09aab1604432931d26dd597503f5dcbbf788d7e7528d13c6d1dbfff1e85d22bf92c7828ef74cf2405d SHA512 5dfeb35198bb096e46cf9e131ef0334cb95bc0bf09f343f291b860b112598b3c36111bd8c232439c401a2b2fb832fa0c399a8d5b96afc60bd359dff070154497
 EBUILD boost-1.82.0-r1.ebuild 11360 BLAKE2B 0b42b206ee6dd64ea8fbcb48b717f91b4a71cb4365ace331648122b9a2383c9359675333968d85097128187f86538cf445753e84c11e7097ef036713b2d85260 SHA512 7113033d9861a03918f64199b7e8a602f5bdb3e627fd505c82df6cd0e1e5fda27d5822ce59340dc0baee6907525d08b1869af21ee48b8924ae51e37dd598dd74
-EBUILD boost-1.84.0-r3.ebuild 11412 BLAKE2B 84ee29c88a891b69377d5e51b9fddd2a4dcf123b612c0998ed585e58f73d5553f25c1a7060ca1700387efe0b4a5ba99b61bf0e0e0b9d65b13444602b2613d81d SHA512 401bfa8cbdefe8654c0f4f8674b3d4a3002638deb70ab91d6adef8aa72a70e235095e08249e455891c35a200021959a7be64eec75e28a6acf712bae85e0cd04e
+EBUILD boost-1.84.0-r3.ebuild 11406 BLAKE2B c3b323a6d1d78b1e8d98f869a59e36afedc60d6517e8afc12cb42c9917f97cd5eef74e6d8d9937edf08e10e3d940b516942dd70bb0a062005b83961a3d88b775 SHA512 2a5eef11f9e7a438eeaec0a5d7e6e4b3790a27a81ba2643e48cb803efc79988a8b6f020a0e23effa45b32358916b7de51679786130a8e574c587d6139b44bc38
 MISC metadata.xml 9162 BLAKE2B c8df087c7fe1e4af3a59f21763777d3f1318aebcd524e077b6a93c374e0910ff31b1e73b8b4908130d63c2bb7d060348602cffd215648f09afd8015c782e2340 SHA512 3c45d74e046e0fd09f152fcfa7af942c9097e3ed91a0915a2541caad14a8b94b9faceccdbc74bf8aa7c8f7b383db7e91e09babba9c2c28fd7855a7b809616839
diff --git a/dev-libs/boost/boost-1.84.0-r3.ebuild b/dev-libs/boost/boost-1.84.0-r3.ebuild
index cf5aa58b660f..7b2f98dd0123 100644
--- a/dev-libs/boost/boost-1.84.0-r3.ebuild
+++ b/dev-libs/boost/boost-1.84.0-r3.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${PN}_${MY_PV}"
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead of the major version due to bug 486122
-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"
+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="bzip2 +context debug doc icu lzma +nls mpi numpy python +stacktrace tools zlib zstd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # the tests will never fail because these are not intended as sanity
diff --git a/dev-libs/dqlite/Manifest b/dev-libs/dqlite/Manifest
index 97d911f9f645..6616573d028e 100644
--- a/dev-libs/dqlite/Manifest
+++ b/dev-libs/dqlite/Manifest
@@ -1,6 +1,4 @@
 AUX dqlite-1.12.0-disable-werror.patch 515 BLAKE2B 3a2ed21d6d4b33f3f39789459754f3663ff03946c65a9660bb98a07bbc6b9b3bde7f800580f40b2e49f92744cbca719463226c60a8e98b8f41f689797b63a916 SHA512 af0a219f9ef5315fdb169f7f812059b6cadc251df5262de8d5574827afb23da64e9d0015ef38db0e5581dd9e6a992a72e3a54c2cbb5181ceddcc07082a98bfdb
 DIST dqlite-1.16.0.tar.gz 216776 BLAKE2B 653eac56c237e466f8b57d43a62ad25b7b3bd72a2088345f66db53b6bce5cdd528d16f3440572e5af8536fafde3f3cbb7700898479f1cd62b273e2192160ad15 SHA512 f9bc7ea3021d72bd81fe487d1c11b86a566002e2b1ddf6000b0fd54e407746ac35af079afc508d9d752de774dfee33c5c6e54c40c7884ac67a3bc7dca14ea362
-DIST dqlite-1.16.2.tar.gz 218814 BLAKE2B 00f1553f986b7b7089a86336e61b6fb560dc5bb8c6d0bd52f8268654674499d62283bd6c25d52c716f3baeac5bd1742d90b598705d8adf93b21e1788f014c6fd SHA512 45cb9b42866bd4955d9ff4513f5f14006bdf9a7217b1f699c46388e49ff7d98c08c0220a7fb9b00cf91d9ba9e1f3e4d660d0bd40d8423d185e81c932624e97b9
 EBUILD dqlite-1.16.0.ebuild 1021 BLAKE2B 0a12b3259ce6826c1a0543ee326643021e2935929a9db175251addd5f15739f19e07120907e0d5c74b483b420b5ab4f90e1c7ac573f575b603c77be37f9f2644 SHA512 95d1f9f0898362898317abb898c53dbc73d14e746e7397bed382c0aaabdf15568a69093b996f52f21b4bcec6ecb1c9b92cf745e0e52ef99b7be93296473cacd0
-EBUILD dqlite-1.16.2.ebuild 1159 BLAKE2B 8fc470b2f3ca48feb8ee3fedd087dc5f45a60f0267f8a07a6a3c328a010f0384713d30f164960ca5c7aa6a07b17d55e44ba51f732be966124be8f0c3a51a138c SHA512 b1f135970fd5032d23a1b843c4b3ffd0cef2e65ed0f092daa13b1db6ccb992fd8c483364249637e8a21c5ed1c047290a81f3f16dfb2923087fc8913d2dceb693
 MISC metadata.xml 950 BLAKE2B 26822e40a2c719e8e3a03db6e513d869eef038fcca973ef049da1b6eeec29aefd0867d6bced049ad1dd0465a4d942982565ff0436a7744ffb127879987ea626a SHA512 bb07a8a87ae66e5b5a2aca695e9d5cd1e5a1d725d1d9200099f9d5b46adad83c2ca9ebfedc172ad01fe31aecc1fbbe5a4de7255a2e04d4462c03a106127c7221
diff --git a/dev-libs/dqlite/dqlite-1.16.2.ebuild b/dev-libs/dqlite/dqlite-1.16.2.ebuild
deleted file mode 100644
index f3a5256c78dd..000000000000
--- a/dev-libs/dqlite/dqlite-1.16.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Embeddable, replicated and fault tolerant SQL engine"
-HOMEPAGE="https://dqlite.io/ https://github.com/canonical/dqlite"
-SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3-with-linking-exception"
-SLOT="0/1.15.1"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Upstream change from canonical to cowsql resetted raft's SONAME, 3 -> 0. bgo#915960
-# Keeping dev-libs/raft:= for a while due to that.
-RDEPEND="dev-db/sqlite:3
-	dev-libs/libuv:=
-	>=dev-libs/raft-0.18.1:="
-DEPEND="${RDEPEND}
-	test? ( dev-libs/raft[lz4,test] )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/dqlite-1.12.0-disable-werror.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-backtrace
-		--disable-debug
-		--disable-sanitize
-		--disable-static
-
-		# Will build a bundled libsqlite3.so.
-		--enable-build-sqlite=no
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index b03b59ba15ff..5110f8d20bd4 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -7,5 +7,5 @@ DIST icu4c-74_2-src.tgz 26529443 BLAKE2B 08790dd3634037177eaec428651afe0da1f71db
 DIST icu4c-74_2-src.tgz.asc 659 BLAKE2B 0723204ce19d7bd4b1989e00b5ab084cc5b154c214129632a7f7ce31c151c8a4b9e0033d49872db728a3787809dbad2320f1d848561c84f94797c7e006749b94 SHA512 b249a61aba711b34599c3c0fbc113a52a83e59cb7bbda914ca74f534c1f474e6821d663dc7f078608b24393703654a43c2b793ca3d3f3be761393b6a73862ecc
 EBUILD icu-layoutex-73.2.ebuild 3698 BLAKE2B 8d4e5814067f2a66963c7be45cf4be2f002d019760def29848d1d78e579bc6b785c1e591d33d3874bf762687a573ec591976572ec3d66c3efb8ae38a04b256cb SHA512 b91c99846ab83f0b536c22997553ed578866b1d596d88a9cb189f4d922ca6542175224efce25d426519feba72157010f606bc35c44d7ac216ec463e286f4c387
 EBUILD icu-layoutex-74.1.ebuild 3655 BLAKE2B 7b44025ca191996ac3fbeb24e9bf37e5473bbf31378e58521595d24ada146c908ba8a0f8d8a14fa17629ceed2da59e9810f5230bd0b19e74559ffad43a60828f SHA512 d4138063d1a6269138819d88415bf0300940af3671ef269c147d45f70247130d575ecaab40d493394d9a1241fd8475878af3b406e3d8dbd9376a7965bd09c673
-EBUILD icu-layoutex-74.2.ebuild 3653 BLAKE2B 13a1c67865c36c0d70fc3c3e2962972832be6c6349efa4d21d99c8521deb20343eb9a47c4883d3eb12064eac778e260f1140ac92ab30d8b741ae87545e814631 SHA512 a87edbdc0bdc9d5a0b97e4b62e1ed12bb44a7f0286ac36e309d279ca761612e1ad1b74461d66cc14dfa22095ce0a7219bab0c9eae40738f67227576704845054
+EBUILD icu-layoutex-74.2.ebuild 3650 BLAKE2B d8c3a4c95255ad34465386c44e349a73f6488335e10e577dd100e3e949a3fe8eb20cf50f12756c9c1524edc5726cda4a4a0494733e0d5f98267e3cb1e2732e1f SHA512 3de107f2ff0a7e435e2a974ba059d85627172b628448ff6bb4fdc2dbfc6abfc025cedf4d36a1afdfb6f92f95e19025d2195d811e3f2147271d2b38a88da1380e
 MISC metadata.xml 336 BLAKE2B df52385ac9930c85fc8cb8799f5fd083e99bfe1bacd63519001f91b841cacdc50d6b7ed32f3520372cbab48d270bb05fd0896eaec55046ce1eac03af4502365e SHA512 80d8e03229a72e9acd1429f7ed697df59e98899b135bb40367e95d6eed63aa011efd2121601be68e685350b6eadd46e6f39c036f86ff18bc3c85410e88008c7e
diff --git a/dev-libs/icu-layoutex/icu-layoutex-74.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-74.2.ebuild
index 6274ae55cf52..7908351f0cf1 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-74.2.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-74.2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"/${PN/-layoutex}/source
 LICENSE="BSD"
 SLOT="0/${PV%.*}.1"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 fi
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 5fcf59c512d3..df61bb9f2bd7 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -10,5 +10,5 @@ DIST icu4c-74_2-src.tgz 26529443 BLAKE2B 08790dd3634037177eaec428651afe0da1f71db
 DIST icu4c-74_2-src.tgz.asc 659 BLAKE2B 0723204ce19d7bd4b1989e00b5ab084cc5b154c214129632a7f7ce31c151c8a4b9e0033d49872db728a3787809dbad2320f1d848561c84f94797c7e006749b94 SHA512 b249a61aba711b34599c3c0fbc113a52a83e59cb7bbda914ca74f534c1f474e6821d663dc7f078608b24393703654a43c2b793ca3d3f3be761393b6a73862ecc
 EBUILD icu-73.2.ebuild 4577 BLAKE2B c2f88d6d6598366411855906d20e118df981d1414f1412eaef486ec3657c517e9aabf60f4e44665e9c9a968e23d32522bb99c04be3a8522335d2b30492954f8c SHA512 3db79df38dde2cb8c1a8ecfca3d4fe8f567aa653ab6130afeee501da0e94226f8acccd700075ece04d6cfc0acb11fadb78bb9d1bb79d795bac1dadd43f2e08b0
 EBUILD icu-74.1.ebuild 4513 BLAKE2B e4657c9c210d9d84cfed68411cb8883e9e6696ac02f75cf09dcacb75584eda864d73b0e8078f3ceb4bc14e0d38ff940b31a3322b2eabc2bbb7a618949c4948c1 SHA512 c6e1cead34203882280642afed302dad0b7975f745499db9671d6641c4af2ac5cd2a5d938b002a4da2147dcc41bd48bc81432f834ea06c7b2f1fbd685be0c87e
-EBUILD icu-74.2.ebuild 4511 BLAKE2B 49055b6d828bb225e002294f1d38e9fc85925301966aef645468d5a57726d6b037addeaa74f0abdf214fc0f247cf2739cc384abea8d553131547529674f6e5ef SHA512 f998ac35255785eab220eafbddc5743f9093c27cf000b3b1269b8739ad6b6f6fd50690333b0d32d5f447b35fb712bd2f618ae46cf9d01ee9ce193be3d38999e2
+EBUILD icu-74.2.ebuild 4505 BLAKE2B 13d7178404d31b0fb0c3331e82b31f2ff34629651c2ba90880b1fe40e83867e37d33ce4188ca14e0d55a687bcf7a6ce8c38c7ebbc6c3905e3edba18807749faf SHA512 1cfde23318a5e8c998a6f0b328b67868720fc59cd0198ad1c654089713d3c098ff2701535c4268654f8e08ced9566a3f7b176563affdc015e4a9ddf091318946
 MISC metadata.xml 336 BLAKE2B df52385ac9930c85fc8cb8799f5fd083e99bfe1bacd63519001f91b841cacdc50d6b7ed32f3520372cbab48d270bb05fd0896eaec55046ce1eac03af4502365e SHA512 80d8e03229a72e9acd1429f7ed697df59e98899b135bb40367e95d6eed63aa011efd2121601be68e685350b6eadd46e6f39c036f86ff18bc3c85410e88008c7e
diff --git a/dev-libs/icu/icu-74.2.ebuild b/dev-libs/icu/icu-74.2.ebuild
index 5707bdbfed9c..d95a60360a39 100644
--- a/dev-libs/icu/icu-74.2.ebuild
+++ b/dev-libs/icu/icu-74.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/re
 S="${WORKDIR}"/${PN}/source
 
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 LICENSE="BSD"
 SLOT="0/${PV%.*}.1"
diff --git a/dev-libs/json-parser/Manifest b/dev-libs/json-parser/Manifest
index b2cc7e60f0df..3ae72211fe26 100644
--- a/dev-libs/json-parser/Manifest
+++ b/dev-libs/json-parser/Manifest
@@ -1,4 +1,4 @@
 AUX json-parser-1.1.0-pkgconfig-libdir.patch 844 BLAKE2B 991a915cff64a9a3fd1fbeea36e9a6389272e70d04b25419650b8eaeb7ef13cd568d171a60817dbda4b51f6cfafebc18637ba9adcac8998d2b35a552e8183a53 SHA512 ee83f9b29d81de6fe313055ee53a3e9f9ab20a9fef46b42c155bda78abd687bdf4e834c9dc9c9ca8b76c1556217a9cbdda89b604efe75e7d9c7ba6ec7a1abf8b
 DIST json-parser-1.1.0_p20211208.tar.gz 51479 BLAKE2B 31ce7929c1de829e312dfc855365d8851ad7c2ce31379d3ab4b4937291e2ec367c7692ecb11b781d0647e5dc38008e4e7bd122d9edaafd1c393a1cbf765117b9 SHA512 cbe6690a70ada1906b2c208fcbe03fe5a14651660ece9ba933a3160ea027c6dd9507189e1c63052059c3a00b2e2a59dbc65fa668a287455d438aa4453eecf22f
-EBUILD json-parser-1.1.0_p20211208.ebuild 1606 BLAKE2B 7050f29d8c0a0f40b4f06aa7a1a44d9cec1b03771c7cc36ec859ac89af17db737619a8849cea74d5a68ffb9ebcac40f210e822d2ecb7afc0a9f4a51e5ee3a5fb SHA512 2ba216ab01b4c0e6a902f976a9d3607bcb9a8a31cb96b8feae483b5a3aba2814e5697cc8600df1a4cf8a89791e2b37a26a9886b1b748bb6057d7a2ce8b95c1d7
+EBUILD json-parser-1.1.0_p20211208.ebuild 1604 BLAKE2B 6dbae32125ba7f430cf604bd0e613301ee4b5b1c470438c13248a2088c69dc437744f3d5746f8aa3064edba3cffc7478107029300da9c02ca4638c834c90df9a SHA512 8c275591ddf073afd30dc5519f213e095f3a16a02357092769f819ef5af6a32fea9f80a73fd9e548cf8ff9a84210e9c3d8f51f61c96199feaecec013a8279217
 MISC metadata.xml 334 BLAKE2B 228b3f35267e6f2ebb207999eef2d73ebfa5fbbfcc56b33ec965ace20fe482d03eafca31e637bdd02670f11e2e93edfb90c904a0483adcfd366ab04322706094 SHA512 f9f59cea26379df727b46518e97d7569d91dfb2984e4cae9c0fe715c2ec1d7d0149f807589936dac89769f5bba77cf9adcac872cdec9cbb731c8cc962f26608f
diff --git a/dev-libs/json-parser/json-parser-1.1.0_p20211208.ebuild b/dev-libs/json-parser/json-parser-1.1.0_p20211208.ebuild
index 373278214033..2f60fe0f3b4c 100644
--- a/dev-libs/json-parser/json-parser-1.1.0_p20211208.ebuild
+++ b/dev-libs/json-parser/json-parser-1.1.0_p20211208.ebuild
@@ -1,11 +1,12 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 edo toolchain-funcs
 
@@ -23,8 +24,7 @@ KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-DEPEND=""
-RDEPEND="${DEPEND}
+RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index ded37a43b20b..d1d73a663e30 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -2,6 +2,7 @@ AUX libaio-0.3.112-cppflags.patch 350 BLAKE2B 8c2d0706f92a47dffff6465712588b525b
 AUX libaio-0.3.113-32-bit-tests.patch 794 BLAKE2B af169fe70e736bcc83bac7394a8c8ac737799a31b23abe1d5a6158f4f118dcdd90378f515279b861f2e5086258f233aa7778062e2e8025788ebbec158dd41993 SHA512 358bab7166887f19c3d64fb8911c4fc9fc0811aabda28838e11013f28f1a6911d5d4ee9b5369e998f01848f1f758cba63644b56ad3b1bd69d0d17f487898e9e1
 AUX libaio-0.3.113-respect-LDFLAGS.patch 537 BLAKE2B 6981fe9a607ddd4f9f803797f91271eaa403d05f65b3c2e778548b30cd486e15245a75a7f201c5f2a573828e20708d77f37d3834e131636228c49d4c697e6ba3 SHA512 726aa73e2d9fd15110acd024312f36293b841aa442a14b77b49cff4dc78961981ba09d406bc1105d31afdb4b96d29906ad4359c23c78a09e0e1d1b26e25ae11a
 DIST libaio-0.3.113.tar.gz 49980 BLAKE2B 2379c88670310b36942563d10f29dfcba0f49391952ffe7fe18b0c917f33ef610405fe13297d1dbb34b7ad1d3066d4a32587a7fb20babba2f264cfc2ab289e57 SHA512 65c30a102433bf8386581b03fc706d84bd341be249fbdee11a032b237a7b239e8c27413504fef15e2797b1acd67f752526637005889590ecb380e2e120ab0b71
+EBUILD libaio-0.3.113-r1.ebuild 2213 BLAKE2B c667153ecc20cfd3626d3debe37c6c2496c8ff474dba4bdf8e56c0b7b512b18b11c88003e868b14ce19f3ff75dc0a4a3dcc00c76eebbbc079c0f340f7ac3e2b9 SHA512 01e06a35572ddc227c41405a8e28de043a4d1ed3d992b2eeb3c029b7a6502115527d1ed9f41084bb9c42d84e100e31a2a03e4c2e8e4ce5a72fdac893c1971a67
 EBUILD libaio-0.3.113.ebuild 2288 BLAKE2B 3ff24b4cd6bbd9f515ef5611a789c37e90c059a13fd3c618a3627d070bf01a441b89ec218c1470e86d7b7db31097c706697b76ff75091ef83322e6e78d1ff53c SHA512 96f6aa57a82077de291b7246c1c945b6efe3c0be6bb53bef7a63f0c343cbfe24a5ea842e192d1646b799afd3e85bde4fa5cf9573225eea4f0bcd29a609513c0b
-EBUILD libaio-9999.ebuild 2248 BLAKE2B b9df5b16af67563434bc1297eb3d5b4ca767db287f57f457152e9f41d20f5f56cdb2fd0f2588667d197e0c5ecb4402774c2ecbc226ba0d9cf403933148c603db SHA512 82e56ce625dce6d15a6061897ed7d710c06692c326befc8f6b5310c4826716cfaf9a7b71d411d9dac6e6ee8033dbbc166e85f6ce60cbb3601e841208a33ef572
+EBUILD libaio-9999.ebuild 2165 BLAKE2B f384a116636d821438e78154df2207b47c9334bb8efb1d37fd884949a5b191357763c356d92dd173869d02be4d1a4e016b44134e35bce266e68e24755c60a2d5 SHA512 2d045e01f446290bdfbe2fb3fa39b11884972e21bff193d16677defddd416f1fbda399a8f18ade57084ca680803658293db79ae6c9d8950fe312f39f5bf1c5f3
 MISC metadata.xml 505 BLAKE2B dd6fdcca9f3876cd5e33eefe891b4e0fd87d8bf21417b36c0e3a0e8b248a2191143037970bb1ce9ed4cc59f3da399e8057c73db1a5b194f265c7940bcb4bdb9f SHA512 5edfc92d534ac0b1526d010cc43dc33da62db6575ebba6e0edcb3b063eec7053dc18d496f0bb02b5f6a8568197d198be309a5fce57f538dc9906b788f46d0d6f
diff --git a/dev-libs/libaio/libaio-0.3.113-r1.ebuild b/dev-libs/libaio/libaio-0.3.113-r1.ebuild
new file mode 100644
index 000000000000..f122b3a77785
--- /dev/null
+++ b/dev-libs/libaio/libaio-0.3.113-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs flag-o-matic
+
+DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
+HOMEPAGE="https://pagure.io/libaio"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://pagure.io/libaio.git"
+else
+	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
+	"${FILESDIR}"/${PN}-0.3.113-respect-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-0.3.113-32-bit-tests.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=(
+		-e "/^prefix=/s:/usr:${EPREFIX}/usr:"
+		-e '/^libdir=/s:lib$:$(ABI_LIBDIR):'
+		-e 's:-Werror ::'
+	)
+	if ! use static-libs; then
+		sed_args+=( -e '/\tinstall .*\/libaio.a/d' )
+		# Tests require the static library to be built.
+		use test || sed_args+=( -e '/^all_targets +=/s/ libaio.a//' )
+	fi
+	sed -i "${sed_args[@]}" src/Makefile harness/Makefile Makefile || die
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# Upstream aren't interested in fixing: bug #855698
+	filter-lto
+
+	if use arm ; then
+		# When building for thumb, we can't allow frame pointers.
+		# http://crbug.com/464517
+		if $(tc-getCPP) ${CFLAGS} ${CPPFLAGS} - <<<$'#ifndef __thumb__\n#error\n#endif' >&/dev/null ; then
+			append-flags -fomit-frame-pointer
+		fi
+	fi
+}
+
+_emake() {
+	CC="$(tc-getCC)" \
+	AR="$(tc-getAR)" \
+	RANLIB="$(tc-getRANLIB)" \
+	ABI_LIBDIR="$(get_libdir)" \
+	CFLAGS_WERROR= \
+	emake "$@"
+}
+
+multilib_src_compile() {
+	_emake
+}
+
+multilib_src_test() {
+	mkdir -p testdir || die
+
+	# 'make check' breaks with sandbox, 'make partcheck' works
+	_emake partcheck prefix="${S}/src" libdir="${S}/src"
+}
+
+multilib_src_install() {
+	_emake install DESTDIR="${D}"
+}
+
+multilib_src_install_all() {
+	doman man/*
+	dodoc ChangeLog TODO
+
+	# This lib is a bare minimal shim on top of kernel syscalls.
+	export QA_DT_NEEDED=$(find "${ED}" -type f -name 'libaio.so.*' -printf '/%P\n')
+}
diff --git a/dev-libs/libaio/libaio-9999.ebuild b/dev-libs/libaio/libaio-9999.ebuild
index db2f93f97564..9066780e1381 100644
--- a/dev-libs/libaio/libaio-9999.ebuild
+++ b/dev-libs/libaio/libaio-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit multilib-minimal toolchain-funcs flag-o-matic usr-ldscript
+inherit multilib-minimal toolchain-funcs flag-o-matic
 
 DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
 HOMEPAGE="https://pagure.io/libaio"
+
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://pagure.io/libaio.git"
@@ -14,6 +15,7 @@ else
 	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
+
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="static-libs test"
@@ -83,9 +85,6 @@ multilib_src_install_all() {
 	doman man/*
 	dodoc ChangeLog TODO
 
-	# move to / for multipath-tools, bug #325355
-	gen_usr_ldscript -a aio
-
 	# This lib is a bare minimal shim on top of kernel syscalls.
 	export QA_DT_NEEDED=$(find "${ED}" -type f -name 'libaio.so.*' -printf '/%P\n')
 }
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index 7ddb6ec5d9ff..52545e434de6 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,6 +1,6 @@
 DIST libixion-0.17.0.tar.xz 499836 BLAKE2B c8c31b07ad14dd49be259686af3e39e6f5d4aeeb8680030ea7bd2697c8baa72123f2659b3087f224f956612dc444c97e6a6d331fd3deff780981bab4d5b6ad25 SHA512 0acdb2eae5250236a94b1a3344ca990058ea8db7b1e741545bcb7160f9e28d21a3c2ec336621fd590df10188a4d5feadfbb3a63f57e9bfd2cc1bffc04009ffad
 DIST libixion-0.19.0.tar.xz 536540 BLAKE2B 2bd8db83f926d553b1b6c78eb3e735e9911dbdd3cb95105fca04fd560099f38c5e4834d5887b1b0e6d44343e0da9b0fa0264f00c931a6b04b7e4c70996f819b2 SHA512 f06edbcf5ae7459a46e01273952ce6fbc4e8f2b7782c7e07645dc30e102f20f542e449acafc26484765207b10656e0b350f4108cbf1e03947ee7267254cf6f97
 EBUILD libixion-0.17.0-r1.ebuild 1170 BLAKE2B 31eb8bcaf590c45d125b2b6eaa46d9f45d3906e227540302ab7065bb06919d33fd50413bafd8f7b6173269619d8e5bdd7755d9a8fa47070e46f5e974164b3bfa SHA512 b623b5b2ed11a5da8b4586200989c49ad5976f5d90fb92b7e74826a69fdfaf58677a75ee88292869b552fe2a57668513ee10590dea23142d4902924f8689ee24
-EBUILD libixion-0.19.0.ebuild 1172 BLAKE2B 40f52774375297b38ed65e3d4d526ec72b2ac5cdeb10ba7b42dedbec361ac0c48721c705f811d9e07ed59a9c5805363797e0a0fdbce7d8aac9950eb6193b4ae8 SHA512 4ba9aad648be2ff39fe20b4a3d15e58f8df1830619dedc1499077a8ad58874f74d88f32ee2e257b22226b28c8bbf2fd97904dd61b264c76d4eda92882fd1d7df
+EBUILD libixion-0.19.0.ebuild 1170 BLAKE2B 36c59e86f221f27df9c8183fc3aba91c80c9c4877a97f2bbc4c6d2d4e89f58370dfa38df65c16de45268dd19c31e2ec3117163b61d2de9330c100e7279e6e002 SHA512 dbc64d0464c7e7bddbcb7c356ebe1235aecc7ee4ae51d2f679766d6307d610341aff64304a547a86dd80358a7d28f4efe8d049cd2eeee189daf093054a0ddf21
 EBUILD libixion-9999.ebuild 1174 BLAKE2B 8999d4e26d35edb2ec080f3dd2fea5eee6f9f33f0be0a9c34f59c3c3daf40c538f040c44c8fd2b59dbfa4c437bb7a53ce37f74f0f81d221b2171fe57275885ce SHA512 9c2890e4cd69d61fb354966190865a63e687f3bcf38afb6408aebc5d5d8f651341f379b8023c32bcfe9440e86379a540bbdb1eb7d9dc3ed604a26c3352019c62
 MISC metadata.xml 398 BLAKE2B 0c2320063cc47c8a993ed456ac3a68466ce443b910d43739552d0f365dd178ed59ff76b2e23bab38b1962b9ce8cc973c03125096074a8bc33b09c8789ef236a5 SHA512 6599412f7feebc12c72eba06522563ff16d700e953d6ebc54f88544e49ad5e48e265b939a4fcfd788776abfb03110a8a27800dee71f031ae27eb207a8f924451
diff --git a/dev-libs/libixion/libixion-0.19.0.ebuild b/dev-libs/libixion/libixion-0.19.0.ebuild
index 493c22f03935..13874bfc6440 100644
--- a/dev-libs/libixion/libixion-0.19.0.ebuild
+++ b/dev-libs/libixion/libixion-0.19.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	MDDS_SLOT="1/2.1"
 	SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index f5a8b145c4e8..0859d09f70a8 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -6,6 +6,6 @@ AUX liborcus-0.17.2-python-optional.patch 681 BLAKE2B 2338884cd5e694c850cd63b85d
 DIST liborcus-0.17.2.tar.xz 1839188 BLAKE2B d274e3af71df16866e305403d63d3978613915753412ac9de19d7de7802930c3886d8653d6d48a8d9a971dc0ee284f8f83af8dc07850b5f28fcdab2815b6d9b2 SHA512 8ad8db46c23673260057aff555286d95ebfeff0a027bdeae24f11f8aa12456284f7f4446edddb91936b3011eb1227cfe1618ab3c4d909f8356c8c151f5739d79
 DIST liborcus-0.19.2.tar.xz 2211268 BLAKE2B 4ee3fd2fb122d3a9840cb92452bf8a6d3d54b7b50a32be84e1bb08dfe2e2abc2de80098d9460b6bd82d0249304a7ba5c39b18ace3f69150ba71e16ef14795ca4 SHA512 c955490f57e91615278a83bb48726025cd5f8059b97ed5532f770199e134ca511c7ee6b0cd0a9d3a2d54208a5fdd19117054e95e818162ea568052fa11b21d4e
 EBUILD liborcus-0.17.2-r1.ebuild 1526 BLAKE2B 234852ad4fc1f27d4d798002ae8298600a6bb99449d891ffed5e1fadd712d909e0dba233bc2ef1f061f1a4065fc43dfe44cb39bc9de60c722a90a3602015a4f5 SHA512 b38f8f96a4a53d8e5150074cd6d1137f984464df4e9bbb316d65aa03e4819aa72d2ce48b8bedb83283fd08ab53e00142ccd683d751b747eb87a2094b0d58ea42
-EBUILD liborcus-0.19.2.ebuild 1330 BLAKE2B f7771c4b263434473006b3c51b6a317d4ebf7de965e3c5ab679e4a474fdaf69f07fbf95c60e48d81f7c8a034f29c2e92834e6193165bea0cd49a09ccf80d46d5 SHA512 a19979f21474149dc64c8366c1f040ea5d68e12e67d33b55b8e86ebc3353175a6b1443f2cb272e3cae8f8b99b362afd70e34530876d2fc75b6cc6ec1988da344
+EBUILD liborcus-0.19.2.ebuild 1328 BLAKE2B c1ea6854b837ab60a668d69021d80e6a033c136dbc05728eb1fcda225826ea75cf0c825b457a643fdea5727c39d1f382e56a8c69440f691781a6f184a7248657 SHA512 20c743c8468b0447847d7837ad6ccc533663faee4262f909d8d50f01b5e0df0afc63cf811eec2c9d7ba01b3ec21a2c7fa34f9e746b063edcadad6392fe58167f
 EBUILD liborcus-9999.ebuild 1354 BLAKE2B 037783df1a45f3b788aacdd4ddc85ad506bf39b2ca67ccba83749e068ac697d1217efec8a54e0eb884a16f65feced6d87f3a73eddf1252f374d97f6b146056ad SHA512 4563e04c0ee5625bffa371b69fdea1eb4bcb07cd27f3b73a0f3ad7057d481eabfb79244743a5a48d0cf745d3defb156f4245e58a558e3d18f8aed06ad476060f
 MISC metadata.xml 557 BLAKE2B b8dd01b0df50a1c6dafedc40f4cebbbd7851ee67fd1ac94f4c8107f052db8721ce12b0ae486e42f459e0b5d337525edc0359e9e94b8da1261e3521c11f66ef64 SHA512 2eca4f5fd25121bdb3ecb9470b66c2c5373ab266c53bf7af55b3f46245ad6973f3cd65ff80c6d1c33cb738136cddf22489b61dc1863701225842ca9dfa4e2c9d
diff --git a/dev-libs/liborcus/liborcus-0.19.2.ebuild b/dev-libs/liborcus/liborcus-0.19.2.ebuild
index 592efa8da2c5..8a3e66a9fe84 100644
--- a/dev-libs/liborcus/liborcus-0.19.2.ebuild
+++ b/dev-libs/liborcus/liborcus-0.19.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	MDDS_SLOT="1/2.1"
 	SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libusb-compat/Manifest b/dev-libs/libusb-compat/Manifest
index 18e0272da6c7..d5bf1810ab62 100644
--- a/dev-libs/libusb-compat/Manifest
+++ b/dev-libs/libusb-compat/Manifest
@@ -1,6 +1,3 @@
-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.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.8.ebuild 1136 BLAKE2B b9a032c11d3f046915e1b828874c6f2ef8ce80ff1fa14d47c43cddac0db03ff73f3ecdf55df12b3d6153a9e9510b9fc957fbff816ea312a20bc6c409721d9e8c SHA512 0d39e69c4fa37e552f460b6d9ba4afad7971566b07f3f3f80a12fe36864b566cbb995a1f682d5c11f74cc79680c7f6f4dd47e010b6115ef81c843b569def77f7
 MISC metadata.xml 398 BLAKE2B 7f22097243db16d87b86af0aa73d25834e168a1075df11ba2c49a7a288c7bf0313158b49af0ffbc456189ba4b8a4920f03ed45b233c3ce7b15c95ed207845c91 SHA512 0e81fc17b1323d5d2707dc24dbec8554ea2f49fdb178baa86da70834eeb4fc7b97be6ade5f83510c8720e64ab17d270c5a0eed074d4f71e3544df3f9b804c930
diff --git a/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch b/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch
deleted file mode 100644
index c04f7172f3ed..000000000000
--- a/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch
+++ /dev/null
@@ -1,188 +0,0 @@
---- a/libusb/usb.h
-+++ b/libusb/usb.h
-@@ -27,8 +27,10 @@
- 
- #include <unistd.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <limits.h>
- 
-+#include <sys/param.h>
- #include <dirent.h>
- 
- /*
-@@ -78,40 +80,40 @@
- 
- /* All standard descriptors have these 2 fields in common */
- struct usb_descriptor_header {
--	u_int8_t  bLength;
--	u_int8_t  bDescriptorType;
-+	uint8_t  bLength;
-+	uint8_t  bDescriptorType;
- };
- 
- /* String descriptor */
- struct usb_string_descriptor {
--	u_int8_t  bLength;
--	u_int8_t  bDescriptorType;
--	u_int16_t wData[1];
-+	uint8_t  bLength;
-+	uint8_t  bDescriptorType;
-+	uint16_t wData[1];
- };
- 
- /* HID descriptor */
- struct usb_hid_descriptor {
--	u_int8_t  bLength;
--	u_int8_t  bDescriptorType;
--	u_int16_t bcdHID;
--	u_int8_t  bCountryCode;
--	u_int8_t  bNumDescriptors;
--	/* u_int8_t  bReportDescriptorType; */
--	/* u_int16_t wDescriptorLength; */
-+	uint8_t  bLength;
-+	uint8_t  bDescriptorType;
-+	uint16_t bcdHID;
-+	uint8_t  bCountryCode;
-+	uint8_t  bNumDescriptors;
-+	/* uint8_t  bReportDescriptorType; */
-+	/* uint16_t wDescriptorLength; */
- 	/* ... */
- };
- 
- /* Endpoint descriptor */
- #define USB_MAXENDPOINTS	32
- struct usb_endpoint_descriptor {
--	u_int8_t  bLength;
--	u_int8_t  bDescriptorType;
--	u_int8_t  bEndpointAddress;
--	u_int8_t  bmAttributes;
--	u_int16_t wMaxPacketSize;
--	u_int8_t  bInterval;
--	u_int8_t  bRefresh;
--	u_int8_t  bSynchAddress;
-+	uint8_t  bLength;
-+	uint8_t  bDescriptorType;
-+	uint8_t  bEndpointAddress;
-+	uint8_t  bmAttributes;
-+	uint16_t wMaxPacketSize;
-+	uint8_t  bInterval;
-+	uint8_t  bRefresh;
-+	uint8_t  bSynchAddress;
- 
- 	unsigned char *extra;	/* Extra descriptors */
- 	int extralen;
-@@ -129,15 +131,15 @@ struct usb_endpoint_descriptor {
- /* Interface descriptor */
- #define USB_MAXINTERFACES	32
- struct usb_interface_descriptor {
--	u_int8_t  bLength;
--	u_int8_t  bDescriptorType;
--	u_int8_t  bInterfaceNumber;
--	u_int8_t  bAlternateSetting;
--	u_int8_t  bNumEndpoints;
--	u_int8_t  bInterfaceClass;
--	u_int8_t  bInterfaceSubClass;
--	u_int8_t  bInterfaceProtocol;
--	u_int8_t  iInterface;
-+	uint8_t  bLength;
-+	uint8_t  bDescriptorType;
-+	uint8_t  bInterfaceNumber;
-+	uint8_t  bAlternateSetting;
-+	uint8_t  bNumEndpoints;
-+	uint8_t  bInterfaceClass;
-+	uint8_t  bInterfaceSubClass;
-+	uint8_t  bInterfaceProtocol;
-+	uint8_t  iInterface;
- 
- 	struct usb_endpoint_descriptor *endpoint;
- 
-@@ -155,14 +157,14 @@ struct usb_interface {
- /* Configuration descriptor information.. */
- #define USB_MAXCONFIG		8
- struct usb_config_descriptor {
--	u_int8_t  bLength;
--	u_int8_t  bDescriptorType;
--	u_int16_t wTotalLength;
--	u_int8_t  bNumInterfaces;
--	u_int8_t  bConfigurationValue;
--	u_int8_t  iConfiguration;
--	u_int8_t  bmAttributes;
--	u_int8_t  MaxPower;
-+	uint8_t  bLength;
-+	uint8_t  bDescriptorType;
-+	uint16_t wTotalLength;
-+	uint8_t  bNumInterfaces;
-+	uint8_t  bConfigurationValue;
-+	uint8_t  iConfiguration;
-+	uint8_t  bmAttributes;
-+	uint8_t  MaxPower;
- 
- 	struct usb_interface *interface;
- 
-@@ -172,28 +174,28 @@ struct usb_config_descriptor {
- 
- /* Device descriptor */
- struct usb_device_descriptor {
--	u_int8_t  bLength;
--	u_int8_t  bDescriptorType;
--	u_int16_t bcdUSB;
--	u_int8_t  bDeviceClass;
--	u_int8_t  bDeviceSubClass;
--	u_int8_t  bDeviceProtocol;
--	u_int8_t  bMaxPacketSize0;
--	u_int16_t idVendor;
--	u_int16_t idProduct;
--	u_int16_t bcdDevice;
--	u_int8_t  iManufacturer;
--	u_int8_t  iProduct;
--	u_int8_t  iSerialNumber;
--	u_int8_t  bNumConfigurations;
-+	uint8_t  bLength;
-+	uint8_t  bDescriptorType;
-+	uint16_t bcdUSB;
-+	uint8_t  bDeviceClass;
-+	uint8_t  bDeviceSubClass;
-+	uint8_t  bDeviceProtocol;
-+	uint8_t  bMaxPacketSize0;
-+	uint16_t idVendor;
-+	uint16_t idProduct;
-+	uint16_t bcdDevice;
-+	uint8_t  iManufacturer;
-+	uint8_t  iProduct;
-+	uint8_t  iSerialNumber;
-+	uint8_t  bNumConfigurations;
- };
- 
- struct usb_ctrl_setup {
--	u_int8_t  bRequestType;
--	u_int8_t  bRequest;
--	u_int16_t wValue;
--	u_int16_t wIndex;
--	u_int16_t wLength;
-+	uint8_t  bRequestType;
-+	uint8_t  bRequest;
-+	uint16_t wValue;
-+	uint16_t wIndex;
-+	uint16_t wLength;
- };
- 
- /*
-@@ -254,7 +256,7 @@ struct usb_device {
- 
-   void *dev;		/* Darwin support */
- 
--  u_int8_t devnum;
-+  uint8_t devnum;
- 
-   unsigned char num_children;
-   struct usb_device **children;
-@@ -266,7 +268,7 @@ struct usb_bus {
-   char dirname[PATH_MAX + 1];
- 
-   struct usb_device *devices;
--  u_int32_t location;
-+  uint32_t location;
- 
-   struct usb_device *root_dev;
- };
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
deleted file mode 100644
index 0939c53d83e2..000000000000
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit usr-ldscript multilib-minimal
-
-DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)"
-HOMEPAGE="http://libusb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN/-compat}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
-
-PATCHES=( "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch )
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/libusb-config
-)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-static \
-		$(use_enable debug debug-log)
-}
-
-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
-}