Bump to 2.24.1. Build fixes for single includes and leak fixes.

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

3 files changed, 149 insertions, 2 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 183ea74be645..9be4eef527cb 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.299 2009/03/18 14:48:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.300 2009/03/19 00:42:09 eva Exp $
+
+*gnome-vfs-2.24.1 (19 Mar 2009)
+
+  19 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-vfs-2.24.1.ebuild:
+  Bump to 2.24.1. Build fixes for single includes and leak fixes.
 
   18 Mar 2009; Raúl Porcel <armin76@gentoo.org> gnome-vfs-2.24.0.ebuild:
   alpha/ia64 stable wrt #260063
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index 1501ef86bd33..2a0af044cb09 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
@@ -10,9 +13,18 @@ AUX gnome-vfs-2.24.0-uuid-mount.patch 2162 RMD160 9c92a80b859d322faff6b1239d28df
 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
+DIST gnome-vfs-2.24.1.tar.bz2 1936704 RMD160 e4c6f99b67496a456596b7040aff859ca49a8998 SHA1 0e7b548ffe7b9eddaef3a43cdda47de538715f8b SHA256 bc59144e303b152b84b86f209347a3e87a91d5ed7172d8503ee19c232dcabeb6
 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 3128 RMD160 73783715ba83a938e549389a16000c34713b8243 SHA1 99163b8e64d385c374178b432757fbd7091e4759 SHA256 b8f9184216a9f94c9b4de86ae460cdafba31d0dcc557400a398670ad8b5fcf04
-MISC ChangeLog 39312 RMD160 18667257f1412f749a0f3e8cfcf1a70cdb3923ee SHA1 2f81bad51390c09f52f4907140638a372df194bc SHA256 704d6567774d9a3016194ee5c34dc725cad2d814fe6b6b4696103ab50b821999
+EBUILD gnome-vfs-2.24.1.ebuild 3638 RMD160 705e6c16eb3595c6776b205dd4e2cb7c8e1458dc SHA1 9d9d27251fff38bf7a85baed47e8e8b45dcf411a SHA256 0b804a5bcb974213fb12e040b99930679e86c9c063debb3b1e8b698e0d64021c
+MISC ChangeLog 39490 RMD160 77bb1be106b5ec87a374f2742274c4cca4cf99a6 SHA1 1afbdf1ad55e914601cb338896cf2e24432f05da SHA256 368e8011a691623805db63d2db51d4c47cc094a87593a48184e59bd0de0825c3
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAknBlOcACgkQ1fmVwcYIWAZLcgCg0Szktgi8oZIKu7l/hTkvNWOt
+qtgAoNQic6H+7iyuCDm6Z1jVqM6XAa8x
+=VS0s
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.1.ebuild
new file mode 100644
index 000000000000..39d6c6bc57c4
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.1.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.1.ebuild,v 1.1 2009/03/19 00:42:09 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}"/${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"
+}