| 1 |
commit: 12c5abc5f4353e7b94e35ac3f83068ebb67b8f5a |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 14 18:10:24 2020 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 14 18:10:44 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12c5abc5 |
| 7 |
|
| 8 |
mail-client/mutt-1.14.0-r1: revbump to enable USE=autocrypt support |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/722874 |
| 11 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
| 12 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 13 |
|
| 14 |
mail-client/mutt/metadata.xml | 1 + |
| 15 |
.../{mutt-1.14.0.ebuild => mutt-1.14.0-r1.ebuild} | 19 ++++++++++++++++--- |
| 16 |
2 files changed, 17 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml |
| 19 |
index 6d9a60c2d6f..f418ce80a68 100644 |
| 20 |
--- a/mail-client/mutt/metadata.xml |
| 21 |
+++ b/mail-client/mutt/metadata.xml |
| 22 |
@@ -5,6 +5,7 @@ |
| 23 |
<email>grobian@g.o</email> |
| 24 |
</maintainer> |
| 25 |
<use> |
| 26 |
+ <flag name="autocrypt">Enable autocrypt.org support</flag> |
| 27 |
<flag name="berkdb">Enable <pkg>sys-libs/db</pkg> database backend |
| 28 |
for header caching</flag> |
| 29 |
<flag name="gdbm">Enable <pkg>sys-libs/gdbm</pkg> database backend |
| 30 |
|
| 31 |
diff --git a/mail-client/mutt/mutt-1.14.0.ebuild b/mail-client/mutt/mutt-1.14.0-r1.ebuild |
| 32 |
similarity index 92% |
| 33 |
rename from mail-client/mutt/mutt-1.14.0.ebuild |
| 34 |
rename to mail-client/mutt/mutt-1.14.0-r1.ebuild |
| 35 |
index 45ba49cadf8..655ecdfe2af 100644 |
| 36 |
--- a/mail-client/mutt/mutt-1.14.0.ebuild |
| 37 |
+++ b/mail-client/mutt/mutt-1.14.0-r1.ebuild |
| 38 |
@@ -14,7 +14,7 @@ MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz" |
| 39 |
SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz |
| 40 |
https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz |
| 41 |
https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}" |
| 42 |
-IUSE="berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix" |
| 43 |
+IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix" |
| 44 |
# hcache: allow multiple, bug #607360 |
| 45 |
REQUIRED_USE=" |
| 46 |
hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) |
| 47 |
@@ -23,7 +23,8 @@ REQUIRED_USE=" |
| 48 |
smime-classic? ( ssl !gnutls ) |
| 49 |
smtp? ( ssl sasl ) |
| 50 |
sasl? ( || ( imap pop smtp ) ) |
| 51 |
- kerberos? ( || ( imap pop smtp ) )" |
| 52 |
+ kerberos? ( || ( imap pop smtp ) ) |
| 53 |
+ autocrypt? ( gpgme )" |
| 54 |
SLOT="0" |
| 55 |
LICENSE="GPL-2" |
| 56 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 57 |
@@ -52,6 +53,7 @@ CDEPEND=" |
| 58 |
kerberos? ( virtual/krb5 ) |
| 59 |
idn? ( net-dns/libidn2 ) |
| 60 |
gpgme? ( >=app-crypt/gpgme-0.9.0:= ) |
| 61 |
+ autocrypt? ( >=dev-db/sqlite-3 ) |
| 62 |
slang? ( sys-libs/slang ) |
| 63 |
!slang? ( >=sys-libs/ncurses-5.2:0= ) |
| 64 |
" |
| 65 |
@@ -118,6 +120,7 @@ src_prepare() { |
| 66 |
src_configure() { |
| 67 |
local myconf=( |
| 68 |
# signing and encryption |
| 69 |
+ $(use_enable autocrypt) $(use_with autocrypt sqlite3) |
| 70 |
$(use_enable pgp-classic pgp) |
| 71 |
$(use_enable smime-classic smime) |
| 72 |
$(use_enable gpgme) |
| 73 |
@@ -215,7 +218,7 @@ src_install() { |
| 74 |
} >> "${ED}"/etc/${PN}/Muttrc |
| 75 |
|
| 76 |
# add setting to actually enable gpgme usage |
| 77 |
- if use gpgme ; then |
| 78 |
+ if use gpgme || use autocrypt ; then |
| 79 |
{ |
| 80 |
echo |
| 81 |
echo "# this setting enables the gpgme backend (via USE=gpgme)" |
| 82 |
@@ -225,6 +228,16 @@ src_install() { |
| 83 |
} >> "${ED}"/etc/${PN}/Muttrc |
| 84 |
fi |
| 85 |
|
| 86 |
+ # similar for autocrypt |
| 87 |
+ if use autocrypt ; then |
| 88 |
+ { |
| 89 |
+ echo |
| 90 |
+ echo "# enables autocrypt (via USE=autocrypt)" |
| 91 |
+ echo "# see http://www.mutt.org/doc/manual/#autocryptdoc" |
| 92 |
+ echo "set autocrypt = yes" |
| 93 |
+ } >> "${ED}"/etc/${PN}/Muttrc |
| 94 |
+ fi |
| 95 |
+ |
| 96 |
# A newer file is provided by app-misc/mime-types. So we link it. |
| 97 |
rm "${ED}"/etc/${PN}/mime.types |
| 98 |
dosym ../mime.types /etc/${PN}/mime.types |
Archives