Merges.

2004/05/22 12:46:48-04:00 local!kergoth
Bugfixes per the recent FILESDIR cleanup.

2004/05/22 01:03:38-04:00 local!kergoth
Run a perl script against the repo to kill off direct FILESDIR usage
in favor of relative file:// paths in SRC_URI, and WORKDIR references
in functions.

2004/05/21 23:07:58-04:00 local!kergoth
Switch file:// FILESDIR uris in SRC_URI to the new relative path format.

BKrev: 40af8428aNyDLBX0MRtyso3VCpMv1w

5 files changed, 28 insertions, 14 deletions

diff --git a/gnome/gconf_2.6.1.oe b/gnome/gconf_2.6.1.oe
index 116918d3ee..aa0088946c 100644
--- a/gnome/gconf_2.6.1.oe
+++ b/gnome/gconf_2.6.1.oe
@@ -1,7 +1,7 @@
 SECTION = "gnome/base"
 DESCRIPTION = "GNOME configuration database system"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \
-	   file://${FILESDIR}/backends.patch;patch=1"
+	   file://backends.patch;patch=1"
 DEPENDS = "orbit2 glib-2.0 gettext"
 
 S = "${WORKDIR}/GConf-${PV}"
diff --git a/gnome/libbonobo_2.6.0.oe b/gnome/libbonobo_2.6.0.oe
index 409340060d..1c589a1227 100644
--- a/gnome/libbonobo_2.6.0.oe
+++ b/gnome/libbonobo_2.6.0.oe
@@ -1,14 +1,16 @@
 SECTION = "gnome/base"
 DESCRIPTION = "Bonobo CORBA interfaces library"
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-${PV}.tar.bz2"
+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"
 
 inherit autotools libtool pkgconfig
 
 do_configure_prepend() {
 	install -d m4
-	install ${FILESDIR}/gtk-doc.m4 m4/
-	install ${FILESDIR}/gtk-doc.make ./
+	install ${WORKDIR}/gtk-doc.m4 m4/
+	install ${WORKDIR}/gtk-doc.make ./
 }
 
 ACTIVATION_HEADERS = "Bonobo_Unknown.h Bonobo_GenericFactory.h Bonobo_Activation_types.h \
diff --git a/gnome/libgnome_2.6.1.1.oe b/gnome/libgnome_2.6.1.1.oe
index e69de29bb2..6271ae23c5 100644
--- a/gnome/libgnome_2.6.1.1.oe
+++ b/gnome/libgnome_2.6.1.1.oe
@@ -0,0 +1,8 @@
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.6/libgnome-${PV}.tar.bz2 \
+	   file://makefile.patch;patch=1"
+
+inherit autotools libtool
+
+DEPENDS = "gnome-vfs libbonobo"
+
+EXTRA_OECONF = "--disable-gtk-doc"
diff --git a/gnome/orbit2-native_2.10.2.oe b/gnome/orbit2-native_2.10.2.oe
index 7f32dd3e6f..204d3ba47c 100644
--- a/gnome/orbit2-native_2.10.2.oe
+++ b/gnome/orbit2-native_2.10.2.oe
@@ -1,9 +1,11 @@
 DESCRIPTION = "CORBA ORB"
 SECTION = "gnome/base"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.10/ORBit2-${PV}.tar.bz2 \
-	   file://${FILESDIR}/gtk-doc.m4 \
-	   file://${FILESDIR}/gtk-doc.make \
-	   file://${FILESDIR}/configure-lossage.patch;patch=1;pnum=1"
+           file://gtk-doc.m4 \
+           file://gtk-doc.make \
+           file://configure-lossage.patch;patch=1;pnum=1 \
+           file://gtk-doc.m4 \
+           file://gtk-doc.make"
 DEPENDS = "libidl-native popt-native"
 
 S = "${WORKDIR}/ORBit2-${PV}"
@@ -13,6 +15,6 @@ inherit autotools native
 
 do_configure_prepend() {
 	install -d m4
-	install ${FILESDIR}/gtk-doc.m4 m4/
-	install ${FILESDIR}/gtk-doc.make ./
+	install ${WORKDIR}/gtk-doc.m4 m4/
+	install ${WORKDIR}/gtk-doc.make ./
 }
diff --git a/gnome/orbit2_2.10.2.oe b/gnome/orbit2_2.10.2.oe
index fa9ce0e0fd..3a95a475eb 100644
--- a/gnome/orbit2_2.10.2.oe
+++ b/gnome/orbit2_2.10.2.oe
@@ -1,9 +1,11 @@
 DESCRIPTION = "CORBA ORB"
 SECTION = "gnome/base"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.10/ORBit2-${PV}.tar.bz2 \
-	   file://${FILESDIR}/gtk-doc.m4 \
-	   file://${FILESDIR}/gtk-doc.make \
-	   file://${FILESDIR}/configure-lossage.patch;patch=1;pnum=1"
+           file://gtk-doc.m4 \
+           file://gtk-doc.make \
+           file://configure-lossage.patch;patch=1;pnum=1 \
+           file://gtk-doc.m4 \
+           file://gtk-doc.make"
 DEPENDS = "libidl popt orbit2-native"
 
 S = "${WORKDIR}/ORBit2-${PV}"
@@ -16,8 +18,8 @@ do_compile() {
 
 do_configure_prepend() {
 	install -d m4
-	install ${FILESDIR}/gtk-doc.m4 m4/
-	install ${FILESDIR}/gtk-doc.make ./
+	install ${WORKDIR}/gtk-doc.m4 m4/
+	install ${WORKDIR}/gtk-doc.make ./
 }
 
 do_stage() {