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

2023-03-03 Thread Arthur Zamarin 
commit: 1265a4dadb36ee0d80a5d29741ff6cd0231579e3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 07:37:40 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 07:37:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1265a4da

sys-apps/x86info: Stabilize 1.31 x86, #899368

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/x86info/x86info-1.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/x86info/x86info-1.31.ebuild 
b/sys-apps/x86info/x86info-1.31.ebuild
index 7829ac953612..9b992155ae72 100644
--- a/sys-apps/x86info/x86info-1.31.ebuild
+++ b/sys-apps/x86info/x86info-1.31.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 
 RDEPEND="sys-apps/pciutils:="
 DEPEND="${RDEPEND}"

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

2022-10-29 Thread Sam James 
commit: e9d0cf8803dd494fb82a45e04ab7455f39b2b57a
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 29 21:30:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 29 21:30:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9d0cf88

sys-apps/x86info: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 sys-apps/x86info/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-apps/x86info/metadata.xml b/sys-apps/x86info/metadata.xml
index cf45babf7d03..b5309a956e04 100644
--- a/sys-apps/x86info/metadata.xml
+++ b/sys-apps/x86info/metadata.xml
@@ -8,4 +8,7 @@
base-sys...@gentoo.org
Gentoo Base System

+   
+   kernelslacker/x86info
+

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

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

sys-apps/x86info: Version bump to 1.31

Signed-off-by: Matt Turner  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 ..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
+}

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

2022-01-29 Thread David Seifert 
commit: b6fa46709f1aa1c46c619115f68381bc1d7d24e8
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jan 29 13:05:33 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jan 29 13:05:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6fa4670

sys-apps/x86info: reformat metadata.xml

Signed-off-by: David Seifert  gentoo.org>

 sys-apps/x86info/metadata.xml | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys-apps/x86info/metadata.xml b/sys-apps/x86info/metadata.xml
index 05c463273728..cf45babf7d03 100644
--- a/sys-apps/x86info/metadata.xml
+++ b/sys-apps/x86info/metadata.xml
@@ -1,11 +1,11 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   robb...@gentoo.org
-
-
-   base-sys...@gentoo.org
-   Gentoo Base System
-
+   
+   robb...@gentoo.org
+   
+   
+   base-sys...@gentoo.org
+   Gentoo Base System
+

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

2022-01-29 Thread David Seifert 
commit: eb96f1f35bb76c5c24292b68f6d5ce5fb81e5447
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jan 29 13:05:31 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jan 29 13:05:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb96f1f3

sys-apps/x86info: add py3.9/py3.10

Closes: https://bugs.gentoo.org/832255
Signed-off-by: David Seifert  gentoo.org>

 sys-apps/x86info/x86info-1.30_p20190617.ebuild | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys-apps/x86info/x86info-1.30_p20190617.ebuild 
b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
index f56ec2fe5718..af2a213c7833 100644
--- a/sys-apps/x86info/x86info-1.30_p20190617.ebuild
+++ b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 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/;
 # 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"
@@ -23,15 +25,13 @@ BDEPEND="
${PYTHON_DEPS}
virtual/pkgconfig"
 
-CONFIG_CHECK="~MTRR ~X86_CPUID"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
 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
 }

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

2022-01-29 Thread David Seifert 
commit: 7cffac797b9db0e309c4ee9d036681c8734a4944
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jan 29 13:05:32 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jan 29 13:05:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cffac79

sys-apps/x86info: fix build on musl

Closes: https://bugs.gentoo.org/713148
Signed-off-by: David Seifert  gentoo.org>

 sys-apps/x86info/files/x86info-1.30-makefile.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/x86info/files/x86info-1.30-makefile.patch 
b/sys-apps/x86info/files/x86info-1.30-makefile.patch
index e513be7155aa..67d3a9dca421 100644
--- a/sys-apps/x86info/files/x86info-1.30-makefile.patch
+++ b/sys-apps/x86info/files/x86info-1.30-makefile.patch
@@ -7,7 +7,7 @@
 +CFLAGS += -DVERSION="$(VERSION)"
  
 -CFLAGS += -Wall -W -g -O2 -D_FORTIFY_SOURCE=2 -I. -Iinclude
-+CFLAGS += -Wall -W -I. -Iinclude
++CFLAGS += -Wall -W -I. -Iinclude -D_GNU_SOURCE=1
  ifneq ($(SYSROOT),)
  CFLAGS += --sysroot=$(SYSROOT)
  endif

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

2021-05-05 Thread David Seifert 
commit: 71eb2d7f6095e1090dd170493e9dda3622b3c81d
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed May  5 11:29:10 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed May  5 11:29:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71eb2d7f

sys-apps/x86info: Respect CFLAGS

Closes: https://bugs.gentoo.org/730204
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sys-apps/x86info/files/x86info-1.30-makefile.patch | 36 --
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/sys-apps/x86info/files/x86info-1.30-makefile.patch 
b/sys-apps/x86info/files/x86info-1.30-makefile.patch
index 9e1768d6895..e513be7155a 100644
--- a/sys-apps/x86info/files/x86info-1.30-makefile.patch
+++ b/sys-apps/x86info/files/x86info-1.30-makefile.patch
@@ -1,27 +1,17 @@
 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 @@
+@@ -1,8 +1,8 @@
+ VERSION=$(shell date +%Y-%m-%d)
  
- CFLAGS = -DVERSION="$(VERSION)"
+-CFLAGS = -DVERSION="$(VERSION)"
++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 @@
+@@ -18,7 +18,7 @@ CFLAGS += -Wstrict-prototypes -Wmissing-prototypes
  CFLAGS += -Wswitch-enum
  CFLAGS += -Wundef
  CFLAGS += -Wwrite-strings
@@ -30,7 +20,7 @@
  
  # gcc specific
  ifneq ($(shell $(CC) -v 2>&1 | grep -c "clang"), 1)
-@@ -33,20 +33,8 @@
+@@ -33,20 +33,8 @@ endif
  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)
@@ -52,7 +42,7 @@
  
  SHELL = /bin/sh
  
-@@ -68,15 +56,14 @@
+@@ -68,15 +56,14 @@ X86INFO_OBJS = $(sort $(patsubst %.c,%.o,$(wildcard *.c))) 
\
$(sort $(patsubst %.c,%.o,$(wildcard vendors/*/*.c)))
  
  x86info: $(X86INFO_OBJS) $(X86INFO_HEADERS)
@@ -70,3 +60,15 @@
@mkdir -p $(DEPDIR)/$(*D)
@$(CC) -MM $(CFLAGS) $*.c > $(df).d
@mv -f $(df).d $(df).d.tmp
+--- a/lsmsr/Makefile
 b/lsmsr/Makefile
+@@ -40,7 +40,8 @@ LSMSR_TMP_HEADERS=AMD_k8.h \
+   generic_msr.h
+ 
+ %.h: %.regs createheader.py
+-  @python createheader.py $< `basename $< .regs` >$@
++  $(PYTHON) createheader.py $< `basename $< .regs` >$@.tmp ; \
++  mv $@.tmp $@
+ 
+ LSMSR_SRC = \
+   lsmsr.c \

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

2020-10-25 Thread Thomas Deutschmann 
commit: 21a1bb3c4a5a3dec94c3142bc75aafaf8cf34ba9
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Oct 25 23:01:38 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Oct 25 23:01:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21a1bb3c

sys-apps/x86info: x86 stable (bug #733810)

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-apps/x86info/x86info-1.30_p20190617.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/x86info/x86info-1.30_p20190617.ebuild 
b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
index e19af2dd09e..4a42d0c845f 100644
--- a/sys-apps/x86info/x86info-1.30_p20190617.ebuild
+++ b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/kernelslacker/x86info/archive/${COMMIT}.tar.gz -> ${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 
 RDEPEND="sys-apps/pciutils:="
 DEPEND="${RDEPEND}"

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

2020-06-29 Thread David Seifert 
commit: 699f337091c0f6dbea147bca493b5040bb4d12d3
Author: David Seifert  gentoo  org>
AuthorDate: Mon Jun 29 13:48:22 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Jun 29 13:48:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=699f3370

sys-apps/x86info: [QA] Add missing virtual/pkgconfig dependency

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: David Seifert  gentoo.org>

 sys-apps/x86info/files/x86info-1.30-makefile.patch | 28 --
 sys-apps/x86info/x86info-1.30_p20190617.ebuild |  6 +++--
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/sys-apps/x86info/files/x86info-1.30-makefile.patch 
b/sys-apps/x86info/files/x86info-1.30-makefile.patch
index e1377c572fb..9e1768d6895 100644
--- a/sys-apps/x86info/files/x86info-1.30-makefile.patch
+++ b/sys-apps/x86info/files/x86info-1.30-makefile.patch
@@ -21,7 +21,16 @@
  ifneq ($(SYSROOT),)
  CFLAGS += --sysroot=$(SYSROOT)
  endif
-@@ -33,14 +33,8 @@
+@@ -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)
@@ -33,18 +42,23 @@
 -ifeq ($(CC),"")
 -CC = gcc
 -endif
-+LIBS += $(shell pkg-config --libs libpci)
+-
+-ifdef STATIC_LIBPCI
+-LIBPCI = -Wl,-Bstatic -lpci -Wl,-Bdynamic -lz
+-else
+-LIBPCI = -lpci
+-endif
++LIBS += $(shell $$PKG_CONFIG --libs libpci)
+ 
+ SHELL = /bin/sh
  
- ifdef STATIC_LIBPCI
- LIBPCI = -Wl,-Bstatic -lpci -Wl,-Bdynamic -lz
-@@ -68,15 +62,15 @@
+@@ -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) \
-+  $(LIBPCI) $(LIBS)
++  $(CC) $(CFLAGS) $(LDFLAGS) -o x86info $(X86INFO_OBJS) $(LIBS)
  
  DEPDIR= .deps
  -include $(X86INFO_SRC:%.c=$(DEPDIR)/%.d)

diff --git a/sys-apps/x86info/x86info-1.30_p20190617.ebuild 
b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
index add19ae6a60..e19af2dd09e 100644
--- a/sys-apps/x86info/x86info-1.30_p20190617.ebuild
+++ b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
@@ -19,7 +19,9 @@ KEYWORDS="-* ~amd64 ~x86"
 
 RDEPEND="sys-apps/pciutils:="
 DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
+BDEPEND="
+   ${PYTHON_DEPS}
+   virtual/pkgconfig"
 
 CONFIG_CHECK="~MTRR ~X86_CPUID"
 S="${WORKDIR}/${PN}-${COMMIT}"
@@ -40,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() {

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

2020-06-29 Thread David Seifert 
commit: db365bacbc0122deac04a5add301d2d86c505aab
Author: David Seifert  gentoo  org>
AuthorDate: Mon Jun 29 12:33:05 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Jun 29 12:33:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db365bac

sys-apps/x86info: Remove old

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: David Seifert  gentoo.org>

 sys-apps/x86info/Manifest  |  1 -
 sys-apps/x86info/files/1.21-pic.patch  | 14 -
 sys-apps/x86info/files/x86info-1.24-pic.patch  | 33 --
 .../files/x86info-1.29-parallel-make-cleanup.patch | 12 
 .../files/x86info-1.30-fix-build-system.patch  | 12 
 sys-apps/x86info/x86info-1.30-r1.ebuild| 72 --
 sys-apps/x86info/x86info-1.30.ebuild   | 72 --
 7 files changed, 216 deletions(-)

diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index 3fa8bb65f0e..109f35371ed 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -1,2 +1 @@
-DIST x86info-1.30.tgz 95727 BLAKE2B 
6e9e345c6b4d05d4a137b898f1cc8a31e901b25b8a3822c06c103298e2ee60c6fada8e1fc314a5fcec04618b9a8a9ce05a4e631dbf9f03a24c5349f13d1e2301
 SHA512 
0b4c9f1be83a737aa26ec14d239d09465608fcf542766ef5b8634d2fe08f75857c0d2bd1969d971ab4b0d55cd3aa3e4e5f58b3b2865865aa68fd751377672e5f
 DIST x86info-1.30_p20190617.tar.gz 85913 BLAKE2B 
e19e5fd797617499c64e75522f0fd030beaa335a6ba9afd29cbb79fd67313a2e57236d1ad8817bf91f0131faf667ba88ac0945ff25301ba8806912979f094ea3
 SHA512 
352e2b00578dc54b8d5ee32f09f327ab6a23e6ab4743882ca78a5a5ec1a04ceed8780228ffbda34f84ebb02c7cb850002a686929726feac90c8083044f479bd6

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 7bf89240c2c..000
--- 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.24-pic.patch 
b/sys-apps/x86info/files/x86info-1.24-pic.patch
deleted file mode 100644
index b4098c5c68c..000
--- a/sys-apps/x86info/files/x86info-1.24-pic.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-http://bugs.gentoo.org/270388
-
 a/cpuid.c
-+++ b/cpuid.c
-@@ -62,12 +62,28 @@
-   sched_setaffinity(getpid(), sizeof(set), );
-   }
- 
-+#ifdef __PIC__
-+  /* GCC on i386 bitches if you clobber ebx.  So hide it behind
-+   * gcc's back. */
-+  asm(
-+  "movl %%ebx,%%edi\n"
-+  "cpuid\n"
-+  "movl %%ebx,%1\n"
-+  "movl %%edi,%%ebx\n"
-+  : "=a" (a),
-+"=m" (b),
-+"+c" (c),
-+"=d" (d)
-+  : "0" ((unsigned int)idx)
-+  : "edi");
-+#else
-   asm("cpuid"
-   : "=a" (a),
- "=b" (b),
- "+c" (c),
- "=d" (d)
-   : "0" ((unsigned int)idx));
-+#endif
- 
-   if (eax!=NULL)
-   *eax = a;

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 a9cec0397fa..000
--- 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 21034d99edc..000
--- 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/x86info-1.30-r1.ebuild 
b/sys-apps/x86info/x86info-1.30-r1.ebuild
deleted file mode 100644
index

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

2020-06-29 Thread David Seifert 
commit: 560917f09c1e92a5f7504ab2b2cb05dba1b111c4
Author: David Seifert  gentoo  org>
AuthorDate: Mon Jun 29 12:33:02 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Jun 29 12:33:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=560917f0

sys-apps/x86info: [QA] Fix various issues

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: David Seifert  gentoo.org>

 sys-apps/x86info/files/x86info-1.30-makefile.patch | 58 ++
 sys-apps/x86info/files/x86info-1.30-pic.patch  | 31 
 sys-apps/x86info/x86info-1.30_p20190617.ebuild | 16 +++---
 3 files changed, 95 insertions(+), 10 deletions(-)

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 000..e1377c572fb
--- /dev/null
+++ b/sys-apps/x86info/files/x86info-1.30-makefile.patch
@@ -0,0 +1,58 @@
+--- 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
+@@ -33,14 +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
++LIBS += $(shell pkg-config --libs libpci)
+ 
+ ifdef STATIC_LIBPCI
+ LIBPCI = -Wl,-Bstatic -lpci -Wl,-Bdynamic -lz
+@@ -68,15 +62,15 @@
+   $(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) \
++  $(LIBPCI) $(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.30-pic.patch 
b/sys-apps/x86info/files/x86info-1.30-pic.patch
new file mode 100644
index 000..6288846b48b
--- /dev/null
+++ b/sys-apps/x86info/files/x86info-1.30-pic.patch
@@ -0,0 +1,31 @@
+--- a/cpuid.c
 b/cpuid.c
+@@ -25,12 +25,28 @@
+ 
+   bind_cpu(cpunr);
+ 
++#ifdef __PIC__
++  /* GCC on i386 bitches if you clobber ebx.  So hide it behind
++   * gcc's back. */
++  asm(
++  "movl %%ebx,%%edi\n"
++  "cpuid\n"
++  "movl %%ebx,%1\n"
++  "movl %%edi,%%ebx\n"
++  : "=a" (a),
++"=m" (b),
++"+c" (c),
++"=d" (d)
++  : "0" ((unsigned int)idx)
++  : "edi");
++#else
+   asm("cpuid"
+   : "=a" (a),
+ "=b" (b),
+ "+c" (c),
+ "=d" (d)
+   : "0" ((unsigned int)idx));
++#endif
+ 
+   if (eax!=NULL)
+   *eax = a;

diff --git a/sys-apps/x86info/x86info-1.30_p20190617.ebuild 
b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
index d8a3b48dfad..add19ae6a60 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,17 @@ 
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="
-   ${PYTHON_DEPS}
-   ${RDEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
 
 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
+

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

2020-06-28 Thread Robin H. Johnson 
commit: 8fb2b4ce43a4f356ff6db728fde15c0a36e34642
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Jun 29 05:37:10 2020 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Jun 29 05:37:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fb2b4ce

sys-apps/x86info: bump for py3

Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-apps/x86info/Manifest  |  1 +
 sys-apps/x86info/x86info-1.30-r1.ebuild| 72 +
 sys-apps/x86info/x86info-1.30_p20190617.ebuild | 73 ++
 3 files changed, 146 insertions(+)

diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index bcc650214b0..3fa8bb65f0e 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -1 +1,2 @@
 DIST x86info-1.30.tgz 95727 BLAKE2B 
6e9e345c6b4d05d4a137b898f1cc8a31e901b25b8a3822c06c103298e2ee60c6fada8e1fc314a5fcec04618b9a8a9ce05a4e631dbf9f03a24c5349f13d1e2301
 SHA512 
0b4c9f1be83a737aa26ec14d239d09465608fcf542766ef5b8634d2fe08f75857c0d2bd1969d971ab4b0d55cd3aa3e4e5f58b3b2865865aa68fd751377672e5f
+DIST x86info-1.30_p20190617.tar.gz 85913 BLAKE2B 
e19e5fd797617499c64e75522f0fd030beaa335a6ba9afd29cbb79fd67313a2e57236d1ad8817bf91f0131faf667ba88ac0945ff25301ba8806912979f094ea3
 SHA512 
352e2b00578dc54b8d5ee32f09f327ab6a23e6ab4743882ca78a5a5ec1a04ceed8780228ffbda34f84ebb02c7cb850002a686929726feac90c8083044f479bd6

diff --git a/sys-apps/x86info/x86info-1.30-r1.ebuild 
b/sys-apps/x86info/x86info-1.30-r1.ebuild
new file mode 100644
index 000..5a09ba8a8e7
--- /dev/null
+++ b/sys-apps/x86info/x86info-1.30-r1.ebuild
@@ -0,0 +1,72 @@
+# 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_p20190617.ebuild 
b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
new file mode 100644
index 000..d8a3b48dfad
--- /dev/null
+++ b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
@@ -0,0 +1,73 @@
+# 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/;
+# Upstream stopped versioned releases entirely
+COMMIT="8ea5ed19fae1d209eba9257171a10f7afd474618"
+SRC_URI="https://github.com/kernelslacker/x86info/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-apps/pciutils:="
+DEPEND="
+   ${PYTHON_DEPS}
+   ${RDEPEND}"
+
+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
+)
+
+pkg_setup() {
+   linux-info_pkg_setup
+   python-any-r1_pkg_setup

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

2017-12-02 Thread David Seifert 
commit: 663b4a62e4640030d63cace5b9700395149a9b17
Author: David Seifert  gentoo  org>
AuthorDate: Sat Dec  2 14:00:20 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Dec  2 14:15:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=663b4a62

sys-apps/x86info: Port to EAPI 6

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 sys-apps/x86info/Manifest  |  2 +-
 sys-apps/x86info/files/1.21-pic.patch  |  5 +-
 sys-apps/x86info/files/x86info-1.24-pic.patch  |  4 +-
 .../files/x86info-1.29-parallel-make-cleanup.patch |  7 ++-
 .../files/x86info-1.30-fix-build-system.patch  | 12 +
 sys-apps/x86info/x86info-1.30.ebuild   | 61 +-
 6 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index c0ebbfda423..bcc650214b0 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -1 +1 @@
-DIST x86info-1.30.tgz 95727 SHA256 
fe3009850e93a9c5fa38ed6bf74d72686043329fead8f1b2be4b5943d4fc9428 SHA512 
0b4c9f1be83a737aa26ec14d239d09465608fcf542766ef5b8634d2fe08f75857c0d2bd1969d971ab4b0d55cd3aa3e4e5f58b3b2865865aa68fd751377672e5f
 WHIRLPOOL 
112b91421b8ff3ce8c01f7f22c5b26cad09a9d222fe4259b6644d8f28887a909f94947f1cd94325ae3acab7d440338bbea5693d2ed014f7464c8279a6079a336
+DIST x86info-1.30.tgz 95727 BLAKE2B 
6e9e345c6b4d05d4a137b898f1cc8a31e901b25b8a3822c06c103298e2ee60c6fada8e1fc314a5fcec04618b9a8a9ce05a4e631dbf9f03a24c5349f13d1e2301
 SHA512 
0b4c9f1be83a737aa26ec14d239d09465608fcf542766ef5b8634d2fe08f75857c0d2bd1969d971ab4b0d55cd3aa3e4e5f58b3b2865865aa68fd751377672e5f

diff --git a/sys-apps/x86info/files/1.21-pic.patch 
b/sys-apps/x86info/files/1.21-pic.patch
index ddf24b293e1..7bf89240c2c 100644
--- a/sys-apps/x86info/files/1.21-pic.patch
+++ b/sys-apps/x86info/files/1.21-pic.patch
@@ -1,6 +1,5 @@
-diff -Nuar x86info-1.21.orig/bench/benchmarks.c x86info-1.21/bench/benchmarks.c
 x86info-1.21.orig/bench/benchmarks.c   2007-11-26 17:53:58.278467889 
-0800
-+++ x86info-1.21/bench/benchmarks.c2007-11-26 17:54:32.014318066 -0800
+--- 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");

diff --git a/sys-apps/x86info/files/x86info-1.24-pic.patch 
b/sys-apps/x86info/files/x86info-1.24-pic.patch
index 5cbd3a586f8..b4098c5c68c 100644
--- a/sys-apps/x86info/files/x86info-1.24-pic.patch
+++ b/sys-apps/x86info/files/x86info-1.24-pic.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/270388
 
 cpuid.c
-+++ cpuid.c
+--- a/cpuid.c
 b/cpuid.c
 @@ -62,12 +62,28 @@
sched_setaffinity(getpid(), sizeof(set), );
}

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
index 54208cab084..a9cec0397fa 100644
--- a/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch
+++ b/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch
@@ -1,12 +1,11 @@
-diff -Nuar x86info-1.29.orig/Makefile x86info-1.29/Makefile
 x86info-1.29.orig/Makefile 2011-04-05 22:54:04.0 +
-+++ x86info-1.29/Makefile  2011-05-15 18:19:42.204228978 +
+--- 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 ; \
++  $(PYTHON) scripts/createheader.py $< `basename $< .regs` >$@.tmp ; \
 +  mv $@.tmp $@
  
  LSMSR_SRC = \

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
new file mode 100644
index 000..21034d99edc
--- /dev/null
+++ b/sys-apps/x86info/files/x86info-1.30-fix-build-system.patch
@@ -0,0 +1,12 @@
+--- 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/x86info-1.30.ebuild 
b/sys-apps/x86info/x86info-1.30.ebuild
index 7ef0bfa3f20..358f453ebbb 100644
--- a/sys-apps/x86info/x86info-1.30.ebuild
+++ b/sys-apps/x86info/x86info-1.30.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
-inherit eutils flag-o-matic linux-info toolchain-funcs
+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/;
@@ -14,48