gentoo resync : 23.09.2020

7 files changed, 10 insertions, 52 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 2c07d54c2c2d..a000fb60a475 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/dptfxtract/Manifest b/sys-power/dptfxtract/Manifest
index e7e7ccd61ee6..24c74a1ca877 100644
--- a/sys-power/dptfxtract/Manifest
+++ b/sys-power/dptfxtract/Manifest
@@ -1,3 +1,3 @@
 DIST dptfxtract-1.4.3.tar.gz 1199293 BLAKE2B df06ad700193b43d78e70af9477bba20a39efcd387adea1f9ae1ceb79dbe784d84b8b18b7a203d96c42d73f6879de022be46001ddd6bd6930f7d629b3e18636d SHA512 3f14bbd5da06b130405bdf4694535e04a3e05352676f656419246965b0dbca333345035855565f5fec2cfd8c7b2e236ee20eb91e39bf876feb0eed07fc605cf5
-EBUILD dptfxtract-1.4.3.ebuild 476 BLAKE2B 85118a9d32da78c2bb7d5a35d36f4c86c16678a29e7c672f46ca35526fbf590a57c7fe99e4e4d5121dbf7d12af466d0afdb2259d241d4807f47439e19259fe45 SHA512 18dd9aacbfb8ccd71d863f9191df34cda84995e93e8e777ae90c468239b241fb21d51ed338379a36e1a633d2570b1929ea2de35c8acad3bbe031b0e2cb50485f
+EBUILD dptfxtract-1.4.3.ebuild 475 BLAKE2B d0bea92b07d99a33d78c66633d97ac75a0995977528e7b2ff3662f3a64d13438fe2c23e7bfc5748c9798d0ec9deb8e46a466ef1f4b3041d4189200eb9bc545a6 SHA512 49bc914419b3e553b287051f84f67873380e144a0a234a3b58fed863cbee29e9f13e5e68d385748597a5e650817ed52da0d3acdecd739d2a33b8c1a2f578a52d
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/sys-power/dptfxtract/dptfxtract-1.4.3.ebuild b/sys-power/dptfxtract/dptfxtract-1.4.3.ebuild
index 1d9109d51335..f14d8983d176 100644
--- a/sys-power/dptfxtract/dptfxtract-1.4.3.ebuild
+++ b/sys-power/dptfxtract/dptfxtract-1.4.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/intel/dptfxtract/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="ipw3945"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND=""
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index b573cf3d4625..f4982b1df8d3 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -1,4 +1,3 @@
-AUX NUT-Monitor-1.3-paths.patch 2833 BLAKE2B 63f1720f94c50a6b63b665a964821ad7452a26d76a454873312fb810d3bf23165ca8fec3d4e54d400a38071bf9cc3c15fdcbe4fd9f5b7f40f842c6f259a86a03 SHA512 c27b7199ec8e06746308620e0e6ddcc3edd4e3494560ca459bae9f2f4244702ef899cab9326a2042ba39556bd1dfcd307657b32b3c7959610a861a85737ffe81
 AUX lighttpd_nut.conf-2.2.0 852 BLAKE2B 782d4e411266612f1393af5ff05bca420ce7e99e6490138515567fb56c401b6f6e4e8b8a85071cb3f640a30f5cf4be0cff7a408ac2b5f9f505c7a2df1211eb83 SHA512 3bdb8cf6823d06ff84fd85f4484be4d842ce4a06722ebe22d7ddd6ea1b78ea08411a7f4a62a31df1b697f5e687f7ee88c8c4872e6a5a05390cef4a46798a7f35
 AUX nut-2.2.2-init.d-upsdrv 859 BLAKE2B 7911afe5ab45fa0123b43ac2fe186dbfa4eb9cb224fe5c6dc702d436d94de92492edc3ccce6a28273267c7b051e296c6ce42b9f420087e0e413921190611f07d SHA512 6ca718fcd0019420eabb4b69e3f24334872336be56c07b14c668813bf3d2b82f92903028d7d3142be743ed22d8dc94d7e471d9596710b9dbc1717e2576d3a8f3
 AUX nut-2.6.2-lowspeed-buffer-size.patch 553 BLAKE2B 2f758e7b807117e20b465951676ff524d1d2b52b5a69fcb09ad6811730c0038fff4b81cfcc1daaf6f0cfc6d5248be35c4be8b58f9193fe26028361c888ed1535 SHA512 59a953d3c89acccc3d5c028b36de15059f512d0a8074e7fed1d3831570bd09a544e44b5b754b4ad72f8163295db21160c142a83f4d608e40a401c9452823d7b7
diff --git a/sys-power/nut/files/NUT-Monitor-1.3-paths.patch b/sys-power/nut/files/NUT-Monitor-1.3-paths.patch
deleted file mode 100644
index 17bedaead727..000000000000
--- a/sys-power/nut/files/NUT-Monitor-1.3-paths.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/scripts/python/app/NUT-Monitor
-+++ b/scripts/python/app/NUT-Monitor
-@@ -70,7 +70,7 @@
-         ( cmd_opts, args ) = opt_parser.parse_args()
- 
- 
--        self.__glade_file = os.path.join( os.path.dirname( sys.argv[0] ), "gui-1.3.glade" )
-+        self.__glade_file = '/usr/share/nut/gui-1.3.glade'
- 
-         self.__widgets["interface"]                   = gtk.glade.XML( self.__glade_file, "window1", APP )
-         self.__widgets["main_window"]                 = self.__widgets["interface"].get_widget("window1")
-@@ -103,11 +103,11 @@
- 
-         # Create the tray icon and connect it to the show/hide method...
-         self.__widgets["status_icon"] = gtk.StatusIcon()
--        self.__widgets["status_icon"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "on_line.png" ) )
-+        self.__widgets["status_icon"].set_from_file( "/usr/share/nut/pixmaps/on_line.png" )
-         self.__widgets["status_icon"].set_visible( True )
-         self.__widgets["status_icon"].connect( "activate", self.tray_activated )
- 
--        self.__widgets["ups_status_image"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "on_line.png" ) )
-+        self.__widgets["ups_status_image"].set_from_file( "/usr/share/nut/pixmaps/on_line.png" )
- 
-         # Define interface callbacks actions
-         self.__callbacks = { "on_window1_destroy"              : self.quit,
-@@ -265,8 +265,8 @@
-     #-------------------------------------------------------------------
-     # Change the status icon and tray icon
-     def change_status_icon( self, icon="on_line", blink=False ) :
--        self.__widgets["status_icon"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "%s.png" % icon ) )
--        self.__widgets["ups_status_image"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "%s.png" % icon ) )
-+        self.__widgets["status_icon"].set_from_file( "/usr/share/nut/pixmaps/%s.png" % icon )
-+        self.__widgets["ups_status_image"].set_from_file( "/usr/share/nut/pixmaps/%s.png" % icon )
-         self.__widgets["status_icon"].set_blinking( blink )
- 
-     #-------------------------------------------------------------------
-@@ -719,9 +719,9 @@
- 
-             for k,v in vars.iteritems() :
-                 if ( rwvars.has_key( k ) ) :
--                    icon_file = os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "var-rw.png" )
-+                    icon_file = "/usr/share/nut/pixmaps/var-rw.png"
-                 else :
--                    icon_file = os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "var-ro.png" )
-+                    icon_file = "/usr/share/nut/pixmaps/var-ro.png"
- 
-                 icon = gtk.gdk.pixbuf_new_from_file( icon_file )
-                 self.__widgets["ups_vars_tree_store"].append( [ icon, k, v ] )
diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 7f0147bfb185..58f455afcb2e 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -2,5 +2,5 @@ AUX thermald 374 BLAKE2B 2ea9775b75acb7797c078c8c7786d442bd9c98102cd53073e1c040a
 DIST thermald-2.2.tar.gz 435659 BLAKE2B 500189b924594e5b1d68adc776b3ad0c1d531d4259c65dd77f9166648c9b4273c52e1f8222254ec6500b3d37e39deb4ec862443728d50e9be95dee8e43496645 SHA512 f2c691061436699aef5bb7d9681370306dc7a64c453208911077c9a4af50e35b32247fc0a35853bb314d0e4289dd07f6116a3ade7fa278b521ed9b7b13db949b
 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
+EBUILD thermald-2.3-r1.ebuild 1156 BLAKE2B 7a7669453125d73330878f1be279063a9efa85cb1c03e18035543281401dac84905ba341016bcecfb54c109cc9f6eb0f8f5b4916a6fadb9093a93735ec2ba04e SHA512 4fe7963b1ad576d146198f75a3c05b2fd991dd868083f80a9dbb04efa2f88a9305635b5e3ca33a2e575112d6c0d0377149d2739d7ced4343c8a7b69c897a1c6b
 MISC metadata.xml 643 BLAKE2B 92fe71631920f61dd6667c2dc8b4e27d2ea1e9bfb64509a9b4a9b0a72e9b4a11b7ae06febf120564c28272b9e079cf71a114bca620ce2651ec615439dd5ff9b3 SHA512 bad363023e01da0232632d54b2cb65dce89a7c70441f05fc873640a29f6fd4ec4ea30b00f94f723a786de1eef87b94673dad455102bc57a11573346e3a8ae2e8
diff --git a/sys-power/thermald/thermald-2.3-r1.ebuild b/sys-power/thermald/thermald-2.3-r1.ebuild
index 0e305e3aa636..2465a7a70379 100644
--- a/sys-power/thermald/thermald-2.3-r1.ebuild
+++ b/sys-power/thermald/thermald-2.3-r1.ebuild
@@ -47,3 +47,10 @@ my_src_install_all() {
 	rm -rf "${ED}"/etc/init || die
 	doinitd "${FILESDIR}"/thermald
 }
+
+pkg_postinst() {
+	if ! has_version sys-power/dptfxtract; then
+		elog "dptfxtract can be used to generate a more specific"
+		elog "thermald configuration for your system"
+	fi
+}