Add support for phpMyAdmin-4.7.1

4 files changed, 2 insertions, 128 deletions

diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index ca85d4b..d9a15f3 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -3,13 +3,9 @@ DIST phpMyAdmin-4.0.10.19-all-languages.tar.xz 4762856 SHA256 221bfb2d3d001a44e6
 DIST phpMyAdmin-4.3.13.3-all-languages.tar.xz 5378200 SHA256 e0253620c19be00b630376955a05519a15e3bb2afccb057ae38c427a79b464b4 SHA512 e0b7db5dccf43fc55cc34afdb685aa43e8eb01129c00de3e7e5effefc1309bdbd6a8816a86c977bfbf4a76256893c4e2e1337dd0be19cda5de9f59b92e480c30 WHIRLPOOL 9b69628fca35865a02e018edf50169000aac9849f2909f7550ba42824993b06bef2ce8118d11d95775eb8128cb56f2aa9e5ab875411b9db80e48f686c449f866
 DIST phpMyAdmin-4.4.15.10-all-languages.tar.xz 5746324 SHA256 1dd06801aeae5962f753cb47d4d6482be83c91ad46110c2af629908d34fc5151 SHA512 3699146ed1d4e82453cf223f9c1c3c9c28c689031095e3e24bcac34131678af6fd8ca09c1355b356e75d3d2b7c34ab57a7db671b65a12e102a05f81a30653e62 WHIRLPOOL aea2fbd73f8b2ca4e34d036b7c43ef495e07ea171cfb981943f290ae132f26e0e0e9213c55a1ace547edafa3c0dff79fb8f5cc1549b0f028302f8cfd439899a2
 DIST phpMyAdmin-4.6.6-all-languages.tar.xz 6147904 SHA256 b7b9e0f88ca740fcba249e7e3e7d51d1923b038b7742cde72de193a2b0a2654f SHA512 7bd18b83f205604dc653ef2daffb22d0bf99a4e2a7960958fb1687daf2a800a76e34477748c6239394e99ab060e789971b73cf8e66adb3182f1b17002345c054 WHIRLPOOL a18f525b999c855d5dfb48371c40957460bb3a361445d856d05f7348d23cea1392a53f11e99b0199878616e33a529c602639f9ba212f866df89490b32f552f87
-DIST phpMyAdmin-4.7.0-all-languages.tar.xz 7600296 SHA256 6378d1f45f5356fda2d18a923c56a495e03bc1e7694e7b7c004dd688d2178f90 SHA512 03f3b56d3fed846e8e27e38a1bf32175b267a3cc2784ee499b64a48b6a37f0352302a9c150e1db1c99f633aabd8a373a834ad7ab2b694146b0ac13dd05bd27e3 WHIRLPOOL b7c65a1e47ef0358057052ca9d5b0a4a40f17157ba8b711b6c54b3e3a244da50b23840f67def30c13fabd0b4be7b03785dbbd69a31fa27cece19f256acbf4af2
-DIST phpMyAdmin-4.7.0-beta1-all-languages.tar.xz 5678136 SHA256 afe5e42e2b60f0a9371e26946a84a02800f2107805bfd615f47aa82d015cc55d SHA512 49c4c1006580b56a379defcbd9ba140557511a06af0b86792ee32383db400bcc5e2050b14f40698735a9972a1ca197ab7678524d1c7ac0dc96d2649b5eb7bba4 WHIRLPOOL caa053dd7da1de834744d4d4b86bf817d4922b0c749ffbf557c1f18032065785af974072f3b575fa58c1ae35a02fb5eb9389ac8abc9e274102532a0c94fbf34d
-DIST phpMyAdmin-4.7.0-rc1-all-languages.tar.xz 7619600 SHA256 c918cb9dcfe49711ad5107193ee72617b2562f856938a036a55d3c05fd54660c SHA512 b6c75ec4dc0e3b2724e16f064a645dbb541512aad1a2e313e0151b6b45748213c36bdb4c64e9bb354d6dbc1fe86f524ebf66020d7b689af3a7e9c3fdb6648064 WHIRLPOOL 935d0ae16f1701e1c980db329375017fd0e2044a04a29b380d7d28b626d7f81ffc70a8ae42259ca583b93fdf54e5b478989ade5dde9aba2b74893c2819e48e0c
+DIST phpMyAdmin-4.7.1-all-languages.tar.xz 5665344 SHA256 f94ed0fc5df38e049746e40852135bf55b9af0fd9fcee07f175919c463ad58a5 SHA512 583ad8c8ee871fedd4df79e49845554f2f6182a343439fff8f91f61428964a85f3305590792096ede95a2ea675f065a4a4cdee31d365c03d2cc3aa721b0aeb6e WHIRLPOOL 9fbb781dac0087eb2100e213f2e4c2048a0358f0272fa4f05105ac7fa50333e617376f9580adcc11e8c8d269b6b8cc7dbb4d7c6c0050f9224fa4892261315c49
 EBUILD phpmyadmin-4.0.10.19.ebuild 1576 SHA256 b86f7f55414af5a0bde690b17fc0df1a7ec96917f86dead7700a50ab3037cbbd SHA512 d0a33d2fa02be5fd271baa2398822b9639339c1e883254ae462d1edc0c74de144f501234d5a272c592b4f6bc63ca0193c7b6fce4645963240772ed52061c6d49 WHIRLPOOL 3a9378ec699f1154d0deaed04744075252e8b26ce6d12135f779775fdd42800bd463195c49d692c3a7accf3c6e8014e5f02932783d3b9a4ef1e07cfa92e27656
 EBUILD phpmyadmin-4.3.13.3.ebuild 1771 SHA256 a4ee35c8bb457471eff8b8b1e85b28a29f76abb11ff3fe191f6d8d78cae5b993 SHA512 ceb50f9c67fc10aadf20748c9d2c465022434679e21d4f8fdd2fb07343bfd6ed1ce8f94b1c23fc87e04c969eb3446f4209ff7e4c833acd3e95c5ac66ff55e7ed WHIRLPOOL 39c6b863d7fc6584e03bc7c777fc65d71017019486cf3614242c31106d16a1be45a51986db9217e1555c1cc29f06f07d36a5e18d8884de6b2f03f9b5c8092a14
 EBUILD phpmyadmin-4.4.15.10.ebuild 1577 SHA256 e343e9307c5a9486ec16f21cceae977cf7756e091d1df0ba6a6711b13eb80646 SHA512 dcc7c0713f3eed9256a441414a39851877c866c2f77bdc1bf27f3d2bd1667ab135f670479341c32b6053749cc40dc320affbe163777169a8e8f76cc5bc104273 WHIRLPOOL fd684c63804e788e476a05fafe21bc5dda84eb9e427a661ec63afaca60979947c57c85d5c26aa716f73454190721a16c8fac25790b19f7ea053a52acc801d35b
 EBUILD phpmyadmin-4.6.6.ebuild 1580 SHA256 2e46fbaada7beb9f9d055ea5d2602928488bc3fb0830dfba0c665d242148adec SHA512 9f6e14c4a8dbeb2bdf78404407b91b71ca7d17cd9a4fd971f94f90102ea097be07a108aab82bceb2809812b37601c091459b5a0175ecdb6d2db6d2e690ea3702 WHIRLPOOL 982890eade648a65f9f0802a33cf0ec5265ba367f791d7d20fc7712532a3da1b248459965ad0052aa7940b04c8921d6e9564d1e93df05dcd84f3c1d097eb38ec
-EBUILD phpmyadmin-4.7.0.ebuild 1568 SHA256 4ff27f93c08896592b5bd4d5d5d5ca7e872427a8b4daa644e9e0ae226c381529 SHA512 5dfac57cc1535df8edb5cb2ff9b37ef0336ca199d306e0adc9522b80172f19decba837f9314b8aa8dc5981eb4bb6a13e235022a7cb788e65ba4c136b13bcbb0f WHIRLPOOL 091d6c85718a4e68abd0179dbc334ecd8ed5b5af7118cc573eefcdad288779a8f60e6c6455f12ee2c965254608864475d781b986ade6d5e753b64bb44905bcd5
-EBUILD phpmyadmin-4.7.0_beta1.ebuild 1575 SHA256 66b32471246093710838ea502c6204226ce5160bf1bad0bfb618d093f0811f17 SHA512 9144b7827cc47c7d0b016759b02dceda26f29d5e4b595ea4df30f0fedb85b0a431e80f252450aaa85eb3de2cdaaff49cde3b0a18c2147f8de0ea85f6576db800 WHIRLPOOL 024c7309fcbc1a5bef08808a5c6a1f3cf239f7230e3cae21ec6085873f7466535cc1e4158d424561ac487cd696d3d2c6ccc8e970152c05fd735390c38776fe1f
-EBUILD phpmyadmin-4.7.0_rc1.ebuild 1575 SHA256 66b32471246093710838ea502c6204226ce5160bf1bad0bfb618d093f0811f17 SHA512 9144b7827cc47c7d0b016759b02dceda26f29d5e4b595ea4df30f0fedb85b0a431e80f252450aaa85eb3de2cdaaff49cde3b0a18c2147f8de0ea85f6576db800 WHIRLPOOL 024c7309fcbc1a5bef08808a5c6a1f3cf239f7230e3cae21ec6085873f7466535cc1e4158d424561ac487cd696d3d2c6ccc8e970152c05fd735390c38776fe1f
+EBUILD phpmyadmin-4.7.1.ebuild 1568 SHA256 4ff27f93c08896592b5bd4d5d5d5ca7e872427a8b4daa644e9e0ae226c381529 SHA512 5dfac57cc1535df8edb5cb2ff9b37ef0336ca199d306e0adc9522b80172f19decba837f9314b8aa8dc5981eb4bb6a13e235022a7cb788e65ba4c136b13bcbb0f WHIRLPOOL 091d6c85718a4e68abd0179dbc334ecd8ed5b5af7118cc573eefcdad288779a8f60e6c6455f12ee2c965254608864475d781b986ade6d5e753b64bb44905bcd5
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.7.0_beta1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.0_beta1.ebuild
deleted file mode 100644
index 80ad74d..0000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.0_beta1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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 ~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.7.0_rc1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.0_rc1.ebuild
deleted file mode 100644
index 80ad74d..0000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.0_rc1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-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 ~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.7.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.1.ebuild
index 3422d6c..3422d6c 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.7.1.ebuild