From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2ABB0138335 for ; Tue, 11 Sep 2018 09:02:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DECB0E0D99; Tue, 11 Sep 2018 09:02:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B8148E0D99 for ; Tue, 11 Sep 2018 09:02:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EDE62335D4C for ; Tue, 11 Sep 2018 09:02:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BAB563D2 for ; Tue, 11 Sep 2018 09:02:35 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1536656548.9a62a700c9ba2bed96650c230ff88456032d8f5e.leio@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/ X-VCS-Repository: proj/gnome X-VCS-Files: mail-client/evolution/evolution-9999.ebuild X-VCS-Directories: mail-client/evolution/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 9a62a700c9ba2bed96650c230ff88456032d8f5e X-VCS-Branch: master Date: Tue, 11 Sep 2018 09:02:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a75871d5-a5b8-41b8-8e6f-62b98d31c481 X-Archives-Hash: 61b0c933692fcaef10e9654ecc8405d9 commit: 9a62a700c9ba2bed96650c230ff88456032d8f5e Author: Mart Raudsepp gentoo org> AuthorDate: Tue Sep 11 09:02:28 2018 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Tue Sep 11 09:02:28 2018 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9a62a700 mail-client/evolution: synchronize live ebuild Package-Manager: Portage-2.3.49, Repoman-2.3.10 mail-client/evolution/evolution-9999.ebuild | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild index 13c6c18b..77d63fe7 100644 --- a/mail-client/evolution/evolution-9999.ebuild +++ b/mail-client/evolution/evolution-9999.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP" SLOT="2.0" -IUSE="archive +bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather ytnef" +IUSE="archive +bogofilter crypt geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef" KEYWORDS="" @@ -73,9 +73,9 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.1.2 - app-text/yelp-tools dev-util/gdbus-codegen - >=dev-util/gtk-doc-am-1.14 + dev-util/glib-utils + gtk-doc? ( dev-util/gtk-doc ) >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.18.3 virtual/pkgconfig @@ -100,18 +100,16 @@ x-scheme-handler/https=firefox.desktop file from /usr/share/applications if you use a different browser)." src_prepare() { - # Leave post-install actions to eclass - sed -e "s;\(find_program(GTK_UPDATE_ICON_CACHE\).*;\1 $(type -P true));" \ - -i "${S}"/cmake/modules/IconCache.cmake || die - + cmake-utils_src_prepare gnome2_src_prepare } src_configure() { # Use NSS/NSPR only if 'ssl' is enabled. local mycmakeargs=( + -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc -DENABLE_SCHEMAS_COMPILE=OFF - -DENABLE_GTK_DOC=OFF + -DENABLE_GTK_DOC=$(usex gtk-doc) -DWITH_OPENLDAP=$(usex ldap) -DENABLE_SMIME=$(usex ssl) -DENABLE_GNOME_DESKTOP=ON