From 79f3db5439143ecd8217586d3ba5244138080f77 Mon Sep 17 00:00:00 2001
From: Eray Aslan <eras@gentoo.org>
Date: Fri, 8 Nov 2019 12:22:22 +0300
Subject: [PATCH] net-mail/mailutils: bump to 3.8

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Eray Aslan <eras@gentoo.org>
---
 net-mail/mailutils/Manifest                   |   1 +
 .../files/mailutils-3.8-fix-tests.patch       |  48 ++++++
 net-mail/mailutils/mailutils-3.8.ebuild       | 140 ++++++++++++++++++
 3 files changed, 189 insertions(+)
 create mode 100644 net-mail/mailutils/files/mailutils-3.8-fix-tests.patch
 create mode 100644 net-mail/mailutils/mailutils-3.8.ebuild

diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index f0659837136e..87a0444dcad7 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,2 +1,3 @@
 DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243e84ed2ee93e6d77353e1871d57d101a3a6ee3d2442709adbfb090e4931e134369661e8e8aa407061c1eccdf862 SHA512 548d97a4a036ef0ef5a429c82ffa43dd377b210b4c4d3844e7e5dded0f963060e3733b7766821c06ccf4dc1135002608658bcd6420e75b4ca1f4f17cfc8e2573
 DIST mailutils-3.7.tar.xz 2846864 BLAKE2B d407d370a4823972c060ea6c6a6e16eefe46598fee8302159f9d44fe150ace32b6915e7e3d4ddaca63ed5d5a5cffce48514f7f6297413a97692eb609a295622d SHA512 aa93ee1cde76392808f492dae6c69625ab124a2c31a296449ba217fc26f292871b4d04f8720bf20377177eab33c01cbfe195d6ac3674c35e1db53157a6916a4d
+DIST mailutils-3.8.tar.xz 2998596 BLAKE2B 4d09c7b5113129b3d2f3b113808d4460d025d4f0eec00dd1209a95f23abe97683b5d50cfe5229f1e5db48ddd6ca66c73fa6b0c1bfe03b324dbf40b6a26ff76f5 SHA512 4d081ae492beb0f9c1945541d63b52f155f11ca172abaedbe465955ac11097037f440e1aaed8d512cd3aab65f7792b755a7e4b9428a90ad7a833de87b1c4f1f9
diff --git a/net-mail/mailutils/files/mailutils-3.8-fix-tests.patch b/net-mail/mailutils/files/mailutils-3.8-fix-tests.patch
new file mode 100644
index 000000000000..90808d883226
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.8-fix-tests.patch
@@ -0,0 +1,48 @@
+commit 2fe205b5e0b025200150c62581283e99598a80a6
+Author: Eray Aslan <eras@gentoo.org>
+Date:   Fri Nov 8 10:57:43 2019 +0300
+
+    save mailboxes as mbox for make test
+    
+    when default mailbox scheme is chosen as maildir, mda tests fail with
+    messages like:
+    
+            sed: read error on spool/root: Is a directory
+    
+    make sure we save the test mailboxes as mbox
+    
+    Signed-off-by: Eray Aslan <eras@gentoo.org>
+
+diff --git a/mda/tests/forward.at b/mda/tests/forward.at
+index 96170ad6a..75a9d6966 100644
+--- a/mda/tests/forward.at
++++ b/mda/tests/forward.at
+@@ -19,7 +19,7 @@ AT_KEYWORDS([maidag forward])
+ 
+ m4_pushdef([TESTMDA_CONF],[cat > testmda.conf <<EOF
+ mailbox {
+-  mailbox-pattern "$(pwd)/spool/\${user}";
++  mailbox-pattern "mbox:$(pwd)/spool/\${user}";
+ }  
+ 
+ mailer {
+diff --git a/mda/tests/mda.at b/mda/tests/mda.at
+index 6623fb623..083e7c318 100644
+--- a/mda/tests/mda.at
++++ b/mda/tests/mda.at
+@@ -16,7 +16,7 @@
+ 
+ m4_pushdef([TESTMDA_CONF],[cat > testmda.conf <<EOF
+ mailbox {
+-  mailbox-pattern "$(pwd)/spool/\${user}";
++  mailbox-pattern "mbox:$(pwd)/spool/\${user}";
+ }  
+ EOF
+ ])
+@@ -56,4 +56,4 @@ cat spool/root
+ 
+ AT_CLEANUP
+ 
+-m4_popdef([TESTMDA_CONF])
+\ No newline at end of file
++m4_popdef([TESTMDA_CONF])
diff --git a/net-mail/mailutils/mailutils-3.8.ebuild b/net-mail/mailutils/mailutils-3.8.ebuild
new file mode 100644
index 000000000000..b3f820b13cc4
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.8.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
+
+DESCRIPTION="A useful collection of mail servers, clients, and filters"
+HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
+	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
+	tokyocabinet"
+
+RDEPEND="!mail-client/nmh
+	!mail-filter/libsieve
+	!mail-client/mailx
+	!mail-client/nail
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	dev-libs/libltdl:0
+	virtual/mta
+	berkdb? ( sys-libs/db:= )
+	bidi? ( dev-libs/fribidi )
+	emacs? ( virtual/emacs )
+	gdbm? ( sys-libs/gdbm )
+	guile? ( dev-scheme/guile:12/2.2-1 )
+	kerberos? ( virtual/krb5 )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c )
+	nls? ( sys-devel/gettext )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( virtual/gsasl )
+	servers? ( virtual/libiconv dev-libs/libunistring )
+	ssl? ( net-libs/gnutls:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tokyocabinet? ( dev-db/tokyocabinet )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	servers? ( tcpd ldap )"
+
+DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
+PATCHES=(
+	"${FILESDIR}/${PN}-3.5-add-include.patch" \
+	"${FILESDIR}/${PN}-3.6-underlinking.patch" \
+	"${FILESDIR}/${PN}-3.8-fix-tests.patch" \
+	)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if use mysql; then
+		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+			sql/Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# maildir is the Gentoo default
+	econf MU_DEFAULT_SCHEME=maildir \
+		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+		$(use_with berkdb berkeley-db) \
+		$(use_with bidi fribidi) \
+		$(use_enable ipv6) \
+		$(use_with gdbm) \
+		$(use_with sasl gsasl) \
+		$(use_with guile) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_with postgres) \
+		$(use_enable python) \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthread) \
+		$(use_with tokyocabinet) \
+		$(use_with kyotocabinet) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable servers build-servers) \
+		$(use_with servers unistring ) \
+		$(use_enable clients build-clients) \
+		EMACS=$(usex emacs emacs no) \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-mail-spool=/var/spool/mail \
+		--with-readline \
+		--enable-sendmail \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	# bug 613112
+	newins "${FILESDIR}/mailutils.rc" mailutils.conf
+	keepdir /etc/mailutils.d/
+	insinto /etc/mailutils.d
+	doins "${FILESDIR}/mail"
+
+	if use python; then
+		python_optimize
+		if use static-libs; then
+			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
+		fi
+	fi
+
+	if use servers; then
+		newinitd "${FILESDIR}"/imap4d.initd imap4d
+		newinitd "${FILESDIR}"/pop3d.initd pop3d
+		newinitd "${FILESDIR}"/comsatd.initd comsatd
+	fi
+
+	# compatibility link
+	if use clients && use split-usr; then
+		dosym ../usr/bin/mail /bin/mail
+	fi
+
+	if ! use static-libs; then
+		find "${D}" -name "*.la" -delete || die
+	fi
+}
-- 
2.26.2