gentoo resync : 12.05.2022

4 files changed, 10 insertions, 58 deletions

diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index b651726c65c3..20da48678271 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -1,8 +1,6 @@
 AUX thermald 385 BLAKE2B 3ffb7f013a3c0f7fbffab5386173e157617229c9c0a36bd9e6bec1f7d7892ae6dee314be21d95000b6086d60cd51112e40b057f7e102c5c1d77d09ccb856c56d SHA512 70420ee1d41d20c2c540467865b98bf98d51f7e23b3d4c80a94e06e039dfa6fb931cafab98d2c66c8fd1f35eea4b49c0e2ddc4eea81fb7654f11c977305ca4d6
-DIST thermald-2.4.6.tar.gz 455905 BLAKE2B 0e3eae24bd4de8f7adc9cb8cc6dec83907d8e8240bec87d752e4502c923e7b407546204af474fe32fa43ba85a60ba51bd3dc6f1ce7cf3a62dd60dc5b0235ed52 SHA512 e337b00ec7f4fa565927f047dbb17dc05b8513850f2488dd6cfc838e5123938fbfe7c39464fffb77c100073edfca9ea51708680eaa2cba537470326df9508d3a
-DIST thermald-2.4.7.tar.gz 457290 BLAKE2B 2c546175181383c21d95345e4884e5d476a47b2c5f2e1dc379add5c340bd9f421567b7c391b6002e05e3ad793ba2f563d2eca7913f0688b53a8565f52da58fbf SHA512 26b09a18d40812705d277416752f7afd0962f0562d9701c9072140089b869c328f6b0caaa08744a660cd83b6a0313098a07aef11e1a2b371a81d2e8014c38887
 DIST thermald-2.4.8.tar.gz 457365 BLAKE2B a200eba847785ad4a99e229c10574ad99b0874ef14e8b14d5190e12090ae5f4577461743ac1993a1bdb28de85100b509c8affc7ba3426a61b9cba95ea14d2686 SHA512 6e81eb25c274f1ef6e8dcb975cfab23dab9e6d29dcd38d10085d47bbf7161f3d3b0f5159d8935ff8d2c0eba99c88fac2feb9e8cef906b6afacba08a57026300d
-EBUILD thermald-2.4.6.ebuild 1066 BLAKE2B cd1b730da42dc13c6163a04a2c81df89c1dcf708af8fc1632340692fb0d12048ce02d3a7b76e8cf7a94d1fb73abd48246ef36dc3e058766a3c36ce66a5b8207b SHA512 dd8ec95a533add81a462c1d71496ccfa86acbcd9ca2ef92b881daf9557f73508403397bb91117b33b4975008339ad09cb0fbc67a60bd10a91146d386062aae5b
-EBUILD thermald-2.4.7.ebuild 1068 BLAKE2B 53c9f13d82df3408d17c4c5588a4cea70f213ecc0b95ecf28b94accd8d69f1eced19c7de27d9dfad0e6a98738796b559c78b7bb78331a1477c1d9681068a0511 SHA512 a08160077fcfb0bdfeefae8eca90b3e552b38a6ef005a91398c2e87d7b9a503e8bb38c047ab55ef5110141c949789b09fd9eca8e648264b256f772027e91fae5
-EBUILD thermald-2.4.8-r1.ebuild 1188 BLAKE2B 369c813d602ab9cc87b980c15902d55ba89015744ed11177e46443dadc533b57486e335885325e5f41ba308d3dce940635682e3f09cec0f74a02cea6d301e89f SHA512 8a834c0eff19e8cf85e5c0d5de462a5894ecce135ba160259059f51e51e1e64ad37708a06c4a56a0c249f88be43cc517b11a808cca6aeadcb7f30504608ab944
+DIST thermald-2.4.9.tar.gz 144780 BLAKE2B 92eb36c19608c454336d8cf709a1650d5853ca3884c0a99d2371ee5e5d749e1b9cc10eab9a9382e2c43dd7d424d58263de9333aa223902714f8794545a0034bd SHA512 801508cf1d6215fdb40730418d2302469ad88fe4456d6f3f99e8695286b86b5b9ee6c90184cff4ff843e0811451cf96afe15478002cba0b25cda4fe8bdb17de5
+EBUILD thermald-2.4.8-r1.ebuild 1186 BLAKE2B 012439408a776fed02946497baa273929256aeeabfb3c4a87783d97cb46e2bef35d03a0c7ac6045765bd97741ad0a2caba9ee9fe1becced4ca89d4ea2869b0eb SHA512 a09a245238ac79cf9e44a671191bb3c6bdf2666846cfd9347e511bee1b34ff0a4a43d476b17cdbab105e7b27995399e92fc3b149122be288643ff484e361be0d
+EBUILD thermald-2.4.9.ebuild 1152 BLAKE2B 465d1db8fcf7a60b78d51ac783d7d8ab07ed48f6e5bc0f2bdcd9ba066f39e6f28fea16ad0bdba8ce637b6823af2349a115964092ec096578f85a90f0e7f74dc7 SHA512 38a225233a55c76ea3143f22ca5273c6cb91d588522b60eea894c2ddd43dd423238d14e3bd7a5de185b1e72842bdf94520b0aa93bf5feab6cd7a61293de86303
 MISC metadata.xml 644 BLAKE2B 3ef4a9af01d461dcfcb83d7f17c024ee83eaa134e9b63ae00fe37d444ac626626af176581f010a397cb2fd91f00180c268e3e3b7371b454685b48b1ae76a2e93 SHA512 60e724e09ea9e7e21de4db80008b822070e8abd8cc72b9abf1ec4d486aa37fa9283f44bb7fd65a1d10d45e649073c4513cf0d4cad3ed25890b515f1053fbf4fa
diff --git a/sys-power/thermald/thermald-2.4.6.ebuild b/sys-power/thermald/thermald-2.4.6.ebuild
deleted file mode 100644
index b64a17ce7957..000000000000
--- a/sys-power/thermald/thermald-2.4.6.ebuild
+++ /dev/null
@@ -1,50 +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
-}
diff --git a/sys-power/thermald/thermald-2.4.8-r1.ebuild b/sys-power/thermald/thermald-2.4.8-r1.ebuild
index 608411e5ceb4..5034be745690 100644
--- a/sys-power/thermald/thermald-2.4.8-r1.ebuild
+++ b/sys-power/thermald/thermald-2.4.8-r1.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.7.ebuild b/sys-power/thermald/thermald-2.4.9.ebuild
index f52005fc4eda..0bee30caf643 100644
--- a/sys-power/thermald/thermald-2.4.7.ebuild
+++ b/sys-power/thermald/thermald-2.4.9.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 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"
+HOMEPAGE="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+"
@@ -32,6 +32,9 @@ src_prepare() {
 	sed -i -e "/group=/s/power/wheel/g" \
 		data/org.freedesktop.thermald.conf || die
 
+	sed -i -e '/tdrundir/s@\$localstatedir/run@\$runstatedir@' \
+		configure.ac || die
+
 	default
 	eautoreconf
 }
@@ -39,6 +42,7 @@ src_prepare() {
 my_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		--disable-werror \
+		--runstatedir="${EPREFIX}"/run \
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 }