gentoo resync : 22.12.2021

7 files changed, 11 insertions, 302 deletions

diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index bd1f027ee29f..616bb8bd601c 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -1,18 +1,11 @@
 AUX kibana.confd 72 BLAKE2B 786203cfc47132fedb989fbcaebc799ed566e15f2b0ced9657980269906a0395ffd6287d8b89ce41fd437086173177a9727daa2cd03de8bda26045c013f7c6dc SHA512 7dfb5c2e99e48227a95ac405fdf9f1ffdf20f7173c5a211a1aedf73b2e2ac37b7f428e5e3c7b713b78433cc9ea7bbfac723477c4497a6cb18ed787d42d8faddd
 AUX kibana.initd 1019 BLAKE2B f57bce1793768f2936dc8cd3437aacbb4d4e034ac53612f01064cd5bcec7449a968242368abc3144f6436d8765c1738e7786147cbc1ecabed9c734035daf4669 SHA512 e5fd56da7fc83466c26acdbd3e9aa341676ac9221495f6f83c46263838c15951164d31ac7e62b732fba1c0e63c6e5c2c97681b15ac5409b74a5c090f72ae6383
-AUX kibana.initd-r1 1126 BLAKE2B bf5fbfec39cc4961269900f2ef6b55b2c3cd2bf5134db12055eeaad4e6a2d71d8d2f8cb0a28e88f9733d142cad706839378b9c800ef6552f4d78305ee83b55f0 SHA512 6f36729960a80f7325a0bff3ca39d0ac9fa48d85a6b122d1ed869ca3470eb347301f22ed1b6604f1bb68daf24d789e898f4f95d02472294d5810c92ac4a83687
+AUX kibana.initd-r1 1040 BLAKE2B 12fc93fcb8f79fc5013fab36eb74335a967f5573d7361dbfce78bde08d53e536eb63a068c047dad3c04e19b973b70d2af2b1e9757ebf9155951dea5c850d5783 SHA512 04cc2571d4c37cb7e270b1ef64e6fb26fa22d4ed259bc74eb165c8f2c49fb8ef9e1a3fbb0a7e45b04ed88309382429b2e78bdc5fe5cc51bf97ffcd5b17f387bf
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
-DIST kibana-6.8.17-linux-x86_64.tar.gz 186139184 BLAKE2B 4b6bead148e9d222f5631ad24a81d6d5b84972c3c2dc4d8010fd4081179251365289858e8f60d8930c20653df6ee502a8833146613cb0195a0cd2bf6ccd5114d SHA512 50ae600ab3b6d69d11e86c84124eea6fd5c2f756c6c961c6f45f32ea3a65f0c29b249a4229dc9cfd6b7a64383efc21cd4bb53c44265ccd9109c6f8d990b3e14d
-DIST kibana-6.8.19-linux-x86_64.tar.gz 186482714 BLAKE2B c79ff1ee992e954f0d1a607a67110dd12ae3d68a2fc44fd67860253a4aedebcedb558c95a92b40168eb85d2c71abf83280f9338564ec3142c1841cba8aed50bf SHA512 6af11abb1bb637dd33b3b60b7fb4eaba0c4706e6e59c1c61bb1f70b5e80d2296a318126535088b24cff692efc80267e53483bdc08a9eb4e132b41bfddaf30049
-DIST kibana-7.13.4-linux-x86_64.tar.gz 306413260 BLAKE2B 3afe039b7be9809b395adb609e65785ccb8f3de07391b306804a79158cacb53c2d8b844b04468e932dc0113b9ecce34bc4bd8326231c9f2191fa5b12f2e00b4e SHA512 1accd5d6933f3f2f54174e53da626bc275b99b2f102d5f8cfee934d3520ee55a97c9c545cca32ddffec06a96114ce284e2e128cf334538214566c6530d1d673e
-DIST kibana-7.15.0-linux-x86_64.tar.gz 284167139 BLAKE2B d46a860055623e4d90f44e42116b78032057659f89193d5ec2bc25728906fd24465fb1c2111fca157bda5745d612aa2b5913168d93f43fc97aa00f477596c48e SHA512 34759eca59a9f6b8bca2513d5da74686d2292d2472ca0cf1f8624d6610745a199fe6aabc102a9e39031057f3ba8ef5e692eca641c8371282481dad36d44757d7
-DIST kibana-7.15.1-linux-x86_64.tar.gz 283752241 BLAKE2B 531a27fd06e6f94f9d1ca77f94e8146f6b8adcd49579241e2b6c5fd234d9e45fd05931fa9886df29bcb70d9b5b8072b76a4ef59139b800a2c657185051fa4f52 SHA512 419450fb596ceb7015792947a2f84ca9e80b1aa180806e9d38e89d2e1f31dd84751511fb600a35026b10440ca5dc9bc5f1245c72a0afde062bdbfdd004fb4417
-DIST kibana-oss-6.8.17-linux-x86_64.tar.gz 68076062 BLAKE2B b87a8067b0598e9291eb78b7666b69ac8babe774ad3f2ae1fcb37d12517ceed067fe0e022cb34e576727525c570863625237b91c6c5ad0b3901e8b6333a13c16 SHA512 28953bc77fd606a11c1f2522bb53b9fe38e7f711f71ac073c4d669a0078ba6fb050688ab06de49d4b5f7fdd0c76b8d040e05194bef814c872a00b9383b9a6d60
-DIST kibana-oss-6.8.19-linux-x86_64.tar.gz 67437896 BLAKE2B 759d2449e056508bae5eddbd3a772ec8112bac6ce0068089f4c43f797e2fe3892e508970df9438aa9591b01b08d7258325cbb493f36768fca9d174bda1f60104 SHA512 86c22f5d3ddffa8c650e6326b8632ee5ca9bfb3f2dac7df38f8dfce41c8f777eaa5eea43dfb03b1e10c3ecc597624f8c3b19a31dbc7abc514759973c8bf0a47c
-EBUILD kibana-bin-6.8.17.ebuild 2524 BLAKE2B 1c3fd84640cf6fbb363b79410db8b5efd9a49bd2a7ef8f55cc3e3d590ee67a6b11782f368fa631cd9866344dfaccd38789efa2050a15227f39ae91406688f87b SHA512 7b36816cbadc0edc36714b81823fc2a21001337907204651a56b5c0245647af8b2c1e2ec40349ab344696971be969fd3c42ace58e3f9a7b17885751a4e351136
-EBUILD kibana-bin-6.8.19.ebuild 2524 BLAKE2B 1c3fd84640cf6fbb363b79410db8b5efd9a49bd2a7ef8f55cc3e3d590ee67a6b11782f368fa631cd9866344dfaccd38789efa2050a15227f39ae91406688f87b SHA512 7b36816cbadc0edc36714b81823fc2a21001337907204651a56b5c0245647af8b2c1e2ec40349ab344696971be969fd3c42ace58e3f9a7b17885751a4e351136
-EBUILD kibana-bin-7.13.4.ebuild 2540 BLAKE2B 4b97a79688192c43ae54c840e6da8a48b0c40abc5f9809337c878cb8e857212121f8f671d95eb9b7e69bbb787d67ea0c9356b5faa9a0b3fc3ff6afc423ed7b12 SHA512 3c3a347f7e799f16501ccaf557b3076430e8b3f2dda793847c87f1fcd5ba90049a49f4a2109e2eebd4291f8f779734315951f1f1d8c20fcdd8fef81e0aea96b7
-EBUILD kibana-bin-7.15.0.ebuild 2540 BLAKE2B 4b97a79688192c43ae54c840e6da8a48b0c40abc5f9809337c878cb8e857212121f8f671d95eb9b7e69bbb787d67ea0c9356b5faa9a0b3fc3ff6afc423ed7b12 SHA512 3c3a347f7e799f16501ccaf557b3076430e8b3f2dda793847c87f1fcd5ba90049a49f4a2109e2eebd4291f8f779734315951f1f1d8c20fcdd8fef81e0aea96b7
-EBUILD kibana-bin-7.15.1.ebuild 2540 BLAKE2B 2cde692172b9e84416a9a911fc633f490b8a2323341d2963f93c87237afda0516a26fdcaf79ec42b7f1cfd7cc2d183bf3c7bd7c984e7a9fd95ee122304deb80c SHA512 3a66f1528c312c13ef31250383e85284b5848f605cc1bfb6468d25065c4ddca0f83c55261a4e4417c815a0084ccd2efb1494801f0db853077745938f9fece93b
+DIST kibana-6.8.22-linux-x86_64.tar.gz 186925815 BLAKE2B c3a5ed661991f7646f9f59a709bb4c3d940b13e7d32beb9f4862b5c1d6ad63b6af0730713463e54e427cb7f488acc3446f4eec28b23cc7ef07f9b7da385161ee SHA512 4a7b74ba93255bbef9255e30f373addb6bb231c364cf367281120c564d00923ab87356e936d4a49165bab8dc50d34ee38728099f40bea26fe76d464a05c7968c
+DIST kibana-7.16.2-linux-x86_64.tar.gz 280893546 BLAKE2B c2057e45823e373c7ac842e0f4d7782aad398cc662aca801eb6cd2a792a5826b5e212c836f14d07bf451fd2d6b8f87bec481b03c2fb9afa8c26ce5054e6d54d9 SHA512 4c82f338b7e818db6e9e03c522d354286bc654e4dbe97529a3308ae27e510c5b4fcfa120371428867c49ed76dee06bf1386c47c8ceb7118bbddf09eed6e131ba
+DIST kibana-oss-6.8.22-linux-x86_64.tar.gz 67436490 BLAKE2B 1de996ea4ab2a7e0b77bf5b5c4c16bb235c9dd35814144f5cec77b662b2b81f05e8c47db7dd5b65c9d58c46ce56232710f3e5f892ad91c6ca0bda9ba37dd1bc4 SHA512 30a19e8ff87f590aefa607db3f55d53acc41077768e0239933c2cbaedd1abffa05c6df96b575f22b3b1151ef6f1a5ed860fc0e53f87ecaa1239c5564e7a7c4bf
+EBUILD kibana-bin-6.8.22.ebuild 2524 BLAKE2B 1c3fd84640cf6fbb363b79410db8b5efd9a49bd2a7ef8f55cc3e3d590ee67a6b11782f368fa631cd9866344dfaccd38789efa2050a15227f39ae91406688f87b SHA512 7b36816cbadc0edc36714b81823fc2a21001337907204651a56b5c0245647af8b2c1e2ec40349ab344696971be969fd3c42ace58e3f9a7b17885751a4e351136
+EBUILD kibana-bin-7.16.2.ebuild 2492 BLAKE2B 50856e652b63ff7fb3aa0298e74829ca17d5d4e8cd4ecc646d55a294ba096260cacfd1894cf5962d8d1c9576e9bea5deace4f907afeecb28419d6e2642add410 SHA512 975e4a51584c6f375c5b39d700424fb703f20277622129fae939394ba14fd65e6e93916a9a602fa150a92dfed370fd5845d219d754a5fafde772578052daf4fe
 MISC metadata.xml 569 BLAKE2B 66a1069bcf497973fbf62e9951912b3a39340a8c9e21ad2d09f297ee9d8680ddbee3fac02aab30e9b5ae463b40a2e9fd230c42a2f3ca42135869273e15a0cdc2 SHA512 2e812f2a8d31f4cf20d2252bab8795a0f25dab616592bb4da6e4cd1063ec7eae88f0bf136dfee2af19cc1dfe9e62ece4d36a2031d32bfa0aeba9925fabd8cdc6
diff --git a/www-apps/kibana-bin/files/kibana.initd-r1 b/www-apps/kibana-bin/files/kibana.initd-r1
index 124cb683c939..51502367e039 100644
--- a/www-apps/kibana-bin/files/kibana.initd-r1
+++ b/www-apps/kibana-bin/files/kibana.initd-r1
@@ -11,12 +11,12 @@ KIBANA_LOG_DIR="${KIBANA_LOG_DIR:-/var/log/kibana}"
 
 command="/opt/kibana/bin/kibana"
 command_args="--elasticsearch ${ES_INSTANCE} --config ${KIBANA_CONFIG} --path.data=${KIBANA_DATA_DIR}"
+command_background="true"
 command_user="${KIBANA_USER}"
 error_log="${KIBANA_LOG_DIR}/kibana.err"
 output_log="${KIBANA_LOG_DIR}/kibana.log"
-
 pidfile="/run/${RC_SVCNAME}.pid"
-command_background="true"
+retry="60"
 start_stop_daemon_args="--env BABEL_CACHE_PATH=${KIBANA_BABEL_CACHE_PATH}"
 
 start_pre() {
@@ -24,10 +24,3 @@ start_pre() {
 	checkpath -d -o "${KIBANA_USER}" -m750 "${KIBANA_DATA_DIR}"
 	checkpath -d -o "${KIBANA_USER}" -m750 "${KIBANA_LOG_DIR}"
 }
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-
-	pkill -P $(cat "${pidfile}")
-	pwait -F "${pidfile}"
-}
diff --git a/www-apps/kibana-bin/kibana-bin-6.8.19.ebuild b/www-apps/kibana-bin/kibana-bin-6.8.19.ebuild
deleted file mode 100644
index 8b3812bc5d6b..000000000000
--- a/www-apps/kibana-bin/kibana-bin-6.8.19.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 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
-	<net-libs/nodejs-14
-	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-6.8.17.ebuild b/www-apps/kibana-bin/kibana-bin-6.8.22.ebuild
index 8b3812bc5d6b..8b3812bc5d6b 100644
--- a/www-apps/kibana-bin/kibana-bin-6.8.17.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-6.8.22.ebuild
diff --git a/www-apps/kibana-bin/kibana-bin-7.13.4.ebuild b/www-apps/kibana-bin/kibana-bin-7.13.4.ebuild
deleted file mode 100644
index f04b3a03b6b0..000000000000
--- a/www-apps/kibana-bin/kibana-bin-7.13.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 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="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-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 Elastic-2.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	acct-group/kibana
-	acct-user/kibana
-	dev-libs/expat
-	dev-libs/nss
-	>=net-libs/nodejs-14.16.0
-	<net-libs/nodejs-15
-"
-
-# Do not complain about CFLAGS etc since we don't use them
-QA_FLAGS_IGNORED='.*'
-QA_PRESTRIPPED="
-	opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/headless_shell
-	opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/swiftshader/libEGL.so
-	opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/swiftshader/libGLESv2.so
-	opt/kibana/node_modules/re2/build/Release/re2.node
-"
-
-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 plugins to /var/lib/kibana
-	rm -r plugins || die
-
-	# handle node.js version with RDEPEND
-	sed -i /node_version_validator/d \
-		src/setup_node_env/index.js \
-		src/setup_node_env/no_transpilation.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-r1 ${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}/plugins
-	keepdir /var/log/${MY_PN}
-
-	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
-}
-
-pkg_postinst() {
-	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
-	elog "Node.js 14. 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.15.0.ebuild b/www-apps/kibana-bin/kibana-bin-7.15.0.ebuild
deleted file mode 100644
index f04b3a03b6b0..000000000000
--- a/www-apps/kibana-bin/kibana-bin-7.15.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 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="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-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 Elastic-2.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	acct-group/kibana
-	acct-user/kibana
-	dev-libs/expat
-	dev-libs/nss
-	>=net-libs/nodejs-14.16.0
-	<net-libs/nodejs-15
-"
-
-# Do not complain about CFLAGS etc since we don't use them
-QA_FLAGS_IGNORED='.*'
-QA_PRESTRIPPED="
-	opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/headless_shell
-	opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/swiftshader/libEGL.so
-	opt/kibana/x-pack/plugins/reporting/chromium/headless_shell-linux_x64/swiftshader/libGLESv2.so
-	opt/kibana/node_modules/re2/build/Release/re2.node
-"
-
-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 plugins to /var/lib/kibana
-	rm -r plugins || die
-
-	# handle node.js version with RDEPEND
-	sed -i /node_version_validator/d \
-		src/setup_node_env/index.js \
-		src/setup_node_env/no_transpilation.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-r1 ${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}/plugins
-	keepdir /var/log/${MY_PN}
-
-	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
-}
-
-pkg_postinst() {
-	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
-	elog "Node.js 14. 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.15.1.ebuild b/www-apps/kibana-bin/kibana-bin-7.16.2.ebuild
index a770ffca906a..dca15c372783 100644
--- a/www-apps/kibana-bin/kibana-bin-7.15.1.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-7.16.2.ebuild
@@ -22,8 +22,7 @@ RDEPEND="
 	acct-user/kibana
 	dev-libs/expat
 	dev-libs/nss
-	>=net-libs/nodejs-14.16.0
-	<net-libs/nodejs-15
+	>=net-libs/nodejs-16.13.0
 "
 
 # Do not complain about CFLAGS etc since we don't use them
@@ -53,8 +52,7 @@ src_prepare() {
 
 	# handle node.js version with RDEPEND
 	sed -i /node_version_validator/d \
-		src/setup_node_env/index.js \
-		src/setup_node_env/no_transpilation.js || die
+		src/setup_node_env/no_transpilation_dist.js || die
 }
 
 src_install() {
@@ -83,7 +81,7 @@ src_install() {
 
 pkg_postinst() {
 	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
-	elog "Node.js 14. Some plugins may fail with other versions of Node.js (Bug #656008)."
+	elog "Node.js 16. 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}"