sys-power/iasl: update to 20200717

Update sys-power/iasl to 20200717, as needed by gcc 10.
Without that update, build fails like:

```
.../x86_64-pc-linux-gnu/bin/ld: obj/aslcompilerparse.o:(.bss+0x8):
multiple definition of `AslCompilerlval';
obj/aslcompilerlex.o:(.bss+0x8): first defined here
.../x86_64-pc-linux-gnu/bin/ld: obj/prparserlex.o:(.bss+0x0):
multiple definition of `LexBuffer';
obj/dtparserlex.o:(.bss+0x0): first defined here
collect2: error: ld returned 1 exit status
```

sdk_container/src/third_party/portage-stable/sys-power/iasl/Manifest

@@ -1,8 +1,4 @@
-DIST acpica-unix-20160729.tar.gz 1556095 BLAKE2B 2785d343d7aa0e3cce83d762bb70f8a7e76221da5d0e803eac3253b4a26dcaf852e114eadf811f387c7c040aeeb794de8cae37c47d8c29968f8cd0a0d76ed4b6 SHA512 37b0439b03e8d811c8b14d0c7c89471989227fb78b462f585c6290431afecc5b258073e568dde8dc982fa959ebce4b4d51589ea997f0066e66d4785ce185ccf2
+DIST acpica-unix-20200326.tar.gz 1850373 BLAKE2B 4b0c8548ff4b99fb774eb4301687368da2149bfaf68e02c638eecf890fc89974dadd75acc844233ecde8cfac2b98d75df79df2bb1bd6993dc8d502b3156c1012 SHA512 253ea7fc2bb540dd0cfa55552648c33562f39efb9a9b8cbab751ad7f4fea9bd3800eb241afb30313140e2008889b62b82b4427624e087a275353d81555403e76
-DIST acpica-unix-20161222.tar.gz 1580428 BLAKE2B dcf44d1a19b51e43ad1a74b2ba5b4bfadeb83eca584ff5a5062aff9cc4b0a65153b1590d993b7bca602e35da747683d230ea56c380afbec3308fb83fdb03908a SHA512 ff733d210b3b013970d3f3a0bea45f346ca5cf78dd61b583d30114a69c80e8272af304d14248aa34e775e19bca1c2ddbbed1b4ba5e8ba660b28621a8ca45ae31
+DIST acpica-unix-20200717.tar.gz 1847795 BLAKE2B 84af34884bbea39aed9ea7ec86f20a27f3dd10fa68456b5f12de2bdecf9f205c43b4b4e5dcfb55325571a5682794cdc2e0c5a83c646036a15cc90f81223aefff SHA512 16de55b97a3b478dd2dd44fcbe51b871c7cc6174d337939b873bcbc871bee10487a796aa86abaa7b54ff6b75279cdbf9ec48e19f6baaea4290daf1ad56bdbc46
-DIST acpica-unix-20171215.tar.gz 1769116 BLAKE2B f15c1202244ce5f489d80240e6c89f7fda38a3c74cf0773c4530e265876f931502571e3086aabae0082654a2085f3d6e5eeed324fd892c199a91a8837fdb19e2 SHA512 4cd3755fe28344de3259dad5209a58c9548216ecaf50a830165a0ee8993af57d4b63836904faafd5f97b1651051ee2f17a908395e0a048bab20b13395fe0d3ff
+DIST acpitests-unix-20200326.tar.gz 2212897 BLAKE2B d88d3d900ac06d165c4a50cddd65495b75db345009b10e76d9f38197ba42efe3ea396ec9828bef62da1fd96ac331d95623c03194e08b00037ff1234321fcf0d3 SHA512 332b4ed016cee48662a5f4572e6d170461f02ee1386109a3970fbe8d104f2a2b14c19235ea43ae9b26e8faf9ef9597cb3d2148e498741361aca62978d0b62189
-DIST acpica-unix-20180810.tar.gz 1797634 BLAKE2B 66b1c53874a7fa898fb042d0aac6001e623bb056ef17de46fc5a8e3ee5667178c47b5d8ecec194ebd8d2b0bdf947b5c85a1874c5d11a9ba3307a85418856ebdb SHA512 f37d8e0f1393b87cbfd9c6607104b05f85386583e4e5a5bcdbd2f049c122592a53e7cd56fe7da75e93bf3a424921fbc9291e7a39e06de80e6403abe042f869cd
+DIST acpitests-unix-20200717.tar.gz 2212717 BLAKE2B 939e8022c5ecb7c5e862767f89c0b0de6146e23014dc0100d7dee0f3502e7adcbba72a468c828f804317e75d3a80ba5864c5497a7695f70be0bc1e3dcc69b4e6 SHA512 02c6674cbb2d98f783f25c71b1f391713de6fb3b56e5b57de9a7ccba0927453be4db8aea513e6e7ad491fcf3a0b2c14fefe8a2b82877a2ae01ea1d7832d36844
-DIST acpitests-unix-20160729.tar.gz 1829061 BLAKE2B 8dacb39c477ff8ba8b68a3f061b74e90a128a90eb287b9febd57d6871ff0878dfe2eaf616d9881af2b0bca6c8db57d48711ad9009c6ceb1ceba321bed182a51c SHA512 bf6073092a0dfb208f1d4b13ff3a3c5335be8e1326b1e58acd41def1a402ab0d843600f616019d1dde6593db8c53c6876bd9d489360fe98c6a7bee95d9215600
-DIST acpitests-unix-20161222.tar.gz 1759278 BLAKE2B cb1b3ea882135e9ee87c4337df4710ac2e613b89f2606306c3ce68af049735f999ae6a37b1f75c112f0fb5f8bc5af6897bf18715f657c8dcac82a37637da2a57 SHA512 ff0435f40564a94ceb3bc6cfc11ac859a5467b650004238092d7f3e2f7d596e7eb2fb9d3c56f0860c8324d38fcbedf3c6f4bc3f0569f1148462b824c7c025408
-DIST acpitests-unix-20171215.tar.gz 2034932 BLAKE2B c36aaf6a8a7aadf54651f95486af918926b664069ed961993c3ee8a062a646a7bd4e40adeebe82a101a5997080b90762fa016724ed4be31af56086eb3c3b3ab9 SHA512 b405e87f18b15bd01540d32c021a7b900139abd7e698b55786ccbaf8536c5068087a8ba1e7adbb69e0954cdc6b347e9a88428f1e8f889e0e9eb3a472c11235f9
-DIST acpitests-unix-20180810.tar.gz 2093850 BLAKE2B 519ce7807026dc11617ed9c34f294600ddae77a57a1fb76220da50da1bee56975373d583d51dfcdd81c8ccba3d5e735167b831bdb4669ab9cb2a1d9753d9261d SHA512 36c2527e8d670ccfb9a537b4944cfb8432c9638c1427e3c59f614c2ca43a66089228ecb74392301a07f266870e2d79bf0e2c671c6c7af06a4683bf97ac01ba54

sdk_container/src/third_party/portage-stable/sys-power/iasl/files/iasl-20140214-nostrip.patch

@@ -1,11 +0,0 @@
---- acpica-unix-20140214/generate/unix/Makefile.config
-+++ acpica-unix-20140214/generate/unix/Makefile.config
-@@ -52,7 +52,7 @@
- INSTALLFLAGS ?= -f
- else
- INSTALL =    install
--INSTALLFLAGS ?= -m 555 -s
-+INSTALLFLAGS ?= -m 555
- endif
- 
- INSTALLPROG = \

sdk_container/src/third_party/portage-stable/sys-power/iasl/files/iasl-20140828-locale.patch

@@ -1,17 +0,0 @@
---- acpica-unix-20140828/generate/unix/Makefile.config
-+++ acpica-unix-20140828/generate/unix/Makefile.config
-@@ -225,12 +225,12 @@
- #YACC=      byacc
- #YFLAGS +=
- #
--YACC=       bison
-+YACC=       LC_ALL=C bison
- YFLAGS +=   -y
- 
- MACROPROC=  m4
- MFLAGS=     -P -I$(ASL_COMPILER)
- 
--LEX=        flex
-+LEX=        LC_ALL=C flex
- LFLAGS +=   -i -s
- 

sdk_container/src/third_party/portage-stable/sys-power/iasl/files/iasl-20200326-Makefile.patch

@@ -0,0 +1,106 @@
+--- a/generate/unix/acpiexec/Makefile
++++ b/generate/unix/acpiexec/Makefile
+@@ -256,12 +256,12 @@
+ endif
+ 
+ ifneq ($(ACPI_HOST),_QNX)
+-LDFLAGS += -lpthread
++LIBS += -lpthread
+ endif
+ 
+ ifneq ($(ACPI_HOST),_APPLE)
+ ifneq ($(ACPI_HOST),_QNX)
+-LDFLAGS += -lrt
++LIBS += -lrt
+ endif
+ endif
+ 
+--- a/generate/unix/Makefile.config
++++ b/generate/unix/Makefile.config
+@@ -35,15 +35,14 @@
+ .SUFFIXES :
+ PROGS = acpibin acpidump acpiexamples acpiexec acpihelp acpinames acpisrc acpixtract iasl
+ ACPI_HOST ?= _CYGWIN
+-CC ?=    gcc
+ 
+ #
+ # Common defines
+ #
+ OBJDIR =     obj
+ BINDIR =     bin
+-COMPILEOBJ = $(CC) -c $(CFLAGS) $(OPT_CFLAGS) -o $@ $<
+-LINKPROG =   $(CC) $(OBJECTS) -o $(PROG) $(LDFLAGS) $(OPT_LDFLAGS)
++COMPILEOBJ = $(CC) -c $(CFLAGS) $(CPPFLAGS) $(OPT_CFLAGS) -o $@ $<
++LINKPROG =   $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) $(LIBS)
+ PREFIX ?=    /usr
+ INSTALLDIR = $(PREFIX)/bin
+ UNAME_S := $(shell uname -s)
+@@ -76,7 +75,7 @@
+ INSTALLFLAGS ?= -f
+ else
+ INSTALL =    install
+-INSTALLFLAGS ?= -m 555 -s
++INSTALLFLAGS ?= -m 555
+ endif
+ 
+ INSTALLPROG = \
+@@ -161,26 +160,18 @@
+ #
+ ifeq ($(M32),TRUE)
+ CFLAGS +=-m32
+-LDFLAGS +=-m32
++LIBS +=-m32
+ endif
+ 
+ #
+ # Optionally disable optimizations. Optimization causes problems on
+ # some compilers such as gcc 4.4
+ #
+-ifneq ($(NOOPT),TRUE)
+-OPT_CFLAGS += -O2
+-else
+-OPT_CFLAGS += -O0
+-endif
+ 
+ #
+ # Optionally disable fortify source. This option can cause
+ # compile errors in toolchains where it is already defined.
+ #
+-ifneq ($(NOFORTIFY),TRUE)
+-OPT_CFLAGS += -D_FORTIFY_SOURCE=2
+-endif
+ 
+ CFLAGS += \
+     -D$(ACPI_HOST)\
+@@ -272,12 +263,12 @@
+ #YACC=      byacc
+ #YFLAGS +=
+ #
+-YACC=       bison
++YACC=       LC_ALL=C bison
+ YFLAGS +=   -y
+ 
+ MACROPROC=  m4
+ MFLAGS=     -P -I$(ASL_COMPILER)
+ 
+-LEX=        flex
++LEX=        LC_ALL=C flex
+ LFLAGS +=   -i -s
+ DLFLAGS +=   -i
+--- a/generate/unix/Makefile.rules
++++ b/generate/unix/Makefile.rules
+@@ -12,12 +12,12 @@
+ 
+ $(PROG) : $(INTERMEDIATES) $(MISC) $(OBJECTS)
+ 	@echo "- Link" $(PROG)
+-	@$(LINKPROG)
++	$(LINKPROG)
+ 	$(RENAMEPROG)
+ 
+ $(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS)
+ 	@echo $(PROG)  $<
+-	@$(COMPILEOBJ)
++	$(COMPILEOBJ)
+ 
+ clean :
+ 	@rm -f $(PROG) $(PROG).exe $(OBJECTS) $(OBJDIR)/*.o $(INTERMEDIATES) $(MISC)

sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20161222.ebuild

@@ -1,127 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic eutils
-
-MY_PN=acpica-unix
-MY_P=${MY_PN}-${PV}
-MY_TESTS_P=${MY_PN/ca/tests}-${PV}
-DESCRIPTION="Intel ACPI Source Language (ASL) compiler"
-HOMEPAGE="https://www.acpica.org/downloads/"
-SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
-	test? ( http://www.acpica.org/sites/acpica/files/${MY_TESTS_P}.tar.gz )"
-
-LICENSE="iASL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="test"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use test && has test ${FEATURES}; then
-		ewarn 'You have selected USE="test". This will install the test results'
-		ewarn "into /usr/share/${PF}/, compressed as a tarball."
-		ewarn 'The tests themselves will only rarely die, but the test results'
-		ewarn 'are interesting for arch testing. The tests may take quite some'
-		ewarn 'time to complete.'
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20140828-locale.patch"
-	"${FILESDIR}/${PN}-20140214-nostrip.patch"
-)
-
-src_prepare() {
-	default
-
-	find "${S}" -type f -name 'Makefile*' -print0 | \
-		xargs -0 -I '{}' \
-		sed -r -e 's:-\<Werror\>::g' -i '{}' \
-		|| die
-
-	# BITS is tied to ARCH - please set appropriately if you add new keywords
-	if [[ $ARCH == @(amd64|amd64-fbsd) ]] ; then
-		export BITS=64
-	else
-		export BITS=32
-	fi
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	cd generate/unix || die
-	emake BITS=${BITS}
-}
-
-src_test() {
-	aslts_test
-	#The aapits test currently fails, missing include probably.
-	#aapits_test
-}
-
-src_install() {
-	cd generate/unix || die
-	emake install DESTDIR="${D}" BITS=${BITS}
-	default_src_install
-	#local bin
-	#for bin in $(<"${T}"/binlist) ; do
-	#	dobin "${T}"/${bin}
-	#done
-	dodoc "${S}"/changes.txt
-	newdoc "${S}"/source/compiler/readme.txt compiler-readme.txt
-	newdoc "${S}"/generate/unix/readme.txt unix-readme.txt
-	newdoc "${S}"/generate/lint/readme.txt lint-readme.txt
-	newdoc "${S}"/source/compiler/new_table.txt compiler-new_table.txt
-
-	if use test && has test ${FEATURES}; then
-		tb="${T}"/testresults.tar.bz2
-		export ASLTSDIR="$(<"${T}"/asltdir)"
-		ebegin "Creating Test Tarball"
-		tar -cjf "${tb}" -C "${ASLTSDIR}"/tmp/RESULTS .  || die "tar failed"
-		eend $?
-		dodir /usr/share/${PF}
-		insinto /usr/share/${PF}
-		doins ${tb}
-	fi
-
-}
-
-aslts_test() {
-	export	ASL="${S}"/generate/unix/bin/iasl \
-		acpiexec="${S}"/generate/unix/bin/acpiexec \
-		ASLTSDIR="${WORKDIR}/${MY_TESTS_P}"/tests/aslts
-	export	PATH="${PATH}:${ASLTSDIR}/bin"
-	echo "$ASLTSDIR" >"${T}"/asltdir
-	cd "${ASLTSDIR}" || die
-	edos2unix $(find . -type 'f')
-	make install || die "make install aslts test failed"
-	chmod +x $(find bin/ ! -regex 'ERROR_OPCODES|HOW_TO_USE|README' ) || die "chmod bin +x failed"
-
-	#The below Do commands runs the tests twice and then dies if the results aren't
-	#Identical.
-	Do 1 || die "failed Do 1"
-	Do 2 || die "failed Do 2"
-}
-
-aapits_test() {
-	mv "${WORKDIR}/${MY_TESTS_P}/tests/aapits" "${S}/tools/" || die "mv failed"
-	cd "${S}/tools/aapits" || die "cannot find ${S}/tools/aapits"
-	edos2unix $(find . -type 'f')
-	chmod +x $(find bin/ | sed  -r -e '/\/[A-Z_]+$/d') || die "chmod bin +x failed"
-	make || die "make in aapits failed"
-	cd asl || die "cd asl failed"
-	make || die "make in asl failed"
-	cd ../bin || die
-	./aapitsrun || die "aapitsrun failed"
-}

sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20171215.ebuild

@@ -1,127 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic eutils
-
-MY_PN=acpica-unix
-MY_P=${MY_PN}-${PV}
-MY_TESTS_P=${MY_PN/ca/tests}-${PV}
-DESCRIPTION="Intel ACPI Source Language (ASL) compiler"
-HOMEPAGE="https://www.acpica.org/downloads/"
-SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
-	test? ( http://www.acpica.org/sites/acpica/files/${MY_TESTS_P}.tar.gz )"
-
-LICENSE="iASL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="test"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use test && has test ${FEATURES}; then
-		ewarn 'You have selected USE="test". This will install the test results'
-		ewarn "into /usr/share/${PF}/, compressed as a tarball."
-		ewarn 'The tests themselves will only rarely die, but the test results'
-		ewarn 'are interesting for arch testing. The tests may take quite some'
-		ewarn 'time to complete.'
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20140828-locale.patch"
-	"${FILESDIR}/${PN}-20140214-nostrip.patch"
-)
-
-src_prepare() {
-	default
-
-	find "${S}" -type f -name 'Makefile*' -print0 | \
-		xargs -0 -I '{}' \
-		sed -r -e 's:-\<Werror\>::g' -i '{}' \
-		|| die
-
-	# BITS is tied to ARCH - please set appropriately if you add new keywords
-	if [[ $ARCH == @(amd64|amd64-fbsd) ]] ; then
-		export BITS=64
-	else
-		export BITS=32
-	fi
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	cd generate/unix || die
-	emake BITS=${BITS}
-}
-
-src_test() {
-	aslts_test
-	#The aapits test currently fails, missing include probably.
-	#aapits_test
-}
-
-src_install() {
-	cd generate/unix || die
-	emake install DESTDIR="${D}" BITS=${BITS}
-	default_src_install
-	#local bin
-	#for bin in $(<"${T}"/binlist) ; do
-	#	dobin "${T}"/${bin}
-	#done
-	dodoc "${S}"/changes.txt
-	newdoc "${S}"/source/compiler/readme.txt compiler-readme.txt
-	newdoc "${S}"/generate/unix/readme.txt unix-readme.txt
-	newdoc "${S}"/generate/lint/readme.txt lint-readme.txt
-	newdoc "${S}"/source/compiler/new_table.txt compiler-new_table.txt
-
-	if use test && has test ${FEATURES}; then
-		tb="${T}"/testresults.tar.bz2
-		export ASLTSDIR="$(<"${T}"/asltdir)"
-		ebegin "Creating Test Tarball"
-		tar -cjf "${tb}" -C "${ASLTSDIR}"/tmp/RESULTS .  || die "tar failed"
-		eend $?
-		dodir /usr/share/${PF}
-		insinto /usr/share/${PF}
-		doins ${tb}
-	fi
-
-}
-
-aslts_test() {
-	export	ASL="${S}"/generate/unix/bin/iasl \
-		acpiexec="${S}"/generate/unix/bin/acpiexec \
-		ASLTSDIR="${WORKDIR}/${MY_TESTS_P}"/tests/aslts
-	export	PATH="${PATH}:${ASLTSDIR}/bin"
-	echo "$ASLTSDIR" >"${T}"/asltdir
-	cd "${ASLTSDIR}" || die
-	edos2unix $(find . -type 'f')
-	make install || die "make install aslts test failed"
-	chmod +x $(find bin/ ! -regex 'ERROR_OPCODES|HOW_TO_USE|README' ) || die "chmod bin +x failed"
-
-	#The below Do commands runs the tests twice and then dies if the results aren't
-	#Identical.
-	Do 1 || die "failed Do 1"
-	Do 2 || die "failed Do 2"
-}
-
-aapits_test() {
-	mv "${WORKDIR}/${MY_TESTS_P}/tests/aapits" "${S}/tools/" || die "mv failed"
-	cd "${S}/tools/aapits" || die "cannot find ${S}/tools/aapits"
-	edos2unix $(find . -type 'f')
-	chmod +x $(find bin/ | sed  -r -e '/\/[A-Z_]+$/d') || die "chmod bin +x failed"
-	make || die "make in aapits failed"
-	cd asl || die "cd asl failed"
-	make || die "make in asl failed"
-	cd ../bin || die
-	./aapitsrun || die "aapitsrun failed"
-}

sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20200326.ebuild

@@ -1,29 +1,34 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs flag-o-matic
+inherit edos2unix toolchain-funcs
 
 MY_PN=acpica-unix
 MY_P="${MY_PN}-${PV}"
 MY_TESTS_P="${MY_PN/ca/tests}-${PV}"
+
 DESCRIPTION="Intel ACPI Source Language (ASL) compiler"
 HOMEPAGE="https://www.acpica.org/downloads/"
-SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
+SRC_URI="
+	http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
 	test? ( http://www.acpica.org/sites/acpica/files/${MY_TESTS_P}.tar.gz )"
 
 LICENSE="iASL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
-DEPEND="sys-devel/bison
+BDEPEND="
+	sys-devel/bison
 	sys-devel/flex"
-RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}"/${PN}-20200326-Makefile.patch )
+
 pkg_setup() {
 	if use test && has test ${FEATURES}; then
 		ewarn 'You have selected USE="test". This will install the test results'
@@ -34,34 +39,29 @@ pkg_setup() {
 	fi
 }
 
-PATCHES=(
-	"${FILESDIR}/${PN}-20140828-locale.patch"
-	"${FILESDIR}/${PN}-20140214-nostrip.patch"
-)
-
 src_prepare() {
 	default
 
 	find "${S}" -type f -name 'Makefile*' -print0 | \
 		xargs -0 -I '{}' \
-		sed -r -e 's:-\<Werror\>::g' -i '{}' \
+		sed -r -e 's:-\<Werror\>::g' -e "s:/usr:${EPREFIX}/usr:g" \
+		-i '{}' \
 		|| die
+}
+
+src_configure() {
+	tc-export CC
 
 	# BITS is tied to ARCH - please set appropriately if you add new keywords
-	if [[ $ARCH == @(amd64|amd64-fbsd) ]] ; then
+	if [[ $ARCH == @(amd64) ]] ; then
 		export BITS=64
 	else
 		export BITS=32
 	fi
 }
 
-src_configure() {
-	:
-}
-
 src_compile() {
-	cd generate/unix || die
+	emake -C generate/unix BITS="${BITS}"
-	emake BITS=${BITS}
 }
 
 src_test() {
@@ -90,15 +90,14 @@ src_install() {
 		ebegin "Creating Test Tarball"
 		tar -cjf "${tb}" -C "${ASLTSDIR}"/tmp/RESULTS .  || die "tar failed"
 		eend $?
-		dodir /usr/share/${PF}
 		insinto /usr/share/${PF}
 		doins ${tb}
 	fi
-
 }
 
 aslts_test() {
-	export	ASL="${S}"/generate/unix/bin/iasl \
+	export ASL="${S}"/generate/unix/bin/iasl \
+		acpibin="${S}"/generate/unix/bin/acpibin \
 		acpiexec="${S}"/generate/unix/bin/acpiexec \
 		ASLTSDIR="${WORKDIR}/${MY_TESTS_P}"/tests/aslts
 	export	PATH="${PATH}:${ASLTSDIR}/bin"
@@ -118,7 +117,7 @@ aapits_test() {
 	mv "${WORKDIR}/${MY_TESTS_P}/tests/aapits" "${S}/tools/" || die "mv failed"
 	cd "${S}/tools/aapits" || die "cannot find ${S}/tools/aapits"
 	edos2unix $(find . -type 'f')
-	chmod +x $(find bin/ | sed  -r -e '/\/[A-Z_]+$/d') || die "chmod bin +x failed"
+	chmod +x $(find bin/ | sed	-r -e '/\/[A-Z_]+$/d') || die "chmod bin +x failed"
 	make || die "make in aapits failed"
 	cd asl || die "cd asl failed"
 	make || die "make in asl failed"

sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20200717.ebuild

@@ -1,28 +1,33 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs flag-o-matic eutils
+inherit edos2unix toolchain-funcs
 
 MY_PN=acpica-unix
-MY_P=${MY_PN}-${PV}
+MY_P="${MY_PN}-${PV}"
-MY_TESTS_P=${MY_PN/ca/tests}-${PV}
+MY_TESTS_P="${MY_PN/ca/tests}-${PV}"
+
 DESCRIPTION="Intel ACPI Source Language (ASL) compiler"
 HOMEPAGE="https://www.acpica.org/downloads/"
-SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
+SRC_URI="
+	http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
 	test? ( http://www.acpica.org/sites/acpica/files/${MY_TESTS_P}.tar.gz )"
 
 LICENSE="iASL"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
-DEPEND="sys-devel/bison
+BDEPEND="
+	sys-devel/bison
 	sys-devel/flex"
-RDEPEND=""
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-20200326-Makefile.patch )
 
 pkg_setup() {
 	if use test && has test ${FEATURES}; then
@@ -34,46 +39,41 @@ pkg_setup() {
 	fi
 }
 
-PATCHES=(
-	"${FILESDIR}/${PN}-20140828-locale.patch"
-	"${FILESDIR}/${PN}-20140214-nostrip.patch"
-)
-
 src_prepare() {
 	default
 
 	find "${S}" -type f -name 'Makefile*' -print0 | \
 		xargs -0 -I '{}' \
-		sed -r -e 's:-\<Werror\>::g' -i '{}' \
+		sed -r -e 's:-\<Werror\>::g' -e "s:/usr:${EPREFIX}/usr:g" \
+		-i '{}' \
 		|| die
+}
+
+src_configure() {
+	tc-export CC
 
 	# BITS is tied to ARCH - please set appropriately if you add new keywords
-	if [[ $ARCH == @(amd64|amd64-fbsd) ]] ; then
+	if [[ $ARCH == @(amd64) ]] ; then
 		export BITS=64
 	else
 		export BITS=32
 	fi
 }
 
-src_configure() {
-	:
-}
-
 src_compile() {
-	cd generate/unix || die
+	emake -C generate/unix BITS="${BITS}"
-	emake BITS=${BITS}
 }
 
 src_test() {
 	aslts_test
-	#aapits_test
 	#The aapits test currently fails, missing include probably.
+	#aapits_test
 }
 
 src_install() {
 	cd generate/unix || die
 	emake install DESTDIR="${D}" BITS=${BITS}
-	default_src_install
+	default
 	#local bin
 	#for bin in $(<"${T}"/binlist) ; do
 	#	dobin "${T}"/${bin}
@@ -90,15 +90,14 @@ src_install() {
 		ebegin "Creating Test Tarball"
 		tar -cjf "${tb}" -C "${ASLTSDIR}"/tmp/RESULTS .  || die "tar failed"
 		eend $?
-		dodir /usr/share/${PF}
 		insinto /usr/share/${PF}
 		doins ${tb}
 	fi
-
 }
 
 aslts_test() {
-	export	ASL="${S}"/generate/unix/bin/iasl \
+	export ASL="${S}"/generate/unix/bin/iasl \
+		acpibin="${S}"/generate/unix/bin/acpibin \
 		acpiexec="${S}"/generate/unix/bin/acpiexec \
 		ASLTSDIR="${WORKDIR}/${MY_TESTS_P}"/tests/aslts
 	export	PATH="${PATH}:${ASLTSDIR}/bin"
@@ -118,7 +117,7 @@ aapits_test() {
 	mv "${WORKDIR}/${MY_TESTS_P}/tests/aapits" "${S}/tools/" || die "mv failed"
 	cd "${S}/tools/aapits" || die "cannot find ${S}/tools/aapits"
 	edos2unix $(find . -type 'f')
-	chmod +x $(find bin/ | sed  -r -e '/\/[A-Z_]+$/d') || die "chmod bin +x failed"
+	chmod +x $(find bin/ | sed	-r -e '/\/[A-Z_]+$/d') || die "chmod bin +x failed"
 	make || die "make in aapits failed"
 	cd asl || die "cd asl failed"
 	make || die "make in asl failed"

sdk_container/src/third_party/portage-stable/sys-power/iasl/metadata.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>