gentoo resync : 12.05.2022

5 files changed, 4 insertions, 191 deletions

diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 23fd18999b33..e3e201783bbc 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -3,11 +3,6 @@ AUX kibana.initd 1019 BLAKE2B f57bce1793768f2936dc8cd3437aacbb4d4e034ac53612f010
 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.23-linux-x86_64.tar.gz 186911401 BLAKE2B 4d0894b88c855bc64ed648489d8c7293965a6edee0ebb841f22c5779592a282dc6af800f39bcd4fd710242aa63365165616bd7a2cf17e8ca0a6560c7bc604256 SHA512 15226207e3606637fe5004bf7b994fa8d09a0b2860881f7539a70872e5480c6614a6181fbb1ec0effa24380bd7721a8bdd87dea152e628c6577684c1b13ee0a2
-DIST kibana-7.16.3-linux-x86_64.tar.gz 281044755 BLAKE2B f308f60615f66a7139ae4e39172900c571c6000879aa2c47f6ba906098e12cb1e0f244af2289b870c6d35bf10ce59d6bd9395678243bd77365aea0b650cc27f5 SHA512 a08198dac16d62a0167a37ed58d73004535eec0fe21e0be8bb4926a2bfb1a69e8d8a679e1a7537dcad72d7a5f25c35c8a233da7dd130df01d2fa47b848d18ca3
-DIST kibana-7.17.1-linux-x86_64.tar.gz 281738743 BLAKE2B ddc29593889c17d3f6bb353ac4445e6a50b30f5a2409576a1bb15cee60da72f2bb9ce099a75764e26336d479604a0402fdb7f3c570bf524459d3e3339b5e0e38 SHA512 7e2fd31bdc7199ff8889fc04b3c1370aa963909a3d693808f41493da6c1546b691c44bc61f1b69309eeca0d0cae39305932ff96f76bfa8ff469cfd5649abaf50
-DIST kibana-oss-6.8.23-linux-x86_64.tar.gz 67419004 BLAKE2B e7d7be6947cdb3d19efae9ca4113d22a70d3354632c57df266f0dff0b367caa01e3e0ee797ed6330f59cf4d4de63c7985c3504b0914445fb18ab696cbbaf98c1 SHA512 f6ffd8e8f957e08a6783b3decbab0f85654eb1386d7135e76c25799c76524957aa250f8bae43b220c0f14616071a63f5132ca73145d5a44ac8a52d106403a530
-EBUILD kibana-bin-6.8.23.ebuild 2524 BLAKE2B b9ed1e826f76a192c1de376442d5ed1653c40c87ca15cbcd7ea8048479f5d0d03755ba7449b4f432f91f8f69cb31931e9d7bf5f2989ea520bd24596f3aed9d82 SHA512 4145f5048d32d5dc5112f17370e5d8b90148960bf3369674f1e8bc00b1a0c9a143b5c962aceef6d4be5565f028cbd4608eb711b7b223a009f2200cd538e49f46
-EBUILD kibana-bin-7.16.3.ebuild 2492 BLAKE2B 53be56a97cc94b5bcbb291d603c0bdbed3d1166180c4cd840b1bb3bb08875d24dc231e2adf47b21917aeaec4f88464bc5533ae2e97727394a488a3bff890d46c SHA512 de8251fc77621f800367cbcecb8e8d07e6b5b9162f893a0131feab7be43840db858a46f7a009d17ca63cc7fee68d07b260e971e0b5610d026aba6caee59a963a
-EBUILD kibana-bin-7.17.1.ebuild 2492 BLAKE2B 53be56a97cc94b5bcbb291d603c0bdbed3d1166180c4cd840b1bb3bb08875d24dc231e2adf47b21917aeaec4f88464bc5533ae2e97727394a488a3bff890d46c SHA512 de8251fc77621f800367cbcecb8e8d07e6b5b9162f893a0131feab7be43840db858a46f7a009d17ca63cc7fee68d07b260e971e0b5610d026aba6caee59a963a
-MISC metadata.xml 569 BLAKE2B 66a1069bcf497973fbf62e9951912b3a39340a8c9e21ad2d09f297ee9d8680ddbee3fac02aab30e9b5ae463b40a2e9fd230c42a2f3ca42135869273e15a0cdc2 SHA512 2e812f2a8d31f4cf20d2252bab8795a0f25dab616592bb4da6e4cd1063ec7eae88f0bf136dfee2af19cc1dfe9e62ece4d36a2031d32bfa0aeba9925fabd8cdc6
+DIST kibana-7.17.3-linux-x86_64.tar.gz 263671680 BLAKE2B fe044050ffbc7f83428cb75f27bcab0afbabbe6ee69603067ceeffb13c673973f7413b8ea13ee6534bc1e96898b2955da0f16c41f254e7e8a56ea58d74032903 SHA512 ad675a4f7ae05dba56517435057d7698c967f71c5b4bca722583bc0075dde15b54757fb99cfa7ed64c488a1cc62b00a617cbd645b052829062be1cb30fc023cc
+EBUILD kibana-bin-7.17.3.ebuild 2507 BLAKE2B be8dfcce97d27cdc3ea405edb9213c9c317bbb6fafd8594b9d035a5e0e104933bc319cae10e05114bee4612bb50abe0c68a4b578011553a2c895be5202fe71ad SHA512 6b6b1ecf6cb208001f76a2f0a925e588f9e937f57755143673fec4df2171668e2cb4a87d245bed788c76bb84e0b21ab50acc5ea2d3311f3a2a64c1869d4440fc
+MISC metadata.xml 477 BLAKE2B 427185c252047ce2b2bbee8ddf2dbc9e59a6c701d3f0c6dec44158627d41f8266f8cedbba9b330c34bbc77335a5763598897fda097f6991a78f96ed9cce1f826 SHA512 6e158be025d255cf1a189bd02d4c9679aa96cc6b15985c321af0102498a760333fa82f4cc90aa3370820626c0d5478fb821eeef24c603d8dac82996447dc7c2c
diff --git a/www-apps/kibana-bin/kibana-bin-6.8.23.ebuild b/www-apps/kibana-bin/kibana-bin-6.8.23.ebuild
deleted file mode 100644
index 0c16c09d3126..000000000000
--- a/www-apps/kibana-bin/kibana-bin-6.8.23.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 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.17.1.ebuild b/www-apps/kibana-bin/kibana-bin-7.17.1.ebuild
deleted file mode 100644
index d13809c0d99b..000000000000
--- a/www-apps/kibana-bin/kibana-bin-7.17.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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-16.13.0
-"
-
-# 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/no_transpilation_dist.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 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}"
-	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.16.3.ebuild b/www-apps/kibana-bin/kibana-bin-7.17.3.ebuild
index d13809c0d99b..6082bc86be56 100644
--- a/www-apps/kibana-bin/kibana-bin-7.16.3.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-7.17.3.ebuild
@@ -21,6 +21,7 @@ RDEPEND="
 	acct-group/kibana
 	acct-user/kibana
 	dev-libs/expat
+	dev-libs/nspr
 	dev-libs/nss
 	>=net-libs/nodejs-16.13.0
 "
diff --git a/www-apps/kibana-bin/metadata.xml b/www-apps/kibana-bin/metadata.xml
index 239f72d67760..c1786678a5e5 100644
--- a/www-apps/kibana-bin/metadata.xml
+++ b/www-apps/kibana-bin/metadata.xml
@@ -12,7 +12,4 @@
 	<upstream>
 		<remote-id type="github">elastic/kibana</remote-id>
 	</upstream>
-	<use>
-		<flag name="x-pack">Enable additional features (may need a license)</flag>
-	</use>
 </pkgmetadata>