7 files changed, 189 insertions, 8 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 18d36ff0afdb..38348683b5eb 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index 2a28e0439036..1bbcf03dd083 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -1,5 +1,5 @@
 AUX ipmiutil-2.9.9-lib_symlink.patch 468 BLAKE2B d24e4e0183f46a3a97b9a9db754b4948446eda7504d81b3854cf8ae65eebdc2f279272ecf09736ff2966dfd477219e19a900cce8665f865bc22a8674ea863f2b SHA512 35912b578b3e61e899f97d2fc6cd6352ac04da638c64c252aa71138d9b7fd1b1de474f2702febfb85ab3f5371971be7a1922a1c6bbe5960c04be2b9171f0e75e
 AUX ipmiutil-3.1.8-fix-configure.patch 5520 BLAKE2B 62a2f71824c37015e9b5999acaa06780a9e398b4ba74461cb963375c497c0c18e5cbb4b5188aaa5d34521ac0a2153835fda38ffe80a1414d85ecc96da49d114e SHA512 13e58b8516ade13d907462b0eca9ce639ea486740992e1d2f348f17a9ed8deadd1ca7ab0fb2c725e5721f7840119fc5e9b134a8eb842d661d81041f39dd1f6cc
 DIST ipmiutil-3.1.9.tar.gz 1876478 BLAKE2B ddbd4d91d1d09fd9a7d4f7a3f9358787cab1baf3e2f34e43b4ebf44843d9ccc8d8b241b030d0f62a4b183ac4642c6676b304a51b8c6611f69d475dd19c1d3181 SHA512 3c9f60669dd6769dc64977c99d68fc0a0838993fb5ef3d8b1b1026b6daf6e6bfbe8738f3dd120b116fc663c84bafe6ed93420a92fecf57a17785d283b415d9c7
-EBUILD ipmiutil-3.1.9.ebuild 2069 BLAKE2B 2ac82550fe8ed6e808baa44e7f123a60afd2eacfe8ebd8d31f4b66b0496900cb0ceccae3ff281c54e44785a73f444a7b3f2e8b63cd6a4eb5ca2e82981f6da0e5 SHA512 bca06b835aefa9a1771eece8f05312bd39798cd80713bd38c65f88cd61fad517663a6c835c8fcf2cca8b5814f0f56a0f18a62b8b017f272e07ca0b013466af6f
+EBUILD ipmiutil-3.1.9.ebuild 2208 BLAKE2B 7659fd4185c2e199affc4f021ab11b10ae4da838884a633a65435c5d1f69850c4082fa7376eb4c2343ad826709aab8d31e4aa8b38766a57e3cfa86c7fb6fa997 SHA512 536e59ea62e775e2f9a193a69720c6e79de169b2408bd1b287e4e63ad0abd5b6207878b3459dee4c625587236864056c9898d43707330c9abd5f08bb1516640a
 MISC metadata.xml 395 BLAKE2B bbc505300e1bb4a974b8c5f19c43fe9cbfe4300c31a5174adad799cac0d2507e231845ab8f586ca427538b67ad45012aec660692f1a4a134af4e7615467b0ee0 SHA512 170e9a7718037935d373ad84c37f7c87764e30fdb1c2860fa3021021f91dd94adb2d3acb4adfc5cea8d64a7e612340a2286c5a4748f91ed32d603b9c306f3513
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.9.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.9.ebuild
index ce6d19a65aa6..c18cffdd971c 100644
--- a/sys-apps/ipmiutil/ipmiutil-3.1.9.ebuild
+++ b/sys-apps/ipmiutil/ipmiutil-3.1.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools systemd
+inherit autotools flag-o-matic systemd
 
 DESCRIPTION="IPMI Management Utilities"
 HOMEPAGE="https://ipmiutil.sourceforge.net/"
@@ -48,6 +48,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/863590
+	# https://github.com/arcress0/ipmiutil/issues/21
+	filter-lto
+
 	local myeconfargs=(
 		--disable-systemd
 		--enable-sha256
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index f7b9281907fe..3bac7eab41c7 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,6 +1,6 @@
 AUX moreutils-0.64-respect-env.patch 344 BLAKE2B 1b1dc56d77f9ddb4ffc05e911ac7ee92def3df7cc5bb74b476ae8172924421676bec09f6c74a59d7b07b82382e57b502088d75e5c365a5747ee7d38e8ba3c227 SHA512 db1ff22fb8a6284bea95488b71c456353379d4f9b4142f62ad7371e2546ff82fae6e7e2fb4be2e5b018d475ef5d19c677059cdb171d882e9c7a3641ed0ce4647
-DIST moreutils-0.67.tar.gz 93627 BLAKE2B 4b8788411f1300ccffa10a52a327ee676b2a241531dafc2106495977ffd29a5b32c91c0afb6425b5797bfea04fa98a3cfd69e034cffc2fb255f5e8505d3b3474 SHA512 3a395fa80c1c1d769ec078cbf9455952201a364d8264796c6443a397ed7fa4f08250ecd140f047cf2e9533d6fc5310b3a579a7c083a5bc4cb4672d39c35dab75
 DIST moreutils-0.68.tar.gz 93732 BLAKE2B f6bac790a294f6a05624ca33906a41e60a0dcc5c25ef31f62dc501ecf39913299f6ecd64130ed4da1896342ae4bfc286b02217f68c76d0e915cd2d8f684237b1 SHA512 8d2ee4ab1e2409a4adde018c558884ff6c642c7426b1d07d5d15bf89ba42ea5aec279c01d7d80815a825adc527ceddf0de8db9c05b0392fccc8e76bcae032558
-EBUILD moreutils-0.67-r1.ebuild 1755 BLAKE2B f3a7a184194b4f0c6a85511bd8995dfc2bd4a7f7a2ed3a412d6802425af0edf92c06ecf272549a94fb1f927e0db72e29ab0d0425b93a02405e2f8a25e8f1e3eb SHA512 b02efd0423a8544c020d977ebde73bfc1b149c94d08d432616fb4ce74a9c66662c2debbc0dcfee2c0085124ef69fcf429c37463d3dece9e1c94c391ccc3e3b79
+DIST moreutils-0.69.tar.gz 93899 BLAKE2B 3bbe031c230aa22f737a661f2e9fab4f5fb6d5bb2d21807bf7207ab382c9a439ca0e9425594d98dee04714038cb2214fbc9852268b4669dd9a0f0eac5f9ad07c SHA512 0f9033a860bbbc72d50331809c94e7d29c1125339b68434d68d95039ec075b46daff642ad4a08303444fa7873f04a894c4f2010b6ce74e92f868cfc246e39a6f
 EBUILD moreutils-0.68.ebuild 1754 BLAKE2B 90f754fd9861524e7415d6cf800087017e24e4391db203191b97fa2f0ec3ff18cd89607ae8e259ce72a5eac5f6b7602efed1a3e33675f7583a1b5a8f617eef42 SHA512 9c5953942474468e86e8469c6fcc5e5ab731d310be0ad688a5585d11691967bd33b4e81f84dcb071145fbf4d72b4772ec244bca40ddccd8a2229f850d775f992
+EBUILD moreutils-0.69.ebuild 1758 BLAKE2B 62eb075f8aafa70bb974a610f8510a206866867747692064aab295359fa65ac1efa42b8d454394fb478a24bd335d425afb5080d519e2638a0784cccb5575549c SHA512 956010d89bbaf31baa86f8860b79eb10806cc527ed0c5525bd24604a4f5f4c10e7da0beb76521b8b26c7510e8830870f01187354536ae4f894f47d258f50a23e
 MISC metadata.xml 314 BLAKE2B 41e19552cdd8289a03ab33f6fd514028d689236160501e2c84644e1075e957f6faeba6eacf163fcd624e995bd6ff7016e663e65cc753e7de3621aa46922a0766 SHA512 36a70c222b6de13c1245d0a95d097389e84ee7b7f55a08c62ca5c7c44bb51808f63faa10e81fdec7eff7bb680be32ed31bb2fd5362c5f35ba8fb92bb60a7ffe3
diff --git a/sys-apps/moreutils/moreutils-0.67-r1.ebuild b/sys-apps/moreutils/moreutils-0.69.ebuild
index fb9a222d78e8..21d861330d68 100644
--- a/sys-apps/moreutils/moreutils-0.67-r1.ebuild
+++ b/sys-apps/moreutils/moreutils-0.69.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 inherit toolchain-funcs
 
-DESCRIPTION="A collection of tools that nobody thought to write when Unix was young"
+DESCRIPTION="Collection of tools that nobody thought to write when Unix was young"
 HOMEPAGE="https://joeyh.name/code/moreutils/ https://git.joeyh.name/index.cgi/moreutils.git/"
 # Not available at time of release
 #SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.xz"
@@ -12,7 +13,7 @@ SRC_URI="https://git.joeyh.name/index.cgi/moreutils.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux ~x64-macos"
 IUSE="+doc +perl"
 
 RDEPEND="
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 01e9b7a14947..74b6422abb07 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,5 +1,7 @@
 AUX conf.d-pciparm 988 BLAKE2B c51b826806c58411939d8987e103cba5775806abcbf12a9320cdba2d410dde4f2b3198b4e07d3341b2b7fcafcfd6cafea648909bdaa4976703c764d5d4a0e312 SHA512 7c3513a9112318736907f4a1f3e94910d59752d8f51cf4f9f8ccd33b563250aca17a507e0937507bd9352d12a2b9a47e7419306908990b21a3460e6527dab6a4
 AUX init.d-pciparm 1758 BLAKE2B a9dd930da942c73d7a150938b2b58543f517542c4c675334cca8f9eb02b83dad456e36ae1bf77ed8fcc0eac52e0dc638f19a41682fa3e1d3623011d09301945b SHA512 c5a527236039edf29f6876d3b07909045dd04e40d863d68014dd96cc021b7b61356470e67541b5b68487d996a299b60b3da46272259f9d0724ea1392e6243646
 DIST pciutils-3.10.0.tar.gz 931711 BLAKE2B 2e1255eb5508c9d1339f5bc772c2592a03cae4d8d097e8939748c9bb5d5d949be53d705d1b7d903f7ea88b2abeea91e39de16e39d2f46f0a1f62f8a9e32c6faa SHA512 3da1af4af8b0fa3cf4d3f06095524e25dc292182beec10aa2c16c5c6ba751fe469d0e7f54e43413b6f3f5bcdbd1fba3c66df1d8e39d2e1962ae36a2d9c06238e
+DIST pciutils-3.11.1.tar.gz 660457 BLAKE2B 447d0e3fa209d2d27a0310a5824a75b543b539c459caed23e9218f4ff3f9a3c2a99c65dd5ddf92a56c2b880ecfaeff6f3edc458c3e5973a1a4937325740915ac SHA512 6bbb248364831a384a2f521d7300cc53b046ce3765c3f7aca08c9e839174b02687543ee697b8ffc24258bcd39ac625d1ce53d6ca02fdc718eea86a50c95a33de
 EBUILD pciutils-3.10.0.ebuild 4905 BLAKE2B fc998bbc04dd08d1707890bafc62deaa9a282640a7ca946b37e24841b2bf00205d4ee18678786a3616293fa211a1ada48da41bd564e0d6716cd5c7ab2edf2fe0 SHA512 5435ab9fef31732c00f278c4ba19501f99cb13aa2ab84974bef5571798121747c2a9cf68c1d20b4d4a0ea2db4f93b842f7149ac46ab3ed615a5793209c97f297
+EBUILD pciutils-3.11.1.ebuild 4913 BLAKE2B 301520e077afbd9406e5f330b1a3013d8e89cacaa8f72757da44935db7c9b532cc732e4131366db4b79972df85ecc5df0219c7a46f7e0f39796baa99499421e4 SHA512 8e1d393c8c32b3dde40fd0f80f1a99284cc24c8f4ed1a80c34d7f0fff830947ee7e04328d1ad47bbf9ded42f57bd4d831d846af0d27c23c2821ba10b0d6c4cbe
 MISC metadata.xml 616 BLAKE2B 0aefbd7995f4bf549cba3e9c60066675efb8dc8e4d38e320c8cb28f7f6a275527e90d2526248c57fd34d09125693e3f185f51c05d0ae10fd8a61d058d4f8a9d0 SHA512 5f44a15a2a18a40ac7a46a5c1dfed741082e48321d5ee3f53bebb6b12e310ea05070e03853cf15655ef800a768d49515f174e3a73ca923177ce0be3963154a59
diff --git a/sys-apps/pciutils/pciutils-3.11.1.ebuild b/sys-apps/pciutils/pciutils-3.11.1.ebuild
new file mode 100644
index 000000000000..dd3c7a05627e
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.11.1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs multilib-minimal flag-o-matic
+
+DESCRIPTION="Various utilities dealing with the PCI bus"
+HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
+SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="dns +kmod static-libs +udev zlib"
+REQUIRED_USE="static-libs? ( !udev )"
+
+# Have the sub-libs in RDEPEND with [static-libs] since, logically,
+# our libpci.a depends on libz.a/etc... at runtime.
+LIB_DEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )"
+DEPEND="
+	kmod? ( sys-apps/kmod )
+	udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )
+	static-libs? ( ${LIB_DEPEND} )
+	!static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/hwdata
+"
+# See bug #847133 re binutils check
+BDEPEND="
+	|| ( >=sys-devel/binutils-2.37:* sys-devel/lld sys-devel/native-cctools )
+	kmod? ( virtual/pkgconfig )
+"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
+
+switch_config() {
+	[[ $# -ne 2 ]] && return 1
+	local opt=$1 val=$2
+
+	sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
+	return 0
+}
+
+check_binutils_version() {
+	if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && ! tc-ld-is-gold && ! tc-ld-is-lld ; then
+		# Okay, hopefully it's Binutils' bfd.
+		# bug #847133
+
+		# Convert this:
+		# ```
+		# GNU ld (Gentoo 2.38 p4) 2.38
+		# Copyright (C) 2022 Free Software Foundation, Inc.
+		# This program is free software; you may redistribute it under the terms of
+		# the GNU General Public License version 3 or (at your option) a later version.
+		# This program has absolutely no warranty.
+		# ```
+		#
+		# into...
+		# ```
+		# 2.38
+		# ```
+		local ver=$($(tc-getLD) --version 2>&1 | head -n 1 | rev | cut -d' ' -f1 | rev)
+
+		if ! [[ ${ver} =~ [0-9].[0-9][0-9] ]] ; then
+			# Skip if unrecognised format so we don't pass something
+			# odd into ver_cut.
+			return
+		fi
+
+		ver_major=$(ver_cut 1 "${ver}")
+		ver_minor=$(ver_cut 2 "${ver}")
+
+		# We use 2.37 here, not 2.35, as https://github.com/pciutils/pciutils/issues/98 mentions
+		# because we've had other miscompiles with older Binutils (not just build failures!)
+		# and we don't want people running any unsupported versions of Binutils. An example
+		# of this is where glibc is completely broken with old binutils: bug #802036. It's
+		# just not sustainable to support.
+		if [[ ${ver_major} -eq 2 && ${ver_minor} -lt 37 ]] ; then
+			eerror "Old version of binutils activated! ${P} cannot be built with an old version."
+			eerror "Please follow these steps:"
+			eerror "1. Select a newer binutils (>= 2.37) using binutils-config"
+			eerror " (If no such version is installed, run emerge -v1 sys-devel/binutils)"
+			eerror "2. Run: . /etc/profile"
+			eerror "3. Try emerging again with: emerge -v1 ${CATEGORY}/${P}"
+			eerror "4. Complete your world upgrade if you were performing one."
+			eerror "5. Perform a depclean (emerge -acv)"
+			eerror "\tYou MUST depclean after every world upgrade in future!"
+			die "Old binutils found! Change to a newer ld using binutils-config (bug #847133)."
+		fi
+	fi
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_binutils_version
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && check_binutils_version
+}
+
+src_prepare() {
+	default
+
+	if use static-libs ; then
+		cp -pPR "${S}" "${S}.static" || die
+		mv "${S}.static" "${S}/static" || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# bug #640836, bug #852929
+	# Still broken in 3.10.0, see https://github.com/pciutils/pciutils/pull/144.
+	filter-lto
+
+	# bug #471102
+	append-lfs-flags
+}
+
+pemake() {
+	emake \
+		HOST="${CHOST}" \
+		CROSS_COMPILE="${CHOST}-" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		RANLIB="$(tc-getRANLIB)" \
+		DNS=$(usex dns) \
+		IDSDIR='$(SHAREDIR)/hwdata' \
+		MANDIR='$(SHAREDIR)/man' \
+		PREFIX="${EPREFIX}/usr" \
+		SHARED="yes" \
+		STRIP="" \
+		ZLIB=$(usex zlib) \
+		PCI_COMPRESSED_IDS=0 \
+		PCI_IDS=pci.ids \
+		LIBDIR="\${PREFIX}/$(get_libdir)" \
+		LIBKMOD=$(multilib_native_usex kmod) \
+		HWDB=$(usex udev) \
+		"$@"
+}
+
+multilib_src_compile() {
+	pemake OPT="${CFLAGS}" all
+
+	if use static-libs ; then
+		pemake \
+			-C "${BUILD_DIR}"/static \
+			OPT="${CFLAGS}" \
+			SHARED="no" \
+			lib/libpci.a
+	fi
+}
+
+multilib_src_install() {
+	pemake DESTDIR="${D}" install install-lib
+
+	use static-libs && dolib.a "${BUILD_DIR}"/static/lib/libpci.a
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog README TODO
+
+	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/man/man8/update-pciids.8* || die
+	rm -r "${ED}"/usr/share/hwdata || die
+
+	newinitd "${FILESDIR}"/init.d-pciparm pciparm
+	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
+}