commit:     ec1ff8c1242a171cabf1a0ef8182b2ad0ab86119
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Aug 28 04:21:48 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 21:46:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec1ff8c1

www-apps/kibana-bin: bump to 6.8.12/7.9.0

Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 www-apps/kibana-bin/Manifest                 |  4 ++
 www-apps/kibana-bin/kibana-bin-6.8.12.ebuild | 88 +++++++++++++++++++++++++
 www-apps/kibana-bin/kibana-bin-7.9.0.ebuild  | 96 ++++++++++++++++++++++++++++
 3 files changed, 188 insertions(+)

diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index fc2810f7c36..dd1415fa3d6 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -1,4 +1,8 @@
 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

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 00000000000..43ac4ff48df
--- /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 00000000000..050593e2ba7
--- /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."
+}

Reply via email to