gentoo resync : 02.08.2019

10 files changed, 71 insertions, 56 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 5624c3da638d..26d3e690a773 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_authnz_external/Manifest b/www-apache/mod_authnz_external/Manifest
index 29393e5e3339..f28edc568812 100644
--- a/www-apache/mod_authnz_external/Manifest
+++ b/www-apache/mod_authnz_external/Manifest
@@ -1,4 +1,7 @@
 AUX 10_mod_authnz_external.conf 987 BLAKE2B 840f46d25a51dad9614bfc1dc12f7e2362ede3c7f039e5101177689767c22bff0e05a5d65327c709e249d20fa8cac782edec3d003efbab9a732b814278e1b556 SHA512 3840a8f29c3575f700f7ad262d8fe01fe42b3273cb674c543715eb8af053cab990f08264739bac7c46dd16d54eb53cf6a8bed556376b29ad78b50e6c3031a061
 DIST mod_authnz_external-3.3.2.tar.gz 36160 BLAKE2B afc3e4b9b52628479163bf705a473edbb96b5c82ac74c43a0d15512adf59adb4a4122f83e59871a3a91d9094347287b1072e3f12b9689680acd91f4ea534cc6d SHA512 8216744dbaed8dbde0d33658e38594463409e613412bd94f3e5f5a816f5e793a395ddda7c582ff1d1e69e48efdd1efb48c168d4cbc37cc7807a0dcb92eace0be
+DIST mod_authnz_external-3.3.3.tar.gz 38266 BLAKE2B 03bdfe7efdcd832b7662be70e0e38cdfb4f025d3bdd3baf3e98b4d77efd538605db8f625006246515f427989aca3242626a4115e4534ecb75c09adc967227ea6 SHA512 65b643870dcfc5cdc0343bc606ff74697473617ce9f6fe27cae40ae1b2dca904bb71b6ec8347c6b5c5e3819785432798f6e78820cdf66fd17b245371a41322d2
 EBUILD mod_authnz_external-3.3.2.ebuild 557 BLAKE2B be9b71ac1d3c9518db7f53299c4d32c2dc8fc718cbf0c82a2ee5bb0a71a8068c7ad3bb5f3aeafda9af7b4d5941b273c9931b613b40c24a268390b5b272878c7d SHA512 13fcdfd45a9fe6e9150af4a3bf18295c446b7bad7acde88561d7187fee930ae98667d93d9a385a344d37f252b3c2789a544681ee1dd1fd34667e32e302af197c
+EBUILD mod_authnz_external-3.3.3.ebuild 807 BLAKE2B 55791df0e64af79430204a412fb48b0e39de500d37db76fba7b2e83133fc4198dd18afd87d83a60f04f311d09169f34bb510511ad0ed14ae87e9ad7eca417e51 SHA512 5edf1c9def9dcaa2ceb1d73c421dfce4d5853ef8622f6146522af715178a7baf8518cc934c58a6567b38862193fd75b8fe29d5a4f080cf5f9f7b3edc243ad8d8
+EBUILD mod_authnz_external-9999.ebuild 807 BLAKE2B 55791df0e64af79430204a412fb48b0e39de500d37db76fba7b2e83133fc4198dd18afd87d83a60f04f311d09169f34bb510511ad0ed14ae87e9ad7eca417e51 SHA512 5edf1c9def9dcaa2ceb1d73c421dfce4d5853ef8622f6146522af715178a7baf8518cc934c58a6567b38862193fd75b8fe29d5a4f080cf5f9f7b3edc243ad8d8
 MISC metadata.xml 336 BLAKE2B 22bff5bdfb90a1ce3e1e02e91eb783b3ad492c042ef11c3cd4322f1a710ee44949db8dc6fd16e36378e26389c1c326655c5a58d053aaa12adfa888c425d819f0 SHA512 d70954c0d9502b0f45dfbe37e623b679fe2b2466a7d261ffed766b5111e79912be5d6c5324af0d9d43741de58d8e70058c08866486a056ae4f7a27246c451500
diff --git a/www-apache/mod_authnz_external/mod_authnz_external-3.3.3.ebuild b/www-apache/mod_authnz_external/mod_authnz_external-3.3.3.ebuild
new file mode 100644
index 000000000000..a118abb601a5
--- /dev/null
+++ b/www-apache/mod_authnz_external/mod_authnz_external-3.3.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit apache-module
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/phokz/mod-auth-external.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}/mod_authnz_external"
+else
+	SRC_URI="https://github.com/phokz/mod-auth-external/archive/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/mod-auth-external-${P}"
+fi
+
+DESCRIPTION="An Apache2 authentication DSO using external programs"
+HOMEPAGE="https://github.com/phokz/mod-auth-external"
+
+LICENSE="Apache-1.1"
+SLOT="2"
+IUSE=""
+need_apache2_4
+
+DOCFILES="AUTHENTICATORS CHANGES INSTALL INSTALL.HARDCODE README TODO UPGRADE"
+
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="AUTHNZ_EXTERNAL"
+
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
diff --git a/www-apache/mod_authnz_external/mod_authnz_external-9999.ebuild b/www-apache/mod_authnz_external/mod_authnz_external-9999.ebuild
new file mode 100644
index 000000000000..a118abb601a5
--- /dev/null
+++ b/www-apache/mod_authnz_external/mod_authnz_external-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit apache-module
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/phokz/mod-auth-external.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}/mod_authnz_external"
+else
+	SRC_URI="https://github.com/phokz/mod-auth-external/archive/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/mod-auth-external-${P}"
+fi
+
+DESCRIPTION="An Apache2 authentication DSO using external programs"
+HOMEPAGE="https://github.com/phokz/mod-auth-external"
+
+LICENSE="Apache-1.1"
+SLOT="2"
+IUSE=""
+need_apache2_4
+
+DOCFILES="AUTHENTICATORS CHANGES INSTALL INSTALL.HARDCODE README TODO UPGRADE"
+
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="AUTHNZ_EXTERNAL"
+
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
diff --git a/www-apache/mod_tidy/Manifest b/www-apache/mod_tidy/Manifest
deleted file mode 100644
index 25b0639355c3..000000000000
--- a/www-apache/mod_tidy/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 55_mod_tidy.conf 100 BLAKE2B bc27e30a07cd0e62db58d2a172e740388506a3f64bed1d553e89a7e8b5dd2a44cd221953177172f2fd548e089051b1ee0967b5480d121d460035b6f7fa506fdf SHA512 95a8fa23cb014ff3210e957b6bfa8316d94207b45378da590dc0cda396b57bed878b725f745e555fccc7a6664cf79b76f286a7f68112a1d0ff3c5561e1ac5db7
-DIST mod_tidy-0.5.5.tar.gz 312340 BLAKE2B 5917a00a003e21795b9705b597888f028f1006a71c6c6c45ad2a96b5079816390ecd99cb3b3c68b8cb04d5512bed78f3b9b0f5a0b87fb53d20d9cecda916e96b SHA512 2e17292f457077fb6ac1f29c5a51050310dab8dddddf640c07b54e9e7d6a85544f437cdc3143950f625d68c8c076badc3512089ae0539351e1cdf51ba95ccc5c
-EBUILD mod_tidy-0.5.5-r1.ebuild 662 BLAKE2B 2c3807a87f1a6172c4d5638909abe1388057983f65da11f51b228bbc5ce3cb34ad33c14a8818e326a9be38f2214a3419bc17016ffe6cb6604fce5d0833c8ed6e SHA512 dc9fa80d0141169fbe37b5382fb0918ad580d9a92ad1ee116607b53b830eb23b41fd83dd9bf6e19c3716e4db35d751e255669491f27cb824938010cc12acf1dc
-MISC metadata.xml 245 BLAKE2B 647523eaa23d4bfa83afd429b4a65a41d8102eb7ef37fcbd4fd7bec34e2341973973e6e66abb1cfa0c910d355061f5687ecbb58508facf0c3826e77fa789299a SHA512 a4e866edc66ea5d12194fe7f4e05e3fea37e6bf42fcb994d905362633638c87638327c36d8595255ca9e7d8e0a041b5ec09562aeeb39143f0982a9e90a79ecbb
diff --git a/www-apache/mod_tidy/files/55_mod_tidy.conf b/www-apache/mod_tidy/files/55_mod_tidy.conf
deleted file mode 100644
index 70984f71bd85..000000000000
--- a/www-apache/mod_tidy/files/55_mod_tidy.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-<IfDefine TIDY>
-LoadModule tidy_module modules/mod_tidy.so
-</IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_tidy/metadata.xml b/www-apache/mod_tidy/metadata.xml
deleted file mode 100644
index 790f04db721e..000000000000
--- a/www-apache/mod_tidy/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">mod-tidy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-apache/mod_tidy/mod_tidy-0.5.5-r1.ebuild b/www-apache/mod_tidy/mod_tidy-0.5.5-r1.ebuild
deleted file mode 100644
index 6a12889446d3..000000000000
--- a/www-apache/mod_tidy/mod_tidy-0.5.5-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit apache-module
-
-DESCRIPTION="TidyLib module to clean-up and pretty-print the webserver (X)HTML output"
-SRC_URI="http://mod-tidy.sourceforge.net/src/${P}.tar.gz"
-HOMEPAGE="http://mod-tidy.sourceforge.net/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-APACHE2_MOD_CONF="55_${PN}"
-APACHE2_MOD_DEFINE="TIDY"
-
-DEPEND="app-text/htmltidy"
-RDEPEND="${DEPEND}"
-
-need_apache2
-
-DOCFILES="Changes INSTALL LICENSE README"
-
-src_prepare() {
-	rm -rf tidy/
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	${APXS} -c src/mod_tidy.c -ltidy
-}
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index 5ff62b6e1d19..3ca3dc8c8429 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -6,5 +6,5 @@ DIST mod_wsgi-4.6.5.tar.gz 693825 BLAKE2B 1564c331505706548ed171a6f57ad8947eea25
 EBUILD mod_wsgi-4.5.13.ebuild 833 BLAKE2B af3ad4d06adb387b897eb9d4a50d4a764757aa68e241dd45afda5dc736598dd43c85ed828b6abaa7c7e4043dd83baa9b7e8ef64b3df0411bb76de47ea2c950d5 SHA512 3214e77a78fc81094de8bd014cbd6f70f93a55361dff60465a349d6d6f6a694d3ef35d7e567c5f51b7e88939233e8f90d715bb9ab8a34a54e0224194d7022e7f
 EBUILD mod_wsgi-4.5.17.ebuild 836 BLAKE2B 363a4133ac4e19a378b39d714935cfd54b627f94e0b465e4bcabd4ef209cade2568df9b15d0c7d1145d8598d3906f623c6ca45e3a614ae12acfb5cc18586470a SHA512 0f58f98a963b4af8e5299d9e2c6162ff1dc280fe5fb433cb7f3235b70e07520f41bb0aca61d3db2c0c46f91eb40139ca7e867fb0bbc1f6fc3b34ab289a71d901
 EBUILD mod_wsgi-4.5.21.ebuild 836 BLAKE2B 363a4133ac4e19a378b39d714935cfd54b627f94e0b465e4bcabd4ef209cade2568df9b15d0c7d1145d8598d3906f623c6ca45e3a614ae12acfb5cc18586470a SHA512 0f58f98a963b4af8e5299d9e2c6162ff1dc280fe5fb433cb7f3235b70e07520f41bb0aca61d3db2c0c46f91eb40139ca7e867fb0bbc1f6fc3b34ab289a71d901
-EBUILD mod_wsgi-4.6.5.ebuild 836 BLAKE2B 363a4133ac4e19a378b39d714935cfd54b627f94e0b465e4bcabd4ef209cade2568df9b15d0c7d1145d8598d3906f623c6ca45e3a614ae12acfb5cc18586470a SHA512 0f58f98a963b4af8e5299d9e2c6162ff1dc280fe5fb433cb7f3235b70e07520f41bb0aca61d3db2c0c46f91eb40139ca7e867fb0bbc1f6fc3b34ab289a71d901
+EBUILD mod_wsgi-4.6.5.ebuild 843 BLAKE2B 130624a5a46eb338ceceda8dcd77e13f2b1c869bb892c6147dd9565705ed44d08fdb0690070a35777fafb0bafa8e87bd2fd7d156a697830eb735bb09c2f17467 SHA512 28cf3d0e2b7461fd6bf095453420686b8e11ff2fdf1129ab289548024f0d247868cf92e69d0957be685fda4625b7c7fcb3c2eceac7d40d80d651fef5956edde2
 MISC metadata.xml 380 BLAKE2B 1b06e8ab30ece204c3b5926675346cca70352c9a0ffd7fef754fc25473b9e4040111da0005e24da304add76f1a56ccd0ab9247ae10faca316dca982052c6853a SHA512 b62536a8a79d3d5198b6cbd7eb51be455a8c7de53add3810120edc1beee7d0684e09e43de355c5da7a61486c8764c4619c809d9fadde9e9502cb5c0b364d7b68
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild
index 23a7c1bab141..78edc30ace56 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.6.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"