gentoo resync : 25.08.2020

3 files changed, 2 insertions, 44 deletions

diff --git a/dev-php/adodb/Manifest b/dev-php/adodb/Manifest
index 0303d49b7645..46ba9a542f38 100644
--- a/dev-php/adodb/Manifest
+++ b/dev-php/adodb/Manifest
@@ -1,7 +1,5 @@
 DIST adodb-5.20.14.tar.gz 465896 BLAKE2B acd8494141584b0c02c2e30aa59b3916ae811b8095ca724d22f44ed2cb1456b8e8afc7ff9af41e7476f4a93809e762c44a175fd3775b69654107813342b3a47a SHA512 fa9b764742f3edf15e79da7a34ca52b19f51454fa20bc963cce963cdd40f7e78671e993cd672a21e9917aa2440c63601fbf768b5259dccb64b458a5be6f4b0eb
-DIST adodb-5.20.15.tar.gz 466749 BLAKE2B ca232e15094eaf728dd82b449cfded4f84fc773e5dbe1a06b7bb15fc18487080131c52d7ae9d77e6a401bfd53baa7875810c94b6bda615d0a836a715914de9d7 SHA512 87c6f508f49a54e436b56d47d3c0b2801f4f022876013a2ffa23e751cc4c7aa83aa359e51acc4f8351fd596ad4f5d71326204ae3d57514c4354f68669e412c73
-DIST adodb-5.20.17.tar.gz 466901 BLAKE2B 86e6cc7ae383c698e889925679d1a1f8ace181fe82a178e527ea169f1d21e83844563707e707968522de8bdc180eeb103793fa0468a38f924f29ac4b96310c50 SHA512 c8850f4e330dc058564b59c8a73e0687e1c9d1c56f617b4bbd99aee83e7047626d436c903caf913b11784be1528bb55e442e6365732f8d4bec82edb029831bd6
+DIST adodb-5.20.18.tar.gz 467003 BLAKE2B ea0b007359a4fdada0fface3d5af82c335f2e7efeacdbb66be37914d76bff2783b58b2318531c527d13c3c358800803385c660c8f9372cf4a49269ed7e0c7d51 SHA512 09b04987e20a674a202be3889523b3bada578ea01f07830fed15afafb046687004b4e305a6abf2af795a7b0e3563f6e8afec5b0189f21e5c74b5e84bfbee1cd9
 EBUILD adodb-5.20.14.ebuild 1445 BLAKE2B 7beb52ccfc3211800b38230d5699e446cf95c263a49971065cd62944aae9c6aa9b612508af0b1c186edb9fb0be45115a10910214d019ca97fe90db50183f7bf7 SHA512 41f97b3992ba0898746d321a3b099f1309794bd38ddaf4ff15c7567bf97ee74e71da73179e1b21afcd9ad73f0f62d960fe4429d393cb1eb65ae52eaa39c07650
-EBUILD adodb-5.20.15.ebuild 1452 BLAKE2B e5286f48e8bdf5fdae03893ea87292ed6da2dffae801140e2dfcd31c1a5994f205d2a17b1f58bcf757f14f1bc6230d367a4deb007facfd097f298982529fac98 SHA512 20efbbea0b7a1db0aae61b433faab6d4ec222c8082c37a5a34875cf214794e1a104a4b5e47e84f822b43576f64233ecea9a1a19e5759c98cef28c80aac4b1444
-EBUILD adodb-5.20.17.ebuild 1452 BLAKE2B aa01cdfbab7c732279973480c2524c8c13668b54c85f8396e205d54f849f8e43a553b6a8325743dc8a17f088317397457a4a3f8e3a3bebaade4515965123fbf1 SHA512 9af2be6f93b6c9d1610393c3fda939b30993ac7121c286541d2e52035b4c084c2034f2bb9c45db1affcbd0f194974276464679c808b3c6d7895b6d16cbea1ccf
+EBUILD adodb-5.20.18.ebuild 1452 BLAKE2B aa01cdfbab7c732279973480c2524c8c13668b54c85f8396e205d54f849f8e43a553b6a8325743dc8a17f088317397457a4a3f8e3a3bebaade4515965123fbf1 SHA512 9af2be6f93b6c9d1610393c3fda939b30993ac7121c286541d2e52035b4c084c2034f2bb9c45db1affcbd0f194974276464679c808b3c6d7895b6d16cbea1ccf
 MISC metadata.xml 490 BLAKE2B fe6674acd3eb6a1c95ae4deb6f4215b0c31251918cc96eef1d6c784914d8e3c7eb273b868b90d7b8585421acb58172b7ce6a54d99b6b41abfed923b6e34abfd3 SHA512 c81b170a7a9532e27707f6bccea90be62a8504228571eae8b5564eea37c6789bafcb2681e4de8cc99916e1304056121575c3d8487cc1102f13909d14a7565fcb
diff --git a/dev-php/adodb/adodb-5.20.15.ebuild b/dev-php/adodb/adodb-5.20.15.ebuild
deleted file mode 100644
index f16a3af534d9..000000000000
--- a/dev-php/adodb/adodb-5.20.15.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="ADOdb"
-DESCRIPTION="Database abstraction layer for PHP"
-HOMEPAGE="https://github.com/ADOdb"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-# If you want to be picky, we should require that PHP be built with at
-# least one database driver enabled; otherwise adodb isn't going to be
-# able to do anything. But, the database USE flags for dev-lang/php are
-# a mess. What we would *like* to do is have a set of USE flags for
-# adodb that then propagate to PHP itself... for example, adodb[mysql]
-# could require php[mysql]. To do that would require that we duplicate
-# the database USE flag mess for adodb -- not desirable. Instead we punt
-# and let the user install adodb unconditionally. If he doesn't have
-# database support in PHP, it just won't work.
-RDEPEND="dev-lang/php:*"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	DOCS="README.md docs/changelog*.md xmlschema*.dtd session/*.sql"
-	DOCS+=" session/*.txt session/*.xml pear/auth_adodb_example.php"
-	DOCS+=" pear/readme.Auth.txt"
-
-	dodoc $DOCS
-	rm -f $DOCS || die "failed to remove docs before installation"
-
-	insinto "/usr/share/php/${PN}"
-	doins *.php
-	doins -r contrib datadict drivers lang pear perf replicate session xsl
-}
diff --git a/dev-php/adodb/adodb-5.20.17.ebuild b/dev-php/adodb/adodb-5.20.18.ebuild
index a1cd6765bdcf..a1cd6765bdcf 100644
--- a/dev-php/adodb/adodb-5.20.17.ebuild
+++ b/dev-php/adodb/adodb-5.20.18.ebuild