Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-vcs/git/files: git-2.0.0-optional-cvs.patch
Date: Thu, 29 May 2014 00:12:31
Message-Id: 20140529001226.7342E2004F@flycatcher.gentoo.org
1 robbat2 14/05/29 00:12:26
2
3 Added: git-2.0.0-optional-cvs.patch
4 Log:
5 Bump.
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)
8
9 Revision Changes Path
10 1.1 dev-vcs/git/files/git-2.0.0-optional-cvs.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/files/git-2.0.0-optional-cvs.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/files/git-2.0.0-optional-cvs.patch?rev=1.1&content-type=text/plain
14
15 Index: git-2.0.0-optional-cvs.patch
16 ===================================================================
17 From e19ad5a8492d83db79a09b459cb17ccee78e0001 Mon Sep 17 00:00:00 2001
18 From: Robin Johnson <robbat2@g.o>
19 Date: Fri, 25 Apr 2014 12:30:42 +0200
20 Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
21 utilities
22
23 Forward-ported from 1.7.12 to current git.git v1.8.4
24 Forward-ported from v1.8.4 to v1.8.5.1
25 Forward-ported from v1.8.5.3 to v1.9.0_rc3
26 Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0
27 Forward-ported from v2.0.0_rc0 to v2.0.0
28
29 diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/Makefile git-2.0.0/Makefile
30 --- git-2.0.0.orig/Makefile 2014-05-28 12:10:36.000000000 -0700
31 +++ git-2.0.0/Makefile 2014-05-28 16:50:10.148376954 -0700
32 @@ -255,6 +255,8 @@
33 #
34 # Define NO_TCLTK if you do not want Tcl/Tk GUI.
35 #
36 +# Define NO_CVS if you do not want any CVS interface utilities.
37 +#
38 # The TCL_PATH variable governs the location of the Tcl interpreter
39 # used to optimize git-gui for your system. Only used if NO_TCLTK
40 # is not set. Defaults to the bare 'tclsh'.
41 @@ -436,6 +438,7 @@
42 PROGRAM_OBJS =
43 PROGRAMS =
44 SCRIPT_PERL =
45 +SCRIPT_PERL_CVS =
46 SCRIPT_PYTHON =
47 SCRIPT_SH =
48 SCRIPT_LIB =
49 @@ -475,20 +478,21 @@
50 SCRIPT_PERL += git-add--interactive.perl
51 SCRIPT_PERL += git-difftool.perl
52 SCRIPT_PERL += git-archimport.perl
53 -SCRIPT_PERL += git-cvsexportcommit.perl
54 -SCRIPT_PERL += git-cvsimport.perl
55 -SCRIPT_PERL += git-cvsserver.perl
56 SCRIPT_PERL += git-relink.perl
57 SCRIPT_PERL += git-send-email.perl
58 SCRIPT_PERL += git-svn.perl
59
60 +SCRIPT_PERL_CVS += git-cvsexportcommit.perl
61 +SCRIPT_PERL_CVS += git-cvsimport.perl
62 +SCRIPT_PERL_CVS += git-cvsserver.perl
63 +
64 SCRIPT_PYTHON += git-p4.py
65
66 NO_INSTALL += git-remote-testgit
67
68 # Generated files for scripts
69 SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
70 -SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
71 +SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS))
72 SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))
73
74 SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN))
75 @@ -1779,8 +1783,18 @@
76 $(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \
77 -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@
78
79 +_SCRIPT_PERL_BUILD =
80 +_SCRIPT_PERL_NOBUILD =
81 +
82 ifndef NO_PERL
83 -$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
84 +
85 +_SCRIPT_PERL_BUILD += $(SCRIPT_PERL)
86 +
87 +ifndef NO_CVS
88 +_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS)
89 +else # NO_CVS
90 +_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS)
91 +endif # NO_CVS
92
93 perl/perl.mak: perl/PM.stamp
94
95 @@ -1793,7 +1807,7 @@
96 $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
97
98 PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ)
99 -$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
100 +$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
101 $(QUIET_GEN)$(RM) $@ $@+ && \
102 INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
103 INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
104 @@ -1826,15 +1840,17 @@
105 $(QUIET_GEN)$(cmd_munge_script) && \
106 chmod +x $@+ && \
107 mv $@+ $@
108 -else # NO_PERL
109 -$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh
110 +_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb
111 +endif # NO_PERL
112 +
113 +# This is any perl scripts that were disabled it might be empty...
114 +$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)) git-instaweb: % : unimplemented.sh
115 $(QUIET_GEN)$(RM) $@ $@+ && \
116 sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
117 -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
118 unimplemented.sh >$@+ && \
119 chmod +x $@+ && \
120 mv $@+ $@
121 -endif # NO_PERL
122
123 ifndef NO_PYTHON
124 $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
125 diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9200-git-cvsexportcommit.sh git-2.0.0/t/t9200-git-cvsexportcommit.sh
126 --- git-2.0.0.orig/t/t9200-git-cvsexportcommit.sh 2014-05-28 12:10:36.000000000 -0700
127 +++ git-2.0.0/t/t9200-git-cvsexportcommit.sh 2014-05-28 16:47:41.812727825 -0700
128 @@ -11,6 +11,11 @@
129 test_done
130 fi
131
132 +if ! test_have_prereq CVS; then
133 + skip_all='skipping git cvsexportcommit tests, cvs not available'
134 + test_done
135 +fi
136 +
137 cvs >/dev/null 2>&1
138 if test $? -ne 1
139 then
140 diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9400-git-cvsserver-server.sh git-2.0.0/t/t9400-git-cvsserver-server.sh
141 --- git-2.0.0.orig/t/t9400-git-cvsserver-server.sh 2014-05-28 12:10:36.000000000 -0700
142 +++ git-2.0.0/t/t9400-git-cvsserver-server.sh 2014-05-28 16:47:41.812727825 -0700
143 @@ -11,9 +11,15 @@
144 . ./test-lib.sh
145
146 if ! test_have_prereq PERL; then
147 - skip_all='skipping git cvsserver tests, perl not available'
148 + skip_all='skipping git-cvsserver tests, perl not available'
149 test_done
150 fi
151 +
152 +if ! test_have_prereq CVS; then
153 + skip_all='skipping git-cvsserver tests, cvs not available'
154 + test_done
155 +fi
156 +
157 cvs >/dev/null 2>&1
158 if test $? -ne 1
159 then
160 diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9401-git-cvsserver-crlf.sh git-2.0.0/t/t9401-git-cvsserver-crlf.sh
161 --- git-2.0.0.orig/t/t9401-git-cvsserver-crlf.sh 2014-05-28 12:10:36.000000000 -0700
162 +++ git-2.0.0/t/t9401-git-cvsserver-crlf.sh 2014-05-28 16:47:41.812727825 -0700
163 @@ -57,15 +57,20 @@
164 return $stat
165 }
166
167 -cvs >/dev/null 2>&1
168 -if test $? -ne 1
169 +if ! test_have_prereq PERL
170 then
171 - skip_all='skipping git-cvsserver tests, cvs not found'
172 + skip_all='skipping git-cvsserver tests, perl not available'
173 test_done
174 fi
175 -if ! test_have_prereq PERL
176 +if ! test_have_prereq CVS
177 then
178 - skip_all='skipping git-cvsserver tests, perl not available'
179 + skip_all='skipping git-cvsserver tests, cvs not available'
180 + test_done
181 +fi
182 +cvs >/dev/null 2>&1
183 +if test $? -ne 1
184 +then
185 + skip_all='skipping git-cvsserver tests, cvs not found'
186 test_done
187 fi
188 perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
189 diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9600-cvsimport.sh git-2.0.0/t/t9600-cvsimport.sh
190 --- git-2.0.0.orig/t/t9600-cvsimport.sh 2014-05-28 12:10:36.000000000 -0700
191 +++ git-2.0.0/t/t9600-cvsimport.sh 2014-05-28 16:47:41.813727843 -0700
192 @@ -3,14 +3,25 @@
193 test_description='git cvsimport basic tests'
194 . ./lib-cvs.sh
195
196 -test_expect_success PERL 'setup cvsroot environment' '
197 +if ! test_have_prereq PERL
198 +then
199 + skip_all='skipping git cvsimport tests, perl not available'
200 + test_done
201 +fi
202 +if ! test_have_prereq CVS
203 +then
204 + skip_all='skipping git cvsimport tests, cvs not available'
205 + test_done
206 +fi
207 +
208 +test_expect_success 'setup cvsroot environment' '
209 CVSROOT=$(pwd)/cvsroot &&
210 export CVSROOT
211 '
212
213 -test_expect_success PERL 'setup cvsroot' '$CVS init'
214 +test_expect_success 'setup cvsroot' '$CVS init'
215
216 -test_expect_success PERL 'setup a cvs module' '
217 +test_expect_success 'setup a cvs module' '
218
219 mkdir "$CVSROOT/module" &&
220 $CVS co -d module-cvs module &&
221 @@ -42,23 +53,23 @@
222 )
223 '
224
225 -test_expect_success PERL 'import a trivial module' '
226 +test_expect_success 'import a trivial module' '
227
228 git cvsimport -a -R -z 0 -C module-git module &&
229 test_cmp module-cvs/o_fortuna module-git/o_fortuna
230
231 '
232
233 -test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
234 +test_expect_success 'pack refs' '(cd module-git && git gc)'
235
236 -test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
237 +test_expect_success 'initial import has correct .git/cvs-revisions' '
238
239 (cd module-git &&
240 git log --format="o_fortuna 1.1 %H" -1) > expected &&
241 test_cmp expected module-git/.git/cvs-revisions
242 '
243
244 -test_expect_success PERL 'update cvs module' '
245 +test_expect_success 'update cvs module' '
246 (cd module-cvs &&
247 cat <<EOF >o_fortuna &&
248 O Fortune,
249 @@ -86,7 +97,7 @@
250 )
251 '
252
253 -test_expect_success PERL 'update git module' '
254 +test_expect_success 'update git module' '
255
256 (cd module-git &&
257 git config cvsimport.trackRevisions true &&
258 @@ -97,7 +108,7 @@
259
260 '
261
262 -test_expect_success PERL 'update has correct .git/cvs-revisions' '
263 +test_expect_success 'update has correct .git/cvs-revisions' '
264
265 (cd module-git &&
266 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
267 @@ -105,7 +116,7 @@
268 test_cmp expected module-git/.git/cvs-revisions
269 '
270
271 -test_expect_success PERL 'update cvs module' '
272 +test_expect_success 'update cvs module' '
273
274 (cd module-cvs &&
275 echo 1 >tick &&
276 @@ -114,7 +125,7 @@
277 )
278 '
279
280 -test_expect_success PERL 'cvsimport.module config works' '
281 +test_expect_success 'cvsimport.module config works' '
282
283 (cd module-git &&
284 git config cvsimport.module module &&
285 @@ -126,7 +137,7 @@
286
287 '
288
289 -test_expect_success PERL 'second update has correct .git/cvs-revisions' '
290 +test_expect_success 'second update has correct .git/cvs-revisions' '
291
292 (cd module-git &&
293 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
294 @@ -135,7 +146,7 @@
295 test_cmp expected module-git/.git/cvs-revisions
296 '
297
298 -test_expect_success PERL 'import from a CVS working tree' '
299 +test_expect_success 'import from a CVS working tree' '
300
301 $CVS co -d import-from-wt module &&
302 (cd import-from-wt &&
303 @@ -148,12 +159,12 @@
304
305 '
306
307 -test_expect_success PERL 'no .git/cvs-revisions created by default' '
308 +test_expect_success 'no .git/cvs-revisions created by default' '
309
310 ! test -e import-from-wt/.git/cvs-revisions
311
312 '
313
314 -test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
315 +test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
316
317 test_done
318 diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9601-cvsimport-vendor-branch.sh git-2.0.0/t/t9601-cvsimport-vendor-branch.sh
319 --- git-2.0.0.orig/t/t9601-cvsimport-vendor-branch.sh 2014-05-28 12:10:36.000000000 -0700
320 +++ git-2.0.0/t/t9601-cvsimport-vendor-branch.sh 2014-05-28 16:47:41.813727843 -0700
321 @@ -34,6 +34,17 @@
322 test_description='git cvsimport handling of vendor branches'
323 . ./lib-cvs.sh
324
325 +if ! test_have_prereq PERL
326 +then
327 + skip_all='skipping git cvsimport tests, perl not available'
328 + test_done
329 +fi
330 +if ! test_have_prereq CVS
331 +then
332 + skip_all='skipping git cvsimport tests, cvs not available'
333 + test_done
334 +fi
335 +
336 setup_cvs_test_repository t9601
337
338 test_expect_success PERL 'import a module with a vendor branch' '
339 diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9602-cvsimport-branches-tags.sh git-2.0.0/t/t9602-cvsimport-branches-tags.sh
340 --- git-2.0.0.orig/t/t9602-cvsimport-branches-tags.sh 2014-05-28 12:10:36.000000000 -0700
341 +++ git-2.0.0/t/t9602-cvsimport-branches-tags.sh 2014-05-28 16:47:41.813727843 -0700
342 @@ -6,6 +6,17 @@
343 test_description='git cvsimport handling of branches and tags'
344 . ./lib-cvs.sh
345
346 +if ! test_have_prereq PERL
347 +then
348 + skip_all='skipping git cvsimport tests, perl not available'
349 + test_done
350 +fi
351 +if ! test_have_prereq CVS
352 +then
353 + skip_all='skipping git cvsimport tests, cvs not available'
354 + test_done
355 +fi
356 +
357 setup_cvs_test_repository t9602
358
359 test_expect_success PERL 'import module' '
360 diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9603-cvsimport-patchsets.sh git-2.0.0/t/t9603-cvsimport-patchsets.sh
361 --- git-2.0.0.orig/t/t9603-cvsimport-patchsets.sh 2014-05-28 12:10:36.000000000 -0700
362 +++ git-2.0.0/t/t9603-cvsimport-patchsets.sh 2014-05-28 16:47:41.813727843 -0700
363 @@ -14,6 +14,17 @@
364 test_description='git cvsimport testing for correct patchset estimation'
365 . ./lib-cvs.sh
366
367 +if ! test_have_prereq PERL
368 +then
369 + skip_all='skipping git cvsimport tests, perl not available'
370 + test_done
371 +fi
372 +if ! test_have_prereq CVS
373 +then
374 + skip_all='skipping git cvsimport tests, cvs not available'
375 + test_done
376 +fi
377 +
378 setup_cvs_test_repository t9603
379
380 test_expect_failure 'import with criss cross times on revisions' '
381 diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/test-lib.sh git-2.0.0/t/test-lib.sh
382 --- git-2.0.0.orig/t/test-lib.sh 2014-05-28 12:10:36.000000000 -0700
383 +++ git-2.0.0/t/test-lib.sh 2014-05-28 16:47:41.813727843 -0700
384 @@ -777,6 +777,7 @@
385 esac
386
387 ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
388 +test -z "$NO_CVS" && test_set_prereq CVS
389 test -z "$NO_PERL" && test_set_prereq PERL
390 test -z "$NO_PYTHON" && test_set_prereq PYTHON
391 test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE