gentoo resync : 22.04.2018

3 files changed, 25 insertions, 34 deletions

diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index e53108dc3bdc..945dd0a3c4b3 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -2,11 +2,11 @@ AUX filebeat.confd 269 BLAKE2B f9cc2a3d96be870d755c41606a274e94d6f6a2a5be71aeb3f
 AUX filebeat.initd 1388 BLAKE2B 2a427750a15e6910344dee1d2707773b01961360ae3a7e3337a761b759b2c9fcd9a914385e8ff6292841ad6c07781af3b5cf059f1338a6f2f33bda576bb125cc SHA512 9b08635b9ba6e180881780de0fa9d6c8c1b2e7496fc803c2b38127fee13d13ca5d00792132cdc8bd4073018e3f6e374d4164a86e450a1dbeb68b2694fa0dbb12
 AUX filebeat.initd.1 1388 BLAKE2B 6ca4f3f4d50bba2a036a35b8e74bfa92d5b03ccaf8548df215d3d68ba9a2eaf9e2996374d49011f9e4380bc59f6307e262eee1367801bfb8279eb0b1639b83c4 SHA512 374b466b39feb832b414d0491510190758007079b6c865823878db00d5c17235f657deb0822066f124e3f07616dc4ff3237e87f6f35785e071815ec4e533b1dd
 DIST filebeat-5.5.2.tar.gz 18075191 BLAKE2B 9786cb8f3db003c86e4bc6d56fcac660b615e7e6ad82d0912f70c545f2af3caab605be739481355466438a1769c20b28db576d208af6b0af9620ce6408068215 SHA512 ad92b41a9ceaad6c6e6fc80d0adccd7fe03a7056d121484bcf35c6a46b2061a5ef6d32121dd12d59b51e7678769da5c405b1d549fa130631ae3f1989b78fba48
-DIST filebeat-5.6.5.tar.gz 18145468 BLAKE2B 57f3320012d8c17b7b961dd6d843e982e3cc5fe0f39658ca5ccc2fb9056c8dd4527306b7cfe483d3fa39bef5892dd22c4f07f24aad1e804bd76cdda94b56a3e8 SHA512 f1c8ffa2521e0e15a14850199c3da83d8f8489d5f97364b205ee8120b56e2ae47055c78ed6a5ef2d0296f449339efa05f2d7bce7282b1e7f2e044d7ed3244d4c
-DIST filebeat-6.0.1.tar.gz 15150919 BLAKE2B 40149de3257d78a737d71f59f8be91a3bd60185f716ecc89dbe373283ab6481afe709ff573efb8b1079f2c571c6de036bd705dd082c3cba1eda44d282409247c SHA512 baf21acf38409b398f261509d25d2b009342fdde1fcd824c99d16cc279355ae5eb029699a5a7e3b6e58abdbed4ef5fda1b4058ed94b807fd5964ad24828585e2
+DIST filebeat-5.6.9.tar.gz 18209544 BLAKE2B 41891b984240af46fb3d9d7818203d7ef8fd5a089d7683877e3907061259442da4884976cfefcc90666699ebe3adb1ce6c87a026a50b07e218a5de6b642b9472 SHA512 2aa40afbd0f1c987aebf51d22aa03c87048766a4c7d41938ff27ffca841666d34cfbf08ae120d98d222a7d3ff447bbce9f1d65b434aef1c9d73c5019aa1558a1
 DIST filebeat-6.1.1.tar.gz 17061456 BLAKE2B 5a5d23618f8140f3815c499305d99ae3dc4c4caa49535043040387922f924ee49a9494b5139f34a70d74173d97332b92909fc74e2f91a2fc0f288ef5d1493ade SHA512 54e85cfce58ba724f6b2892f115ac9ef5b1bb89ce8dc6f2a977e50ccfc07cf95fc578e46e0cadd96acd90c59f4b01446851b93c519afa094ff6dcdb7e716219a
+DIST filebeat-6.2.4.tar.gz 19466271 BLAKE2B 417f1db19b7fdd9bcf66f2c3dcdf2aaa6be9ba5edff1c97a0b8f4a5d7953ef27bcbd860e097fb40e67b3b42b795b684dabb2995eee572243831f749a7184b625 SHA512 49293e28e4ca769a88f7b889ea888a559ae7e142698714e24bf5519d00c2030237cac591590aa284f17792906a6137333173716ddf5db4496217f8b5a054b19c
 EBUILD filebeat-5.5.2.ebuild 1646 BLAKE2B 37f6ac540ed27b471021be5666233d00ceacdcbdf6a32954c5987fa85c957223d84536dd5c0e93bf6acd988b01a061008cffff005806d8b2d8cee7f722884f33 SHA512 4b36e36a4f95c893bca863c4510e903f6265e4950fa000cae61896915c558beb4d8c4b10d8aa78d154bef7eb67886628f499153f988ff66e5b1066cb949b2029
-EBUILD filebeat-5.6.5.ebuild 1647 BLAKE2B de539c0afa664ffb179608e02a73dd75837afdc5564879653b1a5d41c0362dca5b65e5c7b891a3209fb1ecb18b126fa03a4da55ed8287196b2bf14b461999643 SHA512 eae4bdcb37e0ebce86ea8425cacc4289ba311e3f66c50e79b09d3625052f671d24f60fba7dc0be9d8a1758124552cec573b9c843874a0c2e77582c9863d1358c
-EBUILD filebeat-6.0.1.ebuild 1276 BLAKE2B d77562bb3fad920f86ae8a8c155ce161c59f07972c39b546eee8fc723e85ac3943a76fed6a9e6c8ba15926759125f6199a8bc99faddfbc3970c71b35296b96d2 SHA512 d369a624fd8c417059e45ed1b56a848fa8ed1b06d1917f23f251480a29b83847d1f45357e9e7c7b10c592bb94b4d6dead91c98a80d485c3a59acdc8eaa563185
+EBUILD filebeat-5.6.9.ebuild 1496 BLAKE2B cd528a4a68ef61ae3f5fea941e8a71e72002cb5b18814b3d9b3bdfdd86520f42ac87818acaf313807a2b7cdc1eef1f6ffa26d06d5190b9446c3f95b614718158 SHA512 0a7de42d1408d5c3a54836ebea8450e27b57f42824dbb1e2ce3d705123df752d8f68e8c40de2b17a6dae93307856eaa3898925994839e6d5e13e7275a30988f9
 EBUILD filebeat-6.1.1.ebuild 1303 BLAKE2B 9e3c7601566336639171e69171b51d1a7ca33d8636de2cca01709d1c97a65a82fda7b650efd682fd4d4909587a5868a84c4ea4053798b1daa73f11a036951a82 SHA512 fa282f9c87f051c0f33f0344f34d81c8dc9d8beb7d8b8d74ca8490bfb4f727f557145d138f7397452635b96b9be1a0a82e52f6b894a9e0b48cff16a11065491b
+EBUILD filebeat-6.2.4.ebuild 1216 BLAKE2B f3b33fcbe8ac9fae7bffe893254eed1c8daccb095cc04a9b8f07160afe029e6d960910aa0fa4805d61bb1649fb8de9f8f5f0016cba2cc8175651734937ae953c SHA512 4bbed842b8b59e0ddfce1b2ba4118692f03189908e957328f9a6db00e42b5901d32cc7dec8ae449bfdef6bbd8fa1abf06cf428def31070fdb0321ee7d2a55b8a
 MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
diff --git a/app-admin/filebeat/filebeat-5.6.5.ebuild b/app-admin/filebeat/filebeat-5.6.9.ebuild
index fccd5dd69a88..4537daa105ba 100644
--- a/app-admin/filebeat/filebeat-5.6.5.ebuild
+++ b/app-admin/filebeat/filebeat-5.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,28 +10,21 @@ SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
 
 DEPEND=">=dev-lang/go-1.9.2"
 RDEPEND="!app-admin/filebeat-bin"
 
-ELASTIC="${WORKDIR}/src/github.com/elastic"
-BEATS="${ELASTIC}/beats"
-S="${BEATS}"
+S="${WORKDIR}/src/github.com/elastic/beats"
 
 src_unpack() {
-	mkdir -p "${ELASTIC}" || die
-	unpack ${P}.tar.gz
-	mv beats-${PV} "${BEATS}" || die
+	mkdir -p "${S%/*}" || die
+	default
+	mv beats-${PV} "${S}" || die
 }
 
 src_compile() {
-	cd ${BEATS}/filebeat || die
-	GOPATH="${WORKDIR}" emake
-}
-
-src_test() {
-	cd ${BEATS}/filebeat || die
-	GOPATH="${WORKDIR}" emake check
+	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
 }
 
 src_install() {
@@ -42,8 +35,8 @@ src_install() {
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
 	newinitd "${FILESDIR}/${PN}.initd" ${PN}
 
-	insinto "/usr/share/doc/${PF}/examples"
-	doins ${PN}/{filebeat.yml,filebeat.full.yml}
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.full.yml}
 
 	insinto "/etc/${PN}"
 	doins ${PN}/{filebeat.template.json,filebeat.template-es2x.json,filebeat.template-es6x.json}
diff --git a/app-admin/filebeat/filebeat-6.0.1.ebuild b/app-admin/filebeat/filebeat-6.2.4.ebuild
index 0717397854fd..cf379ba2e314 100644
--- a/app-admin/filebeat/filebeat-6.0.1.ebuild
+++ b/app-admin/filebeat/filebeat-6.2.4.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit eapi7-ver
+
 DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
 HOMEPAGE="https://www.elastic.co/products/beats"
 SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -10,25 +12,21 @@ SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
 
 DEPEND=">=dev-lang/go-1.9.2"
 RDEPEND="!app-admin/filebeat-bin"
 
-RESTRICT="test"
-
-ELASTIC="${WORKDIR}/src/github.com/elastic"
-BEATS="${ELASTIC}/beats"
-S="${BEATS}"
+S="${WORKDIR}/src/github.com/elastic/beats"
 
 src_unpack() {
-	mkdir -p "${ELASTIC}" || die
-	unpack ${P}.tar.gz
-	mv beats-${PV} "${BEATS}" || die
+	mkdir -p "${S%/*}" || die
+	default
+	mv beats-${PV} "${S}" || die
 }
 
 src_compile() {
-	cd ${BEATS}/filebeat || die
-	GOPATH="${WORKDIR}" emake
+	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
 }
 
 src_install() {
@@ -39,8 +37,8 @@ src_install() {
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
 	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
 
-	insinto "/usr/share/doc/${PF}/examples"
-	doins ${PN}/{filebeat.yml,filebeat.reference.yml}
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
 
 	dobin filebeat/filebeat
 }
@@ -48,7 +46,7 @@ src_install() {
 pkg_postinst() {
 	if [[ -n "${REPLACING_VERSIONS}" ]]; then
 		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/6.0/upgrading.html"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
 		elog ""
 	fi