| 1 |
commit: b0d9a9ca86b69e29e3ad65e9df1c18e1123b3ea2 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 20 08:09:15 2019 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 20 08:10:00 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0d9a9ca |
| 7 |
|
| 8 |
dev-util/ccache: restore latest stable 3.6, bug #690240 |
| 9 |
|
| 10 |
In commit 4bf8abe7ba2394ba15de2f45ad541b49b8ced688 I removed |
| 11 |
a few old versions. I deleted 3.6 instead of intended 3.5.x. |
| 12 |
|
| 13 |
The change restore 3.6 and deletes 3.5.x. |
| 14 |
|
| 15 |
Reported-by: Matthew Thode |
| 16 |
Bug: https://bugs.gentoo.org/690240 |
| 17 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
| 18 |
RepoMan-Options: --force |
| 19 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 20 |
|
| 21 |
dev-util/ccache/Manifest | 2 +- |
| 22 |
dev-util/ccache/{ccache-3.5.1a.ebuild => ccache-3.6.ebuild} | 9 ++++----- |
| 23 |
2 files changed, 5 insertions(+), 6 deletions(-) |
| 24 |
|
| 25 |
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest |
| 26 |
index 7a6315db02a..043c9706b7b 100644 |
| 27 |
--- a/dev-util/ccache/Manifest |
| 28 |
+++ b/dev-util/ccache/Manifest |
| 29 |
@@ -1,4 +1,4 @@ |
| 30 |
DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d09045cbb54ec54cc3b65b8ce6416b6eb46fae0cf5d60f766129cef11eb01410b522318c67416fdf47f6e8fceae66 SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c |
| 31 |
-DIST ccache-3.5.1a.tar.xz 335888 BLAKE2B 66c044b39dd42c91327e02528a4d6c917ac012c2d08190f7dbc2029ed6d1525aa3a6262fb7528f1721cec510306baa59b498a5afbcf955bb6aaf13594c00d178 SHA512 8a2e9eb06ba21fcf92084afd94fc221168693de545e0448f4da2098bef2bcbfdb017117c325b0bab4931b9e346dd8c1a9d1ebaed0cdc36496d9452985cdd1b43 |
| 32 |
+DIST ccache-3.6.tar.xz 340608 BLAKE2B fa92180f53612f84b71c68da4acccefee129e5bfc9b269caa45a9c16219ed835ccf034d61ff938a54f3673fa23410d960475cc37cf5d27d7be641e7518a43f0a SHA512 13ce4c9084983ce77617cf005235987715cd6b630dac13a17cb9badce24aab71bff505e63da4206878e32d337cc674f05fbf78540711ec5b33a0b8384c47fa0d |
| 33 |
DIST ccache-3.7.1.tar.xz 349276 BLAKE2B 4f36ccb378b614668777d8be32dd343a0e59e36885a845ba004082f7ca0f69a5e4d01ed08af445c33bff218d33ad0385ed6ade383c06da20e3d0271b2f7423dd SHA512 c2f369c861998f82600272deedc436840af7f85baa355a1e119dacea8f41275d601a0805c3e2a8bc434df621a4e52647bd8654a71c2329542a8b160f7f179cdf |
| 34 |
DIST ccache-3.7.2.tar.xz 351168 BLAKE2B 6e5c8847f961bd5aa2cf325e582ece9e8bfb9c015fe3dcb01c8ca1e1834fdfb82a351ec49e203721486817df58c6aebf28e0af011f470fb739d5016f72191654 SHA512 3290f0609c27a2f063e632392be01ef163273115700f87a6d2954fcfd52fcc14bf66fc147ecbd2b692258317e113bf8be9f7efdf377560e2e8d9dd67cef58147 |
| 35 |
|
| 36 |
diff --git a/dev-util/ccache/ccache-3.5.1a.ebuild b/dev-util/ccache/ccache-3.6.ebuild |
| 37 |
similarity index 85% |
| 38 |
rename from dev-util/ccache/ccache-3.5.1a.ebuild |
| 39 |
rename to dev-util/ccache/ccache-3.6.ebuild |
| 40 |
index 7491315da2e..905e13b6111 100644 |
| 41 |
--- a/dev-util/ccache/ccache-3.5.1a.ebuild |
| 42 |
+++ b/dev-util/ccache/ccache-3.6.ebuild |
| 43 |
@@ -11,7 +11,7 @@ SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz" |
| 44 |
|
| 45 |
LICENSE="GPL-3" |
| 46 |
SLOT="0" |
| 47 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" |
| 48 |
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd" |
| 49 |
IUSE="" |
| 50 |
|
| 51 |
DEPEND="app-arch/xz-utils |
| 52 |
@@ -23,10 +23,9 @@ RDEPEND="${DEPEND} |
| 53 |
PATCHES=( |
| 54 |
"${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178 |
| 55 |
"${FILESDIR}"/${PN}-3.5-nvcc-test.patch |
| 56 |
+ "${FILESDIR}"/${PN}-3.6-disable-sized-cleanup.patch #649440 |
| 57 |
) |
| 58 |
|
| 59 |
-S=${WORKDIR}/${P%a} # 3.5.1a->3.5.1, bug #674516 |
| 60 |
- |
| 61 |
src_prepare() { |
| 62 |
default |
| 63 |
|
| 64 |
@@ -55,8 +54,8 @@ src_install() { |
| 65 |
|
| 66 |
DOC_CONTENTS=" |
| 67 |
To use ccache with **non-Portage** C compiling, add |
| 68 |
-${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}/usr/bin. |
| 69 |
-Portage 2.0.46-r11+ will automatically take advantage of ccache with |
| 70 |
+'${EPREFIX}/usr/lib/ccache/bin' to the beginning of your path, before |
| 71 |
+'${EPREFIX}/usr/bin'. Portage will automatically take advantage of ccache with |
| 72 |
no additional steps. If this is your first install of ccache, type |
| 73 |
something like this to set a maximum cache size of 2GB:\\n |
| 74 |
# ccache -M 2G\\n |
Archives