Pull upstream fix for deleting symlinks across mountpoints. bug 89104

(Portage version: 2.0.53_rc7)

5 files changed, 137 insertions, 25 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 92bdb8b82638..ad73e6dc45c8 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.158 2005/10/17 13:11:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.159 2005/11/01 19:40:11 dang Exp $
+
+*nautilus-2.12.1-r1 (01 Nov 2005)
+
+  01 Nov 2005; <dang@gentoo.org> +files/nautilus-2.12.1-symlink-del.patch,
+  +nautilus-2.12.1-r1.ebuild:
+  Pull upstream fix for deleting symlinks across mountpoints. bug 89104
 
   17 Oct 2005; Aron Griffis <agriffis@gentoo.org> nautilus-2.10.1-r1.ebuild:
   Mark 2.10.1-r1 stable on alpha
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index a3e0ed62e15f..16939531546d 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,30 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 30e03d96ad901727aced906beb36baf6 nautilus-2.10.1-r1.ebuild 2557
 MD5 f0646b9e3a3d9b21fa6322daadb35b51 ChangeLog 21109
-MD5 00c95b6b319c4650c8e666dbe2354c7a nautilus-1.0.6-r9.ebuild 3398
-MD5 c0ed9135a2a082d9b804280bbbf62c57 nautilus-2.10.0.ebuild 2587
-MD5 a9bdda3fc643e7b3bb31396f58678770 nautilus-2.12.1.ebuild 2202
-MD5 889a29f6bea75973eafb3d64a1801a5f files/nautilus-2.10.1-deselect.patch 802
-MD5 47ad4a802bbd17967708599cda1b7aaf files/nautilus-1.0.6-mozilla-1.0_rc1.diff 920
-MD5 d7ad0d83dbafefa25a34a50e2ee34806 files/nautilus-1.0.6-mozilla-1.0_rc3.diff 1709
-MD5 76cc1af40c4dc75ce99179ae9b25a2cd files/nautilus-2.9.90-icon_view_gst.patch 8136
+MD5 3db7f854e279f4032b8d1e86d64157aa files/digest-nautilus-1.0.6-r9 68
 MD5 d3f1a79cced5768f96e22c17df92261b files/digest-nautilus-2.10.0 69
 MD5 567191aa3b9ef17acb8e3b0ba006afdf files/digest-nautilus-2.10.1-r1 69
-MD5 4c62404b0162ab39572cb522fed222c4 files/nautilus-1.0.6-hyperbola.diff 1632
 MD5 62b04598faf13b6c5ca417651b88d000 files/digest-nautilus-2.12.1 69
-MD5 48ff9ab600b9230470a12bb5b60ff68f files/nautilus-2.11.91-icon_view_gst.patch 8321
-MD5 ddc1abbf275436c7fa5fd5c04a27cc94 files/nautilus-1.0.6-mozilla-embed-1.0_rc3.diff 526
-MD5 29bf62fc0e7eaa6cd6aa5cf4e2dd291d files/nautilus-2.10.1-font_sizes.patch 1532
-MD5 3db7f854e279f4032b8d1e86d64157aa files/digest-nautilus-1.0.6-r9 68
+MD5 62b04598faf13b6c5ca417651b88d000 files/digest-nautilus-2.12.1-r1 69
 MD5 7cb2f285f24e86a90c6a65b0b9356d39 files/macros/gnome.m4 16426
 MD5 486b971d706aec59655a72282d3feb0b files/macros/nautilus-macros.m4 7993
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDU6MeJrHF4yAQTrARAv3FAKCGvIHzsTfALVcRplMFBI0EP/kCLQCfYPKd
-lxzP3FL2azdKaUUZRpTvcnc=
-=kx7S
------END PGP SIGNATURE-----
+MD5 4c62404b0162ab39572cb522fed222c4 files/nautilus-1.0.6-hyperbola.diff 1632
+MD5 47ad4a802bbd17967708599cda1b7aaf files/nautilus-1.0.6-mozilla-1.0_rc1.diff 920
+MD5 d7ad0d83dbafefa25a34a50e2ee34806 files/nautilus-1.0.6-mozilla-1.0_rc3.diff 1709
+MD5 ddc1abbf275436c7fa5fd5c04a27cc94 files/nautilus-1.0.6-mozilla-embed-1.0_rc3.diff 526
+MD5 889a29f6bea75973eafb3d64a1801a5f files/nautilus-2.10.1-deselect.patch 802
+MD5 29bf62fc0e7eaa6cd6aa5cf4e2dd291d files/nautilus-2.10.1-font_sizes.patch 1532
+MD5 48ff9ab600b9230470a12bb5b60ff68f files/nautilus-2.11.91-icon_view_gst.patch 8321
+MD5 6656801883a1b7be0c2f4f5b660c84c3 files/nautilus-2.12.1-symlink-del.patch 1906
+MD5 76cc1af40c4dc75ce99179ae9b25a2cd files/nautilus-2.9.90-icon_view_gst.patch 8136
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 00c95b6b319c4650c8e666dbe2354c7a nautilus-1.0.6-r9.ebuild 3398
+MD5 c0ed9135a2a082d9b804280bbbf62c57 nautilus-2.10.0.ebuild 2587
+MD5 30e03d96ad901727aced906beb36baf6 nautilus-2.10.1-r1.ebuild 2557
+MD5 f9ce2a30657717d6570086bf9cccafea nautilus-2.12.1-r1.ebuild 1844
+MD5 a9bdda3fc643e7b3bb31396f58678770 nautilus-2.12.1.ebuild 2202
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.12.1-r1 b/gnome-base/nautilus/files/digest-nautilus-2.12.1-r1
new file mode 100644
index 000000000000..2890f00a821a
--- /dev/null
+++ b/gnome-base/nautilus/files/digest-nautilus-2.12.1-r1
@@ -0,0 +1 @@
+MD5 61878b1c3f9bee37cd568e17b31d66b1 nautilus-2.12.1.tar.bz2 4056062
diff --git a/gnome-base/nautilus/files/nautilus-2.12.1-symlink-del.patch b/gnome-base/nautilus/files/nautilus-2.12.1-symlink-del.patch
new file mode 100644
index 000000000000..0bcae043dedd
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.12.1-symlink-del.patch
@@ -0,0 +1,42 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN nautilus-2.12.1.orig/libnautilus-private/nautilus-file-operations.c nautilus-2.12.1/libnautilus-private/nautilus-file-operations.c
+--- nautilus-2.12.1.orig/libnautilus-private/nautilus-file-operations.c	2005-09-26 11:30:05.000000000 -0400
++++ nautilus-2.12.1/libnautilus-private/nautilus-file-operations.c	2005-11-01 13:51:50.000000000 -0500
+@@ -1858,17 +1858,31 @@
+ 		source_dir_uri = gnome_vfs_uri_get_parent (source_uri);
+ 		target_uri = NULL;
+ 		if (target_dir != NULL) {
++			GnomeVFSURI *trash_find_uri;
++
+ 			if (target_is_trash) {
+-				result = gnome_vfs_find_directory (source_uri, GNOME_VFS_DIRECTORY_KIND_TRASH,
++				/* source_uri may be a symlink, which is resolved when finding the trash directory.
++				 * Therefore, we use its parent dir if available */
++				trash_find_uri = source_dir_uri != NULL ? source_dir_uri : source_uri;
++				g_assert (trash_find_uri != NULL);
++
++				result = gnome_vfs_find_directory (trash_find_uri,
++								   GNOME_VFS_DIRECTORY_KIND_TRASH,
+ 								   &target_dir_uri, FALSE, FALSE, 0777);
+-				if (result == GNOME_VFS_ERROR_NOT_FOUND && source_dir_uri != NULL) {
+-					/* source_uri may be a broken symlink */
+-					result = gnome_vfs_find_directory (source_dir_uri, GNOME_VFS_DIRECTORY_KIND_TRASH,
+-									   &target_dir_uri, FALSE, FALSE, 0777);
+-				}
+ 
+-				result = GNOME_VFS_OK;
++				if (result != GNOME_VFS_OK) {
++					char *trash_find_text_uri;
++
++					g_assert (target_dir_uri == NULL);
++
++					trash_find_text_uri = gnome_vfs_uri_to_string (trash_find_uri, GNOME_VFS_URI_HIDE_NONE);
++					g_warning ("Unable to find trash for \"%s\": %s. Please file a bug report.",
++						   trash_find_text_uri,
++						   gnome_vfs_result_to_string (result));
++					g_free (trash_find_text_uri);
++				}
+ 			}
++
+ 			if (target_dir_uri != NULL) {
+ 				target_uri = append_basename (target_dir_uri, source_uri);
+ 			}
diff --git a/gnome-base/nautilus/nautilus-2.12.1-r1.ebuild b/gnome-base/nautilus/nautilus-2.12.1-r1.ebuild
new file mode 100644
index 000000000000..268761ce9d3b
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-2.12.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.12.1-r1.ebuild,v 1.1 2005/11/01 19:40:11 dang Exp $
+
+inherit virtualx gnome2 eutils
+
+DESCRIPTION="A file manager for the GNOME desktop"
+HOMEPAGE="http://www.gnome.org/projects/nautilus/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE=""
+# cups flac gstreamer mad ogg vorbis
+
+RDEPEND=">=media-libs/libart_lgpl-2.3.10
+	>=gnome-base/libbonobo-2.1
+	>=gnome-base/eel-2.12
+	>=media-sound/esound-0.2.27
+	>=dev-libs/glib-2.6
+	>=gnome-base/gnome-desktop-2.9.91
+	>=gnome-base/libgnome-2.1.1
+	>=gnome-base/libgnomeui-2.6
+	>=gnome-base/gnome-vfs-2.11.1
+	>=gnome-base/orbit-2.4
+	>=x11-libs/pango-1.1.2
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/librsvg-2.0.1
+	>=dev-libs/libxml2-2.4.7
+	>=x11-libs/startup-notification-0.8
+	>=media-libs/libexif-0.5.12
+	>=gnome-base/gconf-2
+	dev-libs/popt
+	virtual/x11
+	virtual/eject"
+#	!gstreamer? ( vorbis? ( media-sound/vorbis-tools ) )
+#	gstreamer? (
+#		>=media-libs/gstreamer-0.8
+#		>=media-libs/gst-plugins-0.8
+#		>=media-plugins/gst-plugins-gnomevfs-0.8
+#		mad? ( >=media-plugins/gst-plugins-mad-0.8 )
+#		ogg? ( >=media-plugins/gst-plugins-ogg-0.8 )
+#		vorbis? ( >=media-plugins/gst-plugins-vorbis-0.8 )
+#		flac? (	>=media-plugins/gst-plugins-flac-0.8 ) )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.28
+	>=dev-util/pkgconfig-0.9"
+
+PDEPEND=">=x11-themes/gnome-icon-theme-1.1.91
+	x11-themes/gnome-themes"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
+USE_DESTDIR="1"
+
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	epatch ${FILESDIR}/${P}-symlink-del.patch
+}
+
+src_test() {
+	if hasq userpriv $FEATURES ;
+	then
+		Xmake check || die "Test phase failed"
+	fi
+}