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

It's from Gentoo commit 4056c750051d7302b3fc0f2e9c352360f60fcd0a.
---
 ...c-1.07.1-r3.ebuild => bc-1.07.1-r4.ebuild} | 34 ++++++++-----------
 .../portage-stable/sys-devel/bc/metadata.xml  |  8 ++---
 2 files changed, 19 insertions(+), 23 deletions(-)
 rename sdk_container/src/third_party/portage-stable/sys-devel/bc/{bc-1.07.1-r3.ebuild => bc-1.07.1-r4.ebuild} (57%)

diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r4.ebuild
similarity index 57%
rename from sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r3.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r4.ebuild
index 84f22cd7fd..82f798fc4f 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
@@ -9,33 +9,29 @@ DESCRIPTION="Handy console-based calculator utility"
 HOMEPAGE="https://www.gnu.org/software/bc/bc.html"
 SRC_URI="mirror://gnu/bc/${P}.tar.gz"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-3+"
 SLOT="0"
-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"
+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"
 IUSE="libedit readline static"
 
 RDEPEND="
 	!readline? ( libedit? ( dev-libs/libedit:= ) )
 	readline? (
-		>=sys-libs/readline-4.1:0=
-		>=sys-libs/ncurses-5.2:=
-	)
-"
-DEPEND="
-	${RDEPEND}
+		sys-libs/readline:=
+		sys-libs/ncurses:=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/flex
-	virtual/yacc
-"
+	virtual/yacc"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.07.1-no-ed-its-sed.patch"
-)
+PATCHES=( "${FILESDIR}"/${PN}-1.07.1-no-ed-its-sed.patch )
 
 src_prepare() {
 	default
 
-	# Avoid bad build tool usage when cross-compiling.  #627126
-	tc-is-cross-compiler && eapply "${FILESDIR}/${PN}-1.07.1-use-system-bc.patch"
+	# Avoid bad build tool usage when cross-compiling. Bug #627126
+	tc-is-cross-compiler && eapply "${FILESDIR}"/${PN}-1.07.1-use-system-bc.patch
 }
 
 src_configure() {
@@ -52,8 +48,8 @@ src_configure() {
 	econf "${myconf[@]}"
 
 	# Do not regen docs -- configure produces a small fragment that includes
-	# the version info which causes all pages to regen (newer file). #554774
-	touch -r doc doc/*
+	# the version info which causes all pages to regen (newer file). Bug #554774
+	touch -r doc doc/* || die
 }
 
 src_compile() {
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/bc/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/bc/metadata.xml
index 73dda144f9..b0d83aa2e4 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/bc/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/bc/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 </pkgmetadata>