gentoo auto-resync : 17:08:2022 - 08:32:11

4 files changed, 2 insertions, 65 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index accd369c015c..4fc6a161649f 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 271d7d12a7d2..ed3783736652 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.1.1-all-languages.tar.xz 7751820 BLAKE2B 95d54893b7a7d8743769c0a91ef79c4fd22eb69acf2573f781295f20a39e7e667ff0623c900b68705f6fc9852f3b665adc3689c4c7d596c6cbcb78468d36e7e1 SHA512 22586bf9e37224f4a307564e8da73384cdc55d705063a487c17b3a02ab0a0454371d1349aad96b136395a72dff38409f8eac21ab9a7f3e5835ad85fc7854d59b
 DIST phpMyAdmin-5.2.0-all-languages.tar.xz 7078212 BLAKE2B 184c5f1ca0d9fee4812d7f7847f7142887f39103cc629acd08183986f71a3069bfb89750c0e03f4a3a20d2ee767d37a281b14ec8d0ad50f44321620b0735023a SHA512 69658f94908e279e80f7cb76ac108090d704f27bc3f3206ff7d69c0aac4119ee42696ce66f98be6bc11e3532ca0d47916c1a2a8c915c3af6d1e5be6aa1d925a5
-EBUILD phpmyadmin-5.1.1.ebuild 1540 BLAKE2B 2ed555549366d4f85b79455404a76ea02d9d143b8bd3926fdcbcd0124a639ee487235cfb15468fd3e5767dc9a18079c7d6c9d0f562af0df0e6afed8da0f03030 SHA512 2c45880831590ec16dbec38b74bb64b1eec063483d938649ccd7f9be6c33dd05b733385782d1057b84d4b540d18c3e9d1e19be324012adfd009faf273547a153
-EBUILD phpmyadmin-5.2.0.ebuild 1543 BLAKE2B 76e0d6c2cf107eba7c5f42539a1fc61b115e644a7d2d823e5f3612e1671bde0c894c3c69ef6cb12cb6c186d4cf9415e4cef94c68194e9bf1dc9088f8f64d7c45 SHA512 695fe8687dc6a095a41bfb862ecd5ed3098263e86412be2d5440e1997f0e20b1969a07bcf0a832d148a3b6e66a204b868c8fb09501bba4d99a223918911e2323
+EBUILD phpmyadmin-5.2.0.ebuild 1538 BLAKE2B 617bb473722dddfdfcbc6bff3c93788b53254d7c9a599fd253f6cd18fecf35d87862dd1c7e2fdf0aaf97da7d928fef8f960a3350222080bf6ac6de325854f399 SHA512 f9e5dbaa727aef4618a2fc9418ace2b5f5934b76f178edccac368c3ddfc9d6eb9db93bc5abd7225192ac0fcba201f845d02fc529b0b4ca22597b4c805122f027
 MISC metadata.xml 601 BLAKE2B e801b91970bce82840f935f553483de1a5b6367366b57b0387c63e3ff29582678781bd5a50032499426b0573ae5cbbd70dce7db75368376c703fc605dd739c64 SHA512 9a0985a8bbeeadbc3813a98654bcd996eb9843e623c4a00a77cb92b693357e8fbde384ac19eb56c41e57d411841a93ea458373e564a4cbaf090ce97ca987c459
diff --git a/dev-db/phpmyadmin/phpmyadmin-5.1.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-5.1.1.ebuild
deleted file mode 100644
index 507a5f517c4c..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-5.1.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-7.1[ctype,filter,json(+),session,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.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-5.2.0.ebuild
index 4f76bc1e82db..e253316efce1 100644
--- a/dev-db/phpmyadmin/phpmyadmin-5.2.0.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-5.2.0.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="setup"
 
 RDEPEND="