[gentoo-commits] repo/gentoo:master commit in: sys-apps/x86info/

[Matt Turner]

commit:     f524ba81a84c0fba8b41b0775f71d93a4bfb2043
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 17:29:48 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 17:40:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f524ba81

sys-apps/x86info: Version bump to 1.31

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 sys-apps/x86info/Manifest            |  1 +
 sys-apps/x86info/x86info-1.31.ebuild | 71 ++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index 109f35371edd..bd93e4b2230f 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -1 +1,2 @@
 DIST x86info-1.30_p20190617.tar.gz 85913 BLAKE2B 
e19e5fd797617499c64e75522f0fd030beaa335a6ba9afd29cbb79fd67313a2e57236d1ad8817bf91f0131faf667ba88ac0945ff25301ba8806912979f094ea3
 SHA512 
352e2b00578dc54b8d5ee32f09f327ab6a23e6ab4743882ca78a5a5ec1a04ceed8780228ffbda34f84ebb02c7cb850002a686929726feac90c8083044f479bd6
+DIST x86info-1.31.tar.gz 85913 BLAKE2B 
e19e5fd797617499c64e75522f0fd030beaa335a6ba9afd29cbb79fd67313a2e57236d1ad8817bf91f0131faf667ba88ac0945ff25301ba8806912979f094ea3
 SHA512 
352e2b00578dc54b8d5ee32f09f327ab6a23e6ab4743882ca78a5a5ec1a04ceed8780228ffbda34f84ebb02c7cb850002a686929726feac90c8083044f479bd6

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
+}