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