gentoo resync : 13.10.2019

4 files changed, 24 insertions, 78 deletions

diff --git a/app-shells/peco/Manifest b/app-shells/peco/Manifest
index 7edc925218b3..4b4c3288366b 100644
--- a/app-shells/peco/Manifest
+++ b/app-shells/peco/Manifest
@@ -2,14 +2,10 @@ DIST github.com-google-btree-0c3044bc8bada22db67b93f5760fe3f05d6a5c25.tar.gz 141
 DIST github.com-jessevdk-go-flags-8bc97d602c3bfeb5fc6fc9b5a9c898f245495637.tar.gz 54382 BLAKE2B 5bb4a8609bb8d430e1e0adfca5f09bf8c8884832e0b248e93fd2b9e9f83d5fb816dff9afc46fdbfb65a97efa65e346b54898c14d26a302cdba6a4406a7e3a41a SHA512 65bd90bb6c3d9070ff415f514f2dd113bf886c0a2bcfcf3dbec6fe789df9f27683a4df83d71426f63d00a208b3b581cf791755d71f8dc0c7f7a684a38b7c8401
 DIST github.com-lestrrat-go-pdebug-2e6eaaa5717f81bda41d27070d3c966f40a1e75f.tar.gz 5178 BLAKE2B f90e9d643bc6e2829bea16c5ccd65db5235b5bbca7c5a6da0bab8ee99c6b6e517b94a896dbadbdd3f92208c33aa9342c77c79e83e648a9721183fba192135b13 SHA512 b974046135b8fe7f4272eb0f335f30bea93fb25ec9813a733dd34a2342cd6174a2a67ecd595db51e37eee03ffb5155a67cb86afb74b8b99a151d7cbc9aa52ac7
 DIST github.com-mattn-go-runewidth-737072b4e32b7a5018b4a7125da8d12de90e8045.tar.gz 6862 BLAKE2B c74b5450128e0093d5ae7b37871024fbe9c8e6bf166520dfc32482e2636ba3c0981e3224d843cbde880fa218872c65b37a1046ef4823d7cc3c786ec5fa0bd969 SHA512 ff8389d189ed1480929954d2567026984d93910a6fa7cdc3c6a925e8dc876a3df10298b08bd7bbf6f7d90914d64212928b2b1b3032ee4bd89974a2938a77f853
-DIST github.com-nsf-termbox-go-abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8.tar.gz 30257 BLAKE2B dd54f93c97a6c471b097d955b07eb126b3e5047c9afd594a49de7eac1d6863f78978e43843ab37226bc6f820cc646e7c6a67b3c70fb7fd20887f1952f4b49114 SHA512 0d4f18366c471aacf0d6fc92c716287d66b1f97ad922af23f4edd030697141d34c8013e62848c10827bf35f7cfb6b6153e29609b41fe36886139a074b1517a65
 DIST github.com-nsf-termbox-go-e2050e41c8847748ec5288741c0b19a8cb26d084.tar.gz 31443 BLAKE2B 821aa359d41a5aada4e184ad38159db5a6d1d581940fad86e175745757eb9451ccdf82de17217d8ddcbee87e5ae3390bba0e64ae656981a91623b952b214bdfa SHA512 81c1f9ce6c507404ee79238c655d7c043c895358ef38256c2e9b95498d88149e8aa6ba37659ec2ce42b46e200d87b043c6922e0d784538e7b9dfe9771ff73ea0
 DIST github.com-pkg-errors-248dadf4e9068a0b3e79f02ed0a610d935de5302.tar.gz 11334 BLAKE2B 7d703863f2420dab1975063ab8fe27d4b1b203bfda9f279d288cf50b2ff97e94417fc6cd5dbbe1575b4ba8de3e64efbb1e2903965a3735b9bd6308126fb299c9 SHA512 ee488416799f9359958e1cf68cd17a13019a11687dccee7db2633fcd361c7a48da0f6afec6275977f09a38f8475625b66d9f51a4003d2337d07aadf091f5e1d9
 DIST github.com-stretchr-testify-18a02ba4a312f95da08ff4cfc0055750ce50ae9e.tar.gz 83549 BLAKE2B 7bdaac806a8ea401ad991f995e1f94fa2983debe6ed8ec4f54462a6f7641084c2ffe14814ad265aa825aa2132fc357d023fce43540e7ea3a433a16064cd3e833 SHA512 e9af02a015b8eff0c83ba7ad6236d83804f75206586ac7a260c2ee663764aa41af445420f296d793ab7ebd3ac9f346dfdd5f1bfda20a4cbdf0a7b29452c7ce37
-DIST peco-0.5.1.tar.gz 76247 BLAKE2B 6ac3b8222a8b9847fcdf402532674a51c28be01ac94162b452437ef2862079146bdcf0b3cb3eceb871a96ddda6e8334b04511f90a43b4331e7852541be440009 SHA512 ed940949917ea00556d6484e427c6a98bff8506cbeae95fedbdab8579fe5ec0bb800a901a32a268752ec3502fa4cae8033ad38422ca341b1375370e1b25cad0c
-DIST peco-0.5.2.tar.gz 76546 BLAKE2B 55a640195f8c025457c460b3bb30e28e742b82c85bb9cdde7ef075bde6ed42249d7346c3fd8aebad756e072c75fc9d6ed6b5e1fc873026ea069134c8dfe0e78b SHA512 13d1d72d932e335a60fa07442bdc03cef775ad038f4281f4cdf6eb114123995b824f25c3dcb89122678dee12dea6f041fe11d38fc4b663f9aca799010e6e14e0
 DIST peco-0.5.3.tar.gz 77415 BLAKE2B 9f060e191550d39eed8dbf4b4379e424886476589e40af2c8bd2758c90636c6e9ab8e7551a32726f1f2d3338c7e59d47432d58f6493f03bbd3b8670095e27382 SHA512 c1b5678b369caa35e3bd2679eee857762c73bcc8a815d83e136fa1c30e48728a60f22be5d92132c8a733d591728f9293a973fc387502db79f5676ae1f45c6774
-EBUILD peco-0.5.1.ebuild 1373 BLAKE2B 00c1fba7eb7c606a35c81033f43db8b1e6b394d36a68b07c7ff262b74d5bd514b7d63f9c7a15378249a5fc30bdf8dd41e199f021e4d9dd08db1112c616cce4ce SHA512 d1654ec3ecbc1c370ea029a486d9cb1cebdaec16cb6315b631d0c0f48ce1c58c9375b8d62e5ec42e078a7a01c129f25d2e06657c3b30295db9108e9fc57911d0
-EBUILD peco-0.5.2.ebuild 1361 BLAKE2B a09e77191a4708da48de51adb9250e7b7afaa2dd0070c6251c4b586852c021369f32db673f78532dbd6ed6050532b8d7c648927d78ca180e996270bfd9ef0314 SHA512 306cc0a0c6f052c2d6941c7854da3a3d4367715186879da6a48671f61cd64239af4ca042a6064c548766614cc8520e53da0f5e08d337a605933f495abaa40f4f
-EBUILD peco-0.5.3.ebuild 1573 BLAKE2B 15c7660fbca3b7aad33e1bc40ea5d708dcd0da50c81086ea620faaf6a1a98d1d631bc08f7ae759cfccb50558579869d072fb7237f23d8a50bf2bc3c944c3f0fa SHA512 33cca7c9e4fd73ae4ad42e5ec4ef8f89440ca6eb50ce461d373fb2eb91a1bd33f4f4ca523e736e7fec1a0b3386a9d756677c9cc8870c2baef921a75d779d03f7
+EBUILD peco-0.5.3-r1.ebuild 1591 BLAKE2B 6c3cb74040b59eb901b9e06672bfee82c7775996a65daefbaff1f47c8c09447adbec43029ae294c99caf726343074051a3362da8ee3b1c8d1c5c499c7f05c091 SHA512 191048f7f616216f7a295f285f2f94ac27708434291f334d9da15636d926748b0df735e00e3f33a9533514f3a6983777eb285f236282343f2f6e6761de33b5d0
+EBUILD peco-0.5.3.ebuild 1591 BLAKE2B 606d3404cee5fb38b0290ce3dd59fb5fc0308eb7c28c67d85f586c3fbff25b979d1eaafc78c76b2922ecfcfaa82ca40ac086dc2da1f488d36712a57d4a535ed9 SHA512 fb9e2909748a9064c3cd5894d19353fcc6b7481cafe8e41354f0e99a7d5d5f539a9c8c4542a95db615b4c280f7e5ffec93118dab5d18bec2a0dad495a592aae2
 MISC metadata.xml 666 BLAKE2B e1594259e0f02808e487707acd6d8d1dcf20510aa92410aa03953606bace24777316a408c9079e342c8c6f7ab5680058fea2bfc65e5614751c7580aed78f00e2 SHA512 aab34e7bd48c51784cf3b1119c596893d56113b5a90dfa7e2782ca11e78d0ce2f80a9fdcde4e81e6fb6802a3075ba20bcd19fa9fb162fe2c68bdc1e91d3b6ef7
diff --git a/app-shells/peco/peco-0.5.1.ebuild b/app-shells/peco/peco-0.5.1.ebuild
deleted file mode 100644
index 3d8169733f2d..000000000000
--- a/app-shells/peco/peco-0.5.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-	"github.com/google/btree 0c3044bc8bada22db67b93f5760fe3f05d6a5c25"
-	"github.com/jessevdk/go-flags 8bc97d602c3bfeb5fc6fc9b5a9c898f245495637"
-	"github.com/lestrrat/go-pdebug 2e6eaaa5717f81bda41d27070d3c966f40a1e75f"
-	"github.com/mattn/go-runewidth 737072b4e32b7a5018b4a7125da8d12de90e8045"
-	"github.com/nsf/termbox-go abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8"
-	"github.com/pkg/errors 248dadf4e9068a0b3e79f02ed0a610d935de5302"
-	"github.com/stretchr/testify 18a02ba4a312f95da08ff4cfc0055750ce50ae9e"
-)
-
-EGO_PN="github.com/peco/${PN}"
-
-inherit golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-DESCRIPTION="Simplistic interactive filtering tool"
-HOMEPAGE="https://github.com/peco/peco"
-SRC_URI="
-	${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	dev-go/glide
-	dev-go/go-spew"
-
-src_prepare() {
-	default
-
-	# Don't install dependencies
-	sed -i '/peco\$(SUFFIX):/s/ installdeps//' \
-		src/${EGO_PN}/Makefile || die "sed failed"
-}
-
-src_compile() {
-	GOPATH="${S}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} build
-}
-
-src_install() {
-	dobin src/${EGO_PN}/releases/peco_linux_amd64/peco
-
-	local DOCS=( src/${EGO_PN}/Changes src/${EGO_PN}/README.md )
-	einstalldocs
-}
diff --git a/app-shells/peco/peco-0.5.2.ebuild b/app-shells/peco/peco-0.5.3-r1.ebuild
index 2f611583f620..b548d1894884 100644
--- a/app-shells/peco/peco-0.5.2.ebuild
+++ b/app-shells/peco/peco-0.5.3-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGO_VENDOR=( "github.com/google/btree 0c3044bc8bada22db67b93f5760fe3f05d6a5c25"
 	"github.com/jessevdk/go-flags 8bc97d602c3bfeb5fc6fc9b5a9c898f245495637"
 	"github.com/lestrrat/go-pdebug 2e6eaaa5717f81bda41d27070d3c966f40a1e75f"
 	"github.com/mattn/go-runewidth 737072b4e32b7a5018b4a7125da8d12de90e8045"
-	"github.com/nsf/termbox-go abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8"
+	"github.com/nsf/termbox-go e2050e41c8847748ec5288741c0b19a8cb26d084"
 	"github.com/pkg/errors 248dadf4e9068a0b3e79f02ed0a610d935de5302"
 	"github.com/stretchr/testify 18a02ba4a312f95da08ff4cfc0055750ce50ae9e" )
 
@@ -15,36 +15,40 @@ EGO_PN="github.com/peco/${PN}"
 
 inherit golang-vcs-snapshot
 
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
 DESCRIPTION="Simplistic interactive filtering tool"
 HOMEPAGE="https://github.com/peco/peco"
-SRC_URI="${ARCHIVE_URI}
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
 
-LICENSE="MIT"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="test"
 
-DEPEND="dev-go/glide
-	dev-go/go-spew"
+DEPEND="test? ( dev-go/glide )"
 
-DOCS=( src/${EGO_PN}/Changes src/${EGO_PN}/README.md )
+DOCS=( src/"${EGO_PN}"/{Changes,README.md} )
 
 src_prepare() {
 	default
 
-	# Don't install dependencies
-	sed -i '/peco\$(SUFFIX):/s/ installdeps//' \
-		src/${EGO_PN}/Makefile || die "sed failed"
+	# Don't install dependencies, make build verbose
+	sed -i -e '/peco\$(SUFFIX):/s/ installdeps//' \
+		-e '/test:/s/ installdeps//' \
+		-e '/go build/s/-o/-v -x -o/' \
+		-e '/go test -v/s#$(INTERNAL_BIN_DIR)/$(THIS_GOOS)/$(THIS_GOARCH)/##' \
+		src/"${EGO_PN}"/Makefile || die "sed failed"
 }
 
 src_compile() {
-	GOPATH="${S}:$(get_golibdir_gopath)" emake -C src/${EGO_PN} build
+	GOPATH="${S}:$(get_golibdir_gopath)" emake -C src/"${EGO_PN}" build
+}
+
+src_test() {
+	GOPATH="${S}:$(get_golibdir_gopath)" emake -C src/"${EGO_PN}" test
 }
 
 src_install() {
-	dobin src/${EGO_PN}/releases/peco_linux_amd64/peco
 	einstalldocs
+	dobin src/"${EGO_PN}"/releases/peco_linux_amd64/peco
 }
diff --git a/app-shells/peco/peco-0.5.3.ebuild b/app-shells/peco/peco-0.5.3.ebuild
index 958bad43d524..c40d5b888512 100644
--- a/app-shells/peco/peco-0.5.3.ebuild
+++ b/app-shells/peco/peco-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/peco/peco"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
 
-LICENSE="MIT"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"