gentoo resync : 28.04.2019

4 files changed, 183 insertions, 3 deletions

diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 0ceaccb215eb..786ad285ba65 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -2,9 +2,15 @@ AUX kibana.confd 72 BLAKE2B 786203cfc47132fedb989fbcaebc799ed566e15f2b0ced965798
 AUX kibana.initd 1015 BLAKE2B 4e8e3e22fdbc2cee3fe9b992f2118a57f82d8f099236842b787b8e66fa59a353fcc49364db31016bdec50e0c465b48c18f07236e828268e9a0b76ad3741bb3ec SHA512 cd89c1fc7846d4c553bf2abc7e3df851561a574ef70ba3c6709ee8e3016d0348093563c70e5800bf6ff2e977976835dc7bed30e5b191d60e5f3c5f17fb3adc7e
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
-DIST kibana-5.6.15-linux-x86_64.tar.gz 53411172 BLAKE2B a5c961f14614f242e269375040f1f1f05cd510248bc4196409ed53fcf64edf26233268ba86ea8eb7332094504bf779076a12603c3be51efd0716d0f3637b110b SHA512 eede5afbd11bdc84f435567a5d48f53f1a72d6c94522597cb87c2cd295103b3a0ef0e7e43aa33f2731b91ef23f2ae6ccb3d6cbeb86cf3aa89317b61343f5fa8e
+DIST kibana-5.6.16-linux-x86_64.tar.gz 53468981 BLAKE2B dda2aacad7043e4ed259c194de95da143cfc8f4fef624ff783eb8323f9053afe3a9857e358df7aa0b1fa26e9b452ff5afe7480b7befb5504af95d730c1deea53 SHA512 e3b8cd5911444be3c8f39d2060216d968456cae123a3ac47805bbf1e3d5ca581ecfd061988655926a5c6243df0ea2e127e5cf6fe35d336df570cd5b82cfd338f
 DIST kibana-6.6.1-linux-x86_64.tar.gz 180675854 BLAKE2B 7c911f6715f1bb526e09a47de55b10b197dd78bcd5c9a6e710890cd333d23c8556d8efb12d34b0c0cdf1e989bb456da8f79e54b1798c02ea57658d90fbb80f83 SHA512 df4547a0056b46d6351948e7f67439b5a7fe46c27f20c9cb7783046abea04d28aa85ba74751f54c7a1524dbca55ee9c9bfaec50be903f964dedc1ceeb5d823b0
+DIST kibana-6.7.1-linux-x86_64.tar.gz 186430753 BLAKE2B 10d3b4d7996ee88ea3fc7062585dd0b00618650779e779c2fc18dcb9e0c62d964abb2806997f0712c495fb54ad2399a8b55745c67b6ff77ec1fa8e6041e7a075 SHA512 5ad5af43c18f12312d8bf5b50e8550ed8a008fb36efddb1756498c6a44cbb40cfa3ae7d307f5cb88daee0690dfd3aacfbb7bd526f098c140886a821af4b28e9d
+DIST kibana-7.0.0-linux-x86_64.tar.gz 167679944 BLAKE2B 55e1e36134861a063e6a2e844e717fc1e90130403d1f08be87c27582b822e866d8703b7a16a9cf1371ec65e0ff1a314bf6e838ce4b1b5905911325a1a4850b5a SHA512 647dd3900d70dfcf7c8f97d8a020f204b4e2f11c2fc23b4733618ad931f7876b37bfd885809632bbd05fdac75fbc0e233d48367ddb34801e1450b452af8e3f4a
 DIST kibana-oss-6.6.1-linux-x86_64.tar.gz 59466869 BLAKE2B 593563976b4d1c89b6042dbd1a945c6fc7ae2a8c3ea18d142d9e7e5f8307d72e7b358059316130880c64c6879e5df41d80005a1dad82d8a5ae223bf292bdf392 SHA512 1131ce7cab882166478be89426a8885fb53e2b1154100b6fa5dd0a431b1d9aa20df73c687159c18e1b9703e42f953fb10b3ab7fbfe634ed253331238249bf574
-EBUILD kibana-bin-5.6.15.ebuild 1684 BLAKE2B 5acc3ec74845e30c985ebaf24be06a246ee1317d67ca0275718a5bac7ef8be4642ee2068f13d7377dc3ba453812a6b4bbaaa3c6056bda10ac832b4658271115c SHA512 218dbe3e59fa38cdfce7c50d33ddc9daf48a3b6f908590bee087ad181a21c835c7883bc1a9f2e03f979cce39ec8c1784c534efc882bca578317b9cfd30665189
+DIST kibana-oss-6.7.1-linux-x86_64.tar.gz 62807564 BLAKE2B 8fec550769f4a2a88a4fab72b0ecb49d81d25d2f13d365cfefce2f70ed5c088a72f750a0b5807d729621a78c7fe393a5f9875012b6559aa82bb049083eaff5bf SHA512 309c25a16d535b1c5f0853ea89b7b69b61e3472afdabdd6f60a86fabba4c76c034b620cbe3d7f988cc78d21e5ed058b4f97e4995d868876a55fcc30769822882
+DIST kibana-oss-7.0.0-linux-x86_64.tar.gz 70548795 BLAKE2B b41f6073548f1cf09fd1e49504775f4802a1e86ed561870b60507054583f73bc0c531fadb831c7145d5234832eabf94a1b7e23ba78c88481be154d4b24ee07c4 SHA512 091ab4fbf0aec782307b7313dec82e6437be4cb76efac49eed6434c393e9adda3f925d6a75be4b78c9768c943168881dc38aa7b1b23462af80d5d158b3806136
+EBUILD kibana-bin-5.6.16.ebuild 1684 BLAKE2B 7f2226c849036d14b3d9226902237a456251b1ed7d765394e4dc9cb969d98b9d12abb5a065858e46b074c588242e8612e5ed81b3e40e0fe92007b6106029d772 SHA512 35b7685abc2aac386fcfbad7f7685534967bc2d34c4aab7b39dbe0642428bf61ea3c5dd9aa49f82f6393f786b7389a60b7ddf4c543c5cfdd9689b15dced7cf04
 EBUILD kibana-bin-6.6.1.ebuild 1983 BLAKE2B bcb04b1069e796f06affb4b020ac3659d5ade023d947222db02423c1d222fa2f92f0e269e2bc430fb1b2b63901cee84bedd84c82a16d17c0d3780e6c505d5196 SHA512 5d59d675f38a990fba0c1c76e155a7a0f19444563e511dbdba425a639c59e9b9f4d7d3bc2c1ce0fe18775929d88682dc66b30a03211d4721794eb7e7aed922b8
+EBUILD kibana-bin-6.7.1.ebuild 2508 BLAKE2B f3fb5262c8c37518909ed910b33ac5407d2314b54ebe1411d47924571994e0488767781fa52e826680276c56217b2f641a7b7c948ccfc78ac703277e3cf7288b SHA512 4454a2cca319cd23a6ee6b5cbf2e9019163c61fc30df07eee83e98a0f02420e548a398e6dd624a3fbd2c51bb8c22898bd3f0eed47e5a9be94f6ceedf6130cdcb
+EBUILD kibana-bin-7.0.0.ebuild 2575 BLAKE2B a5adfc1d6e352420452ec8aa16cb72b5189aebf640c20be06fcb9e5f64b54ec81ed601cfaa6b5121695e65ea282bbd030ec231d567aae346c6683123c18c6919 SHA512 c51939d86d84c6df489c8c9dfa5827dd64b3a484bdb71a0e6c996387cc0274e58f3701618f3c6c2e68f8f2fbc2141024315345d2040eba312bb71f82ee354aca
 MISC metadata.xml 538 BLAKE2B 649a05badea8d1116854565d09820a8ce623c733d9d0d1cbded145fdc0dfcac2478273d99f686119adab16126149ad4da8f6feb0c7be9499f5721f31a259ec34 SHA512 f0e65883a644eeb57f2d11d0871631142665e74bf8820431ac8333a1cf3e40a0b517b5cca747adba173c7eab20b70311b7bd8de6c4fb5cee4982e044189e5256
diff --git a/www-apps/kibana-bin/kibana-bin-5.6.15.ebuild b/www-apps/kibana-bin/kibana-bin-5.6.16.ebuild
index d27bc3b0781e..a5b43acbd70c 100644
--- a/www-apps/kibana-bin/kibana-bin-5.6.15.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-5.6.16.ebuild
@@ -17,7 +17,7 @@ LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND=">=net-libs/nodejs-6.16.0"
+RDEPEND=">=net-libs/nodejs-6.17.0"
 
 # Do not complain about CFLAGS etc since kibana does not use them.
 QA_FLAGS_IGNORED='.*'
diff --git a/www-apps/kibana-bin/kibana-bin-6.7.1.ebuild b/www-apps/kibana-bin/kibana-bin-6.7.1.ebuild
new file mode 100644
index 000000000000..5d00a180e54a
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-6.7.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd user
+
+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=">=net-libs/nodejs-10.15.2"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
+}
+
+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.0.0.ebuild b/www-apps/kibana-bin/kibana-bin-7.0.0.ebuild
new file mode 100644
index 000000000000..1e24c466ef11
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-7.0.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd user
+
+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=">=net-libs/nodejs-10.15.2"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
+}
+
+src_prepare() {
+	default
+
+	# remove empty unused directory
+	rmdir 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."
+}