gentoo resync : 22.01.2021

6 files changed, 35 insertions, 71 deletions

diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index ba9d7e8efa32..0b03eecae913 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,11 +1,11 @@
 AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315
-DIST go1.14.12.src.tar.gz 22553834 BLAKE2B f2b3f750cc451c00376846962a5337c8e57aa9f4f737c7a8ab826772547ca0677bb3c6e52d004259f7e53d49efb013f645ce5223241fd29b35121149dc09a76c SHA512 cba26b97878d5bd57d75bd1541932786779ddb7e9fa0bfb7bf003c7ae9e7bee8318c0d2108ce918453b863892b8f562e481bd0ed6cfc44e43d901522603adff2
 DIST go1.14.13.src.tar.gz 22553900 BLAKE2B 35aed1c43a59e06c1d5feaa91a6c4120c586958257cb3e4f83ab4e767159e20ae953d70bc0debabd80722bca0965d1b129531a2bd89f558df0a8700cadc09edc SHA512 b54a0bc3b85809a78d4704fe2e97ad7417a2027608ec0f90c2784e2ddb28b505df3cda862dc6f1b99af2d136363cbb9b120e2fd6ed985cb300c43f8e539a5e28
-DIST go1.15.5.src.tar.gz 23019303 BLAKE2B 549f0e9c4e22432db7a1c6e06724d6ada0ac90c09c0886d3053296390d85686df89bcaff86c703e8a2789119f670ffb2c6c11f4bf7e186c14a75896e8e6b8c6e SHA512 8e1d71f628d364b949b1e124af8950a563bbe9d9ae73b94c66af6ce029f67c26e2654556c0c118d0bc8566af52a7e9ed736b4667bbef7ccdab2bd338c43e6eb4
+DIST go1.14.14.src.tar.gz 22557733 BLAKE2B aa3638c7a20f89e90bf17e9da1b12323cc8c0f52fb0a92ca6a850f7b2c94e406ea50a57fc28cc34b951bf7ecee0a9bb1ce884ad86dfc23241d7b62cd9435f881 SHA512 76213b19eeec66ca6c6b5bdef875bea0b64c3877c70eec64dd65f7869ceb8db016ff19193f01771f8944fd5f0ae3b54c68185e158f2622d1db5552fec1f37976
 DIST go1.15.6.src.tar.gz 23019337 BLAKE2B d328401af9843f4a099dee7d82433ad2a0b349add0f2ecb609635814cca610e17a6fc50215e9928b8cb0d8ea8dd6ae9d84ffca125e1362dfb18ba08783bb4264 SHA512 f20e495204f32170d6554e8f4b64763dae8302a7859005020f650d1d53a5b15de3afbaff28e0b6418287396166c67bdc4c6bee7a0fd7ba8a87bb79b6c1d38326
-EBUILD go-1.14.12.ebuild 4816 BLAKE2B fdef3a598cfb56afcea723bf4be7fe2e2603273631ffc3add513902f6e171f090a7154870ef7e0e9c937e96c6a17bba03b2c26fc7aafb715468f13f65b6c64d5 SHA512 558e7511ab18d58cf026dd841f5ce37b4fcc6a99a6eb4dadd0a0d32eda9eb00d5404de9f5bbba321763cd5ee2abb027137fe74e39ce6a874f3c4036b86621c08
-EBUILD go-1.14.13-r1.ebuild 4921 BLAKE2B d70f9c7cc9d4c2c43db62dfd59bb0f60a75dc056f552f406210011bd96e602397bcc6bb683b7f5fb39ece2c1ec7088e02a8e39fa01da1e279cb178682429523e SHA512 81b2653ac9499ac418bbb0daa4fd11bae0afa7bffa11f129aee7a78aac4ed0837f099f0ce14b51ea0a512419b5b337450b890fff542ad5e1a2068af3b95fd759
-EBUILD go-1.15.5.ebuild 4816 BLAKE2B fdef3a598cfb56afcea723bf4be7fe2e2603273631ffc3add513902f6e171f090a7154870ef7e0e9c937e96c6a17bba03b2c26fc7aafb715468f13f65b6c64d5 SHA512 558e7511ab18d58cf026dd841f5ce37b4fcc6a99a6eb4dadd0a0d32eda9eb00d5404de9f5bbba321763cd5ee2abb027137fe74e39ce6a874f3c4036b86621c08
-EBUILD go-1.15.6-r1.ebuild 4921 BLAKE2B d70f9c7cc9d4c2c43db62dfd59bb0f60a75dc056f552f406210011bd96e602397bcc6bb683b7f5fb39ece2c1ec7088e02a8e39fa01da1e279cb178682429523e SHA512 81b2653ac9499ac418bbb0daa4fd11bae0afa7bffa11f129aee7a78aac4ed0837f099f0ce14b51ea0a512419b5b337450b890fff542ad5e1a2068af3b95fd759
-EBUILD go-9999.ebuild 4921 BLAKE2B d70f9c7cc9d4c2c43db62dfd59bb0f60a75dc056f552f406210011bd96e602397bcc6bb683b7f5fb39ece2c1ec7088e02a8e39fa01da1e279cb178682429523e SHA512 81b2653ac9499ac418bbb0daa4fd11bae0afa7bffa11f129aee7a78aac4ed0837f099f0ce14b51ea0a512419b5b337450b890fff542ad5e1a2068af3b95fd759
+DIST go1.15.7.src.tar.gz 23017978 BLAKE2B 15b0827fb56b8e9208c65e8f7f11c7f67820efce1627b4123e937301bb437c597e87adfff9a2eee9aaf53ba0f22eb2f10746bafb7247b4250566f20181b7a2a0 SHA512 7b3e8bcd2fc95baad41f8b5f0456c009e01896d160e65c2670d51c23d8cfcf7a6801e831e6f9a8877fe58c8f54ac8f75bf6e7935b38ba7aaa51dc8e46cf76ddb
+EBUILD go-1.14.13-r1.ebuild 4574 BLAKE2B c9833658e5cd6f2a032663144aaf037d72a9175da16c4ca2562b49030d434335c9a981761c7ba13217bc3e80805eb127a6a16705fdacc681017a67f96235c20d SHA512 ff8b197a487280639b7e687a823277e260da97ce44d12ccbdbda00d25cb6dbae2b683b34ea8eceb3a98f368bd5fe6eb18f37b4ebd3bab10c2536c85334809122
+EBUILD go-1.14.14.ebuild 4577 BLAKE2B 50b6f9f44810ba3473936dbded7727569b76adb0c0827529cf96ec248108f9083fc2d118cb8f9316e361cbc2a5f7cc8e95121fe208982b21922136d382a81bad SHA512 9e08f5d30a0d901017c2b23c12a5f20260bddf3b053ddc339a1532571e0e2b2a4e51de89f7d591404fdd59ac2b917b187b05d740a3f5c36d20fb0c3095e962ab
+EBUILD go-1.15.6-r1.ebuild 4574 BLAKE2B c9833658e5cd6f2a032663144aaf037d72a9175da16c4ca2562b49030d434335c9a981761c7ba13217bc3e80805eb127a6a16705fdacc681017a67f96235c20d SHA512 ff8b197a487280639b7e687a823277e260da97ce44d12ccbdbda00d25cb6dbae2b683b34ea8eceb3a98f368bd5fe6eb18f37b4ebd3bab10c2536c85334809122
+EBUILD go-1.15.7.ebuild 4577 BLAKE2B 50b6f9f44810ba3473936dbded7727569b76adb0c0827529cf96ec248108f9083fc2d118cb8f9316e361cbc2a5f7cc8e95121fe208982b21922136d382a81bad SHA512 9e08f5d30a0d901017c2b23c12a5f20260bddf3b053ddc339a1532571e0e2b2a4e51de89f7d591404fdd59ac2b917b187b05d740a3f5c36d20fb0c3095e962ab
+EBUILD go-9999.ebuild 4579 BLAKE2B c19b3d07e84df70393c8242eb825444436b97d591b214bf1fbd6d265ac0e276fd147d1cfa96e61b1e33468d56eb355cdeda807af7beaa0b3fdcb2f1d1f989374 SHA512 768d17b68de2925267e8274f9e216cd5f79c13be54cb986d0126ab85beaaaa4e46d8ca18422786ee09813b4707aafc6695df815e234fa330dc0211c2ebd398d3
 MISC metadata.xml 462 BLAKE2B d9d4280e921286791a55619a7e5557c7041b0de157aa0f8bf6f17cf5041f802df4037270eeb3e8d37263f9fc17939c619a0dd3bce449c5f247279884da10bf67 SHA512 26fa7bfe26f00e8e1766cc0a1052fb8b5352799a33c9eb8f0c4f4523601d3eb5d1da8adc4b731f0d778039788734a9ad483f22e58e4bf1551ec8e9dccbcb87ba
diff --git a/dev-lang/go/go-1.14.13-r1.ebuild b/dev-lang/go/go-1.14.13-r1.ebuild
index 6bb792691ce1..55fd0c4f6bf1 100644
--- a/dev-lang/go/go-1.14.13-r1.ebuild
+++ b/dev-lang/go/go-1.14.13-r1.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
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
@@ -181,14 +181,6 @@ src_install()
 	# install the @golang-rebuild set for Portage
 	insinto /usr/share/portage/config/sets
 	newins "${FILESDIR}"/go-sets.conf go.conf
-
-	# fix install_name for test object (binutils_test) on Darwin, it
-	# is never used in real circumstances
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
 }
 
 pkg_postinst() {
diff --git a/dev-lang/go/go-1.14.12.ebuild b/dev-lang/go/go-1.14.14.ebuild
index 7c0569dd4b05..59b37bd3e992 100644
--- a/dev-lang/go/go-1.14.12.ebuild
+++ b/dev-lang/go/go-1.14.14.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
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
@@ -154,43 +154,37 @@ src_test()
 
 src_install()
 {
-	local bin_path f x
-
-	dodir /usr/lib/go
-
 	# There is a known issue which requires the source tree to be installed [1].
 	# Once this is fixed, we can consider using the doc use flag to control
 	# installing the doc and src directories.
+	# The use of cp is deliberate in order to retain permissions
 	# [1] https://golang.org/issue/2775
-	#
-	# deliberately use cp to retain permissions
+	dodir /usr/lib/go
 	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	einstalldocs
+
 	# testdata directories are not needed on the installed system
 	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+	local bin_path
 	if go_cross_compile; then
 		bin_path="bin/$(go_tuple)"
 	else
 		bin_path=bin
 	fi
+	local f x
 	for x in ${bin_path}/*; do
 		f=${x##*/}
 		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
 	done
-	einstalldocs
 
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name for test object (binutils_test) on Darwin, it
-		# is never used in real circumstances
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
+	# install the @golang-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/go-sets.conf go.conf
 }
 
 pkg_postinst() {
 	[[ -z ${REPLACING_VERSIONS} ]] && return
-	has_version "<sys-apps/portage-3.0.9" && return
-
 	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
 	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
 	einfo "due to the static linking nature of go."
diff --git a/dev-lang/go/go-1.15.6-r1.ebuild b/dev-lang/go/go-1.15.6-r1.ebuild
index 6bb792691ce1..55fd0c4f6bf1 100644
--- a/dev-lang/go/go-1.15.6-r1.ebuild
+++ b/dev-lang/go/go-1.15.6-r1.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
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
@@ -181,14 +181,6 @@ src_install()
 	# install the @golang-rebuild set for Portage
 	insinto /usr/share/portage/config/sets
 	newins "${FILESDIR}"/go-sets.conf go.conf
-
-	# fix install_name for test object (binutils_test) on Darwin, it
-	# is never used in real circumstances
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
 }
 
 pkg_postinst() {
diff --git a/dev-lang/go/go-1.15.5.ebuild b/dev-lang/go/go-1.15.7.ebuild
index 7c0569dd4b05..59b37bd3e992 100644
--- a/dev-lang/go/go-1.15.5.ebuild
+++ b/dev-lang/go/go-1.15.7.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
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
@@ -154,43 +154,37 @@ src_test()
 
 src_install()
 {
-	local bin_path f x
-
-	dodir /usr/lib/go
-
 	# There is a known issue which requires the source tree to be installed [1].
 	# Once this is fixed, we can consider using the doc use flag to control
 	# installing the doc and src directories.
+	# The use of cp is deliberate in order to retain permissions
 	# [1] https://golang.org/issue/2775
-	#
-	# deliberately use cp to retain permissions
+	dodir /usr/lib/go
 	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	einstalldocs
+
 	# testdata directories are not needed on the installed system
 	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+	local bin_path
 	if go_cross_compile; then
 		bin_path="bin/$(go_tuple)"
 	else
 		bin_path=bin
 	fi
+	local f x
 	for x in ${bin_path}/*; do
 		f=${x##*/}
 		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
 	done
-	einstalldocs
 
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name for test object (binutils_test) on Darwin, it
-		# is never used in real circumstances
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
+	# install the @golang-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/go-sets.conf go.conf
 }
 
 pkg_postinst() {
 	[[ -z ${REPLACING_VERSIONS} ]] && return
-	has_version "<sys-apps/portage-3.0.9" && return
-
 	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
 	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
 	einfo "due to the static linking nature of go."
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index 6bb792691ce1..39d69abc7b52 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@@ -181,14 +181,6 @@ src_install()
 	# install the @golang-rebuild set for Portage
 	insinto /usr/share/portage/config/sets
 	newins "${FILESDIR}"/go-sets.conf go.conf
-
-	# fix install_name for test object (binutils_test) on Darwin, it
-	# is never used in real circumstances
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
-		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-		install_name_tool -id "${libmac64}" "${D}${libmac64}"
-	fi
 }
 
 pkg_postinst() {