gentoo resync : 31.05.2021

22 files changed, 111 insertions, 69 deletions

diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 0d94dbda618f..05d73f45e3b8 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/automake-1.16.2-r1 b/metadata/md5-cache/sys-devel/automake-1.16.2-r1
deleted file mode 100644
index 0b59ec3fbff5..000000000000
--- a/metadata/md5-cache/sys-devel/automake-1.16.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/gzip sys-apps/help2man test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) )
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
-DESCRIPTION=Used to generate Makefile.in from Makefile.am
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/automake/
-IUSE=test
-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
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
-RESTRICT=!test? ( test )
-SLOT=1.16
-SRC_URI=mirror://gnu/automake/automake-1.16.2.tar.xz https://alpha.gnu.org/pub/gnu/automake/automake-1.16.2.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=35d3a3d08049e8cd770cbc9d1d858067
diff --git a/metadata/md5-cache/sys-devel/automake-1.16.3-r1 b/metadata/md5-cache/sys-devel/automake-1.16.3-r1
index 4149fc95350a..9c8ae5027c7b 100644
--- a/metadata/md5-cache/sys-devel/automake-1.16.3-r1
+++ b/metadata/md5-cache/sys-devel/automake-1.16.3-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/automake/
 IUSE=test
-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 ~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
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 RESTRICT=!test? ( test )
 SLOT=1.16
 SRC_URI=mirror://gnu/automake/automake-1.16.3.tar.xz https://alpha.gnu.org/pub/gnu/automake/automake-1.16.3.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3844db3f25d8ff9204402ab27b49a22e
+_md5_=7da92351d4a4362264b2f73d3d3ee9df
diff --git a/metadata/md5-cache/sys-devel/bison-3.7.3 b/metadata/md5-cache/sys-devel/bison-3.7.3
deleted file mode 100644
index 9e5bb1343b12..000000000000
--- a/metadata/md5-cache/sys-devel/bison-3.7.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/flex examples? ( dev-lang/perl ) test? ( dev-lang/perl )
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=sys-devel/m4-1.4.16 >=sys-devel/gettext-0.21
-DESCRIPTION=A general-purpose (yacc-compatible) parser generator
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/bison/
-IUSE=examples nls static test
-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
-LICENSE=GPL-2
-RDEPEND=>=sys-devel/m4-1.4.16 >=sys-devel/gettext-0.21
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnu/bison/bison-3.7.3.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.7.3-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/bison/bison-3.7.3-patches-01.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=453db9050b585ca420c1636e4aeabeac
diff --git a/metadata/md5-cache/sys-devel/bison-3.7.6 b/metadata/md5-cache/sys-devel/bison-3.7.6
index 58c8cdde1800..cddb768e1d93 100644
--- a/metadata/md5-cache/sys-devel/bison-3.7.6
+++ b/metadata/md5-cache/sys-devel/bison-3.7.6
@@ -5,11 +5,11 @@ DESCRIPTION=A general-purpose (yacc-compatible) parser generator
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/bison/
 IUSE=examples nls static test
-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 ~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
 LICENSE=GPL-2
 RDEPEND=>=sys-devel/m4-1.4.16 >=sys-devel/gettext-0.21
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-3.7.6.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.7.6-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/bison/bison-3.7.6-patches-01.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6f988715cf601f9fc5a81fd6496ed578
+_md5_=322db3f222bc7ad11557b4736aeac714
diff --git a/metadata/md5-cache/sys-devel/bmake-20210314-r1 b/metadata/md5-cache/sys-devel/bmake-20210314-r1
deleted file mode 100644
index 9b34cd47dcab..000000000000
--- a/metadata/md5-cache/sys-devel/bmake-20210314-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=NetBSD's portable make
-EAPI=7
-HOMEPAGE=http://www.crufty.net/help/sjg/bmake.html
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20210314.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20210330.tar.gz
-_md5_=951316eb7de84206f2054cfdb857b698
diff --git a/metadata/md5-cache/sys-devel/bmake-20210420 b/metadata/md5-cache/sys-devel/bmake-20210420
index d2df71ad559f..9511a1115375 100644
--- a/metadata/md5-cache/sys-devel/bmake-20210420
+++ b/metadata/md5-cache/sys-devel/bmake-20210420
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=NetBSD's portable make
 EAPI=7
 HOMEPAGE=http://www.crufty.net/help/sjg/bmake.html
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20210420.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20210330.tar.gz
-_md5_=25da1ccfefc1bc1ff6baca25b034ce5d
+_md5_=64e9d92096288bd796cbba2493c5b6cd
diff --git a/metadata/md5-cache/sys-devel/clang-12.0.0.9999 b/metadata/md5-cache/sys-devel/clang-12.0.1.9999
index d79b99c93491..02dd5c7970ed 100644
--- a/metadata/md5-cache/sys-devel/clang-12.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-12.0.1.9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-util/cmake-3.16 doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-python/sphinx dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-12.0.0.9999:12=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) llvm_targets_AArch64? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_CSKY] ) llvm_targets_VE? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_VE] ) !!sys-devel/llvm:0
+DEPEND=~sys-devel/llvm-12.0.1.9999:12=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) llvm_targets_AArch64? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_CSKY] ) llvm_targets_VE? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_VE] ) !!sys-devel/llvm:0
 DESCRIPTION=C language family frontend for LLVM
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=debug default-compiler-rt default-libcxx default-lld doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE test doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
-PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-12.0.0.9999 default-compiler-rt? ( =sys-libs/compiler-rt-12.0.0.9999* ) default-libcxx? ( >=sys-libs/libcxx-12.0.0.9999 ) default-lld? ( sys-devel/lld )
+PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-12.0.1.9999 default-compiler-rt? ( =sys-libs/compiler-rt-12.0.1.9999* ) default-libcxx? ( >=sys-libs/libcxx-12.0.1.9999 ) default-lld? ( sys-devel/lld )
 PROPERTIES=live
-RDEPEND=~sys-devel/llvm-12.0.0.9999:12=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) llvm_targets_AArch64? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_CSKY] ) llvm_targets_VE? ( ~sys-devel/llvm-12.0.0.9999:12[llvm_targets_VE] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
+RDEPEND=~sys-devel/llvm-12.0.1.9999:12=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) llvm_targets_AArch64? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_CSKY] ) llvm_targets_VE? ( ~sys-devel/llvm-12.0.1.9999:12[llvm_targets_VE] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=12
diff --git a/metadata/md5-cache/sys-devel/clang-12.0.1_rc1 b/metadata/md5-cache/sys-devel/clang-12.0.1_rc1
new file mode 100644
index 000000000000..1c67b1cccf94
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-12.0.1_rc1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/cmake-3.16 doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-python/sphinx dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~sys-devel/llvm-12.0.1_rc1:12=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) llvm_targets_AArch64? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_CSKY] ) llvm_targets_VE? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_VE] ) !!sys-devel/llvm:0
+DESCRIPTION=C language family frontend for LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug default-compiler-rt default-libcxx default-lld doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE test doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-12.0.1_rc1 default-compiler-rt? ( =sys-libs/compiler-rt-12.0.1* ) default-libcxx? ( >=sys-libs/libcxx-12.0.1_rc1 ) default-lld? ( sys-devel/lld )
+RDEPEND=~sys-devel/llvm-12.0.1_rc1:12=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) llvm_targets_AArch64? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_CSKY] ) llvm_targets_VE? ( ~sys-devel/llvm-12.0.1_rc1:12[llvm_targets_VE] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=12
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	947bf87d74971ddf91feb19e4fa5f92f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b21585f33ea097318e7457927856c7b5
diff --git a/metadata/md5-cache/sys-devel/clang-common-12.0.0.9999 b/metadata/md5-cache/sys-devel/clang-common-12.0.1.9999
index c26d76eb8879..97e82d2f9b81 100644
--- a/metadata/md5-cache/sys-devel/clang-common-12.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-12.0.1.9999
@@ -8,4 +8,4 @@ PDEPEND=sys-devel/clang:*
 PROPERTIES=live
 SLOT=0
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	llvm.org	947bf87d74971ddf91feb19e4fa5f92f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ba7e9332ae485bb187dc503176e97a45
+_md5_=b90c4c0dc9eaa89be17463c64885562d
diff --git a/metadata/md5-cache/sys-devel/clang-common-12.0.1_rc1 b/metadata/md5-cache/sys-devel/clang-common-12.0.1_rc1
new file mode 100644
index 000000000000..353b089bb545
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-common-12.0.1_rc1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of clang
+EAPI=7
+HOMEPAGE=https://llvm.org/
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PDEPEND=sys-devel/clang:*
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc1.tar.gz
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	llvm.org	947bf87d74971ddf91feb19e4fa5f92f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b90c4c0dc9eaa89be17463c64885562d
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-12.0.0.9999 b/metadata/md5-cache/sys-devel/clang-runtime-12.0.1.9999
index ffb5d021c95d..aad8ece50fb0 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-12.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-runtime-12.0.1.9999
@@ -5,8 +5,8 @@ HOMEPAGE=https://clang.llvm.org/
 IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=metapackage
 PROPERTIES=live
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-12.0.0.9999:12.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-12.0.0.9999:12.0.0 ) ) libcxx? ( >=sys-libs/libcxx-12.0.0.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-12.0.0.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-12.0.1.9999:12.0.1 sanitize? ( ~sys-libs/compiler-rt-sanitizers-12.0.1.9999:12.0.1 ) ) libcxx? ( >=sys-libs/libcxx-12.0.1.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-12.0.1.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
-SLOT=12.0.0
+SLOT=12.0.1
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=227477f42947a65af543cd73da80bf66
+_md5_=75ae4db590ba9c2b4b7ba88cf44c1dfe
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-12.0.1_rc1 b/metadata/md5-cache/sys-devel/clang-runtime-12.0.1_rc1
new file mode 100644
index 000000000000..73a875465c64
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-runtime-12.0.1_rc1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta-ebuild for clang runtime libraries
+EAPI=7
+HOMEPAGE=https://clang.llvm.org/
+IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=metapackage
+PROPERTIES=live
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-12.0.1_rc1:12.0.1 sanitize? ( ~sys-libs/compiler-rt-sanitizers-12.0.1_rc1:12.0.1 ) ) libcxx? ( >=sys-libs/libcxx-12.0.1_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-12.0.1_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=sanitize? ( compiler-rt )
+SLOT=12.0.1
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=75ae4db590ba9c2b4b7ba88cf44c1dfe
diff --git a/metadata/md5-cache/sys-devel/distcc-3.4 b/metadata/md5-cache/sys-devel/distcc-3.4
index c29f0cbbeb72..ac595ed54a67 100644
--- a/metadata/md5-cache/sys-devel/distcc-3.4
+++ b/metadata/md5-cache/sys-devel/distcc-3.4
@@ -5,11 +5,11 @@ DESCRIPTION=Distribute compilation of C code across several machines on a networ
 EAPI=7
 HOMEPAGE=https://github.com/distcc/distcc
 IUSE=gssapi gtk hardened ipv6 selinux xinetd zeroconf python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/popt gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:3 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) acct-user/distcc dev-util/shadowman >=sys-devel/gcc-config-1.4.1 selinux? ( sec-policy/selinux-distcc ) xinetd? ( sys-apps/xinetd )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/distcc/distcc/releases/download/v3.4/distcc-3.4.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aea36db51ff89d95bbe975b0e865c87e
+_md5_=c3b12d5e09e57bd17f8a5ed9ec1158dc
diff --git a/metadata/md5-cache/sys-devel/lld-12.0.0.9999 b/metadata/md5-cache/sys-devel/lld-12.0.1.9999
index 405bb52a2f8e..e7a99036ca97 100644
--- a/metadata/md5-cache/sys-devel/lld-12.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-12.0.1.9999
@@ -1,13 +1,13 @@
-BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.9 ~dev-python/lit-12.0.0.9999[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 ~dev-python/lit-12.0.0.9999[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 ~dev-python/lit-12.0.0.9999[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.9 ~dev-python/lit-12.0.1.9999[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 ~dev-python/lit-12.0.1.9999[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 ~dev-python/lit-12.0.1.9999[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-12.0.0.9999 !!sys-devel/llvm:0
+DEPEND=~sys-devel/llvm-12.0.1.9999 !!sys-devel/llvm:0
 DESCRIPTION=The LLVM linker (link editor)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=test test
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
-RDEPEND=~sys-devel/llvm-12.0.0.9999
+RDEPEND=~sys-devel/llvm-12.0.1.9999
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	947bf87d74971ddf91feb19e4fa5f92f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
diff --git a/metadata/md5-cache/sys-devel/lld-12.0.1_rc1 b/metadata/md5-cache/sys-devel/lld-12.0.1_rc1
new file mode 100644
index 000000000000..8f515168dd89
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-12.0.1_rc1
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.9 ~dev-python/lit-12.0.1_rc1[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 ~dev-python/lit-12.0.1_rc1[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 ~dev-python/lit-12.0.1_rc1[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-12.0.1_rc1 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM linker (link editor)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test test
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=~sys-devel/llvm-12.0.1_rc1
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc1.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	947bf87d74971ddf91feb19e4fa5f92f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ebe0ebd4ec2ec41ca3b8916a12290331
diff --git a/metadata/md5-cache/sys-devel/llvm-12.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-12.0.1.9999
index f8a405e91ec3..6d656e0586bf 100644
--- a/metadata/md5-cache/sys-devel/llvm-12.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-12.0.1.9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-12.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.9 dev-python/recommonmark[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/recommonmark[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/recommonmark[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) libffi? ( virtual/pkgconfig ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-python/sphinx dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-12.0.1.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.9 dev-python/recommonmark[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/recommonmark[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/recommonmark[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) libffi? ( virtual/pkgconfig ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-python/sphinx dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gold? ( sys-libs/binutils-libs )
 DESCRIPTION=Low Level Virtual Machine
diff --git a/metadata/md5-cache/sys-devel/llvm-12.0.1_rc1 b/metadata/md5-cache/sys-devel/llvm-12.0.1_rc1
new file mode 100644
index 000000000000..e40b8480c9e8
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-12.0.1_rc1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-12.0.1.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.9 dev-python/recommonmark[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/recommonmark[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/recommonmark[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) libffi? ( virtual/pkgconfig ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-python/sphinx dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gold? ( sys-libs/binutils-libs )
+DESCRIPTION=Low Level Virtual Machine
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug doc exegesis gold libedit +libffi ncurses test xar xml z3 kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
+PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-12 )
+RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE )
+RESTRICT=!test? ( test )
+SLOT=12
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc1.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm.org	947bf87d74971ddf91feb19e4fa5f92f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	d3fc79d3d50544347e324864f95206e2	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fb11419bf87331a07642b9313f5f7b42
diff --git a/metadata/md5-cache/sys-devel/llvm-common-12.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-common-12.0.1.9999
index 95da701d7c39..9ffb3915307f 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-12.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-common-12.0.1.9999
@@ -8,4 +8,4 @@ PROPERTIES=live
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 _eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	llvm.org	947bf87d74971ddf91feb19e4fa5f92f	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=69b5382e6a4c27c13e4114449b987724
+_md5_=0f952970544f31ba021c8c334a70d237
diff --git a/metadata/md5-cache/sys-devel/llvm-common-12.0.1_rc1 b/metadata/md5-cache/sys-devel/llvm-common-12.0.1_rc1
new file mode 100644
index 000000000000..94d01dbfde9a
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-12.0.1_rc1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=!sys-devel/llvm:0
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-12.0.1-rc1.tar.gz
+_eclasses_=llvm.org	947bf87d74971ddf91feb19e4fa5f92f	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=0f952970544f31ba021c8c334a70d237
diff --git a/metadata/md5-cache/sys-devel/m4-1.4.19 b/metadata/md5-cache/sys-devel/m4-1.4.19
new file mode 100644
index 000000000000..c5aad4977bb2
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/m4-1.4.19
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/xz-utils nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure install test
+DEPEND=virtual/libiconv nls? ( sys-devel/gettext virtual/libintl )
+DESCRIPTION=GNU macro processor
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/m4/m4.html
+IUSE=examples nls
+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
+LICENSE=GPL-3
+RDEPEND=virtual/libiconv nls? ( sys-devel/gettext virtual/libintl )
+SLOT=0
+SRC_URI=mirror://gnu/m4/m4-1.4.19.tar.xz
+_md5_=5764b150f69dc860187bcf7ec4408748
diff --git a/metadata/md5-cache/sys-devel/m4-1.4.19_beta2 b/metadata/md5-cache/sys-devel/m4-1.4.19_beta2
deleted file mode 100644
index 5d26ba991e89..000000000000
--- a/metadata/md5-cache/sys-devel/m4-1.4.19_beta2
+++ /dev/null
@@ -1,10 +0,0 @@
-BDEPEND=app-arch/xz-utils
-DEFINED_PHASES=configure install test
-DESCRIPTION=GNU macro processor
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/m4/m4.html
-IUSE=examples
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://alpha.gnu.org/gnu/m4/m4-1.4.18d.tar.xz
-_md5_=21a5f47bc715f3a6550ae80dd73395ab