commit: 37ee174421b6f5279221551a764a9a05cbaa098a Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Thu Mar 2 01:18:52 2023 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu Mar 2 01:29:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37ee1744
sys-power/powertop: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> sys-power/powertop/Manifest | 1 - ...igure-Remove-AX-macros-from-configure.ac-.patch | 60 ----------- .../2.14-configure-Use-AX_REQUIRE_DEFINED.patch | 28 ----- sys-power/powertop/powertop-2.14.ebuild | 115 --------------------- 4 files changed, 204 deletions(-) diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest index fe088bdc7752..9f04e847a444 100644 --- a/sys-power/powertop/Manifest +++ b/sys-power/powertop/Manifest @@ -1,2 +1 @@ -DIST powertop-2.14.tar.gz 302578 BLAKE2B 5f53f81b01e83004f6436f497818d2a552b5e7ffda5007749aad415773adeab2a256aeffbacbf9e5fe803ff343a0c1954b5264aebdffa841bb70406b8b9611bc SHA512 f3e25901fb29405e0c8016643855a209cf9dba589fe9dd3e27c291d44699cebeb00dc8c7264c24436db08deb496759bd106666cb52d9ebd5f831bbb99e30f20f DIST powertop-2.15.tar.gz 302891 BLAKE2B f554ee9499c78f1888ecd58a1a357bc6f29f53ae2d3bf6b2819d760afe901f5d5394665a2e6a3ecae9b48cbf9703532feb5c16da9bd3edd4f1d31fe12610a2da SHA512 de4ca3ea25697d2cd5f05c41c82c326ad3e2d21cbf38ddb9b3af40c0d862a70781ca45d9ef7b735ad6def0cb580e4fa153eb4a6e6598e204fc931b30d85ecf41 diff --git a/sys-power/powertop/files/2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch b/sys-power/powertop/files/2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch deleted file mode 100644 index 7f2b7820ff2f..000000000000 --- a/sys-power/powertop/files/2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 2eb781ba822f2d57420400f648f6f531689c8c5d Mon Sep 17 00:00:00 2001 -From: David King <[email protected]> -Date: Thu, 15 Apr 2021 11:37:24 +0100 -Subject: [PATCH 1/2] Revert "configure: Remove AX macros from configure.ac - file" - -This reverts commit 1e478d84f051ba56962a1214cb750b810379ac1d. ---- - README.md | 4 ++-- - configure.ac | 9 +++++++++ - 2 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/README.md b/README.md -index 1b17365..43bd5b2 100644 ---- a/README.md -+++ b/README.md -@@ -26,7 +26,7 @@ Example packages to install in Ubuntu*: - - sudo apt install libpci-dev libnl-3-dev libnl-genl-3-dev gettext \ - libgettextpo-dev autopoint gettext libncurses5-dev libncursesw5-dev libtool-bin \ -- dh-autoreconf pkg-config -+ dh-autoreconf autoconf-archive pkg-config - - - ## Building PowerTOP -@@ -39,7 +39,7 @@ source files are modified. - To build PowerTOP from the cloned source, use the following commands: - - ./autogen.sh -- ./configure LDFLAGS='-pthread' -+ ./configure - make - - -diff --git a/configure.ac b/configure.ac -index 2571c5d..7eeeb9c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -36,9 +36,18 @@ AC_PROG_LIBTOOL - AC_PROG_CC - 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([ -+ LIBS="$PTHREAD_LIBS $LIBS" -+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -+ CC="$PTHREAD_CC" -+ ], [ -+ AC_MSG_ERROR([Could not configure pthreads support]) -+]) - - # Checks for header files. - AC_CHECK_HEADERS([ \ --- -2.32.0 - diff --git a/sys-power/powertop/files/2.14-configure-Use-AX_REQUIRE_DEFINED.patch b/sys-power/powertop/files/2.14-configure-Use-AX_REQUIRE_DEFINED.patch deleted file mode 100644 index f036bf73d619..000000000000 --- a/sys-power/powertop/files/2.14-configure-Use-AX_REQUIRE_DEFINED.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e87357a35f376518c3663a2f5cac53e9c4917427 Mon Sep 17 00:00:00 2001 -From: David King <[email protected]> -Date: Thu, 15 Apr 2021 11:45:13 +0100 -Subject: [PATCH 2/2] configure: Use AX_REQUIRE_DEFINED - -Require additional macros to be defined early, to avoid an aclocal -"too many loops" error when copying macros. ---- - configure.ac | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 7eeeb9c..37c1304 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -29,6 +29,9 @@ AM_GNU_GETTEXT([external]) - AM_GNU_GETTEXT_VERSION([0.18.2]) - - m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) -+AX_REQUIRE_DEFINED([AX_ADD_FORTIFY_SOURCE]) -+AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX]) -+AX_REQUIRE_DEFINED([AX_PTHREAD]) - # Checks for programs. - AC_PROG_CPP - AC_PROG_CXX --- -2.32.0 - diff --git a/sys-power/powertop/powertop-2.14.ebuild b/sys-power/powertop/powertop-2.14.ebuild deleted file mode 100644 index 824c7e799309..000000000000 --- a/sys-power/powertop/powertop-2.14.ebuild +++ /dev/null @@ -1,115 +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}"/${PV}-Revert-configure-Remove-AX-macros-from-configure.ac-.patch - "${FILESDIR}"/${PV}-configure-Use-AX_REQUIRE_DEFINED.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 - - eautoreconf -} - -src_configure() { - export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses) - econf $(use_enable nls) -}
