Version Bump

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

6 files changed, 125 insertions, 15 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/Manifest b/app-benchmarks/i7z/Manifest
index 41ba6551d0d7..6b8b29c9ed2c 100644
--- a/app-benchmarks/i7z/Manifest
+++ b/app-benchmarks/i7z/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 0.26-gcc46.patch 575 RMD160 9475df63439cbfba5306bb2c41736af6e76ab3bc SHA1 46a16f3b6b576eb6c6c1941bc1c07dff7441a4d0 SHA256 461a6a3e57f54d3b67d557c69e7fdc032647d8a1c1ac54aebdfc82b812f0497b
 AUX 0.26-gentoo.patch 1341 RMD160 a4f8d6bb7b264133ba44f7f7a29aef6659d5a839 SHA1 16ef35271a623b16c601e12d22e1a39fcee4b329 SHA256 ea831b1aca9772c7de12e9bc6a8d7f31fa93f4fa2cb0f721a76f9004c524d884
+AUX 0.27-gentoo.patch 1351 RMD160 67673a41d2a4830b37a09d5e6efb9b6d9c2eb1eb SHA1 949916e9a3170e2df7805a0d7146936b92332847 SHA256 e31dfd547d18a6b3ac1ba854f4faae858c95812aaa3fdad0bd34f5d4662e1235
 DIST i7z-0.26.tar.gz 30539 RMD160 580a11cc820a0037e196533ab0bfae9e5f3669b8 SHA1 a0c4e00867955f00708aefcf4a7f4406e4c08423 SHA256 68cf43fc583f2da7f372644f77e83901141543fe47665c9c0148b80258782f85
-EBUILD i7z-0.26.ebuild 958 RMD160 8752b836f7d30d4e3b81d5307132a0db416abac5 SHA1 a193f73c8d54466e90a023d970c0613b9999ff42 SHA256 0fb7b5927aa040fdf0094aee07987e09fd619ed2cefac718704d702e2e782d64
-MISC ChangeLog 591 RMD160 987754ed17514e9b2cca6e2f816974910acb385c SHA1 b3b284aca4220b94661e579f711e73e6fd9bf156 SHA256 c0b9f76f51b81a8e2ad6cce286a311f8e199a4eadd6de876d3a8c6ccc8661cc2
-MISC metadata.xml 220 RMD160 435928b54535666360b3bf96aaa03430383339b8 SHA1 72650d93162578d87307bdef5caf72c5ee15c97a SHA256 e08cbf772d3bdb38ef895160c6573fdd3b1e81aea8f85a8cef84f5964d578fc4
+DIST i7z-0.27.tar.gz 121372 RMD160 657ab3d5f8fb2a365afe1a982174cc0dd12d84e2 SHA1 1f90f0594904c96560c57dff39656180eebc7566 SHA256 a06dab9d0a7fcc4ad2bad5b603a0087ed56f96de55015471b4a29c142b0219ea
+EBUILD i7z-0.26.ebuild 951 RMD160 5e204396871388f4cd823681db587fef2d407666 SHA1 4341c4781e4b00524da93f4a6387f581e915992c SHA256 e06582c514161bdb8c06db2180618f34dd8b52d7c362d6df40cdc9a31a4b4c17
+EBUILD i7z-0.27.ebuild 905 RMD160 edf500611859bb63f9b2b348954e729bdf828f46 SHA1 e7ee5ee5f91fcbe0a5312e95ce8790faa25fde40 SHA256 b09280e06c91a65abb649a2e0433e16201f2d236048eda79ce0839f9f3ae61c6
+MISC ChangeLog 756 RMD160 80d24ff88935157029b6cb46fa18c6a61a10c653 SHA1 5e4ee3a1464e12694c721765ef9c6eae837b8dea SHA256 c2c3074b554e1920325ba5c62b34aa973f057a0efb494c7b3e5c701304f88009
+MISC metadata.xml 223 RMD160 d103626bf675fcbd59d665e802d8854269dff731 SHA1 84c55768ecdcda816237b2784f792eb7d8777d29 SHA256 a449c2ba8a1a7c556970d16995c7735a1de3d5f65a21ae711eeec898e3767abc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk23ybgACgkQgAnW8HDreRa9AQCggVeltmruAqX36Gru1RLd5dKk
-PygAmQFHvI32k3cswGUaUrsn7MbTwehT
-=xOs1
+iEYEAREKAAYFAk5HoacACgkQgAnW8HDreRZHvgCdEGYOX+mYT2ID8uKJPmHeGdrG
+sZsAoKtyW6dOfwvFWRTBvXR8E9wu9Lep
+=HZmg
 -----END PGP SIGNATURE-----
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>