Removed migration tool since it's packaged upstream now and no ebuilds use it

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 7 insertions, 209 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index 30dcdba637b8..38758c14c0da 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gdesklets-core
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.104 2009/06/01 12:03:14 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.105 2009/06/02 21:37:22 nixphoeni Exp $
+
+  02 Jun 2009; Joe Sapp <nixphoeni@gentoo.org>
+  -files/gdesklets-migration-tool:
+  Removed migration tool since it's packaged upstream now and no ebuilds use
+  it
 
 *gdesklets-core-0.36.1-r2 (01 Jun 2009)
 
diff --git a/gnome-extra/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest
index af89412e189b..900aad15aeed 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -3,10 +3,9 @@ AUX gdesklets-core-0.36-python-2.6-fix.patch 531 RMD160 81940f4dfc1f8b21470eee36
 AUX gdesklets-core-0.36.1-bash-completion 1429 RMD160 58005a49b24dc5daf60c93fee0148f1aa995daef SHA1 5fc1bf3c3ffed1d04ca5302047082d03c2221b40 SHA256 12475cc4137b31098cb05ceafb3852d497e311a138b4171795568d88d012abf4
 AUX gdesklets-core-0.36.1-test-control.py-install-fix.patch 483 RMD160 a3a0b625c92738bb99d19f1332ded97fe717d387 SHA1 b088909f190a39479515b9501918fb7e31a03903 SHA256 2d3ef43385c3e2eb506a714ece81768abe6500f58392514a4b1e327bf098625d
 AUX gdesklets-core-0.36_beta-linguas.patch 1208 RMD160 5b691f445e73316232e394b8dca91601ac57d706 SHA1 d9fe4ed5775921c772b00399f3479afbb4a184d9 SHA256 760a79c3df6c6680ea6b76d787f666a603c919f7fac6b22869a4cb6ab7023b4b
-AUX gdesklets-migration-tool 7343 RMD160 d8d3f992e8786534a184de00bbcd5d1eebf93d4e SHA1 f0e0bd96663a35e1f98b2ec3b377a2b4246cbd33 SHA256 6dd834d92f1a70280e8b3d7b7a005564e0daa5e2769758f47e151044d62cfa48
 AUX gdesklets.desktop 265 RMD160 a6a84a28abf1120cc8df2e52505c119cdb82cca7 SHA1 a8a544d457cf613f939c45e29681bab307b0fa36 SHA256 8b38972217e4a923fb988b7982eb1e6655f1f885686a4b9585810999588c11ee
 DIST gdesklets-0.36.1.tar.gz 3537820 RMD160 ff658aa32ee562ed0563f01e6c5c7267c0e1fa7c SHA1 a865fd5cd65f4e217fb2c16982961b7b1f6d54cc SHA256 5e0cfd4cd99437aba24dfca33a72b2b6aef33b4c1128064ce82a368280bc6d61
 EBUILD gdesklets-core-0.36.1-r2.ebuild 3781 RMD160 027a03954735bca3ff6dc2c6c1ae48485f434563 SHA1 94caa37d7985435311de8430eb4ac86b2126d597 SHA256 336b3f931fda1849e243d8f87793add8e3ff327d85daff032e4bf13888135441
 EBUILD gdesklets-core-0.36.1.ebuild 3295 RMD160 e3c4d556bd7c436a7a7b88da3717e5bb09c78e8c SHA1 5e9a1949ad3930ad0c31cfdadcb303aaa0e2d9b0 SHA256 52743f43b259e81b7200db532d284251d006f00bde0574cd14bb26315873edac
-MISC ChangeLog 20329 RMD160 ccb9800c4d2d0e17f68e63021ab9d2c9a423254a SHA1 77bcb8e2dc65a4fe0ad54954e06c703d0e58d82e SHA256 8aba150bc214d1b064eca08e74afa570c367e162356ec684a76656d9787e88bd
+MISC ChangeLog 20494 RMD160 1344e4f7b33a0e46272ca4a83e28219ff92de25d SHA1 331ca1e67dccc8812e280981da9f359296267700 SHA256 9a9e0e26a486e50c2653d3f785e0deeb9e16ebb632c61a1b8d2fa9ad4ace3c56
 MISC metadata.xml 225 RMD160 84ee2a2d6e82c97c9059ca7cfc17f222f18e4431 SHA1 54492f0c3ac21555e1a60882fa7b92103fc3d2c8 SHA256 49feb5b4f0a008e92acb1626adf763199e38ad92f465e41943a89941213ffeef
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-migration-tool b/gnome-extra/gdesklets-core/files/gdesklets-migration-tool
deleted file mode 100755
index 7addea54de36..000000000000
--- a/gnome-extra/gdesklets-core/files/gdesklets-migration-tool
+++ /dev/null
@@ -1,206 +0,0 @@
-#!/usr/bin/env python
-#
-# TODO:
-#   -Add selectors for previous and current gDesklets versions
-#   -Add command-line options for selecting the above
-#   -Add command-line options for verbose configuration migrations
-#
-#
-import gtk, gconf
-import os, re, sys
-import fileinput
-import __builtin__
-
-if "/usr/lib/gdesklets" not in sys.path:
-    sys.path.append("/usr/lib/gdesklets")
-
-from utils import i18n
-from utils.HIGDialog import HIGDialog
-
-from config.StateSaver import DefaultStateSaver, StateSaver
-
-__builtin__._ = i18n.Translator("gdesklets")
-
-class MigrationTool:
-
-    # Display the main window
-    def __init__(self):
-
-        m  = "This tool will safely migrate your settings from old versions of "
-        m += "gDesklets (0.3x.x series), so that they will work with versions "
-        m += "0.35rc1 onwards.\n\n"
-        
-        # This message doesn't really apply, but I'm keeping it here 
-        # in case I forget how to do bold text or if we decide to keep
-        # the old migration tool.
-        #m += "If you are migrating from an earlier version, please run\n"
-        #m += "<span weight=\"bold\">gdesklets-migration-tool</span> first."
-
-        dialog = HIGDialog((gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,gtk.STOCK_OK,
-                            gtk.RESPONSE_OK), gtk.STOCK_DIALOG_INFO,
-                           "gDesklets Config Migration Tool", m)
-        
-        self.__config_path = "/apps/gdesklets"
-        self.__gdesklets_path = os.path.join(os.getenv("HOME"), ".gdesklets")
-        # Get the StateSaver structure for shell config (if any)
-        self.__new_shell_cfg = DefaultStateSaver()
-        self.__old_shell_cfg = self.__config_path + "/shell"
-
-        dialog.connect("response", self.__response)
-
-        # Check if ~/.gdesklets exists
-        if (not os.path.exists(self.__gdesklets_path)):
-            print ("You don't have a working version of gDesklets! (~/.gdesklets not found)\nExiting!")
-            sys.exit(1)
-
-        try:
-            self.__displays_file = self.__gdesklets_path + "/displays"
-        except:
-            print "Can't find ~/.gdesklets/displays"
-            sys.exit(1)
-
-        # Get IDs from each display in the ~/.gdesklets/displays file
-        self.__displays = []
-        
-        # Probably a better way to do it than with fileinput
-        for i in fileinput.input(self.__displays_file):
-            if i.startswith("id"):
-                l = i.split(" ")
-                self.__displays.append(l[0] + "CONFIG")
-        
-        dialog.show()
-
-
-    def __response(self, dialog, response):
-
-        if (response == gtk.RESPONSE_OK):
-            dialog.hide()
-            self.__show_warning(dialog)
-        elif (response == gtk.RESPONSE_YES):
-            dialog.hide()
-            self.__migrate(dialog)
-        else: gtk.main_quit()
-
-
-    def __show_warning(self, dialog):
-
-        m  = "This will overwrite any existing settings from 0.35rc1 on up!\n"
-        m += "Do you wish to continue?"
-
-        dialog = HIGDialog((gtk.STOCK_NO, gtk.RESPONSE_NO,
-                            gtk.STOCK_YES, gtk.RESPONSE_YES),
-                           gtk.STOCK_DIALOG_QUESTION, "Warning!", m)
-        dialog.connect("response", self.__response)
-        dialog.show()
-
-
-    def __show_finished(self, dialog):
-
-        dialog = HIGDialog((gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE),
-                           gtk.STOCK_DIALOG_INFO, "Migration successful!",
-                           "Settings have been migrated succesfully")
-        dialog.connect("response", self.__response)
-        dialog.show()
-
-    # This is just a dummy function to see what's in
-    # the states file.  It's not called except when testing :)
-    def __list(self, dialog):
-        
-        m = ""
-        
-        for d in self.__displays:
-            
-            s = StateSaver(d)
-            for l in s.list():
-                m += str(s.get_key(l))
-                m += "\n"
-            m += "\n\n"
-        
-        dialog = HIGDialog((gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE),
-                           gtk.STOCK_DIALOG_INFO, "List", m)
-
-        dialog.connect("response", self.__response)
-        dialog.show()
-
-    def __migrate(self, dialog):
-
-        # we assume they have a config to start with
-        noconfig = False;
-
-        # set up gconf client
-        self.__client = gconf.client_get_default()
-        self.__client.add_dir(self.__config_path, gconf.CLIENT_PRELOAD_RECURSIVE)
-
-        # open the new output files
-        #d_cfile = open(self.__displays_file, "w")
-
-        for d in self.__displays:
-            
-            cur_id = d[0:len(d) - len("CONFIG")]    # This display's id
-            s = StateSaver(d)                       # StateSaver for this display
-            
-            for entry in self.__client.all_entries(self.__config_path + "/" + cur_id):
-            
-                key = entry.get_key()
-                
-                # Each key had a corresponding key_TYPE variable
-                # that indicated the type of configuration stored.
-                # It seems tests like the following are necessary to
-                # get the right type from gconf.
-                if key.endswith("_TYPE"):
-                
-                    typ = self.__client.get_string(key)     # Type of variable stored
-                    key_result = key[0:key.rfind("_TYPE")]  # Actual key
-                    
-                    # Get the value from key_result
-                    if typ == "bool":
-                        value = self.__client.get_bool(key_result)
-                    elif typ == "string":
-                        value = self.__client.get_string(key_result)
-                    elif typ == "int":
-                        value = self.__client.get_int(key_result)
-                    elif typ == "float":
-                        value = self.__client.get_string(key_result)
-                    
-                    key_result = key_result[key_result.rfind("/")+1:]
-                    #print key_result + " : " + str( (value,typ) )
-                    
-                    s.set_key(key_result, (value,typ))
-        
-            #print str(s.list())
-        
-        # Done with the displays, now migrate the shell configuration
-        for entry in self.__client.all_entries(self.__old_shell_cfg):
-        
-            key = entry.get_key()
-            
-            # Find out which key it is
-            # Are all of these valid from < 0.35_rc1?
-            if key == "current_tip":
-                value = self.__client.get_int(key)
-            elif key == "show_tip_of_the_day":
-                value = self.__client.get_bool(key)
-            elif key == "editor":
-                value = self.__client.get_string(key)
-            elif key == "dpi":
-                value = self.__client.get_int(key)
-            elif key == "translucency":
-                value = self.__client.get_string(key)
-            elif key == "authorized_commands":
-                value = self.__client.get_string(key)
-            
-            # Transform the key to just it's value, not the
-            # entire gconf path
-            key = key[key.rfind("/")+1:]
-            
-            self.__new_shell_cfg.set_key(key, value)
-        
-        # we are done...
-        self.__show_finished(dialog)
-        
-
-
-if __name__ == "__main__":
-
-     MigrationTool()
-     gtk.main()