commit: e8ea8e6e9e6f6392977095e30f0a7414df7984f9
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 06:37:21 2017 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 06:37:21 2017 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=e8ea8e6e
gnome-base/nautilus: sync with gentoo repository
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Manifest-Sign-Key: 0x5A56C8CD0C13248A
gnome-base/nautilus/metadata.xml | 1 +
gnome-base/nautilus/nautilus-3.20.0.ebuild | 121 -----------------------------
gnome-base/nautilus/nautilus-9999.ebuild | 39 ++++------
3 files changed, 15 insertions(+), 146 deletions(-)
diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml
index 4e3c7a33..71760b9a 100644
--- a/gnome-base/nautilus/metadata.xml
+++ b/gnome-base/nautilus/metadata.xml
@@ -13,5 +13,6 @@
<flag name="sendto">Enable the nautilus-sendto extension to send files
to
various locations/devices</flag>
<flag name="tracker">Add support for <pkg>app-misc/tracker</pkg>
search</flag>
+ <flag restrict=">=gnome-base/nautilus-3.22" name="tracker">Add
support for <pkg>app-misc/tracker</pkg> search and batch rename</flag>
</use>
</pkgmetadata>
diff --git a/gnome-base/nautilus/nautilus-3.20.0.ebuild
b/gnome-base/nautilus/nautilus-3.20.0.ebuild
deleted file mode 100644
index c70dc4f1..00000000
--- a/gnome-base/nautilus/nautilus-3.20.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
-
-inherit gnome2 readme.gentoo virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: tests fails under Xvfb, but pass when building manually
-# "FAIL: check failed in nautilus-file.c, line 8307"
-# need org.gnome.SessionManager service (aka gnome-session) but cannot find it
-RESTRICT="test"
-
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND="
- >=dev-libs/glib-2.45.7:2[dbus]
- >=x11-libs/pango-1.28.3
- >=x11-libs/gtk+-3.19.12: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:= )
- xmp? ( >=media-libs/exempi-2.1.0 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-lang/perl-5
- >=dev-util/gdbus-codegen-2.33
- >=dev-util/gtk-doc-am-1.10
- >=dev-util/intltool-0.50
- sys-devel/gettext
- virtual/pkgconfig
- x11-proto/xproto
-"
-RDEPEND="${COMMON_DEPEND}
- packagekit? ( app-admin/packagekit-base )
- sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-"
-
-# For eautoreconf
-# gnome-base/gnome-common
-# dev-util/gtk-doc-am"
-
-PDEPEND="
- gnome? (
- >=x11-themes/gnome-icon-theme-1.1.91
- x11-themes/gnome-icon-theme-symbolic )
- tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
- previewer? ( >=gnome-extra/sushi-0.1.9 )
- sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
- >=gnome-base/gvfs-1.14[gtk]
-"
-# Need gvfs[gtk] for recent:/// support
-
-src_prepare() {
- if use previewer; then
- DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media
files.
- To activate the previewer, select a file and press
space; to
- close the previewer, press space again."
- fi
-
- # Remove -D*DEPRECATED flags. Don't leave this for eclass! (bug #448822)
- sed -e 's/DISABLE_DEPRECATED_CFLAGS=.*/DISABLE_DEPRECATED_CFLAGS=/' \
- -i configure || die "sed failed"
-
- gnome2_src_prepare
-}
-
-src_configure() {
- DOCS="AUTHORS HACKING MAINTAINERS NEWS README* THANKS"
- gnome2_src_configure \
- --disable-profiling \
- --disable-update-mimedb \
- $(use_enable exif libexif) \
- $(use_enable introspection) \
- $(use_enable packagekit) \
- $(use_enable sendto nst-extension) \
- $(use_enable selinux) \
- $(use_enable tracker) \
- $(use_enable xmp)
-}
-
-src_test() {
- gnome2_environment_reset
- Xemake check
-}
-
-src_install() {
- use previewer && readme.gentoo_create_doc
- gnome2_src_install
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if use previewer; then
- readme.gentoo_print_elog
- else
- elog "To preview media files, emerge nautilus with
USE=previewer"
- fi
-}
diff --git a/gnome-base/nautilus/nautilus-9999.ebuild
b/gnome-base/nautilus/nautilus-9999.ebuild
index 9e8e3454..9264faf7 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-9999.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=6
GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
-inherit gnome2 readme.gentoo virtualx
+inherit gnome2 readme.gentoo-r1 virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -16,27 +14,27 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus";
LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
SLOT="0"
-
-# profiling?
IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker
xmp"
+
if [[ ${PV} = 9999 ]]; then
IUSE="${IUSE} doc"
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+ KEYWORDS="~amd64 ~arm64 ~ia64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux
~x86-linux"
fi
# FIXME: tests fails under Xvfb, but pass when building manually
# "FAIL: check failed in nautilus-file.c, line 8307"
+# need org.gnome.SessionManager service (aka gnome-session) but cannot find it
RESTRICT="test"
-# FIXME: selinux support is automagic
# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
# and 2.30.0
COMMON_DEPEND="
- >=dev-libs/glib-2.45.7:2[dbus]
+ >=app-arch/gnome-autoar-0.1
+ >=dev-libs/glib-2.49.1:2[dbus]
>=x11-libs/pango-1.28.3
- >=x11-libs/gtk+-3.19.12:3[introspection?]
+ >=x11-libs/gtk+-3.21.6:3[introspection?]
>=dev-libs/libxml2-2.7.8:2
>=gnome-base/gnome-desktop-3:3=
@@ -50,14 +48,13 @@ COMMON_DEPEND="
introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
selinux? ( >=sys-libs/libselinux-2 )
tracker? ( >=app-misc/tracker-0.16:= )
- xmp? ( >=media-libs/exempi-2.1.0 )
+ 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
- >=dev-util/intltool-0.50
- sys-devel/gettext
+ >=sys-devel/gettext-0.19.7
virtual/pkgconfig
x11-proto/xproto
"
@@ -71,9 +68,7 @@ RDEPEND="${COMMON_DEPEND}
# dev-util/gtk-doc-am"
PDEPEND="
- gnome? (
- >=x11-themes/gnome-icon-theme-1.1.91
- x11-themes/gnome-icon-theme-symbolic )
+ gnome? ( x11-themes/adwaita-icon-theme )
tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
previewer? ( >=gnome-extra/sushi-0.1.9 )
sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
@@ -92,17 +87,12 @@ src_prepare() {
To activate the previewer, select a file and press
space; to
close the previewer, press space again."
fi
-
- # Remove -D*DEPRECATED flags. Don't leave this for eclass! (bug #448822)
- sed -e 's/DISABLE_DEPRECATED_CFLAGS=.*/DISABLE_DEPRECATED_CFLAGS=/' \
- -i configure || die "sed failed"
-
gnome2_src_prepare
}
src_configure() {
- DOCS="AUTHORS HACKING MAINTAINERS NEWS README* THANKS"
gnome2_src_configure \
+ --enable-desktop \
--disable-profiling \
--disable-update-mimedb \
$(use_enable exif libexif) \
@@ -115,8 +105,7 @@ src_configure() {
}
src_test() {
- gnome2_environment_reset
- Xemake check
+ virtx emake check
}
src_install() {
