Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/10/15 22:48:29+02:00 uni-frankfurt.de!mickeyl
PyQWT: catch up w/ qt staging changes and convert to new sip build scheme

2004/10/15 21:34:06+02:00 uni-frankfurt.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/10/15 20:02:59+02:00 uni-frankfurt.de!mickeyl
eliminate bogus , in python subpackage dependencies

BKrev: 4170d57auYHNzygm8Dj-BXq7BOkgyg

3 files changed, 37 insertions, 42 deletions

diff --git a/python/python-2.3.4-manifest.inc b/python/python-2.3.4-manifest.inc
index 0580526065..4e268f9678 100644
--- a/python/python-2.3.4-manifest.inc
+++ b/python/python-2.3.4-manifest.inc
@@ -1,4 +1,4 @@
-### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2004 Michael Lauer] on Tue Oct  5 23:44:21 2004
+### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2004 Michael Lauer] on Fri Oct 15 20:00:43 2004
 ###
 ### Warning: Manual edits will be lost!
 ###
@@ -13,7 +13,7 @@ FILES_python-codecs="/usr/lib/python2.3/codecs.* /usr/lib/python2.3/encodings /u
 
 DESCRIPTION_python-threading="Python Threading & Synchronization Support"
 PR_python-threading="ml1"
-RDEPENDS_python-threading="python-core, python-lang"
+RDEPENDS_python-threading="python-core python-lang"
 FILES_python-threading="/usr/lib/python2.3/bisect.* /usr/lib/python2.3/threading.* /usr/lib/python2.3/Queue.* "
 
 DESCRIPTION_python-distutils="Python Distribution Utility"
@@ -23,17 +23,17 @@ FILES_python-distutils="/usr/lib/python2.3/distutils "
 
 DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
 PR_python-textutils="ml1"
-RDEPENDS_python-textutils="python-core, python-io, python-re, python-stringold"
+RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
 FILES_python-textutils="/usr/lib/python2.3/lib-dynload/_csv.so /usr/lib/python2.3/csv.* /usr/lib/python2.3/optparse.* /usr/lib/python2.3/textwrap.* "
 
 DESCRIPTION_python-curses="Python Curses Support"
 PR_python-curses="ml1"
-RDEPENDS_python-curses="python-core, libncurses5"
+RDEPENDS_python-curses="python-core libncurses5"
 FILES_python-curses="/usr/lib/python2.3/curses /usr/lib/python2.3/lib-dynload/_curses.so /usr/lib/python2.3/lib-dynload/_curses_panel.so "
 
 DESCRIPTION_python-pickle="Python Persistence Support"
 PR_python-pickle="ml1"
-RDEPENDS_python-pickle="python-core, python-re"
+RDEPENDS_python-pickle="python-core python-re"
 FILES_python-pickle="/usr/lib/python2.3/pickle.* /usr/lib/python2.3/shelve.* /usr/lib/python2.3/lib-dynload/cPickle.so "
 
 DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
@@ -43,32 +43,32 @@ FILES_python-core="/usr/lib/python2.3/__future__.* /usr/lib/python2.3/copy.* /us
 
 DESCRIPTION_python-io="Python Low-Level I/O"
 PR_python-io="ml1"
-RDEPENDS_python-io="python-core, python-math"
+RDEPENDS_python-io="python-core python-math"
 FILES_python-io="/usr/lib/python2.3/lib-dynload/_socket.so /usr/lib/python2.3/lib-dynload/select.so /usr/lib/python2.3/lib-dynload/termios.so /usr/lib/python2.3/lib-dynload/cStringIO.so /usr/lib/python2.3/pipes.* /usr/lib/python2.3/socket.* /usr/lib/python2.3/tempfile.* /usr/lib/python2.3/StringIO.* "
 
 DESCRIPTION_python-compression="Python High Level Compression Support"
 PR_python-compression="ml1"
-RDEPENDS_python-compression="python-core, python-zlib"
+RDEPENDS_python-compression="python-core python-zlib"
 FILES_python-compression="/usr/lib/python2.3/gzip.* /usr/lib/python2.3/zipfile.* "
 
 DESCRIPTION_python-re="Python Regular Expression APIs"
 PR_python-re="ml1"
-RDEPENDS_python-re="python-core, python-stringold"
+RDEPENDS_python-re="python-core python-stringold"
 FILES_python-re="/usr/lib/python2.3/re.* /usr/lib/python2.3/sre.* /usr/lib/python2.3/sre_compile.* /usr/lib/python2.3/sre_constants* /usr/lib/python2.3/sre_parse.* "
 
 DESCRIPTION_python-xmlrpc="Python XMLRPC Support"
 PR_python-xmlrpc="ml1"
-RDEPENDS_python-xmlrpc="python-core, python-xml, python-netserver, python-lang"
+RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang"
 FILES_python-xmlrpc="/usr/lib/python2.3/xmlrpclib.* /usr/lib/python2.3/SimpleXMLRPCServer.* "
 
 DESCRIPTION_python-terminal="Python Terminal Controlling Support"
 PR_python-terminal="ml1"
-RDEPENDS_python-terminal="python-core, python-io"
+RDEPENDS_python-terminal="python-core python-io"
 FILES_python-terminal="/usr/lib/python2.3/pty.* /usr/lib/python2.3/tty.* "
 
 DESCRIPTION_python-email="Python Email Support"
 PR_python-email="ml1"
-RDEPENDS_python-email="python-core, python-io, python-re"
+RDEPENDS_python-email="python-core python-io python-re"
 FILES_python-email="/usr/lib/python2.3/email "
 
 DESCRIPTION_python-image="Python Graphical Image Handling"
@@ -98,7 +98,7 @@ FILES_python-unixadmin="/usr/lib/python2.3/lib-dynload/nis.so /usr/lib/python2.3
 
 DESCRIPTION_python-gdbm="Python GNU Database Support"
 PR_python-gdbm="ml1"
-RDEPENDS_python-gdbm="python-core, libgdbm3"
+RDEPENDS_python-gdbm="python-core libgdbm3"
 FILES_python-gdbm="/usr/lib/python2.3/lib-dynload/gdbm.so "
 
 DESCRIPTION_python-fcntl="Python's fcntl Interface"
@@ -108,7 +108,7 @@ FILES_python-fcntl="/usr/lib/python2.3/lib-dynload/fcntl.so "
 
 DESCRIPTION_python-netclient="Python Internet Protocol Clients"
 PR_python-netclient="ml1"
-RDEPENDS_python-netclient="python-core, python-io, python-mime"
+RDEPENDS_python-netclient="python-core python-io python-mime"
 FILES_python-netclient="/usr/lib/python2.3/base64.* /usr/lib/python2.3/ftplib.* /usr/lib/python2.3/gopherlib.* /usr/lib/python2.3/hmac.* /usr/lib/python2.3/httplib.* /usr/lib/python2.3/mimetypes.* /usr/lib/python2.3/nntplib.* /usr/lib/python2.3/poplib.* /usr/lib/python2.3/smtplib.* /usr/lib/python2.3/telnetlib.* /usr/lib/python2.3/urllib.* /usr/lib/python2.3/urllib2.* /usr/lib/python2.3/urlparse.* "
 
 DESCRIPTION_python-pprint="Python Pretty-Print Support"
@@ -118,7 +118,7 @@ FILES_python-pprint="/usr/lib/python2.3/pprint.* "
 
 DESCRIPTION_python-netserver="Python Internet Protocol Servers"
 PR_python-netserver="ml1"
-RDEPENDS_python-netserver="python-core, python-netclient"
+RDEPENDS_python-netserver="python-core python-netclient"
 FILES_python-netserver="/usr/lib/python2.3/cgi.* /usr/lib/python2.3/BaseHTTPServer.* /usr/lib/python2.3/SimpleHTTPServer.* /usr/lib/python2.3/SocketServer.* "
 
 DESCRIPTION_python-compiler="Python Compiler Support"
@@ -138,27 +138,27 @@ FILES_python-html="/usr/lib/python2.3/formatter.* /usr/lib/python2.3/htmlentityd
 
 DESCRIPTION_python-readline="Python Readline Support"
 PR_python-readline="ml1"
-RDEPENDS_python-readline="python-core, libreadline4"
+RDEPENDS_python-readline="python-core libreadline4"
 FILES_python-readline="/usr/lib/python2.3/lib-dynload/readline.so /usr/lib/python2.3/rlcompleter.* "
 
 DESCRIPTION_python-pydoc="Python Interactive Help Support"
 PR_python-pydoc="ml1"
-RDEPENDS_python-pydoc="python-core, python-lang, python-stringold, python-re"
+RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
 FILES_python-pydoc="/usr/bin/pydoc /usr/lib/python2.3/pydoc.* "
 
 DESCRIPTION_python-xml="Python basic XML support."
 PR_python-xml="ml1"
-RDEPENDS_python-xml="python-core, python-re"
+RDEPENDS_python-xml="python-core python-re"
 FILES_python-xml="/usr/lib/python2.3/lib-dynload/pyexpat.so /usr/lib/python2.3/xml /usr/lib/python2.3/xmllib.* "
 
 DESCRIPTION_python-mime="Python MIME Handling APIs"
 PR_python-mime="ml1"
-RDEPENDS_python-mime="python-core, python-io"
+RDEPENDS_python-mime="python-core python-io"
 FILES_python-mime="/usr/lib/python2.3/mimetools.* /usr/lib/python2.3/rfc822.* "
 
 DESCRIPTION_python-unittest="Python Unit Testing Framework"
 PR_python-unittest="ml1"
-RDEPENDS_python-unittest="python-core, python-stringold, python-lang"
+RDEPENDS_python-unittest="python-core python-stringold python-lang"
 FILES_python-unittest="/usr/lib/python2.3/unittest.* "
 
 DESCRIPTION_python-stringold="Python Deprecated String APIs"
@@ -173,17 +173,17 @@ FILES_python-compile="/usr/lib/python2.3/py_compile.* /usr/lib/python2.3/compile
 
 DESCRIPTION_python-shell="Python Shell-Like Functionality"
 PR_python-shell="ml1"
-RDEPENDS_python-shell="python-core, python-re"
+RDEPENDS_python-shell="python-core python-re"
 FILES_python-shell="/usr/lib/python2.3/commands.* /usr/lib/python2.3/dircache.* /usr/lib/python2.3/fnmatch.* /usr/lib/python2.3/glob.* /usr/lib/python2.3/popen2.* /usr/lib/python2.3/shutil.* "
 
 DESCRIPTION_python-mmap="Python Memory-Mapped-File Support"
 PR_python-mmap="ml1"
-RDEPENDS_python-mmap="python-core, python-io"
+RDEPENDS_python-mmap="python-core python-io"
 FILES_python-mmap="/usr/lib/python2.3/lib-dynload/mmap.so "
 
 DESCRIPTION_python-zlib="Python zlib Support."
 PR_python-zlib="ml1"
-RDEPENDS_python-zlib="python-core, zlib1g"
+RDEPENDS_python-zlib="python-core zlib1g"
 FILES_python-zlib="/usr/lib/python2.3/lib-dynload/zlib.so "
 
 DESCRIPTION_python-db="Python File-Based Database Support"
diff --git a/python/python-pyqwt_3.10.oe b/python/python-pyqwt_3.10.oe
index 5c4ecfd050..1f41ab0459 100644
--- a/python/python-pyqwt_3.10.oe
+++ b/python/python-pyqwt_3.10.oe
@@ -1,12 +1,13 @@
-DESCRIPTION = "Python QWT Bindings"
+DESCRIPTION = "Python QWT Bindings, QtE edition"
+HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 SECTION = "devel/python"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-RDEPENDS = "python-core python-pyqt (${PV}) python-numeric qwt"
+RDEPENDS = "python-core python-sip python-pyqt (>=${PV}) python-numeric qwt"
 DEPENDS = "virtual/libqte2 python-numeric python-pyqt qwt"
 SRCNAME = "pyqwt"
-PR = "r1"
+PR = "ml2"
 
 SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \
            file://qt2.x-compat.patch;patch=1 \
@@ -21,15 +22,14 @@ SIP_MODULES = "qwt"
 SIP_FEATURES = "${WORKDIR}/features"   
 EXTRA_OEMAKE = " MAKEFLAGS= "
 
-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 \
-                         TARGET=cmodule DESTDIR= VERSION=1.0.0 \
+EXTRA_QMAKEVARS_POST += "CONFIG=qt CONFIG+=warn_on CONFIG+=release \
+                         TARGET=qwt DESTDIR= VERSION=1.0.0 \
                          DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=HAS_NUMERIC DEFINES+=QWS \
-                         INCLUDEPATH=. INCLUDEPATH+=../numpy \
+                         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 "
+                         INCLUDEPATH+=${STAGING_INCDIR} \
+                         LIBS+=-L${STAGING_LIBDIR}/python2.3/site-packages \
+                         LIBS+=-L${QTDIR}/lib LIBS+=-lqte LIBS+=-lqpe "
 
 do_generate_prepend() {
     echo -e "TEMPLATE=subdirs\nSUBDIRS=qwt\n" >pyqwt.pro
@@ -45,25 +45,20 @@ do_generate_prepend() {
 }
 
 do_stage() {
-    install -d ${STAGING_SIPDIR}/qwt/
+    install -d ${STAGING_SIPDIR}/qt/
     for module in ${SIP_MODULES}
     do
-        cp -a ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qwt/
-        install -m 0755 ${module}/libcmodule.so ${STAGING_LIBDIR}/python2.3/site-packages/lib${module}cmodule.so
+        install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/
+        install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/python2.3/site-packages/${module}.so
     done
 }
 
 do_install() {
     install -d ${D}/${libdir}/python2.3/site-packages/
-    oe_libinstall -so -C ${STAGING_LIBDIR}/python2.3/site-packages libsip ${D}/${libdir}/python2.3/site-packages
     for module in ${SIP_MODULES}
     do
-        install -m 0755 ${module}/libcmodule.so ${D}/${libdir}/python2.3/site-packages/lib${module}cmodule.so
-#        install -m 0644 ${module}/${module}.py ${D}/${libdir}/python2.3/site-packages/
+        install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/python2.3/site-packages/${module}.so
     done
-
-    install -d ${D}/${libdir}/python2.3/site-packages/qwt
-    install -m 0644 ${S}/qwt/*.py ${D}/${libdir}/python2.3/site-packages/qwt/
 }
 
 FILES_${PN} = "/usr/lib/python2.3/site-packages"
diff --git a/python/python_2.3.4.oe b/python/python_2.3.4.oe
index 114dc4b9a2..846b27cb31 100644
--- a/python/python_2.3.4.oe
+++ b/python/python_2.3.4.oe
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "python-native zlib gdbm"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://www.python.org/pub/python/${PV}/Python-${PV}.tar.bz2 \
 	   file://bindir-libdir.patch;patch=1 \