Declare ability to handle http and https (bug #363189 by Ed Catmur), do not crash when clearing the passwords from prefs dialog, upstream bug #606933. Remove old.

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

11 files changed, 259 insertions, 324 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 4e84253445b2..8be4f121a3f2 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.267 2011/03/22 19:46:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.268 2011/04/12 10:54:45 pacho Exp $
+
+*epiphany-2.30.6-r1 (12 Apr 2011)
+
+  12 Apr 2011; Pacho Ramos <pacho@gentoo.org> -epiphany-2.30.2-r1.ebuild,
+  -files/epiphany-2.30.2-favicons-completion.patch,
+  -files/epiphany-2.30.2-history-embed.patch,
+  -files/epiphany-2.30.2-leave-fullscreen.patch,
+  -files/epiphany-2.30.2-referer-downloads.patch,
+  -files/epiphany-2.30.2-uri-crash.patch, +epiphany-2.30.6-r1.ebuild,
+  +files/epiphany-2.30.6-clearing-passwd.patch,
+  +files/epiphany-2.30.6-mime-handler.patch:
+  Declare ability to handle http and https (bug #363189 by Ed Catmur), do not
+  crash when clearing the passwords from prefs dialog, upstream bug #606933.
+  Remove old.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> epiphany-2.30.6.ebuild:
   Marking epiphany-2.30.6 ppc stable for bug 353436
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 3c8ed51816c9..b9c040331a18 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX epiphany-2.26-fix-sandbox-violations.patch 552 RMD160 a7902ab192b698c2edc79a3ff3b6f2476ec68031 SHA1 1db80a7f829e41d605b50dce6caecb35984a9d57 SHA256 94d66760b1c493093febcc399a0418eb37708da1a3bf1d3bc7c851a527b061f1
 AUX epiphany-2.26.0-xulrunner191.patch 491 RMD160 ae36fd6f67b9afb3c03413bed685f10816ac24d2 SHA1 b5ba78085dcf35677361af9008f3f8998788ddd8 SHA256 3c8804a9004ed27f4f2ad99f4e434d6d4050711d000ce73ce2c0fc8bc0d197df
 AUX epiphany-2.26.1-automagic-libcanberra.patch 1838 RMD160 b98c6a734f240ea000e8938ac690426c904ec37f SHA1 9a782c3c8babf1ae8ac18c2602e0eb2d46b6eb82 SHA256 9cc20da812e7a95e535e905efaedf05720e2e8c1828d644934636ccb05f77fa3
@@ -7,19 +10,22 @@ AUX epiphany-2.26.3-nspr.patch 863 RMD160 abb848bd66e90f2579cee987dee2c8f1294ddd
 AUX epiphany-2.26.3-revert-downloadir.patch 1265 RMD160 50b57adf30a1694d54edc2a97bd44888515808c7 SHA1 a11912e3b21afe3acf78f36c9d5335a30c1401ff SHA256 75bbbfa246978a7d2e691cada632138ec93dc96383331e5b02e468a962c589f1
 AUX epiphany-2.26.3-system-plugin.patch 1180 RMD160 d27462c6d352de40103ee843ddd1eafdccd0a367 SHA1 7d1fa738d302f45715ae2dd4b3546d59055b40ce SHA256 4df1a20abdcd3f1591ba5dad241f96d31d0bca8be91f6a20e7c586748ae949a7
 AUX epiphany-2.26.3-xul192.patch 423 RMD160 1df2ec374ca6ac5de2bc3d90d9161d96c3bbab9c SHA1 0a607b70d38bd8dc10f409f3709dbbedfb1c208a SHA256 71b950ad6539c2703417525594c126e7bd1833b921053fce3d9ac2058e50dbd4
-AUX epiphany-2.30.2-favicons-completion.patch 1878 RMD160 7ac326f90d220e76fff97be3ae8c3f98d6b33005 SHA1 5a20a9f7e22d638170c6caedc8876fce5952a249 SHA256 7b20606b46ca84e473ebd213e18d082fcaeb4599faace5de02cfe2ff50bc7594
-AUX epiphany-2.30.2-history-embed.patch 1961 RMD160 056be338f139a66dafd13ad4e53f799dd8d079c5 SHA1 a3d07e5c8efb68a96ee8449bc2c23e3b69eaabdc SHA256 32b310832eca0e11203dfd16fe3ac49905ccf7e2afe69646c601483632caf9c4
-AUX epiphany-2.30.2-leave-fullscreen.patch 865 RMD160 b8c8cd507da9b08eb68ac14e44abb26b8824ce7c SHA1 c9f01b1f32f6365f2afe143c8f044361fe38bb43 SHA256 9c02a1cf06c647c56d1c7a908b8a559fa4edc0ffccf717d2252a3a8a8b738ef8
-AUX epiphany-2.30.2-referer-downloads.patch 2230 RMD160 3609a8b336310000294fb443ae3c503c545926ae SHA1 ed9eff8c2b910f8f73154d867b76328152608879 SHA256 e6a85dfed6a5a83d559404d3f8ffcf6319a48a314b037b763e82684f8aad1122
-AUX epiphany-2.30.2-uri-crash.patch 782 RMD160 b5db55676c1c67582c8cfaad4f53cc19871e3f2c SHA1 4bf980a33f8864bd95ca83bd782e8edf661ab004 SHA256 3fa84fbaeaded14dae97be0c03cc1e42e85439259515bd4614b0452f5c52c3f4
+AUX epiphany-2.30.6-clearing-passwd.patch 3920 RMD160 cf0bd2480672bffef819c4ab276b86b5063277f0 SHA1 bb387af0a09f494dce4e24a387f29a02bed01178 SHA256 3b6fb2e532be75938f80e74e7559c02f81ae512cccb2e6aff9a37fbe5288d94e
 AUX epiphany-2.30.6-dbus-fix.patch 581 RMD160 52802eb04e3a98946913624fcc72740bebde366f SHA1 bf448d233392474b88db51a126e1b313ce744fa5 SHA256 6a0d826767eeed02300b612e16af99a8f3840ce1f754d437a1ddd8da9d254e95
 AUX epiphany-2.30.6-introspection-prefix.patch 710 RMD160 54c07f6d720310058bcbfcb36a968c1950e69455 SHA1 a5a8d616e3e82b5574dfbd97e2b9cd6afe7389e6 SHA256 19f273f7e193c27d667f0b65443a5fe33b67b1d25a3af14eab0a81c5ea5cdda1
 AUX epiphany-2.30.6-libnotify-0.7.patch 1048 RMD160 3607af827a5732561f2e89d9065f3549e14fcdb0 SHA1 2257b0ecd8916657402374265936706e42a1c9c6 SHA256 c1a59a9df78db07c2cf23d47d881d8d4edf6e55af3d655f8ec9870adf9255390
+AUX epiphany-2.30.6-mime-handler.patch 844 RMD160 ffb3e2295084184bd4cb623f48d94cb7de26e083 SHA1 b8c171d993ddeae3be517e06c465ac0b680df9c7 SHA256 768a092f315c905f18c554616a07eb5595c7d512289c280ea435ea482f0820aa
 DIST epiphany-2.26.3.tar.bz2 5655997 RMD160 ef2474c8523a6787227d3dfa5e8fc9d443708a0c SHA1 d1143fd2f287efe3eab648e1feded9f4911e3236 SHA256 bc3e79cb0d62c30ef32c7cf9eef563b1de1af60f31729dae43c3795d214880ad
-DIST epiphany-2.30.2.tar.bz2 5881032 RMD160 c0bb5e1a14ccbe72531cbf3f0f416c5172437a86 SHA1 76b55e002131ffc00f5b1f244d77e2b75e3fcf1b SHA256 cd0124e71e72142593cfeb442d58d97e99ba94ace6e31d94717fe977c0bfb98a
 DIST epiphany-2.30.6.tar.bz2 5927938 RMD160 60f2c7d699dd8728dc79cce012475972943c4007 SHA1 a4bde975f9b2b97d6aad14b4b8a715b40d19a155 SHA256 278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc
 EBUILD epiphany-2.26.3-r4.ebuild 3360 RMD160 d72d8f06cba5529e69add1c09e7cb3a7dc37f7c1 SHA1 84fa5041c9fcd2bbdf0ac5bced17bb31d38673c3 SHA256 6336af83e310010874276fe2b8a4c8321c2ef818662a1d76d2acb4d090596468
-EBUILD epiphany-2.30.2-r1.ebuild 2451 RMD160 d1e9a80f4d288dcba907114fe52b257e8f2b1f98 SHA1 399aec7725d983a8f608247be3ae8d73e3c34554 SHA256 885184ae0a6cca1892b09d3dcec727772b5915a077b21e165eb7b99507424b81
+EBUILD epiphany-2.30.6-r1.ebuild 2554 RMD160 baa3e97e58385a7ae5ab8caa3709ee8b9d0e7f74 SHA1 21c9c79ff23b77f7459389ae1d3738516e523f3c SHA256 26aa476a33829fa4ccb533f1b6d305dbc44b75fb8a24fcd1277f8e7efb322e9d
 EBUILD epiphany-2.30.6.ebuild 2363 RMD160 4bde1923ba236d8f72337c8100965b49c7c5933f SHA1 dbd5b423c96cc1f8ec61989baa42214cafeb13e3 SHA256 2f01cbbad99c056439a90e10d7774f4a12c5bdd9a253d4938cbd4e96a8126c33
-MISC ChangeLog 52119 RMD160 ee11f3b18885115632bdf2b0715c249e2c22a69a SHA1 60457f0b0b9e3d5373c748393d4fc9616dc4456b SHA256 b221e504b83b0ec9f1c7b88443f33b81eb1a08f4b93324ee9499ca9cc2074be9
+MISC ChangeLog 52757 RMD160 7ce30fec85757e267512763bb11af6c663148c9e SHA1 2bf64aca9a3105b36733d7671d90d3fb7ed0716a SHA256 cca13baca042b7c93ea81e681d525bc6cee8859e08ed022d4e328dc58285a9a0
 MISC metadata.xml 375 RMD160 4b38d1fe16a065d10967f7f17d768dc02bf1fae8 SHA1 96a760f61a9e0bb73120bb75a53b2247b84e9f14 SHA256 34a7f30e213476622090d9d1cbbe640a48f365d7e418686d6c855006b9db14f9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2kL3sACgkQCaWpQKGI+9Rz4gCfTV8fcJaC04MLs5qUf4rJGOa6
+w5cAn2gVt6+Z6RBkqp1WHPTA1tdpcXpN
+=fqtu
+-----END PGP SIGNATURE-----
diff --git a/www-client/epiphany/epiphany-2.30.2-r1.ebuild b/www-client/epiphany/epiphany-2.30.2-r1.ebuild
deleted file mode 100644
index 279c61d38f22..000000000000
--- a/www-client/epiphany/epiphany-2.30.2-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.2-r1.ebuild,v 1.10 2011/03/20 22:21:20 nirbheek Exp $
-
-EAPI="2"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-
-# We are not ready for introspection yet
-IUSE="avahi doc networkmanager +nss test"
-
-# TODO: add seed support
-RDEPEND=">=dev-libs/glib-2.19.7:2
-	>=x11-libs/gtk+-2.19.5:2
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-libs/libxslt-1.1.7
-	>=x11-libs/startup-notification-0.5
-	>=x11-libs/libnotify-0.4
-	<x11-libs/libnotify-0.7
-	>=dev-libs/dbus-glib-0.71
-	>=gnome-base/gconf-2:2
-	>=app-text/iso-codes-0.35
-	>=net-libs/webkit-gtk-1.1.22:2
-	>=net-libs/libsoup-gnome-2.29.91:2.4
-	>=gnome-base/gnome-keyring-2.26.0
-
-	x11-libs/libICE
-	x11-libs/libSM
-
-	avahi? ( >=net-dns/avahi-0.6.22 )
-	networkmanager? ( net-misc/networkmanager )
-	nss? ( dev-libs/nss )
-	x11-themes/gnome-icon-theme"
-#       introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	>=app-text/gnome-doc-utils-0.3.2
-	gnome-base/gnome-common
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-introspection
-		--disable-scrollkeeper
-		--disable-maintainer-mode
-		--with-distributor-name=Gentoo
-		$(use_enable avahi zeroconf)
-		$(use_enable networkmanager network-manager)
-		$(use_enable nss)
-		$(use_enable test tests)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# ephy-toolbar: fix leave-fullscreen item visibility
-	epatch "${FILESDIR}/${P}-leave-fullscreen.patch"
-
-	# Send 'Referer' on headers sent for context menu HTTP downloads
-	epatch "${FILESDIR}/${P}-referer-downloads.patch"
-
-	# ephy-location-entry: reenable favicons in completion
-	epatch "${FILESDIR}/${P}-favicons-completion.patch"
-
-	# Allow not copying history when creating a new embed
-	epatch "${FILESDIR}/${P}-history-embed.patch"
-
-	# Fix crash when trying to load URIs with no path
-	epatch "${FILESDIR}/${P}-uri-crash.patch"
-}
-
-src_compile() {
-	# Fix sandbox error with USE="introspection" and "doc"
-	# https://bugs.webkit.org/show_bug.cgi?id=35471
-	addpredict "$(unset HOME; echo ~)/.local"
-	emake || die "Compile failed"
-}
diff --git a/www-client/epiphany/epiphany-2.30.6-r1.ebuild b/www-client/epiphany/epiphany-2.30.6-r1.ebuild
new file mode 100644
index 000000000000..71f069990fd6
--- /dev/null
+++ b/www-client/epiphany/epiphany-2.30.6-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.6-r1.ebuild,v 1.1 2011/04/12 10:54:45 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+
+inherit eutils gnome2 autotools
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="http://projects.gnome.org/epiphany/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="avahi doc +introspection networkmanager +nss test"
+
+# TODO: add seed support
+RDEPEND=">=dev-libs/glib-2.19.7:2
+	>=x11-libs/gtk+-2.19.5:2[introspection?]
+	>=dev-libs/libxml2-2.6.12:2
+	>=dev-libs/libxslt-1.1.7
+	>=x11-libs/startup-notification-0.5
+	>=x11-libs/libnotify-0.4
+	>=dev-libs/dbus-glib-0.71
+	>=gnome-base/gconf-2:2
+	>=app-text/iso-codes-0.35
+	>=net-libs/webkit-gtk-1.2.3:2[introspection?]
+	>=net-libs/libsoup-gnome-2.29.91:2.4
+	>=gnome-base/gnome-keyring-2.26
+
+	x11-libs/libICE
+	x11-libs/libSM
+
+	app-misc/ca-certificates
+	x11-themes/gnome-icon-theme
+
+	avahi? ( >=net-dns/avahi-0.6.22 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+	networkmanager? ( net-misc/networkmanager )
+	nss? ( dev-libs/nss )"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40
+	>=app-text/gnome-doc-utils-0.3.2
+	doc? ( >=dev-util/gtk-doc-1 )
+	gnome-base/gnome-common"
+# eautoreconf needs:
+#	gnome-base/gnome-common
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--disable-maintainer-mode
+		--with-distributor-name=Gentoo
+		$(use_enable avahi zeroconf)
+		$(use_enable introspection)
+		$(use_enable networkmanager network-manager)
+		$(use_enable nss)
+		$(use_enable test tests)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+
+	# introspection: Fix build by telling g-ir-scanner what the prefix is
+	epatch "${FILESDIR}"/${P}-introspection-prefix.patch
+
+	# DBUS_LIBS is needed for libephymain.la
+	epatch "${FILESDIR}"/${P}-dbus-fix.patch
+
+	# Declare ability to handle http and https
+	epatch "${FILESDIR}"/${P}-mime-handler.patch
+
+	# Do not crash when clearing the passwords from prefs dialog, upstream bug #606933
+	epatch "${FILESDIR}"/${P}-clearing-passwd.patch
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+src_compile() {
+	# Fix sandbox error with USE="introspection" and "doc"
+	# https://bugs.webkit.org/show_bug.cgi?id=35471
+	addpredict "$(unset HOME; echo ~)/.local"
+	gnome2_src_compile
+}
diff --git a/www-client/epiphany/files/epiphany-2.30.2-favicons-completion.patch b/www-client/epiphany/files/epiphany-2.30.2-favicons-completion.patch
deleted file mode 100644
index 21b21f70289e..000000000000
--- a/www-client/epiphany/files/epiphany-2.30.2-favicons-completion.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0739487127652cf544257e7a0d48caa580f98ad2 Mon Sep 17 00:00:00 2001
-From: Diego Escalante Urrelo <descalante@igalia.com>
-Date: Tue, 20 Apr 2010 22:18:12 +0000
-Subject: ephy-location-entry: reenable favicons in completion
-
-Favicons in the completion popup were hidden because of an ugly flashing. It
-turns out it is caused by gtk_entry_set_icon_from_* functions. They queue a
-resize if the GtkEntry is visible, hence we see this ugly flash which is
-actually the completion obeying to the resize.
-
-The side effect is that when you start typying a new address in the location
-entry, the favicon of the current location will still be displayed. The
-previous behaviour was to set a 'text/html' icon when the user edited the
-location entry. Note that such icon will disappear as soon as you activate the
-location entry.
-
-Bug #616345
----
-diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
-index cf34789..1f03810 100644
---- a/lib/widgets/ephy-location-entry.c
-+++ b/lib/widgets/ephy-location-entry.c
-@@ -466,8 +466,6 @@ editable_changed_cb (GtkEditable *editable,
- 		g_regex_unref (quote_regex);
- 	}
- 
--	update_favicon (entry);
--
- 	g_signal_emit (entry, signals[USER_CHANGED], 0);
- }
- 
-@@ -1253,16 +1251,11 @@ ephy_location_entry_set_completion (EphyLocationEntry *entry,
- 	g_signal_connect_after (completion, "action-activated",
- 				G_CALLBACK (action_activated_after_cb), entry);
- 
--	/* FIXME: this works fine, but the favicons seem to be
--	 * added-removed the view constantly, and the visual effect is
--	 * very ugly */
--#if 0
- 	cell = gtk_cell_renderer_pixbuf_new ();
- 	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (completion),
- 				    cell, FALSE);
- 	gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (completion),
- 				       cell, "pixbuf", favicon_col);
--#endif
- 
- 	cell = gtk_cell_renderer_text_new ();
- 	g_object_set (cell,
---
-cgit v0.8.3.1
diff --git a/www-client/epiphany/files/epiphany-2.30.2-history-embed.patch b/www-client/epiphany/files/epiphany-2.30.2-history-embed.patch
deleted file mode 100644
index 038109fdbff3..000000000000
--- a/www-client/epiphany/files/epiphany-2.30.2-history-embed.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From be3c8f50cefef8ea3f34854c0254b3bdaa851958 Mon Sep 17 00:00:00 2001
-From: Mario Sanchez Prada <msanchez@igalia.com>
-Date: Tue, 20 Apr 2010 20:15:25 +0000
-Subject: Allow not copying history when creating a new embed
-
-Just added a new flag and check it before copying the history
-
-Bug #611400
-
-Signed-off-by: Xan Lopez <xan@gnome.org>
----
-diff --git a/src/ephy-shell.c b/src/ephy-shell.c
-index e276731..fc4caf9 100644
---- a/src/ephy-shell.c
-+++ b/src/ephy-shell.c
-@@ -435,6 +435,7 @@ ephy_shell_new_tab_full (EphyShell *shell,
- 	gboolean open_page = FALSE;
- 	gboolean jump_to;
- 	gboolean active_is_blank = FALSE;
-+	gboolean copy_history = TRUE;
- 	GtkWidget *nb;
- 	int position = -1;
- 	gboolean is_empty = FALSE;
-@@ -443,6 +444,7 @@ ephy_shell_new_tab_full (EphyShell *shell,
- 	if (flags & EPHY_NEW_TAB_OPEN_PAGE) open_page = TRUE;
- 	if (flags & EPHY_NEW_TAB_IN_NEW_WINDOW) in_new_window = TRUE;
- 	if (flags & EPHY_NEW_TAB_IN_EXISTING_WINDOW) in_new_window = FALSE;
-+	if (flags & EPHY_NEW_TAB_DONT_COPY_HISTORY) copy_history = FALSE;
- 
- 	in_new_window = in_new_window && !eel_gconf_get_boolean (CONF_LOCKDOWN_FULLSCREEN);
- 	g_return_val_if_fail (open_page == (gboolean)(request != NULL), NULL);
-@@ -493,11 +495,11 @@ ephy_shell_new_tab_full (EphyShell *shell,
- 		ephy_embed_container_add_child (EPHY_EMBED_CONTAINER (window), embed, position, jump_to);
- 	}
- 
--	if (previous_embed != NULL)
--	{	
-+	if (copy_history && previous_embed != NULL)
-+	{
- 		ephy_web_view_copy_back_history (ephy_embed_get_web_view (previous_embed),
- 						 ephy_embed_get_web_view (embed));
--	}		
-+	}
- 
- 	ephy_gui_window_update_user_time (GTK_WIDGET (window), user_time);
- 
-diff --git a/src/ephy-shell.h b/src/ephy-shell.h
-index c87a43b..895c91d 100644
---- a/src/ephy-shell.h
-+++ b/src/ephy-shell.h
-@@ -69,6 +69,7 @@ typedef enum
- 
- 	/* The way to load */
- 	EPHY_NEW_TAB_FROM_EXTERNAL      = 1 << 12,
-+	EPHY_NEW_TAB_DONT_COPY_HISTORY  = 1 << 13,
- 	
- } EphyNewTabFlags;
- 
---
-cgit v0.8.3.1
diff --git a/www-client/epiphany/files/epiphany-2.30.2-leave-fullscreen.patch b/www-client/epiphany/files/epiphany-2.30.2-leave-fullscreen.patch
deleted file mode 100644
index a8ff7972c24f..000000000000
--- a/www-client/epiphany/files/epiphany-2.30.2-leave-fullscreen.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7f5202b49a8015bc09faa6e10c9f78c3e97ab83b Mon Sep 17 00:00:00 2001
-From: Diego Escalante Urrelo <descalante@igalia.com>
-Date: Mon, 01 Mar 2010 03:05:43 +0000
-Subject: ephy-toolbar: fix leave-fullscreen item visibility
-
-We were explicitely setting the separator and toolbar visibility but not the
-exit_button item. This meant the fixed_toolbar was shown but the exit_button
-remained hidden.
-
-Bug #611445
----
-diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c
-index a721831..9bb1e61 100644
---- a/src/ephy-toolbar.c
-+++ b/src/ephy-toolbar.c
-@@ -135,6 +135,7 @@ ephy_toolbar_update_fixed_visibility (EphyToolbar *toolbar)
- 
- 	show = priv->leave_fullscreen_visible;
- 	g_object_set (priv->sep_item, "visible", show, NULL);
-+	g_object_set (priv->exit_button, "visible", show, NULL);
- 	g_object_set (priv->fixed_toolbar, "visible", show, NULL);
- }
- 
---
-cgit v0.8.3.1
diff --git a/www-client/epiphany/files/epiphany-2.30.2-referer-downloads.patch b/www-client/epiphany/files/epiphany-2.30.2-referer-downloads.patch
deleted file mode 100644
index aaf70484e39c..000000000000
--- a/www-client/epiphany/files/epiphany-2.30.2-referer-downloads.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From b30cf3d0e24c51b0f77979af49f200bbac5bd050 Mon Sep 17 00:00:00 2001
-From: Mario Sanchez Prada <msanchez@igalia.com>
-Date: Wed, 14 Apr 2010 16:06:36 +0000
-Subject: Send 'Referer' on headers sent for context menu HTTP downloads
-
-Make sure the EphyEmbedPersist object is created specifying the
-EphyEmbed object, and create the network request inside of it
-using the URL from the associated web view as 'Referer'
-
-Bug #136292
-
-Signed-off-by: Xan Lopez <xan@gnome.org>
----
-diff --git a/embed/ephy-embed-persist.c b/embed/ephy-embed-persist.c
-index 44910fe..8ee3df3 100644
---- a/embed/ephy-embed-persist.c
-+++ b/embed/ephy-embed-persist.c
-@@ -763,7 +763,36 @@ ephy_embed_persist_save (EphyEmbedPersist *persist)
- 	 */
- 	g_object_ref (persist);
- 
--	request = webkit_network_request_new (priv->source);
-+	if (priv->embed)
-+	{
-+		EphyWebView *web_view;
-+		SoupMessage *msg;
-+		gchar *referer;
-+
-+		/* Get the webview associated to the embed */
-+		web_view = ephy_embed_get_web_view (priv->embed);
-+
-+		/* Create the request with a SoupMessage to allow
-+		   setting the 'Referer' as got from the embed */
-+		msg = soup_message_new (SOUP_METHOD_GET, priv->source);
-+		request = WEBKIT_NETWORK_REQUEST (
-+			g_object_new (WEBKIT_TYPE_NETWORK_REQUEST,
-+				      "message", msg,
-+				      NULL));
-+
-+		/* Add the referer to the request headers */
-+		referer = ephy_web_view_get_location (web_view, FALSE);
-+		soup_message_headers_append (msg->request_headers,
-+					     "Referer", referer);
-+		g_free (referer);
-+		g_object_unref (msg);
-+	}
-+	else
-+	{
-+		/* Create a normal network request otherwise */
-+		request = webkit_network_request_new (priv->source);
-+	}
-+
- 	priv->download = webkit_download_new (request);
- 	g_object_unref (request);
- 
-diff --git a/src/popup-commands.c b/src/popup-commands.c
-index 8930d83..c620d08 100644
---- a/src/popup-commands.c
-+++ b/src/popup-commands.c
-@@ -237,6 +237,7 @@ save_property_url (GtkAction *action,
- 	ephy_embed_persist_set_persist_key
- 		(persist, CONF_STATE_SAVE_DIR);
- 	ephy_embed_persist_set_source (persist, location);
-+	ephy_embed_persist_set_embed (persist, embed);
- 
- 	g_signal_connect (persist, "completed",
- 			  G_CALLBACK (save_property_url_completed_cb), NULL);
---
-cgit v0.8.3.1
diff --git a/www-client/epiphany/files/epiphany-2.30.2-uri-crash.patch b/www-client/epiphany/files/epiphany-2.30.2-uri-crash.patch
deleted file mode 100644
index 21ac4762d7fe..000000000000
--- a/www-client/epiphany/files/epiphany-2.30.2-uri-crash.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 6a4715b8a9df0bc16394c890cd734bc0601bfd03 Mon Sep 17 00:00:00 2001
-From: Gustavo Noronha Silva <gns@gnome.org>
-Date: Mon, 17 May 2010 15:17:46 +0000
-Subject: Fix crash when trying to load URIs with no path
-
-Trying to load file:, for instance, will crash Epiphany. This commit
-fixes this. See http://bugs.debian.org/554595.
----
-diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
-index 2e08480..d8604cb 100644
---- a/embed/ephy-web-view.c
-+++ b/embed/ephy-web-view.c
-@@ -2688,7 +2688,7 @@ ephy_web_view_can_go_up (EphyWebView *view)
-     return FALSE;
-   }
- 
--  result = (uri->fragment || uri->query || strlen (uri->path) > 1);
-+  result = uri->fragment || uri->query || (uri->path && (strlen (uri->path) > 1));
-   soup_uri_free (uri);
- 
-   return result;
---
-cgit v0.8.3.1
diff --git a/www-client/epiphany/files/epiphany-2.30.6-clearing-passwd.patch b/www-client/epiphany/files/epiphany-2.30.6-clearing-passwd.patch
new file mode 100644
index 000000000000..e4bee1ea1c22
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-2.30.6-clearing-passwd.patch
@@ -0,0 +1,118 @@
+From: Artur Rona <ari-tczew@ubuntu.com>
+Description: Do not crash when clearing the passwords from prefs dialog.
+ The code (wrongly) assumed we could only be called from withing the PDM dialog. Do some refactoring to make it more generic.
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=606933
+Bug-Ubuntu: https://launchpad.net/bugs/562538
+Origin: upstream, http://git.gnome.org/browse/epiphany/commit/?id=479f0a9a7ec095a8457e7d5b70695207e81f40c6
+Author: Xan Lopez <xan@gnome.org>
+
+diff -pruN -x '*~' epiphany-2.30.2.orig/src/pdm-dialog.c epiphany-2.30.2/src/pdm-dialog.c
+--- epiphany-2.30.2.orig/src/pdm-dialog.c	2010-01-08 19:21:01.000000000 +0100
++++ epiphany-2.30.2/src/pdm-dialog.c	2010-10-05 00:09:58.000000000 +0200
+@@ -224,27 +224,44 @@ clear_all_cookies (SoupCookieJar *jar)
+ }
+ 
+ static void
+-pdm_dialog_password_remove_cb (GnomeKeyringResult result,
++get_info_full_cb (GnomeKeyringResult result,
++		  GnomeKeyringItemInfo *info,
++		  gpointer data)
++{
++	if (result != GNOME_KEYRING_RESULT_OK)
++		return;
++
++	if (gnome_keyring_item_info_get_type (info) == GNOME_KEYRING_ITEM_NETWORK_PASSWORD)
++		gnome_keyring_item_delete (GNOME_KEYRING_DEFAULT,
++					   GPOINTER_TO_UINT (data),
++					   NULL, NULL, NULL);
++}
++
++static void
++got_network_passwords_list_cb (GnomeKeyringResult result,
++			       GList *list,
+ 			       gpointer data)
+ {
+-	GtkTreeRowReference *rowref = (GtkTreeRowReference *)data;
++	GList *l;
+ 
+-	if (result == GNOME_KEYRING_RESULT_OK) {
+-		GtkTreeIter iter;
+-		GtkTreePath *path;
+-		GtkTreeModel *model;
+-
+-		if (!gtk_tree_row_reference_valid (rowref))
+-			return;
+-
+-		path = gtk_tree_row_reference_get_path (rowref);
+-		model = gtk_tree_row_reference_get_model (rowref);
+-
+-		if (path != NULL && gtk_tree_model_get_iter (model, &iter, path)) {
+-			gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+-			gtk_tree_path_free (path);
+-		}
+-	}
++	if (result != GNOME_KEYRING_RESULT_OK)
++		return;
++
++	for (l = list; l != NULL; l = l->next)
++		gnome_keyring_item_get_info_full (GNOME_KEYRING_DEFAULT,
++						  GPOINTER_TO_UINT (l->data),
++						  GNOME_KEYRING_ITEM_INFO_BASICS,
++						  (GnomeKeyringOperationGetItemInfoCallback) get_info_full_cb,
++						  l->data,
++						  NULL);
++}
++
++static void
++_ephy_pdm_delete_all_passwords ()
++{
++	gnome_keyring_list_item_ids (GNOME_KEYRING_DEFAULT,
++				     got_network_passwords_list_cb,
++				     NULL, NULL);
+ }
+ 
+ static void
+@@ -282,35 +299,15 @@ clear_all_dialog_response_cb (GtkDialog
+ 		if (gtk_toggle_button_get_active
+ 			(GTK_TOGGLE_BUTTON (checkbuttons->checkbutton_passwords)))
+ 		{
+-			GtkTreeIter iter;
+-			PdmDialog *pdialog = EPHY_PDM_DIALOG (checkbuttons->dialog);
+-			PdmActionInfo *pinfo = pdialog->priv->passwords;
+-
+-			gboolean valid = gtk_tree_model_get_iter_first (pinfo->model, &iter);
+-
+-			while (valid) {
+-				GtkTreePath *path;
+-				EphyPasswordInfo *info;
+-				GtkTreeRowReference *row;
+-
+-				path = gtk_tree_model_get_path (pinfo->model, &iter);
+-				row = gtk_tree_row_reference_new (pinfo->model, path);
+-
+-				gtk_tree_model_get (pinfo->model, &iter,
+-						    COL_PASSWORDS_DATA, &info,
+-						    -1);
+-
+-				gnome_keyring_item_delete (GNOME_KEYRING_DEFAULT,
+-							   info->keyring_id,
+-							   (GnomeKeyringOperationDoneCallback) pdm_dialog_password_remove_cb,
+-							   row,
+-							   (GDestroyNotify) gtk_tree_row_reference_free);
+-
+-				valid = gtk_tree_model_iter_next (pinfo->model, &iter);
+-
+-				g_slice_free (EphyPasswordInfo, info);
+-				gtk_tree_path_free (path);
++			/* Clear UI if we are the PDM dialog */
++			if (EPHY_IS_PDM_DIALOG (checkbuttons->dialog))
++			{
++				PdmDialog *pdialog = EPHY_PDM_DIALOG (checkbuttons->dialog);
++				PdmActionInfo *pinfo = pdialog->priv->passwords;
++				gtk_list_store_clear (GTK_LIST_STORE (pinfo->model));
+ 			}
++
++			_ephy_pdm_delete_all_passwords ();
+ 		}
+ 		if (gtk_toggle_button_get_active
+ 			(GTK_TOGGLE_BUTTON (checkbuttons->checkbutton_cache)))
diff --git a/www-client/epiphany/files/epiphany-2.30.6-mime-handler.patch b/www-client/epiphany/files/epiphany-2.30.6-mime-handler.patch
new file mode 100644
index 000000000000..e2b51f81466a
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-2.30.6-mime-handler.patch
@@ -0,0 +1,22 @@
+From 6375ebd3361a02e6c996140b33979fc1061ef734 Mon Sep 17 00:00:00 2001
+From: Diego Escalante Urrelo <descalante@igalia.com>
+Date: Sun, 10 Oct 2010 19:28:24 -0500
+Subject: [PATCH] epiphany.desktop: declare ability to handle http and https
+
+Bug #631450
+---
+ data/epiphany.desktop.in.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/data/epiphany.desktop.in.in b/data/epiphany.desktop.in.in
+index 1c93f4c..fdf5ffe 100644
+--- a/data/epiphany.desktop.in.in
++++ b/data/epiphany.desktop.in.in
+@@ -13,4 +13,4 @@ X-GNOME-Bugzilla-Product=epiphany
+ X-GNOME-Bugzilla-Component=BugBuddyBugs
+ X-GNOME-Bugzilla-Version=@VERSION@
+ Categories=Network;GNOME;GTK;WebBrowser;
+-MimeType=text/html;text/xml;application/xhtml+xml;
++MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;
+-- 
+1.7.1