Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/
Date: Tue, 11 Sep 2018 09:02:41
Message-Id: 1536656548.9a62a700c9ba2bed96650c230ff88456032d8f5e.leio@gentoo
1 commit: 9a62a700c9ba2bed96650c230ff88456032d8f5e
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 11 09:02:28 2018 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 11 09:02:28 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9a62a700
7
8 mail-client/evolution: synchronize live ebuild
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.10
11
12 mail-client/evolution/evolution-9999.ebuild | 14 ++++++--------
13 1 file changed, 6 insertions(+), 8 deletions(-)
14
15 diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
16 index 13c6c18b..77d63fe7 100644
17 --- a/mail-client/evolution/evolution-9999.ebuild
18 +++ b/mail-client/evolution/evolution-9999.ebuild
19 @@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
20 LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
21 SLOT="2.0"
22
23 -IUSE="archive +bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather ytnef"
24 +IUSE="archive +bogofilter crypt geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
25
26 KEYWORDS=""
27
28 @@ -73,9 +73,9 @@ COMMON_DEPEND="
29 "
30 DEPEND="${COMMON_DEPEND}
31 app-text/docbook-xml-dtd:4.1.2
32 - app-text/yelp-tools
33 dev-util/gdbus-codegen
34 - >=dev-util/gtk-doc-am-1.14
35 + dev-util/glib-utils
36 + gtk-doc? ( dev-util/gtk-doc )
37 >=dev-util/intltool-0.40.0
38 >=sys-devel/gettext-0.18.3
39 virtual/pkgconfig
40 @@ -100,18 +100,16 @@ x-scheme-handler/https=firefox.desktop
41 file from /usr/share/applications if you use a different browser)."
42
43 src_prepare() {
44 - # Leave post-install actions to eclass
45 - sed -e "s;\(find_program(GTK_UPDATE_ICON_CACHE\).*;\1 $(type -P true));" \
46 - -i "${S}"/cmake/modules/IconCache.cmake || die
47 -
48 + cmake-utils_src_prepare
49 gnome2_src_prepare
50 }
51
52 src_configure() {
53 # Use NSS/NSPR only if 'ssl' is enabled.
54 local mycmakeargs=(
55 + -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
56 -DENABLE_SCHEMAS_COMPILE=OFF
57 - -DENABLE_GTK_DOC=OFF
58 + -DENABLE_GTK_DOC=$(usex gtk-doc)
59 -DWITH_OPENLDAP=$(usex ldap)
60 -DENABLE_SMIME=$(usex ssl)
61 -DENABLE_GNOME_DESKTOP=ON