gentoo resync : 30.09.2020

5 files changed, 65 insertions, 245 deletions

diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index b96d88ad9fb0..aa94afb9f1b2 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,9 +1,6 @@
+AUX 0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch 3100 BLAKE2B e432205a6145f4f7efbe3dac7626b97b73bd4c9db6f639fb401494a38540025dcde40fe53464ed15057a5c67e4da5786a4a57b24e549a739c8a758d88654ab50 SHA512 79ca53f0c4ba9d37dd0a6b6bbfcac39651f658b0288aa33b941ae5bfc15cbf520ec197a6fe4230417385fc726723ef79f99a0728bda83eab96907391ebaaea32
 AUX powertop-2.8-ncurses_tinfo.patch 1385 BLAKE2B 1b11138ae9c8fc90236b421d733f8cf0edff843572cfbfececba0efed5dd2a154ca561692b42e087a1c75bc19966b71fde241a029f16b126074b7d857e8c4bf5 SHA512 f1f483c43355fc1c52d0d7b9ca8e01f71c371e4e77c275584afc9f7178985e0028d42ed675adc52a1ea014325c5aaaafe245fa9166c14326cf467bd92c274522
-DIST powertop-2.11.tar.gz 307755 BLAKE2B 01723262922df5cc2ec63f6972b2a301f7efc4c701dfa3c08280dcdaa4b79f2d04503592f8c17e43d77df89e7f08695b0381f498671969fe4aa388578f732978 SHA512 bbe2882196f1b3ae39885d38dd86018576bfac5b5e8f16ea10c7dfd197197d0493ae4ce83c969417a4c4239c41dbcfada989063f14e2943c088a7489e43953b7
 DIST powertop-2.13.tar.gz 303030 BLAKE2B 3c88e05f9889cc4b276bea3bc50a3a83228ca8efae278379a14fadc6104754f2837174e028bf9c5ded9f3af84ce6b8766ac3d24b6ae62b9b192c03fc3afdec11 SHA512 8ebeccd17b6f76d9e445382d9ce5b1c00ab2daf4f1e6e133c249bceb35ea582ca3e76da5415fd0b55a28b8a124655dc5ac7a18aaf2a3df955547d77495e59181
-DIST powertop-v2.10.tar.gz 722992 BLAKE2B 573f1f0ed40705d3463f6e6f76c67ae99127ab2541b851143dafa707ef1c2dab4127d27811b63ad27e6b002ea4efd39417297a0227996ad9b01141b6de733d41 SHA512 4219e7aadbeebdf6932c04f784434e4dd0f540bf4941d43c1830b1b5cad1f3928769b13897e24dd956b6bdee65fb1fbe902ee30685bca229b71e140d65367837
-EBUILD powertop-2.10.ebuild 3843 BLAKE2B f0d637015c7ed1dbf8f69c619630dcf7ea3a0a6fe1a9698da2dda5274a28d054c88ac884b8a7c6ca312c1bca4a582da6e008476a548592fdf60ad357083b85b0 SHA512 c9f56ee6c4d33ad52d4774ffc96b791f7c82c677aa5e439a84c9ee7d4e7c6205163b7ede16c3e30cf10bbee3835fd16d6cbd7aa5c955c8a303f5830842c2d494
-EBUILD powertop-2.11.ebuild 3690 BLAKE2B 145b1787828fc13066f4e076e311b39e5ac22ea990591fe5817b6410d6b16e5c686b9d2c1fe839e9e20653dc920eaaadfc98529d40f523f38f1a9c6ca00ffe7b SHA512 e13aa9b1cef15c80f5f69a9c51bcb286a2211c4c5161b281cb4e879fc970bb7e607a829c987093c1f8b9087f6dbaa2a7649eb905496875220f99e19bf5f03786
-EBUILD powertop-2.13.ebuild 3719 BLAKE2B f4f9d0554bc4eee892f13a5fa3f733befcd0555af4366345745c7967393abc0e1138dc3b0d4bcf25e78902d55ce9785c5510cee4a207d9d57258ae9ab2a94401 SHA512 49f66a7edd7671af9a683fa6a219aac16d493bebb2779315b9379c3af178832eb83af1b06aab122fe1a1a8ad4473998c3e1e2d5f3b7d662a4952f992ebe767fa
+EBUILD powertop-2.13-r1.ebuild 3788 BLAKE2B 4e985b40055bb591c25cb86deb59e5fe53db94c6486857f118000752b6a8764fda314f4c5d4b75e1b3e3877f5e3dac931cf0a9f06fcff44f6afb989cf5fdb29f SHA512 5d1ccd173b788818f5a9f2473cbaa91af89771d206e4726e8873717611240cbf4e2a6ce5c187ba46db0da0edb73c9d9fbca494841abbaceb8e419af6e788a9a0
 EBUILD powertop-9999.ebuild 3602 BLAKE2B b52644b5010edb0cbad9a339a75edaca4ec98188da83ab5c4c16cd85e3cec5ef8613a5fe5622cfc1d0c43654b9073372e6a63fce14d54bfd1c22792181ae9ea3 SHA512 3e918cf6c3012fba1ba5acc486c5bd8c0791f8ff1dc6c4d139c1acb0b7a9cd319a7b50c9b1808ddfafafcf591ac9a0c9d81ee58c115a99b4be5045a553437338
 MISC metadata.xml 328 BLAKE2B b0558a511f51fb77479976e60fde11b9cc46f85af935d78d060a53a1d5b1dc2611721e3c1451e3d23229cb8db0bd2bd9c6bb902c9b0fca8f57718f53f16032a8 SHA512 9d17013502d4a90d7c41493c2e69f7bc20bfd834f6f2caa5b105f9cc3045b87382393903c08a8e25bd75faaa9371e2d5c16d2521a90a89dd08697069ce8e8f5d
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
new file mode 100644
index 000000000000..c864020514e1
--- /dev/null
+++ b/sys-power/powertop/files/0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch
@@ -0,0 +1,62 @@
+From 311b88d2a078aa68b042dc37b416a9bdb3f650e5 Mon Sep 17 00:00:00 2001
+From: Ed Baker <edward.baker@intel.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@intel.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.10.ebuild b/sys-power/powertop/powertop-2.10.ebuild
deleted file mode 100644
index a0784d08bd46..000000000000
--- a/sys-power/powertop/powertop-2.10.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2019 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://01.org/sites/default/files/downloads/${PN}-v${PV}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux"
-	MY_P="${PN}-v${PV}"
-	S="${WORKDIR}/${MY_P}"
-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/gettext
-"
-RDEPEND="
-	${DEPEND}
-	X? ( x11-apps/xset )
-	virtual/libintl
-"
-
-PATCHES=(
-	"${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
-
-	# Bug 599114
-	sed -i '1s|^|AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX_11])|' configure.ac || die
-
-	if [[ ${PV} == "9999" ]] ; then
-		chmod +x scripts/version || die "Failed to make 'scripts/version' executable"
-		scripts/version || die "Failed to extract version information"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
-	econf $(use_enable nls)
-}
diff --git a/sys-power/powertop/powertop-2.11.ebuild b/sys-power/powertop/powertop-2.11.ebuild
deleted file mode 100644
index e472b13d37e0..000000000000
--- a/sys-power/powertop/powertop-2.11.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2019 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/gettext
-"
-RDEPEND="
-	${DEPEND}
-	X? ( x11-apps/xset )
-	virtual/libintl
-"
-
-PATCHES=(
-	"${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
-
-	# Bug 599114
-	sed -i '1s|^|AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX_11])|' 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)
-}
diff --git a/sys-power/powertop/powertop-2.13.ebuild b/sys-power/powertop/powertop-2.13-r1.ebuild
index c3f8c0534105..ef1f63925d7c 100644
--- a/sys-power/powertop/powertop-2.13.ebuild
+++ b/sys-power/powertop/powertop-2.13-r1.ebuild
@@ -41,6 +41,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch
+	"${FILESDIR}"/0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch
 )
 
 pkg_setup() {