New version for gnome-2.14 release. Thanks to dsd,allanonjl, and compnerd for helping during the dev cycle

(Portage version: 2.1_pre5-r4)

5 files changed, 112 insertions, 11 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 5f6c9ba3f31f..9bcd82d5a44e 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/epiphany
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.56 2006/03/10 01:37:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.57 2006/03/13 01:33:37 joem Exp $
+
+*epiphany-2.14.0 (13 Mar 2006)
+
+  13 Mar 2006; Joe McCann <joem@gentoo.org>
+  +files/epiphany-1.9.2-broken-firefox.patch, +epiphany-2.14.0.ebuild:
+  New version for gnome-2.14 release. Thanks to dsd,allanonjl, and compnerd
+  for helping during the dev cycle
 
   10 Mar 2006; Aron Griffis <agriffis@gentoo.org> epiphany-1.8.3.ebuild:
   Mark 1.8.3 stable on ia64
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 1ad9ac90982e..e5766c3d3a06 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6ca61993192d68a4a2f06054790413ad ChangeLog 19464
 RMD160 6b791fb582df3c70b0b1d84869a2dcc22b82867f ChangeLog 19464
 SHA256 e125a66307b5800416092a63673a72dfb0ef67f960d3fb9e9f61f885050db3aa ChangeLog 19464
@@ -22,6 +19,9 @@ SHA256 534c536c06f4e089fb28a6cc6ea8ef9020961984a5ccf16430f8ddd5fe869446 epiphany
 MD5 e5b210ed9c4fc669ed477c5fc10edf23 epiphany-1.8.4.1.ebuild 1828
 RMD160 0fd41053199a6b34aab2859564ec423fd25a8a38 epiphany-1.8.4.1.ebuild 1828
 SHA256 bd7dcc7d4921dabd1f6953095d7d55c085de1e04658929805b4abcbea15232f1 epiphany-1.8.4.1.ebuild 1828
+MD5 ccb84b66979abe492817dd3bf4e14725 epiphany-2.14.0.ebuild 2149
+RMD160 d4cc85fe2c10b157878cafdb2b930a2e4f29267f epiphany-2.14.0.ebuild 2149
+SHA256 a863b2f7721d5659eabe540bafeeebea7a0c6b23792659e4cc8990f893abfe6c epiphany-2.14.0.ebuild 2149
 MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0-r3 68
 RMD160 b99d47ca61cd962c2383dfede7efd7f52109cc32 files/digest-epiphany-1.6.0-r3 68
 SHA256 5e13dc8f1db669a0d78ad9d055b21f2fae62a264333cd729185bbb8a6be8256d files/digest-epiphany-1.6.0-r3 68
@@ -40,6 +40,9 @@ SHA256 eaa5a10e1393daf4e3b493e8cee3ac3dd548c5dbbfe0008f7ffa2fba02201ecc files/di
 MD5 c1c5c058f46fd7d3f0993a3799bf6883 files/digest-epiphany-1.8.4.1 256
 RMD160 b45f694013b20ef2e4e632eb5b6e0b01cefdace7 files/digest-epiphany-1.8.4.1 256
 SHA256 fc4db14b7380baa26e2ac416baa0a6c00a52f44f0285387c798331ab3017fec5 files/digest-epiphany-1.8.4.1 256
+MD5 6f420997e981654cd613894986a66c3f files/digest-epiphany-2.14.0 253
+RMD160 639372d724f65a5dd5c1ed529b16395b504d918e files/digest-epiphany-2.14.0 253
+SHA256 2c674567f47ec90c91b465c0008be2f8491b06d27e5482611e54016769654ede files/digest-epiphany-2.14.0 253
 MD5 c1fc78ef3e0793861e74799bbcb6238c files/epiphany-1.6.0-fix_includes.patch 519
 RMD160 1e34df540c5a6a611e9b37c3c94efaf9d36deca0 files/epiphany-1.6.0-fix_includes.patch 519
 SHA256 00746c1fd2ca4b92bd9d61f9ead21e10fc5a63243ca17999b4d62af4456567f2 files/epiphany-1.6.0-fix_includes.patch 519
@@ -55,13 +58,9 @@ SHA256 1e883ce76645d6293019a65282f2312223a5516473ad9e2f7483fd64af138f8f files/ep
 MD5 3e5d6d82d44078ec1c95566207f9bad1 files/epiphany-1.6.3-fix_includes.patch 369
 RMD160 c5819d9d146ef60cb70b0e8c6bfa21d113e3e58e files/epiphany-1.6.3-fix_includes.patch 369
 SHA256 41b4cf39d1efeb2b865b287729f3f1134ab572c2547434f65a1ffec3b680c24f files/epiphany-1.6.3-fix_includes.patch 369
+MD5 9bff9c987534a9f2cbefa291a28affe7 files/epiphany-1.9.2-broken-firefox.patch 563
+RMD160 ae6d867b1168ef98b2c50bcc2002f5fb088da7c8 files/epiphany-1.9.2-broken-firefox.patch 563
+SHA256 7012e6b2dcc15eea073be4e082f79ad549840216f315f339271539b9c469775e files/epiphany-1.9.2-broken-firefox.patch 563
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFEENhxJrHF4yAQTrARAuMnAKDON1dJJqK9hgn8U/qiziG6KszlRgCdF12J
-xfalrSZRkSh3eZ9RPVvRfdY=
-=k6Ju
------END PGP SIGNATURE-----
diff --git a/www-client/epiphany/epiphany-2.14.0.ebuild b/www-client/epiphany/epiphany-2.14.0.ebuild
new file mode 100644
index 000000000000..66b74e3ae83d
--- /dev/null
+++ b/www-client/epiphany/epiphany-2.14.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.14.0.ebuild,v 1.1 2006/03/13 01:33:37 joem Exp $
+
+inherit eutils gnome2 multilib
+
+DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
+HOMEPAGE="http://www.gnome.org/projects/epiphany/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="dbus doc firefox python"
+
+# Note that there is no libgnomeprint dep, while it is 
+# specified in configure.in . This could in some rare
+# situations break portage dep resolution.
+#
+# Marinus <foser@gentoo.org> 14-9-2005
+
+RDEPEND=">=dev-libs/glib-2.8
+	>=x11-libs/gtk+-2.8.3
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.7
+	>=gnome-base/libglade-2.3.1
+	>=gnome-base/gnome-vfs-2.9.2
+	>=gnome-base/libgnomeui-2.6
+	>=gnome-base/gnome-desktop-2.9.91
+	>=x11-libs/startup-notification-0.5
+	>=gnome-base/libgnomeprintui-2.4
+	>=gnome-base/libbonobo-2
+	>=gnome-base/orbit-2
+	>=gnome-base/gconf-2
+	>=app-text/iso-codes-0.35
+	!firefox? ( >=www-client/mozilla-1.7.9 )
+	firefox? ( >=www-client/mozilla-firefox-1.0.5 )
+	dbus? ( >=sys-apps/dbus-0.35 )
+	python? (
+		>=dev-lang/python-2.3
+		>=dev-python/pygtk-2.7.1
+		>=dev-python/gnome-python-2.6 )
+	x11-themes/gnome-icon-theme"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.29
+	app-text/gnome-doc-utils
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
+USE_DESTDIR="1"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_setup() {
+	G2CONF="--disable-scrollkeeper \
+		$(use_enable dbus) \
+		$(use_enable python)"
+
+	if use firefox; then
+		G2CONF="${G2CONF} --with-mozilla=firefox"
+	else
+		G2CONF="${G2CONF} --with-mozilla=mozilla"
+	fi
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	epatch ${FILESDIR}/${PN}-1.9.2-broken-firefox.patch
+}
+
+src_compile() {
+	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat
+	addpredict /usr/$(get_libdir)/mozilla-firefox/components/compreg.dat.tmp
+	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
+	gnome2_src_compile
+}
diff --git a/www-client/epiphany/files/digest-epiphany-2.14.0 b/www-client/epiphany/files/digest-epiphany-2.14.0
new file mode 100644
index 000000000000..c163b2f5d3a1
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-2.14.0
@@ -0,0 +1,3 @@
+MD5 6a4b91205aa610e4b3f11bfdd86aad12 epiphany-2.14.0.tar.bz2 3560639
+RMD160 01dc22da1fc66eb00b28ebdc436e9b1438472623 epiphany-2.14.0.tar.bz2 3560639
+SHA256 ace2f95ccf7fe4dccf7dc96a46ef3ddc2a30c4eedf8641f2e9fef603a9841595 epiphany-2.14.0.tar.bz2 3560639
diff --git a/www-client/epiphany/files/epiphany-1.9.2-broken-firefox.patch b/www-client/epiphany/files/epiphany-1.9.2-broken-firefox.patch
new file mode 100644
index 000000000000..91d925654dc4
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-1.9.2-broken-firefox.patch
@@ -0,0 +1,12 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN epiphany-1.9.2.orig/plugins/desktop-file/plugin.cpp epiphany-1.9.2/plugins/desktop-file/plugin.cpp
+--- epiphany-1.9.2.orig/plugins/desktop-file/plugin.cpp	2005-11-07 14:33:31.000000000 -0500
++++ epiphany-1.9.2/plugins/desktop-file/plugin.cpp	2005-11-19 15:03:52.000000000 -0500
+@@ -36,7 +36,7 @@
+ 
+ #include <npupp.h>
+ #include <nsCOMPtr.h>
+-#include <nsIDOMWindow.h>
++#include <dom/nsIDOMWindow.h>
+ #include "../../embed/mozilla/EphyUtils.h"
+ 
+ /* NOTE: For simplicity, we use the Epiphany domain for translations,