gentoo resync : 02.09.2020

13 files changed, 224 insertions, 37 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 5a1d177b1d4e..b00be1217a67 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/blohg/Manifest b/www-apps/blohg/Manifest
index 9c6953b388ca..4faaff4053c2 100644
--- a/www-apps/blohg/Manifest
+++ b/www-apps/blohg/Manifest
@@ -1,5 +1,5 @@
 DIST blohg-0.13.tar.gz 75003 BLAKE2B 6b9760ffa99ca85a40e35c81341e395fdfc00256f5e80091c6883e54f050d4cf3f345c4752b635b1297d15e0055c182e00e74165451d695bb396c869c285646f SHA512 de8643e85e3f72827408d726bbe2f8674dcc6dcf1efdc47d33a934892071f8365cb54e63a6adb803361c7fd04032b2ac4e786c442676e8a8132b6d3221696865
 DIST blohg-patches-0.13-r4.tar.xz 14960 BLAKE2B 31458f412395000a05b359db25e8af648c54e554a3b3216f6c62355fd7203fc19c4452defe7692d0382653563f7b0565395af4ceb2177cc8e6de1d7e1a3c7b41 SHA512 3f709880bdd1826b74982866931f5002fdda451a205b6c278a9869979314413f37c8bf6400e3064a463f2fd34810e22d0d4cd5dfc89786f9e276dd9bd9fe5ec2
 EBUILD blohg-0.13-r4.ebuild 1782 BLAKE2B 5012b63c40993659b6c4f53143d9a2cf0a36bf57af4034f5716e7651589fa26f5051296906b8d698874c4fa78d94a6a97c4bd627b6a1dd40500cc5dc4892c44f SHA512 203b20ceee6b75cc284a69e82355ace43cb7ac7d5048ffb91e825e1a928738cf83faa1a04025a0ee5fa58db84d7474975b2891afa802d213e6bafed3138d2642
-EBUILD blohg-9999.ebuild 1776 BLAKE2B a78101332ab32b5147743a0ff566d5d164f6004016298ea9c956e93bfba9723990f12eac5b64eafb7ce0a0bc92a9d98cf42193bf8b5186dcc13ee9be9827390d SHA512 ccc2fd369f31e7da5603b5c22f2e3a86d2ec158653c1aeb671eee38cb9915f9ba9c2bec89068065f2df4282e4ba5293821929673d6c6608ea713cdb4b621bbbf
+EBUILD blohg-9999.ebuild 1782 BLAKE2B 5012b63c40993659b6c4f53143d9a2cf0a36bf57af4034f5716e7651589fa26f5051296906b8d698874c4fa78d94a6a97c4bd627b6a1dd40500cc5dc4892c44f SHA512 203b20ceee6b75cc284a69e82355ace43cb7ac7d5048ffb91e825e1a928738cf83faa1a04025a0ee5fa58db84d7474975b2891afa802d213e6bafed3138d2642
 MISC metadata.xml 983 BLAKE2B b57921e5e260e283cc261200cefcba516918e21ab44ff009a5fb08c58036cd39263de239e65e20714bac823bd7d0c6889dbd0737904109af635809cd16ce2f55 SHA512 39e0799c5a6e685ea188c12b8e2ddd34178fce3630a0cb84308a66c710730e8aeaeaf23444e4f8091ec2adf6eb1da3ea7bf74e1df1adb3d5caa2205da99cc6f8
diff --git a/www-apps/blohg/blohg-9999.ebuild b/www-apps/blohg/blohg-9999.ebuild
index 6a4abc9a54f5..fcd783f4f398 100644
--- a/www-apps/blohg/blohg-9999.ebuild
+++ b/www-apps/blohg/blohg-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 GIT_ECLASS=""
 if [[ ${PV} = *9999* ]]; then
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index 852c1ac6405a..920ff322f657 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1,5 +1,7 @@
 DIST chromedriver-bin-83.0.4103.39.linux64.zip 5222065 BLAKE2B 7d801205bcd0174d1d622b8e3c6c755f1dfae1fd4bf1bc225dbd05bd0d868c300d7bf442a39f29525d4af1f54c0f2e46b233d433d70523d48df15a30aa1a89f0 SHA512 9cb02938cef436dcf0b3f54e5ce668de86e9afc702a1903e2f35ecabcbd4c468f525ff3c6b079eb88b14c1a956bc070fa281fdf64d9d54027254f769c00d24f9
 DIST chromedriver-bin-84.0.4147.30.linux64.zip 5306126 BLAKE2B 2ee0a05eaa42e4724634251fd44d81a2d96f7486db40dc570c01f96cf16124fe2d666e110a4b9c6cd06adf38181c0b2aa3a38beb4ec59fbd65a98cba466fca71 SHA512 ec010c80958439427567c12c714afd5e15f80a9ccb7120e9539986d1af931eb063ad50b709cfa6495bb5a214027ed8531007d4497a01b26a94259aa4a2525f2d
+DIST chromedriver-bin-85.0.4183.83.linux64.zip 5359562 BLAKE2B 020370d0cd42f2af0c81e9ef02802a895e2d566454a27d5a80b8607ca3a83c7ca1ec8ece0ed997b5de70a725134d9c2f0a52765c3f1786b3050f9abbcac3d5d8 SHA512 ba26945906ac6a2b9c724917d8f2e82e9bc26fd601a91a390b637a8dfcecaa57a3acfcf376d316b75ba559b61858a6732cb04332c6c1c661927322ef623a62b8
 EBUILD chromedriver-bin-83.0.4103.39-r1.ebuild 595 BLAKE2B 630d77aec56a4bc0d3bdf7a602f7568b205b4511fef2ffd28d0b811c86e6c31b436ed172198901e143eff56c0633d1b463c338907c79798e10e5468b7a0b5bc8 SHA512 33779f842a2e2e5aedf085c50f91c856438396705dd1191beceb85ae3cd6cfec23fe707de697f2de533289562676e9779bb8195bb63911eb245884bafc7a56fa
 EBUILD chromedriver-bin-84.0.4147.30.ebuild 595 BLAKE2B 630d77aec56a4bc0d3bdf7a602f7568b205b4511fef2ffd28d0b811c86e6c31b436ed172198901e143eff56c0633d1b463c338907c79798e10e5468b7a0b5bc8 SHA512 33779f842a2e2e5aedf085c50f91c856438396705dd1191beceb85ae3cd6cfec23fe707de697f2de533289562676e9779bb8195bb63911eb245884bafc7a56fa
+EBUILD chromedriver-bin-85.0.4183.83.ebuild 595 BLAKE2B 630d77aec56a4bc0d3bdf7a602f7568b205b4511fef2ffd28d0b811c86e6c31b436ed172198901e143eff56c0633d1b463c338907c79798e10e5468b7a0b5bc8 SHA512 33779f842a2e2e5aedf085c50f91c856438396705dd1191beceb85ae3cd6cfec23fe707de697f2de533289562676e9779bb8195bb63911eb245884bafc7a56fa
 MISC metadata.xml 460 BLAKE2B 6da42de60f119a13f70f0a64f61f4fde912d15a7582b240631761e852b0db50bdb2f95102be05b09b1d653907b4c0a8a9641a9952cb6a7c1bd84d8f51ae1d83b SHA512 a8dfdafe46c651f3b06e0c004750747cfbe21e0ee704e5afd6f302c2ea61e288fad3987732b0e4b6ecec4805822c347f1d43a5e09e911e7d950196207eb81f43
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-85.0.4183.83.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-85.0.4183.83.ebuild
new file mode 100644
index 000000000000..c96967a171b8
--- /dev/null
+++ b/www-apps/chromedriver-bin/chromedriver-bin-85.0.4183.83.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="WebDriver for Chrome"
+HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
+SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="bindist mirror strip"
+
+BDEPEND="app-arch/unzip"
+
+RDEPEND="!www-client/chromium
+	www-client/google-chrome"
+
+S="${WORKDIR}"
+QA_PREBUILT="usr/bin/chromedriver"
+
+src_install()
+{
+	dobin chromedriver
+}
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 55c609c0452b..1336e9ec4c19 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -3,9 +3,15 @@ AUX kibana.initd 1022 BLAKE2B 8eb81203f713e75d3eead4eb25a7670c7fab8af67d1fbe7498
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
 DIST kibana-6.8.11-linux-x86_64.tar.gz 188165733 BLAKE2B 719b022ad87769d129e7c6e7c6c4aec09da2bd51d079dab203573531d12df1ced9c45bc25fdc0db51d9ac178ef48183a9899ca1f2fcc6b1d3913efa4140c3321 SHA512 f353949af48d1f4a0c6365425cbdc10972a5b7dc1207231f7e6100563af66d40ad78c8904c32ec2b834d7e2e7d7e597deafc0a9be51749afbb00333280a29789
+DIST kibana-6.8.12-linux-x86_64.tar.gz 188208087 BLAKE2B f03be0c4ad6c3ddd9b3b11421f3dd8e83893d44ad47c2df92c97765949f2cf4b9bb6a4ea18022c596ec9a13946028d5425edff9910fd5e883c0497d1a9ccd2e0 SHA512 ebbe616899fccda2c6a04bb2bddfba2dbd54c0a91bbf111c2f74e78c5f9d0ccd692d1bea861ff4bd5ed5c34cacf8f92b75b635a41bea7958abb7511735afdffa
 DIST kibana-7.8.1-linux-x86_64.tar.gz 337517217 BLAKE2B 208933ef5efccea3e718ff5ef1bfa28a08c75ba3a1a91b1eb00020d33ec1df2c17e299d423be4d2f3c2c5bfcb6189a80ebade26753379148aa72d9f7901a2e8d SHA512 92f3717b2f9ea915570ee8587f1ad0c2a428c266e1cd7dcda485b8b81191c5c1b3155872299c56dbba8de93807b2cc67a0d197ecb2e8df44e09060d4fac1d759
+DIST kibana-7.9.0-linux-x86_64.tar.gz 295354628 BLAKE2B 3f26962334898690542e9ad5d5e4543e95026eb572f716d04bc964e29b7fe3cd03feb673cff123f204d73674e10e1fe30a4c4e4751b906fb12b45461bf964c3d SHA512 505fca8230c938351a4f2a0fb813d52b26a3a1b208c351255ce4ddda2fad30ddbc57798e77428da4cac8d53b00ff9c734292342e66350baf4f6ed479e4838643
 DIST kibana-oss-6.8.11-linux-x86_64.tar.gz 70602922 BLAKE2B 2c435daaa855f1e7961fe933896d96779ada1a49b7dd3d303f8dad5eb020f77a0afb6a6c72f99e00c94a75abfc4a838eff78b381ac646f5b86089b54070921d1 SHA512 4403fa01facddbbd8f56463f80cd588f2f3788b696272f3ad45127d75d589cbc97c62f4dad806ae25901fa3ab195d9e8aa96103bed7c5c76c52c7065c19ea6d2
+DIST kibana-oss-6.8.12-linux-x86_64.tar.gz 70621824 BLAKE2B 474ad88dc19e727d6716eeacdd18e799053110f91ac56bbdbbc9dd2c9f007fba450108c914d95abf03d4240757d68303833e52dc9358f15fdee81930565d119f SHA512 b8fd1fd2617163069a4f6ebb5f04bfd04d6ef39e859476430e42b07ecd209f69c6535b5db731604f2cc1360f62214145be37817509d35d7e4eda22a7085b0541
 DIST kibana-oss-7.8.1-linux-x86_64.tar.gz 154344863 BLAKE2B 19fefe509efd2c803a017d5cc7ea262cfc3065c71a8dae04bbe99f7c2421a1b1a6ee0cbf298d2e7ab8b7283ef67b9f8f2c1db876136dbad7abedcc843b287db4 SHA512 381e467cb6f18892a5d5403e6eab640ffaf6ae2b76bc3e52eb94a377bf773e7dee631d0dc72162e276eafbc10c9c70629c106d25707921b32d2ebb18f69315ba
+DIST kibana-oss-7.9.0-linux-x86_64.tar.gz 137634179 BLAKE2B e52fbd1fb9372cdeb208122c96439f31acd5de8b106c00b07911bd5d4ebed33ad55de09ebae6f0f71944eb8efa98e957828447f7df4e483887d5b0a681506315 SHA512 aee27bfa11b1a513c2db9400e884ea17fd7bc5d97633f02ba48e2e678e60191c318b9c333ec6a9f8b276284ee4933738f83c27545c4c744e76895478e9c92404
 EBUILD kibana-bin-6.8.11.ebuild 2503 BLAKE2B 1a7338d89c5e63e1610ec3f14f39ec76794e6a07b7f4b31b66106f088dd9eb802de7944a18fe59fed5a3eba8e310e2df383f7682be317828c9327e34f2318d74 SHA512 01efdec9efc4fe2ffe4eb6cff18747115aa4e02ac462aefa0c10bcee8d460c536a04b9be99503675a7adbd1abcc09bcc29959427ac7615fdac55f5525cf55bce
+EBUILD kibana-bin-6.8.12.ebuild 2503 BLAKE2B 1a7338d89c5e63e1610ec3f14f39ec76794e6a07b7f4b31b66106f088dd9eb802de7944a18fe59fed5a3eba8e310e2df383f7682be317828c9327e34f2318d74 SHA512 01efdec9efc4fe2ffe4eb6cff18747115aa4e02ac462aefa0c10bcee8d460c536a04b9be99503675a7adbd1abcc09bcc29959427ac7615fdac55f5525cf55bce
 EBUILD kibana-bin-7.8.1.ebuild 2564 BLAKE2B d3805a087535b35b2f786a19ccba63f6e8c83f42287758d48aaf5aca76ebfd72eedf8e112b7f79938780659e44439f76c866c5c7da0de6c9004627e4bab0c428 SHA512 2d3f1649a05d7eede2fa2219e791250b6cac5d80ea6acd338f35489d99c8820d578dc4e0f1f06f1faa53f51c99e181dc6d399dc19b51af727ba9d11d7fc73945
+EBUILD kibana-bin-7.9.0.ebuild 2749 BLAKE2B 87313d736f7506eebe37deca87884f91b87b45a5199db3125a7697eedc26732e95239c1c7107e3da653ada6c2b8456be3ad87e70996857f166874b4be3d9fd24 SHA512 37ff9308ad1586676e81c9ac17abee357594f63587268ce7758bb5da73e93210ce26002b71ddc906b32ffa2c809b5827aa7520111964471512796aea8fc0b1c2
 MISC metadata.xml 646 BLAKE2B 761ac91ba7a5c8a1ebdaa4b85a6db083eaca8e26dd00cf753c6cd80daadec79dbf1624a26a601e7e8c1605d9e7c267dcc75455d591c658ac1ab403ac8955786c SHA512 905abb24126c45f0b170bc4073ceb3860bdb21752a2a0315e25c1c5b3baac175e228694e0d51022928d0f05cc48e261a7b5da5792c4faa06ecef16ac105f67cf
diff --git a/www-apps/kibana-bin/kibana-bin-6.8.12.ebuild b/www-apps/kibana-bin/kibana-bin-6.8.12.ebuild
new file mode 100644
index 000000000000..43ac4ff48dfc
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-6.8.12.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+MY_PN="${PN%-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Analytics and search dashboard for Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/kibana"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="
+	acct-group/kibana
+	acct-user/kibana
+	>=net-libs/nodejs-10.15.2
+	x-pack? (
+		dev-libs/expat
+		dev-libs/nss
+	)"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+src_prepare() {
+	default
+
+	# remove empty unused directory
+	rmdir data || die
+
+	# remove bundled nodejs
+	rm -r node || die
+
+	# move optimize/plugins to /var/lib/kibana
+	rm -r optimize plugins || die
+
+	# handle node.js version with RDEPEND
+	sed -i /node_version_validator/d src/setup_node_env/index.js || die
+}
+
+src_install() {
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	rm -r config || die
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+
+	insinto /opt/${MY_PN}
+	doins -r .
+
+	fperms -R +x /opt/${MY_PN}/bin
+
+	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
+	keepdir /var/lib/${MY_PN}/optimize
+	keepdir /var/lib/${MY_PN}/plugins
+	keepdir /var/log/${MY_PN}
+
+	dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214
+	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
+}
+
+pkg_postinst() {
+	ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana."
+	ewarn "In case of startup failures (FATAL Error: Cannot find module...),"
+	ewarn "please remove the optimize directory content:"
+	ewarn "rm -r /var/lib/kibana/optimize/*"
+	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+	elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
+	elog
+	elog "To set a customized Elasticsearch instance:"
+	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
+	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
+	elog
+	elog "Elasticsearch can run local or remote."
+}
diff --git a/www-apps/kibana-bin/kibana-bin-7.9.0.ebuild b/www-apps/kibana-bin/kibana-bin-7.9.0.ebuild
new file mode 100644
index 000000000000..050593e2ba79
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-7.9.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+MY_PN="${PN%-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Analytics and search dashboard for Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/kibana"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="
+	acct-group/kibana
+	acct-user/kibana
+	>=net-libs/nodejs-10.21.0
+	x-pack? (
+		dev-libs/expat
+		dev-libs/nss
+	)"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+src_prepare() {
+	default
+
+	# remove unused directory
+	rm -r data || die
+
+	# remove bundled nodejs
+	rm -r node || die
+	sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
+		bin/kibana || die
+
+	# move optimize/plugins to /var/lib/kibana
+	rm -r optimize plugins || die
+
+	# handle node.js version with RDEPEND
+	sed -i /node_version_validator/d \
+		src/setup_node_env/index.js \
+		src/setup_node_env/prebuilt_dev_only_entry.js || die
+
+	# https://github.com/elastic/kibana/issues/75550
+	sed -i "/readKeystore/s/get('path.data')//g" \
+		src/cli/serve/serve.js || die
+}
+
+src_install() {
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	rm -r config || die
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+
+	insinto /opt/${MY_PN}
+	doins -r .
+
+	fperms -R +x /opt/${MY_PN}/bin
+
+	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
+	keepdir /var/lib/${MY_PN}/optimize
+	keepdir /var/lib/${MY_PN}/plugins
+	keepdir /var/log/${MY_PN}
+
+	dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214
+	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
+}
+
+pkg_postinst() {
+	ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana."
+	ewarn "In case of startup failures (FATAL Error: Cannot find module...),"
+	ewarn "please remove the optimize directory content:"
+	ewarn "rm -r /var/lib/kibana/optimize/*"
+	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+	elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
+	elog
+	elog "To set a customized Elasticsearch instance:"
+	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
+	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
+	elog
+	elog "Elasticsearch can run local or remote."
+}
diff --git a/www-apps/scgi/Manifest b/www-apps/scgi/Manifest
deleted file mode 100644
index 35333ea28c1e..000000000000
--- a/www-apps/scgi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST scgi-1.14.tar.gz 29406 BLAKE2B 46bf75f9971f8801ae0244bd43ae85730f8c48cc437381937d16f8f7e143302472c4e9e4bf8ce52b1a9732fc77449b95a8f03b785b0c08c48e3a6dc53079ab5a SHA512 148986aab3a5579b7dd7d15583990844149b799df32221b4d2c354b11361f79727087d63ddd54227d2aae937253997774e521606c7baea6b808b9efef025a01a
-EBUILD scgi-1.14-r1.ebuild 638 BLAKE2B 1daa0db06a7b44b96fb13223814b3f9b15dcd980f2361ccacd8678ee77cd5c9067be7a096d21e63ae4416a6f5705c318719a1ebf22a66ed1b54e0a2d0519a329 SHA512 8cb2abbd770c828f42292cd7927ddc1d39c15753eff2b8f213625b57925ee47cea39bab305528aaf2533f87174fb47b18291032becd21444bd84905910bff1a0
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apps/scgi/metadata.xml b/www-apps/scgi/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/www-apps/scgi/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/www-apps/scgi/scgi-1.14-r1.ebuild b/www-apps/scgi/scgi-1.14-r1.ebuild
deleted file mode 100644
index e9b9c77950a1..000000000000
--- a/www-apps/scgi/scgi-1.14-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for implementing SCGI servers"
-HOMEPAGE="https://pypi.org/project/scgi/ http://python.ca/scgi/ http://www.mems-exchange.org/software/scgi/"
-SRC_URI="http://python.ca/scgi/releases/${P}.tar.gz"
-
-LICENSE="CNRI"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_postinst() {
-	elog "This package does not install mod_scgi!"
-	elog "Please install www-apache/mod_scgi if you need it."
-}
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 9d56a170b28b..2d6d7dab14bc 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,5 +1,5 @@
 AUX postinstall-en.txt 1285 BLAKE2B 09a372660022bda4064f2b298e6409be4d8f8943fd06d672e15c6126029acf2551b2eb0447f378a7c9287f757a820787ab6e592556e5cf199b0d8c0dd8f98f18 SHA512 8fa41aa39a1dfead723c87e6b16f979839dd5c585b9f9bb14a8a1ef556b69f9dcab113622b56c24890d1414df045b055b6997be02364ab4d5c7c06db2e4c12b2
 AUX postupgrade-en.txt 963 BLAKE2B c08e2ecca3d462d544549c80fb11abde670251002257d75fa8dd41d890f1327b08f1796c54125663fd35aca999f63b89035b610bdeedc32396c35d9d9b92ce4d SHA512 dbc86a1cf3b5280137322794a344818be8cfc137153f0e634e7bbd856ccb7ac589199353f2ccd5c28a8aa7d35cc2e041137bfc5d812fc6267efc758a1113c2d4
-DIST wordpress-5.5.tar.gz 12979571 BLAKE2B 085bc56f5b9141591db599ffdaba5ebc5874fcbe4ce0dc207d94f9d4350c2460f931589220e8d97e20775a68c63b2ec3a2dda8a107e45c12b2692eced07fbcee SHA512 1fe7ba37023aef4dae01318be06672621454fba90ed4d881c7483573abc6e6e6ba1c0bce16dcc2f4a6b33fde2cd7710ac99827a0939a51f75917d78263a03865
-EBUILD wordpress-5.5.ebuild 1368 BLAKE2B 45194566d2baf141dc52ed370456ae5bc84e94e0b8424f38093617652224603ec715bb490f992a32d4b3372320e8faa7905e821eeba792168b22e9e59ec59bc7 SHA512 224639d9d5827afab6aaf1f9e9808bb4a064da1cc7f686c5ef3818717f900280b8ded7161c9ae718ce14793f21e4591695a0deae718a54e751881e0bcd3a44cb
+DIST wordpress-5.5.1.tar.gz 12983648 BLAKE2B 4aa371ef3c0fcc2e9e6deef18c5d1c53d6f7a0770ff9be055ef1b86faa8dbbacebd4cb304ad19bb9d3baaddc6fdc06c84163b36979a934c59fe3732accd754da SHA512 11285e6e776756185814cde905986ce01f586d159fb06de5d16463cec544c8b3b85a695af51e9de71cbcd79f039ed8f6da233a8e82f5ee797d5124983b6ff0d3
+EBUILD wordpress-5.5.1.ebuild 1368 BLAKE2B 45194566d2baf141dc52ed370456ae5bc84e94e0b8424f38093617652224603ec715bb490f992a32d4b3372320e8faa7905e821eeba792168b22e9e59ec59bc7 SHA512 224639d9d5827afab6aaf1f9e9808bb4a064da1cc7f686c5ef3818717f900280b8ded7161c9ae718ce14793f21e4591695a0deae718a54e751881e0bcd3a44cb
 MISC metadata.xml 392 BLAKE2B 736fb06bba21342a9cdd29ce815b1325098bc11798675534a4d299bcbaeb29f46d1eab8bebd90e2539187e82294510d06827ac068611797ad441e7c024bee6b8 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33
diff --git a/www-apps/wordpress/wordpress-5.5.ebuild b/www-apps/wordpress/wordpress-5.5.1.ebuild
index 6fc0786bf3b1..6fc0786bf3b1 100644
--- a/www-apps/wordpress/wordpress-5.5.ebuild
+++ b/www-apps/wordpress/wordpress-5.5.1.ebuild