gentoo resync : 28.04.2021

3 files changed, 2 insertions, 64 deletions

diff --git a/www-apache/mod_log_sql/Manifest b/www-apache/mod_log_sql/Manifest
index f2f2603f76a0..c0710b280583 100644
--- a/www-apache/mod_log_sql/Manifest
+++ b/www-apache/mod_log_sql/Manifest
@@ -2,6 +2,5 @@ AUX 1.101/42_mod_log_sql.conf 938 BLAKE2B a962983a14e069f574e1728e7029690e9ee5e7
 AUX 42_mod_log_sql.conf 827 BLAKE2B f96bb44047f2301a7db85e9cd9c66a53a703aa5f5426e6d7d5492122c9a41779dafec73621139e1c8c3e488f1922c3c80c69662b9e7a8abea5cc4e7bb6004634 SHA512 0e43b3c89216fe33886373a4036d3ef5f873e8c99f6fbb640224e606d29a1f220e692fb73e6b54cb87aff502e4642f17245a6771c4e0d6426d0834f564cf2f4f
 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 1513 BLAKE2B 4c58e6a6e2d8933e64b70835e85a9d99e10353fe1ad90ab60c411bca0ee3163270c51922b9cf5112026f38af4c906498ad59b14d6f8c498dfd2e7dde364d4b4c SHA512 43d6f1e8ab52c8cd182299f26f4162fed7efd4f457ad9dc6e7f5b69d6f478a5ef85d4c579bec485b1d4618a5949480bb22c40b2ddabf6bef377499db69ca5fdc
+EBUILD mod_log_sql-1.101-r3.ebuild 1512 BLAKE2B 0ce4c3293c4c16baa36914d459978bba273b35810310850adefd6aceeca37813bb0de20b6c699c6ced61dd518dffee4ee7e8aa91273c6db27bafae28751c3120 SHA512 38f672c042a87484ca34d5934135b2a19f9ee37611d7ca2e14c2b015559f913364efcb69328f2f4ee7528d26effd0c6319bd622c3d5fbf74bdac81491d96af8d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apache/mod_log_sql/mod_log_sql-1.101-r2.ebuild b/www-apache/mod_log_sql/mod_log_sql-1.101-r2.ebuild
deleted file mode 100644
index 0ffe17b300e7..000000000000
--- a/www-apache/mod_log_sql/mod_log_sql-1.101-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit apache-module eutils
-
-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="virtual/mysql
-	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"
-
-DOCFILES="AUTHORS CHANGELOG docs/README docs/manual.html \
-contrib/create_tables.sql contrib/make_combined_log.pl contrib/mysql_import_combined_log.pl"
-
-need_apache2_4
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-apache-2.4.patch
-}
-
-src_configure() {
-	local myconf="--with-apxs=${APXS}"
-	use ssl && myconf="${myconf} --with-ssl-inc=/usr"
-	use ssl || myconf="${myconf} --without-ssl-inc"
-	use dbi && myconf="${myconf} --with-dbi=/usr"
-	use dbi || myconf="${myconf} --without-dbi"
-	econf ${myconf}
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	use dbi && APACHE2_EXECFILES="${APACHE2_EXECFILES} .libs/${PN}_dbi.so"
-	apache-module_src_install
-}
-
-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_log_sql/mod_log_sql-1.101-r3.ebuild b/www-apache/mod_log_sql/mod_log_sql-1.101-r3.ebuild
index 728f2cb49d9e..250033863d3d 100644
--- 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
@@ -10,7 +10,7 @@ SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.bz2"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="dbi ssl"
 
 DEPEND="dev-db/mysql-connector-c:0=