Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-vcs/git: git-1.7.0.4.ebuild ChangeLog
Date: Thu, 01 Apr 2010 05:22:07
Message-Id: E1NxCqw-0000GV-36@stork.gentoo.org
1 robbat2 10/04/01 05:22:02
2
3 Modified: ChangeLog
4 Added: git-1.7.0.4.ebuild
5 Log:
6 Version bump.
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.5 dev-vcs/git/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.5&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.5&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.4&r2=1.5
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v
19 retrieving revision 1.4
20 retrieving revision 1.5
21 diff -p -w -b -B -u -u -r1.4 -r1.5
22 --- ChangeLog 31 Mar 2010 07:15:31 -0000 1.4
23 +++ ChangeLog 1 Apr 2010 05:22:01 -0000 1.5
24 @@ -1,6 +1,11 @@
25 # ChangeLog for dev-vcs/git
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.4 2010/03/31 07:15:31 robbat2 Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.5 2010/04/01 05:22:01 robbat2 Exp $
29 +
30 +*git-1.7.0.4 (01 Apr 2010)
31 +
32 + 01 Apr 2010; Robin H. Johnson <robbat2@g.o> +git-1.7.0.4.ebuild:
33 + Version bump.
34
35 31 Mar 2010; Robin H. Johnson <robbat2@g.o> git-1.6.5.1-r1.ebuild,
36 git-1.6.5.2.ebuild, git-1.6.5.3.ebuild, git-1.6.5.4.ebuild,
37
38
39
40 1.1 dev-vcs/git/git-1.7.0.4.ebuild
41
42 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-vcs/git/git-1.7.0.4.ebuild?rev=1.1&view=markup
43 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-vcs/git/git-1.7.0.4.ebuild?rev=1.1&content-type=text/plain
44
45 Index: git-1.7.0.4.ebuild
46 ===================================================================
47 # Copyright 1999-2010 Gentoo Foundation
48 # Distributed under the terms of the GNU General Public License v2
49 # $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.0.4.ebuild,v 1.1 2010/04/01 05:22:01 robbat2 Exp $
50
51 EAPI=2
52
53 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
54 [ "$PV" == "9999" ] && inherit git
55
56 MY_PV="${PV/_rc/.rc}"
57 MY_P="${PN}-${MY_PV}"
58
59 DOC_VER=${MY_PV}
60
61 DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
62 HOMEPAGE="http://www.git-scm.com/"
63 if [ "$PV" != "9999" ]; then
64 SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
65 mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
66 doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
67 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
68 else
69 SRC_URI=""
70 EGIT_BRANCH="master"
71 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
72 # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
73 KEYWORDS=""
74 fi
75
76 LICENSE="GPL-2"
77 SLOT="0"
78 IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
79
80 # Common to both DEPEND and RDEPEND
81 CDEPEND="
82 !blksha1? ( dev-libs/openssl )
83 sys-libs/zlib
84 perl? ( dev-lang/perl )
85 tk? ( dev-lang/tk )
86 curl? (
87 net-misc/curl
88 webdav? ( dev-libs/expat )
89 )
90 emacs? ( virtual/emacs )"
91
92 RDEPEND="${CDEPEND}
93 perl? ( dev-perl/Error
94 dev-perl/Net-SMTP-SSL
95 dev-perl/Authen-SASL
96 cgi? ( virtual/perl-CGI )
97 cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
98 subversion? ( dev-util/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
99 )
100 gtk?
101 (
102 >=dev-python/pygtk-2.8
103 || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python )
104 )"
105
106 # This is how info docs are created with Git:
107 # .txt/asciidoc --(asciidoc)---------> .xml/docbook
108 # .xml/docbook --(docbook2texi.pl)--> .texi
109 # .texi --(makeinfo)---------> .info
110 DEPEND="${CDEPEND}
111 app-arch/cpio
112 doc? (
113 app-text/asciidoc
114 app-text/docbook2X
115 sys-apps/texinfo
116 )"
117
118 # Live ebuild builds HTML docs, additionally
119 if [ "$PV" == "9999" ]; then
120 DEPEND="${DEPEND}
121 doc? (
122 app-text/xmlto
123 )"
124 fi
125
126 SITEFILE=50${PN}-gentoo.el
127 S="${WORKDIR}/${MY_P}"
128
129 pkg_setup() {
130 if ! use perl ; then
131 use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
132 use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
133 use subversion && ewarn "git-svn needs USE=perl, it won't work"
134 fi
135 if use webdav && ! use curl ; then
136 ewarn "USE=webdav needs USE=curl. Ignoring"
137 fi
138 if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/subversion dso ; then
139 ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
140 ewarn "with USE=dso, there may be weird crashes in git-svn. You"
141 ewarn "have been warned."
142 fi
143 }
144
145 # This is needed because for some obscure reasons future calls to make don't
146 # pick up these exports if we export them in src_unpack()
147 exportmakeopts() {
148 local myopts
149
150 if use blksha1 ; then
151 myopts="${myopts} BLK_SHA1=YesPlease"
152 elif use ppcsha1 ; then
153 myopts="${myopts} PPC_SHA1=YesPlease"
154 fi
155
156 if use curl ; then
157 use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
158 else
159 myopts="${myopts} NO_CURL=YesPlease"
160 fi
161
162 use iconv \
163 || myopts="${myopts} NO_ICONV=YesPlease"
164 use tk \
165 || myopts="${myopts} NO_TCLTK=YesPlease"
166 use perl \
167 && myopts="${myopts} INSTALLDIRS=vendor" \
168 || myopts="${myopts} NO_PERL=YesPlease"
169 use threads \
170 && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
171 use subversion \
172 || myopts="${myopts} NO_SVN_TESTS=YesPlease"
173
174 has_version '>=app-text/asciidoc-8.0' \
175 && myopts="${myopts} ASCIIDOC8=YesPlease"
176 myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
177
178 # Bug 290465:
179 # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
180 [[ "${CHOST}" == *-uclibc* ]] && \
181 myopts="${myopts} NO_NSEC=YesPlease"
182
183 export MY_MAKEOPTS="${myopts}"
184 }
185
186 src_unpack() {
187 if [ "${PV}" != "9999" ]; then
188 unpack ${MY_P}.tar.bz2
189 cd "${S}"
190 unpack ${PN}-manpages-${DOC_VER}.tar.bz2
191 use doc && \
192 cd "${S}"/Documentation && \
193 unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
194 cd "${S}"
195 else
196 git_src_unpack
197 cd "${S}"
198 #cp "${FILESDIR}"/GIT-VERSION-GEN .
199 fi
200
201 }
202
203 src_prepare() {
204 # Noperl is being merged to upstream as of 2009/04/05
205 #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
206
207 # GetOpt-Long v2.38 is strict
208 # Merged in 1.6.3 final 2009/05/07
209 #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
210
211 # JS install fixup
212 epatch "${FILESDIR}"/git-1.7.0-always-install-js.patch
213
214 sed -i \
215 -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
216 -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
217 -e 's:^\(CC = \).*$:\1$(OPTCC):' \
218 -e 's:^\(AR = \).*$:\1$(OPTAR):' \
219 Makefile || die "sed failed"
220
221 # Never install the private copy of Error.pm (bug #296310)
222 sed -i \
223 -e '/private-Error.pm/s,^,#,' \
224 perl/Makefile.PL
225
226 # Fix docbook2texi command
227 sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
228 Documentation/Makefile || die "sed failed"
229
230 }
231
232 git_emake() {
233 emake ${MY_MAKEOPTS} \
234 DESTDIR="${D}" \
235 OPTCFLAGS="${CFLAGS}" \
236 OPTLDFLAGS="${LDFLAGS}" \
237 OPTCC="$(tc-getCC)" \
238 OPTAR="$(tc-getAR)" \
239 prefix=/usr \
240 htmldir=/usr/share/doc/${PF}/html \
241 "$@"
242 }
243
244 src_configure() {
245 exportmakeopts
246 }
247
248 src_compile() {
249 git_emake || die "emake failed"
250
251 if use emacs ; then
252 elisp-compile contrib/emacs/git{,-blame}.el \
253 || die "emacs modules failed"
254 fi
255
256 if use perl && use cgi ; then
257 git_emake \
258 gitweb/gitweb.cgi \
259 || die "emake gitweb/gitweb.cgi failed"
260 fi
261
262 cd "${S}"/Documentation
263 if [[ "$PV" == "9999" ]] ; then
264 git_emake man \
265 || die "emake man failed"
266 if use doc ; then
267 git_emake info html \
268 || die "emake info html failed"
269 fi
270 else
271 if use doc ; then
272 git_emake info \
273 || die "emake info html failed"
274 fi
275 fi
276 }
277
278 src_install() {
279 git_emake \
280 install || \
281 die "make install failed"
282
283 doman man?/*.[157] Documentation/*.[157]
284
285 dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
286 use doc && dodir /usr/share/doc/${PF}/html
287 for d in / /howto/ /technical/ ; do
288 docinto ${d}
289 dodoc Documentation${d}*.txt
290 use doc && dohtml -p ${d} Documentation${d}*.html
291 done
292 docinto /
293 # Upstream does not ship this pre-built :-(
294 use doc && doinfo Documentation/{git,gitman}.info
295
296 dobashcompletion contrib/completion/git-completion.bash ${PN}
297
298 if use emacs ; then
299 elisp-install ${PN} contrib/emacs/git.{el,elc} || die
300 elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
301 #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
302 # don't add automatically to the load-path, so the sitefile
303 # can do a conditional loading
304 touch "${D}${SITELISP}/${PN}/compat/.nosearch"
305 elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
306 fi
307
308 if use gtk ; then
309 dobin "${S}"/contrib/gitview/gitview
310 dodoc "${S}"/contrib/gitview/gitview.txt
311 fi
312
313 dobin contrib/fast-import/git-p4
314 dodoc contrib/fast-import/git-p4.txt
315 newbin contrib/fast-import/import-tars.perl import-tars
316
317 dodir /usr/share/${PN}/contrib
318 # The following are excluded:
319 # svnimport - use git-svn
320 # p4import - excluded because fast-import has a better one
321 # examples - these are stuff that is not used in Git anymore actually
322 # patches - stuff the Git guys made to go upstream to other places
323 for i in continuous fast-import hg-to-git \
324 hooks remotes2config.sh stats \
325 workdir convert-objects blameview ; do
326 cp -rf \
327 "${S}"/contrib/${i} \
328 "${D}"/usr/share/${PN}/contrib \
329 || die "Failed contrib ${i}"
330 done
331
332 if use perl && use cgi ; then
333 dodir /usr/share/${PN}/gitweb
334 insinto /usr/share/${PN}/gitweb
335 doins "${S}"/gitweb/gitweb.cgi
336 doins "${S}"/gitweb/gitweb.css
337 js=gitweb.js
338 [ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js
339 doins "${S}"/gitweb/${js}
340 doins "${S}"/gitweb/git-{favicon,logo}.png
341
342 # Make sure it can run
343 fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
344
345 # INSTALL discusses configuration issues, not just installation
346 docinto /
347 newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
348 newdoc "${S}"/gitweb/README README.gitweb
349
350 find "${D}"/usr/lib64/perl5/ \
351 -name .packlist \
352 -exec rm \{\} \;
353 fi
354 if ! use subversion ; then
355 rm -f "${D}"/usr/libexec/git-core/git-svn \
356 "${D}"/usr/share/man/man1/git-svn.1*
357 fi
358
359 if use xinetd ; then
360 insinto /etc/xinetd.d
361 newins "${FILESDIR}"/git-daemon.xinetd git-daemon
362 fi
363
364 newinitd "${FILESDIR}"/git-daemon.initd git-daemon
365 newconfd "${FILESDIR}"/git-daemon.confd git-daemon
366
367 fixlocalpod
368 }
369
370 src_test() {
371 local disabled=""
372 local tests_cvs="t9200-git-cvsexportcommit.sh \
373 t9400-git-cvsserver-server.sh \
374 t9401-git-cvsserver-crlf.sh \
375 t9600-cvsimport.sh \
376 t9601-cvsimport-vendor-branch.sh \
377 t9602-cvsimport-branches-tags.sh \
378 t9603-cvsimport-patchsets.sh"
379 local tests_perl="t5502-quickfetch.sh \
380 t5512-ls-remote.sh \
381 t5520-pull.sh"
382 # Bug #225601 - t0004 is not suitable for root perm
383 # Bug #219839 - t1004 is not suitable for root perm
384 # t0001-init.sh - check for init notices EPERM* fails
385 local tests_nonroot="t0001-init.sh \
386 t0004-unwritable.sh \
387 t1004-read-tree-m-u-wf.sh \
388 t3700-add.sh \
389 t7300-clean.sh"
390
391 # Unzip is used only for the testcase code, not by any normal parts of Git.
392 if ! has_version app-arch/unzip ; then
393 einfo "Disabling tar-tree tests"
394 disabled="${disabled} t5000-tar-tree.sh"
395 fi
396
397 cvs=0
398 use cvs && let cvs=$cvs+1
399 if [[ ${EUID} -eq 0 ]]; then
400 if [[ $cvs -eq 1 ]]; then
401 ewarn "Skipping CVS tests because CVS does not work as root!"
402 ewarn "You should retest with FEATURES=userpriv!"
403 disabled="${disabled} ${tests_cvs}"
404 fi
405 einfo "Skipping other tests that require being non-root"
406 disabled="${disabled} ${tests_nonroot}"
407 else
408 [[ $cvs -gt 0 ]] && \
409 has_version dev-util/cvs && \
410 let cvs=$cvs+1
411 [[ $cvs -gt 1 ]] && \
412 built_with_use dev-util/cvs server && \
413 let cvs=$cvs+1
414 if [[ $cvs -lt 3 ]]; then
415 einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
416 disabled="${disabled} ${tests_cvs}"
417 fi
418 fi
419
420 if ! use perl ; then
421 einfo "Disabling tests that need Perl"
422 disabled="${disabled} ${tests_perl}"
423 fi
424
425 # Reset all previously disabled tests
426 cd "${S}/t"
427 for i in *.sh.DISABLED ; do
428 [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
429 done
430 einfo "Disabled tests:"
431 for i in ${disabled} ; do
432 [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
433 done
434 cd "${S}"
435 # Now run the tests
436 einfo "Start test run"
437 git_emake \
438 test || die "tests failed"
439 }
440
441 showpkgdeps() {
442 local pkg=$1
443 shift
444 elog " $(printf "%-17s:" ${pkg}) ${@}"
445 }
446
447 pkg_postinst() {
448 use emacs && elisp-site-regen
449 if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
450 ewarn "You must build dev-util/subversion with USE=perl"
451 ewarn "to get the full functionality of git-svn!"
452 fi
453 elog "These additional scripts need some dependencies:"
454 echo
455 showpkgdeps git-quiltimport "dev-util/quilt"
456 showpkgdeps git-instaweb \
457 "|| ( www-servers/lighttpd www-servers/apache )"
458 echo
459 }
460
461 pkg_postrm() {
462 use emacs && elisp-site-regen
463 }