8 files changed, 30 insertions, 174 deletions
diff --git a/sys-process/numactl/ChangeLog b/sys-process/numactl/ChangeLog
index 5fa5ec7c3a60..403ef9baa5e8 100644
--- a/sys-process/numactl/ChangeLog
+++ b/sys-process/numactl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-process/numactl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/ChangeLog,v 1.28 2013/04/20 04:15:52 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/ChangeLog,v 1.29 2014/01/05 16:10:13 polynomial-c Exp $
+
+*numactl-2.0.9 (05 Jan 2014)
+
+  05 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> -numactl-2.0.2.ebuild,
+  -numactl-2.0.5.ebuild, -numactl-2.0.7.ebuild, -numactl-2.0.8.ebuild,
+  +numactl-2.0.9.ebuild, -files/numactl-2.0.2-build.patch,
+  -files/numactl-2.0.5-protos.patch, +files/numactl-2.0.9-testsuite_fix.patch:
+  Version bump. Removed old.
 
 *numactl-2.0.8-r1 (20 Apr 2013)
 
diff --git a/sys-process/numactl/files/numactl-2.0.2-build.patch b/sys-process/numactl/files/numactl-2.0.2-build.patch
deleted file mode 100644
index acb04b8ab81b..000000000000
--- a/sys-process/numactl/files/numactl-2.0.2-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 3795115..28a9418 100755
---- a/Makefile
-+++ b/Makefile
-@@ -57,7 +57,7 @@ memhog: util.o memhog.o libnuma.so
- 
- numactl.o: numactl.c
- 
--numademo: override LDFLAGS += -lm
-+numademo: LDLIBS += -lm
- # GNU make 3.80 appends BENCH_CFLAGS twice. Bug? It's harmless though.
- numademo: CFLAGS += -DHAVE_STREAM_LIB -DHAVE_MT -DHAVE_CLEAR_CACHE ${BENCH_CFLAGS}
- stream_lib.o: CFLAGS += ${BENCH_CFLAGS}
diff --git a/sys-process/numactl/files/numactl-2.0.5-protos.patch b/sys-process/numactl/files/numactl-2.0.5-protos.patch
deleted file mode 100644
index 1f1bedc5e0fa..000000000000
--- a/sys-process/numactl/files/numactl-2.0.5-protos.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-fix missing fstat64() prototype
-
---- a/shm.c
-+++ b/shm.c
-@@ -25,6 +25,7 @@
- #include <sys/ipc.h>
- #include <sys/shm.h>
- #include <sys/fcntl.h>
-+#include <sys/stat.h>
- #include <stdarg.h>
- #include <errno.h>
- #include <unistd.h>
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
new file mode 100644
index 000000000000..27a97fdf2509
--- /dev/null
+++ b/sys-process/numactl/files/numactl-2.0.9-testsuite_fix.patch
@@ -0,0 +1,12 @@
+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/numactl-2.0.2.ebuild b/sys-process/numactl/numactl-2.0.2.ebuild
deleted file mode 100644
index 379e8e208e82..000000000000
--- a/sys-process/numactl/numactl-2.0.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/numactl-2.0.2.ebuild,v 1.6 2009/12/22 23:24:25 robbat2 Exp $
-
-inherit eutils toolchain-funcs
-
-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"
-KEYWORDS="amd64 ppc x86"
-IUSE="perl"
-
-RDEPEND="perl? ( dev-lang/perl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" BENCH_CFLAGS="" || die
-}
-
-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 "regress2 failed!"
-	else
-		ewarn "You do not have baseline NUMA support in your kernel, skipping tests."
-	fi
-}
-
-src_install() {
-	emake install prefix="${D}/usr" || die
-	# delete man pages provided by the man-pages package #238805
-	rm -rf "${D}"/usr/share/man/man[25]
-	doman *.8 || die # makefile doesnt get them all
-	dodoc README TODO CHANGES DESIGN
-	if ! use perl ; then
-		rm "${D}"/usr/bin/numastat "${D}"/usr/share/man/man8/numastat.8 || die
-	fi
-}
diff --git a/sys-process/numactl/numactl-2.0.5.ebuild b/sys-process/numactl/numactl-2.0.5.ebuild
deleted file mode 100644
index ee79da848096..000000000000
--- a/sys-process/numactl/numactl-2.0.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/numactl-2.0.5.ebuild,v 1.1 2010/08/14 00:06:16 vapier Exp $
-
-inherit eutils toolchain-funcs
-
-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"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="perl"
-
-RDEPEND="perl? ( dev-lang/perl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-protos.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" BENCH_CFLAGS="" || die
-}
-
-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 "regress2 failed!"
-	else
-		ewarn "You do not have baseline NUMA support in your kernel, skipping tests."
-	fi
-}
-
-src_install() {
-	emake install prefix="${D}/usr" || die
-	# delete man pages provided by the man-pages package #238805
-	rm -rf "${D}"/usr/share/man/man[25]
-	doman *.8 || die # makefile doesnt get them all
-	dodoc README TODO CHANGES DESIGN
-	if ! use perl ; then
-		rm "${D}"/usr/bin/numastat "${D}"/usr/share/man/man8/numastat.8 || die
-	fi
-}
diff --git a/sys-process/numactl/numactl-2.0.7.ebuild b/sys-process/numactl/numactl-2.0.7.ebuild
deleted file mode 100644
index 5537d8588894..000000000000
--- a/sys-process/numactl/numactl-2.0.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/numactl-2.0.7.ebuild,v 1.4 2011/11/06 13:53:18 ranger Exp $
-
-inherit eutils toolchain-funcs
-
-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"
-KEYWORDS="amd64 ppc x86"
-IUSE="perl"
-
-RDEPEND="perl? ( dev-lang/perl )"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" BENCH_CFLAGS="" || die
-}
-
-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 "regress2 failed!"
-	else
-		ewarn "You do not have baseline NUMA support in your kernel, skipping tests."
-	fi
-}
-
-src_install() {
-	emake install prefix="${D}/usr" || die
-	# delete man pages provided by the man-pages package #238805
-	rm -rf "${D}"/usr/share/man/man[25]
-	doman *.8 || die # makefile doesnt get them all
-	dodoc README TODO CHANGES DESIGN
-	if ! use perl ; then
-		rm "${D}"/usr/bin/numastat "${D}"/usr/share/man/man8/numastat.8 || die
-	fi
-}
diff --git a/sys-process/numactl/numactl-2.0.8.ebuild b/sys-process/numactl/numactl-2.0.9.ebuild
index e471d21731f0..7a27e7f5ffdf 100644
--- a/sys-process/numactl/numactl-2.0.8.ebuild
+++ b/sys-process/numactl/numactl-2.0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/numactl-2.0.8.ebuild,v 1.1 2013/01/06 23:04:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/numactl-2.0.9.ebuild,v 1.1 2014/01/05 16:10:13 polynomial-c Exp $
 
 EAPI="4"
 
@@ -13,13 +13,14 @@ SRC_URI="ftp://oss.sgi.com/www/projects/libnuma/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="perl static-libs"
-
-RDEPEND="perl? ( dev-lang/perl )"
+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
+	rm numastat || die #466108
 }
 
 src_compile() {
@@ -29,6 +30,7 @@ src_compile() {
 		RANLIB="$(tc-getRANLIB)" \
 		CFLAGS="${CFLAGS}" \
 		BENCH_CFLAGS="" \
+		THREAD_SUPPORT=$(tc-has-tls && echo yes || echo no) \
 		BUILD_STATIC=$(usex static-libs)
 }
 
@@ -37,7 +39,7 @@ src_test() {
 		einfo "The only generically safe test is regress2."
 		einfo "The other test cases require 2 NUMA nodes."
 		cd test
-		./regress2 || die "regress2 failed!"
+		./regress2 || die
 	else
 		ewarn "You do not have baseline NUMA support in your kernel, skipping tests."
 	fi
@@ -49,7 +51,4 @@ src_install() {
 	rm -rf "${ED}"/usr/share/man/man[25]
 	doman *.8 # makefile doesnt get them all
 	dodoc README TODO CHANGES DESIGN
-	if ! use perl ; then
-		rm "${ED}"/usr/bin/numastat "${ED}"/usr/share/man/man8/numastat.8 || die
-	fi
 }