Add <upstream> tag to metadata. Cleanup old ebuilds and patches.

(Portage version: 2.2.0_alpha87/cvs/Linux x86_64)

2 files changed, 0 insertions, 53 deletions

diff --git a/dev-python/PyQt4/files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff b/dev-python/PyQt4/files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff
deleted file mode 100644
index 38083e76e523..000000000000
--- a/dev-python/PyQt4/files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: PyQt-x11-gpl-4.7.7/pyuic/uic/Loader/loader.py
-===================================================================
---- PyQt-x11-gpl-4.7.7.orig/pyuic/uic/Loader/loader.py
-+++ PyQt-x11-gpl-4.7.7/pyuic/uic/Loader/loader.py
-@@ -1,3 +1,5 @@
-+import os.path
-+
- from PyQt4 import QtGui, QtCore
- from PyQt4.uic.uiparser import UIParser
- from PyQt4.uic.Loader.qobjectcreator import LoaderCreatorPolicy
-@@ -19,6 +21,7 @@ class DynamicUILoader(UIParser):
-     def loadUi(self, filename, toplevelInst=None):
-         self.toplevelInst = toplevelInst
- 
--        # By using QFileInfo.path() rather than os.path.dirname() we allow
--        # QString file names.
--        return self.parse(filename, QtCore.QFileInfo(filename).path())
-+        # Allow the filename to be a QString.
-+        filename = str(filename)
-+
-+        return self.parse(filename, os.path.dirname(filename))
-Index: PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip
-===================================================================
---- PyQt-x11-gpl-4.7.7.orig/sip/QtCore/qglobal.sip
-+++ PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip
-@@ -312,12 +312,12 @@ public:
-     // Qt.Alignment class.
-     QFlags operator|(int f);
- %MethodCode
--        sipRes = new QFlags(*a0 | (ENUM(a1)));
-+        sipRes = new QFlags(*a0 | a1);
- %End
- 
-     QFlags operator^(int f);
- %MethodCode
--        sipRes = new QFlags(*a0 ^ (ENUM(a1)));
-+        sipRes = new QFlags(*a0 ^ a1);
- %End
- 
-     // These are necessary to prevent Python comparing object IDs.
diff --git a/dev-python/PyQt4/files/PyQt4-4.8.3-configure-multilib.patch b/dev-python/PyQt4/files/PyQt4-4.8.3-configure-multilib.patch
deleted file mode 100644
index 2a463dcbd602..000000000000
--- a/dev-python/PyQt4/files/PyQt4-4.8.3-configure-multilib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.py
-+++ configure.py
-@@ -941,8 +941,8 @@
-                     # version.
-                     link = "-framework Python"
-                 elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") and
--                      glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor))):
--                    lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"])
-+                      glob.glob("%s/libpython%d.%d*" % (ducfg["LIBDIR"], py_major, py_minor))):
-+                    lib_dir_flag = quote("-L%s" % ducfg["LIBDIR"])
-                     link = "%s -lpython%d.%d%s" % (lib_dir_flag, py_major, py_minor, abi)
-                 else:
-                     sipconfig.inform("Qt Designer plugin disabled because Python library is static")