[gentoo-commits] proj/betagarden:master commit in: app-benchmarks/i7z/files/, app-benchmarks/i7z/

["Justin Lecher" <jlec@gentoo.org>]

commit:     bad88660641ac8a5937dc4212e3e6fd2fc285a7f
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 28 22:37:27 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 22:37:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=bad88660

Fix for current HEAD

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

---
 app-benchmarks/i7z/ChangeLog               |    4 ++++
 app-benchmarks/i7z/files/9999-gentoo.patch |   25 ++++++++++++++-----------
 app-benchmarks/i7z/i7z-9999.ebuild         |    7 ++++---
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/app-benchmarks/i7z/ChangeLog b/app-benchmarks/i7z/ChangeLog
index a1a8101..119c19e 100644
--- a/app-benchmarks/i7z/ChangeLog
+++ b/app-benchmarks/i7z/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Dec 2011; Justin Lecher <jlec@gentoo.org> files/9999-gentoo.patch,
+  i7z-9999.ebuild:
+  Fix for current HEAD
+
   04 Dec 2011; Justin Lecher <jlec@gentoo.org> files/9999-gentoo.patch:
   Adopted to changes in HEAD
 

diff --git a/app-benchmarks/i7z/files/9999-gentoo.patch b/app-benchmarks/i7z/files/9999-gentoo.patch
index e096ce2..f50f7c9 100644
--- a/app-benchmarks/i7z/files/9999-gentoo.patch
+++ b/app-benchmarks/i7z/files/9999-gentoo.patch
@@ -1,13 +1,16 @@
+ Makefile |   21 ++++++++++-----------
+ 1 files changed, 10 insertions(+), 11 deletions(-)
+
 diff --git a/Makefile b/Makefile
-index fc4d262..e2347bf 100644
+index df50bde..a8da026 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -17,18 +17,18 @@
  
  #makefile updated from patch by anestling
  
--CFLAGSANY = -g -O0 -fomit-frame-pointer -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN -Wall
-+CFLAGS += -O0 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN -Wall
+-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 
  
  LBITS := $(shell getconf LONG_BIT)
  ifeq ($(LBITS),64)
@@ -19,7 +22,7 @@ index fc4d262..e2347bf 100644
  endif
  
 -CC       = gcc 
-+CC       ?= gcc
++CC       ?= gcc 
  
 -LDFLAGS  = -lncurses -lpthread -lrt
 +LIBS  = -lncurses -lpthread -lrt
@@ -33,24 +36,24 @@ index fc4d262..e2347bf 100644
 -sbindir = /usr/sbin
 +sbindir = $(DESTDIR)/usr/sbin
  
--all: clean message bin
-+all: clean bin
+-all: clean message bin test_exist
++all: bin
  
  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)
  
- clean:
- 	rm -f *.o $(BIN)
-@@ -52,6 +52,6 @@ clean:
+ test_exist:
+ 	@test -f i7z && echo 'Succeeded, now run sudo ./i7z' || echo 'Compilation failed'
+@@ -55,6 +55,5 @@ clean:
  distclean: clean
  	rm -f *~ \#*
  
 -install: all
 -	install -m 755 $(BIN) $(sbindir)
+-
 +install:
 +	install -D -m 755 $(BIN) $(sbindir)/$(BIN)
- 

diff --git a/app-benchmarks/i7z/i7z-9999.ebuild b/app-benchmarks/i7z/i7z-9999.ebuild
index 1819372..40bf095 100644
--- a/app-benchmarks/i7z/i7z-9999.ebuild
+++ b/app-benchmarks/i7z/i7z-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit eutils qt4-r2 subversion toolchain-funcs
+inherit eutils flag-o-matic qt4-r2 subversion toolchain-funcs
 
 DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux"
 HOMEPAGE="http://code.google.com/p/i7z/"
@@ -22,6 +22,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	replace-flags -O? -O0
 	epatch "${FILESDIR}"/${PV}-gentoo.patch
 	tc-export CC
 }
@@ -30,12 +31,12 @@ src_compile() {
 	default
 	if use X; then
 		cd GUI
-		eqmake4 GUI.pro && emake
+		eqmake4 ${PN}_GUI.pro && emake clean && emake
 	fi
 }
 
 src_install() {
 	default
-	use X && newsbin GUI/GUI i7z_GUI
+	use X && dosbin GUI/i7z_GUI
 	dodoc put_cores_o*line.sh MAKEDEV-cpuid-msr
 }