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