Version Bump

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

4 files changed, 119 insertions, 8 deletions

diff --git a/app-benchmarks/i7z/ChangeLog b/app-benchmarks/i7z/ChangeLog
index b066afd62bd3..f160fd80bf79 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.5 2011/08/31 14:16:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/ChangeLog,v 1.6 2011/12/28 22:31:59 jlec Exp $
+
+*i7z-0.27.1 (28 Dec 2011)
+
+  28 Dec 2011; Justin Lecher <jlec@gentoo.org> +i7z-0.27.1.ebuild,
+  +files/i7z-0.27.1-gentoo.patch:
+  Version Bump
 
 *i7z-0.27-r1 (31 Aug 2011)
 
diff --git a/app-benchmarks/i7z/Manifest b/app-benchmarks/i7z/Manifest
index 98340ea680be..acaf0cd21b75 100644
--- a/app-benchmarks/i7z/Manifest
+++ b/app-benchmarks/i7z/Manifest
@@ -1,23 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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
 AUX i7z-0.27-cpuid.patch 4706 RMD160 e28b41933d40a3b6ed02f63dc0d30a198709a0c0 SHA1 4aca5976ee984f936c66834e853cf67e6390822d SHA256 cf12b4021dce55954ac2409473ee41b0118a097d3c31a6a9350a26cea3567041
+AUX i7z-0.27.1-gentoo.patch 1506 RMD160 2aed9afcb45a82f83ff93ab8b4862103ce601192 SHA1 fae2b2309c277e777d4064d4cd7a4084ae1c8f4c SHA256 a9fbdf7551a9122f9b333c64ebb1a9290f877988861abb6743b7710e4ea18eee
 DIST i7z-0.26.tar.gz 30539 RMD160 580a11cc820a0037e196533ab0bfae9e5f3669b8 SHA1 a0c4e00867955f00708aefcf4a7f4406e4c08423 SHA256 68cf43fc583f2da7f372644f77e83901141543fe47665c9c0148b80258782f85
+DIST i7z-0.27.1.tar.gz 197875 RMD160 ee0c635571ec9a071cf09bce47967b8f7cbc8200 SHA1 7e8f9efa4ee3ae04a109469614b65e144afa1666 SHA256 862d281fdd5924709056b6c71110f89c7ea1696b6f786bb55a04df8a83cf7758
 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-r1.ebuild 951 RMD160 8fe979c4e660ec6bad1ba599598f79c79f669a8f SHA1 0275497fb0a9daa6c1d865c63682cfd5f41d1b4a SHA256 d04cb74d05dc55f495fc29af70a09f6e37ddb2461c1050b88555701f98248e96
+EBUILD i7z-0.27.1.ebuild 994 RMD160 4c71f56014c17a357e21a419c15e2c54aa4a8852 SHA1 5b43c05baadda87efaf30aad09d017e2034711e3 SHA256 1d54a3ab857021ba5a5c56df9c377d813117e96eaff31a576c8ec07a2ae23dcc
 EBUILD i7z-0.27.ebuild 905 RMD160 edf500611859bb63f9b2b348954e729bdf828f46 SHA1 e7ee5ee5f91fcbe0a5312e95ce8790faa25fde40 SHA256 b09280e06c91a65abb649a2e0433e16201f2d236048eda79ce0839f9f3ae61c6
-MISC ChangeLog 925 RMD160 e8da26caaf7d1b51a1f10aa1e10b9b61e26b8738 SHA1 2822a263352c71d247c93b73c44fca26887f9198 SHA256 0b665a2959d1538cbbe9c738d77bf19cc8b53c06ffe89034f32b1ac0ca5b5070
+MISC ChangeLog 1067 RMD160 c974fbb1b50d0dbac0e00b10a0351949afd42016 SHA1 dcbbd4faad59c9b241801a6d16a851b82e24d44e SHA256 0ab2330b3582879acdee65c54d2a704dbba2de07ee209b8f5768c635bc9e7b53
 MISC metadata.xml 201 RMD160 a6c5202673c0843bd9d1453b78b3f6bddc62a1f7 SHA1 6c7c52b9cddff4c6507fe6e49be0bbd53611d236 SHA256 180014e727f4e39b95bfeadf7661f97f2a0c8fe30658a82cd676fac065c7b3c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk58+Q0ACgkQfXuS5UK5QB3dYAP/fyrY/X0LCBDIANiLKLR5G4FQ
-jzxxYcdWqHig5A+75qil6OqMrf7FTuLz5dmxSKgCxB323VJ1dhe6TQthZWOOIcHe
-J8AYjmDGmDlz0ZVTjY+O3T/Z+8jMKC1Ay+g+6bWN2Oq/jqrpXFZshBfdmL1wdZMP
-YQ0QTQfFh83kyFzIdbk=
-=+HJ8
+iEYEAREKAAYFAk77mOwACgkQgAnW8HDreRbJwACguplGrGX9z3SVeI3nR0gow7UR
+KGIAn1mO5VvEZJIC4m0olXLNVgbEzHzL
+=gOfS
 -----END PGP SIGNATURE-----
diff --git a/app-benchmarks/i7z/files/i7z-0.27.1-gentoo.patch b/app-benchmarks/i7z/files/i7z-0.27.1-gentoo.patch
new file mode 100644
index 000000000000..f50f7c9effbb
--- /dev/null
+++ b/app-benchmarks/i7z/files/i7z-0.27.1-gentoo.patch
@@ -0,0 +1,59 @@
+ 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 @@
+ 
+ #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 
+ 
+ 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 test_exist
++all: bin
+ 
+ message:
+ 	@echo "If the compilation complains about not finding ncurses.h, install ncurses (libncurses5-dev on ubuntu/debian)"
+ 
+ bin: 
+-	$(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRC) $(LDFLAGS) -o $(BIN)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDEFLAGS) $(SRC) -o $(BIN) $(LIBS)
+ 
+ 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-0.27.1.ebuild b/app-benchmarks/i7z/i7z-0.27.1.ebuild
new file mode 100644
index 000000000000..7657e620fc97
--- /dev/null
+++ b/app-benchmarks/i7z/i7z-0.27.1.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.1.ebuild,v 1.1 2011/12/28 22:32:00 jlec Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="X"
+
+RDEPEND="
+	sys-libs/ncurses
+	X? ( x11-libs/qt-gui:4 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+# -O0 is need because we get segf on higher optimizations
+	replace-flags -O? -O0
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	tc-export CC
+}
+
+src_compile() {
+	default
+	if use X; then
+		cd GUI
+		eqmake4 ${PN}_GUI.pro
+		emake clean && emake
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	if use X; then
+		dosbin GUI/i7z_GUI
+	fi
+	dodoc put_cores_o*line.sh MAKEDEV-cpuid-msr
+}