1 |
commit: 3b315e812ab4bf80acb45086577e8b2d3a9c1abd |
2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 4 20:29:01 2014 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 4 20:29:01 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=3b315e81 |
7 |
|
8 |
[dev-vcs/git] add mediawiki supprt, seems to work but perl files are in wrong dir still |
9 |
|
10 |
Package-Manager: portage-2.2.7 |
11 |
|
12 |
--- |
13 |
dev-vcs/git/Manifest | 3 - |
14 |
dev-vcs/git/files/git-1.8.2-optional-cvs.patch | 369 --------------- |
15 |
dev-vcs/git/files/git-1.8.5-mw-destdir.patch | 37 ++ |
16 |
dev-vcs/git/git-1.8.3.2-r1.ebuild | 614 ------------------------- |
17 |
dev-vcs/git/git-1.8.5.2.ebuild | 19 +- |
18 |
dev-vcs/git/metadata.xml | 1 + |
19 |
6 files changed, 55 insertions(+), 988 deletions(-) |
20 |
|
21 |
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest |
22 |
index 99e0dcb..b8dc6e1 100644 |
23 |
--- a/dev-vcs/git/Manifest |
24 |
+++ b/dev-vcs/git/Manifest |
25 |
@@ -1,6 +1,3 @@ |
26 |
-DIST git-1.8.3.2.tar.gz 4474347 SHA256 2f798db86859c85608fe4120f52a1b1cb13ca9c4daa4f59eb1dc090280f46473 SHA512 6e19948821dfbf78c5b9ea95614d3c10f4625583e3c17b6c55110b74f28679e525c449179cf49c2587a86c3b7fd7b6a27589824fcea0ec6fb69ca752a6942931 WHIRLPOOL 26892e039b67b35ae9df0a124d0812b36a22f481f146561b733a758b89a00770c05902c2820f2a783bc0fac07ecb335accbc939d21481da821177e0548d6a077 |
27 |
DIST git-1.8.5.2.tar.gz 4755707 SHA256 e986da24893197e33d835150c456708441e4a116a726ce9312a27f6de804f7b2 SHA512 73e408dd787b73a0f3935e37540d5da32a2f8d6d84af60d3ec7e224c3a953cc62eea749c7a689f8cca3b54e633f2520ed23d910ca5932021523e1fb750bf2c0a WHIRLPOOL d6623742cce0bdcb6b5334d363b44edeb6413e45fa42cb2bce013e07796dc98bd865b0d2c2578f2bd526140dceea25b19acbe212dc6afec7903c5dd6ea794d7f |
28 |
-DIST git-htmldocs-1.8.3.2.tar.gz 2115320 SHA256 805b7fc4399daf9258e8cc28ecc3dd043fdd7f339447f4d84674826916109246 SHA512 0890b60bfa110ca7eaf7aaddbf0aca9574f608addc384cece3c91c8c04ef6397064a0669f3d61d0a65eb120b626ccd85df26f04438ca301f349136cd55e5080a WHIRLPOOL 377c39ac7988a3c1bb6e80333c43878d38fe5eecbb75dcbcbef3c2186842fcc170a552d72be891f1479c336fdd6c5ac1ce1ca2c0adf9a8238bd057f093c3f912 |
29 |
DIST git-htmldocs-1.8.5.2.tar.gz 2237867 SHA256 ba708ab1b5916960f61c22cf60eb6689ac62d1b6dbb6a460d98502815cdbff41 SHA512 824ab4cf879c0b3c1215f29f5dc3d18ae9bf15aad9deb7d81e81f8a57d500d304738c7e580f0fb5e3df2b6609d957b964938250a48145a3559b93ef1419eba2b WHIRLPOOL 962a2da1174ab401bdbafdca8cc9debd0fe927838b44bc8bbd0258a1da62cc32c10a6aa5a8a2bbf404fc257d0f4df981969ec3c2b9e898bcf3dc417d2f6517c6 |
30 |
-DIST git-manpages-1.8.3.2.tar.gz 542769 SHA256 599bc8f6c56986a994a237cfebb53b4fab9051576775e32d0353e0455ab84115 SHA512 42fd781b924355c969ce381aae828f877059472741d7b53b0d1aad53f04c8a27b6b161b5dfc353098370ead73ccb9cdc86ac5374cf02829134f8c4d70bcbb7cf WHIRLPOOL 90226006a35b7b6e644f887981f2725238ff428f572425942701614e14fab5c8c5c602746de93a113d83d9b9c76ea1805a9c7cfa353305b0f817c33976048d77 |
31 |
DIST git-manpages-1.8.5.2.tar.gz 569581 SHA256 2aef8c084ee795e544b6fb8715cccc1109efca1ca4b8db1588a2a5186ddb10c6 SHA512 1ca37aff4d5ca6d4daa6e8f2b3114a63ebdb0bd42382e1ed1ff9d01117da2fd8bd3a662b9beab318fdffd682039589c9b5f50ced67122e96b0a0ffd213a4112a WHIRLPOOL 257bd0549fb63e5ef31f3575731a5c90eead5da556480d929877704086dc03dadd924713480d9c3f8b5890912d54dd8be48d970abb9f7e86c55d8655642fbfb5 |
32 |
|
33 |
diff --git a/dev-vcs/git/files/git-1.8.2-optional-cvs.patch b/dev-vcs/git/files/git-1.8.2-optional-cvs.patch |
34 |
deleted file mode 100644 |
35 |
index 4fa0b3e..0000000 |
36 |
--- a/dev-vcs/git/files/git-1.8.2-optional-cvs.patch |
37 |
+++ /dev/null |
38 |
@@ -1,369 +0,0 @@ |
39 |
-From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001 |
40 |
-From: Robin Johnson <robbat2@g.o> |
41 |
-Date: Wed, 22 Aug 2012 04:25:06 +0000 |
42 |
-Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface |
43 |
- utilities |
44 |
- |
45 |
-Forward-ported from 1.7.12 to current git.git v1.8.2 |
46 |
- |
47 |
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/Makefile git-1.8.2/Makefile |
48 |
---- git-1.8.2.orig/Makefile 2013-03-13 12:15:22.000000000 -0700 |
49 |
-+++ git-1.8.2/Makefile 2013-03-19 16:58:52.922806111 -0700 |
50 |
-@@ -259,6 +259,8 @@ |
51 |
- # |
52 |
- # Define NO_TCLTK if you do not want Tcl/Tk GUI. |
53 |
- # |
54 |
-+# Define NO_CVS if you do not want any CVS interface utilities. |
55 |
-+# |
56 |
- # The TCL_PATH variable governs the location of the Tcl interpreter |
57 |
- # used to optimize git-gui for your system. Only used if NO_TCLTK |
58 |
- # is not set. Defaults to the bare 'tclsh'. |
59 |
-@@ -431,6 +433,7 @@ |
60 |
- PROGRAM_OBJS = |
61 |
- PROGRAMS = |
62 |
- SCRIPT_PERL = |
63 |
-+SCRIPT_PERL_CVS = |
64 |
- SCRIPT_PYTHON = |
65 |
- SCRIPT_SH = |
66 |
- SCRIPT_LIB = |
67 |
-@@ -471,19 +474,20 @@ |
68 |
- SCRIPT_PERL += git-add--interactive.perl |
69 |
- SCRIPT_PERL += git-difftool.perl |
70 |
- SCRIPT_PERL += git-archimport.perl |
71 |
--SCRIPT_PERL += git-cvsexportcommit.perl |
72 |
--SCRIPT_PERL += git-cvsimport.perl |
73 |
--SCRIPT_PERL += git-cvsserver.perl |
74 |
- SCRIPT_PERL += git-relink.perl |
75 |
- SCRIPT_PERL += git-send-email.perl |
76 |
- SCRIPT_PERL += git-svn.perl |
77 |
- |
78 |
-+SCRIPT_PERL_CVS += git-cvsexportcommit.perl |
79 |
-+SCRIPT_PERL_CVS += git-cvsimport.perl |
80 |
-+SCRIPT_PERL_CVS += git-cvsserver.perl |
81 |
-+ |
82 |
- SCRIPT_PYTHON += git-remote-testpy.py |
83 |
- SCRIPT_PYTHON += git-p4.py |
84 |
- |
85 |
- # Generated files for scripts |
86 |
- SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH)) |
87 |
--SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL)) |
88 |
-+SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) |
89 |
- SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON)) |
90 |
- |
91 |
- # Individual rules to allow e.g. |
92 |
-@@ -1745,8 +1749,18 @@ |
93 |
- $(QUIET_GEN)$(cmd_munge_script) && \ |
94 |
- mv $@+ $@ |
95 |
- |
96 |
-+_SCRIPT_PERL_BUILD = |
97 |
-+_SCRIPT_PERL_NOBUILD = |
98 |
-+ |
99 |
- ifndef NO_PERL |
100 |
--$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak |
101 |
-+ |
102 |
-+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL) |
103 |
-+ |
104 |
-+ifndef NO_CVS |
105 |
-+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS) |
106 |
-+else # NO_CVS |
107 |
-+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS) |
108 |
-+endif # NO_CVS |
109 |
- |
110 |
- perl/perl.mak: perl/PM.stamp |
111 |
- |
112 |
-@@ -1758,7 +1772,7 @@ |
113 |
- perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL |
114 |
- $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F) |
115 |
- |
116 |
--$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE |
117 |
-+$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl GIT-VERSION-FILE |
118 |
- $(QUIET_GEN)$(RM) $@ $@+ && \ |
119 |
- INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \ |
120 |
- sed -e '1{' \ |
121 |
-@@ -1783,14 +1797,17 @@ |
122 |
- chmod +x $@+ && \ |
123 |
- mv $@+ $@ |
124 |
- else # NO_PERL |
125 |
--$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh |
126 |
-+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb |
127 |
-+endif # NO_PERL |
128 |
-+ |
129 |
-+# This is any perl scripts that were disabled it might be empty... |
130 |
-+$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh |
131 |
- $(QUIET_GEN)$(RM) $@ $@+ && \ |
132 |
- sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ |
133 |
- -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ |
134 |
- unimplemented.sh >$@+ && \ |
135 |
- chmod +x $@+ && \ |
136 |
- mv $@+ $@ |
137 |
--endif # NO_PERL |
138 |
- |
139 |
- ifndef NO_PYTHON |
140 |
- $(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS |
141 |
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9200-git-cvsexportcommit.sh git-1.8.2/t/t9200-git-cvsexportcommit.sh |
142 |
---- git-1.8.2.orig/t/t9200-git-cvsexportcommit.sh 2013-03-13 12:15:22.000000000 -0700 |
143 |
-+++ git-1.8.2/t/t9200-git-cvsexportcommit.sh 2013-03-19 16:56:29.124993905 -0700 |
144 |
-@@ -12,6 +12,11 @@ |
145 |
- test_done |
146 |
- fi |
147 |
- |
148 |
-+if ! test_have_prereq CVS; then |
149 |
-+ skip_all='skipping git cvsexportcommit tests, cvs not available' |
150 |
-+ test_done |
151 |
-+fi |
152 |
-+ |
153 |
- cvs >/dev/null 2>&1 |
154 |
- if test $? -ne 1 |
155 |
- then |
156 |
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9400-git-cvsserver-server.sh git-1.8.2/t/t9400-git-cvsserver-server.sh |
157 |
---- git-1.8.2.orig/t/t9400-git-cvsserver-server.sh 2013-03-13 12:15:22.000000000 -0700 |
158 |
-+++ git-1.8.2/t/t9400-git-cvsserver-server.sh 2013-03-19 16:56:29.124993905 -0700 |
159 |
-@@ -11,9 +11,15 @@ |
160 |
- . ./test-lib.sh |
161 |
- |
162 |
- if ! test_have_prereq PERL; then |
163 |
-- skip_all='skipping git cvsserver tests, perl not available' |
164 |
-+ skip_all='skipping git-cvsserver tests, perl not available' |
165 |
- test_done |
166 |
- fi |
167 |
-+ |
168 |
-+if ! test_have_prereq CVS; then |
169 |
-+ skip_all='skipping git-cvsserver tests, cvs not available' |
170 |
-+ test_done |
171 |
-+fi |
172 |
-+ |
173 |
- cvs >/dev/null 2>&1 |
174 |
- if test $? -ne 1 |
175 |
- then |
176 |
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9401-git-cvsserver-crlf.sh git-1.8.2/t/t9401-git-cvsserver-crlf.sh |
177 |
---- git-1.8.2.orig/t/t9401-git-cvsserver-crlf.sh 2013-03-13 12:15:22.000000000 -0700 |
178 |
-+++ git-1.8.2/t/t9401-git-cvsserver-crlf.sh 2013-03-19 16:56:29.125993925 -0700 |
179 |
-@@ -57,15 +57,20 @@ |
180 |
- return $stat |
181 |
- } |
182 |
- |
183 |
--cvs >/dev/null 2>&1 |
184 |
--if test $? -ne 1 |
185 |
-+if ! test_have_prereq PERL |
186 |
- then |
187 |
-- skip_all='skipping git-cvsserver tests, cvs not found' |
188 |
-+ skip_all='skipping git-cvsserver tests, perl not available' |
189 |
- test_done |
190 |
- fi |
191 |
--if ! test_have_prereq PERL |
192 |
-+if ! test_have_prereq CVS |
193 |
- then |
194 |
-- skip_all='skipping git-cvsserver tests, perl not available' |
195 |
-+ skip_all='skipping git-cvsserver tests, cvs not available' |
196 |
-+ test_done |
197 |
-+fi |
198 |
-+cvs >/dev/null 2>&1 |
199 |
-+if test $? -ne 1 |
200 |
-+then |
201 |
-+ skip_all='skipping git-cvsserver tests, cvs not found' |
202 |
- test_done |
203 |
- fi |
204 |
- "$PERL_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { |
205 |
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9600-cvsimport.sh git-1.8.2/t/t9600-cvsimport.sh |
206 |
---- git-1.8.2.orig/t/t9600-cvsimport.sh 2013-03-13 12:15:22.000000000 -0700 |
207 |
-+++ git-1.8.2/t/t9600-cvsimport.sh 2013-03-19 16:56:29.125993925 -0700 |
208 |
-@@ -3,14 +3,25 @@ |
209 |
- test_description='git cvsimport basic tests' |
210 |
- . ./lib-cvs.sh |
211 |
- |
212 |
--test_expect_success PERL 'setup cvsroot environment' ' |
213 |
-+if ! test_have_prereq PERL |
214 |
-+then |
215 |
-+ skip_all='skipping git cvsimport tests, perl not available' |
216 |
-+ test_done |
217 |
-+fi |
218 |
-+if ! test_have_prereq CVS |
219 |
-+then |
220 |
-+ skip_all='skipping git cvsimport tests, cvs not available' |
221 |
-+ test_done |
222 |
-+fi |
223 |
-+ |
224 |
-+test_expect_success 'setup cvsroot environment' ' |
225 |
- CVSROOT=$(pwd)/cvsroot && |
226 |
- export CVSROOT |
227 |
- ' |
228 |
- |
229 |
--test_expect_success PERL 'setup cvsroot' '$CVS init' |
230 |
-+test_expect_success 'setup cvsroot' '$CVS init' |
231 |
- |
232 |
--test_expect_success PERL 'setup a cvs module' ' |
233 |
-+test_expect_success 'setup a cvs module' ' |
234 |
- |
235 |
- mkdir "$CVSROOT/module" && |
236 |
- $CVS co -d module-cvs module && |
237 |
-@@ -42,23 +53,23 @@ |
238 |
- ) |
239 |
- ' |
240 |
- |
241 |
--test_expect_success PERL 'import a trivial module' ' |
242 |
-+test_expect_success 'import a trivial module' ' |
243 |
- |
244 |
- git cvsimport -a -R -z 0 -C module-git module && |
245 |
- test_cmp module-cvs/o_fortuna module-git/o_fortuna |
246 |
- |
247 |
- ' |
248 |
- |
249 |
--test_expect_success PERL 'pack refs' '(cd module-git && git gc)' |
250 |
-+test_expect_success 'pack refs' '(cd module-git && git gc)' |
251 |
- |
252 |
--test_expect_success PERL 'initial import has correct .git/cvs-revisions' ' |
253 |
-+test_expect_success 'initial import has correct .git/cvs-revisions' ' |
254 |
- |
255 |
- (cd module-git && |
256 |
- git log --format="o_fortuna 1.1 %H" -1) > expected && |
257 |
- test_cmp expected module-git/.git/cvs-revisions |
258 |
- ' |
259 |
- |
260 |
--test_expect_success PERL 'update cvs module' ' |
261 |
-+test_expect_success 'update cvs module' ' |
262 |
- (cd module-cvs && |
263 |
- cat <<EOF >o_fortuna && |
264 |
- O Fortune, |
265 |
-@@ -86,7 +97,7 @@ |
266 |
- ) |
267 |
- ' |
268 |
- |
269 |
--test_expect_success PERL 'update git module' ' |
270 |
-+test_expect_success 'update git module' ' |
271 |
- |
272 |
- (cd module-git && |
273 |
- git config cvsimport.trackRevisions true && |
274 |
-@@ -97,7 +108,7 @@ |
275 |
- |
276 |
- ' |
277 |
- |
278 |
--test_expect_success PERL 'update has correct .git/cvs-revisions' ' |
279 |
-+test_expect_success 'update has correct .git/cvs-revisions' ' |
280 |
- |
281 |
- (cd module-git && |
282 |
- git log --format="o_fortuna 1.1 %H" -1 HEAD^ && |
283 |
-@@ -105,7 +116,7 @@ |
284 |
- test_cmp expected module-git/.git/cvs-revisions |
285 |
- ' |
286 |
- |
287 |
--test_expect_success PERL 'update cvs module' ' |
288 |
-+test_expect_success 'update cvs module' ' |
289 |
- |
290 |
- (cd module-cvs && |
291 |
- echo 1 >tick && |
292 |
-@@ -114,7 +125,7 @@ |
293 |
- ) |
294 |
- ' |
295 |
- |
296 |
--test_expect_success PERL 'cvsimport.module config works' ' |
297 |
-+test_expect_success 'cvsimport.module config works' ' |
298 |
- |
299 |
- (cd module-git && |
300 |
- git config cvsimport.module module && |
301 |
-@@ -126,7 +137,7 @@ |
302 |
- |
303 |
- ' |
304 |
- |
305 |
--test_expect_success PERL 'second update has correct .git/cvs-revisions' ' |
306 |
-+test_expect_success 'second update has correct .git/cvs-revisions' ' |
307 |
- |
308 |
- (cd module-git && |
309 |
- git log --format="o_fortuna 1.1 %H" -1 HEAD^^ && |
310 |
-@@ -135,7 +146,7 @@ |
311 |
- test_cmp expected module-git/.git/cvs-revisions |
312 |
- ' |
313 |
- |
314 |
--test_expect_success PERL 'import from a CVS working tree' ' |
315 |
-+test_expect_success 'import from a CVS working tree' ' |
316 |
- |
317 |
- $CVS co -d import-from-wt module && |
318 |
- (cd import-from-wt && |
319 |
-@@ -148,12 +159,12 @@ |
320 |
- |
321 |
- ' |
322 |
- |
323 |
--test_expect_success PERL 'no .git/cvs-revisions created by default' ' |
324 |
-+test_expect_success 'no .git/cvs-revisions created by default' ' |
325 |
- |
326 |
- ! test -e import-from-wt/.git/cvs-revisions |
327 |
- |
328 |
- ' |
329 |
- |
330 |
--test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master' |
331 |
-+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master' |
332 |
- |
333 |
- test_done |
334 |
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9601-cvsimport-vendor-branch.sh git-1.8.2/t/t9601-cvsimport-vendor-branch.sh |
335 |
---- git-1.8.2.orig/t/t9601-cvsimport-vendor-branch.sh 2013-03-13 12:15:22.000000000 -0700 |
336 |
-+++ git-1.8.2/t/t9601-cvsimport-vendor-branch.sh 2013-03-19 16:56:29.125993925 -0700 |
337 |
-@@ -34,6 +34,17 @@ |
338 |
- test_description='git cvsimport handling of vendor branches' |
339 |
- . ./lib-cvs.sh |
340 |
- |
341 |
-+if ! test_have_prereq PERL |
342 |
-+then |
343 |
-+ skip_all='skipping git cvsimport tests, perl not available' |
344 |
-+ test_done |
345 |
-+fi |
346 |
-+if ! test_have_prereq CVS |
347 |
-+then |
348 |
-+ skip_all='skipping git cvsimport tests, cvs not available' |
349 |
-+ test_done |
350 |
-+fi |
351 |
-+ |
352 |
- setup_cvs_test_repository t9601 |
353 |
- |
354 |
- test_expect_success PERL 'import a module with a vendor branch' ' |
355 |
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9602-cvsimport-branches-tags.sh git-1.8.2/t/t9602-cvsimport-branches-tags.sh |
356 |
---- git-1.8.2.orig/t/t9602-cvsimport-branches-tags.sh 2013-03-13 12:15:22.000000000 -0700 |
357 |
-+++ git-1.8.2/t/t9602-cvsimport-branches-tags.sh 2013-03-19 16:56:29.126993944 -0700 |
358 |
-@@ -6,6 +6,17 @@ |
359 |
- test_description='git cvsimport handling of branches and tags' |
360 |
- . ./lib-cvs.sh |
361 |
- |
362 |
-+if ! test_have_prereq PERL |
363 |
-+then |
364 |
-+ skip_all='skipping git cvsimport tests, perl not available' |
365 |
-+ test_done |
366 |
-+fi |
367 |
-+if ! test_have_prereq CVS |
368 |
-+then |
369 |
-+ skip_all='skipping git cvsimport tests, cvs not available' |
370 |
-+ test_done |
371 |
-+fi |
372 |
-+ |
373 |
- setup_cvs_test_repository t9602 |
374 |
- |
375 |
- test_expect_success PERL 'import module' ' |
376 |
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9603-cvsimport-patchsets.sh git-1.8.2/t/t9603-cvsimport-patchsets.sh |
377 |
---- git-1.8.2.orig/t/t9603-cvsimport-patchsets.sh 2013-03-13 12:15:22.000000000 -0700 |
378 |
-+++ git-1.8.2/t/t9603-cvsimport-patchsets.sh 2013-03-19 16:56:29.126993944 -0700 |
379 |
-@@ -14,6 +14,17 @@ |
380 |
- test_description='git cvsimport testing for correct patchset estimation' |
381 |
- . ./lib-cvs.sh |
382 |
- |
383 |
-+if ! test_have_prereq PERL |
384 |
-+then |
385 |
-+ skip_all='skipping git cvsimport tests, perl not available' |
386 |
-+ test_done |
387 |
-+fi |
388 |
-+if ! test_have_prereq CVS |
389 |
-+then |
390 |
-+ skip_all='skipping git cvsimport tests, cvs not available' |
391 |
-+ test_done |
392 |
-+fi |
393 |
-+ |
394 |
- setup_cvs_test_repository t9603 |
395 |
- |
396 |
- test_expect_failure 'import with criss cross times on revisions' ' |
397 |
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/test-lib.sh git-1.8.2/t/test-lib.sh |
398 |
---- git-1.8.2.orig/t/test-lib.sh 2013-03-13 12:15:22.000000000 -0700 |
399 |
-+++ git-1.8.2/t/test-lib.sh 2013-03-19 16:56:29.126993944 -0700 |
400 |
-@@ -686,6 +686,7 @@ |
401 |
- esac |
402 |
- |
403 |
- ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1 |
404 |
-+test -z "$NO_CVS" && test_set_prereq CVS |
405 |
- test -z "$NO_PERL" && test_set_prereq PERL |
406 |
- test -z "$NO_PYTHON" && test_set_prereq PYTHON |
407 |
- test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE |
408 |
|
409 |
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 |
410 |
new file mode 100644 |
411 |
index 0000000..ea4f175 |
412 |
--- /dev/null |
413 |
+++ b/dev-vcs/git/files/git-1.8.5-mw-destdir.patch |
414 |
@@ -0,0 +1,37 @@ |
415 |
+diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile |
416 |
+index f206f96..a4b6f7a 100644 |
417 |
+--- a/contrib/mw-to-git/Makefile |
418 |
++++ b/contrib/mw-to-git/Makefile |
419 |
+@@ -18,9 +18,13 @@ SCRIPT_PERL+=git-mw.perl |
420 |
+ GIT_ROOT_DIR=../.. |
421 |
+ HERE=contrib/mw-to-git/ |
422 |
+ |
423 |
++INSTALL = install |
424 |
++ |
425 |
+ SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL)) |
426 |
+ INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \ |
427 |
+ -s --no-print-directory instlibdir) |
428 |
++DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) |
429 |
++INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR)) |
430 |
+ |
431 |
+ all: build |
432 |
+ |
433 |
+@@ -30,7 +34,9 @@ test: all |
434 |
+ check: perlcritic test |
435 |
+ |
436 |
+ install_pm: |
437 |
+- install $(GIT_MEDIAWIKI_PM) $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM) |
438 |
++ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/Git' |
439 |
++ $(INSTALL) -m 644 $(GIT_MEDIAWIKI_PM) \ |
440 |
++ '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/$(GIT_MEDIAWIKI_PM)' |
441 |
+ |
442 |
+ build: |
443 |
+ $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \ |
444 |
+@@ -43,7 +49,6 @@ install: install_pm |
445 |
+ clean: |
446 |
+ $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \ |
447 |
+ clean-perl-script |
448 |
+- rm $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM) |
449 |
+ |
450 |
+ perlcritic: |
451 |
+ perlcritic -5 $(SCRIPT_PERL) |
452 |
|
453 |
diff --git a/dev-vcs/git/git-1.8.3.2-r1.ebuild b/dev-vcs/git/git-1.8.3.2-r1.ebuild |
454 |
deleted file mode 100644 |
455 |
index 818b022..0000000 |
456 |
--- a/dev-vcs/git/git-1.8.3.2-r1.ebuild |
457 |
+++ /dev/null |
458 |
@@ -1,614 +0,0 @@ |
459 |
-# Copyright 1999-2013 Gentoo Foundation |
460 |
-# Distributed under the terms of the GNU General Public License v2 |
461 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.3.2-r1.ebuild,v 1.10 2013/12/11 10:39:17 pinkbyte Exp $ |
462 |
- |
463 |
-EAPI=5 |
464 |
- |
465 |
-GENTOO_DEPEND_ON_PERL=no |
466 |
- |
467 |
-# bug #329479: git-remote-testgit is not multiple-version aware |
468 |
-PYTHON_COMPAT=( python2_{6,7} ) |
469 |
-[[ ${PV} == *9999 ]] && SCM="git-2" |
470 |
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" |
471 |
- |
472 |
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} |
473 |
- |
474 |
-MY_PV="${PV/_rc/.rc}" |
475 |
-MY_P="${PN}-${MY_PV}" |
476 |
- |
477 |
-DOC_VER=${MY_PV} |
478 |
- |
479 |
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" |
480 |
-HOMEPAGE="http://www.git-scm.com/" |
481 |
-if [[ ${PV} != *9999 ]]; then |
482 |
- SRC_URI_SUFFIX="gz" |
483 |
- SRC_URI_GOOG="http://git-core.googlecode.com/files" |
484 |
- SRC_URI_KORG="mirror://kernel/software/scm/git" |
485 |
- SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} |
486 |
- ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} |
487 |
- ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
488 |
- ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
489 |
- doc? ( |
490 |
- ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
491 |
- ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
492 |
- )" |
493 |
- 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" |
494 |
-else |
495 |
- SRC_URI="" |
496 |
- KEYWORDS="" |
497 |
-fi |
498 |
- |
499 |
-LICENSE="GPL-2" |
500 |
-SLOT="0" |
501 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
502 |
- |
503 |
-# Common to both DEPEND and RDEPEND |
504 |
-CDEPEND=" |
505 |
- dev-libs/openssl |
506 |
- sys-libs/zlib |
507 |
- pcre? ( dev-libs/libpcre ) |
508 |
- perl? ( dev-lang/perl[-build(-)] ) |
509 |
- tk? ( dev-lang/tk ) |
510 |
- curl? ( |
511 |
- net-misc/curl |
512 |
- webdav? ( dev-libs/expat ) |
513 |
- ) |
514 |
- emacs? ( virtual/emacs ) |
515 |
- gnome-keyring? ( gnome-base/gnome-keyring )" |
516 |
- |
517 |
-RDEPEND="${CDEPEND} |
518 |
- gpg? ( app-crypt/gnupg ) |
519 |
- perl? ( dev-perl/Error |
520 |
- dev-perl/Net-SMTP-SSL |
521 |
- dev-perl/Authen-SASL |
522 |
- cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) |
523 |
- cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) |
524 |
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) |
525 |
- ) |
526 |
- python? ( gtk? |
527 |
- ( |
528 |
- >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] |
529 |
- >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] |
530 |
- ) |
531 |
- ${PYTHON_DEPS} )" |
532 |
- |
533 |
-# This is how info docs are created with Git: |
534 |
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook |
535 |
-# .xml/docbook --(docbook2texi.pl)--> .texi |
536 |
-# .texi --(makeinfo)---------> .info |
537 |
-DEPEND="${CDEPEND} |
538 |
- app-arch/cpio |
539 |
- doc? ( |
540 |
- app-text/asciidoc |
541 |
- app-text/docbook2X |
542 |
- sys-apps/texinfo |
543 |
- app-text/xmlto |
544 |
- ) |
545 |
- test? ( |
546 |
- app-crypt/gnupg |
547 |
- )" |
548 |
- |
549 |
-# Live ebuild builds man pages and HTML docs, additionally |
550 |
-if [[ ${PV} == *9999 ]]; then |
551 |
- DEPEND="${DEPEND} |
552 |
- app-text/asciidoc" |
553 |
-fi |
554 |
- |
555 |
-SITEFILE=50${PN}-gentoo.el |
556 |
-S="${WORKDIR}/${MY_P}" |
557 |
- |
558 |
-REQUIRED_USE=" |
559 |
- cgi? ( perl ) |
560 |
- cvs? ( perl ) |
561 |
- subversion? ( perl ) |
562 |
- webdav? ( curl ) |
563 |
- gtk? ( python ) |
564 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
565 |
-" |
566 |
- |
567 |
-pkg_setup() { |
568 |
- if use subversion && has_version "dev-vcs/subversion[dso]"; then |
569 |
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" |
570 |
- ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
571 |
- ewarn "have been warned." |
572 |
- fi |
573 |
- if use python ; then |
574 |
- python-single-r1_pkg_setup |
575 |
- fi |
576 |
-} |
577 |
- |
578 |
-# This is needed because for some obscure reasons future calls to make don't |
579 |
-# pick up these exports if we export them in src_unpack() |
580 |
-exportmakeopts() { |
581 |
- local myopts |
582 |
- |
583 |
- if use blksha1 ; then |
584 |
- myopts="${myopts} BLK_SHA1=YesPlease" |
585 |
- elif use ppcsha1 ; then |
586 |
- myopts="${myopts} PPC_SHA1=YesPlease" |
587 |
- fi |
588 |
- |
589 |
- if use curl ; then |
590 |
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease" |
591 |
- else |
592 |
- myopts="${myopts} NO_CURL=YesPlease" |
593 |
- fi |
594 |
- |
595 |
- # broken assumptions, because of broken build system ... |
596 |
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" |
597 |
- myopts="${myopts} INSTALL=install TAR=tar" |
598 |
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" |
599 |
- myopts="${myopts} SANE_TOOL_PATH=" |
600 |
- myopts="${myopts} OLD_ICONV=" |
601 |
- myopts="${myopts} NO_EXTERNAL_GREP=" |
602 |
- |
603 |
- # For svn-fe |
604 |
- extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" |
605 |
- |
606 |
- # can't define this to null, since the entire makefile depends on it |
607 |
- sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile |
608 |
- |
609 |
- use iconv \ |
610 |
- || myopts="${myopts} NO_ICONV=YesPlease" |
611 |
- use nls \ |
612 |
- || myopts="${myopts} NO_GETTEXT=YesPlease" |
613 |
- use tk \ |
614 |
- || myopts="${myopts} NO_TCLTK=YesPlease" |
615 |
- use pcre \ |
616 |
- && myopts="${myopts} USE_LIBPCRE=yes" \ |
617 |
- && extlibs="${extlibs} -lpcre" |
618 |
- use perl \ |
619 |
- && myopts="${myopts} INSTALLDIRS=vendor" \ |
620 |
- || myopts="${myopts} NO_PERL=YesPlease" |
621 |
- use python \ |
622 |
- || myopts="${myopts} NO_PYTHON=YesPlease" |
623 |
- use subversion \ |
624 |
- || myopts="${myopts} NO_SVN_TESTS=YesPlease" |
625 |
- use threads \ |
626 |
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \ |
627 |
- || myopts="${myopts} NO_PTHREADS=YesPlease" |
628 |
- use cvs \ |
629 |
- || myopts="${myopts} NO_CVS=YesPlease" |
630 |
-# Disabled until ~m68k-mint can be keyworded again |
631 |
-# if [[ ${CHOST} == *-mint* ]] ; then |
632 |
-# myopts="${myopts} NO_MMAP=YesPlease" |
633 |
-# myopts="${myopts} NO_IPV6=YesPlease" |
634 |
-# myopts="${myopts} NO_STRLCPY=YesPlease" |
635 |
-# myopts="${myopts} NO_MEMMEM=YesPlease" |
636 |
-# myopts="${myopts} NO_MKDTEMP=YesPlease" |
637 |
-# myopts="${myopts} NO_MKSTEMPS=YesPlease" |
638 |
-# fi |
639 |
- if [[ ${CHOST} == ia64-*-hpux* ]]; then |
640 |
- myopts="${myopts} NO_NSEC=YesPlease" |
641 |
- fi |
642 |
- if [[ ${CHOST} == *-*-aix* ]]; then |
643 |
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" |
644 |
- fi |
645 |
- if [[ ${CHOST} == *-solaris* ]]; then |
646 |
- myopts="${myopts} NEEDS_LIBICONV=YesPlease" |
647 |
- fi |
648 |
- |
649 |
- has_version '>=app-text/asciidoc-8.0' \ |
650 |
- && myopts="${myopts} ASCIIDOC8=YesPlease" |
651 |
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" |
652 |
- |
653 |
- # Bug 290465: |
654 |
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' |
655 |
- [[ "${CHOST}" == *-uclibc* ]] && \ |
656 |
- myopts="${myopts} NO_NSEC=YesPlease" |
657 |
- |
658 |
- export MY_MAKEOPTS="${myopts}" |
659 |
- export EXTLIBS="${extlibs}" |
660 |
-} |
661 |
- |
662 |
-src_unpack() { |
663 |
- if [[ ${PV} != *9999 ]]; then |
664 |
- unpack ${MY_P}.tar.${SRC_URI_SUFFIX} |
665 |
- cd "${S}" |
666 |
- unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
667 |
- use doc && \ |
668 |
- cd "${S}"/Documentation && \ |
669 |
- unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
670 |
- cd "${S}" |
671 |
- else |
672 |
- git-2_src_unpack |
673 |
- cd "${S}" |
674 |
- #cp "${FILESDIR}"/GIT-VERSION-GEN . |
675 |
- fi |
676 |
- |
677 |
-} |
678 |
- |
679 |
-src_prepare() { |
680 |
- # bug #350330 - automagic CVS when we don't want it is bad. |
681 |
- epatch "${FILESDIR}"/git-1.8.2-optional-cvs.patch |
682 |
- |
683 |
- sed -i \ |
684 |
- -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ |
685 |
- -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ |
686 |
- -e 's:^\(CC = \).*$:\1$(OPTCC):' \ |
687 |
- -e 's:^\(AR = \).*$:\1$(OPTAR):' \ |
688 |
- -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ |
689 |
- -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ |
690 |
- Makefile contrib/svn-fe/Makefile || die "sed failed" |
691 |
- |
692 |
- # Never install the private copy of Error.pm (bug #296310) |
693 |
- sed -i \ |
694 |
- -e '/private-Error.pm/s,^,#,' \ |
695 |
- perl/Makefile.PL |
696 |
- |
697 |
- # Fix docbook2texi command |
698 |
- sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ |
699 |
- Documentation/Makefile || die "sed failed" |
700 |
- |
701 |
- # Fix git-subtree missing DESTDIR |
702 |
- sed -i \ |
703 |
- -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ |
704 |
- -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ |
705 |
- contrib/subtree/Makefile |
706 |
-} |
707 |
- |
708 |
-git_emake() { |
709 |
- # bug #326625: PERL_PATH, PERL_MM_OPT |
710 |
- # bug #320647: PYTHON_PATH |
711 |
- PYTHON_PATH="" |
712 |
- use python && PYTHON_PATH="${PYTHON}" |
713 |
- emake ${MY_MAKEOPTS} \ |
714 |
- DESTDIR="${D}" \ |
715 |
- OPTCFLAGS="${CFLAGS}" \ |
716 |
- OPTLDFLAGS="${LDFLAGS}" \ |
717 |
- OPTCC="$(tc-getCC)" \ |
718 |
- OPTAR="$(tc-getAR)" \ |
719 |
- prefix="${EPREFIX}"/usr \ |
720 |
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
721 |
- sysconfdir="${EPREFIX}"/etc \ |
722 |
- PYTHON_PATH="${PYTHON_PATH}" \ |
723 |
- PERL_MM_OPT="" \ |
724 |
- GIT_TEST_OPTS="--no-color" \ |
725 |
- V=1 \ |
726 |
- "$@" |
727 |
- # This is the fix for bug #326625, but it also causes breakage, see bug |
728 |
- # #352693. |
729 |
- # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ |
730 |
-} |
731 |
- |
732 |
-src_configure() { |
733 |
- exportmakeopts |
734 |
-} |
735 |
- |
736 |
-src_compile() { |
737 |
- if use perl ; then |
738 |
- git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" |
739 |
- git_emake perl/perl.mak || die "emake perl/perl.mak failed" |
740 |
- fi |
741 |
- git_emake || die "emake failed" |
742 |
- |
743 |
- if use emacs ; then |
744 |
- elisp-compile contrib/emacs/git{,-blame}.el |
745 |
- fi |
746 |
- |
747 |
- if use perl && use cgi ; then |
748 |
- git_emake \ |
749 |
- gitweb/gitweb.cgi \ |
750 |
- || die "emake gitweb/gitweb.cgi failed" |
751 |
- fi |
752 |
- |
753 |
- if [[ ${CHOST} == *-darwin* ]]; then |
754 |
- cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" |
755 |
- git_emake || die "emake credential-osxkeychain" |
756 |
- fi |
757 |
- |
758 |
- cd "${S}"/Documentation |
759 |
- if [[ ${PV} == *9999 ]] ; then |
760 |
- git_emake man \ |
761 |
- || die "emake man failed" |
762 |
- if use doc ; then |
763 |
- git_emake info html \ |
764 |
- || die "emake info html failed" |
765 |
- fi |
766 |
- else |
767 |
- if use doc ; then |
768 |
- git_emake info \ |
769 |
- || die "emake info html failed" |
770 |
- fi |
771 |
- fi |
772 |
- |
773 |
- if use subversion ; then |
774 |
- cd "${S}"/contrib/svn-fe |
775 |
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed" |
776 |
- if use doc ; then |
777 |
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" |
778 |
- fi |
779 |
- cd "${S}" |
780 |
- fi |
781 |
- |
782 |
- if use gnome-keyring ; then |
783 |
- cd "${S}"/contrib/credential/gnome-keyring |
784 |
- git_emake || die "emake git-credential-gnome-keyring failed" |
785 |
- fi |
786 |
- |
787 |
- cd "${S}"/contrib/subtree |
788 |
- git_emake |
789 |
- use doc && git_emake doc |
790 |
-} |
791 |
- |
792 |
-src_install() { |
793 |
- git_emake \ |
794 |
- install || \ |
795 |
- die "make install failed" |
796 |
- |
797 |
- if [[ ${CHOST} == *-darwin* ]]; then |
798 |
- dobin contrib/credential/osxkeychain/git-credential-osxkeychain |
799 |
- fi |
800 |
- |
801 |
- # Depending on the tarball and manual rebuild of the documentation, the |
802 |
- # manpages may exist in either OR both of these directories. |
803 |
- find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] |
804 |
- find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] |
805 |
- |
806 |
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines} |
807 |
- use doc && dodir /usr/share/doc/${PF}/html |
808 |
- for d in / /howto/ /technical/ ; do |
809 |
- docinto ${d} |
810 |
- dodoc Documentation${d}*.txt |
811 |
- use doc && dohtml -p ${d} Documentation${d}*.html |
812 |
- done |
813 |
- docinto / |
814 |
- # Upstream does not ship this pre-built :-( |
815 |
- use doc && doinfo Documentation/{git,gitman}.info |
816 |
- |
817 |
- newbashcomp contrib/completion/git-completion.bash ${PN} |
818 |
- newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt |
819 |
- |
820 |
- if use emacs ; then |
821 |
- elisp-install ${PN} contrib/emacs/git.{el,elc} |
822 |
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc} |
823 |
- #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} |
824 |
- # don't add automatically to the load-path, so the sitefile |
825 |
- # can do a conditional loading |
826 |
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch" |
827 |
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
828 |
- fi |
829 |
- |
830 |
- if use python && use gtk ; then |
831 |
- python_doscript "${S}"/contrib/gitview/gitview |
832 |
- dodoc "${S}"/contrib/gitview/gitview.txt |
833 |
- fi |
834 |
- |
835 |
- #dobin contrib/fast-import/git-p4 # Moved upstream |
836 |
- #dodoc contrib/fast-import/git-p4.txt # Moved upstream |
837 |
- newbin contrib/fast-import/import-tars.perl import-tars |
838 |
- exeinto /usr/libexec/git-core/ |
839 |
- newexe contrib/git-resurrect.sh git-resurrect |
840 |
- |
841 |
- # git-subtree |
842 |
- cd "${S}"/contrib/subtree |
843 |
- git_emake install || die "Failed to emake install git-subtree" |
844 |
- if use doc ; then |
845 |
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" |
846 |
- fi |
847 |
- newdoc README README.git-subtree |
848 |
- dodoc git-subtree.txt |
849 |
- cd "${S}" |
850 |
- |
851 |
- # git-diffall |
852 |
- dobin contrib/diffall/git-diffall |
853 |
- newdoc contrib/diffall/README git-diffall.txt |
854 |
- |
855 |
- # diff-highlight |
856 |
- dobin contrib/diff-highlight/diff-highlight |
857 |
- newdoc contrib/diff-highlight/README README.diff-highlight |
858 |
- |
859 |
- # git-jump |
860 |
- exeinto /usr/libexec/git-core/ |
861 |
- doexe contrib/git-jump/git-jump |
862 |
- newdoc contrib/git-jump/README git-jump.txt |
863 |
- |
864 |
- if use gnome-keyring ; then |
865 |
- cd "${S}"/contrib/credential/gnome-keyring |
866 |
- dobin git-credential-gnome-keyring |
867 |
- fi |
868 |
- |
869 |
- if use subversion ; then |
870 |
- cd "${S}"/contrib/svn-fe |
871 |
- dobin svn-fe |
872 |
- dodoc svn-fe.txt |
873 |
- use doc && doman svn-fe.1 && dohtml svn-fe.html |
874 |
- cd "${S}" |
875 |
- fi |
876 |
- |
877 |
- # remote-helpers |
878 |
- if use python ; then |
879 |
- python_scriptinto /usr/libexec/git-core/ |
880 |
- python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg} |
881 |
- python_optimize |
882 |
- fi |
883 |
- |
884 |
- dodir /usr/share/${PN}/contrib |
885 |
- # The following are excluded: |
886 |
- # completion - installed above |
887 |
- # credential/gnome-keyring TODO |
888 |
- # diff-highlight - done above |
889 |
- # diffall - done above |
890 |
- # emacs - installed above |
891 |
- # examples - these are stuff that is not used in Git anymore actually |
892 |
- # git-jump - done above |
893 |
- # gitview - installed above |
894 |
- # p4import - excluded because fast-import has a better one |
895 |
- # patches - stuff the Git guys made to go upstream to other places |
896 |
- # persistent-https - TODO |
897 |
- # mw-to-git - TODO |
898 |
- # subtree - build seperately |
899 |
- # svnimport - use git-svn |
900 |
- # thunderbird-patch-inline - fixes thunderbird |
901 |
- for i in \ |
902 |
- blameview buildsystems ciabot continuous convert-objects fast-import \ |
903 |
- hg-to-git hooks remotes2config.sh rerere-train.sh \ |
904 |
- stats vim workdir \ |
905 |
- ; do |
906 |
- cp -rf \ |
907 |
- "${S}"/contrib/${i} \ |
908 |
- "${ED}"/usr/share/${PN}/contrib \ |
909 |
- || die "Failed contrib ${i}" |
910 |
- done |
911 |
- |
912 |
- if use perl && use cgi ; then |
913 |
- # We used to install in /usr/share/${PN}/gitweb |
914 |
- # but upstream installs in /usr/share/gitweb |
915 |
- # so we will install a symlink and use their location for compat with other |
916 |
- # distros |
917 |
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb |
918 |
- |
919 |
- # INSTALL discusses configuration issues, not just installation |
920 |
- docinto / |
921 |
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb |
922 |
- newdoc "${S}"/gitweb/README README.gitweb |
923 |
- |
924 |
- find "${ED}"/usr/lib64/perl5/ \ |
925 |
- -name .packlist \ |
926 |
- -exec rm \{\} \; |
927 |
- else |
928 |
- rm -rf "${ED}"/usr/share/gitweb |
929 |
- fi |
930 |
- |
931 |
- if ! use subversion ; then |
932 |
- rm -f "${ED}"/usr/libexec/git-core/git-svn \ |
933 |
- "${ED}"/usr/share/man/man1/git-svn.1* |
934 |
- fi |
935 |
- |
936 |
- if use xinetd ; then |
937 |
- insinto /etc/xinetd.d |
938 |
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon |
939 |
- fi |
940 |
- |
941 |
- if use !prefix ; then |
942 |
- newinitd "${FILESDIR}"/git-daemon.initd git-daemon |
943 |
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon |
944 |
- systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" |
945 |
- systemd_dounit "${FILESDIR}/git-daemon.socket" |
946 |
- fi |
947 |
- |
948 |
- fixlocalpod |
949 |
-} |
950 |
- |
951 |
-src_test() { |
952 |
- local disabled="" |
953 |
- local tests_cvs="t9200-git-cvsexportcommit.sh \ |
954 |
- t9400-git-cvsserver-server.sh \ |
955 |
- t9401-git-cvsserver-crlf.sh \ |
956 |
- t9402-git-cvsserver-refs.sh \ |
957 |
- t9600-cvsimport.sh \ |
958 |
- t9601-cvsimport-vendor-branch.sh \ |
959 |
- t9602-cvsimport-branches-tags.sh \ |
960 |
- t9603-cvsimport-patchsets.sh \ |
961 |
- t9604-cvsimport-timestamps.sh" |
962 |
- local tests_perl="t3701-add-interactive.sh \ |
963 |
- t5502-quickfetch.sh \ |
964 |
- t5512-ls-remote.sh \ |
965 |
- t5520-pull.sh \ |
966 |
- t7106-reset-unborn-branch.sh \ |
967 |
- t7501-commit.sh" |
968 |
- # Bug #225601 - t0004 is not suitable for root perm |
969 |
- # Bug #219839 - t1004 is not suitable for root perm |
970 |
- # t0001-init.sh - check for init notices EPERM* fails |
971 |
- local tests_nonroot="t0001-init.sh \ |
972 |
- t0004-unwritable.sh \ |
973 |
- t0070-fundamental.sh \ |
974 |
- t1004-read-tree-m-u-wf.sh \ |
975 |
- t3700-add.sh \ |
976 |
- t7300-clean.sh" |
977 |
- # t9100 still fails with symlinks in SVN 1.7 |
978 |
- local test_svn="t9100-git-svn-basic.sh" |
979 |
- |
980 |
- # Unzip is used only for the testcase code, not by any normal parts of Git. |
981 |
- if ! has_version app-arch/unzip ; then |
982 |
- einfo "Disabling tar-tree tests" |
983 |
- disabled="${disabled} t5000-tar-tree.sh" |
984 |
- fi |
985 |
- |
986 |
- cvs=0 |
987 |
- use cvs && let cvs=$cvs+1 |
988 |
- if [[ ${EUID} -eq 0 ]]; then |
989 |
- if [[ $cvs -eq 1 ]]; then |
990 |
- ewarn "Skipping CVS tests because CVS does not work as root!" |
991 |
- ewarn "You should retest with FEATURES=userpriv!" |
992 |
- disabled="${disabled} ${tests_cvs}" |
993 |
- fi |
994 |
- einfo "Skipping other tests that require being non-root" |
995 |
- disabled="${disabled} ${tests_nonroot}" |
996 |
- else |
997 |
- [[ $cvs -gt 0 ]] && \ |
998 |
- has_version dev-vcs/cvs && \ |
999 |
- let cvs=$cvs+1 |
1000 |
- [[ $cvs -gt 1 ]] && \ |
1001 |
- has_version "dev-vcs/cvs[server]" && \ |
1002 |
- let cvs=$cvs+1 |
1003 |
- if [[ $cvs -lt 3 ]]; then |
1004 |
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" |
1005 |
- disabled="${disabled} ${tests_cvs}" |
1006 |
- fi |
1007 |
- fi |
1008 |
- |
1009 |
- if ! use perl ; then |
1010 |
- einfo "Disabling tests that need Perl" |
1011 |
- disabled="${disabled} ${tests_perl}" |
1012 |
- fi |
1013 |
- |
1014 |
- einfo "Disabling tests that fail with SVN 1.7" |
1015 |
- disabled="${disabled} ${test_svn}" |
1016 |
- |
1017 |
- # Reset all previously disabled tests |
1018 |
- cd "${S}/t" |
1019 |
- for i in *.sh.DISABLED ; do |
1020 |
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" |
1021 |
- done |
1022 |
- einfo "Disabled tests:" |
1023 |
- for i in ${disabled} ; do |
1024 |
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" |
1025 |
- done |
1026 |
- |
1027 |
- # Avoid the test system removing the results because we want them ourselves |
1028 |
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ |
1029 |
- -i "${S}"/t/Makefile |
1030 |
- |
1031 |
- # Clean old results first, must always run |
1032 |
- cd "${S}/t" |
1033 |
- nonfatal git_emake clean |
1034 |
- |
1035 |
- # Now run the tests, keep going if we hit an error, and don't terminate on |
1036 |
- # failure |
1037 |
- cd "${S}" |
1038 |
- einfo "Start test run" |
1039 |
- #MAKEOPTS=-j1 |
1040 |
- nonfatal git_emake --keep-going test |
1041 |
- rc=$? |
1042 |
- |
1043 |
- # Display nice results, now print the results |
1044 |
- cd "${S}/t" |
1045 |
- nonfatal git_emake aggregate-results |
1046 |
- |
1047 |
- # And bail if there was a problem |
1048 |
- [ $rc -eq 0 ] || die "tests failed. Please file a bug." |
1049 |
-} |
1050 |
- |
1051 |
-showpkgdeps() { |
1052 |
- local pkg=$1 |
1053 |
- shift |
1054 |
- elog " $(printf "%-17s:" ${pkg}) ${@}" |
1055 |
-} |
1056 |
- |
1057 |
-pkg_postinst() { |
1058 |
- use emacs && elisp-site-regen |
1059 |
- einfo "Please read /usr/share/bash-completion/git for Git bash command completion" |
1060 |
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt" |
1061 |
- einfo "Note that the prompt bash code is now in the seperate script" |
1062 |
- elog "These additional scripts need some dependencies:" |
1063 |
- echo |
1064 |
- showpkgdeps git-quiltimport "dev-util/quilt" |
1065 |
- showpkgdeps git-instaweb \ |
1066 |
- "|| ( www-servers/lighttpd www-servers/apache )" |
1067 |
- echo |
1068 |
-} |
1069 |
- |
1070 |
-pkg_postrm() { |
1071 |
- use emacs && elisp-site-regen |
1072 |
-} |
1073 |
|
1074 |
diff --git a/dev-vcs/git/git-1.8.5.2.ebuild b/dev-vcs/git/git-1.8.5.2.ebuild |
1075 |
index 048f393..0c54ae5 100644 |
1076 |
--- a/dev-vcs/git/git-1.8.5.2.ebuild |
1077 |
+++ b/dev-vcs/git/git-1.8.5.2.ebuild |
1078 |
@@ -40,14 +40,14 @@ fi |
1079 |
|
1080 |
LICENSE="GPL-2" |
1081 |
SLOT="0" |
1082 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
1083 |
+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" |
1084 |
|
1085 |
# Common to both DEPEND and RDEPEND |
1086 |
CDEPEND=" |
1087 |
dev-libs/openssl |
1088 |
sys-libs/zlib |
1089 |
pcre? ( dev-libs/libpcre ) |
1090 |
- perl? ( dev-lang/perl[-build(-)] ) |
1091 |
+ perl? ( dev-lang/perl:=[-build(-)] ) |
1092 |
tk? ( dev-lang/tk ) |
1093 |
curl? ( |
1094 |
net-misc/curl |
1095 |
@@ -100,6 +100,7 @@ S="${WORKDIR}/${MY_P}" |
1096 |
REQUIRED_USE=" |
1097 |
cgi? ( perl ) |
1098 |
cvs? ( perl ) |
1099 |
+ mediawiki? ( perl ) |
1100 |
subversion? ( perl ) |
1101 |
webdav? ( curl ) |
1102 |
gtk? ( python ) |
1103 |
@@ -222,6 +223,9 @@ src_prepare() { |
1104 |
# bug #350330 - automagic CVS when we don't want it is bad. |
1105 |
epatch "${FILESDIR}"/git-1.8.5-optional-cvs.patch |
1106 |
|
1107 |
+ # honor and correctly quote DISTDIR (from git master) |
1108 |
+ epatch "${FILESDIR}"/git-1.8.5-mw-destdir.patch |
1109 |
+ |
1110 |
sed -i \ |
1111 |
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ |
1112 |
-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ |
1113 |
@@ -329,6 +333,11 @@ src_compile() { |
1114 |
cd "${S}"/contrib/subtree |
1115 |
git_emake |
1116 |
use doc && git_emake doc |
1117 |
+ |
1118 |
+ if use mediawiki ; then |
1119 |
+ cd "${S}"/contrib/mw-to-git |
1120 |
+ git_emake |
1121 |
+ fi |
1122 |
} |
1123 |
|
1124 |
src_install() { |
1125 |
@@ -390,6 +399,12 @@ src_install() { |
1126 |
dodoc git-subtree.txt |
1127 |
cd "${S}" |
1128 |
|
1129 |
+ if use mediawiki ; then |
1130 |
+ cd "${S}"/contrib/mw-to-git |
1131 |
+ git_emake install |
1132 |
+ cd "${S}" |
1133 |
+ fi |
1134 |
+ |
1135 |
# git-diffall |
1136 |
dobin contrib/diffall/git-diffall |
1137 |
newdoc contrib/diffall/README git-diffall.txt |
1138 |
|
1139 |
diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml |
1140 |
index 106f3a8..6f4d4ee 100644 |
1141 |
--- a/dev-vcs/git/metadata.xml |
1142 |
+++ b/dev-vcs/git/metadata.xml |
1143 |
@@ -33,6 +33,7 @@ |
1144 |
<flag name="gpg">Pull in gnupg for signing -- without gnupg, attempts at signing will fail at runtime!</flag> |
1145 |
<flag name="gtk">Include the gitview contrib tool</flag> |
1146 |
<flag name="highlight">GitWeb support for app-text/highlight</flag> |
1147 |
+ <flag name="mediawiki">Support pulling and pushing from MediaWiki</flag> |
1148 |
<flag name="ppcsha1">Make use of a bundled routine that is optimized for the PPC arch</flag> |
1149 |
<flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support</flag> |
1150 |
<flag name="webdav">Adds support for push'ing to HTTP/HTTPS repositories via DAV</flag> |