Merge commit 'origin/org.openembedded.dev' into holger/openmoko-merges

10 files changed, 46 insertions, 11 deletions

diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc
index 4142a4b620..6c4440877f 100644
--- a/packages/python/python-2.5-manifest.inc
+++ b/packages/python/python-2.5-manifest.inc
@@ -1,5 +1,5 @@
 # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file.
-# Generator: './generate-manifest-2.5.py' Version 20080722 (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
+# Generator: './generate-manifest-2.5.py' Version 20081102 (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
 # Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
 
  
@@ -10,8 +10,8 @@ PACKAGES="python-profile python-threading python-distutils python-doctest python
 
 DESCRIPTION_python-profile="Python Basic Profiling Support"
 PR_python-profile="ml0"
-RDEPENDS_python-profile="python-core"
-FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* "
+RDEPENDS_python-profile="python-core python-textutils"
+FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* ${libdir}/python2.5/cProfile.* ${libdir}/python2.5/lib-dynload/_lsprof.so "
 
 DESCRIPTION_python-threading="Python Threading & Synchronization Support"
 PR_python-threading="ml0"
diff --git a/packages/python/python-ecore_svn.bb b/packages/python/python-ecore_svn.bb
index 1b02bf77df..78aebc62fc 100644
--- a/packages/python/python-ecore_svn.bb
+++ b/packages/python/python-ecore_svn.bb
@@ -1,5 +1,5 @@
 require python-efl.inc
-DEPENDS += "python-evas ecore"
+DEPENDS += "python-evas ecore eina"
 RDEPENDS += "python-evas"
 PV = "0.3.0+svnr${SRCREV}"
 PR = "r0"
diff --git a/packages/python/python-edje_svn.bb b/packages/python/python-edje_svn.bb
index 4e33847dae..532db0875f 100644
--- a/packages/python/python-edje_svn.bb
+++ b/packages/python/python-edje_svn.bb
@@ -1,5 +1,5 @@
 require python-efl.inc
-DEPENDS += "edje python-evas"
+DEPENDS += "edje python-evas eina"
 RDEPENDS += "python-evas"
 PV = "0.3.0+svnr${SRCREV}"
 PR = "r0"
diff --git a/packages/python/python-evas_svn.bb b/packages/python/python-evas_svn.bb
index 6f53bf7e8d..2deb020b70 100644
--- a/packages/python/python-evas_svn.bb
+++ b/packages/python/python-evas_svn.bb
@@ -1,5 +1,5 @@
 require python-efl.inc
-DEPENDS += "evas"
+DEPENDS += "evas eina"
 PV = "0.3.0+svnr${SRCREV}"
 PR = "r0"
 
diff --git a/packages/python/python-fugrep_0.50.bb b/packages/python/python-fugrep_0.50.bb
new file mode 100644
index 0000000000..150cb84130
--- /dev/null
+++ b/packages/python/python-fugrep_0.50.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "FuGrep is a Python library for fuzzy pattern matching."
+HOMEPAGE = "http://www.j-raedler.de/pages/software/fugrep.php"
+SECTION = "devel/python"
+LICENSE = "${PN}"
+SRCNAME = "FuGrep"
+PR = "ml0"
+
+SRC_URI = "http://www.j-raedler.de/media/Software/FuGrep-${PV}.zip"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
diff --git a/packages/python/python-fusil_1.1.bb b/packages/python/python-fusil_1.1.bb
new file mode 100644
index 0000000000..f6ec3d8d6d
--- /dev/null
+++ b/packages/python/python-fusil_1.1.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Fusil is a Python library used to write fuzzing programs."
+HOMEPAGE = "http://fusil.hachoir.org/"
+SECTION = "devel/python"
+LICENSE = "GPLv2"
+SRCNAME = "fusil"
+
+SRC_URI = "http://pypi.python.org/packages/source/f/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+RDEPENDS_${PN} = "\
+  python-ptrace \
+  python-ctypes \
+  python-lang \
+  python-logging \
+  python-datetime \
+  python-shell \
+  python-resource \
+  python-subprocess \
+"
diff --git a/packages/python/python-pygame-1.8.1/Setup b/packages/python/python-pygame-1.8.1/Setup
index cb8085530a..932e291ae2 100644
--- a/packages/python/python-pygame-1.8.1/Setup
+++ b/packages/python/python-pygame-1.8.1/Setup
@@ -28,7 +28,6 @@ mixer src/mixer.c $(SDL) $(MIXER) $(DEBUG)
 mixer_music src/music.c $(SDL) $(MIXER) $(DEBUG)
 _numericsurfarray src/_numericsurfarray.c $(SDL) $(DEBUG)
 _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
-movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
 scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
 
 #experimental new movie movie. requires libavcodec and libavformat.
diff --git a/packages/python/python-pygame_1.8.1.bb b/packages/python/python-pygame_1.8.1.bb
index 71eff50dfb..499f0c6ee3 100644
--- a/packages/python/python-pygame_1.8.1.bb
+++ b/packages/python/python-pygame_1.8.1.bb
@@ -3,9 +3,10 @@ SECTION = "devel/python"
 HOMEPAGE = "http://www.pygame.org"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-DEPENDS = "libsdl-x11 libsdl-image libsdl-mixer libsdl-net libsdl-ttf smpeg python-numeric"
+DEPENDS = "libsdl-x11 libsdl-image libsdl-mixer libsdl-net libsdl-ttf python-numeric"
+DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'smpeg', d)}"
 SRCNAME = "pygame"
-PR = "ml1"
+PR = "ml2"
 
 SRC_URI = "\
   ftp://ftp.pygame.org/pub/pygame/${SRCNAME}-${PV}release.tar.gz \
@@ -17,6 +18,9 @@ inherit distutils
 do_configure_prepend() {
 	cat ${WORKDIR}/Setup >Setup
 	SDL="`sdl-config --cflags` `sdl-config --libs`"; echo "SDL=$SDL" >>Setup
+	if [ '${ENTERPRISE_DISTRO}' != '1' ]; then
+		echo "movie src/movie.c \$(SDL) \$(SMPEG) \$(DEBUG)" >>Setup
+	fi
 }
 
 do_stage() {
diff --git a/packages/python/python-twisted_2.5.0.bb b/packages/python/python-twisted_2.5.0.bb
index e085e81eb6..ccd3e26101 100644
--- a/packages/python/python-twisted_2.5.0.bb
+++ b/packages/python/python-twisted_2.5.0.bb
@@ -37,7 +37,7 @@ FILES_python-twisted-test = " \
 "
 
 FILES_python-twisted-protocols = " \
-  ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/protocols/ \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/ \
 "
 
 FILES_python-twisted-zsh = " \
diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb
index 19dc65b358..b402b974f1 100644
--- a/packages/python/python_2.5.2.bb
+++ b/packages/python/python_2.5.2.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib"
 DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
 # bump this on every change in contrib/python/generate-manifest-2.5.py
-PR = "ml14"
+PR = "ml16"
 
 PYTHON_MAJMIN = "2.5"