Pick up maintainership. Version bump. Patch Makefile to use toolchain CC (bug #243520).

(Portage version: 2.2_rc12/cvs/Linux 2.6.25-gentoo-r7-JeR i686)

4 files changed, 67 insertions, 4 deletions

diff --git a/app-benchmarks/nbench/ChangeLog b/app-benchmarks/nbench/ChangeLog
index aa5567c9a877..f1ec3acc8b20 100644
--- a/app-benchmarks/nbench/ChangeLog
+++ b/app-benchmarks/nbench/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-benchmarks/nbench
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/nbench/ChangeLog,v 1.15 2007/02/21 20:11:18 peper Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/nbench/ChangeLog,v 1.16 2008/10/29 05:31:20 jer Exp $
+
+*nbench-2.2.3 (29 Oct 2008)
+
+  29 Oct 2008; Jeroen Roovers <jer@gentoo.org>
+  +files/nbench-2.2.3-Makefile.patch, metadata.xml, +nbench-2.2.3.ebuild:
+  Pick up maintainership. Version bump. Patch Makefile to use toolchain CC
+  (bug #243520).
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
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..bf01f55f9936
--- /dev/null
+++ b/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch
@@ -0,0 +1,15 @@
+--- nbench-byte-2.2.3/Makefile.orig	2004-12-30 03:23:30.000000000 +0100
++++ nbench-byte-2.2.3/Makefile	2008-10-29 06:13:34.000000000 +0100
+@@ -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
diff --git a/app-benchmarks/nbench/metadata.xml b/app-benchmarks/nbench/metadata.xml
index fae7d74a9aee..6b29bc518eb4 100644
--- a/app-benchmarks/nbench/metadata.xml
+++ b/app-benchmarks/nbench/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-benchmarks/nbench/nbench-2.2.3.ebuild b/app-benchmarks/nbench/nbench-2.2.3.ebuild
new file mode 100644
index 000000000000..04798594ae55
--- /dev/null
+++ b/app-benchmarks/nbench/nbench-2.2.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/nbench/nbench-2.2.3.ebuild,v 1.1 2008/10/29 05:31:20 jer Exp $
+
+inherit eutils 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 ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+}
+
+src_compile() {
+	sed -i -e 's:$compiler -v\( 2>&1 | sed -e "/version/!d"\|\):$compiler -dumpversion:' sysinfo.sh || die
+	sed -i -e 's:inpath="NNET.DAT":inpath="/usr/share/nbench/NNET.DAT":' nbench1.h || die
+
+	make LINKFLAGS="${LDFLAGS}" CC=$(tc-getCC) CFLAGS="${CFLAGS}" || die "make failed"
+}
+
+src_install() {
+	dobin nbench
+	insinto /usr/share/nbench
+	doins NNET.DAT
+
+	dodoc Changes README* RESULT bdoc.txt
+}