gentoo resync : 16.04.2018

5 files changed, 62 insertions, 7 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 86cb54af67cd..abb9de7d94e4 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_fastcgi_handler/Manifest b/www-apache/mod_fastcgi_handler/Manifest
index b81233ce7668..485d3faba48f 100644
--- a/www-apache/mod_fastcgi_handler/Manifest
+++ b/www-apache/mod_fastcgi_handler/Manifest
@@ -1,4 +1,4 @@
 AUX 20_mod_fastcgi_handler.conf 133 BLAKE2B f99f484da6c2e9f0f3255effa62485c9b9b81a118a6a192134d3631acd26765ef4b32ddf366d9ac0c8979206b891a07f7750a3983354488c50a950edb44d21c7 SHA512 d78c4d4f5ed85d8b42c435684d302dcbfc3f6eae6bdef3035226ad7da6225aee38dc05899b8b8c282bf77c61fe3422b4de5b48db4c948f9df49465e54f999f2f
 DIST mod_fastcgi_handler-0.6.tar.gz 10980 BLAKE2B fa0287d77927e9511c289882d0502dc70ea4c7e1040c80c48d6cd0a8da4a057d8eaaa13255fec824e3c9938810e477271ecd92c6a66c98b3697856ccc10bead4 SHA512 36598183170338871ea2952e6e54914f402353ec51425d2256d336d914ebadc6e7c928a03d60ed0f607dae8c137fe467a48ca6e779b2978bf34c5e34fa7058e5
-EBUILD mod_fastcgi_handler-0.6.ebuild 690 BLAKE2B 17355d732e13a498929d0a5861b85e56a999bd2aaab8564f1e9c0af41c0bb8fd71f7ef3da2228b4b3a402c15619bdbb16f2f3cf58957219684c6b1a2419be7b8 SHA512 02918f9ea0f222beae8e09e6ebd9f8d4482373a6f23d89230d303b494d8f9245fd36db48ba9ea3c709316cce12f0fea1295eb2588e0c65766a8084e7970d57de
+EBUILD mod_fastcgi_handler-0.6-r1.ebuild 665 BLAKE2B b6b7f9026549edc78111c9d6ea5306b46af948982584211b4859af71eb17264a21d74003652ba660e82ec4d9bb6bc50706714511d81194148d80ac3256776bdb SHA512 0c9768885e8afa814df0c657232fc1944bd52a4b06f912cdaac4e0efefc744f02597bae89fb1b35a183b039da9e30fde28014b2a0ac6100733a9c18afca834de
 MISC metadata.xml 230 BLAKE2B d8e48f7095b8faa7e5fede6737d4abeff2de8ed6a64585c524d0b4390952778de0fba265a562389cec08a78d2563dcf11d5cd934115db3807ffa15338e068729 SHA512 dad890785b93be37bae607ebf64fb129487e376fd20deb56e3ce781d62a385017ac715d89c72104df6f9b62f7e6dbcd5c87d34495119cedbde92971d9c37931d
diff --git a/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6.ebuild b/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6-r1.ebuild
index 4b07964fa875..1da963f79758 100644
--- a/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6.ebuild
+++ b/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6-r1.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI=6
 
 GITHUB_AUTHOR="hollow"
 GITHUB_PROJECT="mod_fastcgi_handler"
 GITHUB_COMMIT="c5e075b"
-
 inherit apache-module
 
 DESCRIPTION="A simple FastCGI handler module"
@@ -18,9 +17,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
 S="${WORKDIR}"/${GITHUB_AUTHOR}-${GITHUB_PROJECT}-${GITHUB_COMMIT}
 
 APACHE2_MOD_CONF="20_${PN}"
diff --git a/www-apache/mod_gnutls/Manifest b/www-apache/mod_gnutls/Manifest
index 5b866f83103b..4d214ceb78b0 100644
--- a/www-apache/mod_gnutls/Manifest
+++ b/www-apache/mod_gnutls/Manifest
@@ -1,6 +1,8 @@
 AUX 47_mod_gnutls.conf 1125 BLAKE2B f4e9a48be5abda5f9ac0af5ae6621e1d35f4b52c4d00a64c0c939661ed26ad38563b833bafc1266d0b5c5ea8c2d0e5804547b73d5d2b7d95c5fc3f37411715db SHA512 cafa6b049f4131b3cb43a4c62a6fb06e9ac5c44bea1901865dd5d48692f22bb5f6243d812f7f2b2d2adf0d39a16480f062043556bedc740b5630809ba9c972f7
 DIST mod_gnutls-0.8.2.tar.bz2 415903 BLAKE2B 98c96479e2419ee511ba802c99823ddaae89ddeb7a2f0660b91e2a371f8249ec4f98b2c0443389168a22dbe133b0bcc6020bfa597447507a8e4f91827b6d1d24 SHA512 b1690aeee4f6d104e4b6a7bd443e289204630b33e00b7b145b11291d8819b5c3d5bd52b535746b8ebdfee7a5f34df527243b743b8c5d716b1d0617e319d43f4d
 DIST mod_gnutls-0.8.3.tar.bz2 420257 BLAKE2B a183d11c320e536caef897023d1873bb89f72f7e8e078a5c71f9bdae06ca2c33a03ab68af809ef212757002d91275a537f309eb67fc9cfae8b8880edd75b44a0 SHA512 a0c5babeef5b76e9a10642b3825832290dce3b094d236dd06f76228ba7523ba14c2ada4d97d9c47bf9da0cb0808a9c8fb1080122d27399f6a9267ee0f3ce4656
+DIST mod_gnutls-0.8.4.tar.bz2 422811 BLAKE2B 33b992cbd42671ce0be320268f2421f167c05e62074ad538c22efc1f8b2f1a8604550f103bab579f1dc8622a78bda9e1e62826db06ff0dae21fb9dc1c2ee2bc2 SHA512 cee592f12a26894dacd6db6f25d4b1b1901579ac5cc7dee2be826aa3697bc2af55e2136ef65acd6dc4c9fac635465fbf8c06ea236651d45a2b5fd963408e6684
 EBUILD mod_gnutls-0.8.2-r1.ebuild 993 BLAKE2B 8fa3ad55f2349ab8c3d0eefe011b1f1701e05217a16bb9348395f653f3952438e88b9b61b9ed98e0aaa20b4a28b53dffac2cbf9df22970a205cb4ac9afd73766 SHA512 c9b1a3fc316997fe25aa37317b367ed2bb1a055a8234eb9cfb299f2ea071ccca69e91fcd31fbda21dc097d4dffa2ff4d769186bc6ff76cc14c9054ccd0486b6c
 EBUILD mod_gnutls-0.8.3-r1.ebuild 1158 BLAKE2B c907ed1f80155544368f43ff75381e391d8933747bba791401b2e5ef36df299e87144779df8060d019f5fbf0458d7483b489110949c6d5ead942692a4265f378 SHA512 c17fc27b2413c46cf8e7199e1aa6ef98ea61313302a08f08a2fe351b405bc811fc3a175ddf81f55071f9f7000dbef31d58428a8fd8334cebd6ba61178a6a6a3a
+EBUILD mod_gnutls-0.8.4.ebuild 1158 BLAKE2B c907ed1f80155544368f43ff75381e391d8933747bba791401b2e5ef36df299e87144779df8060d019f5fbf0458d7483b489110949c6d5ead942692a4265f378 SHA512 c17fc27b2413c46cf8e7199e1aa6ef98ea61313302a08f08a2fe351b405bc811fc3a175ddf81f55071f9f7000dbef31d58428a8fd8334cebd6ba61178a6a6a3a
 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.8.4.ebuild
new file mode 100644
index 000000000000..1d6985d4f075
--- /dev/null
+++ b/www-apache/mod_gnutls/mod_gnutls-0.8.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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
+}