gentoo resync : 25.08.2020

4 files changed, 42 insertions, 71 deletions

diff --git a/www-apache/mod_gnutls/Manifest b/www-apache/mod_gnutls/Manifest
index efbd9d3d02c8..040b952feec5 100644
--- a/www-apache/mod_gnutls/Manifest
+++ b/www-apache/mod_gnutls/Manifest
@@ -1,8 +1,6 @@
 AUX 47_mod_gnutls.conf 1125 BLAKE2B f4e9a48be5abda5f9ac0af5ae6621e1d35f4b52c4d00a64c0c939661ed26ad38563b833bafc1266d0b5c5ea8c2d0e5804547b73d5d2b7d95c5fc3f37411715db SHA512 cafa6b049f4131b3cb43a4c62a6fb06e9ac5c44bea1901865dd5d48692f22bb5f6243d812f7f2b2d2adf0d39a16480f062043556bedc740b5630809ba9c972f7
+DIST mod_gnutls-0.11.0.tar.bz2 458966 BLAKE2B 6d81be7b7d48255173d028a8e3207badbce0c1ba541124a241b63d4ed4eb36833156e9cd7194318138b6f16667a971d5311d56b9b0036e5b3d9dac8d352a4335 SHA512 090d244823f15a6b23dd2ad9b35db202ebbe96210ec8fd06e06f13e32c327e9d9a449834c899755f1ec8c1a3a71db1b125d436ce661caee1002a8719b4c1320e
 DIST mod_gnutls-0.8.2.tar.bz2 415903 BLAKE2B 98c96479e2419ee511ba802c99823ddaae89ddeb7a2f0660b91e2a371f8249ec4f98b2c0443389168a22dbe133b0bcc6020bfa597447507a8e4f91827b6d1d24 SHA512 b1690aeee4f6d104e4b6a7bd443e289204630b33e00b7b145b11291d8819b5c3d5bd52b535746b8ebdfee7a5f34df527243b743b8c5d716b1d0617e319d43f4d
-DIST mod_gnutls-0.8.4.tar.bz2 422811 BLAKE2B 33b992cbd42671ce0be320268f2421f167c05e62074ad538c22efc1f8b2f1a8604550f103bab579f1dc8622a78bda9e1e62826db06ff0dae21fb9dc1c2ee2bc2 SHA512 cee592f12a26894dacd6db6f25d4b1b1901579ac5cc7dee2be826aa3697bc2af55e2136ef65acd6dc4c9fac635465fbf8c06ea236651d45a2b5fd963408e6684
-DIST mod_gnutls-0.9.0.tar.bz2 435869 BLAKE2B d5c0a1846b083c469cddc0516a81ac8ef85b1b9287ad53312964f7c542ec107689f832db83a11abda178e79a2d6f2177b6093219a94cec9ded6e8eb6cef86796 SHA512 12a85a53277401648fd44ade3f27969d023ef46d1b593ed0df4284ea5421d87caedc72262fd6eb54a17f4949cf1551bfaef66f81128a060cc77064cd32d00cd2
-EBUILD mod_gnutls-0.8.2-r1.ebuild 993 BLAKE2B 8fa3ad55f2349ab8c3d0eefe011b1f1701e05217a16bb9348395f653f3952438e88b9b61b9ed98e0aaa20b4a28b53dffac2cbf9df22970a205cb4ac9afd73766 SHA512 c9b1a3fc316997fe25aa37317b367ed2bb1a055a8234eb9cfb299f2ea071ccca69e91fcd31fbda21dc097d4dffa2ff4d769186bc6ff76cc14c9054ccd0486b6c
-EBUILD mod_gnutls-0.8.4.ebuild 1158 BLAKE2B c907ed1f80155544368f43ff75381e391d8933747bba791401b2e5ef36df299e87144779df8060d019f5fbf0458d7483b489110949c6d5ead942692a4265f378 SHA512 c17fc27b2413c46cf8e7199e1aa6ef98ea61313302a08f08a2fe351b405bc811fc3a175ddf81f55071f9f7000dbef31d58428a8fd8334cebd6ba61178a6a6a3a
-EBUILD mod_gnutls-0.9.0.ebuild 1155 BLAKE2B 52980920f1681f00b7f05791e1545770b1a29b9356f177d62c98e48d05894abc7fb3929e68a3ee902e6caa3b842e0f0cc9d92abf57422e5309a7439d963c9910 SHA512 6067758a6df14a63aa8bd4a427d9d819242bb1d0c2b76a6a0fd7e36291e62331034be8b274ef07f187b425404bb7f37166b0a7561f507d5c203d75dc3bfa1223
+EBUILD mod_gnutls-0.11.0.ebuild 1815 BLAKE2B 26c1b27c1a9bd003244077cee29b3c398ab7ec991c6ca0f5b5c54abca4b7d9de50f79dc5d2e73808f4a0eb0787d9a709e59e8eeb7ee2965acfb00f74756a8bac SHA512 7a1e1bca94dbdf8ccdbaa44338cfc7503b9196cc93733dffe14ec9397080f4f6d87bb1c724af024998b8bff7b388e76eadba97c07831b0fcc90b5ea2d0bfec36
+EBUILD mod_gnutls-0.8.2-r2.ebuild 998 BLAKE2B 9da57cdaeb490427e4c9f06041366e532ac40f8f5f7e10d04c07c6c8be26bf797794c7ea10bfadfc17120c74ab94cdc2201f60c8e90b8ab0815dcdd9b26c9a8b SHA512 e6693e13d0406f047f977995b8c36281e2e4b1a397bb06c4edd2dafbf6dcb3d6c75c4de4b20f99c40e1e9aa3bbd9854d97edace2b03bdb673754d9288d82260a
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.8.4.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.11.0.ebuild
index 1d6985d4f075..9662e5475d78 100644
--- a/www-apache/mod_gnutls/mod_gnutls-0.8.4.ebuild
+++ b/www-apache/mod_gnutls/mod_gnutls-0.11.0.ebuild
@@ -1,10 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # WARNING! Don't switch to EAPI-6 without checking paths of installed files
 # carefully. The .so file might get installed into /
-EAPI=5
-inherit autotools apache-module
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools apache-module python-any-r1
 
 DESCRIPTION="mod_gnutls uses GnuTLS for SSL/TLS encryption in Apache2 (compare to mod_ssl)"
 HOMEPAGE="https://mod.gnutls.org/"
@@ -15,13 +18,29 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-CDEPEND=">=net-libs/gnutls-3.3.0:="
+CDEPEND=">=net-libs/gnutls-3.3.0:=[pkcs11]"
+
+TEST_REQUIRED_APACHE_MODULES="apache2_modules_proxy,apache2_modules_proxy_http"
+
 DEPEND="${CDEPEND}
-	test? ( app-crypt/monkeysphere )"
+	virtual/pkgconfig
+	$(python_gen_any_dep '
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+	test? (
+		app-crypt/monkeysphere
+		>=net-libs/gnutls-3.3.0:=[tools]
+		net-misc/curl
+		|| (
+			www-servers/apache[apache2_mpms_worker,${TEST_REQUIRED_APACHE_MODULES}]
+			www-servers/apache[apache2_mpms_prefork,${TEST_REQUIRED_APACHE_MODULES}]
+			www-servers/apache[apache2_mpms_event,${TEST_REQUIRED_APACHE_MODULES}]
+		)
+	)"
+
 RDEPEND="${CDEPEND}"
 
-# Fails because gpg-agent cannot be accessed
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 APACHE2_MOD_CONF="47_${PN}"
 APACHE2_MOD_DEFINE="GNUTLS"
@@ -30,6 +49,16 @@ DOCFILES="CHANGELOG NOTICE README"
 
 need_apache2_4
 
+python_check_deps() {
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+	python-any-r1_pkg_setup
+}
+
 src_prepare() {
 	default
 	eautoreconf
@@ -43,6 +72,7 @@ src_configure() {
 		--disable-doxygen-doc
 		--disable-doxygen-html
 		--disable-doxygen-pdf
+		--disable-valgrind-test
 		ac_cv_path_UNSHARE=no
 	)
 	econf "${myeconfargs[@]}"
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.8.2-r1.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.8.2-r2.ebuild
index 3576124376cf..b0d32ce75e30 100644
--- a/www-apache/mod_gnutls/mod_gnutls-0.8.2-r1.ebuild
+++ b/www-apache/mod_gnutls/mod_gnutls-0.8.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
 
-CDEPEND=">=net-libs/gnutls-3.3.0:="
+CDEPEND=">=net-libs/gnutls-3.3.0:=[pkcs11]"
 DEPEND="${CDEPEND}
 	test? ( app-crypt/monkeysphere )"
 RDEPEND="${CDEPEND}"
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.9.0.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.9.0.ebuild
deleted file mode 100644
index 17459ae25889..000000000000
--- a/www-apache/mod_gnutls/mod_gnutls-0.9.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# WARNING! Don't switch to EAPI-6 without checking paths of installed files
-# carefully. The .so file might get installed into /
-EAPI=5
-inherit autotools apache-module
-
-DESCRIPTION="mod_gnutls uses GnuTLS for SSL/TLS encryption in Apache2 (compare to mod_ssl)"
-HOMEPAGE="https://mod.gnutls.org/"
-SRC_URI="https://mod.gnutls.org/downloads/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-CDEPEND=">=net-libs/gnutls-3.3.0:="
-DEPEND="${CDEPEND}
-	test? ( app-crypt/monkeysphere )"
-RDEPEND="${CDEPEND}"
-
-# Fails because gpg-agent cannot be accessed
-RESTRICT="test"
-
-APACHE2_MOD_CONF="47_${PN}"
-APACHE2_MOD_DEFINE="GNUTLS"
-
-DOCFILES="CHANGELOG NOTICE README"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-apxs="${APXS}"
-		--disable-strict
-		--disable-doxygen-dot
-		--disable-doxygen-doc
-		--disable-doxygen-html
-		--disable-doxygen-pdf
-		ac_cv_path_UNSHARE=no
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	apache-module_src_install
-}