From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1112767-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 8180E138334
for <garchives@archives.gentoo.org>; Tue, 24 Sep 2019 14:42:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B40CCE089F;
Tue, 24 Sep 2019 14:42:49 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 83551E089F
for <gentoo-commits@lists.gentoo.org>; Tue, 24 Sep 2019 14:42:49 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id EA53534B51A
for <gentoo-commits@lists.gentoo.org>; Tue, 24 Sep 2019 14:42:46 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 21DB5775
for <gentoo-commits@lists.gentoo.org>; Tue, 24 Sep 2019 14:42:44 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1569336160.79f6eb179a0a8f0a2fb611d5cf7aafe8e27dd58e.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/colobot/
X-VCS-Repository: repo/gentoo
X-VCS-Files: games-strategy/colobot/colobot-0.1.12.ebuild games-strategy/colobot/colobot-9999.ebuild
X-VCS-Directories: games-strategy/colobot/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 79f6eb179a0a8f0a2fb611d5cf7aafe8e27dd58e
X-VCS-Branch: master
Date: Tue, 24 Sep 2019 14:42:44 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a773031d-38ee-4c78-be9d-e0744e14ac0f
X-Archives-Hash: a21ae69bd378be1d2d46bd77ea0f1cb7
commit: 79f6eb179a0a8f0a2fb611d5cf7aafe8e27dd58e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 24 14:42:19 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 24 14:42:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79f6eb17
games-strategy/colobot: Workaround the Ninja build problem
Call po4a early in order to provide files required for manpage builds.
Those files are normally provided implicitly by dependant target call
but that is not good enough for Ninja.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
games-strategy/colobot/colobot-0.1.12.ebuild | 16 +++++++++++++---
games-strategy/colobot/colobot-9999.ebuild | 18 ++++++++++++++----
2 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/games-strategy/colobot/colobot-0.1.12.ebuild b/games-strategy/colobot/colobot-0.1.12.ebuild
index 3c3762f6152..1611ef4a1d6 100644
--- a/games-strategy/colobot/colobot-0.1.12.ebuild
+++ b/games-strategy/colobot/colobot-0.1.12.ebuild
@@ -3,8 +3,6 @@
EAPI=7
-# upstream CMakeLists.txt are buggy
-CMAKE_MAKEFILE_GENERATOR=emake
inherit cmake-utils desktop xdg-utils
DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics"
@@ -18,6 +16,11 @@ KEYWORDS="~amd64"
IUSE="devbuild doc +openal test tools"
RESTRICT="!test? ( test )"
+# perl for pod2man
+BDEPEND="
+ app-text/po4a
+ dev-lang/perl
+ sys-devel/gettext"
DEPEND="
dev-games/physfs
dev-libs/boost:=
@@ -30,11 +33,18 @@ DEPEND="
media-libs/sdl2-image
media-libs/sdl2-ttf
media-sound/vorbis-tools
- sys-devel/gettext
openal? ( media-libs/openal )"
RDEPEND="${DEPEND}
games-strategy/colobot-data"
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # we need to call it explicitly to help Ninja figure out the deps
+ cd desktop || die
+ po4a po4a.cfg || die
+}
+
src_configure() {
local mycmakeargs=(
-DDEV_BUILD=$(usex devbuild)
diff --git a/games-strategy/colobot/colobot-9999.ebuild b/games-strategy/colobot/colobot-9999.ebuild
index b4179756b90..49d5ea90727 100644
--- a/games-strategy/colobot/colobot-9999.ebuild
+++ b/games-strategy/colobot/colobot-9999.ebuild
@@ -3,8 +3,6 @@
EAPI=7
-# upstream CMakeLists.txt are buggy
-CMAKE_MAKEFILE_GENERATOR=emake
inherit cmake-utils desktop git-r3 xdg-utils
DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics"
@@ -12,12 +10,17 @@ HOMEPAGE="https://colobot.info/"
EGIT_REPO_URI="https://github.com/colobot/colobot"
EGIT_SUBMODULES=()
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
SLOT="0"
KEYWORDS=""
IUSE="devbuild doc +openal test tools"
RESTRICT="!test? ( test )"
+# perl for pod2man
+BDEPEND="
+ app-text/po4a
+ dev-lang/perl
+ sys-devel/gettext"
DEPEND="
dev-games/physfs
dev-libs/boost:=
@@ -30,11 +33,18 @@ DEPEND="
media-libs/sdl2-image
media-libs/sdl2-ttf
media-sound/vorbis-tools
- sys-devel/gettext
openal? ( media-libs/openal )"
RDEPEND="${DEPEND}
games-strategy/colobot-data"
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # we need to call it explicitly to help Ninja figure out the deps
+ cd desktop || die
+ po4a po4a.cfg || die
+}
+
src_configure() {
local mycmakeargs=(
-DDEV_BUILD=$(usex devbuild)