gentoo resync : 15.06.2021

8 files changed, 6 insertions, 84 deletions

diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index cb328c9f04e6..c06d52d80360 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/go-licenses/Manifest b/dev-go/go-licenses/Manifest
index 873de7dadacc..67b8acf6947f 100644
--- a/dev-go/go-licenses/Manifest
+++ b/dev-go/go-licenses/Manifest
@@ -127,6 +127,6 @@ DIST gopkg.in%2Fsrc-d%2Fgo-git.v4%2F@v%2Fv4.13.1.zip 612427 BLAKE2B 1a0ccc2cbf96
 DIST gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod 28 BLAKE2B 39555ca91c4818bcc1955c20438d83965ad6f1b2058c6d8590f4c30688eab2ac08dfa1655d4de34bd68006afea1788a89fb0240d60b048be9616c8e44d8a801f SHA512 6fe714c089847582c8c01e055e4bd6b991e8fddc6e420aa03a40efb35fc4ecc5e87a60c44aa82fe004899eab427d4b82262cfebb3331b7443a2c7a68718f8f75
 DIST gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.zip 4950 BLAKE2B 35fad8c7c0a1de9e47bc540f34dd391c0284593466f5c99855fd204882e78cd06d0b32c144d689f516b4b8d23d90a11fd68e9dd0655a5d6dfd930300dc29c01c SHA512 d2be1d6e319c3114e44504d49c37da38c5f58ddde8b39f22e55134aff013447465d0f9354f2b899ffca4bf37bd597960860d16809ee427a0542d94b6b08cf2ba
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-EBUILD go-licenses-0_pre20200511.ebuild 7899 BLAKE2B 8a0c06c20ab6bd6661870e5e9f6a7af107af09091c7248822b14bf92a4d44082352e8a09dafb54a59198b9f38b93ee4b412c8a553d216344a1c897eafa8c3568 SHA512 b2c932802d84518fdb1956edd821b572daf78b3159f6213ef938a06a34c61025b0db02831dd4c70d0037fd2c0305e6df0731d491d1fd8c990bd73ed18e50ccb9
-EBUILD go-licenses-9999.ebuild 7899 BLAKE2B 8a0c06c20ab6bd6661870e5e9f6a7af107af09091c7248822b14bf92a4d44082352e8a09dafb54a59198b9f38b93ee4b412c8a553d216344a1c897eafa8c3568 SHA512 b2c932802d84518fdb1956edd821b572daf78b3159f6213ef938a06a34c61025b0db02831dd4c70d0037fd2c0305e6df0731d491d1fd8c990bd73ed18e50ccb9
+EBUILD go-licenses-0_pre20200511.ebuild 7902 BLAKE2B 4a8f7f3bb6030c49c9ac316819be9d564afbd27650d0d70710840df5ec75b2ee9f40385bf1ce2f7861412e98d74b308ad1d838d3ae48be959c9784730abe4ece SHA512 d2c4a4247042d9e419cecff28340c1ad7f8c005c525ff11237f92d99fe82ee896437e59292304eed786e352023c42a30b97540260dd58abd779b91e38e0555c8
+EBUILD go-licenses-9999.ebuild 7902 BLAKE2B 4a8f7f3bb6030c49c9ac316819be9d564afbd27650d0d70710840df5ec75b2ee9f40385bf1ce2f7861412e98d74b308ad1d838d3ae48be959c9784730abe4ece SHA512 d2c4a4247042d9e419cecff28340c1ad7f8c005c525ff11237f92d99fe82ee896437e59292304eed786e352023c42a30b97540260dd58abd779b91e38e0555c8
 MISC metadata.xml 867 BLAKE2B f0d0363bd8e611e4be122d2883f090c2ffb5600c7d58897cf623de6d67e97efbb197236cf9adf51854dce7b5ae6cd4fb1a1dee1b3d57f2fa8c1039ea08d9434d SHA512 27f4ae03a4b6477e7c104ec1b1400dc5575629d006abf7ffd0f07e9074e45ae6b71ccea994e02e44ea0b5658675d5b6eb4a925116b36c115067ec53f6226006c
diff --git a/dev-go/go-licenses/go-licenses-0_pre20200511.ebuild b/dev-go/go-licenses/go-licenses-0_pre20200511.ebuild
index 9dadfccb67c9..7375f5873fe3 100644
--- a/dev-go/go-licenses/go-licenses-0_pre20200511.ebuild
+++ b/dev-go/go-licenses/go-licenses-0_pre20200511.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -172,7 +172,7 @@ RESTRICT="test"
 src_prepare() {
 	eapply_user
 
-	local share="${EROOT}/usr/share/licenseclassifier"
+	local share="${ESYSROOT}/usr/share/licenseclassifier"
 
 	local vendored_const_path="vendor/github.com/google/licenseclassifier"
 	go mod vendor || die
diff --git a/dev-go/go-licenses/go-licenses-9999.ebuild b/dev-go/go-licenses/go-licenses-9999.ebuild
index 9dadfccb67c9..7375f5873fe3 100644
--- a/dev-go/go-licenses/go-licenses-9999.ebuild
+++ b/dev-go/go-licenses/go-licenses-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -172,7 +172,7 @@ RESTRICT="test"
 src_prepare() {
 	eapply_user
 
-	local share="${EROOT}/usr/share/licenseclassifier"
+	local share="${ESYSROOT}/usr/share/licenseclassifier"
 
 	local vendored_const_path="vendor/github.com/google/licenseclassifier"
 	go mod vendor || die
diff --git a/dev-go/godep/Manifest b/dev-go/godep/Manifest
deleted file mode 100644
index dd040cac8b23..000000000000
--- a/dev-go/godep/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST godep-74.tar.gz 71366 BLAKE2B ce16803fd0bbc7a28de2957b47faf1b88461387a240628d87346f8a64ef19ba2cb4d61fd3a37a990a4c99fb42a2583379ff015163da307ff08f1e3d4ce3f85dd SHA512 c131fd72cd6d6f3d3603c8698a9c4213c6402956488bcf169a846a87607f46c6e94184a6c5c3d4fc04110231a0954e0024c3008577d3ede7aa0825460f430add
-EBUILD godep-74.ebuild 641 BLAKE2B 8b7f18f6e76b4aa7f3574c1051b15ac91f642fb59c4ead889edbd3f73e06a9a8504e225872a81f404bee6f67a50cb8d921fb6b4b4dc92c5061643169ae5eef31 SHA512 ad962744146b79afdf530b05a79d33ee32f5c8ed66872030a2e32b1de964fedf4f18a45fbb8edf0d79e1fd73ec0a8c5373e59cafdb8b1f1124350e57586beb19
-EBUILD godep-9999.ebuild 641 BLAKE2B 8b7f18f6e76b4aa7f3574c1051b15ac91f642fb59c4ead889edbd3f73e06a9a8504e225872a81f404bee6f67a50cb8d921fb6b4b4dc92c5061643169ae5eef31 SHA512 ad962744146b79afdf530b05a79d33ee32f5c8ed66872030a2e32b1de964fedf4f18a45fbb8edf0d79e1fd73ec0a8c5373e59cafdb8b1f1124350e57586beb19
-MISC metadata.xml 248 BLAKE2B f9efa1c45294d6c14c0e896cd0b75ddcba4ad9f7d1bd6f16a8d543a2cd6c9f21273e08e249623310948f716b7329be3e2fa57363edf3b64bbb41e188ab478987 SHA512 60b85cc1ee2d70e66e24f11ba8958ff490ccee543572cbf35f5799841e05abcab37ae64a35e5a9efe3f1501a586284e19a4451fbf58d5f0d55d88ac5f0e0362a
diff --git a/dev-go/godep/godep-74.ebuild b/dev-go/godep/godep-74.ebuild
deleted file mode 100644
index a02c38c7d52d..000000000000
--- a/dev-go/godep/godep-74.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/tools/godep
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT=v${PV}
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="dependency tool for go"
-HOMEPAGE="https://github.com/tools/godep"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #681204
-	golang-build_src_compile
-}
-
-src_install() {
-	dobin godep
-	dodoc src/${EGO_PN}/*.md
-}
diff --git a/dev-go/godep/godep-9999.ebuild b/dev-go/godep/godep-9999.ebuild
deleted file mode 100644
index a02c38c7d52d..000000000000
--- a/dev-go/godep/godep-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/tools/godep
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT=v${PV}
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="dependency tool for go"
-HOMEPAGE="https://github.com/tools/godep"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #681204
-	golang-build_src_compile
-}
-
-src_install() {
-	dobin godep
-	dodoc src/${EGO_PN}/*.md
-}
diff --git a/dev-go/godep/metadata.xml b/dev-go/godep/metadata.xml
deleted file mode 100644
index 5c1204f8fe42..000000000000
--- a/dev-go/godep/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">tools/godep</remote-id>
-  </upstream>
-</pkgmetadata>