Version Bump

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

5 files changed, 115 insertions, 8 deletions

diff --git a/app-benchmarks/i7z/ChangeLog b/app-benchmarks/i7z/ChangeLog
index 9d00f59cb0e1..f28b2fd05c95 100644
--- a/app-benchmarks/i7z/ChangeLog
+++ b/app-benchmarks/i7z/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-benchmarks/i7z
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/ChangeLog,v 1.3 2011/04/27 07:45:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/ChangeLog,v 1.4 2011/08/14 10:21:37 jlec Exp $
+
+*i7z-0.27 (14 Aug 2011)
+
+  14 Aug 2011; Justin Lecher <jlec@gentoo.org> +files/0.27-gentoo.patch,
+  i7z-0.26.ebuild, +i7z-0.27.ebuild, metadata.xml:
+  Version Bump
 
   27 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/0.26-gcc46.patch,
   i7z-0.26.ebuild:
diff --git a/app-benchmarks/i7z/files/0.27-gentoo.patch b/app-benchmarks/i7z/files/0.27-gentoo.patch
new file mode 100644
index 000000000000..fe65a16caf9c
--- /dev/null
+++ b/app-benchmarks/i7z/files/0.27-gentoo.patch
@@ -0,0 +1,56 @@
+diff --git a/Makefile b/Makefile
+index fc4d262..e2347bf 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
+ 
+ LBITS := $(shell getconf LONG_BIT)
+ ifeq ($(LBITS),64)
+-   CFLAGS = $(CFLAGSANY) -Dx64_BIT
++   CFLAGS += -Dx64_BIT
+ else
+-   CFLAGS = $(CFLAGSANY) -Dx86
++   CFLAGS += -Dx86
+ endif
+ 
+-CC       = gcc 
++CC       ?= gcc
+ 
+-LDFLAGS  = -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
+ 
+-sbindir = /usr/sbin
++sbindir = $(DESTDIR)/usr/sbin
+ 
+-all: clean message bin
++all: clean bin
+ 
+ message:
+ 	@echo "If the compilation complains about not finding ncurses.h, install ncurses (libncurses5-dev on ubuntu/debian)"
+ 
+ bin:
+-	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) -o $(BIN)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) -o $(BIN) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o $(BIN)
+@@ -52,6 +52,6 @@ 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-0.26.ebuild b/app-benchmarks/i7z/i7z-0.26.ebuild
index 08ffe3305de4..ec5da87b5003 100644
--- a/app-benchmarks/i7z/i7z-0.26.ebuild
+++ b/app-benchmarks/i7z/i7z-0.26.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/i7z-0.26.ebuild,v 1.3 2011/04/27 07:45:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/i7z-0.26.ebuild,v 1.4 2011/08/14 10:21:37 jlec Exp $
 
-EAPI="3"
+EAPI=3
 
 inherit eutils qt4-r2 toolchain-funcs
 
@@ -28,7 +28,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake || die
+	default
 	if use X; then
 		cd GUI
 		eqmake4 GUI.pro
diff --git a/app-benchmarks/i7z/i7z-0.27.ebuild b/app-benchmarks/i7z/i7z-0.27.ebuild
new file mode 100644
index 000000000000..c0313a3f472e
--- /dev/null
+++ b/app-benchmarks/i7z/i7z-0.27.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/i7z-0.27.ebuild,v 1.1 2011/08/14 10:21:37 jlec Exp $
+
+EAPI=4
+
+inherit eutils qt4-r2 toolchain-funcs
+
+DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux"
+HOMEPAGE="http://code.google.com/p/i7z/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+IUSE="X"
+
+RDEPEND="
+	sys-libs/ncurses
+	X? ( x11-libs/qt-gui:4 )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-gentoo.patch
+	tc-export CC
+}
+
+src_compile() {
+	default
+	if use X; then
+		cd GUI
+		eqmake4 GUI.pro
+		emake
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	if use X; then
+		newsbin GUI/GUI i7z_GUI
+	fi
+	dodoc put_cores_o*line.sh MAKEDEV-cpuid-msr
+}
diff --git a/app-benchmarks/i7z/metadata.xml b/app-benchmarks/i7z/metadata.xml
index 9aa75ad4091e..c8cb9f104784 100644
--- a/app-benchmarks/i7z/metadata.xml
+++ b/app-benchmarks/i7z/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-</maintainer>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>