From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BA5691387B1 for ; Mon, 21 Sep 2015 19:54:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7EFBE0886; Mon, 21 Sep 2015 19:54:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3D924E0886 for ; Mon, 21 Sep 2015 19:54:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 361B33407E2 for ; Mon, 21 Sep 2015 19:54:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3FD11186 for ; Mon, 21 Sep 2015 19:54:15 +0000 (UTC) From: "Ole Reifschneider" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ole Reifschneider" Message-ID: <1442865247.6f76c969e6f0a4b07cac14d8d81386d5c2425997.tranquility@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/ X-VCS-Repository: proj/gnome X-VCS-Files: mail-client/evolution/evolution-3.17.92.ebuild X-VCS-Directories: mail-client/evolution/ X-VCS-Committer: tranquility X-VCS-Committer-Name: Ole Reifschneider X-VCS-Revision: 6f76c969e6f0a4b07cac14d8d81386d5c2425997 X-VCS-Branch: master Date: Mon, 21 Sep 2015 19:54:15 +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: c8a3ae0d-e830-403d-b5e8-d4dcb90b0757 X-Archives-Hash: a309edf1df669e32c364dd8edaa81050 commit: 6f76c969e6f0a4b07cac14d8d81386d5c2425997 Author: Ole Reifschneider gentoo org> AuthorDate: Mon Sep 21 19:54:07 2015 +0000 Commit: Ole Reifschneider gentoo org> CommitDate: Mon Sep 21 19:54:07 2015 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=6f76c969 mail-client/evolution: Sync with tree version Package-Manager: portage-2.2.20.1 Manifest-Sign-Key: 7E8B4D42 mail-client/evolution/evolution-3.17.92.ebuild | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/mail-client/evolution/evolution-3.17.92.ebuild b/mail-client/evolution/evolution-3.17.92.ebuild index b17f476..a92ad4e 100644 --- a/mail-client/evolution/evolution-3.17.92.ebuild +++ b/mail-client/evolution/evolution-3.17.92.ebuild @@ -7,9 +7,6 @@ GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" inherit eutils flag-o-matic readme.gentoo gnome2 -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi DESCRIPTION="Integrated mail, addressbook and calendaring functionality" HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" @@ -18,18 +15,11 @@ 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="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather" -if [[ ${PV} = 9999 ]]; then - IUSE="${IUSE} doc" - KEYWORDS="" -else - # Needs x11-libs/libcryptui keyworded - #KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" - KEYWORDS="~amd64 ~x86 ~x86-fbsd" -fi +KEYWORDS="~amd64 ~x86 ~x86-fbsd" # We need a graphical pinentry frontend to be able to ask for the GPG # password from inside evolution, bug 160302 -PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] )" +PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] )" # glade-3 support is for maintainers only per configure.ac # pst is not mature enough and changes API/ABI frequently @@ -39,7 +29,7 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] )" COMMON_DEPEND=" >=app-crypt/gcr-3.4 >=app-text/enchant-1.1.7 - >=dev-libs/glib-2.40:2 + >=dev-libs/glib-2.40:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 @@ -114,15 +104,11 @@ file from /usr/share/applications if you use a different browser)." src_prepare() { # Fix relink issues in src_install ELTCONF="--reverse-deps" - gnome2_src_prepare - } src_configure() { # Use NSS/NSPR only if 'ssl' is enabled. - local myconf - [[ ${PV} != 9999 ]] && myconf="${myconf} ITSTOOL=$(type -P true)" gnome2_src_configure \ --without-glade-catalog \ --disable-autoar \ @@ -143,8 +129,7 @@ src_configure() { --without-nspr-includes --without-nss-libs --without-nss-includes") \ - $(use_enable weather) \ - ${myconf} + $(use_enable weather) } src_install() {