Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
Date: Sat, 01 Dec 2018 17:41:39
Message-Id: 1543686089.6e876fbac63dff1da3ecab7601dd3ab8713fd911.eva@gentoo
1 commit: 6e876fbac63dff1da3ecab7601dd3ab8713fd911
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 1 17:26:51 2018 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 1 17:41:29 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=6e876fba
7
8 gnome-base/nautilus: use gtk-doc instead of doc USE flag
9
10 As discussed on gentoo-dev mailing list, this is now the standard for
11 gtk-doc documentation.
12
13 Message-ID: <1535141206.6451.19.camel <AT> gentoo.org>
14 Subject: [gentoo-dev] [RFC] New global USE flag: gtk-doc
15 Package-Manager: Portage-2.3.52, Repoman-2.3.12
16 Manifest-Sign-Key: 0x5A56C8CD0C13248A
17 Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org>
18
19 gnome-base/nautilus/nautilus-3.26.4-r1.ebuild | 9 ++++-----
20 1 file changed, 4 insertions(+), 5 deletions(-)
21
22 diff --git a/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild b/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild
23 index 8c82d5fe..716a0347 100644
24 --- a/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild
25 +++ b/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild
26 @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
27
28 LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
29 SLOT="0"
30 -IUSE="doc exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
31 +IUSE="exif gnome gtk-doc +introspection packagekit +previewer selinux sendto tracker xmp"
32
33 KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
34
35 @@ -45,7 +45,7 @@ DEPEND="${COMMON_DEPEND}
36 virtual/pkgconfig
37 x11-base/xorg-proto
38
39 - doc? ( dev-util/gtk-doc )
40 + gtk-doc? ( dev-util/gtk-doc )
41 "
42 RDEPEND="${COMMON_DEPEND}
43 gnome-base/dconf
44 @@ -74,12 +74,11 @@ src_prepare() {
45 }
46
47 src_configure() {
48 - # FIXME no doc useflag??
49 local emesonargs=(
50 "-Denable-desktop=true"
51 "-Denable-profiling=false"
52 "-Dtracker=$(usex tracker auto disabled)"
53 - $(meson_use doc enable-gtk-doc)
54 + $(meson_use gtk-doc enable-gtk-doc)
55 $(meson_use exif enable-exif)
56 $(meson_use packagekit enable-packagekit)
57 $(meson_use sendto enable-nst-extension)
58 @@ -111,7 +110,7 @@ pkg_postinst() {
59 }
60
61 pkg_postrm() {
62 - gnome2_icon_cache_update
63 xdg_pkg_postrm
64 + gnome2_icon_cache_update
65 gnome2_schemas_update
66 }