commit: 03aabc2a4e2255bf074582448bb486f875686207
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 19:58:27 2015 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 20:03:37 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=03aabc2a
gnome-base/gvfs: Bump version to 1.26.1
Package-Manager: portage-2.2.23
Manifest-Sign-Key: 0xE9E568677E8B4D42
.../gvfs/{gvfs-9999.ebuild => gvfs-1.26.1.ebuild} | 34 ++++++++++------------
gnome-base/gvfs/gvfs-9999.ebuild | 12 ++++++--
gnome-base/gvfs/metadata.xml | 2 ++
3 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/gnome-base/gvfs/gvfs-9999.ebuild
b/gnome-base/gvfs/gvfs-1.26.1.ebuild
similarity index 80%
copy from gnome-base/gvfs/gvfs-9999.ebuild
copy to gnome-base/gvfs/gvfs-1.26.1.ebuild
index 5bc8427..a16541b 100644
--- a/gnome-base/gvfs/gvfs-9999.ebuild
+++ b/gnome-base/gvfs/gvfs-1.26.1.ebuild
@@ -7,9 +7,6 @@ GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
inherit autotools bash-completion-r1 eutils gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="Virtual filesystem implementation for gio"
HOMEPAGE="https://git.gnome.org/browse/gvfs";
@@ -17,25 +14,18 @@ HOMEPAGE="https://git.gnome.org/browse/gvfs";
LICENSE="LGPL-2+"
SLOT="0"
-IUSE="afp archive bluray cdda fuse gnome-online-accounts gphoto2 gtk +http ios
libsecret mtp nfs samba systemd test +udev udisks zeroconf"
+IUSE="afp archive bluray cdda fuse +gcr gnome-online-accounts google gphoto2
gtk +http ios libsecret mtp nfs samba systemd test +udev udisks zeroconf"
REQUIRED_USE="
cdda? ( udev )
mtp? ( udev )
udisks? ( udev )
systemd? ( udisks )
"
-
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
- DOCS=""
- IUSE="${IUSE} doc"
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
~sparc-solaris ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
~sparc-solaris ~x86-solaris"
# Can use libgphoto-2.5.0 as well. Automagic detection.
RDEPEND="
- >=dev-libs/glib-2.43.2:2
+ >=dev-libs/glib-2.45.7:2
sys-apps/dbus
dev-libs/libxml2:2
net-misc/openssh
@@ -43,7 +33,12 @@ RDEPEND="
archive? ( app-arch/libarchive:= )
bluray? ( media-libs/libbluray )
fuse? ( >=sys-fs/fuse-2.8.0 )
+ gcr? ( app-crypt/gcr )
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
+ google? (
+ >=net-libs/gnome-online-accounts-3.17.1
+ dev-libs/libgdata
+ )
gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
gtk? ( >=x11-libs/gtk+-3.0:3 )
http? ( >=net-libs/libsoup-2.42:2.4 )
@@ -79,10 +74,9 @@ DEPEND="${RDEPEND}
# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
# test dependencies needed per https://bugzilla.gnome.org/700162
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- doc? ( >=dev-util/gtk-doc-1 )"
-fi
+# Tests with multiple failures, this is being handled upstream at:
+# https://bugzilla.gnome.org/700162
+RESTRICT="test"
src_prepare() {
DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" #
ChangeLog.pre-1.2 README.commits
@@ -93,7 +87,8 @@ src_prepare() {
-e 's/burn.mount/ /' \
-i daemon/Makefile.am || die
- [[ ${PV} = 9999 ]] || eautoreconf
+ # Uncomment when eautoreconf stops being needed always
+ eautoreconf
fi
gnome2_src_prepare
@@ -107,7 +102,6 @@ src_configure() {
--with-bash-completion-dir="$(get_bashcompdir)" \
--disable-gdu \
--disable-hal \
- --disable-obexftp \
--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
--enable-documentation \
$(use_enable afp) \
@@ -115,7 +109,9 @@ src_configure() {
$(use_enable bluray) \
$(use_enable cdda) \
$(use_enable fuse) \
+ $(use_enable gcr gcr) \
$(use_enable gnome-online-accounts goa) \
+ $(use_enable google google) \
$(use_enable gphoto2) \
$(use_enable gtk) \
$(use_enable ios afc) \
diff --git a/gnome-base/gvfs/gvfs-9999.ebuild b/gnome-base/gvfs/gvfs-9999.ebuild
index 5bc8427..babfead 100644
--- a/gnome-base/gvfs/gvfs-9999.ebuild
+++ b/gnome-base/gvfs/gvfs-9999.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://git.gnome.org/browse/gvfs";
LICENSE="LGPL-2+"
SLOT="0"
-IUSE="afp archive bluray cdda fuse gnome-online-accounts gphoto2 gtk +http ios
libsecret mtp nfs samba systemd test +udev udisks zeroconf"
+IUSE="afp archive bluray cdda fuse +gcr gnome-online-accounts google gphoto2
gtk +http ios libsecret mtp nfs samba systemd test +udev udisks zeroconf"
REQUIRED_USE="
cdda? ( udev )
mtp? ( udev )
@@ -35,7 +35,7 @@ fi
# Can use libgphoto-2.5.0 as well. Automagic detection.
RDEPEND="
- >=dev-libs/glib-2.43.2:2
+ >=dev-libs/glib-2.45.7:2
sys-apps/dbus
dev-libs/libxml2:2
net-misc/openssh
@@ -43,7 +43,12 @@ RDEPEND="
archive? ( app-arch/libarchive:= )
bluray? ( media-libs/libbluray )
fuse? ( >=sys-fs/fuse-2.8.0 )
+ gcr? ( app-crypt/gcr )
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
+ google? (
+ >=net-libs/gnome-online-accounts-3.17.1
+ dev-libs/libgdata
+ )
gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
gtk? ( >=x11-libs/gtk+-3.0:3 )
http? ( >=net-libs/libsoup-2.42:2.4 )
@@ -107,7 +112,6 @@ src_configure() {
--with-bash-completion-dir="$(get_bashcompdir)" \
--disable-gdu \
--disable-hal \
- --disable-obexftp \
--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
--enable-documentation \
$(use_enable afp) \
@@ -115,7 +119,9 @@ src_configure() {
$(use_enable bluray) \
$(use_enable cdda) \
$(use_enable fuse) \
+ $(use_enable gcr gcr) \
$(use_enable gnome-online-accounts goa) \
+ $(use_enable google google) \
$(use_enable gphoto2) \
$(use_enable gtk) \
$(use_enable ios afc) \
diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index c4c9f8e..cb602d6 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -17,7 +17,9 @@ applications not using gio to access the gvfs filesystems.
<flag name='bluray'>Enable playback of Blu-ray filesystems using
<pkg>media-libs/libbluray</pkg></flag>
<flag name='fuse'>Enables fuse mount points in $HOME/.gvfs for legacy
application access</flag>
+ <flag name="gcr">Enable support for <pkg>app-crypt/gcr</pkg></flag>
<flag name="gnome-online-accounts">Enable configuration panel for
<pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
+ <flag name="google">Add google drive support</flag>
<flag name="http">Enable the HTTP/DAV backend using
<pkg>net-libs/libsoup-gnome</pkg></flag>
<flag name="libsecret">Enable <pkg>app-crypt/libsecret</pkg> support to
store login credentials.</flag>
<flag name="nfs">Enable NFS client support via
<pkg>net-fs/libnfs</pkg>.</flag>
