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