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

Package-Manager: Portage-2.3.40, Repoman-2.3.9

diff --git a/app-benchmarks/i7z/files/nehalem.patch b/app-benchmarks/i7z/files/nehalem.patch
new file mode 100644 (file)
index 0000000..c1b5639
--- /dev/null
+++ b/app-benchmarks/i7z/files/nehalem.patch
@@ -0,0 +1,15 @@
+Author: Andreas Beckmann <anbe@debian.org>
+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 (file)
index 0000000..9920809
--- /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
+}