python-pyqt: promote qt4 to being the default, rename other packages accordingly

13 files changed, 4 insertions, 2 deletions

diff --git a/packages/python/python-pyqt-3.13/.mtn2git_empty b/packages/python/python-pyqt/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python-pyqt-3.13/.mtn2git_empty
+++ b/packages/python/python-pyqt/.mtn2git_empty
diff --git a/packages/python/python-pyqt4/cross-compile.patch b/packages/python/python-pyqt/cross-compile.patch
index fb1524c09d..fb1524c09d 100644
--- a/packages/python/python-pyqt4/cross-compile.patch
+++ b/packages/python/python-pyqt/cross-compile.patch
diff --git a/packages/python/python-pyqt4_4.2.bb b/packages/python/python-pyqt_4.2.bb
index 64a9a71f68..64a9a71f68 100644
--- a/packages/python/python-pyqt4_4.2.bb
+++ b/packages/python/python-pyqt_4.2.bb
diff --git a/packages/python/python-sip4_4.4.5.bb b/packages/python/python-sip_4.7.bb
index 000aa8b86f..7c022867d7 100644
--- a/packages/python/python-sip4_4.4.5.bb
+++ b/packages/python/python-sip_4.7.bb
@@ -1,3 +1,5 @@
+BROKEN = "1"
+
 DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries"
 SECTION = "devel/python"
 HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
@@ -10,7 +12,7 @@ PR = "ml0"
 SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz"
 S = "${WORKDIR}/sip-${PV}/siplib"
 
-inherit qmake distutils-base
+inherit qmake2 distutils-base
 
 EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \
                          CONFIG=console \
diff --git a/packages/python/python-pyqt4/.mtn2git_empty b/packages/python/python24-pyqt2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python-pyqt4/.mtn2git_empty
+++ b/packages/python/python24-pyqt2/.mtn2git_empty
diff --git a/packages/python/python-pyqt-3.13/features b/packages/python/python24-pyqt2/features
index 6fe74cafe4..6fe74cafe4 100644
--- a/packages/python/python-pyqt-3.13/features
+++ b/packages/python/python24-pyqt2/features
diff --git a/packages/python/python-pyqt-3.13/qt2-fix.patch b/packages/python/python24-pyqt2/qt2-fix.patch
index 5ee978e8f6..5ee978e8f6 100644
--- a/packages/python/python-pyqt-3.13/qt2-fix.patch
+++ b/packages/python/python24-pyqt2/qt2-fix.patch
diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python24-pyqt2_3.13.bb
index f9a8bb334d..2c9916b366 100644
--- a/packages/python/python-pyqt_3.13.bb
+++ b/packages/python/python24-pyqt2_3.13.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "virtual/libqte2 virtual/libqpe1"
-RDEPENDS = "python-core python-sip"
+RDEPENDS = "python-core python24-sip"
 SRCNAME = "pyqt"
 PR = "ml5"
 
diff --git a/packages/python/python-pyqwt-3.10/.mtn2git_empty b/packages/python/python24-pyqwt2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/python/python-pyqwt-3.10/.mtn2git_empty
+++ b/packages/python/python24-pyqwt2/.mtn2git_empty
diff --git a/packages/python/python-pyqwt-3.10/features b/packages/python/python24-pyqwt2/features
index 56eab20b69..56eab20b69 100644
--- a/packages/python/python-pyqwt-3.10/features
+++ b/packages/python/python24-pyqwt2/features
diff --git a/packages/python/python-pyqwt-3.10/qt2.x-compat.patch b/packages/python/python24-pyqwt2/qt2.x-compat.patch
index 249ff4a5ee..249ff4a5ee 100644
--- a/packages/python/python-pyqwt-3.10/qt2.x-compat.patch
+++ b/packages/python/python24-pyqwt2/qt2.x-compat.patch
diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python24-pyqwt2_3.10.bb
index d78bba7e8a..d78bba7e8a 100644
--- a/packages/python/python-pyqwt_3.10.bb
+++ b/packages/python/python24-pyqwt2_3.10.bb
diff --git a/packages/python/python-sip_4.1.1.bb b/packages/python/python24-sip_4.1.1.bb
index 8e118ea7de..8e118ea7de 100644
--- a/packages/python/python-sip_4.1.1.bb
+++ b/packages/python/python24-sip_4.1.1.bb