gentoo resync : 10.02.2019

9 files changed, 114 insertions, 10 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 4e57299b0362..fa92f86a7b5c 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_fcgid/Manifest b/www-apache/mod_fcgid/Manifest
index 77cd6b0e2303..73afdadb30f0 100644
--- a/www-apache/mod_fcgid/Manifest
+++ b/www-apache/mod_fcgid/Manifest
@@ -1,5 +1,5 @@
 AUX 2.2/20_mod_fcgid.conf 165 BLAKE2B 6d0df61890baa8d84f2a373ced303e86e492bef5b854b3cfad934a686684a3391afcdf9787e6998036c32924307567c88794769f144438bd4cd7633e7ff9af93 SHA512 f534c02703f697e76d4c1e57aa9785d81f58374ad4d4f458299e23d64bf3b80c9c5380a9c60862bcfbfbc0d6bef4f0e5c8c11c53e2f90c3824d3b1afd64bcd7c
 DIST mod_fcgid-2.3.9.tar.bz2 80205 BLAKE2B f0320e56f40c90f89d12ecbb91a54a98d49262d01547d743060dfc57c3217f9927a2931d997a003f686d09f4df1c42de45088ce4909aa689f7b7f4ab05b53971 SHA512 c429c14990cc8b492e88db1aa00fc2593bfb1b129b9001be21670d42c8f3e5038acd3f4556b48f3ac7dfc03c8d3656f0d4402122932e5bdc2c2aab1c7c235121
-EBUILD mod_fcgid-2.3.9-r1.ebuild 711 BLAKE2B 0d66034e5c2b2c4c70d3b5591b63984572a0f0c104cb1036b50976cef1814d80f3334e35fe0eea45c87e6307f1f96a90631c58777950a716c92e2f3b27832b3c SHA512 d51c7abfe86a7fa81e801492a2f0694488baf83ed3c37f5bb8f322fbd25654cf78a3729346148d3d912f250ba8fc595e5c8a848e894ad780d0e2f4aab0a0c689
+EBUILD mod_fcgid-2.3.9-r1.ebuild 707 BLAKE2B 879bf1304a2aa9af4e280163a422c6fe4d10e449f64721184153570be72a7bb527c6e616402c40e9c05a58801c5f13fd10f545e8dd2864e35e585143bdb55175 SHA512 b86ed1c90a4d0c38de6b056870bee27b4f85c4390f20be6b1518522b0d3618acd106cece794146dc7e8192d3464c184c106f15f72c52cbb42345e9b113ff966a
 EBUILD mod_fcgid-2.3.9.ebuild 709 BLAKE2B 5b6110e1df37f7d6967a6991a267c0c2295e2e4744535f8b1abb41b7366715a9d815d499b0db472e06fab5b0af6117f8bee6d16582ae038e6303426a2f1137d6 SHA512 54bb1c7e91416a964e95c3e0fd7f4414c19165952de5254a018216c1dacef9eba126021373531658fee3a5f727f37e09cdad465ad88537366562964b6cb85bc6
 MISC metadata.xml 393 BLAKE2B 6b4f4cca80273eeb83d5e8f26daf6a9d0f3d686c1c72883d11bdd78ce20844b986ddc3bc70c5d8f68fc9151ccada81d585d8966d191a7029e53fa4beee19fbe9 SHA512 44e77be6b2d4119e5c63945fca1a68a517e0953b47262d101feae8c083fbe5799ad0032ebe11ce8330df3b15dd59ba12d641070803c619e76f3ad7d080df5ef9
diff --git a/www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild b/www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild
index df4dab78ef92..6cd91c53711e 100644
--- a/www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild
+++ b/www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/mod_fcgid/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ppc ~ppc64 ~x86"
 IUSE=""
 
 APACHE2_MOD_CONF="2.2/20_${PN}"
diff --git a/www-apache/mod_log_sql/Manifest b/www-apache/mod_log_sql/Manifest
index cf5db3ce0227..18790928a255 100644
--- a/www-apache/mod_log_sql/Manifest
+++ b/www-apache/mod_log_sql/Manifest
@@ -3,4 +3,5 @@ AUX 42_mod_log_sql.conf 827 BLAKE2B f96bb44047f2301a7db85e9cd9c66a53a703aa5f5426
 AUX mod_log_sql-1.101-apache-2.4.patch 633 BLAKE2B 71f5a303ec140bc55d02987fbb89a7911e90663a0b1ed1e583382dea2ed135cca0d79eab23720ed2a367ef1e46e223c584d93b33cd25803c31fd1ad73bc23bbb SHA512 9ce5fc6183d76a32a073d0778404d1b112a3f44eddb589a80146b82762535cf909f303af41dd0bbd650d70e362e85e4fb361039c4fcdfd1a8af134d6d02a2fd4
 DIST mod_log_sql-1.101.tar.bz2 127500 BLAKE2B b82677ba590f900a69506b0a9f5ada92076faa303815655d0d9e24c1f50704c96878ab39b7285836bbb59ecac15db6bfba674c10dfc78bdb0907ff37cf680cf5 SHA512 30ea586443cf042e52149012613d80ca0c6631847618366905e90f99bfab235ca6e050fa1dbdb98ef54be6d68b34564781c6efb36ba89f7b51e4f3e00892d91f
 EBUILD mod_log_sql-1.101-r2.ebuild 1504 BLAKE2B 55cab4365c3777ce7f3401c4901a800a24d4e42590d44cda3ba02eedd95fafec90c1cf549513c200b154b36dc9d11b1d7d2e5ab7408cd3a34ff81575278b3bfd SHA512 b49f76ef2444ef56ebc7d3c2d425990d8a31bc99acd066364c597b95c0905c75290e2add1e1ab1b5a87a64320594fea01388d3295a6b3763f6d3d370a399d198
+EBUILD mod_log_sql-1.101-r3.ebuild 1514 BLAKE2B 69532ac3e554101c43215a5d4737cbac104751b8ed89a993f2c987a99093c73b18472acaa4b93ee7840184767c53c6e63624f96598e10f5c282e1d86936febf0 SHA512 bd9349517ed458d8d63817e765f6c5772f9d3b73dfdabab3902fe307937bd2a9edeb4afd88336ba35e98d630aa252c1c177a34c211943a4ebf659027f60e912a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apache/mod_log_sql/mod_log_sql-1.101-r3.ebuild b/www-apache/mod_log_sql/mod_log_sql-1.101-r3.ebuild
new file mode 100644
index 000000000000..d7f0da75b8d4
--- /dev/null
+++ b/www-apache/mod_log_sql/mod_log_sql-1.101-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit apache-module
+
+DESCRIPTION="An Apache module for logging to an SQL (MySQL) database"
+HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_log_sql/"
+SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.bz2"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dbi ssl"
+
+DEPEND="dev-db/mysql-connector-c:0=
+	dbi? ( dev-db/libdbi )
+	ssl? ( dev-libs/openssl:0= )"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_CONF="1.101/42_${PN}"
+APACHE2_MOD_DEFINE="LOG_SQL"
+
+APACHE2_EXECFILES="
+	.libs/${PN}_logio.so
+	.libs/${PN}_mysql.so
+	.libs/${PN}_ssl.so"
+
+DOCS=( AUTHORS CHANGELOG docs/README contrib/create_tables.sql
+	contrib/make_combined_log.pl contrib/mysql_import_combined_log.pl )
+HTML_DOCS=( docs/manual.html )
+
+PATCHES=( "${FILESDIR}"/${P}-apache-2.4.patch )
+
+need_apache2_4
+
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
+
+src_configure() {
+	local myconf="--with-apxs=${APXS}"
+	myconf="${myconf} $(usex ssl --with-ssl-inc=/usr --without-ssl-inc)"
+	myconf="${myconf} $(usex dbi --with-dbi=/usr --without-dbi)"
+	econf ${myconf}
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	use dbi && APACHE2_EXECFILES="${APACHE2_EXECFILES} .libs/${PN}_dbi.so"
+	apache-module_src_install
+	einstalldocs
+}
+
+pkg_postinst() {
+	use dbi && APACHE2_MOD_DEFINE="${APACHE2_MOD_DEFINE} DBI"
+	apache-module_pkg_postinst
+	einfo "Refer to /usr/share/doc/${PF}/ for scripts"
+	einfo "on how to create logging tables."
+}
diff --git a/www-apache/mod_musicindex/Manifest b/www-apache/mod_musicindex/Manifest
index b38b8d4066ff..92e4a10f696f 100644
--- a/www-apache/mod_musicindex/Manifest
+++ b/www-apache/mod_musicindex/Manifest
@@ -3,5 +3,5 @@ DIST mod_musicindex-1.4.1.tar.gz 508795 BLAKE2B 272cdddc16097b55c7b89df42f72c460
 DIST mod_musicindex-1.4.1_valid-rss.png 1523 BLAKE2B 679a17627a73561ca2fa02bf3c3a8e3ec71883b65b0215d4a580e441f2c935538e4477228c7e0ea83df2322e7b7158e0f0cfd9f895744cf10080a5e3f698c936 SHA512 e9df8ea0c6da2d1f268f8aa17e396dcdf53a61d1196ed67f44f03f22f0c5a9661a1e8a96f6d506c02374bc4f0923be9371372a2c678b705017ee733be2b402ec
 DIST mod_musicindex-1.4.1_valid-xhtml11 1842 BLAKE2B b145d2c8d36e677db38dc8a8ad31e7c69b29d28a56aae8c0c4c89319d95ece7f164968b02f30b6abb425309f4c77a1ead59b2058365eee161ed9b7898685d4e3 SHA512 8beb13a595b402e7de416ae05992f3e0a17719554fbc83cd5c3e0518cd859c560339a61c2f198c8e4982ca397f29823b521e05f29ed632826bfb02646990cc9c
 DIST mod_musicindex-1.4.1_vcss 1547 BLAKE2B 465f63519c64353e1ec6d62e99ea9cf95c00244c717d9bc8d2213723dc55d6186589446a19725d5b8c95f45800946040ad9bfe89ec0b951c514651a9447ad281 SHA512 6c2fa4a0c3fbad68752d7471f95838b69816fd00f58c28f32076af24972117d8b0f2cebb075548ec1317f886a8955cf5686dda571c4d5a823d3ff09da8e33a70
-EBUILD mod_musicindex-1.4.1.ebuild 1587 BLAKE2B 4d96c7928fabef5ff619945deb763ae98ae2eb5b87cabf3685cb843075c1cea4038dc5651ab1dcc759b059a0b140fa6c09c37334e3e192763ac53739338dd6a3 SHA512 b84d5257d779a2896ce010051dc9d536b6e479c95dfdf8af87a41e1b986e74638eaf0d3d56c13395dba3a7ccf59e1e945d9ee7881908ab8bd60f4c96909a2b6a
+EBUILD mod_musicindex-1.4.1-r1.ebuild 1570 BLAKE2B 4f04b220fb2a98c8d7a6e24f1270dcb8fce3203c022608594af97e11a799546951d0ffb768daceac6cf08d1796be3d0ac14683a565043da7f5b3ff5c264333f4 SHA512 c2eac0dade0628780c4d625dff663f068dbd7ba100cb7124a2396a20a8548f9a8c7a5c4bd2fdc0f4967ec7ee25492981c3dc27bca21204c7101be489c3fd568c
 MISC metadata.xml 333 BLAKE2B 0480ab51c1560c8728b46a304ded3327ec6826047447d83595fb13478fd6f939946901cc4e8f3ee11a5a6764e31ca375f265e043dee02f1d433566eeb6433df2 SHA512 7f5c3eee6608c17b0718c8a4ac1fb87872842b40acebc2e2aa32c5a475b4b7eccc56897c697a30bc8bc2e23fd40575e0bca598ad53fe1426057f5f463cab7de1
diff --git a/www-apache/mod_musicindex/mod_musicindex-1.4.1.ebuild b/www-apache/mod_musicindex/mod_musicindex-1.4.1-r1.ebuild
index d87b3ed75c33..a033588e3669 100644
--- a/www-apache/mod_musicindex/mod_musicindex-1.4.1.ebuild
+++ b/www-apache/mod_musicindex/mod_musicindex-1.4.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit apache-module
 
@@ -22,16 +22,20 @@ DEPEND="mp3? ( media-libs/libmad media-libs/libid3tag )
 	flac? ( media-libs/flac )
 	vorbis? ( media-libs/libvorbis )
 	archive? ( app-arch/libarchive )
-	mysql? ( virtual/mysql )"
+	mysql? ( dev-db/mysql-connector-c:0= )"
 RDEPEND="${DEPEND}
 	sys-devel/libtool"
 
 APACHE2_MOD_CONF="50_${PN}"
 APACHE2_MOD_DEFINE="MUSICINDEX"
-DOCFILES="AUTHORS BUGS ChangeLog README UPGRADING"
+DOCS=( AUTHORS BUGS ChangeLog README UPGRADING )
 
 need_apache2
 
+pkg_setup() {
+	_init_apache2_late
+}
+
 src_configure() {
 	econf \
 		$(use_enable mp3) \
@@ -44,11 +48,11 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	default
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake failed"
+	default
 	apache-module_src_install
 
 	# install W3C images
diff --git a/www-apache/mod_vdbh/Manifest b/www-apache/mod_vdbh/Manifest
index ae95ecfb9cb2..3dc31f6f7819 100644
--- a/www-apache/mod_vdbh/Manifest
+++ b/www-apache/mod_vdbh/Manifest
@@ -1,4 +1,5 @@
 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
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
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
new file mode 100644
index 000000000000..c514e31cb232
--- /dev/null
+++ b/www-apache/mod_vdbh/mod_vdbh-1.0.3-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="dev-db/mysql-connector-c:=
+		>=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
+
+pkg_setup() {
+	_init_apache2_late
+}