Drop old versions, add new 4.4.14 release and first 4.5 beta.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>

7 files changed, 68 insertions, 10 deletions

diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 8a6ff11488a9..5f0e403c2c57 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,6 +1,6 @@
 DIST phpMyAdmin-4.0.10.10-all-languages.tar.xz 4775140 SHA256 5f4522227ad9ffce9193b1c25c2fc17f5b014b9da32137cc122f011dcd190b15 SHA512 3f4f06c574f941586d7e48fba45023a5d3126fe8ed29527ddf4de3401f0076c678342b9e493ed99290d5b748df90360c0e2f0612766a993f5f7147685ed144d5 WHIRLPOOL bd0ba9cd5f3de88a33b8e8a87568b3f54d923a0d99bc1b75b772baf42b47e76e4059921300a9b03847f3c8f93c5bc4a1c651ca79d550af21f2fd74b1aa96fa9b
 DIST phpMyAdmin-4.2.13.3-all-languages.tar.xz 5205440 SHA256 2d78bd91dc90d95d9f21c7e41294f2995a36dbbe1e4d1209e972b1d855c4877e SHA512 77ad296931666896613b7363c35c5546da66bddcda37fb31609ca5fb78f4b12241f6c976d1916a6491fbbc33d5f837163bcd0c0e0f227458d055076a971b640f WHIRLPOOL c4bb8f0689b0aa2ae7a67793f9c26b761e1a1e28e4e684f495815caf89ef527f4fced30aa53986c10d41ec000f3e295677739d5e73cbfc336466591c9fcf6a3e
 DIST phpMyAdmin-4.3.13.1-all-languages.tar.xz 5446988 SHA256 d7484e2449453eae52613aae59e5f3a9342014aba7db88598ad6a90504ebfbd3 SHA512 b08a41721876a4c7c8fcc162f0f1f43bbd67b4f87fc1c0668672addb8eb6f56695755401a2de2c75fc944b074f5187c6df942bec0ff03c16ad34c27b505b87a0 WHIRLPOOL a72b7e4247bb7de68820d5583967b04b8dfd0917383f88d707b48235d119e0ad4fd45a04352dda0f43b11b2ba4def5a4648eca01e2f7ceabd3f788e429dc83ca
-DIST phpMyAdmin-4.4.12-all-languages.zip 9982178 SHA256 168c5ec097ae819f3491615e824cb7bfe1886b40f85db2f0f5722dc24a89a81f SHA512 b737ac5e804af38e5331e54a1edb040a98057e3abd06c1d93f3b6fbc4895041145ace5e8e7872f25448b2142aa06ae0f8eefc0cb8b098a6bbb3fd9c3ce1b048a WHIRLPOOL 5bf0abb0f470c0763a0c7e4a97f8c68c768d7e8d3361de9c6c569204fb385c49775a08827aa92037b7f3efa26f89eedb665e79a657d38dc1b6c589b27c6140ff
-DIST phpMyAdmin-4.4.13.1-all-languages.zip 10039255 SHA256 4504ad9a9b2c93649a673cf83c4d8a3d6936cf4e63e14021ac2dac9ff42a8d49 SHA512 ecc774c35599f4d8cb4553140014d757e8b66be8b699f0b813fcfec5b54b4d588a0773ef5e07789ded201255ea7373834831dbb050419f8331fe97e9070c5bc7 WHIRLPOOL 4956bbbd56639f3fee4f19e3dde2b15d0ceca1721ec1cb1a43155f251f19d081592ea5ac88a7e8da0f0e028006f1fa0f57e0df38a49a6f7db722dc9d1bacf376
+DIST phpMyAdmin-4.4.14-all-languages.zip 10049779 SHA256 4e57593e22a90cd31dbc1f0b03c4c5740dde50a113acb55ed817f7dbd558f348 SHA512 ec56210f106c0076b68ca4ec91288e5b020e02b22369667a65cd27a152696c78b6575bc110aec43f189079601b3c2b1dfae8b3ec2f66411ec46e0db997f4f892 WHIRLPOOL 6cb18df2c393fb9ed00c798277472bc7a080d1177749370b236fe34271b14bbe73a51d3f241cd74425f8d2081749244a91b07f0ac5512688ca899e34ffad88f7
 DIST phpMyAdmin-4.4.6.1-all-languages.tar.xz 5635832 SHA256 d423a81868f01b4ce77f90113d83df96590446acdbe8f00a46aeb670c4a9ac5c SHA512 d25c63f9d354ae3f488d1837c710cfc5bacde3d6421d71eb96ff5868971132ea570aad9875f35d862d22d0318b5e16b208a2d6a7d542424ee2a04e329a619978 WHIRLPOOL 8c5f5e9349e801e328ddafe89322e457b89bfa4c5dbe593be9990ac3168a5d0cfada260ef275388b95f2c806952a682445baff23d6092dd5a66766681759172b
+DIST phpMyAdmin-4.5.0-beta1-all-languages.zip 10325210 SHA256 9f30442eada57d6bb183b437440e5b6e38b5c7304ae00ba1f0cf94d75e0cba4a SHA512 e851ad09d4cd89875b74f7fdc6d1c30ca9480f6e6de4b2529bd4126ad96bc47dfe1f0423b081cbf998d18d08c3995aa79fd930cccb366557bcf3b48cd52ad4c2 WHIRLPOOL 8f4e46440ea6bf75b831f6f2cad9df3c4fdb6d618149f1c31808db2607e385797cb5373c43bfa5504926bd4b89d60cc0d7d951620333c264f401bcc14e40b226
diff --git a/dev-db/phpmyadmin/metadata.xml b/dev-db/phpmyadmin/metadata.xml
index 7bb697a7b342..7a5f2944a7f3 100644
--- a/dev-db/phpmyadmin/metadata.xml
+++ b/dev-db/phpmyadmin/metadata.xml
@@ -14,7 +14,4 @@
 			exploits in the past.
 		</flag>
 	</use>
-	<upstream>
-		<remote-id type="sourceforge">phpmyadmin</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.10.10.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.10.10-r1.ebuild
index 41f2d33b9989..fdba1e2cd758 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.10.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.10-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils webapp depend.php
+inherit eutils webapp
 
 MY_PV=${PV/_/-}
 MY_P="phpMyAdmin-${MY_PV}-all-languages"
@@ -23,10 +23,10 @@ RDEPEND="
 		dev-lang/php[mysqli]
 		dev-lang/php[mysql]
 	)
+	virtual/httpd-php:*
 "
 
 need_httpd_cgi
-need_php_httpd
 
 S="${WORKDIR}"/${MY_P}
 
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.2.13.3.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.2.13.3-r1.ebuild
index 41f2d33b9989..fdba1e2cd758 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.2.13.3.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.2.13.3-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils webapp depend.php
+inherit eutils webapp
 
 MY_PV=${PV/_/-}
 MY_P="phpMyAdmin-${MY_PV}-all-languages"
@@ -23,10 +23,10 @@ RDEPEND="
 		dev-lang/php[mysqli]
 		dev-lang/php[mysql]
 	)
+	virtual/httpd-php:*
 "
 
 need_httpd_cgi
-need_php_httpd
 
 S="${WORKDIR}"/${MY_P}
 
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.3.13.1-r1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.3.13.1-r1.ebuild
new file mode 100644
index 000000000000..fdba1e2cd758
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-4.3.13.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils webapp
+
+MY_PV=${PV/_/-}
+MY_P="phpMyAdmin-${MY_PV}-all-languages"
+
+DESCRIPTION="Web-based administration for MySQL database in PHP"
+HOMEPAGE="http://www.phpmyadmin.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="setup"
+
+RDEPEND="
+	dev-lang/php[crypt,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 || die
+	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.4.12.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.4.14.ebuild
index d923c97c8086..d923c97c8086 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.12.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.4.14.ebuild
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.4.13.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.5.0_beta1.ebuild
index d923c97c8086..b3c46d649ef2 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.13.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.5.0_beta1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.zip"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS=""
 IUSE="setup"
 
 RDEPEND="