gentoo resync : 03.11.2019

4 files changed, 9 insertions, 89 deletions

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 117b57430aa7..60d6751fc12b 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -8,20 +8,17 @@ AUX logstash.initd-r1 2176 BLAKE2B 37c05148d3789c69805ae5151bed5e297d71b9d60d71f
 AUX logstash.initd-r2 1989 BLAKE2B efa16227a2cf1a42f1f9e27e110dae64c7eb6547e22e89a71b3394fe587e0f83468e361d335e28b15a1507959dc26c019ae8ac9bc110f1b8a6896ceb7f3ceecc SHA512 77c69600f22d31e7e08c2d953c99bea8a24ad83c7abdd578526b850ca37c963a91cfd245b70e4ddb8d405135230fbc641768de2dc4dad096a0db3d40313acb2f
 AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
 DIST logstash-5.6.15.tar.gz 110086992 BLAKE2B 3047259c4bc5d71b072fa004c44953f84860ec53e051641c4efc903e38243e85b8fdebeaf093c01f5410c1f05a78a8d8aa2282fc45cf5fd784a41ea66ff5b196 SHA512 405039ff988aee8878cbeca96ef0fcbadba762f877eaec36c8a75b010e56a943c2951a8f83f9279d7d9fea99c4f8a200c705f784813a2733289336c58c34ca1e
-DIST logstash-6.6.1.tar.gz 169642354 BLAKE2B 335fa036e9f120de5d6588ed18e927ddfb3a94dfcfbc9605fbda3e3eb4da3ba88561d466eb171c85a2deebb3328312ba903616704844e253a7599f75597efbae SHA512 a66f196f160af29492b64efb61b7e3253a4ef45764c5e6226f73c2a216151ff43f6d344c2e3340a1a9ddb8b00e61f14c65d5dd0c14d69421f4efa3542445fe4f
-DIST logstash-6.8.1.tar.gz 172031559 BLAKE2B dcb0d37ce0325affa86c3cba546dae262ae8436cc2234eb977a359498f923620cb1ce4bc79a5a5c5d7afe6b7b3b3e938791baf44ce25ba967f5738ea5cb15669 SHA512 3f3a90cbd185a5efaefbe2004f1265ea5d1fbd3371820897b19d8b9b8fcc6d5522bd97ef4150fd963a376ce7726d9ab4d62fa9e2bc718a2c8bb69dd7e964c378
-DIST logstash-6.8.3.tar.gz 172067513 BLAKE2B e91661009b1977879117c814f1b17a703848bbf09093ed0eb7c91007254299b2935f2cb36374ee0e9ebb71cc3f61521e96db51d4e4f7fa1612cc04cd08cf5201 SHA512 b441619570af6043c914744d32e5a7fef95ed24103693990c9ca6b45aca717678a7916e18a08d7903b907aabda4fab75ef3a4f8ab0e0ea4bea4fc4e167db4dcf
+DIST logstash-6.8.4.tar.gz 172186036 BLAKE2B b1219dab8dd1f88d01def54306ae09b3e9c1657adc7487e5c024f69e51ce24e66a9a713c8db357f84b19fda5ee3f824845858e34e8b75b8025f87b4d27b69b5d SHA512 6dc33099be2ee3670c00cb4162e3924a97e5548c1b978a50fe3d7ed0745c7f0a3422849c04e3d64f999ed9dcf8efee3fba05d9643fbb759c0e27643235667ee9
 DIST logstash-7.2.0.tar.gz 171299740 BLAKE2B cfdbabc11d6e0d182ea7bdff1d30ca3a5bfbfe036f952c0d944c105f563dfa1b444c8dd1e9f023301abfbf9a86708d6bde2689b462b28f00a34d09f78fe3898c SHA512 955358d504b6626ba9ac88a2d65b161044180c3085f8dbaedfb8b85b092ecc65721bbda73b750f7d8b78a052828a54f7ed7ad16ee7ec72f3ed5e428ba291a173
 DIST logstash-7.3.2.tar.gz 171783584 BLAKE2B 0a936edaa57ae5552b79bead754b75c8a8c7a920461b720c58dc8e32c2aae342f3639955b63264e8704093c0d30d5d801f468d1b391e9efb2c5d605dcb2ebf5e SHA512 311b849cb8e1f336908aefa1cb2f0e2d76b696410346dd3fa0560313f9cbd3f098c93aee68c9fead736a3edb39ca543161eb7de115597e034eb0a015904c7417
-DIST logstash-oss-6.6.1.tar.gz 169512439 BLAKE2B 54a18deda80079c9bf2de39936737689d696a4ddc6f8a7ae375d48817ea127f1eb83f1ef50a18b573709446fc3deb858f53a5aff6411329b52ef0316859a7f03 SHA512 7fbe960e615c3c6b6715bd63debd3db869abe29bfdc94d4947290b822fe1d858e289548dbda266c8ad6d25745e63a788de0c83566121faa0d3027642b0f3d108
-DIST logstash-oss-6.8.1.tar.gz 171901409 BLAKE2B bff3b96bcf3f53450e1279f633788af7d7a1d18b18305741c87c6b2c7e9e24db0664798c7040116bfbf72c9714bad867a00a3f37fe8eb436ce1948bb84a2096f SHA512 d928f9eaa2278c76cbdec46349bf1b924d3f5a9f668c834c882158decf52d44f14dcc356a491cc935dd3717f4a76b8a23eac1173ab28f44cdb32a57ab298fbcd
-DIST logstash-oss-6.8.3.tar.gz 171937304 BLAKE2B 25dc90c6223d2481ee7cb4fb5bc9019aff6aa6e01bd56e33758842898a273de5fbec1e939dde91ceb719b41ea0222ab9ce8548cece56fd7c07d398a30b329a1d SHA512 24efed274cf1adf5e538048d1d9c2c5d252fd8671c167f2bf28b1ecbbec353e4b41729e722b3aeadfa72835717bad7f4bd1638ddedf53827dd5d9826e234e8b1
+DIST logstash-7.4.1.tar.gz 173284835 BLAKE2B d1d3fe199175d57e4b47fe50f26d6d54486182d6e69b6e50cccceecf1cf02484c6d9f1a8cd0ef72ea82b1da9550787cb5ac37bbf93a91b4d0518dde415479a1a SHA512 c89d530f16e5c6953d97708b6ff2f46bbb518a93652f11cad988841a73bf5862beb4a5326de1e63d0ffb65a498fc33235ab4fc950e8087aed5815b3a65e81ef6
+DIST logstash-oss-6.8.4.tar.gz 172055711 BLAKE2B 696769dbb94ed9a6c9a84fb54ba35fedff360bff39c61ba7ef6a9a5f00e59dbc3c8d15f6b9080e39ce87f17553f04b831f029e8f779c75f0f28b673a2aa2e697 SHA512 6f7fe35f6e84417332093d089dc737f89737f30718d5ce843dfe6d3ba85d098e2a01da6c191729b68a7a326d4d65f6bcbdfeb656d5120401478dacb96b1f0671
 DIST logstash-oss-7.2.0.tar.gz 171128040 BLAKE2B f0f3d4f0d5228918d8435c521d10ff5070e23561c25ce28e8d58997d499a7c7697354c1fb1cb70bf2bd832ad50c04afb00cbde4b3053f9f24d2619f3fbfffbdf SHA512 24120740bc727b6da50b865bb85bf61f013a38b6679d679ecc75a73c69766a5133fd47ad99fa0220d5dc6cceb506fbde206787adcee31483288c68c228edd1fd
 DIST logstash-oss-7.3.2.tar.gz 171613705 BLAKE2B e1a0c512cadd5855e1a1524e1c44214aeb792361493406c5cacde1bd72243178d03113c08a1fe0d1c2212cec5a2947074911bf19eaaedc636db754081c3fe32c SHA512 3aac74966b27d0d551f49c78c457b18a1a76d0e5a7b2fa1dc9a7776927145b28a6c02f51e4dd7e9ca49dabe5f63effd4227fc6980e522ab7da4ef847da6bda12
+DIST logstash-oss-7.4.1.tar.gz 173114578 BLAKE2B 5530e3275be095168d845381ac2ef92c3fa2e3783b7d9749d88465239751bc74d0483a51fd61ac75f46a569201c5fd34bd1553db32ca84e911dbf34ddd5e6b14 SHA512 26defcb5777c044030081e98cc47a040c72c7a8261f8f2cb9349181ec6a375b4969e1fbd00c8046da2c3fae5a6dea45e53c41d1c84325cd75af766f6a1d4b3c3
 EBUILD logstash-bin-5.6.15.ebuild 2195 BLAKE2B 1ef9e7d8a825109a85e850c2e9b971c3b16d435f1a0e3dce40e18b48f64c5b83a3cedd0d85a15d422a3accccb0ffcbe79b2a0812fda24c04fd0f07a0e37b9436 SHA512 6026cb3d76dbab56a4a495b1bc3abea2d0c4c731261047e76acf792840f3deb1fdd0fd181b5b6a599f2056f22b76920e7844f1e76516919c7404c1d10e1b7259
-EBUILD logstash-bin-6.6.1.ebuild 2185 BLAKE2B c0ca9f44ca02db43d7b6b414f866f5d7a1eed19c44f45874a1df6a9171c0327b971878bcf74bb4028903f23bd2521464bac662cecd89bbacfcc32d6e88d4b4b0 SHA512 0088d7e185bbf58af1c4880aaac299f3a4a93ee1ecd3092aa9548d60767faaa963bbcc422ff40e8b8905b843da25d73dbb0b75bfffa19261306668fd9e414c43
-EBUILD logstash-bin-6.8.1.ebuild 2106 BLAKE2B 8b04abf9b4395e60882de2d5c482bb3ee17f1ec2446a5d2c24feda677025c0662580c277334d2f7eeb0a5b61fe52bc1513a79b1a55f85d33ebbd75829307b86f SHA512 c56a7c1c3eb973cbaf895206270f80a3ed3c9ccec37c9102b5cee1f6477a1952b6a93310f41046e12d021580862dd96fb1b658798126f00535abddb4d738853f
-EBUILD logstash-bin-6.8.3.ebuild 2099 BLAKE2B e7cd6249e76d9e3629cc640542aef942ad893d4643c803a10c789a1070775996364aa0caff337bf2eb18cdd2bdd534941a5637f23e44d370a87bc017bc931fde SHA512 aadfd4248e27c0c0134a7c7705dc3c8cfb9b031a963214174664c8c2438ba8e1e466025337fc9a9a531ff5f6bc16b7e1f25d3362205b0ca2793bdb8482a9e202
+EBUILD logstash-bin-6.8.4.ebuild 2099 BLAKE2B e7cd6249e76d9e3629cc640542aef942ad893d4643c803a10c789a1070775996364aa0caff337bf2eb18cdd2bdd534941a5637f23e44d370a87bc017bc931fde SHA512 aadfd4248e27c0c0134a7c7705dc3c8cfb9b031a963214174664c8c2438ba8e1e466025337fc9a9a531ff5f6bc16b7e1f25d3362205b0ca2793bdb8482a9e202
 EBUILD logstash-bin-7.2.0.ebuild 2102 BLAKE2B 4859b52ecbe2d3cb0fa31768cbfcfe59ff4ab1ccfb70ed1b0b30edf33415a7107a246ab902fc3c42897804482dd91a25bd8da6af29374c424bc53e700ed1b797 SHA512 3e346deb2bccc47fa55d2de9afbc6bea15f28d235e93fae323620a24a70aa6671072ab90f778d3157ba74c860056a1f76d5ad0ac678b6d658bd49ffbb8fdc3dc
 EBUILD logstash-bin-7.3.2.ebuild 2095 BLAKE2B 80aa953c2657cc0218b18df01e67279384fcc57f8fb3931121c787caf0c198e9d87c138bc2c6d809d0766fd67e8e5046d10ca0d4826047f845d89931bf63e5b5 SHA512 4db211818a819557d904ced91163c2bdfeb3ed9a1ae5ecc9873c1973b5137aca526164fe04c35984b9f97a56564c3e2627d4b952775dd3b0ca220c2cca37fe54
+EBUILD logstash-bin-7.4.1.ebuild 2095 BLAKE2B 80aa953c2657cc0218b18df01e67279384fcc57f8fb3931121c787caf0c198e9d87c138bc2c6d809d0766fd67e8e5046d10ca0d4826047f845d89931bf63e5b5 SHA512 4db211818a819557d904ced91163c2bdfeb3ed9a1ae5ecc9873c1973b5137aca526164fe04c35984b9f97a56564c3e2627d4b952775dd3b0ca220c2cca37fe54
 MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/logstash-bin-6.6.1.ebuild b/app-admin/logstash-bin/logstash-bin-6.6.1.ebuild
deleted file mode 100644
index 97dc32bb2def..000000000000
--- a/app-admin/logstash-bin/logstash-bin-6.6.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 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="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-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/lib/${MY_PN}"
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-	rm -v config/{pipelines.yml,startup.options} || die
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	doins "${FILESDIR}/pipelines.yml"
-	rm -rv config data || die
-
-	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"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
-	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
-	ewarn "Install the plugins via eselect module that will automatically re-install"
-	ewarn "all self installed plugins after Logstash upgrades."
-	elog
-	elog "Installing plugins:"
-	elog "eselect logstash-plugin install logstash-output-gelf"
-	elog
-
-	elog "Reinstalling self installed plugins (installed via eselect module):"
-	eselect logstash-plugin reinstall
-
-	elog
-	elog "Sample configuration:"
-	elog "${EROOT%/}/usr/share/${MY_PN}"
-	elog
-	elog "The default pipeline configuration expects the configuration(s) to be found in:"
-	elog "${EROOT%/}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.3.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.4.ebuild
index bc5b7769f9ee..bc5b7769f9ee 100644
--- a/app-admin/logstash-bin/logstash-bin-6.8.3.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-6.8.4.ebuild
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.1.ebuild b/app-admin/logstash-bin/logstash-bin-7.4.1.ebuild
index 05b243d87853..7b2c36e2a632 100644
--- a/app-admin/logstash-bin/logstash-bin-6.8.1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.4.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-inherit java-pkg-2 user
+inherit java-pkg-2
 
 MY_PN="${PN%-bin}"
 MY_P="${MY_PN}-${PV}"
@@ -24,7 +24,7 @@ QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
 
 RDEPEND="acct-group/logstash
 	acct-user/logstash
-	virtual/jre:1.8"
+	virtual/jre"
 
 S="${WORKDIR}/${MY_P}"