gentoo resync : 18.05.2019

5 files changed, 34 insertions, 157 deletions

diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index 6a36d583a51a..927a8501b409 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -1,8 +1,5 @@
 AUX libetpan-1.0-nonnull.patch 404 BLAKE2B 485fa277a9b5a9f1f74e2bb658a68da3d6781d8cf243df019ae945a69fb96e5ddad36d83e00294e1abfb983525dbbc483686882653e55713686099d839fa7fc3 SHA512 3800d6e2dbb50985290b8a141ee2fe6ff92bee8516567f55ea14e634b41e11d1074cd8df6e6de30996e0d86e54cd659300da0d61ad63fc10f713d672aa3b4f6e
-DIST libetpan-1.8.tar.gz 6188927 BLAKE2B 730d9fc545ea2fbd4dbc0eaf3cdbd0540ec85984dee5448c5f22c83ad12e568a9e066e53734da96ef6a9c77942e5aea2eb241c2228f0ca7577755e67646aa589 SHA512 a5e97998803cc56dbd54356153c8579b52a9675fe95fbf642c3158215428d9d2cb30c4e0060c5f4dd760634fff5b1c2a32ce4bb70a5f2bc6398a071ce95e1efd
-DIST libetpan-1.9.2.tar.gz 6191522 BLAKE2B a5b3b93c94596d64b49150680a2599c930b5f010d29be7fbd325e43ba82b8d61032bae65155d2c5e0e2bbcd219db3d916b10a6ce5a98df2ac31fb88811491d71 SHA512 3e2e1de77fae2212374e909d15ed8564eee90883c38fee0ca69f58785733b1ac2df848da1bda6f55577d647e0ad27bc3057199e70b6ef01f2a7e2823b24113ba
+AUX libetpan-1.9.3-missing-stddev_h.patch 989 BLAKE2B 49918148deeacc128bb33e8cf56c9f3a56de92fd7206becd5c6e6054979691e17fd1de008f42c0db64c0f72def07bd5fb10178b0eec9ee64c6d6b0f8749bdd56 SHA512 cc9ea9b4c641cbb3b2446252b8ab8b520814ad8584f7fccd3174e31726a59a8445a5af21b6086034891a883887cb69b1d2c38a07e7f8667c0fea518b40a0e058
 DIST libetpan-1.9.3.tar.gz 5000049 BLAKE2B 1664d93b112410a86935438aae5ff40202a9c10675701d40b60edf81e4f8bac45fb1f407e03714a37465c41a22c1b9fcbbc517d76dc47f812e154c932e05e600 SHA512 66e504fbf82445819845a3f1dcb8dc48ad2440993134d43752c754463cee2434a30080718687cd05c579f0da8df6b0f6dfc7572f2882d0dd9dfd327b4ae11fd6
-EBUILD libetpan-1.8.ebuild 2093 BLAKE2B 4d24c6398d9de5b50433e3c2b4716331280fe0c88f70ac64192bedb570ce955e1002d520e0c1ff7132aa1b957020bddfbc4d4ab08823645b1e16b4b85f83bb4f SHA512 23d9195d9665ad24c58cc1c7b570e48ddc157cae14cc69dbd814124525bc70de3aaa33687a5a914aade21241c082c1b16f5014f8618795cc53ebdbf6b8b0e933
-EBUILD libetpan-1.9.2.ebuild 2059 BLAKE2B 302400ed74c1f3a142f0fbec6ae2fe01467d26bd7ee604d0b098965588ace7a5afef0ee16eeb1f5fe81e0daca13cc09fd9b685cd1d02bbdc0273a512dfca576c SHA512 35d05d4da2bc6c234db47fd048f3beccfb6ab9b6144f1f1d6ff445185d8c4c79a7f67e8e2615d934104601e7e0719e9f4225e3b0678832241559b400acc406bd
-EBUILD libetpan-1.9.3.ebuild 2056 BLAKE2B d5fd3fb1de5b69697f320c0c68a877538c3c74adc6d83cbcc76c622fd2ee8e6e004f6e1d459e4c0d3e212c73288033ba8a734757f2fdea2c9aac786ee176fd35 SHA512 b95e37cff786387d9b9b3e81b8d8578879d2399c0fa5cfc10d0d910b147fc431f80f9b5c085fdb8edb0e7255e804eea001ed52a994ef90f4a5532619d414d4ec
+EBUILD libetpan-1.9.3.ebuild 2104 BLAKE2B 093e7e5bf5de575f1f73d72886d6c6216225b0fbf1a97b06b149c9ad05731b07e217c762c70fb9215fd441d46cb975b8afa290303479fa76cfb46922c1cbec70 SHA512 2fce824e8b46db90e4b8d3afb88c6909b7cf9e696e8b4fffa985afbc46781a5f2d3cefe65dab6cae0089f122b1d88f6d1358f74ddb5fc22b121c88761139f47a
 MISC metadata.xml 744 BLAKE2B 8d47251742439a710cc6c6a2130a001a1a66ceb7f358d8ff138b9d9a508a7d2ddf14a3879537f129b755bca1a6548187f15a62f2183c5297e4245fd5cd8ccf3c SHA512 5b732d7d205ade686cb11042918d81b6959549836743a582701f05e161adbf8416beaaf33cbe03b4ec4ffe38d35699803583cd2bddf9e333dd8c93cd7f9a1db3
diff --git a/net-libs/libetpan/files/libetpan-1.9.3-missing-stddev_h.patch b/net-libs/libetpan/files/libetpan-1.9.3-missing-stddev_h.patch
new file mode 100644
index 000000000000..9d53f90190b0
--- /dev/null
+++ b/net-libs/libetpan/files/libetpan-1.9.3-missing-stddev_h.patch
@@ -0,0 +1,30 @@
+commit da9fd7839c9affea48f74a159a789fbb183b4be1
+Author: maxice8 <30738253+maxice8@users.noreply.github.com>
+Date:   Fri Feb 1 01:58:08 2019 -0200
+
+    add missing stddef.h include for 'NULL' (#322)
+    
+    clientid.c: In function 'mailimap_clientid':
+    clientid.c:66:38: error: 'NULL' undeclared (first use in this function)
+       if (mailimap_read_line(session) == NULL)
+                                          ^~~~
+    clientid.c:66:38: note: 'NULL' is defined in header '<stddef.h>'; did you forget to '#include <stddef.h>'?
+    clientid.c:39:1:
+    +#include <stddef.h>
+    
+    clientid.c:66:38:
+       if (mailimap_read_line(session) == NULL)
+
+diff --git a/src/low-level/imap/clientid.c b/src/low-level/imap/clientid.c
+index 1c34637..38880dd 100644
+--- a/src/low-level/imap/clientid.c
++++ b/src/low-level/imap/clientid.c
+@@ -33,6 +33,8 @@
+ #	include <config.h>
+ #endif
+ 
++#include <stdlib.h>
++
+ #include "mailimap_sender.h"
+ #include "clientid_sender.h"
+ #include "clientid.h"
diff --git a/net-libs/libetpan/libetpan-1.8.ebuild b/net-libs/libetpan/libetpan-1.8.ebuild
deleted file mode 100644
index b6dfb6cdbfb7..000000000000
--- a/net-libs/libetpan/libetpan-1.8.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A portable, efficient middleware for different kinds of mail access"
-HOMEPAGE="http://libetpan.sourceforge.net/"
-SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="berkdb debug gnutls ipv6 liblockfile libressl sasl ssl static-libs"
-
-DEPEND="sys-libs/zlib
-	berkdb? ( sys-libs/db:= )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	liblockfile? ( net-libs/liblockfile )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0-nonnull.patch
-)
-
-pkg_setup() {
-	if use gnutls && ! use ssl ; then
-		ewarn "You have \"gnutls\" USE flag enabled but \"ssl\" USE flag disabled!"
-		ewarn "No ssl support will be available in ${PN}."
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s/-O2 -g//" \
-		configure.ac
-
-	eautoreconf
-}
-
-src_configure() {
-	# in Prefix emake uses SHELL=${BASH}, export CONFIG_SHELL to the same so
-	# libtool recognises it as valid shell (bug #300211)
-	use prefix && export CONFIG_SHELL=${BASH}
-	# The configure script contains an error, in that it doesn't check the
-	# argument of --enable-{debug,optim}, hence --disable-debug results in
-	# --enable-debug=no, which isn't checked and debugging flags are blindly
-	# injected.  So, avoid passing --disable-debug when we don't need it.
-	local myeconfargs=(
-		$(usex debug '--enable-debug' '')
-		$(use_enable berkdb db)
-		$(use_with sasl)
-		$(use_enable ipv6)
-		$(use_enable liblockfile lockfile)
-		$(usex ssl "$(use_with gnutls) $(use_with !gnutls openssl)" '--without-gnutls --without-openssl')
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if ! use static-libs ; then
-		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-	fi
-}
diff --git a/net-libs/libetpan/libetpan-1.9.2.ebuild b/net-libs/libetpan/libetpan-1.9.2.ebuild
deleted file mode 100644
index d364a29f58e9..000000000000
--- a/net-libs/libetpan/libetpan-1.9.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="A portable, efficient middleware for different kinds of mail access"
-HOMEPAGE="http://libetpan.sourceforge.net/"
-SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs"
-
-# BerkDB is only supported up to version 6.0
-DEPEND="sys-libs/zlib
-	!lmdb? ( berkdb? ( <sys-libs/db-6.1:= ) )
-	lmdb? ( dev-db/lmdb )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	liblockfile? ( net-libs/liblockfile )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0-nonnull.patch
-)
-
-pkg_setup() {
-	if use gnutls && ! use ssl ; then
-		ewarn "You have \"gnutls\" USE flag enabled but \"ssl\" USE flag disabled!"
-		ewarn "No ssl support will be available in ${PN}."
-	fi
-
-	if use berkdb && use lmdb ; then
-		ewarn "You have \"berkdb\" _and_ \"lmdb\" USE flags enabled."
-		ewarn "Using lmdb as cache DB!"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# in Prefix emake uses SHELL=${BASH}, export CONFIG_SHELL to the same so
-	# libtool recognises it as valid shell (bug #300211)
-	use prefix && export CONFIG_SHELL=${BASH}
-	local myeconfargs=(
-		# --enable-debug simply injects "-O2 -g" into CFLAGS
-		--disable-debug
-		$(use_enable berkdb db)
-		$(use_enable ipv6)
-		$(use_enable liblockfile lockfile)
-		$(use_enable lmdb)
-		$(use_enable static-libs static)
-		$(use_with sasl)
-		$(usex ssl "$(use_with gnutls) $(use_with !gnutls openssl)" '--without-gnutls --without-openssl')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/net-libs/libetpan/libetpan-1.9.3.ebuild b/net-libs/libetpan/libetpan-1.9.3.ebuild
index 6c5254f45d5b..e2b6c80ffefb 100644
--- a/net-libs/libetpan/libetpan-1.9.3.ebuild
+++ b/net-libs/libetpan/libetpan-1.9.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs"
 
 # BerkDB is only supported up to version 6.0
@@ -30,6 +30,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0-nonnull.patch
+	"${FILESDIR}"/${PN}-1.9.3-missing-stddev_h.patch
 )
 
 pkg_pretend() {