Make http backend optional so people can avoid pulling in gnome deps, fixes bug 271511

Package-Manager: portage-2.1.7.17/cvs/Linux i686

4 files changed, 15 insertions, 8 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 38b82e4a8ea8..5f32294de079 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.94 2010/02/24 23:26:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.95 2010/03/03 09:55:34 nirbheek Exp $
+
+  03 Mar 2010; Nirbheek Chauhan <nirbheek@gentoo.org> gvfs-1.4.3.ebuild,
+  metadata.xml:
+  Make http backend optional so people can avoid pulling in gnome deps,
+  fixes bug 271511
 
   24 Feb 2010; Gilles Dartiguelongue <eva@gentoo.org> -gvfs-1.0.3-r2.ebuild,
   -gvfs-1.0.3-r13.ebuild, -files/gvfs-1.0.3-bluez4-debug.patch,
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 6f25e1809a21..1b1f7a2fa630 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -3,6 +3,6 @@ AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 RMD160 0c6d83f8b38cf41002dbe6f
 DIST gvfs-1.2.3.tar.bz2 1041079 RMD160 ea8469449073b9a0e50fde4301fa5bc4ff5bbe56 SHA1 c94d52b0bf2fe83d7e26c05ce9d65d240cd57be4 SHA256 395d480c1b64504ba75a8deb70ef6790f2ff07538fca73ef1d26a996223e5879
 DIST gvfs-1.4.3.tar.bz2 1263024 RMD160 da1458101257f5496b4469acb7bc7c646fd9c652 SHA1 3c28516893d6829b3bbae1768fb44e8a405c44e7 SHA256 3ca9ccab2efb2699b72a1f346d3533fc727b5ea2692af6c86adfd9532d6ba15d
 EBUILD gvfs-1.2.3.ebuild 2196 RMD160 3e91f2df2a75b28f528bc907812aad7a43e97d67 SHA1 b38ce67504f22e129fe3c751dc464d20383aab1f SHA256 618733ea882b30cb8e28e33f6d8087e09ddcff700372c7c2832ed0895e1638f6
-EBUILD gvfs-1.4.3.ebuild 2830 RMD160 e2e2895722ec34dd7c38b2a483c4ba2a40562980 SHA1 478ed31607d83048235d6fc0498416f13a6277d7 SHA256 5fba3b2356836da9c185a23cb077ff9762e2f958aebbea959f4ff9e42bc2a486
-MISC ChangeLog 13354 RMD160 960bbf9f458cf1ff09b7d2915b53d30972a277a4 SHA1 30fa0acaf6e6791f9f2a85c881d5a610a0873d7a SHA256 244971901020ce96186a4815055f59a67f6de256efb5565febb84fbf6c52448f
-MISC metadata.xml 932 RMD160 0a9dfc77656b6f035d833003d00a34fc7bc51213 SHA1 4a200aa26ceba493d6eb59feb269668619c092a5 SHA256 196c4a5412f54bfb81959c1fb1a12c3a7dbcb020045c9f11ecad473026a2b32e
+EBUILD gvfs-1.4.3.ebuild 2853 RMD160 120ee7ed348386c2d21848d90281adbd197d12bf SHA1 5ac154f61e8833a3b40c9d032a4699920fcc460d SHA256 d9c07ec140ee04da533a1447bfa8809b0970504f098da00ada42259fab151614
+MISC ChangeLog 13540 RMD160 348ae33f339ff2749bbe877f8ce542e37851a6ab SHA1 8849aeb00a3df554fb278c9847a60501fd5cbb04 SHA256 63d9b57cc252662924b9726b00b62eefef6f337bd21d6187bd02c74a4f524a83
+MISC metadata.xml 1026 RMD160 9f60ad05b950ee45d8500c8640f26021f397ab5f SHA1 dd73b18963c0beb12f4ea099833c1376952f0c3b SHA256 b5aa8baad5d63d30113e894a8630e80fb5350dbd91903949e336bd604925fd38
diff --git a/gnome-base/gvfs/gvfs-1.4.3.ebuild b/gnome-base/gvfs/gvfs-1.4.3.ebuild
index 327ae2864366..69b2d77ee7cd 100644
--- a/gnome-base/gvfs/gvfs-1.4.3.ebuild
+++ b/gnome-base/gvfs/gvfs-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.4.3.ebuild,v 1.5 2010/02/19 17:15:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.4.3.ebuild,v 1.6 2010/03/03 09:55:34 nirbheek Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -13,11 +13,11 @@ HOMEPAGE="http://www.gnome.org"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="archive avahi bluetooth cdda doc fuse gdu gnome gnome-keyring gphoto2 hal samba +udev"
+IUSE="archive avahi bluetooth cdda doc fuse gdu gnome gnome-keyring gphoto2 hal
++http samba +udev"
 
 RDEPEND=">=dev-libs/glib-2.21.2
 	>=sys-apps/dbus-1.0
-	>=net-libs/libsoup-2.25.1[gnome]
 	dev-libs/libxml2
 	net-misc/openssh
 	>=sys-fs/udev-138
@@ -39,6 +39,7 @@ RDEPEND=">=dev-libs/glib-2.21.2
 	hal? (
 		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
 		>=sys-apps/hal-0.5.10 )
+	http? ( >=net-libs/libsoup-gnome-2.25.1 )
 	samba? ( || ( net-fs/samba-libs[smbclient]
 			<=net-fs/samba-3.3 ) )"
 DEPEND="${RDEPEND}
@@ -57,7 +58,6 @@ pkg_setup() {
 
 	G2CONF="${G2CONF}
 		--enable-udev
-		--enable-http
 		--disable-bash-completion
 		$(use_enable archive)
 		$(use_enable avahi)
@@ -69,6 +69,7 @@ pkg_setup() {
 		$(use_enable gphoto2)
 		$(use_enable udev gudev)
 		$(use_enable hal)
+		$(use_enable http)
 		$(use_enable gnome-keyring keyring)
 		$(use_enable samba)"
 }
diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index 45b3bd485569..f71befad44bd 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -15,6 +15,7 @@ applications not using gio to access the gvfs filesystems.
 	<flag name='fuse'>Enables fuse mount points in $HOME/.gvfs for legacy
 		application access</flag>
 	<flag name="gdu">Enable <pkg>sys-apps/gnome-disk-utility</pkg> integration</flag>
+	<flag name="http">Enable the HTTP/DAV backend using <pkg>net-libs/libsoup-gnome</pkg></flag>
 	<flag name="udev">Enable udev base replacement code for cdda feature</flag>
 </use>
 </pkgmetadata>