[gentoo-commits] repo/gentoo:master commit in: sys-power/powertop/, sys-power/powertop/files/

[Matt Turner]

commit:     9b2a5e5d3b05a54a75c05e5954c0aba866e83310
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 24 05:53:35 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 05:55:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b2a5e5d

sys-power/powertop: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 sys-power/powertop/Manifest                        |   1 -
 ...onfigure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch |  62 -----------
 sys-power/powertop/powertop-2.13-r2.ebuild         | 120 ---------------------
 3 files changed, 183 deletions(-)

diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 7509e164f2d7..48905cdeb4b4 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,2 +1 @@
-DIST powertop-2.13.tar.gz 303030 BLAKE2B 3c88e05f9889cc4b276bea3bc50a3a83228ca8efae278379a14fadc6104754f2837174e028bf9c5ded9f3af84ce6b8766ac3d24b6ae62b9b192c03fc3afdec11 SHA512 8ebeccd17b6f76d9e445382d9ce5b1c00ab2daf4f1e6e133c249bceb35ea582ca3e76da5415fd0b55a28b8a124655dc5ac7a18aaf2a3df955547d77495e59181
 DIST powertop-2.14.tar.gz 302578 BLAKE2B 5f53f81b01e83004f6436f497818d2a552b5e7ffda5007749aad415773adeab2a256aeffbacbf9e5fe803ff343a0c1954b5264aebdffa841bb70406b8b9611bc SHA512 f3e25901fb29405e0c8016643855a209cf9dba589fe9dd3e27c291d44699cebeb00dc8c7264c24436db08deb496759bd106666cb52d9ebd5f831bbb99e30f20f

diff --git a/sys-power/powertop/files/0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch b/sys-power/powertop/files/0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch
deleted file mode 100644
index c864020514e1..000000000000
--- a/sys-power/powertop/files/0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 311b88d2a078aa68b042dc37b416a9bdb3f650e5 Mon Sep 17 00:00:00 2001
-From: Ed Baker <edward.baker@×××××.com>
-Date: Thu, 3 Sep 2020 09:01:25 -0700
-Subject: [PATCH] configure.ac: Use PKG_PROG_PKG_CONFIG macro
-
-The goal of this commit is to fix an error encountered when building
-2.13 on Chromium OS.
-emerge-${board} powertop
-  <snip>
-  checking for libnl-3.0 >= 3.0 libnl-genl-3.0 >= 3.0... yes
-  checking for library containing inet_aton... none required
-   * pkg-config: ERROR: Do not call unprefixed tools directly.
-   * pkg-config: ERROR: For board tools, use `tc-export PKG_CONFIG` (or ${CHOST}-pkg-config).
-   * pkg-config: ERROR: For build-time-only tools, `tc-export BUILD_PKG_CONFIG` (or ${CBUILD}-pkg-config).
-   * python3 /mnt/data/chromiumos/chromite/bin/cros_sdk --enter --chrome_root=chrome_root
-   *   `-python3 /mnt/data/chromiumos/chromite/bin/cros_sdk --enter --chrome_root=chrome_root
-   *       `-bash
-   *           `-emerge -b /usr/lib/python-exec/python3.6/emerge --root-deps powertop
-   *               `-sandbox /usr/lib/portage/python3.6/ebuild.sh configure
-   *                   `-ebuild.sh /usr/lib/portage/python3.6/ebuild.sh configure
-   *                       `-ebuild.sh /usr/lib/portage/python3.6/ebuild.sh configure
-   *                           `-configure ./configure --prefix=/usr --build=x86_64-pc-linux-gnu --host=x86_64-cros-linux-gnu --mandir=/usr/share/man --infodir=/usr/share/info --datadir=/usr/share --sysconfdir=/etc --localstatedir=/var/lib --disable-dependency-tracking --disable-silent-rules --docdir=/usr/share/doc/powertop-2.13 --htmldir=/usr/share/doc/powertop-2.13/html --with-sysroot=/build/volteer --libdir=/usr/lib64 --disable-nls
-   *                               `-pkg-config /build/volteer/tmp/portage/sys-power/powertop-2.13/temp/build-toolchain-wrappers/pkg-config --exists bash-completion
-   *                                   `-pstree -a -A -s -l 10567
-   * ERROR: sys-power/powertop-2.13::portage-stable failed (configure phase):
-   *   Bad pkg-config [--exists bash-completion] invocation
-<snip>
-
-The environment variable is populated for board specific tooling.
-declare -x PKG_CONFIG="/build/volteer/build/bin/pkg-config"
-
-Signed-off-by: Ed Baker <edward.baker@×××××.com>
----
- configure.ac | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8daa48d..f191197 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -38,6 +38,7 @@ AC_PROG_INSTALL
- AM_PROG_CC_C_O
- AX_ADD_FORTIFY_SOURCE
- AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
-+PKG_PROG_PKG_CONFIG
- 
- # Checks for libraries.
- AX_PTHREAD([
-@@ -155,8 +156,8 @@ AC_SEARCH_LIBS([inet_aton], [resolv], [], [
- ], [])
- 
- 
--AS_IF([`pkg-config --exists bash-completion`], [
--	bashcompletiondir=`pkg-config --variable=completionsdir --define-variable=prefix=${prefix} bash-completion`
-+AS_IF([`${PKG_CONFIG} --exists bash-completion`], [
-+	bashcompletiondir=`${PKG_CONFIG} --variable=completionsdir --define-variable=prefix=${prefix} bash-completion`
- ], [
- 	bashcompletiondir=${datadir}/bash-completion/completions
- ])
--- 
-2.17.1
-

diff --git a/sys-power/powertop/powertop-2.13-r2.ebuild b/sys-power/powertop/powertop-2.13-r2.ebuild
deleted file mode 100644
index 41279e9daac9..000000000000
--- a/sys-power/powertop/powertop-2.13-r2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/fenrus75/powertop.git"
-
-if [[ ${PV} == "9999" ]] ; then
-	GIT_ECLASS="git-r3"
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/fenrus75/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-inherit autotools ${GIT_ECLASS} linux-info
-
-DESCRIPTION="tool to diagnose issues with power consumption and power management"
-HOMEPAGE="https://01.org/powertop/ https://github.com/fenrus75/powertop/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls unicode X"
-
-DEPEND="
-	dev-libs/libnl:3
-	sys-apps/pciutils
-	sys-libs/ncurses:=[unicode(+)?]
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/autoconf-archive
-	>=sys-devel/gettext-0.20.2
-"
-RDEPEND="
-	${DEPEND}
-	X? ( x11-apps/xset )
-	virtual/libintl
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch
-	"${FILESDIR}"/0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch
-)
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~X86_MSR
-		~DEBUG_FS
-		~PERF_EVENTS
-		~TRACEPOINTS
-		~NO_HZ_IDLE
-		~HIGH_RES_TIMERS
-		~HPET_TIMER
-		~CPU_FREQ_STAT
-		~CPU_FREQ_GOV_ONDEMAND
-		~FTRACE
-		~BLK_DEV_IO_TRACE
-		~TRACING
-	"
-	ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
-	ERROR_KERNEL_DEBUG_FS="DEBUG_FS is not enabled in the kernel, you almost certainly need it"
-	ERROR_KERNEL_PERF_EVENTS="PERF_EVENTS should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_TRACEPOINTS="TRACEPOINTS should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_NO_HZ_IDLE="NO_HZ_IDLE should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_HIGH_RES_TIMERS="HIGH_RES_TIMERS should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_HPET_TIMER="HPET_TIMER should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
-	ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable other config options"
-	ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
-	linux-info_pkg_setup
-	if linux_config_exists; then
-		if kernel_is -lt 3 7 0; then
-			if linux_chkconfig_present SND_HDA_INTEL; then
-				CONFIG_CHECK="~SND_HDA_POWER_SAVE"
-				ERROR_KERNEL_SND_HDA_POWER_SAVE="SND_HDA_POWER_SAVE should be enabled in the kernel for full powertop function"
-				check_extra_config
-			fi
-		fi
-		if kernel_is -lt 3 9 0; then
-			CONFIG_CHECK="~EVENT_POWER_TRACING_DEPRECATED"
-			ERROR_KERNEL_EVENT_POWER_TRACING_DEPRECATED="EVENT_POWER_TRACING_DEPRECATED should be enabled in the kernel for full powertop function"
-			check_extra_config
-		fi
-		if kernel_is -lt 3 19; then
-			CONFIG_CHECK="~PM_RUNTIME"
-			ERROR_KERNEL_PM_RUNTIME="PM_RUNTIME should be enabled in the kernel for full powertop function"
-			check_extra_config
-		else
-			CONFIG_CHECK="~PM"
-			ERROR_KERNEL_PM="PM should be enabled in the kernel for full powertop function"
-			check_extra_config
-		fi
-		if kernel_is -lt 4 11; then
-			CONFIG_CHECK="~TIMER_STATS"
-			ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
-			check_extra_config
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Bug 599114
-	sed -i '1s|^|AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])|' configure.ac || die
-
-	echo "\"${PV}\"" > version-short
-	echo "${PV}" > version-long
-
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
-	econf $(use_enable nls)
-}