commit: b9f82f8f946b03fcdb5584d1d8d15c0199c35396 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Apr 20 08:13:31 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Apr 20 08:13:31 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f82f8f
mail-client/nmh: Remove last-rited pkg Closes: https://bugs.gentoo.org/676938 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> mail-client/nmh/Manifest | 1 - mail-client/nmh/files/nmh-1.3-db5.patch | 17 ------- mail-client/nmh/files/nmh-1.6-m_getfld.patch | 25 ---------- mail-client/nmh/metadata.xml | 5 -- mail-client/nmh/nmh-1.6.ebuild | 72 ---------------------------- profiles/package.mask | 2 - 6 files changed, 122 deletions(-) diff --git a/mail-client/nmh/Manifest b/mail-client/nmh/Manifest deleted file mode 100644 index 84f016e9a9e..00000000000 --- a/mail-client/nmh/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST nmh-1.6.tar.gz 1197272 BLAKE2B eb3700864604ad739b1750045c933e04bc7d457db65e87eee1610e1a08dab03fba45726fbc785b4f29d84bf6720f1eae6c979aba74a5e538f5a0b833fc8e5903 SHA512 03775e73f69eb21088e191f41a0bbc2e631956f0d496f87be97981ac2c85d8cbe0680e8ee7e37f97e79c34ccd814fca78f2684acfc8390e333a46c710fbdb2b7 diff --git a/mail-client/nmh/files/nmh-1.3-db5.patch b/mail-client/nmh/files/nmh-1.3-db5.patch deleted file mode 100644 index 473e2b609ae..00000000000 --- a/mail-client/nmh/files/nmh-1.3-db5.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/uip/slocal.c b/uip/slocal.c -index 9697d84..d38a020 100644 ---- a/uip/slocal.c -+++ b/uip/slocal.c -@@ -46,6 +46,12 @@ - extern int initgroups(char*, int); - #endif - -+/* This define is needed for Berkeley db v5 and above to -+ * make the header file expose the 'historical' ndbm APIs. -+ * We define it unconditionally because this is simple and -+ * harmless. -+ */ -+#define HAVE_DBM - /* This define is needed for Berkeley db v2 and above to - * make the header file expose the 'historical' ndbm APIs. - * We define it unconditionally because this is simple and diff --git a/mail-client/nmh/files/nmh-1.6-m_getfld.patch b/mail-client/nmh/files/nmh-1.6-m_getfld.patch deleted file mode 100644 index 36f20779664..00000000000 --- a/mail-client/nmh/files/nmh-1.6-m_getfld.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- 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 deleted file mode 100644 index 7a38bb90096..00000000000 --- a/mail-client/nmh/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> diff --git a/mail-client/nmh/nmh-1.6.ebuild b/mail-client/nmh/nmh-1.6.ebuild deleted file mode 100644 index c64883e3515..00000000000 --- a/mail-client/nmh/nmh-1.6.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# 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[@]}" -} diff --git a/profiles/package.mask b/profiles/package.mask index 80a725dc004..4b5fc873608 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -610,7 +610,6 @@ x11-libs/hippo-canvas # dev-util/wsta: #674004, no fix upstream, also #631610, #674526 # games-util/gtkevemon: #675988, upstream API shut down # mail-client/nail: #676008, last commit in 2010, also #508480 -# mail-client/nmh: #676938, needs bump, 2014, also #676938, #680596 # # Removal in 30 days. app-crypt/keynote @@ -618,7 +617,6 @@ dev-util/skipfish dev-util/wsta games-util/gtkevemon mail-client/nail -mail-client/nmh # Miroslav Šulc <fordf...@gentoo.org> (19 Mar 2019) # Depends on >=virtual/{jdk,jre}-11 which is masked
