From 0cc2bed6e704a22b146f6d2fa43f147ae95c30e9 Mon Sep 17 00:00:00 2001
From: "Vance M. Allen" <vma_gentoo@vmacs.us>
Date: Sat, 9 Jul 2022 03:21:37 -0600
Subject: Remove support for phpmyAdmin-5.2.0, ebuild not working

Signed-off-by: Vance M. Allen <vma_gentoo@vmacs.us>
---
 dev-db/phpmyadmin/Manifest                |  4 +-
 dev-db/phpmyadmin/phpmyadmin-5.1.1.ebuild | 61 +++++++++++++++++++++++++++++++
 dev-db/phpmyadmin/phpmyadmin-5.2.0.ebuild | 61 -------------------------------
 3 files changed, 63 insertions(+), 63 deletions(-)
 create mode 100644 dev-db/phpmyadmin/phpmyadmin-5.1.1.ebuild
 delete mode 100644 dev-db/phpmyadmin/phpmyadmin-5.2.0.ebuild

diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 325ed37..c5a8cbf 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,3 +1,3 @@
 AUX postinstall-en-3.1.txt 1160 BLAKE2B 0aa21601490830f93a784c1a3c09b90986d606d0086b128b37d6598c946e9ebe43f575f12ca5ee571db8520841a2c08624b567b721567d26ee02e1e3c4c9124e SHA512 7b50ab9f9e3a828bd9bff600550ea97712c28804467ab5900a52710d4adb0581fe33155a965dd3956fcd36cc153b1a18a1f001d88ac52d70c8288faf695f01ec
-DIST phpMyAdmin-5.2.0-all-languages.tar.xz 648685 BLAKE2B a3e8686565c82b6ec6fa2e3b98cd7600813e6f2570b435e1f90d140faf9de6def2de2d53c234ed8e077d5368f274f16b9ccc03cb3d9f50d911316ce80ce21913 SHA512 b96cd92a6094b811755dc5dd10893e94a3d927bd874dfd833865dddca9d583847f606464ee0a65513b8a19cc046ba57b67b3887c0cf9a8194931c43c1b163954
-EBUILD phpmyadmin-5.2.0.ebuild 1556 BLAKE2B 989a8394159e188d8c1732c4daf269479cb0853e5e28ac8b74f2b537958209d000839a55b99ea7b881730b38ef1562d214498e98e7d37ca504fce44564d68865 SHA512 b4acf910c9693c42cff68eb04cd8a7c054b34553886b6584399ce042fa0282941f918d81e788d112263c71d50d159975fd5f34d24c88fff0be1821aded606f4a
+DIST phpMyAdmin-5.1.1-all-languages.tar.xz 7751820 BLAKE2B 95d54893b7a7d8743769c0a91ef79c4fd22eb69acf2573f781295f20a39e7e667ff0623c900b68705f6fc9852f3b665adc3689c4c7d596c6cbcb78468d36e7e1 SHA512 22586bf9e37224f4a307564e8da73384cdc55d705063a487c17b3a02ab0a0454371d1349aad96b136395a72dff38409f8eac21ab9a7f3e5835ad85fc7854d59b
+EBUILD phpmyadmin-5.1.1.ebuild 1540 BLAKE2B 2ed555549366d4f85b79455404a76ea02d9d143b8bd3926fdcbcd0124a639ee487235cfb15468fd3e5767dc9a18079c7d6c9d0f562af0df0e6afed8da0f03030 SHA512 2c45880831590ec16dbec38b74bb64b1eec063483d938649ccd7f9be6c33dd05b733385782d1057b84d4b540d18c3e9d1e19be324012adfd009faf273547a153
diff --git a/dev-db/phpmyadmin/phpmyadmin-5.1.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-5.1.1.ebuild
new file mode 100644
index 0000000..507a5f5
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-5.1.1.ebuild
@@ -0,0 +1,61 @@
+# 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
deleted file mode 100644
index 89a5402..0000000
--- a/dev-db/phpmyadmin/phpmyadmin-5.2.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils 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 ~x86-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
-}
-- 
cgit v1.2.3-65-gdbad