From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 71774138336 for ; Sat, 1 Dec 2018 17:41:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93074E0970; Sat, 1 Dec 2018 17:41:38 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4FBD1E0970 for ; Sat, 1 Dec 2018 17:41:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 40141335C5D for ; Sat, 1 Dec 2018 17:41:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 270C14E7 for ; Sat, 1 Dec 2018 17:41:34 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1543686089.d92f9bae154cc8e4f54e203ca3ef368c3533f204.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/nautilus/nautilus-9999.ebuild X-VCS-Directories: gnome-base/nautilus/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: d92f9bae154cc8e4f54e203ca3ef368c3533f204 X-VCS-Branch: master Date: Sat, 1 Dec 2018 17:41:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d6a85602-d687-4ff6-8d0b-7d63a6cbb027 X-Archives-Hash: e46a60f33ba9937e7f995c9d8a2125b5 commit: d92f9bae154cc8e4f54e203ca3ef368c3533f204 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Dec 1 17:30:53 2018 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sat Dec 1 17:41:29 2018 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=d92f9bae gnome-base/nautilus: sync live ebuild Package-Manager: Portage-2.3.52, Repoman-2.3.12 Manifest-Sign-Key: 0x5A56C8CD0C13248A Signed-off-by: Gilles Dartiguelongue gentoo.org> gnome-base/nautilus/nautilus-9999.ebuild | 89 +++++++++++++++----------------- 1 file changed, 43 insertions(+), 46 deletions(-) diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-9999.ebuild index 7b1340d5..f49bf82c 100644 --- a/gnome-base/nautilus/nautilus-9999.ebuild +++ b/gnome-base/nautilus/nautilus-9999.ebuild @@ -1,12 +1,14 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' -inherit gnome2 readme.gentoo-r1 virtualx +inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg if [[ ${PV} = 9999 ]]; then - inherit gnome2-live + inherit git-r3 + SRC_URI="" + EGIT_SRC_URI="https://gitlab.gnome.org/GNOME/${PN}" fi DESCRIPTION="A file manager for the GNOME desktop" @@ -14,14 +16,9 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus" LICENSE="GPL-2+ LGPL-2+ FDL-1.1" SLOT="0" -IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp" +IUSE="exif gnome gtk-doc +introspection packagekit +previewer selinux sendto tracker xmp" -if [[ ${PV} = 9999 ]]; then - IUSE="${IUSE} doc" - KEYWORDS="" -else - KEYWORDS="~amd64 ~arm64 ~ia64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -fi +KEYWORDS="" # FIXME: tests fails under Xvfb, but pass when building manually # "FAIL: check failed in nautilus-file.c, line 8307" @@ -31,55 +28,46 @@ RESTRICT="test" # Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 # and 2.30.0 COMMON_DEPEND=" - >=app-arch/gnome-autoar-0.1 - >=dev-libs/glib-2.49.1:2[dbus] + >=app-arch/gnome-autoar-0.2.1 + >=dev-libs/glib-2.51.2:2[dbus] >=x11-libs/pango-1.28.3 - >=x11-libs/gtk+-3.21.6:3[introspection?] + >=x11-libs/gtk+-3.22.6:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3= - gnome-base/dconf >=gnome-base/gsettings-desktop-schemas-3.8.0 x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) selinux? ( >=sys-libs/libselinux-2 ) - tracker? ( >=app-misc/tracker-0.16:= ) + tracker? ( >=app-misc/tracker-2:= ) xmp? ( >=media-libs/exempi-2.1.0:2 ) " DEPEND="${COMMON_DEPEND} - >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.33 - >=dev-util/gtk-doc-am-1.10 >=sys-devel/gettext-0.19.7 virtual/pkgconfig x11-base/xorg-proto + + gtk-doc? ( dev-util/gtk-doc ) " RDEPEND="${COMMON_DEPEND} + gnome-base/dconf packagekit? ( app-admin/packagekit-base ) sendto? ( !