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