gentoo resync : 16.09.2021

11 files changed, 58 insertions, 46 deletions

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index d3b01a95e0d0..bb556c30ed38 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 786f59636638..1326809a8bc1 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -460,7 +460,7 @@ distutils_enable_tests() {
 esetup.py() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	[[ -n ${EPYTHON} ]] || die "EPYTHON unset, invalid call context"
+	_python_check_EPYTHON
 
 	[[ ${BUILD_DIR} ]] && _distutils-r1_create_setup_cfg
 
@@ -743,6 +743,8 @@ _distutils-r1_copy_egg_info() {
 distutils-r1_python_compile() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	_python_check_EPYTHON
+
 	_distutils-r1_copy_egg_info
 
 	# distutils is parallel-capable since py3.5
@@ -821,6 +823,8 @@ distutils-r1_python_test() {
 		die "${FUNCNAME} can be only used after calling distutils_enable_tests"
 	fi
 
+	_python_check_EPYTHON
+
 	if [[ ${_DISTUTILS_TEST_INSTALL} ]]; then
 		distutils_install_for_testing
 	fi
@@ -860,6 +864,8 @@ distutils-r1_python_test() {
 distutils-r1_python_install() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	_python_check_EPYTHON
+
 	local root=${D%/}/_${EPYTHON}
 	[[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D%/}
 
diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
index 9587c33a12b6..ab1b865fda93 100644
--- a/eclass/haskell-cabal.eclass
+++ b/eclass/haskell-cabal.eclass
@@ -8,6 +8,7 @@
 # Original author: Andres Loeh <kosmikus@gentoo.org>
 # Original author: Duncan Coutts <dcoutts@gentoo.org>
 # @SUPPORTED_EAPIS: 6 7 8
+# @PROVIDES: ghc-package
 # @BLURB: for packages that make use of the Haskell Common Architecture for Building Applications and Libraries (cabal)
 # @DESCRIPTION:
 # Basic instructions:
diff --git a/eclass/kodi-addon.eclass b/eclass/kodi-addon.eclass
index fc2a7a8d8aa7..8cbbad9224fc 100644
--- a/eclass/kodi-addon.eclass
+++ b/eclass/kodi-addon.eclass
@@ -1,10 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: kodi-addon.eclass
 # @MAINTAINER:
 # candrews@gentoo.org
 # @SUPPORTED_EAPIS: 4 5 6 7
+# @PROVIDES: cmake cmake-utils
 # @BLURB: Helper for correct building and (importantly) installing Kodi addon packages.
 # @DESCRIPTION:
 # Provides a src_configure function for correct CMake configuration
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 4e08949a3854..9eae5ad589bb 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -205,9 +205,10 @@ getfilevar() {
 
 		# We use nonfatal because we want the caller to take care of things #373151
 		# Pass need-config= to make to avoid config check in kernel Makefile.
+		# Pass dot-config=0 to avoid the config check in kernels prior to 5.4.
 		[[ ${EAPI:-0} == [0123] ]] && nonfatal() { "$@"; }
 		echo -e "e:\\n\\t@echo \$(${1})\\ninclude ${basefname}" | \
-			nonfatal emake -C "${basedname}" M="${T}" need-config= ${BUILD_FIXES} -s -f - 2>/dev/null
+			nonfatal emake -C "${basedname}" M="${T}" dot-config=0 need-config= ${BUILD_FIXES} -s -f - 2>/dev/null
 
 		ARCH=${myARCH}
 	fi
@@ -629,34 +630,27 @@ get_running_version() {
 		die "${FUNCNAME}() called on non-Linux system, please fix the ebuild"
 	fi
 
-	KV_FULL=$(uname -r)
-
-	if [[ -f ${ROOT%/}/lib/modules/${KV_FULL}/source/Makefile && -f ${ROOT%/}/lib/modules/${KV_FULL}/build/Makefile ]]; then
-		KERNEL_DIR=$(readlink -f ${ROOT%/}/lib/modules/${KV_FULL}/source)
-		KBUILD_OUTPUT=$(readlink -f ${ROOT%/}/lib/modules/${KV_FULL}/build)
-		unset KV_FULL
-		get_version
-		return $?
-	elif [[ -f ${ROOT%/}/lib/modules/${KV_FULL}/source/Makefile ]]; then
-		KERNEL_DIR=$(readlink -f ${ROOT%/}/lib/modules/${KV_FULL}/source)
-		unset KV_FULL
-		get_version
-		return $?
-	elif [[ -f ${ROOT%/}/lib/modules/${KV_FULL}/build/Makefile ]]; then
-		KERNEL_DIR=$(readlink -f ${ROOT%/}/lib/modules/${KV_FULL}/build)
-		unset KV_FULL
-		get_version
-		return $?
-	else
-		# This handles a variety of weird kernel versions.  Make sure to update
-		# tests/linux-info_get_running_version.sh if you want to change this.
-		local kv_full=${KV_FULL//[-+_]*}
-		KV_MAJOR=$(ver_cut 1 ${kv_full})
-		KV_MINOR=$(ver_cut 2 ${kv_full})
-		KV_PATCH=$(ver_cut 3 ${kv_full})
-		KV_EXTRA="${KV_FULL#${KV_MAJOR}.${KV_MINOR}${KV_PATCH:+.${KV_PATCH}}}"
-		: ${KV_PATCH:=0}
+	local kv=$(uname -r)
+
+	if [[ -f ${ROOT%/}/lib/modules/${kv}/source/Makefile ]]; then
+		KERNEL_DIR=$(readlink -f "${ROOT%/}/lib/modules/${kv}/source")
+		if [[ -f ${ROOT%/}/lib/modules/${kv}/build/Makefile ]]; then
+			KBUILD_OUTPUT=$(readlink -f "${ROOT%/}/lib/modules/${kv}/build")
+		fi
+		get_version && return 0
 	fi
+
+	KV_FULL=${kv}
+
+	# This handles a variety of weird kernel versions.  Make sure to update
+	# tests/linux-info_get_running_version.sh if you want to change this.
+	local kv_full=${KV_FULL//[-+_]*}
+	KV_MAJOR=$(ver_cut 1 ${kv_full})
+	KV_MINOR=$(ver_cut 2 ${kv_full})
+	KV_PATCH=$(ver_cut 3 ${kv_full})
+	KV_EXTRA="${KV_FULL#${KV_MAJOR}.${KV_MINOR}${KV_PATCH:+.${KV_PATCH}}}"
+	: ${KV_PATCH:=0}
+
 	return 0
 }
 
diff --git a/eclass/mercurial.eclass b/eclass/mercurial.eclass
index 5d0ebf0d9e4f..e984da08e330 100644
--- a/eclass/mercurial.eclass
+++ b/eclass/mercurial.eclass
@@ -61,7 +61,7 @@ BDEPEND="dev-vcs/mercurial"
 # between several ebuilds.
 [[ -z "${EHG_PROJECT}" ]] && EHG_PROJECT="${PN}"
 
-# @ECLASS-VARIABLE: EGIT_CHECKOUT_DIR
+# @ECLASS-VARIABLE: EHG_CHECKOUT_DIR
 # @DESCRIPTION:
 # The directory to check the hg sources out to.
 #
diff --git a/eclass/php-ext-pecl-r3.eclass b/eclass/php-ext-pecl-r3.eclass
index ccb4bcfc83da..0d1485aa1f7f 100644
--- a/eclass/php-ext-pecl-r3.eclass
+++ b/eclass/php-ext-pecl-r3.eclass
@@ -5,6 +5,7 @@
 # @MAINTAINER:
 # Gentoo PHP team <php-bugs@gentoo.org>
 # @SUPPORTED_EAPIS: 6 7
+# @PROVIDES: php-ext-source-r3
 # @BLURB: A uniform way to install PECL extensions
 # @DESCRIPTION:
 # This eclass should be used by all dev-php/pecl-* ebuilds as a uniform
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 4fedf939c779..c729651699dd 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1250,6 +1250,16 @@ build_sphinx() {
 	HTML_DOCS+=( "${dir}/_build/html/." )
 }
 
+# @FUNCTION: _python_check_EPYTHON
+# @INTERNAL
+# @DESCRIPTION:
+# Check if EPYTHON is set, die if not.
+_python_check_EPYTHON() {
+	if [[ -z ${EPYTHON} ]]; then
+		die "EPYTHON unset, invalid call context"
+	fi
+}
+
 # @VARIABLE: EPYTEST_DESELECT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -1279,7 +1289,7 @@ build_sphinx() {
 epytest() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	[[ -n ${EPYTHON} ]] || die "EPYTHON unset, invalid call context"
+	_python_check_EPYTHON
 
 	local args=(
 		# verbose progress reporting and tracebacks
@@ -1322,7 +1332,7 @@ epytest() {
 eunittest() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	[[ -n ${EPYTHON} ]] || die "EPYTHON unset, invalid call context"
+	_python_check_EPYTHON
 
 	set -- "${EPYTHON}" -m unittest_or_fail discover -v "${@}"
 
diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass
index 48121bf1d2a1..906d76843574 100644
--- a/eclass/ros-catkin.eclass
+++ b/eclass/ros-catkin.eclass
@@ -7,6 +7,7 @@
 # @AUTHOR:
 # Alexis Ballier <aballier@gentoo.org>
 # @SUPPORTED_EAPIS: 7
+# @PROVIDES: cmake python-single-r1
 # @BLURB: Template eclass for catkin based ROS packages.
 # @DESCRIPTION:
 # Provides function for building ROS packages on Gentoo.
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index ac9c117c0c02..6b3c0c25eaa2 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -116,7 +116,7 @@ _ruby_get_all_impls() {
 	for i in ${USE_RUBY}; do
 		case ${i} in
 			# removed implementations
-			ruby19|ruby20|ruby21|ruby22|ruby23|ruby24|jruby)
+			ruby19|ruby20|ruby21|ruby22|ruby23|ruby24|ruby25|jruby)
 				;;
 			*)
 				echo ${i};;
diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
index 36945be3cd65..9d01fd10f50f 100644
--- a/eclass/ssl-cert.eclass
+++ b/eclass/ssl-cert.eclass
@@ -6,7 +6,7 @@
 # maintainer-needed@gentoo.org
 # @AUTHOR:
 # Max Kalika <max@gentoo.org>
-# @SUPPORTED_EAPIS: 1 2 3 4 5 6 7
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: Eclass for SSL certificates
 # @DESCRIPTION:
 # This eclass implements a standard installation procedure for installing
@@ -14,18 +14,14 @@
 # @EXAMPLE:
 # "install_cert /foo/bar" installs ${ROOT}/foo/bar.{key,csr,crt,pem}
 
-# Guard against unsupported EAPIs.  We need EAPI >= 1 for slot dependencies.
-case "${EAPI:-0}" in
-	0)
-		die "${ECLASS}.eclass: EAPI=0 is not supported.  Please upgrade to EAPI >= 1."
-		;;
-	1|2|3|4|5|6|7)
-		;;
-	*)
-		die "${ECLASS}.eclass: EAPI=${EAPI} is not supported yet."
-		;;
+case "${EAPI}" in
+	6|7|8) ;;
+	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
+if [[ ! ${_SSL_CERT_ECLASS} ]]; then
+_SSL_CERT_ECLASS=1
+
 # @ECLASS-VARIABLE: SSL_CERT_MANDATORY
 # @PRE_INHERIT
 # @DESCRIPTION:
@@ -53,7 +49,7 @@ if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then
 	fi
 
 	case "${EAPI}" in
-		1|2|3|4|5|6)
+		6)
 			DEPEND="${SSL_DEPEND}"
 		;;
 		*)
@@ -283,3 +279,5 @@ install_cert() {
 		ewarn "Some requested certificates were not generated"
 	fi
 }
+
+fi