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

[Michał Górny]

commit:     1923c2250dc49aaddc4df7e0602fc1aa03f887d7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 08:14:48 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 08:14:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1923c225

mail-client/nail: Remove last-rited pkg

Closes: https://bugs.gentoo.org/676008
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 mail-client/nail/Manifest                        |   1 -
 mail-client/nail/files/nail-12.4-debian.patch    |  56 ------------
 mail-client/nail/files/nail-12.4-openssl-1.patch |  72 ---------------
 mail-client/nail/metadata.xml                    |  23 -----
 mail-client/nail/nail-12.4-r3.ebuild             | 109 -----------------------
 profiles/package.mask                            |   2 -
 6 files changed, 263 deletions(-)

diff --git a/mail-client/nail/Manifest b/mail-client/nail/Manifest
deleted file mode 100644
index 73ea4acc306..00000000000
--- a/mail-client/nail/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mailx-12.4.tar.bz2 271482 BLAKE2B ad011ef648036f10f800097c56a34cc5b882b808a7886eea86fa3dfc6f5a9a5b4e64e86e9b842384e4f55ce998ee8832176ce7e325c646ac26a187cbf26406a0 SHA512 a0e29972f552bd630ce1a14f70e61661815118520bcd4a00b6cad53f3270d3d08c835ff6982ba8800eb380a5b46f54eb6e60fb7533b5f41c916af45d29605af8

diff --git a/mail-client/nail/files/nail-12.4-debian.patch b/mail-client/nail/files/nail-12.4-debian.patch
deleted file mode 100644
index 2fea0b190d2..00000000000
--- a/mail-client/nail/files/nail-12.4-debian.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- heirloom-mailx-12.4.orig/getopt.c
-+++ heirloom-mailx-12.4/getopt.c
-@@ -43,7 +43,7 @@
- char	*optarg;
- int	optind = 1;
- int	opterr = 1;
--int	optopt;
-+int	optoptc;
- 
- static void
- error(const char *s, int c)
-@@ -69,7 +69,7 @@
- 		*bp++ = *s++;
- 	while (*msg)
- 		*bp++ = *msg++;
--	*bp++ = optopt;
-+	*bp++ = optoptc;
- 	*bp++ = '\n';
- 	write(2, buf, bp - buf);
- 	ac_free(buf);
-@@ -101,13 +101,13 @@
- 		}
- 		curp = &argv[optind][1];
- 	}
--	optopt = curp[0] & 0377;
-+	optoptc = curp[0] & 0377;
- 	while (optstring[0]) {
- 		if (optstring[0] == ':') {
- 			optstring++;
- 			continue;
- 		}
--		if ((optstring[0] & 0377) == optopt) {
-+		if ((optstring[0] & 0377) == optoptc) {
- 			if (optstring[1] == ':') {
- 				if (curp[1] != '\0') {
- 					optarg = (char *)&curp[1];
-@@ -127,7 +127,7 @@
- 					optind++;
- 				optarg = 0;
- 			}
--			return optopt;
-+			return optoptc;
- 		}
- 		optstring++;
- 	}
---- heirloom-mailx-12.4.orig/mailx.1
-+++ heirloom-mailx-12.4/mailx.1
-@@ -3766,7 +3766,7 @@
- .sp
- .fi
- which might cause
--.N mailx
-+.B mailx
- to respond with, for example:
- .nf
- .sp

diff --git a/mail-client/nail/files/nail-12.4-openssl-1.patch b/mail-client/nail/files/nail-12.4-openssl-1.patch
deleted file mode 100644
index 376c4d668e3..00000000000
--- a/mail-client/nail/files/nail-12.4-openssl-1.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-http://bugs.gentoo.org/328363
-http://repos.archlinux.org/wsvn/community/mailx-heirloom/trunk/mailx-heirloom-openssl-1.0.patch
-
---- openssl.c
-+++ openssl.c
-@@ -105,7 +105,7 @@
- static void ssl_load_verifications(struct sock *sp);
- static void ssl_certificate(struct sock *sp, const char *uhp);
- static enum okay ssl_check_host(const char *server, struct sock *sp);
--static int smime_verify(struct message *m, int n, STACK *chain,
-+static int smime_verify(struct message *m, int n, STACK_OF(X509) *chain,
- 		X509_STORE *store);
- static EVP_CIPHER *smime_cipher(const char *name);
- static int ssl_password_cb(char *buf, int size, int rwflag, void *userdata);
-@@ -308,7 +308,7 @@
- 	X509 *cert;
- 	X509_NAME *subj;
- 	char data[256];
--	/*GENERAL_NAMES*/STACK	*gens;
-+	/*GENERAL_NAMES*/STACK_OF(GENERAL_NAMES)	*gens;
- 	GENERAL_NAME	*gen;
- 	int	i;
- 
-@@ -496,7 +496,7 @@
- }
- 
- static int
--smime_verify(struct message *m, int n, STACK *chain, X509_STORE *store)
-+smime_verify(struct message *m, int n, STACK_OF(X509) *chain, X509_STORE *store)
- {
- 	struct message	*x;
- 	char	*cp, *sender, *to, *cc, *cnttype;
-@@ -505,7 +505,8 @@
- 	off_t	size;
- 	BIO	*fb, *pb;
- 	PKCS7	*pkcs7;
--	STACK	*certs, *gens;
-+	STACK_OF(X509)	*certs;
-+	STACK_OF(GENERAL_NAMES) *gens;
- 	X509	*cert;
- 	X509_NAME	*subj;
- 	char	data[LINESIZE];
-@@ -614,7 +615,7 @@
- {
- 	int	*msgvec = vp, *ip;
- 	int	ec = 0;
--	STACK	*chain = NULL;
-+	STACK_OF(X509)	*chain = NULL;
- 	X509_STORE	*store;
- 	char	*ca_dir, *ca_file;
- 
-@@ -687,7 +688,7 @@
- 	X509	*cert;
- 	PKCS7	*pkcs7;
- 	BIO	*bb, *yb;
--	STACK	*certs;
-+	STACK_OF(X509)	*certs;
- 	EVP_CIPHER	*cipher;
- 
- 	certfile = expand((char *)certfile);
-@@ -950,9 +951,9 @@
- 	off_t	size;
- 	BIO	*fb, *pb;
- 	PKCS7	*pkcs7;
--	STACK	*certs;
-+	STACK_OF(X509)	*certs;
- 	X509	*cert;
--	STACK	*chain = NULL;
-+	STACK_OF(X509)	*chain = NULL;
- 	enum okay	ok = OKAY;
- 
- 	message_number = n;

diff --git a/mail-client/nail/metadata.xml b/mail-client/nail/metadata.xml
deleted file mode 100644
index 438edf383cb..00000000000
--- a/mail-client/nail/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="net">
-      Enable support for network protocols (POP, IMAP and SMTP). If you
-      only need to send mail with the local Transport Agent, disabling
-      this will get you support for only /usr/sbin/sendmail call.
-    </flag>
-    <flag name="ssl">
-      If network is enabled, this adds support for S/MIME and
-      SSL/TLS-powered protocols through <pkg>dev-libs/openssl</pkg>.
-    </flag>
-    <flag name="kerberos">
-      If network is enabled, this adds support for GSSAPI login on IMAP
-      through <pkg>virtual/krb5</pkg>.
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">heirloom</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/mail-client/nail/nail-12.4-r3.ebuild b/mail-client/nail/nail-12.4-r3.ebuild
deleted file mode 100644
index 6cd0f0c264b..00000000000
--- a/mail-client/nail/nail-12.4-r3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-HOMEPAGE="http://heirloom.sourceforge.net/"
-DESCRIPTION="an enhanced mailx-compatible mail client"
-LICENSE="BSD"
-
-MY_PN="mailx"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="libressl ssl net kerberos"
-
-RDEPEND="
-	net? (
-		ssl? (
-			!libressl? ( dev-libs/openssl:0 )
-			libressl? ( dev-libs/libressl )
-		)
-		kerberos? ( virtual/krb5 )
-	)
-	!mail-client/mailx
-	!net-mail/mailutils
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-undef() {
-	sed -i -e "/$1/s:#define:#undef:" config.h || die
-}
-
-droplib() {
-	sed -i -e "/$1/s:^:#:" LIBS || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-debian.patch \
-		"${FILESDIR}"/${P}-openssl-1.patch
-	# Do not strip the binary
-	sed -i -e '/STRIP/d' Makefile
-}
-
-src_configure() {
-	# Build config.h and LIBS, neccesary to tweak the config
-	# use -j1 because it will produce bogus output otherwise
-	emake -j1 config.h LIBS || die
-
-	# Logic to 'configure' the package
-
-	if ! use ssl || ! use net ; then
-		undef 'USE_\(OPEN\)\?SSL'
-		droplib -lssl
-	fi
-
-	if ! use kerberos || ! use net ; then
-		undef 'USE_GSSAPI'
-		droplib -lgssapi_krb5
-	fi
-
-	if ! use net ; then
-		undef 'HAVE_SOCKETS'
-	fi
-}
-
-src_compile() {
-	# No configure script to check for and set this
-	tc-export CC
-
-	emake \
-		CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" \
-		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc \
-		SENDMAIL="${EPREFIX}/usr/sbin/sendmail" \
-		MAILSPOOL='/var/spool/mail' \
-		|| die "emake failed"
-}
-
-src_install () {
-	# Use /usr/sbin/sendmail by default and provide an example
-	cat <<- EOSMTP >> nail.rc
-
-		# Use the local sendmail (/usr/sbin/sendmail) binary by default.
-		# (Uncomment the following line to use a SMTP server)
-		#set smtp=localhost
-
-		# Ask for CC: list too.
-		set askcc
-	EOSMTP
-
-	emake DESTDIR="${D}" \
-		UCBINSTALL=$(type -p install) \
-		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc install \
-		|| die
-
-	dodoc AUTHORS README || die
-
-	dodir /bin
-	dosym ../usr/bin/mailx /bin/mail || die
-	dosym mailx /usr/bin/mail || die
-	dosym mailx /usr/bin/Mail || die
-
-	dosym mailx.1 /usr/share/man/man1/mail.1 || die
-	dosym mailx.1 /usr/share/man/man1/Mail.1 || die
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 4b5fc873608..a4e1026813c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -609,14 +609,12 @@ x11-libs/hippo-canvas
 # dev-util/skipfish: #675124, last upstream commit in 2012
 # 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
 #
 # Removal in 30 days.
 app-crypt/keynote
 dev-util/skipfish
 dev-util/wsta
 games-util/gtkevemon
-mail-client/nail
 
 # Miroslav Šulc <fordfrog@g.o> (19 Mar 2019)
 # Depends on >=virtual/{jdk,jre}-11 which is masked