Added patch for Python 2.6 (see bug #266151); removed old files and ebuilds

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 14 insertions, 116 deletions

diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.3-alpha.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.3-alpha.patch
deleted file mode 100644
index 89866ec46c36..000000000000
--- a/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.3-alpha.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -urN gDesklets-0.35.3.orig/libdesklets/system/ArchFactory.py gDesklets-0.35.3/libdesklets/system/ArchFactory.py
---- gDesklets-0.35.3.orig/libdesklets/system/ArchFactory.py	2005-01-22 15:33:31.000000000 +0000
-+++ gDesklets-0.35.3/libdesklets/system/ArchFactory.py	2006-04-30 12:58:04.000000000 +0000
-@@ -27,6 +27,9 @@
-         if (uname[-1] in ('ppc', 'ppc64')):
-             return Linux.PPC()
- 
-+        if (uname[-1] in ('alpha')):
-+            return Linux.Alpha()
-+
-         return Linux.Generic()
- 
- 
-diff -urN gDesklets-0.35.3.orig/libdesklets/system/Linux/Alpha.py gDesklets-0.35.3/libdesklets/system/Linux/Alpha.py
---- gDesklets-0.35.3.orig/libdesklets/system/Linux/Alpha.py	1970-01-01 00:00:00.000000000 +0000
-+++ gDesklets-0.35.3/libdesklets/system/Linux/Alpha.py	2006-04-30 16:06:54.000000000 +0000
-@@ -0,0 +1,52 @@
-+from Generic import Generic
-+
-+import re
-+
-+class Alpha(Generic):
-+
-+    def __init__(self):
-+
-+        Generic.__init__(self)
-+
-+        def _get_model():
-+            r = re.compile('^system type\s+:\s+(.+)$', re.M)
-+            m = r.search( self._read_cpuinfo() )
-+            return m.group(1)
-+
-+        def _get_speed():
-+            r = re.compile('^cycle frequency \[Hz\]\s+:\s+(\d+)\s+est\.$', re.M);
-+            m = r.search( self._read_cpuinfo() )
-+            return float(int(m.group(1))/1000000.0)
-+
-+        self.__model_name = _get_model()
-+        self.__speed      = _get_speed()
-+
-+        # set cache size to 0, since size is not present in /proc/cpuinfo
-+        self.__cache_size = int(0)
-+
-+
-+    def cpu_cache(self):
-+        """
-+        @return : 2nd level cache of installed processor
-+        @rtype  : int
-+        """
-+
-+        return self.__cache_size
-+
-+    def cpu_model(self):
-+        """
-+        @return : model/type of installed processor
-+        @rtype  : str
-+        """
-+
-+        return self.__model_name
-+
-+
-+
-+    def cpu_speed(self):
-+        """
-+        @return : current clock of installed processor
-+        @rtype  : float
-+        """
-+
-+        return self.__speed
-diff -urN gDesklets-0.35.3.orig/libdesklets/system/Linux/Makefile.am gDesklets-0.35.3/libdesklets/system/Linux/Makefile.am
---- gDesklets-0.35.3.orig/libdesklets/system/Linux/Makefile.am	2004-11-22 19:42:53.000000000 +0000
-+++ gDesklets-0.35.3/libdesklets/system/Linux/Makefile.am	2006-04-30 12:58:43.000000000 +0000
-@@ -2,6 +2,7 @@
- 
- install_DATA = \
- 	__init__.py	\
-+	Alpha.py	\
- 	Generic.py \
- 	PPC.py \
- 	Sparc.py \
-diff -urN gDesklets-0.35.3.orig/libdesklets/system/Linux/__init__.py gDesklets-0.35.3/libdesklets/system/Linux/__init__.py
---- gDesklets-0.35.3.orig/libdesklets/system/Linux/__init__.py	2004-04-19 18:24:26.000000000 +0000
-+++ gDesklets-0.35.3/libdesklets/system/Linux/__init__.py	2006-04-30 13:14:47.000000000 +0000
-@@ -1,4 +1,5 @@
- from X86 import X86
- from Sparc import Sparc
- from PPC import PPC
-+from Alpha import Alpha
- from Generic import Generic
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.3-pyorbit_fix.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.3-pyorbit_fix.patch
deleted file mode 100644
index 3ae7c2a93461..000000000000
--- a/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.3-pyorbit_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gdesklets-core-0.35.3.orig/gdesklets	2005-05-11 18:47:55.000000000 -0400
-+++ gdesklets-core-0.35.3/gdesklets	2006-08-31 22:24:30.000000000 -0400
-@@ -58,7 +58,7 @@
-           _("GTK python bindings (pygtk2) version >= 2.4.0 and "
-             "GTK+ version >= 2.4.0 are required.")
-         ),
--        ( ("ORBit",), lambda m : m.__version__ == (2, 0, 1),
-+        ( ("ORBit",), lambda m : m.__version__ >= (2, 0, 1),
-           _("ORBit python bindings (pyorbit) version == 2.0.1 are required.")
-         ),
-         ( ("bonobo.ui",), lambda m : m,
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.4-POTFILES.in.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.4-POTFILES.in.patch
deleted file mode 100644
index c5d65f4c8969..000000000000
--- a/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.4-POTFILES.in.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- po/POTFILES.in.orig	2005-08-11 15:10:42.000000000 -0400
-+++ po/POTFILES.in	2007-03-07 21:04:46.000000000 -0500
-@@ -1,3 +1,4 @@
-+[encoding: UTF-8]
- config/ConfigDialog.py
- config/ConfigUnit.py
- config/DaemonConfigger.py
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36-python-2.6-fix.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36-python-2.6-fix.patch
new file mode 100644
index 000000000000..9e15452ae681
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36-python-2.6-fix.patch
@@ -0,0 +1,14 @@
+--- utils/ErrorFormatter.py	2009-03-25 11:53:35.000000000 -0400
++++ utils/ErrorFormatter.py	2009-05-12 13:38:39.000000000 -0400
+@@ -113,9 +113,9 @@
+ # give us an absolute path.
+ #
+ _old_imp = __import__
+-def _new_imp(name, globs = {}, locls = {}, fromlist = []):
++def _new_imp(*args, **kwargs):
+ 
+-    module = _old_imp(name, globs, locls, fromlist)
++    module = _old_imp(*args, **kwargs)
+     # builtin modules have no "__file__" attribute, so we have to check for it
+     if (module):
+         if (hasattr(module, "__file__")):
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-displays.desktop b/gnome-extra/gdesklets-core/files/gdesklets-displays.desktop
deleted file mode 100644
index d7219e2a173e..000000000000
--- a/gnome-extra/gdesklets-core/files/gdesklets-displays.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=gDesklets Displays
-Comment=Navigate through the Displays available for gDesklets
-Exec=nautilus /usr/share/gdesklets/Displays
-Icon=/usr/share/pixmaps/gdesklets.png
-Terminal=false
-Type=Application
-Categories=Utility;
-