gnome-vfs needs dbus. Bug #148997

(Portage version: 2.1.2_pre1-r3)
 (Signed Manifest commit)

3 files changed, 18 insertions, 105 deletions

diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index 96e4fc41cdc7..38809a5fcba7 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.0/gnome-vfs-1.0.5-codeset.patch 1762 RMD160 b65d4b43bed4432d093744ee35ef0bfe44774a71 SHA1 5306fffc2f9d6a2b9e58bc240c808d3c7435468c SHA256 8ca4b5e145aa6ae9e497f2bce54a1a168b2836c5ffde08145961c5e3f523af86
 MD5 4072a11c3c98c493cbc0bb851176fb44 files/1.0/gnome-vfs-1.0.5-codeset.patch 1762
 RMD160 b65d4b43bed4432d093744ee35ef0bfe44774a71 files/1.0/gnome-vfs-1.0.5-codeset.patch 1762
@@ -83,18 +86,14 @@ EBUILD gnome-vfs-2.14.2.ebuild 1858 RMD160 dfce09e80ef925261242238408da62019149c
 MD5 60dc204e2204eead0a179e3f6ec479a4 gnome-vfs-2.14.2.ebuild 1858
 RMD160 dfce09e80ef925261242238408da62019149c2cb gnome-vfs-2.14.2.ebuild 1858
 SHA256 c4753afff8a8bf7b9f3a6cfb9fbe037c90eab505dc24d68ede2b057dc6110f2b gnome-vfs-2.14.2.ebuild 1858
-EBUILD gnome-vfs-2.16.0-r1.ebuild 2402 RMD160 0ae4d03b50c1b11402b67ed6fced632392698426 SHA1 05306e05b6535bfa87e378a8c162653b38782442 SHA256 e6ab4a2e7132c433411c912afe8e9032f825787f66598724bb6f9b0059f901ee
-MD5 26b9999d5e692856e606b3de0fefb52b gnome-vfs-2.16.0-r1.ebuild 2402
-RMD160 0ae4d03b50c1b11402b67ed6fced632392698426 gnome-vfs-2.16.0-r1.ebuild 2402
-SHA256 e6ab4a2e7132c433411c912afe8e9032f825787f66598724bb6f9b0059f901ee gnome-vfs-2.16.0-r1.ebuild 2402
-EBUILD gnome-vfs-2.16.0.ebuild 2300 RMD160 b2823c5420cf1583e09a5dc9231c8c3f7fdedab2 SHA1 6ca676b73179284c4ffd75bafd530eb4ac12cd65 SHA256 ab91d7d286a1cfad67185f4608ed27f0281de1f2f18f8eb4a8efba5bccf4981e
-MD5 65f06a3a3fc80c0889323b35c7c521ca gnome-vfs-2.16.0.ebuild 2300
-RMD160 b2823c5420cf1583e09a5dc9231c8c3f7fdedab2 gnome-vfs-2.16.0.ebuild 2300
-SHA256 ab91d7d286a1cfad67185f4608ed27f0281de1f2f18f8eb4a8efba5bccf4981e gnome-vfs-2.16.0.ebuild 2300
-MISC ChangeLog 28190 RMD160 8e903845cdf19ec1534fb8077be3bfa2bafb8314 SHA1 393ddcc4bf6878d03554d7943d51636f58b69000 SHA256 f6d772bfb5f90006ff061964ff3e588a6cb5d2fd5dc857894ad416bb9bf249e4
-MD5 8d45ce56d1d4ad10110525a75956c604 ChangeLog 28190
-RMD160 8e903845cdf19ec1534fb8077be3bfa2bafb8314 ChangeLog 28190
-SHA256 f6d772bfb5f90006ff061964ff3e588a6cb5d2fd5dc857894ad416bb9bf249e4 ChangeLog 28190
+EBUILD gnome-vfs-2.16.0-r1.ebuild 2399 RMD160 e45951b8d6a8dba66d48ade76966a784249a94e4 SHA1 c396940cfc92520c073ff01f9f38bbcdbff4d1d0 SHA256 4b8138921de5974f0351228d7e9f4d7269ef6cc4815baeaffa718a1073883a65
+MD5 1669e168c94d57ac889c23d955312bc1 gnome-vfs-2.16.0-r1.ebuild 2399
+RMD160 e45951b8d6a8dba66d48ade76966a784249a94e4 gnome-vfs-2.16.0-r1.ebuild 2399
+SHA256 4b8138921de5974f0351228d7e9f4d7269ef6cc4815baeaffa718a1073883a65 gnome-vfs-2.16.0-r1.ebuild 2399
+MISC ChangeLog 28329 RMD160 b8c99ca3f4fdb574d4a2b656fda4fba3fbdbd02a SHA1 85d940b8b65fa95660c9cff7c24d664513e8670b SHA256 0bef1042a96611228d8dc4ad84cc1227ae319644ab170ef08c1d6c5bf556af2f
+MD5 a0bbea2b7d7884fb0094d8960c164f90 ChangeLog 28329
+RMD160 b8c99ca3f4fdb574d4a2b656fda4fba3fbdbd02a ChangeLog 28329
+SHA256 0bef1042a96611228d8dc4ad84cc1227ae319644ab170ef08c1d6c5bf556af2f ChangeLog 28329
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -114,9 +113,13 @@ SHA256 bb570a6e1ed458d3e0173c04dcdddf3bd535f6a5cbda70592e5c472edbc9aa8a files/di
 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
-MD5 159d51b5a3c189bee847cd80eeb309ce files/digest-gnome-vfs-2.16.0 256
-RMD160 7260a5f39064295fe4e11d6572b0c4203f10b180 files/digest-gnome-vfs-2.16.0 256
-SHA256 74dddd6b6a6332cab3a356cf0656795443dbeb2ba66317c54dc3b5ee6fdf5b64 files/digest-gnome-vfs-2.16.0 256
 MD5 159d51b5a3c189bee847cd80eeb309ce files/digest-gnome-vfs-2.16.0-r1 256
 RMD160 7260a5f39064295fe4e11d6572b0c4203f10b180 files/digest-gnome-vfs-2.16.0-r1 256
 SHA256 74dddd6b6a6332cab3a356cf0656795443dbeb2ba66317c54dc3b5ee6fdf5b64 files/digest-gnome-vfs-2.16.0-r1 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFFHxADomPajV0RnrERAtzOAJ9l945y/0GOp0ZUuxm+08FTm9F+KACcDJYf
+49nDZAwHFunJRflbnqecpLo=
+=qKQD
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.0 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.0
deleted file mode 100644
index 29f11795b592..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fdea9d7be42320c3fa6a09e645613480 gnome-vfs-2.16.0.tar.bz2 1890562
-RMD160 9f4008c0e8cae26513006e4c1f1c1c126116d8ef gnome-vfs-2.16.0.tar.bz2 1890562
-SHA256 d1854eed8ef93ac2f111d56367106159153bb5857793a880b13271bb5fb34361 gnome-vfs-2.16.0.tar.bz2 1890562
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.16.0.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.16.0.ebuild
deleted file mode 100644
index 9a25188bc74e..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.16.0.ebuild
+++ /dev/null
@@ -1,87 +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.16.0.ebuild,v 1.4 2006/09/16 21:08:42 vapier Exp $
-
-inherit eutils gnome2 autotools
-
-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"
-IUSE="avahi doc gnutls hal ipv6 samba ssl"
-
-RDEPEND=">=gnome-base/gconf-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
-	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
-				>=sys-apps/dbus-0.32
-			)
-	avahi? ( >=net-dns/avahi-0.6 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-PDEPEND="hal? ( >=gnome-base/gnome-mount-0.4 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-pkg_setup() {
-	if use hal ; then
-		G2CONF="--with-hal-mount=/usr/bin/gnome-mount \
-				--with-hal-umount=/usr/bin/gnome-umount \
-				--with-hal-eject=/usr/bin/gnome-eject"
-	fi
-
-	G2CONF="${G2CONF}                 \
-		--disable-schemas-install     \
-		--disable-cdda                \
-		--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-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
-
-	# For gtk-doc macro failure when it's not installed
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="."
-	eautoreconf
-}