summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-05-15 07:59:18 +0000
committerPacho Ramos <pacho@gentoo.org>2014-05-15 07:59:18 +0000
commit49ecc2330edf3ec8a4a2c27e5a28bd6c86de9698 (patch)
tree6f1b2c68e92d50be54de07c5f175ee5dab232fc1 /gnome-base
parentDrop old version #510318 (diff)
downloadgentoo-2-49ecc2330edf3ec8a4a2c27e5a28bd6c86de9698.tar.gz
gentoo-2-49ecc2330edf3ec8a4a2c27e5a28bd6c86de9698.tar.bz2
gentoo-2-49ecc2330edf3ec8a4a2c27e5a28bd6c86de9698.zip
Disable obexftp backend, upstream bug #729945
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gvfs/ChangeLog5
-rw-r--r--gnome-base/gvfs/gvfs-1.20.1.ebuild12
2 files changed, 8 insertions, 9 deletions
diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 608a0632ea99..398d5a96eb9d 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for gnome-base/gvfs
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.255 2014/05/14 16:16:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.256 2014/05/15 07:59:18 pacho Exp $
+
+ 15 May 2014; Pacho Ramos <pacho@gentoo.org> gvfs-1.20.1.ebuild:
+ Disable obexftp backend, upstream bug #729945
14 May 2014; Agostino Sarubbo <ago@gentoo.org> gvfs-1.18.3-r1.ebuild:
Stable for sparc, wrt bug #508862
diff --git a/gnome-base/gvfs/gvfs-1.20.1.ebuild b/gnome-base/gvfs/gvfs-1.20.1.ebuild
index 438dccb288fe..b25828579996 100644
--- a/gnome-base/gvfs/gvfs-1.20.1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.20.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.20.1.ebuild,v 1.1 2014/04/27 17:02:41 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.20.1.ebuild,v 1.2 2014/05/15 07:59:18 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/gvfs"
LICENSE="LGPL-2+"
SLOT="0"
-IUSE="afp archive avahi bluetooth bluray cdda fuse gnome-online-accounts gphoto2 gtk +http ios libsecret mtp samba systemd test +udev udisks"
+IUSE="afp archive avahi bluray cdda fuse gnome-online-accounts gphoto2 gtk +http ios libsecret mtp samba systemd test +udev udisks"
REQUIRED_USE="
cdda? ( udev )
udisks? ( udev )
@@ -31,11 +31,6 @@ RDEPEND="
afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
archive? ( app-arch/libarchive:= )
avahi? ( >=net-dns/avahi-0.6 )
- bluetooth? (
- >=app-mobilephone/obex-data-server-0.4.5
- dev-libs/dbus-glib
- net-wireless/bluez
- dev-libs/expat )
bluray? ( media-libs/libbluray )
fuse? ( >=sys-fs/fuse-2.8.0 )
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
@@ -90,16 +85,17 @@ src_prepare() {
src_configure() {
# --enable-documentation installs man pages
+ # --disable-obexftp, upstream bug #729945
gnome2_src_configure \
--disable-bash-completion \
--disable-gdu \
--disable-hal \
+ --disable-obexftp \
--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
--enable-documentation \
$(use_enable afp) \
$(use_enable archive) \
$(use_enable avahi) \
- $(use_enable bluetooth obexftp) \
$(use_enable bluray) \
$(use_enable cdda) \
$(use_enable fuse) \