3 files changed, 4 insertions, 45 deletions
diff --git a/dev-php/adodb/Manifest b/dev-php/adodb/Manifest
index c67fd15c5ae3..869579619bc9 100644
--- a/dev-php/adodb/Manifest
+++ b/dev-php/adodb/Manifest
@@ -1,5 +1,3 @@
-DIST adodb-5.22.2.tar.gz 443988 BLAKE2B 1166c7b53a5ff39afe8d0a77cf56d2682e7f68d8f52f12ed9bf2519f4a15c626e26b590c7df3066f65bf6bbb7458be502d5a9e9b1ed2663286c51761fd58784c SHA512 50c2784f92e9ac372b34ed32d41efe82341dad09f269603359c50a30c9c301b7e65b2dfa75ae02cc7f12437ef57d8a9575e5a36e68d5b6e225fa1073ead3e339
 DIST adodb-5.22.7.tar.gz 447580 BLAKE2B 1d8e6518155585f7e82f697e463832c4d798dce0bc59fb4a068aef7430945fe7cbfb7112b150f36fc91fb9555189276032da420bec68a71c6438c1d513dd3594 SHA512 731e5def40699bc445b9ef44585b7db6f890d977aaafaac58ea1fcfadd9d89d00871a279549f6e8ff683fe56f7061d78cdc2457e99ed0636a8497cae44bddc99
-EBUILD adodb-5.22.2.ebuild 1439 BLAKE2B 903a741356931fdf2fa942aed33d8f2b82c68aca89c762af4d9ec69dfd095abb8434c9bc231c5deb55a1bb010b99f3bfbb768451f1ce45a676682df9873b3110 SHA512 fca6faf7ce302dfa98c133e641ed1e7181c787f7b3829098dbcd926113384906675479ab688edc8e8df9aad6b7dd74b9aa3953cab1efbb42438a4267683fd4dd
-EBUILD adodb-5.22.7.ebuild 1444 BLAKE2B dd1d2b20df59ec02ac484417513fbd7636ccc0f9adfe445b5c1996d9c77d611153565cecc3465ac5b4e2eb5e053ecf0d8ab9ab7ae2d409106c34a9a2f06d0a55 SHA512 5d13c9cb2bf08a381fade8314f4ff0d663059315398ea859a8fdbf3022f1f2e8d02157ab2ed88ddef667abc197794207019cb4a82902722404c2c5bd2e4071b8
+EBUILD adodb-5.22.7.ebuild 1439 BLAKE2B 523fa3b220305641c9651a42829fe9b0d5649314d194862249d000f7e6979bc9c792ce0eff3a0222ea3b43bfbc8d27d7ffb03070efa46e6fa468d1f7a6ae8dc4 SHA512 626bc7baaa2b293b059fcd5c4b515c4c11eadfdb79f784d3d585f92ff43e3b072637d9743b4b47b15184388af052bc371fd46a25d49d3f6600df48d3563a44ad
 MISC metadata.xml 491 BLAKE2B 179eac488892488692b56a5dfc6e8cf081da6bf9bb4c450d872e27bf39bae408e14529b5706005be8e6c3128996278a11c8793eba3ce23562e8783d3e907fb07 SHA512 0bf91e5c93e9dbeef2752d84f3a6860c48e8ff84246c98330623aa4d3e453fd29c560c3a1115e2a1906a255d04a81b79917ace2fa1c426dce1b574a2861a9cd9
diff --git a/dev-php/adodb/adodb-5.22.2.ebuild b/dev-php/adodb/adodb-5.22.2.ebuild
deleted file mode 100644
index 03da43f67f75..000000000000
--- a/dev-php/adodb/adodb-5.22.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="ADOdb"
-DESCRIPTION="Database abstraction layer for PHP"
-HOMEPAGE="https://adodb.org/ https://github.com/ADOdb/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 ppc64 sparc x86"
-
-# 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 datadict drivers lang pear perf session xsl
-}
diff --git a/dev-php/adodb/adodb-5.22.7.ebuild b/dev-php/adodb/adodb-5.22.7.ebuild
index ac9e9d3ab242..c922b86af38d 100644
--- a/dev-php/adodb/adodb-5.22.7.ebuild
+++ b/dev-php/adodb/adodb-5.22.7.ebuild
@@ -8,9 +8,11 @@ DESCRIPTION="Database abstraction layer for PHP"
 HOMEPAGE="https://adodb.org/ https://github.com/ADOdb/ADOdb"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 LICENSE="BSD LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc64 sparc x86"
 
 # 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
@@ -23,8 +25,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
 # 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"