gentoo resync : 28.04.2019

3 files changed, 88 insertions, 2 deletions

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index d1e67b629437..6f6ca00eafff 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -9,9 +9,11 @@ DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d0904
 DIST ccache-3.5.1a.tar.xz 335888 BLAKE2B 66c044b39dd42c91327e02528a4d6c917ac012c2d08190f7dbc2029ed6d1525aa3a6262fb7528f1721cec510306baa59b498a5afbcf955bb6aaf13594c00d178 SHA512 8a2e9eb06ba21fcf92084afd94fc221168693de545e0448f4da2098bef2bcbfdb017117c325b0bab4931b9e346dd8c1a9d1ebaed0cdc36496d9452985cdd1b43
 DIST ccache-3.5.tar.xz 334668 BLAKE2B e3e2b63e8c4c8074514fb3a5794325fa05a4d52f48fc436ab0ad21b643ca4d1a1502c989cb47ed68972b105d4f1642e4fadc5ecef1235fe2bd3be5d218094a79 SHA512 92181fb794f06dc231baa4193c37e8f1d844c9281fd64bcb8f4b35c87b4a88dfc9bf36b810b37151ee85699778fcd3783818949a7010e619aeca7e3b33b7a2e3
 DIST ccache-3.6.tar.xz 340608 BLAKE2B fa92180f53612f84b71c68da4acccefee129e5bfc9b269caa45a9c16219ed835ccf034d61ff938a54f3673fa23410d960475cc37cf5d27d7be641e7518a43f0a SHA512 13ce4c9084983ce77617cf005235987715cd6b630dac13a17cb9badce24aab71bff505e63da4206878e32d337cc674f05fbf78540711ec5b33a0b8384c47fa0d
+DIST ccache-3.7.tar.xz 348764 BLAKE2B a80ac0d5d94ff5d1aaee45a186037a9c8346c5e44d00afd29a4ba40b4fca877cd30b82357f344bed77f5caeb333bacfde8aff46d8fb866b484a3a1d3e5f513f5 SHA512 b8a5944072fcf8280b63ddbd6e2fcbc04d4ee99c0b2d3bfb9b47f61e760ce1dc5e191cf3f6437431b6d08af6cfb2162d6a2021ad49fd6746e531eb03cc26fd2e
 EBUILD ccache-3.2.4.ebuild 2068 BLAKE2B 8fb9e15fe1787760e878ac9c13f9c97e9e9e87e3046ec700266ccd3a1d44240e7a5cf0e24deaef38bad30f66d823488e8979ebe79a9668ff55c6a417ec048229 SHA512 965dcf43bd7999352de8aa6097e90418160cf4f51e4016113c05dc37d023518e22d001a2415ad7948c07e55ab57ae044021e7e4f044df127b81a12ad2bd37653
 EBUILD ccache-3.3.4-r1.ebuild 1917 BLAKE2B 740c0be412ab1c4402682dc403e292c96e3f7b4ef9c881bc71d8a4dfcf58716141a8eba73baba94ceb21d25cb3398c1e3f2a5a0e5435acc02f9c561e3777dc9b SHA512 d4c0899d3bd5f7c8040e4591a658ee93fa7fb96339a0f72169016ef433266a98e558242250697ba9b5abad0eccd636fd23892f6e88e7ee30f9bed84a38eba04b
 EBUILD ccache-3.5-r1.ebuild 2046 BLAKE2B f5bd4d9cf89b0896d51152614c47f329e29d084c371b4fdd0291d2d6d1b2d880af38358a6ffbd620b9a8d1f3ec6a95d263ce2f8fa202955c2cb32c77cf33d758 SHA512 a90b898e8e261afe126321d7222ce41d4c91e068ce5baa15927a630ea66d141cce95f87b826c85b33599f33b0584055d22af6dd358651daea29487800f0cf2ae
 EBUILD ccache-3.5.1a.ebuild 2096 BLAKE2B 3334ed2e2f022f39b27aa9fcfd39d98eb8982bad09b67d3d7a1cbb0a47115dbd416f886121e32aab00c75ee729038efa5696c8bf9c00e9ac0a513d99483ec2ad SHA512 246e5d788fcb590be2b2fe9cd6e214a87934e0547a6d0dd9e3c888f4955ed33be9cc87a2eb0afdc517e48d6dd1bb02129975b4a7b27fbaf77fe76e4a7d971137
-EBUILD ccache-3.6.ebuild 2099 BLAKE2B c8f75918483df8772aa657dc837748053eebbafa8231d6ecf05cab5cd73dd2aeceb6e4394ab0ffe212a35c92d5482fb2f623551ceccb5d5cfd80654786ba6574 SHA512 3ce2913602971e9b6b2d91b8bfb24a839da3800b75e563d457e113db967bc037bdaf4649f6d6bd88d49657aa8533b2d81b944de6c8aa8181472d201e60fd726a
+EBUILD ccache-3.6.ebuild 2094 BLAKE2B c500a209421345174099d4603fc592972862cdde7d961639b81bcaa3c723a9339b4dcb8dfc20287a21b6e22125992245926f317c6c856c672f9cb8f7f601d0da SHA512 bc60aff39b32ddedbd052ce7c0b90f42780fbb40f6b8a76773349c2406ed86b3d630a40d4c7ab9c75bb7b566c18753e7840ff589878918338933e75531c6c8ec
+EBUILD ccache-3.7.ebuild 2126 BLAKE2B 11a1cdb3de7b56d6b97069c8646825ea10bf105d477b6fd16afc235d376b5bb888c53f9148b2ae0aa422d782b6b99e673a5aa821cfb09f0433388f6fa37a0c11 SHA512 b303a89fe8a501547394ba89ac44f9865320a737b8d9cb74acf1008b66803e2f62f46a38c22a1f4890891c97ffd0e249b0c3863ed3f3e2511f67a84f3164633f
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.6.ebuild b/dev-util/ccache/ccache-3.6.ebuild
index c5335c505f37..155ab8c7ce3b 100644
--- a/dev-util/ccache/ccache-3.6.ebuild
+++ b/dev-util/ccache/ccache-3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.ebuild b/dev-util/ccache/ccache-3.7.ebuild
new file mode 100644
index 000000000000..b8912ddeeee1
--- /dev/null
+++ b/dev-util/ccache/ccache-3.7.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1
+
+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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${PN}-3.6-disable-sized-cleanup.patch #649440
+)
+
+src_prepare() {
+	default
+
+	# make sure we always use system zlib
+	rm -rf src/zlib || die
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+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 <<<'/usr/lib/ccache/bin'
+
+	DOC_CONTENTS="
+To use ccache with **non-Portage** C compiling, add
+'${EPREFIX}/usr/lib/ccache/bin' to the beginning of your path, before
+'${EPREFIX}/usr/bin'. Portage will automatically take advantage of ccache with
+no additional steps.  If this is your first install of ccache, type
+something like this to set a maximum cache size of 2GB:\\n
+# ccache -M 2G\\n
+If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
+# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
+ccache now supports sys-devel/clang and dev-lang/icc, too!"
+
+	readme.gentoo_create_doc
+}
+
+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
+
+	# nuke broken symlinks from previous versions that shouldn't exist
+	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
+
+	readme.gentoo_print_elog
+}