gentoo resync : 14.07.2018

4 files changed, 25 insertions, 16 deletions

diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 69b42811e552..a64364d8c402 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -2,10 +2,10 @@ 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.9-linux-x86_64.tar.gz 52381284 BLAKE2B 962891ada991f718bb3a1445ec369db0e71e27aa76fb0170d57dfa66ea2b3e14289412464ec6c6b687e09fb3cad77a7900985dbcbd7fb29e103b06ba6cc8aa9c SHA512 e30fd6735b5fa510b81ba70a66faf2ff57ea01bcc0b0379607173d7a8cef44628efcaa0bd055b3f6672f7874c616c0d99b353a0e14d354879a9675fd367676fa
-DIST kibana-6.2.2-linux-x86_64.tar.gz 83415765 BLAKE2B 86f7511c82b6954a8769673b856eb46f2b633490535a013d4e30138e8abee470776493de43284f2e68b2cac6b74ba2b76245fd35803b8b5834f79ea5f488dd6b SHA512 8d26eb8293028aa0c35942a7b5025401f9b717d5c548d6cdbcf2761c0d8cc1189fdbf12c6f39468d4c809a3975f5f3c817e0f02424b296ce36183e118b0c72c6
+DIST kibana-5.6.10-linux-x86_64.tar.gz 52586941 BLAKE2B cb4e1716c640c80be980541e5496a96fc6baa04152e11f754b46dc71a9995809038b8a82c3404d9d86d1bd0381e9fc55fca44c66f046cb41e005c760aa077092 SHA512 c56c600c79bf2f5d2991d6c1442db300c78dd4135bf8dec5b9f500d609e2f041d09649195cfdae2f6d30cf8de2c2c865ac607283f865c4aa8ec1d400af84c270
 DIST kibana-6.2.4-linux-x86_64.tar.gz 85348919 BLAKE2B ce062a5a7d96c0266143f1091f7dbe5ade6236068a73f6fedbe253957f7ddf2d00b441d985f72e9936aa3bfa7ecd9e7b7672b301b726a7d78c3e2b71d52c3b24 SHA512 125c2002e1a3b197f9f0d6200f2979f2e5974a902bfec2baa4b34a0c8d55babccafdb87b8a7b69c61ca4c02b8ae97e69b9b2743f7d445f0e53e31c69288296d5
-EBUILD kibana-bin-5.6.9.ebuild 1521 BLAKE2B f6deedf6e6bd6aa2c645bd0ce609b93a9dfd70cd795c3164c4f7f00ab757f3d97229a65b17f17332b2f1d78c0553e8cc1ca23047109705ca35e37e1165ba7f8a SHA512 c6b20242490afebfb80a9cda7b2444b4b6889ddfa44d2bb5c5a0e4ccdc1ed55cffc7b7bb5530d0e7f91e662209dea0a2ac35e23304dee76268de0a43391e5202
-EBUILD kibana-bin-6.2.2.ebuild 1429 BLAKE2B f5900166bb79afe612922cd5193249a83daa63e889758ba9e1b5deeab0466e1f51d5403b2b2432a7afbefcff668d9a3de3120f93542630714e4c49ed7178715c SHA512 c9657f12d8ab28df467835cad4c845d20fa1d196532102493fe015d2a11a6b44333c6474ee69a6a5909b2043c1e18d1f9d36845d66131a94616eecc639229909
-EBUILD kibana-bin-6.2.4.ebuild 1654 BLAKE2B 0d7112ba0229cd359d47ef9422e19fdebfc533cfaff331465496da16e9a41d43ee36e7c8762fda32610272a063b83ceda09767319ce081f960c2520be2e163f9 SHA512 64168cc84aa586b7cf96b448c0edb7b7181636d87af791d1fc1357ce51966638f18e25f71a3a5179e73f1505bff4d8b13ee5c7c38fcd8659ce7ffc5c860aef36
+DIST kibana-oss-6.3.1-linux-x86_64.tar.gz 89617065 BLAKE2B bdadf0ddecb060d64ed07f4f3f62934b4ae686f00d1dafbe8030acf95431b13049f53ffe7a6f8eb695d9cb1dc45151110f430c1953e1c0e1edd3656819ee0cb8 SHA512 6be02af23878dae1d48b81e8a46704f35a0bc136dd0952d997ba1f00d080868960fc3fc86d37e1e1fad5acb74dc2345e09ccc7d27862575d5783708d058c6831
+EBUILD kibana-bin-5.6.10.ebuild 1612 BLAKE2B fba7f593b8a2bbed90cf316f4c7f118fb65204efb9be4ebd81480f0ddc0333648a6478bb4fe0d2c1bda61e7ed355f084647d55c62685852daab3c0182b1f7476 SHA512 eb15aae68dec70c34af29140039ec0e16ccc8721817df07ff191eb18ea81bd1d4872b37ade34b74ca5470847b158d90d81c4e0b123073c5bee89854ad41f3c76
+EBUILD kibana-bin-6.2.4.ebuild 1745 BLAKE2B d95296e03ddf57600d331095322c847d7bed1d078da13ba77ecfaf4d45ee6e3a6b148beb086eceaa998ee7f0b7bd0628b093d8eb5a819e470868a31fb0c75df8 SHA512 aad7d437c13a237f86a743f90f71cb8bfedf705eba09f53271c888cd191364e4c51f682b854a5515f9cc10623631f37b11d05cd8e85bd55384c02d1d9321d718
+EBUILD kibana-bin-6.3.1.ebuild 1756 BLAKE2B 270ab6f83343ac29f3cf73d58f4366e8d0ca47db163eea15c50609ff4b572a0b80e243d3e66c53f34c4f640158f841b8c2c53a5ac84c2e164a8b31418ecc0be9 SHA512 32c3779f96f42220a720ffd4d3107be8304f6cc80145b473d3cdd64fb6b9fd5eabf9ed73a5f440af963361db08efca21defb5a6056b4812480e695efd64f3fc3
 MISC metadata.xml 462 BLAKE2B e46d1fa695c441eebcf417e41d8a28d04309768c8e91c97c3e5c6f7a165a284f229708c9d3b6860cfc5ee7b541cc77dae288a7df17468b30f7b2fda258b84359 SHA512 99681a4b9c1674467a8f4828246c0fc0a96d145c5c62cf751b8dbcc060a41b9327f58e5a53323454fa360bf4a5d576b3f01e7664cb0091f20c21b88d6a18b0a9
diff --git a/www-apps/kibana-bin/kibana-bin-5.6.9.ebuild b/www-apps/kibana-bin/kibana-bin-5.6.10.ebuild
index cb88e5913e4d..3a61facff7bb 100644
--- a/www-apps/kibana-bin/kibana-bin-5.6.9.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-5.6.10.ebuild
@@ -57,7 +57,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2)"
+	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+	elog "Node.js 6. Some plugins may fail with other versions of Node.js (Bug #656008)."
 	elog
 	elog "Be sure to point ES_INSTANCE to your Elasticsearch instance"
 	elog "in /etc/conf.d/${MY_PN}."
diff --git a/www-apps/kibana-bin/kibana-bin-6.2.4.ebuild b/www-apps/kibana-bin/kibana-bin-6.2.4.ebuild
index 481a185aa4b1..96789c5c5562 100644
--- a/www-apps/kibana-bin/kibana-bin-6.2.4.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-6.2.4.ebuild
@@ -58,7 +58,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2)"
+	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+	elog "Node.js 6. 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-6.2.2.ebuild b/www-apps/kibana-bin/kibana-bin-6.3.1.ebuild
index 8471d3d0b369..964f443c817e 100644
--- a/www-apps/kibana-bin/kibana-bin-6.2.2.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-6.3.1.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=6
 
-inherit user eapi7-ver
+inherit eapi7-ver 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="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz"
+SRC_URI="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"
@@ -30,33 +30,40 @@ src_prepare() {
 	default
 
 	# remove bundled nodejs
-	rm -rv node || die
+	rm -r node || die
+
+	# remove empty unused directory
+	rmdir data || die
 }
 
 src_install() {
-	keepdir /var/log/${MY_PN}
-
 	insinto /etc/${MY_PN}
 	doins -r config/.
-	rm -rv config || die
+	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 .
 
 	chmod +x "${ED%/}"/opt/${MY_PN}/bin/* || die
+
+	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
+	keepdir /var/log/${MY_PN}
 }
 
 pkg_postinst() {
-	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2)"
+	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+	elog "Node.js 8. Some plugins may fail with other versions of Node.js (Bug #656008)."
 	elog
-	elog "Be sure to point ES_INSTANCE to your Elasticsearch instance"
-	elog "in /etc/conf.d/${MY_PN}."
+	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."
 }