Bump to hopefully fix missing pointer.h (bug #296860).

Package-Manager: portage-2.2_rc59/cvs/Linux i686

4 files changed, 67 insertions, 6 deletions

diff --git a/app-benchmarks/nbench/ChangeLog b/app-benchmarks/nbench/ChangeLog
index 54bd35d76131..17c42bb5d2b7 100644
--- a/app-benchmarks/nbench/ChangeLog
+++ b/app-benchmarks/nbench/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-benchmarks/nbench
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/nbench/ChangeLog,v 1.23 2009/04/01 14:56:27 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/nbench/ChangeLog,v 1.24 2009/12/14 12:43:34 jer Exp $
+
+*nbench-2.2.3-r1 (14 Dec 2009)
+
+  14 Dec 2009; Jeroen Roovers <jer@gentoo.org> +nbench-2.2.3-r1.ebuild,
+  files/nbench-2.2.3-Makefile.patch:
+  Bump to hopefully fix missing pointer.h (bug #296860).
 
   01 Apr 2009; Jeroen Roovers <jer@gentoo.org> -nbench-2.2.2.ebuild,
   nbench-2.2.3.ebuild:
diff --git a/app-benchmarks/nbench/Manifest b/app-benchmarks/nbench/Manifest
index cc3e9c1651d4..2302d60e70be 100644
--- a/app-benchmarks/nbench/Manifest
+++ b/app-benchmarks/nbench/Manifest
@@ -1,5 +1,6 @@
-AUX nbench-2.2.3-Makefile.patch 496 RMD160 0eb4c57832c3137ac270768cad80a5d115761cec SHA1 ff7be8e8f0a5fcd96e80b65ab6d6d949af29904e SHA256 89d7705f74e2cbf2827d6f08e1ea1bd26193c2e06ef76e8f0368ee1fe9f9048e
+AUX nbench-2.2.3-Makefile.patch 709 RMD160 068235291ba5af4f62f6417d574b4a9425731426 SHA1 abf395562b601cd4a023d285f14952cfade51a08 SHA256 b58a2e2213efa31d2a8683e315afb7d330830eaf73024c036092918e209d65de
 DIST nbench-byte-2.2.3.tar.gz 111791 RMD160 a07d2a9f1a6162a5071602e89e6360c13521e463 SHA1 f2a03c56dc2bf26e478c2a1828debcafd83983ef SHA256 723dd073f80e9969639eb577d2af4b540fc29716b6eafdac488d8f5aed9101ac
+EBUILD nbench-2.2.3-r1.ebuild 1258 RMD160 a8b0097223ae21c309de88cd4477d7a7503399f7 SHA1 0372db6365f51670c9bc682f3eb43a171b1552fe SHA256 81d160806b8a2f87c1416ab42f9a2d49d99a3decfea507d051653153b9523f7f
 EBUILD nbench-2.2.3.ebuild 1069 RMD160 e95f26f88ba7a6abd02d91a23da2f56498fbcd50 SHA1 0d2a06f1586500f1f313ee1c3fc5f64118de8f9f SHA256 7696026fa1b2283a2a8613c6cdcf84fb4da2e460769d9533d683b5a93590f288
-MISC ChangeLog 3459 RMD160 b62669688324789889a4471ca776451421667722 SHA1 21c4cd9afb06854dbbae22da1768a5504ae108a1 SHA256 5794ca23e0f17c26d4a82be280c797fac316f222c6a3a89a67bf5f89a3fa51f0
+MISC ChangeLog 3658 RMD160 23f8aac285ec5c9e4f171d513a1367a689f659a9 SHA1 b599f51b9127700a26808eddf93543b525e1eb62 SHA256 6e48e66dd1182cfac8055ac2245cb949fb8d527da567b59d87a57c2cdb245324
 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
index bf01f55f9936..c41fd07557b7 100644
--- a/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch
+++ b/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch
@@ -1,5 +1,5 @@
---- 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
+--- Makefile.org	2004-12-30 03:23:30.000000000 +0100
++++ Makefile	2009-12-14 13:31:18.000000000 +0100
 @@ -19,10 +19,10 @@
  # You should leave -static in the CFLAGS so that your sysinfo can be
  # compiled into the executable.
@@ -13,3 +13,12 @@
  
  # if your gcc lets you do it, then try this one
  #CFLAGS = -s -static -Wall -O3 -fomit-frame-pointer -funroll-loops
+@@ -126,7 +126,7 @@
+ 	if [ "4" = `./pointer` ] ; then touch pointer.h ;\
+ 	else echo "#define LONG64" >pointer.h ; fi
+ 
+-misc.o: misc.h misc.c Makefile
++misc.o: misc.h misc.c pointer.h Makefile
+ 	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
+ 		-c misc.c
+ 
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..3529b9624de9
--- /dev/null
+++ b/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2009 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-r1.ebuild,v 1.1 2009/12/14 12:43:34 jer Exp $
+
+EAPI="2"
+
+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=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	cp -va Makefile{,.org}
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+	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"
+	#sed \
+	#	-e 's|./sysinfo.sh|sh sysinfo.sh|g' \
+	#	-i Makefile || die "patching Makefile failed"
+}
+
+src_compile() {
+
+	emake LINKFLAGS="${LDFLAGS}" CC=$(tc-getCC) CFLAGS="${CFLAGS}" || die "make failed"
+}
+
+src_install() {
+	dobin nbench
+	insinto /usr/share/nbench
+	doins NNET.DAT
+
+	dodoc Changes README* bdoc.txt
+}