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: ChangeLog git-1.7.2.2.ebuild
Date: Mon, 23 Aug 2010 19:05:15
Message-Id: 20100823190511.6FA332004E@flycatcher.gentoo.org
1 robbat2 10/08/23 19:05:11
2
3 Modified: ChangeLog
4 Added: git-1.7.2.2.ebuild
5 Log:
6 Version bump.
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.24 dev-vcs/git/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.24&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.24&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.23&r2=1.24
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v
19 retrieving revision 1.23
20 retrieving revision 1.24
21 diff -p -w -b -B -u -u -r1.23 -r1.24
22 --- ChangeLog 16 Aug 2010 05:47:29 -0000 1.23
23 +++ ChangeLog 23 Aug 2010 19:05:11 -0000 1.24
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.23 2010/08/16 05:47:29 robbat2 Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.24 2010/08/23 19:05:11 robbat2 Exp $
29 +
30 +*git-1.7.2.2 (23 Aug 2010)
31 +
32 + 23 Aug 2010; Robin H. Johnson <robbat2@g.o> +git-1.7.2.2.ebuild:
33 + Version bump.
34
35 16 Aug 2010; Robin H. Johnson <robbat2@g.o> git-1.6.4.4.ebuild,
36 git-1.7.0.ebuild, git-1.7.1-r1.ebuild, git-1.7.1.1.ebuild,
37
38
39
40 1.1 dev-vcs/git/git-1.7.2.2.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.2.2.ebuild?rev=1.1&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.2.2.ebuild?rev=1.1&content-type=text/plain
44
45 Index: git-1.7.2.2.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.2.2.ebuild,v 1.1 2010/08/23 19:05:11 robbat2 Exp $
50
51 EAPI=3
52
53 GENTOO_DEPEND_ON_PERL=no
54 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
55 [ "$PV" == "9999" ] && inherit git
56
57 MY_PV="${PV/_rc/.rc}"
58 MY_P="${PN}-${MY_PV}"
59
60 DOC_VER=${MY_PV}
61
62 DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
63 HOMEPAGE="http://www.git-scm.com/"
64 if [ "$PV" != "9999" ]; then
65 SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
66 mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
67 doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
68 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
69 else
70 SRC_URI=""
71 EGIT_BRANCH="master"
72 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
73 # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
74 KEYWORDS=""
75 fi
76
77 LICENSE="GPL-2"
78 SLOT="0"
79 IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
80
81 # Common to both DEPEND and RDEPEND
82 CDEPEND="
83 !blksha1? ( dev-libs/openssl )
84 sys-libs/zlib
85 perl? ( dev-lang/perl[-build] )
86 tk? ( dev-lang/tk )
87 curl? (
88 net-misc/curl
89 webdav? ( dev-libs/expat )
90 )
91 emacs? ( virtual/emacs )"
92
93 RDEPEND="${CDEPEND}
94 perl? ( dev-perl/Error
95 dev-perl/Net-SMTP-SSL
96 dev-perl/Authen-SASL
97 cgi? ( virtual/perl-CGI )
98 cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
99 subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
100 )
101 gtk?
102 (
103 >=dev-python/pygtk-2.8
104 || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python )
105 )"
106
107 # This is how info docs are created with Git:
108 # .txt/asciidoc --(asciidoc)---------> .xml/docbook
109 # .xml/docbook --(docbook2texi.pl)--> .texi
110 # .texi --(makeinfo)---------> .info
111 DEPEND="${CDEPEND}
112 app-arch/cpio
113 doc? (
114 app-text/asciidoc
115 app-text/docbook2X
116 sys-apps/texinfo
117 )"
118
119 # Live ebuild builds HTML docs, additionally
120 if [ "$PV" == "9999" ]; then
121 DEPEND="${DEPEND}
122 doc? (
123 app-text/xmlto
124 )"
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} == *-interix* ]] ; then
199 myopts="${myopts} NO_IPV6=YesPlease"
200 myopts="${myopts} NO_MEMMEM=YesPlease"
201 myopts="${myopts} NO_MKDTEMP=YesPlease"
202 myopts="${myopts} NO_STRTOUMAX=YesPlease"
203 myopts="${myopts} NO_STRTOULL=YesPlease"
204 myopts="${myopts} NO_INET_NTOP=YesPlease"
205 myopts="${myopts} NO_INET_PTON=YesPlease"
206 myopts="${myopts} NO_NSEC=YesPlease"
207 myopts="${myopts} NO_MKSTEMPS=YesPlease"
208 fi
209 if [[ ${CHOST} == ia64-*-hpux* ]]; then
210 myopts="${myopts} NO_NSEC=YesPlease"
211 fi
212
213 has_version '>=app-text/asciidoc-8.0' \
214 && myopts="${myopts} ASCIIDOC8=YesPlease"
215 myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
216
217 # Bug 290465:
218 # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
219 [[ "${CHOST}" == *-uclibc* ]] && \
220 myopts="${myopts} NO_NSEC=YesPlease"
221
222 export MY_MAKEOPTS="${myopts}"
223 }
224
225 src_unpack() {
226 if [ "${PV}" != "9999" ]; then
227 unpack ${MY_P}.tar.bz2
228 cd "${S}"
229 unpack ${PN}-manpages-${DOC_VER}.tar.bz2
230 use doc && \
231 cd "${S}"/Documentation && \
232 unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
233 cd "${S}"
234 else
235 git_src_unpack
236 cd "${S}"
237 #cp "${FILESDIR}"/GIT-VERSION-GEN .
238 fi
239
240 }
241
242 src_prepare() {
243 # Noperl is being merged to upstream as of 2009/04/05
244 #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
245
246 # GetOpt-Long v2.38 is strict
247 # Merged in 1.6.3 final 2009/05/07
248 #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
249
250 # JS install fixup
251 epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
252
253 # USE=-iconv causes segfaults, fixed post 1.7.1
254 # Gentoo bug #321895
255 #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
256
257 sed -i \
258 -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
259 -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
260 -e 's:^\(CC = \).*$:\1$(OPTCC):' \
261 -e 's:^\(AR = \).*$:\1$(OPTAR):' \
262 -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
263 -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
264 Makefile || die "sed failed"
265
266 # Never install the private copy of Error.pm (bug #296310)
267 sed -i \
268 -e '/private-Error.pm/s,^,#,' \
269 perl/Makefile.PL
270
271 # Fix docbook2texi command
272 sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
273 Documentation/Makefile || die "sed failed"
274
275 # bug #318289
276 epatch "${FILESDIR}"/git-1.7.1-interix.patch
277 epatch "${FILESDIR}"/git-1.6.6.1-interix6.patch
278 }
279
280 git_emake() {
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 "$@"
291 }
292
293 src_configure() {
294 exportmakeopts
295 }
296
297 src_compile() {
298 git_emake || die "emake failed"
299
300 if use emacs ; then
301 elisp-compile contrib/emacs/git{,-blame}.el \
302 || die "emacs modules failed"
303 fi
304
305 if use perl && use cgi ; then
306 git_emake \
307 gitweb/gitweb.cgi \
308 || die "emake gitweb/gitweb.cgi failed"
309 fi
310
311 cd "${S}"/Documentation
312 if [[ "$PV" == "9999" ]] ; then
313 git_emake man \
314 || die "emake man failed"
315 if use doc ; then
316 git_emake info html \
317 || die "emake info html failed"
318 fi
319 else
320 if use doc ; then
321 git_emake info \
322 || die "emake info html failed"
323 fi
324 fi
325 }
326
327 src_install() {
328 git_emake \
329 install || \
330 die "make install failed"
331
332 doman man?/*.[157] Documentation/*.[157]
333
334 dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
335 use doc && dodir /usr/share/doc/${PF}/html
336 for d in / /howto/ /technical/ ; do
337 docinto ${d}
338 dodoc Documentation${d}*.txt
339 use doc && dohtml -p ${d} Documentation${d}*.html
340 done
341 docinto /
342 # Upstream does not ship this pre-built :-(
343 use doc && doinfo Documentation/{git,gitman}.info
344
345 dobashcompletion contrib/completion/git-completion.bash ${PN}
346
347 if use emacs ; then
348 elisp-install ${PN} contrib/emacs/git.{el,elc} || die
349 elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
350 #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
351 # don't add automatically to the load-path, so the sitefile
352 # can do a conditional loading
353 touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
354 elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
355 fi
356
357 if use gtk ; then
358 dobin "${S}"/contrib/gitview/gitview
359 dodoc "${S}"/contrib/gitview/gitview.txt
360 fi
361
362 dobin contrib/fast-import/git-p4
363 dodoc contrib/fast-import/git-p4.txt
364 newbin contrib/fast-import/import-tars.perl import-tars
365
366 dodir /usr/share/${PN}/contrib
367 # The following are excluded:
368 # svnimport - use git-svn
369 # p4import - excluded because fast-import has a better one
370 # examples - these are stuff that is not used in Git anymore actually
371 # patches - stuff the Git guys made to go upstream to other places
372 for i in continuous fast-import hg-to-git \
373 hooks remotes2config.sh stats \
374 workdir convert-objects blameview ; do
375 cp -rf \
376 "${S}"/contrib/${i} \
377 "${ED}"/usr/share/${PN}/contrib \
378 || die "Failed contrib ${i}"
379 done
380
381 if use perl && use cgi ; then
382 dodir /usr/share/${PN}/gitweb
383 insinto /usr/share/${PN}/gitweb
384 doins "${S}"/gitweb/gitweb.cgi
385 doins "${S}"/gitweb/gitweb.css
386 js=gitweb.js
387 [ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js
388 doins "${S}"/gitweb/${js}
389 doins "${S}"/gitweb/git-{favicon,logo}.png
390
391 # Make sure it can run
392 fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
393
394 # INSTALL discusses configuration issues, not just installation
395 docinto /
396 newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
397 newdoc "${S}"/gitweb/README README.gitweb
398
399 find "${ED}"/usr/lib64/perl5/ \
400 -name .packlist \
401 -exec rm \{\} \;
402 fi
403 if ! use subversion ; then
404 rm -f "${ED}"/usr/libexec/git-core/git-svn \
405 "${ED}"/usr/share/man/man1/git-svn.1*
406 fi
407
408 if use xinetd ; then
409 insinto /etc/xinetd.d
410 newins "${FILESDIR}"/git-daemon.xinetd git-daemon
411 fi
412
413 newinitd "${FILESDIR}"/git-daemon.initd git-daemon
414 newconfd "${FILESDIR}"/git-daemon.confd git-daemon
415
416 fixlocalpod
417 }
418
419 src_test() {
420 local disabled=""
421 local tests_cvs="t9200-git-cvsexportcommit.sh \
422 t9400-git-cvsserver-server.sh \
423 t9401-git-cvsserver-crlf.sh \
424 t9600-cvsimport.sh \
425 t9601-cvsimport-vendor-branch.sh \
426 t9602-cvsimport-branches-tags.sh \
427 t9603-cvsimport-patchsets.sh"
428 local tests_perl="t5502-quickfetch.sh \
429 t5512-ls-remote.sh \
430 t5520-pull.sh"
431 # Bug #225601 - t0004 is not suitable for root perm
432 # Bug #219839 - t1004 is not suitable for root perm
433 # t0001-init.sh - check for init notices EPERM* fails
434 local tests_nonroot="t0001-init.sh \
435 t0004-unwritable.sh \
436 t1004-read-tree-m-u-wf.sh \
437 t3700-add.sh \
438 t7300-clean.sh"
439
440 # Unzip is used only for the testcase code, not by any normal parts of Git.
441 if ! has_version app-arch/unzip ; then
442 einfo "Disabling tar-tree tests"
443 disabled="${disabled} t5000-tar-tree.sh"
444 fi
445
446 cvs=0
447 use cvs && let cvs=$cvs+1
448 if [[ ${EUID} -eq 0 ]]; then
449 if [[ $cvs -eq 1 ]]; then
450 ewarn "Skipping CVS tests because CVS does not work as root!"
451 ewarn "You should retest with FEATURES=userpriv!"
452 disabled="${disabled} ${tests_cvs}"
453 fi
454 einfo "Skipping other tests that require being non-root"
455 disabled="${disabled} ${tests_nonroot}"
456 else
457 [[ $cvs -gt 0 ]] && \
458 has_version dev-vcs/cvs && \
459 let cvs=$cvs+1
460 [[ $cvs -gt 1 ]] && \
461 built_with_use dev-vcs/cvs server && \
462 let cvs=$cvs+1
463 if [[ $cvs -lt 3 ]]; then
464 einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
465 disabled="${disabled} ${tests_cvs}"
466 fi
467 fi
468
469 if ! use perl ; then
470 einfo "Disabling tests that need Perl"
471 disabled="${disabled} ${tests_perl}"
472 fi
473
474 # Reset all previously disabled tests
475 cd "${S}/t"
476 for i in *.sh.DISABLED ; do
477 [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
478 done
479 einfo "Disabled tests:"
480 for i in ${disabled} ; do
481 [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
482 done
483 cd "${S}"
484 # Now run the tests
485 einfo "Start test run"
486 git_emake \
487 test || die "tests failed"
488 }
489
490 showpkgdeps() {
491 local pkg=$1
492 shift
493 elog " $(printf "%-17s:" ${pkg}) ${@}"
494 }
495
496 pkg_postinst() {
497 use emacs && elisp-site-regen
498 if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then
499 ewarn "You must build dev-vcs/subversion with USE=perl"
500 ewarn "to get the full functionality of git-svn!"
501 fi
502 elog "These additional scripts need some dependencies:"
503 echo
504 showpkgdeps git-quiltimport "dev-util/quilt"
505 showpkgdeps git-instaweb \
506 "|| ( www-servers/lighttpd www-servers/apache )"
507 echo
508 }
509
510 pkg_postrm() {
511 use emacs && elisp-site-regen
512 }