gentoo resync : 14.12.2020

4 files changed, 3 insertions, 94 deletions

diff --git a/sys-power/cpupower/Manifest b/sys-power/cpupower/Manifest
index 000a49e3b714..b155b3a4f14e 100644
--- a/sys-power/cpupower/Manifest
+++ b/sys-power/cpupower/Manifest
@@ -1,12 +1,9 @@
-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-5.4-gcc-10.patch 2131 BLAKE2B c31074f0d7626249cf3125fac986370c28eeb421bad6428d697faf4567ef62b3af7fa21b77f88c78784c47caf5f00bf599a6e893f3003617bdf931b14727ba0e SHA512 37fa5c4ee11421aa600e6b552fc31643577fb4369e6fc7c0c1fd51810e8ef8d820399c9ed0a524d48798d96d9e71e2fc28bd0380599b998cd73cea821574ca15
 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 linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-EBUILD cpupower-4.13.0.ebuild 1660 BLAKE2B d1f28db05813a69ffad80a074eab2422b020f07a3c740a34475d22ccee07062f814ba7e273e80c3300265cb4870545cabb67811b5aa8d045bcd8c4f7d2bfc05d SHA512 6e034ec616739e260fc7005dbdaf0eea4a6d4e794dbff30184b108b13e9f66b8daab115e5081840cef9013694143e82339dab7b7c180b0fbdd4db1329efff699
-EBUILD cpupower-5.4.ebuild 1684 BLAKE2B 577213319993e4f6f7b5bcc7d005aa7b31136ade6ffeec460869986d9cb0705b1416633233179a99b81fb460605a21137b959769d40796d1567d86b391a293c4 SHA512 200cba8c3c652c67fd709abc192c15e85aa6d505cc63acd530fa9d7c1524e9800d08c9e42a4d6906f530081740a9728a0152ff3c75b209db3a547bb439c48b1f
+EBUILD cpupower-5.4.ebuild 1703 BLAKE2B d3f95fa7986ab1a64b2efbf281a8d8ba607705261897c0cdb4730c7939adc166119cdb2055cc3d251548de5186058f3692dd7df8ba8837811d19cb1f16084818 SHA512 3ce63109fa5ac27eebc48eb55fb11c1927765482ce30663c151fcfd2f4d75e1f89fd1cda420b322026b5570b430d3c27f1af9a7bf0680299b6d5cfe512fca073
 MISC metadata.xml 340 BLAKE2B a03552056a3b361eecd25b085c5f3fe60af7d1dbef9bb74682066b2d87c92b91a7a3d5cb53d1cbb88d85f81982a4b7ee4f8c5ff15c1fd06a266447f2d309ffd9 SHA512 af0ccc6342a6f6095d2bf06f764729e2a3eaa885d95da97462e15e3f5d139d3260e4c6e981e1d1194f4c0b64d3216decf223f854ad80e580092af8235399e054
diff --git a/sys-power/cpupower/cpupower-4.13.0.ebuild b/sys-power/cpupower/cpupower-4.13.0.ebuild
deleted file mode 100644
index 28ce7238b738..000000000000
--- a/sys-power/cpupower/cpupower-4.13.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2013-2020 Gentoo Authors
-# 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 ~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}"/cflags-strip.patch
-)
-
-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}
-	)
-
-	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
index 88abd3b4403e..b015c217ba51 100644
--- a/sys-power/cpupower/cpupower-5.4.ebuild
+++ b/sys-power/cpupower/cpupower-5.4.ebuild
@@ -15,9 +15,7 @@ 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"
+RDEPEND="sys-apps/pciutils"
 DEPEND="${RDEPEND}
 	virtual/os-headers
 	nls? ( sys-devel/gettext )"
@@ -38,6 +36,7 @@ src_configure() {
 	export localedir="${EPREFIX}/usr/share/locale"
 	export docdir="${EPREFIX}/usr/share/doc/${PF}"
 	export confdir="${EPREFIX}/etc"
+	export bash_completion_dir="${EPREFIX}/usr/share/bash-completion/completions"
 	export V=1
 	export NLS=$(usex nls true false)
 }
diff --git a/sys-power/cpupower/files/cflags-strip.patch b/sys-power/cpupower/files/cflags-strip.patch
deleted file mode 100644
index 6e70fdf38b1c..000000000000
--- a/sys-power/cpupower/files/cflags-strip.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -180,14 +180,7 @@
- endif
- export QUIET ECHO
- 
--# if DEBUG is enabled, then we do not strip or optimize
--ifeq ($(strip $(DEBUG)),true)
--	CFLAGS += -O1 -g -DDEBUG
--	STRIPCMD = /bin/true -Since_we_are_debugging
--else
--	CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
--	STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
--endif
-+STRIPCMD = true
- 
- 
- # the actual make rules