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