gentoo resync : 15.12.2019

7 files changed, 105 insertions, 143 deletions

diff --git a/sys-power/cpupower/Manifest b/sys-power/cpupower/Manifest
index 61803b988a6c..e1ec020930fd 100644
--- a/sys-power/cpupower/Manifest
+++ b/sys-power/cpupower/Manifest
@@ -1,12 +1,11 @@
 AUX cflags-strip.patch 423 BLAKE2B aaa63551049273cc00abb0bb71da662e7c44ae7843cbeac60625cf75db872a68d23adfc439080ed2641d00693ff474e594f82b3a03e2173801d5e549b7430ebe SHA512 546c6c8187638cae094a428226c9c7463168b66fb1d16ffb05167a2bb5fb8792c08b6a68e71cbabaaa95aac352ca5ad4c1fce0a3a6fded6863b40c1ed1a5b4c0
 AUX conf.d-r2 1616 BLAKE2B 94083b666d5ad43270ec458488b9a6070a33d0d0611a6430e9d44eddc663197cc715c173d1ca1a67a15e012dbd60a08677d85f2e771bbefff7fc9ef4a4b16b88 SHA512 63cd12a4d8782198c71662e9205e346e064b65bae5e3e175b5bc43bdf7ec6ddf675b60349750afe3c37c8a925f9ae9a93530671821342581bd282a69e0773b8c
+AUX cpupower-5.4-cflags.patch 900 BLAKE2B 6ee752113b03bcd9665937eaf1270337baaef7c6d08503373c2d0890a58fe329d4ae3f1fc40dc80cafdbba94e1f41c87d11530855f8f1b26f67c14f63dc54ec9 SHA512 e765ad5141bbffb27ca357a71dd1360636fa5965d4058f209cb6b5ff3bbe7d8f15c270cb6a1f0dfde4bebe47adf96169f1e9dff9a41dceca080229aebc0a1677
 AUX cpupower-frequency-set.service 151 BLAKE2B ff5a2460bf2080868157ea2b975b9d401f2b47e2c8e77d29ac1528f6b85246394e72d57a88dfacb0242fc1e563eefd0a102d2d6dae877c6e779383a0b163a8f3 SHA512 dcd6bb5dee338113683c2e222df23195857f44f5430569b3c454078d0650c15fa2fa3876dccd6ee4652d0fd409f925205d0d3e57344487a64945c67a3b0dee67
 AUX cpupower-frequency-set.service.conf 41 BLAKE2B b1349f0dc39ee39e7c1442374bd92e069509f106c80206c4a606d732acd2cc6205e2032eb98e4890ef006a8bda5fd65d18b83881aa55008a55375d0bc170efe2 SHA512 d99b78a5ab4f7b4e8fe92bc0b2cd722cd55e97e234027a0eba37eb39739e2a470bfc369efa9cf7846bf1a6d588d9d5d5d9efbb90a68aac2f687ddeb833e291f1
 AUX init.d-r4 804 BLAKE2B b143305b3f117afa49967de098f54419d5f57b86dee7e7153b7adb02331a88d3b90a0a085ee189c0b6de70050de4a1249d481d23816764aad34d416f041f78b3 SHA512 7f6992b17376c0bedb403586e123200272d293b15819260cacd182c19ecdb2da635b177fe3d621ad8605a4ff046fd23669e67ea0bd8f00c9e4339d3ac72d2ddf
 DIST cpupower-4.13.0.tar.xz 67812 BLAKE2B 3b94b18bb57b0499a96d57ca26a48f528bf993e0f1ed7eb6d2949c879de8796501629bd0978946eae925d86dd3204a1cab0c99f1c3a8b51731dfbdb61451e990 SHA512 5e7095e2741eae920a097864926931afb2656e492b504f203c40c24ddc5aee5014c7689b220225171b5ea10c69b70774fb2a979d05ea56ef1fa063f3097626c7
-DIST cpupower-4.9.0.tar.xz 67620 BLAKE2B 0aad0114af52b939f83d80ba89be49a061f46a7597ae2e2f27ee6134dbcb425beefd613b0c3f0217003b700cf9b81cd7538575938e9a867138a78eb6a0247f3e SHA512 67137bd7166a34f131332a5165384ebca5b97deb1c92e6d557195da4be4fecb0c5902159f748ea454461ad2181a778c32b4e4dfd1f8ce7e6a3ec41f553f23677
-DIST linux-3.18.tar.xz 80934708 BLAKE2B cf796fa1eb24276470b51bd3754f02932e57c6469e45959893b3714457ba33f0081ff04137990f228e1aae6d42a05073478a3ef932df468af7cd02bf8c8836c4 SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009
-EBUILD cpupower-3.18.ebuild 1614 BLAKE2B 3629f1141e4517165df4472467ce66105fdba03790541f749a34a7dbf5ee54de5f590528af3a2f9514f63eec3512bda2c50fcdcde94e5026ea99d6025fc93db7 SHA512 7e6444d9f6a14374c190038ae53a3c13b9ab19fec9d3ad57fd495af9f9ccf2938563bacac1d5a3c928d4e783096cb14a8ce9867a799836a7dd7f003292cc65bb
-EBUILD cpupower-4.13.0.ebuild 1729 BLAKE2B 3dc42588fff8c7d26d8b028740e87e9a2e58340d1be6b69229ac3c9bf8092ed6927ee4db70b3aafb696d9803a35887ef416bc3b3d19c2ec543cf1a80538144ad SHA512 6a3054016fc9ecbb3d45a81bf945341ba718e76ff8a26f92df48e164bd0d5434173abb77c93b21b5a9a189f886b3e3f8f6fe2b51eecd281322ebc2bb091bd594
-EBUILD cpupower-4.9.0-r1.ebuild 1460 BLAKE2B cba65257b62d4c552d31d972a044ef6870c8390707ab9c85507379580dd32cf0d1feade9a097a0733b8344d7f8096d04794367f0f7c3e0b2bbb48cbcb5df1adc SHA512 e96a435498faf21b6427fbc5bf72ff2d40190b79354a5db11c8f8d4b505d4749b302f55f066396c8d358a55bdb4dbfb3b86d904f291862fb7ad0b24e78705b93
-MISC metadata.xml 434 BLAKE2B e7c13d7d29993f586d49a6333dccd91f748122e8ca6764bcf1286c46a0d4c197ef5a314889d89bd02a8f39f0122e362f2fed458df9d3bc0f3a793d73f7a23308 SHA512 9ce805896548834fd7c83f53af781432efcfc9a2d272ccb8ae93e57159507940570323a0fbc9d95097c71496cfb2b508d0c4f14bfebd9641140d5317005b2705
+DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
+EBUILD cpupower-4.13.0.ebuild 1660 BLAKE2B bb54f0810ff4d44a068d1e8e009e8d96daef318e60bc73df9e79dbc2bead8336daf2cd4ee3a6a21db7c4b00c2c655d166576cb0c91bdf63f742dd9064871ee6d SHA512 a819a13af0d6baca8c3e87afb350fad329d909e31945e492a38c559a7783bc2ca4630ec1a7c2ebfd191e331bb6b8beaacd6ac5fc19bd1ec4f13df6868774bb8a
+EBUILD cpupower-5.4.ebuild 1645 BLAKE2B 025dfcb9d74ee02f9d2b083ed7246630b9e5c7aee114446c54caf4d57b005ef8a388add25e98ffecb86ed01deaffda390a268e8e52d7d44383e4aa5224f2c899 SHA512 60e837f09d331399c171ee695f04ff083ebc7e33a7ced62c7b9fb50b0ec4d2181ec306b7f2ff0b7250014311dd6050f35352d14f1a8dd20ca16621b46c0e7329
+MISC metadata.xml 340 BLAKE2B a03552056a3b361eecd25b085c5f3fe60af7d1dbef9bb74682066b2d87c92b91a7a3d5cb53d1cbb88d85f81982a4b7ee4f8c5ff15c1fd06a266447f2d309ffd9 SHA512 af0ccc6342a6f6095d2bf06f764729e2a3eaa885d95da97462e15e3f5d139d3260e4c6e981e1d1194f4c0b64d3216decf223f854ad80e580092af8235399e054
diff --git a/sys-power/cpupower/cpupower-3.18.ebuild b/sys-power/cpupower/cpupower-3.18.ebuild
deleted file mode 100644
index 0dcdb330bbc9..000000000000
--- a/sys-power/cpupower/cpupower-3.18.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Shows and sets processor power related values"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/linux-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="cpufreq_bench debug nls"
-
-# File collision w/ headers of the deprecated cpufrequtils
-RDEPEND="sys-apps/pciutils
-	!<sys-apps/linux-misc-apps-3.6-r2
-	!sys-power/cpufrequtils"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/linux-${PV}/tools/power/${PN}
-
-pkg_setup() {
-	myemakeargs=(
-		DEBUG=$(usex debug true false)
-		V=1
-		CPUFREQ_BENCH=$(usex cpufreq_bench true false)
-		NLS=$(usex nls true false)
-		docdir=/usr/share/doc/${PF}/${PN}
-		mandir=/usr/share/man
-		libdir=/usr/$(get_libdir)
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-		LD="$(tc-getCC)"
-		STRIP=true
-		LDFLAGS="${LDFLAGS}"
-		OPTIMIZATION="${CFLAGS}"
-		)
-}
-
-src_unpack() {
-	tar -xf "${DISTDIR}"/linux-${PV}.tar.xz \
-		linux-${PV}/tools/power/${PN} \
-		linux-${PV}/Makefile \
-		|| die
-}
-
-src_prepare() {
-	# -Wl,--as-needed compat
-	local libs="-lcpupower -lrt $($(tc-getPKG_CONFIG) --libs-only-l libpci)"
-	sed -i \
-		-e "/$libs/{ s,${libs},,g; s,\$, ${libs},g;}" \
-		-e "s:-O1 -g::" \
-		Makefile || die
-}
-
-src_compile() {
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" "${myemakeargs[@]}" install
-	dodoc README ToDo
-
-	newconfd "${FILESDIR}"/conf.d-r2 ${PN}
-	newinitd "${FILESDIR}"/init.d-r4 ${PN}
-}
diff --git a/sys-power/cpupower/cpupower-4.13.0.ebuild b/sys-power/cpupower/cpupower-4.13.0.ebuild
index 88366fc8d73a..b3ea8ec6d435 100644
--- a/sys-power/cpupower/cpupower-4.13.0.ebuild
+++ b/sys-power/cpupower/cpupower-4.13.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0/0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="cpufreq_bench nls"
+IUSE="nls"
 
 # File collision w/ headers of the deprecated cpufrequtils
 RDEPEND="sys-apps/pciutils
@@ -38,7 +38,6 @@ src_configure() {
 	export confdir="${EPREFIX}/etc"
 	export V=1
 	export NLS=$(usex nls true false)
-	export CPUFREQ_BENCH=$(usex cpufreq_bench true false)
 }
 
 src_compile() {
diff --git a/sys-power/cpupower/cpupower-4.9.0-r1.ebuild b/sys-power/cpupower/cpupower-4.9.0-r1.ebuild
deleted file mode 100644
index 308a7d815fea..000000000000
--- a/sys-power/cpupower/cpupower-4.9.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# eutils: strip-linguas
-inherit eutils systemd toolchain-funcs
-
-DESCRIPTION="Shows and sets processor power related values"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="cpufreq_bench debug nls"
-
-# File collision w/ headers of the deprecated cpufrequtils
-RDEPEND="sys-apps/pciutils
-	!<sys-apps/linux-misc-apps-3.6-r2
-	!sys-power/cpufrequtils"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	myemakeargs=(
-		DEBUG=$(usex debug true false)
-		V=1
-		CPUFREQ_BENCH=$(usex cpufreq_bench true false)
-		NLS=$(usex nls true false)
-		docdir=/usr/share/doc/${PF}/${PN}
-		mandir=/usr/share/man
-		libdir=/usr/$(get_libdir)
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-		LD="$(tc-getCC)"
-		STRIP=true
-		OPTIMIZATION=
-		VERSION=${PV}
-	)
-
-	if [[ -n ${LINGUAS+set} ]]; then
-		strip-linguas -i po
-		myemakeargs+=( LANGUAGES="${LINGUAS}" )
-	fi
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" "${myemakeargs[@]}" install
-	doheader lib/cpupower.h
-	dodoc README ToDo
-
-	newconfd "${FILESDIR}"/conf.d-r2 cpupower
-	newinitd "${FILESDIR}"/init.d-r4 cpupower
-
-	systemd_dounit "${FILESDIR}"/cpupower-frequency-set.service
-	systemd_install_serviced "${FILESDIR}"/cpupower-frequency-set.service.conf
-}
diff --git a/sys-power/cpupower/cpupower-5.4.ebuild b/sys-power/cpupower/cpupower-5.4.ebuild
new file mode 100644
index 000000000000..d45b53b560a1
--- /dev/null
+++ b/sys-power/cpupower/cpupower-5.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Shows and sets processor power related values"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v${PV%%.*}.x/linux-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="nls"
+
+# File collision w/ headers of the deprecated cpufrequtils
+RDEPEND="sys-apps/pciutils
+	!<sys-apps/linux-misc-apps-3.6-r2
+	!sys-power/cpufrequtils"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}/cpupower-5.4-cflags.patch"
+)
+
+S="${WORKDIR}/linux-${PV}"
+
+src_configure() {
+	export bindir="${EPREFIX}/usr/bin"
+	export sbindir="${EPREFIX}/usr/sbin"
+	export mandir="${EPREFIX}/usr/share/man"
+	export includedir="${EPREFIX}/usr/include"
+	export libdir="${EPREFIX}/usr/$(get_libdir)"
+	export localedir="${EPREFIX}/usr/share/locale"
+	export docdir="${EPREFIX}/usr/share/doc/${PF}"
+	export confdir="${EPREFIX}/etc"
+	export V=1
+	export NLS=$(usex nls true false)
+}
+
+src_compile() {
+	myemakeargs=(
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		LD="$(tc-getCC)"
+		VERSION=${PV}
+	)
+
+	cd tools/power/cpupower || die
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	cd tools/power/cpupower || die
+	emake "${myemakeargs[@]}" DESTDIR="${D}" install
+	doheader lib/cpupower.h
+	einstalldocs
+
+	newconfd "${FILESDIR}"/conf.d-r2 cpupower
+	newinitd "${FILESDIR}"/init.d-r4 cpupower
+
+	systemd_dounit "${FILESDIR}"/cpupower-frequency-set.service
+	systemd_install_serviced "${FILESDIR}"/cpupower-frequency-set.service.conf
+}
diff --git a/sys-power/cpupower/files/cpupower-5.4-cflags.patch b/sys-power/cpupower/files/cpupower-5.4-cflags.patch
new file mode 100644
index 000000000000..f21435a0cd02
--- /dev/null
+++ b/sys-power/cpupower/files/cpupower-5.4-cflags.patch
@@ -0,0 +1,32 @@
+From 6ae1f1b03aaaee6a9a56040d3ba7af6bf6648ad6 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 27 Nov 2019 10:51:15 -0500
+Subject: [PATCH] Respect user CFLAGS
+
+---
+ tools/power/cpupower/Makefile | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile
+index c8622497ef23..f17e8c94da16 100644
+--- a/tools/power/cpupower/Makefile
++++ b/tools/power/cpupower/Makefile
+@@ -178,14 +178,7 @@ else
+ endif
+ export QUIET ECHO
+ 
+-# if DEBUG is enabled, then we do not strip or optimize
+-ifeq ($(strip $(DEBUG)),true)
+-	override CFLAGS += -O1 -g -DDEBUG
+-	STRIPCMD = /bin/true -Since_we_are_debugging
+-else
+-	override CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
+-	STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
+-endif
++STRIPCMD = true
+ 
+ 
+ # the actual make rules
+-- 
+2.24.0
+
diff --git a/sys-power/cpupower/metadata.xml b/sys-power/cpupower/metadata.xml
index 470032972666..5bcecc2e8484 100644
--- a/sys-power/cpupower/metadata.xml
+++ b/sys-power/cpupower/metadata.xml
@@ -5,9 +5,6 @@
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
-	<use>
-		<flag name="cpufreq_bench">Build and install the cpufreq_bench binary</flag>
-	</use>
 	<slots>
 		<subslots>Subslots correspond to major version of libcpupower</subslots>
 	</slots>