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: git-1.7.1.1.ebuild ChangeLog
Date: Wed, 30 Jun 2010 00:16:01
Message-Id: 20100630001558.6A1892C621@corvid.gentoo.org
1 robbat2 10/06/30 00:15:58
2
3 Modified: ChangeLog
4 Added: git-1.7.1.1.ebuild
5 Log:
6 Version bump.
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.15 dev-vcs/git/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.15&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.15&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.14&r2=1.15
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v
19 retrieving revision 1.14
20 retrieving revision 1.15
21 diff -p -w -b -B -u -u -r1.14 -r1.15
22 --- ChangeLog 22 Jun 2010 18:47:46 -0000 1.14
23 +++ ChangeLog 30 Jun 2010 00:15:58 -0000 1.15
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.14 2010/06/22 18:47:46 arfrever Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.15 2010/06/30 00:15:58 robbat2 Exp $
29 +
30 +*git-1.7.1.1 (30 Jun 2010)
31 +
32 + 30 Jun 2010; Robin H. Johnson <robbat2@g.o> +git-1.7.1.1.ebuild:
33 + Version bump.
34
35 22 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
36 git-1.6.3.1.ebuild, git-1.6.3.3.ebuild, git-1.6.3.4.ebuild,
37
38
39
40 1.1 dev-vcs/git/git-1.7.1.1.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.1.1.ebuild?rev=1.1&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-1.7.1.1.ebuild?rev=1.1&content-type=text/plain
44
45 Index: git-1.7.1.1.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.1.1.ebuild,v 1.1 2010/06/30 00:15:58 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-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
98 subversion? ( dev-vcs/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-vcs/subversion && built_with_use --missing false dev-vcs/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 || einfo "Forcing iconv for 1.7.1-r1 due to bugs #321895, #322205."
164 # || myopts="${myopts} NO_ICONV=YesPlease"
165 use tk \
166 || myopts="${myopts} NO_TCLTK=YesPlease"
167 use perl \
168 && myopts="${myopts} INSTALLDIRS=vendor" \
169 || myopts="${myopts} NO_PERL=YesPlease"
170 use threads \
171 && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
172 use subversion \
173 || myopts="${myopts} NO_SVN_TESTS=YesPlease"
174
175 has_version '>=app-text/asciidoc-8.0' \
176 && myopts="${myopts} ASCIIDOC8=YesPlease"
177 myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
178
179 # Bug 290465:
180 # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
181 [[ "${CHOST}" == *-uclibc* ]] && \
182 myopts="${myopts} NO_NSEC=YesPlease"
183
184 export MY_MAKEOPTS="${myopts}"
185 }
186
187 src_unpack() {
188 if [ "${PV}" != "9999" ]; then
189 unpack ${MY_P}.tar.bz2
190 cd "${S}"
191 unpack ${PN}-manpages-${DOC_VER}.tar.bz2
192 use doc && \
193 cd "${S}"/Documentation && \
194 unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
195 cd "${S}"
196 else
197 git_src_unpack
198 cd "${S}"
199 #cp "${FILESDIR}"/GIT-VERSION-GEN .
200 fi
201
202 }
203
204 src_prepare() {
205 # Noperl is being merged to upstream as of 2009/04/05
206 #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
207
208 # GetOpt-Long v2.38 is strict
209 # Merged in 1.6.3 final 2009/05/07
210 #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
211
212 # JS install fixup
213 epatch "${FILESDIR}"/git-1.7.1-always-install-js.patch
214
215 # USE=-iconv causes segfaults, fixed post 1.7.1
216 # Gentoo bug #321895
217 #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
218
219 sed -i \
220 -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
221 -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
222 -e 's:^\(CC = \).*$:\1$(OPTCC):' \
223 -e 's:^\(AR = \).*$:\1$(OPTAR):' \
224 Makefile || die "sed failed"
225
226 # Never install the private copy of Error.pm (bug #296310)
227 sed -i \
228 -e '/private-Error.pm/s,^,#,' \
229 perl/Makefile.PL
230
231 # Fix docbook2texi command
232 sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
233 Documentation/Makefile || die "sed failed"
234
235 }
236
237 git_emake() {
238 emake ${MY_MAKEOPTS} \
239 DESTDIR="${D}" \
240 OPTCFLAGS="${CFLAGS}" \
241 OPTLDFLAGS="${LDFLAGS}" \
242 OPTCC="$(tc-getCC)" \
243 OPTAR="$(tc-getAR)" \
244 prefix=/usr \
245 htmldir=/usr/share/doc/${PF}/html \
246 "$@"
247 }
248
249 src_configure() {
250 exportmakeopts
251 }
252
253 src_compile() {
254 git_emake || die "emake failed"
255
256 if use emacs ; then
257 elisp-compile contrib/emacs/git{,-blame}.el \
258 || die "emacs modules failed"
259 fi
260
261 if use perl && use cgi ; then
262 git_emake \
263 gitweb/gitweb.cgi \
264 || die "emake gitweb/gitweb.cgi failed"
265 fi
266
267 cd "${S}"/Documentation
268 if [[ "$PV" == "9999" ]] ; then
269 git_emake man \
270 || die "emake man failed"
271 if use doc ; then
272 git_emake info html \
273 || die "emake info html failed"
274 fi
275 else
276 if use doc ; then
277 git_emake info \
278 || die "emake info html failed"
279 fi
280 fi
281 }
282
283 src_install() {
284 git_emake \
285 install || \
286 die "make install failed"
287
288 doman man?/*.[157] Documentation/*.[157]
289
290 dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
291 use doc && dodir /usr/share/doc/${PF}/html
292 for d in / /howto/ /technical/ ; do
293 docinto ${d}
294 dodoc Documentation${d}*.txt
295 use doc && dohtml -p ${d} Documentation${d}*.html
296 done
297 docinto /
298 # Upstream does not ship this pre-built :-(
299 use doc && doinfo Documentation/{git,gitman}.info
300
301 dobashcompletion contrib/completion/git-completion.bash ${PN}
302
303 if use emacs ; then
304 elisp-install ${PN} contrib/emacs/git.{el,elc} || die
305 elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
306 #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
307 # don't add automatically to the load-path, so the sitefile
308 # can do a conditional loading
309 touch "${D}${SITELISP}/${PN}/compat/.nosearch"
310 elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
311 fi
312
313 if use gtk ; then
314 dobin "${S}"/contrib/gitview/gitview
315 dodoc "${S}"/contrib/gitview/gitview.txt
316 fi
317
318 dobin contrib/fast-import/git-p4
319 dodoc contrib/fast-import/git-p4.txt
320 newbin contrib/fast-import/import-tars.perl import-tars
321
322 dodir /usr/share/${PN}/contrib
323 # The following are excluded:
324 # svnimport - use git-svn
325 # p4import - excluded because fast-import has a better one
326 # examples - these are stuff that is not used in Git anymore actually
327 # patches - stuff the Git guys made to go upstream to other places
328 for i in continuous fast-import hg-to-git \
329 hooks remotes2config.sh stats \
330 workdir convert-objects blameview ; do
331 cp -rf \
332 "${S}"/contrib/${i} \
333 "${D}"/usr/share/${PN}/contrib \
334 || die "Failed contrib ${i}"
335 done
336
337 if use perl && use cgi ; then
338 dodir /usr/share/${PN}/gitweb
339 insinto /usr/share/${PN}/gitweb
340 doins "${S}"/gitweb/gitweb.cgi
341 doins "${S}"/gitweb/gitweb.css
342 js=gitweb.js
343 [ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js
344 doins "${S}"/gitweb/${js}
345 doins "${S}"/gitweb/git-{favicon,logo}.png
346
347 # Make sure it can run
348 fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
349
350 # INSTALL discusses configuration issues, not just installation
351 docinto /
352 newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
353 newdoc "${S}"/gitweb/README README.gitweb
354
355 find "${D}"/usr/lib64/perl5/ \
356 -name .packlist \
357 -exec rm \{\} \;
358 fi
359 if ! use subversion ; then
360 rm -f "${D}"/usr/libexec/git-core/git-svn \
361 "${D}"/usr/share/man/man1/git-svn.1*
362 fi
363
364 if use xinetd ; then
365 insinto /etc/xinetd.d
366 newins "${FILESDIR}"/git-daemon.xinetd git-daemon
367 fi
368
369 newinitd "${FILESDIR}"/git-daemon.initd git-daemon
370 newconfd "${FILESDIR}"/git-daemon.confd git-daemon
371
372 fixlocalpod
373 }
374
375 src_test() {
376 local disabled=""
377 local tests_cvs="t9200-git-cvsexportcommit.sh \
378 t9400-git-cvsserver-server.sh \
379 t9401-git-cvsserver-crlf.sh \
380 t9600-cvsimport.sh \
381 t9601-cvsimport-vendor-branch.sh \
382 t9602-cvsimport-branches-tags.sh \
383 t9603-cvsimport-patchsets.sh"
384 local tests_perl="t5502-quickfetch.sh \
385 t5512-ls-remote.sh \
386 t5520-pull.sh"
387 # Bug #225601 - t0004 is not suitable for root perm
388 # Bug #219839 - t1004 is not suitable for root perm
389 # t0001-init.sh - check for init notices EPERM* fails
390 local tests_nonroot="t0001-init.sh \
391 t0004-unwritable.sh \
392 t1004-read-tree-m-u-wf.sh \
393 t3700-add.sh \
394 t7300-clean.sh"
395
396 # Unzip is used only for the testcase code, not by any normal parts of Git.
397 if ! has_version app-arch/unzip ; then
398 einfo "Disabling tar-tree tests"
399 disabled="${disabled} t5000-tar-tree.sh"
400 fi
401
402 cvs=0
403 use cvs && let cvs=$cvs+1
404 if [[ ${EUID} -eq 0 ]]; then
405 if [[ $cvs -eq 1 ]]; then
406 ewarn "Skipping CVS tests because CVS does not work as root!"
407 ewarn "You should retest with FEATURES=userpriv!"
408 disabled="${disabled} ${tests_cvs}"
409 fi
410 einfo "Skipping other tests that require being non-root"
411 disabled="${disabled} ${tests_nonroot}"
412 else
413 [[ $cvs -gt 0 ]] && \
414 has_version dev-vcs/cvs && \
415 let cvs=$cvs+1
416 [[ $cvs -gt 1 ]] && \
417 built_with_use dev-vcs/cvs server && \
418 let cvs=$cvs+1
419 if [[ $cvs -lt 3 ]]; then
420 einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
421 disabled="${disabled} ${tests_cvs}"
422 fi
423 fi
424
425 if ! use perl ; then
426 einfo "Disabling tests that need Perl"
427 disabled="${disabled} ${tests_perl}"
428 fi
429
430 # Reset all previously disabled tests
431 cd "${S}/t"
432 for i in *.sh.DISABLED ; do
433 [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
434 done
435 einfo "Disabled tests:"
436 for i in ${disabled} ; do
437 [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
438 done
439 cd "${S}"
440 # Now run the tests
441 einfo "Start test run"
442 git_emake \
443 test || die "tests failed"
444 }
445
446 showpkgdeps() {
447 local pkg=$1
448 shift
449 elog " $(printf "%-17s:" ${pkg}) ${@}"
450 }
451
452 pkg_postinst() {
453 use emacs && elisp-site-regen
454 if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then
455 ewarn "You must build dev-vcs/subversion with USE=perl"
456 ewarn "to get the full functionality of git-svn!"
457 fi
458 elog "These additional scripts need some dependencies:"
459 echo
460 showpkgdeps git-quiltimport "dev-util/quilt"
461 showpkgdeps git-instaweb \
462 "|| ( www-servers/lighttpd www-servers/apache )"
463 echo
464 }
465
466 pkg_postrm() {
467 use emacs && elisp-site-regen
468 }
Report Message
Find on MARC Find on Google Groups