gentoo resync : 14.12.2020

10 files changed, 63 insertions, 97 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index ec8cc6d2ce97..f08d07eea855 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpilight/Manifest b/sys-power/acpilight/Manifest
index 76ce453310fa..84f41e960990 100644
--- a/sys-power/acpilight/Manifest
+++ b/sys-power/acpilight/Manifest
@@ -1,6 +1,6 @@
 AUX acpilight.confd 269 BLAKE2B 196245bd083f89d9d975a81aaaf66d0422655cd6a5f575c2cbb898747c92bdb888f8123dbf8ddf34089be2547d39e33508119065ffb97c26f9d1d3915bee8bb2 SHA512 28e513dbcaa30cec4d2f876c244766037eb6e94ff660ff2caf9cb955f40c710ea750cac73eb5e3890b42904227ccbd7f6c3e2595c2496e54d3339d6afdd0ffb0
 AUX acpilight.initd 742 BLAKE2B bc2ad5027cd9e5c9f8d0d55e249117f7f59ad587522d21ea2baf69e45a884df242d46cb3001ef46ef63c1e1f87a18bc5c05d4facf1e9d72d4b596926e9a6b69b SHA512 9fe648ea994eeb9baa294226b55bd6230cb2b28952f651755da622278539fc071527e3aa2425e26687bb8065ef2e372ab93d7090532dbf3208ccac8519f01fca
 DIST acpilight-v1.2.tar.gz 18068 BLAKE2B 469fd12c0a24b152681d73add559733a294f8a0848f46d0d3a1e209dea2ad3b180294677a8d84a82387ec34b00bbfda85a10f447fe22b81a3c51225cdce14051 SHA512 ef634ec0f315fe94dca138f1b9231f320b93340db3365ab9a09cf898fe4691f70573041bcb04563d760f1201000ea3ff11ab5dad3bfffddf3d3070dedb5732d7
-EBUILD acpilight-1.2-r1.ebuild 1505 BLAKE2B df5b446e3dd8723995171c8e6021480d2628a1d205be2554bea606758ba6b3df5c29d268a1d4e45a88d2d440f6ce37c6fb4bf492c7cbbae7c86c1cc736ca76ad SHA512 84394a2b323ddd5eaa16d3b3c94b39c3fec7f95487b6f119bb6fb047dd7a69c6d5f0e9148436b912d85a1c4fb37c2788d602d923050574798dad4514697fd9a7
+EBUILD acpilight-1.2-r1.ebuild 1503 BLAKE2B 9cc6e6cb3d613fbdf7e5ae9b74fc3bb189f52801aed07e684336e631d4cbb6de6ad17dcbc781c137835a908daa6d2d460fd574d911f434fedf967c52a7c17200 SHA512 8898fcaeb5ca91bc82f3d22a75dbc63294a1841f299de36df27e176d4171fcf897b615108ed76b896604d622bbd07a11c0368324d655c2d11687541dd4c12368
 EBUILD acpilight-1.2.ebuild 1506 BLAKE2B e3185588af5d251aedd7636fdab21ebe54fbaefe37f7a281515c6dde65848d28a6992cfd60c119d317a5f6ed63f025d7b61f4f1c7f036927ea85f0eed2cce7e9 SHA512 ae50de05acf6242c929fa79bc2543a5d01efa39e48c22a65af364a2a22099718be2dc0627d5a68102e6b10142b2af46870c1f4a9c1ef52b21480bf2beba560a8
 MISC metadata.xml 337 BLAKE2B ad7ecd612b078bad830f6f10efaca7f41b7b5ef1d290799ce4c2dbd5489076c5c0fc3500e0c64bc3f00f448f80a1eedb9737c967258bbea5e105a85d7e4b8749 SHA512 6f624eadeaad1f4a440a2663ac9672cd6a36dbb668d11bcdb621aa5ddb739632c8bc74bbbde9905adf023618a9432a26bfec4f6861f5e4ba6167a0c2658dacd0
diff --git a/sys-power/acpilight/acpilight-1.2-r1.ebuild b/sys-power/acpilight/acpilight-1.2-r1.ebuild
index 36f03785d73c..97741e44434f 100644
--- a/sys-power/acpilight/acpilight-1.2-r1.ebuild
+++ b/sys-power/acpilight/acpilight-1.2-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://gitlab.com/wavexx/acpilight/"
 SRC_URI="https://gitlab.com/wavexx/acpilight/-/archive/v${PV}/${MY_P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
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
diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 58f455afcb2e..2976ba63f175 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -1,6 +1,8 @@
 AUX thermald 374 BLAKE2B 2ea9775b75acb7797c078c8c7786d442bd9c98102cd53073e1c040a0972dfd6be8424a62889a666573ee72ce5273bc53169fae5762bc0005a1c899324a699d27 SHA512 17f1c2133e47e897c4a5407ef622adfebb8498fce7ea9bf17cfd177269a3d869bdc21c3d2558010e9669ddc53e69e521bb4c1e112c51010168aa3c074c259e02
 DIST thermald-2.2.tar.gz 435659 BLAKE2B 500189b924594e5b1d68adc776b3ad0c1d531d4259c65dd77f9166648c9b4273c52e1f8222254ec6500b3d37e39deb4ec862443728d50e9be95dee8e43496645 SHA512 f2c691061436699aef5bb7d9681370306dc7a64c453208911077c9a4af50e35b32247fc0a35853bb314d0e4289dd07f6116a3ade7fa278b521ed9b7b13db949b
 DIST thermald-2.3.tar.gz 452790 BLAKE2B caef87d670b14bfa0dbe6ca4873ebea4b0a9960a9bad48ddb10abb348e25cafdbdf5dad831a1c3ad38e71ab61d7f123df99046dec1e5ce2c32be506bc4b1312f SHA512 0d722c35e3638bb917994b8a123e1226b737b120f0946cfc604eb3bb4bd501121b1f196833f8cb3aceee73a8bb3566ef1d176d81143b84423f89d20966e91ed8
+DIST thermald-2.4.1.tar.gz 455735 BLAKE2B ee4d6bc590bc50639c0b19adbba7e243358174a837b2ff155dea060b1cd09171d4fb77b18b785dc9f64a633f680358cb1d7b36e3bd438e5267e0a0a27e18497e SHA512 2dab7d57e028037208034ab4be95dc138ce028d4a47a0151c69816e1502065d801d52990641544b5d246144e654c15c663fa78af6cea094cf9a107f2fb29c1ef
 EBUILD thermald-2.2.ebuild 922 BLAKE2B d5481f4bf46b429ce06e194fab8665d7edc46ec73c15ca16479b33455fc6d71f51c204e01cadbfe39dd970f386168c4ec33d1b8edbc8e74fbd31d5830e5f2c1d SHA512 3f4bef46cf1ec58ee2da8f243102ef7710efde6357d60e150d4ada0310111d49a7c176e844799b9763d33ef484dae84db60261fd9b269b09ae2f0caf21073450
-EBUILD thermald-2.3-r1.ebuild 1156 BLAKE2B 7a7669453125d73330878f1be279063a9efa85cb1c03e18035543281401dac84905ba341016bcecfb54c109cc9f6eb0f8f5b4916a6fadb9093a93735ec2ba04e SHA512 4fe7963b1ad576d146198f75a3c05b2fd991dd868083f80a9dbb04efa2f88a9305635b5e3ca33a2e575112d6c0d0377149d2739d7ced4343c8a7b69c897a1c6b
+EBUILD thermald-2.3-r1.ebuild 1177 BLAKE2B 626325577b22980c0a5fc5d408be170aae607349bc8bf2fee0899ce9ef310fdb7b805cdf1499770da1d64a3aff7f7f7d1379a3d9ada7063739e292dbc2ebb241 SHA512 2dd723040265f778645df4c7b5710559caea7c4da29be91967629aebdc535cf5cad61e56c9b29958e8743d27757f64b9d1191ba2eee0d25d38c1036087b12bc4
+EBUILD thermald-2.4.1.ebuild 1161 BLAKE2B 3268fe644270fab7c48a53134eeee51ad33d8abd782bae5d41714c34d1a99a57d7ed4091b32f180c7b49f957ecdeaf945d8e9c955bc20c57d90b718e3a7fc6b1 SHA512 56e5375a288cd3ca46e275e8912c7bc76011b0a7a4c73b1816fadd30a374564573ce1e0efffdc85f39c296248d9ff46c1ca6f1e42b903517484f59831e509f4c
 MISC metadata.xml 643 BLAKE2B 92fe71631920f61dd6667c2dc8b4e27d2ea1e9bfb64509a9b4a9b0a72e9b4a11b7ae06febf120564c28272b9e079cf71a114bca620ce2651ec615439dd5ff9b3 SHA512 bad363023e01da0232632d54b2cb65dce89a7c70441f05fc873640a29f6fd4ec4ea30b00f94f723a786de1eef87b94673dad455102bc57a11573346e3a8ae2e8
diff --git a/sys-power/thermald/thermald-2.3-r1.ebuild b/sys-power/thermald/thermald-2.3-r1.ebuild
index 2465a7a70379..1110e8a7182f 100644
--- a/sys-power/thermald/thermald-2.3-r1.ebuild
+++ b/sys-power/thermald/thermald-2.3-r1.ebuild
@@ -38,6 +38,7 @@ my_src_configure() {
 	append-cxxflags -std=c++14
 
 	ECONF_SOURCE="${S}" econf \
+		--disable-werror \
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 }
 
diff --git a/sys-power/thermald/thermald-2.4.1.ebuild b/sys-power/thermald/thermald-2.4.1.ebuild
new file mode 100644
index 000000000000..64693c99c353
--- /dev/null
+++ b/sys-power/thermald/thermald-2.4.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools out-of-source systemd
+
+DESCRIPTION="Thermal daemon for Intel architectures"
+HOMEPAGE="https://01.org/linux-thermal-daemon https://github.com/intel/thermal_daemon"
+SRC_URI="https://github.com/intel/thermal_daemon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/dbus-glib:=
+	dev-libs/glib:=
+	dev-libs/libxml2:=
+	dev-libs/libevdev
+	sys-power/upower
+	sys-apps/dbus:="
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc
+	dev-util/glib-utils"
+
+S=${WORKDIR}/thermal_daemon-${PV}
+DOCS=( thermal_daemon_usage.txt README.txt )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+my_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-werror \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+my_src_install_all() {
+	einstalldocs
+
+	rm -rf "${ED}"/etc/init || die
+	doinitd "${FILESDIR}"/thermald
+}
+
+pkg_postinst() {
+	if ! has_version sys-power/dptfxtract; then
+		elog "dptfxtract can be used to generate a more specific"
+		elog "thermald configuration for your system"
+	fi
+}