gentoo resync : 22.05.2021

15 files changed, 42 insertions, 378 deletions

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 1748ab65dad0..ef4696e6746a 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/ada.eclass b/eclass/ada.eclass
index 4b568a8c20a3..2e409fd93050 100644
--- a/eclass/ada.eclass
+++ b/eclass/ada.eclass
@@ -58,7 +58,7 @@ EXPORT_FUNCTIONS pkg_setup
 # @DESCRIPTION:
 # All supported Ada implementations, most preferred last.
 _ADA_ALL_IMPLS=(
-	gnat_2016 gnat_2017 gnat_2018 gnat_2019
+	gnat_2016 gnat_2017 gnat_2018 gnat_2019 gnat_2020
 )
 readonly _ADA_ALL_IMPLS
 
@@ -86,6 +86,9 @@ _ada_impl_supported() {
 		gnat_201[6789])
 			return 0
 			;;
+		gnat_2020)
+			return 0
+			;;
 		*)
 			[[ ${ADA_COMPAT_NO_STRICT} ]] && return 1
 			die "Invalid implementation in ADA_COMPAT: ${impl}"
@@ -181,6 +184,10 @@ ada_export() {
 			impl=${1}
 			shift
 			;;
+		gnat_2020)
+			impl=${1}
+			shift
+			;;
 		*)
 			impl=${EADA}
 			if [[ -z ${impl} ]]; then
@@ -204,6 +211,9 @@ ada_export() {
 		gnat_2019)
 			gcc_pv=8.3.1
 			;;
+		gnat_2020)
+			gcc_pv=9.3.1
+			;;
 		*)
 			gcc_pv="9.9.9"
 			;;
diff --git a/eclass/docs.eclass b/eclass/docs.eclass
index cc3b5b0a1ac4..7ee7a11ca5e4 100644
--- a/eclass/docs.eclass
+++ b/eclass/docs.eclass
@@ -3,9 +3,9 @@
 
 # @ECLASS: docs.eclass
 # @MAINTAINER:
-# Andrew Ammerlaan <andrewammerlaan@riseup.net>
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org>
 # @AUTHOR:
-# Author: Andrew Ammerlaan <andrewammerlaan@riseup.net>
+# Author: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
 # Based on the work of: Michał Górny <mgorny@gentoo.org>
 # @SUPPORTED_EAPIS: 6 7
 # @BLURB: A simple eclass to build documentation.
diff --git a/eclass/dotnet.eclass b/eclass/dotnet.eclass
index fd25ad1d5856..cbda4f01d451 100644
--- a/eclass/dotnet.eclass
+++ b/eclass/dotnet.eclass
@@ -3,7 +3,7 @@
 
 # @ECLASS: dotnet.eclass
 # @MAINTAINER:
-# dotnet@gentoo.org
+# maintainer-needed@gentoo.org
 # @SUPPORTED_EAPIS: 1 2 3 4 5 6 7
 # @BLURB: common settings and functions for mono and dotnet related packages
 # @DESCRIPTION:
diff --git a/eclass/mono-env.eclass b/eclass/mono-env.eclass
index 51794ed4a005..6a93993acd29 100644
--- a/eclass/mono-env.eclass
+++ b/eclass/mono-env.eclass
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: mono-env.eclass
 # @MAINTAINER:
-# dotnet@gentoo.org
+# maintainer-needed@gentoo.org
 # @BLURB: Set environment variables commonly used by dotnet packages.
 # @DESCRIPTION:
 # Set environment variables commonly used by dotnet packages.
diff --git a/eclass/mono.eclass b/eclass/mono.eclass
index b1dc1e56d487..382c6e4b4dcb 100644
--- a/eclass/mono.eclass
+++ b/eclass/mono.eclass
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: mono.eclass
 # @MAINTAINER:
-# dotnet@gentoo.org
+# maintainer-needed@gentoo.org
 # @BLURB: common settings and functions for mono and dotnet related packages
 # @DEPRECATED: mono-env
 # @DESCRIPTION:
diff --git a/eclass/nvidia-driver.eclass b/eclass/nvidia-driver.eclass
deleted file mode 100644
index 99f7cf4876a6..000000000000
--- a/eclass/nvidia-driver.eclass
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# @ECLASS: nvidia-driver.eclass
-# @MAINTAINER:
-# David Seifert <soap@gentoo.org>
-# @AUTHOR:
-# Original author: Doug Goldstein <cardoe@gentoo.org>
-# @SUPPORTED_EAPIS: 7
-# @BLURB: Provide useful messages for nvidia-drivers
-# @DESCRIPTION:
-# Provide useful messages for nvidia-drivers based on currently installed
-# Nvidia GPU and Linux kernel.
-
-# @ECLASS-VARIABLE: NV_KV_MAX_PLUS
-# @REQUIRED
-# @DESCRIPTION:
-# Two component version specifier for the strict upper bound on the
-# usable kernel version.
-#
-# Example:
-# @CODE
-# NV_KV_MAX_PLUS="5.11"
-# @CODE
-#
-# means that only kernels (strictly) below 5.11 are supported by the driver
-# in question.
-
-case ${EAPI:-0} in
-	[0-6]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
-	7)     ;;
-	*)     die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
-esac
-
-if [[ ! ${_NVIDIA_DRIVER_ECLASS} ]]; then
-_NVIDIA_DRIVER_ECLASS=1
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/Download/Find.aspx"
-BDEPEND="sys-apps/pciutils"
-RESTRICT="bindist mirror test"
-
-# Variables for readme.gentoo.eclass:
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You must be in the video group to use the NVIDIA device
-For more info, read the docs at
-https://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6
-
-This ebuild installs a kernel module and X driver. Both must
-match explicitly in their version. This means, if you restart
-X, you must modprobe -r nvidia before starting it back up
-
-To use the NVIDIA CUDA/OpenCL, run \"eselect opencl set nvidia\"
-
-NVIDIA has requested that any bug reports submitted have the
-output of nvidia-bug-report.sh included.
-"
-
-# @FUNCTION: nvidia-driver_get_gpu
-# @DESCRIPTION:
-# Retrieve the PCI device ID for each Nvidia GPU you have
-nvidia-driver_get_gpu() {
-	local NVIDIA_CARD=$(
-		[[ -x ${BROOT}/usr/sbin/lspci ]] && "${BROOT}"/usr/sbin/lspci -d 10de: -n \
-			| awk -F'[: ]' '/ 03[0-9][0-9]: /{print $6}'
-	)
-
-	if [[ -n ${NVIDIA_CARD} ]]; then
-		echo "${NVIDIA_CARD}"
-	else
-		echo 0000
-	fi
-}
-
-nvidia-driver_get_mask() {
-	local nvidia_gpus="$(nvidia-driver_get_gpu)"
-	local nvidia_gpu drv
-
-	for nvidia_gpu in ${nvidia_gpus}; do
-		# the data below is derived from
-		# https://us.download.nvidia.com/XFree86/Linux-x86_64/396.18/README/supportedchips.html
-
-		if has ${nvidia_gpu} \
-			0020 0028 0029 002c 002d 00a0 0100 0101 0103 0150 0151 0152 0153; then
-				echo ">=x11-drivers/nvidia-drivers-72.0.0"
-				return 0
-		fi
-
-		if has ${nvidia_gpu} \
-			0110 0111 0112 0113 0170 0171 0172 0173 0174 0175 0176 0177 0178 0179 017a \
-			017c 017d 0181 0182 0183 0185 0188 018a 018b 018c 01a0 01f0 0200 0201 0202 \
-			0203 0250 0251 0253 0258 0259 025b 0280 0281 0282 0286 0288 0289 028c; then
-				echo ">=x11-drivers/nvidia-drivers-97.0.0"
-				return 0
-		fi
-
-		if has ${nvidia_gpu} \
-			00fa 00fb 00fc 00fd 00fe 0301 0302 0308 0309 0311 0312 0314 031a 031b 031c \
-			0320 0321 0322 0323 0324 0325 0326 0327 0328 032a 032b 032c 032d 0330 0331 \
-			0332 0333 0334 0338 033f 0341 0342 0343 0344 0347 0348 034c 034e; then
-				echo ">=x11-drivers/nvidia-drivers-177.0.0"
-				return 0
-		fi
-
-		if has ${nvidia_gpu} \
-			0040 0041 0042 0043 0044 0045 0046 0047 0048 004e 0090 0091 0092 0093 0095 \
-			0098 0099 009d 00c0 00c1 00c2 00c3 00c8 00c9 00cc 00cd 00ce 00f1 00f2 00f3 \
-			00f4 00f5 00f6 00f8 00f9 0140 0141 0142 0143 0144 0145 0146 0147 0148 0149 \
-			014a 014c 014d 014e 014f 0160 0161 0162 0163 0164 0165 0166 0167 0168 0169 \
-			016a 01d0 01d1 01d2 01d3 01d6 01d7 01d8 01da 01db 01dc 01dd 01de 01df 0211 \
-			0212 0215 0218 0221 0222 0240 0241 0242 0244 0245 0247 0290 0291 0292 0293 \
-			0294 0295 0297 0298 0299 029a 029b 029c 029d 029e 029f 02e0 02e1 02e2 02e3 \
-			02e4 038b 0390 0391 0392 0393 0394 0395 0397 0398 0399 039c 039e 03d0 03d1 \
-			03d2 03d5 03d6 0531 0533 053a 053b 053e 07e0 07e1 07e2 07e3 07e5; then
-				echo ">=x11-drivers/nvidia-drivers-305.0.0"
-				return 0
-		fi
-
-		if has ${nvidia_gpu} \
-			0191 0193 0194 0197 019d 019e 0400 0401 0402 0403 0404 0405 0406 0407 0408 \
-			0409 040a 040b 040c 040d 040e 040f 0410 0420 0421 0422 0423 0424 0425 0426 \
-			0427 0428 0429 042a 042b 042c 042d 042e 042f 05e0 05e1 05e2 05e3 05e6 05e7 \
-			05e7 05e7 05e7 05e7 05e7 05ea 05eb 05ed 05f8 05f9 05fd 05fe 05ff 0600 0601 \
-			0602 0603 0604 0605 0606 0607 0608 0609 0609 060a 060b 060c 060d 060f 0610 \
-			0611 0612 0613 0614 0615 0617 0618 0619 061a 061b 061c 061d 061e 061f 0621 \
-			0622 0623 0625 0626 0627 0628 062a 062b 062c 062d 062e 062e 0630 0631 0632 \
-			0635 0637 0638 063a 0640 0641 0643 0644 0645 0646 0647 0648 0649 0649 064a \
-			064b 064c 0651 0652 0652 0653 0654 0654 0654 0655 0656 0658 0659 065a 065b \
-			065c 06e0 06e1 06e2 06e3 06e4 06e5 06e6 06e7 06e8 06e8 06e9 06ea 06eb 06ec \
-			06ef 06f1 06f8 06f9 06f9 06fa 06fb 06fd 06ff 06ff 0840 0844 0845 0846 0847 \
-			0848 0849 084a 084b 084c 084d 084f 0860 0861 0862 0863 0864 0865 0866 0866 \
-			0867 0868 0869 086a 086c 086d 086e 086f 0870 0871 0872 0872 0873 0873 0874 \
-			0876 087a 087d 087e 087f 08a0 08a2 08a3 08a4 08a5 0a20 0a22 0a23 0a26 0a27 \
-			0a28 0a29 0a2a 0a2b 0a2c 0a2d 0a32 0a34 0a35 0a38 0a3c 0a60 0a62 0a63 0a64 \
-			0a65 0a66 0a67 0a68 0a69 0a6a 0a6c 0a6e 0a6e 0a6f 0a70 0a70 0a70 0a71 0a72 \
-			0a73 0a73 0a73 0a74 0a74 0a75 0a75 0a76 0a78 0a7a 0a7a 0a7a 0a7a 0a7a 0a7a \
-			0a7a 0a7a 0a7a 0a7a 0a7a 0a7c 0ca0 0ca2 0ca3 0ca4 0ca5 0ca7 0ca8 0ca9 0cac \
-			0caf 0cb0 0cb1 0cbc 10c0 10c3 10c5 10d8; then
-				echo ">=x11-drivers/nvidia-drivers-341.0.0"
-				return 0
-		fi
-
-		if has ${nvidia_gpu} \
-			06c0 06c4 06ca 06cd 06d1 06d2 06d8 06d9 06da 06dc 06dd 06de 06df 0dc0 0dc4 \
-			0dc5 0dc6 0dcd 0dce 0dd1 0dd2 0dd3 0dd6 0dd8 0dda 0de0 0de1 0de2 0de3 0de4 \
-			0de5 0de7 0de8 0de9 0dea 0deb 0dec 0ded 0dee 0def 0df0 0df1 0df2 0df3 0df4 \
-			0df5 0df6 0df7 0df8 0df9 0dfa 0dfc 0e22 0e23 0e24 0e30 0e31 0e3a 0e3b 0f00 \
-			0f01 0f02 0f03 1040 1042 1048 1049 104a 104b 104c 1050 1051 1052 1054 1055 \
-			1056 1057 1058 1059 105a 105b 107c 107d 1080 1081 1082 1084 1086 1087 1088 \
-			1089 108b 1091 1094 1096 109a 109b 1140 1200 1201 1203 1205 1206 1207 1208 \
-			1210 1211 1212 1213 1241 1243 1244 1245 1246 1247 1248 1249 124b 124d 1251; then
-				echo ">=x11-drivers/nvidia-drivers-391.0.0"
-				return 0
-		fi
-	done
-
-	return 1
-}
-
-# @FUNCTION: nvidia-driver_check_gpu
-# @DESCRIPTION:
-# Prints out a warning if the driver does not work with the installed GPU
-nvidia-driver_check_gpu() {
-	local nvidia_mask=$(nvidia-driver_get_mask)
-
-	if [[ -n ${nvidia_mask} ]]; then
-		if ver_test "${nvidia_mask##*-}" -lt "${PV}" ; then
-			ewarn "***** WARNING *****"
-			ewarn
-			ewarn "You are currently installing a version of nvidia-drivers that is"
-			ewarn "known not to work with a GPU you have installed on your system."
-			ewarn "If this is intentional, please ignore this. If it is not please"
-			ewarn "perform the following steps:"
-			ewarn
-			ewarn "Add the following mask entry to the local package.mask file:"
-			if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
-				ewarn "echo \"${nvidia_mask}\" > ${EROOT}/etc/portage/package.mask/nvidia-drivers"
-			else
-				ewarn "echo \"${nvidia_mask}\" >> ${EROOT}/etc/portage/package.mask"
-			fi
-			ewarn
-			ewarn "Failure to perform the steps above could result in a non-working"
-			ewarn "X setup."
-			ewarn
-			ewarn "For more information please read:"
-			ewarn "https://www.nvidia.com/object/IO_32667.html"
-		fi
-	fi
-}
-
-nvidia-driver_check_kernel() {
-	if kernel_is ge ${NV_KV_MAX_PLUS/./ }; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-${NV_KV_MAX_PLUS}"
-		ewarn "<sys-kernel/gentoo-kernel-${NV_KV_MAX_PLUS}"
-		ewarn
-		ewarn "You are free to apply custom patches via /etc/portage/patches"
-		ewarn "to provide whatever support you feel is appropriate, but will"
-		ewarn "not receive support as a result of those changes."
-		ewarn
-		ewarn "Do not file a bug report about this."
-		ewarn
-	fi
-
-	check_extra_config
-}
-
-nvidia-driver_check() {
-	# Since Nvidia ships many different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver_check_gpu
-
-	use driver && use kernel_linux && nvidia-driver_check_kernel
-}
-
-fi
diff --git a/eclass/perl-functions.eclass b/eclass/perl-functions.eclass
index e6168a075345..8633f384f1bf 100644
--- a/eclass/perl-functions.eclass
+++ b/eclass/perl-functions.eclass
@@ -127,6 +127,16 @@ perl_delete_emptybsdir() {
 	fi
 }
 
+# @FUNCTION: perl_fix_permissions
+# @DESCRIPTION:
+# Make all of ${D} user-writable, since EU::MM does silly things with
+# the w bit. See bug 554346.
+perl_fix_permissions() {
+	debug-print-function $FUNCNAME "$@"
+	perl_set_version
+	fperms -R u+w "${D}"
+}
+
 # @FUNCTION: perl_fix_packlist
 # @DESCRIPTION:
 # Look through ${D} for .packlist text files containing the temporary installation
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 60526b1f6b14..0082a231f0a0 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -318,16 +318,13 @@ _python_export() {
 				;;
 			PYTHON_SITEDIR)
 				[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
-				# sysconfig can't be used because:
-				# 1) pypy doesn't give site-packages but stdlib
-				# 2) jython gives paths with wrong case
-				PYTHON_SITEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())') || die
+				PYTHON_SITEDIR=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_path("purelib"))') || die
 				export PYTHON_SITEDIR
 				debug-print "${FUNCNAME}: PYTHON_SITEDIR = ${PYTHON_SITEDIR}"
 				;;
 			PYTHON_INCLUDEDIR)
 				[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
-				PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())') || die
+				PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_path("platinclude"))') || die
 				export PYTHON_INCLUDEDIR
 				debug-print "${FUNCNAME}: PYTHON_INCLUDEDIR = ${PYTHON_INCLUDEDIR}"
 
diff --git a/eclass/readme.gentoo.eclass b/eclass/readme.gentoo.eclass
deleted file mode 100644
index c902605538aa..000000000000
--- a/eclass/readme.gentoo.eclass
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# @ECLASS: readme.gentoo.eclass
-# @MAINTAINER:
-# Pacho Ramos <pacho@gentoo.org>
-# @AUTHOR:
-# Author: Pacho Ramos <pacho@gentoo.org>
-# @SUPPORTED_EAPIS: 4 5
-# @BLURB: install a doc file shown via elog messages
-# @DEPRECATED: readme.gentoo-r1
-# @DESCRIPTION:
-# An eclass for installing a README.gentoo doc file recording tips
-# shown via elog messages. With this eclass, those elog messages will only be
-# shown at first package installation and a file for later reviewing will be
-# installed under /usr/share/doc/${PF}
-
-if [[ -z ${_README_GENTOO_ECLASS} ]]; then
-_README_GENTOO_ECLASS=1
-
-inherit estack eutils
-
-case "${EAPI:-0}" in
-	0|1|2|3)
-		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
-		;;
-	4|5)
-		# EAPI>=4 is required for REPLACING_VERSIONS preventing us
-		# from needing to export another pkg_preinst phase to save has_version
-		# result. Also relies on EAPI >=4 default src_install phase.
-		EXPORT_FUNCTIONS src_install pkg_postinst
-		;;
-	6)
-		die "Unsupported EAPI=${EAPI} for ${ECLASS}"
-		die "Please migrate to readme.gentoo-r1.eclass and note	that"
-		die "it stops to export any ebuild phases and, then, you will"
-		die "need to ensure readme.gentoo_create_doc is called in"
-		die "src_install and readme.gentoo_print_elog in pkg_postinst"
-		;;
-	*)
-		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
-		;;
-esac
-
-# @ECLASS-VARIABLE: DISABLE_AUTOFORMATTING
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# If non-empty, DOC_CONTENTS information will be strictly respected,
-# not getting it automatically formatted by fmt. If empty, it will
-# rely on fmt for formatting and 'echo -e' options to tweak lines a bit.
-
-# @ECLASS-VARIABLE: FORCE_PRINT_ELOG
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# If non-empty this variable forces elog messages to be printed.
-
-# @ECLASS-VARIABLE: README_GENTOO_SUFFIX
-# @DESCRIPTION:
-# If you want to specify a suffix for README.gentoo file please export it.
-: ${README_GENTOO_SUFFIX:=""}
-
-# @FUNCTION: readme.gentoo_create_doc
-# @DESCRIPTION:
-# Create doc file with ${DOC_CONTENTS} variable (preferred) and, if not set,
-# look for "${FILESDIR}/README.gentoo" contents. You can use
-# ${FILESDIR}/README.gentoo-${SLOT} also.
-# Usually called at src_install phase.
-readme.gentoo_create_doc() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	if [[ -n "${DOC_CONTENTS}" ]]; then
-		eshopts_push
-		set -f
-		if [[ -n "${DISABLE_AUTOFORMATTING}" ]]; then
-			echo "${DOC_CONTENTS}" > "${T}"/README.gentoo
-		else
-			echo -e ${DOC_CONTENTS} | fold -s -w 70 \
-				| sed 's/[[:space:]]*$//' > "${T}"/README.gentoo
-		fi
-		eshopts_pop
-	elif [[ -f "${FILESDIR}/README.gentoo-${SLOT%/*}" ]]; then
-		cp "${FILESDIR}/README.gentoo-${SLOT%/*}" "${T}"/README.gentoo || die
-	elif [[ -f "${FILESDIR}/README.gentoo${README_GENTOO_SUFFIX}" ]]; then
-		cp "${FILESDIR}/README.gentoo${README_GENTOO_SUFFIX}" "${T}"/README.gentoo || die
-	else
-		die "You are not specifying README.gentoo contents!"
-	fi
-
-	dodoc "${T}"/README.gentoo
-	README_GENTOO_DOC_VALUE=$(< "${T}/README.gentoo")
-}
-
-# @FUNCTION: readme.gentoo_print_elog
-# @DESCRIPTION:
-# Print elog messages with "${T}"/README.gentoo contents. They will be
-# shown only when package is installed at first time.
-# Usually called at pkg_postinst phase.
-#
-# If you want to show them always, please set FORCE_PRINT_ELOG to a non empty
-# value in your ebuild before this function is called.
-# This can be useful when, for example, DOC_CONTENTS is modified, then, you can
-# rely on specific REPLACING_VERSIONS handling in your ebuild to print messages
-# when people update from versions still providing old message.
-readme.gentoo_print_elog() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	eqawarn "${CATEGORY}/${PN} is using the deprecated readme.gentoo.eclass."
-	eqawarn "Please use readme.gentoo-r1 instead."
-
-	if [[ -z "${README_GENTOO_DOC_VALUE}" ]]; then
-		die "readme.gentoo_print_elog invoked without matching readme.gentoo_create_doc call!"
-	elif ! [[ -n "${REPLACING_VERSIONS}" ]] || [[ -n "${FORCE_PRINT_ELOG}" ]]; then
-		echo -e "${README_GENTOO_DOC_VALUE}" | while read -r ELINE; do elog "${ELINE}"; done
-		elog ""
-		elog "(Note: Above message is only printed the first time package is"
-		elog "installed. Please look at ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog "for future reference)"
-	fi
-}
-
-
-# @FUNCTION: readme.gentoo_src_install
-# @DESCRIPTION:
-# Install generated doc file automatically.
-readme.gentoo_src_install() {
-	debug-print-function ${FUNCNAME} "${@}"
-	default
-	readme.gentoo_create_doc
-}
-
-# @FUNCTION: readme.gentoo_pkg_postinst
-# @DESCRIPTION:
-# Show elog messages from from just generated doc file.
-readme.gentoo_pkg_postinst() {
-	debug-print-function ${FUNCNAME} "${@}"
-	readme.gentoo_print_elog
-}
-
-fi
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 3e36b06d3153..9b2fd39ccf14 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -562,7 +562,7 @@ each_fakegem_install() {
 		local _extensionsdir="$(ruby_fakegem_gemsdir)/extensions/$(ruby_rbconfig_value 'arch')/$(ruby_rbconfig_value 'ruby_version')/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}"
 
 		for extension in ${RUBY_FAKEGEM_EXTENSIONS[@]} ; do
-			emake V=1 sitearchdir="${ED}/${_extensionsdir}" -C ${extension%/*} install
+			emake V=1 sitearchdir="${ED}${_extensionsdir}" -C ${extension%/*} install
 		done
 
 		# Add the marker to indicate that the extensions are installed
diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass
index 3301b5f32fe2..64caf3a55559 100644
--- a/eclass/rust-toolchain.eclass
+++ b/eclass/rust-toolchain.eclass
@@ -50,6 +50,7 @@ rust_abi() {
 		mips*)		  echo mips-unknown-linux-gnu;;
 		powerpc*)	  echo powerpc-unknown-linux-gnu;;
 		s390x*)		  echo s390x-unknown-linux-gnu;;
+		riscv64*)	  echo riscv64gc-unknown-linux-gnu;;
 		*)			  echo ${CTARGET};;
   esac
 }
@@ -121,5 +122,6 @@ rust_all_arch_uris()
                        $(rust_arch_uri powerpc64le-unknown-linux-gnu  "$@") ) "
   uris+="s390?       ( $(rust_arch_uri s390x-unknown-linux-gnu        "$@") ) "
   uris+="abi_x86_32? ( $(rust_arch_uri i686-unknown-linux-gnu         "$@") ) "
+  uris+="riscv?      ( $(rust_arch_uri riscv64gc-unknown-linux-gnu    "$@") ) "
   echo "${uris}"
 }
diff --git a/eclass/tests/autotools_eaclocal_amflags.sh b/eclass/tests/autotools_eaclocal_amflags.sh
index b39f5420c31c..f9f02bb77893 100755
--- a/eclass/tests/autotools_eaclocal_amflags.sh
+++ b/eclass/tests/autotools_eaclocal_amflags.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 source tests-common.sh
 
+EAPI=7
+
 inherit autotools
 
 test-it() {
diff --git a/eclass/tests/flag-o-matic.sh b/eclass/tests/flag-o-matic.sh
index 676cc690c75c..dc8cfd375c1e 100755
--- a/eclass/tests/flag-o-matic.sh
+++ b/eclass/tests/flag-o-matic.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 source tests-common.sh
 
+EAPI=7
+
 inherit flag-o-matic
 
 CFLAGS="-a -b -c=1 --param l1-cache-size=32"
diff --git a/eclass/tests/tests-common.sh b/eclass/tests/tests-common.sh
index 2fc849cb69a7..a677842b6ac5 100644
--- a/eclass/tests/tests-common.sh
+++ b/eclass/tests/tests-common.sh
@@ -61,6 +61,9 @@ die() {
 }
 
 has_version() {
+	while [[ $1 == -* ]]; do
+		shift
+	done
 	portageq has_version / "$@"
 }