1 |
commit: d410f234f58b7f1b9f106904fc8b3f5322b01633 |
2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 5 00:45:30 2014 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 5 00:45:30 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=d410f234 |
7 |
|
8 |
[dev-vcs/git] moved to main tree |
9 |
|
10 |
--- |
11 |
dev-vcs/git/Manifest | 3 - |
12 |
dev-vcs/git/files/50git-gentoo.el | 13 - |
13 |
dev-vcs/git/files/git-1.8.5-mw-destdir.patch | 37 -- |
14 |
dev-vcs/git/files/git-1.8.5-mw-vendor.patch | 39 -- |
15 |
dev-vcs/git/files/git-1.8.5-optional-cvs.patch | 362 -------------- |
16 |
dev-vcs/git/files/git-daemon.confd | 19 - |
17 |
dev-vcs/git/files/git-daemon.initd | 30 -- |
18 |
dev-vcs/git/files/git-daemon.socket | 9 - |
19 |
dev-vcs/git/files/git-daemon.xinetd | 13 - |
20 |
dev-vcs/git/files/git-daemon_at.service | 13 - |
21 |
dev-vcs/git/git-1.8.5.2-r1.ebuild | 639 ------------------------- |
22 |
dev-vcs/git/git-9999.ebuild | 618 ------------------------ |
23 |
dev-vcs/git/metadata.xml | 41 -- |
24 |
13 files changed, 1836 deletions(-) |
25 |
|
26 |
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest |
27 |
deleted file mode 100644 |
28 |
index b8dc6e1..0000000 |
29 |
--- a/dev-vcs/git/Manifest |
30 |
+++ /dev/null |
31 |
@@ -1,3 +0,0 @@ |
32 |
-DIST git-1.8.5.2.tar.gz 4755707 SHA256 e986da24893197e33d835150c456708441e4a116a726ce9312a27f6de804f7b2 SHA512 73e408dd787b73a0f3935e37540d5da32a2f8d6d84af60d3ec7e224c3a953cc62eea749c7a689f8cca3b54e633f2520ed23d910ca5932021523e1fb750bf2c0a WHIRLPOOL d6623742cce0bdcb6b5334d363b44edeb6413e45fa42cb2bce013e07796dc98bd865b0d2c2578f2bd526140dceea25b19acbe212dc6afec7903c5dd6ea794d7f |
33 |
-DIST git-htmldocs-1.8.5.2.tar.gz 2237867 SHA256 ba708ab1b5916960f61c22cf60eb6689ac62d1b6dbb6a460d98502815cdbff41 SHA512 824ab4cf879c0b3c1215f29f5dc3d18ae9bf15aad9deb7d81e81f8a57d500d304738c7e580f0fb5e3df2b6609d957b964938250a48145a3559b93ef1419eba2b WHIRLPOOL 962a2da1174ab401bdbafdca8cc9debd0fe927838b44bc8bbd0258a1da62cc32c10a6aa5a8a2bbf404fc257d0f4df981969ec3c2b9e898bcf3dc417d2f6517c6 |
34 |
-DIST git-manpages-1.8.5.2.tar.gz 569581 SHA256 2aef8c084ee795e544b6fb8715cccc1109efca1ca4b8db1588a2a5186ddb10c6 SHA512 1ca37aff4d5ca6d4daa6e8f2b3114a63ebdb0bd42382e1ed1ff9d01117da2fd8bd3a662b9beab318fdffd682039589c9b5f50ced67122e96b0a0ffd213a4112a WHIRLPOOL 257bd0549fb63e5ef31f3575731a5c90eead5da556480d929877704086dc03dadd924713480d9c3f8b5890912d54dd8be48d970abb9f7e86c55d8655642fbfb5 |
35 |
|
36 |
diff --git a/dev-vcs/git/files/50git-gentoo.el b/dev-vcs/git/files/50git-gentoo.el |
37 |
deleted file mode 100644 |
38 |
index 1646a39..0000000 |
39 |
--- a/dev-vcs/git/files/50git-gentoo.el |
40 |
+++ /dev/null |
41 |
@@ -1,13 +0,0 @@ |
42 |
- |
43 |
-;;; dev-vcs/git site-lisp configuration |
44 |
- |
45 |
-(add-to-list 'load-path "@SITELISP@") |
46 |
-(autoload 'git-status "git" "Entry point into git-status mode." t) |
47 |
-;;(autoload 'git-blame-mode "git-blame" |
48 |
-;; "Minor mode for incremental blame for Git." t) |
49 |
- |
50 |
-;; GNU Emacs >=22.2 already includes vc-git.el. |
51 |
-;; Enable the following only if Emacs has no GIT support. |
52 |
-(unless (fboundp 'vc-git-registered) |
53 |
- (add-to-list 'load-path "@SITELISP@/compat") |
54 |
- (add-to-list 'vc-handled-backends 'GIT)) |
55 |
|
56 |
diff --git a/dev-vcs/git/files/git-1.8.5-mw-destdir.patch b/dev-vcs/git/files/git-1.8.5-mw-destdir.patch |
57 |
deleted file mode 100644 |
58 |
index ea4f175..0000000 |
59 |
--- a/dev-vcs/git/files/git-1.8.5-mw-destdir.patch |
60 |
+++ /dev/null |
61 |
@@ -1,37 +0,0 @@ |
62 |
-diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile |
63 |
-index f206f96..a4b6f7a 100644 |
64 |
---- a/contrib/mw-to-git/Makefile |
65 |
-+++ b/contrib/mw-to-git/Makefile |
66 |
-@@ -18,9 +18,13 @@ SCRIPT_PERL+=git-mw.perl |
67 |
- GIT_ROOT_DIR=../.. |
68 |
- HERE=contrib/mw-to-git/ |
69 |
- |
70 |
-+INSTALL = install |
71 |
-+ |
72 |
- SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL)) |
73 |
- INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \ |
74 |
- -s --no-print-directory instlibdir) |
75 |
-+DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) |
76 |
-+INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR)) |
77 |
- |
78 |
- all: build |
79 |
- |
80 |
-@@ -30,7 +34,9 @@ test: all |
81 |
- check: perlcritic test |
82 |
- |
83 |
- install_pm: |
84 |
-- install $(GIT_MEDIAWIKI_PM) $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM) |
85 |
-+ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/Git' |
86 |
-+ $(INSTALL) -m 644 $(GIT_MEDIAWIKI_PM) \ |
87 |
-+ '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/$(GIT_MEDIAWIKI_PM)' |
88 |
- |
89 |
- build: |
90 |
- $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \ |
91 |
-@@ -43,7 +49,6 @@ install: install_pm |
92 |
- clean: |
93 |
- $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \ |
94 |
- clean-perl-script |
95 |
-- rm $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM) |
96 |
- |
97 |
- perlcritic: |
98 |
- perlcritic -5 $(SCRIPT_PERL) |
99 |
|
100 |
diff --git a/dev-vcs/git/files/git-1.8.5-mw-vendor.patch b/dev-vcs/git/files/git-1.8.5-mw-vendor.patch |
101 |
deleted file mode 100644 |
102 |
index 54302ef..0000000 |
103 |
--- a/dev-vcs/git/files/git-1.8.5-mw-vendor.patch |
104 |
+++ /dev/null |
105 |
@@ -1,39 +0,0 @@ |
106 |
-diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile |
107 |
-index a4b6f7a..d83df2c 100644 |
108 |
---- a/contrib/mw-to-git/Makefile |
109 |
-+++ b/contrib/mw-to-git/Makefile |
110 |
-@@ -22,7 +22,7 @@ INSTALL = install |
111 |
- |
112 |
- SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL)) |
113 |
- INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \ |
114 |
-- -s --no-print-directory instlibdir) |
115 |
-+ -s --no-print-directory instvendorlibdir) |
116 |
- DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) |
117 |
- INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR)) |
118 |
- |
119 |
-diff --git a/perl/Makefile b/perl/Makefile |
120 |
-index 15d96fc..91348c6 100644 |
121 |
---- a/perl/Makefile |
122 |
-+++ b/perl/Makefile |
123 |
-@@ -12,7 +12,7 @@ ifndef V |
124 |
- QUIET = @ |
125 |
- endif |
126 |
- |
127 |
--all install instlibdir: $(makfile) |
128 |
-+all install instlibdir instvendorlibdir: $(makfile) |
129 |
- $(QUIET)$(MAKE) -f $(makfile) $@ |
130 |
- |
131 |
- clean: |
132 |
-diff --git a/perl/Makefile.PL b/perl/Makefile.PL |
133 |
-index 3f29ba9..c0b3508 100644 |
134 |
---- a/perl/Makefile.PL |
135 |
-+++ b/perl/Makefile.PL |
136 |
-@@ -17,6 +17,8 @@ sub MY::postamble { |
137 |
- return <<'MAKE_FRAG'; |
138 |
- instlibdir: |
139 |
- @echo '$(INSTALLSITELIB)' |
140 |
-+instvendorlibdir: |
141 |
-+ @echo '$(INSTALLVENDORLIB)' |
142 |
- |
143 |
- ifneq (,$(DESTDIR)) |
144 |
- ifeq (0,$(shell expr '$(MM_VERSION)' '>' 6.10)) |
145 |
|
146 |
diff --git a/dev-vcs/git/files/git-1.8.5-optional-cvs.patch b/dev-vcs/git/files/git-1.8.5-optional-cvs.patch |
147 |
deleted file mode 100644 |
148 |
index aef03d8..0000000 |
149 |
--- a/dev-vcs/git/files/git-1.8.5-optional-cvs.patch |
150 |
+++ /dev/null |
151 |
@@ -1,362 +0,0 @@ |
152 |
-From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001 |
153 |
-From: Robin Johnson <robbat2@g.o> |
154 |
-Date: Wed, 22 Aug 2012 04:25:06 +0000 |
155 |
-Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface |
156 |
- utilities |
157 |
- |
158 |
-Forward-ported from 1.7.12 to current git.git v1.8.4 |
159 |
-Forward-ported from v1.8.4 to v1.8.5.1 |
160 |
- |
161 |
---- git-1.8.5.1/Makefile |
162 |
-+++ git-1.8.5.1/Makefile |
163 |
-@@ -263,6 +263,8 @@ |
164 |
- # |
165 |
- # Define NO_TCLTK if you do not want Tcl/Tk GUI. |
166 |
- # |
167 |
-+# Define NO_CVS if you do not want any CVS interface utilities. |
168 |
-+# |
169 |
- # The TCL_PATH variable governs the location of the Tcl interpreter |
170 |
- # used to optimize git-gui for your system. Only used if NO_TCLTK |
171 |
- # is not set. Defaults to the bare 'tclsh'. |
172 |
-@@ -437,6 +439,7 @@ |
173 |
- PROGRAM_OBJS = |
174 |
- PROGRAMS = |
175 |
- SCRIPT_PERL = |
176 |
-+SCRIPT_PERL_CVS = |
177 |
- SCRIPT_PYTHON = |
178 |
- SCRIPT_SH = |
179 |
- SCRIPT_LIB = |
180 |
-@@ -477,20 +480,21 @@ |
181 |
- SCRIPT_PERL += git-add--interactive.perl |
182 |
- SCRIPT_PERL += git-difftool.perl |
183 |
- SCRIPT_PERL += git-archimport.perl |
184 |
--SCRIPT_PERL += git-cvsexportcommit.perl |
185 |
--SCRIPT_PERL += git-cvsimport.perl |
186 |
--SCRIPT_PERL += git-cvsserver.perl |
187 |
- SCRIPT_PERL += git-relink.perl |
188 |
- SCRIPT_PERL += git-send-email.perl |
189 |
- SCRIPT_PERL += git-svn.perl |
190 |
- |
191 |
-+SCRIPT_PERL_CVS += git-cvsexportcommit.perl |
192 |
-+SCRIPT_PERL_CVS += git-cvsimport.perl |
193 |
-+SCRIPT_PERL_CVS += git-cvsserver.perl |
194 |
-+ |
195 |
- SCRIPT_PYTHON += git-p4.py |
196 |
- |
197 |
- NO_INSTALL += git-remote-testgit |
198 |
- |
199 |
- # Generated files for scripts |
200 |
- SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH)) |
201 |
--SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL)) |
202 |
-+SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) |
203 |
- SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON)) |
204 |
- |
205 |
- SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN)) |
206 |
-@@ -1779,8 +1783,18 @@ |
207 |
- $(join -DMAJOR= -DMINOR= -DPATCH=, $(wordlist 1,3,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \ |
208 |
- -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@ |
209 |
- |
210 |
-+_SCRIPT_PERL_BUILD = |
211 |
-+_SCRIPT_PERL_NOBUILD = |
212 |
-+ |
213 |
- ifndef NO_PERL |
214 |
--$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak |
215 |
-+ |
216 |
-+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL) |
217 |
-+ |
218 |
-+ifndef NO_CVS |
219 |
-+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS) |
220 |
-+else # NO_CVS |
221 |
-+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS) |
222 |
-+endif # NO_CVS |
223 |
- |
224 |
- perl/perl.mak: perl/PM.stamp |
225 |
- |
226 |
-@@ -1792,7 +1806,7 @@ |
227 |
- perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL |
228 |
- $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F) |
229 |
- |
230 |
--$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE |
231 |
-+$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl GIT-VERSION-FILE |
232 |
- $(QUIET_GEN)$(RM) $@ $@+ && \ |
233 |
- INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \ |
234 |
- sed -e '1{' \ |
235 |
-@@ -1817,14 +1831,17 @@ |
236 |
- chmod +x $@+ && \ |
237 |
- mv $@+ $@ |
238 |
- else # NO_PERL |
239 |
--$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh |
240 |
-+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb |
241 |
-+endif # NO_PERL |
242 |
-+ |
243 |
-+# This is any perl scripts that were disabled it might be empty... |
244 |
-+$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh |
245 |
- $(QUIET_GEN)$(RM) $@ $@+ && \ |
246 |
- sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ |
247 |
- -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ |
248 |
- unimplemented.sh >$@+ && \ |
249 |
- chmod +x $@+ && \ |
250 |
- mv $@+ $@ |
251 |
--endif # NO_PERL |
252 |
- |
253 |
- ifndef NO_PYTHON |
254 |
- $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS |
255 |
---- git-1.8.5.1/t/t9200-git-cvsexportcommit.sh |
256 |
-+++ git-1.8.5.1/t/t9200-git-cvsexportcommit.sh |
257 |
-@@ -12,6 +12,11 @@ |
258 |
- test_done |
259 |
- fi |
260 |
- |
261 |
-+if ! test_have_prereq CVS; then |
262 |
-+ skip_all='skipping git cvsexportcommit tests, cvs not available' |
263 |
-+ test_done |
264 |
-+fi |
265 |
-+ |
266 |
- cvs >/dev/null 2>&1 |
267 |
- if test $? -ne 1 |
268 |
- then |
269 |
---- git-1.8.5.1/t/t9400-git-cvsserver-server.sh |
270 |
-+++ git-1.8.5.1/t/t9400-git-cvsserver-server.sh |
271 |
-@@ -11,9 +11,15 @@ |
272 |
- . ./test-lib.sh |
273 |
- |
274 |
- if ! test_have_prereq PERL; then |
275 |
-- skip_all='skipping git cvsserver tests, perl not available' |
276 |
-+ skip_all='skipping git-cvsserver tests, perl not available' |
277 |
- test_done |
278 |
- fi |
279 |
-+ |
280 |
-+if ! test_have_prereq CVS; then |
281 |
-+ skip_all='skipping git-cvsserver tests, cvs not available' |
282 |
-+ test_done |
283 |
-+fi |
284 |
-+ |
285 |
- cvs >/dev/null 2>&1 |
286 |
- if test $? -ne 1 |
287 |
- then |
288 |
---- git-1.8.5.1/t/t9401-git-cvsserver-crlf.sh |
289 |
-+++ git-1.8.5.1/t/t9401-git-cvsserver-crlf.sh |
290 |
-@@ -57,15 +57,20 @@ |
291 |
- return $stat |
292 |
- } |
293 |
- |
294 |
--cvs >/dev/null 2>&1 |
295 |
--if test $? -ne 1 |
296 |
-+if ! test_have_prereq PERL |
297 |
- then |
298 |
-- skip_all='skipping git-cvsserver tests, cvs not found' |
299 |
-+ skip_all='skipping git-cvsserver tests, perl not available' |
300 |
- test_done |
301 |
- fi |
302 |
--if ! test_have_prereq PERL |
303 |
-+if ! test_have_prereq CVS |
304 |
- then |
305 |
-- skip_all='skipping git-cvsserver tests, perl not available' |
306 |
-+ skip_all='skipping git-cvsserver tests, cvs not available' |
307 |
-+ test_done |
308 |
-+fi |
309 |
-+cvs >/dev/null 2>&1 |
310 |
-+if test $? -ne 1 |
311 |
-+then |
312 |
-+ skip_all='skipping git-cvsserver tests, cvs not found' |
313 |
- test_done |
314 |
- fi |
315 |
- perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { |
316 |
---- git-1.8.5.1/t/t9600-cvsimport.sh |
317 |
-+++ git-1.8.5.1/t/t9600-cvsimport.sh |
318 |
-@@ -3,14 +3,25 @@ |
319 |
- test_description='git cvsimport basic tests' |
320 |
- . ./lib-cvs.sh |
321 |
- |
322 |
--test_expect_success PERL 'setup cvsroot environment' ' |
323 |
-+if ! test_have_prereq PERL |
324 |
-+then |
325 |
-+ skip_all='skipping git cvsimport tests, perl not available' |
326 |
-+ test_done |
327 |
-+fi |
328 |
-+if ! test_have_prereq CVS |
329 |
-+then |
330 |
-+ skip_all='skipping git cvsimport tests, cvs not available' |
331 |
-+ test_done |
332 |
-+fi |
333 |
-+ |
334 |
-+test_expect_success 'setup cvsroot environment' ' |
335 |
- CVSROOT=$(pwd)/cvsroot && |
336 |
- export CVSROOT |
337 |
- ' |
338 |
- |
339 |
--test_expect_success PERL 'setup cvsroot' '$CVS init' |
340 |
-+test_expect_success 'setup cvsroot' '$CVS init' |
341 |
- |
342 |
--test_expect_success PERL 'setup a cvs module' ' |
343 |
-+test_expect_success 'setup a cvs module' ' |
344 |
- |
345 |
- mkdir "$CVSROOT/module" && |
346 |
- $CVS co -d module-cvs module && |
347 |
-@@ -42,23 +53,23 @@ |
348 |
- ) |
349 |
- ' |
350 |
- |
351 |
--test_expect_success PERL 'import a trivial module' ' |
352 |
-+test_expect_success 'import a trivial module' ' |
353 |
- |
354 |
- git cvsimport -a -R -z 0 -C module-git module && |
355 |
- test_cmp module-cvs/o_fortuna module-git/o_fortuna |
356 |
- |
357 |
- ' |
358 |
- |
359 |
--test_expect_success PERL 'pack refs' '(cd module-git && git gc)' |
360 |
-+test_expect_success 'pack refs' '(cd module-git && git gc)' |
361 |
- |
362 |
--test_expect_success PERL 'initial import has correct .git/cvs-revisions' ' |
363 |
-+test_expect_success 'initial import has correct .git/cvs-revisions' ' |
364 |
- |
365 |
- (cd module-git && |
366 |
- git log --format="o_fortuna 1.1 %H" -1) > expected && |
367 |
- test_cmp expected module-git/.git/cvs-revisions |
368 |
- ' |
369 |
- |
370 |
--test_expect_success PERL 'update cvs module' ' |
371 |
-+test_expect_success 'update cvs module' ' |
372 |
- (cd module-cvs && |
373 |
- cat <<EOF >o_fortuna && |
374 |
- O Fortune, |
375 |
-@@ -86,7 +97,7 @@ |
376 |
- ) |
377 |
- ' |
378 |
- |
379 |
--test_expect_success PERL 'update git module' ' |
380 |
-+test_expect_success 'update git module' ' |
381 |
- |
382 |
- (cd module-git && |
383 |
- git config cvsimport.trackRevisions true && |
384 |
-@@ -97,7 +108,7 @@ |
385 |
- |
386 |
- ' |
387 |
- |
388 |
--test_expect_success PERL 'update has correct .git/cvs-revisions' ' |
389 |
-+test_expect_success 'update has correct .git/cvs-revisions' ' |
390 |
- |
391 |
- (cd module-git && |
392 |
- git log --format="o_fortuna 1.1 %H" -1 HEAD^ && |
393 |
-@@ -105,7 +116,7 @@ |
394 |
- test_cmp expected module-git/.git/cvs-revisions |
395 |
- ' |
396 |
- |
397 |
--test_expect_success PERL 'update cvs module' ' |
398 |
-+test_expect_success 'update cvs module' ' |
399 |
- |
400 |
- (cd module-cvs && |
401 |
- echo 1 >tick && |
402 |
-@@ -114,7 +125,7 @@ |
403 |
- ) |
404 |
- ' |
405 |
- |
406 |
--test_expect_success PERL 'cvsimport.module config works' ' |
407 |
-+test_expect_success 'cvsimport.module config works' ' |
408 |
- |
409 |
- (cd module-git && |
410 |
- git config cvsimport.module module && |
411 |
-@@ -126,7 +137,7 @@ |
412 |
- |
413 |
- ' |
414 |
- |
415 |
--test_expect_success PERL 'second update has correct .git/cvs-revisions' ' |
416 |
-+test_expect_success 'second update has correct .git/cvs-revisions' ' |
417 |
- |
418 |
- (cd module-git && |
419 |
- git log --format="o_fortuna 1.1 %H" -1 HEAD^^ && |
420 |
-@@ -135,7 +146,7 @@ |
421 |
- test_cmp expected module-git/.git/cvs-revisions |
422 |
- ' |
423 |
- |
424 |
--test_expect_success PERL 'import from a CVS working tree' ' |
425 |
-+test_expect_success 'import from a CVS working tree' ' |
426 |
- |
427 |
- $CVS co -d import-from-wt module && |
428 |
- (cd import-from-wt && |
429 |
-@@ -148,12 +159,12 @@ |
430 |
- |
431 |
- ' |
432 |
- |
433 |
--test_expect_success PERL 'no .git/cvs-revisions created by default' ' |
434 |
-+test_expect_success 'no .git/cvs-revisions created by default' ' |
435 |
- |
436 |
- ! test -e import-from-wt/.git/cvs-revisions |
437 |
- |
438 |
- ' |
439 |
- |
440 |
--test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master' |
441 |
-+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master' |
442 |
- |
443 |
- test_done |
444 |
---- git-1.8.5.1/t/t9601-cvsimport-vendor-branch.sh |
445 |
-+++ git-1.8.5.1/t/t9601-cvsimport-vendor-branch.sh |
446 |
-@@ -34,6 +34,17 @@ |
447 |
- test_description='git cvsimport handling of vendor branches' |
448 |
- . ./lib-cvs.sh |
449 |
- |
450 |
-+if ! test_have_prereq PERL |
451 |
-+then |
452 |
-+ skip_all='skipping git cvsimport tests, perl not available' |
453 |
-+ test_done |
454 |
-+fi |
455 |
-+if ! test_have_prereq CVS |
456 |
-+then |
457 |
-+ skip_all='skipping git cvsimport tests, cvs not available' |
458 |
-+ test_done |
459 |
-+fi |
460 |
-+ |
461 |
- setup_cvs_test_repository t9601 |
462 |
- |
463 |
- test_expect_success PERL 'import a module with a vendor branch' ' |
464 |
---- git-1.8.5.1/t/t9602-cvsimport-branches-tags.sh |
465 |
-+++ git-1.8.5.1/t/t9602-cvsimport-branches-tags.sh |
466 |
-@@ -6,6 +6,17 @@ |
467 |
- test_description='git cvsimport handling of branches and tags' |
468 |
- . ./lib-cvs.sh |
469 |
- |
470 |
-+if ! test_have_prereq PERL |
471 |
-+then |
472 |
-+ skip_all='skipping git cvsimport tests, perl not available' |
473 |
-+ test_done |
474 |
-+fi |
475 |
-+if ! test_have_prereq CVS |
476 |
-+then |
477 |
-+ skip_all='skipping git cvsimport tests, cvs not available' |
478 |
-+ test_done |
479 |
-+fi |
480 |
-+ |
481 |
- setup_cvs_test_repository t9602 |
482 |
- |
483 |
- test_expect_success PERL 'import module' ' |
484 |
---- git-1.8.5.1/t/t9603-cvsimport-patchsets.sh |
485 |
-+++ git-1.8.5.1/t/t9603-cvsimport-patchsets.sh |
486 |
-@@ -14,6 +14,17 @@ |
487 |
- test_description='git cvsimport testing for correct patchset estimation' |
488 |
- . ./lib-cvs.sh |
489 |
- |
490 |
-+if ! test_have_prereq PERL |
491 |
-+then |
492 |
-+ skip_all='skipping git cvsimport tests, perl not available' |
493 |
-+ test_done |
494 |
-+fi |
495 |
-+if ! test_have_prereq CVS |
496 |
-+then |
497 |
-+ skip_all='skipping git cvsimport tests, cvs not available' |
498 |
-+ test_done |
499 |
-+fi |
500 |
-+ |
501 |
- setup_cvs_test_repository t9603 |
502 |
- |
503 |
- test_expect_failure 'import with criss cross times on revisions' ' |
504 |
---- git-1.8.5.1/t/test-lib.sh |
505 |
-+++ git-1.8.5.1/t/test-lib.sh |
506 |
-@@ -772,6 +772,7 @@ |
507 |
- esac |
508 |
- |
509 |
- ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1 |
510 |
-+test -z "$NO_CVS" && test_set_prereq CVS |
511 |
- test -z "$NO_PERL" && test_set_prereq PERL |
512 |
- test -z "$NO_PYTHON" && test_set_prereq PYTHON |
513 |
- test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE |
514 |
|
515 |
diff --git a/dev-vcs/git/files/git-daemon.confd b/dev-vcs/git/files/git-daemon.confd |
516 |
deleted file mode 100644 |
517 |
index db77de5..0000000 |
518 |
--- a/dev-vcs/git/files/git-daemon.confd |
519 |
+++ /dev/null |
520 |
@@ -1,19 +0,0 @@ |
521 |
-# conf.d file for git-daemon |
522 |
-# |
523 |
-# Please check man 1 git-daemon for more information about the options |
524 |
-# git-daemon accepts. You MUST edit this to include your repositories you wish |
525 |
-# to serve. |
526 |
-# |
527 |
-# Some of the meaningful options are: |
528 |
-# --syslog --- Enables syslog logging |
529 |
-# --verbose --- Enables verbose logging |
530 |
-# --export-all --- Exports all repositories |
531 |
-# --port=XXXX --- Starts in port XXXX instead of 9418 |
532 |
-# |
533 |
-GITDAEMON_OPTS="--syslog --base-path=/var/git" |
534 |
- |
535 |
-# To run an anonymous git safely, the following user should be able to only |
536 |
-# read your Git repositories. It should not able able to write to anywhere on |
537 |
-# your system, esp. not the repositories. |
538 |
-GIT_USER="nobody" |
539 |
-GIT_GROUP="nobody" |
540 |
|
541 |
diff --git a/dev-vcs/git/files/git-daemon.initd b/dev-vcs/git/files/git-daemon.initd |
542 |
deleted file mode 100644 |
543 |
index c6ee19f..0000000 |
544 |
--- a/dev-vcs/git/files/git-daemon.initd |
545 |
+++ /dev/null |
546 |
@@ -1,30 +0,0 @@ |
547 |
-#!/sbin/runscript |
548 |
-# Copyright 1999-2008 Gentoo Foundation |
549 |
-# Distributed under the terms of the GNU General Public License v2 |
550 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon.initd,v 1.1 2010/03/17 15:13:27 sping Exp $ |
551 |
- |
552 |
-PIDFILE=/var/run/git-daemon.pid |
553 |
- |
554 |
-depend() { |
555 |
- need net |
556 |
- use logger |
557 |
-} |
558 |
- |
559 |
-start() { |
560 |
- [ -e /lib/librc.so ] || BL1_COMPAT="--name git-daemon" |
561 |
- ebegin "Starting git-daemon" |
562 |
- start-stop-daemon --start --quiet --background \ |
563 |
- --pidfile ${PIDFILE} ${BL1_COMPAT} \ |
564 |
- --exec /usr/bin/git -- daemon \ |
565 |
- --pid-file=${PIDFILE} \ |
566 |
- --user=${GIT_USER} --group=${GIT_GROUP} \ |
567 |
- ${GITDAEMON_OPTS} |
568 |
- eend $? |
569 |
-} |
570 |
- |
571 |
-stop() { |
572 |
- ebegin "Stopping git-daemon" |
573 |
- start-stop-daemon --stop --quiet \ |
574 |
- --pidfile ${PIDFILE} |
575 |
- eend $? |
576 |
-} |
577 |
|
578 |
diff --git a/dev-vcs/git/files/git-daemon.socket b/dev-vcs/git/files/git-daemon.socket |
579 |
deleted file mode 100644 |
580 |
index 3dec01d..0000000 |
581 |
--- a/dev-vcs/git/files/git-daemon.socket |
582 |
+++ /dev/null |
583 |
@@ -1,9 +0,0 @@ |
584 |
-[Unit] |
585 |
-Description=Git Activation Socket |
586 |
- |
587 |
-[Socket] |
588 |
-ListenStream=9418 |
589 |
-Accept=true |
590 |
- |
591 |
-[Install] |
592 |
-WantedBy=sockets.target |
593 |
|
594 |
diff --git a/dev-vcs/git/files/git-daemon.xinetd b/dev-vcs/git/files/git-daemon.xinetd |
595 |
deleted file mode 100644 |
596 |
index 02c938d..0000000 |
597 |
--- a/dev-vcs/git/files/git-daemon.xinetd |
598 |
+++ /dev/null |
599 |
@@ -1,13 +0,0 @@ |
600 |
-service git-daemon |
601 |
-{ |
602 |
- disable = yes |
603 |
- socket_type = stream |
604 |
- wait = no |
605 |
- user = nobody |
606 |
- type = UNLISTED |
607 |
- protocol = tcp |
608 |
- log_on_failure += USERID |
609 |
- port = 9418 |
610 |
- server = /usr/bin/git |
611 |
- server_args = daemon --inetd --syslog --export-all --base-path=/var/git |
612 |
-} |
613 |
|
614 |
diff --git a/dev-vcs/git/files/git-daemon_at.service b/dev-vcs/git/files/git-daemon_at.service |
615 |
deleted file mode 100644 |
616 |
index 2a080d4..0000000 |
617 |
--- a/dev-vcs/git/files/git-daemon_at.service |
618 |
+++ /dev/null |
619 |
@@ -1,13 +0,0 @@ |
620 |
-[Unit] |
621 |
-Description=Git Repositories Server Daemon |
622 |
-Documentation=man:git-daemon(1) |
623 |
- |
624 |
-[Service] |
625 |
-User=nobody |
626 |
-Group=nobody |
627 |
-EnvironmentFile=/etc/conf.d/git-daemon |
628 |
-# Ignore non-zero exit status, access error makes git-daemon return them |
629 |
-ExecStart=-/usr/libexec/git-core/git-daemon --inetd --base-path=/var/git --verbose $GITDAEMON_OPTS |
630 |
-StandardInput=socket |
631 |
-StandardOutput=inherit |
632 |
-StandardError=journal |
633 |
|
634 |
diff --git a/dev-vcs/git/git-1.8.5.2-r1.ebuild b/dev-vcs/git/git-1.8.5.2-r1.ebuild |
635 |
deleted file mode 100644 |
636 |
index 7605b79..0000000 |
637 |
--- a/dev-vcs/git/git-1.8.5.2-r1.ebuild |
638 |
+++ /dev/null |
639 |
@@ -1,639 +0,0 @@ |
640 |
-# Copyright 1999-2013 Gentoo Foundation |
641 |
-# Distributed under the terms of the GNU General Public License v2 |
642 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.2.ebuild,v 1.1 2013/12/18 12:19:16 polynomial-c Exp $ |
643 |
- |
644 |
-EAPI=5 |
645 |
- |
646 |
-GENTOO_DEPEND_ON_PERL=no |
647 |
- |
648 |
-# bug #329479: git-remote-testgit is not multiple-version aware |
649 |
-PYTHON_COMPAT=( python2_{6,7} ) |
650 |
-[[ ${PV} == *9999 ]] && SCM="git-2" |
651 |
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" |
652 |
- |
653 |
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
654 |
- |
655 |
-MY_PV="${PV/_rc/.rc}" |
656 |
-MY_P="${PN}-${MY_PV}" |
657 |
- |
658 |
-DOC_VER=${MY_PV} |
659 |
- |
660 |
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" |
661 |
-HOMEPAGE="http://www.git-scm.com/" |
662 |
-if [[ ${PV} != *9999 ]]; then |
663 |
- SRC_URI_SUFFIX="gz" |
664 |
- SRC_URI_GOOG="http://git-core.googlecode.com/files" |
665 |
- SRC_URI_KORG="mirror://kernel/software/scm/git" |
666 |
- SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} |
667 |
- ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} |
668 |
- ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
669 |
- ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
670 |
- doc? ( |
671 |
- ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
672 |
- ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
673 |
- )" |
674 |
- KEYWORDS="~amd64 ~x86" |
675 |
-else |
676 |
- SRC_URI="" |
677 |
- KEYWORDS="" |
678 |
-fi |
679 |
- |
680 |
-LICENSE="GPL-2" |
681 |
-SLOT="0" |
682 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
683 |
- |
684 |
-# Common to both DEPEND and RDEPEND |
685 |
-CDEPEND=" |
686 |
- dev-libs/openssl |
687 |
- sys-libs/zlib |
688 |
- pcre? ( dev-libs/libpcre ) |
689 |
- perl? ( dev-lang/perl:=[-build(-)] ) |
690 |
- tk? ( dev-lang/tk ) |
691 |
- curl? ( |
692 |
- net-misc/curl |
693 |
- webdav? ( dev-libs/expat ) |
694 |
- ) |
695 |
- emacs? ( virtual/emacs ) |
696 |
- gnome-keyring? ( gnome-base/gnome-keyring )" |
697 |
- |
698 |
-RDEPEND="${CDEPEND} |
699 |
- gpg? ( app-crypt/gnupg ) |
700 |
- mediawiki? ( dev-perl/MediaWiki-API ) |
701 |
- perl? ( dev-perl/Error |
702 |
- dev-perl/Net-SMTP-SSL |
703 |
- dev-perl/Authen-SASL |
704 |
- cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) |
705 |
- cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) |
706 |
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) |
707 |
- ) |
708 |
- python? ( gtk? |
709 |
- ( |
710 |
- >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] |
711 |
- >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] |
712 |
- ) |
713 |
- ${PYTHON_DEPS} )" |
714 |
- |
715 |
-# This is how info docs are created with Git: |
716 |
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook |
717 |
-# .xml/docbook --(docbook2texi.pl)--> .texi |
718 |
-# .texi --(makeinfo)---------> .info |
719 |
-DEPEND="${CDEPEND} |
720 |
- app-arch/cpio |
721 |
- doc? ( |
722 |
- app-text/asciidoc |
723 |
- app-text/docbook2X |
724 |
- sys-apps/texinfo |
725 |
- app-text/xmlto |
726 |
- ) |
727 |
- test? ( |
728 |
- app-crypt/gnupg |
729 |
- )" |
730 |
- |
731 |
-# Live ebuild builds man pages and HTML docs, additionally |
732 |
-if [[ ${PV} == *9999 ]]; then |
733 |
- DEPEND="${DEPEND} |
734 |
- app-text/asciidoc" |
735 |
-fi |
736 |
- |
737 |
-SITEFILE=50${PN}-gentoo.el |
738 |
-S="${WORKDIR}/${MY_P}" |
739 |
- |
740 |
-REQUIRED_USE=" |
741 |
- cgi? ( perl ) |
742 |
- cvs? ( perl ) |
743 |
- mediawiki? ( perl ) |
744 |
- subversion? ( perl ) |
745 |
- webdav? ( curl ) |
746 |
- gtk? ( python ) |
747 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
748 |
-" |
749 |
- |
750 |
-pkg_setup() { |
751 |
- if use subversion && has_version "dev-vcs/subversion[dso]"; then |
752 |
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" |
753 |
- ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
754 |
- ewarn "have been warned." |
755 |
- fi |
756 |
- if use python ; then |
757 |
- python-single-r1_pkg_setup |
758 |
- fi |
759 |
-} |
760 |
- |
761 |
-# This is needed because for some obscure reasons future calls to make don't |
762 |
-# pick up these exports if we export them in src_unpack() |
763 |
-exportmakeopts() { |
764 |
- local myopts |
765 |
- |
766 |
- if use blksha1 ; then |
767 |
- myopts="${myopts} BLK_SHA1=YesPlease" |
768 |
- elif use ppcsha1 ; then |
769 |
- myopts="${myopts} PPC_SHA1=YesPlease" |
770 |
- fi |
771 |
- |
772 |
- if use curl ; then |
773 |
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease" |
774 |
- else |
775 |
- myopts="${myopts} NO_CURL=YesPlease" |
776 |
- fi |
777 |
- |
778 |
- # broken assumptions, because of broken build system ... |
779 |
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" |
780 |
- myopts="${myopts} INSTALL=install TAR=tar" |
781 |
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" |
782 |
- myopts="${myopts} SANE_TOOL_PATH=" |
783 |
- myopts="${myopts} OLD_ICONV=" |
784 |
- myopts="${myopts} NO_EXTERNAL_GREP=" |
785 |
- |
786 |
- # For svn-fe |
787 |
- extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" |
788 |
- |
789 |
- # can't define this to null, since the entire makefile depends on it |
790 |
- sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile |
791 |
- |
792 |
- use iconv \ |
793 |
- || myopts="${myopts} NO_ICONV=YesPlease" |
794 |
- use nls \ |
795 |
- || myopts="${myopts} NO_GETTEXT=YesPlease" |
796 |
- use tk \ |
797 |
- || myopts="${myopts} NO_TCLTK=YesPlease" |
798 |
- use pcre \ |
799 |
- && myopts="${myopts} USE_LIBPCRE=yes" \ |
800 |
- && extlibs="${extlibs} -lpcre" |
801 |
- use perl \ |
802 |
- && myopts="${myopts} INSTALLDIRS=vendor" \ |
803 |
- || myopts="${myopts} NO_PERL=YesPlease" |
804 |
- use python \ |
805 |
- || myopts="${myopts} NO_PYTHON=YesPlease" |
806 |
- use subversion \ |
807 |
- || myopts="${myopts} NO_SVN_TESTS=YesPlease" |
808 |
- use threads \ |
809 |
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \ |
810 |
- || myopts="${myopts} NO_PTHREADS=YesPlease" |
811 |
- use cvs \ |
812 |
- || myopts="${myopts} NO_CVS=YesPlease" |
813 |
-# Disabled until ~m68k-mint can be keyworded again |
814 |
-# if [[ ${CHOST} == *-mint* ]] ; then |
815 |
-# myopts="${myopts} NO_MMAP=YesPlease" |
816 |
-# myopts="${myopts} NO_IPV6=YesPlease" |
817 |
-# myopts="${myopts} NO_STRLCPY=YesPlease" |
818 |
-# myopts="${myopts} NO_MEMMEM=YesPlease" |
819 |
-# myopts="${myopts} NO_MKDTEMP=YesPlease" |
820 |
-# myopts="${myopts} NO_MKSTEMPS=YesPlease" |
821 |
-# fi |
822 |
- if [[ ${CHOST} == ia64-*-hpux* ]]; then |
823 |
- myopts="${myopts} NO_NSEC=YesPlease" |
824 |
- fi |
825 |
- if [[ ${CHOST} == *-*-aix* ]]; then |
826 |
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" |
827 |
- fi |
828 |
- if [[ ${CHOST} == *-solaris* ]]; then |
829 |
- myopts="${myopts} NEEDS_LIBICONV=YesPlease" |
830 |
- fi |
831 |
- |
832 |
- has_version '>=app-text/asciidoc-8.0' \ |
833 |
- && myopts="${myopts} ASCIIDOC8=YesPlease" |
834 |
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" |
835 |
- |
836 |
- # Bug 290465: |
837 |
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' |
838 |
- [[ "${CHOST}" == *-uclibc* ]] && \ |
839 |
- myopts="${myopts} NO_NSEC=YesPlease" |
840 |
- |
841 |
- export MY_MAKEOPTS="${myopts}" |
842 |
- export EXTLIBS="${extlibs}" |
843 |
-} |
844 |
- |
845 |
-src_unpack() { |
846 |
- if [[ ${PV} != *9999 ]]; then |
847 |
- unpack ${MY_P}.tar.${SRC_URI_SUFFIX} |
848 |
- cd "${S}" |
849 |
- unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
850 |
- use doc && \ |
851 |
- cd "${S}"/Documentation && \ |
852 |
- unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
853 |
- cd "${S}" |
854 |
- else |
855 |
- git-2_src_unpack |
856 |
- cd "${S}" |
857 |
- #cp "${FILESDIR}"/GIT-VERSION-GEN . |
858 |
- fi |
859 |
- |
860 |
-} |
861 |
- |
862 |
-src_prepare() { |
863 |
- # bug #350330 - automagic CVS when we don't want it is bad. |
864 |
- epatch "${FILESDIR}"/git-1.8.5-optional-cvs.patch |
865 |
- |
866 |
- # honor and correctly quote DISTDIR (from upstream git master) |
867 |
- epatch "${FILESDIR}"/git-1.8.5-mw-destdir.patch |
868 |
- |
869 |
- # install mediawiki perl modules also in vendor_dir |
870 |
- # hack, needs better upstream solution |
871 |
- epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch |
872 |
- |
873 |
- sed -i \ |
874 |
- -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ |
875 |
- -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ |
876 |
- -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ |
877 |
- -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ |
878 |
- -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ |
879 |
- -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ |
880 |
- Makefile contrib/svn-fe/Makefile || die "sed failed" |
881 |
- |
882 |
- # Never install the private copy of Error.pm (bug #296310) |
883 |
- sed -i \ |
884 |
- -e '/private-Error.pm/s,^,#,' \ |
885 |
- perl/Makefile.PL |
886 |
- |
887 |
- # Fix docbook2texi command |
888 |
- sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ |
889 |
- Documentation/Makefile || die "sed failed" |
890 |
- |
891 |
- # Fix git-subtree missing DESTDIR |
892 |
- sed -i \ |
893 |
- -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ |
894 |
- -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ |
895 |
- contrib/subtree/Makefile |
896 |
-} |
897 |
- |
898 |
-git_emake() { |
899 |
- # bug #326625: PERL_PATH, PERL_MM_OPT |
900 |
- # bug #320647: PYTHON_PATH |
901 |
- PYTHON_PATH="" |
902 |
- use python && PYTHON_PATH="${PYTHON}" |
903 |
- emake ${MY_MAKEOPTS} \ |
904 |
- DESTDIR="${D}" \ |
905 |
- OPTCFLAGS="${CFLAGS}" \ |
906 |
- OPTLDFLAGS="${LDFLAGS}" \ |
907 |
- OPTCC="$(tc-getCC)" \ |
908 |
- OPTAR="$(tc-getAR)" \ |
909 |
- prefix="${EPREFIX}"/usr \ |
910 |
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
911 |
- sysconfdir="${EPREFIX}"/etc \ |
912 |
- PYTHON_PATH="${PYTHON_PATH}" \ |
913 |
- PERL_MM_OPT="" \ |
914 |
- GIT_TEST_OPTS="--no-color" \ |
915 |
- V=1 \ |
916 |
- "$@" |
917 |
- # This is the fix for bug #326625, but it also causes breakage, see bug |
918 |
- # #352693. |
919 |
- # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ |
920 |
-} |
921 |
- |
922 |
-src_configure() { |
923 |
- exportmakeopts |
924 |
-} |
925 |
- |
926 |
-src_compile() { |
927 |
- if use perl ; then |
928 |
- git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" |
929 |
- git_emake perl/perl.mak || die "emake perl/perl.mak failed" |
930 |
- fi |
931 |
- git_emake || die "emake failed" |
932 |
- |
933 |
- if use emacs ; then |
934 |
- elisp-compile contrib/emacs/git{,-blame}.el |
935 |
- fi |
936 |
- |
937 |
- if use perl && use cgi ; then |
938 |
- git_emake \ |
939 |
- gitweb/gitweb.cgi \ |
940 |
- || die "emake gitweb/gitweb.cgi failed" |
941 |
- fi |
942 |
- |
943 |
- if [[ ${CHOST} == *-darwin* ]]; then |
944 |
- cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" |
945 |
- git_emake || die "emake credential-osxkeychain" |
946 |
- fi |
947 |
- |
948 |
- cd "${S}"/Documentation |
949 |
- if [[ ${PV} == *9999 ]] ; then |
950 |
- git_emake man \ |
951 |
- || die "emake man failed" |
952 |
- if use doc ; then |
953 |
- git_emake info html \ |
954 |
- || die "emake info html failed" |
955 |
- fi |
956 |
- else |
957 |
- if use doc ; then |
958 |
- git_emake info \ |
959 |
- || die "emake info html failed" |
960 |
- fi |
961 |
- fi |
962 |
- |
963 |
- if use subversion ; then |
964 |
- cd "${S}"/contrib/svn-fe |
965 |
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed" |
966 |
- if use doc ; then |
967 |
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" |
968 |
- fi |
969 |
- cd "${S}" |
970 |
- fi |
971 |
- |
972 |
- if use gnome-keyring ; then |
973 |
- cd "${S}"/contrib/credential/gnome-keyring |
974 |
- git_emake || die "emake git-credential-gnome-keyring failed" |
975 |
- fi |
976 |
- |
977 |
- cd "${S}"/contrib/subtree |
978 |
- git_emake |
979 |
- use doc && git_emake doc |
980 |
- |
981 |
- if use mediawiki ; then |
982 |
- cd "${S}"/contrib/mw-to-git |
983 |
- git_emake |
984 |
- fi |
985 |
-} |
986 |
- |
987 |
-src_install() { |
988 |
- git_emake \ |
989 |
- install || \ |
990 |
- die "make install failed" |
991 |
- |
992 |
- if [[ ${CHOST} == *-darwin* ]]; then |
993 |
- dobin contrib/credential/osxkeychain/git-credential-osxkeychain |
994 |
- fi |
995 |
- |
996 |
- # Depending on the tarball and manual rebuild of the documentation, the |
997 |
- # manpages may exist in either OR both of these directories. |
998 |
- find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] |
999 |
- find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] |
1000 |
- |
1001 |
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines} |
1002 |
- use doc && dodir /usr/share/doc/${PF}/html |
1003 |
- for d in / /howto/ /technical/ ; do |
1004 |
- docinto ${d} |
1005 |
- dodoc Documentation${d}*.txt |
1006 |
- use doc && dohtml -p ${d} Documentation${d}*.html |
1007 |
- done |
1008 |
- docinto / |
1009 |
- # Upstream does not ship this pre-built :-( |
1010 |
- use doc && doinfo Documentation/{git,gitman}.info |
1011 |
- |
1012 |
- newbashcomp contrib/completion/git-completion.bash ${PN} |
1013 |
- newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt |
1014 |
- |
1015 |
- if use emacs ; then |
1016 |
- elisp-install ${PN} contrib/emacs/git.{el,elc} |
1017 |
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc} |
1018 |
- #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} |
1019 |
- # don't add automatically to the load-path, so the sitefile |
1020 |
- # can do a conditional loading |
1021 |
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch" |
1022 |
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
1023 |
- fi |
1024 |
- |
1025 |
- if use python && use gtk ; then |
1026 |
- python_doscript "${S}"/contrib/gitview/gitview |
1027 |
- dodoc "${S}"/contrib/gitview/gitview.txt |
1028 |
- fi |
1029 |
- |
1030 |
- #dobin contrib/fast-import/git-p4 # Moved upstream |
1031 |
- #dodoc contrib/fast-import/git-p4.txt # Moved upstream |
1032 |
- newbin contrib/fast-import/import-tars.perl import-tars |
1033 |
- exeinto /usr/libexec/git-core/ |
1034 |
- newexe contrib/git-resurrect.sh git-resurrect |
1035 |
- |
1036 |
- # git-subtree |
1037 |
- cd "${S}"/contrib/subtree |
1038 |
- git_emake install || die "Failed to emake install git-subtree" |
1039 |
- if use doc ; then |
1040 |
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" |
1041 |
- fi |
1042 |
- newdoc README README.git-subtree |
1043 |
- dodoc git-subtree.txt |
1044 |
- cd "${S}" |
1045 |
- |
1046 |
- if use mediawiki ; then |
1047 |
- cd "${S}"/contrib/mw-to-git |
1048 |
- git_emake install |
1049 |
- cd "${S}" |
1050 |
- fi |
1051 |
- |
1052 |
- # git-diffall |
1053 |
- dobin contrib/diffall/git-diffall |
1054 |
- newdoc contrib/diffall/README git-diffall.txt |
1055 |
- |
1056 |
- # diff-highlight |
1057 |
- dobin contrib/diff-highlight/diff-highlight |
1058 |
- newdoc contrib/diff-highlight/README README.diff-highlight |
1059 |
- |
1060 |
- # git-jump |
1061 |
- exeinto /usr/libexec/git-core/ |
1062 |
- doexe contrib/git-jump/git-jump |
1063 |
- newdoc contrib/git-jump/README git-jump.txt |
1064 |
- |
1065 |
- # git-contacts |
1066 |
- exeinto /usr/libexec/git-core/ |
1067 |
- doexe contrib/contacts/git-contacts |
1068 |
- dodoc contrib/contacts/git-contacts.txt |
1069 |
- |
1070 |
- if use gnome-keyring ; then |
1071 |
- cd "${S}"/contrib/credential/gnome-keyring |
1072 |
- dobin git-credential-gnome-keyring |
1073 |
- fi |
1074 |
- |
1075 |
- if use subversion ; then |
1076 |
- cd "${S}"/contrib/svn-fe |
1077 |
- dobin svn-fe |
1078 |
- dodoc svn-fe.txt |
1079 |
- use doc && doman svn-fe.1 && dohtml svn-fe.html |
1080 |
- cd "${S}" |
1081 |
- fi |
1082 |
- |
1083 |
- # remote-helpers |
1084 |
- if use python ; then |
1085 |
- python_scriptinto /usr/libexec/git-core/ |
1086 |
- python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg} |
1087 |
- python_optimize |
1088 |
- fi |
1089 |
- |
1090 |
- dodir /usr/share/${PN}/contrib |
1091 |
- # The following are excluded: |
1092 |
- # completion - installed above |
1093 |
- # credential/gnome-keyring TODO |
1094 |
- # diff-highlight - done above |
1095 |
- # diffall - done above |
1096 |
- # emacs - installed above |
1097 |
- # examples - these are stuff that is not used in Git anymore actually |
1098 |
- # git-jump - done above |
1099 |
- # gitview - installed above |
1100 |
- # p4import - excluded because fast-import has a better one |
1101 |
- # patches - stuff the Git guys made to go upstream to other places |
1102 |
- # persistent-https - TODO |
1103 |
- # mw-to-git - TODO |
1104 |
- # subtree - build seperately |
1105 |
- # svnimport - use git-svn |
1106 |
- # thunderbird-patch-inline - fixes thunderbird |
1107 |
- for i in \ |
1108 |
- buildsystems convert-objects fast-import \ |
1109 |
- hg-to-git hooks remotes2config.sh rerere-train.sh \ |
1110 |
- stats vim workdir \ |
1111 |
- ; do |
1112 |
- cp -rf \ |
1113 |
- "${S}"/contrib/${i} \ |
1114 |
- "${ED}"/usr/share/${PN}/contrib \ |
1115 |
- || die "Failed contrib ${i}" |
1116 |
- done |
1117 |
- |
1118 |
- if use perl && use cgi ; then |
1119 |
- # We used to install in /usr/share/${PN}/gitweb |
1120 |
- # but upstream installs in /usr/share/gitweb |
1121 |
- # so we will install a symlink and use their location for compat with other |
1122 |
- # distros |
1123 |
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb |
1124 |
- |
1125 |
- # INSTALL discusses configuration issues, not just installation |
1126 |
- docinto / |
1127 |
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb |
1128 |
- newdoc "${S}"/gitweb/README README.gitweb |
1129 |
- |
1130 |
- find "${ED}"/usr/lib64/perl5/ \ |
1131 |
- -name .packlist \ |
1132 |
- -exec rm \{\} \; |
1133 |
- else |
1134 |
- rm -rf "${ED}"/usr/share/gitweb |
1135 |
- fi |
1136 |
- |
1137 |
- if ! use subversion ; then |
1138 |
- rm -f "${ED}"/usr/libexec/git-core/git-svn \ |
1139 |
- "${ED}"/usr/share/man/man1/git-svn.1* |
1140 |
- fi |
1141 |
- |
1142 |
- if use xinetd ; then |
1143 |
- insinto /etc/xinetd.d |
1144 |
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon |
1145 |
- fi |
1146 |
- |
1147 |
- if use !prefix ; then |
1148 |
- newinitd "${FILESDIR}"/git-daemon.initd git-daemon |
1149 |
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon |
1150 |
- systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" |
1151 |
- systemd_dounit "${FILESDIR}/git-daemon.socket" |
1152 |
- fi |
1153 |
- |
1154 |
- fixlocalpod |
1155 |
-} |
1156 |
- |
1157 |
-src_test() { |
1158 |
- local disabled="" |
1159 |
- local tests_cvs="t9200-git-cvsexportcommit.sh \ |
1160 |
- t9400-git-cvsserver-server.sh \ |
1161 |
- t9401-git-cvsserver-crlf.sh \ |
1162 |
- t9402-git-cvsserver-refs.sh \ |
1163 |
- t9600-cvsimport.sh \ |
1164 |
- t9601-cvsimport-vendor-branch.sh \ |
1165 |
- t9602-cvsimport-branches-tags.sh \ |
1166 |
- t9603-cvsimport-patchsets.sh \ |
1167 |
- t9604-cvsimport-timestamps.sh" |
1168 |
- local tests_perl="t3701-add-interactive.sh \ |
1169 |
- t5502-quickfetch.sh \ |
1170 |
- t5512-ls-remote.sh \ |
1171 |
- t5520-pull.sh \ |
1172 |
- t7106-reset-unborn-branch.sh \ |
1173 |
- t7501-commit.sh" |
1174 |
- # Bug #225601 - t0004 is not suitable for root perm |
1175 |
- # Bug #219839 - t1004 is not suitable for root perm |
1176 |
- # t0001-init.sh - check for init notices EPERM* fails |
1177 |
- local tests_nonroot="t0001-init.sh \ |
1178 |
- t0004-unwritable.sh \ |
1179 |
- t0070-fundamental.sh \ |
1180 |
- t1004-read-tree-m-u-wf.sh \ |
1181 |
- t3700-add.sh \ |
1182 |
- t7300-clean.sh" |
1183 |
- # t9100 still fails with symlinks in SVN 1.7 |
1184 |
- local test_svn="t9100-git-svn-basic.sh" |
1185 |
- |
1186 |
- # Unzip is used only for the testcase code, not by any normal parts of Git. |
1187 |
- if ! has_version app-arch/unzip ; then |
1188 |
- einfo "Disabling tar-tree tests" |
1189 |
- disabled="${disabled} t5000-tar-tree.sh" |
1190 |
- fi |
1191 |
- |
1192 |
- cvs=0 |
1193 |
- use cvs && let cvs=$cvs+1 |
1194 |
- if [[ ${EUID} -eq 0 ]]; then |
1195 |
- if [[ $cvs -eq 1 ]]; then |
1196 |
- ewarn "Skipping CVS tests because CVS does not work as root!" |
1197 |
- ewarn "You should retest with FEATURES=userpriv!" |
1198 |
- disabled="${disabled} ${tests_cvs}" |
1199 |
- fi |
1200 |
- einfo "Skipping other tests that require being non-root" |
1201 |
- disabled="${disabled} ${tests_nonroot}" |
1202 |
- else |
1203 |
- [[ $cvs -gt 0 ]] && \ |
1204 |
- has_version dev-vcs/cvs && \ |
1205 |
- let cvs=$cvs+1 |
1206 |
- [[ $cvs -gt 1 ]] && \ |
1207 |
- has_version "dev-vcs/cvs[server]" && \ |
1208 |
- let cvs=$cvs+1 |
1209 |
- if [[ $cvs -lt 3 ]]; then |
1210 |
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" |
1211 |
- disabled="${disabled} ${tests_cvs}" |
1212 |
- fi |
1213 |
- fi |
1214 |
- |
1215 |
- if ! use perl ; then |
1216 |
- einfo "Disabling tests that need Perl" |
1217 |
- disabled="${disabled} ${tests_perl}" |
1218 |
- fi |
1219 |
- |
1220 |
- einfo "Disabling tests that fail with SVN 1.7" |
1221 |
- disabled="${disabled} ${test_svn}" |
1222 |
- |
1223 |
- # Reset all previously disabled tests |
1224 |
- cd "${S}/t" |
1225 |
- for i in *.sh.DISABLED ; do |
1226 |
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" |
1227 |
- done |
1228 |
- einfo "Disabled tests:" |
1229 |
- for i in ${disabled} ; do |
1230 |
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" |
1231 |
- done |
1232 |
- |
1233 |
- # Avoid the test system removing the results because we want them ourselves |
1234 |
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ |
1235 |
- -i "${S}"/t/Makefile |
1236 |
- |
1237 |
- # Clean old results first, must always run |
1238 |
- cd "${S}/t" |
1239 |
- nonfatal git_emake clean |
1240 |
- |
1241 |
- # Now run the tests, keep going if we hit an error, and don't terminate on |
1242 |
- # failure |
1243 |
- cd "${S}" |
1244 |
- einfo "Start test run" |
1245 |
- #MAKEOPTS=-j1 |
1246 |
- nonfatal git_emake --keep-going test |
1247 |
- rc=$? |
1248 |
- |
1249 |
- # Display nice results, now print the results |
1250 |
- cd "${S}/t" |
1251 |
- nonfatal git_emake aggregate-results |
1252 |
- |
1253 |
- # And bail if there was a problem |
1254 |
- [ $rc -eq 0 ] || die "tests failed. Please file a bug." |
1255 |
-} |
1256 |
- |
1257 |
-showpkgdeps() { |
1258 |
- local pkg=$1 |
1259 |
- shift |
1260 |
- elog " $(printf "%-17s:" ${pkg}) ${@}" |
1261 |
-} |
1262 |
- |
1263 |
-pkg_postinst() { |
1264 |
- use emacs && elisp-site-regen |
1265 |
- einfo "Please read /usr/share/bash-completion/git for Git bash command completion" |
1266 |
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt" |
1267 |
- einfo "Note that the prompt bash code is now in the seperate script" |
1268 |
- elog "These additional scripts need some dependencies:" |
1269 |
- echo |
1270 |
- showpkgdeps git-quiltimport "dev-util/quilt" |
1271 |
- showpkgdeps git-instaweb \ |
1272 |
- "|| ( www-servers/lighttpd www-servers/apache )" |
1273 |
- echo |
1274 |
-} |
1275 |
- |
1276 |
-pkg_postrm() { |
1277 |
- use emacs && elisp-site-regen |
1278 |
-} |
1279 |
|
1280 |
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild |
1281 |
deleted file mode 100644 |
1282 |
index 4d4ee50..0000000 |
1283 |
--- a/dev-vcs/git/git-9999.ebuild |
1284 |
+++ /dev/null |
1285 |
@@ -1,618 +0,0 @@ |
1286 |
-# Copyright 1999-2013 Gentoo Foundation |
1287 |
-# Distributed under the terms of the GNU General Public License v2 |
1288 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.50 2013/12/11 10:27:22 polynomial-c Exp $ |
1289 |
- |
1290 |
-EAPI=5 |
1291 |
- |
1292 |
-GENTOO_DEPEND_ON_PERL=no |
1293 |
- |
1294 |
-# bug #329479: git-remote-testgit is not multiple-version aware |
1295 |
-PYTHON_COMPAT=( python2_{6,7} ) |
1296 |
-[[ ${PV} == *9999 ]] && SCM="git-2" |
1297 |
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" |
1298 |
- |
1299 |
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
1300 |
- |
1301 |
-MY_PV="${PV/_rc/.rc}" |
1302 |
-MY_P="${PN}-${MY_PV}" |
1303 |
- |
1304 |
-DOC_VER=${MY_PV} |
1305 |
- |
1306 |
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" |
1307 |
-HOMEPAGE="http://www.git-scm.com/" |
1308 |
-if [[ ${PV} != *9999 ]]; then |
1309 |
- SRC_URI_SUFFIX="gz" |
1310 |
- SRC_URI_GOOG="http://git-core.googlecode.com/files" |
1311 |
- SRC_URI_KORG="mirror://kernel/software/scm/git" |
1312 |
- SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} |
1313 |
- ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} |
1314 |
- ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
1315 |
- ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
1316 |
- doc? ( |
1317 |
- ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
1318 |
- ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
1319 |
- )" |
1320 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
1321 |
-else |
1322 |
- SRC_URI="" |
1323 |
- KEYWORDS="" |
1324 |
-fi |
1325 |
- |
1326 |
-LICENSE="GPL-2" |
1327 |
-SLOT="0" |
1328 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
1329 |
- |
1330 |
-# Common to both DEPEND and RDEPEND |
1331 |
-CDEPEND=" |
1332 |
- dev-libs/openssl |
1333 |
- sys-libs/zlib |
1334 |
- pcre? ( dev-libs/libpcre ) |
1335 |
- perl? ( dev-lang/perl[-build(-)] ) |
1336 |
- tk? ( dev-lang/tk ) |
1337 |
- curl? ( |
1338 |
- net-misc/curl |
1339 |
- webdav? ( dev-libs/expat ) |
1340 |
- ) |
1341 |
- emacs? ( virtual/emacs ) |
1342 |
- gnome-keyring? ( gnome-base/gnome-keyring )" |
1343 |
- |
1344 |
-RDEPEND="${CDEPEND} |
1345 |
- gpg? ( app-crypt/gnupg ) |
1346 |
- perl? ( dev-perl/Error |
1347 |
- dev-perl/Net-SMTP-SSL |
1348 |
- dev-perl/Authen-SASL |
1349 |
- cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) |
1350 |
- cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) |
1351 |
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) |
1352 |
- ) |
1353 |
- python? ( gtk? |
1354 |
- ( |
1355 |
- >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] |
1356 |
- >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] |
1357 |
- ) |
1358 |
- ${PYTHON_DEPS} )" |
1359 |
- |
1360 |
-# This is how info docs are created with Git: |
1361 |
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook |
1362 |
-# .xml/docbook --(docbook2texi.pl)--> .texi |
1363 |
-# .texi --(makeinfo)---------> .info |
1364 |
-DEPEND="${CDEPEND} |
1365 |
- app-arch/cpio |
1366 |
- doc? ( |
1367 |
- app-text/asciidoc |
1368 |
- app-text/docbook2X |
1369 |
- sys-apps/texinfo |
1370 |
- app-text/xmlto |
1371 |
- ) |
1372 |
- test? ( |
1373 |
- app-crypt/gnupg |
1374 |
- )" |
1375 |
- |
1376 |
-# Live ebuild builds man pages and HTML docs, additionally |
1377 |
-if [[ ${PV} == *9999 ]]; then |
1378 |
- DEPEND="${DEPEND} |
1379 |
- app-text/asciidoc" |
1380 |
-fi |
1381 |
- |
1382 |
-SITEFILE=50${PN}-gentoo.el |
1383 |
-S="${WORKDIR}/${MY_P}" |
1384 |
- |
1385 |
-REQUIRED_USE=" |
1386 |
- cgi? ( perl ) |
1387 |
- cvs? ( perl ) |
1388 |
- subversion? ( perl ) |
1389 |
- webdav? ( curl ) |
1390 |
- gtk? ( python ) |
1391 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
1392 |
-" |
1393 |
- |
1394 |
-pkg_setup() { |
1395 |
- if use subversion && has_version "dev-vcs/subversion[dso]"; then |
1396 |
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" |
1397 |
- ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
1398 |
- ewarn "have been warned." |
1399 |
- fi |
1400 |
- if use python ; then |
1401 |
- python-single-r1_pkg_setup |
1402 |
- fi |
1403 |
-} |
1404 |
- |
1405 |
-# This is needed because for some obscure reasons future calls to make don't |
1406 |
-# pick up these exports if we export them in src_unpack() |
1407 |
-exportmakeopts() { |
1408 |
- local myopts |
1409 |
- |
1410 |
- if use blksha1 ; then |
1411 |
- myopts="${myopts} BLK_SHA1=YesPlease" |
1412 |
- elif use ppcsha1 ; then |
1413 |
- myopts="${myopts} PPC_SHA1=YesPlease" |
1414 |
- fi |
1415 |
- |
1416 |
- if use curl ; then |
1417 |
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease" |
1418 |
- else |
1419 |
- myopts="${myopts} NO_CURL=YesPlease" |
1420 |
- fi |
1421 |
- |
1422 |
- # broken assumptions, because of broken build system ... |
1423 |
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" |
1424 |
- myopts="${myopts} INSTALL=install TAR=tar" |
1425 |
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" |
1426 |
- myopts="${myopts} SANE_TOOL_PATH=" |
1427 |
- myopts="${myopts} OLD_ICONV=" |
1428 |
- myopts="${myopts} NO_EXTERNAL_GREP=" |
1429 |
- |
1430 |
- # For svn-fe |
1431 |
- extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" |
1432 |
- |
1433 |
- # can't define this to null, since the entire makefile depends on it |
1434 |
- sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile |
1435 |
- |
1436 |
- use iconv \ |
1437 |
- || myopts="${myopts} NO_ICONV=YesPlease" |
1438 |
- use nls \ |
1439 |
- || myopts="${myopts} NO_GETTEXT=YesPlease" |
1440 |
- use tk \ |
1441 |
- || myopts="${myopts} NO_TCLTK=YesPlease" |
1442 |
- use pcre \ |
1443 |
- && myopts="${myopts} USE_LIBPCRE=yes" \ |
1444 |
- && extlibs="${extlibs} -lpcre" |
1445 |
- use perl \ |
1446 |
- && myopts="${myopts} INSTALLDIRS=vendor" \ |
1447 |
- || myopts="${myopts} NO_PERL=YesPlease" |
1448 |
- use python \ |
1449 |
- || myopts="${myopts} NO_PYTHON=YesPlease" |
1450 |
- use subversion \ |
1451 |
- || myopts="${myopts} NO_SVN_TESTS=YesPlease" |
1452 |
- use threads \ |
1453 |
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \ |
1454 |
- || myopts="${myopts} NO_PTHREADS=YesPlease" |
1455 |
- use cvs \ |
1456 |
- || myopts="${myopts} NO_CVS=YesPlease" |
1457 |
-# Disabled until ~m68k-mint can be keyworded again |
1458 |
-# if [[ ${CHOST} == *-mint* ]] ; then |
1459 |
-# myopts="${myopts} NO_MMAP=YesPlease" |
1460 |
-# myopts="${myopts} NO_IPV6=YesPlease" |
1461 |
-# myopts="${myopts} NO_STRLCPY=YesPlease" |
1462 |
-# myopts="${myopts} NO_MEMMEM=YesPlease" |
1463 |
-# myopts="${myopts} NO_MKDTEMP=YesPlease" |
1464 |
-# myopts="${myopts} NO_MKSTEMPS=YesPlease" |
1465 |
-# fi |
1466 |
- if [[ ${CHOST} == ia64-*-hpux* ]]; then |
1467 |
- myopts="${myopts} NO_NSEC=YesPlease" |
1468 |
- fi |
1469 |
- if [[ ${CHOST} == *-*-aix* ]]; then |
1470 |
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" |
1471 |
- fi |
1472 |
- if [[ ${CHOST} == *-solaris* ]]; then |
1473 |
- myopts="${myopts} NEEDS_LIBICONV=YesPlease" |
1474 |
- fi |
1475 |
- |
1476 |
- has_version '>=app-text/asciidoc-8.0' \ |
1477 |
- && myopts="${myopts} ASCIIDOC8=YesPlease" |
1478 |
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" |
1479 |
- |
1480 |
- # Bug 290465: |
1481 |
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' |
1482 |
- [[ "${CHOST}" == *-uclibc* ]] && \ |
1483 |
- myopts="${myopts} NO_NSEC=YesPlease" |
1484 |
- |
1485 |
- export MY_MAKEOPTS="${myopts}" |
1486 |
- export EXTLIBS="${extlibs}" |
1487 |
-} |
1488 |
- |
1489 |
-src_unpack() { |
1490 |
- if [[ ${PV} != *9999 ]]; then |
1491 |
- unpack ${MY_P}.tar.${SRC_URI_SUFFIX} |
1492 |
- cd "${S}" |
1493 |
- unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
1494 |
- use doc && \ |
1495 |
- cd "${S}"/Documentation && \ |
1496 |
- unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
1497 |
- cd "${S}" |
1498 |
- else |
1499 |
- git-2_src_unpack |
1500 |
- cd "${S}" |
1501 |
- #cp "${FILESDIR}"/GIT-VERSION-GEN . |
1502 |
- fi |
1503 |
- |
1504 |
-} |
1505 |
- |
1506 |
-src_prepare() { |
1507 |
- # bug #350330 - automagic CVS when we don't want it is bad. |
1508 |
- epatch "${FILESDIR}"/git-1.8.5-optional-cvs.patch |
1509 |
- |
1510 |
- sed -i \ |
1511 |
- -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ |
1512 |
- -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ |
1513 |
- -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ |
1514 |
- -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ |
1515 |
- -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ |
1516 |
- -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ |
1517 |
- Makefile contrib/svn-fe/Makefile || die "sed failed" |
1518 |
- |
1519 |
- # Never install the private copy of Error.pm (bug #296310) |
1520 |
- sed -i \ |
1521 |
- -e '/private-Error.pm/s,^,#,' \ |
1522 |
- perl/Makefile.PL |
1523 |
- |
1524 |
- # Fix docbook2texi command |
1525 |
- sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ |
1526 |
- Documentation/Makefile || die "sed failed" |
1527 |
- |
1528 |
- # Fix git-subtree missing DESTDIR |
1529 |
- sed -i \ |
1530 |
- -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ |
1531 |
- -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ |
1532 |
- contrib/subtree/Makefile |
1533 |
-} |
1534 |
- |
1535 |
-git_emake() { |
1536 |
- # bug #326625: PERL_PATH, PERL_MM_OPT |
1537 |
- # bug #320647: PYTHON_PATH |
1538 |
- PYTHON_PATH="" |
1539 |
- use python && PYTHON_PATH="${PYTHON}" |
1540 |
- emake ${MY_MAKEOPTS} \ |
1541 |
- DESTDIR="${D}" \ |
1542 |
- OPTCFLAGS="${CFLAGS}" \ |
1543 |
- OPTLDFLAGS="${LDFLAGS}" \ |
1544 |
- OPTCC="$(tc-getCC)" \ |
1545 |
- OPTAR="$(tc-getAR)" \ |
1546 |
- prefix="${EPREFIX}"/usr \ |
1547 |
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
1548 |
- sysconfdir="${EPREFIX}"/etc \ |
1549 |
- PYTHON_PATH="${PYTHON_PATH}" \ |
1550 |
- PERL_MM_OPT="" \ |
1551 |
- GIT_TEST_OPTS="--no-color" \ |
1552 |
- V=1 \ |
1553 |
- "$@" |
1554 |
- # This is the fix for bug #326625, but it also causes breakage, see bug |
1555 |
- # #352693. |
1556 |
- # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ |
1557 |
-} |
1558 |
- |
1559 |
-src_configure() { |
1560 |
- exportmakeopts |
1561 |
-} |
1562 |
- |
1563 |
-src_compile() { |
1564 |
- if use perl ; then |
1565 |
- git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" |
1566 |
- git_emake perl/perl.mak || die "emake perl/perl.mak failed" |
1567 |
- fi |
1568 |
- git_emake || die "emake failed" |
1569 |
- |
1570 |
- if use emacs ; then |
1571 |
- elisp-compile contrib/emacs/git{,-blame}.el |
1572 |
- fi |
1573 |
- |
1574 |
- if use perl && use cgi ; then |
1575 |
- git_emake \ |
1576 |
- gitweb/gitweb.cgi \ |
1577 |
- || die "emake gitweb/gitweb.cgi failed" |
1578 |
- fi |
1579 |
- |
1580 |
- if [[ ${CHOST} == *-darwin* ]]; then |
1581 |
- cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" |
1582 |
- git_emake || die "emake credential-osxkeychain" |
1583 |
- fi |
1584 |
- |
1585 |
- cd "${S}"/Documentation |
1586 |
- if [[ ${PV} == *9999 ]] ; then |
1587 |
- git_emake man \ |
1588 |
- || die "emake man failed" |
1589 |
- if use doc ; then |
1590 |
- git_emake info html \ |
1591 |
- || die "emake info html failed" |
1592 |
- fi |
1593 |
- else |
1594 |
- if use doc ; then |
1595 |
- git_emake info \ |
1596 |
- || die "emake info html failed" |
1597 |
- fi |
1598 |
- fi |
1599 |
- |
1600 |
- if use subversion ; then |
1601 |
- cd "${S}"/contrib/svn-fe |
1602 |
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed" |
1603 |
- if use doc ; then |
1604 |
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" |
1605 |
- fi |
1606 |
- cd "${S}" |
1607 |
- fi |
1608 |
- |
1609 |
- if use gnome-keyring ; then |
1610 |
- cd "${S}"/contrib/credential/gnome-keyring |
1611 |
- git_emake || die "emake git-credential-gnome-keyring failed" |
1612 |
- fi |
1613 |
- |
1614 |
- cd "${S}"/contrib/subtree |
1615 |
- git_emake |
1616 |
- use doc && git_emake doc |
1617 |
-} |
1618 |
- |
1619 |
-src_install() { |
1620 |
- git_emake \ |
1621 |
- install || \ |
1622 |
- die "make install failed" |
1623 |
- |
1624 |
- if [[ ${CHOST} == *-darwin* ]]; then |
1625 |
- dobin contrib/credential/osxkeychain/git-credential-osxkeychain |
1626 |
- fi |
1627 |
- |
1628 |
- # Depending on the tarball and manual rebuild of the documentation, the |
1629 |
- # manpages may exist in either OR both of these directories. |
1630 |
- find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] |
1631 |
- find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] |
1632 |
- |
1633 |
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines} |
1634 |
- use doc && dodir /usr/share/doc/${PF}/html |
1635 |
- for d in / /howto/ /technical/ ; do |
1636 |
- docinto ${d} |
1637 |
- dodoc Documentation${d}*.txt |
1638 |
- use doc && dohtml -p ${d} Documentation${d}*.html |
1639 |
- done |
1640 |
- docinto / |
1641 |
- # Upstream does not ship this pre-built :-( |
1642 |
- use doc && doinfo Documentation/{git,gitman}.info |
1643 |
- |
1644 |
- newbashcomp contrib/completion/git-completion.bash ${PN} |
1645 |
- newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt |
1646 |
- |
1647 |
- if use emacs ; then |
1648 |
- elisp-install ${PN} contrib/emacs/git.{el,elc} |
1649 |
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc} |
1650 |
- #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} |
1651 |
- # don't add automatically to the load-path, so the sitefile |
1652 |
- # can do a conditional loading |
1653 |
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch" |
1654 |
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
1655 |
- fi |
1656 |
- |
1657 |
- if use python && use gtk ; then |
1658 |
- python_doscript "${S}"/contrib/gitview/gitview |
1659 |
- dodoc "${S}"/contrib/gitview/gitview.txt |
1660 |
- fi |
1661 |
- |
1662 |
- #dobin contrib/fast-import/git-p4 # Moved upstream |
1663 |
- #dodoc contrib/fast-import/git-p4.txt # Moved upstream |
1664 |
- newbin contrib/fast-import/import-tars.perl import-tars |
1665 |
- exeinto /usr/libexec/git-core/ |
1666 |
- newexe contrib/git-resurrect.sh git-resurrect |
1667 |
- |
1668 |
- # git-subtree |
1669 |
- cd "${S}"/contrib/subtree |
1670 |
- git_emake install || die "Failed to emake install git-subtree" |
1671 |
- if use doc ; then |
1672 |
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" |
1673 |
- fi |
1674 |
- newdoc README README.git-subtree |
1675 |
- dodoc git-subtree.txt |
1676 |
- cd "${S}" |
1677 |
- |
1678 |
- # git-diffall |
1679 |
- dobin contrib/diffall/git-diffall |
1680 |
- newdoc contrib/diffall/README git-diffall.txt |
1681 |
- |
1682 |
- # diff-highlight |
1683 |
- dobin contrib/diff-highlight/diff-highlight |
1684 |
- newdoc contrib/diff-highlight/README README.diff-highlight |
1685 |
- |
1686 |
- # git-jump |
1687 |
- exeinto /usr/libexec/git-core/ |
1688 |
- doexe contrib/git-jump/git-jump |
1689 |
- newdoc contrib/git-jump/README git-jump.txt |
1690 |
- |
1691 |
- # git-contacts |
1692 |
- exeinto /usr/libexec/git-core/ |
1693 |
- doexe contrib/contacts/git-contacts |
1694 |
- dodoc contrib/contacts/git-contacts.txt |
1695 |
- |
1696 |
- if use gnome-keyring ; then |
1697 |
- cd "${S}"/contrib/credential/gnome-keyring |
1698 |
- dobin git-credential-gnome-keyring |
1699 |
- fi |
1700 |
- |
1701 |
- if use subversion ; then |
1702 |
- cd "${S}"/contrib/svn-fe |
1703 |
- dobin svn-fe |
1704 |
- dodoc svn-fe.txt |
1705 |
- use doc && doman svn-fe.1 && dohtml svn-fe.html |
1706 |
- cd "${S}" |
1707 |
- fi |
1708 |
- |
1709 |
- # remote-helpers |
1710 |
- if use python ; then |
1711 |
- python_scriptinto /usr/libexec/git-core/ |
1712 |
- python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg} |
1713 |
- python_optimize |
1714 |
- fi |
1715 |
- |
1716 |
- dodir /usr/share/${PN}/contrib |
1717 |
- # The following are excluded: |
1718 |
- # completion - installed above |
1719 |
- # credential/gnome-keyring TODO |
1720 |
- # diff-highlight - done above |
1721 |
- # diffall - done above |
1722 |
- # emacs - installed above |
1723 |
- # examples - these are stuff that is not used in Git anymore actually |
1724 |
- # git-jump - done above |
1725 |
- # gitview - installed above |
1726 |
- # p4import - excluded because fast-import has a better one |
1727 |
- # patches - stuff the Git guys made to go upstream to other places |
1728 |
- # persistent-https - TODO |
1729 |
- # mw-to-git - TODO |
1730 |
- # subtree - build seperately |
1731 |
- # svnimport - use git-svn |
1732 |
- # thunderbird-patch-inline - fixes thunderbird |
1733 |
- for i in \ |
1734 |
- buildsystems convert-objects fast-import \ |
1735 |
- hg-to-git hooks remotes2config.sh rerere-train.sh \ |
1736 |
- stats vim workdir \ |
1737 |
- ; do |
1738 |
- cp -rf \ |
1739 |
- "${S}"/contrib/${i} \ |
1740 |
- "${ED}"/usr/share/${PN}/contrib \ |
1741 |
- || die "Failed contrib ${i}" |
1742 |
- done |
1743 |
- |
1744 |
- if use perl && use cgi ; then |
1745 |
- # We used to install in /usr/share/${PN}/gitweb |
1746 |
- # but upstream installs in /usr/share/gitweb |
1747 |
- # so we will install a symlink and use their location for compat with other |
1748 |
- # distros |
1749 |
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb |
1750 |
- |
1751 |
- # INSTALL discusses configuration issues, not just installation |
1752 |
- docinto / |
1753 |
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb |
1754 |
- newdoc "${S}"/gitweb/README README.gitweb |
1755 |
- |
1756 |
- find "${ED}"/usr/lib64/perl5/ \ |
1757 |
- -name .packlist \ |
1758 |
- -exec rm \{\} \; |
1759 |
- else |
1760 |
- rm -rf "${ED}"/usr/share/gitweb |
1761 |
- fi |
1762 |
- |
1763 |
- if ! use subversion ; then |
1764 |
- rm -f "${ED}"/usr/libexec/git-core/git-svn \ |
1765 |
- "${ED}"/usr/share/man/man1/git-svn.1* |
1766 |
- fi |
1767 |
- |
1768 |
- if use xinetd ; then |
1769 |
- insinto /etc/xinetd.d |
1770 |
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon |
1771 |
- fi |
1772 |
- |
1773 |
- if use !prefix ; then |
1774 |
- newinitd "${FILESDIR}"/git-daemon.initd git-daemon |
1775 |
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon |
1776 |
- systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" |
1777 |
- systemd_dounit "${FILESDIR}/git-daemon.socket" |
1778 |
- fi |
1779 |
- |
1780 |
- fixlocalpod |
1781 |
-} |
1782 |
- |
1783 |
-src_test() { |
1784 |
- local disabled="" |
1785 |
- local tests_cvs="t9200-git-cvsexportcommit.sh \ |
1786 |
- t9400-git-cvsserver-server.sh \ |
1787 |
- t9401-git-cvsserver-crlf.sh \ |
1788 |
- t9600-cvsimport.sh \ |
1789 |
- t9601-cvsimport-vendor-branch.sh \ |
1790 |
- t9602-cvsimport-branches-tags.sh \ |
1791 |
- t9603-cvsimport-patchsets.sh \ |
1792 |
- t9604-cvsimport-timestamps.sh" |
1793 |
- local tests_perl="t3701-add-interactive.sh \ |
1794 |
- t5502-quickfetch.sh \ |
1795 |
- t5512-ls-remote.sh \ |
1796 |
- t5520-pull.sh \ |
1797 |
- t7106-reset-unborn-branch.sh \ |
1798 |
- t7501-commit.sh" |
1799 |
- # Bug #225601 - t0004 is not suitable for root perm |
1800 |
- # Bug #219839 - t1004 is not suitable for root perm |
1801 |
- # t0001-init.sh - check for init notices EPERM* fails |
1802 |
- local tests_nonroot="t0001-init.sh \ |
1803 |
- t0004-unwritable.sh \ |
1804 |
- t0070-fundamental.sh \ |
1805 |
- t1004-read-tree-m-u-wf.sh \ |
1806 |
- t3700-add.sh \ |
1807 |
- t7300-clean.sh" |
1808 |
- # t9100 still fails with symlinks in SVN 1.7 |
1809 |
- local test_svn="t9100-git-svn-basic.sh" |
1810 |
- |
1811 |
- # Unzip is used only for the testcase code, not by any normal parts of Git. |
1812 |
- if ! has_version app-arch/unzip ; then |
1813 |
- einfo "Disabling tar-tree tests" |
1814 |
- disabled="${disabled} t5000-tar-tree.sh" |
1815 |
- fi |
1816 |
- |
1817 |
- cvs=0 |
1818 |
- use cvs && let cvs=$cvs+1 |
1819 |
- if [[ ${EUID} -eq 0 ]]; then |
1820 |
- if [[ $cvs -eq 1 ]]; then |
1821 |
- ewarn "Skipping CVS tests because CVS does not work as root!" |
1822 |
- ewarn "You should retest with FEATURES=userpriv!" |
1823 |
- disabled="${disabled} ${tests_cvs}" |
1824 |
- fi |
1825 |
- einfo "Skipping other tests that require being non-root" |
1826 |
- disabled="${disabled} ${tests_nonroot}" |
1827 |
- else |
1828 |
- [[ $cvs -gt 0 ]] && \ |
1829 |
- has_version dev-vcs/cvs && \ |
1830 |
- let cvs=$cvs+1 |
1831 |
- [[ $cvs -gt 1 ]] && \ |
1832 |
- has_version "dev-vcs/cvs[server]" && \ |
1833 |
- let cvs=$cvs+1 |
1834 |
- if [[ $cvs -lt 3 ]]; then |
1835 |
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" |
1836 |
- disabled="${disabled} ${tests_cvs}" |
1837 |
- fi |
1838 |
- fi |
1839 |
- |
1840 |
- if ! use perl ; then |
1841 |
- einfo "Disabling tests that need Perl" |
1842 |
- disabled="${disabled} ${tests_perl}" |
1843 |
- fi |
1844 |
- |
1845 |
- einfo "Disabling tests that fail with SVN 1.7" |
1846 |
- disabled="${disabled} ${test_svn}" |
1847 |
- |
1848 |
- # Reset all previously disabled tests |
1849 |
- cd "${S}/t" |
1850 |
- for i in *.sh.DISABLED ; do |
1851 |
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" |
1852 |
- done |
1853 |
- einfo "Disabled tests:" |
1854 |
- for i in ${disabled} ; do |
1855 |
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" |
1856 |
- done |
1857 |
- |
1858 |
- # Avoid the test system removing the results because we want them ourselves |
1859 |
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ |
1860 |
- -i "${S}"/t/Makefile |
1861 |
- |
1862 |
- # Clean old results first, must always run |
1863 |
- cd "${S}/t" |
1864 |
- nonfatal git_emake clean |
1865 |
- |
1866 |
- # Now run the tests, keep going if we hit an error, and don't terminate on |
1867 |
- # failure |
1868 |
- cd "${S}" |
1869 |
- einfo "Start test run" |
1870 |
- #MAKEOPTS=-j1 |
1871 |
- nonfatal git_emake --keep-going test |
1872 |
- rc=$? |
1873 |
- |
1874 |
- # Display nice results, now print the results |
1875 |
- cd "${S}/t" |
1876 |
- nonfatal git_emake aggregate-results |
1877 |
- |
1878 |
- # And bail if there was a problem |
1879 |
- [ $rc -eq 0 ] || die "tests failed. Please file a bug." |
1880 |
-} |
1881 |
- |
1882 |
-showpkgdeps() { |
1883 |
- local pkg=$1 |
1884 |
- shift |
1885 |
- elog " $(printf "%-17s:" ${pkg}) ${@}" |
1886 |
-} |
1887 |
- |
1888 |
-pkg_postinst() { |
1889 |
- use emacs && elisp-site-regen |
1890 |
- einfo "Please read /usr/share/bash-completion/git for Git bash command completion" |
1891 |
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt" |
1892 |
- einfo "Note that the prompt bash code is now in the seperate script" |
1893 |
- elog "These additional scripts need some dependencies:" |
1894 |
- echo |
1895 |
- showpkgdeps git-quiltimport "dev-util/quilt" |
1896 |
- showpkgdeps git-instaweb \ |
1897 |
- "|| ( www-servers/lighttpd www-servers/apache )" |
1898 |
- echo |
1899 |
-} |
1900 |
- |
1901 |
-pkg_postrm() { |
1902 |
- use emacs && elisp-site-regen |
1903 |
-} |
1904 |
|
1905 |
diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml |
1906 |
deleted file mode 100644 |
1907 |
index 6f4d4ee..0000000 |
1908 |
--- a/dev-vcs/git/metadata.xml |
1909 |
+++ /dev/null |
1910 |
@@ -1,41 +0,0 @@ |
1911 |
-<?xml version="1.0" encoding="UTF-8"?> |
1912 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1913 |
-<pkgmetadata> |
1914 |
- <maintainer> |
1915 |
- <email>robbat2@g.o</email> |
1916 |
- <name>Robin H. Johnson</name> |
1917 |
- </maintainer> |
1918 |
- <maintainer> |
1919 |
- <email>prometheanfire@g.o</email> |
1920 |
- </maintainer> |
1921 |
- <maintainer> |
1922 |
- <email>polynomial-c@g.o</email> |
1923 |
- <name>Lars Wendler</name> |
1924 |
- </maintainer> |
1925 |
- <longdescription lang="en"> |
1926 |
- Git - Fast Version Control System. Official titled |
1927 |
- "GIT - the stupid content tracker". |
1928 |
- |
1929 |
- Git is a popular version control system designed to handle very large |
1930 |
- projects with speed and efficiency; it is used mainly for various open |
1931 |
- source projects, most notably the Linux kernel. |
1932 |
- |
1933 |
- Git falls in the category of distributed source code management tools, |
1934 |
- similar to e.g. GNU Arch or Monotone (or BitKeeper in the proprietary |
1935 |
- world). Every Git working directory is a full-fledged repository with full |
1936 |
- revision tracking capabilities, not dependent on network access or a central |
1937 |
- server. |
1938 |
- </longdescription> |
1939 |
- <use> |
1940 |
- <flag name="blksha1">Use the new optimized SHA1 implementation</flag> |
1941 |
- <flag name="cgi">Install gitweb too</flag> |
1942 |
- <flag name="curl">Support fetching and pushing (requires webdav too) over http:// and https:// protocols</flag> |
1943 |
- <flag name="gpg">Pull in gnupg for signing -- without gnupg, attempts at signing will fail at runtime!</flag> |
1944 |
- <flag name="gtk">Include the gitview contrib tool</flag> |
1945 |
- <flag name="highlight">GitWeb support for app-text/highlight</flag> |
1946 |
- <flag name="mediawiki">Support pulling and pushing from MediaWiki</flag> |
1947 |
- <flag name="ppcsha1">Make use of a bundled routine that is optimized for the PPC arch</flag> |
1948 |
- <flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support</flag> |
1949 |
- <flag name="webdav">Adds support for push'ing to HTTP/HTTPS repositories via DAV</flag> |
1950 |
- </use> |
1951 |
-</pkgmetadata> |