gentoo resync : 15.06.2021

4 files changed, 4 insertions, 63 deletions

diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 970a4e3139ef..20ca82973a62 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -1,8 +1,6 @@
 AUX thermald 374 BLAKE2B 2ea9775b75acb7797c078c8c7786d442bd9c98102cd53073e1c040a0972dfd6be8424a62889a666573ee72ce5273bc53169fae5762bc0005a1c899324a699d27 SHA512 17f1c2133e47e897c4a5407ef622adfebb8498fce7ea9bf17cfd177269a3d869bdc21c3d2558010e9669ddc53e69e521bb4c1e112c51010168aa3c074c259e02
-DIST thermald-2.4.1.tar.gz 455735 BLAKE2B ee4d6bc590bc50639c0b19adbba7e243358174a837b2ff155dea060b1cd09171d4fb77b18b785dc9f64a633f680358cb1d7b36e3bd438e5267e0a0a27e18497e SHA512 2dab7d57e028037208034ab4be95dc138ce028d4a47a0151c69816e1502065d801d52990641544b5d246144e654c15c663fa78af6cea094cf9a107f2fb29c1ef
-DIST thermald-2.4.2.tar.gz 455797 BLAKE2B 5be01fa67defe738d2e9109388ab440ee93fea63e2fb56c2f5294095b14077330f1af4cba454e0f39bde69726f358513bec123f1eb7815afac469fb2385b6c9a SHA512 96d5cb9bf4f04b6ec5763d499416c246077b2d6dbc623de3fbb2b1fb8dc8b702d417852119240496f28f0a69c52be1b2a47e5d9ee7e952a123c621bda4d809ef
 DIST thermald-2.4.3.tar.gz 455850 BLAKE2B 2348a5ce9175049e3cb2436ee6d7773af50ace9693956f5a0e64f9fbb28826004f5cf599887d7b4a8405680ecdf90dc04c054082bcca484151373e91d64eab1b SHA512 eda313aa91235ae024a673e9933267c3aa97a3a8e3e6501bf7daac24be747174b223c2f297e7b301477899d099878aa46c58cda936507c8d4683c4f14df009c0
-EBUILD thermald-2.4.1-r1.ebuild 1243 BLAKE2B c605e7c2f943184a9bf9c7ef71996601030211db219e72b6f1f30a50e4354fe5a0305adecbc6f39a40d395db92d7e2b8cb2c3085da6a8d22eeb83a45a56af8c0 SHA512 020218d8d67499e1bde6f69a640d8e2f3d972f30ea3e4ecff070c428f779a8e6e991931bf1c92552ff5168816e42b38eadf23dcac18a60a435589e2cba3320e2
-EBUILD thermald-2.4.2.ebuild 1245 BLAKE2B 170c49f06dc41e270625b41514322b521b1d2c208ddd73e86375761de1637a07eebeabbb101ef3410562001dadbe95f12306dd919a5f20c0c75a3da4639e2dc0 SHA512 9876a0fb51d2401aac53bed4b38b1f09339aef3b4dd540faf2a57a47eaaf857485134e4659f2d342e87a0491ea9c595d59ddb7aac2e9a3e91d5cd3de56750d6a
-EBUILD thermald-2.4.3.ebuild 1245 BLAKE2B 170c49f06dc41e270625b41514322b521b1d2c208ddd73e86375761de1637a07eebeabbb101ef3410562001dadbe95f12306dd919a5f20c0c75a3da4639e2dc0 SHA512 9876a0fb51d2401aac53bed4b38b1f09339aef3b4dd540faf2a57a47eaaf857485134e4659f2d342e87a0491ea9c595d59ddb7aac2e9a3e91d5cd3de56750d6a
+DIST thermald-2.4.5.tar.gz 455875 BLAKE2B f080dc065f5a0227cabed8e88d44c85c6e8ac932a6042b095a91840ea586213fe1b8ca93a04ee872f3e971d1efdd95c0f50357727d70b8e4fecd735e9c840f73 SHA512 8b7d75b3f1d7a98a9985c7552963cde19c81053d12fa39974c1129315fc23e66a432d9ada5d9e385989976453a83cf6418f410d3ce3317e23133d15d2ec37695
+EBUILD thermald-2.4.3.ebuild 1243 BLAKE2B c605e7c2f943184a9bf9c7ef71996601030211db219e72b6f1f30a50e4354fe5a0305adecbc6f39a40d395db92d7e2b8cb2c3085da6a8d22eeb83a45a56af8c0 SHA512 020218d8d67499e1bde6f69a640d8e2f3d972f30ea3e4ecff070c428f779a8e6e991931bf1c92552ff5168816e42b38eadf23dcac18a60a435589e2cba3320e2
+EBUILD thermald-2.4.5.ebuild 1245 BLAKE2B 170c49f06dc41e270625b41514322b521b1d2c208ddd73e86375761de1637a07eebeabbb101ef3410562001dadbe95f12306dd919a5f20c0c75a3da4639e2dc0 SHA512 9876a0fb51d2401aac53bed4b38b1f09339aef3b4dd540faf2a57a47eaaf857485134e4659f2d342e87a0491ea9c595d59ddb7aac2e9a3e91d5cd3de56750d6a
 MISC metadata.xml 643 BLAKE2B 92fe71631920f61dd6667c2dc8b4e27d2ea1e9bfb64509a9b4a9b0a72e9b4a11b7ae06febf120564c28272b9e079cf71a114bca620ce2651ec615439dd5ff9b3 SHA512 bad363023e01da0232632d54b2cb65dce89a7c70441f05fc873640a29f6fd4ec4ea30b00f94f723a786de1eef87b94673dad455102bc57a11573346e3a8ae2e8
diff --git a/sys-power/thermald/thermald-2.4.1-r1.ebuild b/sys-power/thermald/thermald-2.4.1-r1.ebuild
deleted file mode 100644
index 093c0f2a0eb6..000000000000
--- a/sys-power/thermald/thermald-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 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() {
-	sed -i -e "/group=/s/power/wheel/g" \
-		data/org.freedesktop.thermald.conf || die
-
-	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
-}
diff --git a/sys-power/thermald/thermald-2.4.3.ebuild b/sys-power/thermald/thermald-2.4.3.ebuild
index 2683a9652ea6..093c0f2a0eb6 100644
--- a/sys-power/thermald/thermald-2.4.3.ebuild
+++ b/sys-power/thermald/thermald-2.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/intel/thermal_daemon/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-power/thermald/thermald-2.4.2.ebuild b/sys-power/thermald/thermald-2.4.5.ebuild
index 2683a9652ea6..2683a9652ea6 100644
--- a/sys-power/thermald/thermald-2.4.2.ebuild
+++ b/sys-power/thermald/thermald-2.4.5.ebuild