From edf200cdef3db37e8544ef88a1376d5c4ffaa87b Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 19 Jun 2004 12:41:49 +0000
Subject: [PATCH] Merge bk://openembedded@openembedded.bkbits.net/packages into
 r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/06/19 13:31:00+02:00 uni-frankfurt.de!mickey
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/06/19 02:41:35+02:00 uni-frankfurt.de!mickey
remove qte 2.3.8 for now since it has to catch up with 2.3.7
glibc independent build. TT is releaseing 2.3.9 snapshots now (called 2.3.8-snap), btw.

2004/06/19 02:39:22+02:00 uni-frankfurt.de!mickey
minor python fixes

BKrev: 40d4348djT6n5h--n8nPAwEcf6qI2Q
---
 meta/task-python-everything_0.9.0.oe     |  2 +-
 python/python-pycurl_7.12.oe             | 12 ++++
 qte/qte-2.3.8-snap/c700-config.patch     |  0
 qte/qte-2.3.8-snap/c700-hardware.patch   |  0
 qte/qte-2.3.8-snap/compile.patch         |  0
 qte/qte-2.3.8-snap/devfs.patch           |  0
 qte/qte-2.3.8-snap/keyboard.patch        |  0
 qte/qte-2.3.8-snap/no-moc.patch          |  0
 qte/qte-2.3.8-snap/qpe.patch             |  0
 qte/qte-2.3.8-snap/qtopia.patch          |  0
 qte/qte-2.3.8-snap/tslib-calibrate.patch |  0
 qte/qte-2.3.8-snap/tslib-defines.patch   |  0
 qte/qte-2.3.8-snap/tslib.patch           |  0
 qte/qte-2.3.8-snap/tslib2.patch          |  0
 qte/qte-2.3.8-snap/vt-switch.patch       |  0
 qte/qte_2.3.8-snap.oe                    | 71 ------------------------
 16 files changed, 13 insertions(+), 72 deletions(-)
 delete mode 100644 qte/qte-2.3.8-snap/c700-config.patch
 delete mode 100644 qte/qte-2.3.8-snap/c700-hardware.patch
 delete mode 100644 qte/qte-2.3.8-snap/compile.patch
 delete mode 100644 qte/qte-2.3.8-snap/devfs.patch
 delete mode 100644 qte/qte-2.3.8-snap/keyboard.patch
 delete mode 100644 qte/qte-2.3.8-snap/no-moc.patch
 delete mode 100644 qte/qte-2.3.8-snap/qpe.patch
 delete mode 100644 qte/qte-2.3.8-snap/qtopia.patch
 delete mode 100644 qte/qte-2.3.8-snap/tslib-calibrate.patch
 delete mode 100644 qte/qte-2.3.8-snap/tslib-defines.patch
 delete mode 100644 qte/qte-2.3.8-snap/tslib.patch
 delete mode 100644 qte/qte-2.3.8-snap/tslib2.patch
 delete mode 100644 qte/qte-2.3.8-snap/vt-switch.patch
 delete mode 100644 qte/qte_2.3.8-snap.oe

diff --git a/meta/task-python-everything_0.9.0.oe b/meta/task-python-everything_0.9.0.oe
index e54addc46f..e6ae0d1efb 100644
--- a/meta/task-python-everything_0.9.0.oe
+++ b/meta/task-python-everything_0.9.0.oe
@@ -3,7 +3,7 @@ MAINTAINER = "Michael Lauer <mickey@Vanille.de"
 DEPENDS = "	python-ao 		\
 		python-constraint	\
 		python-crypto		\
-		python-curl		\
+		python-pycurl		\
 		python-fnorb		\
 		python-fpconst		\
 		python-gmpy		\
diff --git a/python/python-pycurl_7.12.oe b/python/python-pycurl_7.12.oe
index e69de29bb2..da32853ccb 100644
--- a/python/python-pycurl_7.12.oe
+++ b/python/python-pycurl_7.12.oe
@@ -0,0 +1,12 @@
+DESCRIPTION = "libcurl Python Bindings"
+SECTION = "devel/python"
+PRIORITY = "optional"
+MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
+RDEPENDS = "python-core curl (>=${PV})"
+DEPENDS = "curl"
+SRCNAME = "pycurl"
+
+SRC_URI = "http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
diff --git a/qte/qte-2.3.8-snap/c700-config.patch b/qte/qte-2.3.8-snap/c700-config.patch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/qte/qte-2.3.8-snap/c700-hardware.patch b/qte/qte-2.3.8-snap/c700-hardware.patch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/qte/qte-2.3.8-snap/compile.patch b/qte/qte-2.3.8-snap/compile.patch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/qte/qte-2.3.8-snap/devfs.patch b/qte/qte-2.3.8-snap/devfs.patch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/qte/qte-2.3.8-snap/keyboard.patch b/qte/qte-2.3.8-snap/keyboard.patch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/qte/qte-2.3.8-snap/no-moc.patch b/qte/qte-2.3.8-snap/no-moc.patch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/qte/qte-2.3.8-snap/qpe.patch b/qte/qte-2.3.8-snap/qpe.patch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/qte/qte-2.3.8-snap/qtopia.patch b/qte/qte-2.3.8-snap/qtopia.patch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/qte/qte-2.3.8-snap/tslib-calibrate.patch b/qte/qte-2.3.8-snap/tslib-calibrate.patch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/qte/qte-2.3.8-snap/tslib-defines.patch b/qte/qte-2.3.8-snap/tslib-defines.patch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/qte/qte-2.3.8-snap/tslib.patch b/qte/qte-2.3.8-snap/tslib.patch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/qte/qte-2.3.8-snap/tslib2.patch b/qte/qte-2.3.8-snap/tslib2.patch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/qte/qte-2.3.8-snap/vt-switch.patch b/qte/qte-2.3.8-snap/vt-switch.patch
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/qte/qte_2.3.8-snap.oe b/qte/qte_2.3.8-snap.oe
deleted file mode 100644
index 55b4b28b9f..0000000000
--- a/qte/qte_2.3.8-snap.oe
+++ /dev/null
@@ -1,71 +0,0 @@
-SNAPDATE = "${@'%d%02d%02d' % ( time.localtime()[0], time.localtime()[1], time.localtime()[2]-1 )}" 
-DESCRIPTION = "Qt/Embedded version ${PV}shot as of ${SNAPDATE}"
-LICENSE = "GPL/QPL"
-SECTION = "libs"
-PRIORITY = "optional"
-SRC_URI = "ftp://ftp.trolltech.com/pub/qt/snapshots/qt-embedded-${PV}shot-${SNAPDATE}.tar.gz \
-    	   file://qpe.patch;patch=1 \
-    	   file://tslib.patch;patch=1 \
-    	   file://devfs.patch;patch=1 \
-    	   file://no-moc.patch;patch=1"
-DEPENDS = "base/zlib base/libpng base/jpeg uicmoc-native"
-PROVIDES = "virtual/qte virtual/libqte2"
-S = "${WORKDIR}/qt-${PV}shot-${SNAPDATE}"
-
-export QTDIR = "${S}"
-
-def qte_arch(d):
-	import oe, re
-	arch = oe.data.getVar('TARGET_ARCH', d, 1)
-	if re.match("^i.86$", arch):
-		arch = "x86"
-	elif arch == "x86_64":
-		arch = "x86"
-	elif arch == "mipsel":
-		arch = "mips"
-	return arch
-
-QTE_ARCH := "${@qte_arch(d)}"
-
-EXTRA_OECONF_CONFIG = "-qconfig qpe"
-EXTRA_OECONF_ARCH = "-xplatform ${TARGET_OS}-${QTE_ARCH}-g++"
-EXTRA_OECONF_ARCH_collie = "-xplatform ${TARGET_OS}-sharp-g++"
-EXTRA_OECONF_ARCH_ramses = "-xplatform ${TARGET_OS}-ramses-g++"
-
-EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif ${EXTRA_OECONF_ARCH} ${EXTRA_OECONF_CONFIG}"
-
-EXTRA_OEMAKE = "-e"
-
-export SYSCONF_CC = "${CC}"
-export SYSCONF_CXX = "${CXX}"
-export SYSCONF_LINK = "${CCLD}"
-export SYSCONF_SHLIB = "${CCLD}"
-export SYSCONF_CFLAGS = "${CFLAGS}"
-export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG"
-export SYSCONF_LFLAGS = "${LDFLAGS}"
-export SYSCONF_MOC = "${STAGING_BINDIR}/moc"
-export SYSCONF_UIC = "${STAGING_BINDIR}/uic"
-
-do_configure() {
-    for f in ${S}/configs/linux-*-g++-shared; do
-        sed -e 's,-linux-,-linux-uclibc-,g' < $f \
-            > `echo $f | sed -e 's,linux-,linux-uclibc-,'`
-    done
-    oenote ./configure ${EXTRA_OECONF}
-    echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed"
-}
-
-do_compile() {
-    unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS
-    oe_runmake || die "Compiling qte failed"
-}
-
-do_stage () {
-    oe_libinstall -so -C lib libqte ${STAGING_LIBDIR}
-    rm -f include/qxt.h
-    cp -pfLR include/* ${STAGING_INCDIR}/
-}
-
-do_install () {
-    oe_libinstall -so -C lib libqte ${D}/${palmtopdir}/lib
-}
-- 
2.39.5