commit: f843ce64c961ce23a135b046e6c5556f0a8f236d
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 21 13:28:27 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Apr 21 13:34:39 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f843ce64
gnome-base/gvfs: 1.18.3 → 1.20.1
---
.../gvfs/{gvfs-9999.ebuild => gvfs-1.20.1.ebuild} | 31 +++++++---------------
gnome-base/gvfs/gvfs-9999.ebuild | 6 ++---
2 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/gnome-base/gvfs/gvfs-9999.ebuild
b/gnome-base/gvfs/gvfs-1.20.1.ebuild
similarity index 84%
copy from gnome-base/gvfs/gvfs-9999.ebuild
copy to gnome-base/gvfs/gvfs-1.20.1.ebuild
index 83bf831..7bc181c 100644
--- a/gnome-base/gvfs/gvfs-9999.ebuild
+++ b/gnome-base/gvfs/gvfs-1.20.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";
@@ -23,15 +20,7 @@ REQUIRED_USE="
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"
- DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" #
ChangeLog.pre-1.2 README.commits
-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="
@@ -39,7 +28,7 @@ RDEPEND="
sys-apps/dbus
dev-libs/libxml2:2
net-misc/openssh
- afp? ( >=dev-libs/libgcrypt-1.2.2:= )
+ afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
archive? ( app-arch/libarchive:= )
avahi? ( >=net-dns/avahi-0.6 )
bluetooth? (
@@ -56,14 +45,14 @@ RDEPEND="
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
gtk? ( >=x11-libs/gtk+-3.0:3 )
- http? ( >=net-libs/libsoup-gnome-2.34:2.4 )
+ http? ( >=net-libs/libsoup-2.42:2.4 )
ios? (
>=app-pda/libimobiledevice-1.1.5:=
>=app-pda/libplist-1:= )
libsecret? ( app-crypt/libsecret )
mtp? ( >=media-libs/libmtp-1.1.6 )
samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client]
) )
- systemd? ( sys-apps/systemd )
+ systemd? ( sys-apps/systemd:0= )
udev? (
cdda? ( || ( dev-libs/libcdio-paranoia
<dev-libs/libcdio-0.90[-minimal] ) )
virtual/udev[gudev] )
@@ -81,15 +70,14 @@ DEPEND="${RDEPEND}
|| (
net-analyzer/netcat
net-analyzer/netcat6 ) )
- !udev? ( >=dev-libs/libgcrypt-1.2.2 )
+ !udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
"
# 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() {
if ! use udev; then
@@ -98,7 +86,7 @@ src_prepare() {
-e 's/burn.mount/ /' \
-i daemon/Makefile.am || die
- [[ ${PV} = 9999 ]] || eautoreconf
+ eautoreconf
fi
gnome2_src_prepare
@@ -134,6 +122,7 @@ src_configure() {
}
src_install() {
+ DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" #
ChangeLog.pre-1.2 README.commits
gnome2_src_install
dobashcomp programs/completion/gvfs
}
diff --git a/gnome-base/gvfs/gvfs-9999.ebuild b/gnome-base/gvfs/gvfs-9999.ebuild
index 83bf831..a1a5ae1 100644
--- a/gnome-base/gvfs/gvfs-9999.ebuild
+++ b/gnome-base/gvfs/gvfs-9999.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
sys-apps/dbus
dev-libs/libxml2:2
net-misc/openssh
- afp? ( >=dev-libs/libgcrypt-1.2.2:= )
+ afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
archive? ( app-arch/libarchive:= )
avahi? ( >=net-dns/avahi-0.6 )
bluetooth? (
@@ -56,14 +56,14 @@ RDEPEND="
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
gtk? ( >=x11-libs/gtk+-3.0:3 )
- http? ( >=net-libs/libsoup-gnome-2.34:2.4 )
+ http? ( >=net-libs/libsoup-2.42:2.4 )
ios? (
>=app-pda/libimobiledevice-1.1.5:=
>=app-pda/libplist-1:= )
libsecret? ( app-crypt/libsecret )
mtp? ( >=media-libs/libmtp-1.1.6 )
samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client]
) )
- systemd? ( sys-apps/systemd )
+ systemd? ( sys-apps/systemd:0= )
udev? (
cdda? ( || ( dev-libs/libcdio-paranoia
<dev-libs/libcdio-0.90[-minimal] ) )
virtual/udev[gudev] )
