Merge oe-devel@oe-devel.bkbits.net:packages.bb

into handhelds.org:/home/kergoth/code/packages.bb

2004/12/07 04:58:25-06:00 ti.com!kergoth
More updates per the core rename.

2004/12/07 04:46:51-06:00 ti.com!kergoth
Update soundtracker per the core rename.

2004/12/07 04:44:14-06:00 ti.com!kergoth
Merge

2004/12/07 04:42:38-06:00 ti.com!kergoth
Updates per the recent rename of the oe core from 'oe' to 'bitbake'.

BKrev: 41b6293b91LRHSxMOt6WnrZVAdLbFw

42 files changed, 0 insertions, 649 deletions

diff --git a/gnome/gconf_2.6.1.bb b/gnome/gconf_2.6.1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/gconf_2.6.1.bb
diff --git a/gnome/gconf_2.6.1.oe b/gnome/gconf_2.6.1.oe
deleted file mode 100644
index cb55d5b5c4..0000000000
--- a/gnome/gconf_2.6.1.oe
+++ /dev/null
@@ -1,32 +0,0 @@
-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"
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
-
-FILES_${PN} += " ${libdir}/GConf/*"
-
-S = "${WORKDIR}/GConf-${PV}"
-
-EXTRA_OECONF = "--disable-gtk-doc"
-
-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/2/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/gnome/gnome-common_2.4.0.bb b/gnome/gnome-common_2.4.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/gnome-common_2.4.0.bb
diff --git a/gnome/gnome-common_2.4.0.oe b/gnome/gnome-common_2.4.0.oe
deleted file mode 100644
index 2d4f3826db..0000000000
--- a/gnome/gnome-common_2.4.0.oe
+++ /dev/null
@@ -1,22 +0,0 @@
-LICENSE = GPL
-SECTION = "x11/gnome"
-PR = "r0"
-DESCRIPTION = "Common macros for building GNOME applications"
-inherit gnome
-
-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 -a ${STAGE_TEMP}/usr/bin/* ${STAGING_DIR}/${BUILD_SYS}/bin
-	install -d ${STAGING_DIR}/${HOST_SYS}/share/gnome-common
-	cp -a ${STAGE_TEMP}/usr/share/gnome-common/* ${STAGING_DIR}/${HOST_SYS}/share/gnome-common
-	cp -a ${STAGE_TEMP}/usr/share/aclocal/* ${STAGING_DIR}/${HOST_SYS}/share/aclocal
-	rm -rf ${STAGE_TEMP}
-}
diff --git a/gnome/gnome-desktop_2.7.90.bb b/gnome/gnome-desktop_2.7.90.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/gnome-desktop_2.7.90.bb
diff --git a/gnome/gnome-desktop_2.7.90.oe b/gnome/gnome-desktop_2.7.90.oe
deleted file mode 100644
index ab63577334..0000000000
--- a/gnome/gnome-desktop_2.7.90.oe
+++ /dev/null
@@ -1,24 +0,0 @@
-LICENSE = GPL
-SECTION = "x11/gnome"
-PR = "r0"
-DESCRIPTION = "GNOME library for reading .desktop files"
-inherit gnome
-
-DEPENDS = "gnome-common libgnomeui"
-
-EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros"
-
-do_configure_prepend () {
-	cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S}
-}
-
-do_stage () {
-	install -d ${STAGING_INCDIR}/gnome-desktop-2.0/libgnome/
-#	install -d ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/
-	install -m 0644 libgnome-desktop/libgnome/gnome-desktop-item.h ${STAGING_INCDIR}/gnome-desktop-2.0/libgnome/
-#	install -m 0644 libgnome-desktop/libgnomeui/gnome-ditem-edit.h ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/
-#	install -m 0644 libgnome-desktop/libgnomeui/gnome-hint.h ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/
-	oe_libinstall -C libgnome-desktop/.libs -so libgnome-desktop-2 ${STAGING_LIBDIR}
-	
- 
-}
diff --git a/gnome/gnome-games_2.6.1.bb b/gnome/gnome-games_2.6.1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/gnome-games_2.6.1.bb
diff --git a/gnome/gnome-games_2.6.1.oe b/gnome/gnome-games_2.6.1.oe
deleted file mode 100644
index 36dec7a330..0000000000
--- a/gnome/gnome-games_2.6.1.oe
+++ /dev/null
@@ -1,27 +0,0 @@
-LICENSE = GPL
-SECTION = "x11/gnome"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "guile gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common"
-PR = "r2"
-
-inherit gnome
-
-PACKAGES =+ "libgdkcardimage libgdkcardimage-data libgdkcardimage-dev"
-
-FILES_libgdkcardimage = "${libdir}/libgdkcardimage.so.*"
-FILES_libgdkcardimage-dev = "${libdir}/libgdkcardimage.* ${includedir}/gdkcardimage"
-FILES_libgdkcardimage-data = "${datadir}/pixmaps/cards"
-DEPENDS_libgdkcardimage = "libgdkcardimage-data"
-
-FILES_${PN}-doc += " ${datadir}/gnome/help"
-
-PACKAGES =+ "gnome-games-sol "
-FILES_gnome-games-sol = "${bindir}/sol ${datadir}/applications/sol.desktop ${datadir}/pixmaps/gnome-aisleriot.png ${sysconfdir}/gconf/schemas/aisleriot.schemas ${datadir}/sol-games"
-
-PACKAGES =+ "gnome-games-gnometris "
-FILES_gnome-games-gnometris = "${bindir}/gnometris ${datadir}/pixmaps/gnometris ${datadir}/pixmaps/gnome-gtetris.png ${datadir}/applications/gnometris.desktop ${sysconfdir}/gconf/schemas/gnometris.schemas"
-
-PACKAGES =+ "gnome-games-gnomine"
-FILES_gnome-games-gnomine = "${bindir}/gnomine ${datadir}/pixmaps/gnomine ${datadir}/pixmaps/gnome-gnomine.png ${datadir}/applications/gnomine.desktop ${sysconfdir}/gconf/schemas/gnomine.schemas"
-
-EXTRA_OECONF = "--disable-schemas-install"
diff --git a/gnome/gnome-icon-theme_1.3.3.bb b/gnome/gnome-icon-theme_1.3.3.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/gnome-icon-theme_1.3.3.bb
diff --git a/gnome/gnome-icon-theme_1.3.3.oe b/gnome/gnome-icon-theme_1.3.3.oe
deleted file mode 100644
index 37cca77fb9..0000000000
--- a/gnome/gnome-icon-theme_1.3.3.oe
+++ /dev/null
@@ -1,9 +0,0 @@
-LICENSE = GPL
-SECTION = "x11/gnome"
-SRC_URI = "${GNOME_MIRROR}/${PN}/1.3/${PN}-${PV}.tar.bz2"
-
-FILES_${PN} += "${datadir}/icons"
-
-EXTRA_OECONF = "--disable-hicolor-check"
-
-inherit autotools pkgconfig
diff --git a/gnome/gnome-keyring_0.2.1.bb b/gnome/gnome-keyring_0.2.1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/gnome-keyring_0.2.1.bb
diff --git a/gnome/gnome-keyring_0.2.1.oe b/gnome/gnome-keyring_0.2.1.oe
deleted file mode 100644
index 4df1307ac9..0000000000
--- a/gnome/gnome-keyring_0.2.1.oe
+++ /dev/null
@@ -1,21 +0,0 @@
-LICENSE = GPL
-SECTION = "x11/gnome"
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/0.2/${PN}-${PV}.tar.bz2"
-
-inherit autotools libtool pkgconfig
-
-DEPENDS = ""
-
-EXTRA_OECONF = "--disable-gtk-doc"
-
-HEADERS = " \
-gnome-keyring.h \
-"
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/gnome-keyring-1
-	for i in ${HEADERS}; do
-		install -m 0644 $i ${STAGING_INCDIR}/gnome-keyring-1/$i
-	done
-	oe_libinstall -so libgnome-keyring ${STAGING_LIBDIR}
-}
diff --git a/gnome/gnome-mime-data_2.4.1.bb b/gnome/gnome-mime-data_2.4.1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/gnome-mime-data_2.4.1.bb
diff --git a/gnome/gnome-mime-data_2.4.1.oe b/gnome/gnome-mime-data_2.4.1.oe
deleted file mode 100644
index d02c7e1122..0000000000
--- a/gnome/gnome-mime-data_2.4.1.oe
+++ /dev/null
@@ -1,3 +0,0 @@
-LICENSE = GPL
-SECTION = "x11/gnome"
-inherit gnome
diff --git a/gnome/gnome-vfs-extras_0.99.13.bb b/gnome/gnome-vfs-extras_0.99.13.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/gnome-vfs-extras_0.99.13.bb
diff --git a/gnome/gnome-vfs-extras_0.99.13.oe b/gnome/gnome-vfs-extras_0.99.13.oe
deleted file mode 100644
index 4030454321..0000000000
--- a/gnome/gnome-vfs-extras_0.99.13.oe
+++ /dev/null
@@ -1,10 +0,0 @@
-LICENSE = GPL
-SECTION = "x11/gnome"
-PR = "r1"
-
-inherit gnome
-
-DEPENDS += "gnome-vfs samba"
-
-FILES_${PN} += "${datadir}/gnome ${libdir}/gnome-vfs-2.0/modules/*.so"
-FILES_${PN}-dev += "${libdir}/gnome-vfs-2.0/modules/*"
diff --git a/gnome/gnome-vfs_2.6.0.bb b/gnome/gnome-vfs_2.6.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/gnome-vfs_2.6.0.bb
diff --git a/gnome/gnome-vfs_2.6.0.oe b/gnome/gnome-vfs_2.6.0.oe
deleted file mode 100644
index d6a42df885..0000000000
--- a/gnome/gnome-vfs_2.6.0.oe
+++ /dev/null
@@ -1,76 +0,0 @@
-LICENSE = GPL
-SECTION = "x11/gnome"
-PR = "r3"
-
-inherit gnome
-
-DEPENDS = "libxml2 gconf libbonobo bzip2 gnome-mime-data orbit2 zlib samba"
-
-SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1"
-
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
-
-FILES_${PN} += " ${libdir}/gnome-vfs-2.0/modules/*.so ${libdir}/bonobo/servers ${libdir}/bonobo/monikers/*.so ${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 ${libdir}/bonobo/monikers/*.a ${libdir}/bonobo/monikers/*.la"
-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_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_compile() {
-	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
-}
-
-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
-}
diff --git a/gnome/gnome-vfs_2.6.2.bb b/gnome/gnome-vfs_2.6.2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/gnome-vfs_2.6.2.bb
diff --git a/gnome/gnome-vfs_2.6.2.oe b/gnome/gnome-vfs_2.6.2.oe
deleted file mode 100644
index 8426786a43..0000000000
--- a/gnome/gnome-vfs_2.6.2.oe
+++ /dev/null
@@ -1,83 +0,0 @@
-LICENSE = GPL
-SECTION = "x11/gnome"
-PR = "r4"
-
-inherit gnome
-
-DEPENDS = "libxml2 gconf libbonobo bzip2 gnome-mime-data orbit2 zlib samba"
-
-SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1"
-
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
-
-FILES_${PN} += " ${libdir}/bonobo/servers ${libdir}/bonobo/monikers/*.so ${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 ${libdir}/bonobo/monikers/*.a ${libdir}/bonobo/monikers/*.la"
-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_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_compile() {
-	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
-}
-
-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
-}
-
-python populate_packages_prepend () {
-	print oe.data.getVar('FILES_gnome-vfs', d, 1)
-
-	plugindir = oe.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/gnome/libart-lgpl_2.3.16.bb b/gnome/libart-lgpl_2.3.16.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/libart-lgpl_2.3.16.bb
diff --git a/gnome/libart-lgpl_2.3.16.oe b/gnome/libart-lgpl_2.3.16.oe
deleted file mode 100644
index 0addbdd5fc..0000000000
--- a/gnome/libart-lgpl_2.3.16.oe
+++ /dev/null
@@ -1,28 +0,0 @@
-SECTION = "x11/gnome"
-PR = "r1"
-LICENSE = "LGPL"
-
-# 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://${HOST_SYS}/art_config.h \
-       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}/${HOST_SYS}/art_config.h ${S}
-}
-
-EXTRA_OECONF = "--disable-gtk-doc"
-
-do_stage() {
-	autotools_stage_includes
-	oe_libinstall -a -so libart_lgpl_2 ${STAGING_LIBDIR}
-}
diff --git a/gnome/libbonobo_2.6.0.bb b/gnome/libbonobo_2.6.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/libbonobo_2.6.0.bb
diff --git a/gnome/libbonobo_2.6.0.oe b/gnome/libbonobo_2.6.0.oe
deleted file mode 100644
index 7bafaa32c8..0000000000
--- a/gnome/libbonobo_2.6.0.oe
+++ /dev/null
@@ -1,52 +0,0 @@
-LICENSE = GPL
-SECTION = "x11/gnome"
-DESCRIPTION = "Bonobo CORBA interfaces library"
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-${PV}.tar.bz2 \
-           file://gtk-doc.m4 \
-           file://gtk-doc.make"
-DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
-
-inherit autotools libtool pkgconfig
-
-do_configure_prepend() {
-	install -d m4
-	install ${WORKDIR}/gtk-doc.m4 m4/
-	install ${WORKDIR}/gtk-doc.make ./
-}
-
-ACTIVATION_HEADERS = "Bonobo_Unknown.h Bonobo_GenericFactory.h Bonobo_Activation_types.h \
-	              bonobo-activation.h bonobo-activation-async.h bonobo-activation-activate.h \
- 		      bonobo-activation-init.h bonobo-activation-shlib.h bonobo-activation-register.h \
- 		      bonobo-activation-server-info.h bonobo-activation-version.h"
-
-BONOBO_HEADERS = "Bonobo.h bonobo-arg.h bonobo-context.h bonobo-event-source.h bonobo-exception.h \
-	          bonobo-generic-factory.h bonobo-item-container.h bonobo-item-handler.h \
-	          bonobo-listener.h bonobo-main.h bonobo-macros.h bonobo-moniker-extender.h \
-		  bonobo-moniker-simple.h bonobo-moniker-util.h bonobo-moniker.h bonobo-object.h \
-		  bonobo-foreign-object.h bonobo-persist-file.h bonobo-persist-stream.h \
-		  bonobo-persist.h bonobo-persist-client.h bonobo-property-bag.h \
-	          bonobo-property-bag-client.h bonobo-shlib-factory.h  bonobo-storage.h \
-		  bonobo-stream.h bonobo-stream-client.h bonobo-stream-memory.h \
-	          bonobo-storage-memory.h bonobo-xobject.h bonobo-i18n.h bonobo-types.h \
-		  bonobo-app-client.h bonobo-application.h"
-
-do_compile() {
-	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
-}
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation
-	for i in ${ACTIVATION_HEADERS}; do install -m 0644 bonobo-activation/$i ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation/; done
-	install -d ${STAGING_INCDIR}/libbonobo-2.0/bonobo
-	for i in ${BONOBO_HEADERS}; do install -m 0644 bonobo/$i ${STAGING_INCDIR}/libbonobo-2.0/bonobo/; done
-	install -m 0644 libbonobo.h ${STAGING_INCDIR}/libbonobo-2.0/
-	install -d ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
-	install idl/*.idl ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
-	oe_libinstall -so -C bonobo libbonobo-2 ${STAGING_LIBDIR}
-	oe_libinstall -so -C bonobo-activation libbonobo-activation ${STAGING_LIBDIR}
-}
-
-do_install() {
-	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
-}
diff --git a/gnome/libbonobo_2.6.2.bb b/gnome/libbonobo_2.6.2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/libbonobo_2.6.2.bb
diff --git a/gnome/libbonobo_2.6.2.oe b/gnome/libbonobo_2.6.2.oe
deleted file mode 100644
index eed4c1edbb..0000000000
--- a/gnome/libbonobo_2.6.2.oe
+++ /dev/null
@@ -1,57 +0,0 @@
-LICENSE = GPL
-PR = "r1"
-SECTION = "x11/gnome/libs"
-DESCRIPTION = "Bonobo CORBA interfaces library"
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-${PV}.tar.bz2 \
-           file://gtk-doc.m4 \
-           file://gtk-doc.make"
-DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
-
-FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so"
-FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \
-	${libdir}/bonobo-2.0/samples"
-
-inherit autotools libtool pkgconfig
-
-do_configure_prepend() {
-	install -d m4
-	install ${WORKDIR}/gtk-doc.m4 m4/
-	install ${WORKDIR}/gtk-doc.make ./
-}
-
-ACTIVATION_HEADERS = "Bonobo_Unknown.h Bonobo_GenericFactory.h Bonobo_Activation_types.h \
-	              bonobo-activation.h bonobo-activation-async.h bonobo-activation-activate.h \
- 		      bonobo-activation-init.h bonobo-activation-shlib.h bonobo-activation-register.h \
- 		      bonobo-activation-server-info.h bonobo-activation-version.h"
-
-BONOBO_HEADERS = "Bonobo.h bonobo-arg.h bonobo-context.h bonobo-event-source.h bonobo-exception.h \
-	          bonobo-generic-factory.h bonobo-item-container.h bonobo-item-handler.h \
-	          bonobo-listener.h bonobo-main.h bonobo-macros.h bonobo-moniker-extender.h \
-		  bonobo-moniker-simple.h bonobo-moniker-util.h bonobo-moniker.h bonobo-object.h \
-		  bonobo-foreign-object.h bonobo-persist-file.h bonobo-persist-stream.h \
-		  bonobo-persist.h bonobo-persist-client.h bonobo-property-bag.h \
-	          bonobo-property-bag-client.h bonobo-shlib-factory.h  bonobo-storage.h \
-		  bonobo-stream.h bonobo-stream-client.h bonobo-stream-memory.h \
-	          bonobo-storage-memory.h bonobo-xobject.h bonobo-i18n.h bonobo-types.h \
-		  bonobo-app-client.h bonobo-application.h"
-
-do_compile() {
-	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
-}
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation
-	for i in ${ACTIVATION_HEADERS}; do install -m 0644 bonobo-activation/$i ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation/; done
-	install -d ${STAGING_INCDIR}/libbonobo-2.0/bonobo
-	for i in ${BONOBO_HEADERS}; do install -m 0644 bonobo/$i ${STAGING_INCDIR}/libbonobo-2.0/bonobo/; done
-	install -m 0644 libbonobo.h ${STAGING_INCDIR}/libbonobo-2.0/
-	install -d ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
-	install idl/*.idl ${STAGING_DATADIR}/idl/bonobo-activation-2.0/
-	oe_libinstall -so -C bonobo libbonobo-2 ${STAGING_LIBDIR}
-	oe_libinstall -so -C bonobo-activation libbonobo-activation ${STAGING_LIBDIR}
-}
-
-do_install() {
-	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
-}
diff --git a/gnome/libbonoboui_2.6.1.bb b/gnome/libbonoboui_2.6.1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/libbonoboui_2.6.1.bb
diff --git a/gnome/libbonoboui_2.6.1.oe b/gnome/libbonoboui_2.6.1.oe
deleted file mode 100644
index d278787088..0000000000
--- a/gnome/libbonoboui_2.6.1.oe
+++ /dev/null
@@ -1,57 +0,0 @@
-LICENSE = GPL
-SECTION = "x11/gnome/libs"
-PR = "r1"
-
-inherit gnome pkgconfig
-
-FILES_${PN} += "${libdir}/libglade/2.0/*.so"
-FILES_${PN}-dev += "${libdir}/libglade/2.0/* ${datadir}/gnome-2.0/ui \
-	${libdir}/bonobo-2.0/samples"
-
-DEPENDS = "libbonobo libgnome glib-2.0 gtk-doc gconf libxml2 libglade"
-
-EXTRA_OECONF = "--disable-gtk-doc"
-
-HEADERS = " \
-bonobo/bonobo-zoomable.h \
-bonobo/bonobo-ui-component.h \
-bonobo/bonobo-dock-layout.h \
-bonobo/bonobo-ui-type-builtins.h \
-bonobo/bonobo-canvas-component.h \
-bonobo/bonobo-widget.h \
-bonobo/bonobo-ui-engine.h \
-bonobo/bonobo-window.h \
-bonobo/bonobo-ui-toolbar.h \
-bonobo/bonobo-dock-band.h \
-bonobo/bonobo-ui-toolbar-item.h \
-bonobo/bonobo-control.h \
-bonobo/bonobo-dock-item.h \
-bonobo/bonobo-ui-config-widget.h \
-bonobo/bonobo-zoomable-frame.h \
-bonobo/bonobo-control-frame.h \
-bonobo/bonobo-dock.h \
-bonobo/bonobo-ui-main.h \
-bonobo/bonobo-canvas-item.h \
-bonobo/bonobo-ui-node.h \
-bonobo/bonobo-socket.h \
-bonobo/bonobo-selector.h \
-bonobo/bonobo-ui-sync.h \
-bonobo/bonobo-ui-util.h \
-bonobo/bonobo-plug.h \
-bonobo/bonobo-ui-toolbar-button-item.h \
-bonobo/bonobo-ui-toolbar-toggle-button-item.h \
-bonobo/bonobo-ui-container.h \
-bonobo/bonobo-file-selector-util.h \
-bonobo/bonobo-property-control.h \
-bonobo/bonobo-selector-widget.h \
-libbonoboui.h \
-bonobo.h \
-"
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/libbonoboui-2.0/bonobo
-	for i in ${HEADERS}; do
-		install -m 0644 $i ${STAGING_INCDIR}/libbonoboui-2.0/$i
-	done
-	oe_libinstall -C bonobo -a -so libbonoboui-2 ${STAGING_LIBDIR}
-}
diff --git a/gnome/libgnome_2.6.1.1.bb b/gnome/libgnome_2.6.1.1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/libgnome_2.6.1.1.bb
diff --git a/gnome/libgnome_2.6.1.1.oe b/gnome/libgnome_2.6.1.1.oe
deleted file mode 100644
index 41b072207e..0000000000
--- a/gnome/libgnome_2.6.1.1.oe
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = GPL
-SECTION = "x11/gnome/libs"
-PR = "r1"
-
-inherit gnome
-
-SRC_URI += "file://makefile.patch;patch=1"
-
-DEPENDS = "gnome-vfs libbonobo"
-
-EXTRA_OECONF = "--disable-gtk-doc"
-
-do_stage() {
-	oe_libinstall -C libgnome -a -so libgnome-2 ${STAGING_LIBDIR}
-	gnome_stage_includes
-}
diff --git a/gnome/libgnomecanvas_2.6.1.1.bb b/gnome/libgnomecanvas_2.6.1.1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/libgnomecanvas_2.6.1.1.bb
diff --git a/gnome/libgnomecanvas_2.6.1.1.oe b/gnome/libgnomecanvas_2.6.1.1.oe
deleted file mode 100644
index ce9cffe4b2..0000000000
--- a/gnome/libgnomecanvas_2.6.1.1.oe
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = GPL
-SECTION = "x11/gnome/libs"
-PR = "r1"
-DESCRIPTION = "A powerful object-oriented display"
-inherit gnome
-
-DEPENDS = "gnome-vfs libbonobo 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/gnome/libgnomeprint_2.6.2.bb b/gnome/libgnomeprint_2.6.2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/libgnomeprint_2.6.2.bb
diff --git a/gnome/libgnomeprint_2.6.2.oe b/gnome/libgnomeprint_2.6.2.oe
deleted file mode 100644
index bbec31e74e..0000000000
--- a/gnome/libgnomeprint_2.6.2.oe
+++ /dev/null
@@ -1,13 +0,0 @@
-LICENSE = GPL
-SECTION = "x11/gnome/libs"
-PR = "r1"
-
-DEPENDS = "libxml2 glib-2.0 pango libart-lgpl fontconfig popt gnome-common"
-
-inherit flow-lossage pkgconfig gnome
-
-do_stage() {
-	install -d ${STAGING_LIBDIR}
-	oe_libinstall -so -a -C libgnomeprint libgnomeprint-2-2 ${STAGING_LIBDIR}
-	gnome_stage_includes
-}
diff --git a/gnome/libgnomeprintui_2.6.2.bb b/gnome/libgnomeprintui_2.6.2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/libgnomeprintui_2.6.2.bb
diff --git a/gnome/libgnomeprintui_2.6.2.oe b/gnome/libgnomeprintui_2.6.2.oe
deleted file mode 100644
index c5f94338b4..0000000000
--- a/gnome/libgnomeprintui_2.6.2.oe
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = GPL
-SECTION = "x11/gnome/libs"
-PR = "r1"
-DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme gnome-common"
-
-inherit gnome pkgconfig
-
-SRC_URI += "file://configure.patch;patch=1"
-
-do_stage() {
-	install -d ${STAGING_LIBDIR}
-	oe_libinstall -so -a -C libgnomeprintui libgnomeprintui-2-2 ${STAGING_LIBDIR}
-	gnome_stage_includes
-}
diff --git a/gnome/libgnomeui_2.6.1.1.bb b/gnome/libgnomeui_2.6.1.1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/libgnomeui_2.6.1.1.bb
diff --git a/gnome/libgnomeui_2.6.1.1.oe b/gnome/libgnomeui_2.6.1.1.oe
deleted file mode 100644
index 7c565da685..0000000000
--- a/gnome/libgnomeui_2.6.1.1.oe
+++ /dev/null
@@ -1,23 +0,0 @@
-LICENSE = GPL
-SECTION = "x11/gnome/libs"
-PR = "r1"
-DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
-DESCRIPTION = "GNOME User Interface Library"
-
-FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
-	${libdir}/libglade/*/lib*.so"
-
-inherit gnome
-
-SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
-
-EXTRA_OECONF = "--disable-gtk-doc"
-
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h
-}
-
-do_stage() {
-	gnome_stage_includes
-	oe_libinstall -C libgnomeui -a -so libgnomeui-2 ${STAGING_LIBDIR}
-}
diff --git a/gnome/orbit2-native_2.10.2.bb b/gnome/orbit2-native_2.10.2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/orbit2-native_2.10.2.bb
diff --git a/gnome/orbit2-native_2.10.2.oe b/gnome/orbit2-native_2.10.2.oe
deleted file mode 100644
index 2182ae8d80..0000000000
--- a/gnome/orbit2-native_2.10.2.oe
+++ /dev/null
@@ -1,20 +0,0 @@
-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-native popt-native gtk-doc"
-
-S = "${WORKDIR}/ORBit2-${PV}"
-FILESDIR = "${@os.path.dirname(oe.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/gnome/orbit2_2.10.2.bb b/gnome/orbit2_2.10.2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gnome/orbit2_2.10.2.bb
diff --git a/gnome/orbit2_2.10.2.oe b/gnome/orbit2_2.10.2.oe
deleted file mode 100644
index cd7eb1bcc3..0000000000
--- a/gnome/orbit2_2.10.2.oe
+++ /dev/null
@@ -1,46 +0,0 @@
-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/
-}