gentoo resync : 29.06.2020

3 files changed, 94 insertions, 0 deletions

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index d39c67d5ef8c..e76e739a93ee 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,7 +1,10 @@
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
+AUX ccache-3.7.10-objdump.patch 392 BLAKE2B 6c15a165aff5b2633b0c3571f8f89a3480d5608b006f9f3c0a80117d5c94039fc3e631d0f54c870df1904ac5c855d11007fb73178be8df7001be4f414d103ede SHA512 94f291d44a64ed9aff04da39467751aaf84262fd987c63e53213cbdedbaf30c36ff0aa0902e73418846153e8cdf5a912b021adf7c122bea9698cb296faa9ebf6
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
+DIST ccache-3.7.10.tar.xz 353792 BLAKE2B d7c06ee55a79afb4b72cdc20ec3d6413a5417301c63a0c822a4f82e6b9542c7a9cdf9f1bbd60a4698c335fdddfadcb9d674bff02c6dad1c2df9932212fdf6477 SHA512 64b0d42af7fd2dfdda65668b04dbd16807a22324e336e61f6c6a91c00110fb535c7ac9062a9c14c924a7ddaf42247f69a43d83dd0fd187ce3b0737158b5bb8fc
 DIST ccache-3.7.7.tar.xz 351592 BLAKE2B 0b211cb77ceb42b7ee5dfcde98d9f53bf222cf18b8d38a7cf6fc9631c5e1c79ca82e6d0a0dbacfe2d5f61b2acefebe202e06fc3b8035f0f25a5f9954554a18cd SHA512 f93380aeb45e815964abc3b62f1963abafe22e0c6a7b61d039e710c7f935221e02678e21af65add4fd59fd5a141824ab95f4a7afc8dd557de36737c365cab816
 DIST ccache-3.7.9.tar.xz 352948 BLAKE2B 791491c3f9da58f06bb0a58e411d9a7b3e39e460102793ef736820913d43d488ce7daffba572c21f507ea78d8da04edc3aaa47eb1a0fbec8cb35461a60b770e9 SHA512 5d39baeb66265451b0e9cef250f6d9c5f6869cd87e27c108c9a50bef80050122ed4280ff662a81bba8d1d1311f2004bcaf9ada6b783a42eedc67ca01ebc48bb4
+EBUILD ccache-3.7.10.ebuild 1531 BLAKE2B d1583ac3d2283f44e9feacef08092cf7852ebbbccf35ac82df08f48be3046aa0c89bbb7084d0b77b31c135e350c7f5528bab63c9663db5fc1918ff7d71199a18 SHA512 c1f7d9466122f2c77925cf885c7ef08c596589e7cf005416f169bd9b65eb387448d32fafebc7908d4c15bb3fd5a10b24e48fc45db0b48dcfcf1a70d52f5042d8
 EBUILD ccache-3.7.7-r1.ebuild 2204 BLAKE2B 168006b6402a929a5c4367d98fafcfac1f6bb0a4ae11c2aa495cc6c326a7ff21cedc81204451ffa592b1b6f04150aa7923f0eff851ad502496bc101641f7ae0c SHA512 f60bdfe797f15da5ce90a784029dce92971bd15b90e91d1503ff2da78d8ef6d57a9b98ffa75c1f9565f4e5a71bc09e0be58946a0613d3fe2fdbb20d1797c8ccf
 EBUILD ccache-3.7.9.ebuild 1419 BLAKE2B 6f248e8069578a8fd82ff7c425978c3656d45943e77c611d663cb3d63ca3ac526cba14d410dc3a3a5f46a140733d8fefc0b7580504b9008fc97c963c47669ce9 SHA512 c218ae20057eebf4242b51c5b3fa4dd6e3e9bc43428d4ecdff197773c80a6967c81e3df246c298c89cb028dff9caeba6c190e897bc60cc772445d43519444c0e
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.7.10.ebuild b/dev-util/ccache/ccache-3.7.10.ebuild
new file mode 100644
index 000000000000..900d8f39d692
--- /dev/null
+++ b/dev-util/ccache/ccache-3.7.10.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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"
+SLOT="0"
+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"
+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 )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${P}-objdump.patch
+)
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+
+	# mainly used in tests
+	tc-export OBJDUMP
+}
+
+src_configure() {
+	econf --without-bundled-zlib
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_test() {
+	emake check V=1
+}
+
+src_install() {
+	DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+	default
+
+	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
+}
diff --git a/dev-util/ccache/files/ccache-3.7.10-objdump.patch b/dev-util/ccache/files/ccache-3.7.10-objdump.patch
new file mode 100644
index 000000000000..bad334a5c546
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.7.10-objdump.patch
@@ -0,0 +1,15 @@
+Allow ${CHOST}-objdump (or any other override)
+--- a/test/suites/debug_prefix_map.bash
++++ b/test/suites/debug_prefix_map.bash
+@@ -24,9 +24,9 @@ objdump_cmd() {
+     if $HOST_OS_APPLE; then
+         xcrun dwarfdump -r0 $1
+     elif $HOST_OS_FREEBSD; then
+-        objdump -W $1
++        ${OBJDUMP-objdump} -W $1
+     else
+-        objdump -g $1
++        ${OBJDUMP-objdump} -g $1
+     fi
+ }
+