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 3013F138330 for ; Tue, 29 May 2018 20:54:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DAEBDE07F2; Tue, 29 May 2018 20:54:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 9CE48E07F2 for ; Tue, 29 May 2018 20:54:47 +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 43F0E335C76 for ; Tue, 29 May 2018 20:54:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D3A7296 for ; Tue, 29 May 2018 20:54:44 +0000 (UTC) From: "Sobhan Mohammadpour" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sobhan Mohammadpour" Message-ID: <1527627277.16179dfba3f0ac4332c2ce3ff8903b075fa553fa.sobhan@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.26.6.ebuild mail-client/evolution/evolution-9999.ebuild mail-client/evolution/metadata.xml X-VCS-Directories: mail-client/evolution/ X-VCS-Committer: sobhan X-VCS-Committer-Name: Sobhan Mohammadpour X-VCS-Revision: 16179dfba3f0ac4332c2ce3ff8903b075fa553fa X-VCS-Branch: master Date: Tue, 29 May 2018 20:54:44 +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: f3070ae1-ecc1-4c94-9405-c7dd8405db73 X-Archives-Hash: af3c5cf56dbcba8ed3935d0846bb46f8 commit: 16179dfba3f0ac4332c2ce3ff8903b075fa553fa Author: Sobhan Mohammadpour gentoo org> AuthorDate: Tue May 29 20:54:37 2018 +0000 Commit: Sobhan Mohammadpour gentoo org> CommitDate: Tue May 29 20:54:37 2018 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=16179dfb mail-client/evolution: bump and sync live ebuild Package-Manager: Portage-2.3.36, Repoman-2.3.9 Manifest-Sign-Key: 0x7DF238CF0AA182E1 ...olution-9999.ebuild => evolution-3.26.6.ebuild} | 118 ++++++++++----------- mail-client/evolution/evolution-9999.ebuild | 115 ++++++++++---------- mail-client/evolution/metadata.xml | 8 +- 3 files changed, 114 insertions(+), 127 deletions(-) diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-3.26.6.ebuild similarity index 62% copy from mail-client/evolution/evolution-9999.ebuild copy to mail-client/evolution/evolution-3.26.6.ebuild index 476b39b6..f585a9af 100644 --- a/mail-client/evolution/evolution-9999.ebuild +++ b/mail-client/evolution/evolution-3.26.6.ebuild @@ -1,15 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="5" -GCONF_DEBUG="no" +EAPI=6 GNOME2_LA_PUNT="yes" -inherit eutils flag-o-matic readme.gentoo gnome2 -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi +inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1 DESCRIPTION="Integrated mail, addressbook and calendaring functionality" HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" @@ -17,36 +12,30 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" # Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". 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 + +IUSE="archive +bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather ytnef" + +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86" # 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] app-crypt/pinentry[qt5] )" # glade-3 support is for maintainers only per configure.ac # pst is not mature enough and changes API/ABI frequently # dconf explicitely needed for backup plugin # gnome-desktop support is optional with --enable-gnome-desktop -# gnome-autoar (currently disabled because no release has been made) COMMON_DEPEND=" - >=app-crypt/gcr-3.4 + >=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-1.1.7 - >=dev-libs/glib-2.40:2[dbus] + >=dev-libs/glib-2.46: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 >=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 - >=net-libs/webkit-gtk-2.2:3 + >=net-libs/webkit-gtk-2.16.0:4 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.10:3 @@ -60,32 +49,34 @@ COMMON_DEPEND=" x11-libs/libSM x11-libs/libICE + archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) crypt? ( >=app-crypt/gnupg-1.4 ${PINENTRY_DEPEND} x11-libs/libcryptui ) - map? ( + geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) - spell? ( app-text/gtkspell:3 ) ldap? ( >=net-nds/openldap-2:= ) + spell? ( app-text/gtkspell:3 ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) + ytnef? ( net-mail/ytnef ) " DEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.1.2 - dev-util/gtk-doc-am + app-text/yelp-tools + dev-util/gdbus-codegen + >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.0 + >=sys-devel/gettext-0.18.3 virtual/pkgconfig " -# eautoreconf needs: -# app-text/yelp-tools -# >=gnome-base/gnome-common-2.12 RDEPEND="${COMMON_DEPEND} bogofilter? ( mail-filter/bogofilter ) highlight? ( app-text/highlight ) @@ -93,12 +84,6 @@ RDEPEND="${COMMON_DEPEND} !gnome-extra/evolution-exchange " -if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - app-text/yelp-tools - doc? ( >=dev-util/gtk-doc-1.14 )" -fi - DISABLE_AUTOFORMATTING="yes" DOC_CONTENTS="To change the default browser if you are not using GNOME, edit ~/.local/share/applications/mimeapps.list so it includes the @@ -112,45 +97,50 @@ x-scheme-handler/https=firefox.desktop file from /usr/share/applications if you use a different browser)." src_prepare() { - # Fix relink issues in src_install - ELTCONF="--reverse-deps" + # 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 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 \ - --disable-code-coverage \ - --disable-installed-tests \ - --disable-pst-import \ - --enable-canberra \ - $(use_enable crypt libcryptui) \ - $(use_enable highlight text-highlight) \ - $(use_enable map contact-maps) \ - $(use_enable spell gtkspell) \ - $(use_enable ssl nss) \ - $(use_enable ssl smime) \ - $(use_with bogofilter) \ - $(use_with ldap openldap) \ - $(use_with spamassassin) \ - $(usex ssl --enable-nss=yes "--without-nspr-libs - --without-nspr-includes - --without-nss-libs - --without-nss-includes") \ - $(use_enable weather) \ - ${myconf} + local mycmakeargs=( + -DENABLE_SCHEMAS_COMPILE=OFF + -DENABLE_GTK_DOC=OFF + -DWITH_OPENLDAP=$(usex ldap) + -DENABLE_SMIME=$(usex ssl) + -DENABLE_GNOME_DESKTOP=ON + -DENABLE_CANBERRA=ON + -DENABLE_AUTOAR=$(usex archive) + -DWITH_HELP=ON + -DENABLE_LIBCRYPTUI=$(usex crypt) + -DENABLE_YTNEF=OFF + -DWITH_BOGOFILTER=$(usex bogofilter) + -DWITH_SPAMASSASSIN=$(usex spamassassin) + -DENABLE_GTKSPELL=$(usex spell) + -DENABLE_TEXT_HIGHLIGHT=$(usex highlight) + -DENABLE_WEATHER=$(usex weather) + -DENABLE_CONTACT_MAPS=$(usex geolocation) + -DENABLE_YTNEF=$(usex ytnef) + -DENABLE_PST_IMPORT=OFF + -DWITH_GLADE_CATALOG=OFF + ) + + cmake-utils_src_configure } -src_install() { - DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README" +src_compile() { + cmake-utils_src_compile +} - gnome2_src_install +src_test() { + cmake-utils_src_test +} + +src_install() { + cmake-utils_src_install # Problems with prelink: # https://bugzilla.gnome.org/show_bug.cgi?id=731680 diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild index 476b39b6..13c6c18b 100644 --- a/mail-client/evolution/evolution-9999.ebuild +++ b/mail-client/evolution/evolution-9999.ebuild @@ -1,12 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="5" -GCONF_DEBUG="no" +EAPI=6 GNOME2_LA_PUNT="yes" -inherit eutils flag-o-matic readme.gentoo gnome2 +inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1 if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -17,36 +15,30 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" # Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". 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 + +IUSE="archive +bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather ytnef" + +KEYWORDS="" # 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] app-crypt/pinentry[qt5] )" # glade-3 support is for maintainers only per configure.ac # pst is not mature enough and changes API/ABI frequently # dconf explicitely needed for backup plugin # gnome-desktop support is optional with --enable-gnome-desktop -# gnome-autoar (currently disabled because no release has been made) COMMON_DEPEND=" - >=app-crypt/gcr-3.4 + >=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-1.1.7 - >=dev-libs/glib-2.40:2[dbus] + >=dev-libs/glib-2.46: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 >=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 - >=net-libs/webkit-gtk-2.2:3 + >=net-libs/webkit-gtk-2.16.0:4 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.10:3 @@ -60,32 +52,34 @@ COMMON_DEPEND=" x11-libs/libSM x11-libs/libICE + archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) crypt? ( >=app-crypt/gnupg-1.4 ${PINENTRY_DEPEND} x11-libs/libcryptui ) - map? ( + geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) - spell? ( app-text/gtkspell:3 ) ldap? ( >=net-nds/openldap-2:= ) + spell? ( app-text/gtkspell:3 ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) + ytnef? ( net-mail/ytnef ) " DEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.1.2 - dev-util/gtk-doc-am + app-text/yelp-tools + dev-util/gdbus-codegen + >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.0 + >=sys-devel/gettext-0.18.3 virtual/pkgconfig " -# eautoreconf needs: -# app-text/yelp-tools -# >=gnome-base/gnome-common-2.12 RDEPEND="${COMMON_DEPEND} bogofilter? ( mail-filter/bogofilter ) highlight? ( app-text/highlight ) @@ -93,12 +87,6 @@ RDEPEND="${COMMON_DEPEND} !gnome-extra/evolution-exchange " -if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - app-text/yelp-tools - doc? ( >=dev-util/gtk-doc-1.14 )" -fi - DISABLE_AUTOFORMATTING="yes" DOC_CONTENTS="To change the default browser if you are not using GNOME, edit ~/.local/share/applications/mimeapps.list so it includes the @@ -112,45 +100,50 @@ x-scheme-handler/https=firefox.desktop file from /usr/share/applications if you use a different browser)." src_prepare() { - # Fix relink issues in src_install - ELTCONF="--reverse-deps" + # 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 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 \ - --disable-code-coverage \ - --disable-installed-tests \ - --disable-pst-import \ - --enable-canberra \ - $(use_enable crypt libcryptui) \ - $(use_enable highlight text-highlight) \ - $(use_enable map contact-maps) \ - $(use_enable spell gtkspell) \ - $(use_enable ssl nss) \ - $(use_enable ssl smime) \ - $(use_with bogofilter) \ - $(use_with ldap openldap) \ - $(use_with spamassassin) \ - $(usex ssl --enable-nss=yes "--without-nspr-libs - --without-nspr-includes - --without-nss-libs - --without-nss-includes") \ - $(use_enable weather) \ - ${myconf} + local mycmakeargs=( + -DENABLE_SCHEMAS_COMPILE=OFF + -DENABLE_GTK_DOC=OFF + -DWITH_OPENLDAP=$(usex ldap) + -DENABLE_SMIME=$(usex ssl) + -DENABLE_GNOME_DESKTOP=ON + -DENABLE_CANBERRA=ON + -DENABLE_AUTOAR=$(usex archive) + -DWITH_HELP=ON + -DENABLE_LIBCRYPTUI=$(usex crypt) + -DENABLE_YTNEF=OFF + -DWITH_BOGOFILTER=$(usex bogofilter) + -DWITH_SPAMASSASSIN=$(usex spamassassin) + -DENABLE_GTKSPELL=$(usex spell) + -DENABLE_TEXT_HIGHLIGHT=$(usex highlight) + -DENABLE_WEATHER=$(usex weather) + -DENABLE_CONTACT_MAPS=$(usex geolocation) + -DENABLE_YTNEF=$(usex ytnef) + -DENABLE_PST_IMPORT=OFF + -DWITH_GLADE_CATALOG=OFF + ) + + cmake-utils_src_configure } -src_install() { - DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README" +src_compile() { + cmake-utils_src_compile +} - gnome2_src_install +src_test() { + cmake-utils_src_test +} + +src_install() { + cmake-utils_src_install # Problems with prelink: # https://bugzilla.gnome.org/show_bug.cgi?id=731680 diff --git a/mail-client/evolution/metadata.xml b/mail-client/evolution/metadata.xml index ad4605bc..885e9b3f 100644 --- a/mail-client/evolution/metadata.xml +++ b/mail-client/evolution/metadata.xml @@ -6,17 +6,21 @@ Gentoo GNOME Desktop + Enable archives support in attachments via + app-arch/gnome-autoar Build mail-filter/bogofilter plugin Enable GPG encryption support using app-crypt/gnupg and app-crypt/pinentry + Enable support for displaying contacts on a map + inside evolution using media-libs/libchamplain Enable text highlighting plugin Enable support for fetching contacts from an LDAP or Active Directory server using net-nds/openldap - Enable support for displaying contacts on a map inside - evolution using media-libs/libchamplain Build mail-filter/spamassassin plugin Enable optional weather calendar support + Enable optional TNEF attachments parser support using + net-mail/ytnef