gentoo auto-resync : 13:04:2023 - 11:43:14

3 files changed, 2 insertions, 65 deletions

diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index f643bb2adc28..92fd9cb222be 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,6 +1,4 @@
 AUX postinstall-en-3.1.txt 1160 BLAKE2B 0aa21601490830f93a784c1a3c09b90986d606d0086b128b37d6598c946e9ebe43f575f12ca5ee571db8520841a2c08624b567b721567d26ee02e1e3c4c9124e SHA512 7b50ab9f9e3a828bd9bff600550ea97712c28804467ab5900a52710d4adb0581fe33155a965dd3956fcd36cc153b1a18a1f001d88ac52d70c8288faf695f01ec
-DIST phpMyAdmin-5.2.0-all-languages.tar.xz 7078212 BLAKE2B 184c5f1ca0d9fee4812d7f7847f7142887f39103cc629acd08183986f71a3069bfb89750c0e03f4a3a20d2ee767d37a281b14ec8d0ad50f44321620b0735023a SHA512 69658f94908e279e80f7cb76ac108090d704f27bc3f3206ff7d69c0aac4119ee42696ce66f98be6bc11e3532ca0d47916c1a2a8c915c3af6d1e5be6aa1d925a5
 DIST phpMyAdmin-5.2.1-all-languages.tar.xz 7461668 BLAKE2B bdb95b643c2ba39e406b7c8c01c071a5e8596e15570f68033a439076309c26fd444689bb0acea05ce8c47f913f0c3c30b4f593ad916d081de4b369dd6aef4573 SHA512 8b440d90d887fa0391810732cad2b4bf502f0e045324e1f159cb06e34dae4268febaef0a6a8ac0e58d0cb0f945f3497354313585f80555f199c609de378ca873
-EBUILD phpmyadmin-5.2.0.ebuild 1538 BLAKE2B 617bb473722dddfdfcbc6bff3c93788b53254d7c9a599fd253f6cd18fecf35d87862dd1c7e2fdf0aaf97da7d928fef8f960a3350222080bf6ac6de325854f399 SHA512 f9e5dbaa727aef4618a2fc9418ace2b5f5934b76f178edccac368c3ddfc9d6eb9db93bc5abd7225192ac0fcba201f845d02fc529b0b4ca22597b4c805122f027
-EBUILD phpmyadmin-5.2.1.ebuild 1542 BLAKE2B 70dc76b1e0f20c8a3daa334e6a5fc27b094a0540d6d98098521bb8c805ee273317bd0fe3d923292a24f2c99531467823e788ec91f01bacdf386c823203107ce2 SHA512 2312b0cd73c5ccd953cb5bf2f0b5aa4de04b882803701786ad2fa0d0c2b4e78dd4226bbd965422664b54f02d2d67919bca7cd44b62f38f646f1d4ce534cd40dc
+EBUILD phpmyadmin-5.2.1.ebuild 1537 BLAKE2B b7be5d262fdc74fdea04801c38127ed935145686652eb63dccb44c396cec6410b0fbf346ec9c4751ad66490ffa3afff56c47ca22e690c4cb5d87644a77acd407 SHA512 b41c7c0e29e95e02a28103c8eee023729f1acd960d1c7a838a650ec926e94863caccb4a4137fddf50de544a5766eb2cad6dd91636b470f19faf8e1252caed546
 MISC metadata.xml 601 BLAKE2B e801b91970bce82840f935f553483de1a5b6367366b57b0387c63e3ff29582678781bd5a50032499426b0573ae5cbbd70dce7db75368376c703fc605dd739c64 SHA512 9a0985a8bbeeadbc3813a98654bcd996eb9843e623c4a00a77cb92b693357e8fbde384ac19eb56c41e57d411841a93ea458373e564a4cbaf090ce97ca987c459
diff --git a/dev-db/phpmyadmin/phpmyadmin-5.2.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-5.2.0.ebuild
deleted file mode 100644
index e253316efce1..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-5.2.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit webapp
-
-MY_PV=${PV/_/-}
-MY_PN="phpMyAdmin"
-MY_P="${MY_PN}-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="https://www.phpmyadmin.net/"
-SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[ctype,filter,json(+),session,ssl,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-	virtual/httpd-php:*
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-5.2.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-5.2.1.ebuild
index 582e38711c9d..d4422b2b9a42 100644
--- a/dev-db/phpmyadmin/phpmyadmin-5.2.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-5.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
 S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="setup"
 
 RDEPEND="