Clean up old revisions.

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

5 files changed, 11 insertions, 300 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 349e1196c171..04cf6e59bc43 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.329 2010/08/18 21:31:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.330 2010/08/22 16:12:09 eva Exp $
+
+  22 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-vfs-2.24.1.ebuild, -gnome-vfs-2.24.2-r1.ebuild,
+  -files/gnome-vfs-2.24.2-symlink-crash.patch:
+  Clean up old revisions.
 
   18 Aug 2010; Markus Meier <maekke@gentoo.org> gnome-vfs-2.24.3-r1.ebuild:
   arm stable, bug #314899
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index cdeb1eb7ef9f..eb7a67c6bfed 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -9,20 +9,16 @@ AUX gnome-vfs-2.20.0-home_dir_fakeroot.patch 5197 RMD160 1d2b5909c8ea2c901597ed3
 AUX gnome-vfs-2.20.1-automagic-deps.patch 643 RMD160 0e984be0bf21114192174b87ed9cb9b91df38ff9 SHA1 75c330ed9dd352aae758c7691d766ba7df1a7885 SHA256 7d50fa5944125190ce0b0d47013bc4ff4fbfe2908520828dc9ced80d9b47ed02
 AUX gnome-vfs-2.24.0-gnutls27.patch 1332 RMD160 4524693921a3a7675d50da69dec6766dbd2b5861 SHA1 f7fefc9d6c9d39b02d421ee96c5707f00debb170 SHA256 66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d
 AUX gnome-vfs-2.24.0-uuid-mount.patch 2162 RMD160 9c92a80b859d322faff6b1239d28dfaa2b5f0bbd SHA1 2a76d49e599681066cb161b3c42630c8e039d5a6 SHA256 40cdac82d48e68ec563da5d13e6116c42c2c18ac972287638e8ff63357e55823
-AUX gnome-vfs-2.24.2-symlink-crash.patch 843 RMD160 81f1783462873dfc56026d9bcf6c75475b8846ca SHA1 81a1704f6e7a0c5c829bb6cc7fb2f2767f98e520 SHA256 a03d6118e6bbf2f9c8e292be3c1c3d78c7f6fa2421f2c284622e74e501c8c3bc
-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
 DIST gnome-vfs-2.24.3.tar.bz2 1830456 RMD160 652afba47a33b05128d354927d2648b39b50f35a SHA1 56aed067eea79175bc186a00003c07a42e5e9aa6 SHA256 3b0f342e79813bfc11d8e636db96b3ffd16c9ca48b07306410e09a3fd1065b4a
-EBUILD gnome-vfs-2.24.1.ebuild 3623 RMD160 08f4a79f5890e50490acb61e6f2fb84c059d919e SHA1 709cfd32a6d39317556fa2e6864a3574aa239183 SHA256 b6f8a6011d78df25d801e8856b04286ae7bc9a8ebcae952eba63a066fdfa8706
-EBUILD gnome-vfs-2.24.2-r1.ebuild 3748 RMD160 454eef0970c5e9579b3c9c38abd43c28c90e8b04 SHA1 f440f1377c04ad6431364270b9c5b0e23e516003 SHA256 ca16e41a1768e96225702fe8b21d75cbe864a15ef242fcca69513f3b80d7dd2c
 EBUILD gnome-vfs-2.24.2.ebuild 3623 RMD160 6919ab13845c55fe4b84c9f3321072214de0b6f1 SHA1 63d1605fbd0e12d250b797646fa7995aaea8f2fd SHA256 adbe9248e21074e407195040a03ab247a0ad50fb142399a1b89669b81ccbb3b0
 EBUILD gnome-vfs-2.24.3-r1.ebuild 3632 RMD160 6fac1e802449a008c9c30150e590894563b0c63c SHA1 d4f2513889bd25c8d9d1c4f24904269c5ac230d0 SHA256 17b13fa221a3b9839cf5367f3ed1363bfc4fb181b5d8f720f9ed8053ab08fd18
-MISC ChangeLog 43524 RMD160 4832d0fb616a9f0da45bdaa93dffa052aebc4f12 SHA1 f2de06407adfd53107f7a984d851798f234c560f SHA256 eea8c3f7d4971d91de099b97de98aa998a2e432bae102ae91936bcaa43cc8ed8
+MISC ChangeLog 43706 RMD160 d0f42a25d0d633cf91c07082c6bec8631eb78a9b SHA1 270fb129e1c6832c1ccd1cb5b53681875ba532a8 SHA256 2ef8caecdda0d8f490558339f00367b61a1bfcc2c7410cc6ae5e0db00235561f
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkxsUNEACgkQkKaRLQcq0GIBJwCfeF3kvbUx5irbZ2eG8h7Vz1lI
-J6YAoKUVZeeUoqPeC8coFMbxb+o2lhjy
-=z1lo
+iEYEARECAAYFAkxxTF4ACgkQ1fmVwcYIWAZi/QCgyfm/HKREgSe7Y0oUiFByMYsT
+Qr4AnRHPMTKSPSNiyjwlmmJP2bBjdF3k
+=OQaj
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.2-symlink-crash.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.2-symlink-crash.patch
deleted file mode 100644
index 93a6f628f6ee..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.2-symlink-crash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 92869585b2e9ab4e262f1d6b7592fe7e2c3fb327 Mon Sep 17 00:00:00 2001
-From: Alexander Larsson <alexl@redhat.com>
-Date: Wed, 10 Mar 2010 10:23:24 +0000
-Subject: Don't crash if we get a NULL symlink
-
-Patch from debian/ubuntu:
-http://launchpadlibrarian.net/35571673/gnome-vfs_2.24.2-1ubuntu2.debdiff
----
-diff --git a/modules/ftp-method.c b/modules/ftp-method.c
-index c40c323..ac02b56 100644
---- a/modules/ftp-method.c
-+++ b/modules/ftp-method.c
-@@ -2678,7 +2678,12 @@ do_read_directory (GnomeVFSMethod *method,
- 					res = GNOME_VFS_ERROR_TOO_MANY_LINKS;
- 					break;
- 				}
--				
-+
-+				if (symlink_info->symlink_name == NULL) {
-+					res = GNOME_VFS_ERROR_BAD_PARAMETERS;
-+					break;
-+				}
-+
- 				symlink_name = gnome_vfs_escape_path_string (symlink_info->symlink_name);
- 				gnome_vfs_file_info_clear (symlink_info);
- 				
---
-cgit v0.8.3.1
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.1.ebuild
deleted file mode 100644
index 6f7c178e6809..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2010 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.9 2010/07/20 01:52:41 jer 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 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"
-}
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.2-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.2-r1.ebuild
deleted file mode 100644
index 053c51bf9ee6..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.2-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2010 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-r1.ebuild,v 1.2 2010/07/20 01:52:41 jer 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 ~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
-
-	# Don't crash if we get a NULL symlink, bug #309621
-	epatch "${FILESDIR}"/${PN}-2.24.2-symlink-crash.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
-	# Fix bug #285706
-	unset XAUTHORITY
-	emake check || die "tests failed"
-}