gentoo resync : 30.05.2020

8 files changed, 53 insertions, 40 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index f962138b7720..3ca1ead1f468 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 25a47407e523..4f04225a65b3 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -2,6 +2,6 @@ AUX powertop-2.8-ncurses_tinfo.patch 1385 BLAKE2B 1b11138ae9c8fc90236b421d733f8c
 DIST powertop-2.11.tar.gz 307755 BLAKE2B 01723262922df5cc2ec63f6972b2a301f7efc4c701dfa3c08280dcdaa4b79f2d04503592f8c17e43d77df89e7f08695b0381f498671969fe4aa388578f732978 SHA512 bbe2882196f1b3ae39885d38dd86018576bfac5b5e8f16ea10c7dfd197197d0493ae4ce83c969417a4c4239c41dbcfada989063f14e2943c088a7489e43953b7
 DIST powertop-v2.10.tar.gz 722992 BLAKE2B 573f1f0ed40705d3463f6e6f76c67ae99127ab2541b851143dafa707ef1c2dab4127d27811b63ad27e6b002ea4efd39417297a0227996ad9b01141b6de733d41 SHA512 4219e7aadbeebdf6932c04f784434e4dd0f540bf4941d43c1830b1b5cad1f3928769b13897e24dd956b6bdee65fb1fbe902ee30685bca229b71e140d65367837
 EBUILD powertop-2.10.ebuild 3843 BLAKE2B f0d637015c7ed1dbf8f69c619630dcf7ea3a0a6fe1a9698da2dda5274a28d054c88ac884b8a7c6ca312c1bca4a582da6e008476a548592fdf60ad357083b85b0 SHA512 c9f56ee6c4d33ad52d4774ffc96b791f7c82c677aa5e439a84c9ee7d4e7c6205163b7ede16c3e30cf10bbee3835fd16d6cbd7aa5c955c8a303f5830842c2d494
-EBUILD powertop-2.11.ebuild 3770 BLAKE2B f2d2a23f341a7066ce587ad00dd4013ac1490a519bc6a23dcca32242e6c73b9a39c9a0f18ad50a98c7060e90c7324550b2cdbcf05a5f5bbe20884dc5534d6043 SHA512 c968286837c5c3b1881396991837eebe1ea424531153c2822250e73c418b31c42752633f284cbd256c35c5ac9211fcf4e8155a16914fe4f9cd0ee63be48cf75e
-EBUILD powertop-9999.ebuild 3712 BLAKE2B beb3e79720b7049713a52dcd40ae5282799155669183448c66a6d7944d3dec7328d1bb1eea5ca09bc60a0df571ac1defd907a5d912b0aa7fe7f9e34de28d1b57 SHA512 a3b8b274c51bde944c490242edfdc84dcb34b388474c17456cdc653cb6cca0695253c54585e8e7380f5ae7b718081398a3a21ef5d681a33e557c892bd6b12183
+EBUILD powertop-2.11.ebuild 3690 BLAKE2B 145b1787828fc13066f4e076e311b39e5ac22ea990591fe5817b6410d6b16e5c686b9d2c1fe839e9e20653dc920eaaadfc98529d40f523f38f1a9c6ca00ffe7b SHA512 e13aa9b1cef15c80f5f69a9c51bcb286a2211c4c5161b281cb4e879fc970bb7e607a829c987093c1f8b9087f6dbaa2a7649eb905496875220f99e19bf5f03786
+EBUILD powertop-9999.ebuild 3565 BLAKE2B 4c0ac9b2d9589ad9d6b304b7c92f10657a4698479d0750eaafee8470ac93b78d3754c408a5f9f5dc597921b5548525b8512716996b5f5581fb10c46133553f44 SHA512 2c608a6af5abd67d3042388ffb3a4ddbc26e4d5670e0f6aa9fa441e5db69a3d200fe7c9e2db62abe45a81463ad2b5168dceca4ae50fc4a5042ba72d4b0f2ba83
 MISC metadata.xml 328 BLAKE2B b0558a511f51fb77479976e60fde11b9cc46f85af935d78d060a53a1d5b1dc2611721e3c1451e3d23229cb8db0bd2bd9c6bb902c9b0fca8f57718f53f16032a8 SHA512 9d17013502d4a90d7c41493c2e69f7bc20bfd834f6f2caa5b105f9cc3045b87382393903c08a8e25bd75faaa9371e2d5c16d2521a90a89dd08697069ce8e8f5d
diff --git a/sys-power/powertop/powertop-2.11.ebuild b/sys-power/powertop/powertop-2.11.ebuild
index 200e2c08f9f3..e472b13d37e0 100644
--- a/sys-power/powertop/powertop-2.11.ebuild
+++ b/sys-power/powertop/powertop-2.11.ebuild
@@ -106,8 +106,8 @@ src_prepare() {
 	# Bug 599114
 	sed -i '1s|^|AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX_11])|' configure.ac || die
 
-	chmod +x scripts/version || die "Failed to make 'scripts/version' executable"
-	scripts/version || die "Failed to extract version information"
+	echo "\"${PV}\"" > version-short
+	echo "${PV}" > version-long
 
 	eautoreconf
 }
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index bf3642c77e9b..39fc48dc78de 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-9999.ebuild
@@ -100,10 +100,7 @@ src_prepare() {
 	default
 
 	# Bug 599114
-	sed -i '1s|^|AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX_11])|' configure.ac || die
-
-	chmod +x scripts/version || die "Failed to make 'scripts/version' executable"
-	scripts/version || die "Failed to extract version information"
+	sed -i '1s|^|AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])|' configure.ac || die
 
 	eautoreconf
 }
diff --git a/sys-power/sispmctl/Manifest b/sys-power/sispmctl/Manifest
index e34c2acab541..0470d85f903f 100644
--- a/sys-power/sispmctl/Manifest
+++ b/sys-power/sispmctl/Manifest
@@ -1,3 +1,5 @@
 DIST sispmctl-4.0.tar.gz 517985 BLAKE2B 61e709031f6c5bec5ef011cb33b03661f004cce2ec57986f887daf346dda4cd86e280a7350e118baf2a7b6b2f0ecf22aebd9b28661828b9edfb7b8ddea3f88b5 SHA512 0fc643b627ccfa10f085b37702933fe9b7c2ef448bcbb32c22cacda57f7f710437c413bd02f510a3acb085f99a513a891e815981ee4ffbe7fed691492a335e96
+DIST sispmctl-4.1.tar.gz 429477 BLAKE2B fe9231a5a0b22456d81166ae5dbaf98c86a636e79ff09112438c769daa503996128d31609bd90f66a5414459c9fce66956b1ee001ac3d57f8f472a09b34aee20 SHA512 52cf6e7d4df76c1d28d196a81a06dec59047f2d43571bc72ff08a22359c3e5d7a36fd446118036fe35f9c26e59a07563ac15d9e05285e7b09214b68aab5ef488
 EBUILD sispmctl-4.0.ebuild 1337 BLAKE2B 2522869dfdf18e0e993cfc82b60ecc229f6af5df6aa1a69f4ff0da6913db1a74674c50093e89ff90ebcc222d145c7b7271ec37a4541eaead7db3d893e518d373 SHA512 076f5117a0063d6d8a982974587d88b9a905153886f31c92f97af206a10ee3e791372d80ccf3bb863684854bc6748f579df83846217c76f4db226dc5a6859e26
+EBUILD sispmctl-4.1.ebuild 891 BLAKE2B 29ee3415a8496859d83de418459a5e3ac7ccdb720e9e03436209a7c29e0634b37f0062ecfcca6439a2cb61f27581cd0300e178862729bfa63ca51cdb93423993 SHA512 d48afec4d96f3ad8ac092a86266d9a59c974155d12427ce4ac5bda069c019a7941f651e6f5900c32ec2de7819447ce5741a283b2da74def5251c9825832dac17
 MISC metadata.xml 591 BLAKE2B 6d867e4a7208facfc0a73d75b8fc95b3e6dff7ff27eca5cf1e22994326bbfd01f466b788af6fa9c72b76e4680d78112a70820c0a01058077ec54f5f760576128 SHA512 b641be73891a639ee1beafad81830815da70915ee39df2e96fcfd83dc5f8790c1208803eecacd76f8b2157265f894ca72ddb0f6b10351d2a2868a65d1c8a7634
diff --git a/sys-power/sispmctl/sispmctl-4.1.ebuild b/sys-power/sispmctl/sispmctl-4.1.ebuild
new file mode 100644
index 000000000000..693002dbfb70
--- /dev/null
+++ b/sys-power/sispmctl/sispmctl-4.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 systemd udev user
+
+DESCRIPTION="GEMBIRD SiS-PM control utility"
+HOMEPAGE="http://sispmctl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sispmctl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+	virtual/libusb:0
+"
+DEPEND="
+	${RDEPEND}
+"
+DOCS="AUTHORS README ChangeLog"
+
+pkg_setup() {
+	enewgroup ${PN}
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--enable-webless
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	## install udev rules which make the device files writable
+	## by the members of the group sispmctl
+	udev_dorules examples/60-sispmctl.rules
+
+	systemd_dounit examples/${PN}.service
+
+	einfo "Add users who may run ${PN} to the group '${PN}'"
+}
diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 365e142a194a..1c5a0c9b1f4c 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -1,5 +1,4 @@
 AUX thermald 374 BLAKE2B 2ea9775b75acb7797c078c8c7786d442bd9c98102cd53073e1c040a0972dfd6be8424a62889a666573ee72ce5273bc53169fae5762bc0005a1c899324a699d27 SHA512 17f1c2133e47e897c4a5407ef622adfebb8498fce7ea9bf17cfd177269a3d869bdc21c3d2558010e9669ddc53e69e521bb4c1e112c51010168aa3c074c259e02
-AUX thermald-1.8-x86-fix.patch 1314 BLAKE2B c563b2a23d1f96ae508c55bc17e3c8c0289221aba0c640aa87734630f2fb44d65d0e1b6b087207cfafc45bec25e235f4f95662ca951f37df0724cece1b3276d3 SHA512 dfe3a14856f631c698baf6eb7894b07ebaff38886eb94aaadc0258b4a2f69e7034dbce4c4802ed0136d0967fd90cb6a1a4db473d1ed7fb373668dd2c93de8cd5
 AUX thermald-1.9-size_t-format.patch 2375 BLAKE2B 1f795d846a6012f69bb5c5e27a2b503a206a85565ef18c5d13b01bc6f12c80b81e565d78cc1d6cd5d494d639fbba712ccfbdca8b893ef4e2d6a5ac274a9bd908 SHA512 dc470f499bac68e8154f90d233321b0ca2932a814e2e59fd5ab1bb9a1163fc25e9be26557bef987676591f05effa99ad5b4e00139b9492c6b354345c0cc478b3
 DIST thermald-1.9.1.tar.gz 429116 BLAKE2B 7b6105b25e89e68f82368e154b4ca2a826192d596c7427ebea3c6aa726c28b5409cf7e0f022132e2ee47423cc732a6d37b2eb05236c579e2c725820516f6993f SHA512 7c16871316fb264abad9d0182cf8b6b5c1b4c747093672e74b7db2b6aa4f322fafdf6a94bfc8a11f427f7be2ee5e5691dc6a25bb5357ce45e7afe868f89b89e1
 DIST thermald-1.9.tar.gz 427380 BLAKE2B 1954531838c0fc3677ab8f91476d5670a6b5d067d580c7c570b37e5d8d8ac408cacb218531bc8363cfd56eee9331291959ff11851550c6c782a43b19bacca01a SHA512 71fa6e9fc2f55623ed0acdb65f9699d5ea2c89c4092546a73d53ac3ea3ca0a5c60f3360c8bef0af9daeeecfe9a20411d9e4d25bc1d89349cfe83ebb03ba387a8
diff --git a/sys-power/thermald/files/thermald-1.8-x86-fix.patch b/sys-power/thermald/files/thermald-1.8-x86-fix.patch
deleted file mode 100644
index e944003b79b7..000000000000
--- a/sys-power/thermald/files/thermald-1.8-x86-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From bb7631163c8f3f44d0dc83690765cdb799664fd5 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Wed, 26 Sep 2018 10:34:15 +0800
-Subject: [PATCH] Use correct format specifier for size_t
-
-%zu instead of %lu, otherwise on 32 bit:
-
-| ../git/src/thd_zone.cpp: In member function 'void cthd_zone::sort_and_update_poll_trip()':
-| ../git/src/thd_zone.cpp:106: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=]
-|   thd_log_debug("sort_and_update_poll_trip: trip_points_size =%lu\n",
-|                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-|     trip_points.size());
-
-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 b7edf9e..cb7b8e8 100644
---- a/src/thd_zone.cpp
-+++ b/src/thd_zone.cpp
-@@ -103,7 +103,7 @@ int cthd_zone::read_user_set_psv_temp() {
- }
- 
- void cthd_zone::sort_and_update_poll_trip() {
--	thd_log_debug("sort_and_update_poll_trip: trip_points_size =%lu\n",
-+	thd_log_debug("sort_and_update_poll_trip: trip_points_size =%zu\n",
- 			trip_points.size());
- 	if (trip_points.size()) {
- 		unsigned int polling_trip = 0;