From 94317634ab575b7deae469f83038f770e35fb737 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 16 Aug 2007 08:40:59 +0000 Subject: [PATCH] python-pyqt: promote qt4 to being the default, rename other packages accordingly --- .../python/{python-pyqt-3.13 => python-pyqt}/.mtn2git_empty | 0 .../python/{python-pyqt4 => python-pyqt}/cross-compile.patch | 0 packages/python/{python-pyqt4_4.2.bb => python-pyqt_4.2.bb} | 0 packages/python/{python-sip4_4.4.5.bb => python-sip_4.7.bb} | 4 +++- .../python/{python-pyqt4 => python24-pyqt2}/.mtn2git_empty | 0 packages/python/{python-pyqt-3.13 => python24-pyqt2}/features | 0 .../python/{python-pyqt-3.13 => python24-pyqt2}/qt2-fix.patch | 0 .../python/{python-pyqt_3.13.bb => python24-pyqt2_3.13.bb} | 2 +- .../{python-pyqwt-3.10 => python24-pyqwt2}/.mtn2git_empty | 0 .../python/{python-pyqwt-3.10 => python24-pyqwt2}/features | 0 .../{python-pyqwt-3.10 => python24-pyqwt2}/qt2.x-compat.patch | 0 .../python/{python-pyqwt_3.10.bb => python24-pyqwt2_3.10.bb} | 0 .../python/{python-sip_4.1.1.bb => python24-sip_4.1.1.bb} | 0 13 files changed, 4 insertions(+), 2 deletions(-) rename packages/python/{python-pyqt-3.13 => python-pyqt}/.mtn2git_empty (100%) rename packages/python/{python-pyqt4 => python-pyqt}/cross-compile.patch (100%) rename packages/python/{python-pyqt4_4.2.bb => python-pyqt_4.2.bb} (100%) rename packages/python/{python-sip4_4.4.5.bb => python-sip_4.7.bb} (96%) rename packages/python/{python-pyqt4 => python24-pyqt2}/.mtn2git_empty (100%) rename packages/python/{python-pyqt-3.13 => python24-pyqt2}/features (100%) rename packages/python/{python-pyqt-3.13 => python24-pyqt2}/qt2-fix.patch (100%) rename packages/python/{python-pyqt_3.13.bb => python24-pyqt2_3.13.bb} (98%) rename packages/python/{python-pyqwt-3.10 => python24-pyqwt2}/.mtn2git_empty (100%) rename packages/python/{python-pyqwt-3.10 => python24-pyqwt2}/features (100%) rename packages/python/{python-pyqwt-3.10 => python24-pyqwt2}/qt2.x-compat.patch (100%) rename packages/python/{python-pyqwt_3.10.bb => python24-pyqwt2_3.10.bb} (100%) rename packages/python/{python-sip_4.1.1.bb => python24-sip_4.1.1.bb} (100%) diff --git a/packages/python/python-pyqt-3.13/.mtn2git_empty b/packages/python/python-pyqt/.mtn2git_empty similarity index 100% rename from packages/python/python-pyqt-3.13/.mtn2git_empty rename to packages/python/python-pyqt/.mtn2git_empty diff --git a/packages/python/python-pyqt4/cross-compile.patch b/packages/python/python-pyqt/cross-compile.patch similarity index 100% rename from packages/python/python-pyqt4/cross-compile.patch rename to 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 similarity index 100% rename from packages/python/python-pyqt4_4.2.bb rename to 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 similarity index 96% rename from packages/python/python-sip4_4.4.5.bb rename to 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 similarity index 100% rename from packages/python/python-pyqt4/.mtn2git_empty rename to packages/python/python24-pyqt2/.mtn2git_empty diff --git a/packages/python/python-pyqt-3.13/features b/packages/python/python24-pyqt2/features similarity index 100% rename from packages/python/python-pyqt-3.13/features rename to 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 similarity index 100% rename from packages/python/python-pyqt-3.13/qt2-fix.patch rename to 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 similarity index 98% rename from packages/python/python-pyqt_3.13.bb rename to 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 similarity index 100% rename from packages/python/python-pyqwt-3.10/.mtn2git_empty rename to packages/python/python24-pyqwt2/.mtn2git_empty diff --git a/packages/python/python-pyqwt-3.10/features b/packages/python/python24-pyqwt2/features similarity index 100% rename from packages/python/python-pyqwt-3.10/features rename to 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 similarity index 100% rename from packages/python/python-pyqwt-3.10/qt2.x-compat.patch rename to 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 similarity index 100% rename from packages/python/python-pyqwt_3.10.bb rename to 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 similarity index 100% rename from packages/python/python-sip_4.1.1.bb rename to packages/python/python24-sip_4.1.1.bb -- 2.39.5