1 |
polynomial-c 14/08/30 08:59:38 |
2 |
|
3 |
Modified: git-2.0.2.ebuild git-9999-r3.ebuild |
4 |
git-9999-r1.ebuild ChangeLog git-2.1.0.ebuild |
5 |
git-2.0.4.ebuild git-9999-r2.ebuild git-9999.ebuild |
6 |
Log: |
7 |
Don't install git-remote helpers for bzr and hg anymore (bug #512422). Synced live ebuilds with latest release ebuild |
8 |
|
9 |
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) |
10 |
|
11 |
Revision Changes Path |
12 |
1.5 dev-vcs/git/git-2.0.2.ebuild |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild?rev=1.5&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild?rev=1.5&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild?r1=1.4&r2=1.5 |
17 |
|
18 |
Index: git-2.0.2.ebuild |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild,v |
21 |
retrieving revision 1.4 |
22 |
retrieving revision 1.5 |
23 |
diff -u -r1.4 -r1.5 |
24 |
--- git-2.0.2.ebuild 24 Aug 2014 13:56:32 -0000 1.4 |
25 |
+++ git-2.0.2.ebuild 30 Aug 2014 08:59:38 -0000 1.5 |
26 |
@@ -1,6 +1,6 @@ |
27 |
# Copyright 1999-2014 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild,v 1.4 2014/08/24 13:56:32 slyfox Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild,v 1.5 2014/08/30 08:59:38 polynomial-c Exp $ |
31 |
|
32 |
EAPI=5 |
33 |
|
34 |
@@ -451,13 +451,6 @@ |
35 |
cd "${S}" |
36 |
fi |
37 |
|
38 |
- # remote-helpers |
39 |
- if use python ; then |
40 |
- python_scriptinto /usr/libexec/git-core/ |
41 |
- python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg} |
42 |
- python_optimize |
43 |
- fi |
44 |
- |
45 |
dodir /usr/share/${PN}/contrib |
46 |
# The following are excluded: |
47 |
# completion - installed above |
48 |
|
49 |
|
50 |
|
51 |
1.7 dev-vcs/git/git-9999-r3.ebuild |
52 |
|
53 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild?rev=1.7&view=markup |
54 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild?rev=1.7&content-type=text/plain |
55 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild?r1=1.6&r2=1.7 |
56 |
|
57 |
Index: git-9999-r3.ebuild |
58 |
=================================================================== |
59 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v |
60 |
retrieving revision 1.6 |
61 |
retrieving revision 1.7 |
62 |
diff -u -r1.6 -r1.7 |
63 |
--- git-9999-r3.ebuild 24 Aug 2014 13:56:32 -0000 1.6 |
64 |
+++ git-9999-r3.ebuild 30 Aug 2014 08:59:38 -0000 1.7 |
65 |
@@ -1,6 +1,6 @@ |
66 |
# Copyright 1999-2014 Gentoo Foundation |
67 |
# Distributed under the terms of the GNU General Public License v2 |
68 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v 1.6 2014/08/24 13:56:32 slyfox Exp $ |
69 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v 1.7 2014/08/30 08:59:38 polynomial-c Exp $ |
70 |
|
71 |
EAPI=5 |
72 |
|
73 |
@@ -22,7 +22,7 @@ |
74 |
DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" |
75 |
HOMEPAGE="http://www.git-scm.com/" |
76 |
if [[ ${PV} != *9999 ]]; then |
77 |
- SRC_URI_SUFFIX="gz" |
78 |
+ SRC_URI_SUFFIX="xz" |
79 |
SRC_URI_GOOG="http://git-core.googlecode.com/files" |
80 |
SRC_URI_KORG="mirror://kernel/software/scm/git" |
81 |
SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} |
82 |
@@ -33,7 +33,7 @@ |
83 |
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
84 |
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
85 |
)" |
86 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
87 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
88 |
else |
89 |
SRC_URI="" |
90 |
KEYWORDS="" |
91 |
@@ -225,7 +225,7 @@ |
92 |
|
93 |
src_prepare() { |
94 |
# bug #350330 - automagic CVS when we don't want it is bad. |
95 |
- epatch "${FILESDIR}"/git-2.0.0_rc0-optional-cvs.patch |
96 |
+ epatch "${FILESDIR}"/git-2.0.0-r2-optional-cvs.patch |
97 |
|
98 |
# install mediawiki perl modules also in vendor_dir |
99 |
# hack, needs better upstream solution |
100 |
@@ -420,10 +420,6 @@ |
101 |
cd "${S}" |
102 |
fi |
103 |
|
104 |
- # git-diffall |
105 |
- dobin contrib/diffall/git-diffall |
106 |
- newdoc contrib/diffall/README git-diffall.txt |
107 |
- |
108 |
# diff-highlight |
109 |
dobin contrib/diff-highlight/diff-highlight |
110 |
newdoc contrib/diff-highlight/README README.diff-highlight |
111 |
@@ -451,19 +447,11 @@ |
112 |
cd "${S}" |
113 |
fi |
114 |
|
115 |
- # remote-helpers |
116 |
- if use python ; then |
117 |
- python_scriptinto /usr/libexec/git-core/ |
118 |
- python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg} |
119 |
- python_optimize |
120 |
- fi |
121 |
- |
122 |
dodir /usr/share/${PN}/contrib |
123 |
# The following are excluded: |
124 |
# completion - installed above |
125 |
# credential/gnome-keyring TODO |
126 |
# diff-highlight - done above |
127 |
- # diffall - done above |
128 |
# emacs - installed above |
129 |
# examples - these are stuff that is not used in Git anymore actually |
130 |
# git-jump - done above |
131 |
@@ -478,7 +466,7 @@ |
132 |
for i in \ |
133 |
buildsystems convert-objects fast-import \ |
134 |
hg-to-git hooks remotes2config.sh rerere-train.sh \ |
135 |
- stats vim workdir \ |
136 |
+ stats workdir \ |
137 |
; do |
138 |
cp -rf \ |
139 |
"${S}"/contrib/${i} \ |
140 |
@@ -634,8 +622,8 @@ |
141 |
pkg_postinst() { |
142 |
use emacs && elisp-site-regen |
143 |
einfo "Please read /usr/share/bash-completion/git for Git bash command completion" |
144 |
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt" |
145 |
- einfo "Note that the prompt bash code is now in the seperate script" |
146 |
+ einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" |
147 |
+ einfo "Note that the prompt bash code is now in that separate script" |
148 |
elog "These additional scripts need some dependencies:" |
149 |
echo |
150 |
showpkgdeps git-quiltimport "dev-util/quilt" |
151 |
|
152 |
|
153 |
|
154 |
1.6 dev-vcs/git/git-9999-r1.ebuild |
155 |
|
156 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild?rev=1.6&view=markup |
157 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild?rev=1.6&content-type=text/plain |
158 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild?r1=1.5&r2=1.6 |
159 |
|
160 |
Index: git-9999-r1.ebuild |
161 |
=================================================================== |
162 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v |
163 |
retrieving revision 1.5 |
164 |
retrieving revision 1.6 |
165 |
diff -u -r1.5 -r1.6 |
166 |
--- git-9999-r1.ebuild 24 Aug 2014 13:56:32 -0000 1.5 |
167 |
+++ git-9999-r1.ebuild 30 Aug 2014 08:59:38 -0000 1.6 |
168 |
@@ -1,6 +1,6 @@ |
169 |
# Copyright 1999-2014 Gentoo Foundation |
170 |
# Distributed under the terms of the GNU General Public License v2 |
171 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v 1.5 2014/08/24 13:56:32 slyfox Exp $ |
172 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v 1.6 2014/08/30 08:59:38 polynomial-c Exp $ |
173 |
|
174 |
EAPI=5 |
175 |
|
176 |
@@ -22,7 +22,7 @@ |
177 |
DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" |
178 |
HOMEPAGE="http://www.git-scm.com/" |
179 |
if [[ ${PV} != *9999 ]]; then |
180 |
- SRC_URI_SUFFIX="gz" |
181 |
+ SRC_URI_SUFFIX="xz" |
182 |
SRC_URI_GOOG="http://git-core.googlecode.com/files" |
183 |
SRC_URI_KORG="mirror://kernel/software/scm/git" |
184 |
SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} |
185 |
@@ -33,7 +33,7 @@ |
186 |
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
187 |
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
188 |
)" |
189 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
190 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
191 |
else |
192 |
SRC_URI="" |
193 |
KEYWORDS="" |
194 |
@@ -225,7 +225,7 @@ |
195 |
|
196 |
src_prepare() { |
197 |
# bug #350330 - automagic CVS when we don't want it is bad. |
198 |
- epatch "${FILESDIR}"/git-1.9.0_rc3-optional-cvs.patch |
199 |
+ epatch "${FILESDIR}"/git-2.0.0-r2-optional-cvs.patch |
200 |
|
201 |
# install mediawiki perl modules also in vendor_dir |
202 |
# hack, needs better upstream solution |
203 |
@@ -420,10 +420,6 @@ |
204 |
cd "${S}" |
205 |
fi |
206 |
|
207 |
- # git-diffall |
208 |
- dobin contrib/diffall/git-diffall |
209 |
- newdoc contrib/diffall/README git-diffall.txt |
210 |
- |
211 |
# diff-highlight |
212 |
dobin contrib/diff-highlight/diff-highlight |
213 |
newdoc contrib/diff-highlight/README README.diff-highlight |
214 |
@@ -451,19 +447,11 @@ |
215 |
cd "${S}" |
216 |
fi |
217 |
|
218 |
- # remote-helpers |
219 |
- if use python ; then |
220 |
- python_scriptinto /usr/libexec/git-core/ |
221 |
- python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg} |
222 |
- python_optimize |
223 |
- fi |
224 |
- |
225 |
dodir /usr/share/${PN}/contrib |
226 |
# The following are excluded: |
227 |
# completion - installed above |
228 |
# credential/gnome-keyring TODO |
229 |
# diff-highlight - done above |
230 |
- # diffall - done above |
231 |
# emacs - installed above |
232 |
# examples - these are stuff that is not used in Git anymore actually |
233 |
# git-jump - done above |
234 |
@@ -478,7 +466,7 @@ |
235 |
for i in \ |
236 |
buildsystems convert-objects fast-import \ |
237 |
hg-to-git hooks remotes2config.sh rerere-train.sh \ |
238 |
- stats vim workdir \ |
239 |
+ stats workdir \ |
240 |
; do |
241 |
cp -rf \ |
242 |
"${S}"/contrib/${i} \ |
243 |
@@ -634,8 +622,8 @@ |
244 |
pkg_postinst() { |
245 |
use emacs && elisp-site-regen |
246 |
einfo "Please read /usr/share/bash-completion/git for Git bash command completion" |
247 |
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt" |
248 |
- einfo "Note that the prompt bash code is now in the seperate script" |
249 |
+ einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" |
250 |
+ einfo "Note that the prompt bash code is now in that separate script" |
251 |
elog "These additional scripts need some dependencies:" |
252 |
echo |
253 |
showpkgdeps git-quiltimport "dev-util/quilt" |
254 |
|
255 |
|
256 |
|
257 |
1.280 dev-vcs/git/ChangeLog |
258 |
|
259 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.280&view=markup |
260 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?rev=1.280&content-type=text/plain |
261 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/ChangeLog?r1=1.279&r2=1.280 |
262 |
|
263 |
Index: ChangeLog |
264 |
=================================================================== |
265 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v |
266 |
retrieving revision 1.279 |
267 |
retrieving revision 1.280 |
268 |
diff -u -r1.279 -r1.280 |
269 |
--- ChangeLog 26 Aug 2014 17:00:01 -0000 1.279 |
270 |
+++ ChangeLog 30 Aug 2014 08:59:38 -0000 1.280 |
271 |
@@ -1,6 +1,12 @@ |
272 |
# ChangeLog for dev-vcs/git |
273 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
274 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.279 2014/08/26 17:00:01 polynomial-c Exp $ |
275 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.280 2014/08/30 08:59:38 polynomial-c Exp $ |
276 |
+ |
277 |
+ 30 Aug 2014; Lars Wendler <polynomial-c@g.o> git-2.0.2.ebuild, |
278 |
+ git-2.0.4.ebuild, git-2.1.0.ebuild, git-9999.ebuild, git-9999-r1.ebuild, |
279 |
+ git-9999-r2.ebuild, git-9999-r3.ebuild: |
280 |
+ Don't install git-remote helpers for bzr and hg anymore (bug #512422). Synced |
281 |
+ live ebuilds with latest release ebuild. |
282 |
|
283 |
26 Aug 2014; Lars Wendler <polynomial-c@g.o> git-2.1.0.ebuild: |
284 |
Restrict test for >=git-2.1.0. See bug #520270 for details. |
285 |
|
286 |
|
287 |
|
288 |
1.5 dev-vcs/git/git-2.1.0.ebuild |
289 |
|
290 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.1.0.ebuild?rev=1.5&view=markup |
291 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.1.0.ebuild?rev=1.5&content-type=text/plain |
292 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.1.0.ebuild?r1=1.4&r2=1.5 |
293 |
|
294 |
Index: git-2.1.0.ebuild |
295 |
=================================================================== |
296 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.1.0.ebuild,v |
297 |
retrieving revision 1.4 |
298 |
retrieving revision 1.5 |
299 |
diff -u -r1.4 -r1.5 |
300 |
--- git-2.1.0.ebuild 26 Aug 2014 17:00:01 -0000 1.4 |
301 |
+++ git-2.1.0.ebuild 30 Aug 2014 08:59:38 -0000 1.5 |
302 |
@@ -1,6 +1,6 @@ |
303 |
# Copyright 1999-2014 Gentoo Foundation |
304 |
# Distributed under the terms of the GNU General Public License v2 |
305 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.1.0.ebuild,v 1.4 2014/08/26 17:00:01 polynomial-c Exp $ |
306 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.1.0.ebuild,v 1.5 2014/08/30 08:59:38 polynomial-c Exp $ |
307 |
|
308 |
EAPI=5 |
309 |
|
310 |
@@ -449,13 +449,6 @@ |
311 |
cd "${S}" |
312 |
fi |
313 |
|
314 |
- # remote-helpers |
315 |
- if use python ; then |
316 |
- python_scriptinto /usr/libexec/git-core/ |
317 |
- python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg} |
318 |
- python_optimize |
319 |
- fi |
320 |
- |
321 |
dodir /usr/share/${PN}/contrib |
322 |
# The following are excluded: |
323 |
# completion - installed above |
324 |
|
325 |
|
326 |
|
327 |
1.3 dev-vcs/git/git-2.0.4.ebuild |
328 |
|
329 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.0.4.ebuild?rev=1.3&view=markup |
330 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.0.4.ebuild?rev=1.3&content-type=text/plain |
331 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-2.0.4.ebuild?r1=1.2&r2=1.3 |
332 |
|
333 |
Index: git-2.0.4.ebuild |
334 |
=================================================================== |
335 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.4.ebuild,v |
336 |
retrieving revision 1.2 |
337 |
retrieving revision 1.3 |
338 |
diff -u -r1.2 -r1.3 |
339 |
--- git-2.0.4.ebuild 24 Aug 2014 13:56:32 -0000 1.2 |
340 |
+++ git-2.0.4.ebuild 30 Aug 2014 08:59:38 -0000 1.3 |
341 |
@@ -1,6 +1,6 @@ |
342 |
# Copyright 1999-2014 Gentoo Foundation |
343 |
# Distributed under the terms of the GNU General Public License v2 |
344 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.4.ebuild,v 1.2 2014/08/24 13:56:32 slyfox Exp $ |
345 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.4.ebuild,v 1.3 2014/08/30 08:59:38 polynomial-c Exp $ |
346 |
|
347 |
EAPI=5 |
348 |
|
349 |
@@ -451,13 +451,6 @@ |
350 |
cd "${S}" |
351 |
fi |
352 |
|
353 |
- # remote-helpers |
354 |
- if use python ; then |
355 |
- python_scriptinto /usr/libexec/git-core/ |
356 |
- python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg} |
357 |
- python_optimize |
358 |
- fi |
359 |
- |
360 |
dodir /usr/share/${PN}/contrib |
361 |
# The following are excluded: |
362 |
# completion - installed above |
363 |
|
364 |
|
365 |
|
366 |
1.6 dev-vcs/git/git-9999-r2.ebuild |
367 |
|
368 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild?rev=1.6&view=markup |
369 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild?rev=1.6&content-type=text/plain |
370 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild?r1=1.5&r2=1.6 |
371 |
|
372 |
Index: git-9999-r2.ebuild |
373 |
=================================================================== |
374 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v |
375 |
retrieving revision 1.5 |
376 |
retrieving revision 1.6 |
377 |
diff -u -r1.5 -r1.6 |
378 |
--- git-9999-r2.ebuild 24 Aug 2014 13:56:32 -0000 1.5 |
379 |
+++ git-9999-r2.ebuild 30 Aug 2014 08:59:38 -0000 1.6 |
380 |
@@ -1,6 +1,6 @@ |
381 |
# Copyright 1999-2014 Gentoo Foundation |
382 |
# Distributed under the terms of the GNU General Public License v2 |
383 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v 1.5 2014/08/24 13:56:32 slyfox Exp $ |
384 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v 1.6 2014/08/30 08:59:38 polynomial-c Exp $ |
385 |
|
386 |
EAPI=5 |
387 |
|
388 |
@@ -22,7 +22,7 @@ |
389 |
DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" |
390 |
HOMEPAGE="http://www.git-scm.com/" |
391 |
if [[ ${PV} != *9999 ]]; then |
392 |
- SRC_URI_SUFFIX="gz" |
393 |
+ SRC_URI_SUFFIX="xz" |
394 |
SRC_URI_GOOG="http://git-core.googlecode.com/files" |
395 |
SRC_URI_KORG="mirror://kernel/software/scm/git" |
396 |
SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} |
397 |
@@ -33,7 +33,7 @@ |
398 |
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
399 |
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
400 |
)" |
401 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
402 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
403 |
else |
404 |
SRC_URI="" |
405 |
KEYWORDS="" |
406 |
@@ -225,7 +225,7 @@ |
407 |
|
408 |
src_prepare() { |
409 |
# bug #350330 - automagic CVS when we don't want it is bad. |
410 |
- epatch "${FILESDIR}"/git-1.9.0_rc3-optional-cvs.patch |
411 |
+ epatch "${FILESDIR}"/git-2.0.0-r2-optional-cvs.patch |
412 |
|
413 |
# install mediawiki perl modules also in vendor_dir |
414 |
# hack, needs better upstream solution |
415 |
@@ -420,10 +420,6 @@ |
416 |
cd "${S}" |
417 |
fi |
418 |
|
419 |
- # git-diffall |
420 |
- dobin contrib/diffall/git-diffall |
421 |
- newdoc contrib/diffall/README git-diffall.txt |
422 |
- |
423 |
# diff-highlight |
424 |
dobin contrib/diff-highlight/diff-highlight |
425 |
newdoc contrib/diff-highlight/README README.diff-highlight |
426 |
@@ -451,19 +447,11 @@ |
427 |
cd "${S}" |
428 |
fi |
429 |
|
430 |
- # remote-helpers |
431 |
- if use python ; then |
432 |
- python_scriptinto /usr/libexec/git-core/ |
433 |
- python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg} |
434 |
- python_optimize |
435 |
- fi |
436 |
- |
437 |
dodir /usr/share/${PN}/contrib |
438 |
# The following are excluded: |
439 |
# completion - installed above |
440 |
# credential/gnome-keyring TODO |
441 |
# diff-highlight - done above |
442 |
- # diffall - done above |
443 |
# emacs - installed above |
444 |
# examples - these are stuff that is not used in Git anymore actually |
445 |
# git-jump - done above |
446 |
@@ -478,7 +466,7 @@ |
447 |
for i in \ |
448 |
buildsystems convert-objects fast-import \ |
449 |
hg-to-git hooks remotes2config.sh rerere-train.sh \ |
450 |
- stats vim workdir \ |
451 |
+ stats workdir \ |
452 |
; do |
453 |
cp -rf \ |
454 |
"${S}"/contrib/${i} \ |
455 |
@@ -634,8 +622,8 @@ |
456 |
pkg_postinst() { |
457 |
use emacs && elisp-site-regen |
458 |
einfo "Please read /usr/share/bash-completion/git for Git bash command completion" |
459 |
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt" |
460 |
- einfo "Note that the prompt bash code is now in the seperate script" |
461 |
+ einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" |
462 |
+ einfo "Note that the prompt bash code is now in that separate script" |
463 |
elog "These additional scripts need some dependencies:" |
464 |
echo |
465 |
showpkgdeps git-quiltimport "dev-util/quilt" |
466 |
|
467 |
|
468 |
|
469 |
1.61 dev-vcs/git/git-9999.ebuild |
470 |
|
471 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.61&view=markup |
472 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?rev=1.61&content-type=text/plain |
473 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/git-9999.ebuild?r1=1.60&r2=1.61 |
474 |
|
475 |
Index: git-9999.ebuild |
476 |
=================================================================== |
477 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v |
478 |
retrieving revision 1.60 |
479 |
retrieving revision 1.61 |
480 |
diff -u -r1.60 -r1.61 |
481 |
--- git-9999.ebuild 24 Aug 2014 13:56:32 -0000 1.60 |
482 |
+++ git-9999.ebuild 30 Aug 2014 08:59:38 -0000 1.61 |
483 |
@@ -1,6 +1,6 @@ |
484 |
# Copyright 1999-2014 Gentoo Foundation |
485 |
# Distributed under the terms of the GNU General Public License v2 |
486 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.60 2014/08/24 13:56:32 slyfox Exp $ |
487 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.61 2014/08/30 08:59:38 polynomial-c Exp $ |
488 |
|
489 |
EAPI=5 |
490 |
|
491 |
@@ -22,7 +22,7 @@ |
492 |
DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" |
493 |
HOMEPAGE="http://www.git-scm.com/" |
494 |
if [[ ${PV} != *9999 ]]; then |
495 |
- SRC_URI_SUFFIX="gz" |
496 |
+ SRC_URI_SUFFIX="xz" |
497 |
SRC_URI_GOOG="http://git-core.googlecode.com/files" |
498 |
SRC_URI_KORG="mirror://kernel/software/scm/git" |
499 |
SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} |
500 |
@@ -33,7 +33,7 @@ |
501 |
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
502 |
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
503 |
)" |
504 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
505 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
506 |
else |
507 |
SRC_URI="" |
508 |
KEYWORDS="" |
509 |
@@ -225,7 +225,7 @@ |
510 |
|
511 |
src_prepare() { |
512 |
# bug #350330 - automagic CVS when we don't want it is bad. |
513 |
- epatch "${FILESDIR}"/git-1.9.0_rc3-optional-cvs.patch |
514 |
+ epatch "${FILESDIR}"/git-2.0.0-r2-optional-cvs.patch |
515 |
|
516 |
# install mediawiki perl modules also in vendor_dir |
517 |
# hack, needs better upstream solution |
518 |
@@ -420,10 +420,6 @@ |
519 |
cd "${S}" |
520 |
fi |
521 |
|
522 |
- # git-diffall |
523 |
- dobin contrib/diffall/git-diffall |
524 |
- newdoc contrib/diffall/README git-diffall.txt |
525 |
- |
526 |
# diff-highlight |
527 |
dobin contrib/diff-highlight/diff-highlight |
528 |
newdoc contrib/diff-highlight/README README.diff-highlight |
529 |
@@ -451,19 +447,11 @@ |
530 |
cd "${S}" |
531 |
fi |
532 |
|
533 |
- # remote-helpers |
534 |
- if use python ; then |
535 |
- python_scriptinto /usr/libexec/git-core/ |
536 |
- python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg} |
537 |
- python_optimize |
538 |
- fi |
539 |
- |
540 |
dodir /usr/share/${PN}/contrib |
541 |
# The following are excluded: |
542 |
# completion - installed above |
543 |
# credential/gnome-keyring TODO |
544 |
# diff-highlight - done above |
545 |
- # diffall - done above |
546 |
# emacs - installed above |
547 |
# examples - these are stuff that is not used in Git anymore actually |
548 |
# git-jump - done above |
549 |
@@ -478,7 +466,7 @@ |
550 |
for i in \ |
551 |
buildsystems convert-objects fast-import \ |
552 |
hg-to-git hooks remotes2config.sh rerere-train.sh \ |
553 |
- stats vim workdir \ |
554 |
+ stats workdir \ |
555 |
; do |
556 |
cp -rf \ |
557 |
"${S}"/contrib/${i} \ |
558 |
@@ -634,8 +622,8 @@ |
559 |
pkg_postinst() { |
560 |
use emacs && elisp-site-regen |
561 |
einfo "Please read /usr/share/bash-completion/git for Git bash command completion" |
562 |
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt" |
563 |
- einfo "Note that the prompt bash code is now in the seperate script" |
564 |
+ einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" |
565 |
+ einfo "Note that the prompt bash code is now in that separate script" |
566 |
elog "These additional scripts need some dependencies:" |
567 |
echo |
568 |
showpkgdeps git-quiltimport "dev-util/quilt" |