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

2020-05-31 Thread Pacho Ramos 
commit: 9eda907a2533811b443338bb02428561a5f9e5b5
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun May 31 11:39:00 2020 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun May 31 12:42:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eda907a

app-benchmarks/i7z: Fix for gcc10 and some typos

(from Debian)

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Pacho Ramos  gentoo.org>

 app-benchmarks/i7z/files/gcc-10.patch | 17 +
 app-benchmarks/i7z/files/typos.patch  | 25 +
 app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild |  5 ++---
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/app-benchmarks/i7z/files/gcc-10.patch 
b/app-benchmarks/i7z/files/gcc-10.patch
new file mode 100644
index 000..206b2c14340
--- /dev/null
+++ b/app-benchmarks/i7z/files/gcc-10.patch
@@ -0,0 +1,17 @@
+Author: Andreas Beckmann 
+Description: fix FTBFS with gcc-10
+ gcc-10 defaults to -fno-common
+ see https://gcc.gnu.org/gcc-10/porting_to.html
+Bug-Debian: https://bugs.debian.org/957351
+
+--- a/i7z_Dual_Socket.c
 b/i7z_Dual_Socket.c
+@@ -37,7 +37,7 @@ float Read_Voltage_CPU(int cpu_num);
+ extern struct program_options prog_options;
+ FILE *fp_log_file;
+ 
+-struct timespec global_ts;
++extern struct timespec global_ts;
+ extern FILE *fp_log_file_freq_1, *fp_log_file_freq_2;
+ 
+ extern char* CPU_FREQUENCY_LOGGING_FILE_single;

diff --git a/app-benchmarks/i7z/files/typos.patch 
b/app-benchmarks/i7z/files/typos.patch
new file mode 100644
index 000..9b1f3b95216
--- /dev/null
+++ b/app-benchmarks/i7z/files/typos.patch
@@ -0,0 +1,25 @@
+Author: Andreas Beckmann 
+Description: fix typos found by Lintian
+
+--- a/helper_functions.c
 b/helper_functions.c
+@@ -528,7 +528,7 @@ void Test_Or_Make_MSR_DEVICE_FILES()
+   n=`expr $n + 
1`; \
+   done; \
+   ");
+-printf ("i7z DEBUG: modprobbing for msr\n");
++printf ("i7z DEBUG: modprobing for msr\n");
+ system ("modprobe msr");
+ } else {
+ printf ("i7z DEBUG: You DO NOT have root privileges, mknod to 
create device entries won't work out\n");
+--- a/perfmon-i7z/helper_functions.cpp
 b/perfmon-i7z/helper_functions.cpp
+@@ -484,7 +484,7 @@ void Test_Or_Make_MSR_DEVICE_FILES()
+   n=`expr $n + 
1`; \
+   done; \
+   ");
+-printf ("i7z DEBUG: modprobbing for msr\n");
++printf ("i7z DEBUG: modprobing for msr\n");
+ system ("modprobe msr");
+ } else {
+ printf ("i7z DEBUG: You DONOT have root privileges, mknod to 
create device entries won't work out\n");

diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild 
b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
index 47b4c7b42ec..c2e8656b7af 100644
--- a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
@@ -36,14 +36,13 @@ PATCHES=(
"${FILESDIR}"/install-i7z_rw_registers.patch
"${FILESDIR}"/use_stdbool.patch
"${FILESDIR}"/nehalem.patch
+   "${FILESDIR}"/gcc-10.patch
+   "${FILESDIR}"/typos.patch
 )
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 src_configure() {
-   # Workaround to build with gcc-10 until I find a patch
-   append-cflags -fcommon
-
tc-export CC PKG_CONFIG
cd GUI || die
use qt5 && eqmake5 ${PN}_GUI.pro

[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/i7z/

2020-03-11 Thread Pacho Ramos 
commit: d4f6086e8624fe7c06c8ebc32b73c487235d39e5
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Mar 11 18:33:01 2020 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Mar 11 18:44:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4f6086e

app-benchmarks/i7z: Enforce -fcommon

Closes: https://bugs.gentoo.org/706690
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Pacho Ramos  gentoo.org>

 app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild 
b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
index d121c8ebe66..47b4c7b42ec 100644
--- a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit flag-o-matic qmake-utils toolchain-funcs
 
 COMMIT="5023138d7c35c4667c938b853e5ea89737334e92"
@@ -22,6 +22,7 @@ RDEPEND="
)
 "
 DEPEND="${RDEPEND}"
+BDEPEND=""
 
 PATCHES=(
"${FILESDIR}"/i7z-0.27.2-ncurses.patch
@@ -40,6 +41,9 @@ PATCHES=(
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 src_configure() {
+   # Workaround to build with gcc-10 until I find a patch
+   append-cflags -fcommon
+
tc-export CC PKG_CONFIG
cd GUI || die
use qt5 && eqmake5 ${PN}_GUI.pro

[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/i7z/

2018-08-02 Thread Pacho Ramos 
commit: 7ef53c07f95acb9d6ce3c41d4365a5805988bc78
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Aug  2 09:41:22 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Aug  2 09:41:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ef53c07

app-benchmarks/i7z: Drop old

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild | 69 ---
 1 file changed, 69 deletions(-)

diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild 
b/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
deleted file mode 100644
index 20080024b0f..000
--- a/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic qmake-utils toolchain-funcs
-
-COMMIT="5023138d7c35c4667c938b853e5ea89737334e92"
-DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux"
-HOMEPAGE="https://github.com/ajaiantilal/i7z;
-SRC_URI="https://github.com/ajaiantilal/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="qt5"
-
-RDEPEND="
-   sys-libs/ncurses:0=
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/i7z-0.27.2-ncurses.patch
-   "${FILESDIR}"/qt5.patch
-   "${FILESDIR}"/gcc5.patch
-
-   # From Debian
-   "${FILESDIR}"/fix-insecure-tempfile.patch
-   "${FILESDIR}"/fix_cpuid_asm.patch
-   "${FILESDIR}"/hyphen-used-as-minus-sign.patch
-   "${FILESDIR}"/install-i7z_rw_registers.patch
-   "${FILESDIR}"/use_stdbool.patch
-)
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_configure() {
-   # The GUI segfaults with -O1. None of the documented flags make a
-   # difference. There may not be a specific flag for the culprit.
-   # Looks to work fine for me with -O2 (pacho - 20170530)
-#  filter-flags "-O*"
-
-   tc-export CC PKG_CONFIG
-   cd GUI || die
-
-   use qt5 && eqmake5 ${PN}_GUI.pro
-}
-
-src_compile() {
-   default
-
-   if use qt5; then
-   emake -C GUI clean
-   emake -C GUI
-   fi
-}
-
-src_install() {
-   emake DESTDIR="${ED}" docdir=/usr/share/doc/${PF} install
-
-   if use qt5; then
-   dosbin GUI/i7z_GUI
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/i7z/

2018-07-20 Thread Mikle Kolyada 
commit: 13377a85190deb4eee0809d48658a3ea4bfc7426
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Jul 20 22:14:34 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Jul 20 22:14:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13377a85

app-benchmarks/i7z: amd64 stable wrt bug #661690

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild 
b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
index b31f97afeca..d9e53c406e4 100644
--- a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/ajaiantilal/i7z;
 SRC_URI="https://github.com/ajaiantilal/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="qt5"
 
 RDEPEND="

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

2018-07-20 Thread Pacho Ramos 
commit: e63a836ad3e1587cbbdcfae39e63343b241d9b14
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Jul 20 17:56:55 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Jul 20 17:56:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e63a836a

app-benchmarks/i7z: Don't hardcode pkg-config (by Zentaro Kavanagh)

https://github.com/gentoo/gentoo/pull/9261

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch | 4 ++--
 app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild | 4 ++--
 app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch 
b/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch
index 72695a951f7..d521674af6c 100644
--- a/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch
+++ b/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch
@@ -7,7 +7,7 @@ Index: Makefile
  CC   ?= gcc
  
 -LIBS  += -lncurses -lpthread -lrt -lm
-+LIBS  += `pkg-config --libs ncurses` -lpthread -lrt -lm
++LIBS  += `$(PKG_CONFIG) --libs ncurses` -lpthread -lrt -lm
  INCLUDEFLAGS = 
  
  BIN   = i7z
@@ -16,7 +16,7 @@ Index: Makefile
  #http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=644728 for -ltinfo on debian
  static-bin: message $(OBJ)
 -  $(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(OBJ) -static-libgcc 
-DNCURSES_STATIC -static -lpthread -lncurses -lrt -lm -ltinfo
-+  $(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(OBJ) -static-libgcc 
-DNCURSES_STATIC -static -lpthread `pkg-config --static --libs ncurses` -lrt -lm
++  $(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(OBJ) -static-libgcc 
-DNCURSES_STATIC -static -lpthread `$(PKG_CONFIG) --static --libs ncurses` -lrt 
-lm
  
  # perfmon-bin: message $(OBJ)
  # $(CC) $(CFLAGS) $(LDFLAGS) -o $(PERFMON-BIN) perfmon-i7z.c 
helper_functions.c $(LIBS)

diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild 
b/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
index d555d4c41fa..20080024b0f 100644
--- a/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,7 +45,7 @@ src_configure() {
# Looks to work fine for me with -O2 (pacho - 20170530)
 #  filter-flags "-O*"
 
-   tc-export CC
+   tc-export CC PKG_CONFIG
cd GUI || die
 
use qt5 && eqmake5 ${PN}_GUI.pro

diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild 
b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
index 992080972ba..b31f97afeca 100644
--- a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
@@ -40,7 +40,7 @@ PATCHES=(
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 src_configure() {
-   tc-export CC
+   tc-export CC PKG_CONFIG
cd GUI || die
use qt5 && eqmake5 ${PN}_GUI.pro
 }

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

2018-06-19 Thread Pacho Ramos 
commit: 6c6e341e1326c6a886b9271dd09fade510a35c21
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Jun 19 18:10:19 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Jun 19 18:10:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c6e341e

app-benchmarks/i7z: Fix CPU detection (patch from Debian)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-benchmarks/i7z/files/nehalem.patch| 15 +++
 app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild | 63 +++
 2 files changed, 78 insertions(+)

diff --git a/app-benchmarks/i7z/files/nehalem.patch 
b/app-benchmarks/i7z/files/nehalem.patch
new file mode 100644
index 000..c1b5639779a
--- /dev/null
+++ b/app-benchmarks/i7z/files/nehalem.patch
@@ -0,0 +1,15 @@
+Author: Andreas Beckmann 
+Description: fix some nehalem detected as haswell, too
+Bug-Debian: https://bugs.debian.org/856806
+
+--- a/helper_functions.c
 b/helper_functions.c
+@@ -420,7 +420,7 @@ void Print_Information_Processor(bool* n
+   *nehalem = true;
+   *sandy_bridge = false;
+   *ivy_bridge = false;
+-  *haswell = true;
++  *haswell = false;
+ 
+ } else if (proc_info.extended_model == 0x2) {
+ switch (proc_info.model)

diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild 
b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
new file mode 100644
index 000..992080972ba
--- /dev/null
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic qmake-utils toolchain-funcs
+
+COMMIT="5023138d7c35c4667c938b853e5ea89737334e92"
+DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux"
+HOMEPAGE="https://github.com/ajaiantilal/i7z;
+SRC_URI="https://github.com/ajaiantilal/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="qt5"
+
+RDEPEND="
+   sys-libs/ncurses:0=
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/i7z-0.27.2-ncurses.patch
+   "${FILESDIR}"/qt5.patch
+   "${FILESDIR}"/gcc5.patch
+
+   # From Debian
+   "${FILESDIR}"/fix-insecure-tempfile.patch
+   "${FILESDIR}"/fix_cpuid_asm.patch
+   "${FILESDIR}"/hyphen-used-as-minus-sign.patch
+   "${FILESDIR}"/install-i7z_rw_registers.patch
+   "${FILESDIR}"/use_stdbool.patch
+   "${FILESDIR}"/nehalem.patch
+)
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_configure() {
+   tc-export CC
+   cd GUI || die
+   use qt5 && eqmake5 ${PN}_GUI.pro
+}
+
+src_compile() {
+   default
+
+   if use qt5; then
+   emake -C GUI clean
+   emake -C GUI
+   fi
+}
+
+src_install() {
+   emake DESTDIR="${ED}" docdir=/usr/share/doc/${PF} install
+
+   if use qt5; then
+   dosbin GUI/i7z_GUI
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/i7z/

2017-08-12 Thread Michael Palimaka 
commit: 10d4e1b8e76249c1e4f4890fad0c8ba7360b2946
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Aug 12 14:46:57 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Aug 12 14:48:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10d4e1b8

app-benchmarks/i7z: remove suspicious subslot operators

Gentoo-bug: 624232
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild 
b/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
index faf0f6e581d..d555d4c41fa 100644
--- a/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
@@ -17,9 +17,9 @@ IUSE="qt5"
 RDEPEND="
sys-libs/ncurses:0=
qt5? (
-   dev-qt/qtcore:5=
-   dev-qt/qtgui:5=
-   dev-qt/qtwidgets:5=
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
)
 "
 DEPEND="${RDEPEND}"

[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/i7z/

2017-07-21 Thread Pacho Ramos 
commit: 310ea7808ef48ad26a85ddea2a974589b72a7158
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Jul 21 08:42:54 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Jul 21 08:46:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=310ea780

app-benchmarks/i7z: Drop old

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-benchmarks/i7z/i7z-93_p20131012.ebuild | 68 --
 1 file changed, 68 deletions(-)

diff --git a/app-benchmarks/i7z/i7z-93_p20131012.ebuild 
b/app-benchmarks/i7z/i7z-93_p20131012.ebuild
deleted file mode 100644
index e08e1a871e5..000
--- a/app-benchmarks/i7z/i7z-93_p20131012.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic qmake-utils toolchain-funcs
-
-COMMIT="5023138d7c35c4667c938b853e5ea89737334e92"
-DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux"
-HOMEPAGE="https://github.com/ajaiantilal/i7z;
-SRC_URI="https://github.com/ajaiantilal/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="qt4 qt5"
-
-RDEPEND="sys-libs/ncurses:0=
-   qt5? (
-   dev-qt/qtcore:5=
-   dev-qt/qtgui:5=
-   dev-qt/qtwidgets:5=
-   )
-   !qt5? ( qt4? (
-   dev-qt/qtcore:4=
-   dev-qt/qtgui:4=
-   ) )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/i7z-0.27.2-ncurses.patch
-   "${FILESDIR}"/qt5.patch
-   "${FILESDIR}"/gcc5.patch
-)
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_configure() {
-   # The GUI segfaults with -O1. None of the documented flags make a
-   # difference. There may not be a specific flag for the culprit.
-   filter-flags "-O*"
-
-   tc-export CC
-   cd GUI || die
-
-   if use qt5; then
-   eqmake5 ${PN}_GUI.pro
-   elif use qt4; then
-   eqmake4 ${PN}_GUI.pro
-   fi
-}
-
-src_compile() {
-   default
-
-   if use qt5 || use qt4; then
-   emake -C GUI clean
-   emake -C GUI
-   fi
-}
-
-src_install() {
-   emake DESTDIR="${ED}" docdir=/usr/share/doc/${PF} install
-
-   if use qt5 || use qt4; then
-   dosbin GUI/i7z_GUI
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/i7z/

2017-06-02 Thread James Le Cuirot 
commit: 84622661d35b813fb11691bb070ec2cb33451cf8
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Jun  2 18:28:48 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Jun  2 18:28:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84622661

app-benchmarks/i7z: Remove old 0.27.2

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-benchmarks/i7z/Manifest  |  1 -
 app-benchmarks/i7z/i7z-0.27.2.ebuild | 38 
 2 files changed, 39 deletions(-)

diff --git a/app-benchmarks/i7z/Manifest b/app-benchmarks/i7z/Manifest
index 4b517de685c..474b6ddf568 100644
--- a/app-benchmarks/i7z/Manifest
+++ b/app-benchmarks/i7z/Manifest
@@ -1,2 +1 @@
-DIST i7z-0.27.2.tar.gz 51226 SHA256 
a7f72d65732c17eef0df4f284927fe744fc650075f2364c51c9497534d8f47f1 SHA512 
d693fda4d12bf7b0d8e694d9f97876fcd2cad4556c950b4eab09ae21d121e63e221e1e1b27bcf23a241fd868b09165639ecfafeaa126144ad809199fcaca1cbb
 WHIRLPOOL 
aaea6bc544a554703cd85f7e2e075588114a6c807e1311421300464f1468560423e987f1582b5e58a2fd48eb1753559958ea39ed9ab97e621718e7f46e8c476e
 DIST i7z-93_p20131012.tar.gz 879969 SHA256 
e127bddf850e7febd39cef2d2b13dca5fe19cc2a1bb1099d72b683be5d8bd1c0 SHA512 
ef2dfc36407b18a2081413d423cc3d38c38121e386d9068eee9a794b810232727b3abbd22d3b36bc32206f4dc89dd881a4550df19108c439a91f01369bf74d5a
 WHIRLPOOL 
f46d7c3ae19920315e68d6c3264d14613f457201e1107c07b6c74632fff13c1cdb75747add8f1618937c5b4430a476dfc5f5d30fc01df16579fd843e4516faab

diff --git a/app-benchmarks/i7z/i7z-0.27.2.ebuild 
b/app-benchmarks/i7z/i7z-0.27.2.ebuild
deleted file mode 100644
index e11ec632c02..000
--- a/app-benchmarks/i7z/i7z-0.27.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic qmake-utils toolchain-funcs
-
-DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux"
-HOMEPAGE="https://github.com/ajaiantilal/i7z;
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz;
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="X"
-
-RDEPEND="
-   sys-libs/ncurses:0=
-   X? ( dev-qt/qtgui:4= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   epatch "${FILESDIR}"/${P}-ncurses.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}" docdir=/usr/share/doc/${PF} install
-   use X && dosbin GUI/i7z_GUI
-}

[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/i7z/

2017-06-01 Thread Agostino Sarubbo 
commit: d273a58857ba5bc6ef21f82e9aab131c48bf5779
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun  1 09:11:53 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun  1 09:13:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d273a588

app-benchmarks/i7z: x86 stable wrt bug #620242

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-benchmarks/i7z/i7z-93_p20131012.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-benchmarks/i7z/i7z-93_p20131012.ebuild 
b/app-benchmarks/i7z/i7z-93_p20131012.ebuild
index 937b0ce5965..e08e1a871e5 100644
--- a/app-benchmarks/i7z/i7z-93_p20131012.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/ajaiantilal/i7z;
 SRC_URI="https://github.com/ajaiantilal/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="qt4 qt5"
 
 RDEPEND="sys-libs/ncurses:0=

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

2017-05-31 Thread Pacho Ramos 
commit: e41771703356e344dd98066f85834e345bcd675f
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed May 31 09:32:31 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed May 31 09:32:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4177170

app-benchmarks/i7z: Apply Debian patches fixing multiple bugs, drop deprecated 
qt4 support 
(https://wiki.gentoo.org/wiki/Project:Qt/Policies#Handling_different_versions_of_Qt),
 allow -Ox for now as it looks to work ok for me with this version.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../i7z/files/fix-insecure-tempfile.patch  | 76 ++
 app-benchmarks/i7z/files/fix_cpuid_asm.patch   | 21 ++
 .../i7z/files/hyphen-used-as-minus-sign.patch  | 26 
 .../i7z/files/install-i7z_rw_registers.patch   | 26 
 app-benchmarks/i7z/files/use_stdbool.patch | 40 
 app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild  | 69 
 6 files changed, 258 insertions(+)

diff --git a/app-benchmarks/i7z/files/fix-insecure-tempfile.patch 
b/app-benchmarks/i7z/files/fix-insecure-tempfile.patch
new file mode 100644
index 000..fb027158434
--- /dev/null
+++ b/app-benchmarks/i7z/files/fix-insecure-tempfile.patch
@@ -0,0 +1,76 @@
+Author: Andreas Beckmann 
+Description: fix insecure temfile usage: /tmp/cpufreq.txt
+ switch from system() + fopen() to popen()
+ disable other insecure tempfiles that may be generated but not used
+Bug-Debian: http://bugs.debian.org/718418
+
+diff --git a/GUI/i7z_GUI.cpp b/GUI/i7z_GUI.cpp
+index 2705e84..60eaeb2 100644
+--- a/GUI/i7z_GUI.cpp
 b/GUI/i7z_GUI.cpp
+@@ -171,18 +171,17 @@ MyThread::run ()
+ //CPUINFO is wrong for i7 but correct for the number of physical and 
logical cores present
+ //If Hyperthreading is enabled then, multiple logical processors will 
share a common CORE ID
+ //http://www.redhat.com/magazine/022aug06/departments/tips_tricks/
+-system ("cat /proc/cpuinfo |grep MHz|sed 's/cpu\\sMHz\\s*:\\s//'|tail -n 
1 > /tmp/cpufreq.txt");
+-system ("grep \"core id\" /proc/cpuinfo |sort -|uniq -|wc -l > 
/tmp/numPhysical.txt");
+-system ("grep \"processor\" /proc/cpuinfo |sort -|uniq -|wc -l > 
/tmp/numLogical.txt");
++//system ("grep \"core id\" /proc/cpuinfo |sort -|uniq -|wc -l > 
/tmp/numPhysical.txt");
++//system ("grep \"processor\" /proc/cpuinfo |sort -|uniq -|wc -l > 
/tmp/numLogical.txt");
+ 
+ 
+-//Open the parsed cpufreq file and obtain the cpufreq from /proc/cpuinfo
++// obtain the cpufreq from /proc/cpuinfo
+ FILE *tmp_file;
+-tmp_file = fopen ("/tmp/cpufreq.txt", "r");
++tmp_file = popen ("sed -n '/MHz/ { s/cpu\\sMHz\\s*:\\s//p; q }' 
/proc/cpuinfo", "r");
+ char tmp_str[30];
+ fgets (tmp_str, 30, tmp_file);
++pclose (tmp_file);
+ double cpu_freq_cpuinfo = atof (tmp_str);
+-fclose (tmp_file);
+ 
+ unsigned int numPhysicalCores, numLogicalCores;
+ numPhysicalCores = socket_0.num_physical_cores + 
socket_1.num_physical_cores;
+diff --git a/helper_functions.c b/helper_functions.c
+index 2f8da87..906c298 100644
+--- a/helper_functions.c
 b/helper_functions.c
+@@ -531,16 +531,13 @@ double cpufreq_info()
+ //CPUINFO is wrong for i7 but correct for the number of physical and 
logical cores present
+ //If Hyperthreading is enabled then, multiple logical processors will 
share a common CORE ID
+ //http://www.redhat.com/magazine/022aug06/departments/tips_tricks/
+-system
+-("cat /proc/cpuinfo |grep MHz|sed 's/cpu\\sMHz\\s*:\\s//'|tail -n 1 > 
/tmp/cpufreq.txt");
+ 
+-
+-//Open the parsed cpufreq file and obtain the cpufreq from /proc/cpuinfo
++// obtain the cpufreq from /proc/cpuinfo
+ FILE *tmp_file;
+-tmp_file = fopen ("/tmp/cpufreq.txt", "r");
++tmp_file = popen ("sed -n '/MHz/ { s/cpu\\sMHz\\s*:\\s//p; q }' 
/proc/cpuinfo", "r");
+ char tmp_str[30];
+ fgets (tmp_str, 30, tmp_file);
+-fclose (tmp_file);
++pclose (tmp_file);
+ return atof(tmp_str);
+ }
+ 
+diff --git a/i7z_Single_Socket.c b/i7z_Single_Socket.c
+index 015f154..d0afee0 100644
+--- a/i7z_Single_Socket.c
 b/i7z_Single_Socket.c
+@@ -823,10 +823,13 @@ void print_i7z_single ()
+ //CPUINFO is wrong for i7 but correct for the number of physical and 
logical cores present
+ //If Hyperthreading is enabled then, multiple logical processors will 
share a common CORE ID
+ //http://www.redhat.com/magazine/022aug06/departments/tips_tricks/
++ERROR INSECURE TMPFILE
+ system
+   ("cat /proc/cpuinfo |grep MHz|sed 's/cpu\\sMHz\\s*:\\s//'|tail 
-n 1 > /tmp/cpufreq.txt");
++ERROR INSECURE TMPFILE
+ system
+   ("grep \"core id\" /proc/cpuinfo |sort -|uniq -|wc -l > 
/tmp/numPhysical.txt");
++ERROR INSECURE TMPFILE
+ system
+   ("grep \"processor\" /proc/cpuinfo |sort -|uniq -|wc -l > 
/tmp/numLogical.txt");

[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/i7z/

2017-05-31 Thread Pacho Ramos 
commit: f12b1e5b49006f47af9ec635f9923e73061a9b8b
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed May 31 08:59:32 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed May 31 09:00:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f12b1e5b

app-benchmarks/i7z: amd64 stable, bug #620242

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-benchmarks/i7z/i7z-93_p20131012.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-benchmarks/i7z/i7z-93_p20131012.ebuild 
b/app-benchmarks/i7z/i7z-93_p20131012.ebuild
index e8ec6d12e91..937b0ce5965 100644
--- a/app-benchmarks/i7z/i7z-93_p20131012.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/ajaiantilal/i7z;
 SRC_URI="https://github.com/ajaiantilal/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="qt4 qt5"
 
 RDEPEND="sys-libs/ncurses:0=

[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/i7z/

2017-05-31 Thread Pacho Ramos 
commit: 3e7fed3b21f4d24abb2366a2096e115999eb0a56
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed May 31 09:00:02 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed May 31 09:00:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e7fed3b

app-benchmarks/i7z: Take package as agreed with chewi

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-benchmarks/i7z/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-benchmarks/i7z/metadata.xml b/app-benchmarks/i7z/metadata.xml
index 455842e4694..78dfd9b514c 100644
--- a/app-benchmarks/i7z/metadata.xml
+++ b/app-benchmarks/i7z/metadata.xml
@@ -2,7 +2,7 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   ch...@gentoo.org
+   pa...@gentoo.org


ajaiantilal/i7z

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

2017-03-16 Thread James Le Cuirot 
commit: a79414398ba07ee1a776dafed0ebb86170fb4955
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Mar 16 21:47:51 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Mar 16 21:49:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7941439

app-benchmarks/i7z: Fix building GUI with GCC 5 (Funtoo bug FL-3617)

I wasn't able to reproduce this (possibly affects FREQ[i] > Max_Freq_socket0) && 
(!isnan(mythread->FREQ[i])) &&
+-(!isinf(mythread->FREQ[i]))  && (socket_list[i] == 
socket_0.socket_num) ) {
++if ( (mythread->FREQ[i] > Max_Freq_socket0) && 
(!std::isnan(mythread->FREQ[i])) &&
++(!std::isinf(mythread->FREQ[i]))  && (socket_list[i] == 
socket_0.socket_num) ) {
+ Max_Freq_socket0 = mythread->FREQ[i];
+ num_socket0_cpus++;
+ }
+-if ( (mythread->FREQ[i] > Max_Freq_socket1) && 
(!isnan(mythread->FREQ[i])) &&
+-(!isinf(mythread->FREQ[i]))  && (socket_list[i] == 
socket_1.socket_num) ) {
++if ( (mythread->FREQ[i] > Max_Freq_socket1) && 
(!std::isnan(mythread->FREQ[i])) &&
++(!std::isinf(mythread->FREQ[i]))  && (socket_list[i] == 
socket_1.socket_num) ) {
+ Max_Freq_socket1 = mythread->FREQ[i];
+ num_socket1_cpus++;
+ }

diff --git a/app-benchmarks/i7z/i7z-93_p20131012.ebuild 
b/app-benchmarks/i7z/i7z-93_p20131012.ebuild
index f5ae2dfa5ac..e8ec6d12e91 100644
--- a/app-benchmarks/i7z/i7z-93_p20131012.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
"${FILESDIR}"/i7z-0.27.2-ncurses.patch
"${FILESDIR}"/qt5.patch
+   "${FILESDIR}"/gcc5.patch
 )
 
 S="${WORKDIR}/${PN}-${COMMIT}"

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

2016-11-05 Thread James Le Cuirot 
commit: 5113c5476c9e62ff1676b6d5ead988a06fb60538
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Nov  5 20:56:42 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Nov  5 20:56:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5113c547

app-benchmarks/i7z: Bump to 93_p20131012, fixes bug #487784

Upstream's versioning has gone a bit weird and I don't really
understand it but it also seems dead so there seems little point in
asking.

Upstream probably didn't intend to support Qt5 but it does work with a
tiny patch against the project file.

The GUI segfault in bug #487784 isn't specific to hardened and only
goes away when you drop all -O* flags. This application is more
power-related than benchmark-related so this isn't a big deal.

Package-Manager: portage-2.3.2

 app-benchmarks/i7z/Manifest   |  1 +
 app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch |  4 +-
 app-benchmarks/i7z/files/qt5.patch| 13 +
 app-benchmarks/i7z/i7z-93_p20131012.ebuild| 68 +++
 app-benchmarks/i7z/metadata.xml   |  1 -
 5 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/app-benchmarks/i7z/Manifest b/app-benchmarks/i7z/Manifest
index 55c39a2..4b517de 100644
--- a/app-benchmarks/i7z/Manifest
+++ b/app-benchmarks/i7z/Manifest
@@ -1 +1,2 @@
 DIST i7z-0.27.2.tar.gz 51226 SHA256 
a7f72d65732c17eef0df4f284927fe744fc650075f2364c51c9497534d8f47f1 SHA512 
d693fda4d12bf7b0d8e694d9f97876fcd2cad4556c950b4eab09ae21d121e63e221e1e1b27bcf23a241fd868b09165639ecfafeaa126144ad809199fcaca1cbb
 WHIRLPOOL 
aaea6bc544a554703cd85f7e2e075588114a6c807e1311421300464f1468560423e987f1582b5e58a2fd48eb1753559958ea39ed9ab97e621718e7f46e8c476e
+DIST i7z-93_p20131012.tar.gz 879969 SHA256 
e127bddf850e7febd39cef2d2b13dca5fe19cc2a1bb1099d72b683be5d8bd1c0 SHA512 
ef2dfc36407b18a2081413d423cc3d38c38121e386d9068eee9a794b810232727b3abbd22d3b36bc32206f4dc89dd881a4550df19108c439a91f01369bf74d5a
 WHIRLPOOL 
f46d7c3ae19920315e68d6c3264d14613f457201e1107c07b6c74632fff13c1cdb75747add8f1618937c5b4430a476dfc5f5d30fc01df16579fd843e4516faab

diff --git a/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch 
b/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch
index 2d0a5a1..72695a9 100644
--- a/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch
+++ b/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch
@@ -1,7 +1,7 @@
 Index: Makefile
 ===
 Makefile   (revision 109)
-+++ Makefile   (working copy)
+--- a/Makefile (revision 109)
 b/Makefile (working copy)
 @@ -19,7 +19,7 @@
  
  CC   ?= gcc

diff --git a/app-benchmarks/i7z/files/qt5.patch 
b/app-benchmarks/i7z/files/qt5.patch
new file mode 100644
index ..9e9b162
--- /dev/null
+++ b/app-benchmarks/i7z/files/qt5.patch
@@ -0,0 +1,13 @@
+diff -Naur a/GUI/i7z_GUI.pro b/GUI/i7z_GUI.pro
+--- a/GUI/i7z_GUI.pro  2013-10-12 21:59:19.0 +0100
 b/GUI/i7z_GUI.pro  2016-11-05 13:54:30.118655672 +
+@@ -3,7 +3,8 @@
+ ##
+ 
+ TEMPLATE = app
+-TARGET = 
++TARGET = i7z_GUI
++QT += widgets
+ DEPENDPATH += .
+ INCLUDEPATH += .
+ CONFIG += debug

diff --git a/app-benchmarks/i7z/i7z-93_p20131012.ebuild 
b/app-benchmarks/i7z/i7z-93_p20131012.ebuild
new file mode 100644
index ..7287ec3
--- /dev/null
+++ b/app-benchmarks/i7z/i7z-93_p20131012.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic qmake-utils toolchain-funcs
+
+COMMIT="5023138d7c35c4667c938b853e5ea89737334e92"
+DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux"
+HOMEPAGE="https://github.com/ajaiantilal/i7z;
+SRC_URI="https://github.com/ajaiantilal/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="qt4 qt5"
+
+RDEPEND="sys-libs/ncurses:0=
+   qt5? (
+   dev-qt/qtcore:5=
+   dev-qt/qtgui:5=
+   dev-qt/qtwidgets:5=
+   )
+   !qt5? ( qt4? (
+   dev-qt/qtcore:4=
+   dev-qt/qtgui:4=
+   ) )"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/i7z-0.27.2-ncurses.patch
+   "${FILESDIR}"/qt5.patch
+)
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_configure() {
+   # The GUI segfaults with -O1. None of the documented flags make a
+   # difference. There may not be a specific flag for the culprit.
+   filter-flags "-O*"
+
+   tc-export CC
+   cd GUI || die
+
+   if use qt5; then
+   eqmake5 ${PN}_GUI.pro
+   elif use qt4; then
+   eqmake4 ${PN}_GUI.pro
+   fi
+}
+
+src_compile() {
+   default
+
+   if use qt5 || use qt4; then
+   emake -C GUI clean
+   emake -C GUI
+   fi
+}
+
+src_install() {
+   emake

[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/i7z/

2016-01-08 Thread James Le Cuirot 
commit: 71680779a2be580447e243a47b42228269975569
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Jan  8 09:40:52 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Jan  8 09:42:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71680779

app-benchmarks/i7z: Taking over maintainership from jlec

Package-Manager: portage-2.2.26

 app-benchmarks/i7z/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-benchmarks/i7z/metadata.xml b/app-benchmarks/i7z/metadata.xml
index 611c571..93bd550 100644
--- a/app-benchmarks/i7z/metadata.xml
+++ b/app-benchmarks/i7z/metadata.xml
@@ -2,7 +2,7 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   j...@gentoo.org
+   ch...@gentoo.org


i7z

[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/i7z/

2015-08-21 Thread Justin Lecher 
commit: 22f956b9fbb61984fc0c25c7cbd62561e64a639f
Author: Justin Lecher jlec AT gentoo DOT org
AuthorDate: Fri Aug 21 08:31:54 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Fri Aug 21 08:34:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22f956b9

app-benchmarks/i7z: Move to new home at github

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher jlec AT gentoo.org

 app-benchmarks/i7z/i7z-0.27.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-benchmarks/i7z/i7z-0.27.2.ebuild 
b/app-benchmarks/i7z/i7z-0.27.2.ebuild
index 545879f..db0b885 100644
--- a/app-benchmarks/i7z/i7z-0.27.2.ebuild
+++ b/app-benchmarks/i7z/i7z-0.27.2.ebuild
@@ -7,11 +7,11 @@ EAPI=5
 inherit eutils flag-o-matic qmake-utils toolchain-funcs
 
 DESCRIPTION=A better i7 (and now i3, i5) reporting tool for Linux
-HOMEPAGE=http://code.google.com/p/i7z/;
+HOMEPAGE=https://github.com/ajaiantilal/i7z;
 SRC_URI=http://${PN}.googlecode.com/files/${P}.tar.gz;
 
-LICENSE=GPL-2
 SLOT=0
+LICENSE=GPL-2
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 IUSE=X

[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/i7z/

2015-08-20 Thread Justin Lecher 
commit: f373afdbd072881b26196933cdd104c3f0ca04d1
Author: Justin Lecher jlec AT gentoo DOT org
AuthorDate: Thu Aug 20 14:37:23 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Thu Aug 20 14:37:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f373afdb

app-benchmarks/i7z: Set correct subslot dependency for ncurses

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher jlec AT gentoo.org

 app-benchmarks/i7z/i7z-0.27.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-benchmarks/i7z/i7z-0.27.2.ebuild 
b/app-benchmarks/i7z/i7z-0.27.2.ebuild
index e79f949..545879f 100644
--- a/app-benchmarks/i7z/i7z-0.27.2.ebuild
+++ b/app-benchmarks/i7z/i7z-0.27.2.ebuild
@@ -16,8 +16,8 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 IUSE=X
 
 RDEPEND=
-   sys-libs/ncurses
-   X? ( dev-qt/qtgui:4 )
+   sys-libs/ncurses:5=
+   X? ( dev-qt/qtgui:4= )
 DEPEND=${RDEPEND}
 
 src_prepare() {