apply patch from Martin Schlemmer <azarah@nosferatu.za.org> to fix #133096. Patch sent upstream.

(Portage version: 2.1.1_pre3-r3)
 (Unsigned Manifest commit)

3 files changed, 15 insertions, 87 deletions

diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index 03f027d3c1f2..7ee4c33ea7ba 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -42,6 +42,10 @@ AUX gnome-vfs-2.12.0-afs.patch 663 RMD160 a8ac6fbb9792b02090d3783ce10481bbc6b3b8
 MD5 59ad154c6254211757fde7973afffc14 files/gnome-vfs-2.12.0-afs.patch 663
 RMD160 a8ac6fbb9792b02090d3783ce10481bbc6b3b830 files/gnome-vfs-2.12.0-afs.patch 663
 SHA256 a0bef85feae74a1ecc46f148a476d295e65c92b7a379546fb68186a7733e2e00 files/gnome-vfs-2.12.0-afs.patch 663
+AUX gnome-vfs-2.14.2-http_module-undef-neon-symbols.patch 2885 RMD160 d85b82cc0c12708b806e6abdc267012095be96a1 SHA1 96508f019abcec3b30e029eeeef116331a92509d SHA256 4fa67b70070db7d37b5446e5beac5142952ab58d6086030823c7e51f5ef2f43f
+MD5 643569b7e17cc0a8e81506b071c8b943 files/gnome-vfs-2.14.2-http_module-undef-neon-symbols.patch 2885
+RMD160 d85b82cc0c12708b806e6abdc267012095be96a1 files/gnome-vfs-2.14.2-http_module-undef-neon-symbols.patch 2885
+SHA256 4fa67b70070db7d37b5446e5beac5142952ab58d6086030823c7e51f5ef2f43f files/gnome-vfs-2.14.2-http_module-undef-neon-symbols.patch 2885
 AUX gnome-vfs-2.8.3-reiser4_support.patch 710 RMD160 62c33efed3b6dc44e283174b03fa577dcae98022 SHA1 87258bfba606d76719d6e946ceaa8a7b13e51733 SHA256 e13e61cb02eeeed5bb654fb203cb47c6da9dca4fa7f317e3bdcaf22d4d379bf5
 MD5 09f0fab6d414a859d0f979bef3e10dfb files/gnome-vfs-2.8.3-reiser4_support.patch 710
 RMD160 62c33efed3b6dc44e283174b03fa577dcae98022 files/gnome-vfs-2.8.3-reiser4_support.patch 710
@@ -49,7 +53,6 @@ SHA256 e13e61cb02eeeed5bb654fb203cb47c6da9dca4fa7f317e3bdcaf22d4d379bf5 files/gn
 DIST gnome-vfs-1.0.5.tar.gz 1048954 RMD160 76fbf8e590e41d2cac39faef9edc85e2df02c21a SHA1 41156323969d44e3f14ce481b81bfdb5d1deba49 SHA256 9616c0ba22dd0fd8b269645edc3539d0e8c8a3bee11c1fbf0c64b6a1d62654e1
 DIST gnome-vfs-2.12.1.1.tar.bz2 1726588 RMD160 b96cd620ce60131c0ff467fd277d89ac76419e09 SHA1 48e484663f0d0f5e2a858d2f6e6a5a702e831734 SHA256 c6294cb9553a0d059ac307427b8ac89048103d48255996a879686a74024cd01c
 DIST gnome-vfs-2.12.2.tar.bz2 1558218 RMD160 831d83c791631e7273fdebec1047da6055757104 SHA1 fa8248e18cb8b44f617a5b1bb776df37628828ea SHA256 46f80ead7c52a8c5a3fa7beac2d42385c6bc9552fa28aa5068e1a251d708e177
-DIST gnome-vfs-2.14.1.tar.bz2 1813793 RMD160 bdd11adbc4063021aeec3b14dae66db6eeec0035 SHA1 9cffc2b5c95ad6e082276343a4fcf73fd2bca176 SHA256 cdcef326c3bacd89bf40551932f6b8e2c04bee4ebf3afc1633032af04a7631bf
 DIST gnome-vfs-2.14.2.tar.bz2 1816194 RMD160 e0a67e3576d72a86c898208a93ad8ee52f72f870 SHA1 ffd2e5f229495f55587d8499e5f2b8b8a76e5448 SHA256 15da9d174d2373826a6921c8af2aac18aa64c6d93ac201903c9fb432e142bba7
 EBUILD gnome-vfs-1.0.5-r4.ebuild 2156 RMD160 92d4faa2a7c5a4e646eeaa7f17104b44a92a8813 SHA1 d102e8c57ea27b79d1affb8aedbfffa35f4a1420 SHA256 a37b5db15200698ca994a82ea2ac31872d7155e9a2f74afca7bf9f0f72a76555
 MD5 f5da0479168096c01a4439c5fc0711aa gnome-vfs-1.0.5-r4.ebuild 2156
@@ -63,18 +66,18 @@ EBUILD gnome-vfs-2.12.2.ebuild 2158 RMD160 3cd1452fef78139967a146741de913ae64905
 MD5 fb384ec46cb1b9cc75c72ee8a6fea321 gnome-vfs-2.12.2.ebuild 2158
 RMD160 3cd1452fef78139967a146741de913ae64905254 gnome-vfs-2.12.2.ebuild 2158
 SHA256 4587c42f76d68b1628bc09fca9b5f9300c7ff7061d75726c07aafe38235bd164 gnome-vfs-2.12.2.ebuild 2158
-EBUILD gnome-vfs-2.14.1.ebuild 1861 RMD160 59cc34c42c0a8bd0f9beb6bb34a58ea7743f8ac6 SHA1 4edd8d964606eb8072e5c65d3b881c43ad104d59 SHA256 815d28e37dc0625a9995a71948c063ba4cdd2f423ce35c52df8bb00335c4b28a
-MD5 6cbc5634b431aaae317f4c613b8576ea gnome-vfs-2.14.1.ebuild 1861
-RMD160 59cc34c42c0a8bd0f9beb6bb34a58ea7743f8ac6 gnome-vfs-2.14.1.ebuild 1861
-SHA256 815d28e37dc0625a9995a71948c063ba4cdd2f423ce35c52df8bb00335c4b28a gnome-vfs-2.14.1.ebuild 1861
+EBUILD gnome-vfs-2.14.2-r1.ebuild 1978 RMD160 0eef4f336d8e5c4ecb62e3794f1231fe1f25d2e7 SHA1 3f4168ffcb069a7d2f818204063d60ee84cf4560 SHA256 efb727b3f5de0b2e330e13a9ba28694f9380df0207c805271a27cd033836ac69
+MD5 8e56a4e919219da7c3dc8d1acb51d420 gnome-vfs-2.14.2-r1.ebuild 1978
+RMD160 0eef4f336d8e5c4ecb62e3794f1231fe1f25d2e7 gnome-vfs-2.14.2-r1.ebuild 1978
+SHA256 efb727b3f5de0b2e330e13a9ba28694f9380df0207c805271a27cd033836ac69 gnome-vfs-2.14.2-r1.ebuild 1978
 EBUILD gnome-vfs-2.14.2.ebuild 1859 RMD160 d08765efdf62aa7cfd07a02c988b01793e75e48b SHA1 90c14adfdc4845f6bee28e1f142884f8efa4154b SHA256 547a115c0d6212a64370dde474790420e8c2284c7fc00d331289fe447f8ac547
 MD5 a176a4539783c1e49e7cd89e24ef96f6 gnome-vfs-2.14.2.ebuild 1859
 RMD160 d08765efdf62aa7cfd07a02c988b01793e75e48b gnome-vfs-2.14.2.ebuild 1859
 SHA256 547a115c0d6212a64370dde474790420e8c2284c7fc00d331289fe447f8ac547 gnome-vfs-2.14.2.ebuild 1859
-MISC ChangeLog 25269 RMD160 42cdd79446273784dfcde6baa6fc86b440790597 SHA1 35650227d78ad95048e5fa03e93d2552e7e68fa3 SHA256 df6458b42208d5b70490fcc69274ee2538489f8d7c6d6c3e9f58a8b9250eaa3a
-MD5 251afc211473283eae0efdfecf76fae8 ChangeLog 25269
-RMD160 42cdd79446273784dfcde6baa6fc86b440790597 ChangeLog 25269
-SHA256 df6458b42208d5b70490fcc69274ee2538489f8d7c6d6c3e9f58a8b9250eaa3a ChangeLog 25269
+MISC ChangeLog 25584 RMD160 5425985d8dea27be04e75b8a9e7e5da2a0900628 SHA1 21d0828912faee6dee4a357d847db7b7a8031918 SHA256 4c73739a68d275773795fd2fdae8cf0e0055f59ee61363febec2ba7b804c95a5
+MD5 380125550308f271812e33ae18797ec2 ChangeLog 25584
+RMD160 5425985d8dea27be04e75b8a9e7e5da2a0900628 ChangeLog 25584
+SHA256 4c73739a68d275773795fd2fdae8cf0e0055f59ee61363febec2ba7b804c95a5 ChangeLog 25584
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -88,9 +91,9 @@ SHA256 24bee624ac84e2e208dc5da6ac9a239e84b3dad96b99086771bf8265aa02d48c files/di
 MD5 e2667a783d3d83dbbd3e30a3f87f5384 files/digest-gnome-vfs-2.12.2 256
 RMD160 f56efeac7eb528be626ac29465dfa1de7de8e9bf files/digest-gnome-vfs-2.12.2 256
 SHA256 5b7654811e3e2d61f996efec3f936ffd068908dd3939bc42c1e287bee5f58190 files/digest-gnome-vfs-2.12.2 256
-MD5 e2553c9d6c22298d1d14564b13b7b75a files/digest-gnome-vfs-2.14.1 256
-RMD160 1488caa82f571b415e08f23fd3726aff4415b86f files/digest-gnome-vfs-2.14.1 256
-SHA256 cc2df814e41184f882f6b4f57477b2f82fe243641dc45ec27f129d371a4fa3c8 files/digest-gnome-vfs-2.14.1 256
 MD5 524f567956bcd255067b935908595f46 files/digest-gnome-vfs-2.14.2 256
 RMD160 94eb0c6421e6f2d056120e84e6a1bc9ae1e2cf10 files/digest-gnome-vfs-2.14.2 256
 SHA256 bb570a6e1ed458d3e0173c04dcdddf3bd535f6a5cbda70592e5c472edbc9aa8a files/digest-gnome-vfs-2.14.2 256
+MD5 524f567956bcd255067b935908595f46 files/digest-gnome-vfs-2.14.2-r1 256
+RMD160 94eb0c6421e6f2d056120e84e6a1bc9ae1e2cf10 files/digest-gnome-vfs-2.14.2-r1 256
+SHA256 bb570a6e1ed458d3e0173c04dcdddf3bd535f6a5cbda70592e5c472edbc9aa8a files/digest-gnome-vfs-2.14.2-r1 256
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.14.1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.14.1
deleted file mode 100644
index 90f4be129c5d..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.14.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d7ba7e667b46b5929b3e277a8b870868 gnome-vfs-2.14.1.tar.bz2 1813793
-RMD160 bdd11adbc4063021aeec3b14dae66db6eeec0035 gnome-vfs-2.14.1.tar.bz2 1813793
-SHA256 cdcef326c3bacd89bf40551932f6b8e2c04bee4ebf3afc1633032af04a7631bf gnome-vfs-2.14.1.tar.bz2 1813793
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.14.1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.14.1.ebuild
deleted file mode 100644
index 31c8d5bc4690..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.14.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2006 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.14.1.ebuild,v 1.3 2006/05/14 06:53:44 dertobi123 Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="avahi doc gnutls hal ipv6 samba ssl"
-
-RDEPEND=">=gnome-base/libbonobo-2.3.1
-	>=gnome-base/gconf-1.2
-	>=dev-libs/glib-2.9.3
-	>=gnome-base/orbit-2.12.4
-	>=dev-libs/libxml2-2.6
-	>=net-misc/neon-0.25.3
-	app-arch/bzip2
-	virtual/fam
-	gnome-base/gnome-mime-data
-	>=x11-misc/shared-mime-info-0.14
-	dev-libs/popt
-	samba? ( >=net-fs/samba-3 )
-	ssl? (
-		>=dev-libs/openssl-0.9.5
-		!gnome-extra/gnome-vfs-sftp )
-	gnutls? (
-		!ssl? (
-			net-libs/gnutls
-			!gnome-extra/gnome-vfs-sftp ) )
-	hal? (
-		>=sys-apps/hal-0.5.7
-		>=sys-apps/dbus-0.32 )
-	avahi? ( >=net-dns/avahi-0.6 )"
-
-# ssl/gnutls USE deps : if both are enabled choose openssl
-# foser <foser@gentoo.org> 19 Apr 2004
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="--disable-schemas-install \
-		--disable-howl			  \
-		--enable-http-neon        \
-		$(use_enable ssl openssl) \
-		$(use_enable gnutls)      \
-		$(use_enable samba)       \
-		$(use_enable ipv6)        \
-		$(use_enable hal)         \
-		$(use_enable avahi)"
-
-	# this works because of the order of conifgure parsing
-	# so should always be behind the use_enable options
-	# foser <foser@gentoo.org 19 Apr 2004
-	use gnutls && use ssl && G2CONF="${G2CONF} --disable-gnutls"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Allow the Trash on afs filesystems (#106118)
-	epatch ${FILESDIR}/${PN}-2.12.0-afs.patch
-}