www-apps/kibana-bin: bump to 6.8.21/7.16.1, drop old

Bug: https://bugs.gentoo.org/828969
Signed-off-by: Tomáš Mózes <hydrapolic@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>

7 files changed, 7 insertions, 295 deletions

diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 1cd85b20f19e..51c0de55ebac 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -1,7 +1,3 @@
-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
+DIST kibana-6.8.21-linux-x86_64.tar.gz 186911975 BLAKE2B 079675ed43903af1cc3c2b281997e5ac5238697f4ee8d6fed03e4080910bc61f45801a3b2deb717937bf6f1d952b3c574a09b0a2b436a320b4239101dbec993a SHA512 ef4960a5af8ba1255d4979494638f85315fe0671363157a1d7487fd6bd0319bf64cf4a4f0c10810fba120eac8a93bd190e052b16d24323f7a83d24326327d820
+DIST kibana-7.16.1-linux-x86_64.tar.gz 280881993 BLAKE2B 34ec0f4b5f9742c36334f9915c427583da855923ea767ceb87e59b80213c8b5c10583dc0420e166b502bfed48a33dc1fb0f892e46d65bd2ec1531172901a48fc SHA512 7c5bd24edc2de01ce49ab92636049288a8b20f25defca49dde21aed39b18e1062e0bc8723ba0b3ccb89c84c62cfe25f6319457972da67cb01cb7e753af23526a
+DIST kibana-oss-6.8.21-linux-x86_64.tar.gz 67439710 BLAKE2B c57351d9ae6d49cc698c010ceb243be6b7c1c359b24cc5e31a463e8703dd9d0caecc3f6606efd1efaaf6f7ff245fe62eab1b405f6f5a2dc7c08251775e6b0cda SHA512 a7dc03f60ffb26dde312e38cf047a19adc0121e9953d39e5dc47391ddddb9f1ee0fd4ccbcf8ec0ccaca5c841ec9f8db62a3d22f2e6e24e43172c04644a1f0db7
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.21.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.21.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.1.ebuild
index a770ffca906a..2d5e9240bf04 100644
--- a/www-apps/kibana-bin/kibana-bin-7.15.1.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-7.16.1.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() {