gentoo resync : 03.12.2017

6 files changed, 61 insertions, 39 deletions

diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index f1fd2a43dcf0..10d1e74d447b 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -1,7 +1,8 @@
-AUX 1.21-pic.patch 717 BLAKE2B f99c086338e1639e181eb1533b7fe222df8afa8463fa13ee44b20e1bf5d7df5f227631347e3f165f0377eabf816878c1055709179f913e1ec49e5314de743086 SHA512 bbb1cceaba649a23629b25f7cd6c18248ec3ed9d9072071aaf69ab7e50362b9698d734ad4a2d473d989d3a2cc75a01e8cb96ca7b764725c9d2c424adff406faf
-AUX x86info-1.24-pic.patch 573 BLAKE2B 6c4294abd04da33cfb1750fd3c49a782a1c09af12bdf62f273950ddd0340ba63c21216dc9d672a6dfcb82ef538054cadf687f593f22078724a32b2019edc69e0 SHA512 9844411268f15a94fdd202c5f6f74deff22b6bd7a5a4f2e12aca8f86dae4d642055d7abc01dca4467b20000df9d1966cfa3055bdc4c6fad790b7894aebba0a76
-AUX x86info-1.29-parallel-make-cleanup.patch 486 BLAKE2B c38b7569220044f26d13f3699a3933fd04cafb806e6c65f3ff61aef4c52ad2f6a8bb1fb80f73bb9b9ba7fb091268f892e685bca332d872f95db3a4b14b5457a6 SHA512 ff0ab367a0ed4b14dd0e705463ad63e8a6c4ee026bcfe4509413d8147397332aeac1c41a44684cc09eefe1d09842cf0ab1c27a7c9ea4c7fa8de5b7f04561792b
+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-modules.conf-rc 204 BLAKE2B 1077f0a793ca7eedef6c996d2ec9075872d7df862d24885a8152ee22ef3e0ee1667f142a690b44c019c7d75093038ad5a9eb9be7b34e7bc08abf498aa91a7591 SHA512 54557bb1ee77749b7207ac886a31278ae003b52f5c4e76709c3a367e59ab0086872e8b39d30f018ad9d8b07d037a54b4817815880b5c9ebde106cad73421af6b
-DIST x86info-1.30.tgz 95727 SHA256 fe3009850e93a9c5fa38ed6bf74d72686043329fead8f1b2be4b5943d4fc9428 SHA512 0b4c9f1be83a737aa26ec14d239d09465608fcf542766ef5b8634d2fe08f75857c0d2bd1969d971ab4b0d55cd3aa3e4e5f58b3b2865865aa68fd751377672e5f WHIRLPOOL 112b91421b8ff3ce8c01f7f22c5b26cad09a9d222fe4259b6644d8f28887a909f94947f1cd94325ae3acab7d440338bbea5693d2ed014f7464c8279a6079a336
-EBUILD x86info-1.30.ebuild 1688 BLAKE2B d2311f6173c397221f29152909716fcdd8ac931624a3aa7cd8aad14b6e2daea88866d2b5d3a6b4df051f51d6f4de0681b7ed15a1ab19dc14419824ef996bed93 SHA512 e0d8ff51be23dc2ad706192ebf677aa41a559a2703fc273b1b4b13c6d93fb619c03ae7ad5522bdaf3fbbfea8e3a346693a8d889167625df52f532e5ea2cd3654
+DIST x86info-1.30.tgz 95727 BLAKE2B 6e9e345c6b4d05d4a137b898f1cc8a31e901b25b8a3822c06c103298e2ee60c6fada8e1fc314a5fcec04618b9a8a9ce05a4e631dbf9f03a24c5349f13d1e2301 SHA512 0b4c9f1be83a737aa26ec14d239d09465608fcf542766ef5b8634d2fe08f75857c0d2bd1969d971ab4b0d55cd3aa3e4e5f58b3b2865865aa68fd751377672e5f
+EBUILD x86info-1.30.ebuild 1733 BLAKE2B b3f271e8d4617c828069e438b201fa7ba8d2c84984dac8bf214cd6bf96a4c15c7033934b878c791d078bdb09ff61ff1871dbc3b749ce649d5ca9a8f797ff376b SHA512 ce72adfb475678dfee2f45c00d0ef89231ae81df793d88ff2f0879c17755c7cdfc23af79d12bbc65a24d178698d77c72775c91c010ebf42cf66c3fbdaa1fb87f
 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
index ddf24b293e14..7bf89240c2c0 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.c	2007-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 5cbd3a586f8e..b4098c5c68c2 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), &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 54208cab0843..a9cec0397fac 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.000000000 +0000
-+++ x86info-1.29/Makefile	2011-05-15 18:19:42.204228978 +0000
+--- 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 000000000000..21034d99edc5
--- /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 7ef0bfa3f20b..358f453ebbbe 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 +16,57 @@ SLOT="0"
 KEYWORDS="-* amd64 x86"
 IUSE=""
 
-RDEPEND="sys-apps/pciutils"
-DEPEND="${RDEPEND}"
+RDEPEND="sys-apps/pciutils:="
+DEPEND="
+	${PYTHON_DEPS}
+	${RDEPEND}"
 
 CONFIG_CHECK="~MTRR ~X86_CPUID"
 
-src_prepare() {
-	epatch "${FILESDIR}"/1.21-pic.patch
-	epatch "${FILESDIR}"/${PN}-1.24-pic.patch #270388
-	epatch "${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch
+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_compile() {
+src_configure() {
 	# These flags taken from the 1.29 ebuild
-	append-flags -Wall -Wshadow -Wextra -Wmissing-declarations -Wdeclaration-after-statement -Wredundant-decls
+	append-flags -Wall -Wshadow -Wextra -Wmissing-declarations \
+		-Wdeclaration-after-statement -Wredundant-decls
 	append-ldflags -Wl,-z,relro,-z,now
-	emake x86info lsmsr \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		|| die "emake failed"
+
+	tc-export CC
+}
+
+src_compile() {
+	emake x86info lsmsr
 }
 
 src_install() {
-	dobin x86info lsmsr || die
+	dobin x86info lsmsr
 
 	insinto /etc/modprobe.d
 	newins "${FILESDIR}"/x86info-modules.conf-rc x86info.conf
 
-	dodoc TODO README
+	einstalldocs
 	doman x86info.1 lsmsr.8
-	insinto /usr/share/doc/${PF}
-	doins -r results
-	prepalldocs
+
+	dodoc -r results
 }
 
 pkg_preinst() {
-	if [ -a "${ROOT}"/etc/modules.d/x86info ] && [ ! -a "${ROOT}"/etc/modprobe.d/x86info ] ; then
+	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 "${ROOT}"/etc/{modules,modprobe}.d/x86info
+		mv "${EROOT%/}"/etc/{modules,modprobe}.d/x86info
 	fi
-	if [ -a "${ROOT}"/etc/modprobe.d/x86info ] && [ ! -a "${ROOT}"/etc/modprobe.d/x86info.conf ] ; then
+	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 "${ROOT}"/etc/modprobe.d/x86info{,.conf}
+		mv "${EROOT%/}"/etc/modprobe.d/x86info{,.conf}
 	fi
 }