Merge updates from master

3 files changed, 101 insertions, 0 deletions

diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest
index a7469dbbd762..5487f84ddf8b 100644
--- a/dev-libs/clhpp/Manifest
+++ b/dev-libs/clhpp/Manifest
@@ -1 +1,2 @@
 DIST clhpp-2.0.10.tar.gz 129954 BLAKE2B 1beb9b41ce1ad8ec88d0ccfa5f1d7a7af931841fa64d79b9eb9db90538f1b43f3cee5c74dc015ba835ee4ded2e926967bc3aa00dcc6ec0f5b65a04f9618ea1a9 SHA512 4a4898540c55422ca0cc6ba7f0c5495b915fc34df50f8add90e7f06dd5ef1d01a767234ecdee3757292980aa2f938e773177bcc73f28ac9c1b42d386863dea58
+DIST clhpp-2.0.11.tar.gz 172006 BLAKE2B a346e4e9a5e9090a407946cd8dcb321188a9e66ff003ec65c42ceed8a9690d6decd2c47417e149e061e8ffc975a1bfd919134639ca5ed2d91ae94cf669eac81b SHA512 f73dd41ae0e14b6e42ba993f700103f99bb78230c7c8d9248fb32977b7d1694280a8cab1cefbb8d7171dd207b41623d98eb7524667f24a6925e1ee9d47787f7e
diff --git a/dev-libs/clhpp/clhpp-2.0.11.ebuild b/dev-libs/clhpp/clhpp-2.0.11.ebuild
new file mode 100644
index 000000000000..9738db094c8f
--- /dev/null
+++ b/dev-libs/clhpp/clhpp-2.0.11.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Khronos OpenCL C++ bindings"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-CLHPP/"
+SRC_URI="https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Khronos-CLHPP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/opencl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/OpenCL-CLHPP-${PV}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/include"
+		-DBUILD_DOCS=OFF
+		-DBUILD_EXAMPLES=OFF
+		-DBUILD_TESTS=OFF
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/ccache/ccache-3.7.7-r2.ebuild b/dev-util/ccache/ccache-3.7.7-r2.ebuild
new file mode 100644
index 000000000000..e884b459f8d0
--- /dev/null
+++ b/dev-util/ccache/ccache-3.7.7-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~sh ~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
+)
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+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
+}