[gentoo-commits] repo/gentoo:master commit in: www-apps/kibana-bin/, www-apps/kibana-bin/files/

[Michael Palimaka]

commit:     a60c6f4162b32c7d923ac1be8bc6087af766313a
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Tue Jun 27 12:16:40 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 12:44:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a60c6f41

www-apps/kibana-bin: bump to 5.4.2, drop old

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 www-apps/kibana-bin/Manifest                       |  6 +-
 www-apps/kibana-bin/files/kibana.initd-r3          | 18 ------
 www-apps/kibana-bin/kibana-bin-4.6.4.ebuild        | 66 ----------------------
 ...na-bin-5.4.1.ebuild => kibana-bin-5.4.2.ebuild} |  0
 4 files changed, 2 insertions(+), 88 deletions(-)

diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 200ba7343dc..090f6fe65b4 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -1,10 +1,8 @@
-DIST kibana-4.6.4-linux-x86.tar.gz 35102428 SHA256 4c221ff74ae85218df86b0049154d5470217e1491292ed830f749046f76b3ab7 SHA512 e171c4fbb22db6ba615dc9a33090c4246bf09781c0f3be9d946a3e74ad6ccc98fc60af25848bb687caa8d0eaa604e2839c57d38b8f5f0f13bd0d9c0beb947ca7 WHIRLPOOL 1c6a418d18d84b9960676aa34cb98e8300ae4b214eaedf193d9ab3da56881eaf09d866599b2b8c6d89d4ded4043418785e3c97a665d5d5c7e4b255b55a2bffff
-DIST kibana-4.6.4-linux-x86_64.tar.gz 35651364 SHA256 05699ab7810d1291d555b429081e0299575270e0eb06491af44ba76b355acead SHA512 9006adebbb2c6980bbe3dc1cb9e21a2657dfced9e5b07b5176782ecda0a8c687478c06a9ba353c54720efb690f54626797628ebe35366a0ffd07c5f71bb8bc84 WHIRLPOOL a8411bcd56bf8704089ebc30a06ce5f4386c1a4146f00be49e6c34981402daf3ba0c56b91a1c05b4ad81e2d3181a9106e39066cb233d8456a1fa3fe4c36860c5
 DIST kibana-5.1.2-linux-x86.tar.gz 38506277 SHA256 e612e0669de687d20ac9896c4cb7a1d7a2bdcb7205af531188013044d659ab90 SHA512 f8d80f3c8d9643dcbf5abb8035dbde15b48f099a1bba9a9d7b18c9894f4d9cb427bc5b850d4005182cde127f9967b2d2786964518637c5312e00020e0fe8e68e WHIRLPOOL abf990db0cf0fd50f6f4d4ea1a56703d955b603b0c80b61860800886546fadd1d79fe402cfa31aa414169290f623c1877e1826c3c4dccaad230657360289d785
 DIST kibana-5.1.2-linux-x86_64.tar.gz 39069457 SHA256 c2e30b9581e7222e8f2536d4b08087dc282a6b31a24ec0e43b905507fe2f2b04 SHA512 d1bebb18d1b3af49b7306f6192ba46bf2485b2eb9a6ddbe9028b5dec921104fbd22ab44d028a9d8ca16730d8f8f7533abb79561b420620859a32edda07369b01 WHIRLPOOL cecadd767316d1404bf60afd57dcb52da289197d173bffd5e320daa4a31c43624ff3ca4f75569916ec960beb2e5a4626159c5eaa26846060331e2bff879b3439
 DIST kibana-5.2.2-linux-x86.tar.gz 38297223 SHA256 de0421728aca00e9d4114b45ad5519b843b700006eb0795fcc2df4371d6baa1d SHA512 189def5722ac05e58cec27902a9e72ddb9bcbf65183ce7cd488e30000cabbfa934e10765a68cc2efaca190cfc148adb0b85d0edd6d15dc557a1fae6bed3c9f2e WHIRLPOOL 2d1257ae2f641ac2b83decc8aec191fd0351ab6a821cda906ea176d1a37ac2bd7476046cac15e43e3ea18bbd230dc6cf2d62c03c541232a1aa153c1b41c6bbc1
 DIST kibana-5.2.2-linux-x86_64.tar.gz 38853061 SHA256 9c7c526ce286da7f63aed9fb9f9d752ec182ff16bf374c55e55e5a0536a33563 SHA512 15e3c7919e24f0161b734e80513747655d7dad9996c26c07f96a4b4fe8408cae310f01b518d0555d8bbfc883604b3c95a0e4323fdb0c675d5e0ea384c2e7755c WHIRLPOOL d7e3e1cbf037eba0ff76b088eafd377a54d2f0962b416f6f85790bf781c9206026c5bb34dbe80ac8601bce7ed8274eec02667f95458057dcb8fda1de685405ed
 DIST kibana-5.3.3-linux-x86.tar.gz 38182559 SHA256 d5d2d3f234fc7f9bb1405733655755829ead2f29ee143fb77166252e6cf0bc8f SHA512 8607e2ca994fdcc5112e81b1603343926e808aede8f77ec95bb68bde535336926c0432a491c572453024f0106405a00b7e8dfaf6f6ba94c10f0ecfc52cae1ad7 WHIRLPOOL fab69d3be37c6d4c6ca40ddc32e4f1a55d8d065dbb88ead5bac8663104eb1877f4e5859abf36c0bf460a16d8d86fa423800b9e037b08b457c2b882b59afd94fd
 DIST kibana-5.3.3-linux-x86_64.tar.gz 38736812 SHA256 b35b955a705ed1f46acb20eac50931ddeb12e6b15357f65384a1c4cc47dcc6fb SHA512 e770a7f57cc4968a44e2e94598ba9f63be2cb971f1a943540d39301ee4233d37a8f5b20d5ea2a636ca368cbefada447f6cdb1dcf097b1831029cce904dabae13 WHIRLPOOL 5a064cb6fbe14384bf47959569e2bf5ca719bda528b886cbe3e782a5ac583db4c52675e41aac3f10f9d10ad1bc4fc1068967215b504e1732dd23d0ce22511753
-DIST kibana-5.4.1-linux-x86.tar.gz 53225669 SHA256 25b309435ae4760332e2072e80a83848852245f5c91af6f72bf09771a0bd73fa SHA512 5314d55ec0ae65fecb35f8ab178da847ca2170e313b116d6ac7816115d4d6b2c4555d1af3043ce95569a586abd4dd7b6fd686d4e60d3ddd6b65c0c2214e988f0 WHIRLPOOL ac3756a2558f82870327caacf2731a73eb20142e7a68f011bd5631960ac6f00a08e43f84b50c3cfc3ca4d3dea20134676c34073a838742ae995daaf8aef40e68
-DIST kibana-5.4.1-linux-x86_64.tar.gz 53791517 SHA256 efab73464c6cbc90089acf9275e43c7b3c2bbe8fb62c710567ac523a65c3394b SHA512 787f071452e6265bd1f9e2120077aaf3c1c42cf12aca4093248025e15560fa3953cdbb5b818ee3e5e770eebf35a61dab6f1c48b52772940fc63d4243462b7b5f WHIRLPOOL 2755695bf395bb2ce1407659d6eaf2387698ea8e21eacd4c66d30e3d7af73a4be03274f8613052d8fdddc71931ad6cc3f5ed96ade27c6647fc11d1d36c2d2f9e
+DIST kibana-5.4.2-linux-x86.tar.gz 52785621 SHA256 49497c7c90613da6034af6a47104f47dc1934f2a992fbd2c3120e7fd6b0fd4ed SHA512 88b9f81592035340cd2d7510976b6f0705bddd131727e5c0328d684dbc708420f9c6d571a8f2594b4bf9bff039b946b539ca6727d369f3a2cce85185ddb8d7cc WHIRLPOOL 9234613f58bee9d4300b10c81315a3faabb548f0faf8f733073fa9501fd1951e3319d6ff9a7dca451bef3e82cea68894f13134206452020a6389ebd3d1dfe3d4
+DIST kibana-5.4.2-linux-x86_64.tar.gz 53346622 SHA256 dec4de4f7510a0a1567f2f1862ace2b48abb7d82164e6144d1f71aa345eb732c SHA512 e235b51482b5438875964d0333de6ab01c86ba84257c4ec6c17061bbfbb0a40269561791421a73dcc9cb08ed8055d0192ec6ff7be2bd8759ca4fab515185ef95 WHIRLPOOL b11ddc0557591e5d6774c9fe7f53726a9724d2c5d4d95db190a2c45906a69e7f44afe9871f37a99f6e0be38778ef6cf8ddf3ce369c785ed3a4fb6b7613632ef8

diff --git a/www-apps/kibana-bin/files/kibana.initd-r3 b/www-apps/kibana-bin/files/kibana.initd-r3
deleted file mode 100644
index 99f78bf5427..00000000000
--- a/www-apps/kibana-bin/files/kibana.initd-r3
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-KIBANA_USER=${KIBANA_USER:-kibana}
-KIBANA_CONFIG=${KIBANA_CONFIG:-/etc/kibana/kibana.yml}
-
-command="/opt/kibana/bin/kibana"
-command_args="--elasticsearch ${ES_INSTANCE} --config ${KIBANA_CONFIG}"
-
-pidfile="/run/kibana.pid"
-command_background="true"
-start_stop_daemon_args="--user=\"${KIBANA_USER}\" --stdout /var/log/kibana/kibana.log --stderr /var/log/kibana/kibana.err"
-
-start_pre() {
-	checkpath -d -o "${KIBANA_USER}" -m750 "/var/log/kibana"
-	checkpath -f -o "${KIBANA_USER}" -m644 "/opt/kibana/optimize/.babelcache.json"
-}

diff --git a/www-apps/kibana-bin/kibana-bin-4.6.4.ebuild b/www-apps/kibana-bin/kibana-bin-4.6.4.ebuild
deleted file mode 100644
index 70cbda6ab4d..00000000000
--- a/www-apps/kibana-bin/kibana-bin-4.6.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pax-utils user
-
-MY_PN="${PN%-bin}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Explore and visualize data"
-HOMEPAGE="https://www.elastic.co/products/kibana"
-SRC_URI="amd64? ( https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
-	x86? ( https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}-linux-x86.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/kibana/node/bin/node"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
-}
-
-src_unpack() {
-	if use amd64; then
-		S="${WORKDIR}/${MY_P}-linux-x86_64"
-	elif use x86; then
-		S="${WORKDIR}/${MY_P}-linux-x86"
-	fi
-
-	default
-}
-
-src_install() {
-	keepdir /opt/${MY_PN}
-	keepdir /var/log/${MY_PN}
-	keepdir /etc/${MY_PN}
-
-	insinto /etc/${MY_PN}
-	doins config/*
-	rm -rf 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-r3 ${MY_PN}
-
-	mv * "${ED%/}"/opt/${MY_PN} || die
-
-	# bug 567934
-	pax-mark m "${ED%/}/opt/${MY_PN}/node/bin/node"
-}
-
-pkg_postinst() {
-	elog "This version of Kibana is compatible with Elasticsearch 2.4"
-	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-5.4.1.ebuild b/www-apps/kibana-bin/kibana-bin-5.4.2.ebuild
similarity index 100%
rename from www-apps/kibana-bin/kibana-bin-5.4.1.ebuild
rename to www-apps/kibana-bin/kibana-bin-5.4.2.ebuild