gentoo resync : 20.06.2021

10 files changed, 203 insertions, 84 deletions

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 7a894fa8443f..492236ba54b6 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/cannadic.eclass b/eclass/cannadic.eclass
index 7392d5ce6a9b..5df857d18587 100644
--- a/eclass/cannadic.eclass
+++ b/eclass/cannadic.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: cannadic.eclass
@@ -6,40 +6,33 @@
 # cjk@gentoo.org
 # @AUTHOR:
 # Mamoru KOMACHI <usata@gentoo.org>
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Function for Canna compatible dictionaries
 # @DESCRIPTION:
 # The cannadic eclass is used for installation and setup of Canna
-# compatible dictionaries within the Portage system.
+# compatible dictionaries.
 
-inherit eutils
+case ${EAPI} in
+	7) ;;
+	*) die "EAPI=${EAPI:-0} is not supported" ;;
+esac
 
-EXPORT_FUNCTIONS pkg_setup pkg_postinst pkg_postrm src_install
+EXPORT_FUNCTIONS src_install pkg_postinst pkg_postrm
 
-HOMEPAGE="http://canna.osdn.jp/"		# you need to change this!
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+if [[ -z ${_CANNADIC_ECLASS} ]]; then
+_CANNADIC_ECLASS=1
 
-DICSDIRFILE="${FILESDIR}/*.dics.dir"
-CANNADICS="${CANNADICS}"			# (optional)
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 # You don't need to modify these
-CANNADIC_CANNA_DIR="${EROOT:-${ROOT}}"var/lib/canna/dic/canna
-CANNADIC_DICS_DIR="${EROOT:-${ROOT}}"var/lib/canna/dic/dics.d
-readonly CANNADIC_CANNA_DIR CANNADIC_DICS_DIR
-
-# @FUNCTION: cannadic_pkg_setup
-# @DESCRIPTION:
-# Sets up ${CANNADIC_CANNA_DIR}
-cannadic_pkg_setup() {
-	keepdir "${CANNADIC_CANNA_DIR}"
-	fowners bin:bin "${CANNADIC_CANNA_DIR}"
-	fperms 0775 "${CANNADIC_CANNA_DIR}"
-}
+readonly _CANNADIC_CANNA_DIR="/var/lib/canna/dic/canna"
+readonly _CANNADIC_DICS_DIR="/var/lib/canna/dic/dics.d"
 
 # @FUNCTION: cannadic-install
 # @DESCRIPTION:
-# Installs dictionaries to ${CANNADIC_CANNA_DIR}
+# Installs dictionaries to ${EPREFIX}/var/lib/canna/dic/canna
 cannadic-install() {
-	insinto "${CANNADIC_CANNA_DIR}"
+	insinto ${_CANNADIC_CANNA_DIR}
 	insopts -m 0664 -o bin -g bin
 	doins "${@}"
 }
@@ -48,8 +41,8 @@ cannadic-install() {
 # @DESCRIPTION:
 # Installs dics.dir from ${DICSDIRFILE}
 dicsdir-install() {
-	insinto "${CANNADIC_DICS_DIR}"
-	doins "${DICSDIRFILE}"
+	insinto ${_CANNADIC_DICS_DIR}
+	doins ${DICSDIRFILE}
 }
 
 # @FUNCTION: cannadic_src_install
@@ -57,14 +50,18 @@ dicsdir-install() {
 # Installs all dictionaries under ${WORKDIR}
 # plus dics.dir and docs
 cannadic_src_install() {
+	keepdir ${_CANNADIC_CANNA_DIR}
+	fowners bin:bin ${_CANNADIC_CANNA_DIR}
+	fperms 0775 ${_CANNADIC_CANNA_DIR}
+
 	local f
 	for f in *.c[btl]d *.t; do
-		if [[ -s "${f}" ]]; then
+		if [[ -s ${f} ]]; then
 			cannadic-install "${f}"
 		fi
 	done 2> /dev/null
 
-	dicsdir-install || die
+	dicsdir-install
 
 	einstalldocs
 }
@@ -83,19 +80,20 @@ update-cannadic-dir() {
 	einfo
 
 	# write new dics.dir file in case we are interrupted
-	cat <<-EOF > "${CANNADIC_CANNA_DIR}"/dics.dir.update-new
-	# dics.dir -- automatically generated file by Portage.
-	# DO NOT EDIT BY HAND.
+	cat <<-EOF > "${EROOT}${_CANNADIC_CANNA_DIR}"/dics.dir.update-new || die
+		# dics.dir -- automatically generated file by Portage.
+		# DO NOT EDIT BY HAND.
 	EOF
 
 	local f
-	for f in "${CANNADIC_DICS_DIR}"/*.dics.dir; do
-		echo "# ${f}" >> "${CANNADIC_CANNA_DIR}"/dics.dir.update-new
-		cat "${f}" >> "${CANNADIC_CANNA_DIR}"/dics.dir.update-new
+	for f in "${EROOT}${_CANNADIC_DICS_DIR}"/*.dics.dir; do
+		echo "# ${f}" >> "${EROOT}${_CANNADIC_CANNA_DIR}"/dics.dir.update-new || die
+		cat "${f}" >> "${EROOT}${_CANNADIC_CANNA_DIR}"/dics.dir.update-new || die
 		einfo "Added ${f}."
 	done
 
-	mv "${CANNADIC_CANNA_DIR}"/dics.dir.update-new "${CANNADIC_CANNA_DIR}"/dics.dir
+	mv "${EROOT}${_CANNADIC_CANNA_DIR}"/dics.dir.update-new \
+		"${EROOT}${_CANNADIC_CANNA_DIR}"/dics.dir || die
 
 	einfo
 	einfo "Done."
@@ -106,36 +104,47 @@ update-cannadic-dir() {
 # @DESCRIPTION:
 # Updates dics.dir and print out notice after install
 cannadic_pkg_postinst() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	update-cannadic-dir
 
-	einfo
-	einfo "Please restart cannaserver to fit the changes."
+	einfo "Please restart cannaserver for changes to propagate."
 	einfo "You need to modify your config file (~/.canna) to enable dictionaries."
 
-	if [[ -n "${CANNADICS}" ]]; then
-		einfo "e.g) add $(for d in ${CANNADICS}; do echo -n "\"${d}\" "; done)to section use-dictionary()."
-		einfo "For details, see documents under /usr/share/doc/${PF}."
+	if [[ -n ${CANNADICS} ]]; then
+		einfo "e.g) add"
+		einfo
+		einfo "  $(IFS=' ' ; echo ${CANNADICS[*]})"
+		einfo
+		einfo "to section use-dictionary()."
+		einfo "For details, see documents under ${EROOT}/usr/share/doc/${PF}."
 	fi
 
-	einfo "If you do not have ~/.canna, you can find sample files in /usr/share/canna."
+	einfo "If you do not have ~/.canna, you can find sample files in ${EROOT}/usr/share/canna."
 	ewarn "If you are upgrading from existing dictionary, you may need to recreate"
 	ewarn "user dictionary if you have one."
-	einfo
 }
 
 # @FUNCTION: cannadic_pkg_postrm
 # @DESCRIPTION:
 # Updates dics.dir and print out notice after uninstall
 cannadic_pkg_postrm() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	update-cannadic-dir
 
-	einfo
-	einfo "Please restart cannaserver to fit changes."
+	einfo "Please restart cannaserver for changes to propagate."
 	einfo "and modify your config file (~/.canna) to disable dictionary."
 
-	if [[ -n "${CANNADICS}" ]]; then
-		einfo "e.g) delete $(for d in ${CANNADICS}; do echo -n "\"${d}\" "; done)from section use-dictionary()."
+	if [[ -n ${CANNADICS} ]]; then
+		einfo "e.g) delete"
+		einfo
+		einfo "  $(IFS=' ' ; echo ${CANNADICS[*]})"
+		einfo
+		einfo "from section use-dictionary()."
 	fi
 
 	einfo
 }
+
+fi
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index bce3fd0cec02..1127d536697f 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -10,7 +10,7 @@
 # Mamoru Komachi <usata@gentoo.org>
 # Christian Faulhammer <fauli@gentoo.org>
 # Ulrich Müller <ulm@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
 # @BLURB: Emacs-related installation utilities
 # @DESCRIPTION:
 #
@@ -167,7 +167,7 @@
 
 case ${EAPI:-0} in
 	5|6) inherit eapi7-ver ;;
-	7) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index d763a4944d2d..c3c0045d854e 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -9,7 +9,7 @@
 # Jeremy Maitin-Shepard <jbms@attbi.com>
 # Christian Faulhammer <fauli@gentoo.org>
 # Ulrich Müller <ulm@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: Eclass for Emacs Lisp packages
 # @DESCRIPTION:
 #
@@ -64,7 +64,7 @@
 inherit elisp-common
 
 case ${EAPI:-0} in
-	6|7) ;;
+	6|7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
index 4bef00d40ac7..a5f88e9284a0 100644
--- a/eclass/fcaps.eclass
+++ b/eclass/fcaps.eclass
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: fcaps.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: function to set POSIX file-based capabilities
 # @DESCRIPTION:
 # This eclass provides a function to set file-based capabilities on binaries.
@@ -28,20 +29,21 @@
 # )
 # @CODE
 
+case ${EAPI} in
+	6|7|8) ;;
+	*) die "EAPI ${EAPI:-0} is unsupported" ;;
+esac
+
 if [[ -z ${_FCAPS_ECLASS} ]]; then
 _FCAPS_ECLASS=1
 
 IUSE="+filecaps"
 
-# Since it is needed in pkg_postinst() it must be in RDEPEND
-case "${EAPI:-0}" in
-	[0-6])
-		RDEPEND="filecaps? ( sys-libs/libcap )"
-	;;
-	*)
-		BDEPEND="filecaps? ( sys-libs/libcap )"
-		RDEPEND="${BDEPEND}"
-	;;
+# Since it is needed in pkg_postinst() it must be in IDEPEND
+case ${EAPI} in
+	7) BDEPEND="filecaps? ( sys-libs/libcap )" ;& # fallthrough
+	6) RDEPEND="filecaps? ( sys-libs/libcap )" ;;
+	*) IDEPEND="filecaps? ( sys-libs/libcap )" ;;
 esac
 
 # @ECLASS-VARIABLE: FILECAPS
diff --git a/eclass/findlib.eclass b/eclass/findlib.eclass
index 8eaaccd0ec96..d117c0b2bfd6 100644
--- a/eclass/findlib.eclass
+++ b/eclass/findlib.eclass
@@ -13,9 +13,13 @@
 # Do not complain about CFLAGS etc since ML projects do not use them.
 QA_FLAGS_IGNORED='.*'
 
+# Required to use the ocamlopt? dep in RDEPEND below
+IUSE="ocamlopt"
+
 # From this findlib version, there is proper stublibs support.
 DEPEND=">=dev-ml/findlib-1.0.4-r1"
 [[ ${FINDLIB_USE} ]] && DEPEND="${FINDLIB_USE}? ( ${DEPEND} )"
+RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
 
 check_ocamlfind() {
 	if [ ! -x "${EPREFIX}"/usr/bin/ocamlfind ] ; then
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 55f38af0ffd8..6da13cc0b2f5 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -33,8 +33,10 @@
 # @DESCRIPTION:
 # A string containing the directory of the target kernel sources. The default value is
 # "/usr/src/linux"
+KERNEL_DIR="${KERNEL_DIR:-${ROOT%/}/usr/src/linux}"
 
 # @ECLASS-VARIABLE: CONFIG_CHECK
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # A string containing a list of .config options to check for before
 # proceeding with the install.
@@ -57,13 +59,20 @@
 # sources.
 
 # @ECLASS-VARIABLE: ERROR_<CFG>
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # A string containing the error message to display when the check against CONFIG_CHECK
 # fails. <CFG> should reference the appropriate option used in CONFIG_CHECK.
 #
-#   e.g.: ERROR_MTRR="MTRR exists in the .config but shouldn't!!"
+# e.g.: ERROR_MTRR="MTRR exists in the .config but shouldn't!!"
+#
+# CONFIG_CHECK="CFG" with ERROR_<CFG>="Error Message" will die
+# CONFIG_CHECK="~CFG" with ERROR_<CFG>="Error Message" calls eerror without dieing
+# CONFIG_CHECK="~CFG" with WARNING_<CFG>="Warning Message" calls ewarn without dieing
+
 
 # @ECLASS-VARIABLE: KBUILD_OUTPUT
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # A string passed on commandline, or set from the kernel makefile. It contains the directory
 # which is to be used as the kernel object directory.
@@ -72,35 +81,43 @@
 # set by hand. These are as follows:
 
 # @ECLASS-VARIABLE: KV_FULL
+# @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # A read-only variable. It's a string containing the full kernel version. ie: 2.6.9-gentoo-johnm-r1
 
 # @ECLASS-VARIABLE: KV_MAJOR
+# @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # A read-only variable. It's an integer containing the kernel major version. ie: 2
 
 # @ECLASS-VARIABLE: KV_MINOR
+# @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # A read-only variable. It's an integer containing the kernel minor version. ie: 6
 
 # @ECLASS-VARIABLE: KV_PATCH
+# @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # A read-only variable. It's an integer containing the kernel patch version. ie: 9
 
 # @ECLASS-VARIABLE: KV_EXTRA
+# @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # A read-only variable. It's a string containing the kernel EXTRAVERSION. ie: -gentoo
 
 # @ECLASS-VARIABLE: KV_LOCAL
+# @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # A read-only variable. It's a string containing the kernel LOCALVERSION concatenation. ie: -johnm
 
 # @ECLASS-VARIABLE: KV_DIR
+# @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # A read-only variable. It's a string containing the kernel source directory, will be null if
 # KERNEL_DIR is invalid.
 
 # @ECLASS-VARIABLE: KV_OUT_DIR
+# @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # A read-only variable. It's a string containing the kernel object directory, will be KV_DIR unless
 # KBUILD_OUTPUT is used. This should be used for referencing .config.
@@ -113,11 +130,6 @@ EXPORT_FUNCTIONS pkg_setup
 
 IUSE="kernel_linux"
 
-# Overwritable environment Var's
-# ---------------------------------------
-KERNEL_DIR="${KERNEL_DIR:-${ROOT%/}/usr/src/linux}"
-
-
 # Bug fixes
 # fix to bug #75034
 case ${ARCH} in
diff --git a/eclass/perl-functions.eclass b/eclass/perl-functions.eclass
index 8633f384f1bf..4adba921485e 100644
--- a/eclass/perl-functions.eclass
+++ b/eclass/perl-functions.eclass
@@ -8,7 +8,7 @@
 # Seemant Kulleen <seemant@gentoo.org>
 # Andreas K. Huettel <dilfridge@gentoo.org>
 # Kent Fredric <kentnl@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
 # @BLURB: helper functions eclass for perl modules
 # @DESCRIPTION:
 # The perl-functions eclass is designed to allow easier installation of perl
@@ -19,7 +19,7 @@
 [[ ${CATEGORY} == "perl-core" ]] && inherit alternatives
 
 case "${EAPI:-0}" in
-	5|6|7)
+	5|6|7|8)
 		;;
 	*)
 		die "EAPI=${EAPI} is not supported by perl-functions.eclass"
@@ -134,7 +134,8 @@ perl_delete_emptybsdir() {
 perl_fix_permissions() {
 	debug-print-function $FUNCNAME "$@"
 	perl_set_version
-	fperms -R u+w "${D}"
+	einfo Fixing installed file permissions
+	fperms -R u+w /
 }
 
 # @FUNCTION: perl_fix_packlist
@@ -596,3 +597,31 @@ perl_domodule() {
 	insinto "/${target#/}"
 	doins "${doins_opts[@]}" "${files[@]}"
 }
+
+# @FUNCTION: perl_get_wikiurl
+# @DESCRIPTION:
+# Convenience helper for returning the Gentoo Wiki maintenance page URL of a
+# package. Optionally a suffix can be passed for an in-page anchor.
+#
+# Example:
+# @CODE
+# my_url="$(perl_get_wikiurl Testing)"
+# @CODE
+
+perl_get_wikiurl() {
+	debug-print-function $FUNCNAME "$@"
+
+	if [[ -z "${1}" ]]; then
+		echo "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}"
+	else
+		echo "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}#${1}"
+	fi
+}
+
+perl_get_wikiurl_features() {
+	perl_get_wikiurl Optional_Features
+}
+
+perl_get_wikiurl_tests() {
+	perl_get_wikiurl Testing
+}
diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 3f7e4100db07..6285e9363156 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Seemant Kulleen <seemant@gentoo.org>
 # Andreas K. Hüttel <dilfridge@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
 # @BLURB: eclass for installing Perl module distributions
 # @DESCRIPTION:
 # The perl-module eclass is designed to allow easier installation of Perl
@@ -27,6 +27,10 @@ case ${EAPI:-0} in
 		inherit multiprocessing perl-functions
 		PERL_EXPF="src_prepare src_configure src_compile src_test src_install"
 		;;
+	8)
+		inherit multiprocessing perl-functions readme.gentoo-r1
+		PERL_EXPF="src_prepare src_configure src_compile src_test src_install"
+		;;
 	*)
 		die "EAPI=${EAPI} is not supported by perl-module.eclass"
 		;;
@@ -99,7 +103,7 @@ case ${EAPI:-0} in
 
 		EXPORT_FUNCTIONS ${PERL_EXPF}
 		;;
-	7)
+	*)
 		[[ ${CATEGORY} == perl-core ]] && \
 			PERL_EXPF+=" pkg_postinst pkg_postrm"
 
@@ -126,9 +130,6 @@ case ${EAPI:-0} in
 
 		EXPORT_FUNCTIONS ${PERL_EXPF}
 		;;
-	*)
-		die "EAPI=${EAPI:-0} is not supported by perl-module.eclass"
-		;;
 esac
 
 LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}"
@@ -180,6 +181,25 @@ LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}"
 # a use-flag examples, if not you'll have to add the useflag in your ebuild.
 # Examples are installed only if the useflag examples exists and is activated.
 
+# @ECLASS-VARIABLE: DIST_WIKI
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# (EAPI=8 and later) This variable can be set to contain space-separated keywords
+# corresponding to article sections in a maintenance notes wiki article. If a
+# keyword is set, an ebuild phase can output a message and a link to the wiki.
+# Current keywords as of EAPI=8 are:
+# * features: Notes about additional dependencies for optional features
+# * tests:    Notes about additional dependencies and preparations needed for testing
+
+# @ECLASS-VARIABLE: DIST_MAKE
+# @DESCRIPTION:
+# (EAPI=8 and later) This Bash array contains parameters to the make call
+# from ExtUtils::MakeMaker. Replaces mymake in EAPI=7 and earlier.
+# Defaults to ( OPTIMIZE="${CFLAGS}" )
+if [[ $(declare -p DIST_MAKE 2>&-) != "declare -a DIST_MAKE="* ]]; then
+	DIST_MAKE=( OPTIMIZE="${CFLAGS}" )
+fi
+
 
 if [[ ${EAPI:-0} == 5 ]]; then
 	if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then
@@ -343,11 +363,18 @@ perl-module_src_compile() {
 	debug-print-function $FUNCNAME "$@"
 	perl_set_version
 
-	if [[ $(declare -p mymake 2>&-) != "declare -a mymake="* ]]; then
-		local mymake_local=(${mymake})
-	else
-		local mymake_local=("${mymake[@]}")
-	fi
+	case ${EAPI} in
+		5|6|7)
+			if [[ $(declare -p mymake 2>&-) != "declare -a mymake="* ]]; then
+				local mymake_local=(${mymake})
+			else
+				local mymake_local=("${mymake[@]}")
+			fi
+			;;
+		*)
+			local mymake_local=("${DIST_MAKE[@]}")
+			;;
+	esac
 
 	if [[ -f Build ]] ; then
 		./Build build \
@@ -396,7 +423,7 @@ perl-module_src_test() {
 	local my_test_control
 	local my_test_verbose
 
-	if [[ ${EAPI:-0} == 5 ]] ; then
+	if [[ ${EAPI} == 5 ]] ; then
 		my_test_control=${SRC_TEST}
 		my_test_verbose=${TEST_VERBOSE:-0}
 		if has 'do' ${my_test_control} || has 'parallel' ${my_test_control} ; then
@@ -434,6 +461,18 @@ perl-module_src_test() {
 		fi
 	fi
 
+	case ${EAPI} in
+		5|6|7)
+			;;
+		*)
+			if has 'tests' ${DIST_WIKI} ; then
+				ewarn "This package may require additional dependencies and/or preparation steps for"
+				ewarn "comprehensive testing. For details, see:"
+				ewarn "$(perl_get_wikiurl_tests)"
+			fi
+			;;
+	esac
+
 	perl_set_version
 	if [[ -f Build ]] ; then
 		./Build test verbose=${my_test_verbose} || die "test failed"
@@ -473,9 +512,17 @@ perl-module_src_install() {
 			|| die "emake ${myinst_local[@]} ${mytargets} failed"
 	fi
 
+	case ${EAPI} in
+		5|6|7)
+			;;
+		*)
+			perl_fix_permissions
+			;;
+	esac
+
 	perl_delete_module_manpages
 	perl_delete_localpod
-	if [[ ${EAPI:-0} == 5 ]] ; then
+	if [[ ${EAPI} == 5 ]] ; then
 		perl_delete_packlist
 	else
 		perl_fix_packlist
@@ -487,13 +534,29 @@ perl-module_src_install() {
 		[[ -s ${f} ]] && dodoc ${f}
 	done
 
-	if [[ ${EAPI:-0} != 5 ]] ; then
+	if [[ ${EAPI} != 5 ]] ; then
 		if in_iuse examples && use examples ; then
                         [[ ${#DIST_EXAMPLES[@]} -eq 0 ]] || perl_doexamples "${DIST_EXAMPLES[@]}"
 		fi
 	fi
 
 	perl_link_duallife_scripts
+
+	case ${EAPI} in
+		5|6|7)
+			;;
+		*)
+			if has 'features' ${DIST_WIKI} ; then
+				DISABLE_AUTOFORMATTING=yes
+				DOC_CONTENTS="This package may require additional dependencies and/or preparation steps for\n"
+				DOC_CONTENTS+="some optional features. For details, see\n"
+				DOC_CONTENTS+="$(perl_get_wikiurl_features)"
+				einfo
+				readme.gentoo_create_doc
+				readme.gentoo_print_elog
+			fi
+			;;
+	esac
 }
 
 # @FUNCTION: perl-module_pkg_postinst
diff --git a/eclass/readme.gentoo-r1.eclass b/eclass/readme.gentoo-r1.eclass
index dfa3b52b6765..69d0e1c5c6b4 100644
--- a/eclass/readme.gentoo-r1.eclass
+++ b/eclass/readme.gentoo-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: readme.gentoo-r1.eclass
@@ -6,7 +6,7 @@
 # Pacho Ramos <pacho@gentoo.org>
 # @AUTHOR:
 # Author: Pacho Ramos <pacho@gentoo.org>
-# @SUPPORTED_EAPIS: 4 5 6 7
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: install a doc file shown via elog messages
 # @DESCRIPTION:
 # An eclass for installing a README.gentoo doc file recording tips
@@ -21,10 +21,10 @@ if [[ -z ${_README_GENTOO_ECLASS} ]]; then
 _README_GENTOO_ECLASS=1
 
 case "${EAPI:-0}" in
-	0|1|2|3)
+	0|1|2|3|4|5)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5|6|7)
+	6|7|8)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"