gentoo resync : 28.04.2019

21 files changed, 13 insertions, 402 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index d64c3efbf0f3..9bdbc4c78f8b 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 16fba2ccbdf6..ade01f5113cb 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,4 +1,4 @@
 DIST claws-mail-3.17.3.tar.xz 6164392 BLAKE2B ac0781c4c7e4423f4a8b494a9bd007d62443e8c540feaeef089ca65f641da5ecabfa2c5c0662750d6f58c8913c1d95750a3dfb6b4628e573b0105f8f526bc066 SHA512 b562d785eaedbdec408c4a3db8f4d9326183266fe314509a189c9e1220f15b4f41ccd9d8c58c5194c0267842e8efe900e88eb17c0d17d6069e2543870efa5ef8
-EBUILD claws-mail-3.17.3-r1.ebuild 5888 BLAKE2B 9b1f7c6b621f09ee23469f1d8f88e4d7f07583e6a17bd3861b9b94f5fcdbf7c8c9f8906cfd8ce61f2224fe61db99b379b1fe4ef7ce53581840a368af87803d9c SHA512 80dbb7d5f617f5ba3c2ff03a80ec67778026ba5b6faf5229a27e600eef304485d3baa6ce2449f6450011a7d41010ee2497e52ef8bd9e00cadb9d19fe2dba8415
-EBUILD claws-mail-9999.ebuild 5955 BLAKE2B 90ee83dc50f8b619acee91969c0bb8fd613d1b14689764bf096d07a3a1ea0d4cac6aa18b641f1e36103b02282874a63c9142c0d7858a4d0a94b15cb939253fc0 SHA512 925a3a2bcd42db5c410303de5252ad4c5c532d452827c5aa724dbe178e9fd8bd3c2a26b22d9270d359cedf4a1b0e831c3df7c262e4df641c602e43dac345f5c9
+EBUILD claws-mail-3.17.3-r1.ebuild 5890 BLAKE2B cdc8ccd86b034d6dbcfd0683060dce6ee77bc117a3f75ea9079d8c0c73cbadc7173a7bfa434bb74e9f4d09f1b191131f578d221710fb0e765d42843f16d9ecf9 SHA512 ec9e75d5de10eb83a8288f748154d7657fd07a9f3fa84ea9469acc5615b09fe03aa31eaab9049bcb153b293619f86b257093fa3bd93c055535271e421693b7c8
+EBUILD claws-mail-9999.ebuild 5957 BLAKE2B 2d3a431ac12f8b8e6d2fdcdf8a251bdc6edaaf853875234cb42eb99b75c3ea45ca1fe58b3b1305daa8f88f26e37df800ec069d2e980bfc8ba54c6fecb69060f4 SHA512 5697819f1fe4226c5cb9f94848ea191b59b89aa15c0afc8350652ce4174dfdab39d4f98a169fe6a6c0015caf4ae85b7e9df92ac92e17a2e20cce3e78a2a1c80b
 MISC metadata.xml 1556 BLAKE2B 29e42ddae81e5278dba83a53ae5dfd56993647aa6b22a35cdcef1e69aafa66633472b2ef27894e3fce3aea7a38a4d49af1ac7f0e44aee492e3792c75bb71bafe SHA512 c454d30ee5161f482e97a30895620e01c3900c5bb89ac50b8468f1f3092b736802003b9867a1dfd9c8ce196cdfc689b650a3ac53980dce5a0b925712cb04a572
diff --git a/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild b/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild
index 427c3e97bc0a..2efa76b08b5a 100644
--- a/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild
@@ -72,7 +72,7 @@ COMMONDEPEND="
 	)
 	smime? ( >=app-crypt/gpgme-1.0.0 )
 	spam-report? ( >=net-misc/curl-7.9.7 )
-	spell? ( >=app-text/enchant-1.0.0 )
+	spell? ( >=app-text/enchant-1.0.0:= )
 	startup-notification? ( x11-libs/startup-notification )
 	svg? ( >=gnome-base/librsvg-2.40.5 )
 	valgrind? ( dev-util/valgrind )
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
index dd62d66a3192..34f857928262 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -73,7 +73,7 @@ COMMONDEPEND="
 	)
 	smime? ( >=app-crypt/gpgme-1.0.0 )
 	spam-report? ( >=net-misc/curl-7.9.7 )
-	spell? ( >=app-text/enchant-1.0.0 )
+	spell? ( >=app-text/enchant-1.0.0:= )
 	startup-notification? ( x11-libs/startup-notification )
 	svg? ( >=gnome-base/librsvg-2.40.5 )
 	valgrind? ( dev-util/valgrind )
diff --git a/mail-client/cone/Manifest b/mail-client/cone/Manifest
index d72d0f67f097..c6672a241d35 100644
--- a/mail-client/cone/Manifest
+++ b/mail-client/cone/Manifest
@@ -6,5 +6,5 @@ DIST cone-1.0.tar.bz2 3793288 BLAKE2B e2c8aa91adfff77d3f0207a3caca5d13ebae8c9455
 EBUILD cone-0.92.ebuild 1203 BLAKE2B 8f178b8e745d42a35003db91d7dfa9d1a6972216e98cc041bee1e9c28a60c9c6542efc0dd30924cefcc10de9714dcd3989e72c7c17887a871f9855b0fc602035 SHA512 364fa555ecc58cc312ca4dba20b86cb6a6765591854522e4ee218886d7acf4822a9152c64c31b9c51186487fb86aba737c121961c9fc1e22d0116f6cb70f21ff
 EBUILD cone-0.95.ebuild 1219 BLAKE2B e09eca9f51ebfb0150e0c733e566b2fdd4b6367fa4e5bf1e45c7a76ebaee0d2b4fe50b276f1fb9d18f1aa8bb1fe51b01ef2f3b83b87627037b233ba70439ba6e SHA512 d4d493937662020b042a2792d050747ee8884de0a1c9cb8d7f83b859eca42de48cc81cb4fe9aac9bd0f0334dabcc0065fff002366e655ea9cd75283077f7d444
 EBUILD cone-0.96.ebuild 1217 BLAKE2B 7bbaccc1cdbc9724333cc87c04abe9987a4f1322a803023e3f8ab622f4e8e5798f1ce589221f6da6a88d4ed1e100164aa8efde942280c9b5df77bad2e1c81435 SHA512 861cdbc8e75fb0b68a7a7d97f53dbef80acb1d6ceba1d2ea2345ebca2779af081445dc5d53e5cb4f867ebfec21b93d2ade0d8fcfc0dfe7b4c8bbc371e734e3ab
-EBUILD cone-1.0.ebuild 1713 BLAKE2B 2636a4d853cc4fcc5627784591ac9e7c00da3c1d195350074f505e815afcb027473615d0cebadd30ea6dd6f94c6ea7f79f5f864dacf51aa30c160eb5901c2b2f SHA512 35d5c3cabcc446d61ba54c29a3bf211e59d320b4204956ba87dfb9ead3a4ee7ec6871df7b04420e5212fd93897abff161608f841bfa62e69756e876c3beb0c0c
+EBUILD cone-1.0.ebuild 1710 BLAKE2B a438dda765f8e5ca7e3193b29d55ec34ad30d8850b2f6b2410f58d6cabd3620d4198c235e52fc2c81a0c50f8475d7c21d822143e1bc8132e59b804b048ae064c SHA512 787cee613016d7b6cc61ffab28f12ec2a6d640d895abbd4e467f93416c9ef1114801d4a68e12507096d457f1d2a01084304c38b7cab0fd3e2733901aff162158
 MISC metadata.xml 244 BLAKE2B 45f1b3e90ac17489176656777b4c699037769fba524d6128f5e35653bad136b3227d2d99e60fa91d467bce25c90db4b263f177a6f972d73edc8c509f2f8c8d8f SHA512 0c197888b8bd38dae328bca5f561c69eacee7e82dc995676705861dc3e9da8a4d99c1f03c10a20860e169a4e1a50970c81b0601c3a313fdf100291d34425a203
diff --git a/mail-client/cone/cone-1.0.ebuild b/mail-client/cone/cone-1.0.ebuild
index 2b73ec8e3a71..2e0634efdd1d 100644
--- a/mail-client/cone/cone-1.0.ebuild
+++ b/mail-client/cone/cone-1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="crypt fam gnutls idn ipv6 ldap spell"
 
 RDEPEND="
diff --git a/mail-client/nail/Manifest b/mail-client/nail/Manifest
deleted file mode 100644
index 1e8c905509c8..000000000000
--- a/mail-client/nail/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX nail-12.4-debian.patch 1060 BLAKE2B dc07866c7871391e9bbddecfb5bb5addec4cffc16b93f03d0b6288a4fb95fdc546813ee16dd7a3eb3a03ded2c6889fe3c3e5a9b5fc8414d53b53079f17642ca4 SHA512 3cf37a64acf205bb8404e87e93cd920ee71ae8a9a2af147c21ef7d7b4684a05c1bf38eb3cf9e7a7fef7c883fb48de2324d3a687064f1adea3ab3949d6dcce513
-AUX nail-12.4-openssl-1.patch 1860 BLAKE2B e91b6a9f334060c6393aaa20120c0ce21bc6048c24aa097d57fd4eb73300ce864d6631e0b3a1202c43a9baab1bc11873e21d91f12d0478f8e81649ca9337bb6c SHA512 6496973734f4a4c724c3dc7c46a8fde160e4bd456405737098d65d193581c891e697d728b7ebc7cb0317f9ede9b39110e1b27b2bce896aee9eec85474758eeca
-DIST mailx-12.4.tar.bz2 271482 BLAKE2B ad011ef648036f10f800097c56a34cc5b882b808a7886eea86fa3dfc6f5a9a5b4e64e86e9b842384e4f55ce998ee8832176ce7e325c646ac26a187cbf26406a0 SHA512 a0e29972f552bd630ce1a14f70e61661815118520bcd4a00b6cad53f3270d3d08c835ff6982ba8800eb380a5b46f54eb6e60fb7533b5f41c916af45d29605af8
-EBUILD nail-12.4-r3.ebuild 2431 BLAKE2B ca5556e0e56597904b4315aadaff3a66df315c0c2f48ca69ccade567241982ba13e3931dba39f16768feef741aa9b0487545d1ad1e656ddaa8c3f2ab692b9bed SHA512 abfd5dceda88571f26a8ae6c79739f4e270e600f8f5b5429b532c0ed84e85fddf2a2e809ea18858c3ed85ed49f7a34b7dae1389414fdd5bc81def832faedf958
-MISC metadata.xml 825 BLAKE2B eb7f1456cf87589b72e315514f84892714f7a5bb64818e6df16bfe4e1a90149e4d991930fc75a61dc14c93d21c0da5db9d817842a87f106a8af6ba43a4107293 SHA512 8fdd54add3b24141018d95ba7e178afde536c363a21df40bd90064f9b91af0973454055100edbfe2a2cc06f3f8267b6d13ca67236c75bafc51b58a225f9ebc41
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 2fea0b190d29..000000000000
--- 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 376c4d668e36..000000000000
--- 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 438edf383cb0..000000000000
--- 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 6cd0f0c264bf..000000000000
--- 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/mail-client/nmh/Manifest b/mail-client/nmh/Manifest
deleted file mode 100644
index 91e76282c301..000000000000
--- a/mail-client/nmh/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
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 473e2b609aeb..000000000000
--- 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 36f207796646..000000000000
--- 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 7a38bb900964..000000000000
--- 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 c64883e3515f..000000000000
--- 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/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index 95e33fda5f12..59f5309cf391 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,5 +1,5 @@
 DIST sylpheed-3.6.0.tar.bz2 3568998 BLAKE2B 283ea6c956eb67332b9f1ba34cecb2be853a079d398b5165e925b9adfe33b75d5eab559b91a707b5c76d9253f35acbf4177afcbb90e86fb48b45bcd9aa517768 SHA512 84c59e327690ed7e637e9ce60e630da6cdad771ccc278e31e490ed643da55c295fb47e999ad421fc59dbbcfed990882022b96cf478bd47253692d2e86279c591
 DIST sylpheed-3.7.0.tar.bz2 3612328 BLAKE2B bd8182db8a46b956e12b3da4b15d3ee8184a612e2fb216aca20fd4a022610b17416f994d36b390a5a92835915e95f08bd59bf71154a86962c9564162be891f21 SHA512 490837528bf7ba9d26994cd5fff00b6e5390a127419b9d0efd9fc25c38be1291d55c5b8daebdf5ca9d9159a51c938449e76212328f3eae40cc039db88cb5caa4
-EBUILD sylpheed-3.6.0.ebuild 1616 BLAKE2B 8c8693e53d6e421ca79ef5c0f3b4ff72de4a85a9604e6f804feeb2df15596aa38580a7657df2c871ae0449fb5dd60bac48decc82e0ce5a5f055b4ace2b751017 SHA512 b2d0169576bd7cb31979ffae86b288b2bffb041873d22f4cadf5ae59c5c8a853fd1a3b23b1d002500a92e9bbbc60306e77a2edfcd1d8b0e44026585b07b74892
-EBUILD sylpheed-3.7.0.ebuild 1616 BLAKE2B 8c8693e53d6e421ca79ef5c0f3b4ff72de4a85a9604e6f804feeb2df15596aa38580a7657df2c871ae0449fb5dd60bac48decc82e0ce5a5f055b4ace2b751017 SHA512 b2d0169576bd7cb31979ffae86b288b2bffb041873d22f4cadf5ae59c5c8a853fd1a3b23b1d002500a92e9bbbc60306e77a2edfcd1d8b0e44026585b07b74892
+EBUILD sylpheed-3.6.0.ebuild 1618 BLAKE2B 8a1467c6e7413f7175b9db8a5521e6fd7a62ebce69719e0e3cb9e32514cd769a6e3787b0d35c64af4efa960577de0942163821835919c18fcd1f52172e6ed448 SHA512 6070053ab9c3d2890029eb5bbfbc6bd1e530aebf7b03dfa3ca8e722ff092ce66413560e08ae7626234f1938befcb1a774ca8dc0f25b70e8cda7afd1b42ae3bec
+EBUILD sylpheed-3.7.0.ebuild 1618 BLAKE2B 8a1467c6e7413f7175b9db8a5521e6fd7a62ebce69719e0e3cb9e32514cd769a6e3787b0d35c64af4efa960577de0942163821835919c18fcd1f52172e6ed448 SHA512 6070053ab9c3d2890029eb5bbfbc6bd1e530aebf7b03dfa3ca8e722ff092ce66413560e08ae7626234f1938befcb1a774ca8dc0f25b70e8cda7afd1b42ae3bec
 MISC metadata.xml 352 BLAKE2B 405cc3d3cb69bbfeb0efdaa63e29393c3e1792bf8ce5a5cfbb69c1bebd9746287e3ee11c30b59d92ac7072965baed99ef991c68553fb24a47ff972feece097e7 SHA512 3392043b42819ac3ed03543881fd1eafc56f253d47d424b8ba4b62346ac04c1e6ac8e925bfcada44320bb26283f4e777832c5349e32a77c1e7b14796c0b03ed8
diff --git a/mail-client/sylpheed/sylpheed-3.6.0.ebuild b/mail-client/sylpheed/sylpheed-3.6.0.ebuild
index ea2a5a03bade..572a0d73fa63 100644
--- a/mail-client/sylpheed/sylpheed-3.6.0.ebuild
+++ b/mail-client/sylpheed/sylpheed-3.6.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A lightweight email client and newsreader"
 HOMEPAGE="http://sylpheed.sraoss.jp/"
 SRC_URI="http://${PN}.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="crypt ipv6 ldap libressl nls oniguruma pda spell ssl xface"
diff --git a/mail-client/sylpheed/sylpheed-3.7.0.ebuild b/mail-client/sylpheed/sylpheed-3.7.0.ebuild
index ea2a5a03bade..572a0d73fa63 100644
--- a/mail-client/sylpheed/sylpheed-3.7.0.ebuild
+++ b/mail-client/sylpheed/sylpheed-3.7.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A lightweight email client and newsreader"
 HOMEPAGE="http://sylpheed.sraoss.jp/"
 SRC_URI="http://${PN}.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="crypt ipv6 ldap libressl nls oniguruma pda spell ssl xface"
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 365bec9c5f74..7383d6e24a21 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -5,7 +5,7 @@ AUX thunderbird-60-sqlite3-fts3-tokenizer.patch 3721 BLAKE2B 585af92daf9db441e06
 AUX thunderbird-gentoo-default-prefs-1.js-1 426 BLAKE2B 2cade86c23902fe439018a79847ffef69f82041c35b4a473dbf62b59b17bfe3422abdae604026f8ed14dd1fddc525cb2c49516d2d003bfd3edc075021f24576d SHA512 b40e7b4789b7f43c382589f7d0eaa6043072bce86ab79fb3dda4800e9ab6a43af11f43b0cb3b6ab1c71d887aa1cf9356ac858f0a81dad013cef5b8a4b2107983
 AUX thunderbird-gentoo-default-prefs.js-2 461 BLAKE2B a18e1fdbab7ad81feb41af75e60f48adb960800849630a6f9253b7bebcd3e7db33b2517ad0be6302609545a5464b84bd5c5fc67a07fb2ceab0ca1ad98539bee0 SHA512 db115d89a094c395636e5c008307c7864cb084a0a4ebd024d4ce33cac12963cd4a9ff6833227adc6a098430dc3f7ca9e386e26b87400d46920f4ef15741aefa5
 DIST firefox-52.5-patches-02.tar.xz 15084 BLAKE2B 538dd61dbb7b290add4782b323a62f9ab4dbc57326a9a085710d207752118c504eb030a8741c1eed2e281c8d18e5453210b1905d71439250caa588137bbc37d0 SHA512 b80f9acaf49226cd5c2864714826c5b0e7e918e94c31ec81521b90c47edbb88ea85faa34fc22791efefbcd3867ddc413c563de58ca0f8ce21e10a3858899efce
-DIST firefox-60.6-patches-03.tar.xz 14904 BLAKE2B 91238639c87d151b89f78f24f0b95e458bd47d244ea4448ac7d8b8c570636ccaa559e9c8ad602a5f04ecbde1c757e7b3081290a672a1f9df7117adc7b90a0a34 SHA512 41dd97b6bd8c90eed564af8d15cec1e7081548340944a47979ab0639322b58dd7dac80c8643bcb627a99aa541a31a26e49a65749a0130990aa1f0d579151a577
+DIST firefox-60.6-patches-06.tar.xz 36868 BLAKE2B c6be625593b7b7f4f71407c1b7e6c86dc60155a90a36817065dc0aabea8885649a7c8f59f41626485487687f9b27dfb32c0905df77c9185cb12e984e2dfbc463 SHA512 c30a4ac2d01828452221ada9f0d39d08fe3834ead2633b509816dc6ab2b65f48998ba164a00b29751d51b9ab67e27638f572c4db7b1381fc921456ab840efcfe
 DIST gdata-provider-3.3.tar.xz 85628 BLAKE2B 2ccde620b181a2d8678f50d7107373886f3b2e7d1d1e8861c4e42602cedb02108d28e0bf5e5cd9e31474356b70cb99baa7870e20436bc72e25cd8a8fc1353d14 SHA512 ae0c0e6fd42d6e7088256ca8a4be5b0bac84b2f331b51afdc982354caef60b6ba631d4f76bfba7523000b49235c8f8c63704d90acf24b34b14696b709be9342b
 DIST gdata-provider-4.4.1.tar.xz 78728 BLAKE2B bfe04d714334c38c932d2186ffd859583176ef455b283534c5f8f9e1ab7dc13bdfb8c15db6007de482ab015afc2b8524aad725380bec75ee5f59ea81d6307ba9 SHA512 6c9b5ac41a1064bd1799d2a2f633c3064b27f1294ac3c8908cdef6c1d2eea7b602f2f7bf240b71f507fe9ad286588f030e12f49a41b3bed7bbcc99f3021369f9
 DIST lightning-5.4.9.tar.xz 1891752 BLAKE2B 90b777814db2962ff669430cea5a29ba1612a842fbb0edaca597539e6e2d728a9d90114ec6196fe0d4758a4738a15bc0c985a345e1062cb125617eb84ecf79e1 SHA512 8e54865d50118154c3918d5dec5dade4fb026c24bc697ad2e360db9741509cbdbb71ba9477508a9b209be6c8a8190fb0b5e03d2e8fedcc2cae18f5c9e5a3a496
@@ -123,5 +123,5 @@ DIST thunderbird-60.6.1-zh-CN.xpi 626283 BLAKE2B aeeb293e5c81323c2ca873d589ec5e6
 DIST thunderbird-60.6.1-zh-TW.xpi 626190 BLAKE2B a4b79f607151e532598ac7c4a1d834e83445601a0db304b249e569b592a21c3967b8f89535a45882dac5d5c851e4ad640c955e44bef5606840356f0c280d4563 SHA512 934f9ea341619e0eccd83472bac778767f10f3676c2d072f42301aaa9cdc0ce683a12fd51d9981fffd6b26cc8a61da0ed13b52f9b97914b8309b082fc4f8736d
 DIST thunderbird-60.6.1.source.tar.xz 288706632 BLAKE2B bb72d9c92d36bcc4c0f9fe8f64b348322cb0891f3c7d2e13767e94fef7b055f2c34b55a6a81fb9ab48c2eca9f68c8bc00c0e4315937a4f736aed6956c7572ef6 SHA512 78e96aeb235a07ea3f53c4212a764e9b92dacd0e5d5561e454008a56d165a1e235ed05a8ecdb77efecf80f4c7f7ba2cf7a682c775047d7c175dfb50a1d9a42d2
 EBUILD thunderbird-52.9.1.ebuild 10477 BLAKE2B afcc8251288a25fab08a79fa124a4160885c1f0649c5288c170a87de543144c89086aa1c1299cc7bf73edc2c8ff445d9f4805f7c85e698c307181956017398fe SHA512 0e5ec531150c4803e9fdbed0065ecba4817c5fce5c61cc5c5b89e0cf1e7e66cf77b5d10c441fa8da44242261c42b843a0613bfb119db997163f26e87cb27ef90
-EBUILD thunderbird-60.6.1.ebuild 18260 BLAKE2B bce64bb9679cd158870d5cd1498c5115bbfb1580662e747ba42a6ae21269df916aa4db0dfef98b02e66ac63dcb1c6a734fceefd3adb04e806b814a504f080781 SHA512 397ad7a24b77023990c2a06ce3c4b289cb968696130fc267cc32ed32acb60aa3dca867cac467565f8331bed2ab94bd356a9c53c3ca47563594f6a0d3158d4720
+EBUILD thunderbird-60.6.1.ebuild 18260 BLAKE2B 1264f3b7444f484cfecf63238ba9dde7a324d7479190a076cf0bf45a028eeb186f12a507f4cbc88f5aeab0de5c559a6b25c9c9d1c72af302670593a362553a85 SHA512 099f5e341bab030f42ab6a9058a9364dfb8e5190e275f6ae9ef63571f2b9dc1c794a3b2e45de091505fd929cdd227a3785bb674b42c25cbb8753bcd082484cd2
 MISC metadata.xml 1922 BLAKE2B ab89f183e54a3b58bd9b4b8df547c1172f264d00e3e8d753869d0d421c413bcc8ff06a24dd0910c28c70fd5b05cbc5154fc73ebfddf26e3db4d58d80e6e7d2c7 SHA512 0bdec29294b4b1aa77b965ecf78e2267ac75821c7ba7600783b5190755bd4380c675afbcfcb718a50a765dc35cb88112b8fa4956d298c467e91d21ec84509101
diff --git a/mail-client/thunderbird/thunderbird-60.6.1.ebuild b/mail-client/thunderbird/thunderbird-60.6.1.ebuild
index d0defdc25086..d5fd619411f1 100644
--- a/mail-client/thunderbird/thunderbird-60.6.1.ebuild
+++ b/mail-client/thunderbird/thunderbird-60.6.1.ebuild
@@ -22,7 +22,7 @@ MOZ_PV="${PV/_beta/b}"
 
 # Patches
 PATCHTB="thunderbird-60.0-patches-0"
-PATCHFF="firefox-60.6-patches-03"
+PATCHFF="firefox-60.6-patches-06"
 
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"