| 1 |
commit: a83ca7c3fe8c4e0c700386a12066da5c2f8b4107 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 13 01:33:51 2019 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 16 22:58:05 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a83ca7c3 |
| 7 |
|
| 8 |
dev-vcs/git: Replace USE=+python with USE=perforce |
| 9 |
|
| 10 |
Acked by Lars Wendler on IRC. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/692030 |
| 13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-vcs/git/git-2.21.0-r2.ebuild | 12 ++++++------ |
| 16 |
dev-vcs/git/git-2.22.0.ebuild | 12 ++++++------ |
| 17 |
dev-vcs/git/git-2.22.1.ebuild | 12 ++++++------ |
| 18 |
dev-vcs/git/git-2.23.0_rc2.ebuild | 12 ++++++------ |
| 19 |
dev-vcs/git/git-9999-r1.ebuild | 12 ++++++------ |
| 20 |
dev-vcs/git/git-9999-r2.ebuild | 12 ++++++------ |
| 21 |
dev-vcs/git/git-9999-r3.ebuild | 12 ++++++------ |
| 22 |
dev-vcs/git/git-9999.ebuild | 10 +++++----- |
| 23 |
dev-vcs/git/metadata.xml | 1 + |
| 24 |
9 files changed, 48 insertions(+), 47 deletions(-) |
| 25 |
|
| 26 |
diff --git a/dev-vcs/git/git-2.21.0-r2.ebuild b/dev-vcs/git/git-2.21.0-r2.ebuild |
| 27 |
index 533c6f7f3ee..ec6edbb41bd 100644 |
| 28 |
--- a/dev-vcs/git/git-2.21.0-r2.ebuild |
| 29 |
+++ b/dev-vcs/git/git-2.21.0-r2.ebuild |
| 30 |
@@ -50,7 +50,7 @@ fi |
| 31 |
|
| 32 |
LICENSE="GPL-2" |
| 33 |
SLOT="0" |
| 34 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 35 |
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 36 |
|
| 37 |
# Common to both DEPEND and RDEPEND |
| 38 |
CDEPEND=" |
| 39 |
@@ -98,7 +98,7 @@ RDEPEND="${CDEPEND} |
| 40 |
dev-perl/TermReadKey |
| 41 |
) |
| 42 |
) |
| 43 |
- python? ( ${PYTHON_DEPS} ) |
| 44 |
+ perforce? ( ${PYTHON_DEPS} ) |
| 45 |
" |
| 46 |
|
| 47 |
# This is how info docs are created with Git: |
| 48 |
@@ -132,7 +132,7 @@ REQUIRED_USE=" |
| 49 |
subversion? ( perl ) |
| 50 |
webdav? ( curl ) |
| 51 |
pcre-jit? ( pcre ) |
| 52 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
| 53 |
+ perforce? ( ${PYTHON_REQUIRED_USE} ) |
| 54 |
" |
| 55 |
|
| 56 |
PATCHES=( |
| 57 |
@@ -151,7 +151,7 @@ pkg_setup() { |
| 58 |
ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
| 59 |
ewarn "have been warned." |
| 60 |
fi |
| 61 |
- if use python ; then |
| 62 |
+ if use perforce ; then |
| 63 |
python-single-r1_pkg_setup |
| 64 |
fi |
| 65 |
} |
| 66 |
@@ -166,7 +166,7 @@ exportmakeopts() { |
| 67 |
$(usex iconv '' NO_ICONV=YesPlease) |
| 68 |
$(usex nls '' NO_GETTEXT=YesPlease) |
| 69 |
$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) |
| 70 |
- $(usex python '' NO_PYTHON=YesPlease) |
| 71 |
+ $(usex perforce '' NO_PYTHON=YesPlease) |
| 72 |
$(usex subversion '' NO_SVN_TESTS=YesPlease) |
| 73 |
$(usex threads '' NO_PTHREAD=YesPlease) |
| 74 |
$(usex tk '' NO_TCLTK=YesPlease) |
| 75 |
@@ -301,7 +301,7 @@ src_prepare() { |
| 76 |
git_emake() { |
| 77 |
# bug #320647: PYTHON_PATH |
| 78 |
local PYTHON_PATH="" |
| 79 |
- use python && PYTHON_PATH="${PYTHON}" |
| 80 |
+ use perforce && PYTHON_PATH="${PYTHON}" |
| 81 |
emake ${MY_MAKEOPTS} \ |
| 82 |
prefix="${EPREFIX}"/usr \ |
| 83 |
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
| 84 |
|
| 85 |
diff --git a/dev-vcs/git/git-2.22.0.ebuild b/dev-vcs/git/git-2.22.0.ebuild |
| 86 |
index d691700475c..f3b738828c1 100644 |
| 87 |
--- a/dev-vcs/git/git-2.22.0.ebuild |
| 88 |
+++ b/dev-vcs/git/git-2.22.0.ebuild |
| 89 |
@@ -51,7 +51,7 @@ fi |
| 90 |
|
| 91 |
LICENSE="GPL-2" |
| 92 |
SLOT="0" |
| 93 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 94 |
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 95 |
|
| 96 |
# Common to both DEPEND and RDEPEND |
| 97 |
CDEPEND=" |
| 98 |
@@ -99,7 +99,7 @@ RDEPEND="${CDEPEND} |
| 99 |
dev-perl/TermReadKey |
| 100 |
) |
| 101 |
) |
| 102 |
- python? ( ${PYTHON_DEPS} ) |
| 103 |
+ perforce? ( ${PYTHON_DEPS} ) |
| 104 |
" |
| 105 |
|
| 106 |
# This is how info docs are created with Git: |
| 107 |
@@ -133,7 +133,7 @@ REQUIRED_USE=" |
| 108 |
subversion? ( perl ) |
| 109 |
webdav? ( curl ) |
| 110 |
pcre-jit? ( pcre ) |
| 111 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
| 112 |
+ perforce? ( ${PYTHON_REQUIRED_USE} ) |
| 113 |
" |
| 114 |
|
| 115 |
PATCHES=( |
| 116 |
@@ -152,7 +152,7 @@ pkg_setup() { |
| 117 |
ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
| 118 |
ewarn "have been warned." |
| 119 |
fi |
| 120 |
- if use python ; then |
| 121 |
+ if use perforce ; then |
| 122 |
python-single-r1_pkg_setup |
| 123 |
fi |
| 124 |
} |
| 125 |
@@ -167,7 +167,7 @@ exportmakeopts() { |
| 126 |
$(usex iconv '' NO_ICONV=YesPlease) |
| 127 |
$(usex nls '' NO_GETTEXT=YesPlease) |
| 128 |
$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) |
| 129 |
- $(usex python '' NO_PYTHON=YesPlease) |
| 130 |
+ $(usex perforce '' NO_PYTHON=YesPlease) |
| 131 |
$(usex subversion '' NO_SVN_TESTS=YesPlease) |
| 132 |
$(usex threads '' NO_PTHREAD=YesPlease) |
| 133 |
$(usex tk '' NO_TCLTK=YesPlease) |
| 134 |
@@ -302,7 +302,7 @@ src_prepare() { |
| 135 |
git_emake() { |
| 136 |
# bug #320647: PYTHON_PATH |
| 137 |
local PYTHON_PATH="" |
| 138 |
- use python && PYTHON_PATH="${PYTHON}" |
| 139 |
+ use perforce && PYTHON_PATH="${PYTHON}" |
| 140 |
emake ${MY_MAKEOPTS} \ |
| 141 |
prefix="${EPREFIX}"/usr \ |
| 142 |
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
| 143 |
|
| 144 |
diff --git a/dev-vcs/git/git-2.22.1.ebuild b/dev-vcs/git/git-2.22.1.ebuild |
| 145 |
index d691700475c..f3b738828c1 100644 |
| 146 |
--- a/dev-vcs/git/git-2.22.1.ebuild |
| 147 |
+++ b/dev-vcs/git/git-2.22.1.ebuild |
| 148 |
@@ -51,7 +51,7 @@ fi |
| 149 |
|
| 150 |
LICENSE="GPL-2" |
| 151 |
SLOT="0" |
| 152 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 153 |
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 154 |
|
| 155 |
# Common to both DEPEND and RDEPEND |
| 156 |
CDEPEND=" |
| 157 |
@@ -99,7 +99,7 @@ RDEPEND="${CDEPEND} |
| 158 |
dev-perl/TermReadKey |
| 159 |
) |
| 160 |
) |
| 161 |
- python? ( ${PYTHON_DEPS} ) |
| 162 |
+ perforce? ( ${PYTHON_DEPS} ) |
| 163 |
" |
| 164 |
|
| 165 |
# This is how info docs are created with Git: |
| 166 |
@@ -133,7 +133,7 @@ REQUIRED_USE=" |
| 167 |
subversion? ( perl ) |
| 168 |
webdav? ( curl ) |
| 169 |
pcre-jit? ( pcre ) |
| 170 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
| 171 |
+ perforce? ( ${PYTHON_REQUIRED_USE} ) |
| 172 |
" |
| 173 |
|
| 174 |
PATCHES=( |
| 175 |
@@ -152,7 +152,7 @@ pkg_setup() { |
| 176 |
ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
| 177 |
ewarn "have been warned." |
| 178 |
fi |
| 179 |
- if use python ; then |
| 180 |
+ if use perforce ; then |
| 181 |
python-single-r1_pkg_setup |
| 182 |
fi |
| 183 |
} |
| 184 |
@@ -167,7 +167,7 @@ exportmakeopts() { |
| 185 |
$(usex iconv '' NO_ICONV=YesPlease) |
| 186 |
$(usex nls '' NO_GETTEXT=YesPlease) |
| 187 |
$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) |
| 188 |
- $(usex python '' NO_PYTHON=YesPlease) |
| 189 |
+ $(usex perforce '' NO_PYTHON=YesPlease) |
| 190 |
$(usex subversion '' NO_SVN_TESTS=YesPlease) |
| 191 |
$(usex threads '' NO_PTHREAD=YesPlease) |
| 192 |
$(usex tk '' NO_TCLTK=YesPlease) |
| 193 |
@@ -302,7 +302,7 @@ src_prepare() { |
| 194 |
git_emake() { |
| 195 |
# bug #320647: PYTHON_PATH |
| 196 |
local PYTHON_PATH="" |
| 197 |
- use python && PYTHON_PATH="${PYTHON}" |
| 198 |
+ use perforce && PYTHON_PATH="${PYTHON}" |
| 199 |
emake ${MY_MAKEOPTS} \ |
| 200 |
prefix="${EPREFIX}"/usr \ |
| 201 |
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
| 202 |
|
| 203 |
diff --git a/dev-vcs/git/git-2.23.0_rc2.ebuild b/dev-vcs/git/git-2.23.0_rc2.ebuild |
| 204 |
index d691700475c..f3b738828c1 100644 |
| 205 |
--- a/dev-vcs/git/git-2.23.0_rc2.ebuild |
| 206 |
+++ b/dev-vcs/git/git-2.23.0_rc2.ebuild |
| 207 |
@@ -51,7 +51,7 @@ fi |
| 208 |
|
| 209 |
LICENSE="GPL-2" |
| 210 |
SLOT="0" |
| 211 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 212 |
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 213 |
|
| 214 |
# Common to both DEPEND and RDEPEND |
| 215 |
CDEPEND=" |
| 216 |
@@ -99,7 +99,7 @@ RDEPEND="${CDEPEND} |
| 217 |
dev-perl/TermReadKey |
| 218 |
) |
| 219 |
) |
| 220 |
- python? ( ${PYTHON_DEPS} ) |
| 221 |
+ perforce? ( ${PYTHON_DEPS} ) |
| 222 |
" |
| 223 |
|
| 224 |
# This is how info docs are created with Git: |
| 225 |
@@ -133,7 +133,7 @@ REQUIRED_USE=" |
| 226 |
subversion? ( perl ) |
| 227 |
webdav? ( curl ) |
| 228 |
pcre-jit? ( pcre ) |
| 229 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
| 230 |
+ perforce? ( ${PYTHON_REQUIRED_USE} ) |
| 231 |
" |
| 232 |
|
| 233 |
PATCHES=( |
| 234 |
@@ -152,7 +152,7 @@ pkg_setup() { |
| 235 |
ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
| 236 |
ewarn "have been warned." |
| 237 |
fi |
| 238 |
- if use python ; then |
| 239 |
+ if use perforce ; then |
| 240 |
python-single-r1_pkg_setup |
| 241 |
fi |
| 242 |
} |
| 243 |
@@ -167,7 +167,7 @@ exportmakeopts() { |
| 244 |
$(usex iconv '' NO_ICONV=YesPlease) |
| 245 |
$(usex nls '' NO_GETTEXT=YesPlease) |
| 246 |
$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) |
| 247 |
- $(usex python '' NO_PYTHON=YesPlease) |
| 248 |
+ $(usex perforce '' NO_PYTHON=YesPlease) |
| 249 |
$(usex subversion '' NO_SVN_TESTS=YesPlease) |
| 250 |
$(usex threads '' NO_PTHREAD=YesPlease) |
| 251 |
$(usex tk '' NO_TCLTK=YesPlease) |
| 252 |
@@ -302,7 +302,7 @@ src_prepare() { |
| 253 |
git_emake() { |
| 254 |
# bug #320647: PYTHON_PATH |
| 255 |
local PYTHON_PATH="" |
| 256 |
- use python && PYTHON_PATH="${PYTHON}" |
| 257 |
+ use perforce && PYTHON_PATH="${PYTHON}" |
| 258 |
emake ${MY_MAKEOPTS} \ |
| 259 |
prefix="${EPREFIX}"/usr \ |
| 260 |
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
| 261 |
|
| 262 |
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild |
| 263 |
index d691700475c..f3b738828c1 100644 |
| 264 |
--- a/dev-vcs/git/git-9999-r1.ebuild |
| 265 |
+++ b/dev-vcs/git/git-9999-r1.ebuild |
| 266 |
@@ -51,7 +51,7 @@ fi |
| 267 |
|
| 268 |
LICENSE="GPL-2" |
| 269 |
SLOT="0" |
| 270 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 271 |
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 272 |
|
| 273 |
# Common to both DEPEND and RDEPEND |
| 274 |
CDEPEND=" |
| 275 |
@@ -99,7 +99,7 @@ RDEPEND="${CDEPEND} |
| 276 |
dev-perl/TermReadKey |
| 277 |
) |
| 278 |
) |
| 279 |
- python? ( ${PYTHON_DEPS} ) |
| 280 |
+ perforce? ( ${PYTHON_DEPS} ) |
| 281 |
" |
| 282 |
|
| 283 |
# This is how info docs are created with Git: |
| 284 |
@@ -133,7 +133,7 @@ REQUIRED_USE=" |
| 285 |
subversion? ( perl ) |
| 286 |
webdav? ( curl ) |
| 287 |
pcre-jit? ( pcre ) |
| 288 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
| 289 |
+ perforce? ( ${PYTHON_REQUIRED_USE} ) |
| 290 |
" |
| 291 |
|
| 292 |
PATCHES=( |
| 293 |
@@ -152,7 +152,7 @@ pkg_setup() { |
| 294 |
ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
| 295 |
ewarn "have been warned." |
| 296 |
fi |
| 297 |
- if use python ; then |
| 298 |
+ if use perforce ; then |
| 299 |
python-single-r1_pkg_setup |
| 300 |
fi |
| 301 |
} |
| 302 |
@@ -167,7 +167,7 @@ exportmakeopts() { |
| 303 |
$(usex iconv '' NO_ICONV=YesPlease) |
| 304 |
$(usex nls '' NO_GETTEXT=YesPlease) |
| 305 |
$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) |
| 306 |
- $(usex python '' NO_PYTHON=YesPlease) |
| 307 |
+ $(usex perforce '' NO_PYTHON=YesPlease) |
| 308 |
$(usex subversion '' NO_SVN_TESTS=YesPlease) |
| 309 |
$(usex threads '' NO_PTHREAD=YesPlease) |
| 310 |
$(usex tk '' NO_TCLTK=YesPlease) |
| 311 |
@@ -302,7 +302,7 @@ src_prepare() { |
| 312 |
git_emake() { |
| 313 |
# bug #320647: PYTHON_PATH |
| 314 |
local PYTHON_PATH="" |
| 315 |
- use python && PYTHON_PATH="${PYTHON}" |
| 316 |
+ use perforce && PYTHON_PATH="${PYTHON}" |
| 317 |
emake ${MY_MAKEOPTS} \ |
| 318 |
prefix="${EPREFIX}"/usr \ |
| 319 |
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
| 320 |
|
| 321 |
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild |
| 322 |
index d691700475c..f3b738828c1 100644 |
| 323 |
--- a/dev-vcs/git/git-9999-r2.ebuild |
| 324 |
+++ b/dev-vcs/git/git-9999-r2.ebuild |
| 325 |
@@ -51,7 +51,7 @@ fi |
| 326 |
|
| 327 |
LICENSE="GPL-2" |
| 328 |
SLOT="0" |
| 329 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 330 |
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 331 |
|
| 332 |
# Common to both DEPEND and RDEPEND |
| 333 |
CDEPEND=" |
| 334 |
@@ -99,7 +99,7 @@ RDEPEND="${CDEPEND} |
| 335 |
dev-perl/TermReadKey |
| 336 |
) |
| 337 |
) |
| 338 |
- python? ( ${PYTHON_DEPS} ) |
| 339 |
+ perforce? ( ${PYTHON_DEPS} ) |
| 340 |
" |
| 341 |
|
| 342 |
# This is how info docs are created with Git: |
| 343 |
@@ -133,7 +133,7 @@ REQUIRED_USE=" |
| 344 |
subversion? ( perl ) |
| 345 |
webdav? ( curl ) |
| 346 |
pcre-jit? ( pcre ) |
| 347 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
| 348 |
+ perforce? ( ${PYTHON_REQUIRED_USE} ) |
| 349 |
" |
| 350 |
|
| 351 |
PATCHES=( |
| 352 |
@@ -152,7 +152,7 @@ pkg_setup() { |
| 353 |
ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
| 354 |
ewarn "have been warned." |
| 355 |
fi |
| 356 |
- if use python ; then |
| 357 |
+ if use perforce ; then |
| 358 |
python-single-r1_pkg_setup |
| 359 |
fi |
| 360 |
} |
| 361 |
@@ -167,7 +167,7 @@ exportmakeopts() { |
| 362 |
$(usex iconv '' NO_ICONV=YesPlease) |
| 363 |
$(usex nls '' NO_GETTEXT=YesPlease) |
| 364 |
$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) |
| 365 |
- $(usex python '' NO_PYTHON=YesPlease) |
| 366 |
+ $(usex perforce '' NO_PYTHON=YesPlease) |
| 367 |
$(usex subversion '' NO_SVN_TESTS=YesPlease) |
| 368 |
$(usex threads '' NO_PTHREAD=YesPlease) |
| 369 |
$(usex tk '' NO_TCLTK=YesPlease) |
| 370 |
@@ -302,7 +302,7 @@ src_prepare() { |
| 371 |
git_emake() { |
| 372 |
# bug #320647: PYTHON_PATH |
| 373 |
local PYTHON_PATH="" |
| 374 |
- use python && PYTHON_PATH="${PYTHON}" |
| 375 |
+ use perforce && PYTHON_PATH="${PYTHON}" |
| 376 |
emake ${MY_MAKEOPTS} \ |
| 377 |
prefix="${EPREFIX}"/usr \ |
| 378 |
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
| 379 |
|
| 380 |
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild |
| 381 |
index d691700475c..f3b738828c1 100644 |
| 382 |
--- a/dev-vcs/git/git-9999-r3.ebuild |
| 383 |
+++ b/dev-vcs/git/git-9999-r3.ebuild |
| 384 |
@@ -51,7 +51,7 @@ fi |
| 385 |
|
| 386 |
LICENSE="GPL-2" |
| 387 |
SLOT="0" |
| 388 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 389 |
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 390 |
|
| 391 |
# Common to both DEPEND and RDEPEND |
| 392 |
CDEPEND=" |
| 393 |
@@ -99,7 +99,7 @@ RDEPEND="${CDEPEND} |
| 394 |
dev-perl/TermReadKey |
| 395 |
) |
| 396 |
) |
| 397 |
- python? ( ${PYTHON_DEPS} ) |
| 398 |
+ perforce? ( ${PYTHON_DEPS} ) |
| 399 |
" |
| 400 |
|
| 401 |
# This is how info docs are created with Git: |
| 402 |
@@ -133,7 +133,7 @@ REQUIRED_USE=" |
| 403 |
subversion? ( perl ) |
| 404 |
webdav? ( curl ) |
| 405 |
pcre-jit? ( pcre ) |
| 406 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
| 407 |
+ perforce? ( ${PYTHON_REQUIRED_USE} ) |
| 408 |
" |
| 409 |
|
| 410 |
PATCHES=( |
| 411 |
@@ -152,7 +152,7 @@ pkg_setup() { |
| 412 |
ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
| 413 |
ewarn "have been warned." |
| 414 |
fi |
| 415 |
- if use python ; then |
| 416 |
+ if use perforce ; then |
| 417 |
python-single-r1_pkg_setup |
| 418 |
fi |
| 419 |
} |
| 420 |
@@ -167,7 +167,7 @@ exportmakeopts() { |
| 421 |
$(usex iconv '' NO_ICONV=YesPlease) |
| 422 |
$(usex nls '' NO_GETTEXT=YesPlease) |
| 423 |
$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) |
| 424 |
- $(usex python '' NO_PYTHON=YesPlease) |
| 425 |
+ $(usex perforce '' NO_PYTHON=YesPlease) |
| 426 |
$(usex subversion '' NO_SVN_TESTS=YesPlease) |
| 427 |
$(usex threads '' NO_PTHREAD=YesPlease) |
| 428 |
$(usex tk '' NO_TCLTK=YesPlease) |
| 429 |
@@ -302,7 +302,7 @@ src_prepare() { |
| 430 |
git_emake() { |
| 431 |
# bug #320647: PYTHON_PATH |
| 432 |
local PYTHON_PATH="" |
| 433 |
- use python && PYTHON_PATH="${PYTHON}" |
| 434 |
+ use perforce && PYTHON_PATH="${PYTHON}" |
| 435 |
emake ${MY_MAKEOPTS} \ |
| 436 |
prefix="${EPREFIX}"/usr \ |
| 437 |
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
| 438 |
|
| 439 |
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild |
| 440 |
index ce8ae004896..72cfc9203c0 100644 |
| 441 |
--- a/dev-vcs/git/git-9999.ebuild |
| 442 |
+++ b/dev-vcs/git/git-9999.ebuild |
| 443 |
@@ -51,7 +51,7 @@ fi |
| 444 |
|
| 445 |
LICENSE="GPL-2" |
| 446 |
SLOT="0" |
| 447 |
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 448 |
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" |
| 449 |
|
| 450 |
# Common to both DEPEND and RDEPEND |
| 451 |
CDEPEND=" |
| 452 |
@@ -99,7 +99,7 @@ RDEPEND="${CDEPEND} |
| 453 |
dev-perl/TermReadKey |
| 454 |
) |
| 455 |
) |
| 456 |
- python? ( ${PYTHON_DEPS} ) |
| 457 |
+ perforce? ( ${PYTHON_DEPS} ) |
| 458 |
" |
| 459 |
|
| 460 |
# This is how info docs are created with Git: |
| 461 |
@@ -152,7 +152,7 @@ pkg_setup() { |
| 462 |
ewarn "with USE=dso, there may be weird crashes in git-svn. You" |
| 463 |
ewarn "have been warned." |
| 464 |
fi |
| 465 |
- if use python ; then |
| 466 |
+ if use perforce ; then |
| 467 |
python-single-r1_pkg_setup |
| 468 |
fi |
| 469 |
} |
| 470 |
@@ -167,7 +167,7 @@ exportmakeopts() { |
| 471 |
$(usex iconv '' NO_ICONV=YesPlease) |
| 472 |
$(usex nls '' NO_GETTEXT=YesPlease) |
| 473 |
$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) |
| 474 |
- $(usex python '' NO_PYTHON=YesPlease) |
| 475 |
+ $(usex perforce '' NO_PYTHON=YesPlease) |
| 476 |
$(usex subversion '' NO_SVN_TESTS=YesPlease) |
| 477 |
$(usex threads '' NO_PTHREAD=YesPlease) |
| 478 |
$(usex tk '' NO_TCLTK=YesPlease) |
| 479 |
@@ -302,7 +302,7 @@ src_prepare() { |
| 480 |
git_emake() { |
| 481 |
# bug #320647: PYTHON_PATH |
| 482 |
local PYTHON_PATH="" |
| 483 |
- use python && PYTHON_PATH="${PYTHON}" |
| 484 |
+ use perforce && PYTHON_PATH="${PYTHON}" |
| 485 |
emake ${MY_MAKEOPTS} \ |
| 486 |
prefix="${EPREFIX}"/usr \ |
| 487 |
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
| 488 |
|
| 489 |
diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml |
| 490 |
index f7690883557..53353adb386 100644 |
| 491 |
--- a/dev-vcs/git/metadata.xml |
| 492 |
+++ b/dev-vcs/git/metadata.xml |
| 493 |
@@ -32,6 +32,7 @@ |
| 494 |
<flag name="mediawiki">Support pulling and pushing from MediaWiki</flag> |
| 495 |
<flag name="mediawiki-experimental">Add experimental patches for improved MediaWiki support</flag> |
| 496 |
<flag name="pcre-jit">Enable JIT for pcre</flag> |
| 497 |
+ <flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag> |
| 498 |
<flag name="ppcsha1">Make use of a bundled routine that is optimized for the PPC arch</flag> |
| 499 |
<flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support</flag> |
| 500 |
<flag name="tk">Include the 'gitk' and 'git gui' tools</flag> |
Archives