From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gvfs/
Date: Mon, 21 Apr 2014 14:40:11 +0000 (UTC) [thread overview]
Message-ID: <1398087279.f843ce64c961ce23a135b046e6c5556f0a8f236d.eva@gentoo> (raw)
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] )
next reply other threads:[~2014-04-21 14:40 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-21 14:40 Gilles Dartiguelongue [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-09-14 8:44 [gentoo-commits] proj/gnome:master commit in: gnome-base/gvfs/ Mart Raudsepp
2018-09-10 21:33 Gilles Dartiguelongue
2018-07-31 14:34 Sobhan Mohammadpour
2018-02-14 19:56 Sobhan Mohammadpour
2018-01-12 13:20 Dennis Lamm
2015-10-13 20:03 Ole Reifschneider
2015-05-17 15:39 Gilles Dartiguelongue
2014-12-22 23:11 Gilles Dartiguelongue
2014-11-23 22:27 Gilles Dartiguelongue
2014-02-12 20:58 Gilles Dartiguelongue
2013-12-18 22:49 Gilles Dartiguelongue
2013-03-27 0:37 Priit Laes
2013-03-25 9:46 Nirbheek Chauhan
2013-01-22 8:12 Alexandre Rostovtsev
2012-12-27 23:02 Alexandre Rostovtsev
2012-09-25 15:59 Alexandre Rostovtsev
2012-09-22 15:54 Nirbheek Chauhan
2012-04-24 3:58 Alexandre Restovtsev
2011-10-18 7:57 Alexandre Restovtsev
2011-06-27 20:25 Alexandre Restovtsev
2011-05-30 17:43 Nirbheek Chauhan
2011-04-27 22:22 Gilles Dartiguelongue
2011-04-10 18:04 Gilles Dartiguelongue
2011-04-05 0:57 Nirbheek Chauhan
2011-03-22 1:18 Nirbheek Chauhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1398087279.f843ce64c961ce23a135b046e6c5556f0a8f236d.eva@gentoo \
--to=eva@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox