Moved ORBit dep to orbit

44 files changed, 88 insertions, 88 deletions

diff --git a/gnome-base/bonobo-activation/bonobo-activation-1.0.3.ebuild b/gnome-base/bonobo-activation/bonobo-activation-1.0.3.ebuild
index 30e449b8b38c..d06448322239 100644
--- a/gnome-base/bonobo-activation/bonobo-activation-1.0.3.ebuild
+++ b/gnome-base/bonobo-activation/bonobo-activation-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo-activation/bonobo-activation-1.0.3.ebuild,v 1.13 2004/07/14 15:02:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo-activation/bonobo-activation-1.0.3.ebuild,v 1.14 2004/08/21 15:26:06 obz Exp $
 
 IUSE="doc"
 
@@ -17,7 +17,7 @@ KEYWORDS="x86 ppc sparc alpha"
 RDEPEND=">=dev-libs/glib-2.0.4
 	>=dev-libs/libxml2-2.4.20
 	>=dev-libs/popt-1.6.3
-	>=gnome-base/ORBit2-2.4.0
+	>=gnome-base/orbit-2.4.0
 	>=net-libs/linc-0.5.1"
 
 DEPEND="${RDEPEND}
diff --git a/gnome-base/bonobo-activation/bonobo-activation-2.2.1.1.ebuild b/gnome-base/bonobo-activation/bonobo-activation-2.2.1.1.ebuild
index b78336935148..bf41ce127ed6 100644
--- a/gnome-base/bonobo-activation/bonobo-activation-2.2.1.1.ebuild
+++ b/gnome-base/bonobo-activation/bonobo-activation-2.2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo-activation/bonobo-activation-2.2.1.1.ebuild,v 1.9 2004/07/14 15:02:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo-activation/bonobo-activation-2.2.1.1.ebuild,v 1.10 2004/08/21 15:26:06 obz Exp $
 
 IUSE="doc"
 
@@ -16,7 +16,7 @@ KEYWORDS="x86 ppc ~alpha sparc hppa amd64"
 RDEPEND=">=dev-libs/glib-2.0.1
 	>=dev-libs/libxml2-2.4.20
 	>=dev-libs/popt-1.5
-	>=gnome-base/ORBit2-2.4
+	>=gnome-base/orbit-2.4
 	>=net-libs/linc-0.5.1"
 
 DEPEND="${RDEPEND}
diff --git a/gnome-base/bonobo-activation/bonobo-activation-2.2.1.ebuild b/gnome-base/bonobo-activation/bonobo-activation-2.2.1.ebuild
index 1795ab721dde..c90ee4ff8ee3 100644
--- a/gnome-base/bonobo-activation/bonobo-activation-2.2.1.ebuild
+++ b/gnome-base/bonobo-activation/bonobo-activation-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo-activation/bonobo-activation-2.2.1.ebuild,v 1.9 2004/07/14 15:02:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo-activation/bonobo-activation-2.2.1.ebuild,v 1.10 2004/08/21 15:26:06 obz Exp $
 
 IUSE="doc"
 
@@ -16,7 +16,7 @@ KEYWORDS="x86 ppc alpha ~sparc"
 RDEPEND=">=dev-libs/glib-2.0.1
 	>=dev-libs/libxml2-2.4.20
 	>=dev-libs/popt-1.5
-	>=gnome-base/ORBit2-2.4
+	>=gnome-base/orbit-2.4
 	>=net-libs/linc-0.5.1"
 
 DEPEND="${RDEPEND}
diff --git a/gnome-base/bonobo-activation/bonobo-activation-2.2.2.ebuild b/gnome-base/bonobo-activation/bonobo-activation-2.2.2.ebuild
index 39cec80f01c7..ae4651958243 100644
--- a/gnome-base/bonobo-activation/bonobo-activation-2.2.2.ebuild
+++ b/gnome-base/bonobo-activation/bonobo-activation-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo-activation/bonobo-activation-2.2.2.ebuild,v 1.9 2004/07/14 15:02:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo-activation/bonobo-activation-2.2.2.ebuild,v 1.10 2004/08/21 15:26:06 obz Exp $
 
 IUSE="doc"
 
@@ -16,7 +16,7 @@ KEYWORDS="x86 ppc ~alpha ~sparc hppa amd64"
 RDEPEND=">=dev-libs/glib-2.0.1
 	>=dev-libs/libxml2-2.4.20
 	>=dev-libs/popt-1.5
-	>=gnome-base/ORBit2-2.4
+	>=gnome-base/orbit-2.4
 	>=net-libs/linc-0.5.1"
 
 DEPEND="${RDEPEND}
diff --git a/gnome-base/bonobo-activation/bonobo-activation-2.2.3.ebuild b/gnome-base/bonobo-activation/bonobo-activation-2.2.3.ebuild
index bc95b2997f05..ee75843a3ea4 100644
--- a/gnome-base/bonobo-activation/bonobo-activation-2.2.3.ebuild
+++ b/gnome-base/bonobo-activation/bonobo-activation-2.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo-activation/bonobo-activation-2.2.3.ebuild,v 1.6 2004/06/24 21:54:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo-activation/bonobo-activation-2.2.3.ebuild,v 1.7 2004/08/21 15:26:06 obz Exp $
 
 IUSE="doc"
 
@@ -16,7 +16,7 @@ KEYWORDS="x86 ppc ~alpha ~sparc hppa"
 RDEPEND=">=dev-libs/glib-2.0.1
 	>=dev-libs/libxml2-2.4.20
 	>=dev-libs/popt-1.5
-	>=gnome-base/ORBit2-2.4
+	>=gnome-base/orbit-2.4
 	>=net-libs/linc-0.5.1"
 
 DEPEND="${RDEPEND}
diff --git a/gnome-base/bonobo-activation/bonobo-activation-2.2.4.ebuild b/gnome-base/bonobo-activation/bonobo-activation-2.2.4.ebuild
index ac782ed941e1..3dcfc83f1dc6 100644
--- a/gnome-base/bonobo-activation/bonobo-activation-2.2.4.ebuild
+++ b/gnome-base/bonobo-activation/bonobo-activation-2.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo-activation/bonobo-activation-2.2.4.ebuild,v 1.8 2004/06/24 21:54:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo-activation/bonobo-activation-2.2.4.ebuild,v 1.9 2004/08/21 15:26:06 obz Exp $
 
 IUSE="doc"
 
@@ -16,7 +16,7 @@ KEYWORDS="x86 ppc ~alpha sparc hppa ~amd64"
 RDEPEND=">=dev-libs/glib-2.0.1
 	>=dev-libs/libxml2-2.4.20
 	>=dev-libs/popt-1.5
-	>=gnome-base/ORBit2-2.4
+	>=gnome-base/orbit-2.4
 	>=net-libs/linc-0.5.1"
 
 DEPEND="${RDEPEND}
diff --git a/gnome-base/bonobo/bonobo-1.0.19-r1.ebuild b/gnome-base/bonobo/bonobo-1.0.19-r1.ebuild
index 5a08b6f20925..034dc7417d0b 100644
--- a/gnome-base/bonobo/bonobo-1.0.19-r1.ebuild
+++ b/gnome-base/bonobo/bonobo-1.0.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo/bonobo-1.0.19-r1.ebuild,v 1.21 2004/08/07 23:02:29 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo/bonobo-1.0.19-r1.ebuild,v 1.22 2004/08/21 15:19:33 obz Exp $
 
 IUSE="nls"
 
@@ -12,7 +12,7 @@ KEYWORDS="x86 ppc sparc"
 LICENSE="GPL-2"
 
 RDEPEND=">=gnome-base/oaf-0.6.8
-	>=gnome-base/ORBit-0.5.13
+	=gnome-base/orbit-0*
 	>=gnome-base/gnome-print-0.30
 	>=media-libs/gdk-pixbuf-0.6"
 
diff --git a/gnome-base/bonobo/bonobo-1.0.21.ebuild b/gnome-base/bonobo/bonobo-1.0.21.ebuild
index c9938f5e8658..f2471013d239 100644
--- a/gnome-base/bonobo/bonobo-1.0.21.ebuild
+++ b/gnome-base/bonobo/bonobo-1.0.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo/bonobo-1.0.21.ebuild,v 1.12 2004/08/07 23:02:29 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo/bonobo-1.0.21.ebuild,v 1.13 2004/08/21 15:19:33 obz Exp $
 
 IUSE="nls"
 
@@ -14,7 +14,7 @@ KEYWORDS="~x86 ~ppc ~sparc"
 LICENSE="GPL-2"
 
 RDEPEND=">=gnome-base/oaf-0.6.8
-	>=gnome-base/ORBit-0.5.13
+	=gnome-base/orbit-0*
 	>=gnome-base/gnome-print-0.30
 	>=media-libs/gdk-pixbuf-0.6"
 
diff --git a/gnome-base/bonobo/bonobo-1.0.22.ebuild b/gnome-base/bonobo/bonobo-1.0.22.ebuild
index 3f9e468d8261..d4828bffc689 100644
--- a/gnome-base/bonobo/bonobo-1.0.22.ebuild
+++ b/gnome-base/bonobo/bonobo-1.0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo/bonobo-1.0.22.ebuild,v 1.18 2004/08/07 23:02:29 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo/bonobo-1.0.22.ebuild,v 1.19 2004/08/21 15:19:33 obz Exp $
 
 IUSE="nls"
 
@@ -14,7 +14,7 @@ KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 mips"
 LICENSE="GPL-2"
 
 RDEPEND=">=gnome-base/oaf-0.6.8
-	>=gnome-base/ORBit-0.5.13
+	=gnome-base/orbit-0*
 	>=gnome-base/gnome-print-0.30
 	>=media-libs/gdk-pixbuf-0.6"
 
diff --git a/gnome-base/gconf/gconf-2.4.0.1.ebuild b/gnome-base/gconf/gconf-2.4.0.1.ebuild
index c303b589396f..d0ade8841a1e 100644
--- a/gnome-base/gconf/gconf-2.4.0.1.ebuild
+++ b/gnome-base/gconf/gconf-2.4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.4.0.1.ebuild,v 1.15 2004/07/31 06:38:55 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.4.0.1.ebuild,v 1.16 2004/08/21 15:23:30 obz Exp $
 
 inherit gnome2
 
@@ -19,7 +19,7 @@ SLOT="2"
 KEYWORDS="x86 ppc alpha sparc hppa amd64 ia64 mips"
 
 RDEPEND=">=dev-libs/glib-2.0.1
-	>=gnome-base/ORBit2-2.8
+	>=gnome-base/orbit-2.8
 	>=dev-libs/libxml2-2.4.17
 	dev-libs/popt
 	>=x11-libs/gtk+-2"
diff --git a/gnome-base/gconf/gconf-2.6.0.ebuild b/gnome-base/gconf/gconf-2.6.0.ebuild
index 6dffe9af62f5..014e1149857f 100644
--- a/gnome-base/gconf/gconf-2.6.0.ebuild
+++ b/gnome-base/gconf/gconf-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.6.0.ebuild,v 1.9 2004/07/31 06:38:55 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.6.0.ebuild,v 1.10 2004/08/21 15:23:30 obz Exp $
 
 inherit gnome2
 
@@ -19,7 +19,7 @@ SLOT="2"
 KEYWORDS="x86 ppc alpha ~sparc hppa amd64 ~ia64 mips"
 
 RDEPEND=">=dev-libs/glib-2.0.1
-	>=gnome-base/ORBit2-2.4
+	>=gnome-base/orbit-2.4
 	>=dev-libs/libxml2-2
 	dev-libs/popt
 	>=x11-libs/gtk+-2"
diff --git a/gnome-base/gconf/gconf-2.6.1.ebuild b/gnome-base/gconf/gconf-2.6.1.ebuild
index 6ccd20a64ecc..1d6fb3fb5d28 100644
--- a/gnome-base/gconf/gconf-2.6.1.ebuild
+++ b/gnome-base/gconf/gconf-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.6.1.ebuild,v 1.6 2004/07/31 06:38:55 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.6.1.ebuild,v 1.7 2004/08/21 15:23:30 obz Exp $
 
 inherit eutils gnome2
 
@@ -19,7 +19,7 @@ SLOT="2"
 KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa amd64 ~ia64 ~mips ~ppc64"
 
 RDEPEND=">=dev-libs/glib-2.0.1
-	>=gnome-base/ORBit2-2.4
+	>=gnome-base/orbit-2.4
 	>=dev-libs/libxml2-2
 	dev-libs/popt
 	>=x11-libs/gtk+-2"
diff --git a/gnome-base/gconf/gconf-2.6.2.ebuild b/gnome-base/gconf/gconf-2.6.2.ebuild
index e6fb94680276..044dd356f549 100644
--- a/gnome-base/gconf/gconf-2.6.2.ebuild
+++ b/gnome-base/gconf/gconf-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.6.2.ebuild,v 1.7 2004/08/08 00:59:28 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.6.2.ebuild,v 1.8 2004/08/21 15:23:30 obz Exp $
 
 inherit eutils gnome2
 
@@ -19,7 +19,7 @@ SLOT="2"
 KEYWORDS="x86 ~ppc ~alpha sparc hppa amd64 ~ia64 ~mips ppc64"
 
 RDEPEND=">=dev-libs/glib-2.0.1
-	>=gnome-base/ORBit2-2.4
+	>=gnome-base/orbit-2.4
 	>=dev-libs/libxml2-2
 	dev-libs/popt
 	>=x11-libs/gtk+-2"
diff --git a/gnome-base/gnome-libs/gnome-libs-1.4.1.6.ebuild b/gnome-base/gnome-libs/gnome-libs-1.4.1.6.ebuild
index 73afea1af358..cd59c057b12b 100644
--- a/gnome-base/gnome-libs/gnome-libs-1.4.1.6.ebuild
+++ b/gnome-base/gnome-libs/gnome-libs-1.4.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/gnome-libs-1.4.1.6.ebuild,v 1.18 2004/07/14 15:09:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/gnome-libs-1.4.1.6.ebuild,v 1.19 2004/08/21 15:18:10 obz Exp $
 
 IUSE="doc nls kde"
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 
 RDEPEND=">=media-libs/imlib-1.9.10
 		>=media-sound/esound-0.2.23
-		>=gnome-base/ORBit-0.5.12
+		=gnome-base/orbit-0*
 		=x11-libs/gtk+-1.2*
 		<sys-libs/db-2
 		doc? ( app-text/docbook-sgml
diff --git a/gnome-base/gnome-libs/gnome-libs-1.4.1.7.ebuild b/gnome-base/gnome-libs/gnome-libs-1.4.1.7.ebuild
index f89ee30e2b6c..a399b016fd42 100644
--- a/gnome-base/gnome-libs/gnome-libs-1.4.1.7.ebuild
+++ b/gnome-base/gnome-libs/gnome-libs-1.4.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/gnome-libs-1.4.1.7.ebuild,v 1.21 2004/07/14 15:09:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/gnome-libs-1.4.1.7.ebuild,v 1.22 2004/08/21 15:18:10 obz Exp $
 
 IUSE="doc nls kde"
 
@@ -14,7 +14,7 @@ KEYWORDS="x86 ppc sparc alpha"
 
 RDEPEND=">=media-libs/imlib-1.9.10
 	>=media-sound/esound-0.2.23
-	>=gnome-base/ORBit-0.5.12
+	=gnome-base/orbit-0*
 	=x11-libs/gtk+-1.2*
 	<sys-libs/db-2
 	doc? ( app-text/docbook-sgml
diff --git a/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild b/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild
index 3dcd7155f33a..bbd74c8f94e5 100644
--- a/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild
+++ b/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild,v 1.25 2004/07/30 03:09:05 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild,v 1.26 2004/08/21 15:18:10 obz Exp $
 
 IUSE="doc nls kde"
 
@@ -16,7 +16,7 @@ KEYWORDS="x86 alpha hppa amd64 ia64 sparc mips ppc ppc64"
 
 RDEPEND=">=media-libs/imlib-1.9.10
 		>=media-sound/esound-0.2.23
-		>=gnome-base/ORBit-0.5.12
+		=gnome-base/orbit-0*
 		=x11-libs/gtk+-1.2*
 		<=sys-libs/db-2
 		doc? ( app-text/docbook-sgml
diff --git a/gnome-base/gnome-light/gnome-light-2.2.1.ebuild b/gnome-base/gnome-light/gnome-light-2.2.1.ebuild
index adac17970438..4b0ff0ab5421 100644
--- a/gnome-base/gnome-light/gnome-light-2.2.1.ebuild
+++ b/gnome-base/gnome-light/gnome-light-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.2.1.ebuild,v 1.5 2004/07/11 19:59:42 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.2.1.ebuild,v 1.6 2004/08/21 15:26:42 obz Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
@@ -52,7 +52,7 @@ RDEPEND="!gnome-base/gnome-core
 	>=net-libs/linc-1.0.1
 	>=gnome-base/libglade-2.0.1
 	>=x11-libs/libwnck-2.2.1
-	>=gnome-base/ORBit2-2.6.1
+	>=gnome-base/orbit-2.6.1
 	>=x11-themes/gnome-icon-theme-1.0.1
 	>=x11-themes/gnome-themes-2.2.1"
 
diff --git a/gnome-base/gnome-light/gnome-light-2.4.1.ebuild b/gnome-base/gnome-light/gnome-light-2.4.1.ebuild
index 64575bbe8b9e..1bde817ee00e 100644
--- a/gnome-base/gnome-light/gnome-light-2.4.1.ebuild
+++ b/gnome-base/gnome-light/gnome-light-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.4.1.ebuild,v 1.4 2004/07/11 19:59:42 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.4.1.ebuild,v 1.5 2004/08/21 15:26:42 obz Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
@@ -53,7 +53,7 @@ RDEPEND="!gnome-base/gnome-core
 	>=gnome-base/librsvg-2.4
 	>=gnome-base/libglade-2.0.1
 	>=x11-libs/libwnck-2.4.0.1-r1
-	>=gnome-base/ORBit2-2.8.3
+	>=gnome-base/orbit-2.8.3
 	>=x11-themes/gnome-icon-theme-1.0.9
 	>=x11-themes/gnome-themes-2.4.1"
 
diff --git a/gnome-base/gnome-light/gnome-light-2.4.1_p1.ebuild b/gnome-base/gnome-light/gnome-light-2.4.1_p1.ebuild
index f41a1a018e83..0a8656f13c49 100644
--- a/gnome-base/gnome-light/gnome-light-2.4.1_p1.ebuild
+++ b/gnome-base/gnome-light/gnome-light-2.4.1_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.4.1_p1.ebuild,v 1.3 2004/07/11 19:59:42 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.4.1_p1.ebuild,v 1.4 2004/08/21 15:26:42 obz Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
@@ -53,7 +53,7 @@ RDEPEND="!gnome-base/gnome-core
 	>=gnome-base/librsvg-2.4
 	>=gnome-base/libglade-2.0.1
 	>=x11-libs/libwnck-2.4.0.1-r1
-	>=gnome-base/ORBit2-2.8.3
+	>=gnome-base/orbit-2.8.3
 	>=x11-themes/gnome-icon-theme-1.0.9
 	>=x11-themes/gnome-themes-2.4.1"
 
diff --git a/gnome-base/gnome-light/gnome-light-2.4.2.ebuild b/gnome-base/gnome-light/gnome-light-2.4.2.ebuild
index bdb089e27eba..3d6948979fdd 100644
--- a/gnome-base/gnome-light/gnome-light-2.4.2.ebuild
+++ b/gnome-base/gnome-light/gnome-light-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.4.2.ebuild,v 1.3 2004/07/11 19:59:42 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.4.2.ebuild,v 1.4 2004/08/21 15:26:42 obz Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
@@ -53,7 +53,7 @@ RDEPEND="!gnome-base/gnome-core
 	>=gnome-base/librsvg-2.4
 	>=gnome-base/libglade-2.0.1
 	>=x11-libs/libwnck-2.4.0.1-r1
-	>=gnome-base/ORBit2-2.8.3
+	>=gnome-base/orbit-2.8.3
 	>=x11-themes/gnome-icon-theme-1.0.9
 	>=x11-themes/gnome-themes-2.4.1"
 
diff --git a/gnome-base/gnome-light/gnome-light-2.6.ebuild b/gnome-base/gnome-light/gnome-light-2.6.ebuild
index 9b8d9873973c..80d11a3d1c79 100644
--- a/gnome-base/gnome-light/gnome-light-2.6.ebuild
+++ b/gnome-base/gnome-light/gnome-light-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.6.ebuild,v 1.4 2004/07/11 19:59:42 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.6.ebuild,v 1.5 2004/08/21 15:26:42 obz Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
@@ -54,7 +54,7 @@ RDEPEND="!gnome-base/gnome-core
 	>=gnome-base/librsvg-2.6.4
 	>=gnome-base/libglade-2.3.6
 	>=x11-libs/libwnck-2.4.0.1-r1
-	>=gnome-base/ORBit2-2.10
+	>=gnome-base/orbit-2.10
 
 	>=x11-themes/gnome-icon-theme-1.2
 	>=x11-themes/gnome-themes-2.6"
diff --git a/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild
index a13facd110d8..bb571feeeaff 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild,v 1.12 2004/06/24 21:57:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild,v 1.13 2004/08/21 15:27:57 obz Exp $
 
 inherit gnome2 eutils
 
@@ -17,7 +17,7 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 RDEPEND=">=x11-libs/gtk+-2.1
 	>=x11-libs/libwnck-2.3
-	>=gnome-base/ORBit2-2.4
+	>=gnome-base/orbit-2.4
 	>=gnome-base/gnome-vfs-2.3
 	>=gnome-base/gnome-desktop-2.3
 	>=gnome-base/libbonoboui-2.1.1
diff --git a/gnome-base/gnome-panel/gnome-panel-2.6.0.ebuild b/gnome-base/gnome-panel/gnome-panel-2.6.0.ebuild
index 19bce11573a4..fe4459867bb0 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.6.0.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.6.0.ebuild,v 1.8 2004/07/04 10:49:54 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.6.0.ebuild,v 1.9 2004/08/21 15:27:57 obz Exp $
 
 inherit gnome2 eutils
 
@@ -14,7 +14,7 @@ SLOT="0"
 
 RDEPEND=">=x11-libs/gtk+-2.3.2
 	>=x11-libs/libwnck-2.3
-	>=gnome-base/ORBit2-2.4
+	>=gnome-base/orbit-2.4
 	>=gnome-base/gnome-vfs-2.3
 	>=gnome-base/gnome-desktop-2.2
 	>=gnome-base/libbonoboui-2.1.1
diff --git a/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild
index 09c58abf6a95..65659054e71c 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild,v 1.4 2004/06/24 21:57:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.6.1.ebuild,v 1.5 2004/08/21 15:27:57 obz Exp $
 
 inherit gnome2 eutils
 
@@ -14,7 +14,7 @@ SLOT="0"
 
 RDEPEND=">=x11-libs/gtk+-2.3.2
 	>=x11-libs/libwnck-2.3
-	>=gnome-base/ORBit2-2.4
+	>=gnome-base/orbit-2.4
 	>=gnome-base/gnome-vfs-2.3
 	>=gnome-base/gnome-desktop-2.2
 	>=gnome-base/libbonoboui-2.1.1
diff --git a/gnome-base/gnome-panel/gnome-panel-2.6.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.6.2.ebuild
index 3595b886c7d0..5e0ef3355501 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.6.2.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.6.2.ebuild,v 1.6 2004/08/08 00:59:28 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.6.2.ebuild,v 1.7 2004/08/21 15:27:57 obz Exp $
 
 inherit gnome2 eutils
 
@@ -14,7 +14,7 @@ SLOT="0"
 
 RDEPEND=">=x11-libs/gtk+-2.3.2
 	>=x11-libs/libwnck-2.3
-	>=gnome-base/ORBit2-2.4
+	>=gnome-base/orbit-2.4
 	>=gnome-base/gnome-vfs-2.3
 	>=gnome-base/gnome-desktop-2.2
 	>=gnome-base/libbonoboui-2.1.1
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.4.2-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.4.2-r1.ebuild
index bf6b43af0d08..36fb713a5e40 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.4.2-r1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.4.2-r1.ebuild,v 1.9 2004/06/24 21:58:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.4.2-r1.ebuild,v 1.10 2004/08/21 15:22:42 obz Exp $
 
 inherit gnome2
 
@@ -15,7 +15,7 @@ LICENSE="GPL-2 LGPL-2.1"
 
 RDEPEND=">=dev-libs/glib-2
 	>=gnome-base/gconf-1.2
-	>=gnome-base/ORBit2-2.4
+	>=gnome-base/orbit-2.4
 	>=gnome-base/libbonobo-2
 	>=dev-libs/libxml2-2.2.8
 	>=gnome-base/gnome-mime-data-2
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.6.0.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.6.0.ebuild
index 7d339ddc8c58..94ddddc26808 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.6.0.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.6.0.ebuild,v 1.11 2004/07/03 19:16:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.6.0.ebuild,v 1.12 2004/08/21 15:22:42 obz Exp $
 
 # FIXME : can use gnutls
 inherit gnome2 eutils
@@ -17,7 +17,7 @@ LICENSE="GPL-2 LGPL-2"
 
 RDEPEND=">=dev-libs/glib-2
 	>=gnome-base/gconf-1.2
-	>=gnome-base/ORBit2-2.9
+	>=gnome-base/orbit-2.9
 	>=gnome-base/libbonobo-2
 	>=dev-libs/libxml2-2.2.8
 
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.6.1.1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.6.1.1.ebuild
index 991864bfda12..e731e1b70faa 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.6.1.1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.6.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.6.1.1.ebuild,v 1.9 2004/08/05 21:46:19 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.6.1.1.ebuild,v 1.10 2004/08/21 15:22:42 obz Exp $
 
 inherit gnome2 eutils
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2 LGPL-2"
 
 RDEPEND=">=dev-libs/glib-2
 	>=gnome-base/gconf-1.2
-	>=gnome-base/ORBit2-2.9
+	>=gnome-base/orbit-2.9
 	>=gnome-base/libbonobo-2
 	>=dev-libs/libxml2-2.2.8
 
diff --git a/gnome-base/gnome/gnome-2.4.2.ebuild b/gnome-base/gnome/gnome-2.4.2.ebuild
index a3d6ed4d1730..31cade71d2c7 100644
--- a/gnome-base/gnome/gnome-2.4.2.ebuild
+++ b/gnome-base/gnome/gnome-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.4.2.ebuild,v 1.14 2004/06/24 21:55:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.4.2.ebuild,v 1.15 2004/08/21 15:25:13 obz Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Meta package for the GNOME desktop."
@@ -35,7 +35,7 @@ RDEPEND="!gnome-base/gnome-core
 	>=gnome-base/gconf-2.4.0.1
 
 	>=dev-libs/libIDL-0.8.2
-	>=gnome-base/ORBit2-2.8.3
+	>=gnome-base/orbit-2.8.3
 
 	>=media-libs/audiofile-0.2.5
 	>=media-sound/esound-0.2.32
diff --git a/gnome-base/gnome/gnome-2.6.1_p1.ebuild b/gnome-base/gnome/gnome-2.6.1_p1.ebuild
index 9b3aaaf6b7e0..1bcf6fae48fd 100644
--- a/gnome-base/gnome/gnome-2.6.1_p1.ebuild
+++ b/gnome-base/gnome/gnome-2.6.1_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.6.1_p1.ebuild,v 1.13 2004/07/14 15:07:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.6.1_p1.ebuild,v 1.14 2004/08/21 15:25:13 obz Exp $
 
 # UPDATE TRACKER : GNOME TEAM ONLY
 
@@ -39,7 +39,7 @@ RDEPEND="!gnome-base/gnome-core
 	>=media-libs/libart_lgpl-2.3.16
 
 	>=dev-libs/libIDL-0.8.3
-	>=gnome-base/ORBit2-2.10.2
+	>=gnome-base/orbit-2.10.2
 
 	>=gnome-base/gconf-2.6.1
 	>=gnome-base/gnome-keyring-0.2.1
diff --git a/gnome-base/gnome/gnome-2.6.1_rc1.ebuild b/gnome-base/gnome/gnome-2.6.1_rc1.ebuild
index 8e497231dcd2..6dea5f01b02b 100644
--- a/gnome-base/gnome/gnome-2.6.1_rc1.ebuild
+++ b/gnome-base/gnome/gnome-2.6.1_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.6.1_rc1.ebuild,v 1.7 2004/07/19 21:53:35 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.6.1_rc1.ebuild,v 1.8 2004/08/21 15:25:13 obz Exp $
 
 # UPDATE TRACKER : GNOME TEAM ONLY
 
@@ -39,7 +39,7 @@ RDEPEND="!gnome-base/gnome-core
 	>=media-libs/libart_lgpl-2.3.16
 
 	>=dev-libs/libIDL-0.8.3
-	>=gnome-base/ORBit2-2.10.1
+	>=gnome-base/orbit-2.10.1
 
 	>=gnome-base/gconf-2.6.1
 	>=gnome-base/gnome-keyring-0.2.1
diff --git a/gnome-base/gnome/gnome-2.6.2-r1.ebuild b/gnome-base/gnome/gnome-2.6.2-r1.ebuild
index 665dc4828186..d650d704558c 100644
--- a/gnome-base/gnome/gnome-2.6.2-r1.ebuild
+++ b/gnome-base/gnome/gnome-2.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.6.2-r1.ebuild,v 1.5 2004/08/08 00:59:28 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.6.2-r1.ebuild,v 1.6 2004/08/21 15:25:13 obz Exp $
 
 # UPDATE TRACKER : GNOME TEAM ONLY
 
@@ -43,7 +43,7 @@ RDEPEND="!gnome-base/gnome-core
 	>=media-libs/libart_lgpl-2.3.16
 
 	>=dev-libs/libIDL-0.8.3
-	>=gnome-base/ORBit2-2.10.3
+	>=gnome-base/orbit-2.10.3
 
 	>=gnome-base/gconf-2.6.2
 	>=gnome-base/gnome-keyring-0.2.1
diff --git a/gnome-base/gnome/gnome-2.6.3_pre0.ebuild b/gnome-base/gnome/gnome-2.6.3_pre0.ebuild
index 498fa86b4950..cfe866cbbbf1 100644
--- a/gnome-base/gnome/gnome-2.6.3_pre0.ebuild
+++ b/gnome-base/gnome/gnome-2.6.3_pre0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.6.3_pre0.ebuild,v 1.5 2004/08/19 15:46:27 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.6.3_pre0.ebuild,v 1.6 2004/08/21 15:25:13 obz Exp $
 
 # UPDATE TRACKER : GNOME TEAM ONLY
 
@@ -43,7 +43,7 @@ RDEPEND="!gnome-base/gnome-core
 	>=media-libs/libart_lgpl-2.3.16
 
 	>=dev-libs/libIDL-0.8.3
-	>=gnome-base/ORBit2-2.10.3
+	>=gnome-base/orbit-2.10.3
 
 	>=gnome-base/gconf-2.6.2
 	>=gnome-base/gnome-keyring-0.2.1
diff --git a/gnome-base/gnome/gnome-2.6.ebuild b/gnome-base/gnome/gnome-2.6.ebuild
index 430f3b88b28c..d0e703e07e4a 100644
--- a/gnome-base/gnome/gnome-2.6.ebuild
+++ b/gnome-base/gnome/gnome-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.6.ebuild,v 1.13 2004/07/14 15:07:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.6.ebuild,v 1.14 2004/08/21 15:25:13 obz Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Meta package for the GNOME desktop."
@@ -37,7 +37,7 @@ RDEPEND="!gnome-base/gnome-core
 	>=media-libs/libart_lgpl-2.3.16
 
 	>=dev-libs/libIDL-0.8.3
-	>=gnome-base/ORBit2-2.10
+	>=gnome-base/orbit-2.10
 
 	>=gnome-base/gconf-2.6
 	>=gnome-base/gnome-keyring-0.2
diff --git a/gnome-base/libbonobo/libbonobo-2.4.0.ebuild b/gnome-base/libbonobo/libbonobo-2.4.0.ebuild
index 51d25bb1ceb8..60065932701c 100644
--- a/gnome-base/libbonobo/libbonobo-2.4.0.ebuild
+++ b/gnome-base/libbonobo/libbonobo-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.4.0.ebuild,v 1.9 2004/06/24 21:59:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.4.0.ebuild,v 1.10 2004/08/21 15:29:49 obz Exp $
 
 inherit gnome2
 
@@ -13,7 +13,7 @@ KEYWORDS="x86 ppc alpha sparc ~hppa amd64 ia64"
 LICENSE="LGPL-2.1 GPL-2"
 
 RDEPEND=">=dev-libs/glib-2.0.1
-	>=gnome-base/ORBit2-2.8
+	>=gnome-base/orbit-2.8
 	>=dev-libs/libxml2-2.4.20
 	!gnome-base/bonobo-activation"
 
diff --git a/gnome-base/libbonobo/libbonobo-2.4.3.ebuild b/gnome-base/libbonobo/libbonobo-2.4.3.ebuild
index d85d320d87c8..b7a7fce8e1b0 100644
--- a/gnome-base/libbonobo/libbonobo-2.4.3.ebuild
+++ b/gnome-base/libbonobo/libbonobo-2.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.4.3.ebuild,v 1.12 2004/06/24 21:59:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.4.3.ebuild,v 1.13 2004/08/21 15:29:49 obz Exp $
 
 inherit gnome2
 
@@ -13,7 +13,7 @@ KEYWORDS="x86 ppc alpha sparc hppa amd64 ia64 mips"
 LICENSE="LGPL-2.1 GPL-2"
 
 RDEPEND=">=dev-libs/glib-2.0.1
-	>=gnome-base/ORBit2-2.8
+	>=gnome-base/orbit-2.8
 	>=dev-libs/libxml2-2.4.20
 	!gnome-base/bonobo-activation"
 
diff --git a/gnome-base/libbonobo/libbonobo-2.6.0.ebuild b/gnome-base/libbonobo/libbonobo-2.6.0.ebuild
index b1a9eda5625b..d2300cb31f06 100644
--- a/gnome-base/libbonobo/libbonobo-2.6.0.ebuild
+++ b/gnome-base/libbonobo/libbonobo-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.6.0.ebuild,v 1.9 2004/06/24 21:59:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.6.0.ebuild,v 1.10 2004/08/21 15:29:49 obz Exp $
 
 inherit gnome2
 
@@ -13,7 +13,7 @@ KEYWORDS="x86 ppc alpha ~sparc hppa amd64 ~ia64 mips"
 LICENSE="LGPL-2.1 GPL-2"
 
 RDEPEND=">=dev-libs/glib-2.3.2
-	>=gnome-base/ORBit2-2.9.2
+	>=gnome-base/orbit-2.9.2
 	>=dev-libs/libxml2-2.4.20
 	dev-libs/popt
 	!gnome-base/bonobo-activation"
diff --git a/gnome-base/libbonobo/libbonobo-2.6.2.ebuild b/gnome-base/libbonobo/libbonobo-2.6.2.ebuild
index 8e20505a35ac..29cbdb08a448 100644
--- a/gnome-base/libbonobo/libbonobo-2.6.2.ebuild
+++ b/gnome-base/libbonobo/libbonobo-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.6.2.ebuild,v 1.8 2004/08/08 00:59:28 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.6.2.ebuild,v 1.9 2004/08/21 15:29:49 obz Exp $
 
 inherit gnome2
 
@@ -13,7 +13,7 @@ KEYWORDS="x86 ~ppc ~alpha sparc hppa amd64 ~ia64 ~mips ppc64"
 LICENSE="LGPL-2.1 GPL-2"
 
 RDEPEND=">=dev-libs/glib-2.3.2
-	>=gnome-base/ORBit2-2.9.2
+	>=gnome-base/orbit-2.9.2
 	>=dev-libs/libxml2-2.4.20
 	dev-libs/popt
 	!gnome-base/bonobo-activation"
diff --git a/gnome-base/libgnome/libgnome-2.4.0.ebuild b/gnome-base/libgnome/libgnome-2.4.0.ebuild
index 23e1195def65..74929afad53c 100644
--- a/gnome-base/libgnome/libgnome-2.4.0.ebuild
+++ b/gnome-base/libgnome/libgnome-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.4.0.ebuild,v 1.15 2004/06/24 21:59:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.4.0.ebuild,v 1.16 2004/08/21 15:28:51 obz Exp $
 
 inherit gnome2
 
@@ -18,7 +18,7 @@ RDEPEND=">=dev-libs/glib-2.0.3
 	>=gnome-base/gnome-vfs-2.4
 	>=media-sound/esound-0.2.26
 	>=media-libs/audiofile-0.2.3
-	>=gnome-base/ORBit2-2.8"
+	>=gnome-base/orbit-2.8"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.21
diff --git a/gnome-base/nautilus/nautilus-2.4.2.ebuild b/gnome-base/nautilus/nautilus-2.4.2.ebuild
index 1f7dcebf5d30..1304c5a2950e 100644
--- a/gnome-base/nautilus/nautilus-2.4.2.ebuild
+++ b/gnome-base/nautilus/nautilus-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.4.2.ebuild,v 1.12 2004/06/24 22:01:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.4.2.ebuild,v 1.13 2004/08/21 15:21:49 obz Exp $
 
 inherit gnome2 eutils
 
@@ -26,7 +26,7 @@ RDEPEND=">=dev-libs/glib-2
 	>=gnome-base/libbonobo-2.2
 	>=gnome-base/libbonoboui-2.2
 	>=gnome-base/librsvg-2.0.1
-	>=gnome-base/ORBit2-2.4
+	>=gnome-base/orbit-2.4
 	>=x11-libs/startup-notification-0.5
 	dev-libs/popt
 	app-admin/fam
diff --git a/gnome-base/nautilus/nautilus-2.6.0.ebuild b/gnome-base/nautilus/nautilus-2.6.0.ebuild
index d79bb706ccc0..d28bd5b96960 100644
--- a/gnome-base/nautilus/nautilus-2.6.0.ebuild
+++ b/gnome-base/nautilus/nautilus-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.6.0.ebuild,v 1.14 2004/07/14 15:19:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.6.0.ebuild,v 1.15 2004/08/21 15:21:49 obz Exp $
 
 inherit gnome2 eutils
 
@@ -26,7 +26,7 @@ RDEPEND=">=dev-libs/glib-2.3
 	>=gnome-base/libbonobo-2.2
 	>=gnome-base/libbonoboui-2.2
 	>=gnome-base/librsvg-2.0.1
-	>=gnome-base/ORBit2-2.4
+	>=gnome-base/orbit-2.4
 	>=x11-libs/startup-notification-0.5
 	dev-libs/popt
 	app-admin/fam
diff --git a/gnome-base/nautilus/nautilus-2.6.1.ebuild b/gnome-base/nautilus/nautilus-2.6.1.ebuild
index ad8efb9f0b1d..18a7df10e5fd 100644
--- a/gnome-base/nautilus/nautilus-2.6.1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.6.1.ebuild,v 1.6 2004/07/14 15:19:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.6.1.ebuild,v 1.7 2004/08/21 15:21:49 obz Exp $
 
 inherit gnome2 eutils
 
@@ -26,7 +26,7 @@ RDEPEND=">=dev-libs/glib-2.3
 	>=gnome-base/libbonobo-2.2
 	>=gnome-base/libbonoboui-2.2
 	>=gnome-base/librsvg-2.0.1
-	>=gnome-base/ORBit2-2.4
+	>=gnome-base/orbit-2.4
 	>=x11-libs/startup-notification-0.5
 	dev-libs/popt
 	app-admin/fam
diff --git a/gnome-base/nautilus/nautilus-2.6.3-r1.ebuild b/gnome-base/nautilus/nautilus-2.6.3-r1.ebuild
index 69a9cd883578..5a5f5964a4e1 100644
--- a/gnome-base/nautilus/nautilus-2.6.3-r1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.6.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.6.3-r1.ebuild,v 1.1 2004/08/09 17:19:47 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.6.3-r1.ebuild,v 1.2 2004/08/21 15:21:49 obz Exp $
 
 inherit gnome2 eutils
 
@@ -28,7 +28,7 @@ RDEPEND=">=dev-libs/glib-2.3
 	>=gnome-base/libbonobo-2.2
 	>=gnome-base/libbonoboui-2.2
 	>=gnome-base/librsvg-2.0.1
-	>=gnome-base/ORBit2-2.4
+	>=gnome-base/orbit-2.4
 	>=x11-libs/startup-notification-0.5
 	dev-libs/popt
 	app-admin/fam
diff --git a/gnome-base/nautilus/nautilus-2.6.3.ebuild b/gnome-base/nautilus/nautilus-2.6.3.ebuild
index 35d8e0aa86bd..29d4b1b7ea22 100644
--- a/gnome-base/nautilus/nautilus-2.6.3.ebuild
+++ b/gnome-base/nautilus/nautilus-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.6.3.ebuild,v 1.6 2004/08/08 00:59:28 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.6.3.ebuild,v 1.7 2004/08/21 15:21:49 obz Exp $
 
 inherit gnome2 eutils
 
@@ -28,7 +28,7 @@ RDEPEND=">=dev-libs/glib-2.3
 	>=gnome-base/libbonobo-2.2
 	>=gnome-base/libbonoboui-2.2
 	>=gnome-base/librsvg-2.0.1
-	>=gnome-base/ORBit2-2.4
+	>=gnome-base/orbit-2.4
 	>=x11-libs/startup-notification-0.5
 	dev-libs/popt
 	app-admin/fam