gentoo resync : 08.10.2021

5 files changed, 18 insertions, 17 deletions

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 7b000046d1e0..68860d4a2b3e 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 66d4686849db..95c92cc6df8c 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -112,7 +112,7 @@ if [[ -n ${WANT_LIBTOOL} ]] ; then
 fi
 
 # @ECLASS-VARIABLE: AUTOTOOLS_DEPEND
-# @INTERNAL
+# @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # Contains the combination of requested automake/autoconf/libtool
 # versions in *DEPEND format.
diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass
index a8e5ee4cc9a0..99b90cec6b54 100644
--- a/eclass/cvs.eclass
+++ b/eclass/cvs.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: cvs.eclass
 # @MAINTAINER:
 # vapier@gentoo.org (and anyone who wants to help)
-# @SUPPORTED_EAPIS: 4 5 6 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: This eclass provides generic cvs fetching functions
 # @DESCRIPTION:
 # This eclass provides the generic cvs fetching functions. To use this from an
@@ -16,6 +16,11 @@
 if [[ -z ${_CVS_ECLASS} ]]; then
 _CVS_ECLASS=1
 
+case ${EAPI} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
 # TODO:
 
 # Implement more auth types (gserver?, kserver?)
@@ -179,7 +184,7 @@ PROPERTIES+=" live"
 
 # add cvs to deps
 # ssh is used for ext auth
-DEPEND="dev-vcs/cvs"
+BDEPEND="dev-vcs/cvs"
 
 if [[ ${ECVS_AUTH} == "ext" ]] ; then
 	#default to ssh
@@ -187,16 +192,12 @@ if [[ ${ECVS_AUTH} == "ext" ]] ; then
 	if [[ ${CVS_RSH} != "ssh" ]] ; then
 		die "Support for ext auth with clients other than ssh has not been implemented yet"
 	fi
-	DEPEND+=" net-misc/openssh"
+	BDEPEND+=" net-misc/openssh"
 fi
 
-case ${EAPI:-0} in
-	4|5|6) ;;
-	7) BDEPEND="${DEPEND}"; DEPEND="" ;;
-	*) die "${ECLASS}: EAPI ${EAPI:-0} is not supported" ;;
-esac
-
-# called from cvs_src_unpack
+# @FUNCTION: cvs_fetch
+# @DESCRIPTION:
+# Fetch sources from a CVS repository.  Called from cvs_src_unpack.
 cvs_fetch() {
 	# Make these options local variables so that the global values are
 	# not affected by modifications in this function.
@@ -258,10 +259,10 @@ cvs_fetch() {
 		# just remove the last path element in the string)
 
 		debug-print "${FUNCNAME}: checkout mode. creating cvs directory"
-		addwrite /foobar
-		addwrite /
-		mkdir -p "/${ECVS_TOP_DIR}"
-		export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
+		(
+			addwrite /
+			mkdir -p "${ECVS_TOP_DIR}" || die "mkdir ${ECVS_TOP_DIR} failed"
+		)
 	fi
 
 	# In case ECVS_TOP_DIR is a symlink to a dir, get the real path,
diff --git a/eclass/dune.eclass b/eclass/dune.eclass
index 5e2c1fa1f7c4..02a8a870ef43 100644
--- a/eclass/dune.eclass
+++ b/eclass/dune.eclass
@@ -42,7 +42,7 @@ case ${EAPI:-0} in
 esac
 
 dune_src_compile() {
-	dune build @install || die
+	dune build @install --profile release || die
 }
 
 dune_src_test() {
diff --git a/eclass/gstreamer-meson.eclass b/eclass/gstreamer-meson.eclass
index 152a52b984f1..2e271c5cd4fa 100644
--- a/eclass/gstreamer-meson.eclass
+++ b/eclass/gstreamer-meson.eclass
@@ -13,8 +13,8 @@
 # zaheerm <zaheerm@gentoo.org>
 # Steven Newbury
 # @SUPPORTED_EAPIS: 7
-# @BLURB: Helps building core & split gstreamer plugins
 # @PROVIDES: meson multilib-minimal
+# @BLURB: Helps building core & split gstreamer plugins
 # @DESCRIPTION:
 # Eclass to make external gst-plugins emergable on a per-plugin basis
 # and to solve the problem with gst-plugins generating far too much