games-board/cockatrice: Disable automagic use of ccache with a patch

This has been submitted upstream.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

diff --git a/games-board/cockatrice/cockatrice-20190304.ebuild b/games-board/cockatrice/cockatrice-20190304.ebuild
index bd8edfdaf6b9e108342f757db0643416a7134c9d..8d1cd2056626319ef2a295faf57b83179538a409 100644 (file)
--- a/games-board/cockatrice/cockatrice-20190304.ebuild
+++ b/games-board/cockatrice/cockatrice-20190304.ebuild
@@ -49,8 +49,13 @@ SHA1='294b433'
 
 S="${WORKDIR}/Cockatrice-${MY_PV}"
 
+PATCHES=(
+       "${FILESDIR}"/use-ccache.patch
+)
+
 src_configure() {
        local mycmakeargs=(
+               -DUSE_CCACHE=OFF
                -DWITH_CLIENT=$(usex client)
                -DWITH_ORACLE=$(usex oracle)
                -DWITH_SERVER=$(usex server)

diff --git a/games-board/cockatrice/files/use-ccache.patch b/games-board/cockatrice/files/use-ccache.patch
new file mode 100644 (file)
index 0000000..16deeaf
--- /dev/null
+++ b/games-board/cockatrice/files/use-ccache.patch
@@ -0,0 +1,33 @@
+From 494501bbc88d30d9f1ceb6fb3fbd428eeb58ddee Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Wed, 13 Mar 2019 22:18:45 +0000
+Subject: [PATCH] Add USE_CCACHE option to CMake so that ccache can be forcibly
+ disabled
+
+---
+ CMakeLists.txt | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cc39e77..59eec3d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,12 +25,15 @@ ELSE()
+ ENDIF()
+ 
+ # Early detect ccache
++OPTION(USE_CCACHE "Cache the build results with ccache" ON)
++if(USE_CCACHE)
+ find_program(CCACHE_PROGRAM ccache)
+ if(CCACHE_PROGRAM)
+     # Support Unix Makefiles and Ninja
+     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+     MESSAGE(STATUS "Found CCache ${CCACHE_PROGRAM}")
+ endif()
++endif()
+ 
+ # A project name is needed for CPack
+ # Version can be overriden by git tags, see cmake/getversion.cmake
+-- 
+2.20.1
+