gentoo resync : 28.04.2021

5 files changed, 25 insertions, 221 deletions

diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index bcc02b136587..834418d56525 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -2,19 +2,12 @@ AUX kibana.confd 72 BLAKE2B 786203cfc47132fedb989fbcaebc799ed566e15f2b0ced965798
 AUX kibana.initd 1019 BLAKE2B f57bce1793768f2936dc8cd3437aacbb4d4e034ac53612f01064cd5bcec7449a968242368abc3144f6436d8765c1738e7786147cbc1ecabed9c734035daf4669 SHA512 e5fd56da7fc83466c26acdbd3e9aa341676ac9221495f6f83c46263838c15951164d31ac7e62b732fba1c0e63c6e5c2c97681b15ac5409b74a5c090f72ae6383
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
-DIST kibana-6.8.13-linux-x86_64.tar.gz 188072148 BLAKE2B 452a09bc7d876b57b36a50feb38731ded18b959f48861da259d75234614dbf072ff9cfd817fe4c21a2c83515934f42f5ddc7e7e634dfc9e2b327ee9d4b2ac730 SHA512 14144900eac8985de0982eda88e44474ebbd828bf9efa0b6f02ae0627c711e145e28cfbc931f63d7bb5dc5b3ad1056cdc972990cddc36f7050a29a34d9472508
+DIST kibana-6.8.15-linux-x86_64.tar.gz 188083650 BLAKE2B ce12b1f564f9059952402d53a43c4e2b5a550b69b8835460f870fdf772ce8881325239165677659f6bfc295e148831b3e0459e7a059f73d03e218260c8e5139e SHA512 7afbcd42f332b281106fc58397d7229aa3e3ac38aa9ffcd5d7e3edf32b084f6bf812eac002166099b4e270019651a0d6cb3a9ea06f93f5927c4b4329eb36a14e
 DIST kibana-7.10.2-linux-x86_64.tar.gz 249171053 BLAKE2B 279b1f67a9aaaf6d4bd0a8ba6028794ce8a9a996c9e9daad0815f9dfe9c696748d4210a7496907ee4be8fac111a2f08cc6d84d8fdac0b959b4ce6ee48f712d1a SHA512 aa68f850cc09cf5dcb7c0b48bb8df788ca58eaad38d96141b8e59917fd38b42c728c0968f7cb2c8132c5aaeb595525cdde0859554346c496f53c569e03abe412
-DIST kibana-7.8.1-linux-x86_64.tar.gz 337517217 BLAKE2B 208933ef5efccea3e718ff5ef1bfa28a08c75ba3a1a91b1eb00020d33ec1df2c17e299d423be4d2f3c2c5bfcb6189a80ebade26753379148aa72d9f7901a2e8d SHA512 92f3717b2f9ea915570ee8587f1ad0c2a428c266e1cd7dcda485b8b81191c5c1b3155872299c56dbba8de93807b2cc67a0d197ecb2e8df44e09060d4fac1d759
-DIST kibana-7.9.2-linux-x86_64.tar.gz 295714192 BLAKE2B 74ddb493013a097b1501a27f3ddb06e2081a3ebeaa06c5340d2229bcad936e8ae2249530f487ed1b42e697f2fd04ed6cea5c784f35d68e06b0ea3036f9f25cad SHA512 79d7b836a93b496fa9dc58d3d2286ca6f6ad4d5c66558047a24841085b41c8beeae2a4f68a8883013b93e3036e029f76ebcb6e30080fc0b1979377b1f6d2b19a
-DIST kibana-7.9.3-linux-x86_64.tar.gz 295755102 BLAKE2B e803d92c396684ce56b8b1a82eabfb6c1a88344d07b46d8770ab93ced14cc02fc22fdefec9fa3dbf1e893d02078dd27f7f2fbf1a2445d9d4942dfb1caba92a8e SHA512 c82b0dc91f2e6e585c6187b357ad8da6078a9b17974f6574628161a54981ea64b2f0b6c2e85bb052d20d5d5f64210fae7fbc3f78d7f30722d6f1e5d095b0a2f7
-DIST kibana-oss-6.8.13-linux-x86_64.tar.gz 70392218 BLAKE2B 752119ec4251005dc13acc9c707df6c3d8975d32b610cfaff65884d07a232712fa90ae6dfa46bc0394e98efb94f7e1a1f974b4dcb76b1da5cd6cadded7ae15ba SHA512 58e3d52616ca306739642e7932ec2f6388231c966e6fd5ce3431fc39e46183745f90ae069d659ad6c59f5c1361220e012723ccccd7dc47f61f53bf6d14705cde
+DIST kibana-7.12.0-linux-x86_64.tar.gz 281022115 BLAKE2B 6400dc95f0d2eb357cce46679ab3eb1043f873dcc5904cb1d1169d44fefdc8ca5bcde8c8d3990f951754c2448c12514ac4d0a355f817e5b9b5ce7bf52fb41d00 SHA512 0b6a9596698c64a65d82cc146dad8e24118eb8991b9ed36e13f309d2e3d7af408c35358a8b39899bf2daf260ddd8d50678d437a3dba32923fe026da99a526006
+DIST kibana-oss-6.8.15-linux-x86_64.tar.gz 70468224 BLAKE2B 5ad359cef5082035eaefe277128f8badce8539484f30399d504efe8fe645b1e925f22126a48bf3ef89efc466eff641241e109372ca84f34d2ac4014aeec1868a SHA512 ef67258e2f3d3f447a53ec23d519f13ea50a65f3fde7215352178a6efad9b20c9ce5ade14c4a185c2005b9ec29c997e40e435a0129dd4d03adeaaa21868c9a22
 DIST kibana-oss-7.10.2-linux-x86_64.tar.gz 111701314 BLAKE2B b72ebac1d628cdf486b815d7b9bc87d14d09d21d86affdafa2b7809486649bd10f7d63ba832bb0841102915d5efefce2d4324df8314272a37774ea031fa59ef4 SHA512 77ebb247d5326f3f9ab97d57ecc00c7f70deae0e1857d8b5d8f9a5d05d6713e27514cca342df666be79ab85a580e9dc5c7fa9676d67e95db64a0d69546d8d699
-DIST kibana-oss-7.8.1-linux-x86_64.tar.gz 154344863 BLAKE2B 19fefe509efd2c803a017d5cc7ea262cfc3065c71a8dae04bbe99f7c2421a1b1a6ee0cbf298d2e7ab8b7283ef67b9f8f2c1db876136dbad7abedcc843b287db4 SHA512 381e467cb6f18892a5d5403e6eab640ffaf6ae2b76bc3e52eb94a377bf773e7dee631d0dc72162e276eafbc10c9c70629c106d25707921b32d2ebb18f69315ba
-DIST kibana-oss-7.9.2-linux-x86_64.tar.gz 137021505 BLAKE2B 6e27e40e94a925fe0b6e5fa94050f69088c9d4092428ec8024cfa5d1665f5f0cdc6bb1c3910360808bb4fd28d76bc1150d51aa7f9003121aeb2aef9f929233db SHA512 39d796324b744f0b34548f1d97e042c5aaa66004f052627cfe7cb5ac998ac45df510b76692c297443af1cdd36a75ffd172810969b788df0fa972feedd78c1719
-DIST kibana-oss-7.9.3-linux-x86_64.tar.gz 136992027 BLAKE2B c39b7325461780878cdd06f2f1abd5c3585f7014d6a6703c5ada429dc90686f1d065c9aa2b5bfd6735d609bed3bd2d4a31a6787ee644e63dd0b01b563dc7c900 SHA512 11b9ecaf5e8866b1b4d8bdd2004f3bfe801c2f5ee9bad8c83cd1a368ba2cfe46b357aabf1b1a50f5aef7852b2fd885642384327b3fd53977ec3fc404cf0e6eb8
-EBUILD kibana-bin-6.8.13.ebuild 2524 BLAKE2B 4f4f2b33c0cbe091624e4f17e4ed7eb3a2bffeb485396b204f8a94d105f872d5ae20e13103879f2a646bca6a534f3e287a0c0707ca5cba80a4b37363245b523c SHA512 0284afc873981e5ba1e88fb8cb82a2f5959827c34f1f707636fc0365e4a0269ba12fb696f6d69e865c2c0e123235d7f5dbf3c6b3075b93ababb10dbb01f6e4b3
+EBUILD kibana-bin-6.8.15.ebuild 2524 BLAKE2B 1c3fd84640cf6fbb363b79410db8b5efd9a49bd2a7ef8f55cc3e3d590ee67a6b11782f368fa631cd9866344dfaccd38789efa2050a15227f39ae91406688f87b SHA512 7b36816cbadc0edc36714b81823fc2a21001337907204651a56b5c0245647af8b2c1e2ec40349ab344696971be969fd3c42ace58e3f9a7b17885751a4e351136
 EBUILD kibana-bin-7.10.2.ebuild 2341 BLAKE2B 01aa588dcc73058f0fd8ecbec786ff2b9e1f8ea3d82b50970599d2a9ced5658a36f447a117eb2b782fcaba606a4f14c5bfc0e11fa797fb593e5215c382c26fda SHA512 d95fc8e7fc727aa7928a1e011d6d25f64eea5492db94c1467597e00cb77a8ada82e28387c6b7d42829cab4c83c90d1678d289b188932220b3df45a437ef6bdac
-EBUILD kibana-bin-7.8.1.ebuild 2585 BLAKE2B b152aa8fe53416ef91559212cb5d252b3a400fcfd7b150ff3aea74d1233a6521ce55a9fbdb47ae589ac91571bf054f80183ff77866877ce87b34e01c07183f78 SHA512 df76eb39f0b71060219f31870b586eb89ce0b6977a88bde7116dbf782510951ed4dcf9f887dea972caedaf3d33c244a09a7be280900b574249ab5fe830414cbe
-EBUILD kibana-bin-7.9.2.ebuild 2721 BLAKE2B 32d97c75fb84fa66d67275c8716933a97ee23fc740b8b056d11b0d3c540f9c32c46ff2d7d05dc286ea4c860661013b658a911cf260ec9a273d6b712255e6d8ad SHA512 77565eea714918199499115969a224d5bf2800f9ba70a30b0b5f9453af43a5886c1745e1f55b89cfe1375f43c0c89f32cc7168bf6f30aaa3b34fd06766ebae80
-EBUILD kibana-bin-7.9.3.ebuild 2721 BLAKE2B 32d97c75fb84fa66d67275c8716933a97ee23fc740b8b056d11b0d3c540f9c32c46ff2d7d05dc286ea4c860661013b658a911cf260ec9a273d6b712255e6d8ad SHA512 77565eea714918199499115969a224d5bf2800f9ba70a30b0b5f9453af43a5886c1745e1f55b89cfe1375f43c0c89f32cc7168bf6f30aaa3b34fd06766ebae80
+EBUILD kibana-bin-7.12.0-r1.ebuild 2635 BLAKE2B c5d247f7732c7fc8cd06c54c6f555d532536ad82faa36afb5a983e542e338974d5a92a96f52b5b82f193d90bffa8fb0dcdef921de5707214ad120c61615fbc64 SHA512 c4373a9b1a56c27c68ff2977d2412c87e6e1604d2d26a4403ca227912d2c6e5c499e3e2f40fd4bad586c7960fdce8930aa4fea70bf177d58ebfb9073b4dc9fca
 MISC metadata.xml 690 BLAKE2B 760ed33239b72e0464be29979034d3ea1ab4e44b9645f76088a5aff5d8d1812a9eb3c42dc218d35139898592580d7fa80e19115249df96552201c05b37470be1 SHA512 4d6347db943b11b799884dcc266bc4b4cb8de6516d64a9eb689d952ea9202f4efbf8f5c950c3502d4e30793d012a080f34c653b8563ad63b1701ae7afe8de7c3
diff --git a/www-apps/kibana-bin/kibana-bin-6.8.13.ebuild b/www-apps/kibana-bin/kibana-bin-6.8.15.ebuild
index d7369c1a0606..8b3812bc5d6b 100644
--- a/www-apps/kibana-bin/kibana-bin-6.8.13.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-6.8.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/www-apps/kibana-bin/kibana-bin-7.9.2.ebuild b/www-apps/kibana-bin/kibana-bin-7.12.0-r1.ebuild
index 78b3ade36ebd..bd31aba7f9b0 100644
--- a/www-apps/kibana-bin/kibana-bin-7.9.2.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-7.12.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,27 +10,31 @@ 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 )"
+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 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
+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"
-IUSE="x-pack"
 
 RDEPEND="
 	acct-group/kibana
 	acct-user/kibana
-	>=net-libs/nodejs-10.21.0
-	<net-libs/nodejs-14
-	x-pack? (
-		dev-libs/expat
-		dev-libs/nss
-	)"
+	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="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+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"
 
@@ -45,13 +49,13 @@ src_prepare() {
 	sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
 		bin/kibana || die
 
-	# move optimize/plugins to /var/lib/kibana
-	rm -r optimize plugins || 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/prebuilt_dev_only_entry.js || die
+		src/setup_node_env/no_transpilation.js || die
 }
 
 src_install() {
@@ -72,21 +76,15 @@ src_install() {
 	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 "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}"
diff --git a/www-apps/kibana-bin/kibana-bin-7.8.1.ebuild b/www-apps/kibana-bin/kibana-bin-7.8.1.ebuild
deleted file mode 100644
index a5b24aa852b6..000000000000
--- a/www-apps/kibana-bin/kibana-bin-7.8.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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
-	<net-libs/nodejs-14
-	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 || 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.3.ebuild b/www-apps/kibana-bin/kibana-bin-7.9.3.ebuild
deleted file mode 100644
index 78b3ade36ebd..000000000000
--- a/www-apps/kibana-bin/kibana-bin-7.9.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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
-	<net-libs/nodejs-14
-	x-pack? (
-		dev-libs/expat
-		dev-libs/nss
-	)"
-
-# Do not complain about CFLAGS etc since we don't use them
-QA_FLAGS_IGNORED='.*'
-
-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
-}
-
-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."
-}