New revision, thanks to <brad@gentoo.org>'s work on mozilla-firefox, it's possible to compile epiphany against firefox. This closes bug #85481 amongst others

(Portage version: 2.0.51.19)

5 files changed, 80 insertions, 9 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 9fff236a0b03..5c246aa07268 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,14 @@
 # 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.4 2005/03/23 16:19:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.5 2005/03/28 02:54:09 obz Exp $
+
+*epiphany-1.6.0-r3 (28 Mar 2005)
+
+  28 Mar 2005; Mike Gardiner <obz@gentoo.org>
+  files/epiphany-1.6.0-fix_includes.patch, +epiphany-1.6.0-r3.ebuild:
+  New revision, thanks to <brad@gentoo.org>'s work on mozilla-firefox, it's
+  possible to compile epiphany against firefox. This closes bug #85481 amongst
+  others
 
   23 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
   epiphany-1.2.9-r1.ebuild, epiphany-1.2.10.ebuild, epiphany-1.4.4.ebuild,
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 0986442b5a01..ff0b20fe2ff7 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,3 +1,4 @@
+MD5 57e78f2b2e47f10c40a5359b9e38b953 ChangeLog 13587
 MD5 e5f523ab3c3864df6bc9a056270cdf26 epiphany-1.2.10.ebuild 1338
 MD5 67e7eacaf6ef55d800de3f5a881e3412 epiphany-1.2.9-r1.ebuild 1468
 MD5 359f0d9afadb78a2fc50ad795631eb11 epiphany-1.4.4.ebuild 1375
@@ -5,11 +6,11 @@ MD5 0873a2aa499ea61b33cdaefdf9b46b10 epiphany-1.4.5.ebuild 1375
 MD5 4e94eac2f85ebe735922ae85ff8f5a68 epiphany-1.4.6.ebuild 1475
 MD5 c7b5bfcfb32adb78e2fc258783cbb8d1 epiphany-1.4.7.ebuild 1497
 MD5 a00cea335a3baa39f8f1bdff3fd477b7 epiphany-1.4.8.ebuild 1466
-MD5 8aed3342a6f92a5aef502cd9cf13b561 epiphany-1.6.0.ebuild 1434
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 c7411391205185fcfd7fa2ffb8908d04 epiphany-1.6.0-r1.ebuild 1519
 MD5 3bd417e2964a7df37b72259889c5d224 epiphany-1.6.0-r2.ebuild 1617
-MD5 57e78f2b2e47f10c40a5359b9e38b953 ChangeLog 13587
+MD5 8aed3342a6f92a5aef502cd9cf13b561 epiphany-1.6.0.ebuild 1434
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 89e10467531da1ba66dfd9fb3ac7c6fe epiphany-1.6.0-r3.ebuild 1392
 MD5 56ee35e359c12574247645a59250f5f8 files/digest-epiphany-1.2.10 69
 MD5 86259cda058c165aeb287a2b885b1b7a files/digest-epiphany-1.2.9-r1 68
 MD5 ebbdfe54389d750d3f1772e17d28a790 files/digest-epiphany-1.4.4 68
@@ -18,14 +19,15 @@ MD5 8b89ef168d67e7ae303ae92d4997d401 files/digest-epiphany-1.4.6 68
 MD5 7ba3d886ab73458f0569cd500a39b66f files/digest-epiphany-1.4.7 68
 MD5 24ec843041b5b9fd528431dd8e291297 files/digest-epiphany-1.4.8 68
 MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0 68
+MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0-r1 68
+MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0-r2 68
 MD5 687a46caa636617d50fcf56d46f4c9f2 files/epiphany-1.2.9-mozilla-1.7.3.patch 972
 MD5 f06f6e1c83f9668cfe31e9da7129ba4a files/epiphany-1.3.4-fix_includes.patch 720
 MD5 124caf61eb374940967a1d4c561270ca files/epiphany-1.4.6-fix_includes.patch 869
 MD5 5dd8a008a5612c492c8d0b648f5b0954 files/epiphany-1.4.6-moz-nsiurip.patch 1071
 MD5 30122eb94b387560a22559fecccf1d84 files/epiphany-1.5.5-fix_includes.patch 497
-MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0-r1 68
-MD5 febe27332928e38fb57115a08f66d590 files/epiphany-1.6.0-fix_includes.patch 505
+MD5 c1fc78ef3e0793861e74799bbcb6238c files/epiphany-1.6.0-fix_includes.patch 519
+MD5 a9590e1794335ecb9fb376a3b128570b files/epiphany-1.6.0-view_source.patch 11178
 MD5 40c2cd3b20e5f2847e868edbc4f58915 files/epiphany-1.6.0-wallet_fix.patch 598
 MD5 2a6d9343d321b67fb737cb87301facfc files/epiphany-1.6.0-wallet_password.patch 1307
-MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0-r2 68
-MD5 a9590e1794335ecb9fb376a3b128570b files/epiphany-1.6.0-view_source.patch 11178
+MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0-r3 68
diff --git a/www-client/epiphany/epiphany-1.6.0-r3.ebuild b/www-client/epiphany/epiphany-1.6.0-r3.ebuild
new file mode 100644
index 000000000000..ecb573250908
--- /dev/null
+++ b/www-client/epiphany/epiphany-1.6.0-r3.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-r3.ebuild,v 1.1 2005/03/28 02:54:09 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="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
+	|| ( >=www-client/mozilla-1.7.3
+		 >=www-client/mozilla-firefox-1.0.2-r1 )
+	>=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"
+
+USE_DESTDIR="1"
+
+# Mozilla/Firefox DEPEND on >=gtk+-2 now, no need
+# to check it <obz@gentoo.org>
+
+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
+
+}
+
diff --git a/www-client/epiphany/files/digest-epiphany-1.6.0-r3 b/www-client/epiphany/files/digest-epiphany-1.6.0-r3
new file mode 100644
index 000000000000..3b6ddf3ac56b
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-1.6.0-r3
@@ -0,0 +1 @@
+MD5 53eda1c713aec26a51fb806210c8afa7 epiphany-1.6.0.tar.bz2 2983514
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
index c2cd2beb3323..f7e52859f43a 100644
--- a/www-client/epiphany/files/epiphany-1.6.0-fix_includes.patch
+++ b/www-client/epiphany/files/epiphany-1.6.0-fix_includes.patch
@@ -9,13 +9,14 @@ diff -ur epiphany-1.6.0/embed/mozilla/Makefile.in epiphany-1.6.0-patched/embed/m
  	helperAppDlg		\
  	gfx			\
  	history			\
-@@ -355,10 +356,12 @@
+@@ -355,10 +356,13 @@
  	passwordmgr		\
  	pipboot			\
  	pipnss			\
 +	pref			\
  	shistory		\
  	sidebar			\
++	string 			\
  	uriloader		\
  	uconv			\
 +	wallet			\