gentoo resync : 09.06.2018

3 files changed, 13 insertions, 91 deletions

diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest
index 9999f4462bb2..3464e6fd3f35 100644
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@@ -1,9 +1,7 @@
-DIST restic-0.7.3.tar.gz 37062625 BLAKE2B 0a50c1c6c1ffc8f5d5c0698341bfd1715faee0ab3392ddb065b75143babb45dcfee355f2a369771b4c256cafcb839dc401ad827e194b52d27a1c7582b9c3a1c3 SHA512 2d44b4fc363c7f6389c1f06469cf30ebeff4d6ade0bd4fcae1d7d9def3922936b45043b04f4072284b773df2c6487c58db6aea41c7de5c8184ca33ca3c44d44a
-DIST restic-0.8.0.tar.gz 37309494 BLAKE2B 0c50ccbdabca2057a5d1f8a7326a3e143101daed7cf9eabf0deb2d4452bbd63fd57c3edc8be106c0123f3c4e01195e8042a8f70477c999b00069ffe3d4fcb1d5 SHA512 5f2205ac5caf91f119f1705dc1f8340c481fd27d809cdadbd8ff39ebbc910d98452626c2a9564300935746550a2604ed59aa095f3137788bd0dce87c0dcb14f9
 DIST restic-0.8.1.tar.gz 40330154 BLAKE2B 6758ae4cd7b3caf1bb58b9b95ddd9b99422f2a5997f37317381ec2714a4bc369331e1ba5accb791a2733eddcebdb056256a25b837cad6926f86ec61265d95324 SHA512 02d45b70b94514d3491297dcd34f26db854b6153a1aa297aaa9c938e09d65429fbe0dedb3c028ad38c769049f814c7a923481adfe9962a35dc39a7477a80fdab
 DIST restic-0.8.3.tar.gz 48746281 BLAKE2B 4161326068165b5ba19e9ee0e6386aa1df29a961a42509a2cb7924958100b9412abd1dd27d299d1eef76fdd4731d4a56f0a68e796a46071229a3e6767d3a6bb7 SHA512 758b2c69af8aad6bb62dc750141d5f5a1954ca2b51350ef59c35fd10afefaddc4d8d0cdd5914f249594946db6138124a48fba531b8a24353f022ccea773a240c
-EBUILD restic-0.7.3.ebuild 1276 BLAKE2B 13a79b91735acd188bee1f60303d3237b69fa85af4f37de021b60ca942b0fe2ae06a695720e268f2076eb3c860336a163cb9279d037fbe6a597b621028866531 SHA512 d7bfd4df6620cba9400e6b6c484864a0a5fae4953744cef7e1979f234a3c7d40a53e8750a572d414c98090f99734bc8243aac6353493c845b710190915f52cfe
-EBUILD restic-0.8.0.ebuild 1589 BLAKE2B 9ecc5384646c5227e7557e0a0f4ece8928e70e6491ff90549162223d6aea1b56e57271666491251122ebce01c274a80208010a9647e74a3f33e54ac91f28623e SHA512 3232fcffcf1ced52759125c00f3380f90e263e0e84d1a5da24f3f225ad49c1476e2d979cad85781a7c66bdb89460fa59e7d3b04b7b08bed29b59ea8e008c79f6
+DIST restic-0.9.0.tar.gz 51049118 BLAKE2B 4089a0eafe0f3778d540ffb87d5d773f1bb4296c3cb7a085a38cc1ac54742392790ccf61145ed3ff19a7e35b358e0b40c7f3edf6ee661e22ffd00efafa2bdee1 SHA512 c01e8450c7afbea59d86a53a5491e562ba5d1ab7fe3e96e0e5b53d96f4df2cf051d7abaef742ff2ecce759e2cd97386566e1c19260f0d74ae678edbe200aa885
 EBUILD restic-0.8.1.ebuild 1589 BLAKE2B 9ecc5384646c5227e7557e0a0f4ece8928e70e6491ff90549162223d6aea1b56e57271666491251122ebce01c274a80208010a9647e74a3f33e54ac91f28623e SHA512 3232fcffcf1ced52759125c00f3380f90e263e0e84d1a5da24f3f225ad49c1476e2d979cad85781a7c66bdb89460fa59e7d3b04b7b08bed29b59ea8e008c79f6
 EBUILD restic-0.8.3.ebuild 1190 BLAKE2B b67c12c01ad4f69c281ffeeee90eff0dc1eaba5341ff18c519b2183ef1460843a50d7adb9ec518f8affbe3546328f9f488d274ae99071799e7e3d1ef5415fd3a SHA512 980f1040b4f6b2c46598dd6ba70bd3e9bff8d89274002dad12e497f82ff2c0eb362a43e91473da05f982c1b4aad3e19e1124c8fd753fc371eb5f73f7a43f7b17
+EBUILD restic-0.9.0.ebuild 1155 BLAKE2B 2370d9923040125cab0b8831850d5c997638669eb1a1939e3f59a51d27f131b2631ea5866d77ac1ef85e73fd74c54cd3d49aafc619924e7afdc4c888c08f0864 SHA512 5cdd3cff4ff86b0502f8d6e31f647e144a84db086c43d33fd53cdadcebe4f440a84f82f5bc478f2043adc4ac007a1800a33bf97f9c8b4d43fc11ca5d287572bf
 MISC metadata.xml 444 BLAKE2B f9cc0e8188fbd02a7bacc258eac4052b88fcd3d3b878ce336f7f4635bd4fa94abdfa5112b35bbf6913dcbbfb64833d5f3a4d372c202b2f2488d5d0c750ce2f52 SHA512 8dbd7df10769ff8d0271588be8c97402d5917a4c0dbafa5daad2090245ee4b022193a6c271f71c342540d7599b029998c91c10364eae7d55de0275276342c0f4
diff --git a/app-backup/restic/restic-0.8.0.ebuild b/app-backup/restic/restic-0.8.0.ebuild
deleted file mode 100644
index 3cd921c0f6dc..000000000000
--- a/app-backup/restic/restic-0.8.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot bash-completion-r1
-
-DESCRIPTION="A backup program that is fast, efficient and secure"
-HOMEPAGE="https://restic.github.io/"
-SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-EGO_PN="github.com/restic/restic"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-DOCS=(
-	README.rst CONTRIBUTING.md doc/010_introduction.rst doc/020_installation.rst
-	doc/030_preparing_a_new_repo.rst doc/040_backup.rst doc/045_working_with_repos.rst
-	doc/050_restore.rst doc/060_forget.rst doc/070_encryption.rst doc/080_examples.rst
-	doc/090_participating.rst doc/100_references.rst doc/cache.rst doc/faq.rst
-	doc/index.rst doc/manual_rest.rst
-)
-
-DEPEND="
-	dev-lang/go
-	test? ( sys-fs/fuse:0 )"
-
-RDEPEND="sys-fs/fuse:0"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_compile() {
-	local mygoargs=(
-		-v
-		-work
-		-x
-		-tags release
-		-ldflags "-s -w -X main.version=${PV}"
-		-asmflags "-trimpath=${S}"
-		-gcflags "-trimpath=${S}"
-		-o restic ${EGO_PN}/cmd/restic
-	)
-
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		go build "${mygoargs[@]}" || die
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		go test -timeout 30m -v -work -x ${EGO_PN}/cmd/... ${EGO_PN}/internal/... || die
-}
-
-src_install() {
-	dobin restic
-	einstalldocs
-
-	newbashcomp doc/bash-completion.sh "${PN}"
-
-	insinto /usr/share/zsh/site-functions
-	newins doc/zsh-completion.zsh _restic
-
-	local i
-	for i in doc/man/*; do
-		doman "$i"
-	done
-}
diff --git a/app-backup/restic/restic-0.7.3.ebuild b/app-backup/restic/restic-0.9.0.ebuild
index 8d2fe07c31c1..89515ce18d02 100644
--- a/app-backup/restic/restic-0.7.3.ebuild
+++ b/app-backup/restic/restic-0.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit golang-vcs-snapshot
+inherit bash-completion-r1 golang-vcs-snapshot
 
 DESCRIPTION="A backup program that is fast, efficient and secure"
 HOMEPAGE="https://restic.github.io/"
@@ -15,18 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 
-DOCS=(
-	README.rst CONTRIBUTING.md doc/design.rst
-	doc/faq.rst doc/index.rst doc/manual.rst
-	doc/rest_backend.rst doc/development.rst
-	doc/talks.rst doc/tutorial_aws_s3.rst doc/installation.rst
-)
-
-DEPEND="
-	dev-lang/go
-	test? ( sys-fs/fuse:0 )"
-
 RDEPEND="sys-fs/fuse:0"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${P}/src/${EGO_PN}"
 
@@ -36,7 +26,7 @@ src_compile() {
 		-work
 		-x
 		-tags release
-		-ldflags "-s -w -X main.version=${PV}"
+		-ldflags "-X main.version=${PV}"
 		-asmflags "-trimpath=${S}"
 		-gcflags "-trimpath=${S}"
 		-o restic ${EGO_PN}/cmd/restic
@@ -53,10 +43,12 @@ src_test() {
 
 src_install() {
 	dobin restic
-	einstalldocs
 
-	local i
-	for i in doc/man/*; do
-		doman "$i"
-	done
+	newbashcomp doc/bash-completion.sh "${PN}"
+
+	insinto /usr/share/zsh/site-functions
+	newins doc/zsh-completion.zsh _restic
+
+	doman doc/man/*
+	dodoc doc/*.rst
 }