From ad9de0c6194797da8589d130dbaffa579f2ad5f9 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 3 Dec 2007 19:37:52 +0000
Subject: sip: upgrade to 4.7.1, catch up with sip3/sip4 renaming

---
 classes/sip.bbclass              | 10 ++++++----
 packages/sip/sip-native_4.7.1.bb | 25 +++++++++++++++++++++++++
 packages/sip/sip-native_4.7.bb   | 25 -------------------------
 3 files changed, 31 insertions(+), 29 deletions(-)
 create mode 100644 packages/sip/sip-native_4.7.1.bb
 delete mode 100644 packages/sip/sip-native_4.7.bb

diff --git a/classes/sip.bbclass b/classes/sip.bbclass
index a258fda629..6f77f460dc 100644
--- a/classes/sip.bbclass
+++ b/classes/sip.bbclass
@@ -1,8 +1,10 @@
 # Build Class for Sip based Python Bindings
 # (C) Michael 'Mickey' Lauer <mickey@Vanille.de>
 #
-DEPENDS  =+ "sip-native"
-RDEPENDS += "python-sip"
+
+# yes, python-sip is actually a build-time dependency, since
+# the recipe installs sip.h
+DEPENDS =+ "sip-native python-sip"
 
 # default stuff, do not uncomment
 # EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0"
@@ -34,8 +36,8 @@ sip_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 \
+		echo "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, \
diff --git a/packages/sip/sip-native_4.7.1.bb b/packages/sip/sip-native_4.7.1.bb
new file mode 100644
index 0000000000..b47a3a7539
--- /dev/null
+++ b/packages/sip/sip-native_4.7.1.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "SIP is a C++/Python Wrapper Generator"
+SECTION = "devel"
+HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
+AUTHOR = "Phil Thompson"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz"
+S = "${WORKDIR}/sip-${PV}/sipgen"
+
+inherit qt4x11 native
+
+EXTRA_QMAKEVARS_POST += "DESTDIR=${S} CONFIG=console"
+
+do_configure_prepend() {
+	cat sipgen.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > sipgen.pro
+}
+
+do_stage() {
+	install -m 0755 sip ${STAGING_BINDIR_NATIVE}/sip
+	cd ${WORKDIR}/sip-${PV} && python configure.py
+	install -d ${STAGING_PYDIR}/site-packages
+	install -m 0755 sip*.py ${STAGING_PYDIR}/site-packages
+}
+
diff --git a/packages/sip/sip-native_4.7.bb b/packages/sip/sip-native_4.7.bb
deleted file mode 100644
index 08cdae4ead..0000000000
--- a/packages/sip/sip-native_4.7.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "SIP is a C++/Python Wrapper Generator"
-SECTION = "devel"
-HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
-AUTHOR = "Phil Thompson"
-PRIORITY = "optional"
-LICENSE = "GPL"
-
-SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz"
-S = "${WORKDIR}/sip-${PV}/sipgen"
-
-inherit qmake qt4x11 native
-
-EXTRA_QMAKEVARS_POST += "DESTDIR=${S} CONFIG=console"
-
-do_configure_prepend() {
-	cat sipgen.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > sipgen.pro
-}
-
-do_stage() {
-	install -m 0755 sip ${STAGING_BINDIR}/sip4
-	cd ${WORKDIR}/sip-${PV} && python configure.py
-	install -d ${STAGING_PYDIR}/site-packages
-	install -m 0755 sip*.py ${STAGING_PYDIR}/site-packages
-}
-
-- 
cgit v1.2.3