summaryrefslogtreecommitdiff
path: root/mail-client/neomutt
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-06-09 09:27:03 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-06-09 09:27:03 +0100
commitcb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch)
tree047fc92023c520d07f13ec5ac96e094d1b312a7a /mail-client/neomutt
parent7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff)
gentoo resync : 09.06.2018
Diffstat (limited to 'mail-client/neomutt')
-rw-r--r--mail-client/neomutt/Manifest10
-rw-r--r--mail-client/neomutt/neomutt-20171208.ebuild129
-rw-r--r--mail-client/neomutt/neomutt-20171215-r1.ebuild133
-rw-r--r--mail-client/neomutt/neomutt-20171215.ebuild121
-rw-r--r--mail-client/neomutt/neomutt-20180512.ebuild (renamed from mail-client/neomutt/neomutt-20171215-r2.ebuild)17
-rw-r--r--mail-client/neomutt/neomutt-99999999.ebuild56
6 files changed, 37 insertions, 429 deletions
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index ca0ebfb04861..0c8ecfe99b6f 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,12 +1,8 @@
-DIST neomutt-20171208.tar.gz 2703917 BLAKE2B 709cdb7b00e887f01bf6b1e805b25938ceca1a25d77c8674150e32ae4ac28aad10479ab54f172e2b07cab98b903973190faa138de1061ebbf4fcbe09d544ecf9 SHA512 e4f8a5f01d96d6f82959fe583634585deee28cf146c768e5049281b273c5b76b91ee01c9d9382a26f72a092c14341905129e73bf5c6ba19baae7823bc6680671
-DIST neomutt-20171215.tar.gz 2680191 BLAKE2B 9826537ed985cf56e4a52e0938967645ca607fcd57f455e1a521a67875bacc397e1706099291fe5a7a350542d0bc07b7835a908c64d84067fb12e39f973af545 SHA512 8098f537e8ef7d3f7aa87fc875c0dc079b996285b786fe6fc6bdf18154c1282b03a4e19dd6902a110616443ca2b23008c8c1f5c4a615c53b620b537c50dfb658
DIST neomutt-20180223.tar.gz 2695087 BLAKE2B ebe19022dd23914dd3c529b49fac1b58cb965e8974b8cf2f7fd1f417cb9a3f0fcded951d5506092f90ad03b8fd209392143240b1d48560f9772242652a347817 SHA512 6fbbea9e182d087d8fe90094dfcbadaaca2878fa71e024e504999d1a54d853dcd346ea7aa32f421ed9dfdf90c42307f2796518dc43748805c4e36fd5755d4adc
DIST neomutt-20180323.tar.gz 2650465 BLAKE2B 59f11208320e514119e60f6c85a876fed2693b9eae3127fc3fa5a35722a80dfd99b0c6b5a5074711d42b35d459e70f4dda3d29e7358e1d95d5d0d350438290d5 SHA512 997c697300768809823b8d8588c93003c6cd7fcc6cbe7ce524096033e91c618119f78c697ccd15b4c93751b3156d50e611974e8f8b332efb467c031385e9f819
-EBUILD neomutt-20171208.ebuild 3274 BLAKE2B 231f9bff37d1cb6bd6f6dde94e9943adf7835301f917baf95d1ca5d399337719d677cd7dc187cc373b24d92b5f1fd58cf12b9ae87088d94675079567552a8f29 SHA512 fc039a384d5815d5e8b19d66a2236dd2cd006ce09f32d6dfaaebdea4c22c0294e1cb877c9fdc7657fbd7ef243e8c3387b30a178fb13c953b8f60486e6a76d97f
-EBUILD neomutt-20171215-r1.ebuild 3960 BLAKE2B 1e47347a16c8c0f31c2c89f2173e106dfc78f369564bcd4dac1850649dbeb5ebc71afb9094a5a4f8e52c1c8a8ad1bedf0af5839ee4eaaa55b89df52fc22a5dc6 SHA512 5cc4e2c11e859a1d17f96091ffa97bc0ca3843e6debe2dc4dbba05ab71950f47852404bfb89244e7ec2e4b2d60bdf9c4ff6bbc25ce5262637201189bca571a3c
-EBUILD neomutt-20171215-r2.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
-EBUILD neomutt-20171215.ebuild 3470 BLAKE2B 0612a05bd1f2250b350a02b8868fecf1a8711ea246531352012c8894ef118fe50834a16800f464d31e9b30ebed427980c214e1c38f83cb68fe34d15512af4fc9 SHA512 96ef8e7f5e8e2a674ece11e400943545f07d71b7b694a25f41b31bf36cb52080f2c9509954fc8b83f1dd4a8b1c3ae935a1101c0e52b75e2acc649a000b5dfa4f
+DIST neomutt-20180512.tar.gz 2758674 BLAKE2B 47a8d1fe5d5e2725a6ee868b937eea3807ab35dc8eefe47f0d9b1db3aeaa97e69c36e3b8544fc43f1ce0a9980017d654bace8d342094fd7d26ecdb13cdf54253 SHA512 033faa27b01998895d2452d541ed5942cf7dede7a935fc807e6a7f88f3a8c182ea0ab5b4ed7db852ff2afb4d3b990db05477d9ff0dcf7dee186c393244d1db66
EBUILD neomutt-20180223.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
EBUILD neomutt-20180323.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
-EBUILD neomutt-99999999.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
+EBUILD neomutt-20180512.ebuild 4151 BLAKE2B e83a033603433e6cd5074b382a939990bcd048bc1a453024b27375fa1c70fa44a3c750ff596f549325116c434c7cea38d2457413dc0c116e7b576e30f4b40c5c SHA512 3abd149f283125eb048e29ad8295810951a033fbc91072ba5cd32f913031c9633a61eb6b17fc1821cb02b9f570347eed8b4a7e8fd762d30058823728301336dc
+EBUILD neomutt-99999999.ebuild 3269 BLAKE2B 71a2c2172f924211aa4fcf2406fbcd3e05e4c40a0505bbc5a3390e63f76b483a6baca21d8e2ad4f2db079f7b0806053bc4d6db758f9d75721db54f511bd43be8 SHA512 4a327c9ace86888d7e4bf5d71079eba3b70dafd3cc5603b2c4cd54965495beddd5d4397583c81b4e2769fc462e420e4d957cf176abc13648d7cf87c4cffdae6c
MISC metadata.xml 1430 BLAKE2B cde0fee81787af5d8401b456deafc66ac9427a88b25866abbecbf874c30a6acc69375f4c7705916985b79e052ca2c07e2a0c7ab853dbc562e53230ec11c15e28 SHA512 e19508e8851160c14d2bab48f54b3cf959411b3b0ccfe3555414bc563e8300daf03cf328379569fc516576d0065fb440f3f6426509b599d70555282426163cc3
diff --git a/mail-client/neomutt/neomutt-20171208.ebuild b/mail-client/neomutt/neomutt-20171208.ebuild
deleted file mode 100644
index 406bc5c0cc73..000000000000
--- a/mail-client/neomutt/neomutt-20171208.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic
-
-if [[ ${PV} =~ 9999$ ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
- EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://www.neomutt.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
- libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
- smime_classic ssl tokyocabinet"
-
-CDEPEND="
- app-misc/mime-types
- berkdb? ( >=sys-libs/db-4:= )
- gdbm? ( sys-libs/gdbm )
- kyotocabinet? ( dev-db/kyotocabinet )
- lmdb? ( dev-db/lmdb )
- nls? ( virtual/libintl )
- qdbm? ( dev-db/qdbm )
- tokyocabinet? ( dev-db/tokyocabinet )
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- gpg? ( >=app-crypt/gpgme-0.9.0 )
- gpgme? ( >=app-crypt/gpgme-0.9.0 )
- idn? ( net-dns/libidn )
- kerberos? ( virtual/krb5 )
- notmuch? ( net-mail/notmuch )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- !slang? ( sys-libs/ncurses:0 )
- slang? ( sys-libs/slang )
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
-"
-DEPEND="${CDEPEND}
- net-mail/mailbase
- doc? (
- dev-libs/libxml2
- dev-libs/libxslt
- app-text/docbook-xsl-stylesheets
- || ( www-client/lynx www-client/w3m www-client/elinks )
- )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-mutt )
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
- eapply_user
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- "$(use_enable doc)"
- "$(use_enable gpg gpgme)"
- "$(use_enable gpgme)"
- "$(use_enable nls)"
- "$(use_enable notmuch)"
- "$(use_enable crypt pgp)"
- "$(use_enable pgp_classic pgp)"
- "$(use_enable smime)"
- "$(use_enable smime_classic smime)"
- "$(use_with berkdb bdb)"
- "$(use_with gdbm)"
- "$(use_with idn)"
- "$(use_with kerberos gss)"
- "$(use_with kyotocabinet)"
- "$(use_with lmdb)"
- "$(use_with qdbm)"
- "$(use_with sasl)"
- "$(use_with tokyocabinet)"
- "--with-$(usex slang slang curses)"
- "--sysconfdir=${EPREFIX}/etc/${PN}"
- "--with-docdir=${EPREFIX}/usr/share/doc/${PF}"
- )
-
- if use gnutls; then
- myconf+=( "--with-gnutls" )
- elif use ssl; then
- myconf+=( "--with-ssl" )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # A man-page is always handy, so fake one
- if use !doc; then
- emake -C doc neomuttrc.man
- # make the fake slightly better, bug #413405
- sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
- -e 's#in @docdir@,#at http://www.neomutt.org/,#' \
- -e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
- -e "s#@bindir@#${EPREFIX}/usr/bin#" \
- doc/neomutt.man > neomutt.1 || die
- cp doc/neomuttrc.man neomuttrc.5 || die
- doman neomutt.1 neomuttrc.5
- fi
-
- dodoc COPYRIGHT LICENSE* ChangeLog* README*
-}
-
-pkg_postinst() {
- ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
- ewarn "(https://bugs.gentoo.org/637176)"
- ewarn "crypt -> pgp_classic"
- ewarn "gpg -> gpgme"
- ewarn "smime -> smime_classic"
- ewarn "The old USE flags still work but their use is deprecated and will"
- ewarn "be removed in a future release."
-}
diff --git a/mail-client/neomutt/neomutt-20171215-r1.ebuild b/mail-client/neomutt/neomutt-20171215-r1.ebuild
deleted file mode 100644
index e5725c955639..000000000000
--- a/mail-client/neomutt/neomutt-20171215-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-if [[ ${PV} =~ 9999$ ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
- EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://www.neomutt.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
- libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
- smime_classic ssl tokyocabinet"
-
-CDEPEND="
- app-misc/mime-types
- berkdb? ( >=sys-libs/db-4:= )
- gdbm? ( sys-libs/gdbm )
- kyotocabinet? ( dev-db/kyotocabinet )
- lmdb? ( dev-db/lmdb )
- nls? ( virtual/libintl )
- qdbm? ( dev-db/qdbm )
- tokyocabinet? ( dev-db/tokyocabinet )
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- gpg? ( >=app-crypt/gpgme-0.9.0 )
- gpgme? ( >=app-crypt/gpgme-0.9.0 )
- idn? ( net-dns/libidn )
- kerberos? ( virtual/krb5 )
- notmuch? ( net-mail/notmuch )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- !slang? ( sys-libs/ncurses:0 )
- slang? ( sys-libs/slang )
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
-"
-DEPEND="${CDEPEND}
- dev-lang/tcl
- net-mail/mailbase
- doc? (
- dev-libs/libxml2
- dev-libs/libxslt
- app-text/docbook-xsl-stylesheets
- || ( www-client/lynx www-client/w3m www-client/elinks )
- )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-mutt )
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
- local myconf=(
- "$(use_enable doc)"
- "$(use_enable nls)"
- "$(use_enable notmuch)"
-
- # During the transition of the crypto USE flags we need to support
- # both sets of flags. We do not want to emit a configuration setting
- # twice, since the second flag overrides the first, potentially
- # leading to unwanted settings. See https://bugs.gentoo.org/640824 for
- # details.
- "$(if use gpg || use gpgme; then echo "--enable"; else echo "--disable"; fi)-gpgme"
- "$(if use crypt || use pgp_classic; then echo "--enable"; else echo "--disable"; fi)-pgp"
- "$(if use smime || use smime_classic; then echo "--enable"; else echo "--disable"; fi)-smime"
-
- # Database backends.
- "$(use_enable berkdb bdb)"
- "$(use_enable gdbm)"
- "$(use_enable kyotocabinet)"
- "$(use_enable qdbm)"
- "$(use_enable tokyocabinet)"
-
- "$(use_enable idn)"
- "$(use_enable kerberos gss)"
- "$(use_enable lmdb)"
- "$(use_enable sasl)"
- "--with-ui=$(usex slang slang ncurses)"
- "--sysconfdir=${EPREFIX}/etc/${PN}"
- "$(use_enable ssl)"
- "$(use_enable gnutls)"
- )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # A man-page is always handy, so fake one – here neomuttrc.5
- # (neomutt.1 already exists)
- if use !doc; then
- sed -n '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \
- Makefile > doc/Makefile.fakedoc || die
- sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
- doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
- emake -f doc/Makefile.fakedoc doc/neomuttrc.man
- cp doc/neomuttrc.man doc/neomuttrc.5 || die
- doman doc/neomutt.1 doc/neomuttrc.5
- fi
-
- dodoc COPYRIGHT LICENSE* ChangeLog* README*
-}
-
-pkg_postinst() {
- if use crypt || use gpg || use smime; then
- ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
- ewarn "(https://bugs.gentoo.org/637176)"
- ewarn "crypt -> pgp_classic"
- ewarn "gpg -> gpgme"
- ewarn "smime -> smime_classic"
- ewarn "The old USE flags still work but their use is deprecated and will"
- ewarn "be removed in a future release."
- if use gpg && ( use crypt || use smime ); then
- ewarn " Note that gpgme (old gpg) includes both pgp and smime"
- ewarn " support. You can probably remove pgp_classic (old crypt)"
- ewarn " and smime_classic (old smime) from your USE-flags and"
- ewarn " only enable gpgme."
- fi
- fi
-}
diff --git a/mail-client/neomutt/neomutt-20171215.ebuild b/mail-client/neomutt/neomutt-20171215.ebuild
deleted file mode 100644
index 3741c7d074e7..000000000000
--- a/mail-client/neomutt/neomutt-20171215.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-if [[ ${PV} =~ 9999$ ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
- EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://www.neomutt.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
- libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
- smime_classic ssl tokyocabinet"
-
-CDEPEND="
- app-misc/mime-types
- berkdb? ( >=sys-libs/db-4:= )
- gdbm? ( sys-libs/gdbm )
- kyotocabinet? ( dev-db/kyotocabinet )
- lmdb? ( dev-db/lmdb )
- nls? ( virtual/libintl )
- qdbm? ( dev-db/qdbm )
- tokyocabinet? ( dev-db/tokyocabinet )
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- gpg? ( >=app-crypt/gpgme-0.9.0 )
- gpgme? ( >=app-crypt/gpgme-0.9.0 )
- idn? ( net-dns/libidn )
- kerberos? ( virtual/krb5 )
- notmuch? ( net-mail/notmuch )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- !slang? ( sys-libs/ncurses:0 )
- slang? ( sys-libs/slang )
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
-"
-DEPEND="${CDEPEND}
- dev-lang/tcl
- net-mail/mailbase
- doc? (
- dev-libs/libxml2
- dev-libs/libxslt
- app-text/docbook-xsl-stylesheets
- || ( www-client/lynx www-client/w3m www-client/elinks )
- )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-mutt )
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
- local myconf=(
- "$(use_enable doc)"
- "$(use_enable nls)"
- "$(use_enable notmuch)"
-
- # During the transition of the crypto USE flags we need to support
- # both sets of flags. We do not want to emit a configuration setting
- # twice, since the second flag overrides the first, potentially
- # leading to unwanted settings. See https://bugs.gentoo.org/640824 for
- # details.
- "$(if use gpg || use gpgme; then echo "--enable"; else echo "--disable"; fi)-gpgme"
- "$(if use crypt || use pgp_classic; then echo "--enable"; else echo "--disable"; fi)-pgp"
- "$(if use smime || use smime_classic; then echo "--enable"; else echo "--disable"; fi)-smime"
-
- # Database backends.
- "$(use_enable berkdb bdb)"
- "$(use_enable gdbm)"
- "$(use_enable kyotocabinet)"
- "$(use_enable qdbm)"
- "$(use_enable tokyocabinet)"
-
- "$(use_enable idn)"
- "$(use_enable kerberos gss)"
- "$(use_enable lmdb)"
- "$(use_enable sasl)"
- "--with-ui=$(usex slang slang ncurses)"
- "--sysconfdir=${EPREFIX}/etc/${PN}"
- "$(use_enable ssl)"
- "$(use_enable gnutls)"
- )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc COPYRIGHT LICENSE* ChangeLog* README*
- doman doc/*.{1,5}
-}
-
-pkg_postinst() {
- if use crypt || use gpg || use smime; then
- ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
- ewarn "(https://bugs.gentoo.org/637176)"
- ewarn "crypt -> pgp_classic"
- ewarn "gpg -> gpgme"
- ewarn "smime -> smime_classic"
- ewarn "The old USE flags still work but their use is deprecated and will"
- ewarn "be removed in a future release."
- if use gpg && ( use crypt || use smime ); then
- ewarn " Note that gpgme (old gpg) includes both pgp and smime"
- ewarn " support. You can probably remove pgp_classic (old crypt)"
- ewarn " and smime_classic (old smime) from your USE-flags and"
- ewarn " only enable gpgme."
- fi
- fi
-}
diff --git a/mail-client/neomutt/neomutt-20171215-r2.ebuild b/mail-client/neomutt/neomutt-20180512.ebuild
index f90289f77c00..45c87850f70c 100644
--- a/mail-client/neomutt/neomutt-20171215-r2.ebuild
+++ b/mail-client/neomutt/neomutt-20180512.ebuild
@@ -15,7 +15,7 @@ else
fi
DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://www.neomutt.org/"
+HOMEPAGE="https://neomutt.org/"
LICENSE="GPL-2"
SLOT="0"
@@ -109,16 +109,21 @@ src_install() {
# A man-page is always handy, so fake one – here neomuttrc.5
# (neomutt.1 already exists)
if use !doc; then
- sed -n '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \
+ sed -n \
+ -e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
+ -e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
+ -e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
Makefile > doc/Makefile.fakedoc || die
- sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
+ sed -n \
+ -e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+ -e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
- emake -f doc/Makefile.fakedoc doc/neomuttrc.man
- cp doc/neomuttrc.man doc/neomuttrc.5 || die
+ emake -f doc/Makefile.fakedoc doc/neomutt.1
+ emake -f doc/Makefile.fakedoc doc/neomuttrc.5
doman doc/neomutt.1 doc/neomuttrc.5
fi
- dodoc COPYRIGHT LICENSE* ChangeLog* README*
+ dodoc LICENSE* ChangeLog* README*
}
pkg_postinst() {
diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index f90289f77c00..fb8ad83183d0 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
inherit eutils flag-o-matic
-if [[ ${PV} =~ 9999$ ]]; then
+if [[ ${PV} =~ 99999999$ ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
@@ -15,13 +15,13 @@ else
fi
DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://www.neomutt.org/"
+HOMEPAGE="https://neomutt.org/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
- libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
- smime_classic ssl tokyocabinet"
+IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+ lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime_classic
+ ssl tokyocabinet"
CDEPEND="
app-misc/mime-types
@@ -40,7 +40,6 @@ CDEPEND="
qdbm? ( dev-db/qdbm )
tokyocabinet? ( dev-db/tokyocabinet )
gnutls? ( >=net-libs/gnutls-1.0.17 )
- gpg? ( >=app-crypt/gpgme-0.9.0 )
gpgme? ( >=app-crypt/gpgme-0.9.0 )
idn? ( net-dns/libidn )
kerberos? ( virtual/krb5 )
@@ -74,14 +73,9 @@ src_configure() {
"$(use_enable nls)"
"$(use_enable notmuch)"
- # During the transition of the crypto USE flags we need to support
- # both sets of flags. We do not want to emit a configuration setting
- # twice, since the second flag overrides the first, potentially
- # leading to unwanted settings. See https://bugs.gentoo.org/640824 for
- # details.
- "$(if use gpg || use gpgme; then echo "--enable"; else echo "--disable"; fi)-gpgme"
- "$(if use crypt || use pgp_classic; then echo "--enable"; else echo "--disable"; fi)-pgp"
- "$(if use smime || use smime_classic; then echo "--enable"; else echo "--disable"; fi)-smime"
+ "$(use_enable gpgme)"
+ "$(use_enable pgp_classic pgp)"
+ "$(use_enable smime_classic smime)"
# Database backends.
"$(use_enable berkdb bdb)"
@@ -109,32 +103,28 @@ src_install() {
# A man-page is always handy, so fake one – here neomuttrc.5
# (neomutt.1 already exists)
if use !doc; then
- sed -n '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \
+ sed -n \
+ -e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
+ -e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
+ -e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
Makefile > doc/Makefile.fakedoc || die
- sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
+ sed -n \
+ -e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+ -e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
- emake -f doc/Makefile.fakedoc doc/neomuttrc.man
- cp doc/neomuttrc.man doc/neomuttrc.5 || die
+ emake -f doc/Makefile.fakedoc doc/neomutt.1
+ emake -f doc/Makefile.fakedoc doc/neomuttrc.5
doman doc/neomutt.1 doc/neomuttrc.5
fi
- dodoc COPYRIGHT LICENSE* ChangeLog* README*
+ dodoc LICENSE* ChangeLog* README*
}
pkg_postinst() {
- if use crypt || use gpg || use smime; then
- ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
- ewarn "(https://bugs.gentoo.org/637176)"
- ewarn "crypt -> pgp_classic"
- ewarn "gpg -> gpgme"
- ewarn "smime -> smime_classic"
- ewarn "The old USE flags still work but their use is deprecated and will"
- ewarn "be removed in a future release."
- if use gpg && ( use crypt || use smime ); then
- ewarn " Note that gpgme (old gpg) includes both pgp and smime"
- ewarn " support. You can probably remove pgp_classic (old crypt)"
- ewarn " and smime_classic (old smime) from your USE-flags and"
- ewarn " only enable gpgme."
- fi
+ if use gpgme && ( use pgp_classic || use smime_classic ); then
+ ewarn " Note that gpgme (old gpg) includes both pgp and smime"
+ ewarn " support. You can probably remove pgp_classic (old crypt)"
+ ewarn " and smime_classic (old smime) from your USE-flags and"
+ ewarn " only enable gpgme."
fi
}