gentoo auto-resync : 23:08:2023 - 21:49:58

3 files changed, 84 insertions, 1 deletions

diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 085c91bbea95..6495f49fddee 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,3 +1,4 @@
+AUX kubectl-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f
 DIST kubernetes-1.24.14.tar.gz 37908337 BLAKE2B 08f52b611bea49f1c204a4fb956d87be6f571ef122b4cc10101862c61d11751d944d9140c4355be95759f83240cb8a3d4879c72e077bdc10f235d03b1a0f99f7 SHA512 74cee62fdc7e0dca1430688e832d3b308b6604dee6ca88d5f19fd6b6a9c83833d003ae87d8a09866e2e8fd01cbde0a6ae4bd126f9845f770c76942f1772f04bb
 DIST kubernetes-1.24.15.tar.gz 38151496 BLAKE2B 47064fefb135031ed220341d34519b4ee2e6fb5996e4bacdfd94e5dd01c1e70b0ca56c0eda45208039004ab9f0f2c3d1de3d77f450d7a59ab5ccd1c6e4dc8b0e SHA512 48e450c76fe3c9bd8460a18bbff204ba7b548c807f984ba86ff388206bfc8a178d96718df377a354c88a99c66b54013ee85ba18b7778bd68cee610955abf2498
 DIST kubernetes-1.25.11.tar.gz 38468419 BLAKE2B fa90ffc6fdcba31f4fb70f7ea9cecae5d8e42efb0596abb2aa638e9d235f770cf4772cfa926b3e1a59fa37ae84bc1524d803215d4eccc04cc1d38ec4b884a9fa SHA512 e3805cf6ad4e5b4ce5fb53a73873a3e447cc62b26f106afa1eec21071a7912cfd2e972f27f40c183af3e67a8ac107adc97d63a303b844dcae62e5efa0e1879a5
@@ -15,5 +16,5 @@ EBUILD kubectl-1.26.6.ebuild 873 BLAKE2B b4e63afdf9235f8890d11764f0779540685f007
 EBUILD kubectl-1.26.7.ebuild 873 BLAKE2B b4e63afdf9235f8890d11764f0779540685f007f4a5a1db4c319a8a66d6308549fa764624d99170088c7f82fab9e82173f04f18303b33272bbbc08764be86738 SHA512 9931017dc27ff974a94bff3ee60b3741e24bac819a38ead32d68d96ff08a04a113b22752f9f4076f7b850f7f3c0ca1790c362b89c31963e07617241c1903f602
 EBUILD kubectl-1.27.3.ebuild 873 BLAKE2B 82074aa2427e6cab6cb1e551b9703c1abcefbf7af7784153b5a498490c90fd75a655355d54fd8af5f5751d3627ad100d75c85070c80b19042e9fbd6a2ed587a8 SHA512 320af5826b407a9f617c5c9b63d76d52541b2e7fc5d19d145a9c456578029576fd06e33403e2aae8f2c84a9c9a814e1efef8812e13f6611b9c5020a67089b844
 EBUILD kubectl-1.27.4.ebuild 873 BLAKE2B 82074aa2427e6cab6cb1e551b9703c1abcefbf7af7784153b5a498490c90fd75a655355d54fd8af5f5751d3627ad100d75c85070c80b19042e9fbd6a2ed587a8 SHA512 320af5826b407a9f617c5c9b63d76d52541b2e7fc5d19d145a9c456578029576fd06e33403e2aae8f2c84a9c9a814e1efef8812e13f6611b9c5020a67089b844
-EBUILD kubectl-1.28.0.ebuild 874 BLAKE2B b131bf977a6af040012cb71c43578ec1d0d2cb7183f1e03778c59aef3c0186bc5055f382cebddd19c5878035503a081277bf19abedaff5e7cbdf595810f232bc SHA512 c48ab0fdaed8d0b742879ac963dc40bfe92d0607d2a507b68edd25cc35bcbc0d6ebadd1f48112b31d3d263b8c9f21072d06f4b8c32b00a1941df5ca7ef8ec82b
+EBUILD kubectl-1.28.0.ebuild 947 BLAKE2B d4eefe1b72fe49bd88e955594e24979449ba5233ba89ff832fa7ca4cd6b23355d94417a749657a349ba95b89fc3f6fa89d6671940b6cdd4387bdaa2dc95ed4ed SHA512 81bfcc79f5fef3243c0e953fe8c6434cdac96bbc4a5b10de36077fdde09f624ce7db0fb986a2b54f88de3032f4cf5ddf1b53c1c8eeeebb34c4041513b56f17a2
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubectl/files/kubectl-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kubectl/files/kubectl-1.28.0-make-gomaxprocs-install-optional.patch
new file mode 100644
index 000000000000..1a8935b31c9c
--- /dev/null
+++ b/sys-cluster/kubectl/files/kubectl-1.28.0-make-gomaxprocs-install-optional.patch
@@ -0,0 +1,78 @@
+From cce3f6ffa796ea416021b0d62567a3f52b979567 Mon Sep 17 00:00:00 2001
+From: Jordan Liggitt <liggitt@google.com>
+Date: Wed, 16 Aug 2023 09:33:02 -0400
+Subject: [PATCH 2/2] Make gomaxprocs install optional, limit to tests
+
+---
+ hack/lib/golang.sh               | 25 +++++++++++++++----------
+ hack/make-rules/test-e2e-node.sh |  1 +
+ hack/make-rules/test.sh          |  1 +
+ 3 files changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
+index 66772f08a81..983ff368e25 100755
+--- a/hack/lib/golang.sh
++++ b/hack/lib/golang.sh
+@@ -556,20 +556,25 @@ kube::golang::setup_env() {
+ 
+   # This seems to matter to some tools
+   export GO15VENDOREXPERIMENT=1
++}
+ 
++kube::golang::setup_gomaxprocs() {
+   # GOMAXPROCS by default does not reflect the number of cpu(s) available
+   # when running in a container, please see https://github.com/golang/go/issues/33803
+-  if ! command -v ncpu >/dev/null 2>&1; then
+-    # shellcheck disable=SC2164
+-    pushd "${KUBE_ROOT}/hack/tools" >/dev/null
+-    GO111MODULE=on go install ./ncpu
+-    # shellcheck disable=SC2164
+-    popd >/dev/null
++  if [[ -z "${GOMAXPROCS:-}" ]]; then
++    if ! command -v ncpu >/dev/null 2>&1; then
++      # shellcheck disable=SC2164
++      pushd "${KUBE_ROOT}/hack/tools" >/dev/null
++      GO111MODULE=on go install ./ncpu || echo "Will not automatically set GOMAXPROCS"
++      # shellcheck disable=SC2164
++      popd >/dev/null
++    fi
++    if command -v ncpu >/dev/null 2>&1; then
++      GOMAXPROCS=$(ncpu)
++      export GOMAXPROCS
++      kube::log::status "Set GOMAXPROCS automatically to ${GOMAXPROCS}"
++    fi
+   fi
+-
+-  GOMAXPROCS=${GOMAXPROCS:-$(ncpu)}
+-  export GOMAXPROCS
+-  kube::log::status "Setting GOMAXPROCS: ${GOMAXPROCS}"
+ }
+ 
+ # This will take binaries from $GOPATH/bin and copy them to the appropriate
+diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh
+index 43dde0c740f..49e3e04ac71 100755
+--- a/hack/make-rules/test-e2e-node.sh
++++ b/hack/make-rules/test-e2e-node.sh
+@@ -18,6 +18,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
+ source "${KUBE_ROOT}/hack/lib/init.sh"
+ 
+ kube::golang::setup_env
++kube::golang::setup_gomaxprocs
+ 
+ # start the cache mutation detector by default so that cache mutators will be found
+ KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}"
+diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh
+index e9074678a8f..4aa72730d83 100755
+--- a/hack/make-rules/test.sh
++++ b/hack/make-rules/test.sh
+@@ -22,6 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
+ source "${KUBE_ROOT}/hack/lib/init.sh"
+ 
+ kube::golang::setup_env
++kube::golang::setup_gomaxprocs
+ 
+ # start the cache mutation detector by default so that cache mutators will be found
+ KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}"
+-- 
+2.41.0
+
diff --git a/sys-cluster/kubectl/kubectl-1.28.0.ebuild b/sys-cluster/kubectl/kubectl-1.28.0.ebuild
index ffa067f3b06c..e535262df193 100644
--- a/sys-cluster/kubectl/kubectl-1.28.0.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.28.0.ebuild
@@ -18,6 +18,10 @@ BDEPEND=">=dev-lang/go-1.20"
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-make-gomaxprocs-install-optional.patch
+	)
+
 src_compile() {
 	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
 		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}