old. the last one with bad USE hal vs. udev handling. this breaks thunar, pcmanfm, and nautilus. get rid of it.

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

4 files changed, 0 insertions, 224 deletions

diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index e48a43e14bfa..381adfd7a201 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,11 +1,7 @@
 AUX gvfs-1.2.2-expose-archive-backend.patch 1607 RMD160 cd17c501805fb81e560c35deb1d234280fd07f5c SHA1 70b1824a49ba654dda5ae2ef267ca45a31b53dc4 SHA256 a6cd0f6b848e1943f9121cf4ce4105f32573f9cf7cf75bc0d7d61a98babec519
 AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 RMD160 0c6d83f8b38cf41002dbe6f863916cfac66cd231 SHA1 fc4927fc0f3604689d446d4fe47b48384bee70a5 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062
-AUX gvfs-1.6.4-O_TRUNC-fix.patch 2589 RMD160 8a0d4f627f8c258432afd59d2e774291349719a8 SHA1 670c093a44fae8dcd2175a3b0e8fe12f543204fe SHA256 1c5885854901e9dcf3e2626359cef63151040e382dfd611e4eb3aacd1f9f46b9
-AUX gvfs-1.6.4-sftp-timeout.patch 978 RMD160 01baba58c316fddda48cae2abf8ffee3942ac7fb SHA1 8f36224495e845db734de15c3478b9a5499d8713 SHA256 9b66f6e711dd70172204fa40a2a0e77f47253720532f831d5e571ec8021c98f6
-DIST gvfs-1.6.4.tar.bz2 1385999 RMD160 b5aeb97260534f16c565a36ef87150823fb05283 SHA1 b859dc23916d03e2e6eb7e000916929d223b32e8 SHA256 e1e2810678b42cb0160642f0cd33ccd377cddfb18fc868d6faa04c449f813693
 DIST gvfs-1.6.6.tar.bz2 1387796 RMD160 705934a0a3f520a41237374abeb0182d01398903 SHA1 066800558370187abd838c358349bb73f1579f8b SHA256 902890deb6a670f642180ea958406ebb02af1d5867a464c87e493d56f1dde7bd
 DIST gvfs-1.6.7.tar.bz2 1404372 RMD160 e833fdbc9dc503cdde8e0ab5a7a8fa5403ec1aa1 SHA1 285a810772dce8b37289cbe0aaab8354f2b6717a SHA256 fe5f6181eac14d5147794389bf57717226a15ddf8283631b434c2d9ec120d659
-EBUILD gvfs-1.6.4-r2.ebuild 3206 RMD160 72a2630781f40f9c9555e306aac0d78f56700c87 SHA1 7bf3592e62e2ab799625945dda56b56df38f1ba9 SHA256 cec5b3cb5cb8bcb9d368a0402e215e6d79e973405361cc944c7c45ce7e7ea1d9
 EBUILD gvfs-1.6.6-r1.ebuild 3332 RMD160 e8f07109a52c2575a2f7c0b0a0dcf051d9b1f33e SHA1 7540a002ab29f4155615a1a8f486fb5db5e9363d SHA256 aa3216e00f778eb39ee7821a96cc47d1b40b1daf3d9f70c3517678f4a66ad545
 EBUILD gvfs-1.6.7.ebuild 3348 RMD160 572ca3ea503b3ff69573b09fe2ed8fad0cba67a5 SHA1 2b86de146aa8eb5a5ebcedfc42c6efb54b199731 SHA256 eccd3899e93deeb9f5fdc5dae6a0e6571d1aa8c61fc781f0b24a8d4a0b2e098d
 MISC ChangeLog 18690 RMD160 a796ea44ab7f1dc09ee987574504bf6e0e252d3c SHA1 ce2f3e0787b8eabb6800bc0452f67c4b6c9ea735 SHA256 b4e63bed5e0d0fe1cd22127fece932c0290434a28193a1a65e33c2b7f3e2ce9f
diff --git a/gnome-base/gvfs/files/gvfs-1.6.4-O_TRUNC-fix.patch b/gnome-base/gvfs/files/gvfs-1.6.4-O_TRUNC-fix.patch
deleted file mode 100644
index b5d096d1b4c2..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.6.4-O_TRUNC-fix.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 0d1dc99a87d354e8af9cb0f98827bafb2cd7f577 Mon Sep 17 00:00:00 2001
-From: Tomas Bzatek <tbzatek@redhat.com>
-Date: Wed, 13 Oct 2010 16:25:51 +0200
-Subject: [PATCH] fuse: Add O_TRUNC support for open()
-
-This requires kernel version 2.6.24 or later.
-
-See bug 627567 for details.
----
- client/gvfsfusedaemon.c |   16 +++++++++++-----
- 1 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
-index 13cb74d..bc3090d 100644
---- a/client/gvfsfusedaemon.c
-+++ b/client/gvfsfusedaemon.c
-@@ -948,7 +948,7 @@ setup_input_stream (GFile *file, FileHandle *fh)
- }
- 
- static gint
--setup_output_stream (GFile *file, FileHandle *fh)
-+setup_output_stream (GFile *file, FileHandle *fh, int flags)
- {
-   GError *error  = NULL;
-   gint    result = 0;
-@@ -968,7 +968,10 @@ setup_output_stream (GFile *file, FileHandle *fh)
- 
-   if (!fh->stream)
-     {
--      fh->stream = g_file_append_to (file, 0, NULL, &error);
-+      if (flags & O_TRUNC)
-+        fh->stream = g_file_replace (file, NULL, FALSE, 0, NULL, &error);
-+      else
-+        fh->stream = g_file_append_to (file, 0, NULL, &error);
-       if (fh->stream)
-         fh->pos = g_seekable_tell (G_SEEKABLE (fh->stream));
-     }
-@@ -1024,7 +1027,7 @@ vfs_open (const gchar *path, struct fuse_file_info *fi)
-               set_pid_for_file (file);
- 
-               if (fi->flags & O_WRONLY || fi->flags & O_RDWR)
--                result = setup_output_stream (file, fh);
-+                result = setup_output_stream (file, fh, fi->flags);
-               else
-                 result = setup_input_stream (file, fh);
- 
-@@ -1406,7 +1409,7 @@ vfs_write (const gchar *path, const gchar *buf, size_t len, off_t offset,
-         {
-           g_mutex_lock (fh->mutex);
- 
--          result = setup_output_stream (file, fh);
-+          result = setup_output_stream (file, fh, 0);
-           if (result == 0)
-             {
-               result = write_stream (fh, buf, len, offset);
-@@ -1857,7 +1860,7 @@ vfs_ftruncate (const gchar *path, off_t size, struct fuse_file_info *fi)
-         {
-           g_mutex_lock (fh->mutex);
- 
--          result = setup_output_stream (file, fh);
-+          result = setup_output_stream (file, fh, 0);
- 
-           if (result == 0)
-             {
-@@ -2336,6 +2339,9 @@ vfs_init (struct fuse_conn_info *conn)
-   subthread_main_loop = g_main_loop_new (NULL, FALSE);
-   subthread = g_thread_create ((GThreadFunc) subthread_main, NULL, FALSE, NULL);
- 
-+  /* Indicate O_TRUNC support for open() */
-+  conn->want |= FUSE_CAP_ATOMIC_O_TRUNC;
-+
-   return NULL;
- }
- 
--- 
-1.7.3.1
-
diff --git a/gnome-base/gvfs/files/gvfs-1.6.4-sftp-timeout.patch b/gnome-base/gvfs/files/gvfs-1.6.4-sftp-timeout.patch
deleted file mode 100644
index a236dd2c8d89..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.6.4-sftp-timeout.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4033907045abcf498686c1b34be7b0160260088d Mon Sep 17 00:00:00 2001
-From: Andreas Henriksson <andreas@fatal.se>
-Date: Sat, 02 Oct 2010 12:51:54 +0000
-Subject: sftp: fix poll() timeout.
-
-When switching from select() to poll() in commit
-"sftp: Use poll() to cope with openssh-5.6 changes" (c6be45c8934)
-the difference in seconds vs milliseconds for select/poll timeout
-argument was missed.
-
-SFTP_READ_TIMEOUT is defined in seconds, so multiply it with 1000
-when using it with poll().
-
-https://bugzilla.gnome.org/show_bug.cgi?id=631169
----
-diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c
-index 9fecf6a..f6b7785 100644
---- a/daemon/gvfsbackendsftp.c
-+++ b/daemon/gvfsbackendsftp.c
-@@ -869,7 +869,7 @@ handle_login (GVfsBackend *backend,
-       fds[1].fd = prompt_fd;
-       fds[1].events = POLLIN;
-       
--      ret = poll(fds, 2, SFTP_READ_TIMEOUT);
-+      ret = poll(fds, 2, SFTP_READ_TIMEOUT * 1000);
-       
-       if (ret <= 0)
-         {
---
-cgit v0.8.3.1
diff --git a/gnome-base/gvfs/gvfs-1.6.4-r2.ebuild b/gnome-base/gvfs/gvfs-1.6.4-r2.ebuild
deleted file mode 100644
index f42f3d092ab0..000000000000
--- a/gnome-base/gvfs/gvfs-1.6.4-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.6.4-r2.ebuild,v 1.7 2011/01/17 13:48:34 xarthisius Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit autotools bash-completion gnome2 eutils
-
-DESCRIPTION="GNOME Virtual Filesystem Layer"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="archive avahi bluetooth cdda doc fuse gdu gnome gnome-keyring gphoto2 hal
-+http iphone samba +udev"
-
-RDEPEND=">=dev-libs/glib-2.23.4
-	>=sys-apps/dbus-1.0
-	dev-libs/libxml2
-	net-misc/openssh
-	>=sys-fs/udev-138
-	archive? ( app-arch/libarchive )
-	avahi? ( >=net-dns/avahi-0.6 )
-	bluetooth? (
-		>=app-mobilephone/obex-data-server-0.4.5
-		dev-libs/dbus-glib
-		net-wireless/bluez
-		dev-libs/expat )
-	fuse? ( sys-fs/fuse )
-	gdu? ( >=sys-apps/gnome-disk-utility-2.29 )
-	gnome? ( >=gnome-base/gconf-2.0 )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
-	gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
-	iphone? ( app-pda/libimobiledevice )
-	udev? (
-		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
-		>=sys-fs/udev-145[extras] )
-	hal? (
-		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
-		>=sys-apps/hal-0.5.10 )
-	http? ( >=net-libs/libsoup-gnome-2.26.0 )
-	samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
-			<=net-fs/samba-3.3 ) )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.19
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	if use cdda && ! use hal && ! use udev; then
-		ewarn "You have \"+cdda\", but you have \"-hal\" and \"-udev\""
-		ewarn "cdda support will NOT be built unless you enable EITHER hal OR udev"
-	fi
-
-	G2CONF="${G2CONF}
-		--enable-udev
-		--disable-bash-completion
-		--with-dbus-service-dir=/usr/share/dbus-1/services
-		$(use_enable archive)
-		$(use_enable avahi)
-		$(use_enable bluetooth obexftp)
-		$(use_enable cdda)
-		$(use_enable fuse)
-		$(use_enable gdu)
-		$(use_enable gnome gconf)
-		$(use_enable gphoto2)
-		$(use_enable iphone afc)
-		$(use_enable udev gudev)
-		$(use_enable hal)
-		$(use_enable http)
-		$(use_enable gnome-keyring keyring)
-		$(use_enable samba)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# sftp: fix poll() timeout, bug #339695
-	epatch "${FILESDIR}/${P}-sftp-timeout.patch"
-
-	# Fix file truncation on open; bug #344079
-	epatch "${FILESDIR}/${P}-O_TRUNC-fix.patch"
-
-	# Conditional patching purely to avoid eautoreconf
-	use gphoto2 && epatch "${FILESDIR}/${PN}-1.2.2-gphoto2-stricter-checks.patch"
-
-	if use archive; then
-		epatch "${FILESDIR}/${PN}-1.2.2-expose-archive-backend.patch"
-		echo "mount-archive.desktop.in" >> po/POTFILES.in
-		echo "mount-archive.desktop.in.in" >> po/POTFILES.in
-	fi
-
-	use gphoto2 || use archive && eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-	use bash-completion && \
-		dobashcompletion programs/gvfs-bash-completion.sh ${PN}
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use bash-completion && bash-completion_pkg_postinst
-
-	ewarn "In order to use the new gvfs services, please reload dbus configuration"
-	ewarn "You may need to log out and log back in for some changes to take effect"
-}