Rename /openembedded/ -> /meta/

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966

32 files changed, 936 insertions, 0 deletions

diff --git a/meta/packages/gnome/files/gtk-doc.m4 b/meta/packages/gnome/files/gtk-doc.m4
new file mode 100644
index 0000000000..3ec41666b2
--- /dev/null
+++ b/meta/packages/gnome/files/gtk-doc.m4
@@ -0,0 +1,53 @@
+dnl -*- mode: autoconf -*-
+
+# serial 1
+
+dnl Usage:
+dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
+AC_DEFUN([GTK_DOC_CHECK],
+[
+  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+  dnl for overriding the documentation installation directory
+  AC_ARG_WITH(html-dir,
+    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+    [with_html_dir='${datadir}/gtk-doc/html'])
+  HTML_DIR="$with_html_dir"
+  AC_SUBST(HTML_DIR)
+
+  dnl enable/disable documentation building
+  AC_ARG_ENABLE(gtk-doc,
+    AC_HELP_STRING([--enable-gtk-doc],
+                   [use gtk-doc to build documentation [default=no]]),,
+    enable_gtk_doc=no)
+
+  have_gtk_doc=no
+  if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  fi
+  if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
+    have_gtk_doc=yes
+  fi
+
+  dnl do we want to do a version check?
+ifelse([$1],[],,
+  [gtk_doc_min_version=$1
+  if test "$have_gtk_doc" = yes; then
+    AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
+    if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
+      AC_MSG_RESULT(yes)
+    else
+      AC_MSG_RESULT(no)
+      have_gtk_doc=no
+    fi
+  fi
+])
+  if test x$enable_gtk_doc = xyes; then
+    if test "$have_gtk_doc" != yes; then
+      enable_gtk_doc=no
+    fi
+  fi
+
+  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
+])
diff --git a/meta/packages/gnome/files/gtk-doc.make b/meta/packages/gnome/files/gtk-doc.make
new file mode 100644
index 0000000000..c319e7ad7c
--- /dev/null
+++ b/meta/packages/gnome/files/gtk-doc.make
@@ -0,0 +1,148 @@
+# -*- mode: makefile -*-
+
+####################################
+# Everything below here is generic #
+####################################
+
+if GTK_DOC_USE_LIBTOOL
+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+else
+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+endif
+
+# We set GPATH here; this gives us semantics for GNU make
+# which are more like other make's VPATH, when it comes to
+# whether a source that is a target of one rule is then
+# searched for in VPATH/GPATH.
+#
+GPATH = $(srcdir)
+
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
+EXTRA_DIST = 				\
+	$(content_files)		\
+	$(HTML_IMAGES)			\
+	$(DOC_MAIN_SGML_FILE)		\
+	$(DOC_MODULE).types		\
+	$(DOC_MODULE)-sections.txt	\
+	$(DOC_MODULE)-overrides.txt
+
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+
+SCANOBJ_FILES = 		 \
+	$(DOC_MODULE).args 	 \
+	$(DOC_MODULE).hierarchy  \
+	$(DOC_MODULE).interfaces \
+	$(DOC_MODULE).prerequisites \
+	$(DOC_MODULE).signals
+
+CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-scan.o $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
+
+if ENABLE_GTK_DOC
+all-local: html-build.stamp
+
+#### scan ####
+
+scan-build.stamp: $(HFILE_GLOB)
+	@echo '*** Scanning header files ***'
+	@-chmod -R u+w $(srcdir)
+	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	else \
+	    cd $(srcdir) ; \
+	    for i in $(SCANOBJ_FILES) ; do \
+               test -f $$i || touch $$i ; \
+	    done \
+	fi
+	cd $(srcdir) && \
+	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
+	@true
+
+#### templates ####
+
+tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+	@echo '*** Rebuilding template files ***'
+	@-chmod -R u+w $(srcdir)
+	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
+	touch tmpl-build.stamp
+
+tmpl.stamp: tmpl-build.stamp
+	@true
+
+#### xml ####
+
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
+	@echo '*** Building XML ***'
+	@-chmod -R u+w $(srcdir)
+	cd $(srcdir) && \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS)
+	touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
+	@true
+
+#### html ####
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+	@echo '*** Building HTML ***'
+	@-chmod -R u+w $(srcdir)
+	rm -rf $(srcdir)/html 
+	mkdir $(srcdir)/html
+	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	@echo '-- Fixing Crossreferences' 
+	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	touch html-build.stamp
+endif
+
+##############
+
+clean-local:
+	rm -f *~ *.bak
+
+maintainer-clean-local: clean
+	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
+	(installfiles=`echo $(srcdir)/html/*`; \
+	if test "$$installfiles" = '$(srcdir)/html/*'; \
+	then echo '-- Nothing to install' ; \
+	else \
+	  for i in $$installfiles; do \
+	    echo '-- Installing '$$i ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+	  done; \
+	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
+	fi)
+
+uninstall-local:
+	rm -f $(DESTDIR)$(TARGET_DIR)/*
+
+#
+# Require gtk-doc when making dist
+#
+if ENABLE_GTK_DOC
+dist-check-gtkdoc:
+else
+dist-check-gtkdoc:
+	@echo "*** gtk-doc must be installed and enabled in order to make dist"
+	@false
+endif
+
+dist-hook: dist-check-gtkdoc dist-hook-local
+	mkdir $(distdir)/tmpl
+	mkdir $(distdir)/xml
+	mkdir $(distdir)/html
+	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+	-cp $(srcdir)/xml/*.xml $(distdir)/xml
+	-cp $(srcdir)/html/* $(distdir)/html
+
+.PHONY : dist-hook-local
diff --git a/meta/packages/gnome/gconf-2.6.1/backends.patch b/meta/packages/gnome/gconf-2.6.1/backends.patch
new file mode 100644
index 0000000000..8d6099b41f
--- /dev/null
+++ b/meta/packages/gnome/gconf-2.6.1/backends.patch
@@ -0,0 +1,13 @@
+--- gconf/backends/Makefile.am~	2003-11-03 00:19:33.000000000 +0000
++++ gconf/backends/Makefile.am	2004-05-15 19:01:38.000000000 +0100
+@@ -28,8 +28,8 @@
+ 
+ noinst_PROGRAMS = xml-test
+ 
+-xml_test_SOURCES= $(libgconfbackend_oldxml_la_SOURCES) xml-test.c
+-xml_test_LDADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
++#xml_test_SOURCES= $(libgconfbackend_oldxml_la_SOURCES) xml-test.c
++xml_test_LDADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la libgconfbackend-oldxml.la
+ 
+ bin_PROGRAMS = gconf-merge-tree
+ gconf_merge_tree_SOURCES = gconf-merge-tree.c
diff --git a/meta/packages/gnome/gconf-dbus/69gconfd-dbus b/meta/packages/gnome/gconf-dbus/69gconfd-dbus
new file mode 100755
index 0000000000..c2add042f6
--- /dev/null
+++ b/meta/packages/gnome/gconf-dbus/69gconfd-dbus
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/libexec/gconfd-2 &
diff --git a/meta/packages/gnome/gconf-dbus/gconf-dbus-update.patch b/meta/packages/gnome/gconf-dbus/gconf-dbus-update.patch
new file mode 100755
index 0000000000..9870078b86
--- /dev/null
+++ b/meta/packages/gnome/gconf-dbus/gconf-dbus-update.patch
@@ -0,0 +1,31 @@
+? gconf/gconf.service
+Index: gconf/Makefile.am
+===================================================================
+RCS file: /cvs/gnome/gconf/gconf/Makefile.am,v
+retrieving revision 1.78.4.8
+diff -u -r1.78.4.8 Makefile.am
+--- gconf/Makefile.am	21 Dec 2003 14:21:15 -0000	1.78.4.8
++++ gconf/Makefile.am	22 Jan 2005 00:30:13 -0000
+@@ -155,6 +155,7 @@
+ 
+ libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE) -no-undefined
+ libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) $(GCONF_IPC_LIBS)
++libgconf_2_la_CFLAGS = $(AM_CFLAGS)
+ 
+ if HAVE_DBUS
+ servicedir       = $(DBUS_SERVICE_DIR)
+Index: backends/Makefile.am
+===================================================================
+RCS file: /cvs/gnome/gconf/backends/Makefile.am,v
+retrieving revision 1.30
+diff -u -r1.30 Makefile.am
+--- backends/Makefile.am	3 Nov 2003 00:19:33 -0000	1.30
++++ backends/Makefile.am	22 Jan 2005 00:30:14 -0000
+@@ -17,6 +17,7 @@
+ 
+ libgconfbackend_oldxml_la_LDFLAGS = -avoid-version -module -no-undefined
+ libgconfbackend_oldxml_la_LIBADD  = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
++libgconfbackend_oldxml_la_CFLAGS  = $(AM_CFLAGS)
+ 
+ libgconfbackend_xml_la_SOURCES = 	\
+ 	markup-backend.c		\
diff --git a/meta/packages/gnome/gconf-dbus/no-deprecation.patch b/meta/packages/gnome/gconf-dbus/no-deprecation.patch
new file mode 100644
index 0000000000..133ea550ee
--- /dev/null
+++ b/meta/packages/gnome/gconf-dbus/no-deprecation.patch
@@ -0,0 +1,11 @@
+--- trunk/examples/basic-gconf-app.c.old	2006-04-25 20:39:48.000000000 +0100
++++ trunk/examples/basic-gconf-app.c	2006-04-25 20:40:11.000000000 +0100
+@@ -80,7 +80,7 @@
+ 
+  /* Be clean and pure */
+ #define GTK_DISABLE_DEPRECATED
+-#define G_DISABLE_DEPRECATED
++/*#define G_DISABLE_DEPRECATED*/
+ 
+ #include <gconf/gconf-client.h>
+ #include <gtk/gtk.h>
diff --git a/meta/packages/gnome/gconf-dbus/remove-old-translations.patch b/meta/packages/gnome/gconf-dbus/remove-old-translations.patch
new file mode 100644
index 0000000000..486570040f
--- /dev/null
+++ b/meta/packages/gnome/gconf-dbus/remove-old-translations.patch
@@ -0,0 +1,11 @@
+--- trunk/configure.in.old	2006-06-21 13:49:59.000000000 +0100
++++ trunk/configure.in	2006-06-21 13:50:21.000000000 +0100
+@@ -189,7 +189,7 @@
+ 
+ AC_CHECK_FUNCS(flockfile)
+ 
+-ALL_LINGUAS="am ar az be bg bn ca cs cy da de el en_GB es eu fa fi fr ga gl hi hr hu id it ja ko lt lv mk ml mn ms nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr uk vi yi zh_CN zh_TW ta"
++ALL_LINGUAS="am ar az be bg bn ca cs cy da de el en_GB es eu fa fi fr ga gl hi hr hu id it ja ko lt lv mk ml ms nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr uk vi yi zh_CN zh_TW ta"
+ 
+ AM_GLIB_GNU_GETTEXT
+ 
diff --git a/meta/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch b/meta/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch
new file mode 100644
index 0000000000..c195aad639
--- /dev/null
+++ b/meta/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch
@@ -0,0 +1,16 @@
+--- trunk/backends/xml-backend.c~	2006-01-18 09:57:39.000000000 -0800
++++ trunk/backends/xml-backend.c	2006-01-19 11:38:37.000000000 -0800
+@@ -115,6 +115,13 @@
+ 
+ typedef struct _XMLSource XMLSource;
+ 
++extern GConfLock*
++gconf_get_lock (const gchar *lock_directory,
++                GError     **err);
++extern gboolean
++gconf_release_lock (GConfLock *lock,
++                    GError   **err);
++
+ /* XMLSource **/
+ 
+ struct _XMLSource {
diff --git a/meta/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch b/meta/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch
new file mode 100644
index 0000000000..312a356c84
--- /dev/null
+++ b/meta/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch
@@ -0,0 +1,11 @@
+--- trunk/backends/Makefile~	2006-01-19 09:52:22.000000000 -0800
++++ trunk/backends/Makefile	2006-01-19 13:13:23.000000000 -0800
+@@ -84,7 +84,7 @@
+ xml_test_OBJECTS = $(am_xml_test_OBJECTS)
+ xml_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
+-	$(top_builddir)/backends/libgconfbackend-oldxml.la
++	libgconfbackend-oldxml.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
diff --git a/meta/packages/gnome/gconf-dbus_cvs.bb b/meta/packages/gnome/gconf-dbus_cvs.bb
new file mode 100755
index 0000000000..f8be0c4eee
--- /dev/null
+++ b/meta/packages/gnome/gconf-dbus_cvs.bb
@@ -0,0 +1,38 @@
+SECTION = "x11/utils"
+DEPENDS = "gtk+ glib-2.0 dbus libxml2 popt"
+DESCRIPTION = "Settings daemon using DBUS for communication."
+LICENSE = "GPL"
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+PROVIDES = "gconf"
+RPROVIDES_${PN} = "gconf"
+RPROVIDES_${PN}-dev = "gconf-dev"
+
+PV = "0.0+cvs${SRCDATE}"
+PR = "r8"
+
+SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gconf;tag=gconf-dbus-2-6 \
+           file://gconf-dbus-update.patch;patch=1;pnum=0 \
+	   file://69gconfd-dbus"
+
+inherit pkgconfig autotools
+S = "${WORKDIR}/gconf"
+
+FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*"
+
+EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static"
+
+HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h"
+
+do_stage() {
+        oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
+        install -d ${STAGING_INCDIR}/gconf/2/gconf/
+        ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done )
+        install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
+}
+
+do_install_append () {
+	install -d ${D}/${sysconfdir}/X11/Xsession.d
+	install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
+	install -d ${D}/${datadir}/dbus-1.0/services/
+	install -m 644  gconf/gconf.service ${D}${datadir}/dbus-1.0/services/ 
+}
diff --git a/meta/packages/gnome/gconf-dbus_svn.bb b/meta/packages/gnome/gconf-dbus_svn.bb
new file mode 100644
index 0000000000..1aba51c56c
--- /dev/null
+++ b/meta/packages/gnome/gconf-dbus_svn.bb
@@ -0,0 +1,49 @@
+SECTION = "x11/utils"
+DEPENDS = "gtk+ glib-2.0 dbus libxml2 popt"
+DESCRIPTION = "Settings daemon using DBUS for communication."
+LICENSE = "GPL"
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+PROVIDES = "gconf"
+RPROVIDES_${PN} = "gconf"
+RPROVIDES_${PN}-dev = "gconf-dev"
+
+PV = "2.10.0+svn${SRCDATE}"
+PR = "r2"
+
+SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
+           file://gconf-dbus-update.patch;patch=1;pnum=0 \
+           file://xml-backend-locks-compile-fix.patch;patch=1 \
+	   file://no-deprecation.patch;patch=1 \
+	   file://remove-old-translations.patch;patch=1 \
+           file://xml-backend-oldxml-Makefile.patch \
+	   file://69gconfd-dbus"
+
+inherit pkgconfig autotools
+S = "${WORKDIR}/trunk"
+
+PARALLEL_MAKE = ""
+
+FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*"
+
+EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static"
+
+HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h"
+
+do_compile_prepend() {
+	cd ${S}
+	patch -p1 < ../xml-backend-oldxml-Makefile.patch
+}
+
+do_stage() {
+        oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
+        install -d ${STAGING_INCDIR}/gconf/2/gconf/
+        ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done )
+        install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
+}
+
+do_install_append () {
+	install -d ${D}/${sysconfdir}/X11/Xsession.d
+	install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
+	install -d ${D}/${datadir}/dbus-1.0/services/
+	install -m 644  gconf/gconf.service ${D}${datadir}/dbus-1.0/services/ 
+}
diff --git a/meta/packages/gnome/gconf_2.6.1.bb b/meta/packages/gnome/gconf_2.6.1.bb
new file mode 100644
index 0000000000..7a2ef334e4
--- /dev/null
+++ b/meta/packages/gnome/gconf_2.6.1.bb
@@ -0,0 +1,33 @@
+LICENSE = "LGPL"
+SECTION = "x11/gnome"
+DESCRIPTION = "GNOME configuration database system"
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \
+	   file://backends.patch;patch=1"
+DEPENDS = "orbit2 glib-2.0  libxml2 gtk+"
+ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
+
+FILES_${PN} += " ${libdir}/GConf/*"
+PR = "r1"
+
+S = "${WORKDIR}/GConf-${PV}"
+
+EXTRA_OECONF = "--disable-gtk-doc --enable-gtk"
+
+inherit autotools pkgconfig gettext
+
+HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h"
+
+do_compile() {
+	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
+}
+
+do_stage() {
+	oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/gconf/2/gconf/
+	( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/$i; done )
+	install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
+}
+
+do_install() {
+	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
+}
diff --git a/meta/packages/gnome/gnome-common/omf.patch b/meta/packages/gnome/gnome-common/omf.patch
new file mode 100644
index 0000000000..334425e4b2
--- /dev/null
+++ b/meta/packages/gnome/gnome-common/omf.patch
@@ -0,0 +1,13 @@
+--- gnome-common-2.4.0/doc-build/omf.make	2003-05-24 08:16:25.000000000 -0700
++++ gnome-common-2.4.0.new/doc-build/omf.make	2004-11-15 14:01:12.185155192 -0700
+@@ -43,7 +43,9 @@
+ install-data-hook-omf:
+ 	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
+ 	for file in $(omffile); do \
+-		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++		if [ -f $$file.out ]; then \
++			$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++		fi; \
+ 	done
+ 	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+ 
diff --git a/meta/packages/gnome/gnome-common_2.4.0.bb b/meta/packages/gnome/gnome-common_2.4.0.bb
new file mode 100644
index 0000000000..2991db81c7
--- /dev/null
+++ b/meta/packages/gnome/gnome-common_2.4.0.bb
@@ -0,0 +1,28 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+PR = "r0"
+DESCRIPTION = "Common macros for building GNOME applications"
+inherit gnome
+
+# The omf.make file failed if scrollkeeper doesn't happen to be
+# installed
+
+SRC_URI += "file://omf.patch;patch=1"
+
+EXTRA_AUTORECONF = ""
+DEPENDS = ""
+
+FILES_${PN} += "${datadir}/aclocal"
+FILES_${PN}-dev = ""
+
+do_stage () {
+	rm -rf ${STAGE_TEMP}
+	mkdir -p ${STAGE_TEMP}
+	make DESTDIR="${STAGE_TEMP}" install
+	cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin
+	install -d ${STAGING_DATADIR}/gnome-common
+	install -d ${STAGING_DATADIR}/aclocal
+	cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DATADIR}/gnome-common
+	cp -pPR ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
+	rm -rf ${STAGE_TEMP}
+}
diff --git a/meta/packages/gnome/gnome-mime-data_2.4.2.bb b/meta/packages/gnome/gnome-mime-data_2.4.2.bb
new file mode 100644
index 0000000000..c71f21c9d8
--- /dev/null
+++ b/meta/packages/gnome/gnome-mime-data_2.4.2.bb
@@ -0,0 +1,7 @@
+LICENSE = "GPL"
+inherit gnome
+
+DEPENDS += "shared-mime-info intltool-native"
+RDEPENDS = "shared-mime-info"
+
+PR = "r2"
diff --git a/meta/packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch b/meta/packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch
new file mode 100644
index 0000000000..3dbc130ddc
--- /dev/null
+++ b/meta/packages/gnome/gnome-vfs-dbus/gconftool-lossage.patch
@@ -0,0 +1,11 @@
+--- gnome-vfs-2.6.0/configure.in~	2004-03-22 12:36:23.000000000 +0000
++++ gnome-vfs-2.6.0/configure.in	2004-06-07 16:04:34.000000000 +0100
+@@ -154,7 +154,7 @@
+ AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+ 
+ if test x"$GCONFTOOL" = xno; then
+-  AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
++  AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf])
+ fi
+ 
+ AM_GCONF_SOURCE_2
diff --git a/meta/packages/gnome/gnome-vfs-dbus/gssapi.patch b/meta/packages/gnome/gnome-vfs-dbus/gssapi.patch
new file mode 100644
index 0000000000..bcf46176b2
--- /dev/null
+++ b/meta/packages/gnome/gnome-vfs-dbus/gssapi.patch
@@ -0,0 +1,13 @@
+--- trunk/configure.in.old	2005-10-28 17:18:36.000000000 +0100
++++ trunk/configure.in	2005-10-28 17:20:34.000000000 +0100
+@@ -444,6 +444,10 @@
+    ])
+    LIBS="$saved_LIBS" 
+    CPPFLAGS="$saved_CPPFLAGS" 
++   if test "x$have_gssapi" != "xyes"; then
++      GSSAPI_LIBS=
++      GSSAPI_CFLAGS=
++   fi 
+ fi   
+ AC_SUBST(GSSAPI_LIBS)
+ AC_SUBST(GSSAPI_CFLAGS)
diff --git a/meta/packages/gnome/gnome-vfs-dbus/no-gtk-doc.patch b/meta/packages/gnome/gnome-vfs-dbus/no-gtk-doc.patch
new file mode 100644
index 0000000000..331889b639
--- /dev/null
+++ b/meta/packages/gnome/gnome-vfs-dbus/no-gtk-doc.patch
@@ -0,0 +1,24 @@
+diff -urNd ../gnome-vfs-dbus-2.12.0cvs20051004-r0/trunk/doc/Makefile.am trunk/doc/Makefile.am
+--- ../gnome-vfs-dbus-2.12.0cvs20051004-r0/trunk/doc/Makefile.am	2005-10-28 15:48:43.000000000 +0100
++++ trunk/doc/Makefile.am	2005-10-28 16:17:15.000000000 +0100
+@@ -81,7 +81,7 @@
+ GTKDOC_LIBS = $(LIBGNOMEVFS_LIBS) \
+ 	$(top_builddir)/libgnomevfs/libgnomevfs-2.la
+ 
+-include $(top_srcdir)/gtk-doc.make
++#include $(top_srcdir)/gtk-doc.make
+ 
+ dist-hook-local:
+ #	mkdir $(distdir)/TEXT;          \
+diff -urNd ../gnome-vfs-dbus-2.12.0cvs20051004-r0/trunk/Makefile.am trunk/Makefile.am
+--- ../gnome-vfs-dbus-2.12.0cvs20051004-r0/trunk/Makefile.am	2005-10-28 15:49:03.000000000 +0100
++++ trunk/Makefile.am	2005-10-28 16:17:07.000000000 +0100
+@@ -21,7 +21,7 @@
+ 	gnome-vfs-zip.in			\
+ 	gnome-vfs-2.0.pc.in			\
+ 	gnome-vfs-module-2.0.pc.in		\
+-	gtk-doc.make				\
++#	gtk-doc.make				\
+ 	intltool-extract.in			\
+ 	intltool-merge.in			\
+ 	intltool-update.in
diff --git a/meta/packages/gnome/gnome-vfs-dbus/remove-old-translations.patch b/meta/packages/gnome/gnome-vfs-dbus/remove-old-translations.patch
new file mode 100644
index 0000000000..a5a13f73c3
--- /dev/null
+++ b/meta/packages/gnome/gnome-vfs-dbus/remove-old-translations.patch
@@ -0,0 +1,11 @@
+--- trunk/configure.in.old	2006-06-21 14:15:24.000000000 +0100
++++ trunk/configure.in	2006-06-21 14:19:35.000000000 +0100
+@@ -127,7 +127,7 @@
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Name of the gettext package])
+ 
+-ALL_LINGUAS="af am ar az be bg bn bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ko li lt lv mk ml mn mr ms nb ne nl nn no nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@ije sr@Latn sv ta th tr uk vi wa xh yi zh_CN zh_TW zu"
++ALL_LINGUAS="af am az bg bn bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ko li lt lv mk ml mn mr ms nb ne nl nn no nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@ije sr@Latn sv ta th tr uk vi wa xh yi zh_CN zh_TW zu"
+ AM_GLIB_GNU_GETTEXT
+ 
+ 
diff --git a/meta/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb b/meta/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb
new file mode 100644
index 0000000000..8133be73e0
--- /dev/null
+++ b/meta/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb
@@ -0,0 +1,91 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+PR = "r1"
+PROVIDES = "gnome-vfs"
+RPROVIDES = "gnome-vfs"
+
+inherit gnome pkgconfig
+
+DEPENDS = "libxml2 gconf-dbus dbus bzip2 gnome-mime-data zlib"
+RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
+
+
+SRC_URI = "http://ftp.imendio.com/pub/extra/${PN}/${PN}-${PV}.tar.gz \
+           file://gssapi.patch;patch=1;pnum=1 \
+           file://gconftool-lossage.patch;patch=1;pnum=1"
+
+EXTRA_OECONF = "--with-ipc=dbus"
+
+FILES_${PN} += " ${libdir}/vfs"
+FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/modules/*.a ${libdir}/gnome-vfs-2.0/modules/*.la ${libdir}/gnome-vfs-2.0/include"
+FILES_${PN}-doc += " ${datadir}/gtk-doc"
+
+GNOME_VFS_HEADERS = " \
+gnome-vfs-utils.h \
+gnome-vfs-application-registry.h \
+gnome-vfs-async-ops.h \
+gnome-vfs-ops.h \
+gnome-vfs-uri.h \
+gnome-vfs-standard-callbacks.h \
+gnome-vfs-module-callback.h \
+gnome-vfs-context.h \
+gnome-vfs-file-info.h \
+gnome-vfs-directory.h \
+gnome-vfs-mime-monitor.h \
+gnome-vfs-mime-handlers.h \
+gnome-vfs-result.h \
+gnome-vfs-job-limit.h \
+gnome-vfs-file-size.h \
+gnome-vfs-mime-utils.h \
+gnome-vfs-find-directory.h \
+gnome-vfs-init.h \
+gnome-vfs-handle.h \
+gnome-vfs.h \
+gnome-vfs-cancellation.h \
+gnome-vfs-xfer.h \
+gnome-vfs-monitor.h \
+gnome-vfs-types.h \
+gnome-vfs-volume-monitor.h \
+gnome-vfs-drive.h \
+gnome-vfs-volume.h \
+gnome-vfs-enum-types.h \
+gnome-vfs-address.h \
+gnome-vfs-dns-sd.h \
+gnome-vfs-mime-info-cache.h \
+gnome-vfs-resolve.h"
+
+GNOME_VFS_MODULE_HEADERS = " \
+gnome-vfs-mime-info.h \
+gnome-vfs-transform.h \
+gnome-vfs-ssl.h \
+gnome-vfs-inet-connection.h \
+gnome-vfs-socket.h \
+gnome-vfs-parse-ls.h \
+gnome-vfs-method.h \
+gnome-vfs-cancellable-ops.h \
+gnome-vfs-module.h \
+gnome-vfs-module-shared.h \
+gnome-vfs-module-callback-module-api.h \
+gnome-vfs-mime.h \
+gnome-vfs-socket-buffer.h"
+
+do_stage() {
+	oe_libinstall -so -C libgnomevfs libgnomevfs-2 ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs
+	for i in ${GNOME_VFS_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs/; done
+	install -d ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs
+	for i in ${GNOME_VFS_MODULE_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs/; done
+}
+
+do_install() {
+	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
+}
+
+PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
+
+python populate_packages_prepend () {
+	print bb.data.getVar('FILES_gnome-vfs', d, 1)
+
+	plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d)
+	do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s')
+}
diff --git a/meta/packages/gnome/gnome-vfs-dbus_cvs.bb b/meta/packages/gnome/gnome-vfs-dbus_cvs.bb
new file mode 100755
index 0000000000..9ccd23e414
--- /dev/null
+++ b/meta/packages/gnome/gnome-vfs-dbus_cvs.bb
@@ -0,0 +1,102 @@
+SECTION = "x11/utils"
+DEPENDS = "gtk+ glib-2.0 gconf dbus libxml2 zlib bzip2 gnome-mime-data"
+DESCRIPTION = "Virtual file system library using DBUS for communication."
+LICENSE = "GPLv2"
+MAINTAINER = "Chris Lord <chris@openedhand.com>"
+PROVIDES = "gnome-vfs"
+RPROVIDES_${PN} = "gnome-vfs"
+RPROVIDES_${PN}-dev = "gnome-vfs-dev"
+RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info"
+
+PV = "2.12.0+cvs${SRCDATE}"
+PR = "r6"
+
+SRC_URI = "svn://anonymous@developer.imendio.com/svn/gnome-vfs-dbus;module=trunk;proto=http \
+	   file://no-gtk-doc.patch;patch=1 \
+	   file://gconftool-lossage.patch;patch=1 \
+	   file://gssapi.patch;patch=1 \
+	   file://remove-old-translations.patch;patch=1"
+S = "${WORKDIR}/trunk"
+
+inherit pkgconfig autotools
+
+EXTRA_OECONF = "--with-ipc=dbus --disable-hal --disable-gtk-doc --disable-more-warnings --disable-howl"
+
+FILES_${PN} += " ${libdir}/vfs ${datadir}/dbus-1/services/dbus-vfs-daemon.service"
+FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/modules/*.a ${libdir}/gnome-vfs-2.0/modules/*.la ${libdir}/gnome-vfs-2.0/include"
+FILES_${PN}-doc += " ${datadir}/gtk-doc"
+
+# These header lists have been copy-pasted from trunk/libgnomevfs/Makefile.am
+GNOME_VFS_PLATFORM_HEADERS = " \
+	gnome-vfs-file-size.h"
+
+GNOME_VFS_MODULE_HEADERS = " \
+        gnome-vfs-cancellable-ops.h             \
+        gnome-vfs-inet-connection.h             \
+        gnome-vfs-method.h                      \
+        gnome-vfs-mime.h                        \
+        gnome-vfs-mime-info.h                   \
+        gnome-vfs-module-callback-module-api.h  \
+        gnome-vfs-module-shared.h               \
+        gnome-vfs-module.h                      \
+        gnome-vfs-parse-ls.h                    \
+        gnome-vfs-ssl.h                         \
+        gnome-vfs-transform.h                   \
+        gnome-vfs-socket-buffer.h               \
+        gnome-vfs-socket.h"
+
+GNOME_VFS_HEADERS = " \
+        gnome-vfs-application-registry.h        \
+        gnome-vfs-address.h                     \
+        gnome-vfs-async-ops.h                   \
+        gnome-vfs-cancellation.h                \
+        gnome-vfs-context.h                     \
+        gnome-vfs-directory.h                   \
+        gnome-vfs-dns-sd.h                      \
+        gnome-vfs-drive.h                       \
+        gnome-vfs-enum-types.h                  \
+        gnome-vfs-file-info.h                   \
+        gnome-vfs-file-size.h                   \
+        gnome-vfs-find-directory.h              \
+        gnome-vfs-handle.h                      \
+        gnome-vfs-init.h                        \
+        gnome-vfs-job-limit.h                   \
+        gnome-vfs-mime-deprecated.h             \
+        gnome-vfs-mime-handlers.h               \
+        gnome-vfs-mime-info-cache.h             \
+        gnome-vfs-mime-monitor.h                \
+        gnome-vfs-mime-utils.h                  \
+        gnome-vfs-module-callback.h             \
+        gnome-vfs-monitor.h                     \
+        gnome-vfs-ops.h                         \
+        gnome-vfs-resolve.h                     \
+        gnome-vfs-result.h                      \
+        gnome-vfs-standard-callbacks.h          \
+        gnome-vfs-types.h                       \
+        gnome-vfs-uri.h                         \
+        gnome-vfs-utils.h                       \
+        gnome-vfs-volume-monitor.h              \
+        gnome-vfs-volume.h                      \
+        gnome-vfs-xfer.h                        \
+        gnome-vfs.h"
+
+do_stage() {
+        oe_libinstall -so -C libgnomevfs libgnomevfs-2 ${STAGING_LIBDIR}
+        install -d ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs
+	for i in ${GNOME_VFS_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs/; done
+        install -d ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs
+	for i in ${GNOME_VFS_MODULE_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/gnome-vfs-module-2.0/libgnomevfs/; done
+	install -d ${STAGING_INCDIR}/include/libgnomevfs
+	for i in ${GNOME_VFS_PLATFORM_HEADERS}; do install -m 0644 libgnomevfs/$i ${STAGING_INCDIR}/include/libgnomevfs/; done
+}
+
+PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
+
+python populate_packages_prepend () {
+        print bb.data.getVar('FILES_gnome-vfs', d, 1)
+
+        plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d)
+        do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s',
+'GNOME VFS plugin for %s')
+}
+
diff --git a/meta/packages/gnome/libart-lgpl/Makefile.am.patch b/meta/packages/gnome/libart-lgpl/Makefile.am.patch
new file mode 100644
index 0000000000..749de32e2a
--- /dev/null
+++ b/meta/packages/gnome/libart-lgpl/Makefile.am.patch
@@ -0,0 +1,13 @@
+--- libart_lgpl-2.3.16/Makefile.am.old	2004-06-26 18:57:07.000000000 +0100
++++ libart_lgpl-2.3.16/Makefile.am	2004-06-26 18:57:12.000000000 +0100
+@@ -5,8 +5,8 @@
+ 
+ BUILT_SOURCES = art_config.h
+ 
+-art_config.h:	gen_art_config
+-	./gen_art_config > art_config.h
++#art_config.h:	gen_art_config
++#	./gen_art_config > art_config.h
+ 
+ EXTRA_DIST = 			\
+ 	libart-config.in	\
diff --git a/meta/packages/gnome/libart-lgpl/arm/art_config.h b/meta/packages/gnome/libart-lgpl/arm/art_config.h
new file mode 100644
index 0000000000..b0e74ad6ae
--- /dev/null
+++ b/meta/packages/gnome/libart-lgpl/arm/art_config.h
@@ -0,0 +1,10 @@
+/* Automatically generated by gen_art_config.c */
+
+#define ART_SIZEOF_CHAR 1
+#define ART_SIZEOF_SHORT 2
+#define ART_SIZEOF_INT 4
+#define ART_SIZEOF_LONG 4
+
+typedef unsigned char art_u8;
+typedef unsigned short art_u16;
+typedef unsigned int art_u32;
diff --git a/meta/packages/gnome/libart-lgpl/i386/art_config.h b/meta/packages/gnome/libart-lgpl/i386/art_config.h
new file mode 100644
index 0000000000..b0e74ad6ae
--- /dev/null
+++ b/meta/packages/gnome/libart-lgpl/i386/art_config.h
@@ -0,0 +1,10 @@
+/* Automatically generated by gen_art_config.c */
+
+#define ART_SIZEOF_CHAR 1
+#define ART_SIZEOF_SHORT 2
+#define ART_SIZEOF_INT 4
+#define ART_SIZEOF_LONG 4
+
+typedef unsigned char art_u8;
+typedef unsigned short art_u16;
+typedef unsigned int art_u32;
diff --git a/meta/packages/gnome/libart-lgpl/i586/art_config.h b/meta/packages/gnome/libart-lgpl/i586/art_config.h
new file mode 100644
index 0000000000..b0e74ad6ae
--- /dev/null
+++ b/meta/packages/gnome/libart-lgpl/i586/art_config.h
@@ -0,0 +1,10 @@
+/* Automatically generated by gen_art_config.c */
+
+#define ART_SIZEOF_CHAR 1
+#define ART_SIZEOF_SHORT 2
+#define ART_SIZEOF_INT 4
+#define ART_SIZEOF_LONG 4
+
+typedef unsigned char art_u8;
+typedef unsigned short art_u16;
+typedef unsigned int art_u32;
diff --git a/meta/packages/gnome/libart-lgpl/i686/art_config.h b/meta/packages/gnome/libart-lgpl/i686/art_config.h
new file mode 100644
index 0000000000..b0e74ad6ae
--- /dev/null
+++ b/meta/packages/gnome/libart-lgpl/i686/art_config.h
@@ -0,0 +1,10 @@
+/* Automatically generated by gen_art_config.c */
+
+#define ART_SIZEOF_CHAR 1
+#define ART_SIZEOF_SHORT 2
+#define ART_SIZEOF_INT 4
+#define ART_SIZEOF_LONG 4
+
+typedef unsigned char art_u8;
+typedef unsigned short art_u16;
+typedef unsigned int art_u32;
diff --git a/meta/packages/gnome/libart-lgpl_2.3.16.bb b/meta/packages/gnome/libart-lgpl_2.3.16.bb
new file mode 100644
index 0000000000..8028c8ef3f
--- /dev/null
+++ b/meta/packages/gnome/libart-lgpl_2.3.16.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Library of functions for 2D graphics"
+SECTION = "x11/gnome"
+LICENSE = "LGPL"
+PR = "r2"
+ART_CONFIG = "${HOST_ARCH}/art_config.h"
+
+# can't use gnome.oeclass due to _ in filename
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \
+       file://${ART_CONFIG} \
+       file://Makefile.am.patch;patch=1"
+
+inherit autotools pkgconfig
+
+DEPENDS = ""
+
+FILES_${PN} = "${libdir}/*.so.*"
+FILES_${PN}-dev += "${bindir}/libart2-config"
+
+S = "${WORKDIR}/libart_lgpl-${PV}"
+
+do_configure_prepend() {
+	cp ${WORKDIR}/${ART_CONFIG} ${S}/art_config.h
+}
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_stage() {
+	autotools_stage_includes
+	oe_libinstall -a -so libart_lgpl_2 ${STAGING_LIBDIR}
+}
diff --git a/meta/packages/gnome/libgnomecanvas_2.6.1.1.bb b/meta/packages/gnome/libgnomecanvas_2.6.1.1.bb
new file mode 100644
index 0000000000..5c716855e7
--- /dev/null
+++ b/meta/packages/gnome/libgnomecanvas_2.6.1.1.bb
@@ -0,0 +1,16 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+PR = "r1"
+DESCRIPTION = "A powerful object-oriented display"
+inherit gnome
+
+DEPENDS = "libglade libart-lgpl"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
+
+do_stage() {
+	gnome_stage_includes
+	oe_libinstall -C libgnomecanvas -a -so libgnomecanvas-2 ${STAGING_LIBDIR}
+}
diff --git a/meta/packages/gnome/libsoup_2.2.7.bb b/meta/packages/gnome/libsoup_2.2.7.bb
new file mode 100644
index 0000000000..e97a11cc96
--- /dev/null
+++ b/meta/packages/gnome/libsoup_2.2.7.bb
@@ -0,0 +1,18 @@
+LICENSE = "GPL"
+DESCRIPTION = "An HTTP library implementation in C"
+SECTION = "x11/gnome/libs"
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2"
+DEPENDS = "glib-2.0 gnutls libxml2"
+MAINTAINER = "Chris Lord <chris@openedhand.com>"
+
+inherit autotools pkgconfig
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev = "${includedir} ${libdir}"
+FILES_${PN}-doc = "${datadir}"
+
+do_stage() {
+	autotools_stage_all
+	install -d ${STAGING_DATADIR}/pkgconfig
+	install -m 0644 ${D}${libdir}/pkgconfig/* ${STAGING_DATADIR}/pkgconfig/
+}
diff --git a/meta/packages/gnome/orbit2-2.10.2/configure-lossage.patch b/meta/packages/gnome/orbit2-2.10.2/configure-lossage.patch
new file mode 100644
index 0000000000..7485a0ce0c
--- /dev/null
+++ b/meta/packages/gnome/orbit2-2.10.2/configure-lossage.patch
@@ -0,0 +1,35 @@
+--- orbit/configure.in~	2004-05-07 09:31:32.000000000 +0100
++++ orbit/configure.in	2004-05-08 19:27:35.000000000 +0100
+@@ -193,19 +193,19 @@
+ dnl   So many people with broken linking setups asked about this
+ dnl it turned out to be necessary to check for this.
+ dnl
+-dofus_save_libs="$LIBS"
+-LIBS="$ORBIT_LIBS $LIBS"
+-AC_TRY_RUN([ #include <stdio.h>
+-             main ()
+-             {
+-               return 0;
+-             } ],,
+-           AC_MSG_ERROR([
+-Linking is badly borked on your system. Please ensure your library path is correct
+-Check config.log for details - check near the end of the log above 'failed program was'
+-Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the
+-prefix you're compiling on: '${prefix}' ]))
+-LIBS="$dofus_save_libs"
++dnl dofus_save_libs="$LIBS"
++dnl LIBS="$ORBIT_LIBS $LIBS"
++dnl AC_TRY_RUN([ #include <stdio.h>
++dnl              main ()
++dnl              {
++dnl                return 0;
++dnl              } ],,
++dnl            AC_MSG_ERROR([
++dnl Linking is badly borked on your system. Please ensure your library path is correct
++dnl Check config.log for details - check near the end of the log above 'failed program was'
++dnl Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the
++dnl prefix you're compiling on: '${prefix}' ]))
++dnl LIBS="$dofus_save_libs"
+ 
+ orig_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $ORBIT_CFLAGS"
diff --git a/meta/packages/gnome/orbit2-native_2.10.2.bb b/meta/packages/gnome/orbit2-native_2.10.2.bb
new file mode 100644
index 0000000000..69fb3ded32
--- /dev/null
+++ b/meta/packages/gnome/orbit2-native_2.10.2.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "CORBA ORB"
+LICENSE = "LGPL GPL"
+SECTION = "x11/gnome/libs"
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.10/ORBit2-${PV}.tar.bz2 \
+           file://configure-lossage.patch;patch=1;pnum=1 \
+	   file://gtk-doc.m4 \
+	   file://gtk-doc.make"
+DEPENDS = "libidl-native popt-native gtk-doc"
+
+S = "${WORKDIR}/ORBit2-${PV}"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/orbit2-${PV}"
+
+inherit autotools native pkgconfig
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_configure_prepend() {
+	mkdir -p m4
+	install ${WORKDIR}/gtk-doc.m4 ./m4/
+	install ${WORKDIR}/gtk-doc.make ./
+}
diff --git a/meta/packages/gnome/orbit2_2.10.2.bb b/meta/packages/gnome/orbit2_2.10.2.bb
new file mode 100644
index 0000000000..83d6f0ec15
--- /dev/null
+++ b/meta/packages/gnome/orbit2_2.10.2.bb
@@ -0,0 +1,46 @@
+LICENSE = "GPL"
+PR = "r2"
+DESCRIPTION = "CORBA ORB"
+SECTION = "x11/gnome/libs"
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.10/ORBit2-${PV}.tar.bz2 \
+           file://configure-lossage.patch;patch=1;pnum=1 \
+	   file://gtk-doc.m4 \
+	   file://gtk-doc.make"
+DEPENDS = "libidl popt orbit2-native gtk-doc"
+
+FILES_${PN} += "${libdir}/orbit-2.0/*.so"
+
+S = "${WORKDIR}/ORBit2-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-gtk-doc"
+EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR}/orbit-idl-2'"
+
+do_configure_prepend() {
+	mkdir -p m4
+	install ${WORKDIR}/gtk-doc.m4 ./m4/
+	install ${WORKDIR}/gtk-doc.make ./
+}
+
+do_compile_append () {
+	sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new
+	mv ORBit-2.0.pc.new ORBit-2.0.pc
+}
+
+do_stage() {
+	oe_libinstall -so -C src/orb libORBit-2 ${STAGING_LIBDIR}
+	oe_libinstall -so -C src/services/name libORBitCosNaming-2 ${STAGING_LIBDIR}
+	oe_libinstall -so -C src/services/imodule libORBit-imodule-2 ${STAGING_LIBDIR}
+	install -m 0644 src/services/name/libname-server-2.a ${STAGING_LIBDIR}/
+
+	for dir in orbit orbit/poa orbit/orb-core orbit/util orbit/dynamic; do
+		install -d ${STAGING_INCDIR}/orbit-2.0/$dir
+		( cd include/$dir; for i in *.h; do install -m 0644 $i ${STAGING_INCDIR}/orbit-2.0/$dir/$i; done )
+	done
+
+	install -d ${STAGING_INCDIR}/orbit-2.0/ORBitservices
+	install -m 0644 src/services/name/CosNaming.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/
+	install -m 0644 src/services/name/CosNaming_impl.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/
+	install -m 0644 src/services/imodule/orbit-imodule.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/
+}