[gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/

["Patrice Clement" <monsieurp@gentoo.org>]

commit:     2b777e443c06c2dd1345242602ec5c7c42a06086
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Mon Sep  5 05:26:39 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 06:52:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b777e44

app-admin/logstash-bin: drop old.

Gentoo-Bug: https://bugs.gentoo.org/592544

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2242

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 app-admin/logstash-bin/Manifest                    |  3 -
 app-admin/logstash-bin/logstash-bin-2.3.2.ebuild   | 64 ---------------------
 app-admin/logstash-bin/logstash-bin-2.3.3.ebuild   | 65 ----------------------
 app-admin/logstash-bin/logstash-bin-2.3.4.ebuild   |  2 +-
 ...n-2.4.0-r1.ebuild => logstash-bin-2.4.0.ebuild} |  4 +-
 5 files changed, 3 insertions(+), 135 deletions(-)

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 723e0cc..9bce917 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,6 +1,3 @@
-DIST logstash-2.3.2.tar.gz 74898843 SHA256 b3c9d943fa273c8087386736ef6809df9c5959bab870a6ab4723f58d48dd38c1 SHA512 87b97ae0548328fe56ab4f2104b4c63db6a424bb5937e7be043f5835d08bcd02fbcb403d5cc9312b72d5314abfce2b4b00016b9b380fb88abed690d8d80e8c55 WHIRLPOOL afa2a53230b3e5390c4c4d2a84a168ed2d6c56babf927fe4b8c3cb2dab49def8457e8df45d33ca020b11d49b52397f5abb6604fb1d8fecd3c9b033f426130bd9
-DIST logstash-2.3.3.tar.gz 78887475 SHA256 51a20fbfe2aa0c5ea49ceda8278a4667289fd1871cf7be4ba1c32bd6cbc71d74 SHA512 b1b6ab8e323a01a905c923c24916efe7a1b1165c82d692dbd856b8cdb30ab2e3378c5dfec2e6424c8d44813a1bd8a787075a6f9d82ecbd0d6973d8cdfb1b8193 WHIRLPOOL d280c413bdcf50d5cc7151fe9a5385d974405b69f51df5f12fbb1eb8facc90682cc884d8d79d84968d0a7ae8c63eb688e50832208c647e7e2b05d4f21b8f189a
 DIST logstash-2.3.4.tar.gz 79779303 SHA256 7f62a03ddc3972e33c343e982ada1796b18284f43ed9c0089a2efee78b239583 SHA512 cc5d6c04e414daf63c836141df87204e0cbc63f71ee02abb69496e29587d5b0803dd738949de559a597979c9f6c6bf9d11d55f4b084ce875f24fb362f2c9bd3b WHIRLPOOL 71b6d915153d80d9bc81d10454ffd14af4643c61557964d7fd8edf50bf1a5d1c53ce0b09c2aec9b079918df596bbb5b07420b8661572bf7ea659e9703694f07c
 DIST logstash-2.4.0.tar.gz 83882952 SHA256 622c435c5c0f40e205fd4d9411eb409cc52992cf62dde4c7cd46e480cd8247cc SHA512 27f7e22fcfbeabe58bef1220399a80b32b56b5e2af17c0279e3f583ed5170be649b961b92c3eef33120ce238f126a3cb32e614bd8109bd8c266b538888c5324d WHIRLPOOL 2d1db78ff21d86e22f709600b086dfc253120e6a659d46c1e6ebc6d62dfffd48f0a440c33fa9a1cd7014108f5ae88afa4ccd25211ce57b1a4856f756a855c71e
-DIST logstash-all-plugins-2.3.3.tar.gz 134888154 SHA256 b60a6f59616a54f07f47155b6962cd4d7eb8af8c0ceebfe5fc7d471670c02612 SHA512 41df6c94aa27c86b394580fc426d0c0c0db6ce91157fa250a67a8a72db681770ba3cdd257788cfaf9947704bba1a61308a9bc843204b80dcd739b5082972cf6d WHIRLPOOL 0644f49a6ea76add4a3522b5fd8ec519ea49cc554cfd00f96f0b223840d886dfb8781f59a7fc3d0bef2484266aea168c0a9700b63f8aede9d649106d19b494a9
 DIST logstash-all-plugins-2.4.0.tar.gz 139743651 SHA256 b2ffe60745ece2140ebc4610f42543dcf3ff5ead2707f0b36f0b70e8ddf0baff SHA512 9627f6119d129b4dcdc41ff43e49a3880f4ba5fcb3ee11e1ec821929d542c93629b0f58ded6741c96da49cba16b05eca141acdeee0ed060389abc3f467bba593 WHIRLPOOL 49ddc27d6030ae65aaab0acabda478644232f92cbd2bbe3d1b118782c5ce1167edb2a485def982f3b6c8138f084e79a783273dd50519a82085b984259f7e19d4

diff --git a/app-admin/logstash-bin/logstash-bin-2.3.2.ebuild b/app-admin/logstash-bin/logstash-bin-2.3.2.ebuild
deleted file mode 100644
index 437c3b8..00000000
--- a/app-admin/logstash-bin/logstash-bin-2.3.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit user
-
-MY_PN="${PN/-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-DEPEND=""
-RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN} -m
-}
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	doins "${FILESDIR}/agent.conf.sample"
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
-
-	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}"
-}
-
-pkg_postinst() {
-	ewarn "The default user changed from root to ${MY_PN}. If you wish to run as root (for"
-	ewarn "example to read local logs), be sure to change LS_USER and LS_GROUP in"
-	ewarn "/etc/conf.d/${MY_PN}"
-	einfo
-	einfo "Getting started with logstash:"
-	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
-	einfo ""
-	einfo "Packages that might be interesting:"
-	einfo "  app-misc/elasticsearch"
-	einfo "  dev-python/elasticsearch-curator"
-	einfo "  www-apps/kibana-bin"
-}

diff --git a/app-admin/logstash-bin/logstash-bin-2.3.3.ebuild b/app-admin/logstash-bin/logstash-bin-2.3.3.ebuild
deleted file mode 100644
index 6c83d97..00000000
--- a/app-admin/logstash-bin/logstash-bin-2.3.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit user
-
-MY_PN="${PN/-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="!all-plugins? ( https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz )
-	all-plugins? ( https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_PN}-all-plugins-${PV}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="all-plugins"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-DEPEND=""
-RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN} -m
-}
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	doins "${FILESDIR}/agent.conf.sample"
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
-
-	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}"
-}
-
-pkg_postinst() {
-	ewarn "The default user changed from root to ${MY_PN}. If you wish to run as root (for"
-	ewarn "example to read local logs), be sure to change LS_USER and LS_GROUP in"
-	ewarn "/etc/conf.d/${MY_PN}"
-	einfo
-	einfo "Getting started with logstash:"
-	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
-	einfo ""
-	einfo "Packages that might be interesting:"
-	einfo "  app-misc/elasticsearch"
-	einfo "  dev-python/elasticsearch-curator"
-	einfo "  www-apps/kibana-bin"
-}

diff --git a/app-admin/logstash-bin/logstash-bin-2.3.4.ebuild b/app-admin/logstash-bin/logstash-bin-2.3.4.ebuild
index 437c3b8..1510250 100644
--- a/app-admin/logstash-bin/logstash-bin-2.3.4.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-2.3.4.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN} -m
+	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
 }
 
 src_install() {

diff --git a/app-admin/logstash-bin/logstash-bin-2.4.0-r1.ebuild b/app-admin/logstash-bin/logstash-bin-2.4.0.ebuild
similarity index 96%
rename from app-admin/logstash-bin/logstash-bin-2.4.0-r1.ebuild
rename to app-admin/logstash-bin/logstash-bin-2.4.0.ebuild
index 6c83d97..992700a 100644
--- a/app-admin/logstash-bin/logstash-bin-2.4.0-r1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-2.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit user
 
@@ -29,7 +29,7 @@ S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN} -m
+	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
 }
 
 src_install() {