Bump to 2.24.0-r1.

 * Prevent showing duplicate volumes with UUID or LABEL, bug #193083.
 * Allow building with gnutls >= 2.7, bug #253729.
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

6 files changed, 227 insertions, 6 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 93eaccb22d27..3efa0444f1d1 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.295 2009/03/06 15:36:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.296 2009/03/08 21:52:08 eva Exp $
+
+*gnome-vfs-2.24.0-r1 (08 Mar 2009)
+
+  08 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gnome-vfs-2.24.0-gnutls27.patch,
+  +files/gnome-vfs-2.24.0-uuid-mount.patch, gnome-vfs-2.20.1-r1.ebuild,
+  +gnome-vfs-2.24.0-r1.ebuild:
+  Bump to 2.24.0-r1.
+   * Prevent showing duplicate volumes with UUID or LABEL, bug #193083.
+   * Allow building with gnutls >= 2.7, bug #253729.
 
   06 Mar 2009; Brent Baude <ranger@gentoo.org> gnome-vfs-2.24.0.ebuild:
   Marking gnome-vfs-2.24.0 ppc stable for bug 260063
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index 35f71c7819da..4de4cd5e0390 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-vfs-2.12.0-afs.patch 663 RMD160 a8ac6fbb9792b02090d3783ce10481bbc6b3b830 SHA1 fc7eb54b19a3bf43f1edc253c6517ea9bb60cb6c SHA256 a0bef85feae74a1ecc46f148a476d295e65c92b7a379546fb68186a7733e2e00
 AUX gnome-vfs-2.15.2-headers-define.patch 569 RMD160 5ff16b2fc13ef170a39dad9c300a8fb1581f8f93 SHA1 f448746dd581d8bee99377d860f3d4fb51659eb8 SHA256 ac0136ec0df6ba7efac5ac3403809383e7f681556f082537ee866d0398110918
 AUX gnome-vfs-2.16.0-no-dbus-crash.patch 710 RMD160 816b75d144fc264a34e45f0e2d17e37f528f1682 SHA1 a3011624f5078b468c0a67023109723f9455bd83 SHA256 b68247cc6abf30d183efb51480793917e820ce461b0c62003321aceced177345
@@ -5,11 +8,21 @@ AUX gnome-vfs-2.18.1-drop-gtk-doc-check.patch 856 RMD160 373f6eddf1385f98ae2b542
 AUX gnome-vfs-2.20.0-automagic-deps.patch 2008 RMD160 91c4b7b771548b6645a1bf1764cff9af7947da43 SHA1 da27fcb4652a8f3a9e042a916371bbf03f03ad71 SHA256 478f55fe5e38714a22854351d46a031cacf1c003855865a8bdd1c2f1ececb5c5
 AUX gnome-vfs-2.20.0-home_dir_fakeroot.patch 5197 RMD160 1d2b5909c8ea2c901597ed3784ae3d2524f1145e SHA1 1ff4d5fc865f92c2ae8616511fbfe2efdad080fd SHA256 61b2959ceaeae412cc96dac1258dec47182f6935c4a6145c756541e6e038fe95
 AUX gnome-vfs-2.20.1-automagic-deps.patch 643 RMD160 0e984be0bf21114192174b87ed9cb9b91df38ff9 SHA1 75c330ed9dd352aae758c7691d766ba7df1a7885 SHA256 7d50fa5944125190ce0b0d47013bc4ff4fbfe2908520828dc9ced80d9b47ed02
+AUX gnome-vfs-2.24.0-gnutls27.patch 1334 RMD160 e3de6ae9314255fccdf2e67e05e80c6c25015726 SHA1 6735af4bbd14980354ff2b834b903eca52c16bca SHA256 321453556381b8c7c22fad1786cc09347716fed02e40756b974c59a184c272f4
+AUX gnome-vfs-2.24.0-uuid-mount.patch 2162 RMD160 9c92a80b859d322faff6b1239d28dfaa2b5f0bbd SHA1 2a76d49e599681066cb161b3c42630c8e039d5a6 SHA256 40cdac82d48e68ec563da5d13e6116c42c2c18ac972287638e8ff63357e55823
 DIST gnome-vfs-2.20.1.tar.bz2 1890300 RMD160 faa5fffb5495d1e161cb6c3b47612cf39cbb1629 SHA1 03afa10e84425f7f38e05f0db0ecf55ae5fb7b15 SHA256 37475d17350b0e54b2e0b7bdcd7effd04eafd96b4b07604ff7d941377dd112d3
 DIST gnome-vfs-2.22.0.tar.bz2 1939765 RMD160 307dbff23be666e18326211065a7dee78a8a17e2 SHA1 a58fb0654bb2c434372ee313a591ecfa8195fe18 SHA256 622cf50cefa2c4187e0a23f29d665f010f7a0815864fc35a61caefd5a7d4ebb1
 DIST gnome-vfs-2.24.0.tar.bz2 1935735 RMD160 56a44ca8f3035b781f6b396f3c4bc821340da5e8 SHA1 d836594f9053e2b49cfbaa8f5fab24a5d2c271bd SHA256 b8ae3c81a2d6a3798534e72216899021013b47bc012e405fa00167d190559d94
-EBUILD gnome-vfs-2.20.1-r1.ebuild 3160 RMD160 9d7f17d4a58dbc5b79326cd984f87a5ef860e0b6 SHA1 cabe1be57b817d17d69895ee4651b53fdfce78fc SHA256 c61717456da0bfaf72ce5aa8885046914f4ae98b41e3ff883332977a768cce3c
+EBUILD gnome-vfs-2.20.1-r1.ebuild 3100 RMD160 046a3be0a22a7d6adfa8a2f34894f1894a155e60 SHA1 6bdb70e23a2e2a7f962537ae83f7c40bcaba0583 SHA256 d21e41b4844e5fcd7bdd92f3dc1ef95ba99cf52b2c54d819fef21587322413b2
 EBUILD gnome-vfs-2.22.0.ebuild 3180 RMD160 2130eed95dae4f094253d37852157e5ae1421904 SHA1 dfe2c5cb7dea5fb6894b9dd17fba24e57363e5c9 SHA256 83337a567ce3265d54a9a739e27f42ad6722d2cbd9fbfca43db001666515d092
+EBUILD gnome-vfs-2.24.0-r1.ebuild 3327 RMD160 6b6daa76144ae17faa362f5d8261f35b48204de9 SHA1 8154410ad797c704994bd65b635310d062e1140b SHA256 c0e558969ae55c84c132d3222e303185152380af6a434daf1c49358e5915d7ff
 EBUILD gnome-vfs-2.24.0.ebuild 3131 RMD160 c41a8a04d44e124a07bee9b5d7a3d31b4e5c913e SHA1 9efe0799e50b0ef68ec589b84ba66ababcffe5cb SHA256 0f699c1b35aec5034f3fabec7848d8164ec39a3ed8b58cad6433e5c14437638a
-MISC ChangeLog 38620 RMD160 9858d9c3a15a97cb188b329c402ba7412ff9bf8b SHA1 ea4d4e1cd111aafe42567932f7ab01b4b1fff28a SHA256 368506c150406b097cdd2c38683601a2c7ae904301618bc2260f32c678f988c8
+MISC ChangeLog 38999 RMD160 749f6a3a7039cb5221bac4d0076d739508dcf3db SHA1 803aba537f9b1abcf7ce62d7a81f828bf62d26c6 SHA256 66d5b935511d4ec89a511c3017454b89f2dfd73c133f63cd60f8eaea6d3dd4bd
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkm0Pg4ACgkQ1fmVwcYIWAZBbACeJxDW2MjVWrJCYy3I/mXmu1R6
+J/gAnRBkx4ZT8jB5PsV7eo0W10fxRJsB
+=BpNd
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-gnutls27.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-gnutls27.patch
new file mode 100644
index 000000000000..15483c681f3d
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-gnutls27.patch
@@ -0,0 +1,25 @@
+# Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0
+# Use pkg-config in place of gnutls own macro since it's not present anymore.
+--- a/configure.in	2009-03-07 19:59:53.805507753 +0100
++++ b/configure.in	2009-03-07 18:34:36.928169018 +0100
+@@ -686,14 +686,14 @@
+     AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***])
+   else
+     AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***]))
+-    AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
+-			      have_ssl=true])
++    PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
++    				 	   	  have_ssl = true])
+ 
+     if test "x${LIBGNUTLS_LIBS}" = "x"; then
+-      AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
+-                                 AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
+-				 have_ssl=true],
+-                                 AC_MSG_ERROR([Unable to find GNUTLS]))
++      PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
++      				   	     	    AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
++						    have_ssl=true],
++						    AC_MSG_ERROR([Unable to find GNUTLS]))
+     fi
+   fi
+ fi
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch
new file mode 100644
index 000000000000..364834875fe9
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch
@@ -0,0 +1,57 @@
+# Prevent gnome-vfs to show duplicate volumes due to LABEL and UUID in /etc/fstab
+#
+# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=357156
+# Gentoo: https://bugs.gentoo.org/attachment.cgi?id=131308
+# Similar to http://patches.ubuntu.com/by-release/extracted/ubuntu/g/gnome-vfs/1:2.24.0-1ubuntu2/15_uuid_mount.patch
+--- a/libgnomevfs/gnome-vfs-unix-mounts.c	2007-04-10 15:03:59.000000000 +0300
++++ b/libgnomevfs/gnome-vfs-unix-mounts.c	2007-09-18 17:48:49.000000000 +0300
+@@ -290,6 +290,15 @@ _gnome_vfs_get_current_unix_mounts (GLis
+ 
+ 		mount_entry->mount_path = g_strdup (mntent->mnt_dir);
+ 		mount_entry->device_path = g_strdup (mntent->mnt_fsname);
++
++		if (g_file_test (mntent->mnt_fsname, G_FILE_TEST_IS_SYMLINK)) {
++			char rpath[PATH_MAX];
++			if (realpath (mntent->mnt_fsname, rpath)) {
++				g_free (mount_entry->device_path);
++				mount_entry->device_path = g_strdup (rpath);
++			}
++		}
++
+ 		mount_entry->filesystem_type = g_strdup (mntent->mnt_type);
+ 		
+ 		g_hash_table_insert (mounts_hash,
+@@ -571,9 +580,31 @@ _gnome_vfs_get_unix_mount_table (GList *
+ 		}
+ 		
+ 		mount_entry = g_new0 (GnomeVFSUnixMountPoint, 1);
+-
++		
++		if(strlen(mntent->mnt_fsname) >= 5 && !strncmp (mntent->mnt_fsname, "UUID=", 5)) {
++			mount_entry->device_path = g_strdup_printf ("/dev/disk/by-uuid/%s", mntent->mnt_fsname+5);
++		}
++		else if(strlen(mntent->mnt_fsname) >= 6 && !strncmp (mntent->mnt_fsname, "LABEL=", 6)) {
++			mount_entry->device_path = g_strdup_printf ("/dev/disk/by-label/%s", mntent->mnt_fsname+6);
++		}
++		else {
++			mount_entry->device_path = g_strdup (mntent->mnt_fsname);
++		}
++		
++		if (g_file_test (mount_entry->device_path, G_FILE_TEST_IS_SYMLINK)) {
++			char rpath[PATH_MAX];
++			if (realpath (mount_entry->device_path, rpath)) {
++				g_free (mount_entry->device_path);
++				mount_entry->device_path = g_strdup (rpath);
++			}
++			else {
++				g_free (mount_entry->device_path);
++				g_free (mount_entry);
++				continue;
++			}
++		}
++		
+ 		mount_entry->mount_path = g_strdup (mntent->mnt_dir);
+-		mount_entry->device_path = g_strdup (mntent->mnt_fsname);
+ 		mount_entry->filesystem_type = g_strdup (mntent->mnt_type);
+ 
+ #ifdef HAVE_HASMNTOPT
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.20.1-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.20.1-r1.ebuild
index d95bc3c262c2..008ff888f3b5 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.20.1-r1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.20.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.20.1-r1.ebuild,v 1.9 2008/04/20 01:35:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.20.1-r1.ebuild,v 1.10 2009/03/08 21:52:08 eva Exp $
 
 WANT_AUTOMAKE=1.8
 inherit eutils gnome2 autotools
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="arm sh"
 IUSE="acl avahi doc gnutls hal ipv6 kerberos samba ssl"
 
 RDEPEND=">=gnome-base/gconf-2
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.0-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.0-r1.ebuild
new file mode 100644
index 000000000000..0e66a581c630
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.0-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.24.0-r1.ebuild,v 1.1 2009/03/08 21:52:08 eva Exp $
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Gnome Virtual Filesystem"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="acl avahi doc fam gnutls hal ipv6 kerberos samba ssl"
+
+RDEPEND=">=gnome-base/gconf-2
+	>=dev-libs/glib-2.9.3
+	>=dev-libs/libxml2-2.6
+	app-arch/bzip2
+	fam? ( virtual/fam )
+	gnome-base/gnome-mime-data
+	>=x11-misc/shared-mime-info-0.14
+	>=dev-libs/dbus-glib-0.71
+	samba? ( >=net-fs/samba-3 )
+	gnutls?	(
+		net-libs/gnutls
+		!gnome-extra/gnome-vfs-sftp )
+	ssl? (
+		!gnutls? (
+			>=dev-libs/openssl-0.9.5
+			!gnome-extra/gnome-vfs-sftp ) )
+	hal? ( >=sys-apps/hal-0.5.7 )
+	avahi? ( >=net-dns/avahi-0.6 )
+	kerberos? ( virtual/krb5 )
+	acl? (
+		sys-apps/acl
+		sys-apps/attr )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	gnome-base/gnome-common
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/gtk-doc-am-1.10-r1
+	doc? ( >=dev-util/gtk-doc-1 )"
+PDEPEND="hal? ( >=gnome-base/gnome-mount-0.6 )"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-schemas-install
+		--disable-static
+		--disable-cdda
+		--disable-howl
+		$(use_enable acl)
+		$(use_enable avahi)
+		$(use_enable fam)
+		$(use_enable gnutls)
+		$(use_enable hal)
+		$(use_enable ipv6)
+		$(use_enable kerberos krb5)
+		$(use_enable samba)
+		$(use_enable ssl openssl)"
+		# Useless ? --enable-http-neon
+
+	if use hal ; then
+		G2CONF="${G2CONF}
+			--with-hal-mount=/usr/bin/gnome-mount
+			--with-hal-umount=/usr/bin/gnome-umount
+			--with-hal-eject=/usr/bin/gnome-eject"
+	fi
+
+	# this works because of the order of configure parsing
+	# so should always be behind the use_enable options
+	# foser <foser@gentoo.org 19 Apr 2004
+	use gnutls && use ssl && G2CONF="${G2CONF} --disable-openssl"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Allow the Trash on afs filesystems (#106118)
+	epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
+
+	# Fix compiling with headers missing
+	epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
+
+	# Fix for crashes running programs via sudo
+	epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
+
+	# Fix automagic dependencies, upstream bug #493475
+	epatch "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
+	epatch "${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
+
+	# Fix to identify ${HOME} (#200897)
+	# thanks to debian folks
+	epatch "${FILESDIR}"/${PN}-2.20.0-home_dir_fakeroot.patch
+
+	# Configure with gnutls-2.7, bug #253729
+	epatch "${FILESDIR}"/${P}-gnutls27.patch
+
+	# Prevent duplicated volumes, bug #193083
+	epatch "${FILESDIR}"/${P}-uuid-mount.patch
+
+	# Fix deprecated API disabling in used libraries - this is not future-proof, bug 212163
+	# upstream bug #519632
+	sed -i -e '/DISABLE_DEPRECATED/d' \
+		daemon/Makefile.am daemon/Makefile.in \
+		libgnomevfs/Makefile.am libgnomevfs/Makefile.in \
+		modules/Makefile.am modules/Makefile.in \
+		test/Makefile.am test/Makefile.in
+	sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' \
+		programs/Makefile.am programs/Makefile.in
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}