gentoo resync : 17.06.2021

4 files changed, 187 insertions, 0 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 55400061e57a..3cb14eb656b0 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 777da320de6d..2aa4777c28c0 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -3,10 +3,15 @@ AUX kibana.initd 1019 BLAKE2B f57bce1793768f2936dc8cd3437aacbb4d4e034ac53612f010
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
 DIST kibana-6.8.15-linux-x86_64.tar.gz 188083650 BLAKE2B ce12b1f564f9059952402d53a43c4e2b5a550b69b8835460f870fdf772ce8881325239165677659f6bfc295e148831b3e0459e7a059f73d03e218260c8e5139e SHA512 7afbcd42f332b281106fc58397d7229aa3e3ac38aa9ffcd5d7e3edf32b084f6bf812eac002166099b4e270019651a0d6cb3a9ea06f93f5927c4b4329eb36a14e
+DIST kibana-6.8.16-linux-x86_64.tar.gz 185438137 BLAKE2B 50870e1b15f190210502d9df498b2d2d88de8055f81dba5cc424963419a950710ce85aadf0f65c539322583f09aae70dce224eea8763061e745fb4f3ce02ad38 SHA512 55a9f615eaf0f67704f8704211f2bff06d6f085f789c75dde2df95061632b0be5ceb3614eb4e38a602531b4c482ed3f8f303b902e08422e0556a8b19aaccecf3
 DIST kibana-7.12.0-linux-x86_64.tar.gz 281022115 BLAKE2B 6400dc95f0d2eb357cce46679ab3eb1043f873dcc5904cb1d1169d44fefdc8ca5bcde8c8d3990f951754c2448c12514ac4d0a355f817e5b9b5ce7bf52fb41d00 SHA512 0b6a9596698c64a65d82cc146dad8e24118eb8991b9ed36e13f309d2e3d7af408c35358a8b39899bf2daf260ddd8d50678d437a3dba32923fe026da99a526006
 DIST kibana-7.12.1-linux-x86_64.tar.gz 281051589 BLAKE2B 041ac27f3d58ad419cf6410fcd452dad34a205699701088eeea11056974429e27a1c980ddc2609a592ee1c33f73bde39724603c17c604973a5c80bf1c36e3a70 SHA512 f215ae38c6976e0926b57a3dcb639ba532b724a8195e791a33a09540865a49e7180bed1692a6530b149e0bd6c4dd130c1d6c2dc6022b3ec5b8ec7ec4dc977b17
+DIST kibana-7.13.2-linux-x86_64.tar.gz 305904726 BLAKE2B 4d71432f10cfcc5b56ab007092334a46b1699eba2b3990381d4212b5053c6f6476d2434341907939e213226dd4d03000f8d73e0b32890a9c1194ab934a95efb6 SHA512 e4b88dd0e0266f82e893d1040689aaa88c4541ea355603680cb60d0757d5dbca8e628c65d9d74a1f898afa6926bb8d79f9008361c44c4f0cfc3284b07087ac37
 DIST kibana-oss-6.8.15-linux-x86_64.tar.gz 70468224 BLAKE2B 5ad359cef5082035eaefe277128f8badce8539484f30399d504efe8fe645b1e925f22126a48bf3ef89efc466eff641241e109372ca84f34d2ac4014aeec1868a SHA512 ef67258e2f3d3f447a53ec23d519f13ea50a65f3fde7215352178a6efad9b20c9ce5ade14c4a185c2005b9ec29c997e40e435a0129dd4d03adeaaa21868c9a22
+DIST kibana-oss-6.8.16-linux-x86_64.tar.gz 67967956 BLAKE2B 3b1fcb88fb696c180b5e81219112598f4f156c6a9cb40535aa99cced65dbc8e441c31e9f0c43fd86d0a06cc154c1e5cafc2e8256303c0d65ed7c1c269edac7c2 SHA512 7b2962c78c33e535068ac11d050abcd4a3aa662c533d0ca2d918751ece6fcd84ef08862d1767dd9564d480dc200bd65b7a7199f543e3d5c3fc125ac3d3f4f902
 EBUILD kibana-bin-6.8.15.ebuild 2524 BLAKE2B 1c3fd84640cf6fbb363b79410db8b5efd9a49bd2a7ef8f55cc3e3d590ee67a6b11782f368fa631cd9866344dfaccd38789efa2050a15227f39ae91406688f87b SHA512 7b36816cbadc0edc36714b81823fc2a21001337907204651a56b5c0245647af8b2c1e2ec40349ab344696971be969fd3c42ace58e3f9a7b17885751a4e351136
+EBUILD kibana-bin-6.8.16.ebuild 2524 BLAKE2B 1c3fd84640cf6fbb363b79410db8b5efd9a49bd2a7ef8f55cc3e3d590ee67a6b11782f368fa631cd9866344dfaccd38789efa2050a15227f39ae91406688f87b SHA512 7b36816cbadc0edc36714b81823fc2a21001337907204651a56b5c0245647af8b2c1e2ec40349ab344696971be969fd3c42ace58e3f9a7b17885751a4e351136
 EBUILD kibana-bin-7.12.0-r1.ebuild 2635 BLAKE2B c5d247f7732c7fc8cd06c54c6f555d532536ad82faa36afb5a983e542e338974d5a92a96f52b5b82f193d90bffa8fb0dcdef921de5707214ad120c61615fbc64 SHA512 c4373a9b1a56c27c68ff2977d2412c87e6e1604d2d26a4403ca227912d2c6e5c499e3e2f40fd4bad586c7960fdce8930aa4fea70bf177d58ebfb9073b4dc9fca
 EBUILD kibana-bin-7.12.1.ebuild 2537 BLAKE2B d01242c393c73232af9b9c6ba4d16201c9a7e2e847d09df7484c26982d0928fbdf4f74548b5667320505efc1cb9edc5f931f2b22d9f5f8ade74333c54b8ebebe SHA512 ce3432f6a6ba0476880c3e66e8103456624ac46fb807162e118fb3c944e802ef283dd6a5b7405352acbe62a5f04d1381a025c0036b24917b53422d2f42cbd62c
+EBUILD kibana-bin-7.13.2.ebuild 2537 BLAKE2B d01242c393c73232af9b9c6ba4d16201c9a7e2e847d09df7484c26982d0928fbdf4f74548b5667320505efc1cb9edc5f931f2b22d9f5f8ade74333c54b8ebebe SHA512 ce3432f6a6ba0476880c3e66e8103456624ac46fb807162e118fb3c944e802ef283dd6a5b7405352acbe62a5f04d1381a025c0036b24917b53422d2f42cbd62c
 MISC metadata.xml 690 BLAKE2B 760ed33239b72e0464be29979034d3ea1ab4e44b9645f76088a5aff5d8d1812a9eb3c42dc218d35139898592580d7fa80e19115249df96552201c05b37470be1 SHA512 4d6347db943b11b799884dcc266bc4b4cb8de6516d64a9eb689d952ea9202f4efbf8f5c950c3502d4e30793d012a080f34c653b8563ad63b1701ae7afe8de7c3
diff --git a/www-apps/kibana-bin/kibana-bin-6.8.16.ebuild b/www-apps/kibana-bin/kibana-bin-6.8.16.ebuild
new file mode 100644
index 000000000000..8b3812bc5d6b
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-6.8.16.ebuild
@@ -0,0 +1,89 @@
+# 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-7.13.2.ebuild b/www-apps/kibana-bin/kibana-bin-7.13.2.ebuild
new file mode 100644
index 000000000000..394a86442834
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-7.13.2.ebuild
@@ -0,0 +1,93 @@
+# 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 ${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."
+}