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

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     6e876fbac63dff1da3ecab7601dd3ab8713fd911
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  1 17:26:51 2018 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Dec  1 17:41:29 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=6e876fba

gnome-base/nautilus: use gtk-doc instead of doc USE flag

As discussed on gentoo-dev mailing list, this is now the standard for
gtk-doc documentation.

Message-ID: <1535141206.6451.19.camel <AT> gentoo.org>
Subject: [gentoo-dev] [RFC] New global USE flag: gtk-doc
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Manifest-Sign-Key: 0x5A56C8CD0C13248A
Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org>

 gnome-base/nautilus/nautilus-3.26.4-r1.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild b/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild
index 8c82d5fe..716a0347 100644
--- a/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild
+++ b/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
-IUSE="doc exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
+IUSE="exif gnome gtk-doc +introspection packagekit +previewer selinux sendto tracker xmp"
 
 KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
@@ -45,7 +45,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	x11-base/xorg-proto
 
-	doc? ( dev-util/gtk-doc )
+	gtk-doc? ( dev-util/gtk-doc )
 "
 RDEPEND="${COMMON_DEPEND}
 	gnome-base/dconf
@@ -74,12 +74,11 @@ src_prepare() {
 }
 
 src_configure() {
-	# FIXME no doc useflag??
 	local emesonargs=(
 		"-Denable-desktop=true"
 		"-Denable-profiling=false"
 		"-Dtracker=$(usex tracker auto disabled)"
-		$(meson_use doc enable-gtk-doc)
+		$(meson_use gtk-doc enable-gtk-doc)
 		$(meson_use exif enable-exif)
 		$(meson_use packagekit enable-packagekit)
 		$(meson_use sendto enable-nst-extension)
@@ -111,7 +110,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
 	xdg_pkg_postrm
+	gnome2_icon_cache_update
 	gnome2_schemas_update
 }