gentoo resync : 11.02.2018

7 files changed, 66 insertions, 223 deletions

diff --git a/sys-process/numactl/Manifest b/sys-process/numactl/Manifest
index 2c8be55f3c90..1f861760cf9d 100644
--- a/sys-process/numactl/Manifest
+++ b/sys-process/numactl/Manifest
@@ -1,14 +1,8 @@
 AUX numactl-2.0.10-numademo-cflags.patch 504 BLAKE2B f2346a298b86b9c667d0d9550af881f09fed1d56e507379f59f480cb8b6da8a57ad406273bec044eb8a95f9bb6b6a0f80fcb3288ba9da113725c6b8e2ed0748c SHA512 15266d98c375241fd84146a010f329265644666ab90d517865675618a8f793ea6bdc39e7c8b64836fa5b393afad1cd3c89452e838d751adbb315668a2cd29b78
 AUX numactl-2.0.11-sysmacros.patch 1391 BLAKE2B f761353e82bbb79a70839c34f4ad0759c24b3671bfa8c8ba2869beff4528e9b0241d4b208097c5b6c381dbd4ee532fc6d3b8934f6cac70290ddd48217d0b9185 SHA512 39c5841000650af58ae4f6b15a2e2af7b4fb45e7514537f1d081cc0be74bf13aaa3d336a31ef15386b897cc3478ec58b8c194850e99ca2605f5f25be1650a63f
 AUX numactl-2.0.8-cpuid-pic.patch 697 BLAKE2B 0446f983eab3eefa553027c70e373d6693cb7325979d5ca3cb9aaa2f9f00f5c6545fb2d949e0fb068a857b9cb41e2dbda176ba27e12eeeb664841b3fbaaec9ae SHA512 d9624110a7f8459c13b67eb990f05bc54ffe55818d586691b307dcc4ca5861f064a7269f1038cba5f8abf0f2b6d359d30e4f8d6e904a7e5c0da3404ef1bd4d51
-AUX numactl-2.0.8-static_libs.patch 2761 BLAKE2B 89f0e99ef99a72cb7352f4f62d1d104af12c38722e75ddc322ed12869d42fce9f1075ba3b7a6956f74647e989188ee44c3554c0901ee0092b4a176bfde69503d SHA512 828dbcd719671c8ca81745d5670d48c071a8b353b9e42bbbaf9eeffd41b607a53ae24ddd6f0be422a2e6f61899635228da0926d7d8dedd143f52fde5bc5dbe05
-AUX numactl-2.0.9-testsuite_fix.patch 262 BLAKE2B d343ec139068302b7c4ff3f41611af3989b34177ad4684801ce3ca99109745350b92d46a7d09d14bff5141e780f9686da3555f3b15862e185090ed08cccc92e2 SHA512 8b9d952076eb04f0093d25c87f25e3f68f9a02a96daa4b574414f75092ded757fd587419584e8ea1883c0881aa2d462cf04904a479c0a925784e111e4b95a6c8
-AUX numactl-2.0.9-testsuite_path.patch 716 BLAKE2B f1171ae82ac1dab068b19223e4a76ca7fbbe774a470865df2baa0f15348186a2909411d019ffafc39f5e09ef0bb1cbf6abe9fc537227b7e6c803398863def4aa SHA512 ed6ba9f225f551d473231c187b962e7c6dd2d20ded491a07fab6ec1edebd27c0eed7186e6eeee0c665eb2139425b23dd4a1162cca0eab31e8f063d48a4908629
-DIST numactl-2.0.10.tar.gz 98999 BLAKE2B 292dad14cfe9ae2c3fbf8d7b27a2ff6d0f86de1f57ff8dd291cbabd93f385048543fd4a17b4c60ecc10f66d3bc2cbfe86c7c4fa48ab5c3081692091b05ffea9c SHA512 3a82b28bbc724a2340950ac33396055da852ee06e5b1d3414cd83dd6f9e26fbb648faae35ce4009c76d6a180f3067a8f3fb18e3ffaa6b6db68adfc0877e94975
 DIST numactl-2.0.11.tar.gz 408175 BLAKE2B 0767d555d5254e780ef50bd66215e84208e88fb37422fd86443e53ee52faef4242ff21e6028bdb92c4e1fa7815cdb23e87cd084763539dc1d560097f43bd563f SHA512 1969d7ee0ff3de0d6f1fa42ec089a17cdb3f92cb35d453b8f8b2eec49724c43787ecbd213357013a8f2500a260b0df9844d515815ca3a0376314a0eed050a0d4
-DIST numactl-2.0.9.tar.gz 341455 BLAKE2B 6b56a3c326829e4f148f5b081e219339a3c2a207098209d48be2e27f44893bb2d2365a51c85c1d9ce2a2442003095098a8e1547ff517e80d0019c726224a879f SHA512 483cbb1607da0f3bf0923202ea565100ea430b19502bdbd322f043f75dc945cc0f47878c0ed28badab23561c37da0b04aa12d07656bb4666c4f8d02a0d256407
-EBUILD numactl-2.0.10-r2.ebuild 1341 BLAKE2B 34844cf4bcf3e043f09005757967f8583bd2d09c3df0f6d8ef6d98cface0f908c21fdbabb78a37e440f5f6680fb73434bbaf9f8874d471e37ffed8faef73ff64 SHA512 ca84553e42fdfc562ffa94d4add751b0005d9696891556a49961e6941e49b1334e786f0c385cbc37c7cea22fb2bc9345bae1998eb14f86d287c07ce9c5f7f331
 EBUILD numactl-2.0.11-r1.ebuild 1668 BLAKE2B 14394a9c9620741f45c43b11d8272253f3fb643626aa654edc5fbde9bbe1796e4fa48fc2d4248ff7fc2e6469f04658c0aeb2119de101d30208dd1f3e61c79fec SHA512 f7a4265e81b14d1d5b6814ecddc5640f30fb1ca9c7cf7e8750a754bd397e7327d9af00598a7c19b8906f405487205cbee62f1937faee83fb56a5d1adbe48d740
 EBUILD numactl-2.0.11.ebuild 1527 BLAKE2B 64b4e024b16d1ba057f3bc61613229ff5659613149567ee52440205baac3a793a390724104883da1241daafaf11fccffd764ec68efef41c138b904be800f6c1f SHA512 0a0a6eff479e075be84a48dbe2994c1ce884ad3dee6da4d2d83c770ec7db42cdde077bcd3e17c23166bf19eb83eeecbeb86d1b7c48df34c3146bfece8db481dd
-EBUILD numactl-2.0.9.ebuild 1555 BLAKE2B e80edc04ec99c91504b620ffb2b7541566ad5265a60a76c62b4f16722d2c0662841f12c2948ef870e051b637740235eb6cba96c1c60af78a74cfd513cee2db15 SHA512 9fc857360e0dc121a0737f2109b017d0d5c5474b349ce34aa7632301f44991303b4fd6479f3d23d81c4d629553ed580f7468d1ebc5f001530eed7e1d76fd3833
+EBUILD numactl-9999.ebuild 1690 BLAKE2B cf85c89004e9fe9a623cafba56475984e24a309ba67a9531c1f38c3cdf9fc9fff622e68d12eacbedb1d0f2fae530269449f8062e879d01b46c4af4ef3579bb3f SHA512 3df636c1a1a8f4a70d6f1b6abcd83e9d7102e8a66e28fcb07f8dcc779a72be23e7d29e9ffa2e3569d316c5b322f3578ff4e6af1ce44f44a530457b183ee7aa39
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/numactl/files/numactl-2.0.8-static_libs.patch b/sys-process/numactl/files/numactl-2.0.8-static_libs.patch
deleted file mode 100644
index efb84ff6240a..000000000000
--- a/sys-process/numactl/files/numactl-2.0.8-static_libs.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Build static libs without -fPIC and only if BUILD_STATIC=yes
-
-https://bugs.gentoo.org/379849
-
-Patch written by Kacper Kowalik <xarthisius@gentoo.org>
---- a/Makefile
-+++ b/Makefile
-@@ -7,6 +7,8 @@
- # for compatibility with old releases
- CFLAGS += ${OPT_CFLAGS}
- override CFLAGS += -I.
-+# build static libraries by default
-+BUILD_STATIC ?= yes
- 
- # find out if compiler supports __thread
- THREAD_SUPPORT := $(shell if $(CC) $(CFLAGS) threadtest.c -o threadtest \
-@@ -24,6 +26,7 @@
- 
- CLEANFILES := numactl.o libnuma.o numactl numademo numademo.o distance.o \
- 	      memhog libnuma.so libnuma.so.1 numamon numamon.o syscall.o bitops.o \
-+	      distance.pic.o libnuma.pic.o syscall.pic.o \
- 	      memhog.o util.o stream_main.o stream_lib.o shm.o stream clearcache.o \
- 	      test/pagesize test/tshared test/mynode.o test/tshared.o mt.o empty.o empty.c \
- 	      test/mynode test/ftok test/prefered test/randmap \
-@@ -40,11 +43,16 @@
- libdir := ${prefix}/$(shell ./getlibdir)
- docdir := ${prefix}/share/doc
- 
-+NUMA_LIBS = libnuma.so
-+ifeq ($(BUILD_STATIC),yes)
-+NUMA_LIBS+= libnuma.a
-+endif
-+
- all: numactl migratepages migspeed libnuma.so numademo numamon memhog \
-      test/tshared stream test/mynode test/pagesize test/ftok test/prefered \
-      test/randmap test/nodemap test/distance test/tbitmap test/move_pages \
-      test/mbind_mig_pages test/migrate_pages test/realloc_test libnuma.a \
--     test/node-parse numastat
-+     test/node-parse numastat ${NUMA_LIBS}
- 
- numactl: numactl.o util.o shm.o bitops.o libnuma.so
- 
-@@ -81,13 +89,14 @@
- 
- libnuma.so.1: versions.ldscript
- 
--libnuma.so.1: libnuma.o syscall.o distance.o affinity.o sysfs.o rtnetlink.o
-+libnuma.so.1: libnuma.pic.o syscall.pic.o distance.pic.o affinity.pic.o sysfs.pic.o rtnetlink.pic.o
- 	${CC} ${LDFLAGS} -shared -Wl,-soname=libnuma.so.1 -Wl,--version-script,versions.ldscript -Wl,-init,numa_init -Wl,-fini,numa_fini -o libnuma.so.1 $(filter-out versions.ldscript,$^)
- 
- libnuma.so: libnuma.so.1
- 	ln -sf libnuma.so.1 libnuma.so
- 
--libnuma.o : CFLAGS += -fPIC
-+%.pic.o: %.c
-+	${CC} -fPIC ${CPPFLAGS} ${CFLAGS} -c $< -o $@
- 
- AR ?= ar
- RANLIB ?= ranlib
-@@ -95,16 +104,6 @@
- 	$(AR) rc $@ $^
- 	$(RANLIB) $@
- 
--distance.o : CFLAGS += -fPIC
--
--syscall.o : CFLAGS += -fPIC
--
--affinity.o : CFLAGS += -fPIC
--
--sysfs.o : CFLAGS += -fPIC
--
--rtnetlink.o : CFLAGS += -fPIC
--
- test/tshared: test/tshared.o libnuma.so
- 
- test/mynode: test/mynode.o libnuma.so
-@@ -143,7 +148,9 @@
- 	mkdir -p ${libdir}
- 	install -m 0755 libnuma.so.1 ${libdir}
- 	cd ${libdir} ; ln -sf libnuma.so.1 libnuma.so
-+ifeq ($(BUILD_STATIC),yes)
- 	install -m 0644 libnuma.a ${libdir}
-+endif
- 	mkdir -p ${prefix}/include
- 	install -m 0644 numa.h numaif.h numacompat1.h ${prefix}/include
- 	install -m 0755 numastat ${prefix}/bin
diff --git a/sys-process/numactl/files/numactl-2.0.9-testsuite_fix.patch b/sys-process/numactl/files/numactl-2.0.9-testsuite_fix.patch
deleted file mode 100644
index 27a97fdf2509..000000000000
--- a/sys-process/numactl/files/numactl-2.0.9-testsuite_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests fail with /bin/dash
-
-Singned-off-by: Lars Wendler <polynomial-c@gentoo.org>
-
---- numactl-2.0.9/test/printcpu
-+++ numactl-2.0.9/test/printcpu
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #print cpu it is running on
- declare -a arr
- arr=( $(< /proc/self/stat) )
diff --git a/sys-process/numactl/files/numactl-2.0.9-testsuite_path.patch b/sys-process/numactl/files/numactl-2.0.9-testsuite_path.patch
deleted file mode 100644
index 018fc6dbcd18..000000000000
--- a/sys-process/numactl/files/numactl-2.0.9-testsuite_path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur numactl-2.0.10-orig/test/bind_range numactl-2.0.10/test/bind_range
---- numactl-2.0.10-orig/test/bind_range	2015-05-03 22:23:31.095600314 -0400
-+++ numactl-2.0.10/test/bind_range	2015-05-03 22:25:29.107592557 -0400
-@@ -93,8 +93,8 @@
- 
- HIGHESTCPU=$(grep 'processor' /proc/cpuinfo | tail -n1 | cut -f2 -d':')
- HIGHESTCPU=$(echo $HIGHESTCPU | cut -f2 -d' ')
--HIGHESTNODE=$(numactl -H | grep -e 'node [0-9]* cpus' | tail -n1 | cut -f2 -d' ')
--LOWESTNODE=$(numactl -H | grep -e 'node [0-9]* cpus' | head -n1 | cut -f2 -d' ')
-+HIGHESTNODE=$(../numactl -H | grep -e 'node [0-9]* cpus' | tail -n1 | cut -f2 -d' ')
-+LOWESTNODE=$(../numactl -H | grep -e 'node [0-9]* cpus' | head -n1 | cut -f2 -d' ')
- 
- get_mask
- 
diff --git a/sys-process/numactl/numactl-2.0.10-r2.ebuild b/sys-process/numactl/numactl-2.0.10-r2.ebuild
deleted file mode 100644
index 9fb85bfcce33..000000000000
--- a/sys-process/numactl/numactl-2.0.10-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils toolchain-funcs multilib-minimal
-
-DESCRIPTION="Utilities and libraries for NUMA systems"
-HOMEPAGE="http://oss.sgi.com/projects/libnuma/"
-SRC_URI="ftp://oss.sgi.com/www/projects/libnuma/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# ARM lacks the __NR_migrate_pages syscall.
-KEYWORDS="~amd64 -arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-ECONF_SOURCE=${S}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.8-cpuid-pic.patch #456238
-	epatch "${FILESDIR}"/${PN}-2.0.10-numademo-cflags.patch #540856
-	eautoreconf
-}
-
-src_test() {
-	if [ -d /sys/devices/system/node ]; then
-		einfo "The only generically safe test is regress2."
-		einfo "The other test cases require 2 NUMA nodes."
-		emake regress2
-	else
-		ewarn "You do not have baseline NUMA support in your kernel, skipping tests."
-	fi
-}
-
-multilib_src_compile() {
-	multilib_is_native_abi && default || emake libnuma.la
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install$(multilib_is_native_abi || echo "-libLTLIBRARIES install-includeHEADERS")
-}
-
-multilib_src_install_all() {
-	DOCS=( README TODO CHANGES DESIGN )
-	einstalldocs
-	# delete man pages provided by the man-pages package #238805
-	rm -r "${ED}"/usr/share/man/man[25] || die
-}
diff --git a/sys-process/numactl/numactl-2.0.9.ebuild b/sys-process/numactl/numactl-2.0.9.ebuild
deleted file mode 100644
index 15331a31a4d5..000000000000
--- a/sys-process/numactl/numactl-2.0.9.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="Utilities and libraries for NUMA systems"
-HOMEPAGE="http://oss.sgi.com/projects/libnuma/"
-SRC_URI="ftp://oss.sgi.com/www/projects/libnuma/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# ARM lacks the __NR_migrate_pages syscall.
-KEYWORDS="amd64 -arm ia64 ppc ppc64 x86 ~amd64-linux"
-IUSE="static-libs"
-
-src_prepare() {
-	echo "printf $(get_libdir)" > getlibdir
-	epatch "${FILESDIR}"/${PN}-2.0.8-static_libs.patch
-	epatch "${FILESDIR}"/${PN}-2.0.8-cpuid-pic.patch #456238
-	epatch "${FILESDIR}"/${PN}-2.0.9-testsuite_fix.patch
-	epatch "${FILESDIR}"/${P}-testsuite_path.patch
-	rm numastat || die #466108
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS}" \
-		BENCH_CFLAGS="" \
-		THREAD_SUPPORT=$(tc-has-tls && echo yes || echo no) \
-		BUILD_STATIC=$(usex static-libs)
-}
-
-src_test() {
-	if [ -d /sys/devices/system/node ]; then
-		einfo "The only generically safe test is regress2."
-		einfo "The other test cases require 2 NUMA nodes."
-		cd test
-		./regress2 || die
-	else
-		ewarn "You do not have baseline NUMA support in your kernel, skipping tests."
-	fi
-}
-
-src_install() {
-	emake install prefix="${ED}/usr" BUILD_STATIC=$(usex static-libs)
-	# delete man pages provided by the man-pages package #238805
-	rm -rf "${ED}"/usr/share/man/man[25]
-	doman *.8 # makefile doesnt get them all
-	dodoc README TODO CHANGES DESIGN
-}
diff --git a/sys-process/numactl/numactl-9999.ebuild b/sys-process/numactl/numactl-9999.ebuild
new file mode 100644
index 000000000000..3dad0c6eacec
--- /dev/null
+++ b/sys-process/numactl/numactl-9999.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools toolchain-funcs multilib-minimal
+
+DESCRIPTION="Utilities and libraries for NUMA systems"
+HOMEPAGE="https://github.com/numactl/numactl"
+if [[ "${PV}" = 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/numactl/numactl.git"
+else
+	SRC_URI="ftp://oss.sgi.com/www/projects/libnuma/download/${P}.tar.gz"
+	# ARM lacks the __NR_migrate_pages syscall.
+	KEYWORDS="~amd64 -arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.10-numademo-cflags.patch #540856
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	# We need to copy the sources or else tests will fail
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	multilib_is_native_abi && default || emake libnuma.la
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		if [ -d /sys/devices/system/node ]; then
+			einfo "The only generically safe test is regress2."
+			einfo "The other test cases require 2 NUMA nodes."
+			emake regress2
+		else
+			ewarn "You do not have baseline NUMA support in your kernel, skipping tests."
+		fi
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		install$(multilib_is_native_abi || echo "-libLTLIBRARIES install-includeHEADERS")
+	find "${ED%/}"/usr/ -name libnuma.la -delete || die
+}
+
+multilib_src_install_all() {
+	local DOCS=( README TODO CHANGES DESIGN )
+	einstalldocs
+	# delete man pages provided by the man-pages package #238805
+	rm -r "${ED%/}"/usr/share/man/man[25] || die
+}