1 |
ferdy 08/02/03 18:22:58 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: git-1.5.4.ebuild |
5 |
Removed: git-1.5.4_rc3.ebuild git-1.5.4_rc2.ebuild |
6 |
git-1.5.4_rc4.ebuild |
7 |
Log: |
8 |
New upstream version. Remove RCs for 1.5.4 |
9 |
(Portage version: 2.1.3.19) |
10 |
|
11 |
Revision Changes Path |
12 |
1.254 dev-util/git/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/ChangeLog?rev=1.254&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/ChangeLog?rev=1.254&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/ChangeLog?r1=1.253&r2=1.254 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v |
21 |
retrieving revision 1.253 |
22 |
retrieving revision 1.254 |
23 |
diff -u -r1.253 -r1.254 |
24 |
--- ChangeLog 1 Feb 2008 10:46:40 -0000 1.253 |
25 |
+++ ChangeLog 3 Feb 2008 18:22:58 -0000 1.254 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for dev-util/git |
28 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.253 2008/02/01 10:46:40 robbat2 Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.254 2008/02/03 18:22:58 ferdy Exp $ |
31 |
+ |
32 |
+*git-1.5.4 (03 Feb 2008) |
33 |
+ |
34 |
+ 03 Feb 2008; Fernando J. Pereda <ferdy@g.o> -git-1.5.4_rc2.ebuild, |
35 |
+ -git-1.5.4_rc3.ebuild, -git-1.5.4_rc4.ebuild, +git-1.5.4.ebuild: |
36 |
+ New upstream version. Remove RCs for 1.5.4 |
37 |
|
38 |
01 Feb 2008; Robin H. Johnson <robbat2@g.o> git-1.5.2.5.ebuild, |
39 |
git-1.5.3.7-r1.ebuild, git-1.5.3.8.ebuild, git-1.5.4_rc2.ebuild, |
40 |
|
41 |
|
42 |
|
43 |
1.1 dev-util/git/git-1.5.4.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/git-1.5.4.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/git-1.5.4.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: git-1.5.4.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2008 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.4.ebuild,v 1.1 2008/02/03 18:22:58 ferdy Exp $ |
53 |
|
54 |
inherit toolchain-funcs eutils elisp-common perl-module bash-completion |
55 |
|
56 |
MY_PV="${PV/_rc/.rc}" |
57 |
MY_P="${PN}-${MY_PV}" |
58 |
|
59 |
DOC_VER=${MY_PV} |
60 |
|
61 |
DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" |
62 |
HOMEPAGE="http://git.or.cz/" |
63 |
SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 |
64 |
mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 |
65 |
doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" |
66 |
|
67 |
LICENSE="GPL-2" |
68 |
SLOT="0" |
69 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
70 |
IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk webdav" |
71 |
|
72 |
DEPEND=" |
73 |
!app-misc/git |
74 |
dev-libs/openssl |
75 |
sys-libs/zlib |
76 |
dev-lang/perl |
77 |
app-arch/cpio |
78 |
tk? ( dev-lang/tk ) |
79 |
curl? ( net-misc/curl ) |
80 |
webdav? ( dev-libs/expat ) |
81 |
emacs? ( virtual/emacs )" |
82 |
RDEPEND="${DEPEND} |
83 |
cgi? ( virtual/perl-CGI ) |
84 |
perl? ( dev-perl/Error ) |
85 |
gtk? ( >=dev-python/pygtk-2.8 )" |
86 |
|
87 |
SITEFILE=72${PN}-gentoo.el |
88 |
S="${WORKDIR}/${MY_P}" |
89 |
|
90 |
# This is needed because for some obscure reasons future calls to make don't |
91 |
# pick up these exports if we export them in src_unpack() |
92 |
exportmakeopts() { |
93 |
local myopts |
94 |
|
95 |
if use mozsha1 ; then |
96 |
myopts="${myopts} MOZILLA_SHA1=YesPlease" |
97 |
elif use ppcsha1 ; then |
98 |
myopts="${myopts} PPC_SHA1=YesPlease" |
99 |
fi |
100 |
|
101 |
if use curl ; then |
102 |
use webdav || myopts="${myopts} NO_EXPAT=YesPlease" |
103 |
else |
104 |
myopts="${myopts} NO_CURL=YesPlease" |
105 |
use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring." |
106 |
fi |
107 |
|
108 |
myopts="${myopts} WITH_SEND_EMAIL=YesPlease" |
109 |
|
110 |
use iconv || myopts="${myopts} NO_ICONV=YesPlease" |
111 |
use tk || myopts="${myopts} NO_TCLTK=YesPlease" |
112 |
|
113 |
export MY_MAKEOPTS=${myopts} |
114 |
} |
115 |
|
116 |
showpkgdeps() { |
117 |
local pkg=$1 |
118 |
shift |
119 |
elog " $(printf "%-17s:" ${pkg}) ${@}" |
120 |
} |
121 |
|
122 |
src_unpack() { |
123 |
unpack ${MY_P}.tar.bz2 |
124 |
cd "${S}" |
125 |
unpack ${PN}-manpages-${DOC_VER}.tar.bz2 |
126 |
use doc && cd "${S}"/Documentation && unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 |
127 |
cd "${S}" |
128 |
|
129 |
epatch "${FILESDIR}"/${PN}-1.5.3-symlinks.patch |
130 |
|
131 |
sed -i \ |
132 |
-e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \ |
133 |
-e "s:^\(LDFLAGS = \).*$:\1${LDFLAGS}:" \ |
134 |
-e "s:^\(CC = \).*$:\1$(tc-getCC):" \ |
135 |
-e "s:^\(AR = \).*$:\1$(tc-getAR):" \ |
136 |
-e 's:ln :ln -s :g' \ |
137 |
Makefile || die "sed failed" |
138 |
|
139 |
exportmakeopts |
140 |
} |
141 |
|
142 |
src_compile() { |
143 |
emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" |
144 |
|
145 |
if use emacs ; then |
146 |
elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" |
147 |
fi |
148 |
if use cgi ; then |
149 |
emake ${MY_MAKEOPTS} \ |
150 |
DESTDIR="${D}" \ |
151 |
prefix=/usr \ |
152 |
gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" |
153 |
fi |
154 |
} |
155 |
|
156 |
src_install() { |
157 |
emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ |
158 |
die "make install failed" |
159 |
|
160 |
doman man?/* |
161 |
|
162 |
dodoc README Documentation/{SubmittingPatches,CodingGuidelines} |
163 |
use doc && dodir /usr/share/doc/${PF}/html |
164 |
for d in / /howto/ /technical/ ; do |
165 |
docinto ${d} |
166 |
dodoc Documentation${d}*.txt |
167 |
use doc && dohtml -p ${d} Documentation${d}*.html |
168 |
done |
169 |
docinto / |
170 |
|
171 |
dobashcompletion contrib/completion/git-completion.bash ${PN} |
172 |
|
173 |
if use emacs ; then |
174 |
elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \ |
175 |
die "elisp-install failed" |
176 |
elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
177 |
# don't add automatically to the load-path, so the sitefile |
178 |
# can do a conditional loading |
179 |
touch "${D}"/"${SITELISP}"/${PN}/.nosearch |
180 |
fi |
181 |
|
182 |
if use gtk ; then |
183 |
dobin "${S}"/contrib/gitview/gitview |
184 |
dodoc "${S}"/contrib/gitview/gitview.txt |
185 |
newbin "${S}"/contrib/blameview/blameview.perl blameview |
186 |
newdoc "${S}"/contrib/blameview/README README.blameview |
187 |
fi |
188 |
|
189 |
dobin contrib/fast-import/git-p4 |
190 |
dodoc contrib/fast-import/git-p4.txt |
191 |
newbin contrib/fast-import/import-tars.perl import-tars |
192 |
|
193 |
dodir /usr/share/${PN}/contrib |
194 |
# The following are excluded: |
195 |
# svnimport - use git-svn |
196 |
# p4import - excluded because fast-import has a better one |
197 |
# examples - these are stuff that is not used in Git anymore actually |
198 |
# patches - stuff the Git guys made to go upstream to other places |
199 |
for i in continuous fast-import hg-to-git \ |
200 |
hooks remotes2config.sh vim stats \ |
201 |
workdir convert-objects ; do |
202 |
cp -rf \ |
203 |
"${S}"/contrib/${i} \ |
204 |
"${D}"/usr/share/${PN}/contrib \ |
205 |
|| die "Failed contrib ${i}" |
206 |
done |
207 |
|
208 |
if use cgi ; then |
209 |
dodir /usr/share/${PN}/gitweb |
210 |
insinto /usr/share/${PN}/gitweb |
211 |
doins "${S}"/gitweb/gitweb.{cgi,css} |
212 |
doins "${S}"/gitweb/git-{favicon,logo}.png |
213 |
docinto / |
214 |
# INSTALL discusses configuration issues, not just installation |
215 |
newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb |
216 |
newdoc "${S}"/gitweb/README README.gitweb |
217 |
fi |
218 |
|
219 |
insinto /etc/xinetd.d |
220 |
newins "${FILESDIR}"/git-daemon.xinetd git-daemon |
221 |
|
222 |
newinitd "${FILESDIR}"/git-daemon.initd git-daemon |
223 |
newconfd "${FILESDIR}"/git-daemon.confd git-daemon |
224 |
|
225 |
fixlocalpod |
226 |
} |
227 |
|
228 |
src_test() { |
229 |
has_version dev-util/subversion || \ |
230 |
MY_MAKEOPTS="${MY_MAKEOPTS} NO_SVN_TESTS=YesPlease" |
231 |
has_version app-arch/unzip || \ |
232 |
rm "${S}"/t/t5000-tar-tree.sh |
233 |
if ! has userpriv "${FEATURES}"; then |
234 |
ewarn "Skipping CVS tests because CVS does not work as root!" |
235 |
ewarn "You should retest with FEATURES=userpriv!" |
236 |
for i in t9200-git-cvsexportcommit.sh t9600-cvsimport.sh ; do |
237 |
rm "${S}"/t/${i} || die "Failed to remove ${i}" |
238 |
done |
239 |
fi |
240 |
built_with_use dev-util/cvs server || rm "${S}"/t/t9600-cvsimport.sh |
241 |
emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" |
242 |
} |
243 |
|
244 |
pkg_postinst() { |
245 |
if use emacs ; then |
246 |
elisp-site-regen |
247 |
elog "GNU Emacs has built-in Git support in versions greater 22.1." |
248 |
elog "You can disable the emacs USE flag for dev-util/git" |
249 |
elog "if you are using such a version." |
250 |
fi |
251 |
elog "These additional scripts need some dependencies:" |
252 |
elog "(These are also needed for FEATURES=test)" |
253 |
echo |
254 |
showpkgdeps git-archimport "dev-util/tla" |
255 |
showpkgdeps git-cvsimport ">=dev-util/cvsps-2.1" |
256 |
showpkgdeps git-svn \ |
257 |
"USE=perl" \ |
258 |
"dev-util/subversion(USE=perl)" \ |
259 |
"dev-perl/libwww-perl" \ |
260 |
"dev-perl/TermReadKey" |
261 |
showpkgdeps git-quiltimport "dev-util/quilt" |
262 |
showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite" |
263 |
showpkgdeps git-instaweb \ |
264 |
"|| ( www-servers/lighttpd www-servers/apache )" |
265 |
showpkgdeps git-send-email "USE=perl" |
266 |
showpkgdeps git-remote "USE=perl" |
267 |
echo |
268 |
} |
269 |
|
270 |
pkg_postrm() { |
271 |
use emacs && elisp-site-regen |
272 |
} |
273 |
|
274 |
|
275 |
|
276 |
-- |
277 |
gentoo-commits@l.g.o mailing list |