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