From 7a7ac89e3479c80a107f9363336567b29cd963bd Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Thu, 13 Dec 2007 12:45:55 +0000
Subject: sip: upgrade sip-native and python-sip to 4.7.3 * 4.7.1 had become
 unfetchable * verified successful compilation in Sonkei

---
 packages/python/python-sip_4.7.1.bb | 42 -------------------------------------
 packages/python/python-sip_4.7.3.bb | 42 +++++++++++++++++++++++++++++++++++++
 packages/sip/sip-native_4.7.1.bb    | 25 ----------------------
 packages/sip/sip-native_4.7.3.bb    | 25 ++++++++++++++++++++++
 4 files changed, 67 insertions(+), 67 deletions(-)
 delete mode 100644 packages/python/python-sip_4.7.1.bb
 create mode 100644 packages/python/python-sip_4.7.3.bb
 delete mode 100644 packages/sip/sip-native_4.7.1.bb
 create mode 100644 packages/sip/sip-native_4.7.3.bb

diff --git a/packages/python/python-sip_4.7.1.bb b/packages/python/python-sip_4.7.1.bb
deleted file mode 100644
index fc87b01e53..0000000000
--- a/packages/python/python-sip_4.7.1.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries"
-SECTION = "devel/python"
-HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
-AUTHOR = "Phil Thompson"
-LICENSE = "GPL"
-DEPENDS = "python"
-RDEPENDS = "python-core"
-PR = "ml0"
-
-SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz"
-S = "${WORKDIR}/sip-${PV}/siplib"
-
-inherit qt4x11 distutils-base
-
-EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \
-                         CONFIG=console \
-                         DESTDIR= \
-                         VERSION=1.0.0 \
-                         TARGET=sip \
-                         DEFINES=SIP_QT_SUPPORT \
-                         INCLUDEPATH+=. \
-                         INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \
-                         INCLUDEPATH+=${STAGING_INCDIR}"
-
-
-do_configure_prepend() {
-	cat siplib.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > siplib.pro
-}
-
-do_stage() {
-	install -d ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/
-	# sipconfig.py sipdistutils.py
-	install -m 0644 sip.h ${STAGING_INCDIR}/sip.h
-}
-
-do_install() {
-	install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/
-	install -m 0755 libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so
-}
-
-FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so"
-
diff --git a/packages/python/python-sip_4.7.3.bb b/packages/python/python-sip_4.7.3.bb
new file mode 100644
index 0000000000..fc87b01e53
--- /dev/null
+++ b/packages/python/python-sip_4.7.3.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries"
+SECTION = "devel/python"
+HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
+AUTHOR = "Phil Thompson"
+LICENSE = "GPL"
+DEPENDS = "python"
+RDEPENDS = "python-core"
+PR = "ml0"
+
+SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz"
+S = "${WORKDIR}/sip-${PV}/siplib"
+
+inherit qt4x11 distutils-base
+
+EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \
+                         CONFIG=console \
+                         DESTDIR= \
+                         VERSION=1.0.0 \
+                         TARGET=sip \
+                         DEFINES=SIP_QT_SUPPORT \
+                         INCLUDEPATH+=. \
+                         INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \
+                         INCLUDEPATH+=${STAGING_INCDIR}"
+
+
+do_configure_prepend() {
+	cat siplib.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > siplib.pro
+}
+
+do_stage() {
+	install -d ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/
+	# sipconfig.py sipdistutils.py
+	install -m 0644 sip.h ${STAGING_INCDIR}/sip.h
+}
+
+do_install() {
+	install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/
+	install -m 0755 libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so
+}
+
+FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so"
+
diff --git a/packages/sip/sip-native_4.7.1.bb b/packages/sip/sip-native_4.7.1.bb
deleted file mode 100644
index b47a3a7539..0000000000
--- a/packages/sip/sip-native_4.7.1.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 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.3.bb b/packages/sip/sip-native_4.7.3.bb
new file mode 100644
index 0000000000..b47a3a7539
--- /dev/null
+++ b/packages/sip/sip-native_4.7.3.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
+}
+
-- 
cgit v1.2.3