fix orbit deps

8 files changed, 8 insertions, 118 deletions

diff --git a/net-www/epiphany/epiphany-1.0.7.ebuild b/net-www/epiphany/epiphany-1.0.7.ebuild
index 6a83893df93e..b23714d86422 100644
--- a/net-www/epiphany/epiphany-1.0.7.ebuild
+++ b/net-www/epiphany/epiphany-1.0.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/net-www/epiphany/epiphany-1.0.7.ebuild,v 1.10 2004/06/25 00:52:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.0.7.ebuild,v 1.11 2004/08/21 21:32:32 foser Exp $
 
 inherit gnome2
 
@@ -18,7 +18,7 @@ RDEPEND=">=gnome-base/gconf-1.2
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libglade-2
 	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/ORBit2-2
+	>=gnome-base/orbit-2
 	>=gnome-base/gnome-vfs-2
 	>=net-www/mozilla-1.4
 	gnome? ( >=gnome-base/nautilus-2.2 )"
diff --git a/net-www/epiphany/epiphany-1.2.2.ebuild b/net-www/epiphany/epiphany-1.2.2.ebuild
index e3b3241fad8a..e2d42a849164 100644
--- a/net-www/epiphany/epiphany-1.2.2.ebuild
+++ b/net-www/epiphany/epiphany-1.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/net-www/epiphany/epiphany-1.2.2.ebuild,v 1.7 2004/07/07 02:34:26 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.2.2.ebuild,v 1.8 2004/08/21 21:32:32 foser Exp $
 
 inherit gnome2
 
@@ -19,7 +19,7 @@ RDEPEND=">=dev-libs/glib-2.4
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libglade-2.3.1
 	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/ORBit2-2
+	>=gnome-base/orbit-2
 	>=gnome-base/gnome-vfs-2.3.1
 	>=net-www/mozilla-1.4
 	gnome? ( >=gnome-base/nautilus-2.5 )"
diff --git a/net-www/epiphany/epiphany-1.2.6-r1.ebuild b/net-www/epiphany/epiphany-1.2.6-r1.ebuild
deleted file mode 100644
index a7d2c55273f1..000000000000
--- a/net-www/epiphany/epiphany-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.2.6-r1.ebuild,v 1.1 2004/08/17 16:39:09 stuart Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~alpha amd64 ~ia64"
-IUSE="gnome doc"
-
-RDEPEND=">=dev-libs/glib-2.4.1
-	>=x11-libs/gtk+-2.4
-	>=gnome-base/gconf-1.2
-	>=dev-libs/libxml2-2.6.6
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/ORBit2-2
-	>=gnome-base/gnome-vfs-2.3.1
-	>=net-www/mozilla-1.4
-	gnome? ( >=gnome-base/nautilus-2.5 )"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
-
-use gnome \
-	&& G2CONF="${G2CONF} --enable-nautilus-view=yes" \
-	|| G2CONF="${G2CONF} --enable-nautilus-view=no"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack () {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/epiphany-1.2.6-moz-1.7.2.patch
-}
-
-pkg_setup () {
-
-	if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
-	then
-		eerror "you need mozilla-1.4+ compiled against gtk+-2"
-		eerror "export USE=\"gtk2\" ;emerge mozilla -p "
-		die "Need Mozilla compiled with gtk+-2.0!"
-	fi
-
-}
-
diff --git a/net-www/epiphany/epiphany-1.2.6.ebuild b/net-www/epiphany/epiphany-1.2.6.ebuild
deleted file mode 100644
index e3e251d32b87..000000000000
--- a/net-www/epiphany/epiphany-1.2.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.2.6.ebuild,v 1.5 2004/08/05 23:36:17 gustavoz Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~alpha amd64 ~ia64"
-IUSE="gnome doc"
-
-RDEPEND=">=dev-libs/glib-2.4.1
-	>=x11-libs/gtk+-2.4
-	>=gnome-base/gconf-1.2
-	>=dev-libs/libxml2-2.6.6
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/ORBit2-2
-	>=gnome-base/gnome-vfs-2.3.1
-	>=net-www/mozilla-1.4
-	gnome? ( >=gnome-base/nautilus-2.5 )"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
-
-use gnome \
-	&& G2CONF="${G2CONF} --enable-nautilus-view=yes" \
-	|| G2CONF="${G2CONF} --enable-nautilus-view=no"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup () {
-
-	if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
-	then
-		eerror "you need mozilla-1.4+ compiled against gtk+-2"
-		eerror "export USE=\"gtk2\" ;emerge mozilla -p "
-		die "Need Mozilla compiled with gtk+-2.0!"
-	fi
-
-}
-
diff --git a/net-www/epiphany/epiphany-1.2.7-r1.ebuild b/net-www/epiphany/epiphany-1.2.7-r1.ebuild
index 0dcafdd027be..2c1728955f80 100644
--- a/net-www/epiphany/epiphany-1.2.7-r1.ebuild
+++ b/net-www/epiphany/epiphany-1.2.7-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/net-www/epiphany/epiphany-1.2.7-r1.ebuild,v 1.3 2004/08/19 01:25:15 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.2.7-r1.ebuild,v 1.4 2004/08/21 21:32:32 foser Exp $
 
 inherit eutils gnome2
 
@@ -19,7 +19,7 @@ RDEPEND=">=dev-libs/glib-2.4.1
 	>=gnome-base/libgnomeui-2.6.0
 	>=gnome-base/libglade-2.3.1
 	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/ORBit2-2
+	>=gnome-base/orbit-2
 	>=gnome-base/gnome-vfs-2.3.1
 	>=net-www/mozilla-1.7.2
 	gnome? ( >=gnome-base/nautilus-2.5 )"
diff --git a/net-www/epiphany/epiphany-1.2.7.ebuild b/net-www/epiphany/epiphany-1.2.7.ebuild
index f47b0fba33b4..f424f045a77e 100644
--- a/net-www/epiphany/epiphany-1.2.7.ebuild
+++ b/net-www/epiphany/epiphany-1.2.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/net-www/epiphany/epiphany-1.2.7.ebuild,v 1.3 2004/08/09 14:01:47 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.2.7.ebuild,v 1.4 2004/08/21 21:32:32 foser Exp $
 
 inherit eutils gnome2
 
@@ -19,7 +19,7 @@ RDEPEND=">=dev-libs/glib-2.4.1
 	>=gnome-base/libgnomeui-2.6.0
 	>=gnome-base/libglade-2.3.1
 	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/ORBit2-2
+	>=gnome-base/orbit-2
 	>=gnome-base/gnome-vfs-2.3.1
 	>=net-www/mozilla-1.4
 	gnome? ( >=gnome-base/nautilus-2.5 )"
diff --git a/net-www/epiphany/files/digest-epiphany-1.2.6 b/net-www/epiphany/files/digest-epiphany-1.2.6
deleted file mode 100644
index 6a96bb89477f..000000000000
--- a/net-www/epiphany/files/digest-epiphany-1.2.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6dedf570ddb9106ecd6be624f009a35a epiphany-1.2.6.tar.bz2 2807440
diff --git a/net-www/epiphany/files/digest-epiphany-1.2.6-r1 b/net-www/epiphany/files/digest-epiphany-1.2.6-r1
deleted file mode 100644
index 6a96bb89477f..000000000000
--- a/net-www/epiphany/files/digest-epiphany-1.2.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6dedf570ddb9106ecd6be624f009a35a epiphany-1.2.6.tar.bz2 2807440