merge of 1b2e21b185da17a194d778853f848c2e86a2d31a

     and 649d3cf23ceed3a98c61de4cfc356bb3848b9cf3

77 files changed, 702 insertions, 1712 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 9c1ba1f47c..7893fd75cf 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -150,6 +150,7 @@ STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
 STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include"
 STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share"
 STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader"
+STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
 
 DEPLOY_DIR = "${TMPDIR}/deploy"
 DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
diff --git a/packages/e17/e-wm_0.16.999.026.bb b/packages/e17/e-wm_0.16.999.027.bb
index df78fbdcd0..df78fbdcd0 100644
--- a/packages/e17/e-wm_0.16.999.026.bb
+++ b/packages/e17/e-wm_0.16.999.027.bb
diff --git a/packages/efl/e_0.16.999.026.bb b/packages/efl/e_0.16.999.027.bb
index 5078c71365..5078c71365 100644
--- a/packages/efl/e_0.16.999.026.bb
+++ b/packages/efl/e_0.16.999.027.bb
diff --git a/packages/efl/ecore-fb_0.9.9.026.bb b/packages/efl/ecore-fb_0.9.9.027.bb
index a957c5dd8c..a957c5dd8c 100644
--- a/packages/efl/ecore-fb_0.9.9.026.bb
+++ b/packages/efl/ecore-fb_0.9.9.027.bb
diff --git a/packages/efl/ecore-native_0.9.9.026.bb b/packages/efl/ecore-native_0.9.9.027.bb
index 299470841c..299470841c 100644
--- a/packages/efl/ecore-native_0.9.9.026.bb
+++ b/packages/efl/ecore-native_0.9.9.027.bb
diff --git a/packages/efl/ecore-x11_0.9.9.026.bb b/packages/efl/ecore-x11_0.9.9.027.bb
index 3a88ad229b..3a88ad229b 100644
--- a/packages/efl/ecore-x11_0.9.9.026.bb
+++ b/packages/efl/ecore-x11_0.9.9.027.bb
diff --git a/packages/efl/edje-native_0.5.0.026.bb b/packages/efl/edje-native_0.5.0.027.bb
index 5eb077922a..5eb077922a 100644
--- a/packages/efl/edje-native_0.5.0.026.bb
+++ b/packages/efl/edje-native_0.5.0.027.bb
diff --git a/packages/efl/edje-utils_0.5.0.026.bb b/packages/efl/edje-utils_0.5.0.027.bb
index f8eb917e4d..f8eb917e4d 100644
--- a/packages/efl/edje-utils_0.5.0.026.bb
+++ b/packages/efl/edje-utils_0.5.0.027.bb
diff --git a/packages/efl/edje_0.5.0.026.bb b/packages/efl/edje_0.5.0.027.bb
index d51dd119e4..d51dd119e4 100644
--- a/packages/efl/edje_0.5.0.026.bb
+++ b/packages/efl/edje_0.5.0.027.bb
diff --git a/packages/efl/eet-native_0.9.10.026.bb b/packages/efl/eet-native_0.9.10.027.bb
index fa20c9fb30..fa20c9fb30 100644
--- a/packages/efl/eet-native_0.9.10.026.bb
+++ b/packages/efl/eet-native_0.9.10.027.bb
diff --git a/packages/efl/eet_0.9.10.026.bb b/packages/efl/eet_0.9.10.027.bb
index 6e6032e098..6e6032e098 100644
--- a/packages/efl/eet_0.9.10.026.bb
+++ b/packages/efl/eet_0.9.10.027.bb
diff --git a/packages/efl/embryo-native_0.9.1.026.bb b/packages/efl/embryo-native_0.9.1.027.bb
index a33adb7bd2..a33adb7bd2 100644
--- a/packages/efl/embryo-native_0.9.1.026.bb
+++ b/packages/efl/embryo-native_0.9.1.027.bb
diff --git a/packages/efl/embryo-utils_0.9.1.026.bb b/packages/efl/embryo-utils_0.9.1.027.bb
index d507c53cce..d507c53cce 100644
--- a/packages/efl/embryo-utils_0.9.1.026.bb
+++ b/packages/efl/embryo-utils_0.9.1.027.bb
diff --git a/packages/efl/embryo_0.9.1.026.bb b/packages/efl/embryo_0.9.1.027.bb
index 0009c0a149..0009c0a149 100644
--- a/packages/efl/embryo_0.9.1.026.bb
+++ b/packages/efl/embryo_0.9.1.027.bb
diff --git a/packages/efl/evas-fb_0.9.9.026.bb b/packages/efl/evas-fb_0.9.9.027.bb
index 3f7847874c..3f7847874c 100644
--- a/packages/efl/evas-fb_0.9.9.026.bb
+++ b/packages/efl/evas-fb_0.9.9.027.bb
diff --git a/packages/efl/evas-native_0.9.9.026.bb b/packages/efl/evas-native_0.9.9.027.bb
index cbcbe304e9..cbcbe304e9 100644
--- a/packages/efl/evas-native_0.9.9.026.bb
+++ b/packages/efl/evas-native_0.9.9.027.bb
diff --git a/packages/efl/evas-x11_0.9.9.026.bb b/packages/efl/evas-x11_0.9.9.027.bb
index e130923816..e130923816 100644
--- a/packages/efl/evas-x11_0.9.9.026.bb
+++ b/packages/efl/evas-x11_0.9.9.027.bb
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index e93803982e..4577535aaa 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -12,7 +12,7 @@ inherit efl
 export FREETYPE_CONFIG		= "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}"
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \
-           file://fix-configure-${PV}.patch;patch=1 \
+           file://fix-configure.patch;patch=1 \
            ${E_CVS};module=e17/libs/evas/m4;date=20060101"
 
 S = "${WORKDIR}/evas-${PV}"
diff --git a/packages/efl/evas/fix-configure-0.9.9.026.patch b/packages/efl/evas/fix-configure.patch
index 61e2446c24..61e2446c24 100644
--- a/packages/efl/evas/fix-configure-0.9.9.026.patch
+++ b/packages/efl/evas/fix-configure.patch
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch b/packages/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch
index 0f1edb7d42..7f3622ea4c 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch
+++ b/packages/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch
@@ -819,7 +819,7 @@ Index: SDL-1.2.7/src/video/qtopia/SDL_QWin.h
  class SDL_QWin : public QWidget
  {
    void QueueKey(QKeyEvent *e, int pressed);
-+  int SDL_QWin::ApplyKeyRotation(int key);
++  int ApplyKeyRotation(int key);
   public:
    SDL_QWin(const QSize& size);
    virtual ~SDL_QWin();
diff --git a/packages/python/python-2.3.4-manifest.inc b/packages/python/python-2.3.4-manifest.inc
deleted file mode 100644
index e2344f2029..0000000000
--- a/packages/python/python-2.3.4-manifest.inc
+++ /dev/null
@@ -1,210 +0,0 @@
-### AUTO-GENERATED by './generate-bb.py' [(C) 2002-2004 Michael Lauer] on Sat Oct 16 12:45:14 2004
-###
-### Warning: Manual edits will be lost!
-###
- 
-
-PACKAGES="python-codecs python-threading python-distutils python-textutils python-curses python-pickle python-core python-io python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-math python-hotshot python-unixadmin python-gdbm python-fcntl python-netclient python-pprint python-netserver python-compiler python-syslog python-html python-readline python-pydoc python-xml python-mime python-unittest python-stringold python-compile python-shell python-mmap python-zlib python-db python-crypt python-lang python-audio "
-
-DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"
-PR_python-codecs="ml2"
-RDEPENDS_python-codecs="python-core"
-FILES_python-codecs="${libdir}/python2.3/codecs.* ${libdir}/python2.3/encodings ${libdir}/python2.3/locale.* ${libdir}/python2.3/lib-dynload/_locale.so ${libdir}/python2.3/lib-dynload/unicodedata.so ${libdir}/python2.3/gettext.* ${libdir}/python2.3/xdrlib.* "
-
-DESCRIPTION_python-threading="Python Threading & Synchronization Support"
-PR_python-threading="ml2"
-RDEPENDS_python-threading="python-core python-lang"
-FILES_python-threading="${libdir}/python2.3/bisect.* ${libdir}/python2.3/threading.* ${libdir}/python2.3/Queue.* "
-
-DESCRIPTION_python-distutils="Python Distribution Utility"
-PR_python-distutils="ml2"
-RDEPENDS_python-distutils="python-core"
-FILES_python-distutils="${libdir}/python2.3/distutils "
-
-DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
-PR_python-textutils="ml2"
-RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
-FILES_python-textutils="${libdir}/python2.3/lib-dynload/_csv.so ${libdir}/python2.3/csv.* ${libdir}/python2.3/optparse.* ${libdir}/python2.3/textwrap.* "
-
-DESCRIPTION_python-curses="Python Curses Support"
-PR_python-curses="ml2"
-RDEPENDS_python-curses="python-core libncurses5"
-FILES_python-curses="${libdir}/python2.3/curses ${libdir}/python2.3/lib-dynload/_curses.so ${libdir}/python2.3/lib-dynload/_curses_panel.so "
-
-DESCRIPTION_python-pickle="Python Persistence Support"
-PR_python-pickle="ml2"
-RDEPENDS_python-pickle="python-core python-re"
-FILES_python-pickle="${libdir}/python2.3/pickle.* ${libdir}/python2.3/shelve.* ${libdir}/python2.3/lib-dynload/cPickle.so "
-
-DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
-PR_python-core="ml2"
-RDEPENDS_python-core=""
-FILES_python-core="${libdir}/python2.3/__future__.* ${libdir}/python2.3/copy.* ${libdir}/python2.3/copy_reg.* ${libdir}/python2.3/ConfigParser.py ${libdir}/python2.3/getopt.* ${libdir}/python2.3/new.* ${libdir}/python2.3/os.* ${libdir}/python2.3/posixpath.* ${libdir}/python2.3/warnings.* ${libdir}/python2.3/site.* ${libdir}/python2.3/stat.* ${libdir}/python2.3/UserDict.* ${libdir}/python2.3/lib-dynload/binascii.so ${libdir}/python2.3/lib-dynload/struct.so ${libdir}/python2.3/lib-dynload/time.so ${libdir}/python2.3/lib-dynload/xreadlines.so ${libdir}/python2.3/types.* ${bindir}/python "
-
-DESCRIPTION_python-io="Python Low-Level I/O"
-PR_python-io="ml2"
-RDEPENDS_python-io="python-core python-math"
-FILES_python-io="${libdir}/python2.3/lib-dynload/_socket.so ${libdir}/python2.3/lib-dynload/select.so ${libdir}/python2.3/lib-dynload/termios.so ${libdir}/python2.3/lib-dynload/cStringIO.so ${libdir}/python2.3/pipes.* ${libdir}/python2.3/socket.* ${libdir}/python2.3/tempfile.* ${libdir}/python2.3/StringIO.* "
-
-DESCRIPTION_python-compression="Python High Level Compression Support"
-PR_python-compression="ml2"
-RDEPENDS_python-compression="python-core python-zlib"
-FILES_python-compression="${libdir}/python2.3/gzip.* ${libdir}/python2.3/zipfile.* "
-
-DESCRIPTION_python-re="Python Regular Expression APIs"
-PR_python-re="ml2"
-RDEPENDS_python-re="python-core python-stringold"
-FILES_python-re="${libdir}/python2.3/re.* ${libdir}/python2.3/sre.* ${libdir}/python2.3/sre_compile.* ${libdir}/python2.3/sre_constants* ${libdir}/python2.3/sre_parse.* "
-
-DESCRIPTION_python-xmlrpc="Python XMLRPC Support"
-PR_python-xmlrpc="ml2"
-RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang"
-FILES_python-xmlrpc="${libdir}/python2.3/xmlrpclib.* ${libdir}/python2.3/SimpleXMLRPCServer.* "
-
-DESCRIPTION_python-terminal="Python Terminal Controlling Support"
-PR_python-terminal="ml2"
-RDEPENDS_python-terminal="python-core python-io"
-FILES_python-terminal="${libdir}/python2.3/pty.* ${libdir}/python2.3/tty.* "
-
-DESCRIPTION_python-email="Python Email Support"
-PR_python-email="ml2"
-RDEPENDS_python-email="python-core python-io python-re"
-FILES_python-email="${libdir}/python2.3/email "
-
-DESCRIPTION_python-image="Python Graphical Image Handling"
-PR_python-image="ml2"
-RDEPENDS_python-image="python-core"
-FILES_python-image="${libdir}/python2.3/colorsys.* ${libdir}/python2.3/imghdr.* ${libdir}/python2.3/lib-dynload/imageop.so ${libdir}/python2.3/lib-dynload/rgbimg.so "
-
-DESCRIPTION_python-resource="Python Resource Control Interface"
-PR_python-resource="ml2"
-RDEPENDS_python-resource="python-core"
-FILES_python-resource="${libdir}/python2.3/lib-dynload/resource.so "
-
-DESCRIPTION_python-math="Python Math Support"
-PR_python-math="ml2"
-RDEPENDS_python-math="python-core"
-FILES_python-math="${libdir}/python2.3/lib-dynload/cmath.so ${libdir}/python2.3/lib-dynload/math.so ${libdir}/python2.3/lib-dynload/_random.so ${libdir}/python2.3/random.* "
-
-DESCRIPTION_python-hotshot="Python Hotshot Profiler"
-PR_python-hotshot="ml2"
-RDEPENDS_python-hotshot="python-core"
-FILES_python-hotshot="${libdir}/python2.3/hotshot ${libdir}/python2.3/lib-dynload/_hotshot.so "
-
-DESCRIPTION_python-unixadmin="Python Unix Administration Support"
-PR_python-unixadmin="ml2"
-RDEPENDS_python-unixadmin="python-core"
-FILES_python-unixadmin="${libdir}/python2.3/lib-dynload/nis.so ${libdir}/python2.3/lib-dynload/grp.so ${libdir}/python2.3/lib-dynload/pwd.so ${libdir}/python2.3/getpass.* "
-
-DESCRIPTION_python-gdbm="Python GNU Database Support"
-PR_python-gdbm="ml2"
-RDEPENDS_python-gdbm="python-core libgdbm3"
-FILES_python-gdbm="${libdir}/python2.3/lib-dynload/gdbm.so "
-
-DESCRIPTION_python-fcntl="Python's fcntl Interface"
-PR_python-fcntl="ml2"
-RDEPENDS_python-fcntl="python-core"
-FILES_python-fcntl="${libdir}/python2.3/lib-dynload/fcntl.so "
-
-DESCRIPTION_python-netclient="Python Internet Protocol Clients"
-PR_python-netclient="ml2"
-RDEPENDS_python-netclient="python-core python-io python-mime"
-FILES_python-netclient="${libdir}/python2.3/base64.* ${libdir}/python2.3/ftplib.* ${libdir}/python2.3/gopherlib.* ${libdir}/python2.3/hmac.* ${libdir}/python2.3/httplib.* ${libdir}/python2.3/mimetypes.* ${libdir}/python2.3/nntplib.* ${libdir}/python2.3/poplib.* ${libdir}/python2.3/smtplib.* ${libdir}/python2.3/telnetlib.* ${libdir}/python2.3/urllib.* ${libdir}/python2.3/urllib2.* ${libdir}/python2.3/urlparse.* "
-
-DESCRIPTION_python-pprint="Python Pretty-Print Support"
-PR_python-pprint="ml2"
-RDEPENDS_python-pprint="python-core"
-FILES_python-pprint="${libdir}/python2.3/pprint.* "
-
-DESCRIPTION_python-netserver="Python Internet Protocol Servers"
-PR_python-netserver="ml2"
-RDEPENDS_python-netserver="python-core python-netclient"
-FILES_python-netserver="${libdir}/python2.3/cgi.* ${libdir}/python2.3/BaseHTTPServer.* ${libdir}/python2.3/SimpleHTTPServer.* ${libdir}/python2.3/SocketServer.* "
-
-DESCRIPTION_python-compiler="Python Compiler Support"
-PR_python-compiler="ml2"
-RDEPENDS_python-compiler="python-core"
-FILES_python-compiler="${libdir}/python2.3/compiler "
-
-DESCRIPTION_python-syslog="Python's syslog Interface"
-PR_python-syslog="ml2"
-RDEPENDS_python-syslog="python-core"
-FILES_python-syslog="${libdir}/python2.3/lib-dynload/syslog.so "
-
-DESCRIPTION_python-html="Python HTML Processing"
-PR_python-html="ml2"
-RDEPENDS_python-html="python-core"
-FILES_python-html="${libdir}/python2.3/formatter.* ${libdir}/python2.3/htmlentitydefs.* ${libdir}/python2.3/htmllib.* ${libdir}/python2.3/markupbase.* ${libdir}/python2.3/sgmllib.* "
-
-DESCRIPTION_python-readline="Python Readline Support"
-PR_python-readline="ml2"
-RDEPENDS_python-readline="python-core libreadline4"
-FILES_python-readline="${libdir}/python2.3/lib-dynload/readline.so ${libdir}/python2.3/rlcompleter.* "
-
-DESCRIPTION_python-pydoc="Python Interactive Help Support"
-PR_python-pydoc="ml2"
-RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
-FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.3/pydoc.* "
-
-DESCRIPTION_python-xml="Python basic XML support."
-PR_python-xml="ml2"</