6 files changed, 5 insertions, 250 deletions
diff --git a/mail-client/nmh/Manifest b/mail-client/nmh/Manifest
index 1ad6d34352bb..94e1619ffc6a 100644
--- a/mail-client/nmh/Manifest
+++ b/mail-client/nmh/Manifest
@@ -1,13 +1,5 @@
-AUX nmh-1.3-db5.patch 568 SHA256 b139def59d1c5371bec1a3b5067698bbb7c320771f66a703c7b8c9eb2f1bdf78 SHA512 512838c9838124f29e5f3bf0f9ea6956d1fb0a231fd4301f78268b36f9d69dcfec2cdf5d798569b191752a654934acd68b8a8fa095385daa2daf127718fdf376 WHIRLPOOL 84b5b3edd09298342ac601584a6459054eb4921c5891671ad189d5e8f3704cdff4133b76eabd8666e2e2d5341771b2e853c0776a09b2f0c90f65a317c343a801
-AUX nmh-1.3-inc-login.patch 602 SHA256 6f9991f2cacc05d11495d92813fa8000d415e5bf58fc2d194094897ff16f9dd2 SHA512 8554224b102b9a849f8f49d26895153ed96a236a1c93ddeb6241552c4e074a70540cc421a2d4f341fc717eeb973999e3de9888dd62da9c247d3635c14c45ae0e WHIRLPOOL 02364670461307556a0728069c30e087531a9178f52cd0e407bc67d2fd5ad84e0e04c0a4a3b8ac8a21cbdae005ab98c156c29a16befb88a1252318dc9ee1e341
-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 244 SHA256 856e819659934229aa18649e0c783b9714fa33065cb5113e7b667ed68392b39a SHA512 0e856f808459b6d83c6eaeee418d87d85385968a39e6c1871a0eb76c04b533bbba16996a6f18613b7c550da90c76843bd01237be9b9f290394048e904535653c WHIRLPOOL 2aa292ef66863766df8920a2ebd497218854f9a41724cdef1d63a93c94620fbea641a688af2bb374673773dd5b1b8afff80867c974f49d5600991ab44f9b8752
+AUX nmh-1.3-db5.patch 568 BLAKE2B e895827d406c581b61d46da4331618b044f66e29a1c4055949f10ead52a3a7971f9b181cb7e224cc1764c3de472b10cb14949a4a5f4b0853f6026aa7944a1604 SHA512 512838c9838124f29e5f3bf0f9ea6956d1fb0a231fd4301f78268b36f9d69dcfec2cdf5d798569b191752a654934acd68b8a8fa095385daa2daf127718fdf376
+AUX nmh-1.6-m_getfld.patch 487 BLAKE2B 915e8c29e4da161b56e960373f4f7d1a6d0122243dfa76fa4bfa9bcfb3bf9ab7b955103147d4aed9ef688800077569965bd287986687306c72ce8746d4ba8040 SHA512 a69417fb263b27c65b38778f01a4e08b82fccbb8134f490d01566de1c6275334a02ce25e0a1ab2b7dd47b1e4e1fddd29f8769931f650823cdfbfacd55e325e32
+DIST nmh-1.6.tar.gz 1197272 BLAKE2B eb3700864604ad739b1750045c933e04bc7d457db65e87eee1610e1a08dab03fba45726fbc785b4f29d84bf6720f1eae6c979aba74a5e538f5a0b833fc8e5903 SHA512 03775e73f69eb21088e191f41a0bbc2e631956f0d496f87be97981ac2c85d8cbe0680e8ee7e37f97e79c34ccd814fca78f2684acfc8390e333a46c710fbdb2b7
+EBUILD nmh-1.6.ebuild 1899 BLAKE2B ac85473dea528dee0c4caa3634265515823de892be08d15c4dfb7d7311fe1d919cacbe6f238c1138ce4f15524c98424ccd64568d011a120ced820a97a926e8c0 SHA512 aacdaf8012495b7b14cf3c6c96435c8e50cf274507c36b1d2f0c7a0b00561c000aa982701b8cf28881ab1367facabb827969825bdf625e850fbe0c21a2a0be1a
+MISC metadata.xml 244 BLAKE2B 4c636cb2e4dd31b286d765d3c8724c3fc61051ff0653d1deae09a77fb1849928920749778c98dda893f27765d2ff0f94ce11582315cd95569e1b39092908df67 SHA512 0e856f808459b6d83c6eaeee418d87d85385968a39e6c1871a0eb76c04b533bbba16996a6f18613b7c550da90c76843bd01237be9b9f290394048e904535653c
diff --git a/mail-client/nmh/files/nmh-1.3-inc-login.patch b/mail-client/nmh/files/nmh-1.3-inc-login.patch
deleted file mode 100644
index 631a03f3e35a..000000000000
--- a/mail-client/nmh/files/nmh-1.3-inc-login.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/uip/inc.c b/uip/inc.c
-index cf12ab8..b8384cd 100644
---- a/uip/inc.c
-+++ b/uip/inc.c
-@@ -496,8 +496,7 @@ main (int argc, char **argv)
-      * a POP server?
-      */
-     if (inc_type == INC_POP) {
--	if (user == NULL)
--	    user = getusername ();
-+
- 	if ( strcmp( POPSERVICE, "kpop" ) == 0 ) {
- 	    kpop = 1;
- 	}
-@@ -506,6 +505,12 @@ main (int argc, char **argv)
- 	else
- 	    ruserpass (host, &user, &pass);
- 
-+	/* 
-+	 * Do this _after_ ruserpass, otherwise the login field will be unusable
-+	 */
-+	if (user == NULL)
-+	    user = getusername ();
-+
- 	/*
- 	 * initialize POP connection
- 	 */
diff --git a/mail-client/nmh/files/nmh-1.3-install.patch b/mail-client/nmh/files/nmh-1.3-install.patch
deleted file mode 100644
index 25dc321fd180..000000000000
--- a/mail-client/nmh/files/nmh-1.3-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/uip/Makefile.in b/uip/Makefile.in
-index b3c6717..5ed34f8 100644
---- a/uip/Makefile.in
-+++ b/uip/Makefile.in
-@@ -267,7 +267,6 @@ install-lcmds:
- 	rm -f $(DESTDIR)$(bindir)/folders
- 	rm -f $(DESTDIR)$(bindir)/prev
- 	rm -f $(DESTDIR)$(bindir)/next
--	rm -f $(DESTDIR)$(libdir)/install-mh
- 	$(LN) $(DESTDIR)$(bindir)/flist  $(DESTDIR)$(bindir)/flists
- 	$(LN) $(DESTDIR)$(bindir)/folder $(DESTDIR)$(bindir)/folders
- 	$(LN) $(DESTDIR)$(bindir)/show   $(DESTDIR)$(bindir)/prev
diff --git a/mail-client/nmh/files/nmh-1.3-m_getfld.patch b/mail-client/nmh/files/nmh-1.3-m_getfld.patch
deleted file mode 100644
index 6e0104c3d4c9..000000000000
--- a/mail-client/nmh/files/nmh-1.3-m_getfld.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
-index caf9519..13c2c3d 100644
---- a/sbr/m_getfld.c
-+++ b/sbr/m_getfld.c
-@@ -731,18 +731,18 @@ matchc(int patln, char *pat, int strln, char *str)
- 	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 ((unsigned char *)--str);
-+			return ((unsigned char *)str);
- 	}
-+	return 0;
- }
- 
- 
diff --git a/mail-client/nmh/files/nmh-1.3-parallelmake.patch b/mail-client/nmh/files/nmh-1.3-parallelmake.patch
deleted file mode 100644
index 1ac2415e9845..000000000000
--- a/mail-client/nmh/files/nmh-1.3-parallelmake.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/etc/Makefile.in b/etc/Makefile.in
-index f1412b1..9af408d 100644
---- a/etc/Makefile.in
-+++ b/etc/Makefile.in
-@@ -86,13 +86,13 @@ sendfiles: $(srcdir)/sendfiles.in Makefile
- install: install-bin-files install-etc-files
- 
- install-bin-files:
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
-+	mkdir -p $(DESTDIR)$(bindir)
- 	for script in $(GENERATED_BIN_FILES); do \
- 	  $(INSTALL_SCRIPT) $$script $(DESTDIR)$(bindir)/$$script; \
- 	done
- 
- install-etc-files:
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir)
-+	mkdir -p $(DESTDIR)$(etcdir)
- 	INSTALL_FILES="$(GENERATED_ETC_FILES)"; \
- 	for file in $(STATIC_FILES); do \
- 	  INSTALL_FILES="$$INSTALL_FILES $(srcdir)/$$file"; \
-diff --git a/man/Makefile.in b/man/Makefile.in
-index 2ac26f3..7c613bf 100644
---- a/man/Makefile.in
-+++ b/man/Makefile.in
-@@ -130,14 +130,14 @@ install: install-man1 install-man5 install-man8
- 
- # install the man pages in man1
- install-man1:
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext1)
-+	mkdir -p $(DESTDIR)$(mandir)/man$(manext1)
- 	for file in $(MAN1); do \
- 	  $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext1) ; \
- 	done
- 
- # install the man pages in man5
- install-man5:
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext5)
-+	mkdir -p $(DESTDIR)$(mandir)/man$(manext5)
- 	for file in $(MAN5); do \
- 	  $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext5) ; \
- 	done
-@@ -148,7 +148,7 @@ install-man5:
- 
- # install the man pages in man8
- install-man8:
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext8)
-+	mkdir -p $(DESTDIR)$(mandir)/man$(manext8)
- 	for file in $(MAN8); do \
- 	  $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext8) ; \
- 	done
-diff --git a/mts/Makefile.in b/mts/Makefile.in
-index f739e30..f606fef 100644
---- a/mts/Makefile.in
-+++ b/mts/Makefile.in
-@@ -43,7 +43,7 @@ SUBDIRS = smtp
- 
- all: all-recursive libmts.a
- 
--all-recursive:
-+all-recursive $(OBJS):
- 	for subdir in $(SUBDIRS); do \
- 	  (cd $$subdir && $(MAKE) $(MAKEDEFS) all) || exit 1; \
- 	done
-diff --git a/uip/Makefile.in b/uip/Makefile.in
-index 5ed34f8..c9239b1 100644
---- a/uip/Makefile.in
-+++ b/uip/Makefile.in
-@@ -256,13 +256,13 @@ install: install-cmds install-misc install-lcmds install-scmds
- 
- # install commands
- install-cmds:
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
-+	mkdir -p $(DESTDIR)$(bindir)
- 	for cmd in $(CMDS); do \
- 	  $(INSTALL_PROGRAM) $$cmd $(DESTDIR)$(bindir)/$$cmd; \
- 	done
- 
- # install links
--install-lcmds:
-+install-lcmds: install-cmds
- 	rm -f $(DESTDIR)$(bindir)/flists
- 	rm -f $(DESTDIR)$(bindir)/folders
- 	rm -f $(DESTDIR)$(bindir)/prev
-@@ -274,13 +274,13 @@ install-lcmds:
- 
- # install misc support binaries
- install-misc:
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
-+	mkdir -p $(DESTDIR)$(libdir)
- 	for misc in $(MISC); do \
- 	  $(INSTALL_PROGRAM) $$misc $(DESTDIR)$(libdir)/$$misc; \
- 	done
- 
- # install commands with special installation needs (thus no $(SCMDS) use here)
--install-scmds:
-+install-scmds: install-cmds
- 	if test x$(SETGID_MAIL) != x; then \
- 	  $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(DESTDIR)$(bindir)/$$cmd; \
- 	else \
diff --git a/mail-client/nmh/nmh-1.3-r4.ebuild b/mail-client/nmh/nmh-1.3-r4.ebuild
deleted file mode 100644
index c4260f041840..000000000000
--- a/mail-client/nmh/nmh-1.3-r4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-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"
-IUSE="gdbm"
-
-DEPEND="gdbm? ( sys-libs/gdbm )
-	!gdbm? ( sys-libs/db:= )
-	>=sys-libs/ncurses-5.2:0=
-	net-libs/liblockfile
-	>=app-misc/editor-wrapper-3
-	!!media-gfx/pixie" # Bug #295996 media-gfx/pixie also uses show
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog DATE MACHINES README )
-
-# Patches from bug #22173.
-# bug #57886
-# bug #319937
-# Allow parallel compiles/installs
-
-PATCHES=( "${FILESDIR}"/${P}-inc-login.patch
-	  "${FILESDIR}"/${P}-install.patch
-	  "${FILESDIR}"/${P}-m_getfld.patch
-	  "${FILESDIR}"/${P}-db5.patch
-	  "${FILESDIR}"/${P}-parallelmake.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="--libdir=/usr/$(get_libdir)/nmh"
-
-	# Have gdbm use flag actually control which version of db in use
-	if use gdbm; then
-		myconf="${myconf} --with-ndbmheader=gdbm/ndbm.h --with-ndbm=gdbm_compat"
-	else
-		if has_version ">=sys-libs/db-2"; then
-			myconf="${myconf} --with-ndbmheader=db.h --with-ndbm=db"
-		else
-			myconf="${myconf} --with-ndbmheader=db1/ndbm.h --with-ndbm=db1"
-		fi
-	fi
-
-	# use wrapper scripts to avoid implicit dependencies (Bug #294762)
-	EDITOR=/usr/libexec/editor
-	PAGER=/usr/libexec/pager
-
-	econf \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-editor="${EDITOR}" \
-		--with-pager="${PAGER}" \
-		--enable-nmh-pop \
-		--sysconfdir=/etc/nmh \
-		${myconf}
-}