Fix download dir reset

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

4 files changed, 147 insertions, 7 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index d095bd3b5951..16f1611b37c0 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/epiphany
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.224 2009/12/21 23:11:11 eva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.225 2010/01/11 12:46:41 pacho Exp $
+
+*epiphany-2.26.3-r3 (11 Jan 2010)
+
+  11 Jan 2010; Pacho Ramos <pacho@gentoo.org> +epiphany-2.26.3-r3.ebuild,
+  +files/epiphany-2.26.3-revert-downloadir.patch:
+  Fix download dir reset by preferences dialog, bug 292867
 
 *epiphany-2.28.2 (21 Dec 2009)
 
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index efc305785c8d..b479c26d9c4f 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -8,6 +8,7 @@ AUX epiphany-2.26-fix-sandbox-violations.patch 552 RMD160 a7902ab192b698c2edc79a
 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
 AUX epiphany-2.26.3-favicon-cache.patch 757 RMD160 f138d35b98332a810af559776a798c0deae85f0d SHA1 6b53b73c0ebdd323c1d1f008adab1dcff70248d8 SHA256 71537057738b5e0604214d23d8bb86f888abd1cfbb4606419397c915b132cf00
+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
 DIST epiphany-2.24.3.tar.bz2 5722991 RMD160 d27d511cf9f1cb6b5db94b1c821729c1dfc59b0b SHA1 945d7935273cf341f7c5445b31202ed257cfc9a6 SHA256 cc6ff7b30911bf80d8d72d6db7cc7ecbf51b2f5bb66796b79da33f8f680402ac
 DIST epiphany-2.26.3.tar.bz2 5655997 RMD160 ef2474c8523a6787227d3dfa5e8fc9d443708a0c SHA1 d1143fd2f287efe3eab648e1feded9f4911e3236 SHA256 bc3e79cb0d62c30ef32c7cf9eef563b1de1af60f31729dae43c3795d214880ad
@@ -17,15 +18,16 @@ EBUILD epiphany-2.24.3-r10.ebuild 2410 RMD160 76f47e3085e03ea7519b8d9e08ae545c32
 EBUILD epiphany-2.24.3.ebuild 2756 RMD160 cc01f406e1380d82e10a8df44348cb330d83eef3 SHA1 cb36053f0eb8b124fef19954f8836a490d2212d5 SHA256 f1acd30586027c353982c4298c1704459bcdb9729f133fafd0495ef1dc60b862
 EBUILD epiphany-2.26.3-r1.ebuild 2519 RMD160 04f49d18f90dee88ea90d5eea540451d7765e09d SHA1 1e4d06533f5c25d7665f1bfbe5a8f2d3fdbe95de SHA256 a3d58669e8e8a705952da1a90c17ce79f7f21055f249f462e3a80c33dec49cda
 EBUILD epiphany-2.26.3-r2.ebuild 2627 RMD160 d5b95d1cd9769d64cd59529f93aa90924201f8d9 SHA1 691f2f949890223ef3d67ce28e5b6df3d181f69a SHA256 447b500490b791dab5ef161adf8ecb7ff3295335b1234b13c18eb4c3dc3c6d9e
+EBUILD epiphany-2.26.3-r3.ebuild 2723 RMD160 2a443c8c1303ff0cb2f04066469525919e2524f5 SHA1 76e0cf9342eb11c27157259360add3ef677ec5e7 SHA256 4655c4d6e7d495762c267fd35221c12a7d1b910568976aae7d45d7c55d2646e6
 EBUILD epiphany-2.26.3.ebuild 2245 RMD160 e09d82b971f20470f6bd90efe66b7344edddd42c SHA1 6e98d0403731f52a3cd55cfd5c072eb4dd7f484b SHA256 e5192108d7d4fb407b4d3ac2fccf09792d83db3dd5f13fabad98bc4f5830a7d2
 EBUILD epiphany-2.28.1.ebuild 1627 RMD160 d77a83d5c79eb3619dd02c4274471e3dbe38a617 SHA1 7e016571b024ea506079539736e5fcf9f80e9b99 SHA256 1d1db3e6d75f9e08a28c6af35ef37349abb433e832cc2932ae915626fb70971b
 EBUILD epiphany-2.28.2.ebuild 1627 RMD160 3aeb5f368ad1733e41536cfb7d9d2dc7fc3298e9 SHA1 0520ad80dd6198d0c6a9dec7527b748eda16c980 SHA256 ce566727a3e9d4d4f8bfcc78daf0462321ab1c35944967d82256fc281f6e3903
-MISC ChangeLog 45001 RMD160 1098ffada22cd23eaca1ee15ae86ec6c13b6a41f SHA1 3ceba94773891464a500021b7fb86ff72c6970eb SHA256 f7b77726c3696995cd8b59c53a58f77cf7cbce80fae3e3dcdb2600a239ac6eec
+MISC ChangeLog 45222 RMD160 90b2aa76257e203f9bb82f31dfd19beeb3bb5a25 SHA1 031d87442593ac54a85da48398f5c3cd79f52494 SHA256 e61fa2612a49474e61b584135a61d6c87fa7b5e83bde7eabbdf9157d2653f990
 MISC metadata.xml 276 RMD160 459f04368f1f1341a41c24a487a475b22e878228 SHA1 c296c95eafc63e398d5d203f4eaa26a3826b2b6c SHA256 9e2cf9fb8bee83947d19caa6b4610e82b916daa9f744661f19e4f8138e80490a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkswAJQACgkQ1fmVwcYIWAamXACfYYidPCtrTklBDf9aPGM77QGW
-sAsAoNLV5KmTRYZR3KFKHtU/91XQMWx9
-=Xe08
+iEYEARECAAYFAktLHcIACgkQCaWpQKGI+9Q3jgCfcN574oSgPOEpeDP0mbsr4z/Q
+wxMAmQFUpY9e6vT8uSjFK/JhLVul/qVJ
+=uF2L
 -----END PGP SIGNATURE-----
diff --git a/www-client/epiphany/epiphany-2.26.3-r3.ebuild b/www-client/epiphany/epiphany-2.26.3-r3.ebuild
new file mode 100644
index 000000000000..3f79a716bc11
--- /dev/null
+++ b/www-client/epiphany/epiphany-2.26.3-r3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.26.3-r3.ebuild,v 1.1 2010/01/11 12:46:41 pacho Exp $
+
+EAPI="2"
+
+inherit gnome2 eutils multilib autotools
+
+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 ~ppc64 ~sparc ~x86"
+IUSE="avahi doc networkmanager python spell"
+
+RDEPEND=">=dev-libs/glib-2.18.0
+	>=x11-libs/gtk+-2.16.0
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.7
+	>=gnome-base/libglade-2.3.1
+	>=gnome-base/libgnome-2.14
+	>=gnome-base/libgnomeui-2.14
+	>=gnome-base/gnome-desktop-2.9.91
+	>=x11-libs/startup-notification-0.5
+	>=x11-libs/libnotify-0.4
+	>=media-libs/libcanberra-0.3[gtk]
+	>=dev-libs/dbus-glib-0.71
+	>=gnome-base/gconf-2
+	>=app-text/iso-codes-0.35
+	avahi? ( >=net-dns/avahi-0.6.22 )
+	networkmanager? ( net-misc/networkmanager )
+	=net-libs/xulrunner-1.9*
+	python? (
+		>=dev-lang/python-2.3
+		>=dev-python/pygtk-2.7.1
+		>=dev-python/gnome-python-2.6 )
+	spell? ( app-text/enchant )
+	x11-themes/gnome-icon-theme"
+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 )"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--with-gecko=libxul-embedding
+		--with-distributor-name=Gentoo
+		--enable-canberra
+		$(use_enable avahi zeroconf)
+		$(use_enable networkmanager network-manager)
+		$(use_enable spell spell-checker)
+		$(use_enable python)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix libcanberra automagic support, bug #266232
+	epatch "${FILESDIR}/${PN}-2.26.1-automagic-libcanberra.patch"
+
+	# Fix sandbox violations, bug #263585
+	epatch "${FILESDIR}/${PN}-2.26-fix-sandbox-violations.patch"
+
+	# Fix detection of system plugin, bug #279417
+	epatch "${FILESDIR}/${P}-system-plugin.patch"
+
+	# Fix missing favicons of most web-sites, bug #290024
+	epatch "${FILESDIR}/${P}-favicon-cache.patch"
+
+	# Fix download location reset, bug #292867
+	epatch "${FILESDIR}/${P}-revert-downloadir.patch"
+
+	# Make it libtool-1 compatible
+	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+
+	# All .la files are for plugins or extensions that are dlopened.
+	# Upstream should pass *_la_LIBTOOLFLAGS = --tag=disable-static to drop them instead
+	# but gecko is a dead branch for them, so do it ourselves:
+	find "${D}" -name '*.la' -delete
+}
diff --git a/www-client/epiphany/files/epiphany-2.26.3-revert-downloadir.patch b/www-client/epiphany/files/epiphany-2.26.3-revert-downloadir.patch
new file mode 100644
index 000000000000..b90f667afa04
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-2.26.3-revert-downloadir.patch
@@ -0,0 +1,39 @@
+From: Pacho Ramos <pacho@gentoo.org>
+Date: Wed, 06 Jan 2010 14:17:24 +0000
+Subject: Revert upstream commit 7dbe33b5bfd99ff4ef116f8ccf4777edd8ade788
+(Chdir to / in the factory, so we don't hog any mountpoints.)
+Discussed in:
+https://bugzilla.gnome.org/show_bug.cgi?id=583616
+http://bugs.gentoo.org/show_bug.cgi?id=292867
+---
+--- lib/ephy-file-chooser.c~	2009-05-28 21:26:21.000000000 +0200
++++ lib/ephy-file-chooser.c	2010-01-06 15:13:23.000000000 +0100
+@@ -375,7 +375,6 @@
+ 	 * run.
+ 	 */
+ 
+-        gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), g_get_home_dir ());
+ 
+ 	if (persist_key != NULL)
+ 	{
+--- lib/ephy-file-helpers.c~	2009-05-28 21:26:21.000000000 +0200
++++ lib/ephy-file-helpers.c	2010-01-06 15:14:09.000000000 +0100
+@@ -33,7 +33,6 @@
+ #include "ephy-string.h"
+ 
+ #include <glib.h>
+-#include <glib/gstdio.h>
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
+ #include <gio/gdesktopappinfo.h>
+@@ -264,10 +263,6 @@
+ {
+ 	const char *uuid;
+ 
+-	/* Make sure the server process doesn't hog any mountpoints! */
+-	if (chdir ("/") < 0)
+-		g_warning ("Failed to chdir to /: %s", g_strerror (errno));
+-
+ 	/* See if we've been calling ourself, and abort if we have */
+ 	uuid = g_getenv (EPHY_UUID_ENVVAR);
+ 	if (uuid && strcmp (uuid, EPHY_UUID) == 0)