gentoo (leap year) resync : 29.02.2020

4 files changed, 192 insertions, 23 deletions

diff --git a/sys-power/iasl/Manifest b/sys-power/iasl/Manifest
index ca6a6ed9c8f7..9e3f1d4cc2b9 100644
--- a/sys-power/iasl/Manifest
+++ b/sys-power/iasl/Manifest
@@ -1,12 +1,12 @@
 AUX iasl-20140214-nostrip.patch 253 BLAKE2B 744ae94cdf798b4d0b593de3e69d408c61b720aebfd385aa2e22929530a8ef84aba92b4484fd2c35cb5c51e15e75e4d8bafcf3c9339b63ca54746db1c30835ad SHA512 1379fa71c03d880b53ed1ed34ec925d5e94fe6f636f86cfdbb5a1e65a1c6a82fb99a42b991be154c018da9eaaa70c7443fa4b5ca38eb03fe5cec4f0de1dd6364
 AUX iasl-20140828-locale.patch 349 BLAKE2B b435e40f257103acfaa8f74c8dd5ed66850ce53e3c7577ce59e1773b738dfaff89c58dbdb4517a0213b9b8c1ab4cbdcdf78e2dbe3c0a4857cf4f91b437b23cb9 SHA512 311c20b7d5cdc7e3ce5e2a84e508eb898cd506efa720d1e4bb017ff0b34d786ffed30168b7dcf16b4bee988702d00258289e5e320e0a3bb3cf630a1a71145640
-DIST acpica-unix-20180810.tar.gz 1797634 BLAKE2B 66b1c53874a7fa898fb042d0aac6001e623bb056ef17de46fc5a8e3ee5667178c47b5d8ecec194ebd8d2b0bdf947b5c85a1874c5d11a9ba3307a85418856ebdb SHA512 f37d8e0f1393b87cbfd9c6607104b05f85386583e4e5a5bcdbd2f049c122592a53e7cd56fe7da75e93bf3a424921fbc9291e7a39e06de80e6403abe042f869cd
+AUX iasl-20190703-Makefile.patch 2185 BLAKE2B d3785e324332ddf71e7d3dadff9d62bbd863d82e63961ed099c62a59e3d8c11a76120e1c13723a009abb6eba78e5b7e7b1dabe19133bdb0634fbd6ee0623ea71 SHA512 68ce1372c919fd8e07c8b2a06897a3f5eb4d846ebd11ab4d28e9b3d7b2aebec1e574d929e78be4ec8a520113e63ec0cc40ac4c3c4ffa09bc4097343b00d849eb
+AUX iasl-20190703-gcc10-fno-common.patch 2257 BLAKE2B e98ef965a8053a9047de922fb401ef5a59b0742c6c0d0de0893ebc81da3ba834d98b202fd0059e1f7bb807ff278c3c7a54a33b6bcd1873a3531a910b85403931 SHA512 7470ba23c182f6cb74ccd3d833972e1d0b50196e25824706c3ab2b184deea5bd5b2a678cb62b0c9b9523ac88a38ad17340f103911890df0de8c463a05f6ca0c0
 DIST acpica-unix-20190215.tar.gz 1809671 BLAKE2B aff312636ff0f38e7708a251daad84689cb64abd0dd241d57063b5e229c50a3a8bd3e509c2fe9918da4ab9179b07d2207e01eb7c9f94670d0758eec73bb2714b SHA512 7a469097d82721ea55f86eeefa2a67fc6be6b3d2e0382bb830f64c7daf7d99e2bce60011fb68e54b3891939b1fed91da03de9d19c2d4020d3412656cce2c09b0
 DIST acpica-unix-20190703.tar.gz 1845874 BLAKE2B bc217c40c1154fd562f28e0eb22e8bf664c3ae451e7087e046845623beebc7422d1629a21fed61a82e31c89b3040427fd524bfcde562873cc42191f44f88e6ad SHA512 f687f407aaa14684e5d09d21a2e3c197c490b710a633bca491412875f8dfa9164ba5c2c8531946f82713c24d32f47ff4ea3c108c7c124adb83a69e19a6b31163
-DIST acpitests-unix-20180810.tar.gz 2093850 BLAKE2B 519ce7807026dc11617ed9c34f294600ddae77a57a1fb76220da50da1bee56975373d583d51dfcdd81c8ccba3d5e735167b831bdb4669ab9cb2a1d9753d9261d SHA512 36c2527e8d670ccfb9a537b4944cfb8432c9638c1427e3c59f614c2ca43a66089228ecb74392301a07f266870e2d79bf0e2c671c6c7af06a4683bf97ac01ba54
 DIST acpitests-unix-20190215.tar.gz 2094957 BLAKE2B 3a31ae398650a1dc3ac70843c43868a35501cbe0376d1d2437a3568aad1fb63b3d83270653c009885b014894c69dcfff075bbf5d18290220067bcd1804a38097 SHA512 80060a61c80b01231b10e04dd65c2ab41d42824c439152cf128328890cee39ef597dc3f5bc535db4566cb322394bfce2760e1835df781d699818049cad5a4419
 DIST acpitests-unix-20190703.tar.gz 2009568 BLAKE2B 3d1a527c55a94390381e33a46111bed7ecd3761627b87e24d9345b0d38d9fbd32c371adab3f19a0ca05a99c4532491bc9b466805e231a5ecd8c7a6af346577fb SHA512 d9bab56198dc00fc11b50a199035eb9dc164c226441cd00e163ecd6362d399a50058afa7582f86e62a085b990772995fc10e077581a3b04a6c6b2e95e055f167
-EBUILD iasl-20180810.ebuild 3442 BLAKE2B 7f45fdef51bdf1388c98b331c549fd048f79159dae9369a4f47e799873ecb0f56e1a93d1f2696c0c34e059ff772964c4e7dfd9844f0c908afa1cf64846f4ba4e SHA512 228eebc0dd6102cf502184a7d260674e371277f96395ee4712ad3abce466ba79161e81c8ceeca6d53735b84c34b70c9c56ecc8e0b26619fa6c189e09b164e28f
 EBUILD iasl-20190215.ebuild 3445 BLAKE2B 9792dffc74c16505a41c2252c5d4a335844887eecd8af91da748d957cccfa23a28f70cbce1da02e54b66bb05f46a73c0cb3009ff696e3b27d71f79d56e3d71f7 SHA512 7c0d5a3364bc571d5ae0e5f62c6b275ec0ca739f481384384039330010ed4d9a2c5fd43b293bb5d2a8c35a8e9b3336819a9cd175a1bb2717a087cade4f35e3af
+EBUILD iasl-20190703-r1.ebuild 3443 BLAKE2B 9184933e5686736e7e3928b48c2026b2b272bdedbef58c7cb7939395c0483b6afd41458a9eafc5d8f967bdd9c12075eabdd7e4ef1a6a88cd43d882b7501c710e SHA512 b9b96ea8732399be47c19f41af9b5f26b53f0490f874946913221303942038f897aa69ff6608984c5d594ee5c17aaafe174fdfbab0d9cc5d95925ef7f3f9a61f
 EBUILD iasl-20190703.ebuild 3468 BLAKE2B 44d91a87906aba6b210b76afeb53864ede0ac20cefc01b6d7e440e47232a760345051ff8231d731d6b8af58d154fe74bc479406fcf245de61498cf13ea81de31 SHA512 74aaa2af5f80cff0c63c50e7ccf46c1f7afd809d30fabb785f79e660a767a782c2a54c1af409d4d8992d170d25e17668c2e7570a43881e96210fd4b50ad4ae0c
 MISC metadata.xml 330 BLAKE2B 4c0218788685cc36fddf5d759c091898a71c01bf22e9e7995d1f5da37cd0508c961895b4265bda462062676f3e722205f0a6b10f64db718110f7afe8f088d136 SHA512 4d7760ec82f64ce49478c359b32aa100ca9778471033741b7fd89905d075b3a067fda413c6dcc5115d7755d0ab6cd9d30a848ff674f1c83ef6205c51ec501a65
diff --git a/sys-power/iasl/files/iasl-20190703-Makefile.patch b/sys-power/iasl/files/iasl-20190703-Makefile.patch
new file mode 100644
index 000000000000..f245c97d5317
--- /dev/null
+++ b/sys-power/iasl/files/iasl-20190703-Makefile.patch
@@ -0,0 +1,105 @@
+--- a/generate/unix/acpiexec/Makefile
++++ b/generate/unix/acpiexec/Makefile
+@@ -256,12 +256,12 @@
+ endif
+ 
+ ifneq ($(HOST),_QNX)
+-LDFLAGS += -lpthread
++LIBS += -lpthread
+ endif
+ 
+ ifneq ($(HOST),_APPLE)
+ ifneq ($(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
+ 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 = \
+@@ -153,26 +152,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$(HOST)\
+@@ -264,11 +255,11 @@
+ #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
+--- 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)
diff --git a/sys-power/iasl/files/iasl-20190703-gcc10-fno-common.patch b/sys-power/iasl/files/iasl-20190703-gcc10-fno-common.patch
new file mode 100644
index 000000000000..d6b8fd83cf02
--- /dev/null
+++ b/sys-power/iasl/files/iasl-20190703-gcc10-fno-common.patch
@@ -0,0 +1,64 @@
+--- a/source/compiler/aslcompiler.l
++++ b/source/compiler/aslcompiler.l
+@@ -156,7 +156,7 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
+-YYSTYPE AslCompilerlval;
++#define YYSTYPE AslCompilerlval;
+ 
+ /*
+  * Generation:  Use the following command line:
+--- a/source/compiler/dtparser.l
++++ b/source/compiler/dtparser.l
+@@ -208,7 +208,7 @@
+ /*
+  * Local support functions
+  */
+-YY_BUFFER_STATE         LexBuffer;
++static YY_BUFFER_STATE         LexBuffer;
+ 
+ /******************************************************************************
+  *
+--- a/source/compiler/prparser.l
++++ b/source/compiler/prparser.l
+@@ -224,7 +224,7 @@
+ /*
+  * Local support functions
+  */
+-YY_BUFFER_STATE         LexBuffer;
++static YY_BUFFER_STATE         LexBuffer;
+ 
+ 
+ /******************************************************************************
+--- a/source/include/acglobal.h
++++ b/source/include/acglobal.h
+@@ -438,7 +438,6 @@
+ ACPI_INIT_GLOBAL (ACPI_THREAD_ID,       AcpiGbl_DbThreadId, ACPI_INVALID_THREAD_ID);
+ 
+ ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_DbOpt_NoIniMethods);
+-ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_DbOpt_NoRegionSupport);
+ ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_DbOutputToFile);
+ ACPI_GLOBAL (char *,                    AcpiGbl_DbBuffer);
+ ACPI_GLOBAL (char *,                    AcpiGbl_DbFilename);
+--- a/source/include/acpixf.h
++++ b/source/include/acpixf.h
+@@ -231,6 +231,8 @@
+  *
+  ****************************************************************************/
+ 
++ACPI_INIT_GLOBAL (BOOLEAN,          AcpiGbl_DbOpt_NoRegionSupport, FALSE);
++
+ /*
+  * Enable "slack mode" of the AML interpreter?  Default is FALSE, and the
+  * interpreter strictly follows the ACPI specification. Setting to TRUE
+--- a/source/tools/acpiexec/aemain.c
++++ b/source/tools/acpiexec/aemain.c
+@@ -192,7 +192,6 @@
+ UINT8                       AcpiGbl_RegionFillValue = 0;
+ BOOLEAN                     AcpiGbl_IgnoreErrors = FALSE;
+ BOOLEAN                     AcpiGbl_AbortLoopOnTimeout = FALSE;
+-BOOLEAN                     AcpiGbl_DbOpt_NoRegionSupport = FALSE;
+ UINT8                       AcpiGbl_UseHwReducedFadt = FALSE;
+ BOOLEAN                     AcpiGbl_DoInterfaceTests = FALSE;
+ BOOLEAN                     AcpiGbl_LoadTestTables = FALSE;
diff --git a/sys-power/iasl/iasl-20180810.ebuild b/sys-power/iasl/iasl-20190703-r1.ebuild
index 398bc0314380..2bb7d450ab68 100644
--- a/sys-power/iasl/iasl-20180810.ebuild
+++ b/sys-power/iasl/iasl-20190703-r1.ebuild
@@ -3,28 +3,35 @@
 
 EAPI=7
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit eutils 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 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~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}-20190703-gcc10-fno-common.patch
+	"${FILESDIR}"/${PN}-20190703-Makefile.patch
+)
+
 pkg_setup() {
 	if use test && has test ${FEATURES}; then
 		ewarn 'You have selected USE="test". This will install the test results'
@@ -35,18 +42,18 @@ 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
@@ -56,13 +63,8 @@ src_prepare() {
 	fi
 }
 
-src_configure() {
-	:
-}
-
 src_compile() {
-	cd generate/unix || die
-	emake BITS=${BITS}
+	emake -C generate/unix BITS="${BITS}"
 }
 
 src_test() {
@@ -91,15 +93,13 @@ 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