[gentoo-commits] repo/gentoo:master commit in: mail-client/nmh/files/, mail-client/nmh/

[Tim Harder]

commit:     74e93c23a66b42b925e1dd3abea0bf1cb17e4230
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 21 22:26:37 2017 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 22:29:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74e93c23

mail-client/nmh: remove old

Closes: https://bugs.gentoo.org/631662

 mail-client/nmh/Manifest                         |  3 +-
 mail-client/nmh/files/nmh-1.3-inc-login.patch    | 27 -------
 mail-client/nmh/files/nmh-1.3-install.patch      | 12 ---
 mail-client/nmh/files/nmh-1.3-m_getfld.patch     | 29 -------
 mail-client/nmh/files/nmh-1.3-parallelmake.patch | 99 ------------------------
 mail-client/nmh/nmh-1.3-r4.ebuild                | 70 -----------------
 6 files changed, 1 insertion(+), 239 deletions(-)

diff --git a/mail-client/nmh/Manifest b/mail-client/nmh/Manifest
index 010f048862e..84f016e9a9e 100644
--- a/mail-client/nmh/Manifest
+++ b/mail-client/nmh/Manifest
@@ -1,2 +1 @@
-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
+DIST nmh-1.6.tar.gz 1197272 BLAKE2B eb3700864604ad739b1750045c933e04bc7d457db65e87eee1610e1a08dab03fba45726fbc785b4f29d84bf6720f1eae6c979aba74a5e538f5a0b833fc8e5903 SHA512 03775e73f69eb21088e191f41a0bbc2e631956f0d496f87be97981ac2c85d8cbe0680e8ee7e37f97e79c34ccd814fca78f2684acfc8390e333a46c710fbdb2b7

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 631a03f3e35..00000000000
--- 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 25dc321fd18..00000000000
--- 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 6e0104c3d4c..00000000000
--- 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 1ac2415e984..00000000000
--- 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 c4260f04184..00000000000
--- 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}
-}