gentoo resync : 25.08.2018

3 files changed, 25 insertions, 15 deletions

diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 53bbeeebfef3..844a47ccba4c 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/cockatrice/Manifest b/games-board/cockatrice/Manifest
index f67526750451..730fa3950cb9 100644
--- a/games-board/cockatrice/Manifest
+++ b/games-board/cockatrice/Manifest
@@ -1,3 +1,3 @@
 DIST cockatrice-20170505.tar.gz 7340644 BLAKE2B da3503f5ac02d0a03d59c719af82926e693fc3f2028d096c2b1d8d5145c62439f68e88379281e224d812405b39520e34476a6fd1df75f8202adc463f6ea8b3f8 SHA512 7cf319af46e4e2bd59428cf6635eeefebe70695adb445b24a727050abbc64124c17654ac058429b88a99f09f77639c15f8100d107ee8f54cad2bf0dec7051aa5
-EBUILD cockatrice-20170505.ebuild 1249 BLAKE2B 5447fab0e293d71ec4d92697f91366559cbee58493723348e8f0c8ebb23588a8fab71feaecc50532aea3670924fc598aef9e92f31ddea55d94c09b14db43170b SHA512 d6a722d0325ed0290bb18e44e801a2322ec573a7bc92c41c46c10f4d8f3d2a4984a216a26d4a6fed4f7650be32cd8a9e6af0742017616a3c9536a8306d0d45d8
+EBUILD cockatrice-20170505-r1.ebuild 1342 BLAKE2B 6fb8416491ede2a13fa3e5a7734b38fede163a1822c88e9a9195a82559a9412d08edd54ccd36e31191e99e66b264c854f1f8f524a0df8f2d0194888f7cafe854 SHA512 700f5cd156733adf282b0c3bde3776bde93a638f9b5227f4a97a85e08f3c17d90b3b9d525208c4b932dd6a439af067d6262d79de7143a2032bb9883bb8461049
 MISC metadata.xml 1187 BLAKE2B b04809289e20d3d8e98c474cf7673c4620ee337edaf7a61b94fdb0e56a1957b459350032a725a25bce4fd262768bb1f09937320450902966698d6140978a9656 SHA512 cc3711f5230ae38cdeca3da9d1ed9f23a71f4790567433fc1a60e5035412c2259633fb3a5200d248b0247bc282903fa0f2e8d741900bde1b990ef0ce56f38b0b
diff --git a/games-board/cockatrice/cockatrice-20170505.ebuild b/games-board/cockatrice/cockatrice-20170505-r1.ebuild
index a8edee2cae16..86db0f458d02 100644
--- a/games-board/cockatrice/cockatrice-20170505.ebuild
+++ b/games-board/cockatrice/cockatrice-20170505-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit cmake-utils eutils gnome2-utils
+
+inherit cmake-utils
 
 DESCRIPTION="An open-source multiplatform software for playing card games over a network"
 HOMEPAGE="https://github.com/Cockatrice/Cockatrice"
@@ -11,22 +12,29 @@ SRC_URI="${HOMEPAGE}/archive/2017-05-05-Release-2.3.17.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="server +client +oracle"
+IUSE="+client +oracle server"
 
-DEPEND="
-	dev-libs/libgcrypt:0
-	dev-libs/protobuf
-	dev-qt/linguist-tools:5
+RDEPEND="
 	dev-qt/qtconcurrent:5
-	dev-qt/qtprintsupport:5
 	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtwidgets:5
 	client? (
-		dev-qt/qtgui:5
 		dev-qt/qtmultimedia:5
-		dev-qt/qtsvg:5 )
-	oracle? (
-		sys-libs/zlib
-	)"
+		dev-qt/qtprintsupport:5
+		dev-qt/qtsvg:5
+	)
+	oracle? ( sys-libs/zlib:= )
+	server? (
+		dev-libs/protobuf:=
+		dev-qt/qtsql:5
+		dev-qt/qtwebsockets:5
+	)
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
 
 # As the default help/about display the sha1 we need it
 SHA1='c96f234'
@@ -42,6 +50,8 @@ src_configure() {
 		-DDESKTOPDIR="/usr/share/applications" )
 
 	# Add date in the help about, come from git originally
-	sed -i 's/^set(PROJECT_VERSION_FRIENDLY.*/set(PROJECT_VERSION_FRIENDLY \"'${SHA1}'\")/' cmake/getversion.cmake || die "Sed failed!"
+	sed -e 's/^set(PROJECT_VERSION_FRIENDLY.*/set(PROJECT_VERSION_FRIENDLY \"'${SHA1}'\")/' \
+		-i cmake/getversion.cmake || die "sed failed!"
+
 	cmake-utils_src_configure
 }