gentoo resync : 29.12.2022

2 files changed, 73 insertions, 0 deletions

diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index f2beb45cb9a1..3f4208e66b78 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -2,5 +2,7 @@ AUX x86info-1.30-makefile.patch 2169 BLAKE2B c543daf7e672b1ac55a6cd029bc814f5530
 AUX x86info-1.30-pic.patch 512 BLAKE2B 968b592289df73700785d37b607693f1e43fbae18da878a9888ed02ba68f370b799d92dca1dc00c3c2fc1c2d1faeb9ee9278bc6c1b5ac5fc1f4ddfe5c7a4ca49 SHA512 578dfae0ea84e3836c73840981f9c95594acbeff264c914015be43ad30e3bbf6bbb268373de7871e1a10288749dba466f8511a452a76028cead53571dac8b1a4
 AUX x86info-modules.conf-rc 204 BLAKE2B 1077f0a793ca7eedef6c996d2ec9075872d7df862d24885a8152ee22ef3e0ee1667f142a690b44c019c7d75093038ad5a9eb9be7b34e7bc08abf498aa91a7591 SHA512 54557bb1ee77749b7207ac886a31278ae003b52f5c4e76709c3a367e59ab0086872e8b39d30f018ad9d8b07d037a54b4817815880b5c9ebde106cad73421af6b
 DIST x86info-1.30_p20190617.tar.gz 85913 BLAKE2B e19e5fd797617499c64e75522f0fd030beaa335a6ba9afd29cbb79fd67313a2e57236d1ad8817bf91f0131faf667ba88ac0945ff25301ba8806912979f094ea3 SHA512 352e2b00578dc54b8d5ee32f09f327ab6a23e6ab4743882ca78a5a5ec1a04ceed8780228ffbda34f84ebb02c7cb850002a686929726feac90c8083044f479bd6
+DIST x86info-1.31.tar.gz 85913 BLAKE2B e19e5fd797617499c64e75522f0fd030beaa335a6ba9afd29cbb79fd67313a2e57236d1ad8817bf91f0131faf667ba88ac0945ff25301ba8806912979f094ea3 SHA512 352e2b00578dc54b8d5ee32f09f327ab6a23e6ab4743882ca78a5a5ec1a04ceed8780228ffbda34f84ebb02c7cb850002a686929726feac90c8083044f479bd6
 EBUILD x86info-1.30_p20190617.ebuild 1780 BLAKE2B 7cee22fc45e216b05b1111cf82951ab1e768b4f4ead32e391e8b9d76bd831f8dc7cdb7e94cbf979a4d6e6c8eeb0bad8cce4447a4865f912873f97479d464f971 SHA512 be7388d75e4aeb5344b5a33d38bc92a1784c86f2deb941076de42328a70ea1a10ff5289878003cd059dabcfe915e7b225a5b8cbc13dcf24500d3839d5a78526b
+EBUILD x86info-1.31.ebuild 1781 BLAKE2B 123fb94e2f10df62c9f8c705005840b10a8fa0d002283e36b275d1635cc80cb39902f5c1dba5973feaee8b50182e0323f945c56525802c3370f1ff9748881429 SHA512 61e5e5f202c0ea98883ad39661c3ae7a01beebbdb0a0ad7ca027118be3a37322f2d7f8e3f3f67a86b0eb3926236fd80d566c0fa5fb85059d87b420b9373c4fa9
 MISC metadata.xml 337 BLAKE2B 41db6bb84baa494b640a676262c6e06401688586cede16b94fefad53d15f6472cdea04ec3124b4779c443551edde9cef4a8db76d94b038bef0705e46557bb395 SHA512 4f8abe9675319e4cfb56c4f43e951ecf55ce1a099ddc459b0d8404a7c88e467e78c78fc302b93213b87e7db4684aa36b6f21db22d0e83cfd29098df1669a1193
diff --git a/sys-apps/x86info/x86info-1.31.ebuild b/sys-apps/x86info/x86info-1.31.ebuild
new file mode 100644
index 000000000000..b695f1e7be37
--- /dev/null
+++ b/sys-apps/x86info/x86info-1.31.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic linux-info python-any-r1 toolchain-funcs
+
+# Upstream stopped versioned releases entirely
+COMMIT="8ea5ed19fae1d209eba9257171a10f7afd474618"
+
+DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility"
+HOMEPAGE="http://www.codemonkey.org.uk/projects/x86info/"
+SRC_URI="https://github.com/kernelslacker/x86info/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="sys-apps/pciutils:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.30-pic.patch #270388
+	"${FILESDIR}"/${PN}-1.30-makefile.patch
+)
+
+pkg_setup() {
+	CONFIG_CHECK="~MTRR ~X86_CPUID"
+	linux-info_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# These flags taken from the 1.29 ebuild
+	append-flags -Wall -Wshadow -Wextra -Wmissing-declarations \
+		-Wdeclaration-after-statement -Wredundant-decls
+	append-ldflags -Wl,-z,relro,-z,now
+
+	tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+	emake x86info
+}
+
+src_install() {
+	dobin x86info
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/x86info-modules.conf-rc x86info.conf
+
+	einstalldocs
+	doman x86info.1
+}
+
+pkg_preinst() {
+	if [[ -a "${EROOT}"/etc/modules.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info ]]; then
+		elog "Moving x86info from /etc/modules.d/ to /etc/modprobe.d/"
+		mv "${EROOT}"/etc/{modules,modprobe}.d/x86info
+	fi
+	if [[ -a "${EROOT}"/etc/modprobe.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info.conf ]]; then
+		elog "Adding .conf suffix to x86info in /etc/modprobe.d/"
+		mv "${EROOT}"/etc/modprobe.d/x86info{,.conf}
+	fi
+}