commit: b4b2fc1a667dfb4ada426f60f4f08bf732a8e640 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Aug 22 17:32:17 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Aug 22 18:39:41 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4b2fc1a
games-board/cockatrice: Fix missing (R)DEPENDs, superfluous inherits 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 ...170505.ebuild => cockatrice-20170505-r1.ebuild} | 32 +++++++++++++--------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/games-board/cockatrice/cockatrice-20170505.ebuild b/games-board/cockatrice/cockatrice-20170505-r1.ebuild similarity index 68% rename from games-board/cockatrice/cockatrice-20170505.ebuild rename to games-board/cockatrice/cockatrice-20170505-r1.ebuild index a8edee2cae1..902b7730730 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,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 }
