gentoo resync : 25.04.2020

20 files changed, 7 insertions, 931 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 093fd6d2badc..8e4bbc23d488 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/iasl/Manifest b/sys-power/iasl/Manifest
index fec0fa23e072..f10ce60ec44a 100644
--- a/sys-power/iasl/Manifest
+++ b/sys-power/iasl/Manifest
@@ -1,20 +1,5 @@
-AUX iasl-20140214-nostrip.patch 253 BLAKE2B 744ae94cdf798b4d0b593de3e69d408c61b720aebfd385aa2e22929530a8ef84aba92b4484fd2c35cb5c51e15e75e4d8bafcf3c9339b63ca54746db1c30835ad SHA512 1379fa71c03d880b53ed1ed34ec925d5e94fe6f636f86cfdbb5a1e65a1c6a82fb99a42b991be154c018da9eaaa70c7443fa4b5ca38eb03fe5cec4f0de1dd6364
-AUX iasl-20140828-locale.patch 349 BLAKE2B b435e40f257103acfaa8f74c8dd5ed66850ce53e3c7577ce59e1773b738dfaff89c58dbdb4517a0213b9b8c1ab4cbdcdf78e2dbe3c0a4857cf4f91b437b23cb9 SHA512 311c20b7d5cdc7e3ce5e2a84e508eb898cd506efa720d1e4bb017ff0b34d786ffed30168b7dcf16b4bee988702d00258289e5e320e0a3bb3cf630a1a71145640
-AUX iasl-20190703-Makefile.patch 2185 BLAKE2B d3785e324332ddf71e7d3dadff9d62bbd863d82e63961ed099c62a59e3d8c11a76120e1c13723a009abb6eba78e5b7e7b1dabe19133bdb0634fbd6ee0623ea71 SHA512 68ce1372c919fd8e07c8b2a06897a3f5eb4d846ebd11ab4d28e9b3d7b2aebec1e574d929e78be4ec8a520113e63ec0cc40ac4c3c4ffa09bc4097343b00d849eb
-AUX iasl-20190703-gcc10-fno-common.patch 2257 BLAKE2B e98ef965a8053a9047de922fb401ef5a59b0742c6c0d0de0893ebc81da3ba834d98b202fd0059e1f7bb807ff278c3c7a54a33b6bcd1873a3531a910b85403931 SHA512 7470ba23c182f6cb74ccd3d833972e1d0b50196e25824706c3ab2b184deea5bd5b2a678cb62b0c9b9523ac88a38ad17340f103911890df0de8c463a05f6ca0c0
-AUX iasl-20200214-Makefile.patch 2205 BLAKE2B d066a9370d7e3ff3590492f0f4efdb61fcf13f92c8ea04157d06e56025f38612ab27f1aa5ef98d541f47e9b6ed29426b91740c893da77b5f04f31c1c7d2f9493 SHA512 673902c3d7902a9f5be48c26b33a36398be2552e35d9db70ca1e346b2cf51e357710498f431888082f83811752caf24f6be85760b8f4a14d468f2aea33e5a04c
 AUX iasl-20200326-Makefile.patch 2227 BLAKE2B eaf6d7cb51f65f430d207cea7c54c2f5489dd3dc3fd2930035af37576cf2c22b237c229a6bfe2f5ffa5c76c3bd8c4b138d360c4c0beba7f2558f1efabf577afa SHA512 07be0ba4034d3b3c19b7e29e66ec41b433c32bc077622db89520b89f52f44ad8069a4c50a9da6579eec130672b5187e0217e6dacc3b0c638b1d9ba54d83f91b3
-DIST acpica-unix-20190215.tar.gz 1809671 BLAKE2B aff312636ff0f38e7708a251daad84689cb64abd0dd241d57063b5e229c50a3a8bd3e509c2fe9918da4ab9179b07d2207e01eb7c9f94670d0758eec73bb2714b SHA512 7a469097d82721ea55f86eeefa2a67fc6be6b3d2e0382bb830f64c7daf7d99e2bce60011fb68e54b3891939b1fed91da03de9d19c2d4020d3412656cce2c09b0
-DIST acpica-unix-20190703.tar.gz 1845874 BLAKE2B bc217c40c1154fd562f28e0eb22e8bf664c3ae451e7087e046845623beebc7422d1629a21fed61a82e31c89b3040427fd524bfcde562873cc42191f44f88e6ad SHA512 f687f407aaa14684e5d09d21a2e3c197c490b710a633bca491412875f8dfa9164ba5c2c8531946f82713c24d32f47ff4ea3c108c7c124adb83a69e19a6b31163
-DIST acpica-unix-20200214.tar.gz 1846645 BLAKE2B 6be4bfcf5cc0680da661ef36fef265d467e1d50651bd1330831f6980efaa25c7681d738e8591ec9cb32cfd2e855a969c481967e4779bf1754ada23d1d89af160 SHA512 d41692bad249ce300acc5b581723f1ddb077254a15448351738ad4b2639772c79d440befb22018b8927a83a2b69bb0325e6e5b6bbfd2215586435c6cea91f914
 DIST acpica-unix-20200326.tar.gz 1850373 BLAKE2B 4b0c8548ff4b99fb774eb4301687368da2149bfaf68e02c638eecf890fc89974dadd75acc844233ecde8cfac2b98d75df79df2bb1bd6993dc8d502b3156c1012 SHA512 253ea7fc2bb540dd0cfa55552648c33562f39efb9a9b8cbab751ad7f4fea9bd3800eb241afb30313140e2008889b62b82b4427624e087a275353d81555403e76
-DIST acpitests-unix-20190215.tar.gz 2094957 BLAKE2B 3a31ae398650a1dc3ac70843c43868a35501cbe0376d1d2437a3568aad1fb63b3d83270653c009885b014894c69dcfff075bbf5d18290220067bcd1804a38097 SHA512 80060a61c80b01231b10e04dd65c2ab41d42824c439152cf128328890cee39ef597dc3f5bc535db4566cb322394bfce2760e1835df781d699818049cad5a4419
-DIST acpitests-unix-20190703.tar.gz 2009568 BLAKE2B 3d1a527c55a94390381e33a46111bed7ecd3761627b87e24d9345b0d38d9fbd32c371adab3f19a0ca05a99c4532491bc9b466805e231a5ecd8c7a6af346577fb SHA512 d9bab56198dc00fc11b50a199035eb9dc164c226441cd00e163ecd6362d399a50058afa7582f86e62a085b990772995fc10e077581a3b04a6c6b2e95e055f167
-DIST acpitests-unix-20200214.tar.gz 2212834 BLAKE2B 91d119c7f6d3532006a7ea3e233becca09834a7a133a2281774dfc44221d357c0e2457de3d37647609e0e100c9ba61695730feb0f5da40b16bf4411240e4d715 SHA512 b4d37d4784d3fbb697f244477c085e433efa152bc4c4a06d336b216358405252a77c331f4e792f5fa9b912d6f5f200aa1b6379f1b5064e58be12cf8d4415ee15
 DIST acpitests-unix-20200326.tar.gz 2212897 BLAKE2B d88d3d900ac06d165c4a50cddd65495b75db345009b10e76d9f38197ba42efe3ea396ec9828bef62da1fd96ac331d95623c03194e08b00037ff1234321fcf0d3 SHA512 332b4ed016cee48662a5f4572e6d170461f02ee1386109a3970fbe8d104f2a2b14c19235ea43ae9b26e8faf9ef9597cb3d2148e498741361aca62978d0b62189
-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
-EBUILD iasl-20200214.ebuild 3442 BLAKE2B 8bc42b93ba2553346043908f1adbbeca6e30cf37e8eaae948825a14c8e937e2a7bde61fe96b31cbabb1d02dccfcc2c111ca14386926a29d23dd6cecbc00af53f SHA512 8839c32dbf926432ef043760a02054184a6b5b32cdf91ff37db7c1c03d035431a2053f700a034919e41e69dbe6d42be08ec6c6e20606ba6b091eb565a0175525
-EBUILD iasl-20200326.ebuild 3388 BLAKE2B 757e04a8a3d41634185e365e196f574611cd41bd71881b31efbbf36ad6d164ff29c082498b62834887b57d1736d200f73f97460a9c668a01a53c06c170c39324 SHA512 1c7ae6118c067d805986223a279dc2968e2e988cd01a53026261cbe9b9c22021e9f7c564629784d1fa9bba0f24cf1f365b61c14133e712dde608feda27a56830
+EBUILD iasl-20200326.ebuild 3392 BLAKE2B 0ff5e3a105785bb0379404b85bcf8a3d49dcd17db6b77e6dbc8536572cdadfc497da5f533e039270b7ebfd0d59ca6e36382f7f8df07b6f2ed146d993e45926b6 SHA512 ecf72d6339edc6093720a0d8598f66ef321b5cb411b8168512efe5909a10abdfd11b1413a86d31bac123f8d14573706b52cbc78adea10a279e1ad54de7e0db13
 MISC metadata.xml 330 BLAKE2B 4c0218788685cc36fddf5d759c091898a71c01bf22e9e7995d1f5da37cd0508c961895b4265bda462062676f3e722205f0a6b10f64db718110f7afe8f088d136 SHA512 4d7760ec82f64ce49478c359b32aa100ca9778471033741b7fd89905d075b3a067fda413c6dcc5115d7755d0ab6cd9d30a848ff674f1c83ef6205c51ec501a65
diff --git a/sys-power/iasl/files/iasl-20140214-nostrip.patch b/sys-power/iasl/files/iasl-20140214-nostrip.patch
deleted file mode 100644
index 0bb82df38c3c..000000000000
--- a/sys-power/iasl/files/iasl-20140214-nostrip.patch
+++ /dev/null
@@ -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 = \
diff --git a/sys-power/iasl/files/iasl-20140828-locale.patch b/sys-power/iasl/files/iasl-20140828-locale.patch
deleted file mode 100644
index c8e278f7572a..000000000000
--- a/sys-power/iasl/files/iasl-20140828-locale.patch
+++ /dev/null
@@ -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
- 
diff --git a/sys-power/iasl/files/iasl-20190703-Makefile.patch b/sys-power/iasl/files/iasl-20190703-Makefile.patch
deleted file mode 100644
index f245c97d5317..000000000000
--- a/sys-power/iasl/files/iasl-20190703-Makefile.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- 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
deleted file mode 100644
index d6b8fd83cf02..000000000000
--- a/sys-power/iasl/files/iasl-20190703-gcc10-fno-common.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- 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/files/iasl-20200214-Makefile.patch b/sys-power/iasl/files/iasl-20200214-Makefile.patch
deleted file mode 100644
index e5fb563cf922..000000000000
--- a/sys-power/iasl/files/iasl-20200214-Makefile.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- 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 = \
-@@ -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/iasl-20190215.ebuild b/sys-power/iasl/iasl-20190215.ebuild
deleted file mode 100644
index d18b0fdd12aa..000000000000
--- a/sys-power/iasl/iasl-20190215.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( 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
-	#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 \
-		acpibin="${S}"/generate/unix/bin/acpibin \
-		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"
-}
diff --git a/sys-power/iasl/iasl-20190703-r1.ebuild b/sys-power/iasl/iasl-20190703-r1.ebuild
deleted file mode 100644
index 2bb7d450ab68..000000000000
--- a/sys-power/iasl/iasl-20190703-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-	test? ( http://www.acpica.org/sites/acpica/files/${MY_TESTS_P}.tar.gz )"
-
-LICENSE="iASL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex"
-
-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'
-		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
-}
-
-src_prepare() {
-	default
-
-	find "${S}" -type f -name 'Makefile*' -print0 | \
-		xargs -0 -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
-		export BITS=64
-	else
-		export BITS=32
-	fi
-}
-
-src_compile() {
-	emake -C generate/unix 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
-	#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 $?
-		insinto /usr/share/${PF}
-		doins ${tb}
-	fi
-}
-
-aslts_test() {
-	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"
-	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"
-}
diff --git a/sys-power/iasl/iasl-20190703.ebuild b/sys-power/iasl/iasl-20190703.ebuild
deleted file mode 100644
index f3c565776e50..000000000000
--- a/sys-power/iasl/iasl-20190703.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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"
-IUSE="test"
-RESTRICT="!test? ( 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' -e "s:/usr:${EPREFIX}/usr: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
-	#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 \
-		acpibin="${S}"/generate/unix/bin/acpibin \
-		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"
-}
diff --git a/sys-power/iasl/iasl-20200214.ebuild b/sys-power/iasl/iasl-20200214.ebuild
deleted file mode 100644
index a52227dac14a..000000000000
--- a/sys-power/iasl/iasl-20200214.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-	test? ( http://www.acpica.org/sites/acpica/files/${MY_TESTS_P}.tar.gz )"
-
-LICENSE="iASL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20190703-gcc10-fno-common.patch
-	"${FILESDIR}"/${PN}-20200214-Makefile.patch
-)
-
-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
-}
-
-src_prepare() {
-	default
-
-	find "${S}" -type f -name 'Makefile*' -print0 | \
-		xargs -0 -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
-		export BITS=64
-	else
-		export BITS=32
-	fi
-}
-
-src_compile() {
-	emake -C generate/unix 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
-	#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 $?
-		insinto /usr/share/${PF}
-		doins ${tb}
-	fi
-}
-
-aslts_test() {
-	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"
-	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"
-}
diff --git a/sys-power/iasl/iasl-20200326.ebuild b/sys-power/iasl/iasl-20200326.ebuild
index 050b1a001e8a..22bcd5005b3e 100644
--- a/sys-power/iasl/iasl-20200326.ebuild
+++ b/sys-power/iasl/iasl-20200326.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="iASL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-power/intel-undervolt/Manifest b/sys-power/intel-undervolt/Manifest
index 11ae2fd136d2..ed0fd04a079f 100644
--- a/sys-power/intel-undervolt/Manifest
+++ b/sys-power/intel-undervolt/Manifest
@@ -1,8 +1,4 @@
-AUX confd 75 BLAKE2B 48999f73a7bf3809383904c90a40d6e53a7c338f76585238260bb9d0261ec1b7a31db4ea8039ee31598b042b87c97e6487d048d7880a118864e7bf11cd474344 SHA512 335fc14643b6b0f8f19152966d41d40021b5e6a894f3c27211dcb42c106eef9c03e1b623b8a7bd9e48aeb904854b11d3ac9681738baa87d6eabfd4ac3df9b188
-AUX initd 506 BLAKE2B 0ead334ec3eb2cbfef7a02e326fe73f91a159b60080391b56dba10c021936fe02cc49fd99141b351e17b6231299a4c2ee7c4751744fa3c057ac06a5a8513d751 SHA512 22ba7987ea2dbebf88740967cb326dc6cc2e6797920d8f850494d3bd95280b41655598d07807fd7c2c3f653ee7b65c5e8ad6260dde083f953804497b40f19594
-DIST intel-undervolt-1.6.tar.gz 22465 BLAKE2B 947f3e3f94316a9988fc0311faa23b07e8e0a99afb737232e6e581f45cca89124a49e47bbc85eb0e836b7fc7f966869910fe4d42581e47d98d8c036390c3dec2 SHA512 1c1de1083654085d6711aad28d2815f2aa05d08b7fddbee425b59ab8109dc1e635c2a9bdda8ba0221420e9e00fcd61013bd4a4633d05ede87808c49898772db3
 DIST intel-undervolt-1.7.tar.gz 31481 BLAKE2B 0daade381b492184616356f097de32d14c76d6ab3f7dd59240fb25f92ee1b9aebb16cbef8b6836e16e361a9560b000655470140c31b5822fed7bd90e0b9d9bf2 SHA512 727eddd47a92f6092e89f9326c6b453785fac6155f2c2c50887f9a90704226e6abaf27b4a91cabd4783c4477371699a92186fe7847ac9218da9c26fb295a5304
-EBUILD intel-undervolt-1.6.ebuild 1148 BLAKE2B 8f84169e6bcb0d30fdb3b1901ba7cdbce971e933514e447d67c4cabde2078a57194107f900cd430306d81bfbd245c960d2c9c48780c8ff84694eed8f7afe3385 SHA512 8116d5545b70c0a3a8e81f4c5258462f4f1912712725574177cc92c61e58b355abdc2e70abe854f748eeca1ee747d5c0d436485fd49831580445fbb3e477bd5d
 EBUILD intel-undervolt-1.7.ebuild 1219 BLAKE2B 7e03cb969aa0e8852c21e09f2f5505bb6e375198f5a25eb8944570df30d309d8a4b293c0ccb6a5274d3628d46b8840f2aeaa359b22414af8a43925394e97ad3a SHA512 42142c857b9bbcb1c273b725e3aaee484c81b0de48e8a840fb4c49f932b0e284a2523d3a125d6e7e2d15a2b38729fb36221165f4a2a6da9d2e897c8b21e85d79
 EBUILD intel-undervolt-9999.ebuild 1219 BLAKE2B 7e03cb969aa0e8852c21e09f2f5505bb6e375198f5a25eb8944570df30d309d8a4b293c0ccb6a5274d3628d46b8840f2aeaa359b22414af8a43925394e97ad3a SHA512 42142c857b9bbcb1c273b725e3aaee484c81b0de48e8a840fb4c49f932b0e284a2523d3a125d6e7e2d15a2b38729fb36221165f4a2a6da9d2e897c8b21e85d79
 MISC metadata.xml 439 BLAKE2B 6381419880bfa93e46d034594091121d9f8c18fb096ef0b4ea1a45c820b18ce28f5526e483e9c928df246bcae04efa46b649b01856c03bf26e5b36819d3a2d17 SHA512 e02201c15d777f29c3976f0d1219a30f1be9f0ca061a75d1ca4f15bf6e366d0eb7ff4f2a9e91022662da928fa34069cc89c753198554711049d5904f8f41b606
diff --git a/sys-power/intel-undervolt/files/confd b/sys-power/intel-undervolt/files/confd
deleted file mode 100644
index 0911f6a58995..000000000000
--- a/sys-power/intel-undervolt/files/confd
+++ /dev/null
@@ -1 +0,0 @@
-# /etc/conf.d/intel-undervolt: config file for /etc/init.d/intel-undervolt
diff --git a/sys-power/intel-undervolt/files/initd b/sys-power/intel-undervolt/files/initd
deleted file mode 100644
index 0a43656ea79f..000000000000
--- a/sys-power/intel-undervolt/files/initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	after thermald
-}
-
-command="/usr/bin/intel-undervolt"
-command_args="daemon"
-command_background="true"
-pidfile="/run/${RC_SVCNAME}.pid"
-required_files="/etc/intel-undervolt.conf"
-
-start_pre() {
-	if service_started thermald; then
-		eerror "thermald conflits with ${RC_SVCNAME}, exiting"
-	fi
-
-	ebegin "${RC_SVCNAME} -> apply initial voltage"
-		"${command}" apply
-	eend $?
-}
diff --git a/sys-power/intel-undervolt/intel-undervolt-1.6.ebuild b/sys-power/intel-undervolt/intel-undervolt-1.6.ebuild
deleted file mode 100644
index 74c44d3fe535..000000000000
--- a/sys-power/intel-undervolt/intel-undervolt-1.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="Intel CPU undervolting and throttling configuration tool"
-HOMEPAGE="https://github.com/kitsunyan/intel-undervolt"
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kitsunyan/${PN}.git"
-else
-	SRC_URI="https://github.com/kitsunyan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* ~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-BDEPEND=""
-
-CONFIG_CHECK="~INTEL_RAPL ~X86_MSR"
-
-src_prepare() {
-	# respect CC, CFLAGS and avoid calling pkg-config
-	sed -i \
-		-e 's/^CC=/CC?=/' \
-		-e 's/^CFLAGS=/CFLAGS?=/' \
-		-e '/^UNITDIR=/d' \
-		Makefile || die
-
-	default
-}
-
-src_compile() {
-
-	tc-export CC
-
-	myemakeargs=(
-		BINDIR="${EPREFIX}"/usr/bin
-		SYSCONFDIR="${EPREFIX}"/etc
-		UNITDIR="$(systemd_get_systemunitdir)"
-	)
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	myemakeargs+=(
-		DESTDIR="${D}"
-	)
-	emake "${myemakeargs[@]}" install
-
-	newinitd "${FILESDIR}"/initd "${PN}"
-	newconfd "${FILESDIR}"/confd "${PN}"
-
-	einstalldocs
-}
diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 78e605784e75..418108d8d66c 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -3,6 +3,6 @@ AUX thermald-1.8-x86-fix.patch 1314 BLAKE2B c563b2a23d1f96ae508c55bc17e3c8c02892
 AUX thermald-1.9-size_t-format.patch 2375 BLAKE2B 1f795d846a6012f69bb5c5e27a2b503a206a85565ef18c5d13b01bc6f12c80b81e565d78cc1d6cd5d494d639fbba712ccfbdca8b893ef4e2d6a5ac274a9bd908 SHA512 dc470f499bac68e8154f90d233321b0ca2932a814e2e59fd5ab1bb9a1163fc25e9be26557bef987676591f05effa99ad5b4e00139b9492c6b354345c0cc478b3
 DIST thermald-1.9.1.tar.gz 429116 BLAKE2B 7b6105b25e89e68f82368e154b4ca2a826192d596c7427ebea3c6aa726c28b5409cf7e0f022132e2ee47423cc732a6d37b2eb05236c579e2c725820516f6993f SHA512 7c16871316fb264abad9d0182cf8b6b5c1b4c747093672e74b7db2b6aa4f322fafdf6a94bfc8a11f427f7be2ee5e5691dc6a25bb5357ce45e7afe868f89b89e1
 DIST thermald-1.9.tar.gz 427380 BLAKE2B 1954531838c0fc3677ab8f91476d5670a6b5d067d580c7c570b37e5d8d8ac408cacb218531bc8363cfd56eee9331291959ff11851550c6c782a43b19bacca01a SHA512 71fa6e9fc2f55623ed0acdb65f9699d5ea2c89c4092546a73d53ac3ea3ca0a5c60f3360c8bef0af9daeeecfe9a20411d9e4d25bc1d89349cfe83ebb03ba387a8
-EBUILD thermald-1.9.1.ebuild 923 BLAKE2B f61674468004dc218e2f6d9ac7ed76f2b2df2c5b50cecdcb98464fd8fab22fba91f6111999b7b0568baefd867fab63ae1620b23ff0915ac23179c0748aec3ff7 SHA512 fcd83849886e1ea017fd5804bdac79d49e8c936b6544497cfc9d91cd9e6bef38045d946c6d801078c6dee05463583bb3e82ceb04c35beb3f23e162c9a323043d
+EBUILD thermald-1.9.1.ebuild 922 BLAKE2B d5481f4bf46b429ce06e194fab8665d7edc46ec73c15ca16479b33455fc6d71f51c204e01cadbfe39dd970f386168c4ec33d1b8edbc8e74fbd31d5830e5f2c1d SHA512 3f4bef46cf1ec58ee2da8f243102ef7710efde6357d60e150d4ada0310111d49a7c176e844799b9763d33ef484dae84db60261fd9b269b09ae2f0caf21073450
 EBUILD thermald-1.9.ebuild 969 BLAKE2B 552f431a2298645c8ba1bffa43c44ebb0a377a82ddb567bbb3755597ded23adcc338c874a4151ee9a6180b999b6d58ef8b9624b41f44af6fcd062f94a1bed2df SHA512 0eba38d7d333c205349366da32a1ba4e522d8914a30c9ace287917be586ae8d53fc515c9a6a87bf4b8a52def446fff670b269e7a952674737086bcced0f27ead
 MISC metadata.xml 643 BLAKE2B 92fe71631920f61dd6667c2dc8b4e27d2ea1e9bfb64509a9b4a9b0a72e9b4a11b7ae06febf120564c28272b9e079cf71a114bca620ce2651ec615439dd5ff9b3 SHA512 bad363023e01da0232632d54b2cb65dce89a7c70441f05fc873640a29f6fd4ec4ea30b00f94f723a786de1eef87b94673dad455102bc57a11573346e3a8ae2e8
diff --git a/sys-power/thermald/thermald-1.9.1.ebuild b/sys-power/thermald/thermald-1.9.1.ebuild
index d28e5e815911..fefc84b2d488 100644
--- a/sys-power/thermald/thermald-1.9.1.ebuild
+++ b/sys-power/thermald/thermald-1.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/01org/thermal_daemon/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 04f46c9cfc3b..c6737252327d 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -2,6 +2,6 @@ AUX upower-0.99.9-pending-charge1.patch 1351 BLAKE2B 719581956d7bed9efb148bb84a8
 AUX upower-0.99.9-pending-charge2.patch 2016 BLAKE2B 87a3078acf6c95dd8237f894aa25dbf803d42f766682e3e53f5ec30fcd7725178ebab94111945fbf0b4d0e16b656e8723240b14358d1c6e5285086b30da541d2 SHA512 15aa04bcd892feec125508d6a9edb8df98cd5317fce27d9c8907994f1d735be32934c5010566f0a38221ef20b48d8faf73841df6e35447ef0efccdaab371fb0b
 DIST upower-0.99.11.tar.xz 430128 BLAKE2B 77604d02a69de98e4c7b268d11d189aa42ace2d62b982fda9bc41131ce383ede32953ada31eae0bbfd1121600af5863924d48c636e60a28f505a6998dcac227c SHA512 67219a0beb98c97ac4512e4fe8ba83fc80a1035d1edb5367dda6911da50c672b047051f2f528e8703be29ab47547d92b6c71a7ef695226a1bdb5bc33e6d18803
 DIST upower-0.99.9.tar.xz 448408 BLAKE2B 5fa2436f33c94cffb736d8e3fad433acf58954cf06ccd403a0361214be5afc45d79ea279f3c5c48dcd58b92ccaf995777c95987d1749fd8c8c8958317e439570 SHA512 45eb587b0e5ffcce88bad8c56bc5efa30559748913016a55d58313280f5159378e5fbb4a9842c3a6409257bb97822d235f96b03704268b8471455c93eb05fe2f
-EBUILD upower-0.99.11.ebuild 2128 BLAKE2B 6b3dc32b67d954f9bf413ab30c41db426c6756fbe906dbec3a3d3dac38a9977076d859167638382b7c1f52ccff67b7b4ac48881b0cded81337d8266aefef7511 SHA512 a79ba936bbbdc7c507f4cb3616af4b2390769cc9dabc9194c2ed159283fc09349bbc53c0e91392814780aba9491a365398127da6d1432b87127ed9a7138f22c4
+EBUILD upower-0.99.11.ebuild 2121 BLAKE2B cc7e1f63cb976cd0510f96ccafb6f393c153cdc2d9be70ce65aae3ddbeb426f9a579b5b785bc9a06d8f4286823298d6ad78ca9a3b18fcb4f8a1e0601b606115e SHA512 32f41b66c115e6b48a6c5200ee6dc08ddfa06f473dfbfad5f499fc8dae6fb75f11d189aab3ce65e44048387a651a66b5b4e7b7be77e51e67584a9a5d2f84068c
 EBUILD upower-0.99.9-r1.ebuild 2344 BLAKE2B 3b286baaa33786c5964f86e0153900c1614f5ad37f5ecdd0d3d1c9587bd14ca1759169e3f3bab6f71f2347f7c0453f5b4903f6deb935b0ac3c196e21f139f33f SHA512 05292d9d5f90fbc9c0478db5d2b8b96fb17725cdae9411f4d5fd653d27e2402e50c07feb52b373754330e03210dd1f6735b144a5361c9c004c989a1fda19868a
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/sys-power/upower/upower-0.99.11.ebuild b/sys-power/upower/upower-0.99.11.ebuild
index 0988b00821db..de0b142ed8a3 100644
--- a/sys-power/upower/upower-0.99.11.ebuild
+++ b/sys-power/upower/upower-0.99.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/upower/upower/uploads/${COMMIT}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 
 # gtk-doc files are not available as prebuilt in the tarball
 IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"