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

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.25-gentoo-r7-JeR i686

5 files changed, 72 insertions, 16 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/Manifest b/app-benchmarks/nbench/Manifest
index 0624887769fd..1cfb0843feea 100644
--- a/app-benchmarks/nbench/Manifest
+++ b/app-benchmarks/nbench/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX nbench-2.2.3-Makefile.patch 496 RMD160 0eb4c57832c3137ac270768cad80a5d115761cec SHA1 ff7be8e8f0a5fcd96e80b65ab6d6d949af29904e SHA256 89d7705f74e2cbf2827d6f08e1ea1bd26193c2e06ef76e8f0368ee1fe9f9048e
 DIST nbench-byte-2.2.1.tar.gz 110099 RMD160 e00165d0e04cd38ad922b8680f832c3388b0cb8a SHA1 479fa92e9bbccf85abd60db10ed074e8a7177bef SHA256 9b3340dfd63834c110c33e2151f632cf5546e88c38b775fe868557f6c42700f3
 DIST nbench-byte-2.2.2.tar.gz 111751 RMD160 78b8e1eaf3c24ca8c619a90693265402a4f8be68 SHA1 2ad7c76fb88f80e475650dd3802c187195cc80c1 SHA256 b86751c45fc6d1cd3fc90fecb6c9270e4b61ca76ee4045ccdeab499ad840803d
+DIST nbench-byte-2.2.3.tar.gz 111791 RMD160 a07d2a9f1a6162a5071602e89e6360c13521e463 SHA1 f2a03c56dc2bf26e478c2a1828debcafd83983ef SHA256 723dd073f80e9969639eb577d2af4b540fc29716b6eafdac488d8f5aed9101ac
 EBUILD nbench-2.2.1.ebuild 956 RMD160 ca6669b055ad7d4092179610fe16fd278e905d39 SHA1 e5a9c54b8a0eb5a8960020a73a11fbb65d72aa40 SHA256 d62f51f0e63f1ce25c70d519ccd41b3ed62c6d117e2b5898e5fdd624aabf4199
 EBUILD nbench-2.2.2.ebuild 971 RMD160 5f3d315bafbe71112ac8e53079562d17499598db SHA1 a794d6b838995c91c4cc96e762f1f9e989443927 SHA256 4445fc2d409e3783d4cf2d32e4870effedb0f58f52c7558022d8283d22b4a973
-MISC ChangeLog 2498 RMD160 d6233d17423a9d71b90506e68864121aee056b03 SHA1 a2d23f7b4bfe429dc1e5843c81b5582777ef30b5 SHA256 eeb95f1d7335233b2940b2e57c9e13f33c2d2cabc283b2d5a37ca7103305bba8
-MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkDtQ4ACgkQ67wieSYcaxd5tgCfaNcEtQngAUtjbsC9moHNt3Aq
-W3wAnjRIJKSzAWQQ9k2HH40hmZFgKBJQ
-=zjOn
------END PGP SIGNATURE-----
+EBUILD nbench-2.2.3.ebuild 1107 RMD160 0ce520d44f2f9a18f4db22f4c5ce907d087563c1 SHA1 191e0692fb69d18ef847f305170d48454e654697 SHA256 788845fbf2cc5d3dc5d5e05fd0a2343f11a1dc71d68e3b77156cb13a822f52d7
+MISC ChangeLog 2739 RMD160 a5bd09e65ca22dbf2870a78313b89fbde5027c26 SHA1 3a0ec75eaf4f4a163919fd1a60ecbc23fcd1384f SHA256 dd3466179f047ffdd1a8b5d87ba575ab702561dac6658fdc8a7ba2f1fafbe8e2
+MISC metadata.xml 252 RMD160 ed7e3d6637ec96975f17ce5c33628aa482dfd663 SHA1 ddd00321e20f4a53a140eeb56cb01b9fab24d657 SHA256 76fd24f00e95b2892ca60acdce02d8c85dfeff84fc89ca14ffdbc00b82de44b3
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
+}