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