gentoo auto-resync : 24:07:2022 - 20:54:05

5 files changed, 7 insertions, 137 deletions

diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 41aea4bbcf88..271d7d12a7d2 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,10 +1,6 @@
 AUX postinstall-en-3.1.txt 1160 BLAKE2B 0aa21601490830f93a784c1a3c09b90986d606d0086b128b37d6598c946e9ebe43f575f12ca5ee571db8520841a2c08624b567b721567d26ee02e1e3c4c9124e SHA512 7b50ab9f9e3a828bd9bff600550ea97712c28804467ab5900a52710d4adb0581fe33155a965dd3956fcd36cc153b1a18a1f001d88ac52d70c8288faf695f01ec
-DIST phpMyAdmin-4.9.6-all-languages.tar.xz 4978288 BLAKE2B 73f7cf5da8ec55fb39d5ea1c007d640f521c9b4490c820ef3f2660000f37af751d7e9a9d08d04405497b9e69642c53f6b28f5f84b5401e437bcf3419c2d2323b SHA512 4aa35ae627edfcf99af83a30e328b8b9ccdfa129ae9d16c2672ace234aa8a416ad8840af5bc9998e44b9e26b07abd195cfba1b4c784b0bc6509f5e8e548e62f1
-DIST phpMyAdmin-5.0.3-all-languages.tar.xz 6786864 BLAKE2B 737df7cc7c2bdeda89f81d2d5d61857f5f9c0f1e69c4679df6f728c0df8d50fde589971e5e4cd371f2f33d766cdd17cca5580ccb7b75cecb0122ce49dcf52a05 SHA512 e03b0fcd1998570c243a41bcb9e1bf46c1da8fdb99b8e54ba4de3e7e22ff0d847468f16137b011f22eb2ee58d92debd66f2f0ec1b403775aef879a3f8978ebf1
-DIST phpMyAdmin-5.1.0-all-languages.tar.xz 7902416 BLAKE2B 0b3e8f359e4b528474da8fe15b64f0dc5f82e3366402495c3ba65115852db8041bacdf274ae9e93d9ed9e4edba6c396031cc6f5684ca5a0f270ac1ca7e4d424d SHA512 b49f0c722ef3ea763d9a0eb1fa269717a81affbaf207b108f1cb085a44eae97d690da83fd18ea54477cfb08a646557285d24cd0568aa148b0207f78d17754192
 DIST phpMyAdmin-5.1.1-all-languages.tar.xz 7751820 BLAKE2B 95d54893b7a7d8743769c0a91ef79c4fd22eb69acf2573f781295f20a39e7e667ff0623c900b68705f6fc9852f3b665adc3689c4c7d596c6cbcb78468d36e7e1 SHA512 22586bf9e37224f4a307564e8da73384cdc55d705063a487c17b3a02ab0a0454371d1349aad96b136395a72dff38409f8eac21ab9a7f3e5835ad85fc7854d59b
-EBUILD phpmyadmin-4.9.6.ebuild 1527 BLAKE2B 44c50fbedba73ccb5db54780f7e6a698848ccdf4de82a94f491e7faa51679773bef3de0ef65fde6da0cb4a2baecfd24d6f72705406d4cd2f2b2d7de083ad2cc2 SHA512 756923a68be8ca1f9442d4ba227ae65184e046ce35fbd81c12da7a699ee24348c8ec6c4e7a40ec6cbc271fe75a2be21e3530471e3918db128c36127a089e6153
-EBUILD phpmyadmin-5.0.3.ebuild 1533 BLAKE2B 115d5d37ba97d7bc4675b2bed623a0c7ec3bcb6c39afbac2edb5203f7fd0b72e55c357aeb408c0b219eb73b2e070c2e0d556f6618ef3f8737f245c7d67afbd28 SHA512 e6af4c836a59934d31fab3915f7ef50d5b8e71a61123db9e20607d7ebd638f054ea975fdf85465c32d6630f17f1cf2284dfeb1ec5c588dfa9e2f48289a2b42bb
-EBUILD phpmyadmin-5.1.0.ebuild 1533 BLAKE2B 115d5d37ba97d7bc4675b2bed623a0c7ec3bcb6c39afbac2edb5203f7fd0b72e55c357aeb408c0b219eb73b2e070c2e0d556f6618ef3f8737f245c7d67afbd28 SHA512 e6af4c836a59934d31fab3915f7ef50d5b8e71a61123db9e20607d7ebd638f054ea975fdf85465c32d6630f17f1cf2284dfeb1ec5c588dfa9e2f48289a2b42bb
+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
-MISC metadata.xml 726 BLAKE2B faa9bcff0c2a08b76d7a49819fb7ee9341b5bb0a41c8cce9eb71f6e215867ed673ee0f7c2b94470b88b2603fb96663e4e03c35b19d681ca84c15a4466fd9f16a SHA512 38976b4e9a11e5877a571cde398637a23d9c953b35d191cdf0e079ed1dedb36be5666b991ea876cbafb71fb4cf59a9a90401f11f24c9efdd0a25ae0abfc025fa
+EBUILD phpmyadmin-5.2.0.ebuild 1543 BLAKE2B 76e0d6c2cf107eba7c5f42539a1fc61b115e644a7d2d823e5f3612e1671bde0c894c3c69ef6cb12cb6c186d4cf9415e4cef94c68194e9bf1dc9088f8f64d7c45 SHA512 695fe8687dc6a095a41bfb862ecd5ed3098263e86412be2d5440e1997f0e20b1969a07bcf0a832d148a3b6e66a204b868c8fb09501bba4d99a223918911e2323
+MISC metadata.xml 601 BLAKE2B e801b91970bce82840f935f553483de1a5b6367366b57b0387c63e3ff29582678781bd5a50032499426b0573ae5cbbd70dce7db75368376c703fc605dd739c64 SHA512 9a0985a8bbeeadbc3813a98654bcd996eb9843e623c4a00a77cb92b693357e8fbde384ac19eb56c41e57d411841a93ea458373e564a4cbaf090ce97ca987c459
diff --git a/dev-db/phpmyadmin/metadata.xml b/dev-db/phpmyadmin/metadata.xml
index 8e983045834c..83eef45855b0 100644
--- a/dev-db/phpmyadmin/metadata.xml
+++ b/dev-db/phpmyadmin/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jmbsvicetto@gentoo.org</email>
-		<name>Jorge Manuel B. S. Vicetto</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>web-apps@gentoo.org</email>
 		<name>Gentoo Webapps</name>
diff --git a/dev-db/phpmyadmin/phpmyadmin-5.0.3.ebuild b/dev-db/phpmyadmin/phpmyadmin-5.0.3.ebuild
deleted file mode 100644
index 8cb21b3ed999..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-5.0.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 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 ~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.1.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-5.1.0.ebuild
deleted file mode 100644
index 8cb21b3ed999..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-5.1.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 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 ~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-4.9.6.ebuild b/dev-db/phpmyadmin/phpmyadmin-5.2.0.ebuild
index 163c9511f454..4f76bc1e82db 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.9.6.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-5.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit webapp
 
@@ -14,11 +14,11 @@ 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 ~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="
-	dev-lang/php[ctype,filter,json(+),session,unicode]
+	dev-lang/php[ctype,filter,json(+),session,ssl,unicode]
 	|| (
 		dev-lang/php[mysqli]
 		dev-lang/php[mysql]