gentoo resync : 04.05.2018

4 files changed, 11 insertions, 134 deletions

diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 6275b31e8317..69b42811e552 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -2,14 +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.8-linux-x86_64.tar.gz 51974963 BLAKE2B d90b3e56e9d19c3846b7fae294d8bf27b89ffe462d8554e465bb5235741915ee65c1c6e58b94453ffbb80eaac17ede190300d614b25cf033d84231d87a46c6e9 SHA512 a819fc1166994364e94a47fa6f55f06e0672a6c5fc9bc8d594ad5ba48092033faafcc8fc70aae3c4b04300f96a9221683711bc2e2b5d343fd85d7dc22b173513
-DIST kibana-6.0.1-linux-x86_64.tar.gz 62720465 BLAKE2B 81c3cb130067483cc6138c5274555c01102e365d873bf753a534cbcd96487516af41fbb91878cea4f80ffc02c5d18c82d322b0530cf1d3a55adffeefe60d9574 SHA512 3761f8abff5d949631f365c228af2f205597e1f05137d0140917b35128d2dcb79e32db355873864c1f01bce06121af71f1bfcb1679ae25903e1121bc76f68ecc
-DIST kibana-6.1.2-linux-x86_64.tar.gz 65093343 BLAKE2B 08254af4fcc261a49f5f6e4e1c734acca799708394d95d3203d6355d1e9dc3fa6bfa3eb85b1cb40e5d52a4558b6ea202d54e87ff6274823767f8332a7b01b9c7 SHA512 eefe3ae73e08c0cd14c5c7d7f962dc78cdfff1096895a1ab539f172b84dfa0d8c197d99573ac7dea6c60adb89b5e3fd5be10dddd749c060c540b30c34426c8a1
+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-6.2.4-linux-x86_64.tar.gz 85348919 BLAKE2B ce062a5a7d96c0266143f1091f7dbe5ade6236068a73f6fedbe253957f7ddf2d00b441d985f72e9936aa3bfa7ecd9e7b7672b301b726a7d78c3e2b71d52c3b24 SHA512 125c2002e1a3b197f9f0d6200f2979f2e5974a902bfec2baa4b34a0c8d55babccafdb87b8a7b69c61ca4c02b8ae97e69b9b2743f7d445f0e53e31c69288296d5
-EBUILD kibana-bin-5.6.8.ebuild 1429 BLAKE2B f5900166bb79afe612922cd5193249a83daa63e889758ba9e1b5deeab0466e1f51d5403b2b2432a7afbefcff668d9a3de3120f93542630714e4c49ed7178715c SHA512 c9657f12d8ab28df467835cad4c845d20fa1d196532102493fe015d2a11a6b44333c6474ee69a6a5909b2043c1e18d1f9d36845d66131a94616eecc639229909
-EBUILD kibana-bin-6.0.1.ebuild 1412 BLAKE2B c4c69097fa674a92f675d7dddcd7a27c6741ee9c4dfe2307df8622adc191deecd868f29f7fd3da43c1a48dae072238f7fd33faf4d41a08a8ea3856b493ab32b9 SHA512 12d6802953ed1727dd1f9e90cf7e8cb194956a9e00a52faf64b6aebe03ea9d97efd58725e9dbb75d23d5a944a4e614db565e2018776f1e8ba0a1e2d066b6b441
-EBUILD kibana-bin-6.1.2.ebuild 1429 BLAKE2B f5900166bb79afe612922cd5193249a83daa63e889758ba9e1b5deeab0466e1f51d5403b2b2432a7afbefcff668d9a3de3120f93542630714e4c49ed7178715c SHA512 c9657f12d8ab28df467835cad4c845d20fa1d196532102493fe015d2a11a6b44333c6474ee69a6a5909b2043c1e18d1f9d36845d66131a94616eecc639229909
+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
 MISC metadata.xml 462 BLAKE2B e46d1fa695c441eebcf417e41d8a28d04309768c8e91c97c3e5c6f7a165a284f229708c9d3b6860cfc5ee7b541cc77dae288a7df17468b30f7b2fda258b84359 SHA512 99681a4b9c1674467a8f4828246c0fc0a96d145c5c62cf751b8dbcc060a41b9327f58e5a53323454fa360bf4a5d576b3f01e7664cb0091f20c21b88d6a18b0a9
diff --git a/www-apps/kibana-bin/kibana-bin-5.6.8.ebuild b/www-apps/kibana-bin/kibana-bin-5.6.9.ebuild
index 8471d3d0b369..cb88e5913e4d 100644
--- a/www-apps/kibana-bin/kibana-bin-5.6.8.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-5.6.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit user eapi7-ver
+inherit eapi7-ver user
 
 MY_PN="${PN%-bin}"
 MY_P=${MY_PN}-${PV}
@@ -30,15 +30,16 @@ 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}
@@ -50,6 +51,9 @@ src_install() {
 	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() {
diff --git a/www-apps/kibana-bin/kibana-bin-6.0.1.ebuild b/www-apps/kibana-bin/kibana-bin-6.0.1.ebuild
deleted file mode 100644
index 6f152c22bac7..000000000000
--- a/www-apps/kibana-bin/kibana-bin-6.0.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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"
-
-# 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"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="net-libs/nodejs"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
-}
-
-src_unpack() {
-	S="${WORKDIR}/${MY_P}-linux-x86_64"
-
-	default
-
-	# remove bundled nodejs
-	rm -rv "${S}"/node || die
-}
-
-src_install() {
-	keepdir /opt/${MY_PN}
-	keepdir /var/log/${MY_PN}
-	keepdir /etc/${MY_PN}
-
-	insinto /etc/${MY_PN}
-	doins config/*
-	rm -rv 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}
-
-	mv * "${ED%/}"/opt/${MY_PN} || die
-}
-
-pkg_postinst() {
-	elog "This version of Kibana is compatible with Elasticsearch 6.0"
-	elog
-	elog "Be sure to point ES_INSTANCE to your Elasticsearch instance"
-	elog "in /etc/conf.d/${MY_PN}."
-	elog
-	elog "Elasticsearch can run local or remote."
-}
diff --git a/www-apps/kibana-bin/kibana-bin-6.1.2.ebuild b/www-apps/kibana-bin/kibana-bin-6.1.2.ebuild
deleted file mode 100644
index 8471d3d0b369..000000000000
--- a/www-apps/kibana-bin/kibana-bin-6.1.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user eapi7-ver
-
-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 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="net-libs/nodejs"
-
-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 bundled nodejs
-	rm -rv node || die
-}
-
-src_install() {
-	keepdir /var/log/${MY_PN}
-
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	rm -rv 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}
-
-	insinto /opt/${MY_PN}
-	doins -r .
-
-	chmod +x "${ED%/}"/opt/${MY_PN}/bin/* || die
-}
-
-pkg_postinst() {
-	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2)"
-	elog
-	elog "Be sure to point ES_INSTANCE to your Elasticsearch instance"
-	elog "in /etc/conf.d/${MY_PN}."
-	elog
-	elog "Elasticsearch can run local or remote."
-}