gentoo resync : 25.01.2018

6 files changed, 5 insertions, 193 deletions

diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 4d476d428b7d..9bad49031efa 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,13 +1,8 @@
 AUX postinstall-en-3.1.txt 1160 BLAKE2B 0aa21601490830f93a784c1a3c09b90986d606d0086b128b37d6598c946e9ebe43f575f12ca5ee571db8520841a2c08624b567b721567d26ee02e1e3c4c9124e SHA512 7b50ab9f9e3a828bd9bff600550ea97712c28804467ab5900a52710d4adb0581fe33155a965dd3956fcd36cc153b1a18a1f001d88ac52d70c8288faf695f01ec
 DIST phpMyAdmin-4.0.10.20-all-languages.tar.xz 4323896 BLAKE2B d645280c185904a91f2f9b7d365416d13fd3416c46c82fe3d9ed6e406af0c97e6fe5110db34311689d2fcb4ec3b52d6db64e9e455ca1283794c4667c315f97ba SHA512 e1d8b8a503eaa19a090d24d5ad011241aab06c2767138424d875edd82a868b4ebcdf5bba154b7eefef23b41d1949dcd021defe17e9047d0bf5fcfd0d6a5f4d27
 DIST phpMyAdmin-4.7.0-all-languages.tar.xz 7600296 BLAKE2B 10e1168ab7a1d8dfccf5837c211a2e6455d767e27f11aec870a9c4a1a19e8a4a1df67b82a7a83ff3c184c8a111dc272da5c876150615a9fd9a32a643bba84007 SHA512 03f3b56d3fed846e8e27e38a1bf32175b267a3cc2784ee499b64a48b6a37f0352302a9c150e1db1c99f633aabd8a373a834ad7ab2b694146b0ac13dd05bd27e3
-DIST phpMyAdmin-4.7.1-all-languages.tar.xz 5665344 BLAKE2B 6fc7570badf6496da6d038a117f7ebc523c3bbd4c7bd5193b5350df69b21f1b631391bc5ab0845193c2dabe2b9c54e16c6173495d0f383d17dac5734492166e4 SHA512 583ad8c8ee871fedd4df79e49845554f2f6182a343439fff8f91f61428964a85f3305590792096ede95a2ea675f065a4a4cdee31d365c03d2cc3aa721b0aeb6e
-DIST phpMyAdmin-4.7.2-all-languages.tar.xz 6270116 BLAKE2B 6ce9d6940f8e6e9fce73b4177cb85283c8719fe080082a5f3c493493133e05deba76a6ee57843f9e01d4ba15109f1d56a73f436eba1d105bcd59b4b914a7723b SHA512 ed0b26fd53d1a7d77dcaac98c8570282855b967aee23814fb61737484ea899ede7d900fd0baa27c20fa8ae9a55009db6037b1be42bd6a24d471d672f138d1761
-DIST phpMyAdmin-4.7.5-all-languages.tar.xz 6254188 BLAKE2B eaa4ace63f6f74fd36249d23c839f574a2a78373f831aaf89fd42013684242e1454005bf2b8acb10d49893288ef660767e869d38e6e255592626aec895037bb8 SHA512 f79a6779d3cd216e53c14faad74fcd35f4e89865c2b91cc6fb7599cc16c9a273143a6a491e960c0c902d29dd9e85f123f61bdef5c7b0cef45b827296f50d3d82
+DIST phpMyAdmin-4.7.7-all-languages.tar.xz 6411768 BLAKE2B 59ea3c69ee6bd019d5ff61f16ec37c39b9f94dde72198acd1892d4212d2258b9913305d22c93f6925426a9554c411ebf1a20beeae0a5b5a4f869a3bf7da9d73b SHA512 7eab8567a7889b79839104c3a46cfa7a841cb7188dc0bb0a306a6e15d06265b70e2b389c25e69bef2ebb77c7460381342322e2cfe546686d9b314b99c9419513
 EBUILD phpmyadmin-4.0.10.20.ebuild 1562 BLAKE2B 402c8f669c785bb084a8d7af247c62cd070eced8a613b43303bb2bb44781041f3e099fe5a4ff5817e63ff8260b898f4bed232ffa7e358075991bbe6f5a5656cd SHA512 e15e47f37a54090574b4c4554ff295fb9ad73543aebed5718e28575c238b3e59c393b091eb34ddccc04be8297b08deb442d27e12c595f846d8810aa50561af64
-EBUILD phpmyadmin-4.7.0.ebuild 1568 BLAKE2B 80439ee64be9386811dc843b83d11f82e0518d031608174c428963cf472c1d6e02e3a9bf825ed5d778c0c27aa59c6348361f2859d28726a4f77e190ed39ee7aa SHA512 5dfac57cc1535df8edb5cb2ff9b37ef0336ca199d306e0adc9522b80172f19decba837f9314b8aa8dc5981eb4bb6a13e235022a7cb788e65ba4c136b13bcbb0f
-EBUILD phpmyadmin-4.7.1.ebuild 1575 BLAKE2B 124c3cad4e3d4f7b10ec8da1df933411e57878b1c32781d604d98f5674e734aa10616a4c4f87f0cfed6c95089d46b1909ee00166978a60d450ea7d62d376b72c SHA512 9144b7827cc47c7d0b016759b02dceda26f29d5e4b595ea4df30f0fedb85b0a431e80f252450aaa85eb3de2cdaaff49cde3b0a18c2147f8de0ea85f6576db800
-EBUILD phpmyadmin-4.7.2.ebuild 1575 BLAKE2B 124c3cad4e3d4f7b10ec8da1df933411e57878b1c32781d604d98f5674e734aa10616a4c4f87f0cfed6c95089d46b1909ee00166978a60d450ea7d62d376b72c SHA512 9144b7827cc47c7d0b016759b02dceda26f29d5e4b595ea4df30f0fedb85b0a431e80f252450aaa85eb3de2cdaaff49cde3b0a18c2147f8de0ea85f6576db800
-EBUILD phpmyadmin-4.7.5-r1.ebuild 1569 BLAKE2B bd9908d6d725ce669bef74fa23198fb15009afd4b03c3f966c5c8a24b8eadfaf4ac9afd42c2b6f7d73b292d097057bfec5a4dc5a0f5cffd562b4f6f82073119d SHA512 a6ea4d0eea7b1c3a1a9fd7e8c3cadc9b661e627c3108212d466c37f87bb249d2b7e89e33d739836c96e71520af72c634442620387772a7bb22698bb9310c7dff
-EBUILD phpmyadmin-4.7.5.ebuild 1575 BLAKE2B 124c3cad4e3d4f7b10ec8da1df933411e57878b1c32781d604d98f5674e734aa10616a4c4f87f0cfed6c95089d46b1909ee00166978a60d450ea7d62d376b72c SHA512 9144b7827cc47c7d0b016759b02dceda26f29d5e4b595ea4df30f0fedb85b0a431e80f252450aaa85eb3de2cdaaff49cde3b0a18c2147f8de0ea85f6576db800
+EBUILD phpmyadmin-4.7.0.ebuild 1568 BLAKE2B bf1ade74bd74565b12e48237ed3acd11fbe066aeae08d8336cde2dcf104e6caeefa351aa8da751673cae6430e0b96bdf93ee382b3df22e22ead06d434c6b17a4 SHA512 9ba65eb7c35fe80be1f4bfe6a967e72e4e287f868f6126120f972ff12ade1def36a6bdfe02a8ed8b9cf9fc71f8c8561de4696567fe539b414e5ddae1932a0a0b
+EBUILD phpmyadmin-4.7.7.ebuild 1575 BLAKE2B 0453764f5d69021d970a8a4145c73cc23956d143555bce4b1442e2db40c95eca71d5368327f0e119969e58562541fabddda5ea325650682dd27bc58395ffe8e4 SHA512 5bb3cc05f266fb2abc4a6ceacc83c82d580b73010c7be4d84220c33edba3a35d5798825688bc99672155762bf224e97a36ffa135fb181043305615349f1796e4
 MISC metadata.xml 701 BLAKE2B aef0a047bca31221714bf27203bd720863c5cef6b7b4dd72b441761a0638bca38c03610e65b3819ca0fba6577973908d7ca40ec8baa3aac1255d19b7cfa9f0a7 SHA512 6dcb099779cd0db4928ee812c81fee762612846044e6ee3df3b661a2dce6aed01420d0bc1301c8ff9d763fb8aeaeef3290a7889b32705fc48e8c392aa8b8ca82
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild
index 3422d6c70f46..5ef8db1963ed 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.7.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.2.ebuild
deleted file mode 100644
index 80ad74d42a80..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.2.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.5-r1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.5-r1.ebuild
deleted file mode 100644
index 3e718bb6b1e7..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.5-r1.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[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.5.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.5.ebuild
deleted file mode 100644
index 80ad74d42a80..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.5.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.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.7.ebuild
index 80ad74d42a80..957fab2d7f8e 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"