gentoo (leap year) resync : 29.02.2020

3 files changed, 124 insertions, 8 deletions

diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 9fc2c2471bc7..25a47407e523 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,5 +1,7 @@
 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-v2.10.tar.gz 722992 BLAKE2B 573f1f0ed40705d3463f6e6f76c67ae99127ab2541b851143dafa707ef1c2dab4127d27811b63ad27e6b002ea4efd39417297a0227996ad9b01141b6de733d41 SHA512 4219e7aadbeebdf6932c04f784434e4dd0f540bf4941d43c1830b1b5cad1f3928769b13897e24dd956b6bdee65fb1fbe902ee30685bca229b71e140d65367837
 EBUILD powertop-2.10.ebuild 3843 BLAKE2B f0d637015c7ed1dbf8f69c619630dcf7ea3a0a6fe1a9698da2dda5274a28d054c88ac884b8a7c6ca312c1bca4a582da6e008476a548592fdf60ad357083b85b0 SHA512 c9f56ee6c4d33ad52d4774ffc96b791f7c82c677aa5e439a84c9ee7d4e7c6205163b7ede16c3e30cf10bbee3835fd16d6cbd7aa5c955c8a303f5830842c2d494
-EBUILD powertop-9999.ebuild 3790 BLAKE2B fb6238df26defce86bfd33d36eed9c160ba491f7457dbe708eaaa4511ce9cf007288af610dd57103e9d5eb80b43dbeb1fda74195b044e406ca3a46baf630053a SHA512 ce9caf68f29e9788fc7732bf091a85bf97fc42beacc8a1c80b4d31efcb051a342762aacd546e5a2d88e01ee4426d8513891a16fa22233bc184d62862de8f3db9
+EBUILD powertop-2.11.ebuild 3770 BLAKE2B f2d2a23f341a7066ce587ad00dd4013ac1490a519bc6a23dcca32242e6c73b9a39c9a0f18ad50a98c7060e90c7324550b2cdbcf05a5f5bbe20884dc5534d6043 SHA512 c968286837c5c3b1881396991837eebe1ea424531153c2822250e73c418b31c42752633f284cbd256c35c5ac9211fcf4e8155a16914fe4f9cd0ee63be48cf75e
+EBUILD powertop-9999.ebuild 3712 BLAKE2B beb3e79720b7049713a52dcd40ae5282799155669183448c66a6d7944d3dec7328d1bb1eea5ca09bc60a0df571ac1defd907a5d912b0aa7fe7f9e34de28d1b57 SHA512 a3b8b274c51bde944c490242edfdc84dcb34b388474c17456cdc653cb6cca0695253c54585e8e7380f5ae7b718081398a3a21ef5d681a33e557c892bd6b12183
 MISC metadata.xml 328 BLAKE2B b0558a511f51fb77479976e60fde11b9cc46f85af935d78d060a53a1d5b1dc2611721e3c1451e3d23229cb8db0bd2bd9c6bb902c9b0fca8f57718f53f16032a8 SHA512 9d17013502d4a90d7c41493c2e69f7bc20bfd834f6f2caa5b105f9cc3045b87382393903c08a8e25bd75faaa9371e2d5c16d2521a90a89dd08697069ce8e8f5d
diff --git a/sys-power/powertop/powertop-2.11.ebuild b/sys-power/powertop/powertop-2.11.ebuild
new file mode 100644
index 000000000000..200e2c08f9f3
--- /dev/null
+++ b/sys-power/powertop/powertop-2.11.ebuild
@@ -0,0 +1,118 @@
+# 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
+
+	chmod +x scripts/version || die "Failed to make 'scripts/version' executable"
+	scripts/version || die "Failed to extract version information"
+
+	eautoreconf
+}
+
+src_configure() {
+	export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
+	econf $(use_enable nls)
+}
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index 165318e3ddd1..bf3642c77e9b 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-9999.ebuild
@@ -9,10 +9,8 @@ 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"
+	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"
-	MY_P="${PN}-v${PV}"
-	S="${WORKDIR}/${MY_P}"
 fi
 
 inherit autotools ${GIT_ECLASS} linux-info
@@ -104,10 +102,8 @@ src_prepare() {
 	# 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
+	chmod +x scripts/version || die "Failed to make 'scripts/version' executable"
+	scripts/version || die "Failed to extract version information"
 
 	eautoreconf
 }