1 |
commit: c92811771479b3c770773ce6aae3e07d5c4c438f |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 17 09:48:09 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 17 09:48:09 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9281177 |
7 |
|
8 |
dev-vcs/git: Removed old |
9 |
|
10 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
dev-vcs/git/Manifest | 3 - |
14 |
.../git/files/git-2.18.0_rc1-optional-cvs.patch | 460 ------------- |
15 |
dev-vcs/git/git-2.21.1.ebuild | 715 --------------------- |
16 |
3 files changed, 1178 deletions(-) |
17 |
|
18 |
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest |
19 |
index 8ff76e98a4d..f0a5ec6b8b0 100644 |
20 |
--- a/dev-vcs/git/Manifest |
21 |
+++ b/dev-vcs/git/Manifest |
22 |
@@ -1,14 +1,11 @@ |
23 |
-DIST git-2.21.1.tar.xz 5496840 BLAKE2B 8b61c5ca8940422238e48931b502f2a876e20181e66232fbd8a7311969c27c862524b384792d4a35a61c33ba3297c90e6df5febf3a820281eaab00233f48b02c SHA512 c4f1930effe4b7cddbdc3a5ea0f1503683089d5dfdae491dd7f752f35b655b31fbef569a993ef412962cf9c74a225eafe095f792d493f37b20789e5c643261a1 |
24 |
DIST git-2.23.1.tar.xz 5713672 BLAKE2B 50db7bafbadcefbc5a56db478ea0464d289c45190a0454e0b8f3d99d48e6251071482df0240ee1ee8a1f733c91e9e46d34794bca8ca70d3c4ecc3b5da6d5d529 SHA512 708f8b9a7c65c1c9d3117b1b7ee9383044b66fe8a5c168a52ba561985670f659d514aa34988ea8ba85c127da6a23c39c511919a6d661bffc9cf782e30fd62373 |
25 |
DIST git-2.24.1.tar.xz 5772304 BLAKE2B 45e49325221cd0407968b4e2ff7bcab7ea021863119ae29fec5c7a9ff10461b5af0ea05f587647c7d4965c38e25f1140f194be72ff5f1bea8851c0485effbfa2 SHA512 010c13d4023c142876d0e075a394b74bef422944d8ca602325d0b2b47bf28b1d534283c7f295751113c83fdfcc0c91f97090e8f906560d44b04a94607fd8fcf7 |
26 |
DIST git-2.25.0.tar.xz 5873532 BLAKE2B 7e9e54677ac3c4d3295e9f92ba7e3f7f5b33620d6d0fb8105d5e57d609fe3ee499d1c1bc4a6d8832927a28f4948f4466a6ca4edf996b8a324279f91d25627660 SHA512 8bbada0451fe0a3314e1b9a43a74135115449aa41f5b3e7f960279e4a7fe6069c36e78825fc4b60d06806e3a6fa8158f327cb8a3801686ac22a35e3704244191 |
27 |
DIST git-2.25.1.tar.xz 5875548 BLAKE2B 582da3d4ac996d7b9ce6cf505661496ab1a2cd061f058745350498121956b33d79739b567fb5fea0b4e298303261256034aa0b8da0b842feab04ae67a7d5b142 SHA512 15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344 |
28 |
-DIST git-htmldocs-2.21.1.tar.xz 1236408 BLAKE2B 173892327d27d918cc0a15e982145d5f0f638deeda56be1cbf16c953b7b3454555ecf3e708c6117b1d4e781ca332199457d9c5b619c91735e0c6e85449be528f SHA512 41819a75656afab0fd56407e7141c8176b708099546cdc7cdc5e765a35401e1148a7165c41bc12a68e124335532450748b27cc3f8c0e372d596f27a992e23e95 |
29 |
DIST git-htmldocs-2.23.1.tar.xz 1296144 BLAKE2B 5be4a8afdd79234d220c119b8a4239e640486dc52236d980d08e6b3cad1be61b683c0e3dff6bdd67035a1e23f1d07858d3344f9f2ae90b44188395f34c22fea4 SHA512 c005be3baf129c9320893270d1d3b69e01546a29d482d29e5bc7baefbaab33e45d877c5c09e47312bbdb8b3dfcff27735c2427dcae9eb21fd3500ec30e214ae1 |
30 |
DIST git-htmldocs-2.24.1.tar.xz 1307992 BLAKE2B 80b39d2fcf47d20a584109572414ff8d275245afb80c3946e2fa62346fdaee3b1c873a0dccfb44af52290756d26d5e53021a1bf1ace7ada34e50e03244f05e92 SHA512 4da610ba1ee307e4f53414e324ef63ab25cf3945a74bf813aeacd4cf714710eab31776c2402c9567f1a3805e3d8576a158c78a72722c0178fb7c2dec2dcebf5a |
31 |
DIST git-htmldocs-2.25.0.tar.xz 1293644 BLAKE2B 8966e7d57701543770a589aef4a4bb8e673c22987330095431da6cc6cff023f8e288ba13a43d388d9b6e4fb92bed5baaa983c72124f440ef9e6c966b03d920a4 SHA512 67e8c2cc458d81870c901b720800a49cf605b3815c63af91328419a1e543e296b348bd8f7126a4a3cefcb8e2e2c7b713bcfc38ee945c224bd34bbd1c3e4f45b2 |
32 |
DIST git-htmldocs-2.25.1.tar.xz 1295708 BLAKE2B 18a274e5eb48030f50c0f38cbcc81b0e65c55ea6b702a9cc4f231c274faf0247c4fdaccde2d348717826d1bd914fe62b387946ae63aba64ba032c43898529f7a SHA512 f261cf72a7b59277666c543d2b40cc9e37ae6d4925616dcb448325e69c59efdee9db151a0d509545d5b366d82fe1196ece289197c02c65ae5f8c91526d49b0fb |
33 |
-DIST git-manpages-2.21.1.tar.xz 440316 BLAKE2B 658232d29bbca3b55a6797d5008f2f6f82d0c04d22ae5af8c689d8cb00e35bfbbccf658d269b96dd868cf3e1cf8f3304eb97cfee428ff8c762f914d1cde4e4f4 SHA512 1a687e4cb2dc90854067b164d6142b88205ba40dbc283432296afafde4370afc900096c5aedc9a7a959b8aa910196d42c399c5c4eed7e2f1ce0f98d8005f3581 |
34 |
DIST git-manpages-2.23.1.tar.xz 448432 BLAKE2B 0de4b2c0dcc3a70188a66d8aa6e16aeaad84a9f16b764934b06f61773db2d5141cc0b1091780d126f29a1f50c767a54fbb7d01a36f86d387d8ccb4060f48156e SHA512 16145c0c2215ce6a3aa9045f35f670258f6823a765ed2feec680ed980420d1bb008fc39d8f379c81cd0b259fc582d15e42395d4f954171b20bcf214ab25e41d7 |
35 |
DIST git-manpages-2.24.1.tar.xz 453752 BLAKE2B 51a549099205341bfec5a7998e5f66e9fc78ffd05fd04e745401a8bcc5bffcb64f26a64c7e24c9822bc2d62d000ea2b13779ffe19f065124a8e42b306fb5a2d3 SHA512 ee1e70fdbfc6eae97dc3b3180fa119b0d1189db7cae3e45b8baa9311d0c1162a5b46824a785e91288522a9fd00b8e4ff07590f4e4722a08955d6a9d048cc3a90 |
36 |
DIST git-manpages-2.25.0.tar.xz 456636 BLAKE2B 672557d167b7d2ff48089bc5be1fa446f25eed4412d6e48549d5907f7addab9f721a03a8bcb7ca3fb1804220021566ebac549d9878df9f1030f283ed5e44ddf3 SHA512 3ad1756b1f12898823a8981e3b650f588c6c1fb2d51371739c754108e67c2cd13e4d2bcb8291534523eac60e7a05253d4ddf2f3528e28d4e1b50eafa42168847 |
37 |
|
38 |
diff --git a/dev-vcs/git/files/git-2.18.0_rc1-optional-cvs.patch b/dev-vcs/git/files/git-2.18.0_rc1-optional-cvs.patch |
39 |
deleted file mode 100644 |
40 |
index 2e213c00522..00000000000 |
41 |
--- a/dev-vcs/git/files/git-2.18.0_rc1-optional-cvs.patch |
42 |
+++ /dev/null |
43 |
@@ -1,460 +0,0 @@ |
44 |
-From 7b0d0d066a5f869f86f2be125d63ae98c1451feb Mon Sep 17 00:00:00 2001 |
45 |
-From: Robin Johnson <robbat2@g.o> |
46 |
-Date: Wed, 6 Jun 2018 16:25:13 +0200 |
47 |
-Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface |
48 |
- utilities |
49 |
- |
50 |
-Forward-ported from 1.7.12 to current git.git v1.8.4 |
51 |
-Forward-ported from v1.8.4 to v1.8.5.1 |
52 |
-Forward-ported from v1.8.5.3 to v1.9.0_rc3 |
53 |
-Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0 |
54 |
-Forward-ported from v2.0.0_rc0 to v2.0.0 |
55 |
-Forward-ported from v2.0.0 to v2.2.2 |
56 |
-Forward-ported from v2.2.2 to v2.8.4 |
57 |
-Forward-ported from v2.8.4 to v2.10.0 |
58 |
-Forward-ported from v2.10.0 to v2.12.0 |
59 |
-Forward-ported from v2.12.0 to v2.17.0-rc1 |
60 |
-Forward-ported from v2.17.0-rc1 to v2.18.0-rc1 |
61 |
- |
62 |
-Signed-off-by: Lars Wendler <polynomial-c@g.o> |
63 |
---- |
64 |
- Makefile | 49 ++++++++++++++++++++++-------- |
65 |
- t/t9200-git-cvsexportcommit.sh | 5 +++ |
66 |
- t/t9400-git-cvsserver-server.sh | 8 ++++- |
67 |
- t/t9401-git-cvsserver-crlf.sh | 15 ++++++--- |
68 |
- t/t9600-cvsimport.sh | 41 ++++++++++++++++--------- |
69 |
- t/t9601-cvsimport-vendor-branch.sh | 11 +++++++ |
70 |
- t/t9602-cvsimport-branches-tags.sh | 11 +++++++ |
71 |
- t/t9603-cvsimport-patchsets.sh | 11 +++++++ |
72 |
- t/test-lib.sh | 1 + |
73 |
- 9 files changed, 119 insertions(+), 33 deletions(-) |
74 |
- |
75 |
-diff --git a/Makefile b/Makefile |
76 |
-index 1d27f36365..b30a14e263 100644 |
77 |
---- a/Makefile |
78 |
-+++ b/Makefile |
79 |
-@@ -312,6 +312,8 @@ all:: |
80 |
- # Define SANE_TEXT_GREP to "-a" if you use recent versions of GNU grep |
81 |
- # and egrep that are pickier when their input contains non-ASCII data. |
82 |
- # |
83 |
-+# Define NO_CVS if you do not want any CVS interface utilities. |
84 |
-+# |
85 |
- # The TCL_PATH variable governs the location of the Tcl interpreter |
86 |
- # used to optimize git-gui for your system. Only used if NO_TCLTK |
87 |
- # is not set. Defaults to the bare 'tclsh'. |
88 |
-@@ -589,6 +591,7 @@ LIB_OBJS = |
89 |
- PROGRAM_OBJS = |
90 |
- PROGRAMS = |
91 |
- SCRIPT_PERL = |
92 |
-+SCRIPT_PERL_CVS = |
93 |
- SCRIPT_PYTHON = |
94 |
- SCRIPT_SH = |
95 |
- SCRIPT_LIB = |
96 |
-@@ -626,12 +629,13 @@ SCRIPT_LIB += git-sh-i18n |
97 |
- |
98 |
- SCRIPT_PERL += git-add--interactive.perl |
99 |
- SCRIPT_PERL += git-archimport.perl |
100 |
--SCRIPT_PERL += git-cvsexportcommit.perl |
101 |
--SCRIPT_PERL += git-cvsimport.perl |
102 |
--SCRIPT_PERL += git-cvsserver.perl |
103 |
- SCRIPT_PERL += git-send-email.perl |
104 |
- SCRIPT_PERL += git-svn.perl |
105 |
- |
106 |
-+SCRIPT_PERL_CVS += git-cvsexportcommit.perl |
107 |
-+SCRIPT_PERL_CVS += git-cvsimport.perl |
108 |
-+SCRIPT_PERL_CVS += git-cvsserver.perl |
109 |
-+ |
110 |
- SCRIPT_PYTHON += git-p4.py |
111 |
- |
112 |
- NO_INSTALL += git-remote-testgit |
113 |
-@@ -639,24 +643,26 @@ NO_INSTALL += git-remote-testgit |
114 |
- # Generated files for scripts |
115 |
- SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH)) |
116 |
- SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL)) |
117 |
-+SCRIPT_PERL_CVS_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL_CVS)) |
118 |
- SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON)) |
119 |
- |
120 |
- SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN)) |
121 |
- SCRIPT_PERL_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_GEN)) |
122 |
-+SCRIPT_PERL_CVS_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_CVS_GEN)) |
123 |
- SCRIPT_PYTHON_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PYTHON_GEN)) |
124 |
- |
125 |
- # Individual rules to allow e.g. |
126 |
- # "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script" |
127 |
- # from subdirectories like contrib/*/ |
128 |
- .PHONY: build-perl-script build-sh-script build-python-script |
129 |
--build-perl-script: $(SCRIPT_PERL_GEN) |
130 |
-+build-perl-script: $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) |
131 |
- build-sh-script: $(SCRIPT_SH_GEN) |
132 |
- build-python-script: $(SCRIPT_PYTHON_GEN) |
133 |
- |
134 |
- .PHONY: install-perl-script install-sh-script install-python-script |
135 |
- install-sh-script: $(SCRIPT_SH_INS) |
136 |
- $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' |
137 |
--install-perl-script: $(SCRIPT_PERL_INS) |
138 |
-+install-perl-script: $(SCRIPT_PERL_INS) $(SCRIPT_PERL_CVS_INS) |
139 |
- $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' |
140 |
- install-python-script: $(SCRIPT_PYTHON_INS) |
141 |
- $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' |
142 |
-@@ -665,12 +671,13 @@ install-python-script: $(SCRIPT_PYTHON_INS) |
143 |
- clean-sh-script: |
144 |
- $(RM) $(SCRIPT_SH_GEN) |
145 |
- clean-perl-script: |
146 |
-- $(RM) $(SCRIPT_PERL_GEN) |
147 |
-+ $(RM) $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) |
148 |
- clean-python-script: |
149 |
- $(RM) $(SCRIPT_PYTHON_GEN) |
150 |
- |
151 |
- SCRIPTS = $(SCRIPT_SH_INS) \ |
152 |
- $(SCRIPT_PERL_INS) \ |
153 |
-+ $(SCRIPT_PERL_CVS_INS) \ |
154 |
- $(SCRIPT_PYTHON_INS) \ |
155 |
- git-instaweb |
156 |
- |
157 |
-@@ -2076,13 +2083,27 @@ git.res: git.rc GIT-VERSION-FILE |
158 |
- -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@ |
159 |
- |
160 |
- # This makes sure we depend on the NO_PERL setting itself. |
161 |
--$(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS |
162 |
-+$(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN): GIT-BUILD-OPTIONS |
163 |
-+ |
164 |
-+_SCRIPT_PERL_GEN = |
165 |
-+_SCRIPT_PERL_NOGEN = |
166 |
- |
167 |
- # Used for substitution in Perl modules. Disabled when using RUNTIME_PREFIX |
168 |
- # since the locale directory is injected. |
169 |
- perl_localedir_SQ = $(localedir_SQ) |
170 |
- |
171 |
- ifndef NO_PERL |
172 |
-+_SCRIPT_PERL_GEN = $(SCRIPT_PERL_GEN) |
173 |
-+ |
174 |
-+ifndef NO_CVS |
175 |
-+_SCRIPT_PERL_GEN += $(SCRIPT_PERL_CVS_GEN) |
176 |
-+else |
177 |
-+_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_CVS_GEN) |
178 |
-+_REASON = NO_CVS |
179 |
-+_REASON_CONTENT = $(NO_CVS) |
180 |
-+endif # NO_CVS |
181 |
-+ |
182 |
-+$(_SCRIPT_PERL_GEN): |
183 |
- PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl |
184 |
- PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ):$(perllibdir_SQ) |
185 |
- |
186 |
-@@ -2103,7 +2124,7 @@ endif |
187 |
- |
188 |
- PERL_DEFINES += $(gitexecdir) $(perllibdir) $(localedir) |
189 |
- |
190 |
--$(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE |
191 |
-+$(_SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE |
192 |
- $(QUIET_GEN)$(RM) $@ $@+ && \ |
193 |
- sed -e '1{' \ |
194 |
- -e ' s|#!.*perl|#!$(PERL_PATH_SQ)|' \ |
195 |
-@@ -2149,14 +2170,18 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES |
196 |
- chmod +x $@+ && \ |
197 |
- mv $@+ $@ |
198 |
- else # NO_PERL |
199 |
--$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh |
200 |
-+_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) git-instaweb |
201 |
-+_REASON = NO_PERL |
202 |
-+_REASON_CONTENT = $(NO_PERL) |
203 |
-+endif # NO_PERL |
204 |
-+ |
205 |
-+$(_SCRIPT_PERL_NOGEN): % : unimplemented.sh |
206 |
- $(QUIET_GEN)$(RM) $@ $@+ && \ |
207 |
- sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ |
208 |
-- -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ |
209 |
-+ -e 's|@@REASON@@|$(_REASON)=$(_REASON_CONTENT)|g' \ |
210 |
- unimplemented.sh >$@+ && \ |
211 |
- chmod +x $@+ && \ |
212 |
- mv $@+ $@ |
213 |
--endif # NO_PERL |
214 |
- |
215 |
- # This makes sure we depend on the NO_PYTHON setting itself. |
216 |
- $(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS |
217 |
-@@ -2396,7 +2421,7 @@ LOCALIZED_SH = $(SCRIPT_SH) |
218 |
- LOCALIZED_SH += git-parse-remote.sh |
219 |
- LOCALIZED_SH += git-rebase--interactive.sh |
220 |
- LOCALIZED_SH += git-sh-setup.sh |
221 |
--LOCALIZED_PERL = $(SCRIPT_PERL) |
222 |
-+LOCALIZED_PERL = $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) |
223 |
- |
224 |
- ifdef XGETTEXT_INCLUDE_TESTS |
225 |
- LOCALIZED_C += t/t0200/test.c |
226 |
-diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh |
227 |
-index 1319415ba8..34ac8e28e2 100755 |
228 |
---- a/t/t9200-git-cvsexportcommit.sh |
229 |
-+++ b/t/t9200-git-cvsexportcommit.sh |
230 |
-@@ -11,6 +11,11 @@ if ! test_have_prereq PERL; then |
231 |
- test_done |
232 |
- fi |
233 |
- |
234 |
-+if ! test_have_prereq CVS; then |
235 |
-+ skip_all='skipping git cvsexportcommit tests, cvs not available' |
236 |
-+ test_done |
237 |
-+fi |
238 |
-+ |
239 |
- cvs >/dev/null 2>&1 |
240 |
- if test $? -ne 1 |
241 |
- then |
242 |
-diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh |
243 |
-index 06742748e9..51d474d94b 100755 |
244 |
---- a/t/t9400-git-cvsserver-server.sh |
245 |
-+++ b/t/t9400-git-cvsserver-server.sh |
246 |
-@@ -11,9 +11,15 @@ cvs CLI client via git-cvsserver server' |
247 |
- . ./test-lib.sh |
248 |
- |
249 |
- if ! test_have_prereq PERL; then |
250 |
-- skip_all='skipping git cvsserver tests, perl not available' |
251 |
-+ skip_all='skipping git-cvsserver tests, perl not available' |
252 |
- test_done |
253 |
- fi |
254 |
-+ |
255 |
-+if ! test_have_prereq CVS; then |
256 |
-+ skip_all='skipping git-cvsserver tests, cvs not available' |
257 |
-+ test_done |
258 |
-+fi |
259 |
-+ |
260 |
- cvs >/dev/null 2>&1 |
261 |
- if test $? -ne 1 |
262 |
- then |
263 |
-diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh |
264 |
-index 84787eee9a..eecba88527 100755 |
265 |
---- a/t/t9401-git-cvsserver-crlf.sh |
266 |
-+++ b/t/t9401-git-cvsserver-crlf.sh |
267 |
-@@ -57,15 +57,20 @@ check_status_options() { |
268 |
- return $stat |
269 |
- } |
270 |
- |
271 |
--cvs >/dev/null 2>&1 |
272 |
--if test $? -ne 1 |
273 |
-+if ! test_have_prereq PERL |
274 |
- then |
275 |
-- skip_all='skipping git-cvsserver tests, cvs not found' |
276 |
-+ skip_all='skipping git-cvsserver tests, perl not available' |
277 |
- test_done |
278 |
- fi |
279 |
--if ! test_have_prereq PERL |
280 |
-+if ! test_have_prereq CVS |
281 |
- then |
282 |
-- skip_all='skipping git-cvsserver tests, perl not available' |
283 |
-+ skip_all='skipping git-cvsserver tests, cvs not available' |
284 |
-+ test_done |
285 |
-+fi |
286 |
-+cvs >/dev/null 2>&1 |
287 |
-+if test $? -ne 1 |
288 |
-+then |
289 |
-+ skip_all='skipping git-cvsserver tests, cvs not found' |
290 |
- test_done |
291 |
- fi |
292 |
- perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { |
293 |
-diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh |
294 |
-index 804ce3850f..c53c50e432 100755 |
295 |
---- a/t/t9600-cvsimport.sh |
296 |
-+++ b/t/t9600-cvsimport.sh |
297 |
-@@ -8,14 +8,25 @@ if ! test_have_prereq NOT_ROOT; then |
298 |
- test_done |
299 |
- fi |
300 |
- |
301 |
--test_expect_success PERL 'setup cvsroot environment' ' |
302 |
-+if ! test_have_prereq PERL |
303 |
-+then |
304 |
-+ skip_all='skipping git cvsimport tests, perl not available' |
305 |
-+ test_done |
306 |
-+fi |
307 |
-+if ! test_have_prereq CVS |
308 |
-+then |
309 |
-+ skip_all='skipping git cvsimport tests, cvs not available' |
310 |
-+ test_done |
311 |
-+fi |
312 |
-+ |
313 |
-+test_expect_success 'setup cvsroot environment' ' |
314 |
- CVSROOT=$(pwd)/cvsroot && |
315 |
- export CVSROOT |
316 |
- ' |
317 |
- |
318 |
--test_expect_success PERL 'setup cvsroot' '$CVS init' |
319 |
-+test_expect_success 'setup cvsroot' '$CVS init' |
320 |
- |
321 |
--test_expect_success PERL 'setup a cvs module' ' |
322 |
-+test_expect_success 'setup a cvs module' ' |
323 |
- |
324 |
- mkdir "$CVSROOT/module" && |
325 |
- $CVS co -d module-cvs module && |
326 |
-@@ -47,23 +58,23 @@ EOF |
327 |
- ) |
328 |
- ' |
329 |
- |
330 |
--test_expect_success PERL 'import a trivial module' ' |
331 |
-+test_expect_success 'import a trivial module' ' |
332 |
- |
333 |
- git cvsimport -a -R -z 0 -C module-git module && |
334 |
- test_cmp module-cvs/o_fortuna module-git/o_fortuna |
335 |
- |
336 |
- ' |
337 |
- |
338 |
--test_expect_success PERL 'pack refs' '(cd module-git && git gc)' |
339 |
-+test_expect_success 'pack refs' '(cd module-git && git gc)' |
340 |
- |
341 |
--test_expect_success PERL 'initial import has correct .git/cvs-revisions' ' |
342 |
-+test_expect_success 'initial import has correct .git/cvs-revisions' ' |
343 |
- |
344 |
- (cd module-git && |
345 |
- git log --format="o_fortuna 1.1 %H" -1) > expected && |
346 |
- test_cmp expected module-git/.git/cvs-revisions |
347 |
- ' |
348 |
- |
349 |
--test_expect_success PERL 'update cvs module' ' |
350 |
-+test_expect_success 'update cvs module' ' |
351 |
- (cd module-cvs && |
352 |
- cat <<EOF >o_fortuna && |
353 |
- O Fortune, |
354 |
-@@ -91,7 +102,7 @@ EOF |
355 |
- ) |
356 |
- ' |
357 |
- |
358 |
--test_expect_success PERL 'update git module' ' |
359 |
-+test_expect_success 'update git module' ' |
360 |
- |
361 |
- (cd module-git && |
362 |
- git config cvsimport.trackRevisions true && |
363 |
-@@ -102,7 +113,7 @@ test_expect_success PERL 'update git module' ' |
364 |
- |
365 |
- ' |
366 |
- |
367 |
--test_expect_success PERL 'update has correct .git/cvs-revisions' ' |
368 |
-+test_expect_success 'update has correct .git/cvs-revisions' ' |
369 |
- |
370 |
- (cd module-git && |
371 |
- git log --format="o_fortuna 1.1 %H" -1 HEAD^ && |
372 |
-@@ -110,7 +121,7 @@ test_expect_success PERL 'update has correct .git/cvs-revisions' ' |
373 |
- test_cmp expected module-git/.git/cvs-revisions |
374 |
- ' |
375 |
- |
376 |
--test_expect_success PERL 'update cvs module' ' |
377 |
-+test_expect_success 'update cvs module' ' |
378 |
- |
379 |
- (cd module-cvs && |
380 |
- echo 1 >tick && |
381 |
-@@ -119,7 +130,7 @@ test_expect_success PERL 'update cvs module' ' |
382 |
- ) |
383 |
- ' |
384 |
- |
385 |
--test_expect_success PERL 'cvsimport.module config works' ' |
386 |
-+test_expect_success 'cvsimport.module config works' ' |
387 |
- |
388 |
- (cd module-git && |
389 |
- git config cvsimport.module module && |
390 |
-@@ -131,7 +142,7 @@ test_expect_success PERL 'cvsimport.module config works' ' |
391 |
- |
392 |
- ' |
393 |
- |
394 |
--test_expect_success PERL 'second update has correct .git/cvs-revisions' ' |
395 |
-+test_expect_success 'second update has correct .git/cvs-revisions' ' |
396 |
- |
397 |
- (cd module-git && |
398 |
- git log --format="o_fortuna 1.1 %H" -1 HEAD^^ && |
399 |
-@@ -140,7 +151,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' ' |
400 |
- test_cmp expected module-git/.git/cvs-revisions |
401 |
- ' |
402 |
- |
403 |
--test_expect_success PERL 'import from a CVS working tree' ' |
404 |
-+test_expect_success 'import from a CVS working tree' ' |
405 |
- |
406 |
- $CVS co -d import-from-wt module && |
407 |
- (cd import-from-wt && |
408 |
-@@ -153,12 +164,12 @@ test_expect_success PERL 'import from a CVS working tree' ' |
409 |
- |
410 |
- ' |
411 |
- |
412 |
--test_expect_success PERL 'no .git/cvs-revisions created by default' ' |
413 |
-+test_expect_success 'no .git/cvs-revisions created by default' ' |
414 |
- |
415 |
- ! test -e import-from-wt/.git/cvs-revisions |
416 |
- |
417 |
- ' |
418 |
- |
419 |
--test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master' |
420 |
-+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master' |
421 |
- |
422 |
- test_done |
423 |
-diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh |
424 |
-index 827d39f5bf..d730a41f67 100755 |
425 |
---- a/t/t9601-cvsimport-vendor-branch.sh |
426 |
-+++ b/t/t9601-cvsimport-vendor-branch.sh |
427 |
-@@ -34,6 +34,17 @@ |
428 |
- test_description='git cvsimport handling of vendor branches' |
429 |
- . ./lib-cvs.sh |
430 |
- |
431 |
-+if ! test_have_prereq PERL |
432 |
-+then |
433 |
-+ skip_all='skipping git cvsimport tests, perl not available' |
434 |
-+ test_done |
435 |
-+fi |
436 |
-+if ! test_have_prereq CVS |
437 |
-+then |
438 |
-+ skip_all='skipping git cvsimport tests, cvs not available' |
439 |
-+ test_done |
440 |
-+fi |
441 |
-+ |
442 |
- setup_cvs_test_repository t9601 |
443 |
- |
444 |
- test_expect_success PERL 'import a module with a vendor branch' ' |
445 |
-diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh |
446 |
-index e1db323f54..68f097401f 100755 |
447 |
---- a/t/t9602-cvsimport-branches-tags.sh |
448 |
-+++ b/t/t9602-cvsimport-branches-tags.sh |
449 |
-@@ -6,6 +6,17 @@ |
450 |
- test_description='git cvsimport handling of branches and tags' |
451 |
- . ./lib-cvs.sh |
452 |
- |
453 |
-+if ! test_have_prereq PERL |
454 |
-+then |
455 |
-+ skip_all='skipping git cvsimport tests, perl not available' |
456 |
-+ test_done |
457 |
-+fi |
458 |
-+if ! test_have_prereq CVS |
459 |
-+then |
460 |
-+ skip_all='skipping git cvsimport tests, cvs not available' |
461 |
-+ test_done |
462 |
-+fi |
463 |
-+ |
464 |
- setup_cvs_test_repository t9602 |
465 |
- |
466 |
- test_expect_success PERL 'import module' ' |
467 |
-diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh |
468 |
-index c4c3c49546..9b2957d4f0 100755 |
469 |
---- a/t/t9603-cvsimport-patchsets.sh |
470 |
-+++ b/t/t9603-cvsimport-patchsets.sh |
471 |
-@@ -14,6 +14,17 @@ |
472 |
- test_description='git cvsimport testing for correct patchset estimation' |
473 |
- . ./lib-cvs.sh |
474 |
- |
475 |
-+if ! test_have_prereq PERL |
476 |
-+then |
477 |
-+ skip_all='skipping git cvsimport tests, perl not available' |
478 |
-+ test_done |
479 |
-+fi |
480 |
-+if ! test_have_prereq CVS |
481 |
-+then |
482 |
-+ skip_all='skipping git cvsimport tests, cvs not available' |
483 |
-+ test_done |
484 |
-+fi |
485 |
-+ |
486 |
- setup_cvs_test_repository t9603 |
487 |
- |
488 |
- test_expect_failure PERL 'import with criss cross times on revisions' ' |
489 |
-diff --git a/t/test-lib.sh b/t/test-lib.sh |
490 |
-index 28315706be..6e2f99cdbb 100644 |
491 |
---- a/t/test-lib.sh |
492 |
-+++ b/t/test-lib.sh |
493 |
-@@ -1064,6 +1064,7 @@ case $uname_s in |
494 |
- esac |
495 |
- |
496 |
- ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1 |
497 |
-+test -z "$NO_CVS" && test_set_prereq CVS |
498 |
- test -z "$NO_PERL" && test_set_prereq PERL |
499 |
- test -z "$NO_PTHREADS" && test_set_prereq PTHREADS |
500 |
- test -z "$NO_PYTHON" && test_set_prereq PYTHON |
501 |
--- |
502 |
-2.17.1 |
503 |
- |
504 |
|
505 |
diff --git a/dev-vcs/git/git-2.21.1.ebuild b/dev-vcs/git/git-2.21.1.ebuild |
506 |
deleted file mode 100644 |
507 |
index 5302c78a7fa..00000000000 |
508 |
--- a/dev-vcs/git/git-2.21.1.ebuild |
509 |
+++ /dev/null |
510 |
@@ -1,715 +0,0 @@ |
511 |
-# Copyright 1999-2020 Gentoo Authors |
512 |
-# Distributed under the terms of the GNU General Public License v2 |
513 |
- |
514 |
-EAPI=6 |
515 |
- |
516 |
-GENTOO_DEPEND_ON_PERL=no |
517 |
- |
518 |
-# bug #329479: git-remote-testgit is not multiple-version aware |
519 |
-PYTHON_COMPAT=( python2_7 ) |
520 |
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" |
521 |
-if [[ ${PV} == *9999 ]]; then |
522 |
- SCM="git-r3" |
523 |
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" |
524 |
- # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. |
525 |
- # See https://git-scm.com/docs/gitworkflows#_graduation |
526 |
- # In order of stability: |
527 |
- # 9999-r0: maint |
528 |
- # 9999-r1: master |
529 |
- # 9999-r2: next |
530 |
- # 9999-r3: pu |
531 |
- case "${PVR}" in |
532 |
- 9999) EGIT_BRANCH=maint ;; |
533 |
- 9999-r1) EGIT_BRANCH=master ;; |
534 |
- 9999-r2) EGIT_BRANCH=next;; |
535 |
- 9999-r3) EGIT_BRANCH=pu ;; |
536 |
- esac |
537 |
-fi |
538 |
- |
539 |
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
540 |
- |
541 |
-MY_PV="${PV/_rc/.rc}" |
542 |
-MY_P="${PN}-${MY_PV}" |
543 |
- |
544 |
-DOC_VER=${MY_PV} |
545 |
- |
546 |
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" |
547 |
-HOMEPAGE="https://www.git-scm.com/" |
548 |
-if [[ ${PV} != *9999 ]]; then |
549 |
- SRC_URI_SUFFIX="xz" |
550 |
- SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" |
551 |
- [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' |
552 |
- SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} |
553 |
- ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
554 |
- doc? ( |
555 |
- ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
556 |
- )" |
557 |
- [[ "${PV}" = *_rc* ]] || \ |
558 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
559 |
-fi |
560 |
- |
561 |
-LICENSE="GPL-2" |
562 |
-SLOT="0" |
563 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python +ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
564 |
- |
565 |
-# Common to both DEPEND and RDEPEND |
566 |
-CDEPEND=" |
567 |
- gnome-keyring? ( app-crypt/libsecret ) |
568 |
- !libressl? ( dev-libs/openssl:0= ) |
569 |
- libressl? ( dev-libs/libressl:= ) |
570 |
- sys-libs/zlib |
571 |
- pcre? ( |
572 |
- pcre-jit? ( dev-libs/libpcre2[jit(+)] ) |
573 |
- !pcre-jit? ( dev-libs/libpcre ) |
574 |
- ) |
575 |
- perl? ( dev-lang/perl:=[-build(-)] ) |
576 |
- tk? ( dev-lang/tk:0= ) |
577 |
- curl? ( |
578 |
- net-misc/curl |
579 |
- webdav? ( dev-libs/expat ) |
580 |
- ) |
581 |
- emacs? ( >=app-editors/emacs-23.1:* ) |
582 |
- iconv? ( virtual/libiconv ) |
583 |
-" |
584 |
- |
585 |
-RDEPEND="${CDEPEND} |
586 |
- gpg? ( app-crypt/gnupg ) |
587 |
- perl? ( |
588 |
- dev-perl/Error |
589 |
- dev-perl/MailTools |
590 |
- dev-perl/Authen-SASL |
591 |
- cgi? ( |
592 |
- dev-perl/CGI |
593 |
- highlight? ( app-text/highlight ) |
594 |
- ) |
595 |
- cvs? ( |
596 |
- >=dev-vcs/cvsps-2.1:0 |
597 |
- dev-perl/DBI |
598 |
- dev-perl/DBD-SQLite |
599 |
- ) |
600 |
- mediawiki? ( |
601 |
- dev-perl/DateTime-Format-ISO8601 |
602 |
- dev-perl/HTML-Tree |
603 |
- dev-perl/MediaWiki-API |
604 |
- ) |
605 |
- subversion? ( |
606 |
- dev-vcs/subversion[-dso,perl] |
607 |
- dev-perl/libwww-perl |
608 |
- dev-perl/TermReadKey |
609 |
- ) |
610 |
- ) |
611 |
- python? ( ${PYTHON_DEPS} ) |
612 |
-" |
613 |
- |
614 |
-# This is how info docs are created with Git: |
615 |
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook |
616 |
-# .xml/docbook --(docbook2texi.pl)--> .texi |
617 |
-# .texi --(makeinfo)---------> .info |
618 |
-DEPEND="${CDEPEND} |
619 |
- doc? ( |
620 |
- app-text/asciidoc |
621 |
- app-text/docbook2X |
622 |
- sys-apps/texinfo |
623 |
- app-text/xmlto |
624 |
- ) |
625 |
- nls? ( sys-devel/gettext ) |
626 |
- test? ( app-crypt/gnupg )" |
627 |
- |
628 |
-# Live ebuild builds man pages and HTML docs, additionally |
629 |
-if [[ ${PV} == *9999 ]]; then |
630 |
- DEPEND="${DEPEND} |
631 |
- app-text/asciidoc" |
632 |
-fi |
633 |
- |
634 |
-SITEFILE="50${PN}-gentoo.el" |
635 |
-S="${WORKDIR}/${MY_P}" |
636 |
- |
637 |
-REQUIRED_USE=" |
638 |
- cgi? ( perl ) |
639 |
- cvs? ( perl ) |
640 |
- mediawiki? ( perl ) |
641 |
- mediawiki-experimental? ( mediawiki ) |
642 |
- subversion? ( perl ) |
643 |
- webdav? ( curl ) |
644 |
- pcre-jit? ( pcre ) |
645 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
646 |
-" |
647 |
- |
648 |
-RESTRICT="!test? ( test )" |
649 |
- |
650 |
-PATCHES=( |
651 |
- # bug #350330 - automagic CVS when we don't want it is bad. |
652 |
- "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch |
653 |
- |
654 |
- "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch |
655 |
-) |
656 |
- |
657 |
-pkg_setup() { |
658 |
- if use subversion && has_version "dev-vcs/subversion[dso]"; then |
659 |
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" |
660 |
- ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
661 |
- ewarn "have been warned." |
662 |
- fi |
663 |
- if use python ; then |
664 |
- python-single-r1_pkg_setup |
665 |
- fi |
666 |
-} |
667 |
- |
668 |
-# This is needed because for some obscure reasons future calls to make don't |
669 |
-# pick up these exports if we export them in src_unpack() |
670 |
-exportmakeopts() { |
671 |
- local myopts=( |
672 |
- ASCIIDOC_NO_ROFF=YesPlease |
673 |
- $(usex cvs '' NO_CVS=YesPlease) |
674 |
- $(usex elibc_musl NO_REGEX=YesPlease '') |
675 |
- $(usex iconv '' NO_ICONV=YesPlease) |
676 |
- $(usex nls '' NO_GETTEXT=YesPlease) |
677 |
- $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) |
678 |
- $(usex python '' NO_PYTHON=YesPlease) |
679 |
- $(usex subversion '' NO_SVN_TESTS=YesPlease) |
680 |
- $(usex threads '' NO_PTHREAD=YesPlease) |
681 |
- $(usex tk '' NO_TCLTK=YesPlease) |
682 |
- ) |
683 |
- |
684 |
- if use blksha1 ; then |
685 |
- myopts+=( BLK_SHA1=YesPlease ) |
686 |
- elif use ppcsha1 ; then |
687 |
- myopts+=( PPC_SHA1=YesPlease ) |
688 |
- fi |
689 |
- |
690 |
- if use curl ; then |
691 |
- use webdav || myopts+=( NO_EXPAT=YesPlease ) |
692 |
- else |
693 |
- myopts+=( NO_CURL=YesPlease ) |
694 |
- fi |
695 |
- |
696 |
- # broken assumptions, because of static build system ... |
697 |
- myopts+=( |
698 |
- NO_FINK=YesPlease |
699 |
- NO_DARWIN_PORTS=YesPlease |
700 |
- INSTALL=install |
701 |
- TAR=tar |
702 |
- SHELL_PATH="${EPREFIX}/bin/sh" |
703 |
- SANE_TOOL_PATH= |
704 |
- OLD_ICONV= |
705 |
- NO_EXTERNAL_GREP= |
706 |
- ) |
707 |
- |
708 |
- # For svn-fe |
709 |
- extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') ) |
710 |
- |
711 |
- # can't define this to null, since the entire makefile depends on it |
712 |
- sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die |
713 |
- |
714 |
- if use pcre; then |
715 |
- if use pcre-jit; then |
716 |
- myopts+=( USE_LIBPCRE2=YesPlease ) |
717 |
- extlibs+=( -lpcre2-8 ) |
718 |
- else |
719 |
- myopts+=( |
720 |
- USE_LIBPCRE1=YesPlease |
721 |
- NO_LIBPCRE1_JIT=YesPlease |
722 |
- ) |
723 |
- extlibs+=( -lpcre ) |
724 |
- fi |
725 |
- fi |
726 |
-# Disabled until ~m68k-mint can be keyworded again |
727 |
-# if [[ ${CHOST} == *-mint* ]] ; then |
728 |
-# myopts+=( |
729 |
-# NO_MMAP=YesPlease |
730 |
-# NO_IPV6=YesPlease |
731 |
-# NO_STRLCPY=YesPlease |
732 |
-# NO_MEMMEM=YesPlease |
733 |
-# NO_MKDTEMP=YesPlease |
734 |
-# NO_MKSTEMPS=YesPlease |
735 |
-# ) |
736 |
-# fi |
737 |
- if [[ ${CHOST} == ia64-*-hpux* ]]; then |
738 |
- myopts+=( NO_NSEC=YesPlease ) |
739 |
- fi |
740 |
- if [[ ${CHOST} == *-*-aix* ]]; then |
741 |
- myopts+=( NO_FNMATCH_CASEFOLD=YesPlease ) |
742 |
- fi |
743 |
- if [[ ${CHOST} == *-solaris* ]]; then |
744 |
- myopts+=( |
745 |
- NEEDS_LIBICONV=YesPlease |
746 |
- HAVE_CLOCK_MONOTONIC=1 |
747 |
- ) |
748 |
- grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ |
749 |
- myopts+=( HAVE_GETDELIM=1 ) |
750 |
- fi |
751 |
- |
752 |
- has_version '>=app-text/asciidoc-8.0' \ |
753 |
- && myopts+=( ASCIIDOC8=YesPlease ) |
754 |
- |
755 |
- # Bug 290465: |
756 |
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' |
757 |
- if [[ "${CHOST}" == *-uclibc* ]] ; then |
758 |
- myopts+=( NO_NSEC=YesPlease ) |
759 |
- use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) |
760 |
- fi |
761 |
- |
762 |
- export MY_MAKEOPTS="${myopts[@]}" |
763 |
- export EXTLIBS="${extlibs[@]}" |
764 |
-} |
765 |
- |
766 |
-src_unpack() { |
767 |
- if [[ ${PV} != *9999 ]]; then |
768 |
- unpack ${MY_P}.tar.${SRC_URI_SUFFIX} |
769 |
- cd "${S}" || die |
770 |
- unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
771 |
- if use doc ; then |
772 |
- pushd "${S}"/Documentation &>/dev/null || die |
773 |
- unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
774 |
- popd &>/dev/null || die |
775 |
- fi |
776 |
- else |
777 |
- git-r3_src_unpack |
778 |
- #cp "${FILESDIR}"/GIT-VERSION-GEN . |
779 |
- fi |
780 |
- |
781 |
-} |
782 |
- |
783 |
-src_prepare() { |
784 |
- # add experimental patches to improve mediawiki support |
785 |
- # see patches for origin |
786 |
- if use mediawiki-experimental ; then |
787 |
- PATCHES+=( |
788 |
- "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch |
789 |
- "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch |
790 |
- "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch |
791 |
- ) |
792 |
- fi |
793 |
- |
794 |
- default |
795 |
- |
796 |
- sed -i \ |
797 |
- -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ |
798 |
- -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ |
799 |
- -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ |
800 |
- -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ |
801 |
- -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ |
802 |
- -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ |
803 |
- Makefile contrib/svn-fe/Makefile || die |
804 |
- |
805 |
- # Fix docbook2texi command |
806 |
- sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ |
807 |
- Documentation/Makefile || die |
808 |
-} |
809 |
- |
810 |
-git_emake() { |
811 |
- # bug #320647: PYTHON_PATH |
812 |
- local PYTHON_PATH="" |
813 |
- use python && PYTHON_PATH="${PYTHON}" |
814 |
- emake ${MY_MAKEOPTS} \ |
815 |
- prefix="${EPREFIX}"/usr \ |
816 |
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
817 |
- perllibdir="$(use perl && perl_get_raw_vendorlib)" \ |
818 |
- sysconfdir="${EPREFIX}"/etc \ |
819 |
- DESTDIR="${D}" \ |
820 |
- GIT_TEST_OPTS="--no-color" \ |
821 |
- OPTAR="$(tc-getAR)" \ |
822 |
- OPTCC="$(tc-getCC)" \ |
823 |
- OPTCFLAGS="${CFLAGS}" \ |
824 |
- OPTLDFLAGS="${LDFLAGS}" \ |
825 |
- PERL_PATH="${EPREFIX}/usr/bin/perl" \ |
826 |
- PERL_MM_OPT="" \ |
827 |
- PYTHON_PATH="${PYTHON_PATH}" \ |
828 |
- V=1 \ |
829 |
- "$@" |
830 |
-} |
831 |
- |
832 |
-src_configure() { |
833 |
- exportmakeopts |
834 |
-} |
835 |
- |
836 |
-src_compile() { |
837 |
- git_emake || die "emake failed" |
838 |
- |
839 |
- if use emacs ; then |
840 |
- elisp-compile contrib/emacs/git{,-blame}.el |
841 |
- fi |
842 |
- |
843 |
- if use perl && use cgi ; then |
844 |
- git_emake \ |
845 |
- gitweb \ |
846 |
- || die "emake gitweb (cgi) failed" |
847 |
- fi |
848 |
- |
849 |
- if [[ ${CHOST} == *-darwin* ]]; then |
850 |
- pushd contrib/credential/osxkeychain &>/dev/null || die |
851 |
- git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ |
852 |
- || die "emake credential-osxkeychain" |
853 |
- popd &>/dev/null || die |
854 |
- fi |
855 |
- |
856 |
- pushd Documentation &>/dev/null || die |
857 |
- if [[ ${PV} == *9999 ]] ; then |
858 |
- git_emake man \ |
859 |
- || die "emake man failed" |
860 |
- if use doc ; then |
861 |
- git_emake info html \ |
862 |
- || die "emake info html failed" |
863 |
- fi |
864 |
- else |
865 |
- if use doc ; then |
866 |
- git_emake info \ |
867 |
- || die "emake info html failed" |
868 |
- fi |
869 |
- fi |
870 |
- popd &>/dev/null || die |
871 |
- |
872 |
- if use subversion ; then |
873 |
- pushd contrib/svn-fe &>/dev/null || die |
874 |
- # by defining EXTLIBS we override the detection for libintl and |
875 |
- # libiconv, bug #516168 |
876 |
- local nlsiconv=() |
877 |
- use nls && use !elibc_glibc && nlsiconv+=( -lintl ) |
878 |
- use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) |
879 |
- git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ |
880 |
- || die "emake svn-fe failed" |
881 |
- if use doc ; then |
882 |
- git_emake svn-fe.{1,html} \ |
883 |
- || die "emake svn-fe.1 svn-fe.html failed" |
884 |
- fi |
885 |
- popd &>/dev/null || die |
886 |
- fi |
887 |
- |
888 |
- if use gnome-keyring ; then |
889 |
- pushd contrib/credential/libsecret &>/dev/null || die |
890 |
- git_emake || die "emake git-credential-libsecret failed" |
891 |
- popd &>/dev/null || die |
892 |
- fi |
893 |
- |
894 |
- pushd contrib/subtree &>/dev/null || die |
895 |
- git_emake |
896 |
- use doc && git_emake doc |
897 |
- popd &>/dev/null || die |
898 |
- |
899 |
- pushd contrib/diff-highlight &>/dev/null || die |
900 |
- git_emake |
901 |
- popd &>/dev/null || die |
902 |
- |
903 |
- if use mediawiki ; then |
904 |
- pushd contrib/mw-to-git &>/dev/null || die |
905 |
- git_emake |
906 |
- popd &>/dev/null || die |
907 |
- |
908 |
- fi |
909 |
-} |
910 |
- |
911 |
-src_install() { |
912 |
- git_emake \ |
913 |
- install || \ |
914 |
- die "make install failed" |
915 |
- |
916 |
- if [[ ${CHOST} == *-darwin* ]]; then |
917 |
- dobin contrib/credential/osxkeychain/git-credential-osxkeychain |
918 |
- fi |
919 |
- |
920 |
- # Depending on the tarball and manual rebuild of the documentation, the |
921 |
- # manpages may exist in either OR both of these directories. |
922 |
- find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] |
923 |
- find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] |
924 |
- dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} |
925 |
- use doc && dodir /usr/share/doc/${PF}/html |
926 |
- local d |
927 |
- for d in / /howto/ /technical/ ; do |
928 |
- docinto ${d} |
929 |
- dodoc Documentation${d}*.txt |
930 |
- if use doc ; then |
931 |
- docinto ${d}/html |
932 |
- dodoc Documentation${d}*.html |
933 |
- fi |
934 |
- done |
935 |
- docinto / |
936 |
- # Upstream does not ship this pre-built :-( |
937 |
- use doc && doinfo Documentation/{git,gitman}.info |
938 |
- |
939 |
- newbashcomp contrib/completion/git-completion.bash ${PN} |
940 |
- bashcomp_alias git gitk |
941 |
- # Not really a bash-completion file (bug #477920) |
942 |
- # but still needed uncompressed (bug #507480) |
943 |
- insinto /usr/share/${PN} |
944 |
- doins contrib/completion/git-prompt.sh |
945 |
- |
946 |
- if use emacs ; then |
947 |
- elisp-install ${PN} contrib/emacs/git.{el,elc} |
948 |
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc} |
949 |
- #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} |
950 |
- # don't add automatically to the load-path, so the sitefile |
951 |
- # can do a conditional loading |
952 |
- touch "${ED%/}${SITELISP}/${PN}/compat/.nosearch" |
953 |
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
954 |
- fi |
955 |
- |
956 |
- #dobin contrib/fast-import/git-p4 # Moved upstream |
957 |
- #dodoc contrib/fast-import/git-p4.txt # Moved upstream |
958 |
- newbin contrib/fast-import/import-tars.perl import-tars |
959 |
- exeinto /usr/libexec/git-core/ |
960 |
- newexe contrib/git-resurrect.sh git-resurrect |
961 |
- |
962 |
- # git-subtree |
963 |
- pushd contrib/subtree &>/dev/null || die |
964 |
- git_emake install || die "Failed to emake install git-subtree" |
965 |
- if use doc ; then |
966 |
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" |
967 |
- fi |
968 |
- newdoc README README.git-subtree |
969 |
- dodoc git-subtree.txt |
970 |
- popd &>/dev/null || die |
971 |
- |
972 |
- if use mediawiki ; then |
973 |
- pushd contrib/mw-to-git &>/dev/null || die |
974 |
- git_emake install |
975 |
- popd &>/dev/null || die |
976 |
- fi |
977 |
- |
978 |
- # diff-highlight |
979 |
- dobin contrib/diff-highlight/diff-highlight |
980 |
- newdoc contrib/diff-highlight/README README.diff-highlight |
981 |
- |
982 |
- # git-jump |
983 |
- exeinto /usr/libexec/git-core/ |
984 |
- doexe contrib/git-jump/git-jump |
985 |
- newdoc contrib/git-jump/README git-jump.txt |
986 |
- |
987 |
- # git-contacts |
988 |
- exeinto /usr/libexec/git-core/ |
989 |
- doexe contrib/contacts/git-contacts |
990 |
- dodoc contrib/contacts/git-contacts.txt |
991 |
- |
992 |
- if use gnome-keyring ; then |
993 |
- pushd contrib/credential/libsecret &>/dev/null || die |
994 |
- dobin git-credential-libsecret |
995 |
- popd &>/dev/null || die |
996 |
- fi |
997 |
- |
998 |
- if use subversion ; then |
999 |
- pushd contrib/svn-fe &>/dev/null || die |
1000 |
- dobin svn-fe |
1001 |
- dodoc svn-fe.txt |
1002 |
- if use doc ; then |
1003 |
- doman svn-fe.1 |
1004 |
- docinto html |
1005 |
- dodoc svn-fe.html |
1006 |
- fi |
1007 |
- popd &>/dev/null || die |
1008 |
- fi |
1009 |
- |
1010 |
- dodir /usr/share/${PN}/contrib |
1011 |
- # The following are excluded: |
1012 |
- # completion - installed above |
1013 |
- # diff-highlight - done above |
1014 |
- # emacs - installed above |
1015 |
- # examples - these are stuff that is not used in Git anymore actually |
1016 |
- # git-jump - done above |
1017 |
- # gitview - installed above |
1018 |
- # p4import - excluded because fast-import has a better one |
1019 |
- # patches - stuff the Git guys made to go upstream to other places |
1020 |
- # persistent-https - TODO |
1021 |
- # mw-to-git - TODO |
1022 |
- # subtree - build seperately |
1023 |
- # svnimport - use git-svn |
1024 |
- # thunderbird-patch-inline - fixes thunderbird |
1025 |
- local contrib_objects=( |
1026 |
- buildsystems |
1027 |
- fast-import |
1028 |
- hg-to-git |
1029 |
- hooks |
1030 |
- remotes2config.sh |
1031 |
- rerere-train.sh |
1032 |
- stats |
1033 |
- workdir |
1034 |
- ) |
1035 |
- local i |
1036 |
- for i in "${contrib_objects[@]}" ; do |
1037 |
- cp -rf \ |
1038 |
- "${S}"/contrib/${i} \ |
1039 |
- "${ED%/}"/usr/share/${PN}/contrib \ |
1040 |
- || die "Failed contrib ${i}" |
1041 |
- done |
1042 |
- |
1043 |
- if use perl && use cgi ; then |
1044 |
- # We used to install in /usr/share/${PN}/gitweb |
1045 |
- # but upstream installs in /usr/share/gitweb |
1046 |
- # so we will install a symlink and use their location for compat with other |
1047 |
- # distros |
1048 |
- dosym ../gitweb /usr/share/${PN}/gitweb |
1049 |
- |
1050 |
- # INSTALL discusses configuration issues, not just installation |
1051 |
- docinto / |
1052 |
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb |
1053 |
- newdoc "${S}"/gitweb/README README.gitweb |
1054 |
- |
1055 |
- for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do |
1056 |
- if test -d "${d}" ; then find "${d}" \ |
1057 |
- -name .packlist \ |
1058 |
- -delete || die |
1059 |
- fi |
1060 |
- done |
1061 |
- else |
1062 |
- rm -rf "${ED%/}"/usr/share/gitweb |
1063 |
- fi |
1064 |
- |
1065 |
- if ! use subversion ; then |
1066 |
- rm -f "${ED%/}"/usr/libexec/git-core/git-svn \ |
1067 |
- "${ED%/}"/usr/share/man/man1/git-svn.1* |
1068 |
- fi |
1069 |
- |
1070 |
- if use xinetd ; then |
1071 |
- insinto /etc/xinetd.d |
1072 |
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon |
1073 |
- fi |
1074 |
- |
1075 |
- if use !prefix ; then |
1076 |
- newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon |
1077 |
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon |
1078 |
- systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service" |
1079 |
- systemd_dounit "${FILESDIR}/git-daemon.socket" |
1080 |
- fi |
1081 |
- |
1082 |
- perl_delete_localpod |
1083 |
- |
1084 |
- # Remove disabled linguas |
1085 |
- # we could remove sources in src_prepare, but install does not |
1086 |
- # handle missing locale dir well |
1087 |
- rm_loc() { |
1088 |
- if [[ -e "${ED%/}/usr/share/locale/${1}" ]]; then |
1089 |
- rm -r "${ED%/}/usr/share/locale/${1}" || die |
1090 |
- fi |
1091 |
- } |
1092 |
- l10n_for_each_disabled_locale_do rm_loc |
1093 |
-} |
1094 |
- |
1095 |
-src_test() { |
1096 |
- local disabled=() |
1097 |
- local tests_cvs=( |
1098 |
- t9200-git-cvsexportcommit.sh |
1099 |
- t9400-git-cvsserver-server.sh |
1100 |
- t9401-git-cvsserver-crlf.sh |
1101 |
- t9402-git-cvsserver-refs.sh |
1102 |
- t9600-cvsimport.sh |
1103 |
- t9601-cvsimport-vendor-branch.sh |
1104 |
- t9602-cvsimport-branches-tags.sh |
1105 |
- t9603-cvsimport-patchsets.sh |
1106 |
- t9604-cvsimport-timestamps.sh |
1107 |
- ) |
1108 |
- local tests_perl=( |
1109 |
- t3701-add-interactive.sh |
1110 |
- t5502-quickfetch.sh |
1111 |
- t5512-ls-remote.sh |
1112 |
- t5520-pull.sh |
1113 |
- t7106-reset-unborn-branch.sh |
1114 |
- t7501-commit.sh |
1115 |
- ) |
1116 |
- # Bug #225601 - t0004 is not suitable for root perm |
1117 |
- # Bug #219839 - t1004 is not suitable for root perm |
1118 |
- # t0001-init.sh - check for init notices EPERM* fails |
1119 |
- local tests_nonroot=( |
1120 |
- t0001-init.sh |
1121 |
- t0004-unwritable.sh |
1122 |
- t0070-fundamental.sh |
1123 |
- t1004-read-tree-m-u-wf.sh |
1124 |
- t3700-add.sh |
1125 |
- t7300-clean.sh |
1126 |
- ) |
1127 |
- # t9100 still fails with symlinks in SVN 1.7 |
1128 |
- local test_svn=( t9100-git-svn-basic.sh ) |
1129 |
- |
1130 |
- # Unzip is used only for the testcase code, not by any normal parts of Git. |
1131 |
- if ! has_version app-arch/unzip ; then |
1132 |
- einfo "Disabling tar-tree tests" |
1133 |
- disabled+=( t5000-tar-tree.sh ) |
1134 |
- fi |
1135 |
- |
1136 |
- local cvs=0 |
1137 |
- use cvs && let cvs=${cvs}+1 |
1138 |
- if [[ ${EUID} -eq 0 ]]; then |
1139 |
- if [[ ${cvs} -eq 1 ]]; then |
1140 |
- ewarn "Skipping CVS tests because CVS does not work as root!" |
1141 |
- ewarn "You should retest with FEATURES=userpriv!" |
1142 |
- disabled+=( ${tests_cvs[@]} ) |
1143 |
- fi |
1144 |
- einfo "Skipping other tests that require being non-root" |
1145 |
- disabled+=( ${tests_nonroot[@]} ) |
1146 |
- else |
1147 |
- [[ ${cvs} -gt 0 ]] && \ |
1148 |
- has_version dev-vcs/cvs && \ |
1149 |
- let cvs=${cvs}+1 |
1150 |
- [[ ${cvs} -gt 1 ]] && \ |
1151 |
- has_version "dev-vcs/cvs[server]" && \ |
1152 |
- let cvs=${cvs}+1 |
1153 |
- if [[ ${cvs} -lt 3 ]]; then |
1154 |
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" |
1155 |
- disabled+=( ${tests_cvs[@]} ) |
1156 |
- fi |
1157 |
- fi |
1158 |
- |
1159 |
- if ! use perl ; then |
1160 |
- einfo "Disabling tests that need Perl" |
1161 |
- disabled+=( ${tests_perl[@]} ) |
1162 |
- fi |
1163 |
- |
1164 |
- einfo "Disabling tests that fail with SVN 1.7" |
1165 |
- disabled+=( ${test_svn[@]} ) |
1166 |
- |
1167 |
- # Reset all previously disabled tests |
1168 |
- pushd t &>/dev/null || die |
1169 |
- local i |
1170 |
- for i in *.sh.DISABLED ; do |
1171 |
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" |
1172 |
- done |
1173 |
- einfo "Disabled tests:" |
1174 |
- for i in ${disabled[@]} ; do |
1175 |
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" |
1176 |
- done |
1177 |
- |
1178 |
- # Avoid the test system removing the results because we want them ourselves |
1179 |
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ |
1180 |
- -i Makefile || die |
1181 |
- |
1182 |
- # Clean old results first, must always run |
1183 |
- nonfatal git_emake clean |
1184 |
- popd &>/dev/null || die |
1185 |
- |
1186 |
- # Now run the tests, keep going if we hit an error, and don't terminate on |
1187 |
- # failure |
1188 |
- local rc |
1189 |
- einfo "Start test run" |
1190 |
- #MAKEOPTS=-j1 |
1191 |
- nonfatal git_emake --keep-going test |
1192 |
- rc=$? |
1193 |
- |
1194 |
- # Display nice results, now print the results |
1195 |
- pushd t &>/dev/null || die |
1196 |
- nonfatal git_emake aggregate-results |
1197 |
- |
1198 |
- # And bail if there was a problem |
1199 |
- [ ${rc} -eq 0 ] || die "tests failed. Please file a bug." |
1200 |
-} |
1201 |
- |
1202 |
-showpkgdeps() { |
1203 |
- local pkg=$1 |
1204 |
- shift |
1205 |
- elog " $(printf "%-17s:" ${pkg}) ${@}" |
1206 |
-} |
1207 |
- |
1208 |
-pkg_postinst() { |
1209 |
- use emacs && elisp-site-regen |
1210 |
- elog "Please read /usr/share/bash-completion/completions/git for Git bash command" |
1211 |
- elog "completion." |
1212 |
- elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" |
1213 |
- elog "Note that the prompt bash code is now in that separate script" |
1214 |
- elog "These additional scripts need some dependencies:" |
1215 |
- echo |
1216 |
- showpkgdeps git-quiltimport "dev-util/quilt" |
1217 |
- showpkgdeps git-instaweb \ |
1218 |
- "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" |
1219 |
- echo |
1220 |
- use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed." |
1221 |
-} |
1222 |
- |
1223 |
-pkg_postrm() { |
1224 |
- use emacs && elisp-site-regen |
1225 |
-} |