mark 1.4.4 x86 & big cleanup

19 files changed, 2 insertions, 490 deletions

diff --git a/net-www/epiphany/epiphany-1.0.7.ebuild b/net-www/epiphany/epiphany-1.0.7.ebuild
deleted file mode 100644
index b23714d86422..000000000000
--- a/net-www/epiphany/epiphany-1.0.7.ebuild
+++ /dev/null
@@ -1,46 +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.0.7.ebuild,v 1.11 2004/08/21 21:32:32 foser Exp $
-
-inherit 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"
-
-RDEPEND=">=gnome-base/gconf-1.2
-	>=x11-libs/gtk+-2
-	>=dev-libs/libxml2-2.5.9
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/orbit-2
-	>=gnome-base/gnome-vfs-2
-	>=net-www/mozilla-1.4
-	gnome? ( >=gnome-base/nautilus-2.2 )"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
-
-use gnome \
-	&& G2CONF="${G2CONF} --enable-nautilus-view=yes" \
-	|| G2CONF="${G2CONF} --enable-nautilus-view=no"
-
-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.2.ebuild b/net-www/epiphany/epiphany-1.2.2.ebuild
deleted file mode 100644
index e2d42a849164..000000000000
--- a/net-www/epiphany/epiphany-1.2.2.ebuild
+++ /dev/null
@@ -1,50 +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.2.ebuild,v 1.8 2004/08/21 21:32:32 foser Exp $
-
-inherit 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
-	>=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/orbit-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
deleted file mode 100644
index b0ebb8f5c59e..000000000000
--- a/net-www/epiphany/epiphany-1.2.7-r1.ebuild
+++ /dev/null
@@ -1,60 +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.7-r1.ebuild,v 1.5 2004/08/23 10:27:06 kloeri 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.6.0
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/orbit-2
-	>=gnome-base/gnome-vfs-2.3.1
-	>=net-www/mozilla-1.7.2
-	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
-
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	# Fixing the nautilus view
-	epatch ${FILESDIR}/${P}-nautilus_view.patch
-}
-
diff --git a/net-www/epiphany/epiphany-1.2.7.ebuild b/net-www/epiphany/epiphany-1.2.7.ebuild
deleted file mode 100644
index f424f045a77e..000000000000
--- a/net-www/epiphany/epiphany-1.2.7.ebuild
+++ /dev/null
@@ -1,60 +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.7.ebuild,v 1.4 2004/08/21 21:32:32 foser 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.6.0
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/orbit-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
-
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	# Fixing the nautilus view
-	epatch ${FILESDIR}/${P}-nautilus_view.patch
-}
-
diff --git a/net-www/epiphany/epiphany-1.2.8.ebuild b/net-www/epiphany/epiphany-1.2.8.ebuild
deleted file mode 100644
index f3daeba8dd60..000000000000
--- a/net-www/epiphany/epiphany-1.2.8.ebuild
+++ /dev/null
@@ -1,53 +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.8.ebuild,v 1.1 2004/08/23 13:58:56 spider 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.6.0
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/orbit-2
-	>=gnome-base/gnome-vfs-2.3.1
-	>=net-www/mozilla-1.7.2
-	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.9.ebuild b/net-www/epiphany/epiphany-1.2.9.ebuild
deleted file mode 100644
index 64f155d9a344..000000000000
--- a/net-www/epiphany/epiphany-1.2.9.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.9.ebuild,v 1.1 2004/09/13 16:54:34 obz 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.6.0
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/orbit-2
-	>=gnome-base/gnome-vfs-2.3.1
-	>=net-www/mozilla-1.7.2
-	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* 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.4.0.ebuild b/net-www/epiphany/epiphany-1.4.0.ebuild
deleted file mode 100644
index 15ff208a4282..000000000000
--- a/net-www/epiphany/epiphany-1.4.0.ebuild
+++ /dev/null
@@ -1,59 +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.4.0.ebuild,v 1.2 2004/09/18 20:21:06 foser 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="doc"
-
-RDEPEND=">=dev-libs/glib-2.4.1
-	>=x11-libs/pango-1.6
-	>=x11-libs/gtk+-2.4
-	>=gnome-base/gconf-1.2
-	>=dev-libs/libxml2-2.6.6
-	>=gnome-base/libgnomeui-2.6.0
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/orbit-2
-	>=gnome-base/gnome-vfs-2.3.1
-	>=net-www/mozilla-1.7.3
-	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"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup () {
-
-	if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
-	then
-		eerror "you need mozilla-1.7.3+ compiled against gtk+-2"
-		eerror "export USE=\"gtk2\" ;emerge mozilla -p "
-		die "Need Mozilla compiled with gtk+-2.0!"
-	fi
-
-}
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# Fix to build with moz 1.7.3
-	epatch ${FILESDIR}/${P}-mozilla-1.7.3.patch
-	# Fix include paths for our mozilla
-	epatch ${FILESDIR}/${PN}-1.3.4-fix_includes.patch
-
-}
diff --git a/net-www/epiphany/epiphany-1.4.4.ebuild b/net-www/epiphany/epiphany-1.4.4.ebuild
index 7d93d4c623cb..6bfb07bea4d6 100644
--- a/net-www/epiphany/epiphany-1.4.4.ebuild
+++ b/net-www/epiphany/epiphany-1.4.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/net-www/epiphany/epiphany-1.4.4.ebuild,v 1.1 2004/10/17 15:18:49 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/epiphany-1.4.4.ebuild,v 1.2 2004/11/11 01:23:26 foser Exp $
 
 inherit eutils gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/projects/epiphany/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
 IUSE="doc"
 
 RDEPEND=">=dev-libs/glib-2.4.1
diff --git a/net-www/epiphany/files/digest-epiphany-1.0.7 b/net-www/epiphany/files/digest-epiphany-1.0.7
deleted file mode 100644
index 325cff2295e8..000000000000
--- a/net-www/epiphany/files/digest-epiphany-1.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6f1639d7c7133769ce28eb24358ef55b epiphany-1.0.7.tar.bz2 1830184
diff --git a/net-www/epiphany/files/digest-epiphany-1.2.2 b/net-www/epiphany/files/digest-epiphany-1.2.2
deleted file mode 100644
index 04a0b1f23fe1..000000000000
--- a/net-www/epiphany/files/digest-epiphany-1.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 abf9a04159e1c0ef8c27d676ab383b8d epiphany-1.2.2.tar.bz2 2148870
diff --git a/net-www/epiphany/files/digest-epiphany-1.2.7 b/net-www/epiphany/files/digest-epiphany-1.2.7
deleted file mode 100644
index 87b364f3518c..000000000000
--- a/net-www/epiphany/files/digest-epiphany-1.2.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d839a1fb1acbf4d7b129cfdb4276de44 epiphany-1.2.7.tar.bz2 2979301
diff --git a/net-www/epiphany/files/digest-epiphany-1.2.7-r1 b/net-www/epiphany/files/digest-epiphany-1.2.7-r1
deleted file mode 100644
index 87b364f3518c..000000000000
--- a/net-www/epiphany/files/digest-epiphany-1.2.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d839a1fb1acbf4d7b129cfdb4276de44 epiphany-1.2.7.tar.bz2 2979301
diff --git a/net-www/epiphany/files/digest-epiphany-1.2.8 b/net-www/epiphany/files/digest-epiphany-1.2.8
deleted file mode 100644
index 1e37360b4fdf..000000000000
--- a/net-www/epiphany/files/digest-epiphany-1.2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19d80db940f722b890dd439038743f83 epiphany-1.2.8.tar.bz2 2979211
diff --git a/net-www/epiphany/files/digest-epiphany-1.2.9 b/net-www/epiphany/files/digest-epiphany-1.2.9
deleted file mode 100644
index 2a97f76025d2..000000000000
--- a/net-www/epiphany/files/digest-epiphany-1.2.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8d85d921a1c0ccec165960dc650c5104 epiphany-1.2.9.tar.bz2 3004225
diff --git a/net-www/epiphany/files/digest-epiphany-1.4.0 b/net-www/epiphany/files/digest-epiphany-1.4.0
deleted file mode 100644
index 64797d3f9751..000000000000
--- a/net-www/epiphany/files/digest-epiphany-1.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f9453cded23dd5c432dc2efc4303f796 epiphany-1.4.0.tar.bz2 3381335
diff --git a/net-www/epiphany/files/epiphany-1.2.5-gcc2_fix.patch b/net-www/epiphany/files/epiphany-1.2.5-gcc2_fix.patch
deleted file mode 100644
index 41d237473214..000000000000
--- a/net-www/epiphany/files/epiphany-1.2.5-gcc2_fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -NurdB epiphany-1.2.5-orig/lib/ephy-dialog.c epiphany-1.2.5/lib/ephy-dialog.c
---- epiphany-1.2.5-orig/lib/ephy-dialog.c	2004-05-20 18:46:19.000000000 -0500
-+++ epiphany-1.2.5/lib/ephy-dialog.c	2004-05-20 18:47:12.000000000 -0500
-@@ -584,9 +584,10 @@
- 		}
- 		else
- 		{
-+			char *v;
- 			gtk_combo_box_set_active (GTK_COMBO_BOX (info->widget), -1);
- 
--			char *v = g_strdup_value_contents (value);
-+			v = g_strdup_value_contents (value);
- 			g_warning ("Value '%s' not found in model for combo %s\n", v, info->id);
- 			g_free (v);
- 		}
diff --git a/net-www/epiphany/files/epiphany-1.2.6-moz-1.7.2.patch b/net-www/epiphany/files/epiphany-1.2.6-moz-1.7.2.patch
deleted file mode 100644
index 159a61189dea..000000000000
--- a/net-www/epiphany/files/epiphany-1.2.6-moz-1.7.2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	2004-08-17 17:22:14.243530601 +0100
-+++ configure	2004-08-17 17:23:27.836122375 +0100
-@@ -21923,6 +21923,7 @@
- 1.7rc2) MOZILLA_SNAPSHOT=16 ;;
- 1.7rc3) MOZILLA_SNAPSHOT=17 ;;
-   1.7) MOZILLA_SNAPSHOT=17 ;;
-+  1.7.2) MOZILLA_SNAPSHOT=17 ;;
- branch1.7) MOZILLA_SNAPSHOT=17 ;;
-  1.8a) MOZILLA_SNAPSHOT=18 ;;
- 1.8a1) MOZILLA_SNAPSHOT=18 ;;
-@@ -21930,7 +21931,7 @@
- trunk) MOZILLA_SNAPSHOT=19 ;;
-     *) { { echo "$as_me:$LINENO: error:
- *****************************************************************************
--Epiphany can be built using Mozilla 1.4, 1.4.1, 1.4.2, 1.5, 1.6 or 1.7,
-+Epiphany can be built using Mozilla 1.4, 1.4.1, 1.4.2, 1.5, 1.6, 1.7 or 1.7.2,
- but the version available is $MOZILLA_VERSION.
- *****************************************************************************" >&5
- echo "$as_me: error:
diff --git a/net-www/epiphany/files/epiphany-1.2.7-nautilus_view.patch b/net-www/epiphany/files/epiphany-1.2.7-nautilus_view.patch
deleted file mode 100644
index 75a2aeed8774..000000000000
--- a/net-www/epiphany/files/epiphany-1.2.7-nautilus_view.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: ephy-nautilus-view.c
-===================================================================
-RCS file: /cvs/gnome/epiphany/src/Attic/ephy-nautilus-view.c,v
-retrieving revision 1.31.4.1
-diff -u -p -r1.31.4.1 ephy-nautilus-view.c
---- ephy-nautilus-view.c	22 Mar 2004 09:21:30 -0000	1.31.4.1
-+++ ephy-nautilus-view.c	1 Aug 2004 15:47:39 -0000
-@@ -543,14 +543,7 @@ gnv_cmd_file_print (BonoboUIComponent *u
- 		    EphyNautilusView *view, 
- 		    const char* verbname)
- {
--	EphyDialog *dialog;
--	EphyNautilusViewPrivate *p = view->priv;
--	
--	dialog = ephy_print_dialog_new (NULL, p->embed, FALSE);
--
--	ephy_dialog_set_modal (dialog, TRUE);
--	ephy_dialog_run (dialog);
--	g_object_unref (dialog);
-+        ephy_embed_print (view->priv->embed);
- }
- 
- static void
diff --git a/net-www/epiphany/files/epiphany-1.4.0-mozilla-1.7.3.patch b/net-www/epiphany/files/epiphany-1.4.0-mozilla-1.7.3.patch
deleted file mode 100644
index b055f3c8a375..000000000000
--- a/net-www/epiphany/files/epiphany-1.4.0-mozilla-1.7.3.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -uNr epiphany-1.4.0/embed/mozilla/EphyBrowser.cpp epiphany-1.4.0.patched/embed/mozilla/EphyBrowser.cpp
---- epiphany-1.4.0/embed/mozilla/EphyBrowser.cpp	2004-08-08 20:11:56.000000000 +0200
-+++ epiphany-1.4.0.patched/embed/mozilla/EphyBrowser.cpp	2004-09-16 12:13:46.664381872 +0200
-@@ -411,7 +411,7 @@
- 	return ContentNav->GotoIndex (index);
- }
- 
--#if (!MOZILLA_IS_BRANCH (1, 7) || !MOZILLA_CHECK_VERSION3 (1, 7, 3)) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
-+#if (!MOZILLA_IS_BRANCH (1, 7) || !MOZILLA_CHECK_VERSION3 (1, 7, 4)) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
- /* Workaround for broken reload with frames, see mozilla bug
-  * http://bugzilla.mozilla.org/show_bug.cgi?id=246392
-  */
-diff -uNr epiphany-1.4.0/embed/mozilla/EphyBrowser.h epiphany-1.4.0.patched/embed/mozilla/EphyBrowser.h
---- epiphany-1.4.0/embed/mozilla/EphyBrowser.h	2004-08-08 20:11:56.000000000 +0200
-+++ epiphany-1.4.0.patched/embed/mozilla/EphyBrowser.h	2004-09-16 12:14:09.170960352 +0200
-@@ -112,7 +112,7 @@
- 	nsresult GetSHUrlAtIndex (PRInt32 index, nsACString &url);
- 	nsresult GoToHistoryIndex (PRInt16 index);
- 
--#if (!MOZILLA_IS_BRANCH (1, 7) || !MOZILLA_CHECK_VERSION3 (1, 7, 3)) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
-+#if (!MOZILLA_IS_BRANCH (1, 7) || !MOZILLA_CHECK_VERSION3 (1, 7, 4)) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
- 	enum ReloadType { RELOAD_NORMAL		 = 0,
- 			  RELOAD_FORCE		 = 1,
- 			  RELOAD_ENCODING_CHANGE = 2 };
-diff -uNr epiphany-1.4.0/embed/mozilla/GlobalHistory.cpp epiphany-1.4.0.patched/embed/mozilla/GlobalHistory.cpp
---- epiphany-1.4.0/embed/mozilla/GlobalHistory.cpp	2004-08-27 22:39:10.000000000 +0200
-+++ epiphany-1.4.0.patched/embed/mozilla/GlobalHistory.cpp	2004-09-16 12:14:47.772092088 +0200
-@@ -133,7 +133,7 @@
- 	return NS_ERROR_NOT_IMPLEMENTED;
- }
- 
--#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 3)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
-+#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 4)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
- /* void removePage (in nsIURI aURI); */
- NS_IMETHODIMP MozGlobalHistory::RemovePage(nsIURI *aURI)
- {
-@@ -179,7 +179,7 @@
-     return NS_ERROR_NOT_IMPLEMENTED;
- }
- 
--#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 3)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
-+#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 4)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
- /* void markPageAsTyped (in AUTF8String aURI) */
- NS_IMETHODIMP MozGlobalHistory::MarkPageAsTyped(nsIURI *aURI)
- {