gentoo resync : 19.03.2019

10 files changed, 117 insertions, 18 deletions

diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index a30adc815b06..8e0f69c3f87b 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
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
+
diff --git a/games-board/gnome-chess/Manifest b/games-board/gnome-chess/Manifest
index 8a97c9affcdd..3a86b140831c 100644
--- a/games-board/gnome-chess/Manifest
+++ b/games-board/gnome-chess/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-chess-3.28.1.tar.xz 1697524 BLAKE2B 743147e86fbaf5b1b1d84e802fde439de8a04f1e58607e34d0c5f660e59f3dd1e29aef1c763e5a00fa44581502c1d702a7fd9dfc826281f4dc703b23430a1efc SHA512 296703362fab5afa221130293d09a2f4e8d36d211f6fde7cee54c52a7ccec4c3a8aa5359baaf330e95cfd42277e2f95d44d762518a86d675c8e8a7237ebd9dd1
+DIST gnome-chess-3.30.1.tar.xz 1699668 BLAKE2B 5cb445248f3e223354f5145ee6e652b05d2ced44cbe63705fd54514d7848b5932b3aced35e3e6b72944f0e1e2c2b73ff8b9ad2b0c38fa0e90de5e59bf1da36e5 SHA512 ddf1b62b189adb01e9874606fa45b77b00bb5ca52609db60c58b6c0bca5340786f37a8ef813bb82213c8f7335117d2b896420826cae131db13e77d72e8ad5804
 EBUILD gnome-chess-3.28.1.ebuild 1054 BLAKE2B 57dd76e062c0ade30b1137e8706457c461f1355cfc17ca289b68d25fd205137e35c6c68a60d2926f804b0d680b9c0aab07f3aae93a440d532e864944778360af SHA512 5d226ea5c27e509498e1778b586ee240232cd42c835e920c392ab000fc989555c1eae5acfc1d6a9be23b5b51af15f69a2514b2075b28043687c40502204adf5f
+EBUILD gnome-chess-3.30.1.ebuild 1006 BLAKE2B 7141f1bd6fe460c411f54855f1ad08b9a5185054434da5e99bec7b17d0efb53102852ed6f589d62cc5d740fe79a798546198c07ccbce8c7105ea703444bafd19 SHA512 48592469a6d281e946cd0cfe2280c71ce6997952c44f7742606e998bff6338a5fbb5e6745398646bbace8fd584992981a59a68aac4e6f76f4a15c46644e34917
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/gnome-chess/gnome-chess-3.30.1.ebuild b/games-board/gnome-chess/gnome-chess-3.30.1.ebuild
new file mode 100644
index 000000000000..c26dcdd86ac5
--- /dev/null
+++ b/games-board/gnome-chess/gnome-chess-3.30.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 vala xdg
+
+DESCRIPTION="Play the classic two-player boardgame of chess"
+HOMEPAGE="https://wiki.gnome.org/Apps/Chess"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=x11-libs/gtk+-3.20.0:3
+	>=gnome-base/librsvg-2.32.0:2[vala]
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/itstool
+	dev-libs/appstream-glib
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="For being able to play against computer you will
+need to install a chess engine like, for example, games-board/gnuchess"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/games-board/gnome-mines/Manifest b/games-board/gnome-mines/Manifest
index 707a0fc76c63..1673fcb7879e 100644
--- a/games-board/gnome-mines/Manifest
+++ b/games-board/gnome-mines/Manifest
@@ -3,5 +3,5 @@ DIST gnome-mines-3.30.0.tar.xz 369604 BLAKE2B 4441faccb4c3210fa87670a1dc9b19f876
 DIST gnome-mines-3.30.1.1.tar.xz 369132 BLAKE2B 0b773ff7198335256a5133410458e16ead8596f930b9cd1efa7aa806fc3a19521eb2ca235e522ce03437925ffbc4a816d6b36414c618b83bd50c8b66fd399c72 SHA512 796a17b63cb5cec6fab8b7b5a5c995ac940cc49e1cb1254bab32598b0cd7fb4da03e7a80db117977a78cee94a79f0d8cf3222de5e63424348666c65b51045d6f
 EBUILD gnome-mines-3.20.1.ebuild 689 BLAKE2B 206f912abc192a345aac4c0f8edd7f30e07ee1f6df499803cf03102af2c424006e9d089ef91edb71d3d707288c8b58ae3c0b24b9fe6002a59af3ea6be32b9c05 SHA512 15fd8c2465405beb5f33a850ebd96ee94be75aa83ae8486cc723506a5102cace778ba005379da61d583c6b5ae0eaba43cc8055ef4822a910c6d73467df8aa773
 EBUILD gnome-mines-3.30.0.ebuild 849 BLAKE2B 8784fffcf829bcbffe308e21f5ff8bb7f533b0ec05465b8620edaf38382f1badb023bd7caffbf5f77a1f9c1f0bd82c8b47dadb47f7ab0163f750d777b5cc2d24 SHA512 abd899e590c56f5b6ac3b08bce4b6cf5fc04cd1ddd757c375b51f4cf5d3e60dd529acb353b754a386cf56aedd4c9938647ced08bd13d51225c6b9c61393bfff0
-EBUILD gnome-mines-3.30.1.1.ebuild 851 BLAKE2B 37a40b3104e75d12268572f344a36c1a125b654a6cba43fcede1ccfa338f978fe7708c4f153ccbb42e768a47e67efcd5bd387ab7fe2806cfc6875f0a3e53167c SHA512 8da78b1c6dad043ce8eb38760bbccb17fe54686180ccf25f4ae072ffc9809fdf61cb4ed1edff0b16ecbc323f2fb89025280a6573bfb80fcbb5bbadaa29946e7d
+EBUILD gnome-mines-3.30.1.1.ebuild 821 BLAKE2B 677890cb984612f87fdc97ff50ac3c5c857fbb007e37d48e42f83ca1e00b26c30c13e250eef4dfc497323b98244d9e55b5959e14d1ea78d32b1435b0f9593e49 SHA512 10990f22e844776daedc7822abcc92df3311d606e25b4030210b978d61ea26a66479415b68b0e520a63ec950fe440aebc3011f14b91b29c83c962889a479e292
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/gnome-mines/gnome-mines-3.30.1.1.ebuild b/games-board/gnome-mines/gnome-mines-3.30.1.1.ebuild
index 0f5315699af2..29612f247e1e 100644
--- a/games-board/gnome-mines/gnome-mines-3.30.1.1.ebuild
+++ b/games-board/gnome-mines/gnome-mines-3.30.1.1.ebuild
@@ -17,7 +17,7 @@ RDEPEND="
 	dev-libs/libgee:0.8
 	>=x11-libs/gtk+-3.12:3
 	dev-libs/libgnome-games-support:1=
-	>=gnome-base/librsvg-2.32.0:2[vala]
+	>=gnome-base/librsvg-2.32.0:2
 "
 DEPEND="${RDEPEND}
 	$(vala_depend)
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
+	gnome-base/librsvg:2[vala]
 "
 
 src_prepare() {
@@ -35,12 +36,10 @@ src_prepare() {
 
 pkg_postinst() {
 	xdg_pkg_postinst
-	gnome2_icon_cache_update
 	gnome2_schemas_update
 }
 
 pkg_postrm() {
 	xdg_pkg_postrm
-	gnome2_icon_cache_update
 	gnome2_schemas_update
 }
diff --git a/games-board/tali/Manifest b/games-board/tali/Manifest
index 6a6e60b1dd28..1b5c3766c038 100644
--- a/games-board/tali/Manifest
+++ b/games-board/tali/Manifest
@@ -1,3 +1,3 @@
 DIST tali-3.22.0.tar.xz 1716728 BLAKE2B 74420b49f9b7c44220fce4a4e692a35a6cd9c566eac6bc96615aba184c8bd05001871dc5973da1ad14db81bcbe9f7f45cc4c25f884304c6a8b89989c56dcd226 SHA512 63b50e6a27115fa9502fb86112ac02a987faff40e3eec8f0dc654bea2f001c0a252a6e1331ee3515d7194befe4e27dcde6d704a0f8a777d29e813c454a583ed0
-EBUILD tali-3.22.0.ebuild 514 BLAKE2B ad30cdd4368e18dbafe6cb6a4f2312328838598a3934997705f3efde76e4ff1e0dcd5a7d36b4ce16f744f4b4b406159834f26268ccfe714097054b839b7446af SHA512 fd708d14fb3fb67e23cce955a92ee66dc01b5bea2f252153854d5580bb83d6f483d8d62008154b717d56f67a22ac5a32e1a3cb0c5f87eab06d1dd380ac58e778
+EBUILD tali-3.22.0.ebuild 508 BLAKE2B 32a416bcdd2158fe53f608dc6497dfb1c7d2fe2455134119fe82d225b2bb10fd5269e1d0bf3ac293884ec6951f41eec8df0ad087ee2e60cf383ebbb17bc25359 SHA512 692307cba5580d19796a56edf58b5744d5d8e1fdf363a37881a629e53e03e63f379b8be6bf32a800dbc819a4198755122d2c4e270e839d6e25e2ff50f5a36ef4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/tali/tali-3.22.0.ebuild b/games-board/tali/tali-3.22.0.ebuild
index 1d995bd1293a..be815ac068d2 100644
--- a/games-board/tali/tali-3.22.0.ebuild
+++ b/games-board/tali/tali-3.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,9 +18,9 @@ RDEPEND="
 	>=x11-libs/gtk+-3.15:3
 "
 DEPEND="${RDEPEND}
-	app-text/yelp-tools
 	dev-libs/appstream-glib
 	>=dev-util/intltool-0.50
+	dev-util/itstool
 	sys-devel/gettext
 	virtual/pkgconfig
 "