1 |
For some reason CVS_RSH wouldn't be set into cvs_src_unpack, app-shells/mksh |
2 |
is also the only ebuild in ::gentoo one using it with ECVS_AUTH="ext" |
3 |
|
4 |
I also removed EAPI-4 support as it's banned in ::gentoo |
5 |
|
6 |
Signed-off-by: Haelwenn (lanodan) Monnier <contact@×××××××××.me> |
7 |
--- |
8 |
eclass/cvs.eclass | 15 ++++++++------- |
9 |
1 file changed, 8 insertions(+), 7 deletions(-) |
10 |
|
11 |
diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass |
12 |
index a8e5ee4cc9a0..877ec2798112 100644 |
13 |
--- a/eclass/cvs.eclass |
14 |
+++ b/eclass/cvs.eclass |
15 |
@@ -4,7 +4,7 @@ |
16 |
# @ECLASS: cvs.eclass |
17 |
# @MAINTAINER: |
18 |
# vapier@g.o (and anyone who wants to help) |
19 |
-# @SUPPORTED_EAPIS: 4 5 6 7 |
20 |
+# @SUPPORTED_EAPIS: 5 6 7 |
21 |
# @BLURB: This eclass provides generic cvs fetching functions |
22 |
# @DESCRIPTION: |
23 |
# This eclass provides the generic cvs fetching functions. To use this from an |
24 |
@@ -182,16 +182,11 @@ PROPERTIES+=" live" |
25 |
DEPEND="dev-vcs/cvs" |
26 |
|
27 |
if [[ ${ECVS_AUTH} == "ext" ]] ; then |
28 |
- #default to ssh |
29 |
- [[ -z ${CVS_RSH} ]] && export CVS_RSH="ssh" |
30 |
- if [[ ${CVS_RSH} != "ssh" ]] ; then |
31 |
- die "Support for ext auth with clients other than ssh has not been implemented yet" |
32 |
- fi |
33 |
DEPEND+=" net-misc/openssh" |
34 |
fi |
35 |
|
36 |
case ${EAPI:-0} in |
37 |
- 4|5|6) ;; |
38 |
+ 5|6) ;; |
39 |
7) BDEPEND="${DEPEND}"; DEPEND="" ;; |
40 |
*) die "${ECLASS}: EAPI ${EAPI:-0} is not supported" ;; |
41 |
esac |
42 |
@@ -483,6 +478,12 @@ cvs_src_unpack() { |
43 |
|
44 |
[[ -z ${ECVS_MODULE} ]] && die "ERROR: CVS module not set, cannot continue." |
45 |
|
46 |
+ #default to ssh |
47 |
+ [[ -z ${CVS_RSH} ]] && export CVS_RSH="ssh" |
48 |
+ if [[ ${CVS_RSH} != "ssh" ]] ; then |
49 |
+ die "Support for ext auth with clients other than ssh has not been implemented yet" |
50 |
+ fi |
51 |
+ |
52 |
local ECVS_LOCALNAME=${ECVS_LOCALNAME:-${ECVS_MODULE}} |
53 |
|
54 |
local sanitized_pn=$(echo "${PN}" | LC_ALL=C sed -e 's:[^A-Za-z0-9_]:_:g') |
55 |
-- |
56 |
2.31.1 |