app-benchmarks/i7z: Adopt to HEAD and include patch from http://code.google.com/p/i7z/issues/detail?id=44

(Portage version: 2.2.0_alpha84/git/Linux x86_64, signed Manifest commit with key 70EB7916)

4 files changed, 40 insertions, 30 deletions

diff --git a/app-benchmarks/i7z/ChangeLog b/app-benchmarks/i7z/ChangeLog
index 119c19e..d940882 100644
--- a/app-benchmarks/i7z/ChangeLog
+++ b/app-benchmarks/i7z/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Dec 2011; Justin Lecher <jlec@gentoo.org> files/9999-gentoo.patch,
+  i7z-9999.ebuild:
+  Adopt to HEAD and include patch from
+  http://code.google.com/p/i7z/issues/detail?id=44
+
   28 Dec 2011; Justin Lecher <jlec@gentoo.org> files/9999-gentoo.patch,
   i7z-9999.ebuild:
   Fix for current HEAD
diff --git a/app-benchmarks/i7z/Manifest b/app-benchmarks/i7z/Manifest
index 63c5a3c..8331699 100644
--- a/app-benchmarks/i7z/Manifest
+++ b/app-benchmarks/i7z/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX 9999-gentoo.patch 1506 RMD160 2aed9afcb45a82f83ff93ab8b4862103ce601192 SHA1 fae2b2309c277e777d4064d4cd7a4084ae1c8f4c SHA256 a9fbdf7551a9122f9b333c64ebb1a9290f877988861abb6743b7710e4ea18eee
-EBUILD i7z-9999.ebuild 885 RMD160 ff2ff31d1ab32cd55030d426daf94fb611409a39 SHA1 b85f9602f6298c22b32bb4aa3a1b89dc2511f00a SHA256 5f2aedef59028b175ab68efdaef30a1dde74c36a410a741f28162e57549586dd
-MISC ChangeLog 815 RMD160 d41edd47bfb6cabedfa9a0838738b8618ee4836d SHA1 053ab95dc2d06851a679958b8dfd942c22a4d79d SHA256 2b9f5140bffe0848711417e94a82c73a1394304fa3f3802ee269b93c13108da4
+AUX 9999-gentoo.patch 1835 RMD160 bf47ab0107fe1c01376763294a19b55d189c14b1 SHA1 3efb8d14d7b16d6d94aef3a86df850e10dc8d473 SHA256 3abba116fd0a6f6d16ae86f9faf3cf1e7237b47c9763a8a5362770ce82b79202
+EBUILD i7z-9999.ebuild 817 RMD160 c24397b8ddae7cea65bf144471defac3f083fe57 SHA1 4ab685c11b7f27b5d43d51105dc30e6f4662a52c SHA256 391e8ed4c4cc5bfcaee419e399973e4eaf85dc8a451210c6f87f00b4e76b5e09
+MISC ChangeLog 997 RMD160 15e77d1eb5483f8d89af76f5322d0e70697d318d SHA1 fdc6dd9d3dacab6e5acd42259e8d1e7622d980a2 SHA256 4caf5d753fe3624c2a7f1a3d6d00beeaa73878b857d995a4af105e90febfb380
 MISC metadata.xml 214 RMD160 efd8175069efb91061298ff4584218b633e44678 SHA1 d372fdbfcb7fd07a4082961d3f3527be4fca1d60 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk77micACgkQgAnW8HDreRYawQCdHCCMdg5fQSzpIYWd4IJVyCDg
-UncAn2LHSnPEt8Q+zKHdl48RvmcnZJn9
-=fCJa
+iEYEAREKAAYFAk7/AncACgkQgAnW8HDreRa40ACfQsOnJH8fcfF8rlxmAGtkiGRF
+9a0AnRsoRaf4p2lQMEyEPTF/p5sNplys
+=CjW1
 -----END PGP SIGNATURE-----
diff --git a/app-benchmarks/i7z/files/9999-gentoo.patch b/app-benchmarks/i7z/files/9999-gentoo.patch
index f50f7c9..63bbacf 100644
--- a/app-benchmarks/i7z/files/9999-gentoo.patch
+++ b/app-benchmarks/i7z/files/9999-gentoo.patch
@@ -1,16 +1,14 @@
- Makefile |   21 ++++++++++-----------
- 1 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index df50bde..a8da026 100644
---- a/Makefile
-+++ b/Makefile
-@@ -17,18 +17,18 @@
+Index: Makefile
+===================================================================
+--- Makefile	(revision 81)
++++ Makefile	(working copy)
+@@ -19,36 +19,40 @@
  
- #makefile updated from patch by anestling
- 
--CFLAGSANY = -g -O0 -fomit-frame-pointer -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN 
-+CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN 
+ #explicitly disable two scheduling flags as they cause segfaults
+ CFLAGS_FOR_AVOIDING_SEG_FAULT = -fno-schedule-insns2  -fno-schedule-insns
+-CFLAGSANY = $(CFLAGS_FOR_AVOIDING_SEG_FAULT) -O0 -g  -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN
++CFLAGS ?= -O0 -g
++CFLAGS += $(CFLAGS_FOR_AVOIDING_SEG_FAULT) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN
  
  LBITS := $(shell getconf LONG_BIT)
  ifeq ($(LBITS),64)
@@ -25,35 +23,44 @@ index df50bde..a8da026 100644
 +CC       ?= gcc 
  
 -LDFLAGS  = -lncurses -lpthread -lrt
-+LIBS  = -lncurses -lpthread -lrt
++LIBS  += -lncurses -lpthread -lrt
  INCLUDEFLAGS = 
  
  OBJS = helper_functions
-@@ -36,15 +36,15 @@ OBJS = helper_functions
+ 
  BIN	= i7z
  SRC	= i7z.c helper_functions.c i7z_Single_Socket.c i7z_Dual_Socket.c
++OBJ	= $(SRC:.c=.o)
  
 -sbindir = /usr/sbin
-+sbindir = $(DESTDIR)/usr/sbin
++prefix = /usr
++sbindir = $(prefix)/sbin
++docdir = $(prefix)/share/doc/$(BIN)
  
 -all: clean message bin test_exist
-+all: bin
++all: test_exist
  
  message:
  	@echo "If the compilation complains about not finding ncurses.h, install ncurses (libncurses5-dev on ubuntu/debian)"
  
- bin: 
+-bin: 
 -	$(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRC) $(LDFLAGS) -o $(BIN)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) -o $(BIN) $(LIBS)
++bin: message $(OBJ)
++	$(CC) $(LDFLAGS) -o $(BIN) $(OBJ) $(LIBS)
  
- test_exist:
+-test_exist:
++test_exist: bin
  	@test -f i7z && echo 'Succeeded, now run sudo ./i7z' || echo 'Compilation failed'
-@@ -55,6 +55,5 @@ clean:
+ 
+ clean:
+@@ -57,6 +61,7 @@
  distclean: clean
  	rm -f *~ \#*
  
 -install: all
 -	install -m 755 $(BIN) $(sbindir)
 -
-+install:
-+	install -D -m 755 $(BIN) $(sbindir)/$(BIN)
++install: $(BIN)
++	install -d $(DESTDIR)$(sbindir) $(DESTDIR)$(docdir)
++	install -m 755 $(BIN) $(DESTDIR)$(sbindir)
++	install -m 0644 README.txt put_cores_offline.sh put_cores_online.sh MAKEDEV-cpuid-msr $(DESTDIR)$(docdir)
diff --git a/app-benchmarks/i7z/i7z-9999.ebuild b/app-benchmarks/i7z/i7z-9999.ebuild
index 40bf095..4b9a2e2 100644
--- a/app-benchmarks/i7z/i7z-9999.ebuild
+++ b/app-benchmarks/i7z/i7z-9999.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	replace-flags -O? -O0
 	epatch "${FILESDIR}"/${PV}-gentoo.patch
 	tc-export CC
 }
@@ -38,5 +37,4 @@ src_compile() {
 src_install() {
 	default
 	use X && dosbin GUI/i7z_GUI
-	dodoc put_cores_o*line.sh MAKEDEV-cpuid-msr
 }