add fam USE flag, fix bug #212822. remove neon from RDEPEND since it is an imported library anyway.

Package-Manager: portage-2.1.4.4

3 files changed, 24 insertions, 19 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 8fcaccc72c51..670ad539509f 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.284 2008/03/23 01:54:51 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.285 2008/04/05 16:50:38 eva Exp $
+
+  05 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-vfs-2.22.0.ebuild:
+  add fam USE flag, fix bug #212822. remove neon from RDEPEND since it is an
+  imported library anyway.
 
 *gnome-vfs-2.22.0 (23 Mar 2008)
 
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index aa363b7c6a95..c9dbeaf0ce21 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -13,13 +13,13 @@ 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
 EBUILD gnome-vfs-2.18.1.ebuild 2911 RMD160 84258e4951db9ea461409d8e22df3e2500c83d2a SHA1 990b855f774d9e23efcb26c07bec2c7f8ed4245f SHA256 3b4958fba8e9f363f3a4cb92f3650c4ccfad65366a295df62cda5c0b71e833cf
 EBUILD gnome-vfs-2.20.1-r1.ebuild 3160 RMD160 75e2dae79f0311ca9fe23ac908c5a59ed16e5b0f SHA1 a4d71c02e725c69c061a918975c3d9ee4c1e7909 SHA256 65585d78fbaf08aa2e34a544ed7dd0ef741a4c1047df5ace5c196a070d496398
-EBUILD gnome-vfs-2.22.0.ebuild 3165 RMD160 53327b0e9803512c9445df761c8b1471ceffe348 SHA1 220a64e96b40dad1756f619ff10336aa000f11ed SHA256 c1f4a18e4a1afb14daa5589fe9711bf9f4e3959f70173e850e9a823f2688f9d4
-MISC ChangeLog 37218 RMD160 ae92c09b26a77db85b5dbe40d20ac1ba2ef08bff SHA1 eecc5833ea78ee9873b3086274af0ecdb7cde61c SHA256 bf7a5dea1e03f4829ab4bd895f96509efdbcacaee416902bd4994c1c7e5dbece
+EBUILD gnome-vfs-2.22.0.ebuild 3185 RMD160 e389ba14973dd4a4cdbe699ff80cfe51dfc07c46 SHA1 cc7201327eba9d91c6841df77d60d4bc3997e6bd SHA256 2b9b0f6043c0f43404eeab668c3cc87a14b081040aeb778de590365224dca87c
+MISC ChangeLog 37403 RMD160 456c402fe750f5bd087d45680b840dadc7913727 SHA1 0ab686a0b4d973bf79e936e4ce6e664348dd948b SHA256 38e8c33157e27035e12aeeee1bdd7a0cd850b0f68e5522436084377eefefec13
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkfluHIACgkQkeYb6olFHJd/DQCdF8sN8DCQmMC1vY9dDtAxT3o5
-3J4An2F2Z/uTbh018pFWgTqt8vXDwLQs
-=E/I6
+iD8DBQFH963j1fmVwcYIWAYRAsAiAKCxLmPR2g1YclV47LfoGqk7PDJLSQCg79KE
+CJ4L9NdyN66FeOBTd0HBrLM=
+=7c+c
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.22.0.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.22.0.ebuild
index b99661b4f6f3..66812a38b0b4 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.22.0.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.22.0.ebuild,v 1.1 2008/03/23 01:54:51 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.22.0.ebuild,v 1.2 2008/04/05 16:50:38 eva Exp $
 
 WANT_AUTOMAKE=1.8
 inherit eutils gnome2 autotools
@@ -11,14 +11,13 @@ 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 gnutls hal ipv6 kerberos samba ssl"
+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
-	>=net-misc/neon-0.25.3
 	app-arch/bzip2
-	virtual/fam
+	fam? ( virtual/fam )
 	gnome-base/gnome-mime-data
 	>=x11-misc/shared-mime-info-0.14
 	>=dev-libs/dbus-glib-0.71
@@ -46,7 +45,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9
 	doc? ( >=dev-util/gtk-doc-1 )"
-PDEPEND="hal? ( >=gnome-base/gnome-mount-0.4 )"
+PDEPEND="hal? ( >=gnome-base/gnome-mount-0.6 )"
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
 
@@ -55,15 +54,16 @@ pkg_setup() {
 		--disable-schemas-install
 		--disable-cdda
 		--disable-howl
-		--enable-http-neon
-		$(use_enable ssl openssl)
+		$(use_enable acl)
+		$(use_enable avahi)
+		$(use_enable fam)
 		$(use_enable gnutls)
-		$(use_enable samba)
-		$(use_enable ipv6)
 		$(use_enable hal)
-		$(use_enable avahi)
+		$(use_enable ipv6)
 		$(use_enable kerberos krb5)
-		$(use_enable acl)"
+		$(use_enable samba)
+		$(use_enable ssl openssl)"
+		# Useless ? --enable-http-neon
 
 	if use hal ; then
 		G2CONF="${G2CONF}
@@ -72,7 +72,7 @@ pkg_setup() {
 			--with-hal-eject=/usr/bin/gnome-eject"
 	fi
 
-	# this works because of the order of conifgure parsing
+	# 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"