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