gentoo resync : 03.11.2019

7 files changed, 54 insertions, 8 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index e70ec90bf38a..c5c9d8c96374 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 964d87622e36..7047df5385d4 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -1,7 +1,8 @@
 AUX thermald 374 BLAKE2B 2ea9775b75acb7797c078c8c7786d442bd9c98102cd53073e1c040a0972dfd6be8424a62889a666573ee72ce5273bc53169fae5762bc0005a1c899324a699d27 SHA512 17f1c2133e47e897c4a5407ef622adfebb8498fce7ea9bf17cfd177269a3d869bdc21c3d2558010e9669ddc53e69e521bb4c1e112c51010168aa3c074c259e02
 AUX thermald-1.8-x86-fix.patch 1314 BLAKE2B c563b2a23d1f96ae508c55bc17e3c8c0289221aba0c640aa87734630f2fb44d65d0e1b6b087207cfafc45bec25e235f4f95662ca951f37df0724cece1b3276d3 SHA512 dfe3a14856f631c698baf6eb7894b07ebaff38886eb94aaadc0258b4a2f69e7034dbce4c4802ed0136d0967fd90cb6a1a4db473d1ed7fb373668dd2c93de8cd5
-DIST thermald-1.7.1.tar.gz 420725 BLAKE2B 99e176e978e56d453fe5ff409f048122d18b9c554ed3128dac1c704a61ab483ab3ca21c2c360d1dc763de9770f877948d62d8c2216072d23fa1b828913a8e766 SHA512 a78f8aa9ef0f3e3b57fc1ebbd7ad7e67985676ad7adf5b6a6d23e4aed4e2ccb8273fb67ccd9a2133f91f7f6b19f793c9ba68e41208aabde4248ca666061fe5e0
+AUX thermald-1.9-size_t-format.patch 2375 BLAKE2B 1f795d846a6012f69bb5c5e27a2b503a206a85565ef18c5d13b01bc6f12c80b81e565d78cc1d6cd5d494d639fbba712ccfbdca8b893ef4e2d6a5ac274a9bd908 SHA512 dc470f499bac68e8154f90d233321b0ca2932a814e2e59fd5ab1bb9a1163fc25e9be26557bef987676591f05effa99ad5b4e00139b9492c6b354345c0cc478b3
 DIST thermald-1.8.tar.gz 422982 BLAKE2B 6970190182a6ebcd6b39fcd34d75221173e1bbbf32cb7c0009001cd2934cf18bbc524ec43d1e99dbf7a1a0bda53b0b2239c9e25e08c4cb9435bceb0a512c5e3b SHA512 2360cfad311a804d7609b9879c5a0db749e1813085093e535eaa948b6fa289c385b8e6762ab15270e2e19170a4f48e0b0d736ffff029651289ec23c8dfc61743
-EBUILD thermald-1.7.1.ebuild 926 BLAKE2B f762bc030610b646ef784b0f51b5d80648fe1c70e362fffc2fd7254fbecf8fbecb848fd3309cda10d836471fcff4a24d5f907624b5b3a07f9899c565d4095bbb SHA512 37de5bf2a66a67a126a94d566d000854d2ce2977c6cf1a398ef4cd44dce932f0bca682d0424edca16cd1aeff4d8beb91bf5a72ec32311559c6320b646f0891ea
+DIST thermald-1.9.tar.gz 427380 BLAKE2B 1954531838c0fc3677ab8f91476d5670a6b5d067d580c7c570b37e5d8d8ac408cacb218531bc8363cfd56eee9331291959ff11851550c6c782a43b19bacca01a SHA512 71fa6e9fc2f55623ed0acdb65f9699d5ea2c89c4092546a73d53ac3ea3ca0a5c60f3360c8bef0af9daeeecfe9a20411d9e4d25bc1d89349cfe83ebb03ba387a8
 EBUILD thermald-1.8-r1.ebuild 969 BLAKE2B 79aa181356e669bac648ea93f540effaa6db2cc52a44e6d4d0a7b321c0b1428f7df7b2ada6a1e6465a4f938ef363f4500746d32e541029971698f1767f9ea055 SHA512 4ed59800c405feaf3b0ae2b16eb81615e91b09042f02bf414af66022031c1064c7a2c21d80d22a9db3afcae66c7d89b551008b4c32bc2c32b102ebcafc3bc463
+EBUILD thermald-1.9.ebuild 973 BLAKE2B 6dd5e2879c84274bcf3ac8a25222769617b58b86bef8768cb813d380e2def1254d12926fca57566a573924e9a952fac2cc0346921df27702eeb29533eacf48f9 SHA512 fbdd64d672613eb6ecc5dcd342db1f71820f20b5c486ebc259db804e80c2c1169d733138ed80fa376f6a7fa4506b304a846b11954b96f9c4e765d920f3302045
 MISC metadata.xml 643 BLAKE2B 92fe71631920f61dd6667c2dc8b4e27d2ea1e9bfb64509a9b4a9b0a72e9b4a11b7ae06febf120564c28272b9e079cf71a114bca620ce2651ec615439dd5ff9b3 SHA512 bad363023e01da0232632d54b2cb65dce89a7c70441f05fc873640a29f6fd4ec4ea30b00f94f723a786de1eef87b94673dad455102bc57a11573346e3a8ae2e8
diff --git a/sys-power/thermald/files/thermald-1.9-size_t-format.patch b/sys-power/thermald/files/thermald-1.9-size_t-format.patch
new file mode 100644
index 000000000000..324b3b97f79a
--- /dev/null
+++ b/sys-power/thermald/files/thermald-1.9-size_t-format.patch
@@ -0,0 +1,44 @@
+From dcdaf523393a6e7c07b5a510c573223722b0289b Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Thu, 1 Aug 2019 08:15:52 +0800
+Subject: [PATCH] Use correct format specifier for size_t
+
+%zu instead of %lu, otherwise on 32 bit:
+
+| In file included from ../git/src/thd_common.h:27,
+|                  from ../git/src/thd_zone.h:30,
+|                  from ../git/src/thd_zone.cpp:34:
+| ../git/src/thd_zone.cpp: In member function 'void cthd_zone::update_highest_trip_temp(cthd_trip_point&)':
+| ../git/src/thd_zone.cpp:322:16: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'std::vector<cthd_trip_point>::size_type' {aka 'unsigned int'} [-Werror=format=]
+|   322 |   thd_log_info("trip_points.size():%lu\n", trip_points.size());
+|       |                ^~~~~~~~~~~~~~~~~~~~~~~~~~  ~~~~~~~~~~~~~~~~~~
+|       |                                                            |
+|       |                                                            std::vector<cthd_trip_point>::size_type {aka unsigned int}
+| ../git/src/thermald.h:82:57: note: in definition of macro 'thd_log_info'
+|    82 | #define thd_log_info(...) g_log(NULL, G_LOG_LEVEL_INFO, __VA_ARGS__)
+|       |                                                         ^~~~~~~~~~~
+| ../git/src/thd_zone.cpp:322:38: note: format string is defined here
+|   322 |   thd_log_info("trip_points.size():%lu\n", trip_points.size());
+|       |                                    ~~^
+|       |                                      |
+|       |                                      long unsigned int
+|       |                                    %u
+
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ src/thd_zone.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/thd_zone.cpp b/src/thd_zone.cpp
+index dd485d9..eb81d61 100644
+--- a/src/thd_zone.cpp
++++ b/src/thd_zone.cpp
+@@ -319,7 +319,7 @@ void cthd_zone::add_trip(cthd_trip_point &trip) {
+ void cthd_zone::update_highest_trip_temp(cthd_trip_point &trip)
+ {
+ 	if (trip_points.size()) {
+-		thd_log_info("trip_points.size():%lu\n", trip_points.size());
++		thd_log_info("trip_points.size():%zu\n", trip_points.size());
+ 		for (unsigned int j = trip_points.size() - 1;; --j) {
+ 			if (trip_points[j].get_trip_type() == trip.get_trip_type()) {
+ 				thd_log_info("updating existing trip temp \n");
diff --git a/sys-power/thermald/thermald-1.7.1.ebuild b/sys-power/thermald/thermald-1.9.ebuild
index 525bb27d6f06..9eb5e8b92494 100644
--- a/sys-power/thermald/thermald-1.7.1.ebuild
+++ b/sys-power/thermald/thermald-1.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools flag-o-matic out-of-source systemd
 
@@ -26,6 +26,7 @@ S=${WORKDIR}/thermal_daemon-${PV}
 DOCS=( thermal_daemon_usage.txt README.txt )
 
 src_prepare() {
+	eapply "${FILESDIR}/${P}-size_t-format.patch"
 	default
 	eautoreconf
 }
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index b4eddd3c3cc8..907f7e4e55b3 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -2,6 +2,6 @@ AUX upower-0.99.9-pending-charge1.patch 1351 BLAKE2B 719581956d7bed9efb148bb84a8
 AUX upower-0.99.9-pending-charge2.patch 2016 BLAKE2B 87a3078acf6c95dd8237f894aa25dbf803d42f766682e3e53f5ec30fcd7725178ebab94111945fbf0b4d0e16b656e8723240b14358d1c6e5285086b30da541d2 SHA512 15aa04bcd892feec125508d6a9edb8df98cd5317fce27d9c8907994f1d735be32934c5010566f0a38221ef20b48d8faf73841df6e35447ef0efccdaab371fb0b
 DIST upower-0.99.11.tar.xz 430128 BLAKE2B 77604d02a69de98e4c7b268d11d189aa42ace2d62b982fda9bc41131ce383ede32953ada31eae0bbfd1121600af5863924d48c636e60a28f505a6998dcac227c SHA512 67219a0beb98c97ac4512e4fe8ba83fc80a1035d1edb5367dda6911da50c672b047051f2f528e8703be29ab47547d92b6c71a7ef695226a1bdb5bc33e6d18803
 DIST upower-0.99.9.tar.xz 448408 BLAKE2B 5fa2436f33c94cffb736d8e3fad433acf58954cf06ccd403a0361214be5afc45d79ea279f3c5c48dcd58b92ccaf995777c95987d1749fd8c8c8958317e439570 SHA512 45eb587b0e5ffcce88bad8c56bc5efa30559748913016a55d58313280f5159378e5fbb4a9842c3a6409257bb97822d235f96b03704268b8471455c93eb05fe2f
-EBUILD upower-0.99.11.ebuild 2127 BLAKE2B 7be67f38e0de5cf7da2e3747583bcf4ebcaccf4311a05305d015e53d82156b37958190964beffa4e318076ab7c8045adc4e168a9ca80ee547d4f117c26eba546 SHA512 b10fe52bc8ea5ddfc7070c2644e77dcec9af7bf827461847de7e10cd3e115d3774759e22f5f44f3a2dcc9e95b7ecfebbf1b7792513924ef490b5200338173b84
-EBUILD upower-0.99.9-r1.ebuild 2341 BLAKE2B 634c9e8e4a2bf1c67277fc8e76f054df17c166d962d5c6650e0c20f2aae84d365a6c9555111e28ee6621acba52ed9ede86f60b8cc0fbe5ea9b6d8fe58ac41508 SHA512 4a8ea435c8117bc2baee03b6d8cf0d4627313bee62d2fdf79b87ee7db56a998637a3fc8f2ce4e703a160da46bb8b756c6d73a398f629c3858ccdc706fdd4ff59
+EBUILD upower-0.99.11.ebuild 2128 BLAKE2B 6b3dc32b67d954f9bf413ab30c41db426c6756fbe906dbec3a3d3dac38a9977076d859167638382b7c1f52ccff67b7b4ac48881b0cded81337d8266aefef7511 SHA512 a79ba936bbbdc7c507f4cb3616af4b2390769cc9dabc9194c2ed159283fc09349bbc53c0e91392814780aba9491a365398127da6d1432b87127ed9a7138f22c4
+EBUILD upower-0.99.9-r1.ebuild 2342 BLAKE2B 9e72cb89fa6aa6286ca45696bc6d9ad43eafe0a0584e72098d172cfd126f08839efb7034207114641525cb0252a5f5e39678164e19c3ce810b899435f91735e6 SHA512 35090dc5a2efd56b18f7da3eafb228e73ca5f171474314d5308c4e2a94badcb257ab837f6ed4cf8f7010c4d96c419b55f2fee85ab64350032bd26f9519159eef
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/sys-power/upower/upower-0.99.11.ebuild b/sys-power/upower/upower-0.99.11.ebuild
index a6aeeafc5c55..0988b00821db 100644
--- a/sys-power/upower/upower-0.99.11.ebuild
+++ b/sys-power/upower/upower-0.99.11.ebuild
@@ -24,8 +24,8 @@ COMMON_DEPS="
 	sys-apps/dbus:=
 	introspection? ( dev-libs/gobject-introspection:= )
 	kernel_linux? (
+		dev-libs/libgudev:=
 		virtual/libusb:1
-		virtual/libgudev:=
 		virtual/udev
 		ios? (
 			>=app-pda/libimobiledevice-1:=
diff --git a/sys-power/upower/upower-0.99.9-r1.ebuild b/sys-power/upower/upower-0.99.9-r1.ebuild
index c313d30cee94..4528da1b54a5 100644
--- a/sys-power/upower/upower-0.99.9-r1.ebuild
+++ b/sys-power/upower/upower-0.99.9-r1.ebuild
@@ -25,8 +25,8 @@ COMMON_DEPS="
 	sys-apps/dbus:=
 	introspection? ( dev-libs/gobject-introspection:= )
 	kernel_linux? (
+		dev-libs/libgudev:=
 		virtual/libusb:1
-		virtual/libgudev:=
 		virtual/udev
 		ios? (
 			>=app-pda/libimobiledevice-1:=