[gentoo-commits] repo/gentoo:master commit in: sys-process/numactl/files/, sys-process/numactl/

[Lars Wendler]

commit:     b18f5068f06686bf7e7830ac18194321ca344817
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  9 14:44:39 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Feb  9 15:05:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b18f5068

sys-process/numactl: Removed old.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-process/numactl/Manifest                       |  2 -
 .../numactl/files/numactl-2.0.8-static_libs.patch  | 86 ----------------------
 .../files/numactl-2.0.9-testsuite_fix.patch        | 12 ---
 .../files/numactl-2.0.9-testsuite_path.patch       | 14 ----
 sys-process/numactl/numactl-2.0.10-r2.ebuild       | 49 ------------
 sys-process/numactl/numactl-2.0.9.ebuild           | 55 --------------
 6 files changed, 218 deletions(-)

diff --git a/sys-process/numactl/Manifest b/sys-process/numactl/Manifest
index 6f7b035257d..bd509289f83 100644
--- a/sys-process/numactl/Manifest
+++ b/sys-process/numactl/Manifest
@@ -1,3 +1 @@
-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

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 efb84ff6240..00000000000
--- 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@g.o>
---- 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 27a97fdf250..00000000000
--- 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@g.o>
-
---- 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 018fc6dbcd1..00000000000
--- 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 9fb85bfcce3..00000000000
--- 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 15331a31a4d..00000000000
--- 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
-}