1 |
commit: 6f4ad17babcf9171b7c8ab4f97c6d231c8359b5c |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 22 08:46:32 2022 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 28 17:58:55 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f4ad17b |
7 |
|
8 |
subversion.eclass: Drop support for EAPIs 4 and 5 |
9 |
|
10 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
11 |
|
12 |
eclass/subversion.eclass | 85 +++--------------------------------------------- |
13 |
1 file changed, 5 insertions(+), 80 deletions(-) |
14 |
|
15 |
diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass |
16 |
index aa1a5c355877..2a2297678ad1 100644 |
17 |
--- a/eclass/subversion.eclass |
18 |
+++ b/eclass/subversion.eclass |
19 |
@@ -1,4 +1,4 @@ |
20 |
-# Copyright 1999-2021 Gentoo Authors |
21 |
+# Copyright 1999-2022 Gentoo Authors |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
# @ECLASS: subversion.eclass |
25 |
@@ -6,16 +6,15 @@ |
26 |
# Akinori Hattori <hattya@g.o> |
27 |
# @AUTHOR: |
28 |
# Original Author: Akinori Hattori <hattya@g.o> |
29 |
-# @SUPPORTED_EAPIS: 4 5 6 7 |
30 |
+# @SUPPORTED_EAPIS: 6 7 |
31 |
# @BLURB: Fetch software sources from subversion repositories |
32 |
# @DESCRIPTION: |
33 |
-# The subversion eclass provides functions to fetch, patch and bootstrap |
34 |
-# software sources from subversion repositories. |
35 |
+# The subversion eclass provides functions to fetch software sources |
36 |
+# from subversion repositories. |
37 |
|
38 |
ESVN="${ECLASS}" |
39 |
|
40 |
case ${EAPI} in |
41 |
- 4|5) inherit eutils ;; |
42 |
6|7) inherit estack ;; |
43 |
*) die "${ESVN}: EAPI ${EAPI:-0} is not supported" ;; |
44 |
esac |
45 |
@@ -27,7 +26,7 @@ DEPEND=" |
46 |
net-misc/rsync" |
47 |
|
48 |
case ${EAPI} in |
49 |
- 4|5|6) ;; |
50 |
+ 6) ;; |
51 |
*) BDEPEND="${DEPEND}"; DEPEND="" ;; |
52 |
esac |
53 |
|
54 |
@@ -117,24 +116,6 @@ ESVN_PASSWORD="${ESVN_PASSWORD:-}" |
55 |
# default: ${PN/-svn}. |
56 |
ESVN_PROJECT="${ESVN_PROJECT:-${PN/-svn}}" |
57 |
|
58 |
-# @ECLASS-VARIABLE: ESVN_BOOTSTRAP |
59 |
-# @DESCRIPTION: |
60 |
-# Bootstrap script or command like autogen.sh or etc.. |
61 |
-# Removed in EAPI 6 and later. |
62 |
-ESVN_BOOTSTRAP="${ESVN_BOOTSTRAP:-}" |
63 |
- |
64 |
-# @ECLASS-VARIABLE: ESVN_PATCHES |
65 |
-# @DESCRIPTION: |
66 |
-# subversion eclass can apply patches in subversion_bootstrap(). |
67 |
-# you can use regexp in this variable like *.diff or *.patch or etc. |
68 |
-# NOTE: patches will be applied before ESVN_BOOTSTRAP is processed. |
69 |
-# |
70 |
-# Patches are searched both in ${PWD} and ${FILESDIR}, if not found in either |
71 |
-# location, the installation dies. |
72 |
-# |
73 |
-# Removed in EAPI 6 and later, use PATCHES instead. |
74 |
-ESVN_PATCHES="${ESVN_PATCHES:-}" |
75 |
- |
76 |
# @ECLASS-VARIABLE: ESVN_RESTRICT |
77 |
# @DESCRIPTION: |
78 |
# this should be a space delimited list of subversion eclass features to |
79 |
@@ -363,50 +344,6 @@ subversion_fetch() { |
80 |
echo |
81 |
} |
82 |
|
83 |
-# @FUNCTION: subversion_bootstrap |
84 |
-# @DESCRIPTION: |
85 |
-# Apply patches in ${ESVN_PATCHES} and run ${ESVN_BOOTSTRAP} if specified. |
86 |
-# Removed in EAPI 6 and later. |
87 |
-subversion_bootstrap() { |
88 |
- [[ ${EAPI} == [012345] ]] || die "${FUNCNAME} is removed from subversion.eclass in EAPI 6 and later" |
89 |
- |
90 |
- if has "export" ${ESVN_RESTRICT}; then |
91 |
- return |
92 |
- fi |
93 |
- |
94 |
- cd "${S}" |
95 |
- |
96 |
- if [[ -n ${ESVN_PATCHES} ]]; then |
97 |
- local patch fpatch |
98 |
- einfo "apply patches -->" |
99 |
- for patch in ${ESVN_PATCHES}; do |
100 |
- if [[ -f ${patch} ]]; then |
101 |
- epatch "${patch}" |
102 |
- else |
103 |
- for fpatch in ${FILESDIR}/${patch}; do |
104 |
- if [[ -f ${fpatch} ]]; then |
105 |
- epatch "${fpatch}" |
106 |
- else |
107 |
- die "${ESVN}: ${patch} not found" |
108 |
- fi |
109 |
- done |
110 |
- fi |
111 |
- done |
112 |
- echo |
113 |
- fi |
114 |
- |
115 |
- if [[ -n ${ESVN_BOOTSTRAP} ]]; then |
116 |
- einfo "begin bootstrap -->" |
117 |
- if [[ -f ${ESVN_BOOTSTRAP} && -x ${ESVN_BOOTSTRAP} ]]; then |
118 |
- einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}" |
119 |
- eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP." |
120 |
- else |
121 |
- einfo " bootstrap with command: ${ESVN_BOOTSTRAP}" |
122 |
- eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP." |
123 |
- fi |
124 |
- fi |
125 |
-} |
126 |
- |
127 |
# @FUNCTION: subversion_wc_info |
128 |
# @USAGE: [repo_uri] |
129 |
# @RETURN: ESVN_WC_URL, ESVN_WC_ROOT, ESVN_WC_UUID, ESVN_WC_REVISION and ESVN_WC_PATH |
130 |
@@ -440,15 +377,6 @@ subversion_src_unpack() { |
131 |
subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch." |
132 |
} |
133 |
|
134 |
-# @FUNCTION: subversion_src_prepare |
135 |
-# @DESCRIPTION: |
136 |
-# Default src_prepare. Bootstrap. |
137 |
-# Removed in EAPI 6 and later. |
138 |
-subversion_src_prepare() { |
139 |
- [[ ${EAPI} == [012345] ]] || die "${FUNCNAME} is removed from subversion.eclass in EAPI 6 and later" |
140 |
- subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap." |
141 |
-} |
142 |
- |
143 |
# @FUNCTION: subversion_pkg_preinst |
144 |
# @USAGE: [repo_uri] |
145 |
# @DESCRIPTION: |
146 |
@@ -537,6 +465,3 @@ subversion__get_peg_revision() { |
147 |
} |
148 |
|
149 |
EXPORT_FUNCTIONS src_unpack pkg_preinst |
150 |
-if [[ ${EAPI} == [45] ]]; then |
151 |
- EXPORT_FUNCTIONS src_prepare |
152 |
-fi |