| 1 |
commit: 6f76c969e6f0a4b07cac14d8d81386d5c2425997 |
| 2 |
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 21 19:54:07 2015 +0000 |
| 4 |
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 21 19:54:07 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=6f76c969 |
| 7 |
|
| 8 |
mail-client/evolution: Sync with tree version |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
Manifest-Sign-Key: 7E8B4D42 |
| 12 |
|
| 13 |
mail-client/evolution/evolution-3.17.92.ebuild | 23 ++++------------------- |
| 14 |
1 file changed, 4 insertions(+), 19 deletions(-) |
| 15 |
|
| 16 |
diff --git a/mail-client/evolution/evolution-3.17.92.ebuild b/mail-client/evolution/evolution-3.17.92.ebuild |
| 17 |
index b17f476..a92ad4e 100644 |
| 18 |
--- a/mail-client/evolution/evolution-3.17.92.ebuild |
| 19 |
+++ b/mail-client/evolution/evolution-3.17.92.ebuild |
| 20 |
@@ -7,9 +7,6 @@ GCONF_DEBUG="no" |
| 21 |
GNOME2_LA_PUNT="yes" |
| 22 |
|
| 23 |
inherit eutils flag-o-matic readme.gentoo gnome2 |
| 24 |
-if [[ ${PV} = 9999 ]]; then |
| 25 |
- inherit gnome2-live |
| 26 |
-fi |
| 27 |
|
| 28 |
DESCRIPTION="Integrated mail, addressbook and calendaring functionality" |
| 29 |
HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" |
| 30 |
@@ -18,18 +15,11 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" |
| 31 |
LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP" |
| 32 |
SLOT="2.0" |
| 33 |
IUSE="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather" |
| 34 |
-if [[ ${PV} = 9999 ]]; then |
| 35 |
- IUSE="${IUSE} doc" |
| 36 |
- KEYWORDS="" |
| 37 |
-else |
| 38 |
- # Needs x11-libs/libcryptui keyworded |
| 39 |
- #KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" |
| 40 |
- KEYWORDS="~amd64 ~x86 ~x86-fbsd" |
| 41 |
-fi |
| 42 |
+KEYWORDS="~amd64 ~x86 ~x86-fbsd" |
| 43 |
|
| 44 |
# We need a graphical pinentry frontend to be able to ask for the GPG |
| 45 |
# password from inside evolution, bug 160302 |
| 46 |
-PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] )" |
| 47 |
+PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] )" |
| 48 |
|
| 49 |
# glade-3 support is for maintainers only per configure.ac |
| 50 |
# pst is not mature enough and changes API/ABI frequently |
| 51 |
@@ -39,7 +29,7 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] )" |
| 52 |
COMMON_DEPEND=" |
| 53 |
>=app-crypt/gcr-3.4 |
| 54 |
>=app-text/enchant-1.1.7 |
| 55 |
- >=dev-libs/glib-2.40:2 |
| 56 |
+ >=dev-libs/glib-2.40:2[dbus] |
| 57 |
>=dev-libs/libxml2-2.7.3:2 |
| 58 |
>=gnome-base/gnome-desktop-2.91.3:3= |
| 59 |
>=gnome-base/gsettings-desktop-schemas-2.91.92 |
| 60 |
@@ -114,15 +104,11 @@ file from /usr/share/applications if you use a different browser)." |
| 61 |
src_prepare() { |
| 62 |
# Fix relink issues in src_install |
| 63 |
ELTCONF="--reverse-deps" |
| 64 |
- |
| 65 |
gnome2_src_prepare |
| 66 |
- |
| 67 |
} |
| 68 |
|
| 69 |
src_configure() { |
| 70 |
# Use NSS/NSPR only if 'ssl' is enabled. |
| 71 |
- local myconf |
| 72 |
- [[ ${PV} != 9999 ]] && myconf="${myconf} ITSTOOL=$(type -P true)" |
| 73 |
gnome2_src_configure \ |
| 74 |
--without-glade-catalog \ |
| 75 |
--disable-autoar \ |
| 76 |
@@ -143,8 +129,7 @@ src_configure() { |
| 77 |
--without-nspr-includes |
| 78 |
--without-nss-libs |
| 79 |
--without-nss-includes") \ |
| 80 |
- $(use_enable weather) \ |
| 81 |
- ${myconf} |
| 82 |
+ $(use_enable weather) |
| 83 |
} |
| 84 |
|
| 85 |
src_install() { |
Archives