moved from net-www to www-client

(Portage version: 1.585-cvs)

31 files changed, 1620 insertions, 0 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
new file mode 100644
index 000000000000..eb6e28729280
--- /dev/null
+++ b/www-client/epiphany/ChangeLog
@@ -0,0 +1,407 @@
+# ChangeLog for www-client/epiphany
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.3 2005/03/23 15:10:11 seemant Exp $
+
+*epiphany-1.4.5 (23 Mar 2005)
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
+  +files/epiphany-1.2.9-mozilla-1.7.3.patch,
+  +files/epiphany-1.3.4-fix_includes.patch,
+  +files/epiphany-1.4.6-fix_includes.patch,
+  +files/epiphany-1.4.6-moz-nsiurip.patch,
+  +files/epiphany-1.5.5-fix_includes.patch,
+  +files/epiphany-1.6.0-fix_includes.patch,
+  +files/epiphany-1.6.0-view_source.patch,
+  +files/epiphany-1.6.0-wallet_fix.patch,
+  +files/epiphany-1.6.0-wallet_password.patch, +metadata.xml,
+  +epiphany-1.2.9-r1.ebuild, +epiphany-1.2.10.ebuild,
+  +epiphany-1.4.4.ebuild, +epiphany-1.4.5.ebuild, +epiphany-1.4.6.ebuild,
+  +epiphany-1.4.7.ebuild, +epiphany-1.4.8.ebuild, +epiphany-1.6.0.ebuild,
+  +epiphany-1.6.0-r1.ebuild, +epiphany-1.6.0-r2.ebuild:
+  moved from net-www to www-client
+
+  21 Mar 2005; Guy Martin <gmsoft@gentoo.org> epiphany-1.4.6.ebuild,
+  epiphany-1.4.8.ebuild:
+  Stable on hppa.
+
+*epiphany-1.6.0-r2 (15 Mar 2005)
+
+  15 Mar 2005; Joe McCann <joem@gentoo.org>
+  +files/epiphany-1.6.0-view_source.patch, +epiphany-1.6.0-r2.ebuild:
+  patch from epiphany cvs to fix view page source. Thanks to the tracking in
+  but 85337
+
+*epiphany-1.6.0-r1 (12 Mar 2005)
+
+  12 Mar 2005; Joe McCann <joem@gentoo.org>
+  +files/epiphany-1.6.0-fix_includes.patch,
+  +files/epiphany-1.6.0-wallet_fix.patch,
+  +files/epiphany-1.6.0-wallet_password.patch, +epiphany-1.6.0-r1.ebuild,
+  epiphany-1.6.0.ebuild:
+  Add patch from cvs to fix personaldata/passwords.Also add patch from mailing
+  list to fix problem with mozilla-1.7 wallet code. Remove bogus deps as well
+
+*epiphany-1.6.0 (08 Mar 2005)
+
+  08 Mar 2005; Joe McCann <joem@gentoo.org>
+  +files/epiphany-1.5.5-fix_includes.patch, +epiphany-1.6.0.ebuild:
+  gnome-2.10 release
+
+*epiphany-1.4.8 (17 Feb 2005)
+
+  17 Feb 2005; Mike Gardiner <obz@gentoo.org> +epiphany-1.4.8.ebuild:
+  New version
+
+  08 Jan 2005; Tom Martin <slarti@gentoo.org> epiphany-1.4.6.ebuild:
+  Stable on amd64, resolving bug 77102.
+
+  24 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> epiphany-1.4.6.ebuild:
+  Stable on alpha.
+
+  21 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> epiphany-1.4.6.ebuild:
+  Stable on sparc
+
+*epiphany-1.4.7 (22 Dec 2004)
+
+  22 Dec 2004; Mike Gardiner <obz@gentoo.org> +epiphany-1.4.7.ebuild:
+  New version, still requires the nsiurip patch
+
+  20 Dec 2004; Mike Gardiner <obz@gentoo.org>
+  +files/epiphany-1.4.6-moz-nsiurip.patch, epiphany-1.4.6.ebuild:
+  Added a patch to configure, and configure.in to correct the includes for the
+  GlobalHistory tests - see bug #74972
+
+  19 Dec 2004; Mike Gardiner <obz@gentoo.org> epiphany-1.4.6.ebuild:
+  Keyworded x86 and ppc for GNOME 2.8.1
+
+  11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> epiphany-1.4.5.ebuild:
+  Stable on alpha.
+
+  06 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> epiphany-1.4.5.ebuild:
+  Stable on sparc
+
+*epiphany-1.4.6 (06 Dec 2004)
+
+  06 Dec 2004; Mike Gardiner <obz@gentoo.org>
+  +files/epiphany-1.4.6-fix_includes.patch, +epiphany-1.4.6.ebuild:
+  New version
+
+*epiphany-1.2.10 (22 Nov 2004)
+
+  22 Nov 2004; Mike Gardiner <obz@gentoo.org> +epiphany-1.2.10.ebuild,
+  +epiphany-1.4.5.ebuild:
+  New versions, 1.4.5 was requested in bug #72034
+
+  13 Nov 2004; <plasmaroo@gentoo.org> epiphany-1.2.9-r1.ebuild:
+  Marking stable on IA64.
+
+  12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> epiphany-1.4.4.ebuild:
+  Stable on sparc
+
+  11 Nov 2004; Mike Gardiner <obz@gentoo.org> epiphany-1.4.4.ebuild:
+  Keyworded ppc for GNOME 2.8
+
+*epiphany-1.4.4 (17 Oct 2004)
+
+  17 Oct 2004; Alastair Tse <liquidx@gentoo.org> +epiphany-1.4.4.ebuild:
+  version bump
+
+  20 Sep 2004; Malcolm Lashley <malc@gentoo.org> epiphany-1.2.9-r1.ebuild:
+  Stable on amd64 for security bug
+
+  19 Sep 2004; <kloeri@gentoo.org> epiphany-1.2.9-r1.ebuild:
+  Stable on alpha, bug 63996.
+
+  17 Sep 2004; <SeJo@gentoo.org> epiphany-1.2.9-r1.ebuild:
+  stable ppc bug:63996
+
+  16 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  epiphany-1.2.9-r1.ebuild:
+  Stable on sparc wrt #63996
+
+*epiphany-1.4.0 (16 Sep 2004)
+*epiphany-1.2.9-r1 (16 Sep 2004)
+
+  16 Sep 2004; foser <foser@gentoo.org> epiphany-1.2.9-r1.ebuild :
+  1.4.0 : gnome 2.8 release, remove deprecated gnome USE
+  Add patch to fix the buildtime include paths
+  1.2.9-r1,1.4.0 : Update mozilla dep to 1.7.3, security fix (#63996)
+  Add fix to make epi build with moz 1.7.3
+
+*epiphany-1.2.9 (14 Sep 2004)
+
+  14 Sep 2004; Mike Gardiner <obz@gentoo.org> +epiphany-1.2.9.ebuild:
+  New version, last updates for a GNOME 2.6 release.
+
+  23 Aug 2004; <spider@gentoo.org> :
+  Versionbump, patch unnecessary, this fixes some mozilla issues to be more
+  futureproof
+
+  23 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> epiphany-1.2.7-r1.ebuild:
+  Stable on alpha.
+
+  18 Aug 2004; Travis Tilley <lv@gentoo.org> epiphany-1.2.7-r1.ebuild:
+  stable on amd64
+
+*epiphany-1.2.7-r1 (18 Aug 2004)
+
+  18 Aug 2004; foser <foser@gentoo.org> epiphany-1.2.7-r1.ebuild :
+  Bump, fix moz dep to 1.7.2 because of security issues (#59419)
+  Marked stable on x86 & sparc
+
+*epiphany-1.2.6-r1 (17 Aug 2004)
+
+  17 Aug 2004; Stuart Herbert <stuart@gentoo.org>
+  +files/epiphany-1.2.6-moz-1.7.2.patch, +epiphany-1.2.6-r1.ebuild:
+  Fix for epiphany not compiling against stable Mozilla; fix for bug # 60501;
+  thanks to Lorenzo Hernández García-Hierro <lorenzo@gnu.org> for the basis of
+  the patch
+
+  09 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> epiphany-1.2.7.ebuild:
+  Stable on sparc wrt #59419
+
+  05 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> epiphany-1.2.6.ebuild:
+  Stable on sparc
+
+  03 Aug 2004; <spider@gentoo.org> epiphany-1.2.6.ebuild,
+  epiphany-1.2.7.ebuild:
+  Fixes for glib version dependency. Thanks to Andrew Cowie who pointed it out.
+
+*epiphany-1.2.7 (01 Aug 2004)
+
+  01 Aug 2004; <spider@gentoo.org> +files/epiphany-1.2.7-nautilus_view.patch,
+  +epiphany-1.2.7.ebuild:
+  New upstream version, adds a patch for the nautilus view that went into CVS
+
+  26 Jul 2004; Mike Gardiner <obz@gentoo.org> epiphany-1.2.6.ebuild:
+  Marked 1.2.6 x86 as mozilla 1.7 has moved to x86. See bug #55005 or brad[] for
+  more information
+
+  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> epiphany-1.2.2.ebuild:
+  Stable on alpha.
+
+*epiphany-1.2.6 (19 Jun 2004)
+
+  19 Jun 2004; Yi Qiang <khai@gentoo.org> :
+  Version bump, fixes compilation with latest mozilla trunks
+
+  06 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> :
+  Marked stable on amd64.
+
+  20 May 2004; L. Boshell <leonardop@gentoo.org> epiphany-1.2.5.ebuild,
+  files/epiphany-1.2.5-gcc2_fix.patch:
+  Added patch to fix compilation under gcc-2.
+
+*epiphany-1.2.5 (04 May 2004)
+
+  04 May 2004; foser <foser@gentoo.org> epiphany-1.2.5.ebuild :
+  New release
+
+*epiphany-1.2.3 (20 Apr 2004)
+
+  20 Apr 2004; foser <foser@gentoo.org> epiphany-1.2.3.ebuild :
+  New release
+
+  19 Apr 2004; <khai@gentoo.org> epiphany-1.0.3.ebuild, epiphany-1.0.7.ebuild,
+  epiphany-1.2.2.ebuild:
+  Fixed homepage url, closes #48166
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> epiphany-1.0.7.ebuild:
+  stable on amd64
+
+*epiphany-1.2.2 (01 Apr 2004)
+
+  01 Apr 2004; foser <foser@gentoo.org> epiphany-1.2.2.ebuild
+  Gnome 2.6 final final
+
+*epiphany-1.2.1 (22 Mar 2004)
+
+  22 Mar 2004; foser <foser@gentoo.org> epiphany-1.2.1.ebuild
+  Gnome 2.6 final
+
+*epiphany-1.2.0 (20 Mar 2004)
+
+  20 Mar 2004; foser <foser@gentoo.org> epiphany-1.2.0.ebuild
+  Gnome 2.6 commit
+
+  09 Mar 2004; <agriffis@gentoo.org> epiphany-1.0.7.ebuild:
+  stable on alpha and ia64
+
+  10 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> epiphany-1.0.7.ebuild:
+  set ppc in keywords
+
+  09 Feb 2004; <gustavoz@gentoo.org> epiphany-1.0.7.ebuild:
+  stable on sparc
+
+  07 Feb 2004; <spider@gentoo.org> epiphany-1.0.7.ebuild:
+  remove dep on XML::Parser, and add a hard dep on intltool >= 0.29. This build
+  has an RDEPEND on XML::Parser instead.
+
+  06 Feb 2004; <spider@gentoo.org> epiphany-1.0.7.ebuild:
+  Stable x86 to match mozilla.
+
+  29 Jan 2004; Aron Griffis <agriffis@gentoo.org> epiphany-1.0.6.ebuild:
+  stable on alpha and ia64
+
+*epiphany-1.0.7 (18 Jan 2004)
+
+  18 Jan 2004; <spider@gentoo.org> epiphany-1.0.7.ebuild:
+  Versionbump, now works with moz 1.6.  
+  Added XML-Parser dep due to another configure check for it. (darn intltool)
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> epiphany-1.0.6.ebuild:
+  set ppc in keywords
+
+  09 Jan 2004; <gustavoz@gentoo.org> epiphany-1.0.6.ebuild:
+  marked stable on sparc
+
+  14 Dec 2003; <spider@gentoo.org> epiphany-1.0.6.ebuild:
+  KEYWORDS x86
+
+  14 Nov 2003; Aron Griffis <agriffis@gentoo.org> epiphany-1.0.4.ebuild:
+  Stable on ia64
+
+  12 Nov 2003; Todd Sunderlin <todd@gentoo.org> epiphany-1.0.4.ebuild:
+  changed to stable on sparc
+
+*epiphany-1.0.6 (11 Nov 2003)
+
+  11 Nov 2003; foser <foser@gentoo.org> epiphany-1.0.6.ebuild :
+  New version
+
+  08 Nov 2003; Todd Sunderlin <todd@gentoo.org> epiphany-1.0.ebuild:
+  added sparc keyword
+
+*epiphany-1.0.4 (23 Oct 2003)
+
+  23 Oct 2003; foser <foser@gentoo.org> epiphany-1.0.4.ebuild :
+  New version
+
+  22 Oct 2003; Bartosch Pixa <darkspecter@gentoo.org> epiphany-1.0.ebuild:
+  set ppc in keywords
+
+  20 Oct 2003; Aron Griffis <agriffis@gentoo.org> epiphany-1.0.2.ebuild:
+  Stable on alpha
+
+*epiphany-1.0.3 (17 Oct 2003)
+
+  17 Oct 2003; <spider@gentoo.org> epiphany-1.0.3.ebuild:
+  Versionbump to make it work with moz 1.5
+
+*epiphany-1.0.2 (14 Oct 2003)
+
+  14 Oct 2003; Mike Gardiner <obz@gentoo.org> epiphany-1.0.2.ebuild:
+  New version, this includes the patch to fix bug gnome bug #124042, 
+  so no need to patch in this version
+
+  07 Oct 2003; Alastair Tse <liquidx@gentoo.org> epiphany-1.0.1.ebuild,
+  files/epiphany-1.0.1-session_get_windows-session.patch:
+  added patch to fix --server issues
+
+  05 Oct 2003; Mike Gardiner <obz@gentoo.org> epiphany-1.0.ebuild:
+  Marked stable on x86
+
+  05 Oct 2003; L. Boshell <leonardop@gentoo.org> epiphany-1.0.ebuild:
+  Taking a different approach with the patch. Just disable -Werror by
+  default, since it brings up troubles that are gcc-2's fault anyway.
+  
+  04 Oct 2003; L. Boshell <leonardop@gentoo.org> epiphany-1.0.ebuild:
+  Added patch to make it compile under gcc-2. Thanks to Tristan Henderson
+  for the patch and contribution on bug #28686.
+
+*epiphany-1.0.1 (04 Oct 2003)
+
+  04 Oct 2003; foser <foser@gentoo.org> epiphany-1.0.1.ebuild :
+  New version
+
+  17 Sep 2003; Aron Griffis <agriffis@gentoo.org> epiphany-1.0.ebuild:
+  Add ~alpha
+
+*epiphany-1.0 (09 Sep 2003)
+
+  09 Sep 2003; Mike Gardiner <obz@gentoo.org> epiphany-1.0.ebuild:
+  New version, including nautilus view support
+
+*epiphany-0.9.3 (01 Sep 2003)
+
+  08 Sep 2003; foser <foser@gentoo.org> epiphany-0.9.3.ebuild :
+  Remove bonobo-activation dep (#28156), should be there trough libbonoboui
+
+  01 Sep 2003; foser <foser@gentoo.org> epiphany-0.9.3.ebuild :
+  New version, re-added sparc keyword.. got lost along the way
+
+  24 Aug 2003; Jason Wever <weeve@gentoo.org> epiphany-0.8.4.ebuild,
+  epiphany-0.9.1.ebuild:
+  Added ~sparc to keywords.
+
+*epiphany-0.9.1 (24 Aug 2003)
+
+  24 Aug 2003; foser <foser@gentoo.org> epiphany-0.9.1.ebuild :
+  New version, use mozdev for SRC_URI for now
+
+*epiphany-0.8.4 (12 Aug 2003)
+
+  12 Aug 2003; foser <foser@gentoo.org> epiphany-0.8.4.ebuild :
+  New version again
+
+*epiphany-0.8.3 (11 Aug 2003)
+
+  11 Aug 2003; foser <foser@gentoo.org> epiphany-0.8.3.ebuild :
+  New version, fixed moz dep, remove the Werror disabling stuff all the way
+
+*epiphany-0.8.2 (07 Aug 2003)
+
+  07 Aug 2003; foser <foser@gentoo.org> epiphany-0.8.2.ebuild :
+  new version
+  remove -Werror in a simpler way (thnx hanno & lqx in #22413)
+
+*epiphany-0.8.0 (16 Jul 2003)
+
+  27 Jul 2003; foser <foser@gentoo.org> epiphany-0.8.0.ebuild :
+  Fix mozilla dep to be moer forgiving
+  Remove -Werror to fix gcc2 build failures (#22413)
+
+  16 Jul 2003; Hanno Boeck <hanno@gentoo.org> epiphany-0.8.0.ebuild:
+  Version bump.
+
+*epiphany-0.7.3-r1 (10 Jul 2003)
+
+  10 Jul 2003; <spider@gentoo.org> epiphany-0.7.3-r1.ebuild:
+  this is a mozilla 1.4 compatible build. MAKEOPTS is limited due to paralell
+  build failures here
+
+  09 Jul 2003; Alastair Tse <liquidx@gentoo.org> epiphany-0.7.0.ebuild,
+  epiphany-0.7.3.ebuild:
+  moved scrollkeeper to RDEPEND since we need it at postinst
+
+*epiphany-0.7.3 (29 Jun 2003)
+
+  29 Jun 2003; foser <foser@gentoo.org> epiphany-0.7.3.ebuild :
+  New version, add postinst info about changed gconf keys
+
+  09 Jun 2003; Luca Barbato <lu_zero@gentoo.org> epiphany-0.7.0.ebuild,
+  files/ppc_va_list.patch:
+  fix a ppc problem about copying va_list
+
+  07 Jun 2003; Alastair Tse <liquidx@gentoo.org> epiphany-0.7.0.ebuild:
+  cleanup and add debug eclass
+
+*epiphany-0.7.0 (07 Jun 2003)
+
+  07 Jun 2003; Alastair Tse <liquidx@gentoo.org> epiphany-0.7.0.ebuild:
+  new version.
+
+*epiphany-0.6.1 (19 May 2003)
+
+  19 May 2003; Hanno Boeck <hanno@gentoo.org> epiphany-0.6.1.ebuild:
+  Version bump.
+
+*epiphany-0.6.0 (04 May 2003)
+
+  04 May 2003; foser <foser@gentoo.org> epiphany-0.6.0.ebuild :
+  New version
+
+*epiphany-0.5.0 (14 Apr 2003)
+
+  14 Apr 2003; foser <foser@gentoo.org> epiphany-0.5.0.ebuild, ChangeLog :
+  Initial commit of this GNOME2 browser
diff --git a/www-client/epiphany/epiphany-1.2.10.ebuild b/www-client/epiphany/epiphany-1.2.10.ebuild
new file mode 100644
index 000000000000..d9f465268e10
--- /dev/null
+++ b/www-client/epiphany/epiphany-1.2.10.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.2.10.ebuild,v 1.3 2005/03/23 15:10:11 seemant 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.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* 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/www-client/epiphany/epiphany-1.2.9-r1.ebuild b/www-client/epiphany/epiphany-1.2.9-r1.ebuild
new file mode 100644
index 000000000000..026326270fb8
--- /dev/null
+++ b/www-client/epiphany/epiphany-1.2.9-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.2.9-r1.ebuild,v 1.3 2005/03/23 15:10:11 seemant 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.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* 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}/${P}-mozilla-1.7.3.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
+
+}
+
+#CXXFLAGS="${CXXFLAGS} -DMOZILLA_SNAPSHOT=17"
diff --git a/www-client/epiphany/epiphany-1.4.4.ebuild b/www-client/epiphany/epiphany-1.4.4.ebuild
new file mode 100644
index 000000000000..4770bc6e889f
--- /dev/null
+++ b/www-client/epiphany/epiphany-1.4.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.4.4.ebuild,v 1.3 2005/03/23 15:10:11 seemant 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 include paths for our mozilla
+	epatch ${FILESDIR}/${PN}-1.3.4-fix_includes.patch
+
+}
diff --git a/www-client/epiphany/epiphany-1.4.5.ebuild b/www-client/epiphany/epiphany-1.4.5.ebuild
new file mode 100644
index 000000000000..8248e365f826
--- /dev/null
+++ b/www-client/epiphany/epiphany-1.4.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.4.5.ebuild,v 1.3 2005/03/23 15:10:11 seemant 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 include paths for our mozilla
+	epatch ${FILESDIR}/${PN}-1.3.4-fix_includes.patch
+
+}
diff --git a/www-client/epiphany/epiphany-1.4.6.ebuild b/www-client/epiphany/epiphany-1.4.6.ebuild
new file mode 100644
index 000000000000..fd0be126657a
--- /dev/null
+++ b/www-client/epiphany/epiphany-1.4.6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.4.6.ebuild,v 1.3 2005/03/23 15:10:11 seemant 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 hppa"
+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 ChangeLog 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}
+
+	# Fix include paths for our mozilla
+	epatch ${FILESDIR}/${P}-fix_includes.patch
+	# Fix compilation/API breakage with mozilla 1.7.5.
+	# See bug #74972 ,<obz@gentoo.org>
+	epatch ${FILESDIR}/${P}-moz-nsiurip.patch
+
+}
diff --git a/www-client/epiphany/epiphany-1.4.7.ebuild b/www-client/epiphany/epiphany-1.4.7.ebuild
new file mode 100644
index 000000000000..2be612ab3746
--- /dev/null
+++ b/www-client/epiphany/epiphany-1.4.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.4.7.ebuild,v 1.3 2005/03/23 15:10:11 seemant 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 ChangeLog 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 include paths for our mozilla
+	epatch ${FILESDIR}/${PN}-1.4.6-fix_includes.patch
+	# Fix compilation/API breakage with mozilla 1.7.5.
+	# See bug #74972 ,<obz@gentoo.org>
+	epatch ${FILESDIR}/${PN}-1.4.6-moz-nsiurip.patch
+
+}
diff --git a/www-client/epiphany/epiphany-1.4.8.ebuild b/www-client/epiphany/epiphany-1.4.8.ebuild
new file mode 100644
index 000000000000..96d8db115c54
--- /dev/null
+++ b/www-client/epiphany/epiphany-1.4.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.4.8.ebuild,v 1.3 2005/03/23 15:10:11 seemant 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 ~hppa"
+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"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog 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 include paths for our mozilla
+	epatch ${FILESDIR}/${PN}-1.4.6-fix_includes.patch
+	# Fix compilation/API breakage with mozilla 1.7.5.
+	# See bug #74972 ,<obz@gentoo.org>
+	epatch ${FILESDIR}/${PN}-1.4.6-moz-nsiurip.patch
+
+}
+
diff --git a/www-client/epiphany/epiphany-1.6.0-r1.ebuild b/www-client/epiphany/epiphany-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..8d734fa7449c
--- /dev/null
+++ b/www-client/epiphany/epiphany-1.6.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.6.0-r1.ebuild,v 1.3 2005/03/23 15:10:11 seemant 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.6
+	>=x11-libs/pango-1.8
+	>=x11-libs/gtk+-2.6.3
+	>=gnome-base/gconf-1.2
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.7
+	>=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
+	>=x11-themes/gnome-icon-theme-2.9.3"
+# dbus? ( >=sys-apps/dbus-0.22 )
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog 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 include paths for our mozilla
+	epatch ${FILESDIR}/${P}-fix_includes.patch
+	epatch ${FILESDIR}/${P}-wallet_password.patch
+	epatch ${FILESDIR}/${P}-wallet_fix.patch
+
+}
+USE_DESTDIR="1"
diff --git a/www-client/epiphany/epiphany-1.6.0-r2.ebuild b/www-client/epiphany/epiphany-1.6.0-r2.ebuild
new file mode 100644
index 000000000000..0e4e57c1e1a7
--- /dev/null
+++ b/www-client/epiphany/epiphany-1.6.0-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.6.0-r2.ebuild,v 1.3 2005/03/23 15:10:11 seemant 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.6
+	>=x11-libs/pango-1.8
+	>=x11-libs/gtk+-2.6.3
+	>=gnome-base/gconf-1.2
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.7
+	>=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
+	>=x11-themes/gnome-icon-theme-2.9.3
+	>=x11-libs/startup-notification-0.5"
+# dbus? ( >=sys-apps/dbus-0.22 )
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog 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 include paths for our mozilla
+	epatch ${FILESDIR}/${P}-fix_includes.patch
+	epatch ${FILESDIR}/${P}-wallet_password.patch
+	epatch ${FILESDIR}/${P}-wallet_fix.patch
+	#fix view source
+	epatch ${FILESDIR}/${P}-view_source.patch
+
+}
+USE_DESTDIR="1"
diff --git a/www-client/epiphany/epiphany-1.6.0.ebuild b/www-client/epiphany/epiphany-1.6.0.ebuild
new file mode 100644
index 000000000000..f5f839a6da95
--- /dev/null
+++ b/www-client/epiphany/epiphany-1.6.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.6.0.ebuild,v 1.3 2005/03/23 15:10:11 seemant 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.6
+	>=x11-libs/pango-1.8
+	>=x11-libs/gtk+-2.6.3
+	>=gnome-base/gconf-1.2
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.7
+	>=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
+	>=x11-themes/gnome-icon-theme-2.9.3"
+# dbus? ( >=sys-apps/dbus-0.22 )
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog 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 include paths for our mozilla
+	epatch ${FILESDIR}/${PN}-1.5.5-fix_includes.patch
+
+}
+USE_DESTDIR="1"
diff --git a/www-client/epiphany/files/digest-epiphany-1.2.10 b/www-client/epiphany/files/digest-epiphany-1.2.10
new file mode 100644
index 000000000000..094545176d27
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-1.2.10
@@ -0,0 +1 @@
+MD5 c2418367f79cde9bac0f8a923455e7c0 epiphany-1.2.10.tar.bz2 3001789
diff --git a/www-client/epiphany/files/digest-epiphany-1.2.9-r1 b/www-client/epiphany/files/digest-epiphany-1.2.9-r1
new file mode 100644
index 000000000000..2a97f76025d2
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-1.2.9-r1
@@ -0,0 +1 @@
+MD5 8d85d921a1c0ccec165960dc650c5104 epiphany-1.2.9.tar.bz2 3004225
diff --git a/www-client/epiphany/files/digest-epiphany-1.4.4 b/www-client/epiphany/files/digest-epiphany-1.4.4
new file mode 100644
index 000000000000..d2d85457a9f3
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-1.4.4
@@ -0,0 +1 @@
+MD5 2d29074c577dd42706c923df21a9a5bf epiphany-1.4.4.tar.bz2 3355896
diff --git a/www-client/epiphany/files/digest-epiphany-1.4.5 b/www-client/epiphany/files/digest-epiphany-1.4.5
new file mode 100644
index 000000000000..5ebfb8773bf0
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-1.4.5
@@ -0,0 +1 @@
+MD5 ac41b48506ba2791121648772a885084 epiphany-1.4.5.tar.bz2 3529226
diff --git a/www-client/epiphany/files/digest-epiphany-1.4.6 b/www-client/epiphany/files/digest-epiphany-1.4.6
new file mode 100644
index 000000000000..99809df30bab
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-1.4.6
@@ -0,0 +1 @@
+MD5 82e44449cc615e729d5fb218719b1d58 epiphany-1.4.6.tar.bz2 3541516
diff --git a/www-client/epiphany/files/digest-epiphany-1.4.7 b/www-client/epiphany/files/digest-epiphany-1.4.7
new file mode 100644
index 000000000000..f55371d87211
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-1.4.7
@@ -0,0 +1 @@
+MD5 47909f75c6c87581172656ceed8c14b0 epiphany-1.4.7.tar.bz2 3544181
diff --git a/www-client/epiphany/files/digest-epiphany-1.4.8 b/www-client/epiphany/files/digest-epiphany-1.4.8
new file mode 100644
index 000000000000..334a50376efe
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-1.4.8
@@ -0,0 +1 @@
+MD5 bb9bdb92c5b4a7a97029e942304a9373 epiphany-1.4.8.tar.bz2 3594408
diff --git a/www-client/epiphany/files/digest-epiphany-1.6.0 b/www-client/epiphany/files/digest-epiphany-1.6.0
new file mode 100644
index 000000000000..3b6ddf3ac56b
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-1.6.0
@@ -0,0 +1 @@
+MD5 53eda1c713aec26a51fb806210c8afa7 epiphany-1.6.0.tar.bz2 2983514
diff --git a/www-client/epiphany/files/digest-epiphany-1.6.0-r1 b/www-client/epiphany/files/digest-epiphany-1.6.0-r1
new file mode 100644
index 000000000000..3b6ddf3ac56b
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-1.6.0-r1
@@ -0,0 +1 @@
+MD5 53eda1c713aec26a51fb806210c8afa7 epiphany-1.6.0.tar.bz2 2983514
diff --git a/www-client/epiphany/files/digest-epiphany-1.6.0-r2 b/www-client/epiphany/files/digest-epiphany-1.6.0-r2
new file mode 100644
index 000000000000..3b6ddf3ac56b
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-1.6.0-r2
@@ -0,0 +1 @@
+MD5 53eda1c713aec26a51fb806210c8afa7 epiphany-1.6.0.tar.bz2 2983514
diff --git a/www-client/epiphany/files/epiphany-1.2.9-mozilla-1.7.3.patch b/www-client/epiphany/files/epiphany-1.2.9-mozilla-1.7.3.patch
new file mode 100644
index 000000000000..06eaf5462f67
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-1.2.9-mozilla-1.7.3.patch
@@ -0,0 +1,24 @@
+diff -uNr epiphany-1.2.9/configure epiphany-1.2.9.patched/configure
+--- epiphany-1.2.9/configure	2004-09-11 16:32:47.000000000 +0200
++++ epiphany-1.2.9.patched/configure	2004-09-16 16:01:43.000000000 +0200
+@@ -22061,7 +22061,7 @@
+   1.7) MOZILLA_SNAPSHOT=17 ;;
+ 1.7.1) MOZILLA_SNAPSHOT=17 ;;
+ 1.7.2) MOZILLA_SNAPSHOT=17 ;;
+-1.7.3) MOZILLA_SNAPSHOT=18 ;;
++1.7.3) MOZILLA_SNAPSHOT=17 ;;
+ 1.7.4) MOZILLA_SNAPSHOT=18 ;;
+ 1.7.5) MOZILLA_SNAPSHOT=18 ;;
+ branch1.7) MOZILLA_SNAPSHOT=18 ;;
+diff -uNr epiphany-1.2.9/configure.in epiphany-1.2.9.patched/configure.in
+--- epiphany-1.2.9/configure.in	2004-09-05 01:02:32.000000000 +0200
++++ epiphany-1.2.9.patched/configure.in	2004-09-16 16:01:19.000000000 +0200
+@@ -205,7 +205,7 @@
+   1.7) MOZILLA_SNAPSHOT=17 ;;
+ 1.7.1) MOZILLA_SNAPSHOT=17 ;;
+ 1.7.2) MOZILLA_SNAPSHOT=17 ;;
+-1.7.3) MOZILLA_SNAPSHOT=18 ;;
++1.7.3) MOZILLA_SNAPSHOT=17 ;;
+ 1.7.4) MOZILLA_SNAPSHOT=18 ;;
+ 1.7.5) MOZILLA_SNAPSHOT=18 ;;
+ branch1.7) MOZILLA_SNAPSHOT=18 ;;
diff --git a/www-client/epiphany/files/epiphany-1.3.4-fix_includes.patch b/www-client/epiphany/files/epiphany-1.3.4-fix_includes.patch
new file mode 100644
index 000000000000..d3081aababcb
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-1.3.4-fix_includes.patch
@@ -0,0 +1,18 @@
+--- embed/mozilla/Makefile.in.bak	2004-07-08 05:02:19.678210368 -0500
++++ embed/mozilla/Makefile.in	2004-07-08 05:02:54.573905416 -0500
+@@ -218,6 +218,7 @@
+ 	-I$(MOZILLA_INCLUDE_ROOT)/docshell		\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/dom			\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/exthandler		\
++	-I$(MOZILLA_INCLUDE_ROOT)/find			\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/gfx			\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/helperAppDlg		\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/history		\
+@@ -228,6 +229,7 @@
+ 	-I$(MOZILLA_INCLUDE_ROOT)/nkcache		\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/pipboot		\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/pipnss		\
++	-I$(MOZILLA_INCLUDE_ROOT)/pref			\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/shistory		\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/uriloader		\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/uconv		
diff --git a/www-client/epiphany/files/epiphany-1.4.6-fix_includes.patch b/www-client/epiphany/files/epiphany-1.4.6-fix_includes.patch
new file mode 100644
index 000000000000..08f707e024d6
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-1.4.6-fix_includes.patch
@@ -0,0 +1,19 @@
+diff -ur epiphany-1.4.6/embed/mozilla/Makefile.in epiphany-1.4.6-patched/embed/mozilla/Makefile.in
+--- epiphany-1.4.6/embed/mozilla/Makefile.in	2004-11-29 03:54:32.000000000 +0800
++++ epiphany-1.4.6-patched/embed/mozilla/Makefile.in	2004-12-06 14:13:54.858691504 +0800
+@@ -296,6 +296,7 @@
+ 	-I$(MOZILLA_INCLUDE_ROOT)/docshell \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/dom \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/exthandler \
++	-I$(MOZILLA_INCLUDE_ROOT)/find \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/gfx \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/helperAppDlg \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/js -I$(MOZILLA_INCLUDE_ROOT)/history \
+@@ -307,6 +308,7 @@
+ 	-I$(MOZILLA_INCLUDE_ROOT)/passwordmgr \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/pipboot \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/pipnss \
++	-I$(MOZILLA_INCLUDE_ROOT)/pref \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/shistory \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/uriloader \
+ 	-I$(MOZILLA_INCLUDE_ROOT)/uconv \
diff --git a/www-client/epiphany/files/epiphany-1.4.6-moz-nsiurip.patch b/www-client/epiphany/files/epiphany-1.4.6-moz-nsiurip.patch
new file mode 100644
index 000000000000..04fde3148e42
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-1.4.6-moz-nsiurip.patch
@@ -0,0 +1,28 @@
+diff -ur epiphany-1.4.6/configure epiphany-1.4.6-patched/configure
+--- epiphany-1.4.6/configure	2004-11-29 03:54:24.000000000 +0800
++++ epiphany-1.4.6-patched/configure	2004-12-20 16:15:06.608361048 +0800
+@@ -23030,8 +23030,8 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <nsIURI.h>
+-		  #include <nsIGlobalHistory.h>
++#include <necko/nsIURI.h>
++#include <docshell/nsIGlobalHistory.h>
+ 		  #include <docshell/nsIGlobalHistory2.h>
+ 		  #include <history/nsIBrowserHistory.h>
+ int
+diff -ur epiphany-1.4.6/configure.in epiphany-1.4.6-patched/configure.in
+--- epiphany-1.4.6/configure.in	2004-11-25 05:14:25.000000000 +0800
++++ epiphany-1.4.6-patched/configure.in	2004-12-20 16:14:43.770832880 +0800
+@@ -259,8 +259,8 @@
+ 
+ AC_COMPILE_IFELSE(
+ 	[AC_LANG_PROGRAM(
+-		[[#include <nsIURI.h>
+-		  #include <nsIGlobalHistory.h>
++		[[#include <necko/nsIURI.h>
++		  #include <docshell/nsIGlobalHistory.h>
+ 		  #include <docshell/nsIGlobalHistory2.h>
+ 		  #include <history/nsIBrowserHistory.h>]],
+ 		[[nsIBrowserHistory* p;
diff --git a/www-client/epiphany/files/epiphany-1.5.5-fix_includes.patch b/www-client/epiphany/files/epiphany-1.5.5-fix_includes.patch
new file mode 100644
index 000000000000..1fe3962b5682
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-1.5.5-fix_includes.patch
@@ -0,0 +1,19 @@
+diff -ur epiphany-1.5.5/embed/mozilla/Makefile.in epiphany-1.5.5-patched/embed/mozilla/Makefile.in
+--- epiphany-1.5.5/embed/mozilla/Makefile.in	2005-01-24 22:57:53.000000000 +0800
++++ epiphany-1.5.5-patched/embed/mozilla/Makefile.in	2005-02-06 18:32:59.798042536 +0800
+@@ -340,6 +340,7 @@
+ 	docshell		\
+ 	dom			\
+ 	exthandler		\
++	find			\
+ 	helperAppDlg		\
+ 	gfx			\
+ 	history			\
+@@ -350,6 +351,7 @@
+ 	necko			\
+ 	nkcache			\
+ 	passwordmgr		\
++	pref			\
+ 	pipboot			\
+ 	pipnss			\
+ 	shistory		\
diff --git a/www-client/epiphany/files/epiphany-1.6.0-fix_includes.patch b/www-client/epiphany/files/epiphany-1.6.0-fix_includes.patch
new file mode 100644
index 000000000000..c2cd2beb3323
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-1.6.0-fix_includes.patch
@@ -0,0 +1,25 @@
+diff -ur epiphany-1.6.0/embed/mozilla/Makefile.in epiphany-1.6.0-patched/embed/mozilla/Makefile.in
+--- epiphany-1.6.0/embed/mozilla/Makefile.in
++++ epiphany-1.6.0-patched/embed/mozilla/Makefile.in
+@@ -343,6 +343,7 @@
+ 	docshell		\
+ 	dom			\
+ 	exthandler		\
++	find			\
+ 	helperAppDlg		\
+ 	gfx			\
+ 	history			\
+@@ -355,10 +356,12 @@
+ 	passwordmgr		\
+ 	pipboot			\
+ 	pipnss			\
++	pref			\
+ 	shistory		\
+ 	sidebar			\
+ 	uriloader		\
+ 	uconv			\
++	wallet			\
+ 	webbrowserpersist	\
+ 	webbrwsr		\
+ 	widget			\
+
diff --git a/www-client/epiphany/files/epiphany-1.6.0-view_source.patch b/www-client/epiphany/files/epiphany-1.6.0-view_source.patch
new file mode 100644
index 000000000000..84b2607f6878
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-1.6.0-view_source.patch
@@ -0,0 +1,435 @@
+Index: configure.ac
+===================================================================
+RCS file: /cvs/gnome/epiphany/configure.ac,v
+retrieving revision 1.68.2.1
+retrieving revision 1.68.2.2
+diff -u -r1.68.2.1 -r1.68.2.2
+--- configure.ac	7 Mar 2005 19:41:03 -0000	1.68.2.1
++++ configure.ac	9 Mar 2005 18:19:01 -0000	1.68.2.2
+@@ -52,6 +52,7 @@
+ LIBGNOMEVFS_REQUIRED=2.9.2
+ LIBGNOMEUI_REQUIRED=2.6.0
+ GNOME_DESKTOP_REQUIRED=2.9.91
++LIBSTARTUP_NOTIFICATION_REQUIRED=0.5
+ 
+ AC_ENABLE_SHARED([yes])
+ AC_ENABLE_STATIC([no])
+@@ -71,6 +72,16 @@
+ GNOME_COMPILE_WARNINGS([maximum])
+ dnl GNOME_CXX_WARNINGS
+ 
++AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
++if $PKG_CONFIG --atleast-version $LIBSTARTUP_NOTIFICATION_REQUIRED libstartup-notification-1.0; then
++	echo "Building with libstartup-notification"
++	AC_DEFINE([HAVE_STARTUP_NOTIFICATION],[1],[Define to enable startup notification support])
++	STARTUP_NOTIFICATION_PACKAGE=libstartup-notification-1.0
++else
++	echo "***** WARNING: Building without libstartup-notification"
++	STARTUP_NOTIFICATION_PACKAGE=
++fi
++
+ PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
+ 		  glib-2.0 >= $GLIB_REQUIRED \
+ 		  pango >= $PANGO_REQUIRED \
+@@ -86,6 +97,7 @@
+ 		  gnome-vfs-module-2.0 \
+ 		  gconf-2.0 \
+ 		  gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED \
++		  $STARTUP_NOTIFICATION_PACKAGE \
+ 		  ])
+ AC_SUBST([EPIPHANY_DEPENDENCY_CFLAGS])
+ AC_SUBST([EPIPHANY_DEPENDENCY_LIBS])
+
+Index: lib/ephy-file-helpers.c
+===================================================================
+RCS file: /cvs/gnome/epiphany/lib/ephy-file-helpers.c,v
+retrieving revision 1.26
+retrieving revision 1.26.2.1
+diff -u -r1.26 -r1.26.2.1
+--- lib/ephy-file-helpers.c	26 Feb 2005 22:01:48 -0000	1.26
++++ lib/ephy-file-helpers.c	9 Mar 2005 18:19:01 -0000	1.26.2.1
+@@ -44,6 +44,13 @@
+ #undef GNOME_DISABLE_DEPRECATED
+ #include <libgnome/gnome-desktop-item.h>
+ 
++#ifdef HAVE_STARTUP_NOTIFICATION
++#define SN_API_NOT_YET_FROZEN
++#include <libsn/sn.h>
++#include <gdk/gdk.h>
++#include <gdk/gdkx.h>
++#endif
++
+ static GHashTable *files = NULL;
+ static GHashTable *mime_table = NULL;
+ 
+@@ -458,6 +465,331 @@
+ 	return permission;
+ }
+ 
++/* Copied from nautilus-program-choosing.c */
++
++extern char **environ;
++
++/* Cut and paste from gdkspawn-x11.c */
++static gchar **
++my_gdk_spawn_make_environment_for_screen (GdkScreen  *screen,
++					  gchar     **envp)
++{
++  gchar **retval = NULL;
++  gchar  *display_name;
++  gint    display_index = -1;
++  gint    i, env_len;
++
++  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
++
++  if (envp == NULL)
++    envp = environ;
++
++  for (env_len = 0; envp[env_len]; env_len++)
++    if (strncmp (envp[env_len], "DISPLAY", strlen ("DISPLAY")) == 0)
++      display_index = env_len;
++
++  retval = g_new (char *, env_len + 1);
++  retval[env_len] = NULL;
++
++  display_name = gdk_screen_make_display_name (screen);
++
++  for (i = 0; i < env_len; i++)
++    if (i == display_index)
++      retval[i] = g_strconcat ("DISPLAY=", display_name, NULL);
++    else
++      retval[i] = g_strdup (envp[i]);
++
++  g_assert (i == env_len);
++
++  g_free (display_name);
++
++  return retval;
++}
++
++#ifdef HAVE_STARTUP_NOTIFICATION
++static void
++sn_error_trap_push (SnDisplay *display,
++		    Display   *xdisplay)
++{
++	gdk_error_trap_push ();
++}
++
++static void
++sn_error_trap_pop (SnDisplay *display,
++		   Display   *xdisplay)
++{
++	gdk_error_trap_pop ();
++}
++
++static char **
++make_spawn_environment_for_sn_context (SnLauncherContext *sn_context,
++				       char             **envp)
++{
++	char **retval;
++	int    i, j;
++
++	retval = NULL;
++	
++	if (envp == NULL) {
++		envp = environ;
++	}
++	
++	for (i = 0; envp[i]; i++) {
++		/* Count length */
++	}
++
++	retval = g_new (char *, i + 2);
++
++	for (i = 0, j = 0; envp[i]; i++) {
++		if (!g_str_has_prefix (envp[i], "DESKTOP_STARTUP_ID=")) {
++			retval[j] = g_strdup (envp[i]);
++			++j;
++	        }
++	}
++
++	retval[j] = g_strdup_printf ("DESKTOP_STARTUP_ID=%s",
++				     sn_launcher_context_get_startup_id (sn_context));
++	++j;
++	retval[j] = NULL;
++
++	return retval;
++}
++
++/* This should be fairly long, as it's confusing to users if a startup
++ * ends when it shouldn't (it appears that the startup failed, and
++ * they have to relaunch the app). Also the timeout only matters when
++ * there are bugs and apps don't end their own startup sequence.
++ *
++ * This timeout is a "last resort" timeout that ignores whether the
++ * startup sequence has shown activity or not.  Metacity and the
++ * tasklist have smarter, and correspondingly able-to-be-shorter
++ * timeouts. The reason our timeout is dumb is that we don't monitor
++ * the sequence (don't use an SnMonitorContext)
++ */
++#define STARTUP_TIMEOUT_LENGTH (30 /* seconds */ * 1000)
++
++typedef struct
++{
++	GdkScreen *screen;
++	GSList *contexts;
++	guint timeout_id;
++} StartupTimeoutData;
++
++static void
++free_startup_timeout (void *data)
++{
++	StartupTimeoutData *std;
++
++	std = data;
++
++	g_slist_foreach (std->contexts,
++			 (GFunc) sn_launcher_context_unref,
++			 NULL);
++	g_slist_free (std->contexts);
++
++	if (std->timeout_id != 0) {
++		g_source_remove (std->timeout_id);
++		std->timeout_id = 0;
++	}
++
++	g_free (std);
++}
++
++static gboolean
++startup_timeout (void *data)
++{
++	StartupTimeoutData *std;
++	GSList *tmp;
++	GTimeVal now;
++	int min_timeout;
++
++	std = data;
++
++	min_timeout = STARTUP_TIMEOUT_LENGTH;
++	
++	g_get_current_time (&now);
++	
++	tmp = std->contexts;
++	while (tmp != NULL) {
++		SnLauncherContext *sn_context;
++		GSList *next;
++		long tv_sec, tv_usec;
++		double elapsed;
++		
++		sn_context = tmp->data;
++		next = tmp->next;
++		
++		sn_launcher_context_get_last_active_time (sn_context,
++							  &tv_sec, &tv_usec);
++
++		elapsed =
++			((((double)now.tv_sec - tv_sec) * G_USEC_PER_SEC +
++			  (now.tv_usec - tv_usec))) / 1000.0;
++
++		if (elapsed >= STARTUP_TIMEOUT_LENGTH) {
++			std->contexts = g_slist_remove (std->contexts,
++							sn_context);
++			sn_launcher_context_complete (sn_context);
++			sn_launcher_context_unref (sn_context);
++		} else {
++			min_timeout = MIN (min_timeout, (STARTUP_TIMEOUT_LENGTH - elapsed));
++		}
++		
++		tmp = next;
++	}
++
++	if (std->contexts == NULL) {
++		std->timeout_id = 0;
++	} else {
++		std->timeout_id = g_timeout_add (min_timeout,
++						 startup_timeout,
++						 std);
++	}
++
++	/* always remove this one, but we may have reinstalled another one. */
++	return FALSE;
++}
++
++static void
++add_startup_timeout (GdkScreen         *screen,
++		     SnLauncherContext *sn_context)
++{
++	StartupTimeoutData *data;
++
++	data = g_object_get_data (G_OBJECT (screen), "nautilus-startup-data");
++	if (data == NULL) {
++		data = g_new (StartupTimeoutData, 1);
++		data->screen = screen;
++		data->contexts = NULL;
++		data->timeout_id = 0;
++		
++		g_object_set_data_full (G_OBJECT (screen), "nautilus-startup-data",
++					data, free_startup_timeout);		
++	}
++
++	sn_launcher_context_ref (sn_context);
++	data->contexts = g_slist_prepend (data->contexts, sn_context);
++	
++	if (data->timeout_id == 0) {
++		data->timeout_id = g_timeout_add (STARTUP_TIMEOUT_LENGTH,
++						  startup_timeout,
++						  data);		
++	}
++}
++
++#endif /* HAVE_STARTUP_NOTIFICATION */
++
++gboolean
++ephy_file_launch_application (GnomeVFSMimeApplication *application,
++			      const char *parameter,
++			      guint32 user_time)
++{
++	GdkScreen       *screen;
++	GList           *uris = NULL;
++	char            *uri;
++	char           **envp;
++	GnomeVFSResult   result;
++#ifdef HAVE_STARTUP_NOTIFICATION
++	SnLauncherContext *sn_context;
++	SnDisplay *sn_display;
++#endif
++
++	g_return_val_if_fail (application != NULL, FALSE);
++	g_return_val_if_fail (parameter != NULL, FALSE);
++
++	uri = gnome_vfs_make_uri_canonical (parameter);
++	if (uri == NULL) return FALSE;
++
++	uris = g_list_prepend (NULL, uri);
++	
++	screen = gdk_screen_get_default ();
++	envp = my_gdk_spawn_make_environment_for_screen (screen, NULL);
++	
++#ifdef HAVE_STARTUP_NOTIFICATION
++	sn_display = sn_display_new (gdk_display,
++				     sn_error_trap_push,
++				     sn_error_trap_pop);
++
++	
++	/* Only initiate notification if application supports it. */
++	if (gnome_vfs_mime_application_supports_startup_notification (application))
++	{
++		char *name;
++
++		sn_context = sn_launcher_context_new (sn_display,
++						      screen ? gdk_screen_get_number (screen) :
++						      DefaultScreen (gdk_display));
++		
++		name = g_filename_display_basename (uri);
++		if (name != NULL) {
++			char *description;
++			
++			sn_launcher_context_set_name (sn_context, name);
++
++			/* FIXME: i18n after string freeze! */
++			description = g_strdup_printf ("Opening %s", name);
++			
++			sn_launcher_context_set_description (sn_context, description);
++
++			g_free (name);
++			g_free (description);
++		}
++		
++		if (!sn_launcher_context_get_initiated (sn_context)) {
++			const char *binary_name;
++			char **old_envp;
++
++			binary_name = gnome_vfs_mime_application_get_binary_name (application);
++		
++			sn_launcher_context_set_binary_name (sn_context,
++							     binary_name);
++			
++			sn_launcher_context_initiate (sn_context,
++						      g_get_prgname () ? g_get_prgname () : "unknown",
++						      binary_name,
++						      (Time) user_time);
++
++			old_envp = envp;
++			envp = make_spawn_environment_for_sn_context (sn_context, envp);
++			g_strfreev (old_envp);
++		}
++	} else {
++		sn_context = NULL;
++	}
++#endif /* HAVE_STARTUP_NOTIFICATION */
++	
++	result = gnome_vfs_mime_application_launch_with_env (application, uris, envp);
++
++#ifdef HAVE_STARTUP_NOTIFICATION
++	if (sn_context != NULL) {
++		if (result != GNOME_VFS_OK) {
++			sn_launcher_context_complete (sn_context); /* end sequence */
++		} else {
++			add_startup_timeout (screen ? screen :
++					     gdk_display_get_default_screen (gdk_display_get_default ()),
++					     sn_context);
++		}
++		sn_launcher_context_unref (sn_context);
++	}
++	
++	sn_display_unref (sn_display);
++#endif /* HAVE_STARTUP_NOTIFICATION */
++
++	g_strfreev (envp);
++	g_list_foreach (uris, (GFunc) g_free,NULL);
++	g_list_free (uris);
++
++	if (result != GNOME_VFS_OK)
++	{
++		g_warning ("Cannot launch application '%s'\n",
++			   gnome_vfs_mime_application_get_name (application));
++	}
++
++	return result == GNOME_VFS_OK;
++}
++
++/* End cut-paste-adapt from nautilus */
++
+ static int
+ launch_desktop_item (const char *desktop_file,
+ 		     const char *parameter,
+@@ -529,37 +861,6 @@
+ }
+ 
+ gboolean
+-ephy_file_launch_application (GnomeVFSMimeApplication *application,
+-			      const char *parameter,
+-			      guint32 user_time)
+-{
+-	GError *error = NULL;
+-	const char *desktop_file;
+-	int ret = -1;
+-
+-	g_return_val_if_fail (application != NULL, FALSE);
+-	g_return_val_if_fail (parameter != NULL, FALSE);
+-
+-	desktop_file = gnome_vfs_mime_application_get_desktop_file_path (application);
+-	if (desktop_file != NULL)
+-	{
+-		ret = launch_desktop_item (desktop_file, parameter, user_time, &error);
+-	}
+-
+-	if (ret == -1 || error != NULL)
+-	{
+-		/* FIXME We should really warn the user here */
+-
+-		g_warning ("Cannot launch application '%s': %s\n",
+-			   gnome_vfs_mime_application_get_name (application),
+-			   error ? error->message : "(unknown error)");
+-		g_clear_error (&error);
+-	}
+-
+-	return ret >= 0;
+-}
+-
+-gboolean
+ ephy_file_launch_handler (const char *mime_type,
+ 			  const char *address,
+ 			  guint32 user_time)
+
diff --git a/www-client/epiphany/files/epiphany-1.6.0-wallet_fix.patch b/www-client/epiphany/files/epiphany-1.6.0-wallet_fix.patch
new file mode 100644
index 000000000000..b5c6b447a4f8
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-1.6.0-wallet_fix.patch
@@ -0,0 +1,15 @@
+Index: data/default-prefs-toolkit.js
+===================================================================
+RCS file: /cvs/gnome/epiphany/data/default-prefs-toolkit.js,v
+retrieving revision 1.1
+diff -p -u -u -p -r1.1 default-prefs-toolkit.js
+--- data/default-prefs-toolkit.js       28 Sep 2004 12:46:24 -0000      1.1
++++ data/default-prefs-toolkit.js       19 Jan 2005 13:59:38 -0000
+@@ -4,3 +4,6 @@ pref("plugin.default_plugin_disabled", t
+ // enable locale matching
+ pref("intl.locale.matchOS", true);
+ 
++// enable fixed-up typeaheadfind extension
++pref("accessibility.typeaheadfindsea", true);
++
+
diff --git a/www-client/epiphany/files/epiphany-1.6.0-wallet_password.patch b/www-client/epiphany/files/epiphany-1.6.0-wallet_password.patch
new file mode 100644
index 000000000000..f46ca6a3eb60
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-1.6.0-wallet_password.patch
@@ -0,0 +1,28 @@
+--- configure.orig	2005-03-12 14:05:28.427700360 +0100
++++ configure	2005-03-12 14:05:33.591915280 +0100
+@@ -23596,12 +23596,10 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-
+-
+ if test "x$flavour" = "xmozilla"; then
+-	as_ac_File=`echo "ac_cv_file_$MOZILLA_INCLUDE_ROOT/nsIPassword.h" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $MOZILLA_INCLUDE_ROOT/nsIPassword.h" >&5
+-echo $ECHO_N "checking for $MOZILLA_INCLUDE_ROOT/nsIPassword.h... $ECHO_C" >&6
++	as_ac_File=`echo "ac_cv_file_$MOZILLA_INCLUDE_ROOT/wallet/nsIPassword.h" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $MOZILLA_INCLUDE_ROOT/wallet/nsIPassword.h" >&5
++echo $ECHO_N "checking for $MOZILLA_INCLUDE_ROOT/wallet/nsIPassword.h... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_File+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23609,7 +23607,7 @@
+   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+ echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+    { (exit 1); exit 1; }; }
+-if test -r "$MOZILLA_INCLUDE_ROOT/nsIPassword.h"; then
++if test -r "$MOZILLA_INCLUDE_ROOT/wallet/nsIPassword.h"; then
+   eval "$as_ac_File=yes"
+ else
+   eval "$as_ac_File=no"
+
diff --git a/www-client/epiphany/metadata.xml b/www-client/epiphany/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/www-client/epiphany/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>