Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/
Date: Wed, 13 Oct 2021 06:48:29
Message-Id: 1634107640.f0023341fc9fb9f98f9457d863778ee7386d17a4.polynomial-c@gentoo
1 commit: f0023341fc9fb9f98f9457d863778ee7386d17a4
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 13 06:47:20 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 13 06:47:20 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0023341
7
8 dev-vcs/git: Synced live ebuilds
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11
12 dev-vcs/git/git-9999-r1.ebuild | 10 +++++-----
13 dev-vcs/git/git-9999-r2.ebuild | 10 +++++-----
14 dev-vcs/git/git-9999-r3.ebuild | 6 +++---
15 dev-vcs/git/git-9999.ebuild | 10 +++++-----
16 4 files changed, 18 insertions(+), 18 deletions(-)
17
18 diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
19 index 252c3e3bc1b..6af4b971bc5 100644
20 --- a/dev-vcs/git/git-9999-r1.ebuild
21 +++ b/dev-vcs/git/git-9999-r1.ebuild
22 @@ -1,7 +1,7 @@
23 # Copyright 1999-2021 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 -EAPI=7
27 +EAPI=8
28
29 GENTOO_DEPEND_ON_PERL=no
30
31 @@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
32 ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
33 )"
34 [[ "${PV}" == *_rc* ]] || \
35 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
36 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
37 fi
38
39 LICENSE="GPL-2"
40 @@ -141,7 +141,7 @@ RESTRICT="!test? ( test )"
41
42 PATCHES=(
43 # bug #350330 - automagic CVS when we don't want it is bad.
44 - "${FILESDIR}"/git-2.31.0_rc0-optional-cvs.patch
45 + "${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
46
47 # Make submodule output quiet
48 "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
49 @@ -319,7 +319,7 @@ src_compile() {
50 git_emake gitweb || die "emake gitweb (cgi) failed"
51 fi
52
53 - if [[ ${CHOST} == *-darwin* ]]; then
54 + if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
55 pushd contrib/credential/osxkeychain &>/dev/null || die
56 git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
57 || die "emake credential-osxkeychain"
58 @@ -366,7 +366,7 @@ src_compile() {
59 src_install() {
60 git_emake install || die "make install failed"
61
62 - if [[ ${CHOST} == *-darwin* ]]; then
63 + if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
64 dobin contrib/credential/osxkeychain/git-credential-osxkeychain
65 fi
66
67
68 diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
69 index 252c3e3bc1b..6af4b971bc5 100644
70 --- a/dev-vcs/git/git-9999-r2.ebuild
71 +++ b/dev-vcs/git/git-9999-r2.ebuild
72 @@ -1,7 +1,7 @@
73 # Copyright 1999-2021 Gentoo Authors
74 # Distributed under the terms of the GNU General Public License v2
75
76 -EAPI=7
77 +EAPI=8
78
79 GENTOO_DEPEND_ON_PERL=no
80
81 @@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
82 ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
83 )"
84 [[ "${PV}" == *_rc* ]] || \
85 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
86 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
87 fi
88
89 LICENSE="GPL-2"
90 @@ -141,7 +141,7 @@ RESTRICT="!test? ( test )"
91
92 PATCHES=(
93 # bug #350330 - automagic CVS when we don't want it is bad.
94 - "${FILESDIR}"/git-2.31.0_rc0-optional-cvs.patch
95 + "${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
96
97 # Make submodule output quiet
98 "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
99 @@ -319,7 +319,7 @@ src_compile() {
100 git_emake gitweb || die "emake gitweb (cgi) failed"
101 fi
102
103 - if [[ ${CHOST} == *-darwin* ]]; then
104 + if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
105 pushd contrib/credential/osxkeychain &>/dev/null || die
106 git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
107 || die "emake credential-osxkeychain"
108 @@ -366,7 +366,7 @@ src_compile() {
109 src_install() {
110 git_emake install || die "make install failed"
111
112 - if [[ ${CHOST} == *-darwin* ]]; then
113 + if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
114 dobin contrib/credential/osxkeychain/git-credential-osxkeychain
115 fi
116
117
118 diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
119 index 40a7dede3c1..6af4b971bc5 100644
120 --- a/dev-vcs/git/git-9999-r3.ebuild
121 +++ b/dev-vcs/git/git-9999-r3.ebuild
122 @@ -1,7 +1,7 @@
123 # Copyright 1999-2021 Gentoo Authors
124 # Distributed under the terms of the GNU General Public License v2
125
126 -EAPI=7
127 +EAPI=8
128
129 GENTOO_DEPEND_ON_PERL=no
130
131 @@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
132 ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
133 )"
134 [[ "${PV}" == *_rc* ]] || \
135 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
136 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
137 fi
138
139 LICENSE="GPL-2"
140 @@ -141,7 +141,7 @@ RESTRICT="!test? ( test )"
141
142 PATCHES=(
143 # bug #350330 - automagic CVS when we don't want it is bad.
144 - "${FILESDIR}"/git-2.31.0_rc0-optional-cvs.patch
145 + "${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
146
147 # Make submodule output quiet
148 "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
149
150 diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
151 index 4a1d6a07b90..6af4b971bc5 100644
152 --- a/dev-vcs/git/git-9999.ebuild
153 +++ b/dev-vcs/git/git-9999.ebuild
154 @@ -1,7 +1,7 @@
155 # Copyright 1999-2021 Gentoo Authors
156 # Distributed under the terms of the GNU General Public License v2
157
158 -EAPI=7
159 +EAPI=8
160
161 GENTOO_DEPEND_ON_PERL=no
162
163 @@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
164 ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
165 )"
166 [[ "${PV}" == *_rc* ]] || \
167 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
168 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
169 fi
170
171 LICENSE="GPL-2"
172 @@ -141,7 +141,7 @@ RESTRICT="!test? ( test )"
173
174 PATCHES=(
175 # bug #350330 - automagic CVS when we don't want it is bad.
176 - "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
177 + "${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
178
179 # Make submodule output quiet
180 "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
181 @@ -319,7 +319,7 @@ src_compile() {
182 git_emake gitweb || die "emake gitweb (cgi) failed"
183 fi
184
185 - if [[ ${CHOST} == *-darwin* ]]; then
186 + if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
187 pushd contrib/credential/osxkeychain &>/dev/null || die
188 git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
189 || die "emake credential-osxkeychain"
190 @@ -366,7 +366,7 @@ src_compile() {
191 src_install() {
192 git_emake install || die "make install failed"
193
194 - if [[ ${CHOST} == *-darwin* ]]; then
195 + if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
196 dobin contrib/credential/osxkeychain/git-credential-osxkeychain
197 fi