commit: c6efdbfc31406b5b076f5f6bc9532eeb5990576e Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sun Jul 28 16:39:59 2019 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun Jul 28 16:40:27 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6efdbfc
sys-power/powertop: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> sys-power/powertop/Manifest | 2 - .../files/powertop-2.8-ncurses_tinfo.patch | 41 ------- sys-power/powertop/powertop-2.8.ebuild | 103 ------------------ sys-power/powertop/powertop-2.9.ebuild | 119 --------------------- 4 files changed, 265 deletions(-) diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest index a75203dd1ab..b1fe3aade12 100644 --- a/sys-power/powertop/Manifest +++ b/sys-power/powertop/Manifest @@ -1,3 +1 @@ -DIST powertop-2.8.tar.gz 670000 BLAKE2B 4259f462d36fe0cbb157859d6e1d3e1face67f7232fe8d4112d77f844b545f49e9cf486e21bcbc34f64ffb0c891c1864141784dde14e3a96647d6535641a840a SHA512 253d0e15f0972cf8639735c510f4884d49a0da76c31dd2f39603e2297e6c6f0b9fa283c7b3cb04a431c91f8296275c0adaecc4c3e9ea132c0c31064f7f432c80 DIST powertop-v2.10.tar.gz 722992 BLAKE2B 573f1f0ed40705d3463f6e6f76c67ae99127ab2541b851143dafa707ef1c2dab4127d27811b63ad27e6b002ea4efd39417297a0227996ad9b01141b6de733d41 SHA512 4219e7aadbeebdf6932c04f784434e4dd0f540bf4941d43c1830b1b5cad1f3928769b13897e24dd956b6bdee65fb1fbe902ee30685bca229b71e140d65367837 -DIST powertop-v2.9.tar.gz 718763 BLAKE2B bb6ce789614397b02f0e9f1cb71585cb456c1428cc43e9fe1c4b3bc9f96171fede4c587410e78e58ad8d0b0f772549a93f454bcd1b521e6dd3c809a85dc3cf30 SHA512 783af538c44e3fae7215a5b4247eb32a72e02150b3f297e6b9777a450823dd30aca014601892c0e80937a366eed95b42b622c68161d53e905ad4fbcb574b26f5 diff --git a/sys-power/powertop/files/powertop-2.8-ncurses_tinfo.patch b/sys-power/powertop/files/powertop-2.8-ncurses_tinfo.patch deleted file mode 100644 index 97769fb6728..00000000000 --- a/sys-power/powertop/files/powertop-2.8-ncurses_tinfo.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e1295099f8b42670718ba875cb6749a90042293f Mon Sep 17 00:00:00 2001 -From: Zentaro Kavanagh <zent...@chromium.org> -Date: Thu, 14 Jun 2018 13:13:37 -0700 -Subject: [PATCH] Fix configure to support ncurses w/ tinfo - -- The existing code checked for both ncursesw and ncurses and if - both were not found, NCURSES_LIBS was not set correctly. -- Removed redundant concatenation to $LIBS since the makefile.am - already maps NCURSES_LIBS into LIBS. -- Patch sent upstream to powertop mailing list [1] - -[1] - https://lists.01.org/pipermail/powertop/2018-June/002021.html ---- - configure.ac | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d6a15e1..c6ee50a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -110,10 +110,13 @@ AC_CHECK_FUNCS([ \ - - AC_SEARCH_LIBS([clock_gettime], [rt]) - --PKG_CHECK_MODULES([NCURSES], [ncursesw ncurses], [LIBS="$LIBS $ncurses_LIBS"], [ -- AC_SEARCH_LIBS([delwin], [ncursesw ncurses], [], [ -- AC_MSG_ERROR([ncurses is required but was not found]) -- ], []) -+PKG_CHECK_MODULES([ncursesw], [ncursesw], -+ [NCURSES_CFLAGS="$ncursesw_CFLAGS"; NCURSES_LIBS="$ncursesw_LIBS"], [ -+ PKG_CHECK_MODULES([NCURSES], [ncurses], [], [ -+ AC_SEARCH_LIBS([delwin], [ncursesw ncurses], [], [ -+ AC_MSG_ERROR([ncurses is required but was not found]) -+ ]) -+ ]) - ]) - - has_libpci=0 --- -2.18.0.rc1.242.g61856ae69a-goog - diff --git a/sys-power/powertop/powertop-2.8.ebuild b/sys-power/powertop/powertop-2.8.ebuild deleted file mode 100644 index 2ec905b8419..00000000000 --- a/sys-power/powertop/powertop-2.8.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils linux-info autotools -SRC_URI="https://01.org/sites/default/files/downloads/${PN}/${P}.tar.gz"; -KEYWORDS="amd64 arm ppc sparc x86 ~amd64-linux ~x86-linux" - -DESCRIPTION="tool that helps you find what software is using the most power" -HOMEPAGE="https://01.org/powertop/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="nls unicode X" - -COMMON_DEPEND=" - dev-libs/libnl:3 - sys-apps/pciutils - sys-libs/ncurses:=[unicode?] -" - -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - sys-devel/gettext -" -RDEPEND=" - ${COMMON_DEPEND} - X? ( x11-apps/xset ) - virtual/libintl -" - -DOCS=( TODO README ) - -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() { - epatch "${FILESDIR}"/${P}-ncurses_tinfo.patch - - # Call eautoreconf since ncurses patch touches configure.ac. - eautoreconf -} - -src_configure() { - export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses) - econf $(use_enable nls) -} diff --git a/sys-power/powertop/powertop-2.9.ebuild b/sys-power/powertop/powertop-2.9.ebuild deleted file mode 100644 index d9536ebd1e0..00000000000 --- a/sys-power/powertop/powertop-2.9.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eutils linux-info autotools -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/fenrus75/powertop.git"; - inherit git-r3 autotools - SRC_URI="" -else - MY_P="${PN}-v${PV}" - SRC_URI="https://01.org/sites/default/files/downloads/${PN}/${MY_P}.tar.gz"; - KEYWORDS="amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="tool that helps you find what software is using the most power" -HOMEPAGE="https://01.org/powertop/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="nls unicode X" - -COMMON_DEPEND=" - dev-libs/libnl:3 - sys-apps/pciutils - sys-libs/ncurses:=[unicode?] -" - -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - sys-devel/gettext -" -RDEPEND=" - ${COMMON_DEPEND} - X? ( x11-apps/xset ) - virtual/libintl -" - -PATCHES=( - "${FILESDIR}"/${P}-libc++.patch - "${FILESDIR}"/${PN}-2.8-ncurses_tinfo.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 - if [[ ${PV} == "9999" ]] ; then - chmod +x scripts/version || die "Failed to make 'scripts/version' executable" - scripts/version || die "Failed to extract version information" - fi - - # Call eautoreconf since ncurses patch touches configure.ac. - $(which aclocal) --install -Im4 2>/dev/null #599114 - eautoreconf -} - -src_configure() { - export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses) - econf $(use_enable nls) -}
