gentoo resync : 24.02.2018

7 files changed, 47 insertions, 238 deletions

diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index e3847f4ef29f..741739375036 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -1,11 +1,4 @@
 AUX thermald 374 BLAKE2B 2ea9775b75acb7797c078c8c7786d442bd9c98102cd53073e1c040a0972dfd6be8424a62889a666573ee72ce5273bc53169fae5762bc0005a1c899324a699d27 SHA512 17f1c2133e47e897c4a5407ef622adfebb8498fce7ea9bf17cfd177269a3d869bdc21c3d2558010e9669ddc53e69e521bb4c1e112c51010168aa3c074c259e02
-AUX thermald-1.4.2-terminate-r1.patch 1970 BLAKE2B 12a73a3bb32c14f2f3dff3aa4f3e241cd81a5d2905dee54abb9a759ae16738525ad21417cb7b40f369e0aa6e1a942ae7bc124d3e636c65a9c1e595fdf35652ae SHA512 74e28bccacdf8b33b48991042a559858390bd551620700222655d33f682afec8445889733c1efda884377cc6d56d75f12d04010a33abecec088c57eb0111f77e
-DIST thermald-1.4.2.tar.gz 89080 BLAKE2B 7dd2b734c46e006570ce8cd3ac11d922bcba6dc40c50bc6b2f19ff21e709f686138433f7e17487af405830f0a72dc86d275f3699d97db8677c8c2b75509b7fae SHA512 373620679df7db242770ae2b5c6e2b9015cfb480539889c43b8f20f52faa139ea307985c8f7369daf14c41d987f7c5af4baecc9dd460ef63556ac982eb4bcd47
-DIST thermald-1.5.3.tar.gz 335067 BLAKE2B 209ef4e798ace8521f9164cf796cdf94efdd3c47ed71c18d52728070686ae10ad4d3c10d6c0a7bd727bfc6d834214d6876dcc406ce0877a903bbc175b40beec3 SHA512 aab4ade4dc50985cd5d45bcce6ea9b75cce22504eb113c86b8733c8be88a701c8812b8b0f3202f084a8128d50ec794ebe1c73312c0a5a5fd1dbc87eedf02df16
-DIST thermald-1.5.4.tar.gz 336768 BLAKE2B c56f091bf0034f794ad3aad16d5f9ed0480822d4505efbaed65c413621f3f5da74032da25cfbd9ea6fbb46656e1a9f1626ddab288486e104f013791e4c462ccc SHA512 c23b4aabc59f11fe93074459d8343f587275771268d9c71c871da6bb46d8533a46ab9ac0b495c22771d9064288872abfd3180e3bc92dbe5842cff53046e543d6
-DIST thermald-1.6.tar.gz 331682 BLAKE2B 2e8f18134f49cee618323438478b43b36454ebdeb9f50e972f3b4eefb4c01e40e01384e54c5c15d84e4d2ba9b7fd11f67fbe7b0839df2f2fc31bc42b200e1b85 SHA512 ddcd01dcd2f6b5666ffa16ba635734e4c146244b5df7c3f0deb8120f8ee7ebf1f4ee302d49db2b7e9a4950045650922977bd40bf6b38ccea9896f81e06df1d49
-EBUILD thermald-1.4.2-r1.ebuild 920 BLAKE2B d7f6e2d00fe00027da386c14bc96b96c10a22f16ed3b26ce0e65f7948fc3ad2e93e68f20866b30c94d8a63a68b4a985464da836dad294741a91687d4578927f5 SHA512 df876af934eaa953c597d720c7c7552cd7d171b6ee9f519405636b104550bc35d4028e5ecead51bdd16afc90cd0bcdfa0c6c8a003d3a54701c950bc8f2ab5bd1
-EBUILD thermald-1.5.3.ebuild 868 BLAKE2B 1864bc40dfc83393571451f0c434685998583038775b739b4adaccee6cda8a89d1b25edc87833d22c9d655fb2a2a06f82edc05b77cc24ab0905074dbd621c041 SHA512 80bb3add8d1323d29a9028df94f47790c54fd9f786d3ca8e3c41b802e5b5d514538afea2960e731dc1ff3184e3e2dd4e5aa474a475e5b8b983e813236ee63047
-EBUILD thermald-1.5.4.ebuild 868 BLAKE2B ad7f9d172575473d1d496e23c207155f2713742668277c0361b6194de26ea34dcbbe01132fcdd9feb72d48dfd42607fcd953f2f5be54f9c7be3f80dca5bd3717 SHA512 7d331bf20f8fa2f808045118d79a5cfded63292eee463dbb98a9f37de287405208661d90426166cab44df10d39ab9aee4865209834a8a8eb3860f0886a7b19d9
-EBUILD thermald-1.6.ebuild 868 BLAKE2B ad7f9d172575473d1d496e23c207155f2713742668277c0361b6194de26ea34dcbbe01132fcdd9feb72d48dfd42607fcd953f2f5be54f9c7be3f80dca5bd3717 SHA512 7d331bf20f8fa2f808045118d79a5cfded63292eee463dbb98a9f37de287405208661d90426166cab44df10d39ab9aee4865209834a8a8eb3860f0886a7b19d9
+DIST thermald-1.7.1.tar.gz 420725 BLAKE2B 99e176e978e56d453fe5ff409f048122d18b9c554ed3128dac1c704a61ab483ab3ca21c2c360d1dc763de9770f877948d62d8c2216072d23fa1b828913a8e766 SHA512 a78f8aa9ef0f3e3b57fc1ebbd7ad7e67985676ad7adf5b6a6d23e4aed4e2ccb8273fb67ccd9a2133f91f7f6b19f793c9ba68e41208aabde4248ca666061fe5e0
+EBUILD thermald-1.7.1.ebuild 908 BLAKE2B a0782e36588e8e6738763c57f9b66ada8850e54e21e3b5d2639a659e278898c6954f42deb3e4aa27773017fe33791873b5d43631e55940e9602327add7b69c97 SHA512 73710812af363409df87f09b87336d06c9b37666134a8f8329bf7a02ce8371aaa9f2e66573092625445bda9e26a85fa391bedb4dccc446eb1f2e71bf809f62dd
 MISC metadata.xml 643 BLAKE2B 92fe71631920f61dd6667c2dc8b4e27d2ea1e9bfb64509a9b4a9b0a72e9b4a11b7ae06febf120564c28272b9e079cf71a114bca620ce2651ec615439dd5ff9b3 SHA512 bad363023e01da0232632d54b2cb65dce89a7c70441f05fc873640a29f6fd4ec4ea30b00f94f723a786de1eef87b94673dad455102bc57a11573346e3a8ae2e8
diff --git a/sys-power/thermald/files/thermald-1.4.2-terminate-r1.patch b/sys-power/thermald/files/thermald-1.4.2-terminate-r1.patch
deleted file mode 100644
index 96ba91ffe5ec..000000000000
--- a/sys-power/thermald/files/thermald-1.4.2-terminate-r1.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit 14bf458675a735975c6b9bf7394682e93398a8e0
-Author: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
-Date:   Tue Jul 14 17:46:45 2015 -0700
-
-    Fix regression in exit via dbus message
-    
-    Terminate via dbus terminate message is broken. Fixed this.
-    Thanks to Yixun Lan <yixun.lan@gmail.com> for finding this.
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 2cf4864..d692cf3 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -50,7 +50,7 @@
- #define TD_DIST_VERSION PACKAGE_VERSION
- #endif
- 
--extern int thd_dbus_server_init();
-+extern int thd_dbus_server_init(void (*exit_handler)(int));
- 
- // Default log level
- static int thd_log_level = G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL
-@@ -263,7 +263,7 @@ int main(int argc, char *argv[]) {
- 	}
- 
- 	if (dbus_enable)
--		thd_dbus_server_init();
-+		thd_dbus_server_init(sig_int_handler);
- 
- 	if (!no_daemon) {
- 		printf("Ready to serve requests: Daemonizing.. %d\n", thd_daemonize);
-diff --git a/src/thd_dbus_interface.cpp b/src/thd_dbus_interface.cpp
-index 021bce2..7926101 100644
---- a/src/thd_dbus_interface.cpp
-+++ b/src/thd_dbus_interface.cpp
-@@ -187,8 +187,12 @@ gboolean thd_dbus_interface_get_current_preference(PrefObject *obj,
- 	return TRUE;
- }
- 
-+void (*thd_dbus_exit_callback)(int);
- gboolean thd_dbus_interface_terminate(PrefObject *obj, GError **error) {
- 	thd_engine->thd_engine_terminate();
-+	if (thd_dbus_exit_callback)
-+		thd_dbus_exit_callback(0);
-+
- 	return TRUE;
- }
- 
-@@ -561,13 +565,15 @@ gboolean thd_dbus_interface_get_sensor_temperature(PrefObject *obj, int index,
- }
- 
- // Setup dbus server
--int thd_dbus_server_init() {
-+int thd_dbus_server_init(void (*exit_handler)(int)) {
- 	DBusGConnection *bus;
- 	DBusGProxy *bus_proxy;
- 	GError *error = NULL;
- 	guint result;
- 	PrefObject *value_obj;
- 
-+	thd_dbus_exit_callback = exit_handler;
-+
- 	bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
- 	if (error != NULL) {
- 		thd_log_error("Couldn't connect to session bus: %s:\n", error->message);
diff --git a/sys-power/thermald/thermald-1.4.2-r1.ebuild b/sys-power/thermald/thermald-1.4.2-r1.ebuild
deleted file mode 100644
index 29cd24743a93..000000000000
--- a/sys-power/thermald/thermald-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils 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=""
-S=${WORKDIR}/thermal_daemon-${PV}
-
-CDEPEND="dev-libs/dbus-glib
-	dev-libs/libxml2"
-DEPEND="${CDEPEND}
-	sys-apps/sed"
-RDEPEND="${CDEPEND}"
-
-DOCS=( thermal_daemon_usage.txt README.txt )
-
-PATCHES=(
-	"${FILESDIR}/${P}-terminate-r1.patch"
-)
-
-src_configure() {
-	local myeconfargs=(
-	--with-systemdsystemunitdir=$(systemd_get_unitdir)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	rm -rf "${D}"/etc/init || die
-	doinitd "${FILESDIR}"/thermald
-}
diff --git a/sys-power/thermald/thermald-1.5.3.ebuild b/sys-power/thermald/thermald-1.5.3.ebuild
deleted file mode 100644
index d1751b531f21..000000000000
--- a/sys-power/thermald/thermald-1.5.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils 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=""
-S=${WORKDIR}/thermal_daemon-${PV}
-
-CDEPEND="dev-libs/dbus-glib
-	dev-libs/libxml2"
-DEPEND="${CDEPEND}
-	sys-apps/sed"
-RDEPEND="${CDEPEND}"
-
-DOCS=( thermal_daemon_usage.txt README.txt )
-
-src_configure() {
-	local myeconfargs=(
-	--with-systemdsystemunitdir=$(systemd_get_unitdir)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	rm -rf "${D}"/etc/init || die
-	doinitd "${FILESDIR}"/thermald
-}
diff --git a/sys-power/thermald/thermald-1.5.4.ebuild b/sys-power/thermald/thermald-1.5.4.ebuild
deleted file mode 100644
index 615c338aa4ac..000000000000
--- a/sys-power/thermald/thermald-1.5.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils 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=""
-S=${WORKDIR}/thermal_daemon-${PV}
-
-CDEPEND="dev-libs/dbus-glib
-	dev-libs/libxml2"
-DEPEND="${CDEPEND}
-	sys-apps/sed"
-RDEPEND="${CDEPEND}"
-
-DOCS=( thermal_daemon_usage.txt README.txt )
-
-src_configure() {
-	local myeconfargs=(
-	--with-systemdsystemunitdir=$(systemd_get_unitdir)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	rm -rf "${D}"/etc/init || die
-	doinitd "${FILESDIR}"/thermald
-}
diff --git a/sys-power/thermald/thermald-1.6.ebuild b/sys-power/thermald/thermald-1.6.ebuild
deleted file mode 100644
index 615c338aa4ac..000000000000
--- a/sys-power/thermald/thermald-1.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils 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=""
-S=${WORKDIR}/thermal_daemon-${PV}
-
-CDEPEND="dev-libs/dbus-glib
-	dev-libs/libxml2"
-DEPEND="${CDEPEND}
-	sys-apps/sed"
-RDEPEND="${CDEPEND}"
-
-DOCS=( thermal_daemon_usage.txt README.txt )
-
-src_configure() {
-	local myeconfargs=(
-	--with-systemdsystemunitdir=$(systemd_get_unitdir)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	rm -rf "${D}"/etc/init || die
-	doinitd "${FILESDIR}"/thermald
-}
diff --git a/sys-power/thermald/thermald-1.7.1.ebuild b/sys-power/thermald/thermald-1.7.1.ebuild
new file mode 100644
index 000000000000..d3ca3808cb98
--- /dev/null
+++ b/sys-power/thermald/thermald-1.7.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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}"
+
+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
+}