Version bump, including new some filesystem names, and update to new shared mime info format

Package-Manager: portage-2.2_rc45/cvs/Linux x86_64

3 files changed, 140 insertions, 2 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 4e51c367f49d..11de09dd6229 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.311 2009/08/19 16:36:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.312 2009/10/11 12:32:47 mrpouet Exp $
+
+*gnome-vfs-2.24.2 (11 Oct 2009)
+
+  11 Oct 2009; Romain Perier <mrpouet@gentoo.org>
+  +gnome-vfs-2.24.2.ebuild:
+  Version bump, including new some filesystem names, and update to new
+  shared mime info format.
 
   19 Aug 2009; Jeroen Roovers <jer@gentoo.org> gnome-vfs-2.24.1.ebuild:
   Stable for HPPA (bug #275699).
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index dec79671163d..b51fbdf5b809 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -11,10 +11,12 @@ DIST gnome-vfs-2.20.1.tar.bz2 1890300 RMD160 faa5fffb5495d1e161cb6c3b47612cf39cb
 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
 DIST gnome-vfs-2.24.1.tar.bz2 1936704 RMD160 e4c6f99b67496a456596b7040aff859ca49a8998 SHA1 0e7b548ffe7b9eddaef3a43cdda47de538715f8b SHA256 bc59144e303b152b84b86f209347a3e87a91d5ed7172d8503ee19c232dcabeb6
+DIST gnome-vfs-2.24.2.tar.bz2 1859173 RMD160 af81ef4193821696a2ca26435a6a457d55d5ab5c SHA1 9e8e9387cbf0dd107e16afd95a358581eb610ab8 SHA256 50ecf5f37d377492e8943a3c359ffe64176d4e7f045e9980790eca999a1c6856
 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 3125 RMD160 b72f0142185cceea33d30f22941447f50f370be9 SHA1 0bb90670b6f0b64639f45cbad8fdcdcb8a760a7a SHA256 e5a3ec7eca9e25a613d9e9ffcbbd326d4cdc72a85e8870e95a21eced35e068b9
 EBUILD gnome-vfs-2.24.1.ebuild 3628 RMD160 aced1c861e92441aace80607b06d37bd958aa82f SHA1 114fd216851a9206fd27a4d0119535b5d1cc3416 SHA256 a9de4eb71bea122cdbfac1c804ce6a6be20a39c1cadd2300b3b3eeffa3961809
-MISC ChangeLog 40630 RMD160 6d217c70c0af1339f991d5f7dcb74fc79ac5a77f SHA1 f1b1791ea6ab3bb8109a24ad83f5dd5557b95679 SHA256 5d4a46f702e5c505898862166657f5016ab5330626f3d74158abb636f23b1751
+EBUILD gnome-vfs-2.24.2.ebuild 3642 RMD160 3fec2075ceea82653f1861e5de092b3a77789cb5 SHA1 a452093c28127c316258457847e2d4de737b592f SHA256 3b5e9f029e61206f68c2b2546498ed064ce81617f99a1d08ebe9097f8e4b4b78
+MISC ChangeLog 40844 RMD160 f52afd3e589796cf696ce2e91452efc6d62042ff SHA1 4adcc031a7b2ed71d91ef4a3f131126d9361a0cf SHA256 7c7c740edffeec5a966a8bc8080ea82dd3918565602464e3d7639bd45dd2ff09
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.2.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.2.ebuild
new file mode 100644
index 000000000000..f9493595bc23
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.2.ebuild
@@ -0,0 +1,129 @@
+# 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.2.ebuild,v 1.1 2009/10/11 12:32:47 mrpouet 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}"/${PN}-2.24.0-gnutls27.patch
+
+	# Prevent duplicated volumes, bug #193083
+	epatch "${FILESDIR}"/${PN}-2.24.0-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
+
+	# Fix use of broken gtk-doc.make
+	if use doc; then
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" -i gtk-doc.make
+	else
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=true" -i gtk-doc.make
+	fi
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+src_test() {
+	unset DISPLAY
+	#unset DBUS_SESSION_BUS_ADDRESS
+	emake check || die "tests failed"
+}