Add support for phpMyAdmin-4.5.5 and the 4.6 alpha

4 files changed, 72 insertions, 3 deletions

diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 22104dd..6234e46 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,7 +1,9 @@
 AUX postinstall-en-3.1.txt 1160 SHA256 0fa47a49b9c5604339335d36ce9d1506a1cd07644d219fb7f35e2e4432fa8dbf SHA512 7b50ab9f9e3a828bd9bff600550ea97712c28804467ab5900a52710d4adb0581fe33155a965dd3956fcd36cc153b1a18a1f001d88ac52d70c8288faf695f01ec WHIRLPOOL 5b548fd9d41ca794f74936ce8ceda15c2c410cbc8d383c3376009a8936e47bc4d350c520ece1ff1eb20b0ac899f84fa513a185db5c255db362b7f3ee0b8f69ef
 DIST phpMyAdmin-4.3.13.3-all-languages.tar.xz 5378200 SHA256 e0253620c19be00b630376955a05519a15e3bb2afccb057ae38c427a79b464b4 SHA512 e0b7db5dccf43fc55cc34afdb685aa43e8eb01129c00de3e7e5effefc1309bdbd6a8816a86c977bfbf4a76256893c4e2e1337dd0be19cda5de9f59b92e480c30 WHIRLPOOL 9b69628fca35865a02e018edf50169000aac9849f2909f7550ba42824993b06bef2ce8118d11d95775eb8128cb56f2aa9e5ab875411b9db80e48f686c449f866
 DIST phpMyAdmin-4.4.15.4-all-languages.tar.xz 5597144 SHA256 692b70dfbf46884ae52d57d43e07809ee2319bfa7321be7ae4b00fe3510a3e37 SHA512 eaeaa7d05d6cc4e4f854592993562cdea1a0349064cc3aa5eff4ac9a1aa5a6cb1cca1392d27fb62b33d85fdf12376abbb4bb9233ff5ec9f0074bfb0430625262 WHIRLPOOL aa5bf8cad6da266e649b355e9d1c65fbf736c60130914328b95cd4d34af55d9d37b1c108bb08753d9d6c621a918d2cef2c3c1eb0eeffc1bd6df061113db30527
-DIST phpMyAdmin-4.5.4.1-all-languages.tar.xz 5810548 SHA256 4f79a1e3687ed6976903b0fab6a29f960e657e4eb4c9e8a9b92bcf4f1d57194d SHA512 e3e9669c90610a441901854a4c1e91f1312eba55821bd8b73bbfa5589ca321cb4f6c1893a0f62d0a6cc644ff28b6066cd77f2a7f30641afd4f1547bd427403cb WHIRLPOOL d0f60c55b250b7cfd1f3a4f8c0d1e6afc484394687052fe298bf2db897dfedb663566c345ff2ec2f43fd1cddbf1dba85f3521a78b19fab7cb88d7bbf9678a7e4
+DIST phpMyAdmin-4.5.5-all-languages.tar.xz 5806768 SHA256 fcd8ac70e62da3d16cb12c38b234a94104cd34583bd675cc580307973ca3b8a6 SHA512 7576ae01bb51cc784f532b9c26658761b7343fafaac562a72c9d60ba723700d3cf2a7cbe01f4e0cfee5c5a54dc7cc6aa293af2905e082f6254944def1b31134d WHIRLPOOL 2ceb8f6ad62977e5119a84c42bf33c48f94210d40e2e7f0b5cbb6c3e17b0a0b6802e1c8991ae9f14a6f5187dcdb63af76a9ddd6e9f96b317a2aeb77319b86f77
+DIST phpMyAdmin-4.6.0-alpha1-all-languages.tar.xz 5890492 SHA256 d11f2beecba38d15ca635d15fee4362bc554011eb675cf6f76d36e8ab847a627 SHA512 788790b28af413a98c178aec095d58d55eef78bbcb4f3a69ced250c5a75f31bfce30bed6d11a3ad3070161b408d32cbcb3866d66ae32fc5c91b5bb073f250f90 WHIRLPOOL 8e5e33c7205f696576b1e826cfabccc4d63d50b6094e642cbddf70e51a9936fbb387cfc0b0d09639a15b0241d45e6ebcf602dfb474ff29e092090673285a69a9
 EBUILD phpmyadmin-4.3.13.3.ebuild 1771 SHA256 a4ee35c8bb457471eff8b8b1e85b28a29f76abb11ff3fe191f6d8d78cae5b993 SHA512 ceb50f9c67fc10aadf20748c9d2c465022434679e21d4f8fdd2fb07343bfd6ed1ce8f94b1c23fc87e04c969eb3446f4209ff7e4c833acd3e95c5ac66ff55e7ed WHIRLPOOL 39c6b863d7fc6584e03bc7c777fc65d71017019486cf3614242c31106d16a1be45a51986db9217e1555c1cc29f06f07d36a5e18d8884de6b2f03f9b5c8092a14
 EBUILD phpmyadmin-4.4.15.4.ebuild 1885 SHA256 ba9eeb8b509d7896575cf97dcc03376bbfeaba208315a4ab4f3186e6d15de5b6 SHA512 eabca4c5561841784a4672591099f2953f8ffc6e6de20be641ba2831f7a740aca549409106d78f01d2706fe35c1aea84e2b8c65d3c2b9823796a3e00b5ae9f20 WHIRLPOOL 9609595bda3f69601e608ae49d4437ec2da31ac9a60e01daa5fc17fc0d62c83a26f2becdf3f2d35c85730bc813d18c5e0700a84abf26ab374264d36e66bcb419
-EBUILD phpmyadmin-4.5.4.1.ebuild 1884 SHA256 59c04128f95f2da6607b747e5816757dd6a8a60cdb04a0f493d6022650eeaab0 SHA512 42b9293a10f309782660ddd413f7203d61ecec0555ab0f1f8a0b74f1f9db05694c7848f31ae70a35b604b843d0725649c51962b72eebe9417289435acc0b576d WHIRLPOOL d7a3529d4f9cb17ad2a5597cf7f1394c5455cd411fe510b869d30ebbf65560cdc8eb8ab50cf489fbea2b0095380228f345fc595d1c1a6a1e0004b8afd82ca40b
+EBUILD phpmyadmin-4.5.5.ebuild 1882 SHA256 2c29a22fb766d9f88fdd34c91d634c307afa931b8249636139c23dbdb32b87ce SHA512 9f51856c9f0a517206c6497cad0dc8ec459c579c36bc548b261031b6ac073ac21b8896127fba052f82f20821a64fbfbb192f3909d120956559c28b76ff6223fd WHIRLPOOL 8111cb4c7c03a6bba58f0267ffeeaddabfdcfadda1d0b2919180488648aed42b59b6e457f1d7f14308488e0f685127a7f6231b87136a74c671f6a1a645d21d1d
+EBUILD phpmyadmin-4.6.0_alpha1.ebuild 1889 SHA256 6e0c403308dff414799e5d8bf7d6c66acb6d62b9b116978f04532f4cf7c022f6 SHA512 4af3709fd069d9a3ae0afb89129c194e01f8fa0d18d091ac898690803e96cf14c29cfe8c3f4de390dd230eccf50725c0ecf70f4fc43746d9a6924b872eff4544 WHIRLPOOL d37291e0a01063bd67ce9e50dbb8f80cdb14d52b3f484a19b7e0aa88306bc8ea90787a977f2ee6008f217210cb8a84ae7c656fb11994014d3d3980532ccc2a2f
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.5.4.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.5.5.ebuild
index c561216..f33199b 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.5.4.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.5.4.1.ebuild,v 1.1 2016/01/29 09:17:15 vmacs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.5.5.ebuild,v 1.1 2016/02/26 13:41:15 vmacs Exp $
 
 EAPI="5"
 
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.6.0_alpha1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.6.0_alpha1.ebuild
new file mode 100644
index 0000000..f2d444b
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-4.6.0_alpha1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.6.0_alpha1.ebuild,v 1.1 2016/02/26 13:42:15 vmacs Exp $
+
+EAPI="5"
+
+inherit eutils webapp depend.php
+
+MY_PV=${PV/_/-}
+MY_P="phpMyAdmin-${MY_PV}-all-languages"
+
+DESCRIPTION="Web-based administration for MySQL database in PHP"
+HOMEPAGE="http://www.phpmyadmin.net/"
+
+# phpMyAdmin has migrated away from SourceForge as of July 2015.
+# Source: https://www.phpmyadmin.net/news/2015/7/2/phpmyadmin-website-and-downloads-moved/
+#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+SRC_URI="https://files.phpmyadmin.net/phpMyAdmin/${MY_PV}/${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]
+	)
+"
+
+need_httpd_cgi
+need_php_httpd
+
+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/profiles/package.mask b/profiles/package.mask
new file mode 100644
index 0000000..2ed74d5
--- /dev/null
+++ b/profiles/package.mask
@@ -0,0 +1,2 @@
+# Alpha release, 2/26/2016
+=dev-db/phpmyadmin-4.6.0_alpha1