sip/python-sip/python-pyqt: revamp naming, start to work on a current PyQt that builds against Qt-X11 4.3.0

8 files changed, 21 insertions, 21 deletions

diff --git a/classes/sip.bbclass b/classes/sip.bbclass
index adf179b130..a258fda629 100644
--- a/classes/sip.bbclass
+++ b/classes/sip.bbclass
@@ -1,11 +1,11 @@
 # Build Class for Sip based Python Bindings
 # (C) Michael 'Mickey' Lauer <mickey@Vanille.de>
 #
-
-DEPENDS =+ "sip-native python-sip"
+DEPENDS  =+ "sip-native"
+RDEPENDS += "python-sip"
 
 # default stuff, do not uncomment
-# EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
+# EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0"
 
 sip_do_generate() {
 	if [ -z "${SIP_MODULES}" ]; then 
@@ -33,10 +33,10 @@ sip_do_generate() {
 
 	for module in $MODULES
 	do
-        	install -d ${module}/
-		oenote "calling 'sip -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'"
-		sip -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf sip/${module}/${module}mod.sip \
-		|| die "Error calling sip on ${module}"
+		install -d ${module}/
+		echo "calling 'sip4 -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'"
+		sip4 -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf \
+			sip/${module}/${module}mod.sip || die "Error calling sip on ${module}"
 		cat ${module}/${module}.sbf 	| sed s,target,TARGET, \
 						| sed s,sources,SOURCES, \
 						| sed s,headers,HEADERS, \
diff --git a/classes/sip4.bbclass b/classes/sip3.bbclass
index ca2b1dae20..1dd42ba86b 100644
--- a/classes/sip4.bbclass
+++ b/classes/sip3.bbclass
@@ -1,13 +1,13 @@
 # Build Class for Sip based Python Bindings
 # (C) Michael 'Mickey' Lauer <mickey@Vanille.de>
 #
-DEPENDS  =+ "sip4-native"
-RDEPENDS += "python-sip4"
+
+DEPENDS =+ "sip-native python-sip"
 
 # default stuff, do not uncomment
-# EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_1"
+# EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
 
-sip4_do_generate() {
+sip3_do_generate() {
 	if [ -z "${SIP_MODULES}" ]; then 
 		MODULES="`ls sip/*mod.sip`"
 	else
@@ -33,10 +33,10 @@ sip4_do_generate() {
 
 	for module in $MODULES
 	do
-		install -d ${module}/
-		echo "calling 'sip4 -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'"
-		sip4 -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf \
-			sip/${module}/${module}mod.sip || die "Error calling sip on ${module}"
+        	install -d ${module}/
+		oenote "calling 'sip -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'"
+		sip -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf sip/${module}/${module}mod.sip \
+		|| die "Error calling sip on ${module}"
 		cat ${module}/${module}.sbf 	| sed s,target,TARGET, \
 						| sed s,sources,SOURCES, \
 						| sed s,headers,HEADERS, \
diff --git a/packages/python/python-pyqt_4.2.bb b/packages/python/python-pyqt_4.3.bb
index 64a9a71f68..aeb7cd9212 100644
--- a/packages/python/python-pyqt_4.2.bb
+++ b/packages/python/python-pyqt_4.3.bb
@@ -12,12 +12,12 @@ SRC_URI = "http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${
            file://cross-compile.patch;patch=1"
 S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
 
-inherit qmake qt4x11 sip4 distutils-base
+inherit qmake qt4x11 sip distutils-base
 
 PARALLEL_MAKE = ""
 
 QMAKE_PROFILES = "pyqt.pro"
-EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
+EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility"
 EXTRA_OEMAKE = " MAKEFLAGS= "
 
 SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml"
diff --git a/packages/python/python24-pyqt2_3.13.bb b/packages/python/python24-pyqt2_3.13.bb
index 2c9916b366..04493857dc 100644
--- a/packages/python/python24-pyqt2_3.13.bb
+++ b/packages/python/python24-pyqt2_3.13.bb
@@ -14,7 +14,7 @@ SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \
            file://features"
 S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
 
-inherit palmtop sip distutils-base
+inherit palmtop sip3 distutils-base
 
 QMAKE_PROFILES = "pyqt.pro"
 EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
diff --git a/packages/python/python24-pyqwt2_3.10.bb b/packages/python/python24-pyqwt2_3.10.bb
index d78bba7e8a..28f4080c45 100644
--- a/packages/python/python24-pyqwt2_3.10.bb
+++ b/packages/python/python24-pyqwt2_3.10.bb
@@ -13,7 +13,7 @@ SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \
            file://features"
 S = "${WORKDIR}/PyQwt-20040118"
 
-inherit palmtop sip distutils-base
+inherit palmtop sip3 distutils-base
 
 QMAKE_PROFILES = "pyqwt.pro"
 EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
diff --git a/packages/sip/sip4-native_4.4.5.bb b/packages/sip/sip-native_4.7.bb
index 3f83e6e792..08cdae4ead 100644
--- a/packages/sip/sip4-native_4.4.5.bb
+++ b/packages/sip/sip-native_4.7.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SIP is a C++/Python Wrapper Generator"
-SECTION = "base"
+SECTION = "devel"
 HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
 AUTHOR = "Phil Thompson"
 PRIORITY = "optional"
@@ -8,7 +8,7 @@ LICENSE = "GPL"
 SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz"
 S = "${WORKDIR}/sip-${PV}/sipgen"
 
-inherit qmake native
+inherit qmake qt4x11 native
 
 EXTRA_QMAKEVARS_POST += "DESTDIR=${S} CONFIG=console"
 
diff --git a/packages/sip/sip-native_3.10.1.bb b/packages/sip/sip3-native_3.10.1
index 3702799319..3702799319 100644
--- a/packages/sip/sip-native_3.10.1.bb
+++ b/packages/sip/sip3-native_3.10.1
diff --git a/packages/sip/sip-native_4.0.1.bb b/packages/sip/sip3-native_4.0.1.bb
index e833a31871..e833a31871 100644
--- a/packages/sip/sip-native_4.0.1.bb
+++ b/packages/sip/sip3-native_4.0.1.bb