From ae64d0e4776fb0554d4e8431c817bd2f9fe361c2 Mon Sep 17 00:00:00 2001
From: Patrick Lauer <patrick@gentoo.org>
Date: Fri, 2 Sep 2016 16:37:56 +0200
Subject: app-admin/logstash-bin: Re-enable 'all-plugins' useflag as upstream
 provides tarballs

Package-Manager: portage-2.3.0
---
 app-admin/logstash-bin/Manifest                    |  1 +
 .../logstash-bin/logstash-bin-2.4.0-r1.ebuild      | 65 ++++++++++++++++++++++
 app-admin/logstash-bin/logstash-bin-2.4.0.ebuild   | 64 ---------------------
 3 files changed, 66 insertions(+), 64 deletions(-)
 create mode 100644 app-admin/logstash-bin/logstash-bin-2.4.0-r1.ebuild
 delete mode 100644 app-admin/logstash-bin/logstash-bin-2.4.0.ebuild

(limited to 'app-admin/logstash-bin')

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 86c73d60c3aa..723e0cc82954 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -3,3 +3,4 @@ DIST logstash-2.3.3.tar.gz 78887475 SHA256 51a20fbfe2aa0c5ea49ceda8278a4667289fd
 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.4.0-r1.ebuild b/app-admin/logstash-bin/logstash-bin-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..6c83d971bfd7
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-2.4.0-r1.ebuild
@@ -0,0 +1,65 @@
+# 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.4.0.ebuild b/app-admin/logstash-bin/logstash-bin-2.4.0.ebuild
deleted file mode 100644
index 437c3b890779..000000000000
--- a/app-admin/logstash-bin/logstash-bin-2.4.0.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"
-}
-- 
cgit v1.2.3-65-gdbad