[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-09-12 Thread Sam James
commit: d56498fde0ceed0d0d612b272785bab6a342b423
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 13 01:22:29 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 13 01:22:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d56498fd

dev-util/ccache: Stabilize 4.10.1 ppc64, #939151

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.10.1.ebuild 
b/dev-util/ccache/ccache-4.10.1.ebuild
index db3b3ae14ac4..afda2138cd2c 100644
--- a/dev-util/ccache/ccache-4.10.1.ebuild
+++ b/dev-util/ccache/ccache-4.10.1.ebuild
@@ -34,7 +34,7 @@ fi
 LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 
sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-09-12 Thread Arthur Zamarin
commit: a73a6bc549831da1d5cbff6cb1c7d6de76509367
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Sep 12 12:27:20 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Sep 12 12:27:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a73a6bc5

dev-util/ccache: Stabilize 4.10.1 ppc, #939151

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/ccache/ccache-4.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.10.1.ebuild 
b/dev-util/ccache/ccache-4.10.1.ebuild
index 662a6a70978d..2904ab17a196 100644
--- a/dev-util/ccache/ccache-4.10.1.ebuild
+++ b/dev-util/ccache/ccache-4.10.1.ebuild
@@ -34,7 +34,7 @@ fi
 LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv 
~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-09-05 Thread Sam James
commit: 745beab1e2ba1c6a8860bc58525295123682e9b3
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep  6 03:33:14 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep  6 03:33:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=745beab1

dev-util/ccache: Stabilize 4.10.1 sparc, #939151

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.10.1.ebuild 
b/dev-util/ccache/ccache-4.10.1.ebuild
index a2ab0aa969fa..662a6a70978d 100644
--- a/dev-util/ccache/ccache-4.10.1.ebuild
+++ b/dev-util/ccache/ccache-4.10.1.ebuild
@@ -34,7 +34,7 @@ fi
 LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-09-05 Thread Jakov Smolić
commit: e056e948fb397a1d17c443dc4c36179899ca0f5e
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Sep  5 23:10:01 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Sep  5 23:10:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e056e948

dev-util/ccache: Stabilize 4.10.1 x86, #939151

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/ccache/ccache-4.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.10.1.ebuild 
b/dev-util/ccache/ccache-4.10.1.ebuild
index bf9418c9d7a4..a2ab0aa969fa 100644
--- a/dev-util/ccache/ccache-4.10.1.ebuild
+++ b/dev-util/ccache/ccache-4.10.1.ebuild
@@ -34,7 +34,7 @@ fi
 LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-09-05 Thread Jakov Smolić
commit: f284602c90d5c7c9d52841dc4e1668ffc15da3b4
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Sep  5 23:09:54 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Sep  5 23:09:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f284602c

dev-util/ccache: Stabilize 4.10.1 arm, #939151

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/ccache/ccache-4.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.10.1.ebuild 
b/dev-util/ccache/ccache-4.10.1.ebuild
index f59342a69881..9c9eb2eb8fb9 100644
--- a/dev-util/ccache/ccache-4.10.1.ebuild
+++ b/dev-util/ccache/ccache-4.10.1.ebuild
@@ -34,7 +34,7 @@ fi
 LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-09-05 Thread Jakov Smolić
commit: fcf9b6f181801ff77b65d83b1816984376485ba2
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Sep  5 23:09:58 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Sep  5 23:09:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcf9b6f1

dev-util/ccache: Stabilize 4.10.1 arm64, #939151

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/ccache/ccache-4.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.10.1.ebuild 
b/dev-util/ccache/ccache-4.10.1.ebuild
index 9c9eb2eb8fb9..bf9418c9d7a4 100644
--- a/dev-util/ccache/ccache-4.10.1.ebuild
+++ b/dev-util/ccache/ccache-4.10.1.ebuild
@@ -34,7 +34,7 @@ fi
 LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-09-05 Thread Jakov Smolić
commit: ff8b43f674efa5c0bf8d49263ab63af482f3a5f3
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Sep  5 23:09:53 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Sep  5 23:09:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff8b43f6

dev-util/ccache: Stabilize 4.10.1 amd64, #939151

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/ccache/ccache-4.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.10.1.ebuild 
b/dev-util/ccache/ccache-4.10.1.ebuild
index 9b08f52780fa..f59342a69881 100644
--- a/dev-util/ccache/ccache-4.10.1.ebuild
+++ b/dev-util/ccache/ccache-4.10.1.ebuild
@@ -34,7 +34,7 @@ fi
 LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-08-10 Thread Sam James
commit: 13241aa6ad28fef074450f56233765ba95f600ac
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 10 23:30:53 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 10 23:30:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13241aa6

dev-util/ccache: add 4.10.2

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest |   2 +
 dev-util/ccache/ccache-4.10.2.ebuild | 139 +++
 2 files changed, 141 insertions(+)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 3b73146a5785..415ffb7cd3b7 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,6 +1,8 @@
 DIST ccache-4.10-docs.tar.xz 82900 BLAKE2B 
0d0ef988bb21bc05642c2d5ea42bdf9c87c190464d3bddc08a8bf281b003670a50a07a88bf31731a781d5454be09b87168bc8df3b239b93f4e3d3e3f667e9094
 SHA512 
c1030e76dea6eaeed5548dda80a766bb9c944f8e1223157eb7a227f08f80f48a8fece4e1a99beced4c6075b40ec7de3df662111c95f9390624f6e9a3b04c1083
 DIST ccache-4.10.1.tar.xz 485228 BLAKE2B 
875914cf89bd696e240e93bb8146339b60a96ec5584b9908578abffe1d8f1b5604907e34a578916d291186fb742907b3d5d75f7a0e9775822ffd206358d44535
 SHA512 
98ad98ddc2d05d5779e507190df838317b41bc9b196aa20a43bba21700712b671c581ce7379094625dc6411e720cc7f5cb03d4d3b1df925cb5ce614363dea373
 DIST ccache-4.10.1.tar.xz.asc 833 BLAKE2B 
0d072b247a09e3823636f69bec81031f2ab02ee6aaf545b7dfd71d39b66c60d47e80bf01e0b53ef674234044c724f2b8fd05698f4166fe4ac76bbf915b9a7089
 SHA512 
aaf008593cfb26050a6548421249f60a74ecc98b65140a18304a162d9d2d754742e4a35a0aa216a5d12fdac435dc530808b70c6916c1a20c0d7dd25eaf7d4988
+DIST ccache-4.10.2.tar.xz 485460 BLAKE2B 
7352b8b48ed889e1f251ae59cb7cd9d01d7d3226b58a7823be176907dc074ff22ca5d6a271e2caede7d97a65457b9067b48e9d39ab833bf45fb055eb3bfe7607
 SHA512 
3815c71d7266c32839acb306763268018acc58b3bbbd9ec79fc101e4217c1720d2ad2f01645bf69168c1c61d27700b6f3bb755cfa82689cca69824f015653f3c
+DIST ccache-4.10.2.tar.xz.asc 833 BLAKE2B 
4a975aa1e8c9c12cf4df60b31cea10023e8e8efb561608dd652ecef2a0e575b41c5f6cfc551b0f3bd860e3b4a59061fcf870a67f5625f6a82cab104045ac2e57
 SHA512 
4afcc08563f0dfc8ccfd0797ea2cc26227b253415b9b9fe8ed90ef47e5b8d1dbcb8cbdd17ebf95acd6a367260f6a405764d0d0c5432cfbe2dce4d098b2a7a1b9
 DIST ccache-4.10.tar.xz 411272 BLAKE2B 
55e4efa41a53a664e8dfa25cd2b21dda80bf7847c467cf361058aaf06425a5c494d9e5b71e70f7d9327a6d57672af271946ad4e24fbd99f49c0bb8c256a9a2a5
 SHA512 
8bc8451a5e66300cb26ef7c1348d1b47e164ede17eab7f5f857a584a9def599c5c752d5591017a5e5b9673f108bb7a4a5bd59368e379fed9531e833fca8808a4
 DIST ccache-4.10.tar.xz.asc 833 BLAKE2B 
4cdd6ce059ab54dca39365120b74e675a5a8c16e280f2e812d7a81feecda4283b63f84bf921d8b18493e348de38850facc95d48f0631e9ae46f33d7154a01f21
 SHA512 
faa3177d07a63746fe1dac1e748124d85207aa51d55894523e88074bf3b02deba7e961d2f7de48265acc6898bdd083bb48cb65631b02d9f7bdb7a27364d0fc4c
 DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B 
e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9
 SHA512 
e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb

diff --git a/dev-util/ccache/ccache-4.10.2.ebuild 
b/dev-util/ccache/ccache-4.10.2.ebuild
new file mode 100644
index ..f50d51039e24
--- /dev/null
+++ b/dev-util/ccache/ccache-4.10.2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# XXX: We don't use CCACHE_* for these vars like we do in e.g. 
cmake/libabigail/qemu
+# because Portage unsets them. Aaaah!
+#
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${MY_DOCS_PREBUILT:=1}
+
+MY_DOCS_PREBUILT_DEV=sam
+MY_DOCS_VERSION=$(ver_cut 1-2)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+MY_DOCS_USEFLAG="+doc"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic prefix verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/";
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
+SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz
 )"
+   MY_DOCS_USEFLAG="doc"
+fi
+
+# https://ccache.dev/license.html
+# ccache, blake3, NonstdSpan, tl-expected
+LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
+LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' b

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/

2024-08-10 Thread Sam James
commit: afe458f45b86a439985e0c6cae53912d487bc88e
Author: Holger Hoffstätte  applied-asynchrony  com>
AuthorDate: Thu Jul 25 21:00:37 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 10 20:02:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afe458f4

dev-util/ccache: fix compilation with libfmt >=10

Closes: https://bugs.gentoo.org/935291
Signed-off-by: Holger Hoffstätte  applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/37725
Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.10.1.ebuild |  1 +
 dev-util/ccache/files/ccache-4.10-libfmt11.patch | 85 
 2 files changed, 86 insertions(+)

diff --git a/dev-util/ccache/ccache-4.10.1.ebuild 
b/dev-util/ccache/ccache-4.10.1.ebuild
index f50d51039e24..9b08f52780fa 100644
--- a/dev-util/ccache/ccache-4.10.1.ebuild
+++ b/dev-util/ccache/ccache-4.10.1.ebuild
@@ -73,6 +73,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
"${FILESDIR}"/${PN}-4.0-objdump.patch
"${FILESDIR}"/${PN}-4.10-avoid-run-user.patch
+   "${FILESDIR}"/${PN}-4.10-libfmt11.patch
 )
 
 src_unpack() {

diff --git a/dev-util/ccache/files/ccache-4.10-libfmt11.patch 
b/dev-util/ccache/files/ccache-4.10-libfmt11.patch
new file mode 100644
index ..37ed2167611a
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.10-libfmt11.patch
@@ -0,0 +1,85 @@
+
+Patch from:
+https://github.com/ccache/ccache/commit/71f772e9d3d4f8045cfa7bccd03bd21c1e8fbef1
+
+From db136b6819d95bb53582e4fea8c328029c8f5681 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= 
+Date: Tue, 2 Jul 2024 12:53:04 +0200
+Subject: [PATCH] build: Try harder to determine FMT_VERSION
+
+fmt-11.0 moved the FMT_VERSION from core.h to base.h, so try the
+new header first and then fall back to the old one.
+
+Closes: #1477
+---
+ cmake/FindFmt.cmake | 14 +++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/FindFmt.cmake b/cmake/FindFmt.cmake
+index 55126a3172..0619f4615e 100644
+--- a/cmake/FindFmt.cmake
 b/cmake/FindFmt.cmake
+@@ -3,11 +3,19 @@ mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY)
+ if(DEP_FMT STREQUAL "BUNDLED")
+   message(STATUS "Using bundled Fmt as requested")
+ else()
+-  find_path(FMT_INCLUDE_DIR fmt/core.h)
++  find_path(FMT_INCLUDE_DIR fmt/base.h fmt/core.h)
+   find_library(FMT_LIBRARY fmt)
+   if(FMT_INCLUDE_DIR AND FMT_LIBRARY)
+-file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h)
+-string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}")
++file(READ "${FMT_INCLUDE_DIR}/fmt/base.h" _fmt_base_h)
++string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_base_h}")
++if("${CMAKE_MATCH_0}" STREQUAL "")
++  file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h)
++  string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}")
++endif()
++if("${CMAKE_MATCH_0}" STREQUAL "")
++  message(FATAL_ERROR "FMT_VERSION not found")
++  return()
++endif()
+ math(EXPR _fmt_major "${CMAKE_MATCH_1} / 1")
+ math(EXPR _fmt_minor "${CMAKE_MATCH_1} / 100 % 100")
+ math(EXPR _fmt_patch "${CMAKE_MATCH_1} % 100")
+
+Patch from:
+https://github.com/ccache/ccache/commit/3b09afc5f792f0bd0a15cf6b8408ea40eb069787
+
+From 3b09afc5f792f0bd0a15cf6b8408ea40eb069787 Mon Sep 17 00:00:00 2001
+From: Joel Rosdahl 
+Date: Tue, 2 Jul 2024 17:05:43 +0200
+Subject: [PATCH] build: Fix detection of Fmt version for Fmt<11
+
+Fixes regression in 71f772e9d3d4f8045cfa7bccd03bd21c1e8fbef1.
+---
+ cmake/FindFmt.cmake | 13 +++--
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/cmake/FindFmt.cmake b/cmake/FindFmt.cmake
+index 0619f4615e..7c39291eca 100644
+--- a/cmake/FindFmt.cmake
 b/cmake/FindFmt.cmake
+@@ -3,15 +3,16 @@ mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY)
+ if(DEP_FMT STREQUAL "BUNDLED")
+   message(STATUS "Using bundled Fmt as requested")
+ else()
+-  find_path(FMT_INCLUDE_DIR fmt/base.h fmt/core.h)
++  find_path(FMT_INCLUDE_DIR NAMES fmt/base.h fmt/core.h)
+   find_library(FMT_LIBRARY fmt)
+   if(FMT_INCLUDE_DIR AND FMT_LIBRARY)
+-file(READ "${FMT_INCLUDE_DIR}/fmt/base.h" _fmt_base_h)
+-string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_base_h}")
+-if("${CMAKE_MATCH_0}" STREQUAL "")
+-  file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h)
+-  string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}")
++if(EXISTS "${FMT_INCLUDE_DIR}/fmt/base.h")
++  set(_fmt_h base.h)
++else()
++  set(_fmt_h core.h)
+ endif()
++file(READ "${FMT_INCLUDE_DIR}/fmt/${_fmt_h}" _fmt_h_content)
++string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_h_content}")
+ if("${CMAKE_MATCH_0}" STREQUAL "")
+   message(FATAL_ERROR "FMT_VERSION not found")
+   return()



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-06-30 Thread Sam James
commit: e94ade21b4c0cfea3d2df75c8e9c8dd926a18892
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 30 19:41:23 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 30 19:41:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e94ade21

dev-util/ccache: add 4.10.1

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest |   2 +
 dev-util/ccache/ccache-4.10.1.ebuild | 139 +++
 2 files changed, 141 insertions(+)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index e53c67e2f5fa..3b73146a5785 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,4 +1,6 @@
 DIST ccache-4.10-docs.tar.xz 82900 BLAKE2B 
0d0ef988bb21bc05642c2d5ea42bdf9c87c190464d3bddc08a8bf281b003670a50a07a88bf31731a781d5454be09b87168bc8df3b239b93f4e3d3e3f667e9094
 SHA512 
c1030e76dea6eaeed5548dda80a766bb9c944f8e1223157eb7a227f08f80f48a8fece4e1a99beced4c6075b40ec7de3df662111c95f9390624f6e9a3b04c1083
+DIST ccache-4.10.1.tar.xz 485228 BLAKE2B 
875914cf89bd696e240e93bb8146339b60a96ec5584b9908578abffe1d8f1b5604907e34a578916d291186fb742907b3d5d75f7a0e9775822ffd206358d44535
 SHA512 
98ad98ddc2d05d5779e507190df838317b41bc9b196aa20a43bba21700712b671c581ce7379094625dc6411e720cc7f5cb03d4d3b1df925cb5ce614363dea373
+DIST ccache-4.10.1.tar.xz.asc 833 BLAKE2B 
0d072b247a09e3823636f69bec81031f2ab02ee6aaf545b7dfd71d39b66c60d47e80bf01e0b53ef674234044c724f2b8fd05698f4166fe4ac76bbf915b9a7089
 SHA512 
aaf008593cfb26050a6548421249f60a74ecc98b65140a18304a162d9d2d754742e4a35a0aa216a5d12fdac435dc530808b70c6916c1a20c0d7dd25eaf7d4988
 DIST ccache-4.10.tar.xz 411272 BLAKE2B 
55e4efa41a53a664e8dfa25cd2b21dda80bf7847c467cf361058aaf06425a5c494d9e5b71e70f7d9327a6d57672af271946ad4e24fbd99f49c0bb8c256a9a2a5
 SHA512 
8bc8451a5e66300cb26ef7c1348d1b47e164ede17eab7f5f857a584a9def599c5c752d5591017a5e5b9673f108bb7a4a5bd59368e379fed9531e833fca8808a4
 DIST ccache-4.10.tar.xz.asc 833 BLAKE2B 
4cdd6ce059ab54dca39365120b74e675a5a8c16e280f2e812d7a81feecda4283b63f84bf921d8b18493e348de38850facc95d48f0631e9ae46f33d7154a01f21
 SHA512 
faa3177d07a63746fe1dac1e748124d85207aa51d55894523e88074bf3b02deba7e961d2f7de48265acc6898bdd083bb48cb65631b02d9f7bdb7a27364d0fc4c
 DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B 
e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9
 SHA512 
e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb

diff --git a/dev-util/ccache/ccache-4.10.1.ebuild 
b/dev-util/ccache/ccache-4.10.1.ebuild
new file mode 100644
index ..f50d51039e24
--- /dev/null
+++ b/dev-util/ccache/ccache-4.10.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# XXX: We don't use CCACHE_* for these vars like we do in e.g. 
cmake/libabigail/qemu
+# because Portage unsets them. Aaaah!
+#
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${MY_DOCS_PREBUILT:=1}
+
+MY_DOCS_PREBUILT_DEV=sam
+MY_DOCS_VERSION=$(ver_cut 1-2)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+MY_DOCS_USEFLAG="+doc"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic prefix verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/";
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
+SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz
 )"
+   MY_DOCS_USEFLAG="doc"
+fi
+
+# https://ccache.dev/license.html
+# ccache, blake3, NonstdSpan, tl-expected
+LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
+LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+# TODO: package NonstdSpan, TlExpected
+DEPEND="
+   >=app-arch/zstd-1.3.4:=
+   >=dev-cpp/cpp-httplib-0.10.6:=
+   >=dev-libs/blake3-1.4.0:=
+   >=dev-libs/libfmt-8.0.0:=
+   >=dev-libs/xxhash-0.8.0
+   redis? ( >=dev-libs/hiredis-0.13.3:= )
+"
+RDEPEND="
+   ${DEPEND}
+   dev-util/shadowman
+   sys-apps/gentoo-functions
+"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compa

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/

2024-06-19 Thread Sam James
commit: 5651f7d6d8ecf7ccbf4a192a0a84b749478ed1d9
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 19 14:43:05 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 19 14:43:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5651f7d6

dev-util/ccache: fixup httplib patch for >=0.16.0

Switch to the variant that I submitted upstream & was merged.

Bug: https://github.com/yhirose/cpp-httplib/issues/1851
Signed-off-by: Sam James  gentoo.org>

 .../ccache/files/ccache-4.10-unittest-httplib.patch| 18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/dev-util/ccache/files/ccache-4.10-unittest-httplib.patch 
b/dev-util/ccache/files/ccache-4.10-unittest-httplib.patch
index 2689ba7fcbde..2c466013c219 100644
--- a/dev-util/ccache/files/ccache-4.10-unittest-httplib.patch
+++ b/dev-util/ccache/files/ccache-4.10-unittest-httplib.patch
@@ -1,12 +1,26 @@
-TODO: send upstream (in Gentoo, we don't rename it to cpp-httplib, so need to 
check for that as a library too)
+https://github.com/ccache/ccache/pull/1465
+https://github.com/ccache/ccache/commit/a641e5ea3087752af71e60690dcf3ed3c1dbc56a
+
+From a641e5ea3087752af71e60690dcf3ed3c1dbc56a Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sat, 8 Jun 2024 15:11:48 +0100
+Subject: [PATCH] build: Find CppHttplib named libhttplib.so as well (#1465)
+
+On Gentoo, the library name is 'httplib', not 'cpp-httplib'. Search
+for that first (as it appears to be "more vanilla"), then fall back
+to 'cpp-httplib'.
 --- a/cmake/FindCppHttplib.cmake
 +++ b/cmake/FindCppHttplib.cmake
-@@ -12,7 +12,7 @@ else()
+@@ -12,7 +12,11 @@ else()
  if(NOT "${CMAKE_MATCH_0}" STREQUAL "" AND "${_cpphttplib_version_string}" 
VERSION_GREATER_EQUAL "${CppHttplib_FIND_VERSION}")
# Some dists like Fedora package cpp-httplib as a single header while 
some
# dists like Debian package it as a traditional library.
 -  find_library(CPPHTTPLIB_LIBRARY cpp-httplib)
 +  find_library(CPPHTTPLIB_LIBRARY httplib)
++  if(NOT CPPHTTPLIB_LIBRARY)
++find_library(CPPHTTPLIB_LIBRARY cpp-httplib)
++  endif()
++
if(CPPHTTPLIB_LIBRARY)
  message(STATUS "Using system CppHttplib (${CPPHTTPLIB_LIBRARY})")
  add_library(dep_cpphttplib UNKNOWN IMPORTED)



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-06-05 Thread Arthur Zamarin
commit: ad69a7cb5cb798122bde43df069f543fec29f183
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun  5 07:00:14 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun  5 07:00:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad69a7cb

dev-util/ccache: Keyword 4.10-r1 s390, #933142

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/ccache/ccache-4.10-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.10-r1.ebuild 
b/dev-util/ccache/ccache-4.10-r1.ebuild
index f78605776994..7507908b00db 100644
--- a/dev-util/ccache/ccache-4.10-r1.ebuild
+++ b/dev-util/ccache/ccache-4.10-r1.ebuild
@@ -34,7 +34,7 @@ fi
 LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-05-31 Thread Arthur Zamarin
commit: 6214faa6d436470b24359f30b0c343f347a2c48e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri May 31 19:56:49 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri May 31 19:56:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6214faa6

dev-util/ccache: Keyword 4.10-r1 ppc64, #933142

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/ccache/ccache-4.10-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.10-r1.ebuild 
b/dev-util/ccache/ccache-4.10-r1.ebuild
index 883cd839c7ed..f78605776994 100644
--- a/dev-util/ccache/ccache-4.10-r1.ebuild
+++ b/dev-util/ccache/ccache-4.10-r1.ebuild
@@ -34,7 +34,7 @@ fi
 LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-05-31 Thread Arthur Zamarin
commit: c407b8aca5d9dec716fd31dc5d051f75affb351a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri May 31 19:56:46 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri May 31 19:56:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c407b8ac

dev-util/ccache: Keyword 4.10-r1 ppc, #933142

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/ccache/ccache-4.10-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.10-r1.ebuild 
b/dev-util/ccache/ccache-4.10-r1.ebuild
index a52907e3e3e0..883cd839c7ed 100644
--- a/dev-util/ccache/ccache-4.10-r1.ebuild
+++ b/dev-util/ccache/ccache-4.10-r1.ebuild
@@ -34,7 +34,7 @@ fi
 LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~riscv ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/

2024-05-31 Thread Sam James
commit: 0862af03fc9715f548e1332b40664432aeea616d
Author: Sam James  gentoo  org>
AuthorDate: Fri May 31 18:45:57 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 31 18:45:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0862af03

dev-util/ccache: unbundle blake3 too

Signed-off-by: Sam James  gentoo.org>

 .../{ccache-4.10.ebuild => ccache-4.10-r1.ebuild}  |  5 +-
 dev-util/ccache/files/ccache-4.10-blake3.patch | 79 ++
 2 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/dev-util/ccache/ccache-4.10.ebuild 
b/dev-util/ccache/ccache-4.10-r1.ebuild
similarity index 96%
rename from dev-util/ccache/ccache-4.10.ebuild
rename to dev-util/ccache/ccache-4.10-r1.ebuild
index cf2714cb487b..a52907e3e3e0 100644
--- a/dev-util/ccache/ccache-4.10.ebuild
+++ b/dev-util/ccache/ccache-4.10-r1.ebuild
@@ -34,17 +34,17 @@ fi
 LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~riscv ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"
 
 # TODO: package NonstdSpan, TlExpected
-# TODO: figure out why blake3 can't be found
 # TODO: upstream httplib patch
 DEPEND="
>=app-arch/zstd-1.3.4:=
>=dev-cpp/cpp-httplib-0.10.6:=
+   >=dev-libs/blake3-1.4.0:=
>=dev-libs/libfmt-8.0.0:=
>=dev-libs/xxhash-0.8.0
redis? ( >=dev-libs/hiredis-0.13.3:= )
@@ -75,6 +75,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.0-objdump.patch
"${FILESDIR}"/${PN}-4.10-avoid-run-user.patch
"${FILESDIR}"/${PN}-4.10-unittest-httplib.patch
+   "${FILESDIR}"/${P}-blake3.patch
 )
 
 src_unpack() {

diff --git a/dev-util/ccache/files/ccache-4.10-blake3.patch 
b/dev-util/ccache/files/ccache-4.10-blake3.patch
new file mode 100644
index ..5789051200eb
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.10-blake3.patch
@@ -0,0 +1,79 @@
+https://github.com/ccache/ccache/pull/1464
+
+From d159306db8398da233df6481ac3fd83460ef0f0b Mon Sep 17 00:00:00 2001
+From: Carlo Cabrera <30379873+carlo...@users.noreply.github.com>
+Date: Thu, 30 May 2024 19:26:41 +0800
+Subject: [PATCH 1/4] Fix detection of system blake3
+
+The existing code mistakenly always rejects the system version as too old 
because it doesn't parse the version from the header correctly.
+
+This change fixes that.
+--- a/cmake/FindBlake3.cmake
 b/cmake/FindBlake3.cmake
+@@ -8,7 +8,7 @@ else()
+   find_library(BLAKE3_LIBRARY blake3)
+   if(BLAKE3_INCLUDE_DIR)
+ file(READ "${BLAKE3_INCLUDE_DIR}/blake3.h" _blake3_h)
+-string(REGEX MATCH "#define _blake3_version_string 
\"([0-9]+).([0-9]+).*([0-9]+)\"" _ "${_blake3_h}")
++string(REGEX MATCH "#define BLAKE3_VERSION_STRING 
\"([0-9]+).([0-9]+).*([0-9]+)\"" _ "${_blake3_h}")
+ set(_blake3_version_string 
"${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}")
+ if(NOT "${CMAKE_MATCH_0}" STREQUAL "" AND "${_blake3_version_string}" 
VERSION_GREATER_EQUAL "${Blake3_FIND_VERSION}")
+   if(BLAKE3_LIBRARY)
+
+From fa4046966e71011587364b0241255130b62858fb Mon Sep 17 00:00:00 2001
+From: Carlo Cabrera <30379873+carlo...@users.noreply.github.com>
+Date: Thu, 30 May 2024 19:43:11 +0800
+Subject: [PATCH 2/4] Fix blake3 include in Hash.hpp
+
+System installations of blake3 install the `blake3.h` header directly into the 
`include` directory and not into a `blake3` subdirectory.
+--- a/src/ccache/Hash.hpp
 b/src/ccache/Hash.hpp
+@@ -21,7 +21,7 @@
+ #include 
+ #include 
+ 
+-#include 
++#include 
+ #include 
+ #include 
+ 
+
+From 36f8eeea1cb986440f51c1eee9db563493103462 Mon Sep 17 00:00:00 2001
+From: Carlo Cabrera <30379873+carlo...@users.noreply.github.com>
+Date: Thu, 30 May 2024 19:44:53 +0800
+Subject: [PATCH 3/4] Fix include path for bundled blake3
+
+We modified the include directive for `blake3.h` in `Hash.hpp`, so we need 
this in order for builds that use the bundled blake3 to keep working.
+--- a/src/third_party/blake3/CMakeLists.txt
 b/src/third_party/blake3/CMakeLists.txt
+@@ -7,7 +7,7 @@ add_library(
+   "${CMAKE_CURRENT_SOURCE_DIR}/blake3/blake3_portable.c"
+ )
+ 
+-target_include_directories(dep_blake3 INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
++target_include_directories(dep_blake3 INTERFACE 
"${CMAKE_CURRENT_SOURCE_DIR}/blake3")
+ target_link_libraries(dep_blake3 PRIVATE standard_settings)
+ 
+ if(MSVC)
+
+From 8cc68bc6f3ec8dadcb6a1244c76d865536f91be7 Mon Sep 17 00:00:00 2001
+From: Carlo Cabrera <30379873+carlo...@users.noreply.github.com>
+Date: Thu, 30 May 2024 19:52:59 +0800
+Subject: [PATCH 4/4] Fix `clang-format` failure
+
+--- a/src/ccache/Hash.hpp
 b/src/ccache/Hash.hpp
+@@ -21,10 +21,11 @@
+ #include 
+ #include 
+ 
+-#include 
+ #include

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/, dev-util/ccache/

2024-05-29 Thread Sam James
commit: fe3f4d51550c80fe7bb55548665bb44434731283
Author: Sam James  gentoo  org>
AuthorDate: Thu May 30 02:09:03 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 30 02:09:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe3f4d51

dev-util/ccache: add 4.10

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest   |   3 +
 dev-util/ccache/ccache-4.10.ebuild | 141 +
 .../ccache/files/ccache-4.10-avoid-run-user.patch  |  34 +
 .../files/ccache-4.10-unittest-httplib.patch   |  12 ++
 4 files changed, 190 insertions(+)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index ac00ffd780a6..e53c67e2f5fa 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,3 +1,6 @@
+DIST ccache-4.10-docs.tar.xz 82900 BLAKE2B 
0d0ef988bb21bc05642c2d5ea42bdf9c87c190464d3bddc08a8bf281b003670a50a07a88bf31731a781d5454be09b87168bc8df3b239b93f4e3d3e3f667e9094
 SHA512 
c1030e76dea6eaeed5548dda80a766bb9c944f8e1223157eb7a227f08f80f48a8fece4e1a99beced4c6075b40ec7de3df662111c95f9390624f6e9a3b04c1083
+DIST ccache-4.10.tar.xz 411272 BLAKE2B 
55e4efa41a53a664e8dfa25cd2b21dda80bf7847c467cf361058aaf06425a5c494d9e5b71e70f7d9327a6d57672af271946ad4e24fbd99f49c0bb8c256a9a2a5
 SHA512 
8bc8451a5e66300cb26ef7c1348d1b47e164ede17eab7f5f857a584a9def599c5c752d5591017a5e5b9673f108bb7a4a5bd59368e379fed9531e833fca8808a4
+DIST ccache-4.10.tar.xz.asc 833 BLAKE2B 
4cdd6ce059ab54dca39365120b74e675a5a8c16e280f2e812d7a81feecda4283b63f84bf921d8b18493e348de38850facc95d48f0631e9ae46f33d7154a01f21
 SHA512 
faa3177d07a63746fe1dac1e748124d85207aa51d55894523e88074bf3b02deba7e961d2f7de48265acc6898bdd083bb48cb65631b02d9f7bdb7a27364d0fc4c
 DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B 
e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9
 SHA512 
e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb
 DIST ccache-4.8.3.tar.xz 569724 BLAKE2B 
53211db0e516eea9739b8f05bf6a3db678b4b5cff7af741469360556da20a320e4a40253ca9e51568045a394d3497b428413ff6cf77f4273aa4906357b427d1f
 SHA512 
e0e344cd215de67fe060b36fb1b902bab61454477624fbe41d2ec57fdd721cec9c8920ca834f0ef0ccfeedb961b17143f18197497557887d88911ff66e330478
 DIST ccache-4.8.3.tar.xz.asc 833 BLAKE2B 
e800b7bdce705db3ced97f0fe008e8391811f9c7c49e815b6cd2cf220cf1107f3941d29d7bcdd10f79da4e6cad9766243e482011aeb5a170e1c5920b6ebdd726
 SHA512 
2e2298a3cf800d9de669f560269bd07ca2b76f761198af10f7174759ea95a23518dedce83f481bdd392bb60adbd736e5dd2c21af88beb761c0f589f685737586

diff --git a/dev-util/ccache/ccache-4.10.ebuild 
b/dev-util/ccache/ccache-4.10.ebuild
new file mode 100644
index ..cf2714cb487b
--- /dev/null
+++ b/dev-util/ccache/ccache-4.10.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# XXX: We don't use CCACHE_* for these vars like we do in e.g. 
cmake/libabigail/qemu
+# because Portage unsets them. Aaaah!
+#
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${MY_DOCS_PREBUILT:=1}
+
+MY_DOCS_PREBUILT_DEV=sam
+MY_DOCS_VERSION=$(ver_cut 1-2)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+MY_DOCS_USEFLAG="+doc"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic prefix verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/";
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
+SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz
 )"
+   MY_DOCS_USEFLAG="doc"
+fi
+
+# https://ccache.dev/license.html
+# ccache, blake3, NonstdSpan, tl-expected
+LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
+LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+# TODO: package NonstdSpan, TlExpected
+# TODO: figure out why blake3 can't be found
+# TODO: upstream httplib patch
+DEPEND="
+   >=app-arch/zstd-1.3.4:=
+   >=dev-cpp/cpp-httplib-0.10.6:=
+   >=dev-libs/libfmt-8.0.0:=
+   >=dev-libs/xxhash-0.8.0
+   redis? ( >=dev-libs/hiredis-0.13.3:= )
+"
+RDEPEND="
+   ${DEPEND}
+   dev-util/shadowman

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-05-18 Thread Sam James
commit: 35d76ec03e09e6b58fb8c46d2d2f81d46c146667
Author: Sam James  gentoo  org>
AuthorDate: Sat May 18 17:06:13 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 18 17:06:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35d76ec0

dev-util/ccache: drop 4.9.1

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.9.1.ebuild | 131 
 1 file changed, 131 deletions(-)

diff --git a/dev-util/ccache/ccache-4.9.1.ebuild 
b/dev-util/ccache/ccache-4.9.1.ebuild
deleted file mode 100644
index 73795e42934e..
--- a/dev-util/ccache/ccache-4.9.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# XXX: We don't use CCACHE_* for these vars like we do in e.g. 
cmake/libabigail/qemu
-# because Portage unsets them. Aaaah!
-#
-# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${MY_DOCS_PREBUILT:=1}
-
-MY_DOCS_PREBUILT_DEV=sam
-MY_DOCS_VERSION=$(ver_cut 1-2)
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# See bug #784815
-MY_DOCS_USEFLAG="+doc"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic prefix verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/";
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
-SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
-   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz
 )"
-   MY_DOCS_USEFLAG="doc"
-fi
-
-# https://ccache.dev/license.html
-LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
-LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-   app-arch/zstd:=
-   redis? ( dev-libs/hiredis:= )
-"
-RDEPEND="
-   ${DEPEND}
-   dev-util/shadowman
-   sys-apps/gentoo-functions
-"
-# Needed for eselect calls in pkg_*
-IDEPEND="dev-util/shadowman"
-
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+=" test? ( dev-libs/elfutils )"
-BDEPEND="
-   doc? ( dev-ruby/asciidoctor )
-   verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )
-"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-   "${FILESDIR}"/${PN}-4.0-objdump.patch
-   "${FILESDIR}"/${PN}-4.9-avoid-run-user.patch
-)
-
-src_unpack() {
-   # Avoid aborting on the doc tarball
-   if use verify-sig ; then
-   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
-   fi
-
-   default
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   cp "${FILESDIR}"/ccache-config-3 ccache-config || die
-   eprefixify ccache-config
-}
-
-src_configure() {
-   # Mainly used in tests
-   tc-export CC OBJDUMP
-
-   # Avoid dependency on libstdc++.so. Useful for cases when
-   # we would like to use ccache to build older gcc which injects
-   # into ccache locally built (possibly outdated) libstdc++
-   # See bug #761220 for examples.
-   #
-   # Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
-   use static-c++ && append-ldflags -static-libstdc++
-
-   local mycmakeargs=(
-   -DENABLE_DOCUMENTATION=$(usex doc)
-   -DENABLE_TESTING=$(usex test)
-   -DZSTD_FROM_INTERNET=OFF
-   -DHIREDIS_FROM_INTERNET=OFF
-   -DREDIS_STORAGE_BACKEND=$(usex redis)
-   )
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   dobin ccache-config
-   insinto /usr/share/shadowman/tools
-   newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-
-   # If USE=doc, there'll be newly generated docs which we install instead.
-   if ! use doc && [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
-   doman "${WORKDIR}"/${PN}-${MY_DOCS_VERSION}-docs/doc/*.[0-8]
-   fi
-}
-
-pkg_prerm() {
-   if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
-   eselect compiler-shadow remove ccache
-   fi
-}
-
-pkg_postinst() {
-   if [[ -z ${ROOT} ]] ; then
-   eselect compiler-shadow update ccache
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-05-04 Thread Arthur Zamarin
commit: 4f23efe5793c54b42dccd7b39c467d9ebb487b17
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May  4 09:48:25 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May  4 09:48:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f23efe5

dev-util/ccache: Stabilize 4.9.1-r1 amd64, #930850

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/ccache/ccache-4.9.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.9.1-r1.ebuild 
b/dev-util/ccache/ccache-4.9.1-r1.ebuild
index 8c1ba22183f3..222324b909eb 100644
--- a/dev-util/ccache/ccache-4.9.1-r1.ebuild
+++ b/dev-util/ccache/ccache-4.9.1-r1.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-04-28 Thread Sam James
commit: 9ca107652ec84650d25f80612aff3391a9e85117
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 29 02:46:15 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 29 02:46:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ca10765

dev-util/ccache: Stabilize 4.9.1-r1 x86, #930850

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.9.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.9.1-r1.ebuild 
b/dev-util/ccache/ccache-4.9.1-r1.ebuild
index 44f4b3c6fff1..8c1ba22183f3 100644
--- a/dev-util/ccache/ccache-4.9.1-r1.ebuild
+++ b/dev-util/ccache/ccache-4.9.1-r1.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-04-28 Thread Sam James
commit: 8aa9bfe2af7298831ffe4ad524165559e8a6656a
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 29 02:37:48 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 29 02:37:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa9bfe2

dev-util/ccache: Stabilize 4.9.1-r1 arm, #930850

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.9.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.9.1-r1.ebuild 
b/dev-util/ccache/ccache-4.9.1-r1.ebuild
index 671fcb56fbc6..44f4b3c6fff1 100644
--- a/dev-util/ccache/ccache-4.9.1-r1.ebuild
+++ b/dev-util/ccache/ccache-4.9.1-r1.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-04-28 Thread Sam James
commit: b215e646bb54dc5d9524a773711fca894e4f7c5c
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 29 02:37:47 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 29 02:37:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b215e646

dev-util/ccache: Stabilize 4.9.1-r1 sparc, #930850

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.9.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.9.1-r1.ebuild 
b/dev-util/ccache/ccache-4.9.1-r1.ebuild
index 79531ba79f22..671fcb56fbc6 100644
--- a/dev-util/ccache/ccache-4.9.1-r1.ebuild
+++ b/dev-util/ccache/ccache-4.9.1-r1.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-04-28 Thread Sam James
commit: 18749f0f630fdecc225762c6c743263d6fbaa166
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 29 02:37:43 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 29 02:37:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18749f0f

dev-util/ccache: Stabilize 4.9.1-r1 ppc, #930850

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.9.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.9.1-r1.ebuild 
b/dev-util/ccache/ccache-4.9.1-r1.ebuild
index 8bac5338f821..c4a25253bb64 100644
--- a/dev-util/ccache/ccache-4.9.1-r1.ebuild
+++ b/dev-util/ccache/ccache-4.9.1-r1.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-04-28 Thread Sam James
commit: 7aa040a9f88cec10c0961c05cbf6a874c5796621
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 29 02:37:46 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 29 02:37:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aa040a9

dev-util/ccache: Stabilize 4.9.1-r1 ppc64, #930850

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.9.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.9.1-r1.ebuild 
b/dev-util/ccache/ccache-4.9.1-r1.ebuild
index 28492849b47f..79531ba79f22 100644
--- a/dev-util/ccache/ccache-4.9.1-r1.ebuild
+++ b/dev-util/ccache/ccache-4.9.1-r1.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-04-28 Thread Sam James
commit: 4c97b26432358b1b86772a84a206ccdb6024d71c
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 29 02:37:44 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 29 02:37:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c97b264

dev-util/ccache: Stabilize 4.9.1-r1 arm64, #930850

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.9.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.9.1-r1.ebuild 
b/dev-util/ccache/ccache-4.9.1-r1.ebuild
index c4a25253bb64..28492849b47f 100644
--- a/dev-util/ccache/ccache-4.9.1-r1.ebuild
+++ b/dev-util/ccache/ccache-4.9.1-r1.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-03-27 Thread Sam James
commit: fdd94e71fb71f185121ecb299e5bccfe0ad2d2e6
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 28 05:04:54 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 28 05:04:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdd94e71

dev-util/ccache: drop 4.9

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest  |   2 -
 dev-util/ccache/ccache-4.9.ebuild | 131 --
 2 files changed, 133 deletions(-)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 330b7da6e8c5..ac00ffd780a6 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -4,5 +4,3 @@ DIST ccache-4.8.3.tar.xz.asc 833 BLAKE2B 
e800b7bdce705db3ced97f0fe008e8391811f9c
 DIST ccache-4.9-docs.tar.xz 82684 BLAKE2B 
bc3517803cac75a0124358f740e3f4f4b923341277b77cb9ac7649520bbf19a65a51ebf324cc886f98e606bd29681ca3956073a85b737159792e068d529e299c
 SHA512 
870d15dc9e3a0557dfe533862927ff8e90730678439b576e782f79f1f69c5bb499ff4c7e397a7eca059691ec5f89412594e32c74209a58003a6f55002c00d467
 DIST ccache-4.9.1.tar.xz 583764 BLAKE2B 
9ebaf335fda54666e4bfc8f2c402f2b908b3922f3898b6a739b0256481256c6121546021b80fd2dbc93f3aea254db63a8624b97b2820b88e73e502a243bf2562
 SHA512 
5ae4537a7e546b779c80f5adadce1349a84da3a47b255bda06cb2678ee5403307f013c08c8541a21f6f1fb36a0b64bdbcf785fbd2fcfe3009150117250e75b0b
 DIST ccache-4.9.1.tar.xz.asc 833 BLAKE2B 
a157b0c2c032d9a51fb7519f561fac098bbac9ba33fe453b210a6e9a34372b5d00b0fa940d2b783ab0eb48e7bc98707de884b191d83120d9ad8239c9fb76
 SHA512 
43605eca0f9a62565486c6c7ff622fc4d18a400518aa9c9e3c9d865a99c40c63a6a09d42ccd3428d28575c4de8a69be89c93830d26261d3479792e67179d0839
-DIST ccache-4.9.tar.xz 583744 BLAKE2B 
682b491d061452d77d988d7e9e661ed4ce729a40a58370af55e1f24c5e973e4808d7211b4f8b8ab7f9328ecc651c032fa2efd37675566308197c22fd9a776675
 SHA512 
04200e5ceab56fc119f4376189f45fe811409a8022f08e82cd3089e252f350d604d777a237a57651fcd0c20f8ba0f27e4f3cc330a5970d455a696a977408d563
-DIST ccache-4.9.tar.xz.asc 833 BLAKE2B 
ad91919ab45f98d334c9b2d273b8139a2fb64b28a3fdb2a2042beaaa32905978113cd08ff95a009891c6159505431e4c1e0203adca94032feb2a4cee9bd089e2
 SHA512 
2f51d11d00756d099a64a9e5698591385d2c822438123f1c9e753c66e35f4ea9706db3414d7049cb6604defebc72927b6772c4e8a2271e03fb80f815659f90fa

diff --git a/dev-util/ccache/ccache-4.9.ebuild 
b/dev-util/ccache/ccache-4.9.ebuild
deleted file mode 100644
index ae1a041c2953..
--- a/dev-util/ccache/ccache-4.9.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# XXX: We don't use CCACHE_* for these vars like we do in e.g. 
cmake/libabigail/qemu
-# because Portage unsets them. Aaaah!
-#
-# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${MY_DOCS_PREBUILT:=1}
-
-MY_DOCS_PREBUILT_DEV=sam
-MY_DOCS_VERSION=$(ver_cut 1-2)
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# See bug #784815
-MY_DOCS_USEFLAG="+doc"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic prefix verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/";
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
-SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
-   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz
 )"
-   MY_DOCS_USEFLAG="doc"
-fi
-
-# https://ccache.dev/license.html
-LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
-LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-   app-arch/zstd:=
-   redis? ( dev-libs/hiredis:= )
-"
-RDEPEND="
-   ${DEPEND}
-   dev-util/shadowman
-   sys-apps/gentoo-functions
-"
-# Needed for eselect calls in pkg_*
-IDEPEND="dev-util/shadowman"
-
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+=" test? ( dev-libs/elfutils )"
-BDEPEND="
-   doc? ( dev-ruby/asciidoctor )
-   verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )
-"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-   "${FILESDIR}"/${PN}-4.0-objdump.patch
-   "${FILESDIR}"/${PN}-4.9-avoid-run-user.patch
-)
-
-src_unp

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/

2024-03-24 Thread Sam James
commit: baacb85f312792e72d5f289d841d78a28e14a05a
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 24 18:02:13 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 24 18:02:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baacb85f

dev-util/ccache: backport fix for distcc

Thanks to satmd for reporting.

Closes: https://bugs.gentoo.org/927740
Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.9.1-r1.ebuild  | 132 
 dev-util/ccache/files/ccache-4.9.1-distcc.patch |  38 +++
 2 files changed, 170 insertions(+)

diff --git a/dev-util/ccache/ccache-4.9.1-r1.ebuild 
b/dev-util/ccache/ccache-4.9.1-r1.ebuild
new file mode 100644
index ..8bac5338f821
--- /dev/null
+++ b/dev-util/ccache/ccache-4.9.1-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# XXX: We don't use CCACHE_* for these vars like we do in e.g. 
cmake/libabigail/qemu
+# because Portage unsets them. Aaaah!
+#
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${MY_DOCS_PREBUILT:=1}
+
+MY_DOCS_PREBUILT_DEV=sam
+MY_DOCS_VERSION=$(ver_cut 1-2)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+MY_DOCS_USEFLAG="+doc"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic prefix verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/";
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
+SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz
 )"
+   MY_DOCS_USEFLAG="doc"
+fi
+
+# https://ccache.dev/license.html
+LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
+LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   app-arch/zstd:=
+   redis? ( dev-libs/hiredis:= )
+"
+RDEPEND="
+   ${DEPEND}
+   dev-util/shadowman
+   sys-apps/gentoo-functions
+"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND="
+   doc? ( dev-ruby/asciidoctor )
+   verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )
+"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+   "${FILESDIR}"/${PN}-4.0-objdump.patch
+   "${FILESDIR}"/${PN}-4.9-avoid-run-user.patch
+   "${FILESDIR}"/${P}-distcc.patch
+)
+
+src_unpack() {
+   # Avoid aborting on the doc tarball
+   if use verify-sig ; then
+   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
+   fi
+
+   default
+}
+
+src_prepare() {
+   cmake_src_prepare
+
+   cp "${FILESDIR}"/ccache-config-3 ccache-config || die
+   eprefixify ccache-config
+}
+
+src_configure() {
+   # Mainly used in tests
+   tc-export CC OBJDUMP
+
+   # Avoid dependency on libstdc++.so. Useful for cases when
+   # we would like to use ccache to build older gcc which injects
+   # into ccache locally built (possibly outdated) libstdc++
+   # See bug #761220 for examples.
+   #
+   # Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
+   use static-c++ && append-ldflags -static-libstdc++
+
+   local mycmakeargs=(
+   -DENABLE_DOCUMENTATION=$(usex doc)
+   -DENABLE_TESTING=$(usex test)
+   -DZSTD_FROM_INTERNET=OFF
+   -DHIREDIS_FROM_INTERNET=OFF
+   -DREDIS_STORAGE_BACKEND=$(usex redis)
+   )
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   dobin ccache-config
+   insinto /usr/share/shadowman/tools
+   newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+
+   # If USE=doc, there'll be newly generated docs which we install instead.
+   if ! use doc && [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+   doman "${WORKDIR}"/${PN}-${MY_DOCS_VERSION}-docs/doc/*.[0-8]
+   fi
+}
+
+pkg_prerm() {
+   if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
+   eselect compiler-shadow

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/

2024-02-07 Thread Sam James
commit: 6cfab692a4eef1b616f6b5fda4592f289e62b42a
Author: Eli Schwartz  gmail  com>
AuthorDate: Wed Feb  7 07:09:32 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb  7 19:20:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cfab692

dev-util/ccache: use prefix.eclass to inject eprefix into ccache-config

It is a slightly simpler ebuild handling, and avoids QA warnings from
iwdevtools when the sed doesn't apply.

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.8.3.ebuild   | 9 -
 dev-util/ccache/ccache-4.9.1.ebuild   | 7 +++
 dev-util/ccache/ccache-4.9.ebuild | 7 +++
 dev-util/ccache/files/ccache-config-3 | 2 +-
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/dev-util/ccache/ccache-4.8.3.ebuild 
b/dev-util/ccache/ccache-4.8.3.ebuild
index 554266100f5b..8c1e04988bf3 100644
--- a/dev-util/ccache/ccache-4.8.3.ebuild
+++ b/dev-util/ccache/ccache-4.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ MY_DOCS_VERSION=$(ver_cut 1-2)
 MY_DOCS_USEFLAG="+doc"
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
+inherit cmake toolchain-funcs flag-o-matic prefix verify-sig
 
 DESCRIPTION="Fast compiler cache"
 HOMEPAGE="https://ccache.dev/";
@@ -78,9 +78,8 @@ src_unpack() {
 src_prepare() {
cmake_src_prepare
 
-   sed \
-   -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-   "${FILESDIR}"/ccache-config-3 > ccache-config || die
+   cp "${FILESDIR}"/ccache-config-3 ccache-config || die
+   eprefixify ccache-config
 }
 
 src_configure() {

diff --git a/dev-util/ccache/ccache-4.9.1.ebuild 
b/dev-util/ccache/ccache-4.9.1.ebuild
index 108c29bbdd7a..73795e42934e 100644
--- a/dev-util/ccache/ccache-4.9.1.ebuild
+++ b/dev-util/ccache/ccache-4.9.1.ebuild
@@ -18,7 +18,7 @@ MY_DOCS_VERSION=$(ver_cut 1-2)
 MY_DOCS_USEFLAG="+doc"
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
+inherit cmake toolchain-funcs flag-o-matic prefix verify-sig
 
 DESCRIPTION="Fast compiler cache"
 HOMEPAGE="https://ccache.dev/";
@@ -78,9 +78,8 @@ src_unpack() {
 src_prepare() {
cmake_src_prepare
 
-   sed \
-   -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-   "${FILESDIR}"/ccache-config-3 > ccache-config || die
+   cp "${FILESDIR}"/ccache-config-3 ccache-config || die
+   eprefixify ccache-config
 }
 
 src_configure() {

diff --git a/dev-util/ccache/ccache-4.9.ebuild 
b/dev-util/ccache/ccache-4.9.ebuild
index 68cf3874b664..ae1a041c2953 100644
--- a/dev-util/ccache/ccache-4.9.ebuild
+++ b/dev-util/ccache/ccache-4.9.ebuild
@@ -18,7 +18,7 @@ MY_DOCS_VERSION=$(ver_cut 1-2)
 MY_DOCS_USEFLAG="+doc"
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
+inherit cmake toolchain-funcs flag-o-matic prefix verify-sig
 
 DESCRIPTION="Fast compiler cache"
 HOMEPAGE="https://ccache.dev/";
@@ -78,9 +78,8 @@ src_unpack() {
 src_prepare() {
cmake_src_prepare
 
-   sed \
-   -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-   "${FILESDIR}"/ccache-config-3 > ccache-config || die
+   cp "${FILESDIR}"/ccache-config-3 ccache-config || die
+   eprefixify ccache-config
 }
 
 src_configure() {

diff --git a/dev-util/ccache/files/ccache-config-3 
b/dev-util/ccache/files/ccache-config-3
index 7f604f0016ef..631d671794d8 100644
--- a/dev-util/ccache/files/ccache-config-3
+++ b/dev-util/ccache/files/ccache-config-3
@@ -11,7 +11,7 @@
 #
 # Additional features to come; this provides a starting point
 
-EPREFIX=''
+EPREFIX='@GENTOO_PORTAGE_EPREFIX@'
 
 . "${EPREFIX}"/lib/gentoo/functions.sh 2>/dev/null || {
ebegin() { echo " * $* ..."; }



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-02-05 Thread Sam James
commit: 77617b3550dbe19246fe953ce1a90d6f706343af
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 07:25:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 07:25:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77617b35

dev-util/ccache: Stabilize 4.9.1 arm64, #923867

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.9.1.ebuild 
b/dev-util/ccache/ccache-4.9.1.ebuild
index 465345b11a3d..f02a32c05b6a 100644
--- a/dev-util/ccache/ccache-4.9.1.ebuild
+++ b/dev-util/ccache/ccache-4.9.1.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-02-05 Thread Sam James
commit: da5ba8c40129258c82143b6de36ec5f27e6ac1b9
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 07:25:06 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 07:25:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da5ba8c4

dev-util/ccache: Stabilize 4.9.1 arm, #923867

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.9.1.ebuild 
b/dev-util/ccache/ccache-4.9.1.ebuild
index 180a2c5da3dd..108c29bbdd7a 100644
--- a/dev-util/ccache/ccache-4.9.1.ebuild
+++ b/dev-util/ccache/ccache-4.9.1.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-02-05 Thread Sam James
commit: 32e37d520338c8dde62f7d87125eeb28f52eafe6
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 07:25:04 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 07:25:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32e37d52

dev-util/ccache: Stabilize 4.9.1 ppc64, #923867

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.9.1.ebuild 
b/dev-util/ccache/ccache-4.9.1.ebuild
index 5dd00665db0b..249e02e7f41a 100644
--- a/dev-util/ccache/ccache-4.9.1.ebuild
+++ b/dev-util/ccache/ccache-4.9.1.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-02-05 Thread Sam James
commit: 305cd0800742173147e7e309def17e70fd56d2b7
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 07:25:05 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 07:25:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=305cd080

dev-util/ccache: Stabilize 4.9.1 sparc, #923867

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.9.1.ebuild 
b/dev-util/ccache/ccache-4.9.1.ebuild
index 249e02e7f41a..180a2c5da3dd 100644
--- a/dev-util/ccache/ccache-4.9.1.ebuild
+++ b/dev-util/ccache/ccache-4.9.1.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-02-05 Thread Sam James
commit: f7b9fbace9d6a0f9ed984fec080eb49889367c61
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 07:25:03 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 07:25:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7b9fbac

dev-util/ccache: Stabilize 4.9.1 ppc, #923867

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.9.1.ebuild 
b/dev-util/ccache/ccache-4.9.1.ebuild
index f02a32c05b6a..5dd00665db0b 100644
--- a/dev-util/ccache/ccache-4.9.1.ebuild
+++ b/dev-util/ccache/ccache-4.9.1.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-02-05 Thread Sam James
commit: e6fa99331d8342d1cb9a1b7ce66f5feb2991c6a9
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 06:47:11 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 06:47:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6fa9933

dev-util/ccache: Stabilize 4.9.1 x86, #923867

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.9.1.ebuild 
b/dev-util/ccache/ccache-4.9.1.ebuild
index 68cf3874b664..1cbfa2a4e056 100644
--- a/dev-util/ccache/ccache-4.9.1.ebuild
+++ b/dev-util/ccache/ccache-4.9.1.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-02-05 Thread Sam James
commit: 3c248afac2edb97e7d086a3703a351029ba964ef
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 06:47:12 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 06:47:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c248afa

dev-util/ccache: Stabilize 4.9.1 amd64, #923867

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.9.1.ebuild 
b/dev-util/ccache/ccache-4.9.1.ebuild
index 1cbfa2a4e056..465345b11a3d 100644
--- a/dev-util/ccache/ccache-4.9.1.ebuild
+++ b/dev-util/ccache/ccache-4.9.1.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2024-02-05 Thread Sam James
commit: 0432cac2c9b4c51168fe743c816014204f4b3ad5
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 05:35:05 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 05:36:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0432cac2

dev-util/ccache: add 4.9.1

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest|   2 +
 dev-util/ccache/ccache-4.9.1.ebuild | 132 
 2 files changed, 134 insertions(+)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index c19c5dff0974..330b7da6e8c5 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -2,5 +2,7 @@ DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B 
e8e00dd10a00670ff3a0c3f5ab0966469fa524
 DIST ccache-4.8.3.tar.xz 569724 BLAKE2B 
53211db0e516eea9739b8f05bf6a3db678b4b5cff7af741469360556da20a320e4a40253ca9e51568045a394d3497b428413ff6cf77f4273aa4906357b427d1f
 SHA512 
e0e344cd215de67fe060b36fb1b902bab61454477624fbe41d2ec57fdd721cec9c8920ca834f0ef0ccfeedb961b17143f18197497557887d88911ff66e330478
 DIST ccache-4.8.3.tar.xz.asc 833 BLAKE2B 
e800b7bdce705db3ced97f0fe008e8391811f9c7c49e815b6cd2cf220cf1107f3941d29d7bcdd10f79da4e6cad9766243e482011aeb5a170e1c5920b6ebdd726
 SHA512 
2e2298a3cf800d9de669f560269bd07ca2b76f761198af10f7174759ea95a23518dedce83f481bdd392bb60adbd736e5dd2c21af88beb761c0f589f685737586
 DIST ccache-4.9-docs.tar.xz 82684 BLAKE2B 
bc3517803cac75a0124358f740e3f4f4b923341277b77cb9ac7649520bbf19a65a51ebf324cc886f98e606bd29681ca3956073a85b737159792e068d529e299c
 SHA512 
870d15dc9e3a0557dfe533862927ff8e90730678439b576e782f79f1f69c5bb499ff4c7e397a7eca059691ec5f89412594e32c74209a58003a6f55002c00d467
+DIST ccache-4.9.1.tar.xz 583764 BLAKE2B 
9ebaf335fda54666e4bfc8f2c402f2b908b3922f3898b6a739b0256481256c6121546021b80fd2dbc93f3aea254db63a8624b97b2820b88e73e502a243bf2562
 SHA512 
5ae4537a7e546b779c80f5adadce1349a84da3a47b255bda06cb2678ee5403307f013c08c8541a21f6f1fb36a0b64bdbcf785fbd2fcfe3009150117250e75b0b
+DIST ccache-4.9.1.tar.xz.asc 833 BLAKE2B 
a157b0c2c032d9a51fb7519f561fac098bbac9ba33fe453b210a6e9a34372b5d00b0fa940d2b783ab0eb48e7bc98707de884b191d83120d9ad8239c9fb76
 SHA512 
43605eca0f9a62565486c6c7ff622fc4d18a400518aa9c9e3c9d865a99c40c63a6a09d42ccd3428d28575c4de8a69be89c93830d26261d3479792e67179d0839
 DIST ccache-4.9.tar.xz 583744 BLAKE2B 
682b491d061452d77d988d7e9e661ed4ce729a40a58370af55e1f24c5e973e4808d7211b4f8b8ab7f9328ecc651c032fa2efd37675566308197c22fd9a776675
 SHA512 
04200e5ceab56fc119f4376189f45fe811409a8022f08e82cd3089e252f350d604d777a237a57651fcd0c20f8ba0f27e4f3cc330a5970d455a696a977408d563
 DIST ccache-4.9.tar.xz.asc 833 BLAKE2B 
ad91919ab45f98d334c9b2d273b8139a2fb64b28a3fdb2a2042beaaa32905978113cd08ff95a009891c6159505431e4c1e0203adca94032feb2a4cee9bd089e2
 SHA512 
2f51d11d00756d099a64a9e5698591385d2c822438123f1c9e753c66e35f4ea9706db3414d7049cb6604defebc72927b6772c4e8a2271e03fb80f815659f90fa

diff --git a/dev-util/ccache/ccache-4.9.1.ebuild 
b/dev-util/ccache/ccache-4.9.1.ebuild
new file mode 100644
index ..68cf3874b664
--- /dev/null
+++ b/dev-util/ccache/ccache-4.9.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# XXX: We don't use CCACHE_* for these vars like we do in e.g. 
cmake/libabigail/qemu
+# because Portage unsets them. Aaaah!
+#
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${MY_DOCS_PREBUILT:=1}
+
+MY_DOCS_PREBUILT_DEV=sam
+MY_DOCS_VERSION=$(ver_cut 1-2)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+MY_DOCS_USEFLAG="+doc"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/";
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
+SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz
 )"
+   MY_DOCS_USEFLAG="doc"
+fi
+
+# https://ccache.dev/license.html
+LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
+LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   app-arch/zstd:=
+   redis? ( dev-libs/hiredis:= )
+"
+RDEPEND="
+   ${DEPEND}
+   dev-util/shadowman
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/, dev-util/ccache/

2024-01-04 Thread Sam James
commit: 65c91a401281c8b9c2145f79a47798812db97666
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 07:31:44 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 07:32:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65c91a40

dev-util/ccache: add 4.9

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest   |   3 +
 dev-util/ccache/ccache-4.9.ebuild  | 132 +
 .../ccache/files/ccache-4.9-avoid-run-user.patch   |  34 ++
 3 files changed, 169 insertions(+)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 904ac1d142c5..c19c5dff0974 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,3 +1,6 @@
 DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B 
e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9
 SHA512 
e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb
 DIST ccache-4.8.3.tar.xz 569724 BLAKE2B 
53211db0e516eea9739b8f05bf6a3db678b4b5cff7af741469360556da20a320e4a40253ca9e51568045a394d3497b428413ff6cf77f4273aa4906357b427d1f
 SHA512 
e0e344cd215de67fe060b36fb1b902bab61454477624fbe41d2ec57fdd721cec9c8920ca834f0ef0ccfeedb961b17143f18197497557887d88911ff66e330478
 DIST ccache-4.8.3.tar.xz.asc 833 BLAKE2B 
e800b7bdce705db3ced97f0fe008e8391811f9c7c49e815b6cd2cf220cf1107f3941d29d7bcdd10f79da4e6cad9766243e482011aeb5a170e1c5920b6ebdd726
 SHA512 
2e2298a3cf800d9de669f560269bd07ca2b76f761198af10f7174759ea95a23518dedce83f481bdd392bb60adbd736e5dd2c21af88beb761c0f589f685737586
+DIST ccache-4.9-docs.tar.xz 82684 BLAKE2B 
bc3517803cac75a0124358f740e3f4f4b923341277b77cb9ac7649520bbf19a65a51ebf324cc886f98e606bd29681ca3956073a85b737159792e068d529e299c
 SHA512 
870d15dc9e3a0557dfe533862927ff8e90730678439b576e782f79f1f69c5bb499ff4c7e397a7eca059691ec5f89412594e32c74209a58003a6f55002c00d467
+DIST ccache-4.9.tar.xz 583744 BLAKE2B 
682b491d061452d77d988d7e9e661ed4ce729a40a58370af55e1f24c5e973e4808d7211b4f8b8ab7f9328ecc651c032fa2efd37675566308197c22fd9a776675
 SHA512 
04200e5ceab56fc119f4376189f45fe811409a8022f08e82cd3089e252f350d604d777a237a57651fcd0c20f8ba0f27e4f3cc330a5970d455a696a977408d563
+DIST ccache-4.9.tar.xz.asc 833 BLAKE2B 
ad91919ab45f98d334c9b2d273b8139a2fb64b28a3fdb2a2042beaaa32905978113cd08ff95a009891c6159505431e4c1e0203adca94032feb2a4cee9bd089e2
 SHA512 
2f51d11d00756d099a64a9e5698591385d2c822438123f1c9e753c66e35f4ea9706db3414d7049cb6604defebc72927b6772c4e8a2271e03fb80f815659f90fa

diff --git a/dev-util/ccache/ccache-4.9.ebuild 
b/dev-util/ccache/ccache-4.9.ebuild
new file mode 100644
index ..68cf3874b664
--- /dev/null
+++ b/dev-util/ccache/ccache-4.9.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# XXX: We don't use CCACHE_* for these vars like we do in e.g. 
cmake/libabigail/qemu
+# because Portage unsets them. Aaaah!
+#
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${MY_DOCS_PREBUILT:=1}
+
+MY_DOCS_PREBUILT_DEV=sam
+MY_DOCS_VERSION=$(ver_cut 1-2)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+MY_DOCS_USEFLAG="+doc"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/";
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
+SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz
 )"
+   MY_DOCS_USEFLAG="doc"
+fi
+
+# https://ccache.dev/license.html
+LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
+LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   app-arch/zstd:=
+   redis? ( dev-libs/hiredis:= )
+"
+RDEPEND="
+   ${DEPEND}
+   dev-util/shadowman
+   sys-apps/gentoo-functions
+"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND="
+   doc? ( dev-ruby/asciidoctor )
+  

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/, dev-util/ccache/

2024-01-04 Thread Sam James
commit: df6c278a22a10718de70ca7d62e89167c562e10c
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 06:55:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 06:55:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df6c278a

dev-util/ccache: drop 4.7.4, 4.8.2

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest   |   4 -
 dev-util/ccache/ccache-4.7.4.ebuild|  91 --
 dev-util/ccache/ccache-4.8.2.ebuild| 131 -
 .../files/ccache-4.8.2-gcc-ice-workaround.patch|  25 
 4 files changed, 251 deletions(-)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 66e431c754da..904ac1d142c5 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,7 +1,3 @@
-DIST ccache-4.7.4.tar.xz 547820 BLAKE2B 
03e03223f0fd6eb001c7d93bcd03a0ef6656ebd3ffcc920b9e772fb68275ddf1e8a941f8f7de68358cbc7a9b9d5aa65e35b91554ff24684f29ff1953aefae75f
 SHA512 
48c663b51e874cfbd8daf0ef9759d025c2605c36da47ebbc77b52ceb941b810436600429f74204f13e2e2e601af6186a4bdb992f8da239f88cb9df4c6c95d58f
-DIST ccache-4.7.4.tar.xz.asc 833 BLAKE2B 
e155f9cb695794a28771a928d50e18705441b9fb9a8ec425aabc78dabcd68caca68ba15f74ba176a73abf414c4ba98b1832da3536fcd87d7c32f2689fe7e1908
 SHA512 
567a051e7c93cd62c8ad7631fea98a6846e2f548aaa201acefbe44d1027f8048cae5ef462488da7ce90864b23a426d524f576472428f93ecbc5cea3ae224b860
 DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B 
e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9
 SHA512 
e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb
-DIST ccache-4.8.2.tar.xz 560888 BLAKE2B 
ca907c16b353fabfb8e6479a076aa5cf791e6150f2b16eabf1817d4955d9b5f0200d4b12527ba0493ad9b2d7567adaaf8416bbff858a66fff5a5687328ab7395
 SHA512 
2edf8da79a9286eb4ed5b6dc2063b55fb97e22a40d1c501c6f17b2f0ce32dfc02e99754afbabbd24fed8312e13e5b8bfc20687d0b5c0cf19fbf64e3adc7bb25b
-DIST ccache-4.8.2.tar.xz.asc 833 BLAKE2B 
ea92ceaf9873a1a8373414bb7ad74f101873cbf3bae2ba1c6986d40018b8f37d2fd7cab8d0bcbdfb7cbd167edf0128edb2a6d61ecce2645018a01d450aae25a9
 SHA512 
6182b7a793d5142c1d9d627b6ea058ac524b6914a85d9628788f7eeea7b762c5422ef6007c404fe9b5d77841b69382289ffb6efbf931c9507940c10bee8ff95f
 DIST ccache-4.8.3.tar.xz 569724 BLAKE2B 
53211db0e516eea9739b8f05bf6a3db678b4b5cff7af741469360556da20a320e4a40253ca9e51568045a394d3497b428413ff6cf77f4273aa4906357b427d1f
 SHA512 
e0e344cd215de67fe060b36fb1b902bab61454477624fbe41d2ec57fdd721cec9c8920ca834f0ef0ccfeedb961b17143f18197497557887d88911ff66e330478
 DIST ccache-4.8.3.tar.xz.asc 833 BLAKE2B 
e800b7bdce705db3ced97f0fe008e8391811f9c7c49e815b6cd2cf220cf1107f3941d29d7bcdd10f79da4e6cad9766243e482011aeb5a170e1c5920b6ebdd726
 SHA512 
2e2298a3cf800d9de669f560269bd07ca2b76f761198af10f7174759ea95a23518dedce83f481bdd392bb60adbd736e5dd2c21af88beb761c0f589f685737586

diff --git a/dev-util/ccache/ccache-4.7.4.ebuild 
b/dev-util/ccache/ccache-4.7.4.ebuild
deleted file mode 100644
index 10b421bb1cec..
--- a/dev-util/ccache/ccache-4.7.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/";
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
-SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="doc redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/zstd:=
-   redis? ( dev-libs/hiredis:= )"
-RDEPEND="${DEPEND}
-   dev-util/shadowman
-   sys-apps/gentoo-functions"
-# Needed for eselect calls in pkg_*
-IDEPEND="dev-util/shadowman"
-
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+=" test? ( dev-libs/elfutils )"
-BDEPEND=" doc? ( dev-ruby/asciidoctor )
-   verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-   "${FILESDIR}"/${PN}-4.0-objdump.patch
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   sed \
-   -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-   "${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_configure() {
-   # Mainly used in tests
-   tc-export CC OBJDUMP
-
-   # Avoid dependency on libstdc++.so. Usef

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-12-23 Thread Arthur Zamarin
commit: 4491cfe52140567f8af69268498a2d6d4a6a7b61
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec 23 19:59:22 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec 23 19:59:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4491cfe5

dev-util/ccache: Stabilize 4.8.3 hppa, #920118

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/ccache/ccache-4.8.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.8.3.ebuild 
b/dev-util/ccache/ccache-4.8.3.ebuild
index 093432d2d3e7..554266100f5b 100644
--- a/dev-util/ccache/ccache-4.8.3.ebuild
+++ b/dev-util/ccache/ccache-4.8.3.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-12-18 Thread Arthur Zamarin
commit: 86893d7c93ae89f207b2b3abd1622772c4777d7b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Dec 18 09:00:47 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Dec 18 09:00:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86893d7c

dev-util/ccache: Stabilize 4.8.3 ppc, #920118

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/ccache/ccache-4.8.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.8.3.ebuild 
b/dev-util/ccache/ccache-4.8.3.ebuild
index 20fbe602cdd9..093432d2d3e7 100644
--- a/dev-util/ccache/ccache-4.8.3.ebuild
+++ b/dev-util/ccache/ccache-4.8.3.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-12-16 Thread Arthur Zamarin
commit: 111b106aca7d010ff354c21b30833f6073fae578
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec 16 19:16:10 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec 16 19:16:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=111b106a

dev-util/ccache: Stabilize 4.8.3 amd64, #920118

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/ccache/ccache-4.8.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.8.3.ebuild 
b/dev-util/ccache/ccache-4.8.3.ebuild
index bbb42f72f272..17aea519483f 100644
--- a/dev-util/ccache/ccache-4.8.3.ebuild
+++ b/dev-util/ccache/ccache-4.8.3.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-12-16 Thread Arthur Zamarin
commit: fe7cf4b65a8233498d00321c790921af34b779ce
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec 16 19:16:11 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec 16 19:16:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe7cf4b6

dev-util/ccache: Stabilize 4.8.3 ppc64, #920118

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/ccache/ccache-4.8.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.8.3.ebuild 
b/dev-util/ccache/ccache-4.8.3.ebuild
index 17aea519483f..20fbe602cdd9 100644
--- a/dev-util/ccache/ccache-4.8.3.ebuild
+++ b/dev-util/ccache/ccache-4.8.3.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-12-16 Thread Sam James
commit: 99ba917c4a96cf3b69b04c120b3ab7e4e14fb336
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 16 11:35:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 16 11:35:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99ba917c

dev-util/ccache: Stabilize 4.8.3 sparc, #920118

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.8.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.8.3.ebuild 
b/dev-util/ccache/ccache-4.8.3.ebuild
index cf6a39c85fac..db35d2e50c74 100644
--- a/dev-util/ccache/ccache-4.8.3.ebuild
+++ b/dev-util/ccache/ccache-4.8.3.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-12-16 Thread Sam James
commit: 9849108b5785253b9b5724f8fc183aec898bf369
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 16 11:33:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 16 11:33:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9849108b

dev-util/ccache: Stabilize 4.8.3 arm, #920118

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.8.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.8.3.ebuild 
b/dev-util/ccache/ccache-4.8.3.ebuild
index ec8d8fb12fba..cf6a39c85fac 100644
--- a/dev-util/ccache/ccache-4.8.3.ebuild
+++ b/dev-util/ccache/ccache-4.8.3.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-12-16 Thread Arthur Zamarin
commit: de21e745dab8544691b29266b6723fbb6a70b921
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec 16 11:29:45 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec 16 11:29:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de21e745

dev-util/ccache: Stabilize 4.8.3 arm64, #920118

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/ccache/ccache-4.8.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.8.3.ebuild 
b/dev-util/ccache/ccache-4.8.3.ebuild
index d89d4c4b2486..ec8d8fb12fba 100644
--- a/dev-util/ccache/ccache-4.8.3.ebuild
+++ b/dev-util/ccache/ccache-4.8.3.ebuild
@@ -33,7 +33,7 @@ fi
 LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-10-02 Thread Sam James
commit: 497cc2f3d8a140be47f776757c399825fda5f5d3
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct  2 17:26:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct  2 17:26:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=497cc2f3

dev-util/ccache: Stabilize 4.8.2 hppa, #909282

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.8.2.ebuild 
b/dev-util/ccache/ccache-4.8.2.ebuild
index 8ec5b78da959..9bc2873389e3 100644
--- a/dev-util/ccache/ccache-4.8.2.ebuild
+++ b/dev-util/ccache/ccache-4.8.2.ebuild
@@ -31,7 +31,7 @@ fi
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-08-29 Thread Sam James
commit: 177b45204790210bc1beab2ba5b7e3e8f572e741
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 29 23:19:15 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 29 23:19:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=177b4520

dev-util/ccache: add 4.8.3

Closes: https://bugs.gentoo.org/912389
Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest|   2 +
 dev-util/ccache/ccache-4.8.3.ebuild | 132 
 2 files changed, 134 insertions(+)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 51c3658ed51d..66e431c754da 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -3,3 +3,5 @@ DIST ccache-4.7.4.tar.xz.asc 833 BLAKE2B 
e155f9cb695794a28771a928d50e18705441b9f
 DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B 
e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9
 SHA512 
e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb
 DIST ccache-4.8.2.tar.xz 560888 BLAKE2B 
ca907c16b353fabfb8e6479a076aa5cf791e6150f2b16eabf1817d4955d9b5f0200d4b12527ba0493ad9b2d7567adaaf8416bbff858a66fff5a5687328ab7395
 SHA512 
2edf8da79a9286eb4ed5b6dc2063b55fb97e22a40d1c501c6f17b2f0ce32dfc02e99754afbabbd24fed8312e13e5b8bfc20687d0b5c0cf19fbf64e3adc7bb25b
 DIST ccache-4.8.2.tar.xz.asc 833 BLAKE2B 
ea92ceaf9873a1a8373414bb7ad74f101873cbf3bae2ba1c6986d40018b8f37d2fd7cab8d0bcbdfb7cbd167edf0128edb2a6d61ecce2645018a01d450aae25a9
 SHA512 
6182b7a793d5142c1d9d627b6ea058ac524b6914a85d9628788f7eeea7b762c5422ef6007c404fe9b5d77841b69382289ffb6efbf931c9507940c10bee8ff95f
+DIST ccache-4.8.3.tar.xz 569724 BLAKE2B 
53211db0e516eea9739b8f05bf6a3db678b4b5cff7af741469360556da20a320e4a40253ca9e51568045a394d3497b428413ff6cf77f4273aa4906357b427d1f
 SHA512 
e0e344cd215de67fe060b36fb1b902bab61454477624fbe41d2ec57fdd721cec9c8920ca834f0ef0ccfeedb961b17143f18197497557887d88911ff66e330478
+DIST ccache-4.8.3.tar.xz.asc 833 BLAKE2B 
e800b7bdce705db3ced97f0fe008e8391811f9c7c49e815b6cd2cf220cf1107f3941d29d7bcdd10f79da4e6cad9766243e482011aeb5a170e1c5920b6ebdd726
 SHA512 
2e2298a3cf800d9de669f560269bd07ca2b76f761198af10f7174759ea95a23518dedce83f481bdd392bb60adbd736e5dd2c21af88beb761c0f589f685737586

diff --git a/dev-util/ccache/ccache-4.8.3.ebuild 
b/dev-util/ccache/ccache-4.8.3.ebuild
new file mode 100644
index ..b514b4aee0cb
--- /dev/null
+++ b/dev-util/ccache/ccache-4.8.3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# XXX: We don't use CCACHE_* for these vars like we do in e.g. 
cmake/libabigail/qemu
+# because Portage unsets them. Aaaah!
+#
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${MY_DOCS_PREBUILT:=1}
+
+MY_DOCS_PREBUILT_DEV=sam
+MY_DOCS_VERSION=$(ver_cut 1-2)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+MY_DOCS_USEFLAG="+doc"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/";
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
+SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz
 )"
+   MY_DOCS_USEFLAG="doc"
+fi
+
+# https://ccache.dev/license.html
+LICENSE="GPL-3+ GPL-3 MIT BSD Boost-1.0 BSD-2 || ( CC0-1.0 Apache-2.0 )"
+LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   app-arch/zstd:=
+   redis? ( dev-libs/hiredis:= )
+"
+RDEPEND="
+   ${DEPEND}
+   dev-util/shadowman
+   sys-apps/gentoo-functions
+"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND="
+   doc? ( dev-ruby/asciidoctor )
+   verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )
+"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+   "${FILESDIR}"/${PN}-4.0-objdump.patch
+   "${FIL

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/, dev-util/ccache/

2023-08-07 Thread Sam James
commit: c1683082f6735325895ab84e5d16801dc7fad2f5
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug  8 02:09:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug  8 02:09:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1683082

dev-util/ccache: backport ICE workaround

Already fixed in stable GCC but let's backport as it makes life easier for
people.

Bug: https://bugs.gentoo.org/906310
Bug: https://bugs.gentoo.org/906942
Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.8.2.ebuild|  1 +
 .../files/ccache-4.8.2-gcc-ice-workaround.patch| 25 ++
 2 files changed, 26 insertions(+)

diff --git a/dev-util/ccache/ccache-4.8.2.ebuild 
b/dev-util/ccache/ccache-4.8.2.ebuild
index 782242e5b788..8ec5b78da959 100644
--- a/dev-util/ccache/ccache-4.8.2.ebuild
+++ b/dev-util/ccache/ccache-4.8.2.ebuild
@@ -62,6 +62,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
"${FILESDIR}"/${PN}-4.0-objdump.patch
"${FILESDIR}"/${PN}-4.8-avoid-run-user.patch
+   "${FILESDIR}"/${P}-gcc-ice-workaround.patch
 )
 
 src_unpack() {

diff --git a/dev-util/ccache/files/ccache-4.8.2-gcc-ice-workaround.patch 
b/dev-util/ccache/files/ccache-4.8.2-gcc-ice-workaround.patch
new file mode 100644
index ..a638930ad6ad
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.8.2-gcc-ice-workaround.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/906310
+https://bugs.gentoo.org/906942
+https://github.com/ccache/ccache/issues/1289
+https://github.com/ccache/ccache/commit/689168c292f1ed26c5f4a3070aeb649dad7facb5
+
+From 689168c292f1ed26c5f4a3070aeb649dad7facb5 Mon Sep 17 00:00:00 2001
+From: Joel Rosdahl 
+Date: Tue, 1 Aug 2023 12:30:12 +0200
+Subject: [PATCH] fix: Work around GCC 12.3 bug 109241
+
+See also #1289.
+--- a/src/storage/local/LocalStorage.cpp
 b/src/storage/local/LocalStorage.cpp
+@@ -854,7 +854,9 @@ LocalStorage::recompress(const std::optional level,
+   auto l2_content_lock = get_level_2_content_lock(l1_index, l2_index);
+   l2_content_lock.make_long_lived(lock_manager);
+   if (!l2_content_lock.acquire()) {
+-LOG("Failed to acquire content lock for {}/{}", l1_index, 
l2_index);
++// LOG_RAW+fmt::format instead of LOG due to GCC 12.3 bug #109241
++LOG_RAW(fmt::format(
++  "Failed to acquire content lock for {}/{}", l1_index, 
l2_index));
+ return;
+   }
+ 
+



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-06-28 Thread Sam James
commit: b3eb434c402ae30cf43fce95ab243ba1d2936c9d
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 29 06:17:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 29 06:17:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3eb434c

dev-util/ccache: drop stale comment

The comment was for 4.8.1, 4.8.2 is fine.

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.8.2.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.8.2.ebuild 
b/dev-util/ccache/ccache-4.8.2.ebuild
index ddc3a66e3166..8c88659460ae 100644
--- a/dev-util/ccache/ccache-4.8.2.ebuild
+++ b/dev-util/ccache/ccache-4.8.2.ebuild
@@ -31,7 +31,6 @@ fi
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-# Unkeyworded for now because of failing tests: 
https://github.com/ccache/ccache/issues/1288
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-06-27 Thread Sam James
commit: 67f378a716891285ecf6648d637f205d6f88cbcf
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 27 11:28:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 27 11:28:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67f378a7

dev-util/ccache: Stabilize 4.8.2 ppc64, #909282

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.8.2.ebuild 
b/dev-util/ccache/ccache-4.8.2.ebuild
index 92277415cd10..ddc3a66e3166 100644
--- a/dev-util/ccache/ccache-4.8.2.ebuild
+++ b/dev-util/ccache/ccache-4.8.2.ebuild
@@ -32,7 +32,7 @@ fi
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 # Unkeyworded for now because of failing tests: 
https://github.com/ccache/ccache/issues/1288
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-06-27 Thread Sam James
commit: b8c1464de49b9d4664832f29f5bd103ddc935ec4
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 27 10:08:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 27 10:08:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8c1464d

dev-util/ccache: Stabilize 4.8.2 amd64, #909282

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.8.2.ebuild 
b/dev-util/ccache/ccache-4.8.2.ebuild
index cd1c2bbeb603..92277415cd10 100644
--- a/dev-util/ccache/ccache-4.8.2.ebuild
+++ b/dev-util/ccache/ccache-4.8.2.ebuild
@@ -32,7 +32,7 @@ fi
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 # Unkeyworded for now because of failing tests: 
https://github.com/ccache/ccache/issues/1288
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-06-27 Thread Jakov Smolić
commit: 717bfa8bbcd29491c128d80caadd2c5461f6887f
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Jun 27 09:08:04 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Jun 27 09:08:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=717bfa8b

dev-util/ccache: Stabilize 4.8.2 x86, #909282

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/ccache/ccache-4.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.8.2.ebuild 
b/dev-util/ccache/ccache-4.8.2.ebuild
index d656dbd6af04..cd1c2bbeb603 100644
--- a/dev-util/ccache/ccache-4.8.2.ebuild
+++ b/dev-util/ccache/ccache-4.8.2.ebuild
@@ -32,7 +32,7 @@ fi
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 # Unkeyworded for now because of failing tests: 
https://github.com/ccache/ccache/issues/1288
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-06-27 Thread Jakov Smolić
commit: 88beb27d5273e4e823c55f900aa7d211efbd3395
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Jun 27 09:08:03 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Jun 27 09:08:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88beb27d

dev-util/ccache: Stabilize 4.8.2 ppc, #909282

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/ccache/ccache-4.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.8.2.ebuild 
b/dev-util/ccache/ccache-4.8.2.ebuild
index d2fe267de2c8..d656dbd6af04 100644
--- a/dev-util/ccache/ccache-4.8.2.ebuild
+++ b/dev-util/ccache/ccache-4.8.2.ebuild
@@ -32,7 +32,7 @@ fi
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 # Unkeyworded for now because of failing tests: 
https://github.com/ccache/ccache/issues/1288
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-06-27 Thread Sam James
commit: d557b7b78afc772d3e23a99afbdf9a387cc9446a
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 27 08:04:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 27 08:04:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d557b7b7

dev-util/ccache: Stabilize 4.8.2 sparc, #909282

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.8.2.ebuild 
b/dev-util/ccache/ccache-4.8.2.ebuild
index 72f08e4af2e8..d2fe267de2c8 100644
--- a/dev-util/ccache/ccache-4.8.2.ebuild
+++ b/dev-util/ccache/ccache-4.8.2.ebuild
@@ -32,7 +32,7 @@ fi
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 # Unkeyworded for now because of failing tests: 
https://github.com/ccache/ccache/issues/1288
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-06-27 Thread Sam James
commit: 8c4f5bd33df77c71b5581af8a2eed8783c36a48e
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 27 07:58:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 27 07:58:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c4f5bd3

dev-util/ccache: Stabilize 4.8.2 arm64, #909282

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.8.2.ebuild 
b/dev-util/ccache/ccache-4.8.2.ebuild
index 3ab1a30b536e..72f08e4af2e8 100644
--- a/dev-util/ccache/ccache-4.8.2.ebuild
+++ b/dev-util/ccache/ccache-4.8.2.ebuild
@@ -32,7 +32,7 @@ fi
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 # Unkeyworded for now because of failing tests: 
https://github.com/ccache/ccache/issues/1288
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/, dev-util/ccache/

2023-06-13 Thread Sam James
commit: c53ba48e6c2b55a955ea41aaabe242b880276d5f
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 13 18:11:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 13 18:11:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c53ba48e

dev-util/ccache: drop 4.6.3

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest   |  2 -
 dev-util/ccache/ccache-4.6.3.ebuild| 93 --
 .../ccache/files/ccache-4.6.2-avoid-run-user.patch | 30 ---
 3 files changed, 125 deletions(-)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index c458a2ad7b68..e230e1cec10a 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,5 +1,3 @@
-DIST ccache-4.6.3.tar.xz 531184 BLAKE2B 
b23c22876cd3f31bcd67b9120fd5e605441508478f40267d654a281c00e28e3021b135cda04ace6da9fb39d3c144c92a259e69287be73043730240f32982b6a9
 SHA512 
b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966
-DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 
064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e
 SHA512 
ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
 DIST ccache-4.7.4.tar.xz 547820 BLAKE2B 
03e03223f0fd6eb001c7d93bcd03a0ef6656ebd3ffcc920b9e772fb68275ddf1e8a941f8f7de68358cbc7a9b9d5aa65e35b91554ff24684f29ff1953aefae75f
 SHA512 
48c663b51e874cfbd8daf0ef9759d025c2605c36da47ebbc77b52ceb941b810436600429f74204f13e2e2e601af6186a4bdb992f8da239f88cb9df4c6c95d58f
 DIST ccache-4.7.4.tar.xz.asc 833 BLAKE2B 
e155f9cb695794a28771a928d50e18705441b9fb9a8ec425aabc78dabcd68caca68ba15f74ba176a73abf414c4ba98b1832da3536fcd87d7c32f2689fe7e1908
 SHA512 
567a051e7c93cd62c8ad7631fea98a6846e2f548aaa201acefbe44d1027f8048cae5ef462488da7ce90864b23a426d524f576472428f93ecbc5cea3ae224b860
 DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B 
e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9
 SHA512 
e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb

diff --git a/dev-util/ccache/ccache-4.6.3.ebuild 
b/dev-util/ccache/ccache-4.6.3.ebuild
deleted file mode 100644
index 269b9595497c..
--- a/dev-util/ccache/ccache-4.6.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/";
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
-SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="doc redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/zstd:=
-   redis? ( dev-libs/hiredis:= )"
-RDEPEND="${DEPEND}
-   dev-util/shadowman
-   sys-apps/gentoo-functions"
-# Needed for eselect calls in pkg_*
-IDEPEND="dev-util/shadowman"
-
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+=" test? ( dev-libs/elfutils )"
-BDEPEND=" doc? ( dev-ruby/asciidoctor )
-   verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-   "${FILESDIR}"/${PN}-4.0-objdump.patch
-   "${FILESDIR}"/${PN}-4.6.2-avoid-run-user.patch
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   sed \
-   -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-   "${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_configure() {
-   # Mainly used in tests
-   tc-export CC OBJDUMP
-
-   # Avoid dependency on libstdc++.so. Useful for cases when
-   # we would like to use ccache to build older gcc which injects
-   # into ccache locally built (possibly outdated) libstdc++
-   # See bug #761220 for examples.
-   #
-   # Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
-   use static-c++ && append-ldflags -static-libstdc++
-
-   local mycmakeargs=(
-   -DENABLE_DOCUMENTATION=$(usex doc)
-   -DENABLE_TESTING=$(usex test)
-   -DZSTD_FROM_INTERNET=OFF
-   -DREDIS_STORAGE_BACKEND=$(usex redis)
-   )
-
-   use redis && mycmakeargs+=( -DHIREDIS_FROM_INTER

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-06-13 Thread Sam James
commit: 807e157f8ae0fd672e9f2dac1bdc199dceef392c
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 13 18:11:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 13 18:11:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=807e157f

dev-util/ccache: drop 4.8-r1, 4.8-r2

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest |   2 -
 dev-util/ccache/ccache-4.8-r1.ebuild | 129 --
 dev-util/ccache/ccache-4.8-r2.ebuild | 130 ---
 3 files changed, 261 deletions(-)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index e230e1cec10a..51c3658ed51d 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -3,5 +3,3 @@ DIST ccache-4.7.4.tar.xz.asc 833 BLAKE2B 
e155f9cb695794a28771a928d50e18705441b9f
 DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B 
e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9
 SHA512 
e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb
 DIST ccache-4.8.2.tar.xz 560888 BLAKE2B 
ca907c16b353fabfb8e6479a076aa5cf791e6150f2b16eabf1817d4955d9b5f0200d4b12527ba0493ad9b2d7567adaaf8416bbff858a66fff5a5687328ab7395
 SHA512 
2edf8da79a9286eb4ed5b6dc2063b55fb97e22a40d1c501c6f17b2f0ce32dfc02e99754afbabbd24fed8312e13e5b8bfc20687d0b5c0cf19fbf64e3adc7bb25b
 DIST ccache-4.8.2.tar.xz.asc 833 BLAKE2B 
ea92ceaf9873a1a8373414bb7ad74f101873cbf3bae2ba1c6986d40018b8f37d2fd7cab8d0bcbdfb7cbd167edf0128edb2a6d61ecce2645018a01d450aae25a9
 SHA512 
6182b7a793d5142c1d9d627b6ea058ac524b6914a85d9628788f7eeea7b762c5422ef6007c404fe9b5d77841b69382289ffb6efbf931c9507940c10bee8ff95f
-DIST ccache-4.8.tar.xz 556804 BLAKE2B 
5cca7d49088c5391abf93a2a493ba8e120575ae834abae86f3669e8c883a93ec29d48ab934aa086a87feb6a08d0c0053b3ce7174cec2f342c2d695a93fa3ef9a
 SHA512 
561424d448a049971742b846429c2fa5f1df43c05f201610dab0a3fab7e4806589c14ca20875cb5733763603c0813fe9350a244b63dda03e9def95d547738d0b
-DIST ccache-4.8.tar.xz.asc 833 BLAKE2B 
4a646db5b7a220a21ad93a02ea4bad23a666ad116af70211ea4a9a546ba7aeaf0c1c88c79d264f614a2ca5387dc91bf655a1632f53889dd74f49e085e2f6bd01
 SHA512 
22b6aeb54248576a1199e173db7b58b985bdc4e6a298e9fbd32992ab6dbadcd4496ffcadc24241215bd43166b68faf77aa3e492e44ffeac53e1e5e4c46015836

diff --git a/dev-util/ccache/ccache-4.8-r1.ebuild 
b/dev-util/ccache/ccache-4.8-r1.ebuild
deleted file mode 100644
index 670205fedd4d..
--- a/dev-util/ccache/ccache-4.8-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# XXX: We don't use CCACHE_* for these vars like we do in e.g. 
cmake/libabigail/qemu
-# because Portage unsets them. Aaaah!
-#
-# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${MY_DOCS_PREBUILT:=1}
-
-MY_DOCS_PREBUILT_DEV=sam
-MY_DOCS_VERSION=$(ver_cut 1-2)
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# See bug #784815
-MY_DOCS_USEFLAG="+doc"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/";
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
-SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
-   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz
 )"
-   MY_DOCS_USEFLAG="doc"
-fi
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-   app-arch/zstd:=
-   redis? ( dev-libs/hiredis:= )
-"
-RDEPEND="
-   ${DEPEND}
-   dev-util/shadowman
-   sys-apps/gentoo-functions
-"
-# Needed for eselect calls in pkg_*
-IDEPEND="dev-util/shadowman"
-
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+=" test? ( dev-libs/elfutils )"
-BDEPEND="
-   doc? ( dev-ruby/asciidoctor )
-   verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )
-"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-   "${FILESDIR}"/${PN}-4.0-objdump.patch
-)
-
-src_unpack() {
-   # Avoid aborting on the doc tarball
-   if use verify-sig ; 

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/

2023-06-13 Thread Sam James
commit: 48e3b0e6647efb18f9573f1467ffc5abaaf8a11f
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Jun 13 16:43:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 13 18:05:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48e3b0e6

dev-util/ccache: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31423
Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/files/ccache-4.8.1-test-typo.patch | 20 
 1 file changed, 20 deletions(-)

diff --git a/dev-util/ccache/files/ccache-4.8.1-test-typo.patch 
b/dev-util/ccache/files/ccache-4.8.1-test-typo.patch
deleted file mode 100644
index f557d24e6e93..
--- a/dev-util/ccache/files/ccache-4.8.1-test-typo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/ccache/ccache/pull/1287
-
-From efad3d7c1d18a260b694904fe695e6abd7dfd4df Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Sat, 20 May 2023 05:30:54 +0100
-Subject: [PATCH] test: Fix typo (missing line continuation)
-
-Fixes: ef634bdb292e1e24b8d1b5490e7857144a77c0fd
 a/test/suites/base.bash
-+++ b/test/suites/base.bash
-@@ -552,7 +552,7 @@ fi
- # 
-
- TEST "Directory is not hashed if using -gz"
- 
--if $COMPILER -c test1.c -gz 2>/dev/null
-+if $COMPILER -c test1.c -gz 2>/dev/null \
-&& $COMPILER -E test1.c -gz >preprocessed.i 2>/dev/null \
-&& [ -s preprocessed.i ] \
-&& ! grep -Fq $PWD preprocessed.i; then
-



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-06-12 Thread Sam James
commit: 1344dea8b7137c79bfb8fa33892a6a911a4bb099
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 12 20:39:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 12 20:39:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1344dea8

dev-util/ccache: add 4.8.2, drop 4.8.1

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest | 4 ++--
 dev-util/ccache/{ccache-4.8.1.ebuild => ccache-4.8.2.ebuild} | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index b6ee9a4aee5a..c458a2ad7b68 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -3,7 +3,7 @@ DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 
064d7bdf474540992180372c4c011b5bdeb9883
 DIST ccache-4.7.4.tar.xz 547820 BLAKE2B 
03e03223f0fd6eb001c7d93bcd03a0ef6656ebd3ffcc920b9e772fb68275ddf1e8a941f8f7de68358cbc7a9b9d5aa65e35b91554ff24684f29ff1953aefae75f
 SHA512 
48c663b51e874cfbd8daf0ef9759d025c2605c36da47ebbc77b52ceb941b810436600429f74204f13e2e2e601af6186a4bdb992f8da239f88cb9df4c6c95d58f
 DIST ccache-4.7.4.tar.xz.asc 833 BLAKE2B 
e155f9cb695794a28771a928d50e18705441b9fb9a8ec425aabc78dabcd68caca68ba15f74ba176a73abf414c4ba98b1832da3536fcd87d7c32f2689fe7e1908
 SHA512 
567a051e7c93cd62c8ad7631fea98a6846e2f548aaa201acefbe44d1027f8048cae5ef462488da7ce90864b23a426d524f576472428f93ecbc5cea3ae224b860
 DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B 
e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9
 SHA512 
e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb
-DIST ccache-4.8.1.tar.xz 559628 BLAKE2B 
01c676447aff5493f319df8360b5478b171a229dc47068bfda814bd30afeb28492a3b112532dbe93cf89d47796f4d682e37b22a1d1c31aaf46023e4f7682d80c
 SHA512 
672971560a8aed7754c4280b8983fb185bc7f7f456651e952db3e32fb855ba430c7dcec1f45466e4d10aa59e80e30696f540d93b5f260a846a49dbf4901de514
-DIST ccache-4.8.1.tar.xz.asc 833 BLAKE2B 
948ef7d7965717f42f27ee0858c36b2d6272629f190ddf96f7882463304cc103bd70aebda739686fd6176024356c8998d58642ef1d3b0e7943ef7898496ab689
 SHA512 
c89af05eec3eee8001098c77b27d67b084af06f406af32aafe71f11a2592df86bfe7ac58283749bb7ab3401046312da129c7262230a1a3f892b81946227dd0ad
+DIST ccache-4.8.2.tar.xz 560888 BLAKE2B 
ca907c16b353fabfb8e6479a076aa5cf791e6150f2b16eabf1817d4955d9b5f0200d4b12527ba0493ad9b2d7567adaaf8416bbff858a66fff5a5687328ab7395
 SHA512 
2edf8da79a9286eb4ed5b6dc2063b55fb97e22a40d1c501c6f17b2f0ce32dfc02e99754afbabbd24fed8312e13e5b8bfc20687d0b5c0cf19fbf64e3adc7bb25b
+DIST ccache-4.8.2.tar.xz.asc 833 BLAKE2B 
ea92ceaf9873a1a8373414bb7ad74f101873cbf3bae2ba1c6986d40018b8f37d2fd7cab8d0bcbdfb7cbd167edf0128edb2a6d61ecce2645018a01d450aae25a9
 SHA512 
6182b7a793d5142c1d9d627b6ea058ac524b6914a85d9628788f7eeea7b762c5422ef6007c404fe9b5d77841b69382289ffb6efbf931c9507940c10bee8ff95f
 DIST ccache-4.8.tar.xz 556804 BLAKE2B 
5cca7d49088c5391abf93a2a493ba8e120575ae834abae86f3669e8c883a93ec29d48ab934aa086a87feb6a08d0c0053b3ce7174cec2f342c2d695a93fa3ef9a
 SHA512 
561424d448a049971742b846429c2fa5f1df43c05f201610dab0a3fab7e4806589c14ca20875cb5733763603c0813fe9350a244b63dda03e9def95d547738d0b
 DIST ccache-4.8.tar.xz.asc 833 BLAKE2B 
4a646db5b7a220a21ad93a02ea4bad23a666ad116af70211ea4a9a546ba7aeaf0c1c88c79d264f614a2ca5387dc91bf655a1632f53889dd74f49e085e2f6bd01
 SHA512 
22b6aeb54248576a1199e173db7b58b985bdc4e6a298e9fbd32992ab6dbadcd4496ffcadc24241215bd43166b68faf77aa3e492e44ffeac53e1e5e4c46015836

diff --git a/dev-util/ccache/ccache-4.8.1.ebuild 
b/dev-util/ccache/ccache-4.8.2.ebuild
similarity index 96%
rename from dev-util/ccache/ccache-4.8.1.ebuild
rename to dev-util/ccache/ccache-4.8.2.ebuild
index 37009fdc79b4..3ab1a30b536e 100644
--- a/dev-util/ccache/ccache-4.8.1.ebuild
+++ b/dev-util/ccache/ccache-4.8.2.ebuild
@@ -32,7 +32,7 @@ fi
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 # Unkeyworded for now because of failing tests: 
https://github.com/ccache/ccache/issues/1288
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"
@@ -63,7 +63,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
"${FILESDIR}"/${PN}-4.0-objdump.patch
"${FILESDIR}"/${PN}-4.8-avoid-run-user.patch
-   "${FILESDIR}"/${P}-test-typo.patch
 )
 
 src_unpack() {



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/

2023-05-22 Thread Conrad Kostecki
commit: f042e243123fc221abc67206e714f12a12fece7b
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue May 16 16:10:49 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon May 22 21:25:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f042e243

dev-util/ccache: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31062
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../ccache/files/ccache-4.1-avoid-run-user.patch   | 24 --
 1 file changed, 24 deletions(-)

diff --git a/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch 
b/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch
deleted file mode 100644
index b1d0837ef3e0..
--- a/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Gentoo's sandbox does not whitelist this path by default yet.
-TODO: bug link.
-
-(4.1 update:
-https://github.com/ccache/ccache/issues/984
-https://github.com/ccache/ccache/issues/1044
-https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
-https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68)
-
-Until we have a sandbox whitelisting the path let's rely on ccache's default.
 a/src/Config.cpp
-+++ b/src/Config.cpp
-@@ -885,11 +885,5 @@ Config::check_key_tables_consistency()
- std::string
- Config::default_temporary_dir(const std::string& cache_dir)
- {
--#ifdef HAVE_GETEUID
--  std::string user_tmp_dir = FMT("/run/user/{}", geteuid());
--  if (Stat::stat(user_tmp_dir).is_directory()) {
--return user_tmp_dir + "/ccache-tmp";
--  }
--#endif
-   return cache_dir + "/tmp";
- }



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/

2023-05-19 Thread Sam James
commit: ea57ee3c758c766e209d0d11b372d314ce924fc4
Author: Sam James  gentoo  org>
AuthorDate: Sat May 20 04:39:14 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 20 04:39:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea57ee3c

dev-util/ccache: add 4.8.1 (unkeyworded)

unkw'd b/c of failing tests. Reported upstream at 
https://github.com/ccache/ccache/issues/1288.

I suspect ccache is actually fine though and it's just doctest.

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest   |   2 +
 dev-util/ccache/ccache-4.8.1.ebuild| 132 +
 dev-util/ccache/files/ccache-4.8.1-test-typo.patch |  20 
 3 files changed, 154 insertions(+)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index c6ab7452145f..b6ee9a4aee5a 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -3,5 +3,7 @@ DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 
064d7bdf474540992180372c4c011b5bdeb9883
 DIST ccache-4.7.4.tar.xz 547820 BLAKE2B 
03e03223f0fd6eb001c7d93bcd03a0ef6656ebd3ffcc920b9e772fb68275ddf1e8a941f8f7de68358cbc7a9b9d5aa65e35b91554ff24684f29ff1953aefae75f
 SHA512 
48c663b51e874cfbd8daf0ef9759d025c2605c36da47ebbc77b52ceb941b810436600429f74204f13e2e2e601af6186a4bdb992f8da239f88cb9df4c6c95d58f
 DIST ccache-4.7.4.tar.xz.asc 833 BLAKE2B 
e155f9cb695794a28771a928d50e18705441b9fb9a8ec425aabc78dabcd68caca68ba15f74ba176a73abf414c4ba98b1832da3536fcd87d7c32f2689fe7e1908
 SHA512 
567a051e7c93cd62c8ad7631fea98a6846e2f548aaa201acefbe44d1027f8048cae5ef462488da7ce90864b23a426d524f576472428f93ecbc5cea3ae224b860
 DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B 
e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9
 SHA512 
e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb
+DIST ccache-4.8.1.tar.xz 559628 BLAKE2B 
01c676447aff5493f319df8360b5478b171a229dc47068bfda814bd30afeb28492a3b112532dbe93cf89d47796f4d682e37b22a1d1c31aaf46023e4f7682d80c
 SHA512 
672971560a8aed7754c4280b8983fb185bc7f7f456651e952db3e32fb855ba430c7dcec1f45466e4d10aa59e80e30696f540d93b5f260a846a49dbf4901de514
+DIST ccache-4.8.1.tar.xz.asc 833 BLAKE2B 
948ef7d7965717f42f27ee0858c36b2d6272629f190ddf96f7882463304cc103bd70aebda739686fd6176024356c8998d58642ef1d3b0e7943ef7898496ab689
 SHA512 
c89af05eec3eee8001098c77b27d67b084af06f406af32aafe71f11a2592df86bfe7ac58283749bb7ab3401046312da129c7262230a1a3f892b81946227dd0ad
 DIST ccache-4.8.tar.xz 556804 BLAKE2B 
5cca7d49088c5391abf93a2a493ba8e120575ae834abae86f3669e8c883a93ec29d48ab934aa086a87feb6a08d0c0053b3ce7174cec2f342c2d695a93fa3ef9a
 SHA512 
561424d448a049971742b846429c2fa5f1df43c05f201610dab0a3fab7e4806589c14ca20875cb5733763603c0813fe9350a244b63dda03e9def95d547738d0b
 DIST ccache-4.8.tar.xz.asc 833 BLAKE2B 
4a646db5b7a220a21ad93a02ea4bad23a666ad116af70211ea4a9a546ba7aeaf0c1c88c79d264f614a2ca5387dc91bf655a1632f53889dd74f49e085e2f6bd01
 SHA512 
22b6aeb54248576a1199e173db7b58b985bdc4e6a298e9fbd32992ab6dbadcd4496ffcadc24241215bd43166b68faf77aa3e492e44ffeac53e1e5e4c46015836

diff --git a/dev-util/ccache/ccache-4.8.1.ebuild 
b/dev-util/ccache/ccache-4.8.1.ebuild
new file mode 100644
index ..37009fdc79b4
--- /dev/null
+++ b/dev-util/ccache/ccache-4.8.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# XXX: We don't use CCACHE_* for these vars like we do in e.g. 
cmake/libabigail/qemu
+# because Portage unsets them. Aaaah!
+#
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${MY_DOCS_PREBUILT:=1}
+
+MY_DOCS_PREBUILT_DEV=sam
+MY_DOCS_VERSION=$(ver_cut 1-2)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+MY_DOCS_USEFLAG="+doc"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/";
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
+SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz
 )"
+   MY_DOCS_USEFLAG="doc"
+fi
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+# Unkeyworded for now because of failing tests: 
https://github.com/ccache/ccache/issues/1288
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bu

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/

2023-05-16 Thread Sam James
commit: 257fc52ad8a0d9fa867ed72b9e714dfe5f478555
Author: Sam James  gentoo  org>
AuthorDate: Wed May 17 04:00:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 17 04:01:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=257fc52a

dev-util/ccache: avoid /run usage (again)

Closes: https://bugs.gentoo.org/883799
Closes: https://bugs.gentoo.org/887019
Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.8-r2.ebuild   | 130 +
 .../ccache/files/ccache-4.8-avoid-run-user.patch   |  34 ++
 2 files changed, 164 insertions(+)

diff --git a/dev-util/ccache/ccache-4.8-r2.ebuild 
b/dev-util/ccache/ccache-4.8-r2.ebuild
new file mode 100644
index ..1702d6d4b968
--- /dev/null
+++ b/dev-util/ccache/ccache-4.8-r2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# XXX: We don't use CCACHE_* for these vars like we do in e.g. 
cmake/libabigail/qemu
+# because Portage unsets them. Aaaah!
+#
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${MY_DOCS_PREBUILT:=1}
+
+MY_DOCS_PREBUILT_DEV=sam
+MY_DOCS_VERSION=$(ver_cut 1-2)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+MY_DOCS_USEFLAG="+doc"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/";
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
+SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz
 )"
+   MY_DOCS_USEFLAG="doc"
+fi
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   app-arch/zstd:=
+   redis? ( dev-libs/hiredis:= )
+"
+RDEPEND="
+   ${DEPEND}
+   dev-util/shadowman
+   sys-apps/gentoo-functions
+"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND="
+   doc? ( dev-ruby/asciidoctor )
+   verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )
+"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+   "${FILESDIR}"/${PN}-4.0-objdump.patch
+   "${FILESDIR}"/${PN}-4.8-avoid-run-user.patch
+)
+
+src_unpack() {
+   # Avoid aborting on the doc tarball
+   if use verify-sig ; then
+   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
+   fi
+
+   default
+}
+
+src_prepare() {
+   cmake_src_prepare
+
+   sed \
+   -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+   "${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+   # Mainly used in tests
+   tc-export CC OBJDUMP
+
+   # Avoid dependency on libstdc++.so. Useful for cases when
+   # we would like to use ccache to build older gcc which injects
+   # into ccache locally built (possibly outdated) libstdc++
+   # See bug #761220 for examples.
+   #
+   # Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
+   use static-c++ && append-ldflags -static-libstdc++
+
+   local mycmakeargs=(
+   -DENABLE_DOCUMENTATION=$(usex doc)
+   -DENABLE_TESTING=$(usex test)
+   -DZSTD_FROM_INTERNET=OFF
+   -DHIREDIS_FROM_INTERNET=OFF
+   -DREDIS_STORAGE_BACKEND=$(usex redis)
+   )
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   dobin ccache-config
+   insinto /usr/share/shadowman/tools
+   newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+
+   # If USE=doc, there'll be newly generated docs which we install instead.
+   if ! use doc && [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+   doman "${WORKDIR}"/${PN}-${MY_DOCS_VERSION}-docs/doc/*.[0-8]
+   fi
+}
+
+pkg_prerm() {
+   if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
+   eselect compiler-shadow remove ccache
+   fi
+}
+
+pkg_postinst() {
+   if [[ -z ${ROOT} ]] ; then
+   eselect compiler-shadow 

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-05-14 Thread Andreas Sturmlechner
commit: b9f23d64cae24e5882bdd8ada7d25dc6017e06be
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 14 08:31:11 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 14 10:27:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f23d64

dev-util/ccache: drop 4.5.1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/ccache/Manifest|  1 -
 dev-util/ccache/ccache-4.5.1.ebuild | 88 -
 2 files changed, 89 deletions(-)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 36152adc44af..c6ab7452145f 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,4 +1,3 @@
-DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 
637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498
 SHA512 
267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
 DIST ccache-4.6.3.tar.xz 531184 BLAKE2B 
b23c22876cd3f31bcd67b9120fd5e605441508478f40267d654a281c00e28e3021b135cda04ace6da9fb39d3c144c92a259e69287be73043730240f32982b6a9
 SHA512 
b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966
 DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 
064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e
 SHA512 
ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
 DIST ccache-4.7.4.tar.xz 547820 BLAKE2B 
03e03223f0fd6eb001c7d93bcd03a0ef6656ebd3ffcc920b9e772fb68275ddf1e8a941f8f7de68358cbc7a9b9d5aa65e35b91554ff24684f29ff1953aefae75f
 SHA512 
48c663b51e874cfbd8daf0ef9759d025c2605c36da47ebbc77b52ceb941b810436600429f74204f13e2e2e601af6186a4bdb992f8da239f88cb9df4c6c95d58f

diff --git a/dev-util/ccache/ccache-4.5.1.ebuild 
b/dev-util/ccache/ccache-4.5.1.ebuild
deleted file mode 100644
index 33eaea9d849e..
--- a/dev-util/ccache/ccache-4.5.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs flag-o-matic
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/";
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz";
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="doc redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/zstd:=
-   redis? ( dev-libs/hiredis:= )"
-RDEPEND="${DEPEND}
-   dev-util/shadowman
-   sys-apps/gentoo-functions"
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+=" test? ( dev-libs/elfutils )"
-BDEPEND=" doc? ( dev-ruby/asciidoctor )"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-   "${FILESDIR}"/${PN}-4.0-objdump.patch
-   "${FILESDIR}"/${PN}-4.1-avoid-run-user.patch
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   sed \
-   -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-   "${FILESDIR}"/ccache-config-3 > ccache-config || die
-
-   # mainly used in tests
-   tc-export CC OBJDUMP
-
-   # Avoid dependency on libstdc++.so. Useful for cases when
-   # we would like to use ccache to build older gcc which injects
-   # into ccache locally built (possibly outdated) libstdc++
-   # See bug #761220 for examples.
-   #
-   # Ideally gcc should not use LD_PRELOAD to avoid this type of failures.
-   use static-c++ && append-ldflags -static-libstdc++
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_DOCUMENTATION=$(usex doc)
-   -DENABLE_TESTING=$(usex test)
-   -DUSE_CCACHE=OFF
-   -DZSTD_FROM_INTERNET=OFF
-   -DREDIS_STORAGE_BACKEND=$(usex redis)
-   )
-
-   use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF )
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   dobin ccache-config
-   insinto /usr/share/shadowman/tools
-   newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-}
-
-pkg_prerm() {
-   if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
-   eselect compiler-shadow remove ccache
-   fi
-}
-
-pkg_postinst() {
-   if [[ ${ROOT:-/} == / ]]; then
-   eselect compiler-shadow update ccache
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-05-13 Thread Sam James
commit: 4be9cd309cf4c202d50e2ea5c9142622a9b12181
Author: Sam James  gentoo  org>
AuthorDate: Sun May 14 04:43:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 14 04:44:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4be9cd30

dev-util/ccache: fix pre-generated man page installation

Portage unsets CCACHE_*. I'll file a bug for that later.

Signed-off-by: Sam James  gentoo.org>

 .../{ccache-4.8.ebuild => ccache-4.8-r1.ebuild}| 26 +-
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/dev-util/ccache/ccache-4.8.ebuild 
b/dev-util/ccache/ccache-4.8-r1.ebuild
similarity index 82%
rename from dev-util/ccache/ccache-4.8.ebuild
rename to dev-util/ccache/ccache-4.8-r1.ebuild
index f839a350fcda..670205fedd4d 100644
--- a/dev-util/ccache/ccache-4.8.ebuild
+++ b/dev-util/ccache/ccache-4.8-r1.ebuild
@@ -3,15 +3,19 @@
 
 EAPI=8
 
+# XXX: We don't use CCACHE_* for these vars like we do in e.g. 
cmake/libabigail/qemu
+# because Portage unsets them. Aaaah!
+#
 # Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
 # Set to 1 if prebuilt, 0 if not
 # (the construct below is to allow overriding from env for script)
-CCACHE_DOCS_PREBUILT=${CCACHE_DOCS_PREBUILT:-1}
-CCACHE_DOCS_PREBUILT_DEV=sam
-CCACHE_DOCS_VERSION="${PV}"
+: ${MY_DOCS_PREBUILT:=1}
+
+MY_DOCS_PREBUILT_DEV=sam
+MY_DOCS_VERSION=$(ver_cut 1-2)
 # Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# bug #830088
-CCACHE_DOC_USEFLAG="+doc"
+# See bug #784815
+MY_DOCS_USEFLAG="+doc"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
 inherit cmake toolchain-funcs flag-o-matic verify-sig
@@ -20,16 +24,16 @@ DESCRIPTION="Fast compiler cache"
 HOMEPAGE="https://ccache.dev/";
 SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
 SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-if [[ ${CCACHE_DOCS_PREBUILT} == 1 ]] ; then
-   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${CCACHE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CCACHE_DOCS_VERSION}-docs.tar.xz
 )"
+if [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${MY_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${MY_DOCS_VERSION}-docs.tar.xz
 )"
+   MY_DOCS_USEFLAG="doc"
 fi
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
-[[ ${CCACHE_DOCS_PREBUILT} == 1 ]] && CCACHE_DOC_USEFLAG="doc"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="${CCACHE_DOC_USEFLAG} redis +static-c++ test"
+IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -107,8 +111,8 @@ src_install() {
newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
 
# If USE=doc, there'll be newly generated docs which we install instead.
-   if ! use doc && [[ ${CCACHE_DOCS_PREBUILT} == 1 ]] ; then
-   doman 
"${WORKDIR}"/${PN}-${CCACHE_DOCS_VERSION}-docs/docs/*.[0-8]
+   if ! use doc && [[ ${MY_DOCS_PREBUILT} == 1 ]] ; then
+   doman "${WORKDIR}"/${PN}-${MY_DOCS_VERSION}-docs/doc/*.[0-8]
fi
 }
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-03-13 Thread Sam James
commit: 4e7bd768ddd549a9518fc9e55fa6ec948fff7c16
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 13 22:38:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 13 22:45:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e7bd768

dev-util/ccache: avoid verify-sig for doc tarball

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.8.ebuild | 9 +
 1 file changed, 9 insertions(+)

diff --git a/dev-util/ccache/ccache-4.8.ebuild 
b/dev-util/ccache/ccache-4.8.ebuild
index b57b66d696ce..f839a350fcda 100644
--- a/dev-util/ccache/ccache-4.8.ebuild
+++ b/dev-util/ccache/ccache-4.8.ebuild
@@ -59,6 +59,15 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.0-objdump.patch
 )
 
+src_unpack() {
+   # Avoid aborting on the doc tarball
+   if use verify-sig ; then
+   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
+   fi
+
+   default
+}
+
 src_prepare() {
cmake_src_prepare
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2023-03-13 Thread Sam James
commit: 6fab44776bcfd4d494da00210b597e299d67a9d1
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 13 22:21:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 13 22:35:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fab4477

dev-util/ccache: add 4.8

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest  |   3 +
 dev-util/ccache/ccache-4.8.ebuild | 116 ++
 2 files changed, 119 insertions(+)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 35b83db462db..36152adc44af 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -3,3 +3,6 @@ DIST ccache-4.6.3.tar.xz 531184 BLAKE2B 
b23c22876cd3f31bcd67b9120fd5e60544150847
 DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 
064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e
 SHA512 
ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
 DIST ccache-4.7.4.tar.xz 547820 BLAKE2B 
03e03223f0fd6eb001c7d93bcd03a0ef6656ebd3ffcc920b9e772fb68275ddf1e8a941f8f7de68358cbc7a9b9d5aa65e35b91554ff24684f29ff1953aefae75f
 SHA512 
48c663b51e874cfbd8daf0ef9759d025c2605c36da47ebbc77b52ceb941b810436600429f74204f13e2e2e601af6186a4bdb992f8da239f88cb9df4c6c95d58f
 DIST ccache-4.7.4.tar.xz.asc 833 BLAKE2B 
e155f9cb695794a28771a928d50e18705441b9fb9a8ec425aabc78dabcd68caca68ba15f74ba176a73abf414c4ba98b1832da3536fcd87d7c32f2689fe7e1908
 SHA512 
567a051e7c93cd62c8ad7631fea98a6846e2f548aaa201acefbe44d1027f8048cae5ef462488da7ce90864b23a426d524f576472428f93ecbc5cea3ae224b860
+DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B 
e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9
 SHA512 
e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb
+DIST ccache-4.8.tar.xz 556804 BLAKE2B 
5cca7d49088c5391abf93a2a493ba8e120575ae834abae86f3669e8c883a93ec29d48ab934aa086a87feb6a08d0c0053b3ce7174cec2f342c2d695a93fa3ef9a
 SHA512 
561424d448a049971742b846429c2fa5f1df43c05f201610dab0a3fab7e4806589c14ca20875cb5733763603c0813fe9350a244b63dda03e9def95d547738d0b
+DIST ccache-4.8.tar.xz.asc 833 BLAKE2B 
4a646db5b7a220a21ad93a02ea4bad23a666ad116af70211ea4a9a546ba7aeaf0c1c88c79d264f614a2ca5387dc91bf655a1632f53889dd74f49e085e2f6bd01
 SHA512 
22b6aeb54248576a1199e173db7b58b985bdc4e6a298e9fbd32992ab6dbadcd4496ffcadc24241215bd43166b68faf77aa3e492e44ffeac53e1e5e4c46015836

diff --git a/dev-util/ccache/ccache-4.8.ebuild 
b/dev-util/ccache/ccache-4.8.ebuild
new file mode 100644
index ..b57b66d696ce
--- /dev/null
+++ b/dev-util/ccache/ccache-4.8.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-ccache-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+CCACHE_DOCS_PREBUILT=${CCACHE_DOCS_PREBUILT:-1}
+CCACHE_DOCS_PREBUILT_DEV=sam
+CCACHE_DOCS_VERSION="${PV}"
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+CCACHE_DOC_USEFLAG="+doc"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/";
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
+SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+if [[ ${CCACHE_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${CCACHE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CCACHE_DOCS_VERSION}-docs.tar.xz
 )"
+fi
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+[[ ${CCACHE_DOCS_PREBUILT} == 1 ]] && CCACHE_DOC_USEFLAG="doc"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="${CCACHE_DOC_USEFLAG} redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   app-arch/zstd:=
+   redis? ( dev-libs/hiredis:= )
+"
+RDEPEND="
+   ${DEPEND}
+   dev-util/shadowman
+   sys-apps/gentoo-functions
+"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND="
+   doc? ( dev-ruby/asciidoctor )
+   verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )
+"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.5-nvcc-test.

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-12-16 Thread Arthur Zamarin
commit: e727a03ec6ae0d229e0b48ea39b61746f3185324
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 16 20:45:06 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 16 20:45:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e727a03e

dev-util/ccache: Stabilize 4.7.4 hppa, #886213

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/ccache/ccache-4.7.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.7.4.ebuild 
b/dev-util/ccache/ccache-4.7.4.ebuild
index 8b7999197346..12144ebf5f86 100644
--- a/dev-util/ccache/ccache-4.7.4.ebuild
+++ b/dev-util/ccache/ccache-4.7.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${P
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="doc redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-12-02 Thread Arthur Zamarin
commit: c9896dfe6a8a4a13b1d9a019083d34f1ade9ecdd
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  2 11:23:01 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  2 11:23:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9896dfe

dev-util/ccache: Stabilize 4.6.3 x86, #882871

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/ccache/ccache-4.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.6.3.ebuild 
b/dev-util/ccache/ccache-4.6.3.ebuild
index 415f609ee0ee..269b9595497c 100644
--- a/dev-util/ccache/ccache-4.6.3.ebuild
+++ b/dev-util/ccache/ccache-4.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${P
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="doc redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-11-28 Thread Jakov Smolić
commit: d9e5acc65d6b3c377c78a9334dc35c1c15fe4a28
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Nov 29 06:54:49 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Nov 29 06:54:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e5acc6

dev-util/ccache: Stabilize 4.6.3 amd64, #882871

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/ccache/ccache-4.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.6.3.ebuild 
b/dev-util/ccache/ccache-4.6.3.ebuild
index 89a7f7404f39..415f609ee0ee 100644
--- a/dev-util/ccache/ccache-4.6.3.ebuild
+++ b/dev-util/ccache/ccache-4.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${P
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="doc redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-11-25 Thread Arthur Zamarin
commit: 09f23b624850757f05921fb583b78fb1c37528f6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov 25 20:40:22 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov 25 20:40:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09f23b62

dev-util/ccache: Stabilize 4.6.3 hppa, #882871

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/ccache/ccache-4.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.6.3.ebuild 
b/dev-util/ccache/ccache-4.6.3.ebuild
index 0484e4b843fa..89a7f7404f39 100644
--- a/dev-util/ccache/ccache-4.6.3.ebuild
+++ b/dev-util/ccache/ccache-4.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${P
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="doc redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-11-25 Thread Arthur Zamarin
commit: c4a4e65fe4435a541afe393c8d243215fe06b180
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov 25 09:58:12 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov 25 09:58:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4a4e65f

dev-util/ccache: Stabilize 4.6.3 sparc, #882871

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/ccache/ccache-4.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.6.3.ebuild 
b/dev-util/ccache/ccache-4.6.3.ebuild
index 56e2b6265a28..0484e4b843fa 100644
--- a/dev-util/ccache/ccache-4.6.3.ebuild
+++ b/dev-util/ccache/ccache-4.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${P
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="doc redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-11-25 Thread Matthew Smith
commit: 5a88daabdbd55643106ca57f9df16c58208e4815
Author: Matthew Smith  gentoo  org>
AuthorDate: Fri Nov 25 09:15:08 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Fri Nov 25 09:15:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a88daab

dev-util/ccache: add 4.7.4

Signed-off-by: Matthew Smith  gentoo.org>

 dev-util/ccache/Manifest|  2 +
 dev-util/ccache/ccache-4.7.4.ebuild | 91 +
 2 files changed, 93 insertions(+)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index e42085afd6d5..5754e4140f49 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -3,3 +3,5 @@ DIST ccache-4.6.3.tar.xz 531184 BLAKE2B 
b23c22876cd3f31bcd67b9120fd5e60544150847
 DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 
064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e
 SHA512 
ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
 DIST ccache-4.7.3.tar.xz 546528 BLAKE2B 
2b219506b94a7ae7d62545b02d976f8afd12acc226bd4cabc575199629e4abc86657150b55c2aaf283e477fc5bcfa38843d0d52c8737bd98f11c126d4afe2582
 SHA512 
c7d15db426967ff69ec31bc167d49069f1908dfc03d70ac0ac61a281bca1202c17e3a469006bb42a11549cb6a064d89af94f0779c550617bb68b213ed9cef784
 DIST ccache-4.7.3.tar.xz.asc 833 BLAKE2B 
743a066d5b3a69341e51e4b48ef9ae81b74acfe14a566ffa38f839c8aa09d178c48e4a14ea388648de847651ab6c0c2279fd646d623745e68fd7b2555e32aba3
 SHA512 
4049d9dc342b604d5228809c0e5d20656d4408bf2bc2242f0d1fc30e7df1cec0f3f48ed77b1be2f3b1e3bbace79397ce3fae411de99f6bf5a7626fd4225777a1
+DIST ccache-4.7.4.tar.xz 547820 BLAKE2B 
03e03223f0fd6eb001c7d93bcd03a0ef6656ebd3ffcc920b9e772fb68275ddf1e8a941f8f7de68358cbc7a9b9d5aa65e35b91554ff24684f29ff1953aefae75f
 SHA512 
48c663b51e874cfbd8daf0ef9759d025c2605c36da47ebbc77b52ceb941b810436600429f74204f13e2e2e601af6186a4bdb992f8da239f88cb9df4c6c95d58f
+DIST ccache-4.7.4.tar.xz.asc 833 BLAKE2B 
e155f9cb695794a28771a928d50e18705441b9fb9a8ec425aabc78dabcd68caca68ba15f74ba176a73abf414c4ba98b1832da3536fcd87d7c32f2689fe7e1908
 SHA512 
567a051e7c93cd62c8ad7631fea98a6846e2f548aaa201acefbe44d1027f8048cae5ef462488da7ce90864b23a426d524f576472428f93ecbc5cea3ae224b860

diff --git a/dev-util/ccache/ccache-4.7.4.ebuild 
b/dev-util/ccache/ccache-4.7.4.ebuild
new file mode 100644
index ..8bd176f53d23
--- /dev/null
+++ b/dev-util/ccache/ccache-4.7.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/";
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
+SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="doc redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-arch/zstd:=
+   redis? ( dev-libs/hiredis:= )"
+RDEPEND="${DEPEND}
+   dev-util/shadowman
+   sys-apps/gentoo-functions"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND=" doc? ( dev-ruby/asciidoctor )
+   verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+   "${FILESDIR}"/${PN}-4.0-objdump.patch
+)
+
+src_prepare() {
+   cmake_src_prepare
+
+   sed \
+   -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+   "${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+   # Mainly used in tests
+   tc-export CC OBJDUMP
+
+   # Avoid dependency on libstdc++.so. Useful for cases when
+   # we would like to use ccache to build older gcc which injects
+   # into ccache locally built (possibly outdated) libstdc++
+   # See bug #761220 for examples.
+   #
+   # Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
+   use static-c++ && append-ldflags -static-libstdc++
+
+   local mycmakeargs=(
+   -DENABLE_DOCUMENTATION=$(usex doc)
+   -DENABLE_TESTING=$(usex test)
+   -DZSTD_FROM_INTERNET=OFF
+   -DHIREDIS_FROM_INTERNET=OFF
+   -DREDIS_STORAGE_BACKEND=$(usex redis)
+   )
+
+   cmake_src_configure
+}
+
+src_install() {
+

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-11-24 Thread Arthur Zamarin
commit: a58f26465b774503ccc4c9d3d788d2830cf5cc8d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov 25 06:33:22 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov 25 06:33:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a58f2646

dev-util/ccache: Stabilize 4.6.3 ppc64, #882871

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/ccache/ccache-4.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.6.3.ebuild 
b/dev-util/ccache/ccache-4.6.3.ebuild
index a6902ba60240..56e2b6265a28 100644
--- a/dev-util/ccache/ccache-4.6.3.ebuild
+++ b/dev-util/ccache/ccache-4.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${P
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="doc redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-11-24 Thread Sam James
commit: 7917addee633d4ea3c2fa36a7210a1eeb6ffcb3b
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 25 06:01:47 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 25 06:01:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7917adde

dev-util/ccache: Stabilize 4.6.3 ppc, #882871

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.6.3.ebuild 
b/dev-util/ccache/ccache-4.6.3.ebuild
index b73e39d5cdbe..a6902ba60240 100644
--- a/dev-util/ccache/ccache-4.6.3.ebuild
+++ b/dev-util/ccache/ccache-4.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${P
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="doc redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-11-24 Thread Sam James
commit: caa084865252b33380268bad3cbbc7546c485653
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 25 05:15:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 25 05:15:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caa08486

dev-util/ccache: Stabilize 4.6.3 arm64, #882871

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.6.3.ebuild 
b/dev-util/ccache/ccache-4.6.3.ebuild
index e6fd6165c15d..f83a0f8d86da 100644
--- a/dev-util/ccache/ccache-4.6.3.ebuild
+++ b/dev-util/ccache/ccache-4.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${P
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="doc redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-11-24 Thread Sam James
commit: fc89b305920d889b36efb897884a474067194cb2
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 25 05:15:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 25 05:15:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc89b305

dev-util/ccache: Stabilize 4.6.3 arm, #882871

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.6.3.ebuild 
b/dev-util/ccache/ccache-4.6.3.ebuild
index f83a0f8d86da..b73e39d5cdbe 100644
--- a/dev-util/ccache/ccache-4.6.3.ebuild
+++ b/dev-util/ccache/ccache-4.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${P
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="doc redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-10-29 Thread Sam James
commit: 4182f2967fcff1f152dfde1181abd9664926076b
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 29 14:48:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 29 15:04:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4182f296

dev-util/ccache: add 4.7.2

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest|  2 +
 dev-util/ccache/ccache-4.7.2.ebuild | 92 +
 2 files changed, 94 insertions(+)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 77b379c18071..c8b5461c32f5 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -3,5 +3,7 @@ DIST ccache-4.6.3.tar.xz 531184 BLAKE2B 
b23c22876cd3f31bcd67b9120fd5e60544150847
 DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 
064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e
 SHA512 
ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
 DIST ccache-4.7.1.tar.xz 545788 BLAKE2B 
0d96b7d7739329cb86f749cac756998af648f512c2be0a88b35cda8dcc1160a2eb37a02e6bfde34810451b66bb99b56bc91ad64d67c8305c7af620a2075464b7
 SHA512 
9a17f550e9a70067c55405a0832769cf367e96b21256631f9b0e638574f2c4c90106be0fcef04e868cf4b069668fe09f13cf71539e9f85752f7869da6a9abd0a
 DIST ccache-4.7.1.tar.xz.asc 833 BLAKE2B 
3735876dd9a4e9a7105480b55154baaff269f1a4564c82d5d95a36c4a085e95386f21a971e6349a0b9043dc0208ddd464f120bdd8127c20dd33909c7e70c449d
 SHA512 
2ad6be6805254d5d4f24d89801f6338431118d948ee90f38f4eeecb282e99c8f90294e6cd4f8f582d01e2ac138d7ac233e71fa985dd73dc43869606f841faba9
+DIST ccache-4.7.2.tar.xz 546016 BLAKE2B 
ce68e759bbeb99e5d5fb7341c85e58dbcf05aa21caa7aea67cba244041a44cfb22bceb7dcea47597ea44f39e88d7d006fd0a5fc7ceefb264309a74affedf8d8e
 SHA512 
854834d38ae64c1a253746be7f30b6f6f50215277a3eb01f25dcab23d3fe1131bc5fde76da10506b72c8eca5b00bc63555f5c2363b8613833f491d05635173ed
+DIST ccache-4.7.2.tar.xz.asc 833 BLAKE2B 
63dc3d283148622b2ed3a8688c865602e6f803f6cf00c1281e0004ac16b4c7606df2d977329328b784bf36134ac529f3d7dbabfd3c295b9eb688a7962e2d81fb
 SHA512 
5ffd9f51b7ff580603c9926cba6df0f13ccd1cf217a49d0cc97963a15d690cc51da9a42e37f6f2fd53bbf8b3458badb138c19f1383ef3899a54514d135362070
 DIST ccache-4.7.tar.xz 545560 BLAKE2B 
20d08092e775354f84699ed48a88f8212517e7202ff2bc1bc381164341d4058b598d2a4981e35059ac10fc46ada183c35056732f1a61c9d14185cd41839a7485
 SHA512 
af7010de1f44bf5be9ba62a3af54af6b19e01b6dddf986a52c37106676bc3a5bd2298cccd2337cccbacfd1c148de177612c2bf24d254c6ade9dec253a0a62efd
 DIST ccache-4.7.tar.xz.asc 833 BLAKE2B 
4c868467e53fb21021e5f553b6660b94f7fc93ba66d1798c09f09a281124f8351cbe29fcb621637e29c1f6f24468f0a9a6423a33a1691c220f929a595e961a56
 SHA512 
e88e8cf2ee8ce9015a93eefe3a7c8dab58da3e50536b5af8ee5013f6cb2af9928f82b4a6d9c4af2880e14698819f63c434324e45aa667e63e9fd309aaef448a6

diff --git a/dev-util/ccache/ccache-4.7.2.ebuild 
b/dev-util/ccache/ccache-4.7.2.ebuild
new file mode 100644
index ..57b53e31e44a
--- /dev/null
+++ b/dev-util/ccache/ccache-4.7.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/";
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
+SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="doc redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-arch/zstd:=
+   redis? ( dev-libs/hiredis:= )"
+RDEPEND="${DEPEND}
+   dev-util/shadowman
+   sys-apps/gentoo-functions"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND=" doc? ( dev-ruby/asciidoctor )
+   verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+   "${FILESDIR}"/${PN}-4.0-objdump.patch
+   "${FILESDIR}"/${PN}-4.6.2-avoid-run-user.patch
+)
+
+src_prepare() {
+   cmake_src_prepare
+
+   sed \
+   -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+   "${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+   # Mainly used in tests
+   tc-export CC OBJDUMP
+
+   # Avoid dependency on libstdc++.so. Useful for cases w

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-10-29 Thread Sam James
commit: 916e1adbfad066c4752e63babbb3c4c584148bec
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 29 14:49:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 29 15:04:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=916e1adb

dev-util/ccache: drop 4.7, 4.7.1

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest|  4 --
 dev-util/ccache/ccache-4.7.1.ebuild | 92 -
 dev-util/ccache/ccache-4.7.ebuild   | 92 -
 3 files changed, 188 deletions(-)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index c8b5461c32f5..6636af784ae3 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,9 +1,5 @@
 DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 
637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498
 SHA512 
267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
 DIST ccache-4.6.3.tar.xz 531184 BLAKE2B 
b23c22876cd3f31bcd67b9120fd5e605441508478f40267d654a281c00e28e3021b135cda04ace6da9fb39d3c144c92a259e69287be73043730240f32982b6a9
 SHA512 
b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966
 DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 
064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e
 SHA512 
ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
-DIST ccache-4.7.1.tar.xz 545788 BLAKE2B 
0d96b7d7739329cb86f749cac756998af648f512c2be0a88b35cda8dcc1160a2eb37a02e6bfde34810451b66bb99b56bc91ad64d67c8305c7af620a2075464b7
 SHA512 
9a17f550e9a70067c55405a0832769cf367e96b21256631f9b0e638574f2c4c90106be0fcef04e868cf4b069668fe09f13cf71539e9f85752f7869da6a9abd0a
-DIST ccache-4.7.1.tar.xz.asc 833 BLAKE2B 
3735876dd9a4e9a7105480b55154baaff269f1a4564c82d5d95a36c4a085e95386f21a971e6349a0b9043dc0208ddd464f120bdd8127c20dd33909c7e70c449d
 SHA512 
2ad6be6805254d5d4f24d89801f6338431118d948ee90f38f4eeecb282e99c8f90294e6cd4f8f582d01e2ac138d7ac233e71fa985dd73dc43869606f841faba9
 DIST ccache-4.7.2.tar.xz 546016 BLAKE2B 
ce68e759bbeb99e5d5fb7341c85e58dbcf05aa21caa7aea67cba244041a44cfb22bceb7dcea47597ea44f39e88d7d006fd0a5fc7ceefb264309a74affedf8d8e
 SHA512 
854834d38ae64c1a253746be7f30b6f6f50215277a3eb01f25dcab23d3fe1131bc5fde76da10506b72c8eca5b00bc63555f5c2363b8613833f491d05635173ed
 DIST ccache-4.7.2.tar.xz.asc 833 BLAKE2B 
63dc3d283148622b2ed3a8688c865602e6f803f6cf00c1281e0004ac16b4c7606df2d977329328b784bf36134ac529f3d7dbabfd3c295b9eb688a7962e2d81fb
 SHA512 
5ffd9f51b7ff580603c9926cba6df0f13ccd1cf217a49d0cc97963a15d690cc51da9a42e37f6f2fd53bbf8b3458badb138c19f1383ef3899a54514d135362070
-DIST ccache-4.7.tar.xz 545560 BLAKE2B 
20d08092e775354f84699ed48a88f8212517e7202ff2bc1bc381164341d4058b598d2a4981e35059ac10fc46ada183c35056732f1a61c9d14185cd41839a7485
 SHA512 
af7010de1f44bf5be9ba62a3af54af6b19e01b6dddf986a52c37106676bc3a5bd2298cccd2337cccbacfd1c148de177612c2bf24d254c6ade9dec253a0a62efd
-DIST ccache-4.7.tar.xz.asc 833 BLAKE2B 
4c868467e53fb21021e5f553b6660b94f7fc93ba66d1798c09f09a281124f8351cbe29fcb621637e29c1f6f24468f0a9a6423a33a1691c220f929a595e961a56
 SHA512 
e88e8cf2ee8ce9015a93eefe3a7c8dab58da3e50536b5af8ee5013f6cb2af9928f82b4a6d9c4af2880e14698819f63c434324e45aa667e63e9fd309aaef448a6

diff --git a/dev-util/ccache/ccache-4.7.1.ebuild 
b/dev-util/ccache/ccache-4.7.1.ebuild
deleted file mode 100644
index 57b53e31e44a..
--- a/dev-util/ccache/ccache-4.7.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/";
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
-SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="doc redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/zstd:=
-   redis? ( dev-libs/hiredis:= )"
-RDEPEND="${DEPEND}
-   dev-util/shadowman
-   sys-apps/gentoo-functions"
-# Needed for eselect calls in pkg_*
-IDEPEND="dev-util/shadowman"
-
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+=" test? ( dev-libs/elfutils )"
-BDEPEND=" doc? ( dev-ruby/asciidoctor

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-10-24 Thread Sam James
commit: b0aed59bf8278dd6f7928c699a332f555eb7389b
Author: Arsen Arsenović  aarsen  me>
AuthorDate: Sat Oct 22 18:22:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 24 12:12:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0aed59b

dev-util/ccache: add 4.7.1

Signed-off-by: Arsen Arsenović  aarsen.me>
Closes: https://github.com/gentoo/gentoo/pull/27905
Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest|  2 +
 dev-util/ccache/ccache-4.7.1.ebuild | 92 +
 2 files changed, 94 insertions(+)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 41e028682b40..77b379c18071 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,5 +1,7 @@
 DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 
637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498
 SHA512 
267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
 DIST ccache-4.6.3.tar.xz 531184 BLAKE2B 
b23c22876cd3f31bcd67b9120fd5e605441508478f40267d654a281c00e28e3021b135cda04ace6da9fb39d3c144c92a259e69287be73043730240f32982b6a9
 SHA512 
b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966
 DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 
064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e
 SHA512 
ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
+DIST ccache-4.7.1.tar.xz 545788 BLAKE2B 
0d96b7d7739329cb86f749cac756998af648f512c2be0a88b35cda8dcc1160a2eb37a02e6bfde34810451b66bb99b56bc91ad64d67c8305c7af620a2075464b7
 SHA512 
9a17f550e9a70067c55405a0832769cf367e96b21256631f9b0e638574f2c4c90106be0fcef04e868cf4b069668fe09f13cf71539e9f85752f7869da6a9abd0a
+DIST ccache-4.7.1.tar.xz.asc 833 BLAKE2B 
3735876dd9a4e9a7105480b55154baaff269f1a4564c82d5d95a36c4a085e95386f21a971e6349a0b9043dc0208ddd464f120bdd8127c20dd33909c7e70c449d
 SHA512 
2ad6be6805254d5d4f24d89801f6338431118d948ee90f38f4eeecb282e99c8f90294e6cd4f8f582d01e2ac138d7ac233e71fa985dd73dc43869606f841faba9
 DIST ccache-4.7.tar.xz 545560 BLAKE2B 
20d08092e775354f84699ed48a88f8212517e7202ff2bc1bc381164341d4058b598d2a4981e35059ac10fc46ada183c35056732f1a61c9d14185cd41839a7485
 SHA512 
af7010de1f44bf5be9ba62a3af54af6b19e01b6dddf986a52c37106676bc3a5bd2298cccd2337cccbacfd1c148de177612c2bf24d254c6ade9dec253a0a62efd
 DIST ccache-4.7.tar.xz.asc 833 BLAKE2B 
4c868467e53fb21021e5f553b6660b94f7fc93ba66d1798c09f09a281124f8351cbe29fcb621637e29c1f6f24468f0a9a6423a33a1691c220f929a595e961a56
 SHA512 
e88e8cf2ee8ce9015a93eefe3a7c8dab58da3e50536b5af8ee5013f6cb2af9928f82b4a6d9c4af2880e14698819f63c434324e45aa667e63e9fd309aaef448a6

diff --git a/dev-util/ccache/ccache-4.7.1.ebuild 
b/dev-util/ccache/ccache-4.7.1.ebuild
new file mode 100644
index ..57b53e31e44a
--- /dev/null
+++ b/dev-util/ccache/ccache-4.7.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/";
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
+SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="doc redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-arch/zstd:=
+   redis? ( dev-libs/hiredis:= )"
+RDEPEND="${DEPEND}
+   dev-util/shadowman
+   sys-apps/gentoo-functions"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND=" doc? ( dev-ruby/asciidoctor )
+   verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+   "${FILESDIR}"/${PN}-4.0-objdump.patch
+   "${FILESDIR}"/${PN}-4.6.2-avoid-run-user.patch
+)
+
+src_prepare() {
+   cmake_src_prepare
+
+   sed \
+   -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+   "${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+   # Mainly used in tests
+   tc-export CC OBJDUMP
+
+   # Avoid dependency on libstdc++.so. U

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-10-18 Thread Sam James
commit: 2defa0838f01737ca3c442c6f79ee909c38c1114
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 18 19:19:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 18 19:19:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2defa083

dev-util/ccache: fix Redis option (noop)

Closes: https://bugs.gentoo.org/877543
Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.7.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-util/ccache/ccache-4.7.ebuild 
b/dev-util/ccache/ccache-4.7.ebuild
index e6fd6165c15d..57b53e31e44a 100644
--- a/dev-util/ccache/ccache-4.7.ebuild
+++ b/dev-util/ccache/ccache-4.7.ebuild
@@ -64,11 +64,10 @@ src_configure() {
-DENABLE_DOCUMENTATION=$(usex doc)
-DENABLE_TESTING=$(usex test)
-DZSTD_FROM_INTERNET=OFF
+   -DHIREDIS_FROM_INTERNET=OFF
-DREDIS_STORAGE_BACKEND=$(usex redis)
)
 
-   use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF )
-
cmake_src_configure
 }
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-10-17 Thread Sam James
commit: b36d74a57ebdbe9629a621d45250b09261ae7be6
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 17 18:43:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 17 19:23:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b36d74a5

dev-util/ccache: add 4.7

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest  |  2 +
 dev-util/ccache/ccache-4.7.ebuild | 93 +++
 2 files changed, 95 insertions(+)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index b00c2ab50f9a..41e028682b40 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,3 +1,5 @@
 DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 
637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498
 SHA512 
267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
 DIST ccache-4.6.3.tar.xz 531184 BLAKE2B 
b23c22876cd3f31bcd67b9120fd5e605441508478f40267d654a281c00e28e3021b135cda04ace6da9fb39d3c144c92a259e69287be73043730240f32982b6a9
 SHA512 
b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966
 DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 
064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e
 SHA512 
ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
+DIST ccache-4.7.tar.xz 545560 BLAKE2B 
20d08092e775354f84699ed48a88f8212517e7202ff2bc1bc381164341d4058b598d2a4981e35059ac10fc46ada183c35056732f1a61c9d14185cd41839a7485
 SHA512 
af7010de1f44bf5be9ba62a3af54af6b19e01b6dddf986a52c37106676bc3a5bd2298cccd2337cccbacfd1c148de177612c2bf24d254c6ade9dec253a0a62efd
+DIST ccache-4.7.tar.xz.asc 833 BLAKE2B 
4c868467e53fb21021e5f553b6660b94f7fc93ba66d1798c09f09a281124f8351cbe29fcb621637e29c1f6f24468f0a9a6423a33a1691c220f929a595e961a56
 SHA512 
e88e8cf2ee8ce9015a93eefe3a7c8dab58da3e50536b5af8ee5013f6cb2af9928f82b4a6d9c4af2880e14698819f63c434324e45aa667e63e9fd309aaef448a6

diff --git a/dev-util/ccache/ccache-4.7.ebuild 
b/dev-util/ccache/ccache-4.7.ebuild
new file mode 100644
index ..e6fd6165c15d
--- /dev/null
+++ b/dev-util/ccache/ccache-4.7.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/";
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
+SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="doc redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-arch/zstd:=
+   redis? ( dev-libs/hiredis:= )"
+RDEPEND="${DEPEND}
+   dev-util/shadowman
+   sys-apps/gentoo-functions"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND=" doc? ( dev-ruby/asciidoctor )
+   verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+   "${FILESDIR}"/${PN}-4.0-objdump.patch
+   "${FILESDIR}"/${PN}-4.6.2-avoid-run-user.patch
+)
+
+src_prepare() {
+   cmake_src_prepare
+
+   sed \
+   -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+   "${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+   # Mainly used in tests
+   tc-export CC OBJDUMP
+
+   # Avoid dependency on libstdc++.so. Useful for cases when
+   # we would like to use ccache to build older gcc which injects
+   # into ccache locally built (possibly outdated) libstdc++
+   # See bug #761220 for examples.
+   #
+   # Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
+   use static-c++ && append-ldflags -static-libstdc++
+
+   local mycmakeargs=(
+   -DENABLE_DOCUMENTATION=$(usex doc)
+   -DENABLE_TESTING=$(usex test)
+   -DZSTD_FROM_INTERNET=OFF
+   -DREDIS_STORAGE_BACKEND=$(usex redis)
+   )
+
+   use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF )
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_insta

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/

2022-09-22 Thread Sam James
commit: 93ff4df64ce3ad1585f52faca10a4bcafc86703f
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 23 01:55:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 23 01:55:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ff4df6

dev-util/ccache: drop 4.6-r1, 4.6.1, 4.6.2

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest   |  6 --
 dev-util/ccache/ccache-4.6-r1.ebuild   | 93 --
 dev-util/ccache/ccache-4.6.1.ebuild| 93 --
 dev-util/ccache/ccache-4.6.2.ebuild| 93 --
 .../ccache/files/ccache-4.6-avoid-run-user.patch   | 28 ---
 .../ccache/files/ccache-4.6.1-avoid-run-user.patch | 28 ---
 6 files changed, 341 deletions(-)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 92a864aa4108..b00c2ab50f9a 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,9 +1,3 @@
 DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 
637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498
 SHA512 
267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
-DIST ccache-4.6.1.tar.xz 529040 BLAKE2B 
b4c1cae8b0c836c9e562488c79524ddbba4c995946e16f87c9b856e32961b454dd205bacdb030c283477be66d357b0fb5e67c9ad38715359b73f714aa73baee9
 SHA512 
361427ccecd74e8c25ca6a98ef3d3c125d81862196767eb383f6f8159fed8e1695cd5bc8731cb591c23c55352f0114a088b32a673717711efbfbb178a6c08c82
-DIST ccache-4.6.1.tar.xz.asc 833 BLAKE2B 
2f9ca555a014cfc9dbc354f43d4db0d79f89a6f84c57a7b9452324854abb39cd21af1071404278c694212f38c3975c7fa702f7cc475e44f75e9b132e53088d5d
 SHA512 
5494844f99232c5bc21f52db461f2a03d706e38bd73e147ebda89a4ce57fc2b80a920e42f7de539b9a5837ac8b515b309a29e045e479910c95a95d3c839b837d
-DIST ccache-4.6.2.tar.xz 530952 BLAKE2B 
ef0fec6438ea69b109e918decb5e4a768ae0a5350e124b18cf700af7d307ed7a46509d02a9499aee87ed76a8fe5b9e4523ffec1fcc37b9b0a5ad56e5e713f8b8
 SHA512 
324c09c7cc76425552fd88e7483527c20ae977c817de1f0dff8a0102ae98f1c35d5e08c8a49c83ad76f6564ea912d9a500948051baa028139074913a6e07e452
-DIST ccache-4.6.2.tar.xz.asc 833 BLAKE2B 
dc4103d15808f044e47e27967df0b3ac063e40c4a40175958c99cf2609549657f4eec761f7d1103d8995ed7a86ad844cadd411fc4a4928901d78191f2dbe291b
 SHA512 
66f42af7fb43ce1e701adaf911829d6690388e69249e6d97e0f51c31510f4198c22a7fdf68489f7b59fa07d311b2391be02d0a6702e8d890401318e4bfafd900
 DIST ccache-4.6.3.tar.xz 531184 BLAKE2B 
b23c22876cd3f31bcd67b9120fd5e605441508478f40267d654a281c00e28e3021b135cda04ace6da9fb39d3c144c92a259e69287be73043730240f32982b6a9
 SHA512 
b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966
 DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 
064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e
 SHA512 
ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
-DIST ccache-4.6.tar.xz 526084 BLAKE2B 
2e43d0a3a004117e8c535ecb2f09c1273f5bec2b3704710abbc3034749438df33ef27db37d5bfbd48d83d60bdd3f738d3dbf356eff21166fee03780969dd1f24
 SHA512 
3a53fedfa91034ee876e1a4a672de25498fe53c6c80901bd4976049eb35e0479275ceb6627f0e8cf76d677d041d216f731daf4bad142e454e775b5e7f05e3e4e
-DIST ccache-4.6.tar.xz.asc 833 BLAKE2B 
e0fc7677087006e3c6ac2bb7285915a56f233b4058c738c9d5967d29baf62b1b072ad2da4bf12f076440c68f39be77333d001d68703c32e26bd88a42b9e3ce71
 SHA512 
af09ffcdbba5e1e26047c7692dd0cf61f07869720d5849f59cbc0fe0f61c11aa419226d4d05061d23b5a03e8ec995e4d0e5af398af096bd19dbe35bf460eee0c

diff --git a/dev-util/ccache/ccache-4.6-r1.ebuild 
b/dev-util/ccache/ccache-4.6-r1.ebuild
deleted file mode 100644
index 046476bcf614..
--- a/dev-util/ccache/ccache-4.6-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/";
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
-SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="doc redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/zstd:=
-   redis? ( dev-libs/hiredis:= )"
-RDEPEND="${DEPEND}
-   dev-util/shadowman
-   sys-apps/gentoo-functions"
-# Needed for eselect calls in pkg_*

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-08-27 Thread Sam James
commit: 7696d2cdeb62982c2c90113f4a7a9525994cdec5
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 27 18:54:01 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 27 18:54:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7696d2cd

dev-util/ccache: add 4.6.3

Closes: https://bugs.gentoo.org/862645
Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest|  2 +
 dev-util/ccache/ccache-4.6.3.ebuild | 93 +
 2 files changed, 95 insertions(+)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 7fa32ed168dc..92a864aa4108 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -3,5 +3,7 @@ DIST ccache-4.6.1.tar.xz 529040 BLAKE2B 
b4c1cae8b0c836c9e562488c79524ddbba4c9959
 DIST ccache-4.6.1.tar.xz.asc 833 BLAKE2B 
2f9ca555a014cfc9dbc354f43d4db0d79f89a6f84c57a7b9452324854abb39cd21af1071404278c694212f38c3975c7fa702f7cc475e44f75e9b132e53088d5d
 SHA512 
5494844f99232c5bc21f52db461f2a03d706e38bd73e147ebda89a4ce57fc2b80a920e42f7de539b9a5837ac8b515b309a29e045e479910c95a95d3c839b837d
 DIST ccache-4.6.2.tar.xz 530952 BLAKE2B 
ef0fec6438ea69b109e918decb5e4a768ae0a5350e124b18cf700af7d307ed7a46509d02a9499aee87ed76a8fe5b9e4523ffec1fcc37b9b0a5ad56e5e713f8b8
 SHA512 
324c09c7cc76425552fd88e7483527c20ae977c817de1f0dff8a0102ae98f1c35d5e08c8a49c83ad76f6564ea912d9a500948051baa028139074913a6e07e452
 DIST ccache-4.6.2.tar.xz.asc 833 BLAKE2B 
dc4103d15808f044e47e27967df0b3ac063e40c4a40175958c99cf2609549657f4eec761f7d1103d8995ed7a86ad844cadd411fc4a4928901d78191f2dbe291b
 SHA512 
66f42af7fb43ce1e701adaf911829d6690388e69249e6d97e0f51c31510f4198c22a7fdf68489f7b59fa07d311b2391be02d0a6702e8d890401318e4bfafd900
+DIST ccache-4.6.3.tar.xz 531184 BLAKE2B 
b23c22876cd3f31bcd67b9120fd5e605441508478f40267d654a281c00e28e3021b135cda04ace6da9fb39d3c144c92a259e69287be73043730240f32982b6a9
 SHA512 
b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966
+DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 
064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e
 SHA512 
ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
 DIST ccache-4.6.tar.xz 526084 BLAKE2B 
2e43d0a3a004117e8c535ecb2f09c1273f5bec2b3704710abbc3034749438df33ef27db37d5bfbd48d83d60bdd3f738d3dbf356eff21166fee03780969dd1f24
 SHA512 
3a53fedfa91034ee876e1a4a672de25498fe53c6c80901bd4976049eb35e0479275ceb6627f0e8cf76d677d041d216f731daf4bad142e454e775b5e7f05e3e4e
 DIST ccache-4.6.tar.xz.asc 833 BLAKE2B 
e0fc7677087006e3c6ac2bb7285915a56f233b4058c738c9d5967d29baf62b1b072ad2da4bf12f076440c68f39be77333d001d68703c32e26bd88a42b9e3ce71
 SHA512 
af09ffcdbba5e1e26047c7692dd0cf61f07869720d5849f59cbc0fe0f61c11aa419226d4d05061d23b5a03e8ec995e4d0e5af398af096bd19dbe35bf460eee0c

diff --git a/dev-util/ccache/ccache-4.6.3.ebuild 
b/dev-util/ccache/ccache-4.6.3.ebuild
new file mode 100644
index ..e6fd6165c15d
--- /dev/null
+++ b/dev-util/ccache/ccache-4.6.3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/";
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
+SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="doc redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-arch/zstd:=
+   redis? ( dev-libs/hiredis:= )"
+RDEPEND="${DEPEND}
+   dev-util/shadowman
+   sys-apps/gentoo-functions"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND=" doc? ( dev-ruby/asciidoctor )
+   verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+   "${FILESDIR}"/${PN}-4.0-objdump.patch
+   "${FILESDIR}"/${PN}-4.6.2-avoid-run-user.patch
+)
+
+src_prepare() {
+   cmake_src_prepare
+
+   sed \
+   -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+   "${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+   # Mainly used in tests
+   tc-export CC OBJDUMP
+
+   # Avoid depende

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/

2022-08-22 Thread Sam James
commit: ae6b3941bae945937367927bf2a651b220845071
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 22 20:04:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 22 21:08:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae6b3941

dev-util/ccache: add 4.6.2

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest   |  2 +
 dev-util/ccache/ccache-4.6.2.ebuild| 93 ++
 .../ccache/files/ccache-4.6.2-avoid-run-user.patch | 30 +++
 3 files changed, 125 insertions(+)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 7a1b44c369a5..7fa32ed168dc 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,5 +1,7 @@
 DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 
637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498
 SHA512 
267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
 DIST ccache-4.6.1.tar.xz 529040 BLAKE2B 
b4c1cae8b0c836c9e562488c79524ddbba4c995946e16f87c9b856e32961b454dd205bacdb030c283477be66d357b0fb5e67c9ad38715359b73f714aa73baee9
 SHA512 
361427ccecd74e8c25ca6a98ef3d3c125d81862196767eb383f6f8159fed8e1695cd5bc8731cb591c23c55352f0114a088b32a673717711efbfbb178a6c08c82
 DIST ccache-4.6.1.tar.xz.asc 833 BLAKE2B 
2f9ca555a014cfc9dbc354f43d4db0d79f89a6f84c57a7b9452324854abb39cd21af1071404278c694212f38c3975c7fa702f7cc475e44f75e9b132e53088d5d
 SHA512 
5494844f99232c5bc21f52db461f2a03d706e38bd73e147ebda89a4ce57fc2b80a920e42f7de539b9a5837ac8b515b309a29e045e479910c95a95d3c839b837d
+DIST ccache-4.6.2.tar.xz 530952 BLAKE2B 
ef0fec6438ea69b109e918decb5e4a768ae0a5350e124b18cf700af7d307ed7a46509d02a9499aee87ed76a8fe5b9e4523ffec1fcc37b9b0a5ad56e5e713f8b8
 SHA512 
324c09c7cc76425552fd88e7483527c20ae977c817de1f0dff8a0102ae98f1c35d5e08c8a49c83ad76f6564ea912d9a500948051baa028139074913a6e07e452
+DIST ccache-4.6.2.tar.xz.asc 833 BLAKE2B 
dc4103d15808f044e47e27967df0b3ac063e40c4a40175958c99cf2609549657f4eec761f7d1103d8995ed7a86ad844cadd411fc4a4928901d78191f2dbe291b
 SHA512 
66f42af7fb43ce1e701adaf911829d6690388e69249e6d97e0f51c31510f4198c22a7fdf68489f7b59fa07d311b2391be02d0a6702e8d890401318e4bfafd900
 DIST ccache-4.6.tar.xz 526084 BLAKE2B 
2e43d0a3a004117e8c535ecb2f09c1273f5bec2b3704710abbc3034749438df33ef27db37d5bfbd48d83d60bdd3f738d3dbf356eff21166fee03780969dd1f24
 SHA512 
3a53fedfa91034ee876e1a4a672de25498fe53c6c80901bd4976049eb35e0479275ceb6627f0e8cf76d677d041d216f731daf4bad142e454e775b5e7f05e3e4e
 DIST ccache-4.6.tar.xz.asc 833 BLAKE2B 
e0fc7677087006e3c6ac2bb7285915a56f233b4058c738c9d5967d29baf62b1b072ad2da4bf12f076440c68f39be77333d001d68703c32e26bd88a42b9e3ce71
 SHA512 
af09ffcdbba5e1e26047c7692dd0cf61f07869720d5849f59cbc0fe0f61c11aa419226d4d05061d23b5a03e8ec995e4d0e5af398af096bd19dbe35bf460eee0c

diff --git a/dev-util/ccache/ccache-4.6.2.ebuild 
b/dev-util/ccache/ccache-4.6.2.ebuild
new file mode 100644
index ..e6fd6165c15d
--- /dev/null
+++ b/dev-util/ccache/ccache-4.6.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/";
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
+SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="doc redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-arch/zstd:=
+   redis? ( dev-libs/hiredis:= )"
+RDEPEND="${DEPEND}
+   dev-util/shadowman
+   sys-apps/gentoo-functions"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND=" doc? ( dev-ruby/asciidoctor )
+   verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+   "${FILESDIR}"/${PN}-4.0-objdump.patch
+   "${FILESDIR}"/${PN}-4.6.2-avoid-run-user.patch
+)
+
+src_prepare() {
+   cmake_src_prepare
+
+   sed \
+   -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+   "${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+   # Mainly used in tests
+   tc-export CC OBJDUMP
+
+   # Avoid dependency on libstdc++.so. Useful for cases whe

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/

2022-05-20 Thread Matt Turner
commit: fe611282019feabd47b3bf0cca5e7630225666bb
Author: Matt Turner  gentoo  org>
AuthorDate: Fri May 20 18:59:57 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri May 20 19:25:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe611282

dev-util/ccache: Version bump to 4.6.1

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/ccache/Manifest   |  2 +
 dev-util/ccache/ccache-4.6.1.ebuild| 93 ++
 .../ccache/files/ccache-4.6.1-avoid-run-user.patch | 28 +++
 3 files changed, 123 insertions(+)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index ddf19bb26242..7a1b44c369a5 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,3 +1,5 @@
 DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 
637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498
 SHA512 
267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
+DIST ccache-4.6.1.tar.xz 529040 BLAKE2B 
b4c1cae8b0c836c9e562488c79524ddbba4c995946e16f87c9b856e32961b454dd205bacdb030c283477be66d357b0fb5e67c9ad38715359b73f714aa73baee9
 SHA512 
361427ccecd74e8c25ca6a98ef3d3c125d81862196767eb383f6f8159fed8e1695cd5bc8731cb591c23c55352f0114a088b32a673717711efbfbb178a6c08c82
+DIST ccache-4.6.1.tar.xz.asc 833 BLAKE2B 
2f9ca555a014cfc9dbc354f43d4db0d79f89a6f84c57a7b9452324854abb39cd21af1071404278c694212f38c3975c7fa702f7cc475e44f75e9b132e53088d5d
 SHA512 
5494844f99232c5bc21f52db461f2a03d706e38bd73e147ebda89a4ce57fc2b80a920e42f7de539b9a5837ac8b515b309a29e045e479910c95a95d3c839b837d
 DIST ccache-4.6.tar.xz 526084 BLAKE2B 
2e43d0a3a004117e8c535ecb2f09c1273f5bec2b3704710abbc3034749438df33ef27db37d5bfbd48d83d60bdd3f738d3dbf356eff21166fee03780969dd1f24
 SHA512 
3a53fedfa91034ee876e1a4a672de25498fe53c6c80901bd4976049eb35e0479275ceb6627f0e8cf76d677d041d216f731daf4bad142e454e775b5e7f05e3e4e
 DIST ccache-4.6.tar.xz.asc 833 BLAKE2B 
e0fc7677087006e3c6ac2bb7285915a56f233b4058c738c9d5967d29baf62b1b072ad2da4bf12f076440c68f39be77333d001d68703c32e26bd88a42b9e3ce71
 SHA512 
af09ffcdbba5e1e26047c7692dd0cf61f07869720d5849f59cbc0fe0f61c11aa419226d4d05061d23b5a03e8ec995e4d0e5af398af096bd19dbe35bf460eee0c

diff --git a/dev-util/ccache/ccache-4.6.1.ebuild 
b/dev-util/ccache/ccache-4.6.1.ebuild
new file mode 100644
index ..95ae40faf2de
--- /dev/null
+++ b/dev-util/ccache/ccache-4.6.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/";
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
+SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="doc redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-arch/zstd:=
+   redis? ( dev-libs/hiredis:= )"
+RDEPEND="${DEPEND}
+   dev-util/shadowman
+   sys-apps/gentoo-functions"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND=" doc? ( dev-ruby/asciidoctor )
+   verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+   "${FILESDIR}"/${PN}-4.0-objdump.patch
+   "${FILESDIR}"/${PN}-4.6.1-avoid-run-user.patch
+)
+
+src_prepare() {
+   cmake_src_prepare
+
+   sed \
+   -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+   "${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+   # Mainly used in tests
+   tc-export CC OBJDUMP
+
+   # Avoid dependency on libstdc++.so. Useful for cases when
+   # we would like to use ccache to build older gcc which injects
+   # into ccache locally built (possibly outdated) libstdc++
+   # See bug #761220 for examples.
+   #
+   # Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
+   use static-c++ && append-ldflags -static-libstdc++
+
+   local mycmakeargs=(
+   -DENABLE_DOCUMENTATION=$(usex doc)
+   -DENABLE_TESTING=$(usex test)
+   -DZSTD_FROM_INTERNET=OFF
+   -DREDIS_STORAGE_BACKEND=$(usex redis)
+   )
+
+   use redis && mycmakeargs+=( -DHI

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-05-13 Thread WANG Xuerui
commit: 2aae2d34f3115cfd07a963c1994c4ec26cfb6889
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sat May 14 05:31:35 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sat May 14 05:32:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aae2d34

dev-util/ccache: keyword 4.6-r1 for ~loong

Tests passed on real hardware.

Signed-off-by: WANG Xuerui  gentoo.org>

 dev-util/ccache/ccache-4.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.6-r1.ebuild 
b/dev-util/ccache/ccache-4.6-r1.ebuild
index d3c7ceee833f..046476bcf614 100644
--- a/dev-util/ccache/ccache-4.6-r1.ebuild
+++ b/dev-util/ccache/ccache-4.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${P
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="doc redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/files/, dev-util/ccache/

2022-04-17 Thread Sam James
commit: 994391ae87835f151009ee177fc10fa4332551c7
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 17 18:23:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 17 18:23:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=994391ae

dev-util/ccache: drop 4.3-r3, 4.4.2

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest   |  2 -
 dev-util/ccache/ccache-4.3-r3.ebuild   | 91 --
 dev-util/ccache/ccache-4.4.2.ebuild| 88 -
 dev-util/ccache/files/ccache-4.3-PWD.patch | 85 
 4 files changed, 266 deletions(-)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 29ab5c3c1a3d..ddf19bb26242 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,5 +1,3 @@
-DIST ccache-4.3.tar.xz 433508 BLAKE2B 
6ab48aa587b4dc86020e3b0f722003dc5c03709626e143a1d38506b6072f9963fc76e89b6d18128dfc28035bf8d24e46ea44f219db69a1b3a294416f0b023090
 SHA512 
ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f
-DIST ccache-4.4.2.tar.xz 510260 BLAKE2B 
f0d8b9ac6e1972592ce5a51a392279a01f01c09e6bffc498ff0b20aa46acb6d7f949ae9f4c6006e20b15cdea9fa2fa057c78b69ef66c2e13b3ddee13367e91b1
 SHA512 
afcec4806b1e307ec16006ecd9e39eb69fc1376407877f024c882926725d41f2b08eccdcfb3efd8dac9e481d07f9c08c043b8cea5ea563a0f49b2f587325e4a7
 DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 
637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498
 SHA512 
267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
 DIST ccache-4.6.tar.xz 526084 BLAKE2B 
2e43d0a3a004117e8c535ecb2f09c1273f5bec2b3704710abbc3034749438df33ef27db37d5bfbd48d83d60bdd3f738d3dbf356eff21166fee03780969dd1f24
 SHA512 
3a53fedfa91034ee876e1a4a672de25498fe53c6c80901bd4976049eb35e0479275ceb6627f0e8cf76d677d041d216f731daf4bad142e454e775b5e7f05e3e4e
 DIST ccache-4.6.tar.xz.asc 833 BLAKE2B 
e0fc7677087006e3c6ac2bb7285915a56f233b4058c738c9d5967d29baf62b1b072ad2da4bf12f076440c68f39be77333d001d68703c32e26bd88a42b9e3ce71
 SHA512 
af09ffcdbba5e1e26047c7692dd0cf61f07869720d5849f59cbc0fe0f61c11aa419226d4d05061d23b5a03e8ec995e4d0e5af398af096bd19dbe35bf460eee0c

diff --git a/dev-util/ccache/ccache-4.3-r3.ebuild 
b/dev-util/ccache/ccache-4.3-r3.ebuild
deleted file mode 100644
index d49b0b149a99..
--- a/dev-util/ccache/ccache-4.3-r3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.dev/";
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz";
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="+static-c++ test"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-   app-arch/zstd:0=
-   dev-util/shadowman
-   sys-apps/gentoo-functions
-"
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+="
-   test? ( dev-libs/elfutils )
-"
-BDEPEND="
-   app-text/asciidoc
-"
-
-RESTRICT="!test? ( test )"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-   "${FILESDIR}"/${PN}-4.0-objdump.patch
-   "${FILESDIR}"/${PN}-4.1-avoid-run-user.patch
-   "${FILESDIR}"/${P}-PWD.patch
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   sed \
-   -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-   "${FILESDIR}"/ccache-config-3 > ccache-config || die
-
-   # mainly used in tests
-   tc-export CC OBJDUMP
-
-   # Avoid dependency on libstdc++.so. Useful for cases when
-   # we would like to use ccache to build older gcc which injects
-   # into ccache locally built (possibly outdated) libstdc++
-   # See bug #761220 for examples.
-   #
-   # Ideally gcc should not use LD_PRELOAD to avoid this type of failures.
-   use static-c++ && append-ldflags -static-libstdc++
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DUSE_CCACHE=OFF
-   -DUSE_FASTER_LINKER=OFF
-   -DZSTD_FROM_INTERNET=OFF
-   )
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   dobin ccache-config
-   insinto /usr/share/shadowman/tools
-   newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-}
-
-pkg_prerm() {
-   if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
-   eselect compiler-shadow remove ccache
-   fi
-}
-
-pkg

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-04-09 Thread Sam James
commit: 035fe04cb6f6f041330ab7561bdd1dc7687343de
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr  9 11:27:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr  9 11:27:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=035fe04c

dev-util/ccache: revbump for /run fix

Thought I had!

Fixes: 9767f9723c5c168a772653541283cb9065090c1e
Bug: https://bugs.gentoo.org/837362
Bug: https://bugs.gentoo.org/837380
Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/{ccache-4.6.ebuild => ccache-4.6-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-util/ccache/ccache-4.6.ebuild 
b/dev-util/ccache/ccache-4.6-r1.ebuild
similarity index 100%
rename from dev-util/ccache/ccache-4.6.ebuild
rename to dev-util/ccache/ccache-4.6-r1.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/

2022-04-09 Thread Sam James
commit: 9767f9723c5c168a772653541283cb9065090c1e
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr  9 11:26:14 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr  9 11:26:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9767f972

dev-util/ccache: restore /run-skip patch

I still can't hit this but let's rebase the old patch
given it makes sense for now.

Closes: https://bugs.gentoo.org/837362
Bug: https://bugs.gentoo.org/837380
Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.6.ebuild  |  1 +
 .../ccache/files/ccache-4.6-avoid-run-user.patch   | 28 ++
 2 files changed, 29 insertions(+)

diff --git a/dev-util/ccache/ccache-4.6.ebuild 
b/dev-util/ccache/ccache-4.6.ebuild
index 9bff72bc83a7..d3c7ceee833f 100644
--- a/dev-util/ccache/ccache-4.6.ebuild
+++ b/dev-util/ccache/ccache-4.6.ebuild
@@ -37,6 +37,7 @@ DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md 
README.md )
 PATCHES=(
"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
"${FILESDIR}"/${PN}-4.0-objdump.patch
+   "${FILESDIR}"/${PN}-4.6-avoid-run-user.patch
 )
 
 src_prepare() {

diff --git a/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch 
b/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch
new file mode 100644
index ..cfdd09f79e66
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch
@@ -0,0 +1,28 @@
+Gentoo's sandbox does not whitelist this path by default yet.
+
+(4.1 update:
+https://github.com/ccache/ccache/issues/984
+https://github.com/ccache/ccache/issues/1044
+https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
+https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68
+... gets us closer, but not there yet.)
+
+https://bugs.gentoo.org/837362 for 4.6 issue.
+--- a/src/Config.cpp
 b/src/Config.cpp
+@@ -1031,14 +1031,5 @@ Config::check_key_tables_consistency()
+ std::string
+ Config::default_temporary_dir(const std::string& cache_dir)
+ {
+-  static const std::string run_user_tmp_dir = [] {
+-#ifdef HAVE_GETEUID
+-auto dir = FMT("/run/user/{}/ccache-tmp", geteuid());
+-if (Util::create_dir(dir)) {
+-  return dir;
+-}
+-#endif
+-return std::string();
+-  }();
+-  return !run_user_tmp_dir.empty() ? run_user_tmp_dir : cache_dir + "/tmp";
++  return cache_dir + "/tmp";
+ }



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/

2022-04-08 Thread Sam James
commit: 1ed449cc0f55f53a177ce4cc6c81463a0e04d633
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr  9 04:28:33 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr  9 04:30:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed449cc

dev-util/ccache: add 4.6

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest   |  2 +
 dev-util/ccache/ccache-4.6.ebuild  | 92 ++
 .../ccache/files/ccache-4.1-avoid-run-user.patch   |  6 ++
 3 files changed, 100 insertions(+)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 8001b81d957a..29ab5c3c1a3d 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,3 +1,5 @@
 DIST ccache-4.3.tar.xz 433508 BLAKE2B 
6ab48aa587b4dc86020e3b0f722003dc5c03709626e143a1d38506b6072f9963fc76e89b6d18128dfc28035bf8d24e46ea44f219db69a1b3a294416f0b023090
 SHA512 
ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f
 DIST ccache-4.4.2.tar.xz 510260 BLAKE2B 
f0d8b9ac6e1972592ce5a51a392279a01f01c09e6bffc498ff0b20aa46acb6d7f949ae9f4c6006e20b15cdea9fa2fa057c78b69ef66c2e13b3ddee13367e91b1
 SHA512 
afcec4806b1e307ec16006ecd9e39eb69fc1376407877f024c882926725d41f2b08eccdcfb3efd8dac9e481d07f9c08c043b8cea5ea563a0f49b2f587325e4a7
 DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 
637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498
 SHA512 
267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
+DIST ccache-4.6.tar.xz 526084 BLAKE2B 
2e43d0a3a004117e8c535ecb2f09c1273f5bec2b3704710abbc3034749438df33ef27db37d5bfbd48d83d60bdd3f738d3dbf356eff21166fee03780969dd1f24
 SHA512 
3a53fedfa91034ee876e1a4a672de25498fe53c6c80901bd4976049eb35e0479275ceb6627f0e8cf76d677d041d216f731daf4bad142e454e775b5e7f05e3e4e
+DIST ccache-4.6.tar.xz.asc 833 BLAKE2B 
e0fc7677087006e3c6ac2bb7285915a56f233b4058c738c9d5967d29baf62b1b072ad2da4bf12f076440c68f39be77333d001d68703c32e26bd88a42b9e3ce71
 SHA512 
af09ffcdbba5e1e26047c7692dd0cf61f07869720d5849f59cbc0fe0f61c11aa419226d4d05061d23b5a03e8ec995e4d0e5af398af096bd19dbe35bf460eee0c

diff --git a/dev-util/ccache/ccache-4.6.ebuild 
b/dev-util/ccache/ccache-4.6.ebuild
new file mode 100644
index ..9bff72bc83a7
--- /dev/null
+++ b/dev-util/ccache/ccache-4.6.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/joelrosdahl.asc
+inherit cmake toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/";
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz";
+SRC_URI+=" verify-sig? ( 
https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="doc redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-arch/zstd:=
+   redis? ( dev-libs/hiredis:= )"
+RDEPEND="${DEPEND}
+   dev-util/shadowman
+   sys-apps/gentoo-functions"
+# Needed for eselect calls in pkg_*
+IDEPEND="dev-util/shadowman"
+
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND=" doc? ( dev-ruby/asciidoctor )
+   verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+   "${FILESDIR}"/${PN}-4.0-objdump.patch
+)
+
+src_prepare() {
+   cmake_src_prepare
+
+   sed \
+   -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+   "${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+   # Mainly used in tests
+   tc-export CC OBJDUMP
+
+   # Avoid dependency on libstdc++.so. Useful for cases when
+   # we would like to use ccache to build older gcc which injects
+   # into ccache locally built (possibly outdated) libstdc++
+   # See bug #761220 for examples.
+   #
+   # Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
+   use static-c++ && append-ldflags -static-libstdc++
+
+   local mycmakeargs=(
+   -DENABLE_DOCUMENTATION=$(usex doc)
+   -DENABLE_TESTING=$(usex test)
+   -DZSTD_FROM_INTERNET=OFF
+   -DREDIS_STORAGE_BACKEND=$(usex redis)
+   )
+
+   use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF )
+
+   cmake_src_configure
+}
+
+src_install() {
+   cm

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-01-03 Thread Sam James
commit: a7d00b4f87b8e89be76ef257008264e077185af2
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Jan  3 11:42:24 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan  3 12:36:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7d00b4f

dev-util/ccache: stable 4.5.1 for hppa, bug #830377

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.5.1.ebuild 
b/dev-util/ccache/ccache-4.5.1.ebuild
index 895c94f4d1aa..33eaea9d849e 100644
--- a/dev-util/ccache/ccache-4.5.1.ebuild
+++ b/dev-util/ccache/ccache-4.5.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="doc redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-01-03 Thread Sam James
commit: 6ecd6beb76ed3cf6ba46b3111c4ad8d067b2412d
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan  3 09:19:31 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan  3 09:19:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ecd6beb

dev-util/ccache: Stabilize 4.5.1 arm64, #830377

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.5.1.ebuild 
b/dev-util/ccache/ccache-4.5.1.ebuild
index 72267146c468..895c94f4d1aa 100644
--- a/dev-util/ccache/ccache-4.5.1.ebuild
+++ b/dev-util/ccache/ccache-4.5.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="doc redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-01-02 Thread Arthur Zamarin
commit: b83c8aa3cab7eec8b20a8828b1f692fb3b1d1f91
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jan  2 19:31:25 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jan  2 19:31:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b83c8aa3

dev-util/ccache: Stabilize 4.5.1 ppc, #830377

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/ccache/ccache-4.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.5.1.ebuild 
b/dev-util/ccache/ccache-4.5.1.ebuild
index 212ef1a4d435..72267146c468 100644
--- a/dev-util/ccache/ccache-4.5.1.ebuild
+++ b/dev-util/ccache/ccache-4.5.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="doc redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-01-02 Thread Sam James
commit: a33289ba5ccadc0653bef53b2cdc0e3a427dc6c4
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan  2 09:58:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  2 09:58:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a33289ba

dev-util/ccache: Stabilize 4.5.1 x86, #830377

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.5.1.ebuild 
b/dev-util/ccache/ccache-4.5.1.ebuild
index eb82c425be31..212ef1a4d435 100644
--- a/dev-util/ccache/ccache-4.5.1.ebuild
+++ b/dev-util/ccache/ccache-4.5.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="doc redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-01-01 Thread Sam James
commit: 821542db8a9545fe60006d2330aa0b3ee102a852
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan  2 00:03:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  2 00:03:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=821542db

dev-util/ccache: Stabilize 4.5.1 amd64, #830377

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.5.1.ebuild 
b/dev-util/ccache/ccache-4.5.1.ebuild
index 896130992839..eb82c425be31 100644
--- a/dev-util/ccache/ccache-4.5.1.ebuild
+++ b/dev-util/ccache/ccache-4.5.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="doc redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2022-01-01 Thread Arthur Zamarin
commit: bb10ad4559cf558ce03f182879dcda6b802082ae
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jan  1 09:37:25 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jan  1 09:37:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb10ad45

dev-util/ccache: Stabilize 4.5.1 arm, #830377

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/ccache/ccache-4.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.5.1.ebuild 
b/dev-util/ccache/ccache-4.5.1.ebuild
index 9921652488cb..896130992839 100644
--- a/dev-util/ccache/ccache-4.5.1.ebuild
+++ b/dev-util/ccache/ccache-4.5.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="doc redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2021-12-31 Thread Sam James
commit: 7b7b98e9a1d7772e483ca88f0e6f5ea263cfd0e4
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan  1 05:32:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan  1 05:32:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b7b98e9

dev-util/ccache: Stabilize 4.5.1 ppc64, #830377

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ccache/ccache-4.5.1.ebuild 
b/dev-util/ccache/ccache-4.5.1.ebuild
index 8cb44ac4cf03..9921652488cb 100644
--- a/dev-util/ccache/ccache-4.5.1.ebuild
+++ b/dev-util/ccache/ccache-4.5.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="doc redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2021-12-31 Thread Sam James
commit: 9c13ec07c645b7ee33a6b620b00d6b72a33e553d
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan  1 05:32:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan  1 05:32:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c13ec07

dev-util/ccache: Stabilize 4.5.1 sparc, #830377

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/ccache-4.5.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/ccache/ccache-4.5.1.ebuild 
b/dev-util/ccache/ccache-4.5.1.ebuild
index 39deaa2e861d..8cb44ac4cf03 100644
--- a/dev-util/ccache/ccache-4.5.1.ebuild
+++ b/dev-util/ccache/ccache-4.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc ~x86"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="doc redis +static-c++ test"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2021-11-18 Thread Sam James
commit: bb3459efc77a96ad5aecb5466d06ef74ea79aae8
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 18 08:59:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 18 08:59:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb3459ef

dev-util/ccache: drop 4.5

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest  |  1 -
 dev-util/ccache/ccache-4.5.ebuild | 88 ---
 2 files changed, 89 deletions(-)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 44cd919e1617..8001b81d957a 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,4 +1,3 @@
 DIST ccache-4.3.tar.xz 433508 BLAKE2B 
6ab48aa587b4dc86020e3b0f722003dc5c03709626e143a1d38506b6072f9963fc76e89b6d18128dfc28035bf8d24e46ea44f219db69a1b3a294416f0b023090
 SHA512 
ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f
 DIST ccache-4.4.2.tar.xz 510260 BLAKE2B 
f0d8b9ac6e1972592ce5a51a392279a01f01c09e6bffc498ff0b20aa46acb6d7f949ae9f4c6006e20b15cdea9fa2fa057c78b69ef66c2e13b3ddee13367e91b1
 SHA512 
afcec4806b1e307ec16006ecd9e39eb69fc1376407877f024c882926725d41f2b08eccdcfb3efd8dac9e481d07f9c08c043b8cea5ea563a0f49b2f587325e4a7
 DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 
637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498
 SHA512 
267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
-DIST ccache-4.5.tar.xz 512772 BLAKE2B 
6cfd80aeee140c18e0b6c1e30c15d717caeaa6ef17ebf6400773fc957e02285242cd8f8861cf137b542272258a81fe8fd128ee69eea0fe6ecd12cf20acc5b2d8
 SHA512 
c05dd4280c68f64e799cee5704d879df1348f970ff4bbee2278a15ce99c2c52c337ee64713edbd8111634484e9159c1ce3d93fe9351ef388b65a9cbd6c0fc6ab

diff --git a/dev-util/ccache/ccache-4.5.ebuild 
b/dev-util/ccache/ccache-4.5.ebuild
deleted file mode 100644
index 39deaa2e861d..
--- a/dev-util/ccache/ccache-4.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs flag-o-matic
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/";
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz";
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="doc redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/zstd:=
-   redis? ( dev-libs/hiredis:= )"
-RDEPEND="${DEPEND}
-   dev-util/shadowman
-   sys-apps/gentoo-functions"
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+=" test? ( dev-libs/elfutils )"
-BDEPEND=" doc? ( dev-ruby/asciidoctor )"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-   "${FILESDIR}"/${PN}-4.0-objdump.patch
-   "${FILESDIR}"/${PN}-4.1-avoid-run-user.patch
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   sed \
-   -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-   "${FILESDIR}"/ccache-config-3 > ccache-config || die
-
-   # mainly used in tests
-   tc-export CC OBJDUMP
-
-   # Avoid dependency on libstdc++.so. Useful for cases when
-   # we would like to use ccache to build older gcc which injects
-   # into ccache locally built (possibly outdated) libstdc++
-   # See bug #761220 for examples.
-   #
-   # Ideally gcc should not use LD_PRELOAD to avoid this type of failures.
-   use static-c++ && append-ldflags -static-libstdc++
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_DOCUMENTATION=$(usex doc)
-   -DENABLE_TESTING=$(usex test)
-   -DUSE_CCACHE=OFF
-   -DZSTD_FROM_INTERNET=OFF
-   -DREDIS_STORAGE_BACKEND=$(usex redis)
-   )
-
-   use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF )
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   dobin ccache-config
-   insinto /usr/share/shadowman/tools
-   newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-}
-
-pkg_prerm() {
-   if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
-   eselect compiler-shadow remove ccache
-   fi
-}
-
-pkg_postinst() {
-   if [[ ${ROOT:-/} == / ]]; then
-   eselect compiler-shadow update ccache
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2021-11-18 Thread Sam James
commit: 75417063a9ced09839f02c021bf9266a04fb81f2
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 18 08:58:54 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 18 08:59:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75417063

dev-util/ccache: add 4.5.1

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest|  1 +
 dev-util/ccache/ccache-4.5.1.ebuild | 88 +
 2 files changed, 89 insertions(+)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 350ed7ee59cf..3fbad187b433 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -2,4 +2,5 @@ DIST ccache-4.3.tar.xz 433508 BLAKE2B 
6ab48aa587b4dc86020e3b0f722003dc5c03709626
 DIST ccache-4.4.1.tar.xz 509916 BLAKE2B 
54fec9480c37c144667ae2dd969cabc1526a01312200b2b9b26ef1d5533836e2070d28e6a7fbc580f232b22dbd6f1a56a43494b8960d96c5a97d8f041e8f31ca
 SHA512 
820c0b05d2b0209e8478c7409da0e27de8e9621c683aa0f147f9c025b8ac7bc3d06d6945d346143790168da79dfbd14b0ccfb284c7ac05c35f85b492be07d676
 DIST ccache-4.4.2.tar.xz 510260 BLAKE2B 
f0d8b9ac6e1972592ce5a51a392279a01f01c09e6bffc498ff0b20aa46acb6d7f949ae9f4c6006e20b15cdea9fa2fa057c78b69ef66c2e13b3ddee13367e91b1
 SHA512 
afcec4806b1e307ec16006ecd9e39eb69fc1376407877f024c882926725d41f2b08eccdcfb3efd8dac9e481d07f9c08c043b8cea5ea563a0f49b2f587325e4a7
 DIST ccache-4.4.tar.xz 509516 BLAKE2B 
6c4519d3cd93be49dfff09f22ada798894c9f4475395443e0dcfcf768178f1520cf26bc5c2e0ea22e06cc3ebd6ddaf930a2d1b517593a10c3253f7faa3131f43
 SHA512 
a857d1aded9c352eabba9c0f31b43fd17ae91672dabdfc086851448867c9dff6ad6dd7ee60f8e39102d41b7d8cf7866c6bf104e0214e865de45e75a8df7626f0
+DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 
637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498
 SHA512 
267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
 DIST ccache-4.5.tar.xz 512772 BLAKE2B 
6cfd80aeee140c18e0b6c1e30c15d717caeaa6ef17ebf6400773fc957e02285242cd8f8861cf137b542272258a81fe8fd128ee69eea0fe6ecd12cf20acc5b2d8
 SHA512 
c05dd4280c68f64e799cee5704d879df1348f970ff4bbee2278a15ce99c2c52c337ee64713edbd8111634484e9159c1ce3d93fe9351ef388b65a9cbd6c0fc6ab

diff --git a/dev-util/ccache/ccache-4.5.1.ebuild 
b/dev-util/ccache/ccache-4.5.1.ebuild
new file mode 100644
index ..39deaa2e861d
--- /dev/null
+++ b/dev-util/ccache/ccache-4.5.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs flag-o-matic
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/";
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz";
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="doc redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-arch/zstd:=
+   redis? ( dev-libs/hiredis:= )"
+RDEPEND="${DEPEND}
+   dev-util/shadowman
+   sys-apps/gentoo-functions"
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND=" doc? ( dev-ruby/asciidoctor )"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+   "${FILESDIR}"/${PN}-4.0-objdump.patch
+   "${FILESDIR}"/${PN}-4.1-avoid-run-user.patch
+)
+
+src_prepare() {
+   cmake_src_prepare
+
+   sed \
+   -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+   "${FILESDIR}"/ccache-config-3 > ccache-config || die
+
+   # mainly used in tests
+   tc-export CC OBJDUMP
+
+   # Avoid dependency on libstdc++.so. Useful for cases when
+   # we would like to use ccache to build older gcc which injects
+   # into ccache locally built (possibly outdated) libstdc++
+   # See bug #761220 for examples.
+   #
+   # Ideally gcc should not use LD_PRELOAD to avoid this type of failures.
+   use static-c++ && append-ldflags -static-libstdc++
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_DOCUMENTATION=$(usex doc)
+   -DENABLE_TESTING=$(usex test)
+   -DUSE_CCACHE=OFF
+   -DZSTD_FROM_INTERNET=OFF
+   -DREDIS_STORAGE_BACKEND=$(usex redis)
+   )
+
+   use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF )
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   dobin ccache-config
+   insinto /usr/share/shadowman/tools
+   newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+}
+
+pkg_prerm() {
+   if [[ -z ${REPLACED_BY_VERSION} && 

[gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/

2021-11-18 Thread Sam James
commit: c355894dad05c4eeafa01aef12473b519272f170
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 18 08:59:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 18 08:59:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c355894d

dev-util/ccache: drop 4.3, 4.3-r2, 4.4, 4.4.1

Signed-off-by: Sam James  gentoo.org>

 dev-util/ccache/Manifest |  2 -
 dev-util/ccache/ccache-4.3-r2.ebuild | 90 
 dev-util/ccache/ccache-4.3.ebuild| 81 
 dev-util/ccache/ccache-4.4.1.ebuild  | 88 ---
 dev-util/ccache/ccache-4.4.ebuild| 86 --
 5 files changed, 347 deletions(-)

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 3fbad187b433..44cd919e1617 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,6 +1,4 @@
 DIST ccache-4.3.tar.xz 433508 BLAKE2B 
6ab48aa587b4dc86020e3b0f722003dc5c03709626e143a1d38506b6072f9963fc76e89b6d18128dfc28035bf8d24e46ea44f219db69a1b3a294416f0b023090
 SHA512 
ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f
-DIST ccache-4.4.1.tar.xz 509916 BLAKE2B 
54fec9480c37c144667ae2dd969cabc1526a01312200b2b9b26ef1d5533836e2070d28e6a7fbc580f232b22dbd6f1a56a43494b8960d96c5a97d8f041e8f31ca
 SHA512 
820c0b05d2b0209e8478c7409da0e27de8e9621c683aa0f147f9c025b8ac7bc3d06d6945d346143790168da79dfbd14b0ccfb284c7ac05c35f85b492be07d676
 DIST ccache-4.4.2.tar.xz 510260 BLAKE2B 
f0d8b9ac6e1972592ce5a51a392279a01f01c09e6bffc498ff0b20aa46acb6d7f949ae9f4c6006e20b15cdea9fa2fa057c78b69ef66c2e13b3ddee13367e91b1
 SHA512 
afcec4806b1e307ec16006ecd9e39eb69fc1376407877f024c882926725d41f2b08eccdcfb3efd8dac9e481d07f9c08c043b8cea5ea563a0f49b2f587325e4a7
-DIST ccache-4.4.tar.xz 509516 BLAKE2B 
6c4519d3cd93be49dfff09f22ada798894c9f4475395443e0dcfcf768178f1520cf26bc5c2e0ea22e06cc3ebd6ddaf930a2d1b517593a10c3253f7faa3131f43
 SHA512 
a857d1aded9c352eabba9c0f31b43fd17ae91672dabdfc086851448867c9dff6ad6dd7ee60f8e39102d41b7d8cf7866c6bf104e0214e865de45e75a8df7626f0
 DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 
637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498
 SHA512 
267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
 DIST ccache-4.5.tar.xz 512772 BLAKE2B 
6cfd80aeee140c18e0b6c1e30c15d717caeaa6ef17ebf6400773fc957e02285242cd8f8861cf137b542272258a81fe8fd128ee69eea0fe6ecd12cf20acc5b2d8
 SHA512 
c05dd4280c68f64e799cee5704d879df1348f970ff4bbee2278a15ce99c2c52c337ee64713edbd8111634484e9159c1ce3d93fe9351ef388b65a9cbd6c0fc6ab

diff --git a/dev-util/ccache/ccache-4.3-r2.ebuild 
b/dev-util/ccache/ccache-4.3-r2.ebuild
deleted file mode 100644
index b3930229a412..
--- a/dev-util/ccache/ccache-4.3-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.dev/";
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz";
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
-IUSE="static-c++ test"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-   app-arch/zstd:0=
-   dev-util/shadowman
-   sys-apps/gentoo-functions
-"
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+="
-   test? ( dev-libs/elfutils )
-"
-BDEPEND="
-   app-text/asciidoc
-"
-
-RESTRICT="!test? ( test )"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-   "${FILESDIR}"/${PN}-4.0-objdump.patch
-   "${FILESDIR}"/${PN}-4.1-avoid-run-user.patch
-   "${FILESDIR}"/${P}-PWD.patch
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   sed \
-   -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-   "${FILESDIR}"/ccache-config-3 > ccache-config || die
-
-   # mainly used in tests
-   tc-export CC OBJDUMP
-
-   # Avoid dependency on libstdc++.so. Useful for cases when
-   # we would like to use ccache to build older gcc which injects
-   # into ccache locally built (possibly outdated) libstdc++
-   # See bug #761220 for examples.
-   #
-   # Ideally gcc should not use LD_PRELOAD to avoid this type of failures.
-   use static-c++ && append-ldflags -static-libstdc++
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DUSE_CCACHE=OFF
-   -DUSE_FASTER_LINKER=OFF
-   -DZSTD_FROM_INTERNET=OFF
-   )
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmak

  1   2   3   4   >