gentoo auto-resync : 25:11:2022 - 13:12:41

3 files changed, 96 insertions, 2 deletions

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 5a5d3851c3b6..dc041b67d1ae 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -8,7 +8,10 @@ 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
 EBUILD ccache-4.5.1.ebuild 2295 BLAKE2B 8b89808a850d5bb512a9672d719a800c9f17fd23dddc3bb5b1c0626b4160910bead0ca27137d734340ca9a60783349b97730376d5cb35473698b843203758d7c SHA512 96c0b4dbe479a0383fb28fda5f262e4490625e0ba137e5435ba8ee9702d14fe68c42a04a462792ff96aa176e3676a819602e2e50cb989d5061842c188d8fc5ba
-EBUILD ccache-4.6.3.ebuild 2580 BLAKE2B 39ae43c3eac81b56030997f2fe8cef7b7e799c9bed959e4e9b77cfe6bcf62f5bc50c9a9db23c56a5e876e13b2db5de41106d4e927c961889f29168bf7911208d SHA512 32274ad5f6f9fb5bc8910f86426b401dabd638505cf0a0748f9d4bd1d5b156cba160a247532a5468df5a39b74c9812f4a7d363794000d928771babebc2013ba7
+EBUILD ccache-4.6.3.ebuild 2578 BLAKE2B 03c13d9fefe25a59e54882a64a5dee2b1a970cd0b368bcee455dcc5fe5b50d4488250470d728a8d4e6ee4434becef91feb1f7b52918151706f6532299cbdbdd8 SHA512 cddd10532086bb153ba3634f190206258900ea3490cae90865ed87ed88557255f0475a3d6ea71d972e570f38fdade96440f07865882d7ff6109b0033bd6fedad
 EBUILD ccache-4.7.3.ebuild 2545 BLAKE2B 5d914716fa1f62164e9408564682e2b89b19557f682e1cb1ba8d470b9bc68f97248630c034ff8adf988e3aa407b40853d51e25a375a27f00a04cbf32596ee30a SHA512 5b1a858ae8c027cd4381d94eb82c285dddc116d3081424428887856cd0c9ce6940b5d40c77f9ac7446f06ef209e64f6124ddcdf8e8800100286c9253255d47e4
+EBUILD ccache-4.7.4.ebuild 2497 BLAKE2B 692e155e41260671d0e6d2516c2f3d5d00e8323b80a61b6195df5befcb8abb6cb8faf7bae8e6b197dd381626dcb65ae0c8e6a91016315b62188fa6beb0a046c8 SHA512 2ca7dc9f44210361160a05ddb5efe5bc1ecf6e8e2194c4933ef3fafd88efd803fc251ea8c97feccb349b5dc41a1979ce54eab716bd786f5a4731a4e3b617fe56
 MISC metadata.xml 710 BLAKE2B 0a93cf3dd4222eb2fd500c3cafdff3c01eacecc489a471270922fc5dd1daf58cd1398ddfb7ab4d271a6e84d5a3da5c3e7a341b1e7994af7b10fd432318de7c5e SHA512 dbfa6b8d8f435e25887b25ce25df65184a7f315986ee60a1c723d0e6592ca73bc7414b6650014812eb882e7e39bed953eaa21139a414043c50c018a7b780e6f1
diff --git a/dev-util/ccache/ccache-4.6.3.ebuild b/dev-util/ccache/ccache-4.6.3.ebuild
index a6902ba60240..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 )"
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 000000000000..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() {
+	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} && -z ${ROOT} ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} ]] ; then
+		eselect compiler-shadow update ccache
+	fi
+}