1 |
robbat2 08/03/29 07:59:42 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: git-1.5.4.5.ebuild |
5 |
Log: |
6 |
Version bump. |
7 |
(Portage version: 2.1.4.4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.265 dev-util/git/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/ChangeLog?rev=1.265&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/ChangeLog?rev=1.265&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/ChangeLog?r1=1.264&r2=1.265 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v |
19 |
retrieving revision 1.264 |
20 |
retrieving revision 1.265 |
21 |
diff -p -w -b -B -u -u -r1.264 -r1.265 |
22 |
--- ChangeLog 24 Mar 2008 15:48:19 -0000 1.264 |
23 |
+++ ChangeLog 29 Mar 2008 07:59:42 -0000 1.265 |
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.264 2008/03/24 15:48:19 armin76 Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.265 2008/03/29 07:59:42 robbat2 Exp $ |
29 |
+ |
30 |
+*git-1.5.4.5 (29 Mar 2008) |
31 |
+ |
32 |
+ 29 Mar 2008; Robin H. Johnson <robbat2@g.o> +git-1.5.4.5.ebuild: |
33 |
+ Version bump. |
34 |
|
35 |
24 Mar 2008; Raúl Porcel <armin76@g.o> git-1.5.4.4-r1.ebuild: |
36 |
Re-add ~ia64 wrt #214464 |
37 |
|
38 |
|
39 |
|
40 |
1.1 dev-util/git/git-1.5.4.5.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/git-1.5.4.5.ebuild?rev=1.1&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/git-1.5.4.5.ebuild?rev=1.1&content-type=text/plain |
44 |
|
45 |
Index: git-1.5.4.5.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.5.4.5.ebuild,v 1.1 2008/03/29 07:59:42 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" |
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? ( net-misc/curl ) |
77 |
webdav? ( dev-libs/expat ) |
78 |
emacs? ( virtual/emacs )" |
79 |
# dev-perl/{Authen-SASL,Net-SMTP-SSL} are used by git-send-email |
80 |
|
81 |
RDEPEND="${DEPEND} |
82 |
perl? ( dev-perl/Error |
83 |
dev-perl/Net-SMTP-SSL |
84 |
dev-perl/Authen-SASL |
85 |
cgi? ( virtual/perl-CGI ) |
86 |
cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) |
87 |
subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) |
88 |
) |
89 |
gtk? ( >=dev-python/pygtk-2.8 )" |
90 |
|
91 |
SITEFILE=72${PN}-gentoo.el |
92 |
S="${WORKDIR}/${MY_P}" |
93 |
|
94 |
pkg_setup() { |
95 |
if ! use perl ; then |
96 |
if use cgi || use cvs || use subversion ; then |
97 |
eerror "You must built dev-util/git with USE=perl and the" |
98 |
eerror "applicable USE flag to use any of the following:" |
99 |
eerror "gitweb, git-cvs*, git-svn, git-archimport, git-quiltimport" |
100 |
die "You need USE=perl to satisfy your other USE= requests!" |
101 |
fi |
102 |
fi |
103 |
} |
104 |
|
105 |
# This is needed because for some obscure reasons future calls to make don't |
106 |
# pick up these exports if we export them in src_unpack() |
107 |
exportmakeopts() { |
108 |
local myopts |
109 |
|
110 |
if use mozsha1 ; then |
111 |
myopts="${myopts} MOZILLA_SHA1=YesPlease" |
112 |
elif use ppcsha1 ; then |
113 |
myopts="${myopts} PPC_SHA1=YesPlease" |
114 |
fi |
115 |
|
116 |
if use curl ; then |
117 |
use webdav || myopts="${myopts} NO_EXPAT=YesPlease" |
118 |
else |
119 |
myopts="${myopts} NO_CURL=YesPlease" |
120 |
use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring." |
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}"/${PN}-1.5.3-symlinks.patch |
140 |
epatch "${FILESDIR}"/20080322-${PN}-1.5.5.4-noperl.patch |
141 |
|
142 |
sed -i \ |
143 |
-e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \ |
144 |
-e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \ |
145 |
-e "s:^\(CC = \).*$:\1$(tc-getCC):" \ |
146 |
-e "s:^\(AR = \).*$:\1$(tc-getAR):" \ |
147 |
-e 's:ln :ln -s :g' \ |
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 |
dodir /usr/share/${PN}/contrib |
203 |
# The following are excluded: |
204 |
# svnimport - use git-svn |
205 |
# p4import - excluded because fast-import has a better one |
206 |
# examples - these are stuff that is not used in Git anymore actually |
207 |
# patches - stuff the Git guys made to go upstream to other places |
208 |
for i in continuous fast-import hg-to-git \ |
209 |
hooks remotes2config.sh vim stats \ |
210 |
workdir convert-objects blameview ; do |
211 |
cp -rf \ |
212 |
"${S}"/contrib/${i} \ |
213 |
"${D}"/usr/share/${PN}/contrib \ |
214 |
|| die "Failed contrib ${i}" |
215 |
done |
216 |
|
217 |
if use perl && use cgi ; then |
218 |
dodir /usr/share/${PN}/gitweb |
219 |
insinto /usr/share/${PN}/gitweb |
220 |
doins "${S}"/gitweb/gitweb.{cgi,css} |
221 |
doins "${S}"/gitweb/git-{favicon,logo}.png |
222 |
docinto / |
223 |
# INSTALL discusses configuration issues, not just installation |
224 |
newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb |
225 |
newdoc "${S}"/gitweb/README README.gitweb |
226 |
fi |
227 |
|
228 |
if use xinetd ; then |
229 |
insinto /etc/xinetd.d |
230 |
newins "${FILESDIR}"/git-daemon.xinetd git-daemon |
231 |
fi |
232 |
|
233 |
newinitd "${FILESDIR}"/git-daemon.initd git-daemon |
234 |
newconfd "${FILESDIR}"/git-daemon.confd git-daemon |
235 |
|
236 |
fixlocalpod |
237 |
} |
238 |
|
239 |
src_test() { |
240 |
local disabled="" |
241 |
local tests_cvs="t9200-git-cvsexportcommit.sh \ |
242 |
t9400-git-cvsserver-server.sh \ |
243 |
t9600-cvsimport.sh" |
244 |
local tests_perl="t5502-quickfetch.sh \ |
245 |
t5512-ls-remote.sh \ |
246 |
t5520-pull.sh" |
247 |
|
248 |
# Unzip is used only for the testcase code, not by any normal parts of Git. |
249 |
has_version app-arch/unzip || \ |
250 |
einfo "Disabling tar-tree tests" && \ |
251 |
disabled="${disabled} \ |
252 |
t5000-tar-tree.sh" |
253 |
|
254 |
if ! has userpriv "${FEATURES}"; then |
255 |
ewarn "Skipping CVS tests because CVS does not work as root!" |
256 |
ewarn "You should retest with FEATURES=userpriv!" |
257 |
disabled="${disabled} \ |
258 |
${tests_cvs}" |
259 |
fi |
260 |
|
261 |
use cvs && \ |
262 |
has_version dev-util/cvs && \ |
263 |
built_with_use dev-util/cvs server || \ |
264 |
einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])" && \ |
265 |
disabled="${disabled} \ |
266 |
${tests_cvs}" |
267 |
|
268 |
use perl || \ |
269 |
einfo "Disabling tests that need Perl" && \ |
270 |
disabled="${disabled} \ |
271 |
${tests_perl}" |
272 |
|
273 |
# Reset all previously disabled tests |
274 |
cd "${S}/t" |
275 |
for i in *.sh.DISABLED ; do |
276 |
[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" |
277 |
done |
278 |
einfo "Disabled tests:" |
279 |
for i in ${disabled} ; do |
280 |
[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" |
281 |
done |
282 |
cd "${S}" |
283 |
# Now run the tests |
284 |
einfo "Start test run" |
285 |
emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" |
286 |
} |
287 |
|
288 |
showpkgdeps() { |
289 |
local pkg=$1 |
290 |
shift |
291 |
elog " $(printf "%-17s:" ${pkg}) ${@}" |
292 |
} |
293 |
|
294 |
pkg_postinst() { |
295 |
if use emacs ; then |
296 |
elisp-site-regen |
297 |
elog "GNU Emacs has built-in Git support in versions greater 22.1." |
298 |
elog "You can disable the emacs USE flag for dev-util/git" |
299 |
elog "if you are using such a version." |
300 |
fi |
301 |
if use subversion && ! built_with_use dev-util/subversion perl ; then |
302 |
ewarn "You must build dev-util/subversion with USE=perl" |
303 |
ewarn "to get the full functionality of git-svn!" |
304 |
fi |
305 |
elog "These additional scripts need some dependencies:" |
306 |
echo |
307 |
showpkgdeps git-archimport "dev-util/tla" |
308 |
showpkgdeps git-quiltimport "dev-util/quilt" |
309 |
showpkgdeps git-instaweb \ |
310 |
"|| ( www-servers/lighttpd www-servers/apache )" |
311 |
echo |
312 |
} |
313 |
|
314 |
pkg_postrm() { |
315 |
use emacs && elisp-site-regen |
316 |
} |
317 |
|
318 |
|
319 |
|
320 |
-- |
321 |
gentoo-commits@l.g.o mailing list |