[gentoo-dev] [PATCH 1/3] cvs.eclass: Support EAPI 8, drop EAPI 6 and older

[gentoo-dev] [PATCH 1/3] cvs.eclass: Support EAPI 8, drop EAPI 6 and older

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/cvs.eclass | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass
index a8e5ee4cc9a0..2868cb31f317 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,15 +192,9 @@ 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
 cvs_fetch() {
 	# Make these options local variables so that the global values are
-- 
2.33.0

[gentoo-dev] [PATCH 2/3] cvs.eclass: Don't rely on sandbox internals

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/cvs.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass
index 2868cb31f317..34c32a4a4190 100644
--- a/eclass/cvs.eclass
+++ b/eclass/cvs.eclass
@@ -257,10 +257,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,
-- 
2.33.0

[gentoo-dev] [PATCH 3/3] cvs.eclass: Fix eclass documentation

[Ulrich Müller]

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 eclass/cvs.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass
index 34c32a4a4190..99b90cec6b54 100644
--- a/eclass/cvs.eclass
+++ b/eclass/cvs.eclass
@@ -195,7 +195,9 @@ if [[ ${ECVS_AUTH} == "ext" ]] ; then
 	BDEPEND+=" net-misc/openssh"
 fi
 
-# 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.
-- 
2.33.0

Re: [gentoo-dev] [PATCH 1/3] cvs.eclass: Support EAPI 8, drop EAPI 6 and older

[Robin H. Johnson]

[-- Attachment #1: Type: text/plain, Size: 421 bytes --]

Can we verify the consumers of this eclass are indeed still using CVS in
the year 2021?

If they are not, I think it would be reasonable to consider removing CVS
from the tree on 2022/01/01.

-- 
Robin Hugh Johnson
Gentoo Linux: Dev, Infra Lead, Foundation Treasurer
E-Mail   : robbat2@gentoo.org
GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85
GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 1113 bytes --]

Re: [gentoo-dev] [PATCH 1/3] cvs.eclass: Support EAPI 8, drop EAPI 6 and older

[Ulrich Mueller]

[-- Attachment #1: Type: text/plain, Size: 407 bytes --]

>>>>> On Sun, 03 Oct 2021, Robin H Johnson wrote:

> If they are not, I think it would be reasonable to consider removing
> CVS from the tree on 2022/01/01.

I disagree. It is still useful as a package even if it hadn't any
reverse dependencies. For example, it is needed when doing conversions
of historical CVS repositories.

Also projects still use it; OpenBSD may be the most prominent example.

Ulrich

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]

Re: [gentoo-dev] [PATCH 1/3] cvs.eclass: Support EAPI 8, drop EAPI 6 and older

[David Seifert]

On Sun, 2021-10-03 at 12:30 +0200, Ulrich Mueller wrote:
> > > > > > On Sun, 03 Oct 2021, Robin H Johnson wrote:
> 
> > If they are not, I think it would be reasonable to consider removing
> > CVS from the tree on 2022/01/01.
> 
> I disagree. It is still useful as a package even if it hadn't any
> reverse dependencies. For example, it is needed when doing conversions
> of historical CVS repositories.
> 
> Also projects still use it; OpenBSD may be the most prominent example.
> 
> Ulrich

Those use cases don't necessitate keeping the eclass though?

Re: [gentoo-dev] [PATCH 1/3] cvs.eclass: Support EAPI 8, drop EAPI 6 and older

[Ulrich Mueller]

[-- Attachment #1: Type: text/plain, Size: 234 bytes --]

>>>>> On Sun, 03 Oct 2021, David Seifert wrote:

> Those use cases don't necessitate keeping the eclass though?

I don't see why possible removal of the eclass at some unknown time in
the future should block improving it now.

Ulrich

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]