app-admin/logstash-bin: [QA] Revert "Bump, fix maintainer"

The maintainer change was unwarranted and incomplete.

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 9874cc9650aa5bf3307ecff6cc8999c3131c3717..f3f31f6eb59a102bbd1ee6100d7e77371d87ed0e 100644 (file)
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,4 +1,3 @@
 DIST logstash-5.1.2.zip 100044055 SHA256 99fd514b6241310c78aefca2cd895c1cec4cd426aa08fccf7e8bba26567573c3 SHA512 4186f942dd555dc1284bc657cbd3a61de8aa67a50bd2f7b725d3364e5fca61029cadb0ca4f9e1c4a36078805fd015128ddcd7773e19e643eaddd5ae2fa9c6673 WHIRLPOOL 1127a419a35e42de59a4bd61fe5b75e39daad69d0646019417abf83f44639a86fd2b1ffc687b6cc551562045ef3d2d901d7985437d158094d4d054e4a93bfd5d
 DIST logstash-5.2.2.zip 100068713 SHA256 35bd0378f5b9001b4c3056b11496936ef47c09e3ddc469353bc8951e3b81e174 SHA512 923b35e8bcc97f6036cd4a484df546b2cc1341ec8fe5080bea8f979856086aaaae5f71fa0c3f7aee2207f7c3e71aec18af416278123362f89990c05ec9e2c92f WHIRLPOOL 4a67ed0ba3b532da5d488b2e45f53149b4e63b6b638b6fe1058a13eab904cb7ec24cd87306868a4770fe6aadfe13f7d76bfc9973e73104a8e4e9aee455321c32
 DIST logstash-5.3.1.zip 100150030 SHA256 f5e626a8cfe128b7ebaa0ec8ddc20876913852efd91c2c81a1f19f2223e00e07 SHA512 7897eab56bc33ee38169ad34e600cdf7180d0af30f93811f1ecf30a107944cd7a5ab2e95805695da7c1ce6f2112424c17de3b3bd9efaf344daff4e227d5e3d90 WHIRLPOOL 12383a43c372a2eef31b0a64e1b14f304ea90f7202524f6d56b7f0f51fcefd029f45b7f2782050d3c89269e41ae96c02e78586db30bb5d509f45b19508c36be3
-DIST logstash-5.4.0.zip 98567077 SHA256 f7a817009f7458cb186d652497e68003c221b07dbf28b5097a66b40ffb022a2a SHA512 4d552d43a1817ba04d25a3ada1cf87ecdae632a520627d3b6cb514b7e3384a6a09a98e8f24ea19328c60c4549b9dd1eb0e1a5282665f85877afbd7e7fef88e71 WHIRLPOOL 25dc935abee1ae1852c83801d50fc08bc2896e2744282f219e2afef4e9da5f608472baf4f88b31127959495d320643bbf7f94d7fea809b15d8186f333649ad0e

diff --git a/app-admin/logstash-bin/logstash-bin-5.4.0.ebuild b/app-admin/logstash-bin/logstash-bin-5.4.0.ebuild
deleted file mode 100644 (file)
index cda22ab..0000000
--- a/app-admin/logstash-bin/logstash-bin-5.4.0.ebuild
+++ /dev/null
@@ -1,56 +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="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="virtual/jre:1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       enewgroup ${MY_PN}
-       enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_install() {
-       keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-       keepdir "/var/log/${MY_PN}"
-
-       insinto "/usr/share/${MY_PN}"
-       newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-       insinto "/opt/${MY_PN}"
-       doins -r .
-       fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-       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 "${EROOT%/}/etc/conf.d/${MY_PN}"
-       einfo
-       einfo "Installing plugins: (bug #601294)"
-       einfo "DEBUG=1 JARS_SKIP='true' bin/logstash-plugin install logstash-output-gelf"
-}

diff --git a/app-admin/logstash-bin/metadata.xml b/app-admin/logstash-bin/metadata.xml
index 8e5673323882500196482e3fc2bbeacbf8ae3490..86e0bec1b14b5c0152b65d9f39c855170eca5fee 100644 (file)
--- a/app-admin/logstash-bin/metadata.xml
+++ b/app-admin/logstash-bin/metadata.xml
@@ -2,13 +2,17 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>monsieurp@gentoo.org</email>
-    <name>Patrice Clement</name>
+    <email>patrick@gentoo.org</email>
+    <name>Patrick Lauer</name>
   </maintainer>
   <maintainer type="person">
     <email>hydrapolic@gmail.com</email>
     <name>Tomáš Mózes</name>
   </maintainer>
+  <maintainer type="person">
+    <email>erkiferenc@gmail.com</email>
+    <name>Ferenc Erki</name>
+  </maintainer>
   <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>