app-benchmarks/i7z: Version Bump, drop old patches

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

7 files changed, 64 insertions, 264 deletions

diff --git a/app-benchmarks/i7z/ChangeLog b/app-benchmarks/i7z/ChangeLog
index 0395e0c07a61..a9bd55340d20 100644
--- a/app-benchmarks/i7z/ChangeLog
+++ b/app-benchmarks/i7z/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-benchmarks/i7z
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/ChangeLog,v 1.13 2012/06/08 12:53:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/ChangeLog,v 1.14 2012/09/12 06:24:13 jlec Exp $
+
+*i7z-0.27.2 (12 Sep 2012)
+
+  12 Sep 2012; Justin Lecher <jlec@gentoo.org> -files/0.26-gcc46.patch,
+  -files/i7z-0.27-cpuid.patch, -files/0.26-gentoo.patch, +i7z-0.27.2.ebuild,
+  -files/0.27-gentoo.patch:
+  Version Bump, drop old patches
 
   08 Jun 2012; Justin Lecher <jlec@gentoo.org> -i7z-0.27-r1.ebuild:
   Cleaned old
diff --git a/app-benchmarks/i7z/Manifest b/app-benchmarks/i7z/Manifest
index d1c9d11ed067..a732cd847920 100644
--- a/app-benchmarks/i7z/Manifest
+++ b/app-benchmarks/i7z/Manifest
@@ -1,9 +1,18 @@
-AUX 0.26-gcc46.patch 575 SHA256 461a6a3e57f54d3b67d557c69e7fdc032647d8a1c1ac54aebdfc82b812f0497b SHA512 d7c822544d34df063f330e891b9e1e61725e4f9beb1c04eb60327209efea8050bd3db4fcb15e1fd9491b4218c0193e0bdfaa50cb80bf4259a97b851507e674fe WHIRLPOOL 578d48e02c80dae1a4758b430e93ed2d243f967f4bddbca9bfdebb7f21c0f8ce60ec317983abb50cc20687db3aba07afee9f3cfa5ad3e6abfcf5a75429866e0e
-AUX 0.26-gentoo.patch 1341 SHA256 ea831b1aca9772c7de12e9bc6a8d7f31fa93f4fa2cb0f721a76f9004c524d884 SHA512 7a7ff24506b7ba26c6ad97fae6b423ac42c34baa8768d2d820ed392296dbe6822a02cca9340ae79ca0332b49ee017a8d8a2f674b9964c75867163c5aacd1b0a3 WHIRLPOOL 33f3b5ba0cb08fc430a04ba7b0fdad6340dcd0f598607f313ba23bc7b16b9a0cb5dd9ebef7b48bdef10ffa9187f5b6c403802ecc3cb3a3cb163bc2819ba6ba8e
-AUX 0.27-gentoo.patch 1351 SHA256 e31dfd547d18a6b3ac1ba854f4faae858c95812aaa3fdad0bd34f5d4662e1235 SHA512 18690bfb06dda0e6f28f2da33fb7c5d0baecc9e8f15a48e249b92227711ca4d9b329fd40a3364981a5872735a16e8c875989b35c39f8be70ee9ad69ee139cc19 WHIRLPOOL 5d10e058b04e667d1c332653bdb7fd6aa5619a4bf9a4dd18c27029075aac262362c4878674890434a0eac766bc07e17b30b707a1e17fb18387fe51da309db1f4
-AUX i7z-0.27-cpuid.patch 4706 SHA256 cf12b4021dce55954ac2409473ee41b0118a097d3c31a6a9350a26cea3567041 SHA512 2f4ad7d9a462169b795aef888b22b2a8f57f798300fe985b5cacfd1346b49e924f975aaf9be0a2cd4e7e77c3947ca0b2bb4adfff4a305b7cd50fc05e98c5f42a WHIRLPOOL 42fc8cc83e9d5e2a8ba1886584796349ca2e139254c563c84011aa75e6ea44d9ee46359d83e9bd16163ceb0b25c380704aa001e43ac17b86c8c04c35eca288a6
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX i7z-0.27.1-gentoo.patch 1506 SHA256 a9fbdf7551a9122f9b333c64ebb1a9290f877988861abb6743b7710e4ea18eee SHA512 861b1fec29e8292834b4f7c07fbadfd98884cbd451c05140ae49e52afa180f000fde22756c86b04877fac44a5c8d5be625c032a16b31db2ebfbec894d28da04b WHIRLPOOL c2495ebc84dc13f416748c0017af661545cdbf6ad022ac375e8a82f7aa4e1b72ddac3b8e4fbc87a390a562c0204a0a999bab6c75d8dbb1ea8cceb12236a28fb4
 DIST i7z-0.27.1.tar.gz 197875 SHA256 862d281fdd5924709056b6c71110f89c7ea1696b6f786bb55a04df8a83cf7758 SHA512 515c239a875ad282563b0b2d735243daaa39c9ef9f2d8c8663a2616ad28c56f0d71a4e1d99bdf88e9250b8090f0f4726ff272b0c6e1265991c86e100d26eb362 WHIRLPOOL 32ff5457a66f11a201da8c652eb5ff8365543511e1a94b349737c5f67cda3c0fa6045f45b7cbf6588657dc9ace05b099c8f40fe6cd5f6c873799ca4443234c5c
+DIST i7z-0.27.2.tar.gz 51226 SHA256 a7f72d65732c17eef0df4f284927fe744fc650075f2364c51c9497534d8f47f1 SHA512 d693fda4d12bf7b0d8e694d9f97876fcd2cad4556c950b4eab09ae21d121e63e221e1e1b27bcf23a241fd868b09165639ecfafeaa126144ad809199fcaca1cbb WHIRLPOOL aaea6bc544a554703cd85f7e2e075588114a6c807e1311421300464f1468560423e987f1582b5e58a2fd48eb1753559958ea39ed9ab97e621718e7f46e8c476e
 EBUILD i7z-0.27.1.ebuild 998 SHA256 53273818e137867399a7604c4b2e7d498e543807f4d74cfd58c318f65bb17e7d SHA512 687ec6d88b0a51f80aa4a8eef1d63a9af14dc66ad43f632bdfc300bf5b0d70aeaf068a2d30338557217e9292ed0c044772eae07522ef687337a72b206a2a9c2d WHIRLPOOL 8def06569f4088c0ee10f781ec820086460beb598261be61c90ba7307778de876c5877f23f97d53fc620ac7b1207d326bfa96b09c1f40d44482f97ef0a7f9bfb
-MISC ChangeLog 1791 SHA256 888ecdc9cb270c01acba19fc9ff320abd215ae597d3732ad43b7d50a2b9ea704 SHA512 ef389c1d68efd1893f360710d39f2ce6811804e4d50f872044f37f8b01443f964f99eb51438eaa0efe140c1e6e3e1fff90607fd6dd90e288af6c58c27b794f79 WHIRLPOOL 6e1cc66de0f2261bfe96641209724e6efe21d05925353a0be0d33d58477072bff58235b30dd86e2b71278f637de54be0878c7c011b591e5ea4b3b2cc82da7a5f
+EBUILD i7z-0.27.2.ebuild 873 SHA256 15afc868ebf66952b1afebaa002ac07d11a66f69516084deb1a3c692346b6725 SHA512 d36aa9da2c6f0e63d128a6b9fa7b1ef19838302c8eefeaca5636368602a50a5c9b510621009bd5c4f7cfb77c9c4375bbcdcb32de0732953bd4589e50fa71af3a WHIRLPOOL 3d95855278ea2a8294a959376296a174bf5889d3f91f27f0b2f865287772331fdff18ad681ab7629110e623ad6575501513b57042565e2582010fc227a54dcf0
+MISC ChangeLog 2029 SHA256 fc08fb2b6cddf38eb9f95a60e42b876af398e6160593a8a26fc9c8b9661f930f SHA512 30917e8045b590103909c26836b848aa9422d7a71391165e3682861485355f7e10497ff84435fade40ba08160d8a1639cd414515216b85ebb142246027cc1909 WHIRLPOOL d7ce50f77acb7d54a229f047c0b3b7d265bb796f3818e752d90d1924635c89d255f765e203c2ac761c0b45acdc3856a3a6ad76d5c3d2cdb9cc6f076deadc1d97
 MISC metadata.xml 274 SHA256 99db8dacd71438ce8b9e6e2fce529fb4558d62e7fb34c6ee9f00705278d896d6 SHA512 e0e1052bc07e355daba76e2fb773d1c98618a2cd3bc1617299ffddbef5764640999a6752e11a9ba162e471c1ff8c4a779da9a53dd5a1ddce6ed1cc242875c3e9 WHIRLPOOL 0da25710f5676efd0793cb0b8e901abc24bf8295fe009e2e739aef7a3652b129f941f9981dc13fe41fc407a8a7cb8a036572e71b9420f1cbe78937b02b0dba58
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREIAAYFAlBQKpIACgkQgAnW8HDreRYChgCgh179FpfHBj9yZ3pld4D+aLRM
+w2IAoLgtYDBntaW/3VrudzhWMf21/I8t
+=GoVU
+-----END PGP SIGNATURE-----
diff --git a/app-benchmarks/i7z/files/0.26-gcc46.patch b/app-benchmarks/i7z/files/0.26-gcc46.patch
deleted file mode 100644
index 08ad216566b4..000000000000
--- a/app-benchmarks/i7z/files/0.26-gcc46.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- /tmp/GUI_i7z-50.cpp
-+++ i7z/GUI/GUI_i7z.cpp
-@@ -48,10 +48,14 @@
- void Construct_Socket_Information_in_GUI(unsigned int *numCPUs) {
-     socket_0.max_cpu=0;
-     socket_0.socket_num=0;
--    socket_0.processor_num={-1,-1,-1,-1,-1,-1,-1,-1};
-+    int i;
-+    for(i=0;i < 8; i++)
-+        socket_0.processor_num[i]=-1;
-     socket_1.max_cpu=0;
-     socket_1.socket_num=1;
--    socket_1.processor_num={-1,-1,-1,-1,-1,-1,-1,-1};
-+    
-+    for(i=0;i < 8; i++)
-+        socket_1.processor_num[i]=-1;
- 
-     construct_CPU_Heirarchy_info(&chi);
-     construct_sibling_list(&chi);
diff --git a/app-benchmarks/i7z/files/0.26-gentoo.patch b/app-benchmarks/i7z/files/0.26-gentoo.patch
deleted file mode 100644
index 345fe505f80c..000000000000
--- a/app-benchmarks/i7z/files/0.26-gentoo.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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
-+LIBS  = -lncurses -lpthread
- 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/files/0.27-gentoo.patch b/app-benchmarks/i7z/files/0.27-gentoo.patch
deleted file mode 100644
index fe65a16caf9c..000000000000
--- a/app-benchmarks/i7z/files/0.27-gentoo.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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/files/i7z-0.27-cpuid.patch b/app-benchmarks/i7z/files/i7z-0.27-cpuid.patch
deleted file mode 100644
index 16b5a097234f..000000000000
--- a/app-benchmarks/i7z/files/i7z-0.27-cpuid.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-http://code.google.com/p/i7z/issues/detail?id=31
-
-this makes cpuid work on 32bit and 64bit systems, both PIC and non-PIC
-
-the things it fixes:
- - no more silent clobbering of ebx/ecx/edx
- - works under 32bit pic builds (gcc doesnt like to clobber ebx)
-   - ebx gets saved/restored via edi register
- - get_vendor incorrectly used ebx,ecx,edx when it should be ebx,edx,ecx
- - unify all the cpuid implementations to make usage much simpler
-
-I WROTE THIS
-
---- a/helper_functions.c
-+++ b/helper_functions.c
-@@ -87,41 +87,40 @@ print_family_info (struct family_info *proc_info)
-     //    printf("    Extended Family %d\n", proc_info->extended_family);
- }
- 
-+static inline void cpuid (unsigned int info, unsigned int *eax, unsigned int *ebx,
-+                          unsigned int *ecx, unsigned int *edx)
-+{
-+    unsigned int _eax = info, _ebx, _ecx, _edx;
-+    asm volatile ("mov %%ebx, %%edi;" // save ebx (for PIC)
-+                  "cpuid;"
-+                  "mov %%ebx, %%esi;" // pass to caller
-+                  "mov %%edi, %%ebx;" // restore ebx
-+                  :"+a" (_eax), "=S" (_ebx), "=c" (_ecx), "=d" (_edx)
-+                  :      /* inputs: eax is handled above */
-+                  :"edi" /* clobbers: we hit edi directly */);
-+    if (eax) *eax = _eax;
-+    if (ebx) *ebx = _ebx;
-+    if (ecx) *ecx = _ecx;
-+    if (edx) *edx = _edx;
-+}
- 
--#ifdef x64_BIT
- void  get_vendor (char *vendor_string)
- {
-     //get vendor name
--    unsigned int b, c, d, e;
--    //  int i;
--    asm volatile ("mov %4, %%eax; "	// 0 into eax
--                  "cpuid;" "mov %%eax, %0;"	// eeax into b
--                  "mov %%ebx, %1;"	// eebx into c
--                  "mov %%edx, %2;"	// eeax into d
--                  "mov %%ecx, %3;"	// eeax into e
--              :"=r" (b), "=r" (c), "=r" (d), "=r" (e)	/* output */
--                          :"r" (0)	/* input */
--                          :"%eax", "%ebx", "%ecx", "%edx"	/* clobbered register, will be modifying inside the asm routine so dont use them */
--                         );
--    memcpy (vendor_string, &c, 4);
-+    unsigned int a, b, c, d;
-+    cpuid (0, &a, &b, &c, &d);
-+    memcpy (vendor_string, &b, 4);
-     memcpy (vendor_string + 4, &d, 4);
--    memcpy (vendor_string + 8, &e, 4);
-+    memcpy (vendor_string + 8, &c, 4);
-     vendor_string[12] = '\0';
-     //        printf("Vendor %s\n",vendor_string);
- }
--#endif
- 
- int turbo_status ()
- {
-     //turbo state flag
-     unsigned int eax;
--    //  int i;
--    asm volatile ("mov %1, %%eax; "	// 0 into eax
--                  "cpuid;" "mov %%eax, %0;"	// eeax into b
--              :"=r" (eax)	/* output */
--                          :"r" (6)	/* input */
--                          :"%eax"		/* clobbered register, will be modifying inside the asm routine so dont use them */
--                         );
-+    cpuid (6, &eax, NULL, NULL, NULL);
- 
-     //printf("eax %d\n",(eax&0x2)>>1);
- 
-@@ -132,12 +131,7 @@ void get_familyinformation (struct family_info *proc_info)
- {
-     //get info about CPU
-     unsigned int b;
--    asm volatile ("mov %1, %%eax; "	// 0 into eax
--                  "cpuid;" "mov %%eax, %0;"	// eeax into b
--              :"=r" (b)	/* output */
--                          :"r" (1)	/* input */
--                          :"%eax"		/* clobbered register, will be modifying inside the asm routine so dont use them */
--                         );
-+    cpuid (1, &b, NULL, NULL, NULL);
-     //  printf ("eax %x\n", b);
-     proc_info->stepping = b & 0x0000000F;	//bits 3:0
-     proc_info->model = (b & 0x000000F0) >> 4;	//bits 7:4
-@@ -348,7 +342,6 @@ void Print_Information_Processor(bool* nehalem, bool* sandy_bridge)
- {
-     struct family_info proc_info;
- 
--#ifdef x64_BIT
-     char vendor_string[13];
-     get_vendor (vendor_string);
-     if (strcmp (vendor_string, "GenuineIntel") == 0)
-@@ -359,14 +352,6 @@ void Print_Information_Processor(bool* nehalem, bool* sandy_bridge)
-         ("this was designed to be a intel proc utility. You can perhaps mod it for your machine?\n");
-         exit (1);
-     }
--#endif
--
--#ifndef x64_BIT
--    //anecdotal evidence: get_vendor doesnt seem to work on 32-bit
--    printf
--    ("I dont know the CPUID code to check on 32-bit OS, so i will assume that you have an Intel processor\n");
--    printf ("Don't worry if i don't find a nehalem next, i'll quit anyways\n");
--#endif
- 
-     get_familyinformation (&proc_info);
-     print_family_info (&proc_info);
---- a/i7z.h
-+++ b/i7z.h
-@@ -106,9 +106,7 @@ __asm__ __volatile__ ("rdtsc":"=a" (lo), "=d" (hi));
- 
- void print_family_info (struct family_info *proc_info);
- 
--#ifdef x64_BIT
- void get_vendor (char *vendor_string);
--#endif
- 
- int turbo_status ();
- double cpufreq_info();
diff --git a/app-benchmarks/i7z/i7z-0.27.2.ebuild b/app-benchmarks/i7z/i7z-0.27.2.ebuild
new file mode 100644
index 000000000000..01af82e2e5f7
--- /dev/null
+++ b/app-benchmarks/i7z/i7z-0.27.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/i7z/i7z-0.27.2.ebuild,v 1.1 2012/09/12 06:24:13 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() {
+	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
+}