gentoo resync : 19.10.2017

4 files changed, 105 insertions, 2 deletions

diff --git a/mail-client/nmh/Manifest b/mail-client/nmh/Manifest
index 1a2284e3845b..1ad6d34352bb 100644
--- a/mail-client/nmh/Manifest
+++ b/mail-client/nmh/Manifest
@@ -3,8 +3,11 @@ AUX nmh-1.3-inc-login.patch 602 SHA256 6f9991f2cacc05d11495d92813fa8000d415e5bf5
 AUX nmh-1.3-install.patch 482 SHA256 b5f5ba018b71ee02ebc0618df1d1eb47a74214e7ff210975040a4f51619b0cfa SHA512 40f9530cdff47b89e9c186942a2bbb2c302c5a45e98f3f082686ffff21b9f1d0deed7b2406240656289eb9e04d799d21687b0690943481d37ccc6d0024aee179 WHIRLPOOL e4fef2339350665ae55acc660cbef0b51e1dd2f2fb37bfafd97253d9e4c094d12dc50d2b96085276097f09084812b98d0052685dd605bdc978cc7453096d6c39
 AUX nmh-1.3-m_getfld.patch 624 SHA256 733984fb6a763f1451e265c57aabb982cc788e13839497a3b5769875aa0cc2f5 SHA512 85b088a4c7470d498e9c6ab5c39fb1d7752acf91db3dec77ebe176bae78dce2758752027af7f9024c81b422627559ca18df6dc4ce55a2c31b3df09d3fddf9a47 WHIRLPOOL 79ea44333ba14f4abbf10f9d9cfee5beb05c6d8477964666066b8d7105a52af3e71bbd0e22e2fa2bb7a1eb8914276ece1507e11d570e201f9457319f1e3468de
 AUX nmh-1.3-parallelmake.patch 3121 SHA256 befcdf3e2cec4eea23cccb3854cde3df8163282bfff84efce77c96fbdeae456c SHA512 cd84d2dceca9b66ecd50afe5bc08aa48b825b054ac2367bb762d4fe34ab42d1a0d2715f7f9459656874f209dc397d5e12969217154cb2b6c9a55b68354fd9132 WHIRLPOOL cdd1964772244e870a6b40323d8834307af6e0b196516d2a30556e68f2630381ce3bbe9e8f21821e142ca257f69913634f5aba83143c0ede3b4ff496c732fc9d
+AUX nmh-1.6-m_getfld.patch 487 SHA256 9bcb42936ab0d4f61185a4b8c756b0e38d05070c5446fc4794551cba2aeebc5a SHA512 a69417fb263b27c65b38778f01a4e08b82fccbb8134f490d01566de1c6275334a02ce25e0a1ab2b7dd47b1e4e1fddd29f8769931f650823cdfbfacd55e325e32 WHIRLPOOL efc361de9cc82958cdcac60509a88b5449be141e48867cde47e92610b94170d1d089d0f66e5ccde8a9d0f8e7b3e0c6938756812b652de797be5014fe8ba9cebf
 DIST nmh-1.3.tar.gz 847614 SHA256 9f16848424489b5a9f7c1402c87665dc56dcadecf6e5c44fb608aef0d1b03b47 SHA512 f7ab227813a7fb1c45cb1c91ca5c020c22be28193152d80d008cf962856138a2fdfe7dc5a9fae5e3702c1a7020b9609826ebffd843241d9b09b7b136d901e77a WHIRLPOOL d38bc6353a288e28b07cdd1df5bd9785f06a0b96607ef3a1cf72c7bded99d9d81da9f9015629927cc033d90a83caec438656df05d2056735e8480915617b8905
+DIST nmh-1.6.tar.gz 1197272 SHA256 29338ae2bc8722fe8a5904b7b601a63943b72b07b6fcda53f3a354edb6a64bc3 SHA512 03775e73f69eb21088e191f41a0bbc2e631956f0d496f87be97981ac2c85d8cbe0680e8ee7e37f97e79c34ccd814fca78f2684acfc8390e333a46c710fbdb2b7 WHIRLPOOL 64eaf63a3453bdd6862ce3eab9a4b7df1ca1dccefdc872f1866c1f6d89d174249051f6768797c3f067df878e018be0ff4ad6adf6b4b5e4844a53624f67ff2547
 EBUILD nmh-1.3-r4.ebuild 1921 SHA256 57878ce0d11278e7c1ca061d02bad85d728ab2f0eda908d96c65906cace78b53 SHA512 68f69901b22dffb37b53b38666f62d1bb2093f642430652387bec9a24717f37ce10a81ea65578f9e1239fd541a3d5f7ffd3a892988340dc17295c41709614056 WHIRLPOOL 855420481a24f3f5a28b8e63864374ba6b87c0d2a7aab8f92abd9f296c5bfedd20faa2c257fbe67da09ecd322c52913a8aeeb0853e7b06fd2bf6e84e0711d143
+EBUILD nmh-1.6.ebuild 1899 SHA256 d67635d572eee62a9c858778243c4ca969df93d893efad0fa4f7e9c5bd489674 SHA512 aacdaf8012495b7b14cf3c6c96435c8e50cf274507c36b1d2f0c7a0b00561c000aa982701b8cf28881ab1367facabb827969825bdf625e850fbe0c21a2a0be1a WHIRLPOOL 97a73a905d48ebffefd160ae22a0e06f1c5a9310e9a2912ade869f0729beef812d1e2a77d4b14404eef49f69ab4ba4523bd68239aa1313f017394fd801e9a6e7
 MISC ChangeLog 3074 SHA256 4b641caa747366107d2d62f195a04334d634abb591aa0419f5c8d1db2e38812d SHA512 261be639d0e6e5e0fb6919355f9c7e3486edeb73d2c23fba0e69ef57a5f6195d3781c540fb8a86da9bd06a4384d47b30b3f6d683b0f5c70b0dbfeaf51aba5028 WHIRLPOOL aa1169e089b89ceaf33ae5055c13ceea09341aae5ee90b12ef39108a4bdccdb84b91450e295661f26c98a3923fb269206ff71fbd6e9c08893e95fd92a0a91a6b
 MISC ChangeLog-2015 1473 SHA256 ef22e09da70249ba52ed5c6fd8cbf169654954c519578cc7dc6b89061e80831c SHA512 ce151c46aa512f9ac1afcd7952575ecfe21f32f3cb03f6fc7d54801e7c2e4c1dee563c05d46b9cf4109673c073db53ac74265ff750c9d7d5e5b301b778fc2368 WHIRLPOOL f4899cdd87e7dae7df935eef3b39eba716fc262f193a6d53afa790b2070bdcd5c8cf295f722ac3caab6587c7133262f4a4f037628caace1d9d7a9e65a435311e
-MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
+MISC metadata.xml 244 SHA256 856e819659934229aa18649e0c783b9714fa33065cb5113e7b667ed68392b39a SHA512 0e856f808459b6d83c6eaeee418d87d85385968a39e6c1871a0eb76c04b533bbba16996a6f18613b7c550da90c76843bd01237be9b9f290394048e904535653c WHIRLPOOL 2aa292ef66863766df8920a2ebd497218854f9a41724cdef1d63a93c94620fbea641a688af2bb374673773dd5b1b8afff80867c974f49d5600991ab44f9b8752
diff --git a/mail-client/nmh/files/nmh-1.6-m_getfld.patch b/mail-client/nmh/files/nmh-1.6-m_getfld.patch
new file mode 100644
index 000000000000..36f207796646
--- /dev/null
+++ b/mail-client/nmh/files/nmh-1.6-m_getfld.patch
@@ -0,0 +1,25 @@
+--- nmh-1.6/sbr/m_getfld.c
++++ nmh-1.6/sbr/m_getfld.c
+@@ -919,16 +919,16 @@
+ 	register char *ep = pat + patln;
+ 	register char pc = *pat++;
+ 
+-	for(;;) {
+-		while (pc != *str++)
+-			if (str > es)
+-				return 0;
++	for(; str <= es; str++) {
++		if (pc != *str)
++			continue;
+ 		if (str > es+1)
+ 			return 0;
+-		sp = str; pp = pat;
++		sp = str+1; pp = pat;
+ 		while (pp < ep && *sp++ == *pp)
+ 			pp++;
+ 		if (pp >= ep)
+-			return --str;
++			return ((unsigned char *)str);
+ 	}
++	return 0;
+ }
diff --git a/mail-client/nmh/metadata.xml b/mail-client/nmh/metadata.xml
index 6f49eba8f496..1c3bc7b3fcef 100644
--- a/mail-client/nmh/metadata.xml
+++ b/mail-client/nmh/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-client/nmh/nmh-1.6.ebuild b/mail-client/nmh/nmh-1.6.ebuild
new file mode 100644
index 000000000000..c64883e3515f
--- /dev/null
+++ b/mail-client/nmh/nmh-1.6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="New MH mail reader"
+HOMEPAGE="http://www.nongnu.org/nmh/"
+SRC_URI="https://savannah.nongnu.org/download/nmh/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="gdbm readline sasl ssl"
+
+# bug 295996: media-gfx/pixie also uses show
+# bug 631662: sys-apps/pick also uses pick
+# bug 555550: sci-mathematics/snns also uses scan
+DEPEND="gdbm? ( sys-libs/gdbm )
+	!gdbm? ( sys-libs/db:= )
+	>=sys-libs/ncurses-5.2:0=
+	net-libs/liblockfile
+	readline? ( sys-libs/readline:0= )
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )
+	!!media-gfx/pixie
+	!!sys-apps/pick
+	!!sci-mathematics/snns
+"
+RDEPEND="${DEPEND}
+	virtual/editor
+	virtual/pager
+"
+
+DOCS=( ChangeLog DATE MACHINES README )
+
+PATCHES=(
+	# bug #57886
+	"${FILESDIR}"/${P}-m_getfld.patch
+	# bug #319937
+	"${FILESDIR}"/${PN}-1.3-db5.patch
+)
+
+src_configure() {
+	# Bug 348816 & Bug 341741: The previous ebuild default of
+	# /usr/bin caused unnecessary conflicts with other
+	# packages. However, the default nmh libdir location causes
+	# problems with cross-compiling, so we use, eg., /usr/lib64.
+	# Users may use /usr/lib/nmh in scripts needing these support
+	# programs in normal environments.
+	local myconf=(
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/nmh
+		--mandir="${EPREFIX}"/usr/share/man
+		--sysconfdir="${EPREFIX}"/etc/nmh
+		$(use_with sasl cyrus-sasl)
+		$(use_with ssl tls)
+		$(use_with readline)
+	)
+
+	# have gdbm use flag actually control which version of db in use
+	if use gdbm; then
+		myconf+=( --with-ndbmheader=gdbm/ndbm.h --with-ndbm=gdbm_compat )
+	else
+		if has_version ">=sys-libs/db-2"; then
+			myconf+=( --with-ndbmheader=db.h --with-ndbm=db )
+		else
+			myconf+=( --with-ndbmheader=db1/ndbm.h --with-ndbm=db1 )
+		fi
+	fi
+
+	econf "${myconf[@]}"
+}