From b32a2573e265e07a5c6b9bf0a67dec580b9cc732 Mon Sep 17 00:00:00 2001
From: Patrick Lauer <patrick@gentoo.org>
Date: Tue, 5 Apr 2016 11:46:03 +0200
Subject: [PATCH] app-admin/logstash-bin: Fix logrotate #579066

Package-Manager: portage-2.2.28
---
 .../files/{logstash.logrotate-r1 => logstash.logrotate-r2}      | 2 +-
 ...ogstash-bin-2.2.2-r1.ebuild => logstash-bin-2.2.2-r2.ebuild} | 2 +-
 .../{logstash-bin-2.3.0.ebuild => logstash-bin-2.3.0-r1.ebuild} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename app-admin/logstash-bin/files/{logstash.logrotate-r1 => logstash.logrotate-r2} (60%)
 rename app-admin/logstash-bin/{logstash-bin-2.2.2-r1.ebuild => logstash-bin-2.2.2-r2.ebuild} (96%)
 rename app-admin/logstash-bin/{logstash-bin-2.3.0.ebuild => logstash-bin-2.3.0-r1.ebuild} (96%)

diff --git a/app-admin/logstash-bin/files/logstash.logrotate-r1 b/app-admin/logstash-bin/files/logstash.logrotate-r2
similarity index 60%
rename from app-admin/logstash-bin/files/logstash.logrotate-r1
rename to app-admin/logstash-bin/files/logstash.logrotate-r2
index 5de699ad15e3..0a9c28cabfdf 100644
--- a/app-admin/logstash-bin/files/logstash.logrotate-r1
+++ b/app-admin/logstash-bin/files/logstash.logrotate-r2
@@ -1,4 +1,4 @@
-/var/log/logstash/*.{err,log} {
+/var/log/logstash/*.err /var/log/logstash/*.log {
         copytruncate
         compress
         missingok
diff --git a/app-admin/logstash-bin/logstash-bin-2.2.2-r1.ebuild b/app-admin/logstash-bin/logstash-bin-2.2.2-r2.ebuild
similarity index 96%
rename from app-admin/logstash-bin/logstash-bin-2.2.2-r1.ebuild
rename to app-admin/logstash-bin/logstash-bin-2.2.2-r2.ebuild
index 8d3ffea69b66..7fcd1d8e0f57 100644
--- a/app-admin/logstash-bin/logstash-bin-2.2.2-r1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-2.2.2-r2.ebuild
@@ -43,7 +43,7 @@ src_install() {
 	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate-r1" "${MY_PN}"
+	newins "${FILESDIR}/${MY_PN}.logrotate-r2" "${MY_PN}"
 
 	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
 	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
diff --git a/app-admin/logstash-bin/logstash-bin-2.3.0.ebuild b/app-admin/logstash-bin/logstash-bin-2.3.0-r1.ebuild
similarity index 96%
rename from app-admin/logstash-bin/logstash-bin-2.3.0.ebuild
rename to app-admin/logstash-bin/logstash-bin-2.3.0-r1.ebuild
index 8d3ffea69b66..7fcd1d8e0f57 100644
--- a/app-admin/logstash-bin/logstash-bin-2.3.0.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-2.3.0-r1.ebuild
@@ -43,7 +43,7 @@ src_install() {
 	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate-r1" "${MY_PN}"
+	newins "${FILESDIR}/${MY_PN}.logrotate-r2" "${MY_PN}"
 
 	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
 	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
-- 
2.26.2