commit: 1b48f05a26ab97df869ebcc62893b6c8f37817e9
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 7 21:32:02 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 17:30:10 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1b48f05a
gnome-base/nautilus: 3.10.1 → 3.12.0
---
.../{nautilus-9999.ebuild => nautilus-3.12.0.ebuild} | 19 +++----------------
gnome-base/nautilus/nautilus-9999.ebuild | 4 ++--
2 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/gnome-base/nautilus/nautilus-9999.ebuild
b/gnome-base/nautilus/nautilus-3.12.0.ebuild
similarity index 88%
copy from gnome-base/nautilus/nautilus-9999.ebuild
copy to gnome-base/nautilus/nautilus-3.12.0.ebuild
index dc8cbf2..97a973d 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -7,9 +7,6 @@ GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
inherit eutils gnome2 readme.gentoo virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="A file manager for the GNOME desktop"
HOMEPAGE="http://live.gnome.org/Nautilus";
@@ -19,12 +16,7 @@ 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 ~arm-linux ~x86-linux"
-fi
+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"
@@ -36,7 +28,7 @@ RESTRICT="test"
COMMON_DEPEND="
>=dev-libs/glib-2.35.3:2
>=x11-libs/pango-1.28.3
- >=x11-libs/gtk+-3.9.11:3[introspection?]
+ >=x11-libs/gtk+-3.11.6:3[introspection?]
>=dev-libs/libxml2-2.7.8:2
>=gnome-base/gnome-desktop-3:3=
@@ -81,11 +73,6 @@ PDEPEND="
"
# Need gvfs[gtk] for recent:/// support
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- doc? ( >=dev-util/gtk-doc-1.4 )"
-fi
-
src_prepare() {
if use previewer; then
DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media
files.
diff --git a/gnome-base/nautilus/nautilus-9999.ebuild
b/gnome-base/nautilus/nautilus-9999.ebuild
index dc8cbf2..e5ebfa0 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -36,7 +36,7 @@ RESTRICT="test"
COMMON_DEPEND="
>=dev-libs/glib-2.35.3:2
>=x11-libs/pango-1.28.3
- >=x11-libs/gtk+-3.9.11:3[introspection?]
+ >=x11-libs/gtk+-3.11.6:3[introspection?]
>=dev-libs/libxml2-2.7.8:2
>=gnome-base/gnome-desktop-3:3=
