gentoo resync : 13.11.2021

6 files changed, 8 insertions, 20 deletions

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 86fe927152c0..15a563a2ebcf 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 3513a74c4db4..d07dfac246a4 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -610,6 +610,8 @@ _distutils-r1_disable_ez_setup() {
 # @DESCRIPTION:
 # Generate setup.py for pyproject.toml if requested.
 _distutils-r1_handle_pyproject_toml() {
+	[[ ${DISTUTILS_USE_SETUPTOOLS} == manual ]] && return
+
 	if [[ ! -f setup.py && -f pyproject.toml ]]; then
 		if [[ ${DISTUTILS_USE_SETUPTOOLS} != pyproject.toml ]]; then
 			eerror "No setup.py found but pyproject.toml is present.  In order to enable"
@@ -890,8 +892,7 @@ distutils-r1_python_install() {
 	# python likes to compile any module it sees, which triggers sandbox
 	# failures if some packages haven't compiled their modules yet.
 	addpredict "${EPREFIX}/usr/lib/${EPYTHON}"
-	addpredict /usr/lib/pypy3.6
-	addpredict /usr/lib/pypy3.7
+	addpredict /usr/lib/pypy3.8
 	addpredict /usr/lib/portage/pym
 	addpredict /usr/local # bug 498232
 
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index c729651699dd..22e00c56815d 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -421,7 +421,7 @@ _python_export() {
 					pypy)
 						PYTHON_PKG_DEP='>=dev-python/pypy-7.3.0:0=';;
 					pypy3)
-						PYTHON_PKG_DEP='>=dev-python/pypy3-7.3.0:0=';;
+						PYTHON_PKG_DEP='>=dev-python/pypy3-7.3.7:0=';;
 					*)
 						die "Invalid implementation: ${impl}"
 				esac
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 573e3511daf7..7f88c292e536 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -558,7 +558,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}" sitelibdir="${ED}$(ruby_rbconfig_value 'sitelibdir')" -C ${extension%/*} install
 		done
 
 		# Add the marker to indicate that the extensions are installed
diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass
index c4fd0c492f45..20669c08b338 100644
--- a/eclass/savedconfig.eclass
+++ b/eclass/savedconfig.eclass
@@ -39,13 +39,6 @@ case ${EAPI} in
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-# @ECLASS-VARIABLE: _SAVEDCONFIG_CONFIGURATION_FILE
-# @DEFAULT_UNSET
-# @INTERNAL
-# @DESCRIPTION:
-# Path of configuration file, relative to /etc/portage/savedconfig,
-# restored by restore_config() and saved by save_config().
-
 # @FUNCTION: save_config
 # @USAGE: <config files to save>
 # @DESCRIPTION:
@@ -59,12 +52,7 @@ save_config() {
 	fi
 	[[ $# -eq 0 ]] && die "Usage: save_config <files>"
 
-	local configfile
-	if [[ -n ${_SAVEDCONFIG_CONFIGURATION_FILE} ]] ; then
-		configfile="/etc/portage/savedconfig/${_SAVEDCONFIG_CONFIGURATION_FILE}"
-	else
-		configfile="/etc/portage/savedconfig/${CATEGORY}/${PF}"
-	fi
+	local configfile="/etc/portage/savedconfig/${CATEGORY}/${PF}"
 
 	if [[ $# -eq 1 && -f $1 ]] ; then
 		# Just one file, so have the ${configfile} be that config file
@@ -125,7 +113,6 @@ restore_config() {
 		if [[ -r "${configfile}" ]] ; then
 			einfo "Found \"${configfile}\""
 			found=${configfile}
-			_SAVEDCONFIG_CONFIGURATION_FILE=${configfile#${base}/}
 			break
 		fi
 
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index 0431bb86377c..c7ee9fe3648d 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -33,8 +33,8 @@ VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.44}
 
 # @ECLASS-VARIABLE: VALA_MAX_API_VERSION
 # @DESCRIPTION:
-# Maximum vala API version (e.g. 0.52).
-VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.52}
+# Maximum vala API version (e.g. 0.54).
+VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.54}
 
 # @ECLASS-VARIABLE: VALA_USE_DEPEND
 # @DEFAULT_UNSET