| 1 |
commit: 486a1bae24f6cfbaf73b2c1930e6b67b5576414c |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 6 00:10:57 2017 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 6 00:12:17 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=486a1bae |
| 7 |
|
| 8 |
dev-vcs/git: sync 9999 builds to latest release. |
| 9 |
|
| 10 |
dev-vcs/git/git-9999-r1.ebuild | 6 +++++- |
| 11 |
dev-vcs/git/git-9999-r2.ebuild | 6 +++++- |
| 12 |
dev-vcs/git/git-9999-r3.ebuild | 6 +++++- |
| 13 |
dev-vcs/git/git-9999.ebuild | 6 +++++- |
| 14 |
4 files changed, 20 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild |
| 17 |
index 73c3a63eff5..e61e4dbc350 100644 |
| 18 |
--- a/dev-vcs/git/git-9999-r1.ebuild |
| 19 |
+++ b/dev-vcs/git/git-9999-r1.ebuild |
| 20 |
@@ -37,7 +37,8 @@ if [[ ${PV} != *9999 ]]; then |
| 21 |
doc? ( |
| 22 |
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 23 |
)" |
| 24 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 25 |
+ [[ "${PV}" = *_rc* ]] || \ |
| 26 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 27 |
fi |
| 28 |
|
| 29 |
LICENSE="GPL-2" |
| 30 |
@@ -367,6 +368,9 @@ src_compile() { |
| 31 |
git_emake |
| 32 |
use doc && git_emake doc |
| 33 |
|
| 34 |
+ cd "${S}"/contrib/diff-highlight || die |
| 35 |
+ git_emake |
| 36 |
+ |
| 37 |
if use mediawiki ; then |
| 38 |
cd "${S}"/contrib/mw-to-git |
| 39 |
git_emake |
| 40 |
|
| 41 |
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild |
| 42 |
index 269086404b3..7c6c767ea6e 100644 |
| 43 |
--- a/dev-vcs/git/git-9999-r2.ebuild |
| 44 |
+++ b/dev-vcs/git/git-9999-r2.ebuild |
| 45 |
@@ -37,7 +37,8 @@ if [[ ${PV} != *9999 ]]; then |
| 46 |
doc? ( |
| 47 |
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 48 |
)" |
| 49 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 50 |
+ [[ "${PV}" = *_rc* ]] || \ |
| 51 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 52 |
fi |
| 53 |
|
| 54 |
LICENSE="GPL-2" |
| 55 |
@@ -367,6 +368,9 @@ src_compile() { |
| 56 |
git_emake |
| 57 |
use doc && git_emake doc |
| 58 |
|
| 59 |
+ cd "${S}"/contrib/diff-highlight || die |
| 60 |
+ git_emake |
| 61 |
+ |
| 62 |
if use mediawiki ; then |
| 63 |
cd "${S}"/contrib/mw-to-git |
| 64 |
git_emake |
| 65 |
|
| 66 |
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild |
| 67 |
index 1d514565254..f2270d9140f 100644 |
| 68 |
--- a/dev-vcs/git/git-9999-r3.ebuild |
| 69 |
+++ b/dev-vcs/git/git-9999-r3.ebuild |
| 70 |
@@ -37,7 +37,8 @@ if [[ ${PV} != *9999 ]]; then |
| 71 |
doc? ( |
| 72 |
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 73 |
)" |
| 74 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 75 |
+ [[ "${PV}" = *_rc* ]] || \ |
| 76 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 77 |
fi |
| 78 |
|
| 79 |
LICENSE="GPL-2" |
| 80 |
@@ -367,6 +368,9 @@ src_compile() { |
| 81 |
git_emake |
| 82 |
use doc && git_emake doc |
| 83 |
|
| 84 |
+ cd "${S}"/contrib/diff-highlight || die |
| 85 |
+ git_emake |
| 86 |
+ |
| 87 |
if use mediawiki ; then |
| 88 |
cd "${S}"/contrib/mw-to-git |
| 89 |
git_emake |
| 90 |
|
| 91 |
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild |
| 92 |
index 1d2603cd749..1c670f22bcd 100644 |
| 93 |
--- a/dev-vcs/git/git-9999.ebuild |
| 94 |
+++ b/dev-vcs/git/git-9999.ebuild |
| 95 |
@@ -37,7 +37,8 @@ if [[ ${PV} != *9999 ]]; then |
| 96 |
doc? ( |
| 97 |
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} |
| 98 |
)" |
| 99 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 100 |
+ [[ "${PV}" = *_rc* ]] || \ |
| 101 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 102 |
fi |
| 103 |
|
| 104 |
LICENSE="GPL-2" |
| 105 |
@@ -367,6 +368,9 @@ src_compile() { |
| 106 |
git_emake |
| 107 |
use doc && git_emake doc |
| 108 |
|
| 109 |
+ cd "${S}"/contrib/diff-highlight || die |
| 110 |
+ git_emake |
| 111 |
+ |
| 112 |
if use mediawiki ; then |
| 113 |
cd "${S}"/contrib/mw-to-git |
| 114 |
git_emake |
Archives