8 files changed, 18 insertions, 51 deletions
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.292_p10 b/metadata/md5-cache/dev-java/openjdk-bin-8.292_p10
index fbddebe0d90b..86c300239dbe 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.292_p10
+++ b/metadata/md5-cache/dev-java/openjdk-bin-8.292_p10
@@ -5,11 +5,11 @@ EAPI=6
 HOMEPAGE=https://adoptopenjdk.net
 INHERIT=eapi7-ver java-vm-2
 IUSE=alsa cups examples headless-awt selinux source
-KEYWORDS=amd64 ~arm64 ppc64 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ppc64 ~x64-macos
 LICENSE=GPL-2-with-classpath-exception
 RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) arm? ( dev-libs/libffi-compat:6 ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 RESTRICT=preserve-libs strip
 SLOT=8
-SRC_URI=arm64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz ) x64-macos? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz )
+SRC_URI=arm64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz ) arm? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u292b10.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz ) x64-macos? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz )
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	java-vm-2	1b9686c0df06500159478dfaf5c21338
-_md5_=e8f63f57bb0eca570b35fcd807ce9bd7
+_md5_=29af4780098b0aa10a3f9d880099d878
diff --git a/metadata/md5-cache/dev-lang/rust-1.51.0-r2 b/metadata/md5-cache/dev-lang/rust-1.51.0-r2
index 17e2c44d4ca6..e136382e8e11 100644
--- a/metadata/md5-cache/dev-lang/rust-1.51.0-r2
+++ b/metadata/md5-cache/dev-lang/rust-1.51.0-r2
@@ -1,17 +1,17 @@
 BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) app-eselect/eselect-rust || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) system-bootstrap? ( || ( =dev-lang/rust-1.50* =dev-lang/rust-bin-1.50* =dev-lang/rust-1.51* =dev-lang/rust-bin-1.51* ) ) !system-llvm? ( dev-util/cmake dev-util/ninja ) test? ( sys-devel/gdb )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) elibc_musl? ( sys-libs/libunwind:= ) system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:11[llvm_targets_AArch64(-)] ) llvm_targets_AMDGPU? ( sys-devel/llvm:11[llvm_targets_AMDGPU(-)] ) llvm_targets_ARM? ( sys-devel/llvm:11[llvm_targets_ARM(-)] ) llvm_targets_AVR? ( sys-devel/llvm:11[llvm_targets_AVR(-)] ) llvm_targets_BPF? ( sys-devel/llvm:11[llvm_targets_BPF(-)] ) llvm_targets_Hexagon? ( sys-devel/llvm:11[llvm_targets_Hexagon(-)] ) llvm_targets_Lanai? ( sys-devel/llvm:11[llvm_targets_Lanai(-)] ) llvm_targets_Mips? ( sys-devel/llvm:11[llvm_targets_Mips(-)] ) llvm_targets_MSP430? ( sys-devel/llvm:11[llvm_targets_MSP430(-)] ) llvm_targets_NVPTX? ( sys-devel/llvm:11[llvm_targets_NVPTX(-)] ) llvm_targets_PowerPC? ( sys-devel/llvm:11[llvm_targets_PowerPC(-)] ) llvm_targets_RISCV? ( sys-devel/llvm:11[llvm_targets_RISCV(-)] ) llvm_targets_Sparc? ( sys-devel/llvm:11[llvm_targets_Sparc(-)] ) llvm_targets_SystemZ? ( sys-devel/llvm:11[llvm_targets_SystemZ(-)] ) llvm_targets_WebAssembly? ( sys-devel/llvm:11[llvm_targets_WebAssembly(-)] ) llvm_targets_X86? ( sys-devel/llvm:11[llvm_targets_X86(-)] ) llvm_targets_XCore? ( sys-devel/llvm:11[llvm_targets_XCore(-)] ) ) ) <sys-devel/llvm-12:= wasm? ( sys-devel/lld ) ) !!sys-devel/llvm:0
+DEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= elibc_musl? ( sys-libs/libunwind:= ) system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:11[llvm_targets_AArch64(-)] ) llvm_targets_AMDGPU? ( sys-devel/llvm:11[llvm_targets_AMDGPU(-)] ) llvm_targets_ARM? ( sys-devel/llvm:11[llvm_targets_ARM(-)] ) llvm_targets_AVR? ( sys-devel/llvm:11[llvm_targets_AVR(-)] ) llvm_targets_BPF? ( sys-devel/llvm:11[llvm_targets_BPF(-)] ) llvm_targets_Hexagon? ( sys-devel/llvm:11[llvm_targets_Hexagon(-)] ) llvm_targets_Lanai? ( sys-devel/llvm:11[llvm_targets_Lanai(-)] ) llvm_targets_Mips? ( sys-devel/llvm:11[llvm_targets_Mips(-)] ) llvm_targets_MSP430? ( sys-devel/llvm:11[llvm_targets_MSP430(-)] ) llvm_targets_NVPTX? ( sys-devel/llvm:11[llvm_targets_NVPTX(-)] ) llvm_targets_PowerPC? ( sys-devel/llvm:11[llvm_targets_PowerPC(-)] ) llvm_targets_RISCV? ( sys-devel/llvm:11[llvm_targets_RISCV(-)] ) llvm_targets_Sparc? ( sys-devel/llvm:11[llvm_targets_Sparc(-)] ) llvm_targets_SystemZ? ( sys-devel/llvm:11[llvm_targets_SystemZ(-)] ) llvm_targets_WebAssembly? ( sys-devel/llvm:11[llvm_targets_WebAssembly(-)] ) llvm_targets_X86? ( sys-devel/llvm:11[llvm_targets_X86(-)] ) llvm_targets_XCore? ( sys-devel/llvm:11[llvm_targets_XCore(-)] ) ) ) <sys-devel/llvm-12:= wasm? ( sys-devel/lld ) ) !!sys-devel/llvm:0
 DESCRIPTION=Systems programming language from Mozilla
 EAPI=7
 HOMEPAGE=https://www.rust-lang.org/
 INHERIT=bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
-IUSE=clippy cpu_flags_x86_sse2 debug doc libressl miri nightly parallel-compiler rls rustfmt system-bootstrap system-llvm test wasm 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 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=clippy cpu_flags_x86_sse2 debug doc miri nightly parallel-compiler rls rustfmt system-bootstrap system-llvm test wasm 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 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-RDEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) elibc_musl? ( sys-libs/libunwind:= ) system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:11[llvm_targets_AArch64(-)] ) llvm_targets_AMDGPU? ( sys-devel/llvm:11[llvm_targets_AMDGPU(-)] ) llvm_targets_ARM? ( sys-devel/llvm:11[llvm_targets_ARM(-)] ) llvm_targets_AVR? ( sys-devel/llvm:11[llvm_targets_AVR(-)] ) llvm_targets_BPF? ( sys-devel/llvm:11[llvm_targets_BPF(-)] ) llvm_targets_Hexagon? ( sys-devel/llvm:11[llvm_targets_Hexagon(-)] ) llvm_targets_Lanai? ( sys-devel/llvm:11[llvm_targets_Lanai(-)] ) llvm_targets_Mips? ( sys-devel/llvm:11[llvm_targets_Mips(-)] ) llvm_targets_MSP430? ( sys-devel/llvm:11[llvm_targets_MSP430(-)] ) llvm_targets_NVPTX? ( sys-devel/llvm:11[llvm_targets_NVPTX(-)] ) llvm_targets_PowerPC? ( sys-devel/llvm:11[llvm_targets_PowerPC(-)] ) llvm_targets_RISCV? ( sys-devel/llvm:11[llvm_targets_RISCV(-)] ) llvm_targets_Sparc? ( sys-devel/llvm:11[llvm_targets_Sparc(-)] ) llvm_targets_SystemZ? ( sys-devel/llvm:11[llvm_targets_SystemZ(-)] ) llvm_targets_WebAssembly? ( sys-devel/llvm:11[llvm_targets_WebAssembly(-)] ) llvm_targets_X86? ( sys-devel/llvm:11[llvm_targets_X86(-)] ) llvm_targets_XCore? ( sys-devel/llvm:11[llvm_targets_XCore(-)] ) ) ) <sys-devel/llvm-12:= wasm? ( sys-devel/lld ) ) app-eselect/eselect-rust !<dev-lang/rust-1.47.0-r1 !<dev-lang/rust-bin-1.47.0-r1
+RDEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= elibc_musl? ( sys-libs/libunwind:= ) system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:11[llvm_targets_AArch64(-)] ) llvm_targets_AMDGPU? ( sys-devel/llvm:11[llvm_targets_AMDGPU(-)] ) llvm_targets_ARM? ( sys-devel/llvm:11[llvm_targets_ARM(-)] ) llvm_targets_AVR? ( sys-devel/llvm:11[llvm_targets_AVR(-)] ) llvm_targets_BPF? ( sys-devel/llvm:11[llvm_targets_BPF(-)] ) llvm_targets_Hexagon? ( sys-devel/llvm:11[llvm_targets_Hexagon(-)] ) llvm_targets_Lanai? ( sys-devel/llvm:11[llvm_targets_Lanai(-)] ) llvm_targets_Mips? ( sys-devel/llvm:11[llvm_targets_Mips(-)] ) llvm_targets_MSP430? ( sys-devel/llvm:11[llvm_targets_MSP430(-)] ) llvm_targets_NVPTX? ( sys-devel/llvm:11[llvm_targets_NVPTX(-)] ) llvm_targets_PowerPC? ( sys-devel/llvm:11[llvm_targets_PowerPC(-)] ) llvm_targets_RISCV? ( sys-devel/llvm:11[llvm_targets_RISCV(-)] ) llvm_targets_Sparc? ( sys-devel/llvm:11[llvm_targets_Sparc(-)] ) llvm_targets_SystemZ? ( sys-devel/llvm:11[llvm_targets_SystemZ(-)] ) llvm_targets_WebAssembly? ( sys-devel/llvm:11[llvm_targets_WebAssembly(-)] ) llvm_targets_X86? ( sys-devel/llvm:11[llvm_targets_X86(-)] ) llvm_targets_XCore? ( sys-devel/llvm:11[llvm_targets_XCore(-)] ) ) ) <sys-devel/llvm-12:= wasm? ( sys-devel/lld ) ) app-eselect/eselect-rust !<dev-lang/rust-1.47.0-r1 !<dev-lang/rust-bin-1.47.0-r1
 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 ) miri? ( nightly ) parallel-compiler? ( nightly ) test? ( 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 ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
 RESTRICT=test
 SLOT=stable/1.51
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.51.0-src.tar.xz !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.50.0-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.50.0-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.50.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.50.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.50.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.50.0-aarch64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.50.0-aarch64-unknown-linux-musl.tar.xz ) ) mips? ( https://static.rust-lang.org/dist/rust-1.50.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.50.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.50.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.50.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.50.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.50.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.50.0-s390x-unknown-linux-gnu.tar.xz ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.50.0-i686-unknown-linux-gnu.tar.xz ) )
 _eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	estack	055c42df72f76a4f45ec92b35e83cd56	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib-build	ac696f0bea6c503f5980bfd5a0f312e5	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-any-r1	17241a11501065ff3651350040875aa9	rust-toolchain	ce4799931c06282e30af60d3c1fa281d
-_md5_=b419268dd453ed9545319d719eb74133
+_md5_=bf1293ac336d8549b67bb31a53fcbde9
diff --git a/metadata/md5-cache/sys-fs/zfs-0.8.6 b/metadata/md5-cache/sys-fs/zfs-0.8.6
index d431d5484db8..2e504bf4483b 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.8.6
+++ b/metadata/md5-cache/sys-fs/zfs-0.8.6
@@ -1,17 +1,17 @@
 BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python? ( virtual/python-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] dev-libs/openssl:0=[static-libs?] !minimal? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python? ( virtual/python-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=7
 HOMEPAGE=https://github.com/openzfs/zfs
 INHERIT=autotools bash-completion-r1 flag-o-matic linux-info distutils-r1 systemd toolchain-funcs udev usr-ldscript
-IUSE=custom-cflags debug kernel-builtin libressl minimal nls python +rootfs test-suite static-libs kernel_linux python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 split-usr
+IUSE=custom-cflags debug kernel-builtin minimal nls python +rootfs test-suite static-libs kernel_linux python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 split-usr
 KEYWORDS=amd64 arm64 ppc64
 LICENSE=BSD-2 CDDL MIT
-RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python? ( virtual/python-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-0.8.6 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
+RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] dev-libs/openssl:0=[static-libs?] !minimal? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python? ( virtual/python-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-0.8.6 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
 REQUIRED_USE=!minimal? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ) python? ( !minimal ) test-suite? ( !minimal )
 RESTRICT=test
 SLOT=0/2
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-0.8.6/zfs-0.8.6.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=ce6d6f409dc7384db7c2d7e24396ab20
+_md5_=2e9b8fedecbe8406840e582d8519472e
diff --git a/metadata/md5-cache/sys-fs/zfs-2.0.3 b/metadata/md5-cache/sys-fs/zfs-2.0.3
deleted file mode 100644
index f06f628a4dd3..000000000000
--- a/metadata/md5-cache/sys-fs/zfs-2.0.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=Userland utilities for ZFS Linux kernel module
-EAPI=7
-HOMEPAGE=https://github.com/openzfs/zfs
-INHERIT=autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
-IUSE=custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=BSD-2 CDDL MIT
-RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.0.3 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
-REQUIRED_USE=!minimal? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ) python? ( !minimal ) test-suite? ( !minimal )
-RESTRICT=test
-SLOT=0/4
-SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.3/zfs-2.0.3.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	pam	b097695df28f3974e3af860d6704d4f2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=bb17360f7f02b5b7c12dfc7e9cf9c9ed
diff --git a/metadata/md5-cache/sys-fs/zfs-2.0.4 b/metadata/md5-cache/sys-fs/zfs-2.0.4
index c5152748669f..267edd207229 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.0.4
+++ b/metadata/md5-cache/sys-fs/zfs-2.0.4
@@ -1,17 +1,17 @@
 BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] dev-libs/openssl:0=[static-libs?] !minimal? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=7
 HOMEPAGE=https://github.com/openzfs/zfs
 INHERIT=autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
-IUSE=custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr
+IUSE=custom-cflags debug kernel-builtin minimal nls pam python +rootfs test-suite static-libs python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux split-usr
 KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=BSD-2 CDDL MIT
-RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) !minimal? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.0.4 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
+RDEPEND=net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] dev-libs/openssl:0=[static-libs?] !minimal? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.0.4 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
 REQUIRED_USE=!minimal? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ) python? ( !minimal ) test-suite? ( !minimal )
 RESTRICT=test
 SLOT=0/4
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.4/zfs-2.0.4.tar.gz
 _eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multiprocessing	cac3169468f893670dac3e7cb940e045	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	3ea803de86891185c7b1db2c0b5bc8c8	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	d8655e1387589a2e1930339b1627d5c1	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	pam	b097695df28f3974e3af860d6704d4f2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=bb17360f7f02b5b7c12dfc7e9cf9c9ed
+_md5_=33c5d425d440443b685b2e8e40823b16
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.3 b/metadata/md5-cache/sys-fs/zfs-kmod-2.0.3
deleted file mode 100644
index 2323ed093c8b..000000000000
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/awk sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
-EAPI=7
-HOMEPAGE=https://github.com/openzfs/zfs
-INHERIT=autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
-IUSE=custom-cflags debug +rootfs kernel_linux kernel_linux dist-kernel
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=CDDL MIT debug? ( GPL-2+ )
-RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-RESTRICT=debug? ( strip ) test
-SLOT=0
-SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.3/zfs-2.0.3.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	c0964e43ba712cb933da5f65b958fa88	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8
-_md5_=dada342eb472dab83d63f9465bd5d1dc
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 8c662c77588f..6203d7c30e13 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -17793,9 +17793,9 @@ sys-fs/xfsprogs 5.10.0-r1 5.11.0: xfs filesystem utilities
 sys-fs/xwmfs 0.90: FUSE-based X11 Window-Manager file system
 sys-fs/yaffs2utils 0.2.9: tools for generating YAFFS images
 sys-fs/zerofree 1.1.1: Zeroes out all free space on a filesystem
-sys-fs/zfs 0.8.6 2.0.3 2.0.4 2.1.0_rc4 9999: Userland utilities for ZFS Linux kernel module
+sys-fs/zfs 0.8.6 2.0.4 2.1.0_rc4 9999: Userland utilities for ZFS Linux kernel module
 sys-fs/zfs-auto-snapshot 1.2.4 1.2.4-r1 9999: ZFS Automatic Snapshot Service for Linux
-sys-fs/zfs-kmod 0.8.6 2.0.3 2.0.4 2.1.0_rc4 9999: Linux ZFS kernel module for sys-fs/zfs
+sys-fs/zfs-kmod 0.8.6 2.0.4 2.1.0_rc4 9999: Linux ZFS kernel module for sys-fs/zfs
 sys-kernel/bliss-initramfs 8.1.0-r1 9.3.0: Boot your system's rootfs from Encrypted/OpenZFS.
 sys-kernel/bliss-kernel-bin 4.14.178 5.4.51: Precompiled Vanilla Kernel (Kernel Ready-to-Eat [KRE])
 sys-kernel/cryptodev 1.11 1.12 9999: device that allows access to Linux kernel cryptographic drivers
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8f98290a7a0c..e107242f6274 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 02 May 2021 16:50:15 +0000
+Sun, 02 May 2021 17:05:15 +0000