gentoo auto-resync : 02:04:2023 - 23:19:00

8 files changed, 320 insertions, 4 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 13c0e7810e40..3ee54534994b 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index f5810ea6bfde..3736e4bd8443 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -10,10 +10,12 @@ DIST binutils-2.37_p1.tar.xz 22992196 BLAKE2B a8aa0f386d03a5b1466166ac7c40989c22
 DIST binutils-2.38-patches-4.tar.xz 193852 BLAKE2B 5a83e20008e58464ed563a6817a367e50684c59d08c47345cc546054269c42463d1651441720f865851e4e182e917df1a095c68e64226e0351b64e975d524096 SHA512 6657e547bb02898632cc45a8f1894be098aa7472b6725b65f95393e621abb127e468b4e50310720bf03f7e8d0a68bc2c47af76fc43aaa8f32b2e4a149c0c6290
 DIST binutils-2.38.tar.xz 23651408 BLAKE2B 19ede396ec97b88e632aded2f69f4684cc5053109e06c3c4a1934944e3f0ceaa9e4a2604528a440189771f778cb5d75edd510163970eeea31afba87fa256feba SHA512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d
 DIST binutils-2.39-patches-5.tar.xz 82924 BLAKE2B 2cf75f661989f22270d6afe5f3c543814eb6a331be4493016fa2871e1f10a84a123c1c51e77a19b35e46680b9fe77390cb1532ca40d470a6041fa768fed3ccd7 SHA512 4b5811b4822b3a06f590fc7d082dc0ddf18a6058ac23887254e2ee9bd63c7f06f1636e446152115c7e0b01a6c5298a0d9df6904bd1582e66504ccde80dd1ecbd
+DIST binutils-2.39-patches-6.tar.xz 92380 BLAKE2B 39f490f1134fb0e7dc80924a280d3113efe0ed094ee15de97c42ab751c83d2f5aa7448966d8cbbcde722b2af4999a36c1e5aa2f37ca6d2e3942b97b6d90ff152 SHA512 213cd7a86da83987966675f3195e843d898ca4ff412dfc29fd33ed80adb7bbf80a0b2919cd8e7dd49208c73a621ab7b720970f2259418bdc82ed2a568ff62064
 DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79edf72450b9bb8b3525ce525129cef3d2eb90c85ef3bb3270b5a03b0e1ffb8f0b705f028158726f9777ebb8685066f SHA512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3
 DIST binutils-2.40-patches-1.tar.xz 12260 BLAKE2B d525502e08012080417634fd41981550362d4d799952e89f388af2a6e5db5b80e88bfdb0b5b1d2a1bcf8ebda529eefbced8fa2ae84c7fe3ddb10184e98d4b369 SHA512 140f80be786511f63651e67bf25c2992de6a21bac00a3252dcf98becc3f9379c8070ef1380d5542bbf2e1908c50dab2c7ebb651d13bb97609594fe9fd9f1f079
 DIST binutils-2.40-patches-2.tar.xz 183760 BLAKE2B 447f1c40ac8212b1e91f6f2137f87958c3f4e2366b11b9979d9d09d52e9fcde9a9d74f0c1871616157e001f505849fceb2097a512f434b9c848885e367a07c35 SHA512 30efbfcbd2d936c74d9480e4f2f4b8dcd30abcd0f1b22d21d20558002fdb8c90bd2fe97e3f27c2905714dcfd1297cac2646ede1e2c3d9fbf159f93c8cf01a290
 DIST binutils-2.40-patches-3.tar.xz 259432 BLAKE2B 03b9024e658a5860d54b9087f3e1cc4b417a2501d6a1744c44759bbc99cabd5938058ba2909b16cc999208187998094aa6ab5464e5ed54b87ea0b1eef007e85c SHA512 f2f3e38f5c0c2928ed0588ee42be74d43486d209b43249f73ae133c4c1f81491c86b14df2ddecbc37df6fe80b27b0eab6c3f319e44854e91596dfbd3ec37b8aa
+DIST binutils-2.40-patches-4.tar.xz 264420 BLAKE2B 70acdc15f64a45cda49ebd7c252d909db2fe659f5c2c0866c50fd710415fd34bd88f9c5cd5ba07beef1e7de7fe827bb40f835fb79ff10e00fc50451e3a8cab33 SHA512 5f0a080841cb3a032cbe7b135ba38bebeae0b0e444623887bdcb92a3adcf804701524eff840f108a9544293f5ac307b4a8d9509176abfeaea6c461b2ea5c0886
 DIST binutils-2.40.tar.xz 25241484 BLAKE2B 8d799f7c595f878b9af5b17a490021dd8b8300ac2fe0ed8574c012929d22d2d0493e003a3e631a9436e8e712da801779b777c566167fe42b0bde119ffa5ad1c2 SHA512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925
 EBUILD binutils-libs-2.34-r2.ebuild 3678 BLAKE2B 2ecd619f2dd9968a11a3c8c2cf8f65d30d7191163bc6fd5ae1fc7d6dfad4bb30b061e5029fc7d2a23c1b7d0a4ca142532b8175b593d9d0ac408338c39cc02e60 SHA512 3ae489fa333ea206ce758f102a56ebbde7a59fa817720503eb1287c4d1d156598cbe7bc78beb2f0ab85f6f60c32f753d4c66cb0428dcbeb13d873407a4c86335
 EBUILD binutils-libs-2.35.2.ebuild 4100 BLAKE2B 521acb4f160e171efd6500aba598825f50c19b62f77689b208dcca260396aa1a2c769937db49b147a51e7645baa1fd72f13559fa15e5fced7c8bd57088575027 SHA512 628c171049d6fae374538a96ad7cc76463d78e562d16fbd5877ab7b0800b026e9c72f3b346ec2e3e92a9c5836c483e0eec226c5ac2ecc8e71c2c66c6c8c5b844
@@ -21,7 +23,9 @@ EBUILD binutils-libs-2.36.1-r2.ebuild 4053 BLAKE2B 1d2c9609ce0fa3aff3222d89ee237
 EBUILD binutils-libs-2.37_p1-r2.ebuild 4126 BLAKE2B 63dcef180b378d47d48f714e095ff2ce98dcd027de0d176c64179fcfe1f48df5f451468fb974176ade21914f4ba731487b91b03223eba11662be17cb3b42c9c1 SHA512 c659774de8238e81669507dfd5b2a565b5deaa8c54fe12ee02f5b3b204a147b2aea5bb9a6707930d0ac3ca10225ce486f294e510402b37c99ee1f6c170c31ecc
 EBUILD binutils-libs-2.38-r2.ebuild 4803 BLAKE2B 60922f7c60d381f778474a74497a70c652033a92f0fbbac3fab30a2fe4c4a88afcb4931a3914a4c5ca6a853653f83f941253398128dddf21636e8eb95643265e SHA512 f479a863a002bc373c188ccc55c5ad9c2791d32dc64af9cd3e5896204b6e0438a52035622697888e7fc16a0bf7d3df79c3eea2ec8c2e3b4c443b82637a1dbd0d
 EBUILD binutils-libs-2.39-r4.ebuild 4811 BLAKE2B 0aa3431de9e88fbcaece3c177db1a154f0b72c62249905e38bedb3852525247700d7aca738d9fce5eb52b9db6ef76d5643e47b2a3482f9c160475cfc456788e3 SHA512 dc3988a84c0d9389c9674852b7348788e6bbc9cffd445289f8ac51a2964b761546dfbafb4ba229fed6d6b63fe9b8b0fe6f5db3a72cc79824f877adaacc4d2a25
+EBUILD binutils-libs-2.39-r5.ebuild 4819 BLAKE2B 9e215afc50bcb5f8571fd00e6ee6b4dffdffb32341cb792942e99ba6660d7ec68a365359a6220ff2f64276f070ec7e590337b8e451226f3c0b5f4551b4005e2f SHA512 fc5bbc4aea8c45572349b4a7f6865b4ffcec103a1c38268b6cd3031f89b51d34ced889ee4934e16dd3f0b40dc95e5d7bd48b5957fe22b713c0d45cf599473e9c
 EBUILD binutils-libs-2.40-r1.ebuild 4994 BLAKE2B 78e60c130edcb858d4d59431d5e3bd4155907705360bca7b319715f5379c74168434c8e51eb4a7ca1875be6de5fb1d43a3c54234d6190c385abff8b692dbb0dc SHA512 62941ebb14792cdb681d5c8440b9c3f15ff324f4a9f745fc98d9d2833e5acafb5f3150fd9fe181bf3fff66191209649f1487fdb313dd5214acacad09be48c444
 EBUILD binutils-libs-2.40-r2.ebuild 4994 BLAKE2B fe234258a71935449d03dc0c693031510320ba420e963a2305db965883ad95e8570f89a28094683c5814f37182b65dc4a57d81453154637da5cbe319728ba670 SHA512 fc92764c33603132baadb0e041be9fd68e0532dbf841250884f96e84dc0e8972de5256500a81e08cf079d9be8680d041b96b409c57387835e06e401560de5d02
 EBUILD binutils-libs-2.40-r3.ebuild 4994 BLAKE2B a76c37c0520f4718d13e4e360575ffb094a7f0bd3e6101437107f5d0ab9600715dbc0ea0b9b695f119c8742afeb7475f99b598b8f1a589e84f1889e4b0f17804 SHA512 e7cd40f4ce8725a4fc987ae61da6785d8537fa797285670494a201d5829fcd9bf1ff95b95ad9ed1aa3bc34f8c1e948dfd41753fa5078842e64fafb69e33ab36f
+EBUILD binutils-libs-2.40-r4.ebuild 4994 BLAKE2B ca0c54ee3becdc7dbea81042f94d77afaa0212d7c0628bd91a405608a03f84491285e9ef0ba420806845fea886ee4e36b2e59afbc75c48e3636af5a91d4d9e16 SHA512 4d597a319c0e50720a94fbfcf8eb88dc52c6a3ec008f5fd3016b8d24c84831281d12dd4f45ac1400784a669bcd93f362e70fa447fc1eba5af19217d92d885f92
 MISC metadata.xml 612 BLAKE2B ceaafd9fd1421e9f3993e003d0029c92a78054c7a2b90bd78afc05370ad19c931c6a7c150545cfb7d57165168e0fdaf3a00dde1905b328826a91cbc70d9548a8 SHA512 c8d33bb8d1c62c7e95758624ed0febbc9d40e9f141bfd280837b3207bcd771412158d71c0cb5548d60be0b236f6fe103621daf7efa8875191982859b566ffa8d
diff --git a/sys-libs/binutils-libs/binutils-libs-2.39-r5.ebuild b/sys-libs/binutils-libs/binutils-libs-2.39-r5.ebuild
new file mode 100644
index 000000000000..05f6b752897d
--- /dev/null
+++ b/sys-libs/binutils-libs/binutils-libs-2.39-r5.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCH_VER=6
+PATCH_DEV=dilfridge
+
+inherit libtool toolchain-funcs multilib-minimal
+
+MY_PN="binutils"
+MY_P="${MY_PN}-${PV}"
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+PATCH_DEV=${PATCH_DEV:-dilfridge}
+
+DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
+HOMEPAGE="https://sourceware.org/binutils/"
+SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0/${PV%_p?}"
+IUSE="64-bit-bfd cet multitarget nls static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
+# Need a newer binutils-config that'll reset include/lib symlinks for us.
+RDEPEND="${DEPEND}
+	>=sys-devel/binutils-config-5
+"
+
+S="${WORKDIR}/${MY_P%_p?}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/bfd.h
+)
+
+src_prepare() {
+	if [[ -n ${PATCH_VER} ]] ; then
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# Fix cross-compile relinking issue, bug #626402
+	elibtoolize
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# somehow libtool/configure is messed up and (custom patch at
+		# upstream?) and misdetects (basically assumes) nm can be called
+		# with -B arg -- can't run eautoreconf (fails), so patch up
+		# manually, this would break any target that needs -B to nm
+		sed -i -e 's/lt_cv_path_NM="$tmp_nm -B"/lt_cv_path_NM="$tmp_nm"/' \
+			libctf/configure || die
+	fi
+
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
+	default
+}
+
+pkgversion() {
+	printf "Gentoo ${PVR}"
+	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="https://bugs.gentoo.org/"
+		--with-pkgversion="$(pkgversion)"
+		$(use_enable static-libs static)
+		# The binutils eclass enables this flag for all bi-arch builds,
+		# but other tools often don't care about that support.  Put it
+		# beyond a flag if people really want it, but otherwise leave
+		# it disabled as it can slow things down on 32bit arches. #438522
+		$(use_enable 64-bit-bfd)
+		# This only disables building in the zlib subdir.
+		# For binutils itself, it'll use the system version. #591516
+		--without-zlib
+		--with-system-zlib
+		# We only care about the libs, so disable programs. #528088
+		--disable-{binutils,etc,ld,gas,gold,gprof,gprofng}
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# We pull in all USE-flags that change ABI in an incompatible
+		# way. #666100
+		# USE=multitarget change size of global arrays
+		# USE=64-bit-bfd changes data structures of exported API
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def)
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+	)
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	use nls \
+		&& myconf+=( --without-included-gettext ) \
+		|| myconf+=( --disable-nls )
+
+	if [[ ${CHOST} == *-darwin* ]] && use nls ; then
+		# fix underlinking in opcodes
+		sed -i -e 's/@SHARED_LDFLAGS@/@SHARED_LDFLAGS@ -lintl/' \
+			"${S}"/opcodes/Makefile.in || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# Prevent makeinfo from running as we don't build docs here.
+	# bug #622652
+	sed -i \
+		-e '/^MAKEINFO/s:=.*:= true:' \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	emake V=1
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install
+
+	# Provide libiberty.h directly.
+	dosym libiberty/libiberty.h /usr/include/libiberty.h
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/sys-libs/binutils-libs/binutils-libs-2.40-r4.ebuild b/sys-libs/binutils-libs/binutils-libs-2.40-r4.ebuild
new file mode 100644
index 000000000000..728495450eff
--- /dev/null
+++ b/sys-libs/binutils-libs/binutils-libs-2.40-r4.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCH_VER=4
+PATCH_DEV=dilfridge
+
+inherit libtool toolchain-funcs multilib-minimal
+
+MY_PN="binutils"
+MY_P="${MY_PN}-${PV}"
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+PATCH_DEV=${PATCH_DEV:-dilfridge}
+
+DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
+HOMEPAGE="https://sourceware.org/binutils/"
+SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_P}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0/${PV%_p?}"
+IUSE="64-bit-bfd cet multitarget nls static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
+# Need a newer binutils-config that'll reset include/lib symlinks for us.
+RDEPEND="${DEPEND}
+	>=sys-devel/binutils-config-5
+"
+
+S="${WORKDIR}/${MY_P%_p?}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/bfd.h
+)
+
+src_prepare() {
+	if [[ -n ${PATCH_VER} ]] ; then
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# Fix cross-compile relinking issue, bug #626402
+	elibtoolize
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# somehow libtool/configure is messed up and (custom patch at
+		# upstream?) and misdetects (basically assumes) nm can be called
+		# with -B arg -- can't run eautoreconf (fails), so patch up
+		# manually, this would break any target that needs -B to nm
+		sed -i -e 's/lt_cv_path_NM="$tmp_nm -B"/lt_cv_path_NM="$tmp_nm"/' \
+			libctf/configure || die
+	fi
+
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	export MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
+	default
+}
+
+pkgversion() {
+	printf "Gentoo ${PVR}"
+	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="https://bugs.gentoo.org/"
+		--with-pkgversion="$(pkgversion)"
+		$(use_enable static-libs static)
+		# The binutils eclass enables this flag for all bi-arch builds,
+		# but other tools often don't care about that support.  Put it
+		# beyond a flag if people really want it, but otherwise leave
+		# it disabled as it can slow things down on 32bit arches. #438522
+		$(use_enable 64-bit-bfd)
+		# This only disables building in the zlib subdir.
+		# For binutils itself, it'll use the system version. #591516
+		--without-zlib
+		--with-system-zlib
+		# We only care about the libs, so disable programs. #528088
+		--disable-{binutils,etc,ld,gas,gold,gprof,gprofng}
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# We pull in all USE-flags that change ABI in an incompatible
+		# way. #666100
+		# USE=multitarget change size of global arrays
+		# USE=64-bit-bfd changes data structures of exported API
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def)
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		# Revisit if it's useful, we do have binutils[zstd] though
+		--without-zstd
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+	)
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	use nls \
+		&& myconf+=( --without-included-gettext ) \
+		|| myconf+=( --disable-nls )
+
+	if [[ ${CHOST} == *-darwin* ]] && use nls ; then
+		# fix underlinking in opcodes
+		sed -i -e 's/@SHARED_LDFLAGS@/@SHARED_LDFLAGS@ -lintl/' \
+			"${S}"/opcodes/Makefile.in || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# Prevent makeinfo from running as we don't build docs here.
+	# bug #622652
+	sed -i \
+		-e '/^MAKEINFO/s:=.*:= true:' \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	emake V=1
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install
+
+	# Provided by sys-devel/gdb instead
+	rm "${ED}"/usr/share/info/sframe-spec.info || die
+
+	# Provide libiberty.h directly.
+	dosym libiberty/libiberty.h /usr/include/libiberty.h
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 8c3ef1bb29ec..3519fbfda967 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -44,7 +44,7 @@ EBUILD glibc-2.33-r14.ebuild 48640 BLAKE2B a8be6903094275c6b68af5eb997ecf9824edd
 EBUILD glibc-2.34-r14.ebuild 49635 BLAKE2B b9e39255651ebda4cf2fff8ff9e6e0470955ed04559fc78a20bdcdcaf1a1ac7a188157798bb23feef4d52c393f36fe3e2dc85e4fd0d4d256c7d9a399431ad7e5 SHA512 351c113b723f492cb74ae1178e3769a7775bf5660ec1a69fc7d779ee48d060c48e690b101fa4880b55d9105e4488f6a9b46e5c4b23484bf02d2448db74414a86
 EBUILD glibc-2.35-r11.ebuild 50176 BLAKE2B a7999672c0039cb7ef79fd84b13ea7d8d752adeb185eac0744383f514b0897ad8b7518c9ea8392b8f4217ec0873f2d4b9e56bd1424378c83c2dd98122b2caf7d SHA512 bf7d103bb91722cd61720290bf38c6cb73d8d199e6479e35ab017de83006826b014c49d6dc0188cd3f4aaf906578ee4ae9f851d37346a4d9a228bee683930bfa
 EBUILD glibc-2.36-r5.ebuild 51373 BLAKE2B e90a8b848d463cd1fb3e8e3101408ef1c4834f1179f3d008d67d0e5a0ce5862b82819113b4c0f00881b828ba4d59cb03025f002b908793aba49cde1297aa6b2e SHA512 813f7bab667a08d96efc84bf62b17ec465e2c6546a0756d90718320e2983f5e6ae2ee36858517ec6affa13aacac91a4fdce70e5df0c1244fde26bc72b3b17dcc
-EBUILD glibc-2.36-r7.ebuild 52455 BLAKE2B 052ba7aa54a95a762996bbc1018505c7a02e2121d11fc0e3af97e349e5a6e737437d2943e9553469a3465627e40bb7d25f8dc6506d96c92569f946ca645fa807 SHA512 c69e344997b7320511c8982337f967ee0313705a00b19d00cbb99292941807b151280fe5913c3e6c408c577bd6acf9f55970e349c57c975b956172f1eefef85f
+EBUILD glibc-2.36-r7.ebuild 52453 BLAKE2B ef5c9a4cbcc7fde3003910973c6d2fdcbb8fdc52e1eb75771919617651f2edc34f615d5508894e7f0a4ee3605bb2b638e001adfbe86a2183100c42808cd5dce6 SHA512 3101657a81f9110ce0072c070bb9aab2fad50fe46f968d99307faad572b426b204cbb6734d367e26c2708556628fb7d0dfb3f4a407432e7907032dfb5ead6666
 EBUILD glibc-2.37-r1.ebuild 52461 BLAKE2B 9f4fdba007e7537a8cfe03694da60f956e297d118cc3d3ebc3b620ef1abc08f18d803e90ad6170a062624ab46bf20a49c9addff8d0eae2536739bc17fe8d4620 SHA512 59b14cd19b20bde1ef5bb5e7113c533efb3b5ef84eda05a1749ab7f5c99bcb5d3fe1d493fbdeb8ebab5b3c92f09e568faea97937a266a0394517627dfccba406
 EBUILD glibc-9999.ebuild 52432 BLAKE2B 0988666562a1d49f59d52a6368b426c154e532747f1bf1cba50529d3f2b5f71ff82c1b2af101e0dd87e158591f0a1a711b94959b794c56bcee92eaf03e8c16b6 SHA512 f97ee9b4c19ccbdae6ba17689ac11d5ef692359b6e82950c0ee83ddd9744d3fb05f1e1e20ca19a5394bc11e7162a363ddf62dbc3a33ef9148d01d561f7d13fe8
 MISC metadata.xml 2142 BLAKE2B 765ba540eb10afccd1bade4de56f0c13ce269225500a62d1d17328194de69e7fa15d359a14eac6bfa8a36df45344db3d52f5e1811b174cf1fa2bfb95ad7760a7 SHA512 2f4a148c076a0967663d14e76b85a698ddae7093ff299b0dc95a6c3b00957c9bf73443f2bace9670eb62a45465efbcca892bb52b6aac8577acb2bc5f74a7397c
diff --git a/sys-libs/glibc/glibc-2.36-r7.ebuild b/sys-libs/glibc/glibc-2.36-r7.ebuild
index 1888a31be9eb..5f7cdcd38d87 100644
--- a/sys-libs/glibc/glibc-2.36-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.36-r7.ebuild
@@ -26,7 +26,7 @@ PATCH_DEV=dilfridge
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 fi
diff --git a/sys-libs/kpmcore/Manifest b/sys-libs/kpmcore/Manifest
index f1cdfce12711..e616248cb94a 100644
--- a/sys-libs/kpmcore/Manifest
+++ b/sys-libs/kpmcore/Manifest
@@ -1,5 +1,5 @@
 DIST kpmcore-22.08.3.tar.xz 599692 BLAKE2B 1a866db1d14bb866c2e0579bd79211bc22d27583425ba8f715d973779eba5a571722c19d6db5613440d85f046a3303d0067b3a6ca26645dd14a0e37db713c3e4 SHA512 4b48b6fa8f6a0ede38aeacc4f91c87e51f2205be93d4fff785ed144bb9ff59e8c8cb98a4e202f11b2ed246f6955e9ecede28efb0601da5c7936a4b4ccc25457c
 DIST kpmcore-22.12.3.tar.xz 618340 BLAKE2B 64ad0ae724e2329ae9d0cb4416adf70502f34b7385745214a4d6754c36949c73404dea7aaf41b473c91b049b3cab2350f93b7595cf019c0001aa8ecc0d11ef1d SHA512 0e56331043e4d220a1ab1c871b4d5012e5575b92795413125b6bcc9c5a177811587335fe6384d4ba0ec4f1b58c519fad8abe21278d53109e4a7bb53bf5e47c00
 EBUILD kpmcore-22.08.3.ebuild 750 BLAKE2B c9db67472d6c23f4802b2674b8a43011b4b14626ce82f58426b7f47f9dbc0424ce0c065906f0b3d51a34d9d2eac7c2ebfe4b1d80c3971d6ccc672b914751fec5 SHA512 35907ee1245a4777320baea29f03968be75ee239bb4673894f2feb70bb9cdf7bcb0e9f7b58071c403b39fea412d91157fef8f539f597096aa0a7c63021455452
-EBUILD kpmcore-22.12.3.ebuild 752 BLAKE2B 6f8148b0a9c20b58c651305fbe607a6f3c9427903e8c08444186b0bc08cda5d0d8ded765836a7bfac6ae04f488c8a8bbf270c8f192e05a7dd4c9dd4c6c2bf9ad SHA512 c17bd21a8202458af6810bebe27effe78ed57db8315370a1bcf548448c97fd7c2e657bb8dbe99df36fad140c6b1a1cd3cd4d63bb67098b0aaf3cc0707a42c17b
+EBUILD kpmcore-22.12.3.ebuild 751 BLAKE2B 8b994b2e15d6b0ce0b82f7a4e46dd3166b159eb911599e962e23e380b39094fbf81b6bd6adc8d14841fe60a2eb17144826de84b097178c3e6682733c8db115cf SHA512 d373b17f283f77c85a0a097e82a75596715a512da159ff9500cb3c1d6963e4b80ba7dae41a84e3a37489ffcbc79e6a0a03f5e99ea12da58cd7185afce08ff9a4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/sys-libs/kpmcore/kpmcore-22.12.3.ebuild b/sys-libs/kpmcore/kpmcore-22.12.3.ebuild
index e8a178f39634..4ca0f18891cd 100644
--- a/sys-libs/kpmcore/kpmcore-22.12.3.ebuild
+++ b/sys-libs/kpmcore/kpmcore-22.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/partitionmanager/"
 
 LICENSE="GPL-3"
 SLOT="5/10"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86"
 IUSE=""
 
 # bug 689468, tests need polkit etc.