gentoo resync : 25.04.2020

5 files changed, 123 insertions, 5 deletions

diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 07a320078b7a..14dff2fac2ab 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,5 +1,7 @@
 DIST neon-0.30.2.tar.gz 932779 BLAKE2B 0536e4f1c8634ede9a1806180c315772a65b9cb1ead0ae3674d58aba855905b6a7c7684ef930ca1998c1163c662d642a687cc704922981dbc4a89efaa83f4cd9 SHA512 634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631
 DIST neon-0.31.0.tar.gz 867476 BLAKE2B 84981d0fcca97bfa495f9e8cbf060a06e04c931ce3b5eca41ff1d76a47fd863139b8bf3e102c5e4e8d22d5cffcebc64cee9b8f746f8d6669f0cbccf124fed9cc SHA512 62c55e16609d657ac56bb4a2fd32a10ffa72d5694aa1369be533491a6683034ed42843d5f19ed06cf8c1b7b8ba11b74f9839cdfeef4afc3b2d7b11372ed85cd2
-EBUILD neon-0.30.2.ebuild 3397 BLAKE2B 42a0b46c7daad4186abdd2e58546e563d62b7d585f9a2d67fcc8fa78341ef5305034cbf5a7dd0d2b189fe01d5fde416d8951875a02781ba6f7faef7e17ebb34b SHA512 1aa07f7cca4b68ac00f535546843905bd6b0b1ab919f97bbc8de89e66b01246ee9965616b979c7855f17843c05b93cb5881387caf7d73471b1c92a0d6bbb5a5c
-EBUILD neon-0.31.0.ebuild 3406 BLAKE2B 89a40fca0d41610c0a4cc7a982aa00a4e694eefd74a865cde7267a437f0c982046fa6bb97e16701bcff457fee65989ba2531e0654ca6be6fc2504d872fef99b4 SHA512 ee8c451b6c87dd6e7d6c912a081595130e9f01bed672013b964967264504c119d3c18c5184b87b80a0cddd78b79f5881bdb7fc67a7d9c425ad351c91d029dc0a
-MISC metadata.xml 1341 BLAKE2B c2bec964f34a0d9be01935bd3d78d3e4afcc0101f9d31eefa44106c13d3e8c1f91b227b5f15449d71785a889dfe801768c8b2aee361b919aede85e0d41602a17 SHA512 9b40394e7a103b87d61c0ac004dbb7294bc977ccb69d2669f186ceb1980fca2e2def5ac097ae2364c4e2c762e5170d06a5b281bbd870ebe00559cb5cb17d87f8
+DIST neon-0.31.1.tar.gz 867810 BLAKE2B 7b7d0c8ab635446c98f3db7072f1dabbb74ad9f579086f209bb3af5460363520be38886a299d22dc0f27a091f322c6d5972a00d4e6c612c710dca12e7620f850 SHA512 00d7297c102ee828d84eb28c9b6a57e66290904acf5327f8a6d3d1759ffacf88329bb2157dcef418c69e93d1370ccbd591829da06c01c3f44aea6c7b92462c13
+EBUILD neon-0.30.2.ebuild 3404 BLAKE2B c2eb86b8bf6381be8c39120ebfddcdbc2909c23bbf56550adf5283c1aa7b415ab8c6406d40e4c8616b657e9346015898bca269fb3689300d088b42b13a8e1c00 SHA512 a64f9ed28745bded709b483a1d25c3b8dd4749671cbc629f9b009743678cd015bbfdfd2c23c63a89dd22adc12ffbdf2121bd156dfe54caab728883dc346eb06e
+EBUILD neon-0.31.0.ebuild 3413 BLAKE2B e812c4975d2adf03124c2f55aca6f86a7c83e13194c8147e134b60ed634bfb518727ee0b568205032e3290f06170b0fa80534be6afc7f4f117031954a84fd62a SHA512 40b5521f79d78f0d200a5f96f7350f8e07e3b4128702e19a1bfd3e7f35d5472202c6c180c44d64f154f305cb4fb0bc426b22613957708d29787c8b4c11e6261a
+EBUILD neon-0.31.1.ebuild 3420 BLAKE2B 9c7e377e9ea9e21bed8263539fba9ec9e900750b837ed82a3af327d7f135248deba39c1fe88ebf3513006e79854e08e5bf8d3f0f925d613afbd2ea6f2f955dd2 SHA512 4a1d387fb944d6850293cdd929fc9bf10c94b75bd0c5008b50bcabab247946b2c18405b55b58a8ae442730f25251cae80990ba03710c94b0805adf686c59545d
+MISC metadata.xml 1417 BLAKE2B 5feada9aceaed7ca6c5db29a993c24f049469f2d7d1ed57db5ddce3277e575a850ccc45700bd620ee503f3cb1abe7a9b333066b7be50bb7fd5f40f558dcfb0d1 SHA512 cef52cfe791a0b561a2c4472fb3d7ff5e878f8bc7fecf4095568b215724ce16edd866a6033d4be730d22b1297615119ae17bdeb09dfcc8555496a610270cfb97
diff --git a/net-libs/neon/metadata.xml b/net-libs/neon/metadata.xml
index 78e276ad6748..4059f5b77bc9 100644
--- a/net-libs/neon/metadata.xml
+++ b/net-libs/neon/metadata.xml
@@ -26,4 +26,7 @@
 		<flag name="libproxy">Add support for <pkg>net-libs/libproxy</pkg></flag>
 		<flag name="pkcs11">Add support for PKCS#11 using <pkg>dev-libs/pakchois</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">notroj/neon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
index 6ff38ebbff6f..6e4e2fc96974 100644
--- a/net-libs/neon/neon-0.30.2.ebuild
+++ b/net-libs/neon/neon-0.30.2.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit autotools libtool multilib-minimal
 
 DESCRIPTION="HTTP and WebDAV client library"
-HOMEPAGE="http://webdav.org/neon/"
+HOMEPAGE="https://notroj.github.io/neon/"
 SRC_URI="http://webdav.org/neon/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-libs/neon/neon-0.31.0.ebuild b/net-libs/neon/neon-0.31.0.ebuild
index 0be8adfc1aef..f038f33ba546 100644
--- a/net-libs/neon/neon-0.31.0.ebuild
+++ b/net-libs/neon/neon-0.31.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools libtool multilib-minimal
 
 DESCRIPTION="HTTP and WebDAV client library"
-HOMEPAGE="http://webdav.org/neon/"
+HOMEPAGE="https://notroj.github.io/neon/"
 SRC_URI="http://webdav.org/neon/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-libs/neon/neon-0.31.1.ebuild b/net-libs/neon/neon-0.31.1.ebuild
new file mode 100644
index 000000000000..11cf88702f22
--- /dev/null
+++ b/net-libs/neon/neon-0.31.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2001-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool multilib-minimal
+
+DESCRIPTION="HTTP and WebDAV client library"
+HOMEPAGE="https://notroj.github.io/neon/"
+SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/27"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
+RESTRICT="test"
+
+RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
+	!expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] )
+	nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			app-misc/ca-certificates
+			net-libs/gnutls:0=[${MULTILIB_USEDEP}]
+		)
+		!gnutls? (
+			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		)
+		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
+	)
+	zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/neon-config
+)
+
+src_prepare() {
+	# Use CHOST-prefixed version of xml2-config for cross-compilation.
+	sed -e "s/AC_CHECK_PROG(XML2_CONFIG,/AC_CHECK_TOOL(XML2_CONFIG,/" -i macros/neon-xml-parser.m4 || die "sed failed"
+
+	# Fix compatibility with OpenSSL >=1.1.
+	sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed"
+
+	if has_version "<dev-libs/libressl-3.0.0"; then
+		# Support LibreSSL.
+		# Functions RSA_meth_get0_app_data() and RSA_meth_set0_app_data() are not implemented in LibreSSL 2.9.2.
+		sed -e "1202s/#if OPENSSL_VERSION_NUMBER < 0x10100000L/& || defined(LIBRESSL_VERSION_NUMBER)/" -i src/ne_openssl.c || die "sed failed"
+		sed -e "97a #if defined(LIBRESSL_VERSION_NUMBER)\nstatic void *RSA_meth_get0_app_data(const RSA_METHOD *meth)\n{\n    return meth->app_data;\n}\nstatic int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)\n{\n    meth->app_data = app_data;\n    return 1;\n}\n#endif" -i src/ne_pkcs11.c || die "sed failed"
+	fi
+
+	eapply_user
+
+	AT_M4DIR="macros" eautoreconf
+
+	elibtoolize
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	if has_version sys-libs/glibc; then
+		einfo "Enabling SSL library thread-safety using POSIX threads..."
+		myconf+=(--enable-threadsafe-ssl=posix)
+	fi
+
+	if use expat; then
+		myconf+=(--with-expat)
+	else
+		myconf+=(--with-libxml2)
+	fi
+
+	if use ssl; then
+		if use gnutls; then
+			myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt")
+		else
+			myconf+=(--with-ssl=openssl)
+		fi
+	fi
+
+	econf \
+		--enable-shared \
+		$(use_with kerberos gssapi) \
+		$(use_with libproxy) \
+		$(use_enable nls) \
+		$(use_with pkcs11 pakchois) \
+		$(use_enable static-libs static) \
+		$(use_with zlib) \
+		"${myconf[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install-{config,headers,lib,man,nls}
+
+	if multilib_is_native_abi && use doc; then
+		(
+			docinto html
+			dodoc -r doc/html/*
+		)
+	fi
+}
+
+multilib_src_install_all() {
+	find "${D}" -name "*.la" -type f -delete || die
+
+	dodoc AUTHORS BUGS NEWS README.md THANKS TODO
+}