gentoo resync : 13.10.2019

4 files changed, 67 insertions, 4 deletions

diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index e81c62655ecf..7b113ce21f0d 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,6 +1,8 @@
 AUX postinstall-en-3.1.txt 1160 BLAKE2B 0aa21601490830f93a784c1a3c09b90986d606d0086b128b37d6598c946e9ebe43f575f12ca5ee571db8520841a2c08624b567b721567d26ee02e1e3c4c9124e SHA512 7b50ab9f9e3a828bd9bff600550ea97712c28804467ab5900a52710d4adb0581fe33155a965dd3956fcd36cc153b1a18a1f001d88ac52d70c8288faf695f01ec
 DIST phpMyAdmin-4.8.5-all-languages.tar.xz 6026176 BLAKE2B 6fea778544d266ea9950a5764a6c31806bfcc437edbfd190780218d841e55a21cd534fceef9309d2e1d6acbd8a780cb1d120aeb47e2e35705118ceb9d5ae1266 SHA512 590efd46f4ae5a9cafd3b33f3565d74e4bfd535e3de8763e72da7bccea06fabb2f9fb90af3fe144846573507c5eefc20ee412bf6b51adfb494402302dc81aa2f
 DIST phpMyAdmin-4.9.0.1-all-languages.tar.xz 6066680 BLAKE2B fc949684e97bef1be832968a9c0a3a893e0a81d7984953e694f41ff15deb82bffe3116ff7ec3c832bf2cfd4e24cefec4ce703baa9404bc0740b7231480165a4f SHA512 92fc032ba44e84f6c6a62bb658c2c7ea984bfd8c963b18bf19c26c3991cfe635771376ad8aebf90140bb1bd723b62a5adaca35d88f7bb68169fd0d07c3995356
-EBUILD phpmyadmin-4.8.5.ebuild 1558 BLAKE2B 5058ee85e899e6ab6ab8e7b98f7c8f2f22ab2467ccf110aa460b36624c767c3077a450ecfd854e6af6701d78770ddc5a754e7bb4d5660d0055d70091f8f8cf57 SHA512 b4d91d971cce9d4faa672eb76bcf0b465d2d1f86fec478215fffae22c55a30743567d621018de697d4c1e07650c9f575ac96b06f56382806be292e4a37ec105c
-EBUILD phpmyadmin-4.9.0.1.ebuild 1564 BLAKE2B 1b62fb393cd9c248fae68ee72ec9e9172f3ffbd386c11e5ebe87cb00155bf2b38b92746f6a6a6568525e01dec80f4116a7b0c784a00f2cafa1955555ab8cd62b SHA512 0545942949e94db25359418a96ca50c640357e149b030fba0a12d9577bf6612cabb1b03371f41f9e7bfe614cd0b07e79767a259dd11070bbdd9a3e1cfc994266
+DIST phpMyAdmin-4.9.1-all-languages.tar.xz 6146368 BLAKE2B d0a4fdb9bd995f807a0f88c3572f67ddd1df090817b4d32606025b6e7d08c6e05fbcbbc9b3b7edbe5492345c45c454797c9ba0f59498fe5e01d0979148c070ad SHA512 c2804bdb9d8501309e46d66fe4c27c3618de9cbd440928bf6335b3623a7e71608bb02fda17c5f1715b0cb32ecd68e2bbca86565f240b138c3630084225c56f83
+EBUILD phpmyadmin-4.8.5.ebuild 1549 BLAKE2B a0920fa567648ea84518fd951a4ac60cf1f43c7728c0851e7f98afe653360c0eaff14c89e3dee42c4bea4947f7b4bec675412f4b9ac5265e5ae3952778613d2c SHA512 0f2efbfae17fd03c73da2586b04d9f4d31d0e783578222407597a4f02e12d6df9ca9de0431fb90c1d6d527bc442a05bde83cecbbaed6d23d8f4bcb8dad0c49d5
+EBUILD phpmyadmin-4.9.0.1.ebuild 1549 BLAKE2B a0920fa567648ea84518fd951a4ac60cf1f43c7728c0851e7f98afe653360c0eaff14c89e3dee42c4bea4947f7b4bec675412f4b9ac5265e5ae3952778613d2c SHA512 0f2efbfae17fd03c73da2586b04d9f4d31d0e783578222407597a4f02e12d6df9ca9de0431fb90c1d6d527bc442a05bde83cecbbaed6d23d8f4bcb8dad0c49d5
+EBUILD phpmyadmin-4.9.1.ebuild 1554 BLAKE2B 1d3f797c525eeb07eb19a6bb91df7d042fa4cd445e0823d64151b84c708ea8b0fdad4e1764699c9ba2c1d6d51c0efa8060aea3134dff52b1f2ad4fbd819dfb3a SHA512 ae134c845904406da98496eae72c2152629c78c0741c78ae3cd8632d4f557fda55c4bd2d89c14e7d5924997406c0c33d5ff48e38bd6de53cbe7996576d096645
 MISC metadata.xml 701 BLAKE2B aef0a047bca31221714bf27203bd720863c5cef6b7b4dd72b441761a0638bca38c03610e65b3819ca0fba6577973908d7ca40ec8baa3aac1255d19b7cfa9f0a7 SHA512 6dcb099779cd0db4928ee812c81fee762612846044e6ee3df3b661a2dce6aed01420d0bc1301c8ff9d763fb8aeaeef3290a7889b32705fc48e8c392aa8b8ca82
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.8.5.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.8.5.ebuild
index 43eb70035434..1e9e51eddcff 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.8.5.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.8.5.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.9.0.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.9.0.1.ebuild
index b0e6be3d92ed..1e9e51eddcff 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.9.0.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.9.0.1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 
 RDEPEND="
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.9.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.9.1.ebuild
new file mode 100644
index 000000000000..e73147126446
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-4.9.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 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[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
+}