9 files changed, 86 insertions, 205 deletions
diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index c7d7e566b654..81645b2a3fbb 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -1,11 +1,6 @@
-AUX 1.21-pic.patch 538 BLAKE2B 98869b7f97ef786a6a8c72277416722d815ffeb562f756f730886dd5dd07f9c03b7d53626be507d23854ecdc5a4d89391effe0084265dd0bfb78b80b11dc86bc SHA512 cee450649d775b682cbed101036f58b6c277417533202919c93df2802e06eaf7337399bf0ef68806f1b5c282589772c63ae46a65dd8d1f754d4691cd4062bd5c
-AUX x86info-1.24-pic.patch 577 BLAKE2B c552b1e35109107b8b368929240deb0acb84c09f12d60acb67646a947386a1b7cd532da79c2e7ff97104526327d625f917f2ee51275977de41b2743f1d386bcf SHA512 72d476c4fdc0eef30dfaa585ab4344081da1c441289d917cd01612bc0d7f1b31f8c26510c86c89fbb9d79d4526ae6a1ad413f98fb8aa005d9fc729f80fb99e2a
-AUX x86info-1.29-parallel-make-cleanup.patch 330 BLAKE2B 77d0b528bd5a5dae91442ae6e2ee5e5c6d397ae82e0b35f89e5f441319907e3ca9e83c79fcdcf2964cf7b0b96cd2c5cfa94536e4d5002665771876c158b0943f SHA512 c13035a4487d36c5949fab22aed6b61db70c4ff304849ac5345656ec56e7d90c8636ea25180db7ec5b73881d3602acae3bc0936148a3bc25f8d64f4c1d97d454
-AUX x86info-1.30-fix-build-system.patch 268 BLAKE2B a1f57d38ea3836b51eef4ed6b6516ac8a3e1350496e5550a2070d8b7f1a8e6b15c5af664d2c45062ea347168edf882ee2ddafa976beaa8688b19c33ae4ac3b0c SHA512 80f7b0773737b83c35a8dc59aa1f844edf73c93ee89d8fceeed3eb69cf757b79d42e9e0acfea061c1e7f7f4c38b953dbc0943dda874c62db7b63102394f8f6ea
+AUX x86info-1.30-makefile.patch 1939 BLAKE2B aadfe68d30fb12a71435e4ceb708cc69280c47d32e92d7ce0e95ca12199fe728bdbf2d3edfe4c296cf25a972df26e39355c0dd12a79cd4b1d8dc3c5680c4f6e9 SHA512 57ff52a78747abd75016b4b61a21e859c0b5023d5402d2025c7bd93e3a9511d291938da1c688e1eb60f912db64800140423d1e5ca19c159fc2d9c94dc97bc693
+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.tgz 95727 BLAKE2B 6e9e345c6b4d05d4a137b898f1cc8a31e901b25b8a3822c06c103298e2ee60c6fada8e1fc314a5fcec04618b9a8a9ce05a4e631dbf9f03a24c5349f13d1e2301 SHA512 0b4c9f1be83a737aa26ec14d239d09465608fcf542766ef5b8634d2fe08f75857c0d2bd1969d971ab4b0d55cd3aa3e4e5f58b3b2865865aa68fd751377672e5f
 DIST x86info-1.30_p20190617.tar.gz 85913 BLAKE2B e19e5fd797617499c64e75522f0fd030beaa335a6ba9afd29cbb79fd67313a2e57236d1ad8817bf91f0131faf667ba88ac0945ff25301ba8806912979f094ea3 SHA512 352e2b00578dc54b8d5ee32f09f327ab6a23e6ab4743882ca78a5a5ec1a04ceed8780228ffbda34f84ebb02c7cb850002a686929726feac90c8083044f479bd6
-EBUILD x86info-1.30-r1.ebuild 1738 BLAKE2B f809a7f512452242dfb9580026f1adf61ba57337ed46ad9614e007d2be67ba2782f359378d3d67842fb437158c488db0349d1ac01d3fa57d1c9f656fb8e450ba SHA512 34b59d22cbe750be756adef44dbd79feedc59aa6921550cc1fca9a4662fedf781b6c619d25eef8a15468efe945e30ee5931ed15198f50eaffbe5edb2a0772660
-EBUILD x86info-1.30.ebuild 1733 BLAKE2B b3f271e8d4617c828069e438b201fa7ba8d2c84984dac8bf214cd6bf96a4c15c7033934b878c791d078bdb09ff61ff1871dbc3b749ce649d5ca9a8f797ff376b SHA512 ce72adfb475678dfee2f45c00d0ef89231ae81df793d88ff2f0879c17755c7cdfc23af79d12bbc65a24d178698d77c72775c91c010ebf42cf66c3fbdaa1fb87f
-EBUILD x86info-1.30_p20190617.ebuild 1856 BLAKE2B e4bca9efb1259b4eb475306dbf9cab3fe1399fc7b89061de4a65d0eec595f4fa20d7d476edb5ef4bfd05a644fa03f21aae1710dcbdcaa9819ce31ee24d3c7ce4 SHA512 c5e7aa9c9233d40b1be7290f67fd48c2af3b342851e4727f95caaa48de4da4617b799ea5c951128fb4dbf5f087ca8347ef0e58a56fb0fecd8720c829a524afc3
+EBUILD x86info-1.30_p20190617.ebuild 1779 BLAKE2B 79d83ac17a9d7c5d98b363bc6e941a334560b2b9ecc167dabf062b470528ac203dd0a2a4706403a5fe54234cfef4438dfbe6a075baf029e65b47b13f35ea7075 SHA512 07c9d015cb4232c433724f161b2b2455a7040692a4e0926962cc3eb792680957432e4260e2e7f5d46d609a51d468ebac2a57f0447d80e63613214e3f4feb709d
 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/x86info/files/1.21-pic.patch b/sys-apps/x86info/files/1.21-pic.patch
deleted file mode 100644
index 7bf89240c2c0..000000000000
--- a/sys-apps/x86info/files/1.21-pic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/bench/benchmarks.c
-+++ b/bench/benchmarks.c
-@@ -19,7 +19,10 @@
- #ifdef __linux__
- 	TIME(asm volatile("int $0x80" :"=a" (tmp) :"0" (__NR_getppid)), "int 0x80");
- #endif
--	TIME(asm volatile("cpuid": : :"ax", "dx", "cx", "bx"), "cpuid");
-+ 	TIME(asm volatile("movl %%ebx,%%edi\n"
-+ 	                  "cpuid\n"
-+ 	                  "movl %%edi,%%ebx\n"
-+ 	                  : : :"%eax", "%edx", "%ecx", "%edi"), "cpuid");
- 
- 	TIME(asm volatile("addl $1,0(%esp)"), "addl");
- 	TIME(asm volatile("lock ; addl $1,0(%esp)"), "locked add");
diff --git a/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch b/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch
deleted file mode 100644
index a9cec0397fac..000000000000
--- a/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -12,7 +12,8 @@
- LSMSR_TMP_HEADERS=AMD/k8.h AMD/fam10h.h AMD/fam11h.h generic_msr.h
- 
- %.h: %.regs scripts/createheader.py
--	python scripts/createheader.py $< `basename $< .regs` >$@
-+	$(PYTHON) scripts/createheader.py $< `basename $< .regs` >$@.tmp ; \
-+	mv $@.tmp $@
- 
- LSMSR_SRC = \
- 	lsmsr.c \
diff --git a/sys-apps/x86info/files/x86info-1.30-fix-build-system.patch b/sys-apps/x86info/files/x86info-1.30-fix-build-system.patch
deleted file mode 100644
index 21034d99edc5..000000000000
--- a/sys-apps/x86info/files/x86info-1.30-fix-build-system.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,9 +1,5 @@
- VERSION=1.30
- 
--CFLAGS = -g -O2 -Werror -Wall -Wshadow -Wextra -Wmissing-declarations -Wdeclaration-after-statement -Wredundant-decls
--LDFLAGS = -Wl,-z,relro,-z,now
--CC = gcc
--
- SHELL = /bin/sh
- 
- all: x86info test lsmsr
diff --git a/sys-apps/x86info/files/x86info-1.30-makefile.patch b/sys-apps/x86info/files/x86info-1.30-makefile.patch
new file mode 100644
index 000000000000..9e1768d68958
--- /dev/null
+++ b/sys-apps/x86info/files/x86info-1.30-makefile.patch
@@ -0,0 +1,72 @@
+--- a/lsmsr/Makefile
++++ b/lsmsr/Makefile
+@@ -40,7 +40,8 @@
+ 	generic_msr.h
+ 
+ %.h: %.regs createheader.py
+-	@python createheader.py $< `basename $< .regs` >$@
++	$(PYTHON) createheader.py $< `basename $< .regs` >$@.tmp ; \
++	mv $@.tmp $@
+ 
+ LSMSR_SRC = \
+ 	lsmsr.c \
+--- a/Makefile
++++ b/Makefile
+@@ -2,7 +2,7 @@
+ 
+ CFLAGS = -DVERSION="$(VERSION)"
+ 
+-CFLAGS += -Wall -W -g -O2 -D_FORTIFY_SOURCE=2 -I. -Iinclude
++CFLAGS += -Wall -W -I. -Iinclude
+ ifneq ($(SYSROOT),)
+ CFLAGS += --sysroot=$(SYSROOT)
+ endif
+@@ -18,7 +18,7 @@
+ CFLAGS += -Wswitch-enum
+ CFLAGS += -Wundef
+ CFLAGS += -Wwrite-strings
+-CFLAGS += $(shell pkg-config --cflags libpci)
++CFLAGS += $(shell $$PKG_CONFIG --cflags libpci)
+ 
+ # gcc specific
+ ifneq ($(shell $(CC) -v 2>&1 | grep -c "clang"), 1)
+@@ -33,20 +33,8 @@
+ CPP_MAJOR := $(shell $(CPP) -dumpversion 2>&1 | cut -d'.' -f1)
+ CPP_MINOR := $(shell $(CPP) -dumpversion 2>&1 | cut -d'.' -f2)
+ DEVEL   := $(shell grep VERSION Makefile | head -n1 | grep pre | wc -l)
+-CFLAGS  += $(shell if [ $(CPP_MAJOR) -eq 6 -a $(CPP_MINOR) -ge 3 -a $(DEVEL) -eq 1 ] ; then echo "-Werror"; else echo ""; fi)
+ 
+-LDFLAGS = -Wl,-z,relro,-z,now
+-LDFLAGS += $(shell pkg-config --libs libpci)
+-
+-ifeq ($(CC),"")
+-CC = gcc
+-endif
+-
+-ifdef STATIC_LIBPCI
+-LIBPCI = -Wl,-Bstatic -lpci -Wl,-Bdynamic -lz
+-else
+-LIBPCI = -lpci
+-endif
++LIBS += $(shell $$PKG_CONFIG --libs libpci)
+ 
+ SHELL = /bin/sh
+ 
+@@ -68,15 +56,14 @@
+ 	$(sort $(patsubst %.c,%.o,$(wildcard vendors/*/*.c)))
+ 
+ x86info: $(X86INFO_OBJS) $(X86INFO_HEADERS)
+-	$(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o x86info $(X86INFO_OBJS) \
+-	    $(LIBPCI)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o x86info $(X86INFO_OBJS) $(LIBS)
+ 
+ DEPDIR= .deps
+ -include $(X86INFO_SRC:%.c=$(DEPDIR)/%.d)
+ df = $(DEPDIR)/$(*D)/$(*F)
+ 
+ %.o : %.c
+-	$(QUIET_CC)$(CC) $(CFLAGS) -o $@ -c $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
+ 	@mkdir -p $(DEPDIR)/$(*D)
+ 	@$(CC) -MM $(CFLAGS) $*.c > $(df).d
+ 	@mv -f $(df).d $(df).d.tmp
diff --git a/sys-apps/x86info/files/x86info-1.24-pic.patch b/sys-apps/x86info/files/x86info-1.30-pic.patch
index b4098c5c68c2..6288846b48b7 100644
--- a/sys-apps/x86info/files/x86info-1.24-pic.patch
+++ b/sys-apps/x86info/files/x86info-1.30-pic.patch
@@ -1,10 +1,8 @@
-http://bugs.gentoo.org/270388
-
 --- a/cpuid.c
 +++ b/cpuid.c
-@@ -62,12 +62,28 @@
- 		sched_setaffinity(getpid(), sizeof(set), &set);
- 	}
+@@ -25,12 +25,28 @@
+ 
+ 	bind_cpu(cpunr);
  
 +#ifdef __PIC__
 +	/* GCC on i386 bitches if you clobber ebx.  So hide it behind
diff --git a/sys-apps/x86info/x86info-1.30-r1.ebuild b/sys-apps/x86info/x86info-1.30-r1.ebuild
deleted file mode 100644
index 5a09ba8a8e78..000000000000
--- a/sys-apps/x86info/x86info-1.30-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{4..8} )
-
-inherit flag-o-matic linux-info python-any-r1 toolchain-funcs
-
-DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility"
-HOMEPAGE="http://www.codemonkey.org.uk/projects/x86info/"
-SRC_URI="http://www.codemonkey.org.uk/projects/x86info/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-apps/pciutils:="
-DEPEND="
-	${PYTHON_DEPS}
-	${RDEPEND}"
-
-CONFIG_CHECK="~MTRR ~X86_CPUID"
-
-PATCHES=(
-	"${FILESDIR}"/1.21-pic.patch
-	"${FILESDIR}"/${PN}-1.24-pic.patch #270388
-	"${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch
-	"${FILESDIR}"/${PN}-1.30-fix-build-system.patch
-)
-
-pkg_setup() {
-	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
-}
-
-src_compile() {
-	emake x86info lsmsr
-}
-
-src_install() {
-	dobin x86info lsmsr
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/x86info-modules.conf-rc x86info.conf
-
-	einstalldocs
-	doman x86info.1 lsmsr.8
-
-	dodoc -r results
-}
-
-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.30.ebuild b/sys-apps/x86info/x86info-1.30.ebuild
deleted file mode 100644
index 358f453ebbbe..000000000000
--- a/sys-apps/x86info/x86info-1.30.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic linux-info python-any-r1 toolchain-funcs
-
-DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility"
-HOMEPAGE="http://www.codemonkey.org.uk/projects/x86info/"
-SRC_URI="http://www.codemonkey.org.uk/projects/x86info/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="sys-apps/pciutils:="
-DEPEND="
-	${PYTHON_DEPS}
-	${RDEPEND}"
-
-CONFIG_CHECK="~MTRR ~X86_CPUID"
-
-PATCHES=(
-	"${FILESDIR}"/1.21-pic.patch
-	"${FILESDIR}"/${PN}-1.24-pic.patch #270388
-	"${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch
-	"${FILESDIR}"/${PN}-1.30-fix-build-system.patch
-)
-
-pkg_setup() {
-	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
-}
-
-src_compile() {
-	emake x86info lsmsr
-}
-
-src_install() {
-	dobin x86info lsmsr
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/x86info-modules.conf-rc x86info.conf
-
-	einstalldocs
-	doman x86info.1 lsmsr.8
-
-	dodoc -r results
-}
-
-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.30_p20190617.ebuild b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
index d8a3b48dfadf..e19af2dd09ea 100644
--- a/sys-apps/x86info/x86info-1.30_p20190617.ebuild
+++ b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4..8} )
+PYTHON_COMPAT=( python3_{6..8} )
 
 inherit flag-o-matic linux-info python-any-r1 toolchain-funcs
 
@@ -16,21 +16,19 @@ SRC_URI="https://github.com/kernelslacker/x86info/archive/${COMMIT}.tar.gz -> ${
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
 
 RDEPEND="sys-apps/pciutils:="
-DEPEND="
+DEPEND="${RDEPEND}"
+BDEPEND="
 	${PYTHON_DEPS}
-	${RDEPEND}"
+	virtual/pkgconfig"
 
 CONFIG_CHECK="~MTRR ~X86_CPUID"
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 PATCHES=(
-	#"${FILESDIR}"/1.21-pic.patch
-	"${FILESDIR}"/${PN}-1.24-pic.patch #270388
-	#"${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch
-	#"${FILESDIR}"/${PN}-1.30-fix-build-system.patch
+	"${FILESDIR}"/${PN}-1.30-pic.patch #270388
+	"${FILESDIR}"/${PN}-1.30-makefile.patch
 )
 
 pkg_setup() {
@@ -44,7 +42,7 @@ src_configure() {
 		-Wdeclaration-after-statement -Wredundant-decls
 	append-ldflags -Wl,-z,relro,-z,now
 
-	tc-export CC
+	tc-export CC PKG_CONFIG
 }
 
 src_compile() {