6 files changed, 48 insertions, 14 deletions
diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
index fa2884b98e..f87d4df0d1 100644
--- a/packages/avahi/avahi.inc
+++ b/packages/avahi/avahi.inc
@@ -4,11 +4,12 @@ HOMEPAGE = "http://avahi.org"
 SECTION = "network"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR="r3"
+PR="r4"
 
 DEPENDS = "expat libdaemon dbus glib-2.0"
 RRECOMMENDS = "libnss-mdns"
 RRECOMMENDS_avahi-daemon = "libnss-mdns"
+RDEPENDS_avahi-daemon = "sysvinit-pidof"
 
 SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
 	   file://00avahi-autoipd file://99avahi-autoipd"
diff --git a/packages/avahi/avahi_0.6.19.bb b/packages/avahi/avahi_0.6.19.bb
index 59de20446c..27dcdcffcb 100644
--- a/packages/avahi/avahi_0.6.19.bb
+++ b/packages/avahi/avahi_0.6.19.bb
@@ -1,3 +1,3 @@
 require avahi.inc
 
-PR = "r0"
+PR = "r1"
diff --git a/packages/gimp/babl_svn.bb b/packages/gimp/babl_svn.bb
new file mode 100644
index 0000000000..bb40a3957c
--- /dev/null
+++ b/packages/gimp/babl_svn.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Babl is a dynamic, any to any, pixel format conversion library."
+LICENSE = "LGPL"
+
+PV = "0.0.14+svn${SRCDATE}"
+
+inherit gnome
+
+SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk"
+
+S = "${WORKDIR}/trunk"
+
+do_stage() {
+        autotools_stage_all
+}	
+
+
diff --git a/packages/gimp/gegl_svn.bb b/packages/gimp/gegl_svn.bb
new file mode 100644
index 0000000000..91d654d43a
--- /dev/null
+++ b/packages/gimp/gegl_svn.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "GEGL (Generic Graphics Library) is a graph based image processing framework."
+LICENSE = "LGPL"
+DEPENDS = "babl glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual/libsdl"
+
+PV = "0.0.12+svn${SRCDATE}"
+
+inherit gnome
+
+SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk"
+
+S = "${WORKDIR}/trunk"
+
+do_configure_prepend() {
+        sed -i -e s:tools\ docs:tools:g Makefile.am
+}
+
+FILES_${PN} += "${libdir}/gegl-1.0"
+FILES_${PN}-dbg += "${libdir}/gegl-1.0/.debug"
+
+
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/packages/libidl/libidl_0.8.6.bb b/packages/libidl/libidl_0.8.6.bb
index ccc93e291a..33a1154357 100644
--- a/packages/libidl/libidl_0.8.6.bb
+++ b/packages/libidl/libidl_0.8.6.bb
@@ -2,25 +2,19 @@ DESCRIPTION = "Library for parsing CORBA IDL files"
 SECTION = "x11/gnome/libs"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 libidl-native"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-${PV}.tar.bz2"
 S = "${WORKDIR}/libIDL-${PV}"
 
-inherit autotools pkgconfig
+BINCONFIG_GLOB = "*-config-2"
+inherit autotools pkgconfig binconfig
 
 # Firefox uses the libIDL-config-2 script instead of pkgconfig (for some
 # strange reason - so we do some sed fu to fix the path there
 
 do_stage() {
 	autotools_stage_all
-
-	cat ${S}/libIDL-config-2 | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2
-
-	if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then
-		mv ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR_CROSS}/libIDL-config-2
-	fi
-			 
 }
 
 FILES_${PN} = "${libdir}/*.so.*"
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index b7f4497d92..dfada74a87 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 = "r29"
+PR = "r30"
 
 PACKAGES = 'task-boot \
             task-base \
@@ -139,6 +139,7 @@ RDEPENDS_task-boot = "\
     initscripts \
     modutils-initscripts \
     netbase \
+    update-alternatives \
     ${DISTRO_DEV_MANAGER} \
     ${DISTRO_INIT_MANAGER} \
     ${DISTRO_LOGIN_MANAGER} \
@@ -204,7 +205,6 @@ RDEPENDS_task-base-pcmcia = "\
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'prism3-support', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-conf', '',d)} \
-    ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-conf', '',d)} \
     "
 
 RRECOMMENDS_task-base-pcmcia = "\
@@ -224,7 +224,6 @@ task-base-pcmcia24 = "\
 
 task-base-pcmcia26 = "\
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \
-    ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
 
 RDEPENDS_task-base-bluetooth = "\