Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/claws-mail/
Date: Tue, 29 Sep 2015 07:36:08
Message-Id: 1443512158.945c4ddacaed8b04c78bcf975da49caedc547706.polynomial-c@gentoo
1 commit: 945c4ddacaed8b04c78bcf975da49caedc547706
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 29 07:35:15 2015 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 29 07:35:58 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=945c4dda
7
8 mail-client/claws-mail: sieve plugin requires gnutls (bug #560798)
9
10 Make compilation of sieve plugin optional. Minor ebuild corrections.
11
12 Package-Manager: portage-2.2.22
13 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
14
15 mail-client/claws-mail/claws-mail-3.12.0.ebuild | 22 ++++++++++++----------
16 mail-client/claws-mail/metadata.xml | 1 +
17 2 files changed, 13 insertions(+), 10 deletions(-)
18
19 diff --git a/mail-client/claws-mail/claws-mail-3.12.0.ebuild b/mail-client/claws-mail/claws-mail-3.12.0.ebuild
20 index 5a90bc3..0abc916 100644
21 --- a/mail-client/claws-mail/claws-mail-3.12.0.ebuild
22 +++ b/mail-client/claws-mail/claws-mail-3.12.0.ebuild
23 @@ -2,7 +2,7 @@
24 # Distributed under the terms of the GNU General Public License v2
25 # $Id$
26
27 -EAPI="5"
28 +EAPI=5
29
30 PYTHON_COMPAT=( python2_7 )
31 AUTOTOOLS_AUTORECONF=yes
32 @@ -18,12 +18,13 @@ SLOT="0"
33 LICENSE="GPL-3"
34 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
35
36 -IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
37 -REQUIRED_USE="networkmanager? ( dbus )
38 - smime? ( pgp )
39 - libcanberra? ( notification )
40 +IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
41 +REQUIRED_USE="libcanberra? ( notification )
42 libindicate? ( notification )
43 - libnotify? ( notification )"
44 + libnotify? ( notification )
45 + networkmanager? ( dbus )
46 + sieve? ( gnutls )
47 + smime? ( pgp )"
48
49 # Plugins are all integrated or dropped since 3.9.1
50 PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
51 @@ -129,6 +130,7 @@ src_configure() {
52 $(use_enable python python-plugin)
53 $(use_enable rss rssyl-plugin)
54 $(use_enable spamassassin spamassassin-plugin)
55 + $(use_enable sieve managesieve-plugin)
56 $(use_enable smime smime-plugin)
57 $(use_enable spam-report spam_report-plugin)
58 $(use_enable webkit fancy-plugin)
59 @@ -165,12 +167,12 @@ src_install() {
60 # => also install it in /usr/share/pixmaps for other desktop envs
61 # => also install higher resolution icons in /usr/share/icons/hicolor/...
62 insinto /usr/share/pixmaps
63 - doins ${PN}.png || die
64 + doins ${PN}.png
65 local res resdir
66 for res in 64x64 128x128 ; do
67 resdir="/usr/share/icons/hicolor/${res}/apps"
68 insinto ${resdir}
69 - newins ${PN}-${res}.png ${PN}.png || die
70 + newins ${PN}-${res}.png ${PN}.png
71 done
72
73 docinto tools
74 @@ -181,8 +183,8 @@ src_install() {
75 einfo "Installing extra tools"
76 cd "${S}"/tools
77 exeinto /usr/$(get_libdir)/${PN}/tools
78 - doexe *.pl *.py *.conf *.sh || die
79 - doexe tb2claws-mail update-po uudec uuooffice || die
80 + doexe *.pl *.py *.conf *.sh
81 + doexe tb2claws-mail update-po uudec uuooffice
82
83 # kill useless files
84 rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
85
86 diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
87 index 7719354..798d327 100644
88 --- a/mail-client/claws-mail/metadata.xml
89 +++ b/mail-client/claws-mail/metadata.xml
90 @@ -28,6 +28,7 @@
91 <flag name="notification">Notification for new mail in
92 different way, see also USE flags libcanberra,
93 libindicate and libnotify</flag>
94 + <flag name="sieve">Build plugin for sieve filter support</flag>
95 <flag name="smime">Build plugin for S/MIME support</flag>
96 <flag name="spamassassin">Build <pkg>mail-filter/spamassassin</pkg>
97 plugin</flag>