gentoo resync : 18.11.2019

8 files changed, 53 insertions, 39 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 016adcb12a1d..86ec8242f4e7 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/gentoo-zsh-completions/Manifest b/app-shells/gentoo-zsh-completions/Manifest
index b18a49539a1d..d6dd496ebf0a 100644
--- a/app-shells/gentoo-zsh-completions/Manifest
+++ b/app-shells/gentoo-zsh-completions/Manifest
@@ -1,6 +1,4 @@
-DIST gentoo-zsh-completions-20150103.tar.gz 23759 BLAKE2B 9e48cad8b98df4de9479f06ab394e689f2169c6b52e062806b2051f18b86a6f80b660f472fe48b94bb0aff10095d7fcb9e097aa38710d6f3969cb03cfa4aff5c SHA512 4d87edda071d98672df79e3dbb9565757c0738bc50751d31e5dfefab4f17523387fb2342906ecc0600ce86d888ab4a785756bbb1daf37ca56a3ce1af9e5ae173
 DIST gentoo-zsh-completions-20180228.tar.gz 23246 BLAKE2B a6e4004aa7592cbb097cad55fe9d7286f39bd264d8c463ed22e665ca6a60732b0bc8678a0ac09715e2f34abbadd0e4466d783fdb228ce364bcbe13fb7f097649 SHA512 2b3dcfb910e297eb2f03f4ad9f3749b379ceb60f8b6cbcb7c7d03b7921b79aa21f8d3aa50931c5d4eff52f988a208f1a810c6da7c20720be7a3f2ce4a4564788
-EBUILD gentoo-zsh-completions-20150103.ebuild 749 BLAKE2B 3dc0cdc039b46e168e9df3c122e3296f039be0e52b5167439bffb41e9ee7812607c98ef4b49568b6b6a9a8d1d89ca38d779ee1f1aa5f5518e9c571bee1c11bbf SHA512 c8b4cc5e74530e7e513efba127aaf16cdb1762b374bf2c6ae860902ee7bd231382e2f3b0adc28ddbedadeb551c1717236a06f1333387107e46ffffd72da86933
 EBUILD gentoo-zsh-completions-20180228.ebuild 752 BLAKE2B f2ce8ba36cc26a33bd46695c99a855b169251e38e087db8117559b9c5fa78ea483263839dc57281687dccd2503c2a0e9be5519f816efebeba5ec16d6a7f24ba7 SHA512 ed145ad66ee9f8c7b888ce80da3b85ab942f20dd3e0d18d28a8446a496a3a3bd3c26381712e20a0bc35b6e65dc72007615ee4e50b45dd21ab889e79d0aad6475
 EBUILD gentoo-zsh-completions-99999999.ebuild 749 BLAKE2B 6fcaf920e884fc2f3a74a80d77e8d48f1b4be968a764e63447701c74e4bd22239e860db3169126943f901d59428da7f342aae9966e9ae85313e78f3dcc47c9c5 SHA512 141b3cae869c3a877a44093ea8ab444ced6247db21c70c11c6e87fb052379e3dd1df638740a7f16a6b41e775c50e9f52505f280b46e974fed7bcd71debb1b2c5
-MISC metadata.xml 350 BLAKE2B c8d3cbed9f1d2cc6511612f05448d7826ca031448c936a2ec18ad2bc8af628c3531a248c63cc2f46f0037c2b9305051df2b3d05808d5d7721c39560c0621bfd9 SHA512 06072032aaba8a33b43231772067bbadedc05abe289933b54108d30e6acd81fab23e621db91dd1269df46a171bb11c3903e8e942a7ce964c1229e44912702d59
+MISC metadata.xml 264 BLAKE2B 8020d5ed518f5d0046da3b51ca0cb5be5e6afca0f743dd117dd8057b707c4b8dff58487491fd61592b625793837c30408a9029cf8ab74e0d7efac7d7ad205dcc SHA512 baa3e290eb539d5a9c615585e8701a9656d1f2e5096de544cadd8f84f4bacbee6f5c3874af59942b2933506a60cfea5d60538fd9e38135f711ffb50fbad2f034
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20150103.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20150103.ebuild
deleted file mode 100644
index 8a03144af909..000000000000
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20150103.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gentoo/gentoo-zsh-completions.git"
-else
-	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
-fi
-
-DESCRIPTION="Gentoo specific zsh completion support (includes emerge and ebuild commands)"
-HOMEPAGE="https://github.com/gentoo/gentoo-zsh-completions"
-
-LICENSE="ZSH"
-SLOT="0"
-
-RDEPEND=">=app-shells/zsh-4.3.5"
-
-src_install() {
-	insinto /usr/share/zsh/site-functions
-	doins src/_*
-
-	dodoc AUTHORS
-}
diff --git a/app-shells/gentoo-zsh-completions/metadata.xml b/app-shells/gentoo-zsh-completions/metadata.xml
index bb95fea0f268..1b2e926e8038 100644
--- a/app-shells/gentoo-zsh-completions/metadata.xml
+++ b/app-shells/gentoo-zsh-completions/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
+  <!--maintainer-needed-->
   <upstream>
     <remote-id type="github">gentoo/gentoo-zsh-completions</remote-id>
   </upstream>
diff --git a/app-shells/peco/Manifest b/app-shells/peco/Manifest
index 4b4c3288366b..707f10827652 100644
--- a/app-shells/peco/Manifest
+++ b/app-shells/peco/Manifest
@@ -7,5 +7,6 @@ DIST github.com-pkg-errors-248dadf4e9068a0b3e79f02ed0a610d935de5302.tar.gz 11334
 DIST github.com-stretchr-testify-18a02ba4a312f95da08ff4cfc0055750ce50ae9e.tar.gz 83549 BLAKE2B 7bdaac806a8ea401ad991f995e1f94fa2983debe6ed8ec4f54462a6f7641084c2ffe14814ad265aa825aa2132fc357d023fce43540e7ea3a433a16064cd3e833 SHA512 e9af02a015b8eff0c83ba7ad6236d83804f75206586ac7a260c2ee663764aa41af445420f296d793ab7ebd3ac9f346dfdd5f1bfda20a4cbdf0a7b29452c7ce37
 DIST peco-0.5.3.tar.gz 77415 BLAKE2B 9f060e191550d39eed8dbf4b4379e424886476589e40af2c8bd2758c90636c6e9ab8e7551a32726f1f2d3338c7e59d47432d58f6493f03bbd3b8670095e27382 SHA512 c1b5678b369caa35e3bd2679eee857762c73bcc8a815d83e136fa1c30e48728a60f22be5d92132c8a733d591728f9293a973fc387502db79f5676ae1f45c6774
 EBUILD peco-0.5.3-r1.ebuild 1591 BLAKE2B 6c3cb74040b59eb901b9e06672bfee82c7775996a65daefbaff1f47c8c09447adbec43029ae294c99caf726343074051a3362da8ee3b1c8d1c5c499c7f05c091 SHA512 191048f7f616216f7a295f285f2f94ac27708434291f334d9da15636d926748b0df735e00e3f33a9533514f3a6983777eb285f236282343f2f6e6761de33b5d0
+EBUILD peco-0.5.3-r2.ebuild 1486 BLAKE2B 29300f27965261a64269f68433ee707e91084f512c439da179d61df3b588d29358bbcdd1663a1aa532ea4190e42f12231405e4913ea85bb2960e0c352e967482 SHA512 ffa9cdf9e861b2093ab6f2fdacce82113b65d8e790a25bdeb380a0e06bfdb205a9ecd04cdb706fa48dbd6c83f3634fbd75f9218e737877975ac87712bb26557a
 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.3-r2.ebuild b/app-shells/peco/peco-0.5.3-r2.ebuild
new file mode 100644
index 000000000000..4bf612fe18c2
--- /dev/null
+++ b/app-shells/peco/peco-0.5.3-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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 e2050e41c8847748ec5288741c0b19a8cb26d084"
+	"github.com/pkg/errors 248dadf4e9068a0b3e79f02ed0a610d935de5302"
+	"github.com/stretchr/testify 18a02ba4a312f95da08ff4cfc0055750ce50ae9e" )
+
+EGO_PN="github.com/peco/${PN}"
+
+inherit golang-vcs-snapshot
+
+DESCRIPTION="Simplistic interactive filtering tool"
+HOMEPAGE="https://github.com/peco/peco"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="test"
+
+DOCS=( src/"${EGO_PN}"/{Changes,README.md} )
+
+src_prepare() {
+	default
+
+	# 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
+}
+
+src_install() {
+	einstalldocs
+	dobin src/"${EGO_PN}"/releases/peco_linux_amd64/peco
+}
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 6b668d778035..b59cda27726b 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -8,4 +8,4 @@ DIST zsh-5.7.1.tar.xz 3126308 BLAKE2B 4f1aa2d5aea0341ba7839cf05687020889b5ca6879
 EBUILD zsh-5.6.2.ebuild 5796 BLAKE2B 23454fd9fe184d2a52d325f35785f73da3c87aa8016d267458edeae5194bb0e0981b7b6b6e9c815a844cee79e5203ddcb1ff33e926ebcad9eb6b0db5d222d215 SHA512 f7e89fef58005a2e8d51c8b24487557dabde870624fc8e33d8efc2c6b78c0d7e14e523ecf17a4682c3834d855492de98afaf5e3f5cd8107d9a6276dbb5492095
 EBUILD zsh-5.7.1.ebuild 5918 BLAKE2B 157c02c1885f49e39ef74ffcb4a8f3725cab0ab3bb909a163da7d4f9987e26c39d6ba63e3456a39deefd84442236498f839f5761c1dc92b53f60c10e38cff863 SHA512 dd61bccc222da83e4b4bb05fcb36aa929068698f7006f9425f90c0800763e1541acfdde472bb9e030d8246548d5ce6a6463445839823576d04df4b264063f973
 EBUILD zsh-9999.ebuild 5894 BLAKE2B d421ee14a23f359781a2b6ac242a96ace0b09509057cebb155c0f1cf02fe6e7fd5278890654001ff606b7903e74fc802b8035486bed1a51f3f78a804e4505d33 SHA512 64a7cbe8d309f3fc598e9984f0a15644f94a50fbd3e2e8f047b712a50ece4f55bf94253f57175e14bb3e3c77b9a1d9c9606c109f3eab31e814986ba0e6f62b27
-MISC metadata.xml 627 BLAKE2B 075ca50a779af22aa7664943a0ec270d99869d615d73aa65f5483d4ae30821ca535f18e8841c43f2359ae83650f32931a6f91e8b0eab63ceee7ec4754db55f3c SHA512 489307b83b15893965874824d59bf9d54a6f82aa13c62e1e7a12ada87d10b8e5d3ab63c6e1dc327b087f7403c871ce3cb766423e3513ed0c3b2304342775fbb1
+MISC metadata.xml 514 BLAKE2B 63d77a851911c67bbf8bd722cd8a4766bd0ff0184c2cc6bd2629b27186ea1bdba9b15bed73cee6a261ff499a22a9ef9b8582b22b76eb3752709553bf49e92071 SHA512 bb460e1e123c3f9b7bcad9a6abfcd42ac69f9a2071d6b2dcbee968c3fe82b9bb940e28021b1d619642d99fc595f492247b1a97e6ad51133be73bbb5fd997ef0d
diff --git a/app-shells/zsh/metadata.xml b/app-shells/zsh/metadata.xml
index 4c28ddb4044d..f3a82649cf20 100644
--- a/app-shells/zsh/metadata.xml
+++ b/app-shells/zsh/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
-  <maintainer type="person">
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>