Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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.3.1.ebuild
Date: Thu, 30 Sep 2010 00:57:51
Message-Id: 20100930005744.726E720051@flycatcher.gentoo.org
1 robbat2 10/09/30 00:57:44
2
3 Modified: ChangeLog
4 Added: git-1.7.3.1.ebuild
5 Log:
6 Version bump.
7
8 (Portage version: 2.2_rc88/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.36 dev-vcs/git/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.36&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.36&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.35&r2=1.36
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v
20 retrieving revision 1.35
21 retrieving revision 1.36
22 diff -p -w -b -B -u -u -r1.35 -r1.36
23 --- ChangeLog 19 Sep 2010 02:27:15 -0000 1.35
24 +++ ChangeLog 30 Sep 2010 00:57:44 -0000 1.36
25 @@ -1,6 +1,11 @@
26 # ChangeLog for dev-vcs/git
27 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.35 2010/09/19 02:27:15 robbat2 Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.36 2010/09/30 00:57:44 robbat2 Exp $
30 +
31 +*git-1.7.3.1 (30 Sep 2010)
32 +
33 + 30 Sep 2010; Robin H. Johnson <robbat2@g.o> +git-1.7.3.1.ebuild:
34 + Version bump.
35
36 *git-1.7.3 (19 Sep 2010)
37
38
39
40
41 1.1 dev-vcs/git/git-1.7.3.1.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.3.1.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.3.1.ebuild?rev=1.1&content-type=text/plain
45
46 Index: git-1.7.3.1.ebuild
47 ===================================================================
48 # Copyright 1999-2010 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.3.1.ebuild,v 1.1 2010/09/30 00:57:44 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="~ppc ~ppc64"
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 HTML docs, additionally
121 if [ "$PV" == "9999" ]; then
122 DEPEND="${DEPEND}
123 doc? (
124 app-text/xmlto
125 )"
126 fi
127
128 SITEFILE=50${PN}-gentoo.el
129 S="${WORKDIR}/${MY_P}"
130
131 pkg_setup() {
132 if ! use perl ; then
133 use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
134 use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
135 use subversion && ewarn "git-svn needs USE=perl, it won't work"
136 fi
137 if use webdav && ! use curl ; then
138 ewarn "USE=webdav needs USE=curl. Ignoring"
139 fi
140 if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
141 ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
142 ewarn "with USE=dso, there may be weird crashes in git-svn. You"
143 ewarn "have been warned."
144 fi
145 }
146
147 # This is needed because for some obscure reasons future calls to make don't
148 # pick up these exports if we export them in src_unpack()
149 exportmakeopts() {
150 local myopts
151
152 if use blksha1 ; then
153 myopts="${myopts} BLK_SHA1=YesPlease"
154 elif use ppcsha1 ; then
155 myopts="${myopts} PPC_SHA1=YesPlease"
156 fi
157
158 if use curl ; then
159 use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
160 else
161 myopts="${myopts} NO_CURL=YesPlease"
162 fi
163
164 # broken assumptions, because of broken build system ...
165 myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
166 myopts="${myopts} INSTALL=install TAR=tar"
167 myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
168 myopts="${myopts} SANE_TOOL_PATH="
169 myopts="${myopts} OLD_ICONV="
170 myopts="${myopts} NO_EXTERNAL_GREP="
171
172 # can't define this to null, since the entire makefile depends on it
173 sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
174
175 use iconv \
176 || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
177 # || myopts="${myopts} NO_ICONV=YesPlease"
178 # because, above, we need to do this unconditionally (no "&& use iconv")
179 use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
180
181 use tk \
182 || myopts="${myopts} NO_TCLTK=YesPlease"
183 use perl \
184 && myopts="${myopts} INSTALLDIRS=vendor" \
185 || myopts="${myopts} NO_PERL=YesPlease"
186 use threads \
187 && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
188 use subversion \
189 || myopts="${myopts} NO_SVN_TESTS=YesPlease"
190 # Disabled until ~m68k-mint can be keyworded again
191 # if [[ ${CHOST} == *-mint* ]] ; then
192 # myopts="${myopts} NO_MMAP=YesPlease"
193 # myopts="${myopts} NO_IPV6=YesPlease"
194 # myopts="${myopts} NO_STRLCPY=YesPlease"
195 # myopts="${myopts} NO_MEMMEM=YesPlease"
196 # myopts="${myopts} NO_MKDTEMP=YesPlease"
197 # myopts="${myopts} NO_MKSTEMPS=YesPlease"
198 # fi
199 if [[ ${CHOST} == *-interix* ]] ; then
200 myopts="${myopts} NO_IPV6=YesPlease"
201 myopts="${myopts} NO_MEMMEM=YesPlease"
202 myopts="${myopts} NO_MKDTEMP=YesPlease"
203 myopts="${myopts} NO_STRTOUMAX=YesPlease"
204 myopts="${myopts} NO_STRTOULL=YesPlease"
205 myopts="${myopts} NO_INET_NTOP=YesPlease"
206 myopts="${myopts} NO_INET_PTON=YesPlease"
207 myopts="${myopts} NO_NSEC=YesPlease"
208 myopts="${myopts} NO_MKSTEMPS=YesPlease"
209 fi
210 if [[ ${CHOST} == ia64-*-hpux* ]]; then
211 myopts="${myopts} NO_NSEC=YesPlease"
212 fi
213
214 has_version '>=app-text/asciidoc-8.0' \
215 && myopts="${myopts} ASCIIDOC8=YesPlease"
216 myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
217
218 # Bug 290465:
219 # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
220 [[ "${CHOST}" == *-uclibc* ]] && \
221 myopts="${myopts} NO_NSEC=YesPlease"
222
223 export MY_MAKEOPTS="${myopts}"
224 }
225
226 src_unpack() {
227 if [ "${PV}" != "9999" ]; then
228 unpack ${MY_P}.tar.bz2
229 cd "${S}"
230 unpack ${PN}-manpages-${DOC_VER}.tar.bz2
231 use doc && \
232 cd "${S}"/Documentation && \
233 unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
234 cd "${S}"
235 else
236 git_src_unpack
237 cd "${S}"
238 #cp "${FILESDIR}"/GIT-VERSION-GEN .
239 fi
240
241 }
242
243 src_prepare() {
244 # Noperl is being merged to upstream as of 2009/04/05
245 #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
246
247 # GetOpt-Long v2.38 is strict
248 # Merged in 1.6.3 final 2009/05/07
249 #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
250
251 # JS install fixup
252 epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
253
254 # USE=-iconv causes segfaults, fixed post 1.7.1
255 # Gentoo bug #321895
256 #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
257
258 sed -i \
259 -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
260 -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
261 -e 's:^\(CC = \).*$:\1$(OPTCC):' \
262 -e 's:^\(AR = \).*$:\1$(OPTAR):' \
263 -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
264 -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
265 Makefile || die "sed failed"
266
267 # Never install the private copy of Error.pm (bug #296310)
268 sed -i \
269 -e '/private-Error.pm/s,^,#,' \
270 perl/Makefile.PL
271
272 # Fix docbook2texi command
273 sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
274 Documentation/Makefile || die "sed failed"
275
276 # bug #318289
277 epatch "${FILESDIR}"/git-1.7.1-interix.patch
278 epatch "${FILESDIR}"/git-1.6.6.1-interix6.patch
279 }
280
281 git_emake() {
282 emake ${MY_MAKEOPTS} \
283 DESTDIR="${D}" \
284 OPTCFLAGS="${CFLAGS}" \
285 OPTLDFLAGS="${LDFLAGS}" \
286 OPTCC="$(tc-getCC)" \
287 OPTAR="$(tc-getAR)" \
288 prefix="${EPREFIX}"/usr \
289 htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
290 sysconfdir="${EPREFIX}"/etc \
291 "$@"
292 }
293
294 src_configure() {
295 exportmakeopts
296 }
297
298 src_compile() {
299 git_emake || die "emake failed"
300
301 if use emacs ; then
302 elisp-compile contrib/emacs/git{,-blame}.el \
303 || die "emacs modules failed"
304 fi
305
306 if use perl && use cgi ; then
307 git_emake \
308 gitweb/gitweb.cgi \
309 || die "emake gitweb/gitweb.cgi failed"
310 fi
311
312 cd "${S}"/Documentation
313 if [[ "$PV" == "9999" ]] ; then
314 git_emake man \
315 || die "emake man failed"
316 if use doc ; then
317 git_emake info html \
318 || die "emake info html failed"
319 fi
320 else
321 if use doc ; then
322 git_emake info \
323 || die "emake info html failed"
324 fi
325 fi
326 }
327
328 src_install() {
329 git_emake \
330 install || \
331 die "make install failed"
332
333 doman man?/*.[157] Documentation/*.[157]
334
335 dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
336 use doc && dodir /usr/share/doc/${PF}/html
337 for d in / /howto/ /technical/ ; do
338 docinto ${d}
339 dodoc Documentation${d}*.txt
340 use doc && dohtml -p ${d} Documentation${d}*.html
341 done
342 docinto /
343 # Upstream does not ship this pre-built :-(
344 use doc && doinfo Documentation/{git,gitman}.info
345
346 dobashcompletion contrib/completion/git-completion.bash ${PN}
347
348 if use emacs ; then
349 elisp-install ${PN} contrib/emacs/git.{el,elc} || die
350 elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
351 #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
352 # don't add automatically to the load-path, so the sitefile
353 # can do a conditional loading
354 touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
355 elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
356 fi
357
358 if use gtk ; then
359 dobin "${S}"/contrib/gitview/gitview
360 dodoc "${S}"/contrib/gitview/gitview.txt
361 fi
362
363 dobin contrib/fast-import/git-p4
364 dodoc contrib/fast-import/git-p4.txt
365 newbin contrib/fast-import/import-tars.perl import-tars
366
367 dodir /usr/share/${PN}/contrib
368 # The following are excluded:
369 # svnimport - use git-svn
370 # p4import - excluded because fast-import has a better one
371 # examples - these are stuff that is not used in Git anymore actually
372 # patches - stuff the Git guys made to go upstream to other places
373 for i in continuous fast-import hg-to-git \
374 hooks remotes2config.sh stats \
375 workdir convert-objects blameview ; do
376 cp -rf \
377 "${S}"/contrib/${i} \
378 "${ED}"/usr/share/${PN}/contrib \
379 || die "Failed contrib ${i}"
380 done
381
382 if use perl && use cgi ; then
383 exeinto /usr/share/${PN}/gitweb
384 doexe "${S}"/gitweb/gitweb.cgi
385 insinto /usr/share/${PN}/gitweb/static
386 doins "${S}"/gitweb/static/gitweb.css
387 js=gitweb.js
388 [ -f "${S}"/gitweb/static/gitweb.min.js ] && js=gitweb.min.js
389 doins "${S}"/gitweb/static/${js}
390 doins "${S}"/gitweb/static/git-{favicon,logo}.png
391
392 # INSTALL discusses configuration issues, not just installation
393 docinto /
394 newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
395 newdoc "${S}"/gitweb/README README.gitweb
396
397 find "${ED}"/usr/lib64/perl5/ \
398 -name .packlist \
399 -exec rm \{\} \;
400 fi
401 if ! use subversion ; then
402 rm -f "${ED}"/usr/libexec/git-core/git-svn \
403 "${ED}"/usr/share/man/man1/git-svn.1*
404 fi
405
406 if use xinetd ; then
407 insinto /etc/xinetd.d
408 newins "${FILESDIR}"/git-daemon.xinetd git-daemon
409 fi
410
411 newinitd "${FILESDIR}"/git-daemon.initd git-daemon
412 newconfd "${FILESDIR}"/git-daemon.confd git-daemon
413
414 fixlocalpod
415 }
416
417 src_test() {
418 local disabled=""
419 local tests_cvs="t9200-git-cvsexportcommit.sh \
420 t9400-git-cvsserver-server.sh \
421 t9401-git-cvsserver-crlf.sh \
422 t9600-cvsimport.sh \
423 t9601-cvsimport-vendor-branch.sh \
424 t9602-cvsimport-branches-tags.sh \
425 t9603-cvsimport-patchsets.sh"
426 local tests_perl="t5502-quickfetch.sh \
427 t5512-ls-remote.sh \
428 t5520-pull.sh"
429 # Bug #225601 - t0004 is not suitable for root perm
430 # Bug #219839 - t1004 is not suitable for root perm
431 # t0001-init.sh - check for init notices EPERM* fails
432 local tests_nonroot="t0001-init.sh \
433 t0004-unwritable.sh \
434 t1004-read-tree-m-u-wf.sh \
435 t3700-add.sh \
436 t7300-clean.sh"
437
438 # Unzip is used only for the testcase code, not by any normal parts of Git.
439 if ! has_version app-arch/unzip ; then
440 einfo "Disabling tar-tree tests"
441 disabled="${disabled} t5000-tar-tree.sh"
442 fi
443
444 cvs=0
445 use cvs && let cvs=$cvs+1
446 if [[ ${EUID} -eq 0 ]]; then
447 if [[ $cvs -eq 1 ]]; then
448 ewarn "Skipping CVS tests because CVS does not work as root!"
449 ewarn "You should retest with FEATURES=userpriv!"
450 disabled="${disabled} ${tests_cvs}"
451 fi
452 einfo "Skipping other tests that require being non-root"
453 disabled="${disabled} ${tests_nonroot}"
454 else
455 [[ $cvs -gt 0 ]] && \
456 has_version dev-vcs/cvs && \
457 let cvs=$cvs+1
458 [[ $cvs -gt 1 ]] && \
459 built_with_use dev-vcs/cvs server && \
460 let cvs=$cvs+1
461 if [[ $cvs -lt 3 ]]; then
462 einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
463 disabled="${disabled} ${tests_cvs}"
464 fi
465 fi
466
467 if ! use perl ; then
468 einfo "Disabling tests that need Perl"
469 disabled="${disabled} ${tests_perl}"
470 fi
471
472 # Reset all previously disabled tests
473 cd "${S}/t"
474 for i in *.sh.DISABLED ; do
475 [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
476 done
477 einfo "Disabled tests:"
478 for i in ${disabled} ; do
479 [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
480 done
481 cd "${S}"
482 # Now run the tests
483 einfo "Start test run"
484 git_emake \
485 test || die "tests failed"
486 }
487
488 showpkgdeps() {
489 local pkg=$1
490 shift
491 elog " $(printf "%-17s:" ${pkg}) ${@}"
492 }
493
494 pkg_postinst() {
495 use emacs && elisp-site-regen
496 if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then
497 ewarn "You must build dev-vcs/subversion with USE=perl"
498 ewarn "to get the full functionality of git-svn!"
499 fi
500 elog "These additional scripts need some dependencies:"
501 echo
502 showpkgdeps git-quiltimport "dev-util/quilt"
503 showpkgdeps git-instaweb \
504 "|| ( www-servers/lighttpd www-servers/apache )"
505 echo
506 }
507
508 pkg_postrm() {
509 use emacs && elisp-site-regen
510 }
Report Message
Find on MARC Find on Google Groups