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

[Gilles Dartiguelongue]

commit:     718b7ddcdc2fe01bb20045d52a05a72e01ccb252
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 22:05:54 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec  1 14:57:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=718b7ddc

gnome-base/nautilus: 3.8.2 → 3.10.1

---
 gnome-base/nautilus/nautilus-9999.ebuild | 75 ++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 28 deletions(-)

diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-9999.ebuild
index 7c8dbc8..dc8cbf2 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
+GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
 
-inherit eutils gnome2 virtualx
+inherit eutils gnome2 readme.gentoo virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -16,13 +16,14 @@ HOMEPAGE="http://live.gnome.org/Nautilus"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
+
 # profiling?
 IUSE="debug exif gnome +introspection packagekit +previewer 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 ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 # FIXME: tests fails under Xvfb, but pass when building manually
@@ -33,14 +34,14 @@ 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.33.13:2
+	>=dev-libs/glib-2.35.3:2
 	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.5.12:3[introspection?]
+	>=x11-libs/gtk+-3.9.11:3[introspection?]
 	>=dev-libs/libxml2-2.7.8:2
 	>=gnome-base/gnome-desktop-3:3=
 
 	gnome-base/dconf
-	gnome-base/gsettings-desktop-schemas
+	>=gnome-base/gsettings-desktop-schemas-3.8.0
 	>=x11-libs/libnotify-0.7:=
 	x11-libs/libX11
 	x11-libs/libXext
@@ -48,8 +49,9 @@ COMMON_DEPEND="
 
 	exif? ( >=media-libs/libexif-0.6.20 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	tracker? ( >=app-misc/tracker-0.14:= )
-	xmp? ( >=media-libs/exempi-2.1.0 )"
+	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
@@ -57,20 +59,26 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.1
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xproto"
+	x11-proto/xproto
+"
 RDEPEND="${COMMON_DEPEND}
 	packagekit? ( app-admin/packagekit-base )
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )"
+	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
+"
+
 # For eautoreconf
 #	gnome-base/gnome-common
 #	dev-util/gtk-doc-am"
-PDEPEND="gnome? (
+
+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]"
+	>=gnome-base/gvfs-1.14[gtk]
+"
 # Need gvfs[gtk] for recent:/// support
 
 if [[ ${PV} = 9999 ]]; then
@@ -79,26 +87,34 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 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
+
 	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
 	# bug #393663
 	epatch "${FILESDIR}/${PN}-3.5.91-delete.patch"
 
+	# 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 ChangeLog* HACKING MAINTAINERS NEWS README THANKS"
-	G2CONF="${G2CONF}
-		--disable-profiling
-		--disable-update-mimedb
-		$(use_enable debug)
-		$(use_enable exif libexif)
-		$(use_enable introspection)
-		$(use_enable packagekit)
-		$(use_enable sendto nst-extension)
-		$(use_enable tracker)
-		$(use_enable xmp)"
-	gnome2_src_configure
+	DOCS="AUTHORS HACKING MAINTAINERS NEWS README* THANKS"
+	gnome2_src_configure \
+		--disable-profiling \
+		--disable-update-mimedb \
+		$(use_enable debug) \
+		$(use_enable exif libexif) \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable sendto nst-extension) \
+		$(use_enable tracker) \
+		$(use_enable xmp)
 }
 
 src_test() {
@@ -109,13 +125,16 @@ src_test() {
 	unset GSETTINGS_BACKEND
 }
 
+src_install() {
+	use previewer && readme.gentoo_create_doc
+	gnome2_src_install
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst
 
 	if use previewer; then
-		elog "nautilus uses gnome-extra/sushi to preview media files."
-		elog "To activate the previewer, select a file and press space; to"
-		elog "close the previewer, press space again."
+		readme.gentoo_print_elog
 	else
 		elog "To preview media files, emerge nautilus with USE=previewer"
 	fi