Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
Date: Fri, 04 Jan 2019 21:13:56
Message-Id: 1546636421.be5c4a9d9cda0adbb1734314bbeadb0ece0eabe6.slyfox@gentoo
1 commit: be5c4a9d9cda0adbb1734314bbeadb0ece0eabe6
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 4 21:12:56 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 4 21:13:41 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be5c4a9d
7
8 dev-util/ccache: bump up to 3.5.1a, bug #674516
9
10 Reported-by: Dan Goodliffe
11 Closes: https://bugs.gentoo.org/674516
12 Package-Manager: Portage-2.3.53, Repoman-2.3.12
13 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
14
15 dev-util/ccache/Manifest | 2 +-
16 .../{ccache-3.5.1.ebuild => ccache-3.5.1a.ebuild} | 3 ++-
17 dev-util/ccache/files/ccache-3.5.1-configure.patch | 19 -------------------
18 3 files changed, 3 insertions(+), 21 deletions(-)
19
20 diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
21 index 84c68dd998d..a317bc0c7bb 100644
22 --- a/dev-util/ccache/Manifest
23 +++ b/dev-util/ccache/Manifest
24 @@ -1,4 +1,4 @@
25 DIST ccache-3.2.4.tar.xz 302548 BLAKE2B 7d642dc3f944183660e79cfdfd68948528aa3ea4ef8162a4d04837c85ccace35107e663ec81a15438dab133fca2e8bf100fecd483f33c9b0aa52c68989ae8122 SHA512 d048b70804c81dece97f3ba511b3c109ec0d14e7dca69bc68faeeb61a4a7b5639c03e3e5ad7dad4e42b4bd198d7a7fffa4e3b7ef99590dfd4df0805db6c25db7
26 DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d09045cbb54ec54cc3b65b8ce6416b6eb46fae0cf5d60f766129cef11eb01410b522318c67416fdf47f6e8fceae66 SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c
27 -DIST ccache-3.5.1.tar.xz 335988 BLAKE2B f9cb8d48b16ebf48a409af6e69f16606e543144781b9988f25f5031dd7c4137709e32f76f6ae8879aef425064e6dce112195849008f2dcc9b6deb39d2726cae5 SHA512 25956ac68f24b3a443d9cf74fe759d9d5946e2f2188d40538a31d383550c6674c22f7e9290ceb71f1ee3987ed8f2802343a5a137b2f68692008ead3a347761af
28 +DIST ccache-3.5.1a.tar.xz 335888 BLAKE2B 66c044b39dd42c91327e02528a4d6c917ac012c2d08190f7dbc2029ed6d1525aa3a6262fb7528f1721cec510306baa59b498a5afbcf955bb6aaf13594c00d178 SHA512 8a2e9eb06ba21fcf92084afd94fc221168693de545e0448f4da2098bef2bcbfdb017117c325b0bab4931b9e346dd8c1a9d1ebaed0cdc36496d9452985cdd1b43
29 DIST ccache-3.5.tar.xz 334668 BLAKE2B e3e2b63e8c4c8074514fb3a5794325fa05a4d52f48fc436ab0ad21b643ca4d1a1502c989cb47ed68972b105d4f1642e4fadc5ecef1235fe2bd3be5d218094a79 SHA512 92181fb794f06dc231baa4193c37e8f1d844c9281fd64bcb8f4b35c87b4a88dfc9bf36b810b37151ee85699778fcd3783818949a7010e619aeca7e3b33b7a2e3
30
31 diff --git a/dev-util/ccache/ccache-3.5.1.ebuild b/dev-util/ccache/ccache-3.5.1a.ebuild
32 similarity index 97%
33 rename from dev-util/ccache/ccache-3.5.1.ebuild
34 rename to dev-util/ccache/ccache-3.5.1a.ebuild
35 index b57ecc61aab..7491315da2e 100644
36 --- a/dev-util/ccache/ccache-3.5.1.ebuild
37 +++ b/dev-util/ccache/ccache-3.5.1a.ebuild
38 @@ -23,9 +23,10 @@ RDEPEND="${DEPEND}
39 PATCHES=(
40 "${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
41 "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
42 - "${FILESDIR}"/${PN}-3.5.1-configure.patch
43 )
44
45 +S=${WORKDIR}/${P%a} # 3.5.1a->3.5.1, bug #674516
46 +
47 src_prepare() {
48 default
49
50
51 diff --git a/dev-util/ccache/files/ccache-3.5.1-configure.patch b/dev-util/ccache/files/ccache-3.5.1-configure.patch
52 deleted file mode 100644
53 index b3e1a29670a..00000000000
54 --- a/dev-util/ccache/files/ccache-3.5.1-configure.patch
55 +++ /dev/null
56 @@ -1,19 +0,0 @@
57 -https://github.com/ccache/ccache/issues/344
58 -
59 ---- a/configure
60 -+++ b/configure
61 -@@ -642,4 +642,5 @@ no_implicit_fallthrough_warning
62 - more_warnings
63 - include_dev_mk
64 -+getopt_long_c
65 - extra_libs
66 - disable_man
67 -@@ -4724,4 +4725,8 @@ done
68 -
69 -
70 -+if test x"$ac_cv_func_getopt_long" != x"yes"; then
71 -+ getopt_long_c="src/getopt_long.c"
72 -+fi
73 -+
74 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compar_fn_t in stdlib.h" >&5
75 - $as_echo_n "checking for compar_fn_t in stdlib.h... " >&6; }