new upstream version, + patch for the nautilus view

5 files changed, 98 insertions, 5 deletions

diff --git a/net-www/epiphany/ChangeLog b/net-www/epiphany/ChangeLog
index 80c474345376..06899100d943 100644
--- a/net-www/epiphany/ChangeLog
+++ b/net-www/epiphany/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/epiphany
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/ChangeLog,v 1.58 2004/07/26 05:21:14 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/epiphany/ChangeLog,v 1.59 2004/08/01 16:16:05 spider Exp $
+
+*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
diff --git a/net-www/epiphany/Manifest b/net-www/epiphany/Manifest
index 89956c7c6c11..d14a2b627ca9 100644
--- a/net-www/epiphany/Manifest
+++ b/net-www/epiphany/Manifest
@@ -1,13 +1,16 @@
-MD5 2b89fc1eab460413022111a579b35015 epiphany-1.2.6.ebuild 1325
+MD5 6557aa6248d504ff78954f42343bda4a ChangeLog 7546
 MD5 fa3cf7d91a4f072dba0b5fc4095c843a epiphany-1.0.7.ebuild 1225
+MD5 7716f725a5a7f9033dadb777ad59c7f7 epiphany-1.2.2.ebuild 1318
 MD5 5fc85b60cb72b58f37a820a0f10685da epiphany-1.2.3.ebuild 1323
 MD5 e1e44a01a23ebc21a287784f91cec9ac epiphany-1.2.5.ebuild 1457
-MD5 7716f725a5a7f9033dadb777ad59c7f7 epiphany-1.2.2.ebuild 1318
-MD5 9c656febcc75c481d44d8551ccb7ebe2 ChangeLog 7329
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 771a6412c25bf38ed285c69e27f7cdcd files/epiphany-1.2.5-gcc2_fix.patch 539
+MD5 2b89fc1eab460413022111a579b35015 epiphany-1.2.6.ebuild 1325
+MD5 09f1398d584cbb9d794475d6b3279d75 epiphany-1.2.7.ebuild 1453
 MD5 5edb401fcdae44c283b7d8b7fbdeba84 files/digest-epiphany-1.0.7 68
 MD5 a3d36d0b5e57c13bc93e3c3e0cedb08a files/digest-epiphany-1.2.2 68
 MD5 1651ad3aab0f207db7e39a5601a5fa3e files/digest-epiphany-1.2.3 68
 MD5 44b01636ae8eda75498104ec559c14bf files/digest-epiphany-1.2.5 68
+MD5 771a6412c25bf38ed285c69e27f7cdcd files/epiphany-1.2.5-gcc2_fix.patch 539
 MD5 ac323ac94ea3225d8cb548bdd586a9ad files/digest-epiphany-1.2.6 68
+MD5 4bbb4c198b340ac287571eb51c02188c files/digest-epiphany-1.2.7 68
+MD5 bb7ec0bea74a36ed1d7274167e580f63 files/epiphany-1.2.7-nautilus_view.patch 757
diff --git a/net-www/epiphany/epiphany-1.2.7.ebuild b/net-www/epiphany/epiphany-1.2.7.ebuild
new file mode 100644
index 000000000000..c0f121e90bd3
--- /dev/null
+++ b/net-www/epiphany/epiphany-1.2.7.ebuild
@@ -0,0 +1,60 @@
+# 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.1 2004/08/01 16:16:05 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
+	>=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/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
+
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src
+	# Fixing the nautilus view
+	epatch ${FILESDIR}/${P}-nautilus_view.patch
+}
+
diff --git a/net-www/epiphany/files/digest-epiphany-1.2.7 b/net-www/epiphany/files/digest-epiphany-1.2.7
new file mode 100644
index 000000000000..87b364f3518c
--- /dev/null
+++ b/net-www/epiphany/files/digest-epiphany-1.2.7
@@ -0,0 +1 @@
+MD5 d839a1fb1acbf4d7b129cfdb4276de44 epiphany-1.2.7.tar.bz2 2979301
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
new file mode 100644
index 000000000000..75a2aeed8774
--- /dev/null
+++ b/net-www/epiphany/files/epiphany-1.2.7-nautilus_view.patch
@@ -0,0 +1,23 @@
+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