gentoo resync : 23.09.2020

2 files changed, 0 insertions, 49 deletions

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 ] )