gentoo auto-resync : 09:09:2022 - 10:40:04

author: V3n3RiX <venerix@koprulu.sector> 2022-09-09 10:40:04 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-09-09 10:40:04 +0100
commit: b426a5cef3f0ebe3389686a1c145a834d3a1e120 (patch)
tree: eee77f741af6979f620416c573e5203eab81c9c3 /dev-libs
parent: 97b176c73aa78bd33234884388e3978f520161c3 (diff)
63 files changed, 325 insertions, 686 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index c58d5ef0e54b..98fadd0d2c8f 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/antlr-c/Manifest b/dev-libs/antlr-c/Manifest
index 6e936b1e0b39..ef8ea35092e0 100644
--- a/dev-libs/antlr-c/Manifest
+++ b/dev-libs/antlr-c/Manifest
@@ -1,4 +1,4 @@
 AUX 3.5-cflags.patch 423 BLAKE2B 1605eb4dbc47bdd9f54699a0fe0f0bdc54d419b68d4a99be11c55a654d3167422560e4edbdd59515b65f52d9a7785b103baa9e1e6742be8f9c40eb1985c6cf5e SHA512 fbabfd7db5d373646b873a5b56c6153b39c5287518ced27c4857aa91947998cfe009db143995d8fe93750068f615092edb647ea2a2ededa7a7997e6c741fb638
 DIST antlr-3.5.2.tar.gz 6927126 BLAKE2B 1907229549434dfea6ef1fa915137a2f733bd61f0a40aacb131689df619d1c92e125453ec3d1febc5d92da1841ffbde060af196cff1ca8fb6f4684600375e161 SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99
-EBUILD antlr-c-3.5.2-r1.ebuild 1346 BLAKE2B 0f5514635fddb6cdc833b4e904b846f9a308f0af23bc7fc99deeefcb29cc4a742e9fbc9ac1fef1b23b5174c0755120c834eeeff5659ed2a8d546a029b0ed7fdb SHA512 744d8bf6a9ef64cc197f48369d76f4fb05a57ff25b421d42b0e5e4c6961bdd8b9b4ee4ba3885744a0e6a202a104a8f4ac34675bbb1dc6e6b5532afb0a0708c5a
+EBUILD antlr-c-3.5.2-r2.ebuild 1128 BLAKE2B b8955b16713b8d6572fb8b9ba33d57feea9186e678a4c833ff033300375693b50d615782a59c385eaf42e719ab93ec42ca90ea5dcd157a5026d3b54f1c25dfa2 SHA512 2a85ef45ac7dbe1d446b2949fece7bf5d774ab1033c909bc377e1749082a262a24b3fba40f2dcc02516698909aa5cae1b76cd4969d924ae2ae1ab4414e0394ba
 MISC metadata.xml 337 BLAKE2B e7536e66d5b8bd250838b00b81d494a800134f65625bb11c598f0ed39b4832a962c0894220b02522300c9930e1980bfccb8c70a176d87c2274d6042a7fe832f2 SHA512 1ef902a5485a4156a7994a84820df004fc0d76e6a82da4abd4962954dfa33c74b69c694cf74dd94b9a8ab584746a6ceaaafecc566342faa3764cdd6144b08a3a
diff --git a/dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild b/dev-libs/antlr-c/antlr-c-3.5.2-r2.ebuild
index e0b7a34e56fa..f7a8a0295cdd 100644
--- a/dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild
+++ b/dev-libs/antlr-c/antlr-c-3.5.2-r2.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-inherit autotools multilib-minimal
+inherit autotools
 
 MY_PN="${PN%-c}"
 DESCRIPTION="The ANTLR3 C Runtime"
@@ -19,20 +19,16 @@ IUSE="debug debugger doc"
 BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 PATCHES=( "${FILESDIR}/3.5-cflags.patch" )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/antlr3config.h )
-DOCS=( AUTHORS ChangeLog NEWS README )
 
 src_prepare() {
 	default
+
 	sed -i '/^QUIET/s/NO/YES/' doxyfile || die
 	eautoreconf
-	multilib_copy_sources
 }
 
-multilib_src_configure() {
+src_configure() {
 	local econfargs=(
-		--enable-shared
-		--disable-static
 		$(use_enable debug debuginfo)
 		$(use_enable debugger antlrdebug)
 	)
@@ -42,24 +38,23 @@ multilib_src_configure() {
 		*) econfargs+=( --disable-64bit ) ;;
 	esac
 
-	econf "${econfargs[@]}"
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${econfargs[@]}"
 }
 
 src_compile() {
-	multilib-minimal_src_compile
+	default
 
-	if use doc; then
+	if use doc ; then
 		einfo "Generating API documentation ..."
-		cd "${S}" || die
 		doxygen -u doxyfile || die
 		doxygen doxyfile || die
+
+		HTML_DOCS=( "${S}"/api/ )
 	fi
 }
 
 src_install() {
-	use doc && HTML_DOCS=( "${S}/api/" )
-
-	multilib-minimal_src_install
+	default
 
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest
index b2af2dd74ae6..1c70f7bf789b 100644
--- a/dev-libs/ding-libs/Manifest
+++ b/dev-libs/ding-libs/Manifest
@@ -4,5 +4,5 @@ AUX 0002-validators_ut_check-Fix-fail-with-new-glibc.patch 1944 BLAKE2B cf1971b7
 DIST ding-libs-0.6.1.tar.gz 904092 BLAKE2B 72eda10dfe002f27bb2d096bd96f6a6ee60dc246492fb1cc3581661184d050827aad6a5897aadf9b06db9b6dbd18da756637bd27bcc02742c6318c8cc7e68298 SHA512 335a0925bfa7cc113e86c91ad3f2c8aac12711879d5c9b62660140a4b749335a74024c987fcd2304dd78176362997b3e0ebd745193aaffab7a368e2873118628
 DIST ding-libs-0.6.2.tar.gz 957577 BLAKE2B 7236706b0892e5b56506e89f67305cac54da648b2bd6f21dcf3c330d848e1bc556134c8e7d2efd0a9c8234ea41212d6bd2250ff7feaf84df12ff8ee6b56e0602 SHA512 566172e0addb0ee6e0ebd12874d3b72f2fa6bcb1ecc628c0c529984193290fae554efc40f52d2cec675bffab32a36183e47ec629db25e83ed2995f1049c64703
 EBUILD ding-libs-0.6.1-r1.ebuild 932 BLAKE2B bebbf6d14a083ce22b3121f796353427889dd2149b3760487467316171b73eb37964d9f9fe5605d801d660f4ff5ff0f58167d59826b6eb76e46ba90c8766bb9d SHA512 decbaef04bd6023a0f5a2aed6f811781b1db6e8d455ae9db21b65b07c4c4587a788c36af2f20770b352608d11cbd10603b07e71ea7270aef7d188a30f0c74733
-EBUILD ding-libs-0.6.2.ebuild 729 BLAKE2B 89c671fc7b69cd55891dc096304a93fffd4ef084a2f5ca74d39814a430d60375aa4d711c629e2652f1c673a038659fe628801a832ae4f1ddc3c31ee4e1baabe7 SHA512 0063ad834962523e22da0dcd40f91a5c301f66907714b8d6c139e087b85b592a9a8b97c8a74d587f1b8e4364f9ab606b6d06e1bffec5ec4b6f13e13397aad054
+EBUILD ding-libs-0.6.2-r1.ebuild 628 BLAKE2B cb6bca809b82229e0a8611f420a458e9374376f8f3ea672f8fe484dcfaa784e94f06cfc7435061e6beb5999770f93a8cc4088674548e46d3091cc1f7d0cef5b0 SHA512 da3182534777539b47bfd7d37c19ab08706e1762c797c4ee8864d9a63094c02a3d77fc1fd2faaf8873744e2d4762686ee34dd941df0f96b68fb4fc4ea9394d43
 MISC metadata.xml 247 BLAKE2B cb144c57b3bcd3ce9042d41d2c5fe955abd61d93f348e9bc249d6f8a41172bbdf4b28e83682b8817f202886e6daf757fa0bb825b39eb6409633a323a162ee9f0 SHA512 cb8ffcc6e9e67e555d82ca99bccc6479b0db6e211127a53452d07dc4b106e7e0633ff9c8e0af1b1eccd7b6154ae3d7f61a50e8dbec835fcdca7c070e8cde2f1d
diff --git a/dev-libs/ding-libs/ding-libs-0.6.2.ebuild b/dev-libs/ding-libs/ding-libs-0.6.2-r1.ebuild
index f39708265382..ccd6a03cf4f8 100644
--- a/dev-libs/ding-libs/ding-libs-0.6.2.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.6.2-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=8
 
-inherit multilib-minimal
-
 DESCRIPTION="Set of utility libraries (mostly used by sssd)"
 HOMEPAGE="https://github.com/SSSD/ding-libs"
 SRC_URI="https://github.com/SSSD/ding-libs/releases/download/${PV}/${P}.tar.gz"
@@ -18,13 +16,9 @@ RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-libs/check )"
 BDEPEND="virtual/pkgconfig"
 
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
-
-multilib_src_install_all() {
-	einstalldocs
+src_install() {
+	default
 
-	# no static archives
+	# No static archives
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 03394d80db14..ed1b7d62b2f0 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -2,6 +2,6 @@ AUX ell-0.51-musl-build-time.patch 1449 BLAKE2B 7012ac17e87b9e2cb1a4a16b723bc7b7
 DIST ell-0.51.tar.xz 544744 BLAKE2B ae9cd3bc2d892109f5ae1a602f0f711b350ceb10ce2a7fcced5ce4bca63986a69c350013fc08eed29c9c626cc892b70ba997dda321d7c6c089d465850fabd5e1 SHA512 c2fd2ea9858542e23d46eba96045e1c924531b6a436401e86d838ffee39d0062923861c2898dae76ec9bfb325327c97b13799d81a2324982928b07b1fb898595
 DIST ell-0.52.tar.xz 548816 BLAKE2B 9c2ac4128fe770c1d1a1532fca8a5e36fcb620b9908177acb4fa8f35cea733374199fbe55ae78aac25ff5e37ee71044b6296a38fbbf7ff23fa867e2a338b8287 SHA512 e3cad20e42b71a7c1aae2c8bebe025f7a2bd0e594738aba96ffe8b316e216eb57dc86a5f0b0837d8141b16cae4f150c7b472c60d455feec5d7eb340b960c26d4
 EBUILD ell-0.51.ebuild 1331 BLAKE2B 7d6a254dbf13ae781be3f9f4e4240590cac8f9bc36267bb84f5fda9d7035b01007bc4106d04537daa5fd2828cda7f1343a5f3ccc8258349c01cbdc41344981cf SHA512 287bfa2f891a9097fb7fbf11c96037fa7f875afe1a268863a8a21d77d0c0bcdfb8a7a83044c010a5fa767cd1bf21b7187e8ead14719428db074c8588b1c24cf8
-EBUILD ell-0.52.ebuild 1283 BLAKE2B 95a9314fde42039e022cb71499b4aa66a8aed02eb94559553ced7b469c36cd037809e8a52c9670c0c93b2e8084903fb649f1b94b6c4ec664d9b1763a9de99f4e SHA512 b8c222e493906f46cc0f4449a145f2ada57c8deec8a808c9aa403c71ae6a2a742111a5c2c2658664fc972a4ce59e5c713eb3d9a45eb3f22de04ab790b24320b9
-EBUILD ell-9999.ebuild 1175 BLAKE2B c91500654e555bb6023ac37c0715d240e93d57d5f1e48f1c3a3b6083360a8a2eadcb37a8750730905b9a73abfd0d9e42e55928d884801711ca65ca947629e6a3 SHA512 a402b13afb81a1cb481464581c2210961a5ecb239ac68a638c0f3e117c1e1490cc4ae17c939d25995b1e647104a9713ed628fee4eeb9c396ddbb9dd9e86f6b8b
+EBUILD ell-0.52-r1.ebuild 1175 BLAKE2B 6f34b0b7cd415715039cda1a0fe1387c329cd4f704e96b99adce6b6ea7ae2059a08a24b0041a45cd455b1ec491c7ebc585b414b4afea0182feec5c5fc7c3bb7e SHA512 5a6e778aae87e96794ce29a103e4e4f0591ee8519960a1eefcc3e92d0eb931a2d77fbcbfdf142d0d60da63a4f4e65f31601841282d4fbfabe22af9f4c51ae40e
+EBUILD ell-9999.ebuild 1181 BLAKE2B 882b8780ae8199afea4dda01eedb6e01120646b25fc46b7b7924b6472029abd6716fcd686571234105444a62994f2241ae6577937c6e2bbe3b36222161d7466b SHA512 f8797a2b189c08c3cf29ebf1519970ed4bde3009c0ea3ed21829eface5f7e1fd8a8d541440b858447cb9431e4bc95a31f5178b39230a18c43e3b48b8e4b55155
 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f
diff --git a/dev-libs/ell/ell-0.52.ebuild b/dev-libs/ell/ell-0.52-r1.ebuild
index 58a4b91e1ca6..0220fd7c1acc 100644
--- a/dev-libs/ell/ell-0.52.ebuild
+++ b/dev-libs/ell/ell-0.52-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic linux-info multilib-minimal
+inherit flag-o-matic linux-info
 
 DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
 HOMEPAGE="https://01.org/ell"
@@ -20,7 +20,6 @@ SLOT="0"
 IUSE="pie test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=""
 DEPEND="test? ( sys-apps/dbus )"
 
 CONFIG_CHECK="
@@ -40,17 +39,16 @@ src_prepare() {
 	[[ "${PV}" == *9999 ]] && eautoreconf
 }
 
-multilib_src_configure() {
+src_configure() {
 	append-cflags "-fsigned-char" #662694
 	local myeconfargs=(
 		$(use_enable pie)
 	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	econf "${myeconfargs[@]}"
 }
 
-multilib_src_install_all() {
-	local DOCS=( ChangeLog README )
-	einstalldocs
+src_install() {
+	default
 
 	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/dev-libs/ell/ell-9999.ebuild b/dev-libs/ell/ell-9999.ebuild
index 56c48e4f83d1..8cffe5864e18 100644
--- a/dev-libs/ell/ell-9999.ebuild
+++ b/dev-libs/ell/ell-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic linux-info multilib-minimal
+inherit flag-o-matic linux-info
 
 DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
 HOMEPAGE="https://01.org/ell"
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -20,7 +20,6 @@ SLOT="0"
 IUSE="pie test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=""
 DEPEND="test? ( sys-apps/dbus )"
 
 CONFIG_CHECK="
@@ -35,20 +34,21 @@ CONFIG_CHECK="
 
 src_prepare() {
 	default
+	sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \
+		unit/test-dbus*.c unit/dbus.conf || die
 	[[ "${PV}" == *9999 ]] && eautoreconf
 }
 
-multilib_src_configure() {
+src_configure() {
 	append-cflags "-fsigned-char" #662694
 	local myeconfargs=(
 		$(use_enable pie)
 	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	econf "${myeconfargs[@]}"
 }
 
-multilib_src_install_all() {
-	local DOCS=( ChangeLog README )
-	einstalldocs
+src_install() {
+	default
 
 	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/dev-libs/inih/Manifest b/dev-libs/inih/Manifest
index 84f3fd41549b..41e9ca861cdd 100644
--- a/dev-libs/inih/Manifest
+++ b/dev-libs/inih/Manifest
@@ -1,5 +1,5 @@
 DIST inih-55.tar.gz 18219 BLAKE2B 28b5e04e54e31b3e0392b44799a2c2e75c1fe00527491a857480b7e960302f2438d29652b131dae5147487c863d93f577b67aeff3ab5f863546d3661628d8236 SHA512 bcbef361a4400da017dbed811ad21672b58512d2b2b537cc0058cdeca709dd0d5a9def4045ce1c1972873c3d3d35182123337e4388676f6f0d16e8dbff967b0f
 DIST inih-56.tar.gz 18458 BLAKE2B 51935959a9eb4e393b17302f0932a232963883680f10d404c63d5f2ebbd3bf0b740f44edfa1b2541d0e130016eb853ebedf68a1c40797f658496e2a8c966af3d SHA512 ff3e0910990f73e5b21fddc84737ab346279f201c86c7ad864c6cad9de5bde57c3e0a433b9b8f3585b7d86feaae2ea074185f92891dcadc98c274c1c0745d2d2
 EBUILD inih-55.ebuild 766 BLAKE2B f663eafa557bc2eebfa3a1186d93a198e4d8bd371c8de89c1cf817335105cee5cdb626e5c4323e048d8b4d1d48581f5566469272f7d701f1958c431a9fa1581c SHA512 bafcd6430cb49eac80e2a068f5f6327920040318a2577728db8ca8d345de683f3671fd68c600d69939f8fd76e444812968effdf8212eb167acb10332eb3079ac
-EBUILD inih-56.ebuild 769 BLAKE2B f683f556a1739fe735627000899364169c6a7b5fc268df03f743261c5382c4d8f3e34ebafed185880d6a300ae62f615a13b0e9ba3d28c6dc552471dc754fdf08 SHA512 9a4910ab52f5e5fda92b7c7fa8d6021730f0f5f449574f257f42da490b2d5193e192bd689b414378133632aa9fa288aa1fe4aaa4cadd412652e6d5932785d74c
+EBUILD inih-56-r1.ebuild 750 BLAKE2B b09131a21552af44fcdcf46d35fe451496b37d1eb8e9aa3f3ed2288cab36cd057822f6a42a3db100dab27e6878c9da7a6e6761dd5a4c02232ae518aa4311c39e SHA512 61ab9d2559300dd8d292b54841d330170babbe134f8b81712ed0ed7cd13901328f4148045d7d2df4b5788f5f97b4f1ab1c6fe67942ddd556fa35b4eb1f7e4734
 MISC metadata.xml 520 BLAKE2B d067b0d423cb2ecdeee888a8b6588c1ee3a47d9080a83d0288736fd31d2521956e6dfb970d612ca27f3c9da8103f37e3dd3245eba9b57f9a1ce4d8631695da14 SHA512 47fafee9e35a1827b8d68ab35fea44e8895658dbdd77628f03d31160bbeb915e2cdad81a17c0530d3b0de713fd141999949992feb4c98fabf2ed9bcf717e6b1f
diff --git a/dev-libs/inih/inih-56.ebuild b/dev-libs/inih/inih-56-r1.ebuild
index 813bef4ae86a..512d1d32e36a 100644
--- a/dev-libs/inih/inih-56.ebuild
+++ b/dev-libs/inih/inih-56-r1.ebuild
@@ -1,26 +1,25 @@
 # Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # Tests not wired up to meson and don't seem to be intended for downstream use yet
 # e.g. hardcoding gcc, just a shell script
 
-inherit meson-multilib
+inherit meson
 
 DESCRIPTION="inih (INI not invented here) simple .INI file parser"
 HOMEPAGE="https://github.com/benhoyt/inih"
-
 SRC_URI="https://github.com/benhoyt/inih/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
-S="${WORKDIR}/inih-r${PV}"
+S="${WORKDIR}"/inih-r${PV}
 
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 DOCS=( README.md )
 
-multilib_src_configure() {
+src_configure() {
 	local emesonargs=(
 		-Ddefault_library=shared
 		-Ddistro_install=true
diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index ab2533618f64..999dcfbd6336 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -3,6 +3,6 @@ AUX iniparser-3.0b-cpp.patch 1032 BLAKE2B bc558d7c0263b2fef25a0cca617a717378a203
 AUX iniparser-4.0-out-of-bounds-read.patch 330 BLAKE2B b60d6a3a514d5e5704e2a97c67ead108150375d850d6afe6f57815e9c4b434415596c514632e0575ea1cdf0cb464d6ca12e47780db5cd237bcf38849771ee41a SHA512 f1f01120fbf740cce5749f8ee9ba2014794523bc045999f45ad28a2bd4842d1e822b65fab2feb0751cba074de956c753949fb8b188454daf129c1ba8f0b6a1d4
 DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86
 DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968
-EBUILD iniparser-3.1-r2.ebuild 1253 BLAKE2B 1722b381eb3374c140190731a14fb0107793e7a066b300eca24b38ef82a0ff10258a76dd89269a38ef621edc5fc455d3ee2766a9c231d86d5546cb1977f6e013 SHA512 8dee9bb632dd198ac1bca4d6fe14974abec2a3a67ab99979e772ef956d27d66815df1f5d060c274d5946b8855d33ffffcc58ce68400e6fc4c289a79238acbd96
+EBUILD iniparser-3.1-r3.ebuild 1140 BLAKE2B d9dacd1281ec316faffa1ae80f4b40336fd42d6218259426cb2819cb0c9f098ce371e932b14b8bba8bccf6504dba52c15cba6dc6636cf53beefe73c28a620f21 SHA512 a1aa4ecc7090494dd188fde22d6dc200aef66d5ae05d68c17430de6eaba8e45ad26702f8e8fbd9f5bc0819eb5a5f1093a1d432fc8bc08def200bdde2777687b5
 EBUILD iniparser-4.1.ebuild 1525 BLAKE2B 840cb276b823c10d4a111fbfedbed40eb6e85a1b5742be513be59376c922759712f515e5c3ed32d95c99d1962bad26f9a38bc9338ac4766bc2176fad6aa28058 SHA512 2edc2f0849197b7095c7bfd98f89d0022aaa12c708afddf292f950cfba3810863b38c005fdb2660cba5a3b7f63de4696bf098cc74ad05c58f953d99766b30ce0
 MISC metadata.xml 436 BLAKE2B c0e0cb8638e1b94424e78ee12f2138aa8b66c8e469447760045a8052f996032e33b10b32c3a8ebcd04bb4ade7bacb339aeb3e876e555c83cb5b762c2eb8a3c26 SHA512 6977c3e2fea75ed71b15dadee4af80a45adf591c03e097a4e640adbbc7c7624a6b0711f1216ce92a7f551676db95e3d0c561d5b383961f60a70dc6625282c741
diff --git a/dev-libs/iniparser/iniparser-3.1-r2.ebuild b/dev-libs/iniparser/iniparser-3.1-r3.ebuild
index 43064dc3c80b..4f0dd7a5229f 100644
--- a/dev-libs/iniparser/iniparser-3.1-r2.ebuild
+++ b/dev-libs/iniparser/iniparser-3.1-r3.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-inherit autotools multilib-minimal
+inherit autotools
 
 DESCRIPTION="A free stand-alone ini file parsing library"
 HOMEPAGE="http://ndevilla.free.fr/iniparser/"
@@ -31,18 +31,13 @@ src_prepare() {
 	eautoreconf
 }
 
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-static
-}
-
-multilib_src_install_all() {
+src_install() {
 	if use doc; then
 		emake -C doc
 		HTML_DOCS=( html/. )
 	fi
 
-	einstalldocs
+	default
 
 	if use examples; then
 		docinto examples
@@ -50,6 +45,6 @@ multilib_src_install_all() {
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 
-	# no static archives
+	# No static archives
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/jthread/Manifest b/dev-libs/jthread/Manifest
index 618ec5d0390f..2eead790145d 100644
--- a/dev-libs/jthread/Manifest
+++ b/dev-libs/jthread/Manifest
@@ -1,3 +1,3 @@
 DIST jthread-1.3.3.tar.bz2 8514 BLAKE2B ba24fb73f5b02e64af81f889401cc81acaf8c6d60fcfa0316b92e9356b36f8ec65a9cbf0fb999867ef2b590fe15a46136f165739279b14805d26dce8d55b1b0e SHA512 87c57db51014cd1af87cb4a7f6ac1ccfdff699cf72ff91ecbdb30702c844aad360768261d7bf6391b96639cc17f2fae29f3f3506a333b4ce6ed8a9ba64239e6f
-EBUILD jthread-1.3.3.ebuild 703 BLAKE2B 28f28736056cf74b9873bb64db67ed7e0d07489c1ee8cfc9bcb8e5c24dad9894cae71e9815df183d7cc1a97a6f4d1c1d5415e8f87b7d5deb687e223695a5fcad SHA512 d87966519185c4a4243e265d725f09067eab52fd7ed040c3fa9a60e5120b02bcbcca87e466a0647f2f088e09f9f3030026c5b8d63237b043881c75837a49a21e
+EBUILD jthread-1.3.3-r1.ebuild 618 BLAKE2B 229e14458be1a8e0917cd712f62cd12275fc43ef3b013e5a3b2c4219789d23675ec1edad29bc68f1ccbc46014fe3d3c37880d24ea5c42dd45465a7bbd1a3ddf8 SHA512 29d6fe5d9892d67316679d8e872c17f13823da0b4b116da762c2596371e3f9eaea331129581bc5d3669c213fb3063512bfb6ccd35c1fc5f149369994fe0a73aa
 MISC metadata.xml 248 BLAKE2B 66e4449d4247cee6b9b5f83956e415b9dbb08cf64770a96cbf98d9be71b52f99633ac4724d01684446f72c07e8604ea59c12df34cefda37386d3f43ab1606425 SHA512 01f5f77d52fbb159724187a68a6d5f9fe00ddd3f04657629c8c432dc8290d499779b3920fd3feeb21a8408bacf3c4064fe14827384569c7e044eb6d81dd9dd93
diff --git a/dev-libs/jthread/jthread-1.3.3.ebuild b/dev-libs/jthread/jthread-1.3.3-r1.ebuild
index 07be46306898..d3d9dfc88a32 100644
--- a/dev-libs/jthread/jthread-1.3.3.ebuild
+++ b/dev-libs/jthread/jthread-1.3.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="JThread provides some classes to make use of threads easy on different platforms"
 HOMEPAGE="https://research.edm.uhasselt.be/jori/page/CS/Jthread.html"
@@ -13,14 +13,11 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="amd64 x86"
 
-IUSE="static-libs"
-
 DOCS=( ChangeLog README.md doc/manual.tex )
 
 src_prepare() {
-	# do not build static library, if it is not requested
-	if ! use static-libs; then
-		sed -i -e '/jthread-static/d' src/CMakeLists.txt || die 'sed on src/CMakeLists.txt failed'
-	fi
+	# Do not build static library
+	sed -i -e '/jthread-static/d' src/CMakeLists.txt || die 'sed on src/CMakeLists.txt failed'
+
 	cmake_src_prepare
 }
diff --git a/dev-libs/judy/Manifest b/dev-libs/judy/Manifest
index e3466ed2f32a..8fdc496b58b7 100644
--- a/dev-libs/judy/Manifest
+++ b/dev-libs/judy/Manifest
@@ -1,5 +1,5 @@
 AUX judy-1.0.5-gcc49.patch 3112 BLAKE2B 36550790454e36ddb1c13a3e2addce7aafe126d87f3ca39240460d84033123a518bf0b8162be8226bfeea43c08cf810b3ac2219909ff505903d54ebae42c74ee SHA512 191f64d44d444ee238b8cfe589fcd25471c82978f6a5e34736b7a9631dd72e06542c8f748ce2c2cd434ea40793ac5b9f95a32e95c5559fbbc9aee3f2dc2e7aec
 AUX judy-1.0.5-parallel-make.patch 6736 BLAKE2B 4ba894f81e98a02a83700a061c9fa1f4670ad0b880635fb7812f5a109c14b518598f65c3221cec35bbe1f148b2ab3bf48142734bc74baa15e86604cd6b75f985 SHA512 80f5f361f4cc9f8d5e433ac40f3f4371186025d4fd33b15ae5e80db9d80460c4db94bd6e24d83cfaeebb82328a762d5560464112c7d3f80c5601a7a98f6c5765
 DIST Judy-1.0.5.tar.gz 1147847 BLAKE2B f5f31af2b7d1db5524ff035e9f9b733a4c5c23de76cd4c55bcdc59f7474ee02d7c7ec9341f087736ff6e39a139d20d9ab8298397aaf17f7d48a851037b8677c5 SHA512 1a0d59b092c80d95270a3089cd25ee0ddad1d591101b03784e2e46dfc73bce445a7fb495b449043544a366c09b35b833556053bf3bf65dd00abbd786d26c6980
-EBUILD judy-1.0.5-r3.ebuild 879 BLAKE2B 852ce789874dc9e831be848a3c7c143bee7c9afc28331397795ccd94863476d4ca8948737ba89938614ee540303419ce01dc4e0737ab8202b838aefa2a0e07ae SHA512 ad95a36cafff1c7da107b3094a877404866f6e53e52d4293f109d2a5e6e6c69a2bda7ac08c670ece9e89c1e82fff3bd56b93088ba1024048e3790c4f7923dfb4
+EBUILD judy-1.0.5-r4.ebuild 672 BLAKE2B ab1109e70b7dc9665d3c036ae1672a1b617d1882bd20cb1ab659e018817e3d59ac376419f6c7e8225dee16524cbfca64bb6e085bcebc284623f5cf7d60467ebf SHA512 72b3b16f498b7fadba5190cf68380a403669796053a222fb469bb02379229f169278ae514197101b981ced3fc3872a17e0991e2fa6cb85544a1f462a5ea7a34a
 MISC metadata.xml 321 BLAKE2B 6d6ab94e382db122f3ad8e94e456763f32616c09b1c0bc339b1115f0c7e90c43056fdc48b192f2d1b66e4df563b3b15eab4b76a19498d6ee70b718ba0d5edf3b SHA512 1ec5626e3a8ff786a4d192738e918859f670cf69d432e1769214cb0e5cd69741a4b54ca4ae2ede93fdc69b6a864ed897f0328f193829096dc7664e2bb0285189
diff --git a/dev-libs/judy/judy-1.0.5-r3.ebuild b/dev-libs/judy/judy-1.0.5-r4.ebuild
index 7be4cdf3b359..2be794f72f8f 100644
--- a/dev-libs/judy/judy-1.0.5-r3.ebuild
+++ b/dev-libs/judy/judy-1.0.5-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools
 
 DESCRIPTION="A C library that implements a dynamic array"
 HOMEPAGE="http://judy.sourceforge.net/"
@@ -12,8 +12,6 @@ SRC_URI="mirror://sourceforge/judy/Judy-${PV}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="static-libs"
-DOCS=( AUTHORS ChangeLog README )
 
 src_prepare() {
 	eapply -p0 "${FILESDIR}/${P}-parallel-make.patch"
@@ -21,14 +19,9 @@ src_prepare() {
 	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
 	eapply_user
 	eautoreconf
-	multilib_copy_sources
 }
 
-multilib_src_configure() {
-	ECONF_SOURCE=${BUILD_DIR} econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
+src_install() {
+	default
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libdaemon/Manifest b/dev-libs/libdaemon/Manifest
index 05eb9b86ff96..da11b94aae48 100644
--- a/dev-libs/libdaemon/Manifest
+++ b/dev-libs/libdaemon/Manifest
@@ -1,4 +1,4 @@
 AUX 0.14-man-page-typo-fix.patch 1562 BLAKE2B 3e0bc53ca9cbe959ba6360c6226ee99a822bdd78918791bdcf367775d9f80a9bfcf7e82dcd3b4f45c4f10af31be1bacf4ecdbe119482ac6ee705d99967cf9826 SHA512 19aafe2b9d39484ad01544ad3c7937d98b0e8216de1ed8cd331106004f565a6c094888f1a0fd1f540c790728274079343d5db060a0e1a9647d600cea675994d1
 DIST libdaemon-0.14.tar.gz 340474 BLAKE2B 1dd6ac48e7b9a31f58688c7a59814435059287a30db80dd7c9cf69f9eaba27245424ecdbfd8719a4cf30d9686f4b61bb5e394821f66c05e770c244a0208e8f3f SHA512 a96b25c09bd63cc192c1c5f8b5bf34cc6ad0c32d42ac14b520add611423b6ad3d64091a47e0c7ab9a94476a5e645529abccea3ed6b23596567163fba88131ff2
-EBUILD libdaemon-0.14-r3.ebuild 1439 BLAKE2B a2e4bf02203e21bd62bf8249b962b4081771791c8c9c546933ee80ab1b32c0bb68a08a39d449100d5d2d5dfb474da9493a4482d93ffeba7e2fd088f13f58643e SHA512 d16ceda7c373a297e64cbb5742303bc886b5b565d13928bf0ab1ef5a66974a9138a47a591793b7849a575f1647041eb5d9b89994c8807c68eac22e68c9a0bcc3
+EBUILD libdaemon-0.14-r4.ebuild 1186 BLAKE2B 009ee728c2eeb1a9500a5a485e7822ba9362f7b7b112ecb9debcc4b7b9309ee1bc9dc3444e81e0945313c1d60c9e9f5170b241e1e853870660d912c39e19339d SHA512 b21321cbbf195ed6837b9456ee2dd9c731d79fd57d81f7bd63f7993c1bbad967d5f7ac6ec8a67793a15c7faae06fb928abc45812da4e8e5c39ca0957a1f902f9
 MISC metadata.xml 264 BLAKE2B d8719650b7f42f0fd73819de2c5bea03b775280ea9d8442332f5a47c48d15ecdb91e085f0c9e4d22b0c3850b0049efc0f169a1e147fb21d3ae9b0987b99ee82c SHA512 644fe886ad7c42724a4a622cce4e716461a751eea6307cb04a6a070d3cf5beb46f30c159539b008fcbbee5afbbbc8a4182df448d12b842b30c41f868c7a60e5e
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r4.ebuild
index 6e38f45fae5b..30beecfa0faa 100644
--- a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.14-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools
 
 DESCRIPTION="Simple library for creating daemon processes in C"
 HOMEPAGE="http://0pointer.de/lennart/projects/libdaemon/"
@@ -12,7 +12,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0/5"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc examples static-libs"
+IUSE="doc examples"
 
 BDEPEND="doc? ( app-doc/doxygen )"
 
@@ -27,40 +27,33 @@ src_prepare() {
 	# (elibtoolize is insufficient)
 	# bug #668404
 	eautoreconf
-
-	# doxygen is broken with out-of-source builds
-	multilib_copy_sources
 }
 
-multilib_src_configure() {
-	econf \
-		--localstatedir=/var \
-		--disable-examples \
-		--disable-lynx \
-		$(use_enable static-libs static)
+src_configure() {
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}"/var
+		--disable-examples
+		--disable-lynx
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
-multilib_src_compile() {
+src_compile() {
 	emake
 
-	if multilib_is_native_abi && use doc; then
+	if use doc; then
 		einfo "Building documentation"
 		emake doxygen
-	fi
-}
 
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/README.html doc/style.css doc/reference/html/*
-		doman doc/reference/man/man3/*.h.3
+		HTML_DOCS=( doc/README.html doc/style.css doc/reference/html/. )
 	fi
 }
 
-multilib_src_install_all() {
-	einstalldocs
+src_install() {
+	default
+
+	use doc && doman doc/reference/man/man3/*.h.3
 
 	find "${ED}" -name '*.la' -delete || die
 
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 254e6e72ae53..5ca0788c1090 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -14,6 +14,6 @@ EBUILD libfmt-8.0.1-r1.ebuild 759 BLAKE2B 284fb666372d3c19ffcf0d92881814575ad7f9
 EBUILD libfmt-8.1.1-r1.ebuild 817 BLAKE2B 1b37a334e01cb02318c7f77e5037147a2be99cb1aa10c453ef0db5c29dbca723febbcfb59340ea24e1235a2195936a75ae67170c84add4c6bf65b3ca0568b71e SHA512 c439cdb3988e2cef8cbe2efcd97ba06f61b3c051092ee5ed143a772b9a25751a75bcefb86bd7f055fa05454f48eccf7d18dae4f8e26155a91592610dfe1f3cde
 EBUILD libfmt-8.1.1.ebuild 765 BLAKE2B b734f176937de7e9258cda873b5690d702ebf3b9e3c45f3b197ae8608fd44410e190413bcfff66261b79a3774ee1fd615288ee40d957c61c18cdee56549a6358 SHA512 120127e41cf4b858353ae64b601c9cbfdb60aacc06a53bd7bed3260fcdaf0377be4a32b181bf8736bc3afd30e2386241a359b96e28b593a400786518209eec67
 EBUILD libfmt-9.0.0.ebuild 765 BLAKE2B 34f2ad6148823c50af98d0704b7bbc960899835038d34c739edcfc4935814e3eb864483067b0c8fbb709c6efd10a8566a75225fd28228ccb10de70bd61e7e6fb SHA512 3334906caad2379a7dd4e265ad274a788277c2aa591b19d9cc2401acda3c9cd048a152b8a1101007a69ea838d11b012cfb858656071e4ad274ef3b5224d180d2
-EBUILD libfmt-9.1.0.ebuild 765 BLAKE2B 34f2ad6148823c50af98d0704b7bbc960899835038d34c739edcfc4935814e3eb864483067b0c8fbb709c6efd10a8566a75225fd28228ccb10de70bd61e7e6fb SHA512 3334906caad2379a7dd4e265ad274a788277c2aa591b19d9cc2401acda3c9cd048a152b8a1101007a69ea838d11b012cfb858656071e4ad274ef3b5224d180d2
-EBUILD libfmt-9999.ebuild 765 BLAKE2B 34f2ad6148823c50af98d0704b7bbc960899835038d34c739edcfc4935814e3eb864483067b0c8fbb709c6efd10a8566a75225fd28228ccb10de70bd61e7e6fb SHA512 3334906caad2379a7dd4e265ad274a788277c2aa591b19d9cc2401acda3c9cd048a152b8a1101007a69ea838d11b012cfb858656071e4ad274ef3b5224d180d2
+EBUILD libfmt-9.1.0-r1.ebuild 725 BLAKE2B 66494f629e981ece3c6a28bbbcd75f21203d7013d687d0def461b62c72a52cef7ba5feea15e0219f8d8c06a18ec82169a43b8891ca751de05e7d21ca69935081 SHA512 0994afdab526c5494fa69ecc07f3a285a9a340a99815f61151732c948cfc6bcb7e1e35db8413d1a816a95dd8d69954263a52d1758fce76e2d180d568affde161
+EBUILD libfmt-9999.ebuild 725 BLAKE2B 66494f629e981ece3c6a28bbbcd75f21203d7013d687d0def461b62c72a52cef7ba5feea15e0219f8d8c06a18ec82169a43b8891ca751de05e7d21ca69935081 SHA512 0994afdab526c5494fa69ecc07f3a285a9a340a99815f61151732c948cfc6bcb7e1e35db8413d1a816a95dd8d69954263a52d1758fce76e2d180d568affde161
 MISC metadata.xml 382 BLAKE2B e67d9bbfe9721b994b68130e570826f819088bf0c891073ecf1451a4fb54611e2ed1465588314cf6d1b69be91d7ac2c082da8aa4e2ed5b4d531a40fce7143bac SHA512 21bd1200ee00e4f664b5d992281492c1c4a61229aa408c387280db08a9438f75b2215ef0c0ee1aa9db0d7537bfff074fba54176d44f1f105db611ebe1e45e742
diff --git a/dev-libs/libfmt/libfmt-9.1.0.ebuild b/dev-libs/libfmt/libfmt-9.1.0-r1.ebuild
index d61928901158..4e9f5edae832 100644
--- a/dev-libs/libfmt/libfmt-9.1.0.ebuild
+++ b/dev-libs/libfmt/libfmt-9.1.0-r1.ebuild
@@ -3,15 +3,11 @@
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="Small, safe and fast formatting library"
 HOMEPAGE="https://github.com/fmtlib/fmt"
 
-LICENSE="MIT"
-IUSE="test"
-SLOT="0/${PV}"
-
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
 	inherit git-r3
@@ -21,11 +17,12 @@ else
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
-DEPEND=""
-RDEPEND=""
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
 		-DFMT_LIB_DIR="$(get_libdir)"
diff --git a/dev-libs/libfmt/libfmt-9999.ebuild b/dev-libs/libfmt/libfmt-9999.ebuild
index d61928901158..4e9f5edae832 100644
--- a/dev-libs/libfmt/libfmt-9999.ebuild
+++ b/dev-libs/libfmt/libfmt-9999.ebuild
@@ -3,15 +3,11 @@
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="Small, safe and fast formatting library"
 HOMEPAGE="https://github.com/fmtlib/fmt"
 
-LICENSE="MIT"
-IUSE="test"
-SLOT="0/${PV}"
-
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
 	inherit git-r3
@@ -21,11 +17,12 @@ else
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
-DEPEND=""
-RDEPEND=""
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
 		-DFMT_LIB_DIR="$(get_libdir)"
diff --git a/dev-libs/libgpiod/Manifest b/dev-libs/libgpiod/Manifest
index ac26e1c5072a..685c88263c92 100644
--- a/dev-libs/libgpiod/Manifest
+++ b/dev-libs/libgpiod/Manifest
@@ -2,5 +2,5 @@ DIST libgpiod-1.4.1.tar.xz 314936 BLAKE2B 8949c4a96f69a83a479f5951e6f1eb8fee56db
 DIST libgpiod-1.6.3.tar.xz 326068 BLAKE2B eda5409f2db3914ede92690589643211eca3002f8dc53a7c48213602f28158084c8eb8061319923f7a51c7d91650ff58b81b059323b5b9133a28b0bb04f6904d SHA512 f7e48662d02904f3f25976d61aa2cf4af0b8a52f65f184f23dfb6916bde9b86634b211f2696d3459a4f902ba5a79621b2fc47d18d487fd7a159018fe8933e370
 EBUILD libgpiod-1.4.1.ebuild 1165 BLAKE2B 190c2b8c0bfaf71973fb722717798b663ca73486f2b9724bfe53f4931169cf055451a7bf7fdabccc0689c5e0e148c99596cf3081b75ebdb759de4c562c07ae55 SHA512 b77d0c3b7f7354b99bb648312fb794253cdda9bdf333d29c34e563e4965555a35c201d3568a7881cd123a81fe7a8f48568680c60e2cdcdb728128eb1057a3846
 EBUILD libgpiod-1.6.3-r1.ebuild 1245 BLAKE2B 44b84731ba022664d4ef008a1e4c09d36fb97871b0f34ffddc2d5398d2a2bf7ba1d35b688faf8cb96526d7183d73b8768a94044e7c806df4e60a35c25f63b628 SHA512 f73e26192b56c9727972e9cdd645b97d029e517a2dcd8e9670efd6f8a2f8056137993a83ad924eb20c559052b1261e2d5cce8c9498f704b68429ab536dbfc271
-EBUILD libgpiod-1.6.3-r3.ebuild 1249 BLAKE2B 700463f86e10a47faeab03102c01e18aed3ffd10b8c388473f86a771c23b635ccd0518125fa94db7585908779ee2b520962cc35f6fcfd5799936577b9439ea70 SHA512 ee43b1f706cd189c4f778da2301ae2851e1ae73b9bdf2c4a0df4f3cd840859a0dd5c7e69dc6cb0628f865db6341e985a537862a4d3f49b2c4d3b3ad5b83c0241
+EBUILD libgpiod-1.6.3-r4.ebuild 1057 BLAKE2B 900e49b3e673c8d227e650bbb54329bf5a25be79714e3ee4ba81099b1b3891648d62d4fc2a31f9de5a4402ca8dc58b9141ad20705d7e454ba6a1fea77f61dc01 SHA512 37e8aa6b5f1ba0df5824d2c51118c3de6de8b49859673420a9c57d52151065aa014b700b7a6a31a951c6c183864bf70ff58ec8ea35d0d3c552b73990a594bb2c
 MISC metadata.xml 344 BLAKE2B 3c4f791ae16ba0fa5e2d061ee5aa6795f39b4b2224643b564fcb5f2368a42e349a8d1fa57413a475d48f7038371af321d4758be99658842246403212a22321f3 SHA512 b2d8068c46c3478e2d2251d74f81657c7fcbc320b8d35a56f36e609a118f6858eb62c7905da35ba39c0ae2c98a6bcd0c13418bb9f14176c0d887b5df505a4374
diff --git a/dev-libs/libgpiod/libgpiod-1.6.3-r3.ebuild b/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild
index 83669f2db358..98464819a577 100644
--- a/dev-libs/libgpiod/libgpiod-1.6.3-r3.ebuild
+++ b/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit linux-info multilib-minimal
+inherit linux-info
 
 DESCRIPTION="C library and tools for interacting with the linux GPIO character device"
 HOMEPAGE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/"
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1"
 # Reflects the ABI of libgpiod.so
 SLOT="0/2"
 KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="static-libs +tools cxx python test"
+IUSE="+tools cxx python test"
 RESTRICT="!test? ( test )"
 
 #  --enable-tests          enable libgpiod tests [default=no]
@@ -25,29 +25,20 @@ pkg_setup() {
 	linux-info_pkg_setup
 }
 
-multilib_src_configure() {
+src_configure() {
 	local myconf=(
 		$(use_enable tools)
 		$(use_enable cxx bindings-cxx)
 		$(use_enable test tests)
-		$(multilib_native_use_enable python bindings-python)
+		$(use_enable python bindings-python)
 	)
 
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			--disable-tools
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
-multilib_src_install() {
+src_install() {
 	default
 
 	find "${D}" -name '*.la' -type f -delete || die
-
-	if ! use static-libs; then
-		find "${D}" -name "*.a" -delete || die
-	fi
+	find "${D}" -name "*.a" -delete || die
 }
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 8a874f5cd271..78bd0864ac3b 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,4 +1,4 @@
 DIST libmspack-0.10.1alpha.tar.gz 963274 BLAKE2B 39bcb3b7ea419d6d00850b70c217c802a2095dd4398038e594ae7c01ca12e71508218c1cfca5ae8b102636ab9517b13d55c1e411b31e87d28aa46331cd0127e6 SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245
-EBUILD libmspack-0.10.1_alpha.ebuild 1658 BLAKE2B 18c20da2dad99cbe4bb484953706b2db546f6460326b760d9c1b671af1298cb4ddee51f28c6563bc14c34f3e2c4bc75d55a3a44aa88ce57862af0208ab8e7945 SHA512 1e8187b29048d1553be7a18eb5284669d7bc3024b5b4b0303ea2928c69b64b8c760214073a10d3537d99bba81fdfbd41b7d9c42fb37d692cc44b8670266d2055
-EBUILD libmspack-9999.ebuild 1611 BLAKE2B 929a19e9bb951141d81489cafbb1948849672f3e2b63eef932998e8e4ae3d253dd82711dec3100ff3b0a88de55dab9cde7a3d66346cb57b4cd675cc805fee630 SHA512 4bef68ecd068d8acc5bb4f9c0a891efcc855ae3e51111d985891bd135c8702e6829b27c8798d5cc621ddd9130b64023699ca089f5efbf60ecaf4b1f38c9d417a
+EBUILD libmspack-0.10.1_alpha-r1.ebuild 1356 BLAKE2B dd12598018f5af01cd4ceac2a711f3f0b289237b81e1b68e2fe9d7bbe9d0836ad45de13332a5193da015283fd131b064e4e2dd48eef4c47c404ca5bd3304af44 SHA512 d5f053584b3f49d0069750557c382779a1265bf5837942268cb7d06dca2bba696d6c0cb5fe587c55c03c7e92ceb56cae327cccc25a265cf09ca33e1646ed0bbd
+EBUILD libmspack-9999.ebuild 1356 BLAKE2B dd12598018f5af01cd4ceac2a711f3f0b289237b81e1b68e2fe9d7bbe9d0836ad45de13332a5193da015283fd131b064e4e2dd48eef4c47c404ca5bd3304af44 SHA512 d5f053584b3f49d0069750557c382779a1265bf5837942268cb7d06dca2bba696d6c0cb5fe587c55c03c7e92ceb56cae327cccc25a265cf09ca33e1646ed0bbd
 MISC metadata.xml 330 BLAKE2B 443f1e0e7d08031a118eb3a1936ee027b5f286e30aed7f4dd05be9674985893f3d043ce1da1a44d5adbb3a9306d256ef7900d58957ff63ffc3ed8f57d078a2ed SHA512 6e4a217b11f7776fd45b0f56745be54cc87e49a8641b69c61be13db6a469c899249b39a90155392360fbd264c54796bf59fe3d553028b788604db21b1fe7306c
diff --git a/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild b/dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild
index 35e40b93e7ce..1c6a56dacf44 100644
--- a/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/kyz/libmspack.git"
 	inherit git-r3
 	MY_P="${PN}-9999"
@@ -21,53 +21,47 @@ HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="debug doc static-libs"
-
-DEPEND=""
-RDEPEND=""
+IUSE="debug doc"
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
+	if [[ ${PV} == *9999 ]] ; then
 		# Re-create file layout from release tarball
-		pushd "${WORKDIR}" &>/dev/null || die
+		pushd "${WORKDIR}" > /dev/null || die
+
 		cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die
 		rm -r "${S}" || die
 		mv "${WORKDIR}"/${PN}-source "${S}" || die
-		popd &>/dev/null || die
+
+		popd > /dev/null || die
 	fi
 
 	default
 
 	eautoreconf
-
-	multilib_copy_sources
 }
 
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
+src_configure() {
+	econf $(use_enable debug)
 }
 
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		default
-		cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
-	fi
+src_test() {
+	default
+
+	cd "${S}"/test || die
+	./cabd_test || die
 }
 
-multilib_src_install_all() {
-	DOCS=(AUTHORS ChangeLog NEWS README TODO)
-	use doc && HTML_DOCS=(doc/*)
-	default_src_install
-	if use doc; then
+src_install() {
+	use doc && HTML_DOCS=( doc/. )
+
+	default
+
+	if use doc ; then
 		rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
 	fi
 
 	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
+	find "${ED}" -name "*.a" -delete || die
 }
diff --git a/dev-libs/libmspack/libmspack-9999.ebuild b/dev-libs/libmspack/libmspack-9999.ebuild
index 098660213fe6..1c6a56dacf44 100644
--- a/dev-libs/libmspack/libmspack-9999.ebuild
+++ b/dev-libs/libmspack/libmspack-9999.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/kyz/libmspack.git"
 	inherit git-r3
 	MY_P="${PN}-9999"
 else
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~loong ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
@@ -21,53 +21,47 @@ HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="debug doc static-libs"
-
-DEPEND=""
-RDEPEND=""
+IUSE="debug doc"
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
+	if [[ ${PV} == *9999 ]] ; then
 		# Re-create file layout from release tarball
-		pushd "${WORKDIR}" &>/dev/null || die
+		pushd "${WORKDIR}" > /dev/null || die
+
 		cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die
 		rm -r "${S}" || die
 		mv "${WORKDIR}"/${PN}-source "${S}" || die
-		popd &>/dev/null || die
+
+		popd > /dev/null || die
 	fi
 
 	default
 
 	eautoreconf
-
-	multilib_copy_sources
 }
 
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
+src_configure() {
+	econf $(use_enable debug)
 }
 
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		default
-		cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
-	fi
+src_test() {
+	default
+
+	cd "${S}"/test || die
+	./cabd_test || die
 }
 
-multilib_src_install_all() {
-	DOCS=(AUTHORS ChangeLog NEWS README TODO)
-	use doc && HTML_DOCS=(doc/*)
-	default_src_install
-	if use doc; then
+src_install() {
+	use doc && HTML_DOCS=( doc/. )
+
+	default
+
+	if use doc ; then
 		rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
 	fi
 
 	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
+	find "${ED}" -name "*.a" -delete || die
 }
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index 07aa2df8d4fd..cff5cf29a9fb 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,7 +1,5 @@
-AUX libofx-0.10.6-0001-autotools-fix-LIBOFX_MAJOR_VERSION-and-friends-in-li.patch 1492 BLAKE2B 18332883446eab98d32663950dcd6db179d5fd370a4b6d7a06c00ea4e46336b01b1558123c801392dda559fe7101b326ea1dad3b9818033916340af227fb7952 SHA512 117fb2a008dd11b4b6a49d2dd29407021637923fd1828431e172931dd87bc252e886dd330fb8c09c8ee482114dceb82dda9ac93adbdf6242e440572075c12443
-AUX libofx-0.10.6-0002-autotools-fix-parallel-build-issue-with-ofxconnect-o.patch 1663 BLAKE2B bfd5d53aa1b71ebb1a51f0e5c1159e00b1cc1c62d72342903f8dd24d3f4d6dffc440e8356666bbf415d7faaffd200b93b1eab1eb2c67368fb7c160e51def3e47 SHA512 87574fad469fc29dedf0b9a2744552751b08e5de9fd09a5eba428f1038ee12a54a9f41ddf7847e737879f54cb1eb649d24eb71163561d4126da010e1ea54aaa2
 DIST libofx-0.10.3.tar.gz 225132 BLAKE2B 29dff4cb79a4a535bf255c787e184d103ecdbe975bb4bb223b675bbacaff9f8a228ae0a3dffe7710c2707496ac65c4f48ce993243b8353172c53cb02067d9267 SHA512 6c024628a6a11d9542c669a438223331a033eb820b1a2c3001c60d1ab3fad45ccdec64f9b54dd206fe0058ead8e14e751eb7a3bd88e8f9e1013b0bdd5b6c5242
-DIST libofx-0.10.6.tar.gz 1836880 BLAKE2B 4c5fd24576f969e9ced311e112f183596905bd1225dbfe8646a8f24d545d49fe3b496baadf46e174bfb708ffbaac67b44e746cc8acb8e74509ef5ec22f8f3972 SHA512 8c8a569ca3083c7101c051857d286c3615461fdd88065666d7d6dc53a95d1251a6e5fd44be6cbf54e3591d9ba2b3916c846a4e9e83d6a6c4724e35a193c6a679
+DIST libofx-0.10.7.tar.gz 1420230 BLAKE2B 03a98fa3dc79519a7e84b5c0df1686ef523c2f2209caa4f4cb3e40f2cbac0172956cab107ef4086f0e13aea2898bdd36e7a56140874cbd8a2a88d5634ef988c2 SHA512 da96d24675cf681d007e3d4f7d83f4fc2ca56d991b4128f4e3a870fd66d70302950b24b1e17e78a9795d19704f1af7cd2102929b3290f27204499f42a24502a2
 EBUILD libofx-0.10.3.ebuild 1160 BLAKE2B cdfce6873c28f88c8cdc17b8b640962f494a0ef20e9c02518099ae9498b54eefc103ddaacda063144f7bc28ad7a963fe53503ea8717bc2a02bbbadf3c7f68700 SHA512 da36e60cd6780ab8ce1df578cef553bfec2406e180ad3873098a5cbde535e4a40691ff80daa502f307644c7942e48bd5592758d50eec02a0680e1fa5b6479b7c
-EBUILD libofx-0.10.6-r1.ebuild 1274 BLAKE2B aceedcf170571d43626d9f65815e4129471dc4f6950a2665395a4dbaa98f52255761e74e623d735634fbbf8d43054e270fad37b12dc22b604c4cec25fff2f8b2 SHA512 ffd995b9b5e1f865c99b64bdc8e09de167a8e73b7ff21ecef805ad362c7ee200470cd58931ae885762c599733010224297906e6f2d918e8d8a3b24e801b88359
+EBUILD libofx-0.10.7.ebuild 990 BLAKE2B 8ca537b4aadb23799fafdba8c57aa4c0576219bcf6bb06f41d26ffb15666c2bff3a1ce0383d478c875ea15ba78cddf2cc006a82f85793c79d6ed7f854f6ac903 SHA512 efc48d240828f7a52daa3c434ee5cffa3f68a5e25afdc19a4c0a0c9a4d978795144249282e4272b148d50bba2a9fdf67c9465b395a9393c199bfc789321a8269
 MISC metadata.xml 297 BLAKE2B 819f3298f3f9a816e9630ebce9f8d163b5974cbd76a1e6bf5ad5c499a3e926b887c0396b6f1c8d13e765b3b37cce93188d15b2ff0bef52d98b7f9bb516225bbb SHA512 58f2ece0d8cb8ffb32fc849e42a49cd086c08a0dbd4e03ab78ec51a9224f3ce60c69acaa56712567ee4e1a4d87aabd7830d2a60af1a5669af7a9eb7b4ec4f046
diff --git a/dev-libs/libofx/files/libofx-0.10.6-0001-autotools-fix-LIBOFX_MAJOR_VERSION-and-friends-in-li.patch b/dev-libs/libofx/files/libofx-0.10.6-0001-autotools-fix-LIBOFX_MAJOR_VERSION-and-friends-in-li.patch
deleted file mode 100644
index 283e852fef0f..000000000000
--- a/dev-libs/libofx/files/libofx-0.10.6-0001-autotools-fix-LIBOFX_MAJOR_VERSION-and-friends-in-li.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://github.com/libofx/libofx/pull/77
-
-From a8326e0800c5c28228624005566ae9f37a775367 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 6 Sep 2022 05:47:00 +0100
-Subject: [PATCH 1/2] autotools: fix LIBOFX_MAJOR_VERSION and friends in
- libofx.h
-
-Closes: https://github.com/libofx/libofx/issues/76
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,17 +8,15 @@ dnl Process this file with autoconf to produce a configure script.
- # FUNCTION:
- # implements checks for a variety of system-specific functions
- 
--
--
--LIBOFX_MAJOR_VERSION=0
--LIBOFX_MINOR_VERSION=10
--LIBOFX_MICRO_VERSION=6
--AC_INIT(libofx, 0.10.6)  # must repeat the version number here, sorry
-+AC_INIT([libofx], [0.10.6])  # must repeat the version number here, sorry
-+AC_SUBST([LIBOFX_MAJOR_VERSION], [0])
-+AC_SUBST([LIBOFX_MINOR_VERSION], [10])
-+AC_SUBST([LIBOFX_MICRO_VERSION], [6])
- 
- LIBOFX_VERSION_RELEASE_STRING="$LIBOFX_MAJOR_VERSION.$LIBOFX_MINOR_VERSION.$LIBOFX_MICRO_VERSION"
- 
- AC_CONFIG_SRCDIR(inc/libofx.h.in)
--AM_CONFIG_HEADER(config.h)
-+AM_CONFIG_HEADER([config.h])
- AC_CONFIG_AUX_DIR(config)
- AC_CONFIG_MACRO_DIR(m4)
- AC_PROG_CC
-@@ -57,9 +55,6 @@ CXXFLAGS="-DIN_LIBOFX $CXXFLAGS"
- 
- LIBOFX_VERSION=$LIBOFX_MAJOR_VERSION.$LIBOFX_MINOR_VERSION.$LIBOFX_MICRO_VERSION
- 
--AC_SUBST(LIBOFX_MAJOR_VERSION)
--AC_SUBST(LIBOFX_MINOR_VERSION)
--AC_SUBST(LIBOFX_MICRO_VERSION)
- LIBOFX_BUILD_VERSION=0
- AC_SUBST(LIBOFX_BUILD_VERSION)
- AC_SUBST(LIBOFX_VERSION_RELEASE_STRING)
diff --git a/dev-libs/libofx/files/libofx-0.10.6-0002-autotools-fix-parallel-build-issue-with-ofxconnect-o.patch b/dev-libs/libofx/files/libofx-0.10.6-0002-autotools-fix-parallel-build-issue-with-ofxconnect-o.patch
deleted file mode 100644
index 8288aac50947..000000000000
--- a/dev-libs/libofx/files/libofx-0.10.6-0002-autotools-fix-parallel-build-issue-with-ofxconnect-o.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/libofx/libofx/pull/77
-
-From 55923eba7617c7c4056b21ddf3b569adaea43858 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 6 Sep 2022 06:00:04 +0100
-Subject: [PATCH 2/2] autotools: fix parallel build issue with ofxconnect,
- ofxdump
-
-We need to build the relevant tool before calling help2man, as
-help2man tries to call the tool itself.
-
-Otherwise, we get:
-```
-help2man: can't get `--help' info from ./ofxdump
-Try `--no-discard-stderr' if option outputs to stderr
-make[2]: *** [Makefile:1211: ofxdump.1] Error 127
-make[2]: *** Waiting for unfinished jobs....
-```
-
-Ends up building okay as a workaround with -j1.
-
-Bug: https://github.com/libofx/libofx/pull/56
-See: 0597b8a0a9da3226af0779163fbb3ca389d70bc9
-Fixes: 76dae192b4bf642b311084043cf9d6273dd69bb2
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/ofxconnect/Makefile.am
-+++ b/ofxconnect/Makefile.am
-@@ -23,9 +23,9 @@ EXTRA_DIST = cmdline.ggo test-privateserver.sh CMakeLists.txt
- 
- # See README.privateserver for details on this server and how to get
- # the key needed to run this test.
--TESTS = test-privateserver.sh 
-+TESTS = test-privateserver.sh
- 
--ofxconnect.1: $(top_srcdir)/configure.ac
-+ofxconnect.1: ofxconnect$(EXEEXT)
- if HAVE_HELP2MAN
- 	$(HELP2MAN)  -n 'Create a statement request file' -N --output=ofxconnect.1 ./ofxconnect$(EXEEXT)
- else
---- a/ofxdump/Makefile.am
-+++ b/ofxdump/Makefile.am
-@@ -15,7 +15,7 @@ cmdline.c cmdline.h: cmdline.ggo Makefile
- 
- endif
- 
--ofxdump.1: $(top_srcdir)/configure.ac
-+ofxdump.1: ofxdump$(EXEEXT)
- if HAVE_HELP2MAN
- 	$(HELP2MAN) -n 'Dump content of OFX files as human-readable text' -N --output=ofxdump.1 ./ofxdump$(EXEEXT)
- else
diff --git a/dev-libs/libofx/libofx-0.10.6-r1.ebuild b/dev-libs/libofx/libofx-0.10.7.ebuild
index fb768f5ba89e..87cfdff2482d 100644
--- a/dev-libs/libofx/libofx-0.10.6-r1.ebuild
+++ b/dev-libs/libofx/libofx-0.10.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic
+inherit flag-o-matic
 
 DESCRIPTION="Library to support the Open Financial eXchange XML format"
 HOMEPAGE="https://github.com/libofx/libofx"
@@ -31,18 +31,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.10.6-0001-autotools-fix-LIBOFX_MAJOR_VERSION-and-friends-in-li.patch
-	"${FILESDIR}"/${PN}-0.10.6-0002-autotools-fix-parallel-build-issue-with-ofxconnect-o.patch
-)
-
-src_prepare() {
-	default
-
-	# Needed for header version patch
-	eautoreconf
-}
-
 src_configure() {
 	# bug #566456
 	append-cxxflags -std=c++14
diff --git a/dev-libs/liboil/Manifest b/dev-libs/liboil/Manifest
index 751357ed8679..1b1942b0624e 100644
--- a/dev-libs/liboil/Manifest
+++ b/dev-libs/liboil/Manifest
@@ -1,5 +1,5 @@
 AUX liboil-0.3.17-amd64-cpuid.patch 1040 BLAKE2B 4cf2a34250d08175c7bf466b93fea90c0b4a793561b127a8658ab4bfa354cd8ad5124655a305ae6f4437c504092492151b18b02c7c32fbacafebc8608bd5e82c SHA512 f77100d5e8270cd137b3061904009c8f9f37648e85fa2d82bbeec08d58886dc7a8544a39331ad7854b9db17890092944a74ca12fadc73c24fbc40feacfc50e73
 AUX liboil-0.3.17-x32.patch 7762 BLAKE2B f3402d64fa9ef13e488aa07d7565782b38e585e7ab73e8c6d4c33882ba138734c1369b87ec549850f9cd9b9d2a85cfd0e3972eb038863c1b632fc5ad2c34a9fa SHA512 83201a8a03a3785f228d9bff916928d80fdbf8abeaa27f715956c09b2a2eaffcffcda97e680abbb7b29b3f207531ee935489c1f226796a34968284751ffbd8d5
 DIST liboil-0.3.17.tar.gz 912563 BLAKE2B c7ad7cc4db422fd2a3fd2be01b81a8a2f4c9acbc7407955e30b8ca6d39b79a235f383b4897e01a51a9ed47f4476e321a0bd6522951a125acc2da85f38ea40770 SHA512 26f60d37af8aae435ff17f2aa852a4e52cebd96ef7be04cb4dc14c61bc42160e333e317e5b33f05f6d4b6c819b15c4ecd1d4c03018515252daea26dd4ed60145
-EBUILD liboil-0.3.17-r3.ebuild 1745 BLAKE2B fbea1004b30ef54222e46199ad6327993627ff66ba081b694b99ea17053f24ac93ea8c4333ea9b32d5b6a51e226c30908e35278756b2a981d6d9bb3180a66e09 SHA512 cdf065a30a8cdc71fdcb5bbcf26891949e6031e21067bf6abeeb67d65093c2f35b849d35ec46266f36665ef2f1bde4f903638ef74bb07f32dc34f37596ed0402
+EBUILD liboil-0.3.17-r4.ebuild 1612 BLAKE2B 2a9486c0f8ea7bd8c9d651c7513c18e1763e6e9a049c71053de6d465e75fef799c9d7960fd3d41fc1bafcd24afc8aa1e8bd5e0d021499cc3532587445315d088 SHA512 84c201f2a80c35f816fd9c69bd5da10afe8e9fd61fec6948b31aaa925a77d7e0d4c52c6689c2f2b47dd3eceaf9721cc0a0cc08cb941680d48c2971eb31856253
 MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/dev-libs/liboil/liboil-0.3.17-r3.ebuild b/dev-libs/liboil/liboil-0.3.17-r4.ebuild
index 35619ad3a606..aa2946547264 100644
--- a/dev-libs/liboil/liboil-0.3.17-r3.ebuild
+++ b/dev-libs/liboil/liboil-0.3.17-r4.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-inherit flag-o-matic multilib-minimal
+inherit flag-o-matic
 
 DESCRIPTION="Library of simple functions that are optimized for various CPUs"
 HOMEPAGE="https://liboil.freedesktop.org/"
@@ -24,7 +24,8 @@ BDEPEND="
 PATCHES=( "${FILESDIR}"/${P}-amd64-cpuid.patch )
 
 src_prepare() {
-	has x32 $(get_all_abis) && PATCHES+=( "${FILESDIR}"/${PN}-0.3.17-x32.patch )
+	[[ ${CHOST} == *x32 ]] && PATCHES+=( "${FILESDIR}"/${PN}-0.3.17-x32.patch )
+
 	default
 
 	if ! use examples; then
@@ -46,17 +47,15 @@ src_configure() {
 	# For use with Clang, which is the only compiler on OSX, bug #576646
 	[[ ${CHOST} == *-darwin* ]] && append-flags -fheinous-gnu-extensions
 
-	multilib_src_configure() {
-		ECONF_SOURCE="${S}" econf --disable-static
-	}
-	multilib-minimal_src_configure
+	default
 }
 
-multilib_src_install_all() {
-	einstalldocs
+src_install() {
+	default
+
 	dodoc BUG-REPORTING HACKING
 
-	# no static archives
+	# No static archives
 	find "${ED}" -name '*.la' -delete || die
 }
 
diff --git a/dev-libs/libretls/Manifest b/dev-libs/libretls/Manifest
index 9f27ad259a55..6769e65de069 100644
--- a/dev-libs/libretls/Manifest
+++ b/dev-libs/libretls/Manifest
@@ -1,3 +1,3 @@
 DIST libretls-3.5.2.tar.gz 425404 BLAKE2B b975326c0bd9c2f4adb511f3a6ad4fc8cd9afccd24a3def0c82bf68473b73b93cd83b8b6b3ffb29fc5ba378a9d4fd902dda933f552a02fec374cd56e1690956e SHA512 62eed971cbacb4a50e5ebdad1ea1d57dd3b4f7520634393faf1fc141ef63b6e7d50acbe49747c956fca6b9f2dec8a79ab724df6e08a77858a1624b5a6e3cbe57
-EBUILD libretls-3.5.2.ebuild 738 BLAKE2B bd2c993a2697cd342d36ce1afa6312c200630535b13d1aa0234d3599e1baf5f073ea3588e85e6add4e0d406c87be6d5f49f281c82bf294e7a3afde832ca78db6 SHA512 7dd24878de3fc748235b57bd4b8ddd70987c919a5419a316a30fe3c2e905698f5c9b5ca6ffe99238c08665cb5af879a13e4e9124c345525d0ad5103d597e453c
+EBUILD libretls-3.5.2-r1.ebuild 594 BLAKE2B 01603e44df9e1f07e394eff8cb2ee780b93a92190bca191f5b0945986dc6d5294aab125cc01626b8b0f7edbb111b7c12c0af97afd75d037dfca6d1b1158b3a4f SHA512 ef35a0958c1cc24bce7c73e3a5491f0423c9125d8630fb51f4e5a6182232273045eb0d044a42dcdc4f22f41f423e762be98a419ed2e55aa174bc0d7593afaa59
 MISC metadata.xml 361 BLAKE2B 9f05ddd1ac3e1a634962c9c800c3bdf60554488c61dff9b215866b24e0b2472d7c0873f0fd6bacec2abbab0e79faca728a4b22e34633c3dde64995b05b86db61 SHA512 c7b186da31da21b4ad5c5662325cb2757e3ee8d7cfd84d75a49b07aebd4dc882cb9b0e16ffce99a8ae2409a53dd750dfb5ec6eff0f9da9f4afee013f102ef688
diff --git a/dev-libs/libretls/libretls-3.5.2.ebuild b/dev-libs/libretls/libretls-3.5.2-r1.ebuild
index 6927b1f8e368..fa5b6fa9549c 100644
--- a/dev-libs/libretls/libretls-3.5.2.ebuild
+++ b/dev-libs/libretls/libretls-3.5.2-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=8
 
-inherit multilib-minimal
-
 DESCRIPTION="Port of libtls from LibreSSL to OpenSSL"
 HOMEPAGE="https://git.causal.agency/libretls/about/"
 SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
@@ -23,14 +21,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-multilib_src_configure() {
-	local myconf=(
-		--disable-static
-	)
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install() {
+src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index a2ed26704192..1f67573faa61 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -1,4 +1,4 @@
 DIST libsass-3.6.5.tar.gz 342426 BLAKE2B 8c6bb37da3f832dd462408a7ef4f80384e468295fc420b3d915899e65fb89a9d0b4c1cf0653b7288fedbf6a66daa2943c2911ad2c310f77a06deb84bec1d3abf SHA512 98cc7e12fdf74cd9e92d8d4a62b821956d3ad186fcee9a8d77b677a621342aa161b73d9adad4c1849678a3bac890443120cc8febe1b7429aab374321d635b8f7
-EBUILD libsass-3.6.5.ebuild 1144 BLAKE2B 3919f3ec0fa423e2c5df4e20ed76651e6da8902b1b4694242cd3f5df639429d266d5260d5935685be49f1c539ef0b3fbb3e4843f075384418a06ec2a94eb5c1a SHA512 6528c53873f17ca161585e9de9362958c2caa5c1c0748201ad941b729585c7fbd8769cfe6496c5c8c5ff716b9fa98ee92d0b5138f8449913e7594c3926b65577
-EBUILD libsass-9999.ebuild 1129 BLAKE2B 74ce5b5d25d821a1d6dead5db25a4d5f834dd30b2f9da2e2ee8526a3842b2934b6ec5b8c5b5abdbbf4d97b846eee6aa513588f597011025ea77357667c91f2d8 SHA512 620076a106661dfcd9d332c628732eb9bafbd1db59b7619a0edc312cf7aa9f91417b6def62c12934e1f7201c8527ec52df4549b5c9c873682653df40f8483250
+EBUILD libsass-3.6.5-r1.ebuild 879 BLAKE2B 877c498326d37f5a39fb562a018f614e2650d2a45ffecf82520ef5a65e619e70fd8f3676a8ba6c9f42d4215abee75cb4d79f8e9c52ecc9786bfada44ab5248f2 SHA512 fd910e5c575198c3a8e09e39fdc7738ca7fe638e388e18856ee76ac6d89fedd6fe8deb119e3869ca67348f001ffe5dc1939c458e58a961c2e778e9a044bd2517
+EBUILD libsass-9999.ebuild 879 BLAKE2B 877c498326d37f5a39fb562a018f614e2650d2a45ffecf82520ef5a65e619e70fd8f3676a8ba6c9f42d4215abee75cb4d79f8e9c52ecc9786bfada44ab5248f2 SHA512 fd910e5c575198c3a8e09e39fdc7738ca7fe638e388e18856ee76ac6d89fedd6fe8deb119e3869ca67348f001ffe5dc1939c458e58a961c2e778e9a044bd2517
 MISC metadata.xml 647 BLAKE2B 2043328e18efbefdfaded61e1fd2269d8b83910a2440cfba2c692fd343889087bd861ad70b2f8f96651b9e0af28cae3bb0668177478203b2ebabab3f8764c8ec SHA512 98de3665f1c27ae03a73212a3ee947597dde27846a2f44db6ef19d362566887d999d42daf505e8a938352005e5d7a3b77f0d661e4f2170f2ec225c43442a47ff
diff --git a/dev-libs/libsass/libsass-3.6.5.ebuild b/dev-libs/libsass/libsass-3.6.5-r1.ebuild
index c1a6d0479eb3..80400548f196 100644
--- a/dev-libs/libsass/libsass-3.6.5.ebuild
+++ b/dev-libs/libsass/libsass-3.6.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools
 
 if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/sass/libsass.git"
@@ -17,7 +17,6 @@ DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
 HOMEPAGE="https://github.com/sass/libsass"
 LICENSE="MIT"
 SLOT="0/1" # libsass soname
-IUSE="static-libs"
 
 DOCS=( Readme.md SECURITY.md )
 
@@ -27,27 +26,22 @@ src_prepare() {
 	if [[ ${PV} != *9999 ]]; then
 		[[ -f VERSION ]] || echo "${PV}" > VERSION
 	fi
-	eautoreconf
 
-	# only sane way to deal with various version-related scripts, env variables etc.
-	multilib_copy_sources
+	eautoreconf
 }
 
-multilib_src_configure() {
+src_configure() {
 	local myeconfargs=(
-		$(use_enable static-libs static)
 		--enable-shared
 	)
 
 	econf "${myeconfargs[@]}"
 }
 
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-}
+src_install() {
+	default
+
+	dodoc -r docs
 
-multilib_src_install_all() {
-	einstalldocs
-	dodoc -r "${S}/docs"
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libsass/libsass-9999.ebuild b/dev-libs/libsass/libsass-9999.ebuild
index 04fbd70077d4..80400548f196 100644
--- a/dev-libs/libsass/libsass-9999.ebuild
+++ b/dev-libs/libsass/libsass-9999.ebuild
@@ -1,23 +1,22 @@
-# 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
 
-inherit autotools multilib-minimal
+inherit autotools
 
 if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/sass/libsass.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
 HOMEPAGE="https://github.com/sass/libsass"
 LICENSE="MIT"
 SLOT="0/1" # libsass soname
-IUSE="static-libs"
 
 DOCS=( Readme.md SECURITY.md )
 
@@ -27,27 +26,22 @@ src_prepare() {
 	if [[ ${PV} != *9999 ]]; then
 		[[ -f VERSION ]] || echo "${PV}" > VERSION
 	fi
-	eautoreconf
 
-	# only sane way to deal with various version-related scripts, env variables etc.
-	multilib_copy_sources
+	eautoreconf
 }
 
-multilib_src_configure() {
+src_configure() {
 	local myeconfargs=(
-		$(use_enable static-libs static)
 		--enable-shared
 	)
 
 	econf "${myeconfargs[@]}"
 }
 
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-}
+src_install() {
+	default
+
+	dodoc -r docs
 
-multilib_src_install_all() {
-	einstalldocs
-	dodoc -r "${S}/docs"
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libslz/Manifest b/dev-libs/libslz/Manifest
index 7745402f0b85..66850132e4d7 100644
--- a/dev-libs/libslz/Manifest
+++ b/dev-libs/libslz/Manifest
@@ -1,5 +1,5 @@
 DIST libslz-1.1.0.tar.bz2 229577 BLAKE2B d05b619d0b7b76c2777285ecaf976b75565b50c77e00a1ce042f5a28ab8d527788a75d28d70357a32ea9a98267ae621d5a6e4613e4a7e4f52767e68c77765bb3 SHA512 064e2e8e7091adf863653981e5b677bdb9e64901f61cf3b68f098cf7957a4c32e19cec7d41b8dab61098017119d6ea562350c7fbfa10b5e922f52ac0d6066948
 DIST libslz-1.2.0.tar.bz2 230567 BLAKE2B cf8a21fe0c23ae003830bfae3bd5ae172df4e88f63b0d5c1394c316e9d69c570b544d2c2db76cddd1e320d68119d7ae39352f9932673fb41e06ded030ebc5078 SHA512 811876f3893c0a0c273518fcf6d5a827a86513033e2048dbb541ca32286171c408f124495c4454ce7811e3c52ffb6a7bfcbb08af5b7f56a670c2c1cb2c5cd496
 EBUILD libslz-1.1.0.ebuild 1171 BLAKE2B 198e5fca5067778136ff7a2b50b990879186b073095906e4ac134922386780822f5d6a6d52b8f9122f3a793944c19ce560ac77c24b429f50be1f28607b7d89fb SHA512 4d2e6f3c7b54edd926e9bbe275e999314fb3e7ab577abad77126ae88fbf477b6c2d98a0282d00cdc435228271cd8928eece3cb56a069fccd3d7fd69636a9feb4
-EBUILD libslz-1.2.0.ebuild 1175 BLAKE2B bfe8a7e5cd3d96b435a680a6b041fe4f8902bf99238d82ad4ffac2c26af06f4fdd094b7070c12d92809c5c86068f7f9da08f0aad9e7d48fdf9998833dfd0de4e SHA512 e15a12f2f40ad17b8bf5031f0158c827e2584b171403b454635ce38e23ce47b7238c760ca9e1df3298f227c93e105cb9a01b3337bfa17673e75523f90b5e4f0f
+EBUILD libslz-1.2.0-r1.ebuild 827 BLAKE2B 1fa2258635ce0869ebd64972c5037036791fc72b1b0752f2679d9636e54252af1eaef89f30ae66c05eff13db525ea4c3424d43293127d804ccea444b09efc4ea SHA512 fabb2305828b0a68ec564d8090a7f6b3828b004b66a41d3a4b59b861777d7a895bac0ee578e2e52699d816db4b6dcf94e1d1e2872987e7807715e3a1c71b31b3
 MISC metadata.xml 1191 BLAKE2B 98101432b70c26facdf54b28710ec27afe7ede00aa69840d29d9e0ce0e78b915656d8e9b4dba0fb7eb0332535e2a53fc142d90df1d6a79ca1df7a23a9ca60d44 SHA512 3696dabd8230d673f7077109ff791dab7415c6d7b5466ff0a59633a06ab8415592903232d50832cc9ba64d2bc38bddcbd542a82aaa88384e2277475c406f0adf
diff --git a/dev-libs/libslz/libslz-1.2.0-r1.ebuild b/dev-libs/libslz/libslz-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..8fff4fd6f227
--- /dev/null
+++ b/dev-libs/libslz/libslz-1.2.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Stateless, zlib-compatible, and very fast compression library"
+HOMEPAGE="http://1wt.eu/projects/libslz"
+SRC_URI="http://git.1wt.eu/web?p=${PN}.git;a=snapshot;h=v${PV};sf=tbz2 -> ${P}.tar.bz2"
+S="${WORKDIR}/${PN}"
+
+LICENSE="MIT"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="tools"
+
+src_compile() {
+	local opts=(
+		CC="$(tc-getCC)"
+		OPT_CFLAGS="${CFLAGS}"
+		USR_LFLAGS="${LDFLAGS}"
+		shared
+		$(usev tools)
+	)
+
+	emake "${opts[@]}"
+}
+
+src_install() {
+	local opts=(
+		STRIP=":"
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		install-headers
+		install-shared
+		$(usev tools install-tools)
+	)
+
+	einstalldocs
+
+	emake "${opts[@]}"
+}
diff --git a/dev-libs/libslz/libslz-1.2.0.ebuild b/dev-libs/libslz/libslz-1.2.0.ebuild
deleted file mode 100644
index be90a23d2bc6..000000000000
--- a/dev-libs/libslz/libslz-1.2.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="stateless, zlib-compatible, and very fast compression library"
-HOMEPAGE="http://1wt.eu/projects/libslz"
-SRC_URI="http://git.1wt.eu/web?p=${PN}.git;a=snapshot;h=v${PV};sf=tbz2 -> ${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="static-libs tools"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	local -a opts=(
-		CC="$(tc-getCC)" \
-		OPT_CFLAGS="${CFLAGS}" \
-		USR_LFLAGS="${LDFLAGS}" \
-		shared \
-		$(usex static-libs static '')
-	)
-
-	if multilib_is_native_abi ; then
-		opts+=(
-			$(usex tools tools '')
-		)
-	fi
-
-	emake "${opts[@]}"
-}
-
-multilib_src_install() {
-	local -a opts=(
-		STRIP=":" \
-		DESTDIR="${ED}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		install-headers
-		install-shared \
-		$(usex static-libs install-static '')
-	)
-
-	if multilib_is_native_abi ; then
-		einstalldocs
-
-		opts+=(
-			$(usex tools install-tools '')
-		)
-	fi
-
-	emake "${opts[@]}"
-}
diff --git a/dev-libs/libstrl/Manifest b/dev-libs/libstrl/Manifest
index 60d594c8bdff..2b36a9eb46e3 100644
--- a/dev-libs/libstrl/Manifest
+++ b/dev-libs/libstrl/Manifest
@@ -1,3 +1,3 @@
 DIST libstrl-0.5.1.tar.bz2 259026 BLAKE2B 9f2b576b1a86361f982069a1e7b1c12e0f47918637ed43add261379c195ba9ddeb5b8ca04b0811b75373235c79ff5b254a42c2e3ed360da410039a913137dd60 SHA512 c79b37aef2cf909529e3afabdf472730f9df2eb3605eeb41a74b56f1c9c43a5be1f23c7f383c4b1c2aacb81b9df1d455a3fe9ec1083d5fcabae4c82ef916df92
-EBUILD libstrl-0.5.1-r1.ebuild 736 BLAKE2B 1f87b29a0e88d58fd8a8ed52af3b036c9bd9016cbeb852bb1372ef0915ab71ae856e3178ee7c5c49bb434c4f51ec9437c1ec3c7347eb6ce4e22dfb26667c1b3e SHA512 8a3635c85bde10411e6ddbf1809f16920c84915faa7760fb1255666020c3fa655f4768a230df6d204d07966383cf85a8068f4d63f3a23f0bed8ba25405fa1154
+EBUILD libstrl-0.5.1-r2.ebuild 684 BLAKE2B 932bf55ce17ad9a64b813299698d7487ea0264567d46692c8d73101b2644ec6af464516cd1831c1cb3a5f49823ebb031e93e5da093ae7f34adaa4306a7ef1e8d SHA512 86e7c0bc18d7752a94b140a8ed8a8d0c51d7cb83807f946f19ee233b09537296231643eb7e36763dbf4c2ded35a62ea3c9cf63e8fbeda8277be0975177ef8655
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-libs/libstrl/libstrl-0.5.1-r1.ebuild b/dev-libs/libstrl/libstrl-0.5.1-r2.ebuild
index 33b911319375..13faa3a50256 100644
--- a/dev-libs/libstrl/libstrl-0.5.1-r1.ebuild
+++ b/dev-libs/libstrl/libstrl-0.5.1-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit toolchain-funcs multilib-minimal
+EAPI=8
+
+inherit toolchain-funcs
 
 DESCRIPTION="Compat library for functions like strlcpy(), strlcat(), strnlen(), getline()"
 HOMEPAGE="http://ohnopub.net/~ohnobinki/libstrl/"
@@ -11,23 +12,24 @@ SRC_URI="http://mirror.ohnopub.net/mirror/${P}.tar.bz2"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x64-macos"
-IUSE="doc static-libs test"
+IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+BDEPEND="
 	doc? ( app-doc/doxygen )
 	test? ( dev-libs/check )
 "
 
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
+src_configure() {
 	tc-export AR
+
 	econf \
-		$(use_enable static-libs static) \
 		$(use_with doc doxygen) \
 		$(use_with test check)
 }
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 6ce992303e76..c6c97756c7ab 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -2,6 +2,6 @@ AUX libuv-1.41.0-darwin.patch 1747 BLAKE2B a5a2d3ac70468515e395f69c9a80748d6db26
 DIST libuv-1.44.1.tar.gz 1301786 BLAKE2B 34418fbf8ddffe368b4df8f8b668888ec9f3e369c0d8794efa993ace5c37a3359a020d7868b9287b31abece6d0d3cf839ca412e959a4ee970650755f37247c29 SHA512 050b5f91540d126bef0a35681f8dd347296d3be32671b1c785494e78f5367b4ab064ece3f594523e09b08bcac284377d5fb123ba441fb570d25c5146aa484c8e
 DIST libuv-1.44.2.tar.gz 1309062 BLAKE2B 883a1fbffcd8f55bf28ea5a79ed18aa3e2f2fac126285e8aca2ef9370eafc62f69f95ddb8bf27d4159e038bfb0a01abafdf0dadbc4309e5d31f0e77057ee84ac SHA512 d21c890787b0b364fafa5fc0cbbff296bc2ca269e1991d2f7f35fcb37b8634da377466f5af5a4245425fcf876ae6870d100ab32b12bce64f8e0b01fd25a1bc83
 EBUILD libuv-1.44.1.ebuild 1371 BLAKE2B 01fac1a7a2a09f274b628371ba1aadbc4077a17787eba8f63b92a40f462c0446a70ab5fd829d5bef53df73a78287c31f88c06414210476e84cedce5584624099 SHA512 22b1f916f13eebd76de097934033b5b2a46f9e5fa7a886a15a0fdbde0584e19b132d6c5959ca4fb914de02574a638b834cba9c382a0f6743be312afd27ae4148
-EBUILD libuv-1.44.2.ebuild 1371 BLAKE2B 01fac1a7a2a09f274b628371ba1aadbc4077a17787eba8f63b92a40f462c0446a70ab5fd829d5bef53df73a78287c31f88c06414210476e84cedce5584624099 SHA512 22b1f916f13eebd76de097934033b5b2a46f9e5fa7a886a15a0fdbde0584e19b132d6c5959ca4fb914de02574a638b834cba9c382a0f6743be312afd27ae4148
-EBUILD libuv-9999.ebuild 1379 BLAKE2B 143b79afdc5972a057973b3d93d05384ae95498e45e409bd0867d745698f4340dea6c91f7439506bd029d42bc6a1e65209ec16aa520018609946c4e8626b8061 SHA512 953fde8d3a7289473beec07d585f5c2d0e867f348819705503f90fb1460bd39b78a0fe160ac967593c7911644967c1e43577850bb955c1ae25444220946add2d
+EBUILD libuv-1.44.2-r1.ebuild 1189 BLAKE2B a75f6a472dffb3edf73652722208f93d1bebb851da8303b82c52d81863d6bced0c3d6e1ac7b7922e2be5bec3935dc15b360f11302804c00f521440510ed4b80e SHA512 41172797ae9d03be15dd9e666806f040b06f782dc9df018a6a636690c3d8b361d70b8f33cb46ac1c3c535000f086996016df0a06d73e1ddec92e39c92866841c
+EBUILD libuv-9999.ebuild 1197 BLAKE2B fe59a01a287b40bc6e9368c8121c8035bd7078f7b5fc34446da0a98c5b22a4f28b73aae78ac70f8fd0edcafd1a9305de55cd570bb58110b1de0e0884751c5c08 SHA512 2ddec39b857111852299fb26ee1ad2bb1629714d41e722018cb4e75c234a57b847c23681cdccd29b65ffd0d99d14f29483b915c415e313fb820b533c0c4f3fa4
 MISC metadata.xml 1426 BLAKE2B 79a040706bd2e88560fdf7cdd75226c51384f1b27f8f86798f3a694d1d4b02ce309edef4f1921f73e498533e37deff9051ebdaa6ae565defabe9d4546aa33bd4 SHA512 a6fa2c3217de06d7d324b37b00e0cb19e8d0b192cd10736d32f5d459c701c14a6aa296d7d4d292f7c56120953423df0068f3f71495941295c97e86c283b084d3
diff --git a/dev-libs/libuv/libuv-1.44.2.ebuild b/dev-libs/libuv/libuv-1.44.2-r1.ebuild
index b71cb1bbda54..a994456d8364 100644
--- a/dev-libs/libuv/libuv-1.44.2.ebuild
+++ b/dev-libs/libuv/libuv-1.44.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools
 
 DESCRIPTION="Cross-platform asychronous I/O"
 HOMEPAGE="https://github.com/libuv/libuv"
@@ -34,25 +34,20 @@ src_prepare() {
 		eapply "${FILESDIR}"/${PN}-1.41.0-darwin.patch
 	fi
 
-	# upstream fails to ship a configure script
+	# Upstream fails to ship a configure script
 	eautoreconf
 }
 
-multilib_src_configure() {
+src_configure() {
 	local myeconfargs=(
-		--disable-static
 		cc_cv_cflags__g=no
 	)
 
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	econf "${myeconfargs[@]}"
 }
 
-multilib_src_test() {
-	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+src_install() {
 	default
-}
 
-multilib_src_install_all() {
-	einstalldocs
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libuv/libuv-9999.ebuild b/dev-libs/libuv/libuv-9999.ebuild
index 978959adc0b9..0898d659c88a 100644
--- a/dev-libs/libuv/libuv-9999.ebuild
+++ b/dev-libs/libuv/libuv-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools
 
 DESCRIPTION="Cross-platform asychronous I/O"
 HOMEPAGE="https://github.com/libuv/libuv"
@@ -34,25 +34,20 @@ src_prepare() {
 		eapply "${FILESDIR}"/${PN}-1.41.0-darwin.patch
 	fi
 
-	# upstream fails to ship a configure script
+	# Upstream fails to ship a configure script
 	eautoreconf
 }
 
-multilib_src_configure() {
+src_configure() {
 	local myeconfargs=(
-		--disable-static
 		cc_cv_cflags__g=no
 	)
 
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	econf "${myeconfargs[@]}"
 }
 
-multilib_src_test() {
-	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+src_install() {
 	default
-}
 
-multilib_src_install_all() {
-	einstalldocs
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest
index bacaf9f9d967..cba6e4f314e4 100644
--- a/dev-libs/log4cpp/Manifest
+++ b/dev-libs/log4cpp/Manifest
@@ -6,5 +6,5 @@ AUX log4cpp-1.1-cmath-fix.patch 206 BLAKE2B 7caa58dcb66cc184b1f88a99ea6c6c0d2123
 AUX log4cpp-1.1-glibc-2.31.patch 647 BLAKE2B 80d59c50d322531258f79a8a90385e1565ac0c5658071682dd13ee22b0fba22f1f4b799c4c08a59f07a57eeea2cafa7ffa76902951870854a1dafbf7805abdf2 SHA512 b27fe0c8218dd48c5b72ffc0ba0eb103c610b665777e643929b18b52e23ddf9f6e87bb4c9798f077aaedfcbe1d9ca44342499b15b4c209e5097e7b07269f0fcf
 AUX log4cpp-1.1.3-fix-version.patch 314 BLAKE2B 27dabdf67a2c3a53ff1f10b1c4b2b1796e144213b2ba545ffd800d21bcae22e8248cf53da73d951a3e712b45e2fcac97f4c5d131bf260ca9680699df8ba527ae SHA512 1ecba987f5295d507babff49f3d0d37d7e998ac2014ee430a981f7c64c35f1d10f2a3810bcfd7e8ca037a0fdadac61972ff93bf37cf6f543d7cedc6b836edb49
 DIST log4cpp-1.1.3.tar.gz 595639 BLAKE2B fc7d643aa70d739e38ec5aba127b4e760a47a064f4032690586c4698ec83a2b7f219d8476650d3bfc5e25563de0852869429ec45171233c6bd5c08b69476b169 SHA512 88e5e10bce8d7d6421c3dcf14aa25385159c4ae52becdc1f3666ab86e1ad3f633786d82afe398c517d4faaa57b3e7b7c0b524361d81c6b9040dbded5cecc19de
-EBUILD log4cpp-1.1.3-r1.ebuild 1512 BLAKE2B c53c1e9c2e1aad66ff0afea966a1234835b9b4f2ff024cfe69cca4f080b7da00518cebf50290851debef62e59e91a72ec241447bf52b5d964eb03d5ddefa52da SHA512 e1d80c50bcbd8ba9a745861bb474312ded9e9ac8c8803f44f7a8df1e0ca589cd2e5cb829b25872ed3d74ba4c8786990871395a9dec63d9b51971b9e13109da8c
+EBUILD log4cpp-1.1.3-r2.ebuild 1333 BLAKE2B 9ab435cb3e74cccb276917b37493ac36b65a3b7f3b18039279f4c93ea2222a0587f2e38f321e98a3233e1d0048a9429c92314f3b3dea61be9f9dd187943cc8d9 SHA512 41f0537c2525afdf53a111e34bbaa14c211662993501470953b115ee9bdccd935e0dd2ee54dc037dbb242bd49405e86b72f771672f1d39359855f9760621e9b5
 MISC metadata.xml 245 BLAKE2B fc64c325a442c85782c437edf7e7835b640d7d42d6161da3d4e803c0e81c7e1df99baa33c812e6da007a7286084aa97678109e21c72f684a4b7ab5903f1d281a SHA512 8ae4a6eeb33b2013ef7200430fbd5e9e24c72b8c1f02a7b36d7c62a122c5a10a184e4b86645f1e5ad3ee0b384fd786b2d7d063cdd1befb911f6d4bad7506862a
diff --git a/dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild b/dev-libs/log4cpp/log4cpp-1.1.3-r2.ebuild
index 286862cfccee..b20890c24690 100644
--- a/dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild
+++ b/dev-libs/log4cpp/log4cpp-1.1.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools
 
 DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations"
 HOMEPAGE="http://log4cpp.sourceforge.net/"
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}"
 LICENSE="LGPL-2.1"
 SLOT="0/5"
 KEYWORDS="amd64 ~arm ppc ~riscv ~s390 x86"
-IUSE="doc static-libs test"
+IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="doc? ( app-doc/doxygen )"
@@ -28,10 +28,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.3-fix-version.patch
 )
 
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/log4cpp-config
-)
-
 src_prepare() {
 	default
 
@@ -45,19 +41,18 @@ src_prepare() {
 	eautoreconf
 }
 
-multilib_src_configure() {
+src_configure() {
 	# Bashisms call configure tests to malfunction / config.h to be misgenerated
 	# which then causes a build failure later on in the package (w/ GCC 12,
 	# anyway).
-	CONFIG_SHELL="${BROOT}"/bin/bash ECONF_SOURCE="${S}" econf \
+	CONFIG_SHELL="${BROOT}"/bin/bash econf \
 		--without-idsa \
-		$(multilib_native_use_enable doc doxygen) \
-		$(use_enable static-libs static)
+		$(use_enable doc doxygen)
 }
 
-multilib_src_install_all() {
-	einstalldocs
+src_install() {
+	default
 
 	# Package installs .pc files
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/modsecurity/Manifest b/dev-libs/modsecurity/Manifest
index 17ee6a300e49..0cd443a8be11 100644
--- a/dev-libs/modsecurity/Manifest
+++ b/dev-libs/modsecurity/Manifest
@@ -1,3 +1,3 @@
 DIST modsecurity-v3.0.7.tar.gz 3333372 BLAKE2B f391e2057b95a26a16efaa5f9d86acdd030b2f32d3da3ebac4e5eccdae7c9c6453bdb6b4e2d7f49ce189760d5c5de7d656aa5796fe2723e2e6f5493c93420913 SHA512 d8caf5946b598b16c4481938f22c1116595286811cfdb01d95db95ab061f7045751f2aa98e515df239bceb3f1a6dce2ecd5b24c954bddc27997fa64e9e429730
-EBUILD modsecurity-3.0.7.ebuild 1944 BLAKE2B 398365375f9bfdbab1896b3a9c354cc6d9dbf51768a72d3d05a3d5735e8dd13d57686b88388158eaa1b59f13efc5db7aed8facd3201c81c301e90e95bbfb049d SHA512 6bb8999056c5ab3f2057d167efc55faf58b735ea7ddc90e790755f79879949c3981b729081f0ed3da2df04feb7f8f8a4ae6ce9d1a1191bc02aa182a59f28baee
+EBUILD modsecurity-3.0.7.ebuild 1941 BLAKE2B 37e05e6e7b4859b12e7e507b73309f6995c7b2c5cf729f6d00f506365fc7991fa1ac533df0504cdb63ad0f957f974e6cc118648888102120251887ae9c9249c6 SHA512 25c9d30c8dc13a3e263f7cad5f7d4a14e4136edf3479b9bc1ac67772a9db828ab953b617e1d762c01f01f4f5131a06da6d796272a97b2fa8a99463afde64d6fa
 MISC metadata.xml 1019 BLAKE2B 0873fbb1c328dea3378abbe280dc7adacf389a9f1085614057e328ca7258afb4553c2a37bb527eb80b995d69e428ac7fcb3306e65a84c0e3d17acb6ace270b0b SHA512 549b1dc80684fff950148598807b866ab9400c619d2ecb32f2e7f90f8f298dd47daadd4c33f76af40983ed22ffbbb017c110253d810bab931344dd6f80d8f2ce
diff --git a/dev-libs/modsecurity/modsecurity-3.0.7.ebuild b/dev-libs/modsecurity/modsecurity-3.0.7.ebuild
index 6a604332810b..ca8015c34eda 100644
--- a/dev-libs/modsecurity/modsecurity-3.0.7.ebuild
+++ b/dev-libs/modsecurity/modsecurity-3.0.7.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc fuzzyhash geoip geoip2 json lmdb lua pcre2"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/dev-libs/nanomsg/Manifest b/dev-libs/nanomsg/Manifest
index 137f311e17a0..6e453a0d7142 100644
--- a/dev-libs/nanomsg/Manifest
+++ b/dev-libs/nanomsg/Manifest
@@ -1,3 +1,3 @@
 DIST nanomsg-1.1.5.tar.gz 310739 BLAKE2B be3a6c3b8d41373798909f24f49c24018d99454e431dc64105a554021b1b49c8ed4fc6d14adfef315f5defd38d19482ab3a7625ea54fefea0794f149038ddfd4 SHA512 773b8e169a7accac21414c63972423a249164f5b843c6c65c1b03a2eb90d21da788a98debdeb396dab795e52d30605696bc2cf65e5e05687bf115438d5b22717
-EBUILD nanomsg-1.1.5.ebuild 982 BLAKE2B 40657d5219d19d4574f5169b6a608733845695fc7d7019f5eec007d2c3d71fcabc66ea991552bc4ec66e96c9c6291fc520ecb62ad7d1a8841d25ec72f655d27b SHA512 f3b958aa1ef90473e42f79d09bd7ce7339052f371ad4c0bb53b09fe93bd61f6d37f318c93cc644e3bfc34e06700477e1248c1241838792d9ff0129affc79f66b
+EBUILD nanomsg-1.1.5-r1.ebuild 796 BLAKE2B c15c373b5ba8d2b9069993977ba8588239bed664ec460453afcd687932703c89feda3d1db87bce3946f815bf6094176bdb8eff23cbd29eb73116599d393e22cd SHA512 75d05a3044a06408091e2dc137f0a1b9ca2d524684bd2329726a036350aee3866fae4925b87484b50d73f035bcc2255103e3811808da532f8fc1644dbb6a4cab
 MISC metadata.xml 248 BLAKE2B 491f849b48cddf6768cf7b8bf6914b5331c647f708bcd17372ea461b1d05e249aacef393f6641b7ee5c9da84d2e69588c340a72a426051cd2d29b28399416522 SHA512 f9cad9e1d46fe8f275a70a7e578de6dce7f1e705e599664a74af58a38791cddfa6446c8cceb018c1e77ef01c32ca5b8e8b18aebc22f9239d2f673441af0cfb6e
diff --git a/dev-libs/nanomsg/nanomsg-1.1.5.ebuild b/dev-libs/nanomsg/nanomsg-1.1.5-r1.ebuild
index 43d543afa707..b10243ad377a 100644
--- a/dev-libs/nanomsg/nanomsg-1.1.5.ebuild
+++ b/dev-libs/nanomsg/nanomsg-1.1.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="High-performance messaging interface for distributed applications"
 HOMEPAGE="https://nanomsg.org/"
@@ -14,9 +14,9 @@ SLOT="0/5.0.0"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~riscv x86"
 IUSE="doc"
 
-DEPEND="doc? ( dev-ruby/asciidoctor )"
+BDEPEND="doc? ( dev-ruby/asciidoctor )"
 
-multilib_src_prepare() {
+src_prepare() {
 	# Old CPUs like HPPA fails test because of timeout
 	sed -i \
 		-e '/inproc_shutdown/s/5/80/' \
@@ -26,20 +26,11 @@ multilib_src_prepare() {
 	cmake_src_prepare
 }
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DNN_STATIC_LIB=OFF
+		-DNN_ENABLE_DOC=$(usex doc)
 	)
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DNN_ENABLE_DOC=$(usex doc ON OFF)
-		)
-	else
-		mycmakeargs+=(
-			-DNN_ENABLE_DOC=OFF
-			-DNN_TOOLS=OFF
-			-DNN_ENABLE_NANOCAT=OFF
-		)
-	fi
+
 	cmake_src_configure
 }
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 66be87742d72..76aed4bdffe8 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -6,10 +6,8 @@ AUX nspr-4.7.1-solaris.patch 411 BLAKE2B 0c1f0e621aec9e150bd8c279f46c18256c451b2
 AUX nspr-4.8.4-darwin-install_name.patch 1046 BLAKE2B 1182149b03bd2c03fc4051bf98c61cdd4245da21a51d5f9b10149e12f5326992d587f0fe04bab79c26acee4aa2e4dded5ddf8c697b5cd4f2e34ea730c6ca7fe0 SHA512 dd00bc2108d6c7a64945afeaf97f31189250c90c3d63c86fa2b2b091ef812cc7c5f8c0f17211a02b497f50efc1c3668c840e21a45f514ff1103e22c659e820f2
 AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b29ccce37bab39e10e0e76c433ae5c79839b5f7f9bdaf8b2475c8e3692ff4a57c246dfa4e1fed6866ab284826ee0d SHA512 0bb61dc09d287f1324749c983404e1f03fdf7014fbbd32cc5abe452fc2f32b90b759d8f18d964a61da044b5a7221f5ba274d94c93c07c8a7359e3c937e44b975
 AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc1ef59f0e78f9fd9ddee740a4da3825bafea34f3900200b3f6edefed7d0797c194cb0339d4e36551615d599156108d SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310
-DIST nspr-4.33.tar.gz 1078948 BLAKE2B b46e1c02ab7e5c442288a2cba2868166adb9461950d35fcd76074e3340734057f2b1bbeb3c700f38edf3710323ffd34576dd644814c379033de2a380c54d4fe3 SHA512 8064f826c977f1302a341ca7a7aaf7977b5d10102062c030b1d42b856638e3408ab262447e8c7cfd5a98879b9b1043d17ceae66fbb1e5ed86d6bc3531f26667e
 DIST nspr-4.34.1.tar.gz 1096874 BLAKE2B be12bda63a72d25a60542c5cdadaa7dc59ad2d40d41affc0af5eab07659129ff235a62227a78285e4c00bc72a365b49691658aee7818ffc4c5d014aa0c2b0df7 SHA512 b77226c3fbba6fc9acc90deb8496370dba1384de72ce564524c03bc239846fd17c27d7e1fd7ce99161faafdd8c92413ee58ce1a74a41c786759210bbab478991
 DIST nspr-4.34.tar.gz 1096407 BLAKE2B 61199c1319578570f9569011a2fea8ec6b8c4e8337b03517d1b0e1a22749a7449feb2152c348f3a1d73fefa7aa5067be460f4cbc1728c479309f4a2592424fdf SHA512 4cfac886c14cf7df4c4b79fa1c3bc92e1b14260c9c3018fa2562060d62fecb4e66c0b4e8f7edf4f4823def784a919d99dde88a89674f0cd8a644310b0569ead4
-EBUILD nspr-4.33.ebuild 3959 BLAKE2B 963dea226892adbf2c4009fb4b940db2b3b6d20a0c2a72c5a671d6bbfcbb146ed1ebaf35417f816cb4d009e4f9fac5b17d1d0fce9fe0d61d9a14e964f521f992 SHA512 9ed8ed63e1b298d8efaccb9212cc4370bdd3d6d171c2b909cced7b10b601ca856b3a6f4f66b3a8c794788e34d75351a32f68916da48f8bd7ef226e19548d62a0
-EBUILD nspr-4.34.1.ebuild 4868 BLAKE2B 0ff0994c2c5cb11e0f516a331893d7d1f2d242954d353234deb7acacc01310e1c81b34e1bcd9f409cd1c9ef2d86dd03c7fd56b9929fcc5736a0ccbd6fa92ed24 SHA512 4d1990ea7fa8a352034a9214b5fe3a61d1aa18f9ed55cd2a2033b013dd7e05b8674a030205fc3ce51bd6e9f5af2830f99654c40f62f396fc6468038e87adcbd8
+EBUILD nspr-4.34.1.ebuild 4866 BLAKE2B 697b2da9930276d21da3e593d3c2197c542c1f27189da164f440bd9c7429fcba2d060197d86a7a7f25579d513f5ab5129abfd9244832cc0e1492f6d654d734cf SHA512 01da9399ea5b6d98ef153cc4c8fb56359d485b501031e43b40ba07cd1debff655b5b51bbc62808f2512cbde2f861c8777f185c05b792e8d1ca16a5b60978b675
 EBUILD nspr-4.34.ebuild 4860 BLAKE2B 9cc8a8f045aa6f69987d7285927566dcc4578c1a9d16ae52de238462936565459e5f4a5dec655c4fa70dcb95dcdae461464422b10bf54feacaa2676825743520 SHA512 9e3f5aa90aea50e0c3b5e350d841f5c18a1dd41afa5aa80807454f18c339aa3d95b3e717b77fd1747de5c46f0cf118d1f7efe1ea496259d7a053f76e3a19d60c
 MISC metadata.xml 350 BLAKE2B 0f4d7850a3ca725af4e01a47e4db4219d2465b6d4db8c44e12b8f57d2064fd3c6ddbeec16888a316627f96e1f9415777f3fedecbd7065e4d13516bbed473a6f6 SHA512 2cc7f3e6eefcb5ba16c4b2127e751c47ea7a6822eb71080c96c6850ef741acff8d424c520eb60288ca32ccdbe825568d7aced9f57148e304dddd0afb7f4a8883
diff --git a/dev-libs/nspr/nspr-4.33.ebuild b/dev-libs/nspr/nspr-4.33.ebuild
deleted file mode 100644
index ffaa47314aae..000000000000
--- a/dev-libs/nspr/nspr-4.33.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs multilib-minimal
-
-MIN_PV="$(ver_cut 2)"
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="https://www.mozilla.org/projects/nspr/"
-SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 GPL-2 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 ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nspr-config
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.23-prtime.patch
-	"${FILESDIR}"/${PN}-4.7.1-solaris.patch
-	"${FILESDIR}"/${PN}-4.10.6-solaris.patch
-	"${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
-	"${FILESDIR}"/${PN}-4.8.9-link-flags.patch
-	# We do not need to pass -L$libdir via nspr-config --libs
-	"${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
-	"${FILESDIR}"/${PN}-4.33-loong.patch
-)
-
-src_prepare() {
-	cd "${S}"/nspr || die
-
-	default
-
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
-
-	# rename configure.in to configure.ac for new autotools compatibility
-	if [[ -e "${S}"/nspr/configure.in ]] ; then
-		einfo "Renaming configure.in to configure.ac"
-		mv "${S}"/nspr/configure.{in,ac} || die
-	else
-		elog "configure.in rename logic can be removed from ebuild."
-	fi
-
-	# We must run eautoconf to regenerate configure
-	eautoconf
-
-	# make sure it won't find Perl out of Prefix
-	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-		"${S}"/nspr/config/rules.mk || die
-}
-
-multilib_src_configure() {
-	# We use the standard BUILD_xxx but nspr uses HOST_xxx
-	tc-export_build_env BUILD_CC
-	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
-	tc-export AR AS CC CXX RANLIB
-	[[ ${CBUILD} != ${CHOST} ]] \
-		&& export CROSS_COMPILE=1 \
-		|| unset CROSS_COMPILE
-
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		$(use_enable debug)
-		$(use_enable !debug optimize)
-	)
-
-	# The configure has some fancy --enable-{{n,x}32,64bit} switches
-	# that trigger some code conditional to platform & arch. This really
-	# matters for the few common arches (x86, ppc) but we pass a little
-	# more of them to be future-proof.
-
-	# use ABI first, this will work for most cases
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
-		n32) myconf+=( --enable-n32 );;
-		x32) myconf+=( --enable-x32 );;
-		s390x|*64) myconf+=( --enable-64bit );;
-		default) # no abi actually set, fall back to old check
-			einfo "Running a short build test to determine 64bit'ness"
-			echo > "${T}"/test.c || die
-			${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
-			case $(file "${T}"/test.o) in
-				*32-bit*x86-64*) myconf+=( --enable-x32 );;
-				*64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );;
-				*32-bit*|*ppc*|*i386*) ;;
-				*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
-			esac ;;
-		*) ;;
-	esac
-
-	# Ancient autoconf needs help finding the right tools.
-	LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
-	ac_cv_path_AR="${AR}" \
-	ac_cv_path_AS="${AS}" \
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	# Their build system is royally confusing, as usual
-	MINOR_VERSION=${MIN_PV} # Used for .so version
-	emake DESTDIR="${D}" install
-
-	einfo "removing static libraries as upstream has requested!"
-	rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
-
-	# install nspr-config
-	dobin config/nspr-config
-
-	# Remove stupid files in /usr/bin
-	rm "${ED}"/usr/bin/prerr.properties || die
-
-	# This is used only to generate prerr.c and prerr.h at build time.
-	# No other projects use it, and we don't want to depend on perl.
-	# Talked to upstream and they agreed w/punting.
-	rm "${ED}"/usr/bin/compile-et.pl || die
-}
diff --git a/dev-libs/nspr/nspr-4.34.1.ebuild b/dev-libs/nspr/nspr-4.34.1.ebuild
index 90c38eb08772..0fe881b0b6b4 100644
--- a/dev-libs/nspr/nspr-4.34.1.ebuild
+++ b/dev-libs/nspr/nspr-4.34.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 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 ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nsync/Manifest b/dev-libs/nsync/Manifest
index 6560bc57dba0..4ffac3cf8c13 100644
--- a/dev-libs/nsync/Manifest
+++ b/dev-libs/nsync/Manifest
@@ -1,3 +1,3 @@
 DIST nsync-1.24.0.tar.gz 155132 BLAKE2B 9a914b408faf8fff96a57fd3868c34aa96b4243ef2acd30dbdbe1fc90a1818d58ffc96bc6d016f5539c0e266fc1fb633952edba0a51b115904c9d6b06a35f7f8 SHA512 14dd582488072123a353c967664ed9a3f636865bb35e64d7256dcc809539129fa47c7979a4009fd45c9341cac537a4ca6b4b617ba2cae1d3995a7c251376339f
-EBUILD nsync-1.24.0.ebuild 567 BLAKE2B a4062c628ca78b095c081b8198d1bb66dcfb333bf35155c141c6a250040fe97f6eb1f88d45fa344636dbeb47f7aa75787826a2390604c8dcf3633c7853f81e98 SHA512 4e90a616e8baf8c4c00472f31feaebdb7a1bf94eb31f328dce59420aa37a21dbc55a8bb6f67745affafabb7e9afc80260619953768b6251052e637af14d424db
+EBUILD nsync-1.24.0-r1.ebuild 531 BLAKE2B 1d5ca5c79b29647e351fd8ede1e576753afc2aeb350e1894338223cc71c8f10b79b84dabcd15ca7693be5c033832235a46c2f719ecc5bfaf36edc5ff99181ba6 SHA512 ec9855a88ad1de2784f3639f9e5381bddbf74a58670bd63d73fc6baca4771ea5db0cef4d9c3cd6e1e7e6db288c708c5b8570d831fb0b9b372463cd62b12ff0b4
 MISC metadata.xml 248 BLAKE2B fc6c49e6d2a9807728c39d8b35e23c41446ef45106e9e400926334eecc4fac18c2614dfa18e68888f2e8c7d9356468794734ad0b33bbdf632f690a1c3dc4df34 SHA512 d9e2f282ed49c5ecde0d12d63ebcc971b7c487b9cdac14fe57790cc89a5984ea62bd0ba7c9aed86679598e7704c38f1767e0222d7f54c694f4328a9c4b9d36fa
diff --git a/dev-libs/nsync/nsync-1.24.0.ebuild b/dev-libs/nsync/nsync-1.24.0-r1.ebuild
index 2196157caec6..b707bd898d59 100644
--- a/dev-libs/nsync/nsync-1.24.0.ebuild
+++ b/dev-libs/nsync/nsync-1.24.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="C library that exports various synchronization primitives, such as mutexes"
 HOMEPAGE="https://github.com/google/nsync"
@@ -13,12 +13,9 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
-
 RESTRICT="!test? ( test )"
 
-DOCS=( README )
-
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DNSYNC_ENABLE_TESTS=$(usex test)
 	)
diff --git a/dev-libs/onigmo/Manifest b/dev-libs/onigmo/Manifest
index 5dd43d7770cd..24b8c950e607 100644
--- a/dev-libs/onigmo/Manifest
+++ b/dev-libs/onigmo/Manifest
@@ -1,3 +1,3 @@
 DIST onigmo-6.2.0.tar.gz 844935 BLAKE2B 768918af337be0bbe9fd9c9f15a630ce0a74f081832ef84ba13e48f4e6ed692ff1250e20272c039d95bb4d9b847bfaac829addd7de3f50780b7620b1f105406c SHA512 651ab8c64d8b8c0d56e1549809030be79a751b9d1c06af6527f8cf6014fba1bafea593d572e1cf766099a10fb4e6506ca683ef48131f47471348b5cbd35a1a77
-EBUILD onigmo-6.2.0.ebuild 869 BLAKE2B 0e10f53f852c3685d51210ee50785ca0cdb9a4eb2a266e5007518275758a85384459e304e1e2d96c84c06a39c9ac86e139cb8c4fd89d45bf54097281f8661678 SHA512 86683ba757b9c648b692c59273ad1d412d28a759599d39339ee3d4a24445c64e73552ad6d0819f63fc5d75176b2e9d30c0e5f4fcb0de292b302f17c05ac4c637
+EBUILD onigmo-6.2.0-r1.ebuild 726 BLAKE2B 62d6d7727423b734607199d8e53213e9559a1480013f09b5bd6c5d4d13993809d07160890ba0597140ad32475f673a28ff8c88099149d90bf4791ca27f58a8d2 SHA512 3b424c7bacb1c0310e796b064d1cb26f9da0cb79f21913c01dcc6b8284c70a90f8ec082a62b0f9fb6ceb77dce8bcd00484a205eb7404f82fb8be5f1be966d72f
 MISC metadata.xml 578 BLAKE2B 38a6a9291def49146005a2c79ba2b19920ae4be7f224e7692079d7c3d1741615f0dbf8502931436c71be8616a033919d56d4f39777cf7249d93c4831c7bd38f4 SHA512 7d02bf5155cd3effbaf019f459d5e001145bfbb8f8f4043412090d1b7feb72ea3d7ef3a262181e22ebfc527dea1b0b7010189c83e7c084f755369a9a8cc69c5a
diff --git a/dev-libs/onigmo/onigmo-6.2.0-r1.ebuild b/dev-libs/onigmo/onigmo-6.2.0-r1.ebuild
new file mode 100644
index 000000000000..66151a7a8e68
--- /dev/null
+++ b/dev-libs/onigmo/onigmo-6.2.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Onigmo is a regular expressions library forked from Oniguruma"
+HOMEPAGE="https://github.com/k-takata/Onigmo"
+SRC_URI="https://github.com/k-takata/${PN^o}/releases/download/${P^o}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/6"
+KEYWORDS="amd64 x86"
+IUSE="combination-explosion-check crnl-as-line-terminator"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable combination-explosion-check) \
+		$(use_enable crnl-as-line-terminator)
+}
+
+src_install() {
+	default
+
+	dodoc doc/{API,FAQ,RE}{,.ja} doc/UnicodeProps.txt
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/onigmo/onigmo-6.2.0.ebuild b/dev-libs/onigmo/onigmo-6.2.0.ebuild
deleted file mode 100644
index 21ef5b828dbc..000000000000
--- a/dev-libs/onigmo/onigmo-6.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Onigmo is a regular expressions library forked from Oniguruma"
-HOMEPAGE="https://github.com/k-takata/Onigmo"
-SRC_URI="https://github.com/k-takata/${PN^o}/releases/download/${P^o}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/6"
-KEYWORDS="amd64 x86"
-IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
-
-DOCS=( AUTHORS HISTORY README{,.ja} doc/{API,FAQ,RE}{,.ja} doc/UnicodeProps.txt )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable combination-explosion-check) \
-		$(use_enable crnl-as-line-terminator) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index 35d05ded9fa3..6105a28850f8 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -1,3 +1,3 @@
 DIST tinyxml2-9.0.0.tar.gz 619734 BLAKE2B 9a7bb8b8158417aa505e3d9fcc246b0bede52d6d4d5ff1b5cee891c2b72d1ee43d00ccea001ac24500f52c36320994b3446f3898ab2be1997940dbff526bc78e SHA512 9c5ce8131984690df302ca3e32314573b137180ed522c92fd631692979c942372a28f697fdb3d5e56bcf2d3dc596262b724d088153f3e1d721c9536f2a883367
-EBUILD tinyxml2-9.0.0.ebuild 607 BLAKE2B 041c9dd296d33be0435459ec216d0d1eb88aec96b5c0f42c14427b9e7d2c218a0ab56c2fb08a67fbd93a973c071d07eb5a0f20bf83a3ced3eea92bb6effb7bc6 SHA512 b51fcdac12b064f0b2ef2dee8b96a9dabe2373841efeb1f101e5c1e365995a87461aee28e888b76ca47f3a85a0cc1a7a84aa3629107af37bedc80d33d1b32a2a
+EBUILD tinyxml2-9.0.0-r1.ebuild 593 BLAKE2B 4f5281af1e4857dc2da2e84c9c95579160b48838f87388dba77d561d65bfc2ddfaac08620b64742c1ef9757239df3961281857ba6e2a8812f0301dd3d7a3cc09 SHA512 9169364950535c2999e91a84747edab5d3b259d77095b23a9dcb7d6269e51bf69ef751b599107b9878eb7c2273379e6f9a622107ac0cd2ee4a1cb4e6401bb438
 MISC metadata.xml 355 BLAKE2B 6be5c6bba810888d84a8e4c04a01116b36d2bce9ee5bbdfdb291312fa77e3cc85671e72aa3fe1d5c495d036bfd96930e8b5b3c782b9cc71ecef97729823c0241 SHA512 3c40ff5e22cfa8a3ea1c54e132f6c1d6698fa87659a14862e52267c0f80109527d7a872f92b8dcbcabc6ecbec11b3e51ce4b8329325857d465114c4600c8eed6
diff --git a/dev-libs/tinyxml2/tinyxml2-9.0.0.ebuild b/dev-libs/tinyxml2/tinyxml2-9.0.0-r1.ebuild
index 9299951c20bf..77637717145c 100644
--- a/dev-libs/tinyxml2/tinyxml2-9.0.0.ebuild
+++ b/dev-libs/tinyxml2/tinyxml2-9.0.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="A simple, small, efficient, C++ XML parser"
 HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
@@ -15,7 +15,10 @@ KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-multilib_src_configure() {
-	local mycmakeargs=( -DBUILD_TESTING=$(usex test) )
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+
 	cmake_src_configure
 }
diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest
index 2450b4bb7b9c..8a137b180740 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -8,5 +8,5 @@ AUX tre-issue55-part2.patch 335 BLAKE2B e4c67973f6565e918c17d733bd8d8a1c5e6e67ce
 AUX tre-python3.patch 5186 BLAKE2B c9e08efa47fb8ad00385703c9c7cc9d240eaccacf472c47991426702d4c971857c7c6fd1cac47135153616e4358ccbe1fcd05c04973c3c9164639634926b9c8c SHA512 0fb84b2051b2082f3271e4d47d0bc666ba9e6deb8ea2dfe0201ef4f0708b94b6706726740bfbfcf1ae708f348c63850c1b175ed1f93200934817337a5d23f1d2
 AUX tre-tests.patch 235 BLAKE2B 11c601f9b352dee9e2d36e60c537a4c2969beefd04bdab21c1e00886611d243a6c818b4a8cb484b8a414d3ec07de3e3ce32fde4aaa096bcda307b66225e8179b SHA512 69373229743ad805d4bfbf41def35de930424baaf66c36f35b3cba04860c2de15051ff640d486ec75e85aa20a28863e7937c6876ec443418ba1391e9dbbf4047
 DIST tre-0.8.0_p20210321.tar.gz 146294 BLAKE2B d740bd0e99f50f5e4d8105f5260e43a81b6af9857a21e386e437ab8d48a9e0de23eae03e96cf6b9f4d2d37f72d0fa73ef7343086271ea80f166bdba3f04475a9 SHA512 950c81f681970fc737cfdd6815445f05a018fc742b964cea3ce19f0249c677dd715ece4ff8e543fa9f3fd23b503eafa00aea00dbae063af9bc7e08dc1bc33aed
-EBUILD tre-0.8.0_p20210321-r1.ebuild 2384 BLAKE2B 71455f86ea9d2729ae120af4694d294c330f8612b23d7b7bd4c7baad76cafded9ce5e0fa3e7e4b3ac3415aa632d296cf90a05d8495ce7f1f5044a7108749dcc0 SHA512 7ae52af0db7a2fd2a537b2b4b14a2f9ff53338d799d739f47d92e79aef6d7d8dc0934d5b5b8baf1f7def2f305fd563083945730a53e3933400d7e4df84035b52
+EBUILD tre-0.8.0_p20210321-r1.ebuild 2403 BLAKE2B 93f7e8cc5cf095cdaa8f46ae95b21f64ffdaba19f0e90802bbec1f390bf1979b53f361f0e3d070b2ca1f95aa8a37bf98b48e49290ca440afed5a031caba7dbab SHA512 1729777915c85d1451239928755629c4fb7e9295796ded829e3b916875130d026edc2d80d2ee26a222e07fb6f426dd637baaf37e514aa32be476ce01320ddf57
 MISC metadata.xml 638 BLAKE2B 4e02f7673a19acc091ee21459551e6d40f6a78d5a25cbbffe877d46f0a181067e2163d1ac79d0f7d38ff383b8775abf6f69309ad97b25fd2af55b0ac2223ab40 SHA512 9f725eebbee4753cb05b0adcda1edec2aa50265257db359ca0ec4596761072ec335fffb5a5035cf5ec43c13b8c8a7dd7ed916bbf82acd57c6d8ee5e4c89cb622
diff --git a/dev-libs/tre/tre-0.8.0_p20210321-r1.ebuild b/dev-libs/tre/tre-0.8.0_p20210321-r1.ebuild
index 7ad484a2dea8..3add77d877ac 100644
--- a/dev-libs/tre/tre-0.8.0_p20210321-r1.ebuild
+++ b/dev-libs/tre/tre-0.8.0_p20210321-r1.ebuild
@@ -33,7 +33,8 @@ DEPEND="
 	${RDEPEND}
 	nls? ( sys-devel/gettext )
 "
-BDEPEND="virtual/pkgconfig"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
 
 REQUIRED_USE="
 	agrep? ( approx )
author	V3n3RiX <venerix@koprulu.sector>	2022-09-09 10:40:04 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-09-09 10:40:04 +0100
commit	b426a5cef3f0ebe3389686a1c145a834d3a1e120 (patch)
tree	eee77f741af6979f620416c573e5203eab81c9c3 /dev-libs
parent	97b176c73aa78bd33234884388e3978f520161c3 (diff)