| 1 |
commit: 364d527015bfeca046ddbc055b3740127b098b59 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 8 16:23:49 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 8 16:24:21 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=364d5270 |
| 7 |
|
| 8 |
dev-util/ninja: add new kitware release (1.8.2.g81279) |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/667952 |
| 11 |
Package-Manager: Portage-2.3.50_p14, Repoman-2.3.11_p21 |
| 12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-util/ninja/Manifest | 3 ++- |
| 15 |
dev-util/ninja/ninja-1.8.2-r1.ebuild | 11 ++++++----- |
| 16 |
.../ninja/{ninja-1.8.2-r1.ebuild => ninja-1.8.2-r2.ebuild} | 11 ++++++----- |
| 17 |
3 files changed, 14 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest |
| 20 |
index 15be30523ae..400f6e8bd92 100644 |
| 21 |
--- a/dev-util/ninja/Manifest |
| 22 |
+++ b/dev-util/ninja/Manifest |
| 23 |
@@ -1,3 +1,4 @@ |
| 24 |
DIST ninja-1.7.2.tar.gz 180611 BLAKE2B 9e0b5faaed9dd0c01b3cb22e5927668e985f897c4a448871b3147d4383d562b91f4e4fe304cb61a31d5ee096b58f0c4e4a7c1907ed9637658faa1eafb31cdd72 SHA512 29900d07364d87ad8b9614b82bc1b0afda5ca6522563ab73fb228f206ed6b29b70cf034a3caf5a9b2c0b105d1e076c6b425d93b5d14aa3ca3730d75611212a64 |
| 25 |
-DIST ninja-1.8.2-fortran.tar.gz 203848 BLAKE2B a6002abcfe4003dd5c9ccb8fd504b98736a6bc249323ca7afabc042a5091b9e7f0c0c19853cd7a270e00b0825ea14a7ba47c1b35d15f725c7b4866de1a79c07a SHA512 74f42181a2a712653450b0ab7ce5ad93b5ec010f4ab8411c732f682be5a6a991a7481ae1649ad70a7b903c45427b1e238b001aef29702f0896a1ae393ee22bec |
| 26 |
+DIST ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz 203848 BLAKE2B a6002abcfe4003dd5c9ccb8fd504b98736a6bc249323ca7afabc042a5091b9e7f0c0c19853cd7a270e00b0825ea14a7ba47c1b35d15f725c7b4866de1a79c07a SHA512 74f42181a2a712653450b0ab7ce5ad93b5ec010f4ab8411c732f682be5a6a991a7481ae1649ad70a7b903c45427b1e238b001aef29702f0896a1ae393ee22bec |
| 27 |
+DIST ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz 204539 BLAKE2B cee66a5d6ad7fd1254e68cf7be1e97eb796ec3103bdb9e869dc66757a96ce1d6e946018aa048855e70d6a3698ae609f75740809a8e9183057da16769f07e1fa6 SHA512 ae5f9c4c76114cabc4ec06056edccfa4027d514c4ae0f3ab08bbcd3ce2322e9ff08b8f90fe69fab989707adb6ecc78f226b65e223b41535aa5c0db5b6c61117a |
| 28 |
DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2 |
| 29 |
|
| 30 |
diff --git a/dev-util/ninja/ninja-1.8.2-r1.ebuild b/dev-util/ninja/ninja-1.8.2-r1.ebuild |
| 31 |
index caa2bb8e646..84c7f67ce66 100644 |
| 32 |
--- a/dev-util/ninja/ninja-1.8.2-r1.ebuild |
| 33 |
+++ b/dev-util/ninja/ninja-1.8.2-r1.ebuild |
| 34 |
@@ -1,17 +1,20 @@ |
| 35 |
-# Copyright 1999-2018 Gentoo Foundation |
| 36 |
+# Copyright 1999-2018 Gentoo Authors |
| 37 |
# Distributed under the terms of the GNU General Public License v2 |
| 38 |
|
| 39 |
EAPI=6 |
| 40 |
|
| 41 |
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
| 42 |
|
| 43 |
-inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs vcs-snapshot |
| 44 |
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs |
| 45 |
|
| 46 |
if [[ ${PV} == 9999 ]]; then |
| 47 |
inherit git-r3 |
| 48 |
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" |
| 49 |
else |
| 50 |
- SRC_URI="https://github.com/Kitware/${PN}/archive/v${PV}.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz -> ${P}-fortran.tar.gz" |
| 51 |
+ KITWARE_VERSION="1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1" |
| 52 |
+ MY_P="ninja-${KITWARE_VERSION}" |
| 53 |
+ S="${WORKDIR}/${MY_P}" |
| 54 |
+ SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz" |
| 55 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" |
| 56 |
fi |
| 57 |
|
| 58 |
@@ -44,8 +47,6 @@ RDEPEND=" |
| 59 |
zsh-completion? ( app-shells/zsh ) |
| 60 |
!<net-irc/ninja-1.5.9_pre14-r1" #436804 |
| 61 |
|
| 62 |
-S="${WORKDIR}/${P}-fortran" |
| 63 |
- |
| 64 |
run_for_build() { |
| 65 |
if tc-is-cross-compiler; then |
| 66 |
local -x AR=$(tc-getBUILD_AR) |
| 67 |
|
| 68 |
diff --git a/dev-util/ninja/ninja-1.8.2-r1.ebuild b/dev-util/ninja/ninja-1.8.2-r2.ebuild |
| 69 |
similarity index 90% |
| 70 |
copy from dev-util/ninja/ninja-1.8.2-r1.ebuild |
| 71 |
copy to dev-util/ninja/ninja-1.8.2-r2.ebuild |
| 72 |
index caa2bb8e646..18d8f1000a7 100644 |
| 73 |
--- a/dev-util/ninja/ninja-1.8.2-r1.ebuild |
| 74 |
+++ b/dev-util/ninja/ninja-1.8.2-r2.ebuild |
| 75 |
@@ -1,17 +1,20 @@ |
| 76 |
-# Copyright 1999-2018 Gentoo Foundation |
| 77 |
+# Copyright 1999-2018 Gentoo Authors |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
|
| 80 |
EAPI=6 |
| 81 |
|
| 82 |
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
| 83 |
|
| 84 |
-inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs vcs-snapshot |
| 85 |
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs |
| 86 |
|
| 87 |
if [[ ${PV} == 9999 ]]; then |
| 88 |
inherit git-r3 |
| 89 |
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" |
| 90 |
else |
| 91 |
- SRC_URI="https://github.com/Kitware/${PN}/archive/v${PV}.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz -> ${P}-fortran.tar.gz" |
| 92 |
+ KITWARE_VERSION="1.8.2.g81279.kitware.dyndep-1.jobserver-1" |
| 93 |
+ MY_P="ninja-${KITWARE_VERSION}" |
| 94 |
+ S="${WORKDIR}/${MY_P}" |
| 95 |
+ SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz" |
| 96 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" |
| 97 |
fi |
| 98 |
|
| 99 |
@@ -44,8 +47,6 @@ RDEPEND=" |
| 100 |
zsh-completion? ( app-shells/zsh ) |
| 101 |
!<net-irc/ninja-1.5.9_pre14-r1" #436804 |
| 102 |
|
| 103 |
-S="${WORKDIR}/${P}-fortran" |
| 104 |
- |
| 105 |
run_for_build() { |
| 106 |
if tc-is-cross-compiler; then |
| 107 |
local -x AR=$(tc-getBUILD_AR) |
Archives