1 |
commit: a8758e7ab7a4a1e7d1a2cdb4b1c926b6c7afa297 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 4 17:43:46 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 4 17:53:04 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8758e7a |
7 |
|
8 |
dev-vcs/git: Bump to version 2.34.0_rc1 |
9 |
|
10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
11 |
|
12 |
dev-vcs/git/Manifest | 3 + |
13 |
dev-vcs/git/git-2.34.0_rc1.ebuild | 668 ++++++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 671 insertions(+) |
15 |
|
16 |
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest |
17 |
index 42679febeb7..a655dfc74bc 100644 |
18 |
--- a/dev-vcs/git/Manifest |
19 |
+++ b/dev-vcs/git/Manifest |
20 |
@@ -6,6 +6,7 @@ DIST git-2.31.1.tar.xz 6413368 BLAKE2B 2d40aa3e5336e57b3cab42c36dd07698be7a811e2 |
21 |
DIST git-2.32.0.tar.xz 6551348 BLAKE2B 546203ce3f749ba806866a9e9767bc807794cec435fd0b60306ae6cd2b1b17a0159ef9774c79c4f59d0dba45b36941085b55f103e1820450d560bffa41d1058f SHA512 1ab3e7022ccee411d14a7da5c37d6259ef5c0f85ebed8f49698e25c65cbc7a46f8096919fcb6568360bfe284dd7475b596eee1a167db966096255a405853837c |
22 |
DIST git-2.33.0.tar.xz 6548308 BLAKE2B 52310a54a059ca1926ed14326bad5430f0bc8b19601c640fcaf6be58e2f9e9b2c0b7b34c4a3b80e84bb52cbd7c8c6a1b8b53c977af11f6714d32c34121221a63 SHA512 1abbcdf9ff640c95934b6a78341baa76ac3a5838c4751f513f334fdf5a3760c730e309f05ad16ffec115896e3e0c750c116683f6a787d92757ee9d916a346bfd |
23 |
DIST git-2.33.1.tar.xz 6558636 BLAKE2B f4959d5309f85e063448673a3f06f1d3cdd65ced5f5173cfe5a38df3b5547cae1c08275bda02e48307e8290628735e2ea1ff49222262e7cd29b252a6aa4d4a15 SHA512 16d417183232e1057bea754d59cdf4bbacc5f1527d1de6ee04cdd293a2512bfa7208e20f6130816605528b59cb1bc3188c5bddf1a42c1413095ee74e44dd2f91 |
24 |
+DIST git-2.34.0.rc1.tar.xz 6596708 BLAKE2B eb55ebb8c48650759aa2224f4685f4a53ecf5d21d7ccee71f45854789f79b62fdc7033762a3382e1e7f2c1cc007558cfaa166b9d5a6d1d588474c72380fd27a9 SHA512 2eaf7431869e52096e8317b8d0630f70a5f09f6bcc8b6567c6cb7e6eb283ec14c415ca0959f21c1b04c537afe08ddb79457199833005af92b2e716ccfe14a603 |
25 |
DIST git-htmldocs-2.26.3.tar.xz 1305208 BLAKE2B d5bb834b00a9d0cd3cdcd671e33142595e4ac28be8eab2326263f548718d52cf141b7fa6afee8da05a15ac75252455945dd34d60ffe5cda6cf1d612b7ee35953 SHA512 ff6c912572d32a1f32ec4c73e07e1404155ccbf81509a741e25e9dbcf42e5348dce59c40b0bb5d64993d8a981e2afd773393b2aeacde457870aa1f03feb9a1a6 |
26 |
DIST git-htmldocs-2.28.1.tar.xz 1348296 BLAKE2B 6bbaf94a963204d85100554578fb2520c44b74332e6dfd0f468fa3217efad2a484ef427359411569ca503a809aec00edde21ab577ee9ddc9779f0b702402ed4c SHA512 9e672673f271a136f9c2d1ed827dbc76656b40315cb5d11d95aa18c006fad8ea2c2535f2092f1b6514a6ae7f88589178fc90299b496f446debb673e8f36f8909 |
27 |
DIST git-htmldocs-2.29.3.tar.xz 1365468 BLAKE2B b8b2d46a5b35f6962f06bd9837ddc613aa5f4096dcdabea4308fcc52bf4f639fbdade2f91e01738cce6befb8b63faf57f8ecab1200048794d873f12055f04bdd SHA512 217a313636b5e7470e58d21428c81262f9d9909227f6a47c8445eb301bb20dd8393d0e600b8e7dad04b030a688561f93cdce317ad714cecd0505c198e1fe44a2 |
28 |
@@ -14,6 +15,7 @@ DIST git-htmldocs-2.31.1.tar.xz 1357592 BLAKE2B 54b48cfe2bb8e5dad9fdff862aa91e58 |
29 |
DIST git-htmldocs-2.32.0.tar.xz 1381664 BLAKE2B d1b47aa99d32a252fd20df26eff44a558044f3a389379b161bb43621eb28375eb0621969849a31938ba7fc9fc58b140d27d703559ea5735d0a0ffd2e93cd9692 SHA512 12b84e342f0d19afe385ab8a685ae625e86c3295d1555992e0c427b361aa2cdfc89a679e7dbc468d3568a325dafbf699468aadcdb02f93e372eff3dd96a7cf7f |
30 |
DIST git-htmldocs-2.33.0.tar.xz 1393260 BLAKE2B 4a43ce9d184a9c69d27a4c80e93ed5e138bb9d043272fbbda5399af00e089e138bd6d68d3f77b1907ae5edfe4d8a83a33ce0b8c38e20e0b363f5ac6367d16f7f SHA512 8cb2210be8022f9152045f72d0be30eb45134ec78edb47f99c83fa47d9fe7247fa918692d30bdefb24b246c143f3f987930c14a0a06b45448bb230c12036e0bc |
31 |
DIST git-htmldocs-2.33.1.tar.xz 1396744 BLAKE2B cbd65cf08fc7ea466fcd72820ba3e2135ade37f69c436a4ee7276dc71fb62f6270b71e2f46d981f5681a0fd3c30613d61680c2ef2460d0d7d292f7455e114128 SHA512 5b856b919067e1f644539d43a85aab6f602537ea0970b6248b471e3fa6756a8494f0525a69d22ad3795fcf9e106ff8439e0f6716ba0b8c895d7aad8c59e5bd74 |
32 |
+DIST git-htmldocs-2.34.0.rc1.tar.xz 1406144 BLAKE2B 49c8c1b134da39ac0ffa586f9270311c53cd3959cf746a810381a3ec501ab707296f79849314e56a68f7289dccc97250febc2679ee28fd7a3696911e9f573e72 SHA512 de4c7fc9fc24e407bab3abf504918b7b2d3e74567c25e574986f535187e586e7dde685829e321b7f289d1daa438a4339d125f527797f7fa40bd261fdb55ca3bf |
33 |
DIST git-manpages-2.26.3.tar.xz 462116 BLAKE2B 3191f719c5f2f0df34a66a041ab8590cbb43ed8df6d4b430df04e4255544048a982c00dbcbc7d7d9057830d5354c595d853e9f7558efdd6049be74e81d61a20d SHA512 8f9b64b0554867a56a647ac4f76351858342f84a38fd9977c606612c034dcad552afba8489a81ce227ed48a90d78f23d203452086175e218efb3f0fe8429f9f9 |
34 |
DIST git-manpages-2.28.1.tar.xz 472404 BLAKE2B d6b411dee47439b91e61f93fdca24fc5a707807c9445b69df81be8cdf6b78e24ea8424c0a36a3b4bd7db82e303b4139449a3fdc7de43d65d50f8b9e936e73669 SHA512 b543934fb9a91636033a2a7262180bf62b5493be3c222fb882aa992fe15f9fc0b9cc6723f3afa65fe8c60b8909af4337139bc0c355df0ac063f9e915d4b574bd |
35 |
DIST git-manpages-2.29.3.tar.xz 478456 BLAKE2B e568b92badda851be5d5c0524455d1eb728e4633dd88144edc8e22d84c64ad195538d906ae3443789ea14607be536d1de0f30b448ab0860d605b65a6476455fb SHA512 5d1a26c1342c31ca3501f2e40ec55c6e5dddd1ee2de909ec65425dea92455f00ca23a10e7475dcfe5b9a60dc4c2012778e86797cc8922de20638fcc07c60d941 |
36 |
@@ -22,3 +24,4 @@ DIST git-manpages-2.31.1.tar.xz 487784 BLAKE2B 9fe67839cca51f18b0aca16678eadb9ee |
37 |
DIST git-manpages-2.32.0.tar.xz 491868 BLAKE2B 7598a864246aed771371924604ee13d3f51b839b10b254bb1159dd47266513f5cd6484aab200a7b4ed427edc76538a98e39a040a17201483965175f5e1c5f484 SHA512 5c9950bd5d6904972cddf4afad534197d843c0dee8198d14ec5a3448873cab37dac88295b2a4df3658749f048bda4800b54fdc850517be7208906c911832c66e |
38 |
DIST git-manpages-2.33.0.tar.xz 492900 BLAKE2B 3f5e5cc8e9b493b272f2c9bd8b43a3bfd2f571bbcea8552471386cf8275d184d1559f61565bf33230cbba4ad9d36165173f016f53bf7240ca5e69bc5f5dd5cc3 SHA512 82b1e76cb457bd740dcc9614e0523064c1f6ef44654caa159efda555d201c8febf094f19cda0cdb3a828fefff30419a323976e64279eb361c1a6370e96245ed5 |
39 |
DIST git-manpages-2.33.1.tar.xz 494288 BLAKE2B 1f8bd4f23de31a285d3f4327e562dddafdf9f28e8b36334e54f5e280c81fc8170e8b153ca42baa642d02d8e6fdfcac9a8fdd3cee1e32c29bcd53f689d1a6c463 SHA512 d465a7b491046b7a5da6ad1fc6c62b351c69905932e0672263de5a1d3abe1113660cff9fe30c7be1d1695c6170ceca5a11b3f65e9b2d1545f35cc653e4c6ad62 |
40 |
+DIST git-manpages-2.34.0.rc1.tar.xz 497324 BLAKE2B 62c12441ed8053b6bf8023ccd37ef0830a7c604248a419a8472469d9eaf9cd6d7d5a358caba621140c9c66b8e60be7ed96d070318a2855c2b528b6023d7fc3e6 SHA512 c8662127936154fa6037460d6840095c3b9a2851baed4488c829453034d479bf780b5169bfe78f02e533e0dc804f0b4f64029a04dcb726236d7d6861a40ed62a |
41 |
|
42 |
diff --git a/dev-vcs/git/git-2.34.0_rc1.ebuild b/dev-vcs/git/git-2.34.0_rc1.ebuild |
43 |
new file mode 100644 |
44 |
index 00000000000..6af4b971bc5 |
45 |
--- /dev/null |
46 |
+++ b/dev-vcs/git/git-2.34.0_rc1.ebuild |
47 |
@@ -0,0 +1,668 @@ |
48 |
+# Copyright 1999-2021 Gentoo Authors |
49 |
+# Distributed under the terms of the GNU General Public License v2 |
50 |
+ |
51 |
+EAPI=8 |
52 |
+ |
53 |
+GENTOO_DEPEND_ON_PERL=no |
54 |
+ |
55 |
+# bug #329479: git-remote-testgit is not multiple-version aware |
56 |
+PYTHON_COMPAT=( python3_{8..10} ) |
57 |
+ |
58 |
+inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd |
59 |
+ |
60 |
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" |
61 |
+if [[ ${PV} == *9999 ]]; then |
62 |
+ inherit git-r3 |
63 |
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git" |
64 |
+ # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. |
65 |
+ # See https://git-scm.com/docs/gitworkflows#_graduation |
66 |
+ # In order of stability: |
67 |
+ # 9999-r0: maint |
68 |
+ # 9999-r1: master |
69 |
+ # 9999-r2: next |
70 |
+ # 9999-r3: seen |
71 |
+ case "${PVR}" in |
72 |
+ 9999) EGIT_BRANCH=maint ;; |
73 |
+ 9999-r1) EGIT_BRANCH=master ;; |
74 |
+ 9999-r2) EGIT_BRANCH=next;; |
75 |
+ 9999-r3) EGIT_BRANCH=seen ;; |
76 |
+ esac |
77 |
+fi |
78 |
+ |
79 |
+MY_PV="${PV/_rc/.rc}" |
80 |
+MY_P="${PN}-${MY_PV}" |
81 |
+ |
82 |
+DOC_VER="${MY_PV}" |
83 |
+ |
84 |
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" |
85 |
+HOMEPAGE="https://www.git-scm.com/" |
86 |
+if [[ ${PV} != *9999 ]]; then |
87 |
+ SRC_URI_SUFFIX="xz" |
88 |
+ SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" |
89 |
+ [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' |
90 |
+ SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} |
91 |
+ ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
92 |
+ doc? ( |
93 |
+ ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
94 |
+ )" |
95 |
+ [[ "${PV}" == *_rc* ]] || \ |
96 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
97 |
+fi |
98 |
+ |
99 |
+LICENSE="GPL-2" |
100 |
+SLOT="0" |
101 |
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" |
102 |
+ |
103 |
+# Common to both DEPEND and RDEPEND |
104 |
+DEPEND=" |
105 |
+ gnome-keyring? ( |
106 |
+ app-crypt/libsecret |
107 |
+ dev-libs/glib:2 |
108 |
+ ) |
109 |
+ dev-libs/openssl:0= |
110 |
+ sys-libs/zlib |
111 |
+ pcre? ( dev-libs/libpcre2:= ) |
112 |
+ perl? ( dev-lang/perl:=[-build(-)] ) |
113 |
+ tk? ( dev-lang/tk:0= ) |
114 |
+ curl? ( |
115 |
+ net-misc/curl |
116 |
+ webdav? ( dev-libs/expat ) |
117 |
+ ) |
118 |
+ iconv? ( virtual/libiconv ) |
119 |
+" |
120 |
+ |
121 |
+RDEPEND="${DEPEND} |
122 |
+ gpg? ( app-crypt/gnupg ) |
123 |
+ perl? ( |
124 |
+ dev-perl/Error |
125 |
+ dev-perl/MailTools |
126 |
+ dev-perl/Authen-SASL |
127 |
+ >=virtual/perl-libnet-3.110.0-r4[ssl] |
128 |
+ cgi? ( |
129 |
+ dev-perl/CGI |
130 |
+ highlight? ( app-text/highlight ) |
131 |
+ ) |
132 |
+ cvs? ( |
133 |
+ >=dev-vcs/cvsps-2.1:0 |
134 |
+ dev-perl/DBI |
135 |
+ dev-perl/DBD-SQLite |
136 |
+ ) |
137 |
+ mediawiki? ( |
138 |
+ dev-perl/DateTime-Format-ISO8601 |
139 |
+ dev-perl/HTML-Tree |
140 |
+ dev-perl/MediaWiki-API |
141 |
+ ) |
142 |
+ subversion? ( |
143 |
+ dev-vcs/subversion[-dso(-),perl] |
144 |
+ dev-perl/libwww-perl |
145 |
+ dev-perl/TermReadKey |
146 |
+ ) |
147 |
+ ) |
148 |
+ perforce? ( ${PYTHON_DEPS} ) |
149 |
+" |
150 |
+ |
151 |
+# This is how info docs are created with Git: |
152 |
+# .txt/asciidoc --(asciidoc)---------> .xml/docbook |
153 |
+# .xml/docbook --(docbook2texi.pl)--> .texi |
154 |
+# .texi --(makeinfo)---------> .info |
155 |
+BDEPEND=" |
156 |
+ doc? ( |
157 |
+ app-text/asciidoc |
158 |
+ app-text/docbook2X |
159 |
+ app-text/xmlto |
160 |
+ sys-apps/texinfo |
161 |
+ ) |
162 |
+ emacs? ( >=app-editors/emacs-23.1:* ) |
163 |
+ gnome-keyring? ( virtual/pkgconfig ) |
164 |
+ nls? ( sys-devel/gettext ) |
165 |
+ test? ( app-crypt/gnupg ) |
166 |
+" |
167 |
+ |
168 |
+# Live ebuild builds man pages and HTML docs, additionally |
169 |
+if [[ ${PV} == *9999 ]]; then |
170 |
+ BDEPEND="${BDEPEND} |
171 |
+ app-text/asciidoc" |
172 |
+fi |
173 |
+ |
174 |
+SITEFILE="50${PN}-gentoo.el" |
175 |
+S="${WORKDIR}/${MY_P}" |
176 |
+ |
177 |
+REQUIRED_USE=" |
178 |
+ cgi? ( perl ) |
179 |
+ cvs? ( perl ) |
180 |
+ mediawiki? ( perl ) |
181 |
+ mediawiki-experimental? ( mediawiki ) |
182 |
+ perforce? ( ${PYTHON_REQUIRED_USE} ) |
183 |
+ subversion? ( perl ) |
184 |
+ webdav? ( curl ) |
185 |
+" |
186 |
+ |
187 |
+RESTRICT="!test? ( test )" |
188 |
+ |
189 |
+PATCHES=( |
190 |
+ # bug #350330 - automagic CVS when we don't want it is bad. |
191 |
+ "${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch |
192 |
+ |
193 |
+ # Make submodule output quiet |
194 |
+ "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch |
195 |
+) |
196 |
+ |
197 |
+pkg_setup() { |
198 |
+ if use subversion && has_version "dev-vcs/subversion[dso]" ; then |
199 |
+ ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" |
200 |
+ ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
201 |
+ ewarn "have been warned." |
202 |
+ fi |
203 |
+ |
204 |
+ if use perforce ; then |
205 |
+ python-single-r1_pkg_setup |
206 |
+ fi |
207 |
+} |
208 |
+ |
209 |
+# This is needed because for some obscure reasons future calls to make don't |
210 |
+# pick up these exports if we export them in src_unpack() |
211 |
+exportmakeopts() { |
212 |
+ local extlibs myopts |
213 |
+ |
214 |
+ myopts=( |
215 |
+ ASCIIDOC_NO_ROFF=YesPlease |
216 |
+ $(usex cvs '' NO_CVS=YesPlease) |
217 |
+ $(usex elibc_musl NO_REGEX=YesPlease '') |
218 |
+ $(usex iconv '' NO_ICONV=YesPlease) |
219 |
+ $(usex nls '' NO_GETTEXT=YesPlease) |
220 |
+ $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) |
221 |
+ $(usex perforce '' NO_PYTHON=YesPlease) |
222 |
+ $(usex subversion '' NO_SVN_TESTS=YesPlease) |
223 |
+ $(usex threads '' NO_PTHREADS=YesPlease) |
224 |
+ $(usex tk '' NO_TCLTK=YesPlease) |
225 |
+ ) |
226 |
+ |
227 |
+ if use blksha1 ; then |
228 |
+ myopts+=( BLK_SHA1=YesPlease ) |
229 |
+ elif use ppcsha1 ; then |
230 |
+ myopts+=( PPC_SHA1=YesPlease ) |
231 |
+ fi |
232 |
+ |
233 |
+ if use curl ; then |
234 |
+ use webdav || myopts+=( NO_EXPAT=YesPlease ) |
235 |
+ else |
236 |
+ myopts+=( NO_CURL=YesPlease ) |
237 |
+ fi |
238 |
+ |
239 |
+ # broken assumptions, because of static build system ... |
240 |
+ myopts+=( |
241 |
+ NO_FINK=YesPlease |
242 |
+ NO_DARWIN_PORTS=YesPlease |
243 |
+ INSTALL=install |
244 |
+ TAR=tar |
245 |
+ SHELL_PATH="${EPREFIX}/bin/sh" |
246 |
+ SANE_TOOL_PATH= |
247 |
+ OLD_ICONV= |
248 |
+ NO_EXTERNAL_GREP= |
249 |
+ ) |
250 |
+ |
251 |
+ # can't define this to null, since the entire makefile depends on it |
252 |
+ sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die |
253 |
+ |
254 |
+ if use pcre; then |
255 |
+ myopts+=( USE_LIBPCRE2=YesPlease ) |
256 |
+ extlibs+=( -lpcre2-8 ) |
257 |
+ fi |
258 |
+ if [[ ${CHOST} == *-solaris* ]]; then |
259 |
+ myopts+=( |
260 |
+ NEEDS_LIBICONV=YesPlease |
261 |
+ HAVE_CLOCK_MONOTONIC=1 |
262 |
+ ) |
263 |
+ if grep -Fq getdelim "${EROOT}"/usr/include/stdio.h ; then |
264 |
+ myopts+=( HAVE_GETDELIM=1 ) |
265 |
+ fi |
266 |
+ fi |
267 |
+ |
268 |
+ if has_version '>=app-text/asciidoc-8.0' ; then |
269 |
+ myopts+=( ASCIIDOC8=YesPlease ) |
270 |
+ fi |
271 |
+ |
272 |
+ # Bug 290465: |
273 |
+ # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' |
274 |
+ if [[ "${CHOST}" == *-uclibc* ]] ; then |
275 |
+ myopts+=( NO_NSEC=YesPlease ) |
276 |
+ use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) |
277 |
+ fi |
278 |
+ |
279 |
+ export MY_MAKEOPTS="${myopts[@]}" |
280 |
+ export EXTLIBS="${extlibs[@]}" |
281 |
+} |
282 |
+ |
283 |
+src_unpack() { |
284 |
+ if [[ ${PV} != *9999 ]] ; then |
285 |
+ unpack ${MY_P}.tar.${SRC_URI_SUFFIX} |
286 |
+ cd "${S}" || die |
287 |
+ unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
288 |
+ if use doc ; then |
289 |
+ pushd "${S}"/Documentation &>/dev/null || die |
290 |
+ unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
291 |
+ popd &>/dev/null || die |
292 |
+ fi |
293 |
+ else |
294 |
+ git-r3_src_unpack |
295 |
+ #cp "${FILESDIR}"/GIT-VERSION-GEN . |
296 |
+ fi |
297 |
+ |
298 |
+} |
299 |
+ |
300 |
+src_prepare() { |
301 |
+ # add experimental patches to improve mediawiki support |
302 |
+ # see patches for origin |
303 |
+ if use mediawiki-experimental ; then |
304 |
+ PATCHES+=( |
305 |
+ "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch |
306 |
+ "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch |
307 |
+ "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch |
308 |
+ ) |
309 |
+ fi |
310 |
+ |
311 |
+ default |
312 |
+ |
313 |
+ if use prefix ; then |
314 |
+ # bug #757309 |
315 |
+ eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch |
316 |
+ fi |
317 |
+ |
318 |
+ sed -i \ |
319 |
+ -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ |
320 |
+ -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ |
321 |
+ -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ |
322 |
+ -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ |
323 |
+ -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ |
324 |
+ -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ |
325 |
+ Makefile || die |
326 |
+ |
327 |
+ # Fix docbook2texi command |
328 |
+ sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ |
329 |
+ Documentation/Makefile || die |
330 |
+} |
331 |
+ |
332 |
+git_emake() { |
333 |
+ # bug #320647: PYTHON_PATH |
334 |
+ local PYTHON_PATH="" |
335 |
+ use perforce && PYTHON_PATH="${PYTHON}" |
336 |
+ emake ${MY_MAKEOPTS} \ |
337 |
+ prefix="${EPREFIX}"/usr \ |
338 |
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
339 |
+ perllibdir="$(use perl && perl_get_raw_vendorlib)" \ |
340 |
+ sysconfdir="${EPREFIX}"/etc \ |
341 |
+ DESTDIR="${D}" \ |
342 |
+ GIT_TEST_OPTS="--no-color" \ |
343 |
+ OPTAR="$(tc-getAR)" \ |
344 |
+ OPTCC="$(tc-getCC)" \ |
345 |
+ OPTCFLAGS="${CFLAGS}" \ |
346 |
+ OPTLDFLAGS="${LDFLAGS}" \ |
347 |
+ PERL_PATH="${EPREFIX}/usr/bin/perl" \ |
348 |
+ PERL_MM_OPT="" \ |
349 |
+ PYTHON_PATH="${PYTHON_PATH}" \ |
350 |
+ V=1 \ |
351 |
+ "$@" |
352 |
+} |
353 |
+ |
354 |
+src_configure() { |
355 |
+ exportmakeopts |
356 |
+} |
357 |
+ |
358 |
+src_compile() { |
359 |
+ git_emake || die "emake failed" |
360 |
+ |
361 |
+ if use emacs ; then |
362 |
+ elisp-compile contrib/emacs/git{,-blame}.el |
363 |
+ fi |
364 |
+ |
365 |
+ if use perl && use cgi ; then |
366 |
+ git_emake gitweb || die "emake gitweb (cgi) failed" |
367 |
+ fi |
368 |
+ |
369 |
+ if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then |
370 |
+ pushd contrib/credential/osxkeychain &>/dev/null || die |
371 |
+ git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ |
372 |
+ || die "emake credential-osxkeychain" |
373 |
+ popd &>/dev/null || die |
374 |
+ fi |
375 |
+ |
376 |
+ pushd Documentation &>/dev/null || die |
377 |
+ if [[ ${PV} == *9999 ]] ; then |
378 |
+ git_emake man || die "emake man failed" |
379 |
+ if use doc ; then |
380 |
+ git_emake info html || die "emake info html failed" |
381 |
+ fi |
382 |
+ else |
383 |
+ if use doc ; then |
384 |
+ git_emake info || die "emake info html failed" |
385 |
+ fi |
386 |
+ fi |
387 |
+ popd &>/dev/null || die |
388 |
+ |
389 |
+ if use gnome-keyring ; then |
390 |
+ pushd contrib/credential/libsecret &>/dev/null || die |
391 |
+ git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)" |
392 |
+ popd &>/dev/null || die |
393 |
+ fi |
394 |
+ |
395 |
+ pushd contrib/subtree &>/dev/null || die |
396 |
+ git_emake git-subtree || die |
397 |
+ # git-subtree.1 requires the full USE=doc dependency stack |
398 |
+ use doc && git_emake git-subtree.html git-subtree.1 |
399 |
+ popd &>/dev/null || die |
400 |
+ |
401 |
+ pushd contrib/diff-highlight &>/dev/null || die |
402 |
+ git_emake || die |
403 |
+ popd &>/dev/null || die |
404 |
+ |
405 |
+ if use mediawiki ; then |
406 |
+ pushd contrib/mw-to-git &>/dev/null || die |
407 |
+ git_emake || die |
408 |
+ popd &>/dev/null || die |
409 |
+ |
410 |
+ fi |
411 |
+} |
412 |
+ |
413 |
+src_install() { |
414 |
+ git_emake install || die "make install failed" |
415 |
+ |
416 |
+ if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then |
417 |
+ dobin contrib/credential/osxkeychain/git-credential-osxkeychain |
418 |
+ fi |
419 |
+ |
420 |
+ # Depending on the tarball and manual rebuild of the documentation, the |
421 |
+ # manpages may exist in either OR both of these directories. |
422 |
+ find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] |
423 |
+ find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] |
424 |
+ dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} |
425 |
+ use doc && dodir /usr/share/doc/${PF}/html |
426 |
+ local d |
427 |
+ for d in / /howto/ /technical/ ; do |
428 |
+ docinto ${d} |
429 |
+ dodoc Documentation${d}*.txt |
430 |
+ if use doc ; then |
431 |
+ docinto ${d}/html |
432 |
+ dodoc Documentation${d}*.html |
433 |
+ fi |
434 |
+ done |
435 |
+ docinto / |
436 |
+ # Upstream does not ship this pre-built :-( |
437 |
+ use doc && doinfo Documentation/{git,gitman}.info |
438 |
+ |
439 |
+ newbashcomp contrib/completion/git-completion.bash ${PN} |
440 |
+ bashcomp_alias git gitk |
441 |
+ # Not really a bash-completion file (bug #477920) |
442 |
+ # but still needed uncompressed (bug #507480) |
443 |
+ insinto /usr/share/${PN} |
444 |
+ doins contrib/completion/git-prompt.sh |
445 |
+ |
446 |
+ if use emacs ; then |
447 |
+ elisp-install ${PN} contrib/emacs/git.{el,elc} |
448 |
+ elisp-install ${PN} contrib/emacs/git-blame.{el,elc} |
449 |
+ #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} |
450 |
+ # don't add automatically to the load-path, so the sitefile |
451 |
+ # can do a conditional loading |
452 |
+ touch "${ED}${SITELISP}/${PN}/compat/.nosearch" |
453 |
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
454 |
+ fi |
455 |
+ |
456 |
+ #dobin contrib/fast-import/git-p4 # Moved upstream |
457 |
+ #dodoc contrib/fast-import/git-p4.txt # Moved upstream |
458 |
+ newbin contrib/fast-import/import-tars.perl import-tars |
459 |
+ exeinto /usr/libexec/git-core/ |
460 |
+ newexe contrib/git-resurrect.sh git-resurrect |
461 |
+ |
462 |
+ # git-subtree |
463 |
+ pushd contrib/subtree &>/dev/null || die |
464 |
+ git_emake install || die "Failed to emake install for git-subtree" |
465 |
+ if use doc ; then |
466 |
+ # Do not move git subtree install-man outside USE=doc! |
467 |
+ git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" |
468 |
+ fi |
469 |
+ newdoc README README.git-subtree |
470 |
+ dodoc git-subtree.txt |
471 |
+ popd &>/dev/null || die |
472 |
+ |
473 |
+ if use mediawiki ; then |
474 |
+ pushd contrib/mw-to-git &>/dev/null || die |
475 |
+ git_emake install |
476 |
+ popd &>/dev/null || die |
477 |
+ fi |
478 |
+ |
479 |
+ # diff-highlight |
480 |
+ dobin contrib/diff-highlight/diff-highlight |
481 |
+ newdoc contrib/diff-highlight/README README.diff-highlight |
482 |
+ |
483 |
+ # git-jump |
484 |
+ exeinto /usr/libexec/git-core/ |
485 |
+ doexe contrib/git-jump/git-jump |
486 |
+ newdoc contrib/git-jump/README git-jump.txt |
487 |
+ |
488 |
+ # git-contacts |
489 |
+ exeinto /usr/libexec/git-core/ |
490 |
+ doexe contrib/contacts/git-contacts |
491 |
+ dodoc contrib/contacts/git-contacts.txt |
492 |
+ |
493 |
+ if use gnome-keyring ; then |
494 |
+ pushd contrib/credential/libsecret &>/dev/null || die |
495 |
+ dobin git-credential-libsecret |
496 |
+ popd &>/dev/null || die |
497 |
+ fi |
498 |
+ |
499 |
+ dodir /usr/share/${PN}/contrib |
500 |
+ # The following are excluded: |
501 |
+ # completion - installed above |
502 |
+ # diff-highlight - done above |
503 |
+ # emacs - installed above |
504 |
+ # examples - these are stuff that is not used in Git anymore actually |
505 |
+ # git-jump - done above |
506 |
+ # gitview - installed above |
507 |
+ # p4import - excluded because fast-import has a better one |
508 |
+ # patches - stuff the Git guys made to go upstream to other places |
509 |
+ # persistent-https - TODO |
510 |
+ # mw-to-git - TODO |
511 |
+ # subtree - build seperately |
512 |
+ # svnimport - use git-svn |
513 |
+ # thunderbird-patch-inline - fixes thunderbird |
514 |
+ local contrib_objects=( |
515 |
+ buildsystems |
516 |
+ fast-import |
517 |
+ hg-to-git |
518 |
+ hooks |
519 |
+ remotes2config.sh |
520 |
+ rerere-train.sh |
521 |
+ stats |
522 |
+ workdir |
523 |
+ ) |
524 |
+ local i |
525 |
+ for i in "${contrib_objects[@]}" ; do |
526 |
+ cp -rf \ |
527 |
+ "${S}"/contrib/${i} \ |
528 |
+ "${ED}"/usr/share/${PN}/contrib \ |
529 |
+ || die "Failed contrib ${i}" |
530 |
+ done |
531 |
+ |
532 |
+ if use perl && use cgi ; then |
533 |
+ # We used to install in /usr/share/${PN}/gitweb |
534 |
+ # but upstream installs in /usr/share/gitweb |
535 |
+ # so we will install a symlink and use their location for compat with other |
536 |
+ # distros |
537 |
+ dosym ../gitweb /usr/share/${PN}/gitweb |
538 |
+ |
539 |
+ # INSTALL discusses configuration issues, not just installation |
540 |
+ docinto / |
541 |
+ newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb |
542 |
+ newdoc "${S}"/gitweb/README README.gitweb |
543 |
+ |
544 |
+ for d in "${ED}"/usr/lib{,64}/perl5/ ; do |
545 |
+ if [[ -d "${d}" ]] ; then |
546 |
+ find "${d}" -name .packlist -delete || die |
547 |
+ fi |
548 |
+ done |
549 |
+ else |
550 |
+ rm -rf "${ED}"/usr/share/gitweb |
551 |
+ fi |
552 |
+ |
553 |
+ if ! use subversion ; then |
554 |
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \ |
555 |
+ "${ED}"/usr/share/man/man1/git-svn.1* |
556 |
+ fi |
557 |
+ |
558 |
+ if use xinetd ; then |
559 |
+ insinto /etc/xinetd.d |
560 |
+ newins "${FILESDIR}"/git-daemon.xinetd git-daemon |
561 |
+ fi |
562 |
+ |
563 |
+ if ! use prefix ; then |
564 |
+ newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon |
565 |
+ newconfd "${FILESDIR}"/git-daemon.confd git-daemon |
566 |
+ systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \ |
567 |
+ "git-daemon@.service" |
568 |
+ systemd_dounit "${FILESDIR}/git-daemon.socket" |
569 |
+ fi |
570 |
+ |
571 |
+ perl_delete_localpod |
572 |
+ |
573 |
+ # Remove disabled linguas |
574 |
+ # we could remove sources in src_prepare, but install does not |
575 |
+ # handle missing locale dir well |
576 |
+ rm_loc() { |
577 |
+ if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then |
578 |
+ rm -r "${ED}/usr/share/locale/${1}" || die |
579 |
+ fi |
580 |
+ } |
581 |
+ plocale_for_each_disabled_locale rm_loc |
582 |
+} |
583 |
+ |
584 |
+src_test() { |
585 |
+ local disabled=() |
586 |
+ local tests_cvs=( |
587 |
+ t9200-git-cvsexportcommit.sh |
588 |
+ t9400-git-cvsserver-server.sh |
589 |
+ t9401-git-cvsserver-crlf.sh |
590 |
+ t9402-git-cvsserver-refs.sh |
591 |
+ t9600-cvsimport.sh |
592 |
+ t9601-cvsimport-vendor-branch.sh |
593 |
+ t9602-cvsimport-branches-tags.sh |
594 |
+ t9603-cvsimport-patchsets.sh |
595 |
+ t9604-cvsimport-timestamps.sh |
596 |
+ ) |
597 |
+ local tests_perl=( |
598 |
+ t3701-add-interactive.sh |
599 |
+ t5502-quickfetch.sh |
600 |
+ t5512-ls-remote.sh |
601 |
+ t5520-pull.sh |
602 |
+ t7106-reset-unborn-branch.sh |
603 |
+ t7501-commit.sh |
604 |
+ ) |
605 |
+ # Bug #225601 - t0004 is not suitable for root perm |
606 |
+ # Bug #219839 - t1004 is not suitable for root perm |
607 |
+ # t0001-init.sh - check for init notices EPERM* fails |
608 |
+ local tests_nonroot=( |
609 |
+ t0001-init.sh |
610 |
+ t0004-unwritable.sh |
611 |
+ t0070-fundamental.sh |
612 |
+ t1004-read-tree-m-u-wf.sh |
613 |
+ t3700-add.sh |
614 |
+ t7300-clean.sh |
615 |
+ ) |
616 |
+ # t9100 still fails with symlinks in SVN 1.7 |
617 |
+ local test_svn=( t9100-git-svn-basic.sh ) |
618 |
+ |
619 |
+ # Unzip is used only for the testcase code, not by any normal parts of Git. |
620 |
+ if ! has_version app-arch/unzip ; then |
621 |
+ einfo "Disabling tar-tree tests" |
622 |
+ disabled+=( t5000-tar-tree.sh ) |
623 |
+ fi |
624 |
+ |
625 |
+ local cvs=0 |
626 |
+ use cvs && let cvs=${cvs}+1 |
627 |
+ if [[ ${EUID} -eq 0 ]] ; then |
628 |
+ if [[ ${cvs} -eq 1 ]] ; then |
629 |
+ ewarn "Skipping CVS tests because CVS does not work as root!" |
630 |
+ ewarn "You should retest with FEATURES=userpriv!" |
631 |
+ disabled+=( ${tests_cvs[@]} ) |
632 |
+ fi |
633 |
+ einfo "Skipping other tests that require being non-root" |
634 |
+ disabled+=( ${tests_nonroot[@]} ) |
635 |
+ else |
636 |
+ [[ ${cvs} -gt 0 ]] && \ |
637 |
+ has_version dev-vcs/cvs && \ |
638 |
+ let cvs=${cvs}+1 |
639 |
+ [[ ${cvs} -gt 1 ]] && \ |
640 |
+ has_version "dev-vcs/cvs[server]" && \ |
641 |
+ let cvs=${cvs}+1 |
642 |
+ if [[ ${cvs} -lt 3 ]] ; then |
643 |
+ einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" |
644 |
+ disabled+=( ${tests_cvs[@]} ) |
645 |
+ fi |
646 |
+ fi |
647 |
+ |
648 |
+ if ! use perl ; then |
649 |
+ einfo "Disabling tests that need Perl" |
650 |
+ disabled+=( ${tests_perl[@]} ) |
651 |
+ fi |
652 |
+ |
653 |
+ einfo "Disabling tests that fail with SVN 1.7" |
654 |
+ disabled+=( ${test_svn[@]} ) |
655 |
+ |
656 |
+ # Reset all previously disabled tests |
657 |
+ pushd t &>/dev/null || die |
658 |
+ local i |
659 |
+ for i in *.sh.DISABLED ; do |
660 |
+ [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" |
661 |
+ done |
662 |
+ einfo "Disabled tests:" |
663 |
+ for i in ${disabled[@]} ; do |
664 |
+ if [[ -f "${i}" ]] ; then |
665 |
+ mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" |
666 |
+ fi |
667 |
+ done |
668 |
+ |
669 |
+ # Avoid the test system removing the results because we want them ourselves |
670 |
+ sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die |
671 |
+ |
672 |
+ # Clean old results first, must always run |
673 |
+ nonfatal git_emake clean |
674 |
+ popd &>/dev/null || die |
675 |
+ |
676 |
+ # Now run the tests, keep going if we hit an error, and don't terminate on |
677 |
+ # failure |
678 |
+ local rc |
679 |
+ einfo "Start test run" |
680 |
+ #MAKEOPTS=-j1 |
681 |
+ nonfatal git_emake --keep-going test |
682 |
+ rc=$? |
683 |
+ |
684 |
+ # Display nice results, now print the results |
685 |
+ pushd t &>/dev/null || die |
686 |
+ nonfatal git_emake aggregate-results |
687 |
+ |
688 |
+ # And bail if there was a problem |
689 |
+ [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." |
690 |
+} |
691 |
+ |
692 |
+showpkgdeps() { |
693 |
+ local pkg=$1 |
694 |
+ shift |
695 |
+ elog " $(printf "%-17s:" ${pkg}) ${@}" |
696 |
+} |
697 |
+ |
698 |
+pkg_postinst() { |
699 |
+ use emacs && elisp-site-regen |
700 |
+ elog "Please read /usr/share/bash-completion/completions/git for Git bash command" |
701 |
+ elog "completion." |
702 |
+ elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" |
703 |
+ elog "Note that the prompt bash code is now in that separate script" |
704 |
+ elog "These additional scripts need some dependencies:" |
705 |
+ echo |
706 |
+ showpkgdeps git-quiltimport "dev-util/quilt" |
707 |
+ showpkgdeps git-instaweb \ |
708 |
+ "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" |
709 |
+ echo |
710 |
+ use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed." |
711 |
+} |
712 |
+ |
713 |
+pkg_postrm() { |
714 |
+ use emacs && elisp-site-regen |
715 |
+} |