gentoo resync : 27.03.2021

11 files changed, 52 insertions, 60 deletions

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index ebbf98283f44..4251a6a3bb90 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/apache-module.eclass b/eclass/apache-module.eclass
index e192a7454277..4c88f14566a1 100644
--- a/eclass/apache-module.eclass
+++ b/eclass/apache-module.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: apache-module.eclass
 # @MAINTAINER:
-# apache-devs@gentoo.org
+# apache-bugs@gentoo.org
 # @BLURB: Provides a common set of functions for apache modules
 # @DESCRIPTION:
 # This eclass handles apache modules in a sane way.
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 08c72cd77953..4ae360aa24d4 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -447,7 +447,16 @@ eautopoint() {
 # use gettext directly.  So we have to copy it in manually since
 # we can't let `autopoint` do it for us.
 config_rpath_update() {
-	local dst src=$(type -P gettext | sed 's:bin/gettext:share/gettext/config.rpath:')
+	local dst src
+
+	case ${EAPI:-0} in
+		0|1|2|3|4|5|6)
+			src="${EPREFIX}/usr/share/gettext/config.rpath"
+			;;
+		*)
+			src="${BROOT}/usr/share/gettext/config.rpath"
+			;;
+	esac
 
 	[[ $# -eq 0 ]] && set -- $(find -name config.rpath)
 	[[ $# -eq 0 ]] && return 0
diff --git a/eclass/common-lisp-3.eclass b/eclass/common-lisp-3.eclass
index 5d5b68e6f105..334444e16326 100644
--- a/eclass/common-lisp-3.eclass
+++ b/eclass/common-lisp-3.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: common-lisp-3.eclass
@@ -136,7 +136,7 @@ common-lisp-install-one-asdf() {
 	[[ $# != 1 ]] && die "${FUNCNAME[0]} must receive exactly one argument"
 
 	# the suffix «.asd» is optional
-	local source=${1/.asd}.asd
+	local source=${1%.asd}.asd
 	common-lisp-install-one-source true "${source}" "$(dirname "${source}")"
 	local target="${CLSOURCEROOT%/}/${CLPACKAGE}/${source}"
 	dosym "${target}" "${CLSYSTEMROOT%/}/$(basename ${target})"
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 5aa552542680..a6ce217687b9 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.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: depend.apache.eclass
 # @MAINTAINER:
-# apache-devs@gentoo.org
+# apache-bugs@gentoo.org
 # @SUPPORTED_EAPIS: 0 2 3 4 5 6 7
 # @BLURB: Functions to allow ebuilds to depend on apache
 # @DESCRIPTION:
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index be8d0fa3b304..832fc19e4675 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -494,7 +494,7 @@ elisp-site-regen() {
 		mv "${T}"/site-gentoo.el "${sitelisp}"/site-gentoo.el
 		eend $? "elisp-site-regen: Replacing site-gentoo.el failed" || die
 		case ${#sflist[@]} in
-			0) [[ ${PN} = emacs-common-gentoo ]] \
+			0) [[ ${PN} = emacs-common ]] \
 				|| ewarn "... Huh? No site initialisation files found." ;;
 			1) einfo "... ${#sflist[@]} site initialisation file included." ;;
 			*) einfo "... ${#sflist[@]} site initialisation files included." ;;
diff --git a/eclass/font.eclass b/eclass/font.eclass
index e9e448a8155b..ec1b6ca93587 100644
--- a/eclass/font.eclass
+++ b/eclass/font.eclass
@@ -1,19 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: font.eclass
 # @MAINTAINER:
 # fonts@gentoo.org
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Eclass to make font installation uniform
 
 case ${EAPI:-0} in
-	[56]) inherit eutils ;;
 	7) ;;
 	*) die "EAPI ${EAPI} is not supported by font.eclass." ;;
 esac
 
 if [[ ! ${_FONT_ECLASS} ]]; then
+_FONT_ECLASS=1
 
 EXPORT_FUNCTIONS pkg_setup src_install pkg_postinst pkg_postrm
 
@@ -46,21 +46,12 @@ FONTDIR=${FONTDIR:-/usr/share/fonts/${FONT_PN}}
 # Array containing fontconfig conf files to install.
 FONT_CONF=( "" )
 
-# @ECLASS-VARIABLE: DOCS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Space delimited list of docs to install.
-# We always install these:
-# COPYRIGHT README{,.txt} NEWS AUTHORS BUGS ChangeLog FONTLOG.txt
-DOCS=${DOCS:-}
-
 if [[ ${CATEGORY}/${PN} != media-fonts/encodings ]]; then
 	IUSE="X"
-	DEPEND="X? (
+	BDEPEND="X? (
 			>=x11-apps/mkfontscale-1.2.0
 			media-fonts/encodings
 	)"
-	RDEPEND=""
 fi
 
 # @FUNCTION: font_xfont_config
@@ -70,14 +61,14 @@ font_xfont_config() {
 	local dir_name
 	if in_iuse X && use X ; then
 		dir_name="${1:-${FONT_PN}}"
-		rm -f "${ED%/}/${FONTDIR}/${1//${S}/}"/{fonts.{dir,scale},encodings.dir} \
+		rm -f "${ED}${FONTDIR}/${1//${S}/}"/{fonts.{dir,scale},encodings.dir} \
 			|| die "failed to prepare ${FONTDIR}/${1//${S}/}"
 		einfo "Creating fonts.scale & fonts.dir in ${dir_name##*/}"
-		mkfontscale "${ED%/}/${FONTDIR}/${1//${S}/}" || eerror "failed to create fonts.scale"
+		mkfontscale "${ED}${FONTDIR}/${1//${S}/}" || eerror "failed to create fonts.scale"
 		mkfontdir \
-			-e ${EPREFIX}/usr/share/fonts/encodings \
-			-e ${EPREFIX}/usr/share/fonts/encodings/large \
-			"${ED%/}/${FONTDIR}/${1//${S}/}" || eerror "failed to create fonts.dir"
+			-e "${EPREFIX}"/usr/share/fonts/encodings \
+			-e "${EPREFIX}"/usr/share/fonts/encodings/large \
+			"${ED}${FONTDIR}/${1//${S}/}" || eerror "failed to create fonts.dir"
 		[[ -e fonts.alias ]] && doins fonts.alias
 	fi
 }
@@ -137,7 +128,7 @@ font_cleanup_dirs() {
 			# if there's nothing left remove the directory
 			find "${d}" -maxdepth 0 -type d -empty -delete || eerror "failed to purge ${d}"
 		fi
-	done < <(find -L "${EROOT%/}"/usr/share/fonts/ -type d -print0)
+	done < <(find -L "${EROOT}"/usr/share/fonts/ -type d -print0)
 	eend 0
 }
 
@@ -148,8 +139,8 @@ font_cleanup_dirs() {
 font_pkg_setup() {
 	# make sure we get no collisions
 	# setup is not the nicest place, but preinst doesn't cut it
-	if [[ -e "${EROOT%/}/${FONTDIR}/fonts.cache-1" ]] ; then
-		rm "${EROOT%/}/${FONTDIR}/fonts.cache-1" || die "failed to remove fonts.cache-1"
+	if [[ -e "${EROOT}${FONTDIR}/fonts.cache-1" ]] ; then
+		rm "${EROOT}${FONTDIR}/fonts.cache-1" || die "failed to remove fonts.cache-1"
 	fi
 }
 
@@ -170,19 +161,6 @@ font_src_install() {
 			font_xfont_config "${dir}"
 			popd > /dev/null || die
 		done
-	elif [[ ${FONT_S/[[:space:]]} != "${FONT_S}" ]]; then
-		# backwards compatibility code, can be removed after 2021-02-14
-		eqawarn "Using a space-separated list for FONT_S is deprecated."
-		eqawarn "Use a bash array instead if there are multiple directories."
-		for dir in ${FONT_S}; do
-			pushd "${dir}" > /dev/null || die "pushd ${dir} failed"
-			insinto "${FONTDIR}/${dir//${S}/}"
-			for suffix in ${FONT_SUFFIX}; do
-				doins *.${suffix}
-			done
-			font_xfont_config "${dir}"
-			popd > /dev/null || die
-		done
 	else
 		pushd "${FONT_S:-${S}}" > /dev/null \
 			|| die "pushd ${FONT_S:-${S}} failed"
@@ -209,10 +187,10 @@ font_src_install() {
 # Updates fontcache if !prefix and media-libs/fontconfig installed
 _update_fontcache() {
 	# unreadable font files = fontconfig segfaults
-	find "${EROOT%/}"/usr/share/fonts/ -type f '!' -perm 0644 \
+	find "${EROOT}"/usr/share/fonts/ -type f '!' -perm 0644 \
 		-exec chmod -v 0644 2>/dev/null {} + || die "failed to fix font files perms"
 
-	if [[ -z ${ROOT%/} ]] ; then
+	if [[ -z ${ROOT} ]] ; then
 		if has_version media-libs/fontconfig ; then
 			ebegin "Updating global fontcache"
 			fc-cache -fs
@@ -236,7 +214,7 @@ font_pkg_postinst() {
 		elog "The following fontconfig configuration files have been installed:"
 		elog
 		for conffile in "${FONT_CONF[@]}"; do
-			[[ -e "${EROOT%/}"/etc/fonts/conf.avail/${conffile##*/} ]] &&
+			[[ -e "${EROOT}"/etc/fonts/conf.avail/${conffile##*/} ]] &&
 				elog "  ${conffile##*/}"
 		done
 		elog
@@ -254,5 +232,4 @@ font_pkg_postrm() {
 	_update_fontcache
 }
 
-_FONT_ECLASS=1
 fi
diff --git a/eclass/gnome.org.eclass b/eclass/gnome.org.eclass
index fd6077e4594c..281627859e86 100644
--- a/eclass/gnome.org.eclass
+++ b/eclass/gnome.org.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: gnome.org.eclass
@@ -45,8 +45,12 @@ fi
 # @ECLASS-VARIABLE: GNOME_ORG_PVP
 # @INTERNAL
 # @DESCRIPTION:
-# Major and minor numbers of the version number.
-: ${GNOME_ORG_PVP:=$(ver_cut 1-2)}
+# Components of the version number that correspond to a 6 month release.
+if ver_test -ge 40.0; then
+	: ${GNOME_ORG_PVP:=$(ver_cut 1)}
+else
+	: ${GNOME_ORG_PVP:=$(ver_cut 1-2)}
+fi
 
 SRC_URI="mirror://gnome/sources/${GNOME_ORG_MODULE}/${GNOME_ORG_PVP}/${GNOME_ORG_MODULE}-${PV}.tar.${GNOME_TARBALL_SUFFIX}"
 
diff --git a/eclass/oasis.eclass b/eclass/oasis.eclass
index 53cfbb87122e..a0b9a0a71153 100644
--- a/eclass/oasis.eclass
+++ b/eclass/oasis.eclass
@@ -1,6 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# @DEAD
 # @ECLASS: oasis.eclass
 # @MAINTAINER:
 # ML <ml@gentoo.org>
@@ -8,6 +9,7 @@
 # Original Author: Alexis Ballier <aballier@gentoo.org>
 # @SUPPORTED_EAPIS: 3 4 5
 # @BLURB: Provides common ebuild phases for oasis-based packages.
+# @DEPRECATED: Use opam.eclass, dune.eclass, or findlib.eclass (if necessary)
 # @DESCRIPTION:
 # Provides common ebuild phases for oasis-based packages.
 # Most of these packages will just have to inherit the eclass, set their
diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index 21f317fd34a2..f42f04915157 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.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: qmail.eclass
 # @MAINTAINER:
-# qmail-bugs@gentoo.org
+# Rolf Eike Beer <eike@sf-mail.de>
 # @BLURB: common qmail functions
 
 inherit flag-o-matic toolchain-funcs fixheadtails
diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass
index 9b37074d3b62..e1f77f0b7c2b 100644
--- a/eclass/wxwidgets.eclass
+++ b/eclass/wxwidgets.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: wxwidgets.eclass
@@ -22,6 +22,7 @@
 # wxGTK was built with.
 
 if [[ -z ${_WXWIDGETS_ECLASS} ]]; then
+_WXWIDGETS_ECLASS=1
 
 inherit flag-o-matic
 
@@ -80,7 +81,7 @@ esac
 # See: http://docs.wxwidgets.org/trunk/overview_debugging.html
 
 setup-wxwidgets() {
-	local wxtoolkit wxdebug wxconf
+	local w wxtoolkit wxdebug wxconf
 
 	[[ -z ${WX_GTK_VER} ]] \
 		&& die "WX_GTK_VER must be set before calling $FUNCNAME."
@@ -116,17 +117,17 @@ setup-wxwidgets() {
 	fi
 
 	wxconf="${wxtoolkit}-unicode-${wxdebug}${WX_GTK_VER}"
+	for w in "${CHOST:-${CBUILD}}-${wxconf}" "${wxconf}"; do
+		[[ -f ${ESYSROOT:-${EPREFIX}}/usr/$(get_libdir)/wx/config/${w} ]] && wxconf=${w} && break
+	done || die "Failed to find configuration ${wxconf}"
 
-	[[ ! -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf} ]] \
-		&& die "Failed to find configuration ${wxconf}"
-
-	export WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf}"
+	export WX_CONFIG="${ESYSROOT:-${EPREFIX}}/usr/$(get_libdir)/wx/config/${wxconf}"
 	export WX_ECLASS_CONFIG="${WX_CONFIG}"
 
-	echo
+	einfo
 	einfo "Requested wxWidgets:        ${WX_GTK_VER}"
 	einfo "Using wxWidgets:            ${wxconf}"
-	echo
+	einfo
 }
 
 case ${EAPI:-0} in
@@ -138,5 +139,4 @@ case ${EAPI:-0} in
 		;;
 esac
 
-_WXWIDGETS_ECLASS=1
 fi