Skip to content

Commit

Permalink
Add updated neomutt with tinfow patch
Browse files Browse the repository at this point in the history
  • Loading branch information
alepez committed Apr 4, 2018
1 parent 8e7dfb5 commit 2a87a61
Show file tree
Hide file tree
Showing 3 changed files with 165 additions and 0 deletions.
3 changes: 3 additions & 0 deletions mail-client/neomutt/Manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
AUX 1118.patch 682 BLAKE2B 8c69e3da4b5ddb37b4a4a0b97e2844a8010b4cb8e768d546b5f66125df13f18ee729b38d170b8d5bd2804150fcfb567f1c755354c57bc832f51240383d284c29 SHA512 130493c7f6ce4769f1b3239562ca618f655dbd093a9c332719a12babffa388833d92a62008a6d8d4c2716ebaec1acf7c5cb6b77e0c126b216583a3fdf0376b4b
DIST neomutt-20180323.tar.gz 2650465 BLAKE2B 59f11208320e514119e60f6c85a876fed2693b9eae3127fc3fa5a35722a80dfd99b0c6b5a5074711d42b35d459e70f4dda3d29e7358e1d95d5d0d350438290d5 SHA512 997c697300768809823b8d8588c93003c6cd7fcc6cbe7ce524096033e91c618119f78c697ccd15b4c93751b3156d50e611974e8f8b332efb467c031385e9f819
EBUILD neomutt-20180323.ebuild 4071 BLAKE2B b285e9e4a414b64a4bd69d6af46538abad461122f1ab903d73bd599a2d7dca5df74270d84d79830d26d55dbc066004287d1634db82c9efd4cc8bbf5c285e5e6e SHA512 fadef18ef8d5adfdad99fd18b6c1411187e0667c11633e6d422b08ff36987d6539dfd9b198eee9d8f00b340f7493ea4e148b9bd59cd138a3680e89b49f1c2f4d
18 changes: 18 additions & 0 deletions mail-client/neomutt/files/1118.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/auto.def b/auto.def
index 1d492ff2..5a762478 100644
--- a/auto.def
+++ b/auto.def
@@ -500,8 +500,10 @@ switch [opt-val with-ui ncurses] {
}

cc-with [list -libs -L$ncurses_prefix/lib] {
- if {![cc-check-function-in-lib tgetent $ncurses_lib]} {
- cc-check-function-in-lib tgetent tinfo
+ msg-checking "Libraries for tgetent"
+ msg-result "[get-define LDFLAGS] [get-define LIBS]"
+ if {![cc-check-function-in-lib tgetent tinfow]} {
+ cc-check-function-in-lib tgetent $ncurses_lib
}
foreach f {start_color typeahead bkgdset curs_set meta use_default_colors} {
cc-check-function-in-lib $f $ncurses_lib

144 changes: 144 additions & 0 deletions mail-client/neomutt/neomutt-20180323.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
# 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:6.2
sys-libs/db:5.3
sys-libs/db:4.8
)
<sys-libs/db-6.3:=
)
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}"

PATCHES=(
"${FILESDIR}/1118.patch"
)

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
}

0 comments on commit 2a87a61

Please sign in to comment.