commit: 7fd2cd077b0a48a2a2d67e83cebdf138a77ff61d
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 4 11:05:19 2015 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 20:46:13 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=7fd2cd07
gnome-base/nautilus: Bump version to 3.18.0
Package-Manager: portage-2.2.22
Manifest-Sign-Key: 7E8B4D42
...nautilus-9999.ebuild => nautilus-3.18.0.ebuild} | 23 +++++-----------------
gnome-base/nautilus/nautilus-9999.ebuild | 6 +++---
2 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/gnome-base/nautilus/nautilus-9999.ebuild
b/gnome-base/nautilus/nautilus-3.18.0.ebuild
similarity index 84%
copy from gnome-base/nautilus/nautilus-9999.ebuild
copy to gnome-base/nautilus/nautilus-3.18.0.ebuild
index 6b9ea11..ca079ba 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-3.18.0.ebuild
@@ -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="https://wiki.gnome.org/Apps/Nautilus";
@@ -18,13 +15,8 @@ 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 ~arm-linux ~x86-linux"
-fi
+IUSE="exif gnome +introspection packagekit +previewer 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"
@@ -34,9 +26,9 @@ 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.43.4:2[dbus]
+ >=dev-libs/glib-2.45.7:2[dbus]
>=x11-libs/pango-1.28.3
- >=x11-libs/gtk+-3.15.2:3[introspection?]
+ >=x11-libs/gtk+-3.17.5:3[introspection?]
>=dev-libs/libxml2-2.7.8:2
>=gnome-base/gnome-desktop-3:3=
@@ -54,7 +46,7 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
>=dev-lang/perl-5
>=dev-util/gdbus-codegen-2.33
- >=dev-util/gtk-doc-am-1.4
+ >=dev-util/gtk-doc-am-1.10
>=dev-util/intltool-0.40.1
sys-devel/gettext
virtual/pkgconfig
@@ -80,11 +72,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 6b9ea11..71e45dc 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-9999.ebuild
@@ -34,9 +34,9 @@ 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.43.4:2[dbus]
+ >=dev-libs/glib-2.45.7:2[dbus]
>=x11-libs/pango-1.28.3
- >=x11-libs/gtk+-3.15.2:3[introspection?]
+ >=x11-libs/gtk+-3.17.5:3[introspection?]
>=dev-libs/libxml2-2.7.8:2
>=gnome-base/gnome-desktop-3:3=
@@ -54,7 +54,7 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
>=dev-lang/perl-5
>=dev-util/gdbus-codegen-2.33
- >=dev-util/gtk-doc-am-1.4
+ >=dev-util/gtk-doc-am-1.10
>=dev-util/intltool-0.40.1
sys-devel/gettext
virtual/pkgconfig
