1 |
robbat2 09/01/26 12:16:53 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: git-1.6.1.1.ebuild |
5 |
Log: |
6 |
Version bump. Also bug #254029 - fix noperl patch. |
7 |
(Portage version: 2.2_rc20/cvs/Linux 2.6.28-05718-g0556e82 x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.318 dev-util/git/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/ChangeLog?rev=1.318&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/ChangeLog?rev=1.318&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/ChangeLog?r1=1.317&r2=1.318 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v |
19 |
retrieving revision 1.317 |
20 |
retrieving revision 1.318 |
21 |
diff -p -w -b -B -u -u -r1.317 -r1.318 |
22 |
--- ChangeLog 8 Jan 2009 19:00:42 -0000 1.317 |
23 |
+++ ChangeLog 26 Jan 2009 12:16:53 -0000 1.318 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for dev-util/git |
26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.317 2009/01/08 19:00:42 ranger Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.318 2009/01/26 12:16:53 robbat2 Exp $ |
29 |
+ |
30 |
+*git-1.6.1.1 (26 Jan 2009) |
31 |
+ |
32 |
+ 26 Jan 2009; Robin H. Johnson <robbat2@g.o> |
33 |
+ +files/20090126-git-1.6.1.1-noperl.patch, +git-1.6.1.1.ebuild: |
34 |
+ Version bump. Also bug #254029 - fix noperl patch. |
35 |
|
36 |
08 Jan 2009; Brent Baude <ranger@g.o> git-1.6.0.6.ebuild: |
37 |
Marking git-1.6.0.6 ppc64 for bug 251343 |
38 |
|
39 |
|
40 |
|
41 |
1.1 dev-util/git/git-1.6.1.1.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/git-1.6.1.1.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/git-1.6.1.1.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: git-1.6.1.1.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2009 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.1.1.ebuild,v 1.1 2009/01/26 12:16:53 robbat2 Exp $ |
51 |
|
52 |
inherit toolchain-funcs eutils elisp-common perl-module bash-completion |
53 |
|
54 |
MY_PV="${PV/_rc/.rc}" |
55 |
MY_P="${PN}-${MY_PV}" |
56 |
|
57 |
DOC_VER=${MY_PV} |
58 |
|
59 |
DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" |
60 |
HOMEPAGE="http://git.or.cz/" |
61 |
SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 |
62 |
mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 |
63 |
doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" |
64 |
|
65 |
LICENSE="GPL-2" |
66 |
SLOT="0" |
67 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
68 |
IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion vim-syntax" |
69 |
|
70 |
DEPEND=" |
71 |
!app-misc/git |
72 |
dev-libs/openssl |
73 |
sys-libs/zlib |
74 |
app-arch/cpio |
75 |
perl? ( dev-lang/perl ) |
76 |
tk? ( dev-lang/tk ) |
77 |
curl? ( |
78 |
net-misc/curl |
79 |
webdav? ( dev-libs/expat ) |
80 |
) |
81 |
emacs? ( virtual/emacs )" |
82 |
|
83 |
RDEPEND="${DEPEND} |
84 |
perl? ( dev-perl/Error |
85 |
dev-perl/Net-SMTP-SSL |
86 |
dev-perl/Authen-SASL |
87 |
cgi? ( virtual/perl-CGI ) |
88 |
cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) |
89 |
subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) |
90 |
) |
91 |
gtk? ( >=dev-python/pygtk-2.8 )" |
92 |
|
93 |
SITEFILE=50${PN}-gentoo.el |
94 |
S="${WORKDIR}/${MY_P}" |
95 |
|
96 |
pkg_setup() { |
97 |
if ! use perl ; then |
98 |
use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" |
99 |
use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" |
100 |
use subversion && ewarn "git-svn needs USE=perl, it won't work" |
101 |
fi |
102 |
if use webdav && ! use curl ; then |
103 |
ewarn "USE=webdav needs USE=curl. Ignoring" |
104 |
fi |
105 |
if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/subversion dso ; then |
106 |
ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" |
107 |
ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
108 |
ewarn "have been warned." |
109 |
fi |
110 |
} |
111 |
|
112 |
# This is needed because for some obscure reasons future calls to make don't |
113 |
# pick up these exports if we export them in src_unpack() |
114 |
exportmakeopts() { |
115 |
local myopts |
116 |
|
117 |
if use mozsha1 ; then |
118 |
myopts="${myopts} MOZILLA_SHA1=YesPlease" |
119 |
elif use ppcsha1 ; then |
120 |
myopts="${myopts} PPC_SHA1=YesPlease" |
121 |
fi |
122 |
|
123 |
if use curl ; then |
124 |
use webdav || myopts="${myopts} NO_EXPAT=YesPlease" |
125 |
else |
126 |
myopts="${myopts} NO_CURL=YesPlease" |
127 |
fi |
128 |
|
129 |
use iconv || myopts="${myopts} NO_ICONV=YesPlease" |
130 |
use tk || myopts="${myopts} NO_TCLTK=YesPlease" |
131 |
use perl || myopts="${myopts} NO_PERL=YesPlease" |
132 |
use threads && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" |
133 |
use subversion || myopts="${myopts} NO_SVN_TESTS=YesPlease" |
134 |
|
135 |
export MY_MAKEOPTS="${myopts}" |
136 |
} |
137 |
|
138 |
src_unpack() { |
139 |
unpack ${MY_P}.tar.bz2 |
140 |
cd "${S}" |
141 |
unpack ${PN}-manpages-${DOC_VER}.tar.bz2 |
142 |
use doc && \ |
143 |
cd "${S}"/Documentation && \ |
144 |
unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 |
145 |
cd "${S}" |
146 |
|
147 |
epatch "${FILESDIR}"/20090126-git-1.6.1.1-noperl.patch |
148 |
|
149 |
sed -i \ |
150 |
-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ |
151 |
-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ |
152 |
-e "s:^\(CC = \).*$:\1$(tc-getCC):" \ |
153 |
-e "s:^\(AR = \).*$:\1$(tc-getAR):" \ |
154 |
Makefile || die "sed failed" |
155 |
|
156 |
exportmakeopts |
157 |
} |
158 |
|
159 |
git_emake() { |
160 |
emake ${MY_MAKEOPTS} \ |
161 |
DESTDIR="${D}" \ |
162 |
OPTCFLAGS="${CFLAGS}" \ |
163 |
OPTLDFLAGS="${LDFLAGS}" \ |
164 |
prefix=/usr \ |
165 |
htmldir=/usr/share/doc/${PF}/html \ |
166 |
"$@" |
167 |
} |
168 |
|
169 |
src_compile() { |
170 |
git_emake || die "emake failed" |
171 |
|
172 |
if use emacs ; then |
173 |
elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" |
174 |
fi |
175 |
if use perl && use cgi ; then |
176 |
git_emake \ |
177 |
gitweb/gitweb.cgi || die "emake gitweb/gitweb.cgi failed" |
178 |
fi |
179 |
} |
180 |
|
181 |
src_install() { |
182 |
git_emake \ |
183 |
install || \ |
184 |
die "make install failed" |
185 |
|
186 |
doman man?/* |
187 |
|
188 |
dodoc README Documentation/{SubmittingPatches,CodingGuidelines} |
189 |
use doc && dodir /usr/share/doc/${PF}/html |
190 |
for d in / /howto/ /technical/ ; do |
191 |
docinto ${d} |
192 |
dodoc Documentation${d}*.txt |
193 |
use doc && dohtml -p ${d} Documentation${d}*.html |
194 |
done |
195 |
docinto / |
196 |
|
197 |
dobashcompletion contrib/completion/git-completion.bash ${PN} |
198 |
|
199 |
if use emacs ; then |
200 |
elisp-install ${PN} contrib/emacs/git.{el,elc} || die |
201 |
elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die |
202 |
# don't add automatically to the load-path, so the sitefile |
203 |
# can do a conditional loading |
204 |
touch "${D}${SITELISP}/${PN}/compat/.nosearch" |
205 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die |
206 |
fi |
207 |
|
208 |
if use gtk ; then |
209 |
dobin "${S}"/contrib/gitview/gitview |
210 |
dodoc "${S}"/contrib/gitview/gitview.txt |
211 |
fi |
212 |
|
213 |
dobin contrib/fast-import/git-p4 |
214 |
dodoc contrib/fast-import/git-p4.txt |
215 |
newbin contrib/fast-import/import-tars.perl import-tars |
216 |
|
217 |
if use vim-syntax ; then |
218 |
insinto /usr/share/vim/vimfiles/syntax/ |
219 |
doins contrib/vim/syntax/gitcommit.vim |
220 |
insinto /usr/share/vim/vimfiles/ftdetect/ |
221 |
newins "${FILESDIR}"/vim-ftdetect-gitcommit.vim gitcommit.vim |
222 |
fi |
223 |
|
224 |
dodir /usr/share/${PN}/contrib |
225 |
# The following are excluded: |
226 |
# svnimport - use git-svn |
227 |
# p4import - excluded because fast-import has a better one |
228 |
# examples - these are stuff that is not used in Git anymore actually |
229 |
# patches - stuff the Git guys made to go upstream to other places |
230 |
for i in continuous fast-import hg-to-git \ |
231 |
hooks remotes2config.sh stats \ |
232 |
workdir convert-objects blameview ; do |
233 |
cp -rf \ |
234 |
"${S}"/contrib/${i} \ |
235 |
"${D}"/usr/share/${PN}/contrib \ |
236 |
|| die "Failed contrib ${i}" |
237 |
done |
238 |
|
239 |
if use perl && use cgi ; then |
240 |
dodir /usr/share/${PN}/gitweb |
241 |
insinto /usr/share/${PN}/gitweb |
242 |
doins "${S}"/gitweb/gitweb.cgi |
243 |
doins "${S}"/gitweb/gitweb.css |
244 |
doins "${S}"/gitweb/git-{favicon,logo}.png |
245 |
|
246 |
# Make sure it can run |
247 |
fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi |
248 |
|
249 |
# INSTALL discusses configuration issues, not just installation |
250 |
docinto / |
251 |
newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb |
252 |
newdoc "${S}"/gitweb/README README.gitweb |
253 |
fi |
254 |
if ! use subversion ; then |
255 |
rm -f "${D}"/usr/libexec/git-core/git-svn \ |
256 |
"${D}"/usr/share/man/man1/git-svn.1* |
257 |
fi |
258 |
|
259 |
if use xinetd ; then |
260 |
insinto /etc/xinetd.d |
261 |
newins "${FILESDIR}"/git-daemon.xinetd git-daemon |
262 |
fi |
263 |
|
264 |
newinitd "${FILESDIR}"/git-daemon.initd git-daemon |
265 |
newconfd "${FILESDIR}"/git-daemon.confd git-daemon |
266 |
|
267 |
fixlocalpod |
268 |
} |
269 |
|
270 |
src_test() { |
271 |
local disabled="" |
272 |
local tests_cvs="t9200-git-cvsexportcommit.sh \ |
273 |
t9400-git-cvsserver-server.sh \ |
274 |
t9600-cvsimport.sh" |
275 |
local tests_perl="t5502-quickfetch.sh \ |
276 |
t5512-ls-remote.sh \ |
277 |
t5520-pull.sh" |
278 |
|
279 |
# Unzip is used only for the testcase code, not by any normal parts of Git. |
280 |
if ! has_version app-arch/unzip ; then |
281 |
einfo "Disabling tar-tree tests" |
282 |
disabled="${disabled} t5000-tar-tree.sh" |
283 |
fi |
284 |
|
285 |
cvs=0 |
286 |
use cvs && let cvs=$cvs+1 |
287 |
if ! has userpriv "${FEATURES}"; then |
288 |
if [[ $cvs -eq 1 ]]; then |
289 |
ewarn "Skipping CVS tests because CVS does not work as root!" |
290 |
ewarn "You should retest with FEATURES=userpriv!" |
291 |
disabled="${disabled} ${tests_cvs}" |
292 |
fi |
293 |
# Bug #225601 - t0004 is not suitable for root perm |
294 |
# Bug #219839 - t1004 is not suitable for root perm |
295 |
disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh" |
296 |
else |
297 |
[[ $cvs -gt 0 ]] && \ |
298 |
has_version dev-util/cvs && \ |
299 |
let cvs=$cvs+1 |
300 |
[[ $cvs -gt 0 ]] && \ |
301 |
built_with_use dev-util/cvs server && \ |
302 |
let cvs=$cvs+1 |
303 |
if [[ $cvs -lt 3 ]]; then |
304 |
einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])" |
305 |
disabled="${disabled} ${tests_cvs}" |
306 |
fi |
307 |
fi |
308 |
|
309 |
if ! use perl ; then |
310 |
einfo "Disabling tests that need Perl" |
311 |
disabled="${disabled} ${tests_perl}" |
312 |
fi |
313 |
|
314 |
# Reset all previously disabled tests |
315 |
cd "${S}/t" |
316 |
for i in *.sh.DISABLED ; do |
317 |
[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" |
318 |
done |
319 |
einfo "Disabled tests:" |
320 |
for i in ${disabled} ; do |
321 |
[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" |
322 |
done |
323 |
cd "${S}" |
324 |
# Now run the tests |
325 |
einfo "Start test run" |
326 |
git_emake \ |
327 |
test || die "tests failed" |
328 |
} |
329 |
|
330 |
showpkgdeps() { |
331 |
local pkg=$1 |
332 |
shift |
333 |
elog " $(printf "%-17s:" ${pkg}) ${@}" |
334 |
} |
335 |
|
336 |
pkg_postinst() { |
337 |
use emacs && elisp-site-regen |
338 |
if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then |
339 |
ewarn "You must build dev-util/subversion with USE=perl" |
340 |
ewarn "to get the full functionality of git-svn!" |
341 |
fi |
342 |
elog "These additional scripts need some dependencies:" |
343 |
echo |
344 |
showpkgdeps git-quiltimport "dev-util/quilt" |
345 |
showpkgdeps git-instaweb \ |
346 |
"|| ( www-servers/lighttpd www-servers/apache )" |
347 |
echo |
348 |
} |
349 |
|
350 |
pkg_postrm() { |
351 |
use emacs && elisp-site-regen |
352 |
} |