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