17 files changed, 142 insertions, 23 deletions
diff --git a/packages/libpcre/libpcre_4.4.bb b/packages/libpcre/libpcre_4.4.bb
index 3eb25ef485..517256a0ff 100644
--- a/packages/libpcre/libpcre_4.4.bb
+++ b/packages/libpcre/libpcre_4.4.bb
@@ -5,7 +5,7 @@ provides a POSIX calling interface to PCRE; the regular expressions \
 themselves still follow Perl syntax and semantics. The header file for \
 the POSIX-style functions is called pcreposix.h."
 SECTION = "devel"
-PR = "r7"
+PR = "r8"
 LICENSE = "BSD"
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2"
 S = "${WORKDIR}/pcre-${PV}"
@@ -37,7 +37,9 @@ do_stage () {
 	oe_libinstall -a -so libpcreposix ${STAGING_LIBDIR}
 	install -m 0644 pcre.h ${STAGING_INCDIR}/
 	install -m 0644 pcreposix.h ${STAGING_INCDIR}/
+        install -d ${STAGING_BINDIR_NATIVE}
+	install -m 0755 ${S}/dftables ${STAGING_BINDIR_NATIVE}/
 }
 
-FILES_${PN} = "${libdir}/lib*.so*"
+FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += "${bindir}/*"
diff --git a/packages/networkmanager/networkmanager_svn.bb b/packages/networkmanager/networkmanager_svn.bb
new file mode 100644
index 0000000000..604af0a729
--- /dev/null
+++ b/packages/networkmanager/networkmanager_svn.bb
@@ -0,0 +1,70 @@
+DESCRIPTION = "NetworkManager"
+SECTION = "net/misc"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gnome.org"
+PRIORITY = "optional"
+DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools"
+RDEPENDS = "wpa-supplicant iproute2 dhcdbd"
+PV = "0.6.5+svn${SRCDATE}"
+
+PR = "r0"
+
+SRC_URI="svn://svn.gnome.org/svn/NetworkManager/branches;module=NETWORKMANAGER_0_6_0_RELEASE;proto=http \
+	file://NetworkManager \
+	file://99_networkmanager"
+
+DEFAULT_PREFERENCE = "-1"
+
+EXTRA_OECONF = " \
+		--with-gnome \
+		--with-distro=debian \
+		--without-gcrypt \
+ 		--with-wpa_supplicant=/usr/sbin/wpa_supplicant \
+		--with-dhcdbd=/sbin/dhcdbd \
+		--with-ip=/sbin/ip"
+
+S = "${WORKDIR}/NETWORKMANAGER_0_6_0_RELEASE"
+
+inherit autotools pkgconfig
+
+do_staging () {
+	autotools_stage_includes
+	oe_libinstall -C libnm-util libnm-util ${STAGING_LIBDIR}
+	oe_libinstall gnome/libnm_glib libnm_glib ${STAGING_LIBDIR}
+}
+
+do_install () {
+	oe_libinstall -C libnm-util libnm-util ${D}/usr/lib
+	oe_libinstall -C gnome/libnm_glib libnm_glib ${D}/usr/lib
+
+	oe_runmake -C src DESTDIR="${D}" install
+	install -d ${D}/etc/default/volatiles
+	install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
+	install -d ${D}/etc/init.d/
+	install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d/
+	install -d ${D}/${datadir}/
+}
+
+pkg_postinst_${PN} () {
+if [ "x$D" != "x" ]; then
+        exit 1
+fi
+/etc/init.d/populate-volatile.sh update
+}
+
+PACKAGES =+ "libnmutil libnmglib" 
+
+FILES_libnmutil += "${libdir}/libnm-util.so.*"
+FILES_libnmglib += "${libdir}/libnm_glib.so.*"
+
+FILES_${PN} += "${datadir} \
+		${sbindir}/* \
+		${bindir}/* \
+		${sysconfdir} \
+		${libexecdir}"
+
+FILES_${PN}-dev += "${incdir} \
+		   ${libdir}/*.a \
+		   ${libdir}/*.la \
+		   ${libdir}/pkgconfig"
+
diff --git a/packages/python/python-ecore_cvs.bb b/packages/python/python-ecore_cvs.bb
new file mode 100644
index 0000000000..e87b415285
--- /dev/null
+++ b/packages/python/python-ecore_cvs.bb
@@ -0,0 +1,3 @@
+require python-efl.inc
+
+DEPENDS += "ecore"
diff --git a/packages/python/python-edje_cvs.bb b/packages/python/python-edje_cvs.bb
new file mode 100644
index 0000000000..632ca8400a
--- /dev/null
+++ b/packages/python/python-edje_cvs.bb
@@ -0,0 +1,4 @@
+require python-efl.inc
+
+DEPENDS += "edje python-evas"
+
diff --git a/packages/python/python-efl.inc b/packages/python/python-efl.inc
new file mode 100644
index 0000000000..875a88f5b2
--- /dev/null
+++ b/packages/python/python-efl.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "${PN} bindings"
+LICENSE = "BSD"
+AUTHOR = "Gustavo Sverzut Barbieri <barbieri@gmail.com>"
+HOMEPAGE = "http://www.enlightenment.org"
+DEPENDS = "python-pyrex-native python-numeric"
+PV = "0.0.0+cvs${SRCDATE}"
+
+inherit distutils
+
+SRC_URI = "${E_CVS};module=e17/proto/python-efl/${PN}"
+S = "${WORKDIR}/${PN}"
+
+do_install_append() {
+	rm ${D}${libdir}/${PYTHON_DIR}/site-packages/site.*
+}
+
+FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*.egg/*/*/.debug"
+
diff --git a/packages/python/python-emotion_cvs.bb b/packages/python/python-emotion_cvs.bb
new file mode 100644
index 0000000000..a101c07007
--- /dev/null
+++ b/packages/python/python-emotion_cvs.bb
@@ -0,0 +1,4 @@
+require python-efl.inc
+
+DEPENDS += "emotion python-evas"
+
diff --git a/packages/python/python-evas_cvs.bb b/packages/python/python-evas_cvs.bb
new file mode 100644
index 0000000000..78f306c060
--- /dev/null
+++ b/packages/python/python-evas_cvs.bb
@@ -0,0 +1,13 @@
+require python-efl.inc
+
+DEPENDS += "evas"
+
+do_stage() {
+	distutils_stage_headers
+}
+
+#do_stage_append() {
+#	install -d ${STAGING_DIR}/${BUILD_SYS}/include/${PYTHON_DIR}/python-evas/
+#	install -m 0644 evas/evas.c_evas.pxd ${STAGING_DIR}/${BUILD_SYS}/include/${PYTHON_DIR}/python-evas/
+#}
+
diff --git a/packages/python/python-pyrex-native_0.9.3.1.bb b/packages/python/python-pyrex-native_0.9.5.1a.bb
index d7ec81fd8e..d7ec81fd8e 100644
--- a/packages/python/python-pyrex-native_0.9.3.1.bb
+++ b/packages/python/python-pyrex-native_0.9.5.1a.bb
diff --git a/packages/python/python-pyrex_0.9.3.1.bb b/packages/python/python-pyrex_0.9.5.1a.bb
index d0a5f826e0..d0a5f826e0 100644
--- a/packages/python/python-pyrex_0.9.3.1.bb
+++ b/packages/python/python-pyrex_0.9.5.1a.bb
diff --git a/packages/python/python-setuptools_0.6c5.bb b/packages/python/python-setuptools_0.6c6.bb
index 0ee3a02229..ef56b9b652 100644
--- a/packages/python/python-setuptools_0.6c5.bb
+++ b/packages/python/python-setuptools_0.6c6.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "MIT-like"
 RDEPENDS = "python-core python-zlib"
 SRCNAME = "setuptools"
-PR = "r0"
+PR = "ml1"
 
 SRC_URI = "http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
@@ -20,7 +20,3 @@ do_stage() {
     BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
       ${STAGING_BINDIR_NATIVE}/python setup.py install 
 }
-
-# Deal with .pth file error 
-export PYTHONPATH="${D}/${libdir}/${PYTHON_DIR}/site-packages"
-
diff --git a/packages/python/python-simplejson_1.7.1.bb b/packages/python/python-simplejson_1.7.1.bb
index e41d9085af..129f4fb9eb 100644
--- a/packages/python/python-simplejson_1.7.1.bb
+++ b/packages/python/python-simplejson_1.7.1.bb
@@ -8,17 +8,9 @@ DEPENDS = "python-setuptools"
 # python-zlib is needed to unpack egg created by setuptools
 RDEPENDS = "python-core python-re python-io python-netserver python-zlib"
 SRCNAME = "simplejson"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://cheeseshop.python.org/packages/source/s/simplejson/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
-
-do_install_prepend() {
-    install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
-}
-
-# Deal with .pth file error
-export PYTHONPATH="${D}/${libdir}/python2.4/site-packages"
-
diff --git a/packages/ruby/ruby_1.8.5.bb b/packages/ruby/ruby_1.8.5.bb
index d06e9e0943..6260614772 100644
--- a/packages/ruby/ruby_1.8.5.bb
+++ b/packages/ruby/ruby_1.8.5.bb
@@ -1,2 +1,8 @@
 require ruby.inc
 DEPENDS = "ruby-native zlib openssl"
+
+PR = "r1"
+
+FILES_${PN}-dbg += "${libdir}/ruby/1.8/*/.debug \
+                    ${libdir}/ruby/1.8/*/*/.debug"
+
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 368e9374d2..84c3610b8f 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r40"
+PR = "r41"
 
 DEPENDS = "task-boot"
 PROVIDES = "${PACKAGES}"
@@ -223,9 +223,13 @@ task-base-pcmcia26 = "\
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
 
+# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware! 
+
 RDEPENDS_task-base-bluetooth = "\ 
     blueprobe \
-    bluez-utils"
+    bluez-utils \
+    bluez-utils-compat \  
+    "
 
 RRECOMMENDS_task-base-bluetooth = "\
     kernel-module-bluetooth \
diff --git a/packages/tasks/task-python-everything_20060425.bb b/packages/tasks/task-python-everything_20060425.bb
index 5723a4294f..37e4b99b87 100644
--- a/packages/tasks/task-python-everything_20060425.bb
+++ b/packages/tasks/task-python-everything_20060425.bb
@@ -1,7 +1,7 @@
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml13"
+PR = "ml14"
 
 BROKEN_BECAUSE_GCC4 = "\
 		python-egenix-mx-base"
@@ -12,6 +12,10 @@ RDEPENDS = "\
 		python-constraint	\
 		python-crypto		\
 		python-dialog		\
+		python-evas			\
+		python-ecore		\
+		python-emotion		\
+		python-edje			\
 		python-pycurl		\
 		python-fam			\
 		python-fnorb		\
diff --git a/packages/webkit/webkit/WebKit.pri b/packages/webkit/webkit/WebKit.pri
index 4db63eb54f..0375102a0c 100644
--- a/packages/webkit/webkit/WebKit.pri
+++ b/packages/webkit/webkit/WebKit.pri
@@ -28,7 +28,9 @@ gdk-port:INCLUDEPATH += \
     $$BASE_DIR/WebCore/platform/network/curl \
     $$BASE_DIR/WebCore/platform/graphics/cairo \
     $$BASE_DIR/WebCore/loader/gdk \
-    $$BASE_DIR/WebCore/page/gdk
+    $$BASE_DIR/WebCore/page/gdk \
+    $$BASE_DIR/WebKit/gtk/Api \
+    $$BASE_DIR/WebKit/gtk/WebCoreSupport
 INCLUDEPATH += \
     $$BASE_DIR/JavaScriptCore/ \
     $$BASE_DIR/JavaScriptCore/kjs \
diff --git a/packages/webkit/webkit/WebKit.pro b/packages/webkit/webkit/WebKit.pro
index 712eeadb78..335d11e6e7 100644
--- a/packages/webkit/webkit/WebKit.pro
+++ b/packages/webkit/webkit/WebKit.pro
@@ -3,7 +3,6 @@ CONFIG += ordered
 !gdk-port:CONFIG += qt-port
 qt-port:SUBDIRS += WebKitQt/Plugins
 SUBDIRS += \
-        JavaScriptCore/pcre/dftables.pro \
         WebCore \
         JavaScriptCore/kjs/testkjs.pro
 
diff --git a/packages/webkit/webkit_svn.bb b/packages/webkit/webkit_svn.bb
index dd2e8ce6ea..656b2384ac 100644
--- a/packages/webkit/webkit_svn.bb
+++ b/packages/webkit/webkit_svn.bb
@@ -1,4 +1,4 @@
-DEPENDS = "flex-native gperf-native gperf perl-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo libxslt libidn gnutls gtk+"
+DEPENDS = "libpcre flex-native gperf-native gperf perl-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo libxslt libidn gnutls gtk+"
 
 # Yes, this is wrong...
 PV = "0.0+svn${SRCDATE}"
@@ -31,7 +31,9 @@ do_configure_append() {
 }
 
 do_compile_prepend() {
-        cd ${S}/WebKitBuilds/Debug
+         mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+	 cp ${STAGING_BINDIR_NATIVE}/dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+         cd ${S}/WebKitBuilds/Debug
 }
 
 do_install() {