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 @@

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

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

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

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
Comment: Robbat2 @ Orbis-Terrarum Networks - The text below is a digital signature. If it doesn't make any sense to you, ignore it.

iQKTBAABCgB9FiEEveu2pS8Vb98xaNkRGTlfI8WIJsQFAmFZYAVfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEJE RUJCNkE1MkYxNTZGREYzMTY4RDkxMTE5Mzk1RjIzQzU4ODI2QzQACgkQGTlfI8WI JsTIgw/8Dnc1ZzsNwjirnn8p+jsVrilIZSWZDzbAfigCCR+6y1HD9Uqggfr41Rox KxS4QpIq/40Sfi1mU23QQ1zOqt5ZTG6POEWJK+yfOydLQyVTHOJlJPfFA6cmhFUC Mg6TAswejbzYlc1h96dSCZbM7njJNTjpc9rBUqalbf1vy5v5h2tlygafE/4K/5JM TE+ix1SK5JXMU0H87lQLVLWweRovfsYGmd4IAM5Ml/PlhGJ3ud40dfagGMCTbd/z p0f7wla0XEqfFqZBdzJBLLrpxg1qbXYUqjYX8++clekWQBhlQ7Qbv8bZjSX+uUse ezf9HymCwZPSX+YRqA6bSBgxIc+QVxiRR/6LCZWJ8TebdivnfmDqkUfQgvWR0uD6 NEm9ysdaRKgNJf8VwkHG

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?

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

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

-----BEGIN PGP SIGNATURE-----

iQFDBAEBCAAtFiEEtDnZ1O9xIP68rzDbUYgzUIhBXi4FAmFZhlsPHHVsbUBnZW50 b28ub3JnAAoJEFGIM1CIQV4u7IcH/2DLz9ogUPOdbV+nWlok7G2ZW8kPPUrEU38a wsdaUAzIMIxZ53CZf96dfoibOes5v50NnQhHwKWKtLLtLyGzuiXv+46gfdv8Ei/o tgwDyRe/nyrHJgGf705iq2rKJKNSsCWBs9FrdL3l/ITxuGQoeWj6JYHoN22qkw1K 4XoCjiEHMCFCyHe1DO4V+u1SMamDY7Rs+vK4PXY6UVT/DEdZ9Vf+Ij3Z8ip1JREO V/Bq/yrB6j0aWLSq+G1wE8kcfSU1b3BsK6el3cXPUx7s+Pbb428gfqsBHMRPVDUi YQQGT5Mls7unIXHXJ3xjy1cJ6Le+637OAYbeXHgdUxv8JvSqkS4=
=qS+o
-----END PGP SIGNATURE-----

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

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

-----BEGIN PGP SIGNATURE-----

iQFDBAEBCAAtFiEEtDnZ1O9xIP68rzDbUYgzUIhBXi4FAmFZnl8PHHVsbUBnZW50 b28ub3JnAAoJEFGIM1CIQV4uYlAIAKee7fwmEy98eSRKBTwXXM2T9sGOvLjBfvX3 ug4LgH0nsx8SKs8zvcK9IAXRCuwqjzEt644RhMJX7N7AUKR3gOk884vGuD9mKnnA ZTXo+73tjeWXOPrkVyCqkp+qqFKtM30P96U778zqoLQk1gVksZzQXxvbonFRJpJg Q3hcLgK8I+sg9L+xV0PcbBgkN01Vc46rTWZ8TzCBEq0IAKXN3SQ1o/xTa0tu8hzi WZd98O7rPrJssooHya7kFh1mCJyHoPWieSsDpuAXDVv5jBlakkQQENsik5G3TtnJ R1EE22lRKPEkky998yTPFfizjY3dNIx5VsZImULODclNzwH5k9s=
=rPq8
-----END PGP SIGNATURE-----

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)