gentoo resync : 19.03.2019

3 files changed, 57 insertions, 11 deletions

diff --git a/games-board/cockatrice/Manifest b/games-board/cockatrice/Manifest
index 49871f0e0352..56bdd03bd47e 100644
--- a/games-board/cockatrice/Manifest
+++ b/games-board/cockatrice/Manifest
@@ -1,3 +1,4 @@
-DIST cockatrice-20170505.tar.gz 7340644 BLAKE2B da3503f5ac02d0a03d59c719af82926e693fc3f2028d096c2b1d8d5145c62439f68e88379281e224d812405b39520e34476a6fd1df75f8202adc463f6ea8b3f8 SHA512 7cf319af46e4e2bd59428cf6635eeefebe70695adb445b24a727050abbc64124c17654ac058429b88a99f09f77639c15f8100d107ee8f54cad2bf0dec7051aa5
-EBUILD cockatrice-20170505-r1.ebuild 1364 BLAKE2B a14d7b957b1807523b66ead35be6a247d726d00929331f6c138f7f2db9d3b5a73b819cbeaba9c5563e2419204e4296ab439cea63333a08252df4e5547af2a86c SHA512 f0fb06c256be1f57c1074b7080219cd99745635fcb9bb190d669d2fd8e9ee1c42ad6a58bee40fbaeee568d0b4c8fac6bce0e7f0a512ff40f8b57e770b4239db0
+AUX use-ccache.patch 950 BLAKE2B e514c416c7c8821f79a195f968ae9804b83cd9a4a23be3391967a758cca12443e9acf5ee1d568f2b5b1536a9f351df4393a5dc91a08d865d3e038608989df916 SHA512 1140d2dc007474cf192a0a1fa2f9388c8cbd68214a31bc8c5d02f6ced0fd440400f0632a3b76ce1e172ed4ffd481c76b8e3d6a28c8aefa7816b3292c78182a1c
+DIST cockatrice-20190304.tar.gz 8464830 BLAKE2B 6e6b41593d7eddc8599fa894eed63f993fb69888c57fdfc4a45d71e6e7990d7d716663b69902139f5fd7ead455acdba76ac1d649977e26dceb2948293c34b74e SHA512 6a76e5de2aa7a4d2c9943bee9225ebf01aca7679bcd2542450b7e8b919e401992019f5bfb69597e8845bb2d8db568d7a6549600b85b576f9fb29be712bbfc9e5
+EBUILD cockatrice-20190304.ebuild 1564 BLAKE2B 839f73b1637788b1b89222f7a6c0db33857371fa54a9bee2c58e711538de7c59d0c1e8f721f2c4ddf94f23194b93df62c7e827e8c966305453dfc5770b1192ea SHA512 f949aac42a897d58db256794f55e371c70e935ea8af1f372b397802d51f98430aad1eca1711adce9b90be4db0e27748d951157694cfef607b28de7dc4f12ed41
 MISC metadata.xml 1187 BLAKE2B b04809289e20d3d8e98c474cf7673c4620ee337edaf7a61b94fdb0e56a1957b459350032a725a25bce4fd262768bb1f09937320450902966698d6140978a9656 SHA512 cc3711f5230ae38cdeca3da9d1ed9f23a71f4790567433fc1a60e5035412c2259633fb3a5200d248b0247bc282903fa0f2e8d741900bde1b990ef0ce56f38b0b
diff --git a/games-board/cockatrice/cockatrice-20170505-r1.ebuild b/games-board/cockatrice/cockatrice-20190304.ebuild
index b5d17ff65ab6..8d1cd2056626 100644
--- a/games-board/cockatrice/cockatrice-20170505-r1.ebuild
+++ b/games-board/cockatrice/cockatrice-20190304.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
+MY_PV="2019-03-04-Release-2.7.0"
 DESCRIPTION="An open-source multiplatform software for playing card games over a network"
 HOMEPAGE="https://github.com/Cockatrice/Cockatrice"
-SRC_URI="${HOMEPAGE}/archive/2017-05-05-Release-2.3.17.tar.gz -> ${P}.tar.gz"
+SRC_URI="${HOMEPAGE}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,9 +17,11 @@ IUSE="+client +oracle server"
 
 RDEPEND="
 	dev-qt/qtconcurrent:5
+	dev-qt/qtprintsupport:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtwebsockets:5
 	dev-qt/qtwidgets:5
 	client? (
 		dev-libs/protobuf:=
@@ -26,29 +29,38 @@ RDEPEND="
 		dev-qt/qtprintsupport:5
 		dev-qt/qtsvg:5
 	)
-	oracle? ( sys-libs/zlib:= )
+	oracle? ( sys-libs/zlib )
 	server? (
 		dev-libs/protobuf:=
 		dev-qt/qtsql:5
 		dev-qt/qtwebsockets:5
 	)
 "
-DEPEND="${RDEPEND}
+BDEPEND="
 	dev-qt/linguist-tools:5
+	client? ( dev-libs/protobuf )
+	server? ( dev-libs/protobuf )
+"
+DEPEND="${RDEPEND}
 "
 
 # As the default help/about display the sha1 we need it
-SHA1='c96f234'
+SHA1='294b433'
+
+S="${WORKDIR}/Cockatrice-${MY_PV}"
 
-S=${WORKDIR}/"Cockatrice-2017-05-05-Release-2.3.17"
+PATCHES=(
+	"${FILESDIR}"/use-ccache.patch
+)
 
 src_configure() {
 	local mycmakeargs=(
+		-DUSE_CCACHE=OFF
 		-DWITH_CLIENT=$(usex client)
 		-DWITH_ORACLE=$(usex oracle)
 		-DWITH_SERVER=$(usex server)
-		-DICONDIR="/usr/share/icons"
-		-DDESKTOPDIR="/usr/share/applications" )
+		-DICONDIR="${EPREFIX}/usr/share/icons"
+		-DDESKTOPDIR="${EPREFIX}/usr/share/applications" )
 
 	# Add date in the help about, come from git originally
 	sed -e 's/^set(PROJECT_VERSION_FRIENDLY.*/set(PROJECT_VERSION_FRIENDLY \"'${SHA1}'\")/' \
diff --git a/games-board/cockatrice/files/use-ccache.patch b/games-board/cockatrice/files/use-ccache.patch
new file mode 100644
index 000000000000..16deeaf0bb73
--- /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
+