From ec6e5ae93b672a4e9e241b53c3c1220efefe5d6e Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Fri, 3 Jun 2022 19:39:51 +0200
Subject: [PATCH] sys-devel/make: Sync with Gentoo

It's from Gentoo commit 2f57d1e86732ff5160de52e92584363cc0e256cb.
---
 .../portage-stable/sys-devel/make/Manifest    |  1 +
 ...ake-3.82-darwin-library_search-dylib.patch |  4 ++--
 .../make/files/make-4.2-default-cxx.patch     |  6 ++----
 .../sys-devel/make/make-4.3.ebuild            | 19 +++++++++----------
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/make/Manifest
index 34d9f6842b..f9cbb5a172 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/make/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/Manifest
@@ -1 +1,2 @@
 DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b
+DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528 SHA512 bf13e2943593b153457c8111179e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch
index d2f60ec91c..743583b5a0 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch
@@ -1,8 +1,8 @@
 Fixed default libpatttern on Darwin, imported from prefix overlay.
 Got merged upstream:
 https://savannah.gnu.org/bugs/?37197
---- a/default.c
-+++ b/default.c
+--- a/src/default.c
++++ b/src/default.c
 @@ -509,7 +509,11 @@
  #ifdef __MSDOS__
      ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a",
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2-default-cxx.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2-default-cxx.patch
index 4d592086a6..39e3ee0dd9 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2-default-cxx.patch
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2-default-cxx.patch
@@ -1,7 +1,5 @@
-diff --git a/default.c b/default.c
-index 3d865c7..e8b3ed6 100644
---- a/default.c
-+++ b/default.c
+--- a/src/default.c
++++ b/src/default.c
 @@ -530,7 +530,7 @@ static const char *default_variables[] =
      "OBJC", "gcc",
  #else
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/make-4.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-4.3.ebuild
index bd0a3434e1..50caf0365b 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/make/make-4.3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-4.3.ebuild
@@ -1,24 +1,29 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/make.asc
+inherit flag-o-matic verify-sig
 
 DESCRIPTION="Standard tool to compile source trees"
 HOMEPAGE="https://www.gnu.org/software/make/make.html"
 if [[ "$(ver_cut 3)" -ge 90 ]] ; then
 	SRC_URI="https://alpha.gnu.org/gnu//make/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu//make/${P}.tar.gz.sig )"
 else
 	SRC_URI="mirror://gnu//make/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI+=" verify-sig? ( mirror://gnu//make/${P}.tar.gz.sig )"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
+
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="guile nls static"
 
 DEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
-BDEPEND="nls? ( sys-devel/gettext )"
+BDEPEND="nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-make )"
 RDEPEND="${DEPEND}
 	nls? ( virtual/libintl )"
 
@@ -27,12 +32,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2-default-cxx.patch
 )
 
-src_prepare() {
-	# sources were moved into src directory
-	cd src || die
-	default
-}
-
 src_configure() {
 	use static && append-ldflags -static
 	local myeconfargs=(