gentoo auto-resync : 09:10:2023 - 06:05:11

5 files changed, 32 insertions, 65 deletions

diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index e311494c77df..3b38a87863c2 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.5.2.tar.gz 162307 BLAKE2B 884fbfb440a0b5e9d1d12bfd7b9173fd79f68b46c499e341f0afdf3d312e10bcd5956b14de7c4c8c0b4db1bc7b675025e3b108bc27cc3cbf236212d0bd642508 SHA512 50ec8c0afb62805d4a86eff91725c468c9035d4524d5d12c187c8b5bbff5a6e723ead7a32bda1a2964fa8a8a8ae437bc7c05d657ea1ac64e4a3d32e6dc0591e2
-DIST thermald-2.5.3.tar.gz 162876 BLAKE2B bfdd297ff703588433d749bb64d0a0cd803b54192e3ee87449433ba89b726836f4050bbb87b7233fe4519686fdbd9bd23408bbeb6a5c31bfdd8b07aa9b723a47 SHA512 2c46e7e02c6ee375f78c8593765f01ff3be82bda3e90c133a9680bfbe7897a3fff78679e1306ee7d76192d7f164ca0ccbfeafd240c56160cdc9c4167827d5ead
+AUX thermald-2.5.4-ioctl.patch 1209 BLAKE2B 6a8f56dc06bf72261b6799b662ca334e93713a9132c8f5f57c011577d08d157a6019fd9c990f01dde0bd4fc201604ee66b28afb1711b4d8e30fe542d19818188 SHA512 123e3278494ba78e2f027be6a58a2720b01cb6e724ff72281f636cd585894f380fe9756d3c6da7c920bf481a6c4befc084a11ecfbb1f03d529516b1b1f551f41
 DIST thermald-2.5.4.tar.gz 179202 BLAKE2B 945466ee90e61b4c59105f6f0d5b011b9cad9a9613ec5ac1f9e8d2ec1d75bc21e1685e7c8f165f5f4f46736d0b862a149b1e1444500d64aa1429d97db85209ac SHA512 7e73e7860ca6df22862db5fad1d8ab75361deac9cb3631da2950b02f366febd78a93c81afe93af396c9be2a809e8be8c764b0d3183b545e051f3ec7b9d9dd078
-EBUILD thermald-2.5.2.ebuild 1289 BLAKE2B 32c00a64951863d30ac38d9c544a94deb48861e7a6beeaf73ec1d520216a9e7cca9f31c5e99b33cb99bc104ae2e48307be3019b6b6da99d51feb599b7368635c SHA512 600d174fb293bfd5dfce9741af20d5d48ec7ebab5ba2f930f2e9b0c6b28225c4f645ff98e564b851e51462ed169259905a367dbbd632fba50cca344b87f211e6
-EBUILD thermald-2.5.3.ebuild 1291 BLAKE2B 2db9c83c0c8c05841c53d9b7f5cdf3db16c3a5140fb4f47ba5e982d1cf5eda93503f8e69ee82e3e16ad06973696eb2b5a8aaf11dbafc9856559e4683811fbeb2 SHA512 6a228c84039856adddea52f6d777e62110940c10b380b9b54dfdfd03d65eab9729a5f81830f4a31c23fa8b65961a04bada59326942304ad7958c4a3365ca5fe0
-EBUILD thermald-2.5.4.ebuild 1241 BLAKE2B dad19a14c6bee077b90558df19ef70e16f1ff6183c06f7847f83c1e18d301b758afc81c2cb7896056ae3b7e7da53f171d03c1ea99f1807533649cb981ce7d94c SHA512 a0a9e5b7863806ef3c3143a8e237119af33207add29ef4df70e6c3ac251ab87a64c8b28211a673ab4ec1518b6f71f7fb5d1e8e51437cd12548c4fa4add3bc365
+EBUILD thermald-2.5.4-r1.ebuild 1285 BLAKE2B fffe80b7a34caf0ff2def428cf071717edde11f54a829582b994f140efa2495d915f874cab68c9c71330468097ae6382d291adc450011539ed642fe698d7402b SHA512 bc816d7f2d190db30fc411b6e4cd201789ded0dcc79f980581a19ab2077bd97a6d543f7b0a42e6120350d0cf54c9735957e951ef7df12efff0843aee6e23cb13
+EBUILD thermald-2.5.4.ebuild 1239 BLAKE2B edf609aa20a7a65295c60120a4255f04fb2be1fc820173f4e448323bf25a809d63d2077fe74aa023aed1d5e2b88e2a524170f0dd9942c9b725676830a640d57f SHA512 cf157888924c67e0d9647bfba1e625e9437e377f26b6934c57b9e1ad972bc847eb204a945d66632750d40d651603ebf86e7c40e8aac7fcf677dbebf585773716
 MISC metadata.xml 648 BLAKE2B dc9cd4601c2577a6c7df13c8511586e2fdaee12f587cf31b0abd10dc637dbec8bf0a6e17672a935738f8929d5057c8b83a4bccb551b420c5de52b63f395a39f2 SHA512 9c1d353d16359f135b32850fa9fd52023994fe4148258b05564e6bc01b5a1c93aea0588e137aa24c382ad6587e0791d31176b3dcee25970a11a0b8efa01256c3
diff --git a/sys-power/thermald/files/thermald-2.5.4-ioctl.patch b/sys-power/thermald/files/thermald-2.5.4-ioctl.patch
new file mode 100644
index 000000000000..85a4a82218aa
--- /dev/null
+++ b/sys-power/thermald/files/thermald-2.5.4-ioctl.patch
@@ -0,0 +1,25 @@
+diff --git a/src/acpi_thermal_rel_ioct.h b/src/acpi_thermal_rel_ioct.h
+index dd045a9..9b12a69 100644
+--- a/src/acpi_thermal_rel_ioct.h
++++ b/src/acpi_thermal_rel_ioct.h
+@@ -34,17 +34,14 @@
+ #define ACPI_THERMAL_GET_ART	_IOR(ACPI_THERMAL_MAGIC, 6, unsigned long)
+ 
+ /*
+- * ACPI_THERMAL_GET_PSVT_REV = Revision number
+- *   identifies limit type: 1=true proportional limit, 2=depth limit
+  * ACPI_THERMAL_GET_PSVT_COUNT = Number of PSVT entries
+  * ACPI_THERMAL_GET_PSVT_LEN = Total return data size (PSVT count x each
+  * PSVT entry size)
+  * ACPI_THERMAL_GET_PSVT = Get the data as an array of psvt_objects
+  */
+-#define ACPI_THERMAL_GET_PSVT_REV _IOR(ACPI_THERMAL_MAGIC, 7, unsigned long)
+-#define ACPI_THERMAL_GET_PSVT_LEN _IOR(ACPI_THERMAL_MAGIC, 8, unsigned long)
+-#define ACPI_THERMAL_GET_PSVT_COUNT _IOR(ACPI_THERMAL_MAGIC, 9, unsigned long)
+-#define ACPI_THERMAL_GET_PSVT	_IOR(ACPI_THERMAL_MAGIC, 10, unsigned long)
++#define ACPI_THERMAL_GET_PSVT_LEN _IOR(ACPI_THERMAL_MAGIC, 7, unsigned long)
++#define ACPI_THERMAL_GET_PSVT_COUNT _IOR(ACPI_THERMAL_MAGIC, 8, unsigned long)
++#define ACPI_THERMAL_GET_PSVT	_IOR(ACPI_THERMAL_MAGIC, 9, unsigned long)
+ 
+ #ifndef __KERNEL__
+ #define u64 unsigned long long
diff --git a/sys-power/thermald/thermald-2.5.2.ebuild b/sys-power/thermald/thermald-2.5.2.ebuild
deleted file mode 100644
index bcc7f1b46b8a..000000000000
--- a/sys-power/thermald/thermald-2.5.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools linux-info out-of-source systemd
-
-DESCRIPTION="Thermal daemon for Intel architectures"
-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+"
-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 )
-
-CONFIG_CHECK="~PERF_EVENTS_INTEL_RAPL ~X86_INTEL_PSTATE ~INTEL_POWERCLAMP ~INT340X_THERMAL ~ACPI_THERMAL_REL ~INT3406_THERMAL"
-
-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
-}
-
-my_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-werror \
-		--runstatedir="${EPREFIX}"/run \
-		--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.5.3.ebuild b/sys-power/thermald/thermald-2.5.4-r1.ebuild
index a4a0727b15bf..d9b0e929bcb5 100644
--- a/sys-power/thermald/thermald-2.5.3.ebuild
+++ b/sys-power/thermald/thermald-2.5.4-r1.ebuild
@@ -30,10 +30,9 @@ DOCS=( thermal_daemon_usage.txt README.txt )
 
 CONFIG_CHECK="~PERF_EVENTS_INTEL_RAPL ~X86_INTEL_PSTATE ~INTEL_POWERCLAMP ~INT340X_THERMAL ~ACPI_THERMAL_REL ~INT3406_THERMAL"
 
-src_prepare() {
-	sed -i -e "/group=/s/power/wheel/g" \
-		data/org.freedesktop.thermald.conf || die
+PATCHES=( "${FILESDIR}/${P}-ioctl.patch" )
 
+src_prepare() {
 	sed -i -e '/tdrundir/s@\$localstatedir/run@\$runstatedir@' \
 		configure.ac || die
 
@@ -45,6 +44,7 @@ my_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		--disable-werror \
 		--runstatedir="${EPREFIX}"/run \
+		--with-dbus-power-group=wheel \
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 }
 
diff --git a/sys-power/thermald/thermald-2.5.4.ebuild b/sys-power/thermald/thermald-2.5.4.ebuild
index 2daa0c75f6aa..7a575095e70e 100644
--- a/sys-power/thermald/thermald-2.5.4.ebuild
+++ b/sys-power/thermald/thermald-2.5.4.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="