gentoo resync : 15.12.2019

5 files changed, 7 insertions, 83 deletions

diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest
index f2b7b402313c..60388059270c 100644
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@@ -1,6 +1,3 @@
-AUX gopass-1.8.4-xc-tests.patch 923 BLAKE2B 67c00d9d0d983dbb0e3f8a7e78c895dc645d1ce0e4eed2e726871d5fa35086cba10872452b76fa0ffb65ff89f3ad25c9f726141221d1dd3f11086690697da0a1 SHA512 a80ce382b9e35af43a7ddeaa7a863e73d7960e37337b66d558dfc1840a7b113767eacbb6225bbbc2f3dd581b33c0f4a9a03105a08340a9abed4768baa4c32648
-DIST gopass-1.8.5.tar.gz 6561060 BLAKE2B 99d5ba9d5aed396eb4747461b64285d37544e7deaeb7ee7ebd6e3298a8746cdacbae4aa573d87d324703751d5a78efad2735954d8e2a2a8b53549985a4a9952a SHA512 1f451b10aa87141de635650489bf7227c252e10e5139dad274c95d5625db74fec0b8892a468800d3d3c5dd8b3d64f1c93bd6c75a0ba54fe5f6e630c77b2c6c71
 DIST gopass-1.8.6.tar.gz 7072723 BLAKE2B 5ae883c54f8180f8b6da870bd99710f1c740afe9de193c127a3047fa1211641b94ab98e23148d83c6d5b2cd2e3275f644dc875d106c9267e7e0c6342bf0b9a46 SHA512 7acdb095cf8913954044c3206eab020f197542334798c6b94724709c3953b12f7e5b73ce8c1aa4bfd5df3acf1f424b64bfa94f9a8f68fa7116ed14c8a0f2e6f0
-EBUILD gopass-1.8.5.ebuild 1095 BLAKE2B ce53235ad3e59da78f578b2388372ce67131e66f5a55d444088cc41d261f9d311e04e1372accb5936d359a4871c1c54d0a90166d231b53665567dd99c9e4ee6b SHA512 f798a8efec8122f9dbbf1d3558123e13709dde9e33819ea0179ea2f407f0634e3c17fd6ffd7766c3cadcf36a9cea51ce2baccece160fba0302334d1a3b1d06db
-EBUILD gopass-1.8.6.ebuild 1041 BLAKE2B 04d26bf816ad93d9267177e12b3d86ef6f383a5c73ab9548d098b39b92ffa205e5a7924fb91bacd5f6510bb4475bec8a087ff095a5dcdb1578acdaa8c94914df SHA512 d73ae1d48ce585ae27abdec5ad52f1e95c6b9917fd5831c683765becf50565df5fe14380179f5f7027f9945d89e6fa60d6b7d9b2f562d09588885530705acd34
-MISC metadata.xml 326 BLAKE2B fbff56ecc7a4bd866c1220fc218f9233ed0660b04cde03047df5db992557bf5d20f518815dc15eba2a22f6b2b8cc4eb5ed1c0f2cc2753e18ce4cafd59b768637 SHA512 2d43a58c7997bd539d9aa5659fe7cfcd947c97c49d31dea4ee1230b06b0ae2c8cef4fb228b889968f65c36693d5befa76828da3644bea0852ead709bbf7d760c
+EBUILD gopass-1.8.6-r1.ebuild 1068 BLAKE2B 11cfbbeb943ad9ed42bd9e16ff230d49ff40759e241d6a60ccf57b31a4bf455dfb4ff954e31fbfcf06ce242e5776ddff100b604448eed80986bd63c472680fdc SHA512 f9a71715b209b88157c72591a30f3d385f14d6e3456324a75cdcfc1e9e9e9f795f65482f7b3ec45b9691af88d756fd71646a4bf7e0c4855415843663d9c1e78a
+MISC metadata.xml 327 BLAKE2B d3ea7ba02c3484c31b58d8c8e1b1b5a064eff597c42add7bcd720d818d90ae107a9f72292fafc6c059995118d96204e8f8f2ed82856dcc0e1061c2eca81aab54 SHA512 7c7bb9cd28275bb75bb0e71da2dee86f7a32340908e59359d330b03fd07ba8569226775101a92032b06fac1ba0327ca6cb57c5ecf6b6c3c1a0319b3259bda38c
diff --git a/app-admin/gopass/files/gopass-1.8.4-xc-tests.patch b/app-admin/gopass/files/gopass-1.8.4-xc-tests.patch
deleted file mode 100644
index 5780f17bf347..000000000000
--- a/app-admin/gopass/files/gopass-1.8.4-xc-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Skip xc cli tests, 1.8.3 failed when run with no arguments for these commands
-but 1.8.4 doesn't.
-
---- gopass-1.8.4/src/github.com/gopasspw/gopass/commands_test.go
-+++ gopass-1.8.4/src/github.com/gopasspw/gopass/commands_test.go
-@@ -55,14 +55,14 @@
- 	".templates.remove":      {},
- 	".templates.show":        {},
- 	".unclip":                {},
--	".xc.decrypt":            {},
--	".xc.encrypt":            {},
--	".xc.export":             {},
--	".xc.export-private-key": {},
--	".xc.generate":           {},
--	".xc.import":             {},
--	".xc.import-private-key": {},
--	".xc.remove":             {},
-+	// ".xc.decrypt":            {},
-+	// ".xc.encrypt":            {},
-+	// ".xc.export":             {},
-+	// ".xc.export-private-key": {},
-+	// ".xc.generate":           {},
-+	// ".xc.import":             {},
-+	// ".xc.import-private-key": {},
-+	// ".xc.remove":             {},
- }
- 
- func TestGetCommands(t *testing.T) {
diff --git a/app-admin/gopass/gopass-1.8.5.ebuild b/app-admin/gopass/gopass-1.8.5.ebuild
deleted file mode 100644
index 108b80c18f66..000000000000
--- a/app-admin/gopass/gopass-1.8.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/gopasspw/gopass"
-
-inherit golang-vcs-snapshot golang-build bash-completion-r1
-
-DESCRIPTION="a simple but powerful password manager for the terminal"
-HOMEPAGE="https://www.gopass.pw/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11"
-RDEPEND="
-	dev-vcs/git
-	>=app-crypt/gnupg-2
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.8.4-xc-tests.patch )
-
-src_install() {
-	dobin gopass
-
-	local DOCS=( src/${EGO_PN}/{CHANGELOG,CONTRIBUTING}.md src/${EGO_PN}/docs/*.md )
-	einstalldocs
-
-	# install fish completion
-	./gopass completion fish > "${T}"/${PN}.fish || die
-	insinto /usr/share/fish/vendor_completions.d
-	doins "${T}"/${PN}.fish
-
-	# install bash completion
-	./gopass completion bash > "${T}"/${PN} || die
-	dobashcomp "${T}"/${PN}
-
-	# install zsh completion
-	./gopass completion zsh > "${T}"/${PN}.zsh || die
-	insinto /usr/share/zsh/site-functions
-	newins "${T}"/${PN}.zsh _${PN}
-}
diff --git a/app-admin/gopass/gopass-1.8.6.ebuild b/app-admin/gopass/gopass-1.8.6-r1.ebuild
index 5ca88b63636f..76181e91d2fc 100644
--- a/app-admin/gopass/gopass-1.8.6.ebuild
+++ b/app-admin/gopass/gopass-1.8.6-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 EGO_PN="github.com/gopasspw/gopass"
 
 inherit golang-vcs-snapshot golang-build bash-completion-r1
@@ -10,9 +10,9 @@ DESCRIPTION="a simple but powerful password manager for the terminal"
 HOMEPAGE="https://www.gopass.pw/"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="MIT"
+LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=dev-lang/go-1.11"
diff --git a/app-admin/gopass/metadata.xml b/app-admin/gopass/metadata.xml
index 06eb97b4a0f0..9dce670d8f3f 100644
--- a/app-admin/gopass/metadata.xml
+++ b/app-admin/gopass/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
+		<name>Mikle Kolyada</name>
+		<email>zlogene@gentoo.org</email>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">gopasspw/gopass</remote-id>