Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/
Date: Sat, 05 Nov 2016 23:46:04
Message-Id: 1478389531.2a10ad53d08011f6a09488f3355782a8d3edd1d0.robbat2@gentoo
1 commit: 2a10ad53d08011f6a09488f3355782a8d3edd1d0
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 5 23:45:31 2016 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 5 23:45:31 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a10ad53
7
8 dev-vcs/git: drop remaining googlecode mirrors, bump livevcs patches
9
10 Package-Manager: portage-2.3.2
11
12 dev-vcs/git/git-2.10.1.ebuild | 8 ++------
13 dev-vcs/git/git-2.10.2.ebuild | 8 ++------
14 dev-vcs/git/git-2.4.11.ebuild | 6 +-----
15 dev-vcs/git/git-2.5.5.ebuild | 6 +-----
16 dev-vcs/git/git-2.6.6.ebuild | 6 +-----
17 dev-vcs/git/git-2.7.3-r1.ebuild | 6 +-----
18 dev-vcs/git/git-2.7.4.ebuild | 6 +-----
19 dev-vcs/git/git-2.8.4.ebuild | 8 ++------
20 dev-vcs/git/git-2.9.3.ebuild | 8 ++------
21 dev-vcs/git/git-9999-r1.ebuild | 8 ++------
22 dev-vcs/git/git-9999-r2.ebuild | 8 ++------
23 dev-vcs/git/git-9999-r3.ebuild | 8 ++------
24 dev-vcs/git/git-9999.ebuild | 8 ++------
25 13 files changed, 21 insertions(+), 73 deletions(-)
26
27 diff --git a/dev-vcs/git/git-2.10.1.ebuild b/dev-vcs/git/git-2.10.1.ebuild
28 index 2d9fd8a..da2cc39 100644
29 --- a/dev-vcs/git/git-2.10.1.ebuild
30 +++ b/dev-vcs/git/git-2.10.1.ebuild
31 @@ -17,7 +17,7 @@ PYTHON_COMPAT=( python2_7 )
32 # 9999-r2: next
33 # 9999-r3: pu
34 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
35 -EGIT_BRANCH=pu
36 +EGIT_BRANCH=maint
37 PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
38
39 inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
40 @@ -31,15 +31,11 @@ DESCRIPTION="stupid content tracker: distributed VCS designed for speed and effi
41 HOMEPAGE="http://www.git-scm.com/"
42 if [[ ${PV} != *9999 ]]; then
43 SRC_URI_SUFFIX="xz"
44 - SRC_URI_GOOG="https://git-core.googlecode.com/files"
45 SRC_URI_KORG="mirror://kernel/software/scm/git"
46 - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
47 - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
48 - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
49 + SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
50 ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
51 doc? (
52 ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
53 - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
54 )"
55 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"
56 fi
57
58 diff --git a/dev-vcs/git/git-2.10.2.ebuild b/dev-vcs/git/git-2.10.2.ebuild
59 index 2d9fd8a..da2cc39 100644
60 --- a/dev-vcs/git/git-2.10.2.ebuild
61 +++ b/dev-vcs/git/git-2.10.2.ebuild
62 @@ -17,7 +17,7 @@ PYTHON_COMPAT=( python2_7 )
63 # 9999-r2: next
64 # 9999-r3: pu
65 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
66 -EGIT_BRANCH=pu
67 +EGIT_BRANCH=maint
68 PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
69
70 inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
71 @@ -31,15 +31,11 @@ DESCRIPTION="stupid content tracker: distributed VCS designed for speed and effi
72 HOMEPAGE="http://www.git-scm.com/"
73 if [[ ${PV} != *9999 ]]; then
74 SRC_URI_SUFFIX="xz"
75 - SRC_URI_GOOG="https://git-core.googlecode.com/files"
76 SRC_URI_KORG="mirror://kernel/software/scm/git"
77 - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
78 - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
79 - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
80 + SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
81 ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
82 doc? (
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 ~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"
87 fi
88
89 diff --git a/dev-vcs/git/git-2.4.11.ebuild b/dev-vcs/git/git-2.4.11.ebuild
90 index d91b9bb..4d1adaf 100644
91 --- a/dev-vcs/git/git-2.4.11.ebuild
92 +++ b/dev-vcs/git/git-2.4.11.ebuild
93 @@ -23,15 +23,11 @@ DESCRIPTION="stupid content tracker: distributed VCS designed for speed and effi
94 HOMEPAGE="http://www.git-scm.com/"
95 if [[ ${PV} != *9999 ]]; then
96 SRC_URI_SUFFIX="xz"
97 - SRC_URI_GOOG="https://git-core.googlecode.com/files"
98 SRC_URI_KORG="mirror://kernel/software/scm/git"
99 - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
100 - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
101 - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
102 + SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
103 ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
104 doc? (
105 ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
106 - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
107 )"
108 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"
109 fi
110
111 diff --git a/dev-vcs/git/git-2.5.5.ebuild b/dev-vcs/git/git-2.5.5.ebuild
112 index 13d350c..0ddf8e8 100644
113 --- a/dev-vcs/git/git-2.5.5.ebuild
114 +++ b/dev-vcs/git/git-2.5.5.ebuild
115 @@ -23,15 +23,11 @@ DESCRIPTION="stupid content tracker: distributed VCS designed for speed and effi
116 HOMEPAGE="http://www.git-scm.com/"
117 if [[ ${PV} != *9999 ]]; then
118 SRC_URI_SUFFIX="xz"
119 - SRC_URI_GOOG="https://git-core.googlecode.com/files"
120 SRC_URI_KORG="mirror://kernel/software/scm/git"
121 - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
122 - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
123 - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
124 + SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
125 ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
126 doc? (
127 ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
128 - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
129 )"
130 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"
131 fi
132
133 diff --git a/dev-vcs/git/git-2.6.6.ebuild b/dev-vcs/git/git-2.6.6.ebuild
134 index 13d350c..0ddf8e8 100644
135 --- a/dev-vcs/git/git-2.6.6.ebuild
136 +++ b/dev-vcs/git/git-2.6.6.ebuild
137 @@ -23,15 +23,11 @@ DESCRIPTION="stupid content tracker: distributed VCS designed for speed and effi
138 HOMEPAGE="http://www.git-scm.com/"
139 if [[ ${PV} != *9999 ]]; then
140 SRC_URI_SUFFIX="xz"
141 - SRC_URI_GOOG="https://git-core.googlecode.com/files"
142 SRC_URI_KORG="mirror://kernel/software/scm/git"
143 - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
144 - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
145 - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
146 + SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
147 ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
148 doc? (
149 ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
150 - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
151 )"
152 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"
153 fi
154
155 diff --git a/dev-vcs/git/git-2.7.3-r1.ebuild b/dev-vcs/git/git-2.7.3-r1.ebuild
156 index df361e4..0da2067 100644
157 --- a/dev-vcs/git/git-2.7.3-r1.ebuild
158 +++ b/dev-vcs/git/git-2.7.3-r1.ebuild
159 @@ -23,16 +23,12 @@ DESCRIPTION="stupid content tracker: distributed VCS designed for speed and effi
160 HOMEPAGE="http://www.git-scm.com/"
161 if [[ ${PV} != *9999 ]]; then
162 SRC_URI_SUFFIX="xz"
163 - SRC_URI_GOOG="https://git-core.googlecode.com/files"
164 SRC_URI_KORG="mirror://kernel/software/scm/git"
165 - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
166 - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
167 - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
168 + SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
169 ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
170 https://dev.gentoo.org/~robbat2/distfiles/git-2.7.3-00-9831e92bfa833ee9c0ce464bbc2f941ae6c2698d-lose-name-path.patch
171 doc? (
172 ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
173 - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
174 )"
175 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"
176 fi
177
178 diff --git a/dev-vcs/git/git-2.7.4.ebuild b/dev-vcs/git/git-2.7.4.ebuild
179 index 2f6bdeb..bca2787 100644
180 --- a/dev-vcs/git/git-2.7.4.ebuild
181 +++ b/dev-vcs/git/git-2.7.4.ebuild
182 @@ -24,15 +24,11 @@ DESCRIPTION="stupid content tracker: distributed VCS designed for speed and effi
183 HOMEPAGE="http://www.git-scm.com/"
184 if [[ ${PV} != *9999 ]]; then
185 SRC_URI_SUFFIX="xz"
186 - SRC_URI_GOOG="https://git-core.googlecode.com/files"
187 SRC_URI_KORG="mirror://kernel/software/scm/git"
188 - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
189 - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
190 - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
191 + SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
192 ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
193 doc? (
194 ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
195 - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
196 )"
197 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"
198 fi
199
200 diff --git a/dev-vcs/git/git-2.8.4.ebuild b/dev-vcs/git/git-2.8.4.ebuild
201 index 95d95e7..ee440a3 100644
202 --- a/dev-vcs/git/git-2.8.4.ebuild
203 +++ b/dev-vcs/git/git-2.8.4.ebuild
204 @@ -17,7 +17,7 @@ PYTHON_COMPAT=( python2_7 )
205 # 9999-r2: next
206 # 9999-r3: pu
207 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
208 -EGIT_BRANCH=pu
209 +EGIT_BRANCH=maint
210 PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
211
212 inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
213 @@ -31,15 +31,11 @@ DESCRIPTION="stupid content tracker: distributed VCS designed for speed and effi
214 HOMEPAGE="http://www.git-scm.com/"
215 if [[ ${PV} != *9999 ]]; then
216 SRC_URI_SUFFIX="xz"
217 - SRC_URI_GOOG="https://git-core.googlecode.com/files"
218 SRC_URI_KORG="mirror://kernel/software/scm/git"
219 - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
220 - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
221 - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
222 + SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
223 ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
224 doc? (
225 ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
226 - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
227 )"
228 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"
229 fi
230
231 diff --git a/dev-vcs/git/git-2.9.3.ebuild b/dev-vcs/git/git-2.9.3.ebuild
232 index 95d95e7..ee440a3 100644
233 --- a/dev-vcs/git/git-2.9.3.ebuild
234 +++ b/dev-vcs/git/git-2.9.3.ebuild
235 @@ -17,7 +17,7 @@ PYTHON_COMPAT=( python2_7 )
236 # 9999-r2: next
237 # 9999-r3: pu
238 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
239 -EGIT_BRANCH=pu
240 +EGIT_BRANCH=maint
241 PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
242
243 inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
244 @@ -31,15 +31,11 @@ DESCRIPTION="stupid content tracker: distributed VCS designed for speed and effi
245 HOMEPAGE="http://www.git-scm.com/"
246 if [[ ${PV} != *9999 ]]; then
247 SRC_URI_SUFFIX="xz"
248 - SRC_URI_GOOG="https://git-core.googlecode.com/files"
249 SRC_URI_KORG="mirror://kernel/software/scm/git"
250 - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
251 - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
252 - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
253 + SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
254 ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
255 doc? (
256 ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
257 - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
258 )"
259 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"
260 fi
261
262 diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
263 index 18a9ee9..f14b54e 100644
264 --- a/dev-vcs/git/git-9999-r1.ebuild
265 +++ b/dev-vcs/git/git-9999-r1.ebuild
266 @@ -31,15 +31,11 @@ DESCRIPTION="stupid content tracker: distributed VCS designed for speed and effi
267 HOMEPAGE="http://www.git-scm.com/"
268 if [[ ${PV} != *9999 ]]; then
269 SRC_URI_SUFFIX="xz"
270 - SRC_URI_GOOG="https://git-core.googlecode.com/files"
271 SRC_URI_KORG="mirror://kernel/software/scm/git"
272 - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
273 - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
274 - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
275 + SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
276 ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
277 doc? (
278 ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
279 - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
280 )"
281 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"
282 fi
283 @@ -120,7 +116,7 @@ REQUIRED_USE="
284
285 PATCHES=(
286 # bug #350330 - automagic CVS when we don't want it is bad.
287 - "${FILESDIR}"/git-2.8.4-optional-cvs.patch
288 + "${FILESDIR}"/git-2.10.0-optional-cvs.patch
289
290 # install mediawiki perl modules also in vendor_dir
291 # hack, needs better upstream solution
292
293 diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
294 index e28e6c6..b1d27c2 100644
295 --- a/dev-vcs/git/git-9999-r2.ebuild
296 +++ b/dev-vcs/git/git-9999-r2.ebuild
297 @@ -31,15 +31,11 @@ DESCRIPTION="stupid content tracker: distributed VCS designed for speed and effi
298 HOMEPAGE="http://www.git-scm.com/"
299 if [[ ${PV} != *9999 ]]; then
300 SRC_URI_SUFFIX="xz"
301 - SRC_URI_GOOG="https://git-core.googlecode.com/files"
302 SRC_URI_KORG="mirror://kernel/software/scm/git"
303 - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
304 - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
305 - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
306 + SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
307 ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
308 doc? (
309 ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
310 - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
311 )"
312 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"
313 fi
314 @@ -120,7 +116,7 @@ REQUIRED_USE="
315
316 PATCHES=(
317 # bug #350330 - automagic CVS when we don't want it is bad.
318 - "${FILESDIR}"/git-2.8.4-optional-cvs.patch
319 + "${FILESDIR}"/git-2.10.0-optional-cvs.patch
320
321 # install mediawiki perl modules also in vendor_dir
322 # hack, needs better upstream solution
323
324 diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
325 index 95d95e7..28b544f 100644
326 --- a/dev-vcs/git/git-9999-r3.ebuild
327 +++ b/dev-vcs/git/git-9999-r3.ebuild
328 @@ -31,15 +31,11 @@ DESCRIPTION="stupid content tracker: distributed VCS designed for speed and effi
329 HOMEPAGE="http://www.git-scm.com/"
330 if [[ ${PV} != *9999 ]]; then
331 SRC_URI_SUFFIX="xz"
332 - SRC_URI_GOOG="https://git-core.googlecode.com/files"
333 SRC_URI_KORG="mirror://kernel/software/scm/git"
334 - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
335 - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
336 - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
337 + SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
338 ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
339 doc? (
340 ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
341 - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
342 )"
343 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"
344 fi
345 @@ -120,7 +116,7 @@ REQUIRED_USE="
346
347 PATCHES=(
348 # bug #350330 - automagic CVS when we don't want it is bad.
349 - "${FILESDIR}"/git-2.8.4-optional-cvs.patch
350 + "${FILESDIR}"/git-2.10.0-optional-cvs.patch
351
352 # install mediawiki perl modules also in vendor_dir
353 # hack, needs better upstream solution
354
355 diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
356 index 792b633..da2cc39 100644
357 --- a/dev-vcs/git/git-9999.ebuild
358 +++ b/dev-vcs/git/git-9999.ebuild
359 @@ -31,15 +31,11 @@ DESCRIPTION="stupid content tracker: distributed VCS designed for speed and effi
360 HOMEPAGE="http://www.git-scm.com/"
361 if [[ ${PV} != *9999 ]]; then
362 SRC_URI_SUFFIX="xz"
363 - SRC_URI_GOOG="https://git-core.googlecode.com/files"
364 SRC_URI_KORG="mirror://kernel/software/scm/git"
365 - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
366 - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
367 - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
368 + SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
369 ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
370 doc? (
371 ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
372 - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
373 )"
374 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"
375 fi
376 @@ -120,7 +116,7 @@ REQUIRED_USE="
377
378 PATCHES=(
379 # bug #350330 - automagic CVS when we don't want it is bad.
380 - "${FILESDIR}"/git-2.8.4-optional-cvs.patch
381 + "${FILESDIR}"/git-2.10.0-optional-cvs.patch
382
383 # install mediawiki perl modules also in vendor_dir
384 # hack, needs better upstream solution