gentoo resync : 14.07.2018

4 files changed, 131 insertions, 0 deletions

diff --git a/app-benchmarks/nbench/Manifest b/app-benchmarks/nbench/Manifest
new file mode 100644
index 000000000000..bcfa59f014eb
--- /dev/null
+++ b/app-benchmarks/nbench/Manifest
@@ -0,0 +1,4 @@
+AUX nbench-2.2.3-Makefile.patch 2616 BLAKE2B 60ac4ec24c7787ebf4c0f76c25c1ad1afcc96818a9c2c6dd6f5fb8b04de6ff6d3a6832f030c0f7cc7ddbebeca647bf129009926d7a550a7299b2f81e26cbef61 SHA512 9d5df03ec62ca535ae432a3644ae7903f0d8520d86d9bf16d3e715fabf63e124230ddd8f735f03599592a02bac4f06f95fdf427923fe54150bfb05f553011815
+DIST nbench-byte-2.2.3.tar.gz 111791 BLAKE2B 83b602f582af32fbf8e2440cf597e8fb605fba5e0c7e5ae070e4e759ad00ee86022123c7a8a5957382a03bb4c7450aa1a2633e8d98fc86d03ea52e7a8f2895ce SHA512 68ae34c083e2e01f0114e6ff9ce04df41d70facbb05533b4cb9432fd9856048fde28e5c024d92f202e5f2de10fe223fdb46570873b1e2f69b2c847779645dec8
+EBUILD nbench-2.2.3-r1.ebuild 952 BLAKE2B b3308cbcfcc7d2487efaed4eb665f6ac56c1f028b305d9c58d48e7bf58ccbe8f38e6a6056ba564883ba1da071f52ab74e35efb311484de85eabd487180027694 SHA512 e0af98ec3324dd2bf252f1b0054ac69f109f3ab71be8bb9f3fe615755df3b475b228a1d24a5d249a57f9860637167cda3ccf5d7f20e7c8e4be6914f61d2410d8
+MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch b/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch
new file mode 100644
index 000000000000..b853fc7b65ad
--- /dev/null
+++ b/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch
@@ -0,0 +1,77 @@
+--- a/Makefile
++++ b/Makefile
+@@ -19,10 +19,10 @@
+ # You should leave -static in the CFLAGS so that your sysinfo can be
+ # compiled into the executable.
+ 
+-CC = gcc
++#CC = gcc
+ 
+ # generic options for gcc
+-CFLAGS = -s -static -Wall -O3
++#CFLAGS = -s -static -Wall -O3
+ 
+ # if your gcc lets you do it, then try this one
+ #CFLAGS = -s -static -Wall -O3 -fomit-frame-pointer -funroll-loops
+@@ -96,10 +96,10 @@
+ ##########################################################################
+ # For LINUX-like systems with gcc
+ sysinfoc.c: Makefile
+-	./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)
++	./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)
+ 
+ sysinfo.c: Makefile
+-	./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)
++	./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)
+ 
+ ##########################################################################
+ # For non-LINUX systems
+@@ -107,39 +107,39 @@
+ # and take sysinfo.c and sysinfoc.c out of the dependencies for nbench0.o
+ 
+ hardware.o: hardware.c hardware.h Makefile
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-c hardware.c
+ 
+ nbench0.o: nbench0.h nbench0.c nmglobal.h pointer.h hardware.h\
+ 	   Makefile sysinfo.c sysinfoc.c
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-c nbench0.c
+ 
+ emfloat.o: emfloat.h emfloat.c nmglobal.h pointer.h Makefile
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-c emfloat.c
+ 
+ pointer.h: pointer Makefile
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-o pointer pointer.c
+ 	rm -f pointer.h
+ 	if [ "4" = `./pointer` ] ; then touch pointer.h ;\
+ 	else echo "#define LONG64" >pointer.h ; fi
+ 
+-misc.o: misc.h misc.c Makefile
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++misc.o: misc.h misc.c pointer.h Makefile
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-c misc.c
+ 
+ nbench1.o: nbench1.h nbench1.c wordcat.h nmglobal.h pointer.h Makefile
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-c nbench1.c
+ 
+ sysspec.o: sysspec.h sysspec.c nmglobal.h pointer.h Makefile
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-c sysspec.c
+ 
+ nbench: emfloat.o misc.o nbench0.o nbench1.o sysspec.o hardware.o
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(LINKFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)\
+ 		emfloat.o misc.o nbench0.o nbench1.o sysspec.o hardware.o\
+ 		-o nbench -lm
+ 
diff --git a/app-benchmarks/nbench/metadata.xml b/app-benchmarks/nbench/metadata.xml
new file mode 100644
index 000000000000..f8bd6f3f34f9
--- /dev/null
+++ b/app-benchmarks/nbench/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild b/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild
new file mode 100644
index 000000000000..2954671d7f89
--- /dev/null
+++ b/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+MY_P="${PN}-byte-${PV}"
+
+DESCRIPTION="Linux/Unix of release 2 of BYTE Magazine's BYTEmark benchmark"
+HOMEPAGE="http://www.tux.org/~mayer/linux/bmark.html"
+SRC_URI="http://www.tux.org/~mayer/linux/${MY_P}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sh sparc x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}/${P}-Makefile.patch" )
+
+src_prepare() {
+	default
+
+	sed \
+		-e 's:$compiler -v\( 2>&1 | sed -e "/version/!d"\|\):$compiler -dumpversion:' \
+		-i sysinfo.sh || die "patching sysinfo.sh failed"
+	sed -e 's:inpath="NNET.DAT":inpath="/usr/share/nbench/NNET.DAT":' \
+		-i nbench1.h || die "patching nbench1.h failed"
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin nbench
+	dodoc Changes README* bdoc.txt
+
+	insinto /usr/share/nbench
+	doins NNET.DAT
+}