gentoo (valentine's day) resync : 14.02.2021

4 files changed, 30 insertions, 38 deletions

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 0019b3583bdc..e11bfbd2b8ea 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,10 +1,9 @@
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
-AUX ccache-3.7.12-objdump.patch 302 BLAKE2B dfd85c0448ee685109079d0b6d84342941d777aee0d0eaa968abc9f089173f7d9e63b97dcbc1618431815238de1c231d2454d4577b7177e63230e4806cce4d3b SHA512 18461643d1404b341f9259aea8163c5306c81155350487bef22614586c7ba355bb846d2bc2ebe2746ac781d7267a474933ed3baf2196f1d62bb3fdeff5c8d094
 AUX ccache-4.0-objdump.patch 271 BLAKE2B e641f1acef1e439660753c781d5760ab2a2530ce8dbcfacb1c3835523ec41ff35701536698827f11c39c1e06641fcf6b57d374944ecb44888a66c7860f97b813 SHA512 cc53f44b173c1ae66258aa573182ae936304dac9daf8489a20c45dbe3d554df207bd93b370da2c86b22fbc4edf5fd954f84fd18812d97d41a88ea4c7926f117c
 AUX ccache-4.1-avoid-run-user.patch 557 BLAKE2B 956ac163da6c8acdefb5b395549067272beea095e93686cf553d534c94d76c1c032ef3423f851907367006e1e7bc7b4afe1494bef1eb293e5aca2e3625c29c10 SHA512 bbdd370e478839980423777053baa42ce37cd18ebf8cd36d3f5b13d9252c38b17840ab6e71aefda20a9903bd4a85e4cdb4582728a9db9d1e847b0ee9569bba9e
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
-DIST ccache-3.7.12.tar.xz 354684 BLAKE2B b0b1028ede8206622c4b563cdc1351bdbe49ac11aa92d405c778af91db5bac029f7331371ef0a55bc3b1c7a0b60fbc5711277e048481bf0f4ad4b1be8acd3495 SHA512 0eb47869f86d36b3e5fad0d5073973f0444f3efe23fd14469a9e05154ea219228443098b1c5e4a8a0c5c78b4bfa7623735b50ebd6b8b4d0626766061850d6a62
 DIST ccache-4.1.tar.xz 389240 BLAKE2B 265ed6cd9602a04db0fadf63266d0fe1e78a74c69a27f05854a287e4048934d6afd63e71987bc525217782075c1a158601c400f3418caa0eb9730f34275bd08c SHA512 e80075eeea3fef8215de0a793e02381bfb59d7e74237fa34a49306047c60f0de0e678396ad3a9e5d86d3ad2aa21bbe29c7f0055f06b3ba2470f6895ce2eedd7b
-EBUILD ccache-3.7.12.ebuild 1531 BLAKE2B 135f010762040f4a6141d67016db66e4e10dcda9bf7e6a25733e1bda77988a50bccd52afc647e3227e71b05373f12d4d1317692672a89a4f1e6e5b8b9eea9fec SHA512 8b0a26a598f3cd704527e6657cdc393a1e13ab4ab83bae67744e8439a71761b98fc727b11b65676c79f972d90979a2b027cb2fdcb4a00fc5e71dbf5537b012a6
-EBUILD ccache-4.1.ebuild 1727 BLAKE2B f8284cb2dfd4a9533365f2b507bbcfbaa2814d645996f9463803d41bfdc1bf8e19167335842c05bba0a590e60a25e3e1d454808be8e95cfe6a34e50d1d0c16cd SHA512 0a25d48cc753ef90f272d670302b6f6472f8f427377071986aeb4f92df2fd946ae951e58736f9fe48444b456b9ed21e08386645acc615ac8b07c45b31cbf7fe3
+DIST ccache-4.2.tar.xz 422688 BLAKE2B 932db2e4f6ef9d98359fe44f931d083acb9fd32661d9baec5a2d0cfffc9301a999b04e4628d31513ec809bf43e3e94d71f9b92a1c83bcebbaf5e35e219596704 SHA512 b7e5823a0705b9a1100c959281170dcd682228b585c329821337ef57d5b5cf47d6f3d644a6d5a3675a32a02730559f8fe6d84d11f01847f47b77c0893d1d1fbe
+EBUILD ccache-4.1.ebuild 1726 BLAKE2B 26faa29d244714adedc0a6f7306ea92d39ab152be9ba623491c195207d6685a5e8b265fb264bfc75d8ee6679b0ea872b50a18656e517bb507c630b02c312340e SHA512 215de272d0ecb95fbb6acf0fd0cf5760c953d20fc922e39c1ef159034a4db82100911177f199c1a1b9ada1cb16723fbbaa24de4b15e3881b18e686ab8b6b09df
+EBUILD ccache-4.2.ebuild 1662 BLAKE2B 3747ef40e6edd8f35a9c2760200593bb93c222b5864f9edda872413f1f54393b01402c675a7e39280786d32f87f2a798286f6ab6c14993a366d76c6e7548eef3 SHA512 7538e49273de477d4bc77b8db6e093c5c222d59c5c25383677195399a89bce281d64014b8631ab107c5af05c04aef69f6872a55631fecaee3a81b36d957b5921
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-4.1.ebuild b/dev-util/ccache/ccache-4.1.ebuild
index 3bee41803c9c..710619c6fb9c 100644
--- a/dev-util/ccache/ccache-4.1.ebuild
+++ b/dev-util/ccache/ccache-4.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"
 IUSE="test"
 
 DEPEND=""
diff --git a/dev-util/ccache/ccache-3.7.12.ebuild b/dev-util/ccache/ccache-4.2.ebuild
index 5300a828d02a..3f58044c6822 100644
--- a/dev-util/ccache/ccache-3.7.12.ebuild
+++ b/dev-util/ccache/ccache-4.2.ebuild
@@ -1,62 +1,67 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+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"
+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"
 IUSE="test"
 
-DEPEND="app-arch/xz-utils
-	sys-libs/zlib"
+DEPEND=""
 RDEPEND="${DEPEND}
+	app-arch/zstd:0=
 	dev-util/shadowman
-	sys-apps/gentoo-functions"
+	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 )"
+	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}-3.7.12-objdump.patch
+	"${FILESDIR}"/${PN}-4.0-objdump.patch
+	"${FILESDIR}"/${PN}-4.1-avoid-run-user.patch
 )
 
 src_prepare() {
-	default
+	cmake_src_prepare
 
 	sed \
 		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
 		"${FILESDIR}"/ccache-config-3 > ccache-config || die
 
 	# mainly used in tests
-	tc-export OBJDUMP
+	tc-export CC OBJDUMP
 }
 
 src_configure() {
-	econf --without-bundled-zlib
-}
-
-src_compile() {
-	emake V=1
-}
+	local mycmakeargs=(
+		-DUSE_CCACHE=OFF
+		-DUSE_FASTER_LINKER=OFF
+		-DZSTD_FROM_INTERNET=OFF
+	)
 
-src_test() {
-	emake check V=1
+	cmake_src_configure
 }
 
 src_install() {
-	DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-	default
+	cmake_src_install
 
 	dobin ccache-config
 	insinto /usr/share/shadowman/tools
diff --git a/dev-util/ccache/files/ccache-3.7.12-objdump.patch b/dev-util/ccache/files/ccache-3.7.12-objdump.patch
deleted file mode 100644
index f5387104e453..000000000000
--- a/dev-util/ccache/files/ccache-3.7.12-objdump.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Allow ${CHOST}-objdump (or any other override)
---- a/test/suites/debug_prefix_map.bash
-+++ b/test/suites/debug_prefix_map.bash
-@@ -24,7 +24,7 @@ objdump_cmd() {
-     if $HOST_OS_APPLE; then
-         xcrun dwarfdump -r0 $1
-     else
--        objdump -W $1
-+        ${OBJDUMP-objdump} -W $1
-     fi
- }
-