BUGFIX: the python packages should now build again

(fixed some dependencies, too)

BKrev: 402e388ceppLnKc1s7M7m_83993tLQ

7 files changed, 103 insertions, 9 deletions

diff --git a/libsip/libsip_3.10.oe b/libsip/libsip_3.10.oe
index af582066fc..09dc0c8346 100644
--- a/libsip/libsip_3.10.oe
+++ b/libsip/libsip_3.10.oe
@@ -24,8 +24,8 @@ EXTRA_QMAKEVARS_POST = ' CONFIG=qte \
                          DEFINES=SIP_MAKE_DLL \
                          DEFINES+=SIP_QT_SUPPORT \
                          INCLUDEPATH=. \
-                         INCLUDEPATH+=${STAGING_DIR}/build/include/python2.3 \
-                         INCLUDEPATH+=${STAGING_DIR}/target/include '
+                         INCLUDEPATH+=${STAGING_INCDIR}/python2.3 \
+                         INCLUDEPATH+=${STAGING_INCDIR} '
 
 
 #
diff --git a/python/python-native_2.3.3.oe b/python/python-native_2.3.3.oe
index 08433a3560..97859cc184 100644
--- a/python/python-native_2.3.3.oe
+++ b/python/python-native_2.3.3.oe
@@ -12,14 +12,14 @@ inherit autotools native
 
 DEPENDS=patcher-native
 
-EXTRA_OECONF = '--with-threads --with-pymalloc --with-cyclic-gc --with-exec-prefix=${STAGING_DIR}/build'
+EXTRA_OECONF = '--with-threads --with-pymalloc --with-cyclic-gc --with-prefix=${STAGING_DIR} --with-exec-prefix=${STAGING_DIR}/build'
+
 do_configure () {
 	oe_runconf
 }
 
-do_stage_append() {
+do_stage() {
 	# install pgen for later usage with non-native builds
 	install Parser/pgen ${STAGING_DIR}/build/bin
 }
 
-
diff --git a/python/python-pyqt_3.10.oe b/python/python-pyqt_3.10.oe
index 49ee571a6f..6757a910ec 100644
--- a/python/python-pyqt_3.10.oe
+++ b/python/python-pyqt_3.10.oe
@@ -2,8 +2,9 @@ DESCRIPTION="Python Qt/Embedded + Qt/Palmtop Bindings"
 SECTION=base
 PRIORITY=optional
 MAINTAINER="Michael Lauer <mickey@Vanille.de>"
-LICENSE="GPL"
-DEPENDS="virtual/libc virtual/libqte2 virtual/libqpe"
+LICENSE=GPL
+RDEPENDS=python-core libqte2 libqpe1
+DEPENDS=virtual/libc virtual/libqte2 virtual/libqpe libsip sip-native
 SRCNAME=pyqt
 
 SRC_URI = http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \
@@ -21,8 +22,8 @@ EXTRA_QMAKEVARS_POST = ' QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BIN
                          DESTDIR=${STAGING_LIBDIR}/python2.3/site-packages \
                          DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT \
                          INCLUDEPATH=. \
-                         INCLUDEPATH+=${STAGING_DIR}/build/include/python2.3 \
-                         INCLUDEPATH+=${STAGING_DIR}/target/include \
+                         INCLUDEPATH+=${STAGING_INCDIR}/python2.3 \
+                         INCLUDEPATH+=${STAGING_INCDIR} \
                          LIBS=-L${STAGING_LIBDIR}/python2.3/site-packages \
                          LIBS+=-L${STAGING_LIBDIR} LIBS+=-lqte LIBS+=-lqpe LIBS+=-lsip '
 
diff --git a/python/python-pyqwt-3.10/qtmod-sip-staging.patch b/python/python-pyqwt-3.10/qtmod-sip-staging.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/python/python-pyqwt-3.10/qtmod-sip-staging.patch
diff --git a/python/python-pyqwt_3.10.oe b/python/python-pyqwt_3.10.oe
index e69de29bb2..33f27d628a 100644
--- a/python/python-pyqwt_3.10.oe
+++ b/python/python-pyqwt_3.10.oe
@@ -0,0 +1,77 @@
+DESCRIPTION="Python QWT Bindings"
+SECTION=base
+PRIORITY=optional
+MAINTAINER="Michael Lauer <mickey@Vanille.de>"
+LICENSE=GPL"
+RDEPENDS=python-core python-pyqt (${PV}) python-numeric qwt
+DEPENDS=virtual/libc virtual/libqte2 python-numeric python-pyqt qwt
+SRCNAME=pyqwt
+
+SRC_URI = http://pyqwt.sourceforge.net/snapshot/PyQwt-20040118.tar.gz \
+          file://${FILESDIR}/qt2.x-compat.patch;patch=1               \
+          file://${FILESDIR}/qtmod-sip-staging.patch;patch=1
+S = ${WORKDIR}/PyQwt-20040118
+
+export QTDIR=${STAGING_DIR}/target
+
+EXTRA_QMAKEVARS_POST = ' QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, \
+                         CONFIG=qte CONFIG+=warn_on CONFIG+=release \
+                         DESTDIR=${STAGING_LIBDIR}/python2.3/site-packages \
+                         DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=HAS_NUMERIC\
+                         INCLUDEPATH=. INCLUDEPATH+=../numpy \
+                         INCLUDEPATH+=${STAGING_INCDIR}/python2.3 \
+                         INCLUDEPATH+=${STAGING_INCDIR}/ \
+                         LIBS=-L${STAGING_LIBDIR}/python2.3/site-packages \
+                         LIBS+=-L${STAGING_LIBDIR} LIBS+=-lqte LIBS+=-lqpe LIBS+=-lsip '
+
+PYTHON=${STAGING_BINDIR}/python
+SIP=${STAGING_BINDIR}/sip
+QMAKE=${STAGING_BINDIR}/qmake
+QMAKESPEC=${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++
+
+MODULES=qwt
+
+do_configure_prepend() {
+    echo "%Makefile qwt.pro" >>sip/qwtmod.sip
+    echo "TEMPLATE=lib" >>sip/qwtmod.sip
+    echo 'SOURCES = $B' >>sip/qwtmod.sip
+    echo 'HEADERS = $H' >>sip/qwtmod.sip
+    echo "%End" >>sip/qwtmod.sip
+}
+
+#%Makefile qwt.pro
+#TEMPLATE = lib
+#TARGET = @BLX_TARGET_LIB@
+#DESTDIR = @PYQT_MODDIR@
+#CONFIG += @BLX_CONFIG_LIB@ @PYQT_WARN@
+#INCLUDEPATH = @BLX_INCLUDEPATH@
+#DEFINES = @BLX_DEFINES@
+#LIBS += @PYQT_QASSISTANTCLIENT_LIB@ @BLX_LIBS@
+#macx:QMAKE_LFLAGS += -framework Python
+#SOURCES = $B
+#HEADERS = $H
+#%End
+
+do_configure() {
+    for module in ${MODULES}
+    do
+        mkdir -p ${module}
+        ${SIP} -Isip -I${STAGING_SIPDIR} -tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1 -z${FILESDIR}/features -c ${module} -m ${module}.pro sip/${module}mod.sip
+        mv -f ${module}.pro ${module}/${module}.pro
+    done
+
+    for module in ${MODULES}
+    do
+        cd ${S}/${module}
+        ${QMAKE} -spec ${QMAKESPEC} -after TARGET=${module}cmodule ${EXTRA_QMAKEVARS_POST}
+    done
+}
+
+do_compile() {
+    for module in ${MODULES}
+    do
+        cd ${S}/${module}
+        oe_runmake
+    done
+}
+
diff --git a/python/python-sqlite_0.5.0.oe b/python/python-sqlite_0.5.0.oe
index e69de29bb2..0929d77ea8 100644
--- a/python/python-sqlite_0.5.0.oe
+++ b/python/python-sqlite_0.5.0.oe
@@ -0,0 +1,12 @@
+DESCRIPTION="A Python extension for the SQLite Embedded Relational Database"
+SECTION=base
+PRIORITY=optional
+MAINTAINER="Michael Lauer <mickey@Vanille.de>"
+RDEPENDS=libc6 python-core python-re python-lang sqlite
+DEPENDS=virtual/libc sqlite
+SRCNAME=pysqlite
+
+SRC_URI = ${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz
+S = ${WORKDIR}/${SRCNAME}
+
+inherit distutils
diff --git a/python/python_2.3.3.oe b/python/python_2.3.3.oe
index fa2916b56c..7717db70c0 100644
--- a/python/python_2.3.3.oe
+++ b/python/python_2.3.3.oe
@@ -39,6 +39,10 @@ do_compile() {
 		   STAGING_DIR=${STAGING_DIR}
 }
 
+do_stage() {
+	install -m 0644 Include/*.h ${STAGING_INCDIR}/python2.3/
+}
+
 do_install() {
 	install -m 0644 Makefile.orig Makefile
         oe_runmake HOSTPGEN=${STAGING_BINDIR}/pgen \