gentoo resync : 02.02.2022

7 files changed, 30 insertions, 463 deletions

diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 701e99a2f4a2..0d74f24dd266 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,13 +1,5 @@
-DIST neon-0.30.2.tar.gz 932779 BLAKE2B 0536e4f1c8634ede9a1806180c315772a65b9cb1ead0ae3674d58aba855905b6a7c7684ef930ca1998c1163c662d642a687cc704922981dbc4a89efaa83f4cd9 SHA512 634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631
-DIST neon-0.31.0.tar.gz 867476 BLAKE2B 84981d0fcca97bfa495f9e8cbf060a06e04c931ce3b5eca41ff1d76a47fd863139b8bf3e102c5e4e8d22d5cffcebc64cee9b8f746f8d6669f0cbccf124fed9cc SHA512 62c55e16609d657ac56bb4a2fd32a10ffa72d5694aa1369be533491a6683034ed42843d5f19ed06cf8c1b7b8ba11b74f9839cdfeef4afc3b2d7b11372ed85cd2
-DIST neon-0.31.1.tar.gz 867810 BLAKE2B 7b7d0c8ab635446c98f3db7072f1dabbb74ad9f579086f209bb3af5460363520be38886a299d22dc0f27a091f322c6d5972a00d4e6c612c710dca12e7620f850 SHA512 00d7297c102ee828d84eb28c9b6a57e66290904acf5327f8a6d3d1759ffacf88329bb2157dcef418c69e93d1370ccbd591829da06c01c3f44aea6c7b92462c13
 DIST neon-0.31.2.tar.gz 867914 BLAKE2B 8ae1301dd5f9ac1a6b518f99919a1b7e7b7c6499413b523ff82e00d364d6d9c5ad96875795330e2fd9c42a42b073e3eea51b6cc0ee9e9a21850763f0cdd0b97e SHA512 1e402b40a0445f68ed24d2697ee60d21636f61ebc98edcde37ff9e26c54430acabf3969ac22a942d1dd51bddee0f312c04073b423b0af3a3e7c9bf60cd53e48c
-DIST neon-0.32.1.tar.gz 880434 BLAKE2B 91b942cb0d7184f4da26d7d45e846a0f80aa834226e5ff0689df75650da79cbfad0854c718dbffdd31cc0f09f25458ea37ca39bb38071643a6a609ef6102b896 SHA512 a231865c3aad3668f6effded97a58eb981655f64c71b0954fcb2e667bdec50895d11bf296f4f454bd63e6ce9b02c2fd13cbb17cb82631e16f100000ecd7e1977
 DIST neon-0.32.2.tar.gz 880651 BLAKE2B 3629eee38e10ada5e001bf0afb77c70814083bf553596fc150a6cf21f0b66cf4de28841b242f68faaeb44fa5e0ad260939102b015d2a543ef59012876256b364 SHA512 2580a3c8c3cf4aff2d399f72a721ccfb4e68434ef92da4af8103c126812d779b9fbe5cafbab512c79f4365bbb3d3eac61568748136470e86f7aa7b98b27053c8
-EBUILD neon-0.30.2.ebuild 2637 BLAKE2B ca7d46b167c16691eed84c4fa6f20a8b177b5f74a92be193a8f4d544aac3cc1a5f9efcd727029a96e3395fb7b59ae5cd86defee9de8f1282e5850164d34e1fa9 SHA512 6e39206178a702501252a5b651b6bc7b78027ea0964fb62d82cd3fff8c2328a469e649bb2b69930782c8d06f0a383989c81ac02de6ce239a6acc2cd73598e957
-EBUILD neon-0.31.0.ebuild 2645 BLAKE2B 1fa391bc79023f61977c500cc1dba20482332eaee623632e92c6556df3d256c4638ccaa642ff4561b4572aecfb92cb73c9ce27b77e212d56c923beeef15d04cb SHA512 353a070a4ef590388e29b91442fc30c6ec1be79289765d53afc190d4d89ccb26034b076cedde1bf27c492a43b534ecda7e584f918141bb510516a1d4860e8823
-EBUILD neon-0.31.1.ebuild 2652 BLAKE2B ce07b714de82accd30783ae03fd9243c41adbaf8470891f7a37301b5eafc5a885ee5beee4f2dffe2cad34c966306ba68a1e4b4a4d0b0ae76a107a7b74b8e6194 SHA512 7ac1d4a62ddde50d7406d90760aeccbe68ff4cd36a2933faddecaa20724c904c9d4a007810b56632a63e2fd7fc8aff014755c3019191f52ff44aa97d3bd1ad10
 EBUILD neon-0.31.2.ebuild 2652 BLAKE2B e718aeeb582f1d0ea1fb0460dfdee36bb29241a22848ff5cbe4831a6ed9b8b909098583e228c3c2d9ba33199999b3d2a322ae58915d48a542bf4e0235031c31f SHA512 5107c9be940005e1bff5b20bdf878b96c0ee94817812139f5f7c3875020c64731eda7a22221b0519b769936143d868757849314ba48403e1140ab0402e69582f
-EBUILD neon-0.32.1.ebuild 2717 BLAKE2B 3ed9eb1069ef0485205f74755902268a26fd2b7e475c8e27534bc82701193e7c573b77cc4f8272bd59685c8225c2863a810fb009fed100ef23de23bc56b9fe71 SHA512 7376c1fb7d34f0c9d983b3f1640a72f8fa15db2bd0657eced6a0b4aa56c044a61f80ea45b49ef9f1987d8f70d2118d13a9fd0e2b6118c9b5b11a6c339ec68958
-EBUILD neon-0.32.2.ebuild 2717 BLAKE2B 50b3a737198c4176ccf4ae722690c58777fdd4ffb43002214155050c7f29b3fdd92fec57b62e3d6bbe623c39f06e8934b6305bc7658410e00f20f94318744ed8 SHA512 b7bdc5b90305558fbb0acea64c08b2bf5b9529703bc0649a0fbbe3b7e1532f8c6647172a5b05e119de60eb72bda3e1cda1088a8ad45fc9f3d93698d10102bf47
-MISC metadata.xml 1413 BLAKE2B c90629adef6f151c3584782110a60c0f3dc5729faa222b347348ee24f20f137711fa2f075cea72629729be803fed5cbd562f96005717b6fc3fda52c32c471bbb SHA512 f06e7f2864d42a47b385d836c793652ae8699e495dc7d21d33277025c27af8f35ee674ce15109159c0cd4aa61cea9bfedbd14d7730d4cbd222432d69acdb6757
+EBUILD neon-0.32.2.ebuild 2552 BLAKE2B 2a9e938e9796095a42280e179a57d73aa4127b115d00f54fa42a299353bbf5bb0589cc8b975b12cb1f32d16effeab1172a5e7a0904a3d20fc5ac816ec0832253 SHA512 22283c7d3f04225cfdaefafbc0f1d5793346f2e63257753011431b85e95af515cd318e5cfe8191d952e145a9e78407fe46418907be04b6427cc85a20b69b62ed
+MISC metadata.xml 1465 BLAKE2B cc9629974affeda497ea2825a4412182f9445f90ef04eb1337a456fad1b578a30d6b1135255b278cf795ffa9be7d78e810797fc7fd170606e52e48f7af5e02fc SHA512 ca250ba34c8c50c20d92a60b138e6548920f9fead9c5dda3a18928bd06203f6952c4a6a2a0eee846c3f7bcd48c79959c92af9a0fd1a5133273fdc09fcbb051f3
diff --git a/net-libs/neon/metadata.xml b/net-libs/neon/metadata.xml
index f53db81ccb5b..5fd2d0a22b8e 100644
--- a/net-libs/neon/metadata.xml
+++ b/net-libs/neon/metadata.xml
@@ -3,10 +3,11 @@
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
 	<maintainer type="person" proxied="proxy">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<longdescription>
 		Neon is an HTTP and WebDAV client library for Unix systems, with a C
diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
deleted file mode 100644
index 0579d7c523da..000000000000
--- a/net-libs/neon/neon-0.30.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2001-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools libtool multilib-minimal
-
-DESCRIPTION="HTTP and WebDAV client library"
-HOMEPAGE="https://notroj.github.io/neon/"
-SRC_URI="http://webdav.org/neon/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/27"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc expat gnutls kerberos libproxy 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? (
-			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_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"
-
-	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 THANKS TODO
-}
diff --git a/net-libs/neon/neon-0.31.0.ebuild b/net-libs/neon/neon-0.31.0.ebuild
deleted file mode 100644
index adbc8e2dcc79..000000000000
--- a/net-libs/neon/neon-0.31.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2001-2021 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="http://webdav.org/neon/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/27"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc expat gnutls kerberos libproxy 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? (
-			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_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"
-
-	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
-}
diff --git a/net-libs/neon/neon-0.31.1.ebuild b/net-libs/neon/neon-0.31.1.ebuild
deleted file mode 100644
index a6ad1025fb55..000000000000
--- a/net-libs/neon/neon-0.31.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2001-2021 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc expat gnutls kerberos libproxy 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? (
-			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_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"
-
-	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
-}
diff --git a/net-libs/neon/neon-0.32.1.ebuild b/net-libs/neon/neon-0.32.1.ebuild
deleted file mode 100644
index 92ef286a9128..000000000000
--- a/net-libs/neon/neon-0.32.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2001-2021 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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc expat gnutls kerberos libproxy 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? (
-			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-		)
-		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
-	)
-	zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	virtual/pkgconfig
-"
-
-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"
-
-	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
-}
diff --git a/net-libs/neon/neon-0.32.2.ebuild b/net-libs/neon/neon-0.32.2.ebuild
index b318674ec7f0..2759c3517627 100644
--- a/net-libs/neon/neon-0.32.2.ebuild
+++ b/net-libs/neon/neon-0.32.2.ebuild
@@ -1,21 +1,28 @@
 # Copyright 2001-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="8"
 
 inherit autotools libtool multilib-minimal
 
 DESCRIPTION="HTTP and WebDAV client library"
-HOMEPAGE="https://notroj.github.io/neon/"
+HOMEPAGE="https://notroj.github.io/neon/ https://github.com/notroj/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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
-RESTRICT="test"
-
-RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
+IUSE="doc +expat gnutls kerberos libproxy nls pkcs11 ssl test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig
+	test? (
+		ssl? (
+			dev-libs/openssl:0
+			pkcs11? ( dev-libs/nss )
+		)
+	)"
+DEPEND="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}] )
@@ -25,29 +32,24 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
 			app-misc/ca-certificates
 			net-libs/gnutls:0=[${MULTILIB_USEDEP}]
 		)
-		!gnutls? (
-			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-		)
+		!gnutls? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
 	)
 	zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
 
 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"
+DOCS=( AUTHORS BUGS NEWS README.md THANKS TODO )
 
-	# 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"
+src_prepare() {
+	if use gnutls; then
+		# Ignore failure of test pkcs11.
+		# https://github.com/notroj/neon/issues/72
+		sed -e "s/T(pkcs11)/T_XFAIL(pkcs11)/" -i test/ssl.c || die
+	fi
 
 	eapply_user
 
@@ -86,7 +88,6 @@ multilib_src_configure() {
 		$(use_with libproxy) \
 		$(use_enable nls) \
 		$(use_with pkcs11 pakchois) \
-		$(use_enable static-libs static) \
 		$(use_with zlib) \
 		"${myconf[@]}"
 }
@@ -95,15 +96,12 @@ 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/*
-		)
+		dodoc -r doc/html
 	fi
 }
 
 multilib_src_install_all() {
-	find "${D}" -name "*.la" -type f -delete || die
+	find "${ED}" -name "*.la" -delete || die
 
-	dodoc AUTHORS BUGS NEWS README.md THANKS TODO
+	einstalldocs
 }