[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/

["Ole Reifschneider" <tranquility@gentoo.org>]

commit:     2769fa9d1cf9076073f48905bb1c9a56ec712a14
Author:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 22:10:37 2016 +0000
Commit:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 00:55:46 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2769fa9d

gnome-base/nautilus: Bump version to 3.20.0

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42

 ...nautilus-3.18.1.ebuild => nautilus-3.20.0.ebuild} | 20 +++++++++-----------
 gnome-base/nautilus/nautilus-9999.ebuild             | 17 ++++++++---------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/gnome-base/nautilus/nautilus-3.18.1.ebuild b/gnome-base/nautilus/nautilus-3.20.0.ebuild
similarity index 86%
rename from gnome-base/nautilus/nautilus-3.18.1.ebuild
rename to gnome-base/nautilus/nautilus-3.20.0.ebuild
index ca079ba..c70dc4f 100644
--- a/gnome-base/nautilus/nautilus-3.18.1.ebuild
+++ b/gnome-base/nautilus/nautilus-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
 
-inherit eutils gnome2 readme.gentoo virtualx
+inherit gnome2 readme.gentoo virtualx
 
 DESCRIPTION="A file manager for the GNOME desktop"
 HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
@@ -14,21 +14,20 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
 
-# profiling?
-IUSE="exif gnome +introspection packagekit +previewer sendto tracker xmp"
+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"
 
-# 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]
 	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.17.5:3[introspection?]
+	>=x11-libs/gtk+-3.19.12:3[introspection?]
 	>=dev-libs/libxml2-2.7.8:2
 	>=gnome-base/gnome-desktop-3:3=
 
@@ -39,7 +38,8 @@ COMMON_DEPEND="
 	x11-libs/libXrender
 
 	exif? ( >=media-libs/libexif-0.6.20 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
+	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 )
 "
@@ -47,7 +47,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
 	>=dev-util/gdbus-codegen-2.33
 	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/intltool-0.40.1
+	>=dev-util/intltool-0.50
 	sys-devel/gettext
 	virtual/pkgconfig
 	x11-proto/xproto
@@ -95,16 +95,14 @@ src_configure() {
 		$(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
-	unset DBUS_SESSION_BUS_ADDRESS
-	export GSETTINGS_BACKEND="memory"
 	Xemake check
-	unset GSETTINGS_BACKEND
 }
 
 src_install() {

diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-9999.ebuild
index 71e45dc..9e8e345 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
 
-inherit eutils gnome2 readme.gentoo virtualx
+inherit gnome2 readme.gentoo virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -18,7 +18,7 @@ LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
 
 # profiling?
-IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp"
+IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
 if [[ ${PV} = 9999 ]]; then
 	IUSE="${IUSE} doc"
 	KEYWORDS=""
@@ -36,7 +36,7 @@ RESTRICT="test"
 COMMON_DEPEND="
 	>=dev-libs/glib-2.45.7:2[dbus]
 	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.17.5:3[introspection?]
+	>=x11-libs/gtk+-3.19.12:3[introspection?]
 	>=dev-libs/libxml2-2.7.8:2
 	>=gnome-base/gnome-desktop-3:3=
 
@@ -47,7 +47,8 @@ COMMON_DEPEND="
 	x11-libs/libXrender
 
 	exif? ( >=media-libs/libexif-0.6.20 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
+	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 )
 "
@@ -55,7 +56,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
 	>=dev-util/gdbus-codegen-2.33
 	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/intltool-0.40.1
+	>=dev-util/intltool-0.50
 	sys-devel/gettext
 	virtual/pkgconfig
 	x11-proto/xproto
@@ -108,16 +109,14 @@ src_configure() {
 		$(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
-	unset DBUS_SESSION_BUS_ADDRESS
-	export GSETTINGS_BACKEND="memory"
 	Xemake check
-	unset GSETTINGS_BACKEND
 }
 
 src_install() {