gentoo resync : 25.08.2018

3 files changed, 98 insertions, 0 deletions

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 1bf9135f3802..c0017e2edd78 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,9 +1,12 @@
 AUX ccache-3.1.10-size-on-disk.patch 518 BLAKE2B 1f949d0cb0168e3de0a4e142db339f59b1dabda2b06912133e10c536e23f7912e002c7d4cf6ec90654863c0339339bf17baa9b3b107110e4f25e6876ba8fe39b SHA512 bf7a160b091798e7de57748f4f9e0d6f027872c713108e3791cfc82bf64d3ed843607267ff0cca9e0848abf8bbcbbb6c19921560032576849a42f29ecc496212
 AUX ccache-3.3-size-on-disk.patch 514 BLAKE2B 93ce94415da1ac5af7ccf60958908f7b1b75b9a7af2602c1f23113b06dbc15489f797a188103a948cb7dd81ffba11797fa0e525c2ab667b9fb5a2a890097028b SHA512 7e7f01ca602722a1add1615223bb109cecfdf69ab7612a0424732f992331b0addd7b94f684fedb91486f69cbe57fcb1961d1069116a27458f1f5b20a169f2569
+AUX ccache-3.4-size-on-disk.patch 522 BLAKE2B 6ec1f4cdb75d39997e16716caf3195c180ef7796568031b0dcbb92c385034b793fef2ad7afd9d3aaf66c37dd562447fca3bbac8b42909b2fa4e2b2ae1f8008ea SHA512 91757a176c813076d90f1a44b6a605bf1fac30e47caf253883c59e8f9e0e257d6aeceeb3f3f96351fc5c24f413eb7bb08a811e4be0991fe653ae62d68cce565f
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-3.2.4.tar.xz 302548 BLAKE2B 7d642dc3f944183660e79cfdfd68948528aa3ea4ef8162a4d04837c85ccace35107e663ec81a15438dab133fca2e8bf100fecd483f33c9b0aa52c68989ae8122 SHA512 d048b70804c81dece97f3ba511b3c109ec0d14e7dca69bc68faeeb61a4a7b5639c03e3e5ad7dad4e42b4bd198d7a7fffa4e3b7ef99590dfd4df0805db6c25db7
 DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d09045cbb54ec54cc3b65b8ce6416b6eb46fae0cf5d60f766129cef11eb01410b522318c67416fdf47f6e8fceae66 SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c
+DIST ccache-3.4.2.tar.xz 324340 BLAKE2B e49582b4ff254dd4cd210634342d7b21d5c099892d4c7f3240122a3b9de013477f6c440eaf73d06fc0445020e225562528babfb41d10ca1fab68052c1e726531 SHA512 9bf07269df6785bb92758093f46f3be4df45de532e431e0bc3a68a7170d1782376a9b4495acf77569549062c84f61621c21c5d200e271cd064dbda4a73276f8e
 EBUILD ccache-3.2.4.ebuild 2068 BLAKE2B 8fb9e15fe1787760e878ac9c13f9c97e9e9e87e3046ec700266ccd3a1d44240e7a5cf0e24deaef38bad30f66d823488e8979ebe79a9668ff55c6a417ec048229 SHA512 965dcf43bd7999352de8aa6097e90418160cf4f51e4016113c05dc37d023518e22d001a2415ad7948c07e55ab57ae044021e7e4f044df127b81a12ad2bd37653
 EBUILD ccache-3.3.4-r1.ebuild 1907 BLAKE2B eb985796e32759c421dc13c1eed2d42af1b487eaed3a7765ec67ca1c909d9244f5eb14d6d643ba4f357645336ffa69b2e0fef01a6d9c8f20a984b046e541ec4e SHA512 2ee7fa571a5daa9649ee24fb7027da366181d0ca38ff3e2bf61358b5b461742625c80554575a55634f12fcbf515d7745bbf638b9ae38405499eb81039d4d199e
 EBUILD ccache-3.3.4.ebuild 2083 BLAKE2B c9ab28add0fd4b71ce98d2e5d6ad8fe6383c9d097438925f37cb7a61e6668e6ef9f517fa73ab7e69fed483948408bf9f782281ecc439eb14641f30193ac86798 SHA512 3e48057216c5618b26cdf5361fea268caae0814d7ee7cc5abfd54be4adfb3cfca7da171acda1f17ab2794478ba4c9b2721403023cc04fd468239e7a3a737378f
+EBUILD ccache-3.4.2.ebuild 1939 BLAKE2B 66a0eef49b7e59918703df2d1270f421d576858a1cbb37b9c4f285b6208b56e4dabd3fe650f3f7c734c3570e38e1082db18c37745246410cba1106338948de26 SHA512 4c9540d5c8c9d6e2bbabaf78f2656d32318387fb05995adb09584819ad5149e19473f32fe579d761bce7be79cbba9bd9aad0a7dee9852808346287adfa7ed800
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.4.2.ebuild b/dev-util/ccache/ccache-3.4.2.ebuild
new file mode 100644
index 000000000000..25d07d629e1f
--- /dev/null
+++ b/dev-util/ccache/ccache-3.4.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="https://ccache.samba.org/"
+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"
+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
+)
+
+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_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 2.0.46-r11+ 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
+}
diff --git a/dev-util/ccache/files/ccache-3.4-size-on-disk.patch b/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
new file mode 100644
index 000000000000..4f39a0348f2f
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/56178
+
+stick to the size of files on disk rather than their byte size.
+this func is only used for stats management, so this should be safe.
+
+--- a/src/util.c
++++ b/src/util.c
+@@ -845,12 +845,7 @@ file_size(struct stat *st)
+ #ifdef _WIN32
+ 	return (st->st_size + 1023) & ~1023;
+ #else
+-	size_t size = st->st_blocks * 512;
+-	if ((size_t)st->st_size > size) {
+-		// Probably a broken stat() call...
+-		size = (st->st_size + 1023) & ~1023;
+-	}
+-	return size;
++	return st->st_blocks * 512;
+ #endif
+ }
+