diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-15 17:25:28 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-15 17:25:28 +0000 |
commit | 6b933047f46efec1aa747570f945344254227457 (patch) | |
tree | a12a4b87b38f954c4de435272cf4b90d721df5e8 /mail-client/neomutt | |
parent | f45955e60d4da9b7f4a1088c98042f9c06669039 (diff) |
gentoo resync : 15.12.2017
Diffstat (limited to 'mail-client/neomutt')
-rw-r--r-- | mail-client/neomutt/Manifest | 4 | ||||
-rw-r--r-- | mail-client/neomutt/neomutt-20171215.ebuild | 134 | ||||
-rw-r--r-- | mail-client/neomutt/neomutt-9999.ebuild | 77 |
3 files changed, 178 insertions, 37 deletions
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest index ee94b8d14fe2..8fde081e4be7 100644 --- a/mail-client/neomutt/Manifest +++ b/mail-client/neomutt/Manifest @@ -9,11 +9,13 @@ DIST neomutt-20171006.tar.gz 2706019 BLAKE2B b16f065fd1c5b829c6b73614c42e5353b96 DIST neomutt-20171013.tar.gz 2706753 BLAKE2B d8801f4168ce978b8b2578a1fa28b8f29e98700c2b3c11dcce7b9cdf132a755403ed1b54216426736c1dde78c580320ebac4fbb6e3ca6f92abc1c1e6d1e4fd1b SHA512 9e4499b165f25091d73868c62b14f950bdfc032444c0cb3619e99a8299d29c3d1f24078e15537e693a3af69ae0681d59e25a73b857882cce2653be593231ffac DIST neomutt-20171027.tar.gz 2682699 BLAKE2B 4e3eda453a8c19d2ec1460c0813e030ef8209e8761d1ef768698cf624c11a2d3b22b941da78fb2d39ef44d6f39c7b30786248448910e59170f50b6d6e010a331 SHA512 e2df0d20c0729abb32d1614c94c08cca0cecad1cb36a380f8210e2df3e353ffc08f66abf1e5e3a1cf4a746437d59c15262ce05ab1a820561466bf7e3a5d6b894 DIST neomutt-20171208.tar.gz 2703917 BLAKE2B 709cdb7b00e887f01bf6b1e805b25938ceca1a25d77c8674150e32ae4ac28aad10479ab54f172e2b07cab98b903973190faa138de1061ebbf4fcbe09d544ecf9 SHA512 e4f8a5f01d96d6f82959fe583634585deee28cf146c768e5049281b273c5b76b91ee01c9d9382a26f72a092c14341905129e73bf5c6ba19baae7823bc6680671 +DIST neomutt-20171215.tar.gz 2680191 BLAKE2B 9826537ed985cf56e4a52e0938967645ca607fcd57f455e1a521a67875bacc397e1706099291fe5a7a350542d0bc07b7835a908c64d84067fb12e39f973af545 SHA512 8098f537e8ef7d3f7aa87fc875c0dc079b996285b786fe6fc6bdf18154c1282b03a4e19dd6902a110616443ca2b23008c8c1f5c4a615c53b620b537c50dfb658 EBUILD neomutt-20170714.ebuild 2876 BLAKE2B 3dee3dcf19233937d04031f33cd5b5b8c9d16ced394cbf7d827d6f2939dc1cd8e79afcec749b966f97a5442e7a52b139349d4a239c6c438cce98b8678d1c66e8 SHA512 fab00df2bf15ea4f1f513f3487e1ae40e4d0e94666f0ada62fef6ef2112ecfa868502d972533e7ef5cec5fe7d4754ec6607c03710120bae91d800e56b36a5947 EBUILD neomutt-20170912.ebuild 2873 BLAKE2B c1d8f2746fc0b4db7b118fa5b45ee72ecebf442fc34158ceec562ec5c45fa436271335850d690790849820abb68f4f9c12ae80ab907390f8be4a6eeb6f6bda6b SHA512 ca2deb8c51648e02b61e892b99c7796184145754aaf016e9ea2f55454c0e6e35c4a6508a9e5d6279571f1ba648413047c56050a74ee6c46130c3e926b4f9e530 EBUILD neomutt-20171006.ebuild 2785 BLAKE2B 2bfd22e3165a509db8ac7620388cfdd18fd254461da69838ab52dba127ef999f2a8ac90dd4b8cbcf8f4827b1fe4ed81f500bb6957ed57d297d3236fdfeb14d03 SHA512 c7576ab061c3b6726f06dbb584145751a573c5ff19a3e6157d96a7a22d54980fbe70682a37d00003e872b854b658b284a37bb7bda7913023cd8bb7fc3387a4e4 EBUILD neomutt-20171013.ebuild 2709 BLAKE2B 03ef87a76af095aa61d2b0630979ef74d2bab16b00cf023c18bef7276fe56565021390a200f29544089b9111f025f32f8c9b8f3dd4ec3e62d9651e346f43515a SHA512 e4ba14fc7d2415419c91cfff4b6f5d633179e53d8dcb43b71786c8b63b97832f45fd0506debbfc763b77496ca075d13d3f941cd20e029f28a505cb28b4dfc78e EBUILD neomutt-20171027.ebuild 2709 BLAKE2B 03ef87a76af095aa61d2b0630979ef74d2bab16b00cf023c18bef7276fe56565021390a200f29544089b9111f025f32f8c9b8f3dd4ec3e62d9651e346f43515a SHA512 e4ba14fc7d2415419c91cfff4b6f5d633179e53d8dcb43b71786c8b63b97832f45fd0506debbfc763b77496ca075d13d3f941cd20e029f28a505cb28b4dfc78e EBUILD neomutt-20171208.ebuild 3274 BLAKE2B 231f9bff37d1cb6bd6f6dde94e9943adf7835301f917baf95d1ca5d399337719d677cd7dc187cc373b24d92b5f1fd58cf12b9ae87088d94675079567552a8f29 SHA512 fc039a384d5815d5e8b19d66a2236dd2cd006ce09f32d6dfaaebdea4c22c0294e1cb877c9fdc7657fbd7ef243e8c3387b30a178fb13c953b8f60486e6a76d97f -EBUILD neomutt-9999.ebuild 3274 BLAKE2B 231f9bff37d1cb6bd6f6dde94e9943adf7835301f917baf95d1ca5d399337719d677cd7dc187cc373b24d92b5f1fd58cf12b9ae87088d94675079567552a8f29 SHA512 fc039a384d5815d5e8b19d66a2236dd2cd006ce09f32d6dfaaebdea4c22c0294e1cb877c9fdc7657fbd7ef243e8c3387b30a178fb13c953b8f60486e6a76d97f +EBUILD neomutt-20171215.ebuild 3912 BLAKE2B d2b7ed25c443f1192663e9e98bbfb62c269a2f3897b82bbbd80bf2c0749760b695942b8b05f6f9ec0c139d80ea2d02061b52c4b37a870969eb2d4dc0cd1b5b31 SHA512 a50ce190784904f012624a707371046b04771a77dbb7b7cd633b8a16e7ed2d6fd54d9977585da94f1bb10e51cf1d1a2430ec4e8478f071b05e29325d39b61635 +EBUILD neomutt-9999.ebuild 3912 BLAKE2B d2b7ed25c443f1192663e9e98bbfb62c269a2f3897b82bbbd80bf2c0749760b695942b8b05f6f9ec0c139d80ea2d02061b52c4b37a870969eb2d4dc0cd1b5b31 SHA512 a50ce190784904f012624a707371046b04771a77dbb7b7cd633b8a16e7ed2d6fd54d9977585da94f1bb10e51cf1d1a2430ec4e8478f071b05e29325d39b61635 MISC metadata.xml 1430 BLAKE2B cde0fee81787af5d8401b456deafc66ac9427a88b25866abbecbf874c30a6acc69375f4c7705916985b79e052ca2c07e2a0c7ab853dbc562e53230ec11c15e28 SHA512 e19508e8851160c14d2bab48f54b3cf959411b3b0ccfe3555414bc563e8300daf03cf328379569fc516576d0065fb440f3f6426509b599d70555282426163cc3 diff --git a/mail-client/neomutt/neomutt-20171215.ebuild b/mail-client/neomutt/neomutt-20171215.ebuild new file mode 100644 index 000000000000..7b36a57de365 --- /dev/null +++ b/mail-client/neomutt/neomutt-20171215.ebuild @@ -0,0 +1,134 @@ +# 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 + + # 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() { + 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-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild index 406bc5c0cc73..7b36a57de365 100644 --- a/mail-client/neomutt/neomutt-9999.ebuild +++ b/mail-client/neomutt/neomutt-9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit autotools eutils flag-o-matic +inherit eutils flag-o-matic if [[ ${PV} =~ 9999$ ]]; then inherit git-r3 @@ -47,6 +47,7 @@ CDEPEND=" ) " DEPEND="${CDEPEND} + dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 @@ -60,42 +61,38 @@ RDEPEND="${CDEPEND} 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)" + + # 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}" - "--with-docdir=${EPREFIX}/usr/share/doc/${PF}" + "$(use_enable ssl)" + "$(use_enable gnutls)" ) - if use gnutls; then - myconf+=( "--with-gnutls" ) - elif use ssl; then - myconf+=( "--with-ssl" ) - fi - econf "${myconf[@]}" } @@ -119,11 +116,19 @@ src_install() { } 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." + 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 } |