gentoo auto-resync : 07:08:2024 - 12:37:20

3 files changed, 3 insertions, 76 deletions

diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index 1686a4be335e..fff1ea23adaa 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -1,8 +1,6 @@
 AUX x86info-1.30-makefile.patch 2169 BLAKE2B c543daf7e672b1ac55a6cd029bc814f5530989fc5896575c876c17b9928cc4b00cd3056d611197dcd10e2e5262c6f161e449b3fcebe8f68e060343f00bc06f89 SHA512 5f75e7e64def6fc474ac1c189246272234ac2861b61a0538f38d54521444158d69806c5e472e8d9b9935a2b02ff2d6b37499f51c472f4bf2c5c8f94d2e81a3a7
 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 0d1e05254ed689d5fdd47b235795527bb8820cb7843bbeb02badc92c73b4a40e2aecfd1f8d698cc313465873edf9732be7a2f8946250edc03b0da226412076f6 SHA512 8b44d443fbfeb8ce39739b28a40c9c49f278b891e50ca4d63a6cb5eaf72844cbd5082b77fff5dcb18ac8af738468b5832673d9bac3475f452554e932015f4920
-EBUILD x86info-1.31.ebuild 1780 BLAKE2B 940e94af8aaafc8e0f5195fc8c17467b0d4686b04aab8daa08a737421e1ca68293d5d32b59ac3b81cb345626e1556a83649b512138a669f51f4c1d4a10d7df41 SHA512 28555732c60df9a83851ade845bb29c4797eb036392c51fe3b1542d334eb5d5190322c0678f7b570c37c364b979c94656784784c0c132ba98177f0714a51e853
+EBUILD x86info-1.31.ebuild 1781 BLAKE2B de00060ec67efd99f8f3c5565482fcd6027d5efeb208e92debfefba291170d451633609633a0a7f39a4ae9827da710c5bf6ee65c1f1d2dbefbb63b277cab74db SHA512 e04ca9dc0d5948acbf6dcd37bc83578b93dc44ed172d98e83049aec4c5a280d4767c96252b11127f606b8192231e8819950266a9446b7aaf17b393a0bc69efd4
 MISC metadata.xml 423 BLAKE2B 4abf257ead4fb3d815bc1fb4acd2aa83f88d8acb9601564527bbd342c8c3d704ec9e747c0622ee3d12d2d093760ed7795bcbd5d4a51ccf53f9e19753d7e55035 SHA512 6dfad2f9e3bbad0d4b0f04d2d54cbe20271e9d386f0914b35942e97622287a705a68ae2dfdf2073277e41586811589168514b7d2cb8abdf0eade588810ca9165
diff --git a/sys-apps/x86info/x86info-1.30_p20190617.ebuild b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
deleted file mode 100644
index 41b3c215905a..000000000000
--- a/sys-apps/x86info/x86info-1.30_p20190617.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-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
-}
diff --git a/sys-apps/x86info/x86info-1.31.ebuild b/sys-apps/x86info/x86info-1.31.ebuild
index 9b992155ae72..f2e02335e7b8 100644
--- a/sys-apps/x86info/x86info-1.31.ebuild
+++ b/sys-apps/x86info/x86info-1.31.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
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit flag-o-matic linux-info python-any-r1 toolchain-funcs