games-board/cockatrice: Fix missing (R)DEPENDs, superfluous inherits
authorAndreas Sturmlechner <asturm@gentoo.org>
Wed, 22 Aug 2018 17:32:17 +0000 (19:32 +0200)
committerAndreas Sturmlechner <asturm@gentoo.org>
Wed, 22 Aug 2018 18:39:41 +0000 (20:39 +0200)
Sort dependencies, add missing sys-libs/zlib slot op
Add completely missing RDEPEND (since 2f2b7ec5b6fb49b79bd936219f0b0ae5baa70514)
Add missing USE-dep on dev-qt/qtnetwork:5[ssl]

Closes: https://bugs.gentoo.org/664290
Package-Manager: Portage-2.3.48, Repoman-2.3.10

games-board/cockatrice/cockatrice-20170505-r1.ebuild [moved from games-board/cockatrice/cockatrice-20170505.ebuild with 68% similarity]

similarity index 68%
rename from games-board/cockatrice/cockatrice-20170505.ebuild
rename to games-board/cockatrice/cockatrice-20170505-r1.ebuild
index a8edee2cae1660ac7ce87f1d791e5e1dd8de9228..902b7730730e91ee5cc33a4966edc5f9a835c219 100644 (file)
@@ -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,25 @@ 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
+RDEPEND="
        dev-libs/protobuf
-       dev-qt/linguist-tools:5
        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:= )
+"
+DEPEND="${RDEPEND}
+       dev-qt/linguist-tools:5
+"
 
 # As the default help/about display the sha1 we need it
 SHA1='c96f234'
@@ -42,6 +46,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
 }