gentoo resync : 02.09.2020

3 files changed, 5 insertions, 50 deletions

diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 504f6be20df3..7f0147bfb185 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -1,8 +1,6 @@
 AUX thermald 374 BLAKE2B 2ea9775b75acb7797c078c8c7786d442bd9c98102cd53073e1c040a0972dfd6be8424a62889a666573ee72ce5273bc53169fae5762bc0005a1c899324a699d27 SHA512 17f1c2133e47e897c4a5407ef622adfebb8498fce7ea9bf17cfd177269a3d869bdc21c3d2558010e9669ddc53e69e521bb4c1e112c51010168aa3c074c259e02
-DIST thermald-1.9.1.tar.gz 429116 BLAKE2B 7b6105b25e89e68f82368e154b4ca2a826192d596c7427ebea3c6aa726c28b5409cf7e0f022132e2ee47423cc732a6d37b2eb05236c579e2c725820516f6993f SHA512 7c16871316fb264abad9d0182cf8b6b5c1b4c747093672e74b7db2b6aa4f322fafdf6a94bfc8a11f427f7be2ee5e5691dc6a25bb5357ce45e7afe868f89b89e1
-DIST thermald-2.1.tar.gz 435310 BLAKE2B 7a5b67c2f8cb56276427188a91cc0d0c5cc7975ea847abe6eddc41b5dba77f908bc1ab97234568c65b2bcbb3bfff7881412cef2f8aa422139c64d5fb089a6511 SHA512 407d743d2799f84cd178e17ef694f0825f03db4ce80a47df95826bc26a9f142b80295905707fcba41bd5268d411a03478cd9d432545f9e2f1394d7d61539e169
 DIST thermald-2.2.tar.gz 435659 BLAKE2B 500189b924594e5b1d68adc776b3ad0c1d531d4259c65dd77f9166648c9b4273c52e1f8222254ec6500b3d37e39deb4ec862443728d50e9be95dee8e43496645 SHA512 f2c691061436699aef5bb7d9681370306dc7a64c453208911077c9a4af50e35b32247fc0a35853bb314d0e4289dd07f6116a3ade7fa278b521ed9b7b13db949b
-EBUILD thermald-1.9.1.ebuild 922 BLAKE2B d5481f4bf46b429ce06e194fab8665d7edc46ec73c15ca16479b33455fc6d71f51c204e01cadbfe39dd970f386168c4ec33d1b8edbc8e74fbd31d5830e5f2c1d SHA512 3f4bef46cf1ec58ee2da8f243102ef7710efde6357d60e150d4ada0310111d49a7c176e844799b9763d33ef484dae84db60261fd9b269b09ae2f0caf21073450
-EBUILD thermald-2.1.ebuild 924 BLAKE2B 22a248bb8becef8fbb2dd4ebca3d20e879508bae70a3b2690b9e27f04451a9d0c44cca46d1e82f20560d5cdb9c81c5843433fefd7b8af3a39f64c272b22696dc SHA512 de36365498bf49ef44c2e5830e1def6bf4a9fdf8f8888d7b66b9890b433a2c981f40c63b51df77aff4fa248d0587b1f5785a1ec7298f940edc584e5bd3105c07
+DIST thermald-2.3.tar.gz 452790 BLAKE2B caef87d670b14bfa0dbe6ca4873ebea4b0a9960a9bad48ddb10abb348e25cafdbdf5dad831a1c3ad38e71ab61d7f123df99046dec1e5ce2c32be506bc4b1312f SHA512 0d722c35e3638bb917994b8a123e1226b737b120f0946cfc604eb3bb4bd501121b1f196833f8cb3aceee73a8bb3566ef1d176d81143b84423f89d20966e91ed8
 EBUILD thermald-2.2.ebuild 922 BLAKE2B d5481f4bf46b429ce06e194fab8665d7edc46ec73c15ca16479b33455fc6d71f51c204e01cadbfe39dd970f386168c4ec33d1b8edbc8e74fbd31d5830e5f2c1d SHA512 3f4bef46cf1ec58ee2da8f243102ef7710efde6357d60e150d4ada0310111d49a7c176e844799b9763d33ef484dae84db60261fd9b269b09ae2f0caf21073450
+EBUILD thermald-2.3-r1.ebuild 979 BLAKE2B ab4543dd9c2359ecff866931d7cbca0534a326845060e8015e3f23488eef173a8357f4be131caacc9d8696595859c06fa05c7edcb4025f7a3bfb8fe3cafd9e57 SHA512 3651d62fbd995b6caecb0d92ede8e805ba9a5968ee0de80b6e743b5828525d95a3470d37267c91333dcf19b9b1773ce2b79a16f9a80c8b2526f5231c0bd9953b
 MISC metadata.xml 643 BLAKE2B 92fe71631920f61dd6667c2dc8b4e27d2ea1e9bfb64509a9b4a9b0a72e9b4a11b7ae06febf120564c28272b9e079cf71a114bca620ce2651ec615439dd5ff9b3 SHA512 bad363023e01da0232632d54b2cb65dce89a7c70441f05fc873640a29f6fd4ec4ea30b00f94f723a786de1eef87b94673dad455102bc57a11573346e3a8ae2e8
diff --git a/sys-power/thermald/thermald-1.9.1.ebuild b/sys-power/thermald/thermald-1.9.1.ebuild
deleted file mode 100644
index fefc84b2d488..000000000000
--- a/sys-power/thermald/thermald-1.9.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic out-of-source systemd
-
-DESCRIPTION="Thermal daemon for Intel architectures"
-HOMEPAGE="https://01.org/linux-thermal-daemon"
-SRC_URI="https://github.com/01org/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:=
-	sys-apps/dbus:="
-DEPEND="${RDEPEND}
-	dev-util/glib-utils"
-
-S=${WORKDIR}/thermal_daemon-${PV}
-DOCS=( thermal_daemon_usage.txt README.txt )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-my_src_configure() {
-	# bug 618948
-	append-cxxflags -std=c++14
-
-	ECONF_SOURCE="${S}" econf \
-		--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.1.ebuild b/sys-power/thermald/thermald-2.3-r1.ebuild
index b551961e47bf..0e305e3aa636 100644
--- a/sys-power/thermald/thermald-2.1.ebuild
+++ b/sys-power/thermald/thermald-2.3-r1.ebuild
@@ -18,8 +18,11 @@ 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}