summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2010-03-03 09:55:34 +0000
committerNirbheek Chauhan <nirbheek@gentoo.org>2010-03-03 09:55:34 +0000
commit2de28f50c77eb7696cc29ce6c44b241dd6960437 (patch)
tree3da3cbcba9a7276937d6129b56c79eb035fd9d73 /gnome-base
parentProper ChangeLog. (diff)
downloadgentoo-2-2de28f50c77eb7696cc29ce6c44b241dd6960437.tar.gz
gentoo-2-2de28f50c77eb7696cc29ce6c44b241dd6960437.tar.bz2
gentoo-2-2de28f50c77eb7696cc29ce6c44b241dd6960437.zip
Make http backend optional so people can avoid pulling in gnome deps, fixes bug 271511
(Portage version: 2.1.7.17/cvs/Linux i686)
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gvfs/ChangeLog7
-rw-r--r--gnome-base/gvfs/gvfs-1.4.3.ebuild9
-rw-r--r--gnome-base/gvfs/metadata.xml1
3 files changed, 12 insertions, 5 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/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>