From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 170D815813A for ; Thu, 16 Jan 2025 14:16:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1A18E07EE; Thu, 16 Jan 2025 14:16:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CF5B8E07EE for ; Thu, 16 Jan 2025 14:16:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AEA4F34134D for ; Thu, 16 Jan 2025 14:16:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D85191F9A for ; Thu, 16 Jan 2025 14:16:30 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1737036980.6b519a41ff8dbb81b407142252891e2053bcae72.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/i7z/files/, app-benchmarks/i7z/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-benchmarks/i7z/files/i7z_GUI.policy app-benchmarks/i7z/i7z-93_p20131012-r3.ebuild X-VCS-Directories: app-benchmarks/i7z/files/ app-benchmarks/i7z/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 6b519a41ff8dbb81b407142252891e2053bcae72 X-VCS-Branch: master Date: Thu, 16 Jan 2025 14:16:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 78254c20-7066-4e31-8740-650bb54c42fb X-Archives-Hash: ee36c9a225bbec0cb8906bacf89277fa commit: 6b519a41ff8dbb81b407142252891e2053bcae72 Author: Pacho Ramos gentoo org> AuthorDate: Thu Jan 16 14:13:40 2025 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Thu Jan 16 14:16:20 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b519a41 app-benchmarks/i7z: Migrate to qt6 By the way, also provide a working desktop file for regular desktop users to more easily launch i7z gui. Thanks-to: Andreas Sturmlechner Closes: https://bugs.gentoo.org/947627 Signed-off-by: Pacho Ramos gentoo.org> app-benchmarks/i7z/files/i7z_GUI.policy | 18 +++++++ app-benchmarks/i7z/i7z-93_p20131012-r3.ebuild | 71 +++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) diff --git a/app-benchmarks/i7z/files/i7z_GUI.policy b/app-benchmarks/i7z/files/i7z_GUI.policy new file mode 100644 index 000000000000..03756867650a --- /dev/null +++ b/app-benchmarks/i7z/files/i7z_GUI.policy @@ -0,0 +1,18 @@ + + + + i7z + https://github.com/ajaiantilal/i7z + i7z + + Run i7z_GUI as root + Authentication is required to run i7z GUI as root + + auth_admin + auth_admin + auth_admin + + /usr/sbin/i7z_GUI + true + + diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r3.ebuild b/app-benchmarks/i7z/i7z-93_p20131012-r3.ebuild new file mode 100644 index 000000000000..b4f65ba24612 --- /dev/null +++ b/app-benchmarks/i7z/i7z-93_p20131012-r3.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop 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" +S="${WORKDIR}/${PN}-${COMMIT}" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="policykit qt6" + +RDEPEND=" + sys-libs/ncurses:0= + qt6? ( + policykit? ( sys-auth/polkit ) + dev-qt/qtbase:6[gui,widgets] + ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +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 + "${FILESDIR}"/gcc-10.patch + "${FILESDIR}"/typos.patch +) + +src_configure() { + tc-export CC PKG_CONFIG + cd GUI || die + use qt6 && eqmake6 ${PN}_GUI.pro +} + +src_compile() { + default + + if use qt6; then + emake -C GUI clean + emake -C GUI + fi +} + +src_install() { + emake DESTDIR="${ED}" docdir=/usr/share/doc/${PF} install + + if use qt6; then + dosbin GUI/i7z_GUI + if use policykit; then + insinto /usr/share/polkit-1/actions + doins "${FILESDIR}/i7z_GUI.policy" + make_desktop_entry "pkexec --disable-internal-agent /usr/sbin/i7z_GUI" i7z kcmprocessor + fi + fi +}