merge of '1f5a2c36e677453b7935b6a0f72bbb7b0563a1ed'

     and '60eadea31c2dce277f39d64f53efc32a033d3035'

13 files changed, 127 insertions, 74 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 72b45cc9bc..864f6fe178 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -111,6 +111,7 @@ SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-psplash ?= "249"
+SRCREV_pn-python-formencode = "3148"
 SRCREV_pn-settings-daemon ?= "1755"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "45"
diff --git a/packages/pulseaudio/files/disable-using-glibc-tls.patch b/packages/pulseaudio/files/disable-using-glibc-tls.patch
new file mode 100644
index 0000000000..9646e2c2d0
--- /dev/null
+++ b/packages/pulseaudio/files/disable-using-glibc-tls.patch
@@ -0,0 +1,15 @@
+Index: pulseaudio-0.9.7/configure.ac
+===================================================================
+--- pulseaudio-0.9.7.orig/configure.ac
++++ pulseaudio-0.9.7/configure.ac
+@@ -124,8 +124,8 @@
+ ret=$?
+ rm -f conftest.o conftest
+ if test $ret -eq 0 ; then
+-    AC_DEFINE([HAVE_TLS_BUILTIN], 1, [Have __thread().])
+-    AC_MSG_RESULT([yes])
++dnl    AC_DEFINE([HAVE_TLS_BUILTIN], 1, [Have __thread().])
++    AC_MSG_RESULT([no])
+ else
+     AC_MSG_RESULT([no])
+ fi
diff --git a/packages/pulseaudio/pulseaudio_0.9.7.bb b/packages/pulseaudio/pulseaudio_0.9.7.bb
new file mode 100644
index 0000000000..d466086b50
--- /dev/null
+++ b/packages/pulseaudio/pulseaudio_0.9.7.bb
@@ -0,0 +1,12 @@
+require pulse.inc
+
+# this is not correct (see below)
+SRC_URI += "file://disable-using-glibc-tls.patch;patch=1"
+
+PR = "r0"
+
+# problems w/ pulseaudio 0.9.7 atm:
+# 1.) needs libtool 1.2.24 (which miscompiles plugins in OE, hence we can't make it the default yet)
+# 2.) doesn't build w/ glibc TLS support (hence patched out)
+DEFAULT_PREFERENCE = "-1"
+
diff --git a/packages/python/python-formencode/setup.py.diff b/packages/python/python-formencode/setup.py.diff
deleted file mode 100644
index dc9db4352e..0000000000
--- a/packages/python/python-formencode/setup.py.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- python-formencode-0.4.orig/setup.py
-+++ python-formencode-0.4/setup.py
-@@ -1,6 +1,7 @@
--from ez_setup import use_setuptools
--use_setuptools()
--from setuptools import setup
-+#from ez_setup import use_setuptools
-+#use_setuptools()
-+#from setuptools import setup
-+from distutils.core import setup
- 
- version = '0.4'
- 
diff --git a/packages/python/python-formencode_svn.bb b/packages/python/python-formencode_svn.bb
index b1cf3ce7c7..80a1ba2e5b 100644
--- a/packages/python/python-formencode_svn.bb
+++ b/packages/python/python-formencode_svn.bb
@@ -4,12 +4,11 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "sqlite3"
 SRCNAME = "FormEncode"
-PV = "0.4+svn${SRCDATE}"
+PV = "0.4+svnr${SRCREV}"
 PR = "ml0"
 
 inherit distutils
 
-SRC_URI = "svn://svn.colorstudy.com/FormEncode;module=trunk;proto=http \
-           file://setup.py.diff;patch=1"
+SRC_URI = "svn://svn.colorstudy.com/FormEncode;module=trunk;proto=http"
 
 S = "${WORKDIR}/trunk"
diff --git a/packages/python/python-gst_0.10.8.bb b/packages/python/python-gst_0.10.8.bb
index 7b3535ce25..224d24b59a 100644
--- a/packages/python/python-gst_0.10.8.bb
+++ b/packages/python/python-gst_0.10.8.bb
@@ -21,4 +21,6 @@ do_stage() {
 	autotools_stage_all
 }
 
-FILES_${PN}-dbg = "${libdir}/python2.5/site-packages/gst-0.10/gst/.debug/"
+FILES_${PN} += "${datadir}/gst-python"
+FILES_${PN}-dev += "${datadir}/gst-python/0.10/defs"
+FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/"
diff --git a/packages/python/python-pycairo_1.4.0.bb b/packages/python/python-pycairo_1.4.0.bb
index 0a20010be6..a74c59fdaa 100644
--- a/packages/python/python-pycairo_1.4.0.bb
+++ b/packages/python/python-pycairo_1.4.0.bb
@@ -14,6 +14,3 @@ do_stage() {
 	install -d ${STAGING_INCDIR}
 	install -m 0644 cairo/pycairo.h ${STAGING_INCDIR}
 }
-
-
-FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/cairo/.debug"
diff --git a/packages/python/python-pygobject_2.12.3.bb b/packages/python/python-pygobject_2.12.3.bb
index a9ab5b51ad..bfd04d569d 100644
--- a/packages/python/python-pygobject_2.12.3.bb
+++ b/packages/python/python-pygobject_2.12.3.bb
@@ -6,7 +6,6 @@ PR = "r3"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2 \
            file://python-path.patch;patch=1"
-
 S = "${WORKDIR}/pygobject-${PV}"
 
 inherit autotools distutils-base pkgconfig
@@ -22,5 +21,4 @@ do_stage() {
 }
 
 FILES_${PN} = "${libdir}/python*"
-FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/gobject/.debug"
 FILES_${PN}-dev += "${datadir}/pygobject/xsl"
diff --git a/packages/python/python-pygtk-1.2/acinclude.m4 b/packages/python/python-pygtk-1.2/acinclude.m4
new file mode 100644
index 0000000000..53518fb2eb
--- /dev/null
+++ b/packages/python/python-pygtk-1.2/acinclude.m4
@@ -0,0 +1,90 @@
+## this one is commonly used with AM_PATH_PYTHONDIR ...
+dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
+dnl Check if a module containing a given symbol is visible to python.
+AC_DEFUN(AM_CHECK_PYMOD,
+[AC_REQUIRE([AM_PATH_PYTHON])
+py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
+AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
+AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
+ifelse([$2],[], [prog="
+import sys
+try:
+        import $1
+except ImportError:
+        sys.exit(1)
+except:
+        sys.exit(0)
+sys.exit(0)"], [prog="
+import $1
+$1.$2"])
+if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+  then
+    eval "py_cv_mod_$py_mod_var=yes"
+  else
+    eval "py_cv_mod_$py_mod_var=no"
+  fi
+])
+py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
+if test "x$py_val" != xno; then
+  AC_MSG_RESULT(yes)
+  ifelse([$3], [],, [$3
+])dnl
+else
+  AC_MSG_RESULT(no)
+  ifelse([$4], [],, [$4
+])dnl
+fi
+])
+
+dnl a macro to check for ability to create python extensions
+dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
+dnl function also defines PYTHON_INCLUDES
+AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+[AC_REQUIRE([AM_PATH_PYTHON])
+AC_MSG_CHECKING(for headers required to compile python extensions)
+dnl deduce PYTHON_INCLUDES
+AC_ARG_WITH(python-includes,
+	[  --with-python-includes=DIR  path to Python includes], py_exec_prefix=$withval)
+if test x$py_exec_prefix != x; then
+PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+else
+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+if test "$py_prefix" != "$py_exec_prefix"; then
+  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+fi
+fi
+AC_SUBST(PYTHON_INCLUDES)
+dnl check if the headers exist:
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+AC_TRY_CPP([#include <Python.h>],dnl
+[AC_MSG_RESULT(found)
+$1],dnl
+[AC_MSG_RESULT(not found)
+$2])
+CPPFLAGS="$save_CPPFLAGS"
+])
+
+dnl
+dnl JH_ADD_CFLAG(FLAG)
+dnl checks whether the C compiler supports the given flag, and if so, adds
+dnl it to $CFLAGS.  If the flag is already present in the list, then the
+dnl check is not performed.
+AC_DEFUN([JH_ADD_CFLAG],
+[
+case " $CFLAGS " in
+*@<:@\	\ @:>@$1@<:@\	\ @:>@*)
+  ;;
+*)
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $1"
+  AC_MSG_CHECKING([whether [$]CC understands $1])
+  AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
+  AC_MSG_RESULT($jh_has_option)
+  if test $jh_has_option = no; then
+    CFLAGS="$save_CFLAGS"
+  fi
+  ;;
+esac])
diff --git a/packages/python/python-pygtk_2.10.3.bb b/packages/python/python-pygtk_2.10.3.bb
deleted file mode 100644
index 78c76d47f9..0000000000
--- a/packages/python/python-pygtk_2.10.3.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "Python GTK+ Bindings"
-SECTION = "devel/python"
-# needs gtk+ 2.10.x
-DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
-RDEPENDS = "python-shell"
-SRCNAME = "pygtk"
-LICENSE = "LGPL"
-PR = "ml4"
-
-SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \
-           file://fix-gtkunixprint.patch;patch=1 \
-           file://acinclude.m4"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-EXTRA_OECONF = "--disable-docs"
-EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
-
-inherit autotools pkgconfig distutils-base
-
-FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*"
-FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug"
-
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
-}
-
-require fix-path.inc
-
-FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/*/.debug"
-FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug"
-
-do_stage() {
-	autotools_stage_includes
-        sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0
-        install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/
-	install -d ${STAGING_DATADIR}/pygtk/2.0/codegen
-	install -d ${STAGING_DATADIR}/pygtk/2.0/defs/
-	cp -pPr codegen/*.py* ${STAGING_DATADIR}/pygtk/2.0/codegen/
-	cp -pPr *.defs ${STAGING_DATADIR}/pygtk/2.0/defs/
-	cp -pPr gtk/*.defs ${STAGING_DATADIR}/pygtk/2.0/defs/
-}
diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb
index 87776ff426..76a8504c7d 100644
--- a/packages/python/python-pygtk_2.10.4.bb
+++ b/packages/python/python-pygtk_2.10.4.bb
@@ -21,18 +21,13 @@ do_configure_prepend() {
     install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
 }
 
-
-FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*"
-FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug"
-
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
 }
 
 require fix-path.inc
+
 FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*"
-FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/*/.debug"
-FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug"
 
 do_stage() {
 	autotools_stage_includes
diff --git a/packages/python/python-pygtk_2.6.3.bb b/packages/python/python-pygtk_2.6.3.bb
index 417de0a109..ae6b7d131e 100644
--- a/packages/python/python-pygtk_2.6.3.bb
+++ b/packages/python/python-pygtk_2.6.3.bb
@@ -15,8 +15,6 @@ inherit autotools pkgconfig distutils-base
 EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
 
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-doc ${PN}"
-FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/gtk/.debug \
-		    ${libdir}/python2.4/site-packages/gtk-2.0/.debug"
 FILES_${PN}-dev += "${bindir} ${datadir}/pygtk ${libdir}/pygtk"
 
 do_configure_prepend() {
@@ -25,7 +23,7 @@ do_configure_prepend() {
 
 do_stage() {
 	autotools_stage_includes
-        sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0
+	sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0
 	install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/
 	install -d ${STAGING_DATADIR}/pygtk/2.0/codegen
 	install -d ${STAGING_DATADIR}/pygtk/2.0/defs/
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index 09367a931f..444eb73781 100644
--- a/packages/tasks/task-python-everything.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -11,8 +11,8 @@ RDEPENDS = "\
 		python-dialog		\
 		python-evas			\
 		python-ecore		\
-		python-emotion		\
-		python-edje			\
+#		python-emotion		\
+#		python-edje			\
 		python-pycurl		\
 		python-fam			\
 		python-fnorb		\