1 |
robbat2 08/04/29 22:35:26 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: git-1.5.5.1-r1.ebuild |
5 |
Log: |
6 |
The gitweb.cgi did not contain the build-time replacements. Ensure that it does, and also make it executable by default so that portage does not strip the executability on upgrade. |
7 |
(Portage version: 2.1.4.4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.269 dev-util/git/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/ChangeLog?rev=1.269&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/ChangeLog?rev=1.269&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/ChangeLog?r1=1.268&r2=1.269 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v |
19 |
retrieving revision 1.268 |
20 |
retrieving revision 1.269 |
21 |
diff -p -w -b -B -u -u -r1.268 -r1.269 |
22 |
--- ChangeLog 24 Apr 2008 08:24:03 -0000 1.268 |
23 |
+++ ChangeLog 29 Apr 2008 22:35:26 -0000 1.269 |
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.268 2008/04/24 08:24:03 robbat2 Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.269 2008/04/29 22:35:26 robbat2 Exp $ |
29 |
+ |
30 |
+*git-1.5.5.1-r1 (29 Apr 2008) |
31 |
+ |
32 |
+ 29 Apr 2008; Robin H. Johnson <robbat2@g.o> +git-1.5.5.1-r1.ebuild: |
33 |
+ The gitweb.cgi did not contain the build-time replacements. Ensure that it |
34 |
+ does, and also make it executable by default so that portage does not |
35 |
+ strip the executability on upgrade. |
36 |
|
37 |
24 Apr 2008; Robin H. Johnson <robbat2@g.o> |
38 |
+files/20080322-git-1.5.4.4-noperl.patch, |
39 |
|
40 |
|
41 |
|
42 |
1.1 dev-util/git/git-1.5.5.1-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/git-1.5.5.1-r1.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/git-1.5.5.1-r1.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: git-1.5.5.1-r1.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.5.5.1-r1.ebuild,v 1.1 2008/04/29 22:35:26 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" |
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? ( net-misc/curl ) |
79 |
webdav? ( dev-libs/expat ) |
80 |
emacs? ( virtual/emacs )" |
81 |
# dev-perl/{Authen-SASL,Net-SMTP-SSL} are used by git-send-email |
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=72${PN}-gentoo.el |
94 |
S="${WORKDIR}/${MY_P}" |
95 |
|
96 |
pkg_setup() { |
97 |
if ! use perl ; then |
98 |
if use cgi || use cvs || use subversion ; then |
99 |
eerror "You must built dev-util/git with USE=perl and the" |
100 |
eerror "applicable USE flag to use any of the following:" |
101 |
eerror "gitweb, git-cvs*, git-svn, git-archimport, git-quiltimport" |
102 |
die "You need USE=perl to satisfy your other USE= requests!" |
103 |
fi |
104 |
fi |
105 |
} |
106 |
|
107 |
# This is needed because for some obscure reasons future calls to make don't |
108 |
# pick up these exports if we export them in src_unpack() |
109 |
exportmakeopts() { |
110 |
local myopts |
111 |
|
112 |
if use mozsha1 ; then |
113 |
myopts="${myopts} MOZILLA_SHA1=YesPlease" |
114 |
elif use ppcsha1 ; then |
115 |
myopts="${myopts} PPC_SHA1=YesPlease" |
116 |
fi |
117 |
|
118 |
if use curl ; then |
119 |
use webdav || myopts="${myopts} NO_EXPAT=YesPlease" |
120 |
else |
121 |
myopts="${myopts} NO_CURL=YesPlease" |
122 |
use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring." |
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}"/${PN}-1.5.3-symlinks.patch |
142 |
epatch "${FILESDIR}"/20080423-${PN}-1.5.5.1-noperl.patch |
143 |
|
144 |
sed -i \ |
145 |
-e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \ |
146 |
-e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \ |
147 |
-e "s:^\(CC = \).*$:\1$(tc-getCC):" \ |
148 |
-e "s:^\(AR = \).*$:\1$(tc-getAR):" \ |
149 |
-e 's:ln :ln -s :g' \ |
150 |
Makefile || die "sed failed" |
151 |
|
152 |
exportmakeopts |
153 |
} |
154 |
|
155 |
src_compile() { |
156 |
emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" |
157 |
|
158 |
if use emacs ; then |
159 |
elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" |
160 |
fi |
161 |
if use perl && use cgi ; then |
162 |
emake ${MY_MAKEOPTS} \ |
163 |
DESTDIR="${D}" \ |
164 |
prefix=/usr \ |
165 |
gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" |
166 |
fi |
167 |
} |
168 |
|
169 |
src_install() { |
170 |
emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ |
171 |
die "make install failed" |
172 |
|
173 |
doman man?/* |
174 |
|
175 |
dodoc README Documentation/{SubmittingPatches,CodingGuidelines} |
176 |
use doc && dodir /usr/share/doc/${PF}/html |
177 |
for d in / /howto/ /technical/ ; do |
178 |
docinto ${d} |
179 |
dodoc Documentation${d}*.txt |
180 |
use doc && dohtml -p ${d} Documentation${d}*.html |
181 |
done |
182 |
docinto / |
183 |
|
184 |
dobashcompletion contrib/completion/git-completion.bash ${PN} |
185 |
|
186 |
if use emacs ; then |
187 |
elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \ |
188 |
die "elisp-install failed" |
189 |
elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
190 |
# don't add automatically to the load-path, so the sitefile |
191 |
# can do a conditional loading |
192 |
touch "${D}"/"${SITELISP}"/${PN}/.nosearch |
193 |
fi |
194 |
|
195 |
if use gtk ; then |
196 |
dobin "${S}"/contrib/gitview/gitview |
197 |
dodoc "${S}"/contrib/gitview/gitview.txt |
198 |
fi |
199 |
|
200 |
dobin contrib/fast-import/git-p4 |
201 |
dodoc contrib/fast-import/git-p4.txt |
202 |
newbin contrib/fast-import/import-tars.perl import-tars |
203 |
|
204 |
dodir /usr/share/${PN}/contrib |
205 |
# The following are excluded: |
206 |
# svnimport - use git-svn |
207 |
# p4import - excluded because fast-import has a better one |
208 |
# examples - these are stuff that is not used in Git anymore actually |
209 |
# patches - stuff the Git guys made to go upstream to other places |
210 |
for i in continuous fast-import hg-to-git \ |
211 |
hooks remotes2config.sh vim stats \ |
212 |
workdir convert-objects blameview ; do |
213 |
cp -rf \ |
214 |
"${S}"/contrib/${i} \ |
215 |
"${D}"/usr/share/${PN}/contrib \ |
216 |
|| die "Failed contrib ${i}" |
217 |
done |
218 |
|
219 |
if use perl && use cgi ; then |
220 |
dodir /usr/share/${PN}/gitweb |
221 |
insinto /usr/share/${PN}/gitweb |
222 |
doins "${S}"/gitweb/gitweb.cgi |
223 |
doins "${S}"/gitweb/gitweb.css |
224 |
doins "${S}"/gitweb/git-{favicon,logo}.png |
225 |
|
226 |
# Make sure it can run |
227 |
fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi |
228 |
|
229 |
# INSTALL discusses configuration issues, not just installation |
230 |
docinto / |
231 |
newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb |
232 |
newdoc "${S}"/gitweb/README README.gitweb |
233 |
fi |
234 |
|
235 |
if use xinetd ; then |
236 |
insinto /etc/xinetd.d |
237 |
newins "${FILESDIR}"/git-daemon.xinetd git-daemon |
238 |
fi |
239 |
|
240 |
newinitd "${FILESDIR}"/git-daemon.initd git-daemon |
241 |
newconfd "${FILESDIR}"/git-daemon.confd git-daemon |
242 |
|
243 |
fixlocalpod |
244 |
} |
245 |
|
246 |
src_test() { |
247 |
local disabled="" |
248 |
local tests_cvs="t9200-git-cvsexportcommit.sh \ |
249 |
t9400-git-cvsserver-server.sh \ |
250 |
t9600-cvsimport.sh" |
251 |
local tests_perl="t5502-quickfetch.sh \ |
252 |
t5512-ls-remote.sh \ |
253 |
t5520-pull.sh" |
254 |
|
255 |
# Unzip is used only for the testcase code, not by any normal parts of Git. |
256 |
has_version app-arch/unzip || \ |
257 |
einfo "Disabling tar-tree tests" && \ |
258 |
disabled="${disabled} \ |
259 |
t5000-tar-tree.sh" |
260 |
|
261 |
if ! has userpriv "${FEATURES}"; then |
262 |
ewarn "Skipping CVS tests because CVS does not work as root!" |
263 |
ewarn "You should retest with FEATURES=userpriv!" |
264 |
disabled="${disabled} \ |
265 |
${tests_cvs}" |
266 |
fi |
267 |
|
268 |
use cvs && \ |
269 |
has_version dev-util/cvs && \ |
270 |
built_with_use dev-util/cvs server || \ |
271 |
einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])" && \ |
272 |
disabled="${disabled} \ |
273 |
${tests_cvs}" |
274 |
|
275 |
use perl || \ |
276 |
einfo "Disabling tests that need Perl" && \ |
277 |
disabled="${disabled} \ |
278 |
${tests_perl}" |
279 |
|
280 |
# Reset all previously disabled tests |
281 |
cd "${S}/t" |
282 |
for i in *.sh.DISABLED ; do |
283 |
[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" |
284 |
done |
285 |
einfo "Disabled tests:" |
286 |
for i in ${disabled} ; do |
287 |
[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" |
288 |
done |
289 |
cd "${S}" |
290 |
# Now run the tests |
291 |
einfo "Start test run" |
292 |
emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" |
293 |
} |
294 |
|
295 |
showpkgdeps() { |
296 |
local pkg=$1 |
297 |
shift |
298 |
elog " $(printf "%-17s:" ${pkg}) ${@}" |
299 |
} |
300 |
|
301 |
pkg_postinst() { |
302 |
if use emacs ; then |
303 |
elisp-site-regen |
304 |
elog "GNU Emacs has built-in Git support in versions greater 22.1." |
305 |
elog "You can disable the emacs USE flag for dev-util/git" |
306 |
elog "if you are using such a version." |
307 |
fi |
308 |
if use subversion && ! built_with_use dev-util/subversion perl ; then |
309 |
ewarn "You must build dev-util/subversion with USE=perl" |
310 |
ewarn "to get the full functionality of git-svn!" |
311 |
fi |
312 |
elog "These additional scripts need some dependencies:" |
313 |
echo |
314 |
showpkgdeps git-archimport "dev-util/tla" |
315 |
showpkgdeps git-quiltimport "dev-util/quilt" |
316 |
showpkgdeps git-instaweb \ |
317 |
"|| ( www-servers/lighttpd www-servers/apache )" |
318 |
echo |
319 |
} |
320 |
|
321 |
pkg_postrm() { |
322 |
use emacs && elisp-site-regen |
323 |
} |
324 |
|
325 |
|
326 |
|
327 |
-- |
328 |
gentoo-commits@l.g.o mailing list |