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