gentoo resync : 13.10.2019

14 files changed, 5 insertions, 124 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 31ee00a282ad..e8e0c703ae5d 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_diagnostics/Manifest b/www-apache/mod_diagnostics/Manifest
deleted file mode 100644
index f95084846025..000000000000
--- a/www-apache/mod_diagnostics/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 20_mod_diagnostics.conf 127 BLAKE2B 2eae27eaf774568cd7dcd7fa2fbc3a383df171c5109d348082a20f20609e2927fa76644c360aa50aa4f8ee084d3f93fbaefed7478fbd0889b31e1b1fb367f125 SHA512 ab19ed00552ac8424b773aea82b6760936cb1574e7dd43adc980c71fe6649419d8de6948a55c33b848ffa62cddff9680b202b7e1911f8448760d8b9f82b48692
-DIST mod_diagnostics-0.0.1.c 6373 BLAKE2B 4cc76a6abaef0eadfa6f6e1ba2d5c6852b6d73da0d17593b676e5112b855d9357754aef79b1a84bcfc279f7cf6056c84da8b6881bdac0ac822403d4e71852dd7 SHA512 b6f6498f70e37279508ca732aa3bbeb7180175ac35f16cfb88fa2c7558edec64b1cc3659b4516909888119f7984d51a98cadc9ef07480fdff5eac72174e8835b
-EBUILD mod_diagnostics-0.0.1.ebuild 599 BLAKE2B ae6a60ebfa4cf51add9be82f637a14235f52f67a04b26bef56a8f07340e758a9d6ec7de089f6a69abe5cfd1a5b257d4dce47df0b75def2f9a5d7ebf267ee6a63 SHA512 3c93760c91a4498c9735b531cf7c018c47148297e068995d8ec9d0a0a5297289e35aad7b092ffe2073000d5abacc2a440568b264d87c4e5951696e717884af4e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apache/mod_diagnostics/files/20_mod_diagnostics.conf b/www-apache/mod_diagnostics/files/20_mod_diagnostics.conf
deleted file mode 100644
index 7600654ea7f1..000000000000
--- a/www-apache/mod_diagnostics/files/20_mod_diagnostics.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-<IfDefine DIAGNOSTICS>
-LoadModule diagnostic_filter_module modules/mod_diagnostics.so
-</IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_diagnostics/metadata.xml b/www-apache/mod_diagnostics/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/www-apache/mod_diagnostics/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild b/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild
deleted file mode 100644
index a76bbf3ee643..000000000000
--- a/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit apache-module
-
-KEYWORDS="x86"
-
-DESCRIPTION="An Apache2 module which can do debugging of modules in the Apache2 Filter Chain"
-HOMEPAGE="http://apache.webthing.com/mod_diagnostics/"
-SRC_URI="mirror://gentoo/${P}.c"
-LICENSE="Apache-1.1"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-APACHE2_MOD_CONF="20_${PN}"
-APACHE2_MOD_DEFINE="DIAGNOSTICS"
-
-need_apache2
-
-src_unpack() {
-	mkdir -p "${S}" || die "mkdir S failed"
-	cp -f "${DISTDIR}/${P}.c" "${S}/${PN}.c" || die "source copy failed"
-}
diff --git a/www-apache/mod_pcgi2/Manifest b/www-apache/mod_pcgi2/Manifest
deleted file mode 100644
index 39f487998e2b..000000000000
--- a/www-apache/mod_pcgi2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 20_mod_pcgi.conf 197 BLAKE2B 4e39cbef40717da4290fd0ad84d296261281a56d4bd8a567fba71b5f85a9deca082ea7c7e0f05502bd8251336495d93a68d0cbcc7f2f904fd71c6cb75e12d9de SHA512 88058fdf57409bdff759e6f1ec73e10b13e479883bc34992a8bab72a8100854ca8c225e74d97402a719aed6b82594f47de231ebd7c0b8f14a276eece039b4828
-DIST mod_pcgi2-2.0.2-src.tar.gz 32214 BLAKE2B c247be1a74f3c9efbe0e850c9ad9394827bb947a5dce740cd3372bc3e09221f0275f72c2acd6e7433c6b0ba4f40b2281a9e49f4e6fc5f51dcac5684a9a0c2915 SHA512 81e10168702559644d1a23211ba34fd1fe55f8334e1a97d11efcaa7032f8a485fb28e579e96c6b0d4f14a25544baf188a3806746e8949b7143ac0adb148e1531
-EBUILD mod_pcgi2-2.0.2.ebuild 651 BLAKE2B 5d586b318736ca311dc5a8003164f28c22d21b46e0987e19d0cbaa8a79f64728e4c403aa83284d2de4a60e53839a39adfe6cd637092b6add26cb6ea66494f392 SHA512 4a0562cc1ed715382ab8dff52e8a428b96cb7edbbdc770caf67dcffbc89db279919d9246a905587eadf4a2ebbc0537d09a4e36b79c2e80899f628a5cbb120529
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apache/mod_pcgi2/files/20_mod_pcgi.conf b/www-apache/mod_pcgi2/files/20_mod_pcgi.conf
deleted file mode 100644
index 4849530c96bc..000000000000
--- a/www-apache/mod_pcgi2/files/20_mod_pcgi.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-<IfDefine PCGI>
-LoadModule pcgi2_module modules/mod_pcgi2.so
-
-# please see /usr/share/doc/mod_pcgi-*/README
-# for details on the required apache directives
-</IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_pcgi2/metadata.xml b/www-apache/mod_pcgi2/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/www-apache/mod_pcgi2/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/www-apache/mod_pcgi2/mod_pcgi2-2.0.2.ebuild b/www-apache/mod_pcgi2/mod_pcgi2-2.0.2.ebuild
deleted file mode 100644
index cab9b77023b4..000000000000
--- a/www-apache/mod_pcgi2/mod_pcgi2-2.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit apache-module
-
-KEYWORDS="~ppc ~x86"
-
-DESCRIPTION="An Apache module to talk to Zope Corporation's PCGI"
-HOMEPAGE="http://www.zope.org/Members/phd/mod_pcgi2/"
-SRC_URI="http://zope.org/Members/phd/${PN}/${PN}/${P}-src.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="www-apps/pcgi"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN/mod_}"
-
-APXS2_ARGS="-n pcgi2 -DUNIX -DAPACHE2 -DMOD_PCGI2 -c mod_pcgi2.c pcgi-wrapper.c parseinfo.c "
-
-APACHE2_MOD_CONF="20_mod_pcgi"
-APACHE2_MOD_DEFINE="PCGI"
-
-DOCFILES="NEWS README ChangeLog"
-
-need_apache
diff --git a/www-apache/mod_vdbh/Manifest b/www-apache/mod_vdbh/Manifest
index 3dc31f6f7819..430ea48480c0 100644
--- a/www-apache/mod_vdbh/Manifest
+++ b/www-apache/mod_vdbh/Manifest
@@ -1,5 +1,4 @@
 AUX 21_mod_vdbh.conf 489 BLAKE2B f91c0dcbafb1cbd6925bd26e61ec00f463ebe95aef47c221cc72139679259d275bd88983a1a900dd57eb56d2820ca04a2815214b0d189f4227857d03fcc8b036 SHA512 db6fe3fc7e76e5db30529f458ff326681151cd116ff3cb2bda036c6117765103a79cd6b66af46038ee8e22e83ff58524e74bbf1f25723595006159e057064f1b
 DIST mod_vdbh-1.0.3.tar.gz 8053 BLAKE2B f0b7b00e180c288cd93fbc4021f2c35809179d980a3bd20d05173f4da057cf923efa13cc0331a075e2cefc44860bf82236a801f17c80625670dbe924bc9fb7eb SHA512 32039fca98bd106571db2f456c60a8420a67846125e3a042ba7e770817d62c224c834aed79d9cdd538116c46bdb9b7bc90be0b6832ecc8712572bc95280805cf
-EBUILD mod_vdbh-1.0.3-r1.ebuild 657 BLAKE2B 6468f92f877bbcfd45c7dee3563dd1cd0b547d131024e0b0558e428333743fbb6200c71de282411867bafd745cfea82f184deb4b4c0f2d581e80031c92b74f0b SHA512 d0fe332c16d05740834303ddbae4a2ea44a8ff97e5ea7603a32d54047de8b3a627b07ccb8db022ce67403b0f72a1cff7e6a5236df4969d6eed58afad7bfd9b2b
-EBUILD mod_vdbh-1.0.3-r2.ebuild 706 BLAKE2B d9c7c1350e34eba5b3f8f60f4fc626f6675c1c7e79cce3e018875a912c342ad7fe6ab3b6db56d874c11bf31b83f6f634250c5c7c2144fa0c33df390cac2bf4c7 SHA512 b9331b9dbca8445d8468e7fef0be1e00fabbe2d73b0962202570303cacf92ec2687b0b2d62230320efca51e13866fdc3e078b5b005964fbee8d817498853aaf6
+EBUILD mod_vdbh-1.0.3-r2.ebuild 704 BLAKE2B 2011b193d2fd629ab3eb6d6bf026f7ccbd212a281f2f92c620bdf667d5ace0493092f2e8745155282c25b57f3c28082aed1e341eeed1d4940a435223645d6ba3 SHA512 47d4832c9a0eace6b7d564017d4c2f08dff1178a5040ee2f6a22ee8bb2eb2153c48e8b6080c2438a2354423494b3d7585d09fa5112867a28916fdcb6560115a1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apache/mod_vdbh/mod_vdbh-1.0.3-r1.ebuild b/www-apache/mod_vdbh/mod_vdbh-1.0.3-r1.ebuild
deleted file mode 100644
index 6e53bbb94e10..000000000000
--- a/www-apache/mod_vdbh/mod_vdbh-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit apache-module
-
-KEYWORDS="ppc x86"
-
-DESCRIPTION="An Apache2 module for mass virtual hosting using a MySQL database"
-HOMEPAGE="http://www.synthemesc.com/mod_vdbh/"
-SRC_URI="http://www.synthemesc.com/downloads/${PN}/${P}.tar.gz"
-LICENSE="Apache-1.1"
-SLOT="0"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-
-DEPEND="virtual/mysql
-		>=sys-libs/zlib-1.1.4"
-RDEPEND="${DEPEND}"
-
-APXS2_ARGS="-DHAVE_STDDEF_H -I/usr/include/mysql -Wl,-lmysqlclient -c ${PN}.c"
-
-APACHE2_MOD_CONF="21_mod_vdbh"
-APACHE2_MOD_DEFINE="VDBH"
-
-DOCFILES="AUTHORS README"
-
-need_apache2
diff --git a/www-apache/mod_vdbh/mod_vdbh-1.0.3-r2.ebuild b/www-apache/mod_vdbh/mod_vdbh-1.0.3-r2.ebuild
index c514e31cb232..3b7c60c3f165 100644
--- a/www-apache/mod_vdbh/mod_vdbh-1.0.3-r2.ebuild
+++ b/www-apache/mod_vdbh/mod_vdbh-1.0.3-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit apache-module
 
-KEYWORDS="~ppc ~x86"
+KEYWORDS="ppc x86"
 
 DESCRIPTION="An Apache2 module for mass virtual hosting using a MySQL database"
 HOMEPAGE="http://www.synthemesc.com/mod_vdbh/"
diff --git a/www-apache/pwauth/Manifest b/www-apache/pwauth/Manifest
index 55dff3eb1850..2a8c6aa66162 100644
--- a/www-apache/pwauth/Manifest
+++ b/www-apache/pwauth/Manifest
@@ -3,5 +3,5 @@ AUX pwauth-2.3.10-makefile.patch 1468 BLAKE2B 4880a5fa1da08dbbe22f2a3a6baa30aaf9
 AUX pwauth-strchr.patch 272 BLAKE2B 6b23d51fa68dc2e93216d183d4ab14f1e3dda12bcc1f68e051f9d94fb9c07a6b08b65e2d3cfb76b17290a4b1a8dfef9507cd1cb5c6b461935bac16ee4232bf38 SHA512 2717de2fd77bea0f2fbba2462b6a252cdb4acfd1e6a61cd3208cda4d283ed719b2f7f0c31090d5e0cde06aa8b6005e0fd78a660554827f0c65bfa8cd3af1e8f8
 AUX pwauth.pam-include 174 BLAKE2B c81c30aa536dcc6343d24661bf9d9b0f237f5123592da075c3abae6e25aa7112f1fac2c94fadb9cf3741c35f17fdf721e5d5760981402283706603ab107e042e SHA512 0169ddc1945230570491c5a3e6d21ba521d2b44dde35ff84d5c4def07b7f09c51ddb99c03f401a02a4f913036e1cd8babdfbc38cd5eaa27cccd5c3618cbe17cd
 DIST pwauth-2.3.10.tar.gz 23825 BLAKE2B 193a90a0f81af38ac336d56625c3cc585c160da4f98e3332d1b65d3ad03a2bb09afc04e86a35beb1ce40c16d32fc42debec19d2eeea70564c77b87e3fab5c3ad SHA512 a2f02f2c8b61d87cc0c034952e17f187bbc358506052a31107ccd38a938d59862f0ee18362c84984c900d2986bb35abbbd5877d4cf973a0215a6ec3656a23bff
-EBUILD pwauth-2.3.10.ebuild 1914 BLAKE2B 3cbbac3fb873b3c2c7f08761573ca3388616adb2b7ec8f15d16b582dd56fb51b55d87e7787199a138cdedce17b8164efd937eb90d12e60acadc5ba011b96e9f5 SHA512 da19048a6f783c9cd088a839c6eb62737bfaa5a096494c80598c05b7a6bef564cda31e81865c957f80252600454750be70d6750458f179cb8edd46892d1e18f7
+EBUILD pwauth-2.3.10.ebuild 1912 BLAKE2B 331ba15c6a656605d36b4b3e945f34a612acede8b4442aa6a5e325dcf58a9d4dfed8d127ab53e3d67674f999c4ed14430717263acdf1871dea75ab5c4ad7d9b4 SHA512 93c42eea8454f84824243d4fce229eaf6562fc1625c18e8e406121c035cfd534a3b39cb11107ec6b4923f9792e1ce735f05572ae233c7961da532987bbf50a49
 MISC metadata.xml 502 BLAKE2B fab26850cff9adf0d53f059c2809d1d67100cf9de3a6a8506a70ad26ab3384aa435b1e4197f6991b0248fedee69328131395eebde1f0b76dd66f380e7742aebc SHA512 57990b021af7f99ad2dfcff6ee111acac263f8624d385b302f455c16d24ebb0dbe95b4e6caad36e10938b79666d2ec23ac1e642919af83c934cce479b1fb54f1
diff --git a/www-apache/pwauth/pwauth-2.3.10.ebuild b/www-apache/pwauth/pwauth-2.3.10.ebuild
index 8bd3806e64a3..c1fd701b6e9c 100644
--- a/www-apache/pwauth/pwauth-2.3.10.ebuild
+++ b/www-apache/pwauth/pwauth-2.3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="faillog pam ignore-case domain-aware"
 
-DEPEND="pam? ( virtual/pam )"
+DEPEND="pam? ( sys-libs/pam )"
 RDEPEND="${DEPEND}"
 
 PATCHES=(