old

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)

2 files changed, 0 insertions, 120 deletions

diff --git a/dev-python/PyQt4/files/PyQt4-4.7.2-configure.py.patch b/dev-python/PyQt4/files/PyQt4-4.7.2-configure.py.patch
deleted file mode 100644
index 4f3b251de0a6..000000000000
--- a/dev-python/PyQt4/files/PyQt4-4.7.2-configure.py.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- PyQt-x11-gpl-4.7.2/configure.py.orig	2010-03-18 00:59:51.000000000 +0100
-+++ PyQt-x11-gpl-4.7.2/configure.py	2010-03-18 01:08:46.000000000 +0100
-@@ -478,7 +478,7 @@
-             generate_code("QtXmlPatterns")
- 
-         if "phonon" in pyqt_modules:
--            generate_code("phonon")
-+            generate_code("phonon", extra_include_dirs=["/usr/include/phonon"])
- 
-         if "QtAssistant" in pyqt_modules:
-             generate_code("QtAssistant")
-@@ -797,6 +797,7 @@
-                 install_dir=pydbusmoddir,
-                 qt=["QtCore"],
-                 debug=opts.debug,
-+                strip=0,
-                 universal=sipcfg.universal,
-                 arch=sipcfg.arch
-             )
-@@ -1611,6 +1612,7 @@
-         warnings=1,
-         static=opts.static,
-         debug=opts.debug,
-+        strip=0,
-         universal=sipcfg.universal,
-         arch=sipcfg.arch,
-         prot_is_public=opts.prot_is_public
diff --git a/dev-python/PyQt4/files/PyQt4-4.9.4-pyuic-custom-widgets.patch b/dev-python/PyQt4/files/PyQt4-4.9.4-pyuic-custom-widgets.patch
deleted file mode 100644
index 20ebeb93e842..000000000000
--- a/dev-python/PyQt4/files/PyQt4-4.9.4-pyuic-custom-widgets.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-# HG changeset patch
-# User Phil Thompson <phil@riverbankcomputing.com>
-# Date 2012-07-13 13:39:28 +0100
-# Node ID 29b668ada14c1428a3bbfe8f0324c6626bd5ac9a
-# Parent  fd0f3da9d79ca9858d10a20c15fb85456cb832d7
-Fixed a regression in pyuic's handling of custom widgets.
-
-diff --git a/pyuic/uic/Compiler/qobjectcreator.py b/pyuic/uic/Compiler/qobjectcreator.py
---- a/pyuic/uic/Compiler/qobjectcreator.py
-+++ b/pyuic/uic/Compiler/qobjectcreator.py
-@@ -1,6 +1,6 @@
- #############################################################################
- ##
--## Copyright (C) 2011 Riverbank Computing Limited.
-+## Copyright (C) 2012 Riverbank Computing Limited.
- ## Copyright (C) 2006 Thorsten Marek.
- ## All right reserved.
- ##
-@@ -100,7 +100,6 @@
-         assert widgetClass not in self._widgets 
-         self._widgets[widgetClass] = (baseClass, module)
- 
--
-     def _resolveBaseclass(self, baseClass):
-         try:
-             for x in range(0, 10):
-@@ -114,19 +113,17 @@
-         except KeyError:
-             raise ValueError("unknown baseclass %s" % baseClass)
-         
--
-     def search(self, cls):
-         try:
--            self._usedWidgets.add(cls)
-             baseClass = self._resolveBaseclass(self._widgets[cls][0])
-             DEBUG("resolved baseclass of %s: %s" % (cls, baseClass))
--            
--            return type(cls, (baseClass,),
--                        {"module" : ""})
--        
-         except KeyError:
-             return None
- 
-+        self._usedWidgets.add(cls)
-+
-+        return type(cls, (baseClass, ), {"module" : ""})
-+
-     def _writeImportCode(self):
-         imports = {}
-         for widget in self._usedWidgets:
-diff --git a/pyuic/uic/objcreator.py b/pyuic/uic/objcreator.py
---- a/pyuic/uic/objcreator.py
-+++ b/pyuic/uic/objcreator.py
-@@ -102,19 +102,26 @@
-         self._modules.append(self._customWidgets)
- 
-     def createQObject(self, classname, *args, **kwargs):
--        # Handle scoped names, typically static factory methods.
--        parts = classname.split('.')
--        factory = self.findQObjectType(parts[0])
-+        # Handle regular and custom widgets.
-+        factory = self.findQObjectType(classname)
- 
--        if factory is not None:
--            for part in parts[1:]:
--                factory = getattr(factory, part, None)
--                if factory is None:
--                    break
--            else:
--                return self._cpolicy.instantiate(factory, *args, **kwargs)
-+        if factory is None:
-+            # Handle scoped names, typically static factory methods.
-+            parts = classname.split('.')
- 
--        raise NoSuchWidgetError(classname)
-+            if len(parts) > 1:
-+                factory = self.findQObjectType(parts[0])
-+
-+                if factory is not None:
-+                    for part in parts[1:]:
-+                        factory = getattr(factory, part, None)
-+                        if factory is None:
-+                            break
-+
-+            if factory is None:
-+                raise NoSuchWidgetError(classname)
-+
-+        return self._cpolicy.instantiate(factory, *args, **kwargs)
- 
-     def invoke(self, rname, method, args=()):
-         return self._cpolicy.invoke(rname, method, args)