| 1 |
commit: 79f6eb179a0a8f0a2fb611d5cf7aafe8e27dd58e |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 24 14:42:19 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 24 14:42:40 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79f6eb17 |
| 7 |
|
| 8 |
games-strategy/colobot: Workaround the Ninja build problem |
| 9 |
|
| 10 |
Call po4a early in order to provide files required for manpage builds. |
| 11 |
Those files are normally provided implicitly by dependant target call |
| 12 |
but that is not good enough for Ninja. |
| 13 |
|
| 14 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 15 |
|
| 16 |
games-strategy/colobot/colobot-0.1.12.ebuild | 16 +++++++++++++--- |
| 17 |
games-strategy/colobot/colobot-9999.ebuild | 18 ++++++++++++++---- |
| 18 |
2 files changed, 27 insertions(+), 7 deletions(-) |
| 19 |
|
| 20 |
diff --git a/games-strategy/colobot/colobot-0.1.12.ebuild b/games-strategy/colobot/colobot-0.1.12.ebuild |
| 21 |
index 3c3762f6152..1611ef4a1d6 100644 |
| 22 |
--- a/games-strategy/colobot/colobot-0.1.12.ebuild |
| 23 |
+++ b/games-strategy/colobot/colobot-0.1.12.ebuild |
| 24 |
@@ -3,8 +3,6 @@ |
| 25 |
|
| 26 |
EAPI=7 |
| 27 |
|
| 28 |
-# upstream CMakeLists.txt are buggy |
| 29 |
-CMAKE_MAKEFILE_GENERATOR=emake |
| 30 |
inherit cmake-utils desktop xdg-utils |
| 31 |
|
| 32 |
DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics" |
| 33 |
@@ -18,6 +16,11 @@ KEYWORDS="~amd64" |
| 34 |
IUSE="devbuild doc +openal test tools" |
| 35 |
RESTRICT="!test? ( test )" |
| 36 |
|
| 37 |
+# perl for pod2man |
| 38 |
+BDEPEND=" |
| 39 |
+ app-text/po4a |
| 40 |
+ dev-lang/perl |
| 41 |
+ sys-devel/gettext" |
| 42 |
DEPEND=" |
| 43 |
dev-games/physfs |
| 44 |
dev-libs/boost:= |
| 45 |
@@ -30,11 +33,18 @@ DEPEND=" |
| 46 |
media-libs/sdl2-image |
| 47 |
media-libs/sdl2-ttf |
| 48 |
media-sound/vorbis-tools |
| 49 |
- sys-devel/gettext |
| 50 |
openal? ( media-libs/openal )" |
| 51 |
RDEPEND="${DEPEND} |
| 52 |
games-strategy/colobot-data" |
| 53 |
|
| 54 |
+src_prepare() { |
| 55 |
+ cmake-utils_src_prepare |
| 56 |
+ |
| 57 |
+ # we need to call it explicitly to help Ninja figure out the deps |
| 58 |
+ cd desktop || die |
| 59 |
+ po4a po4a.cfg || die |
| 60 |
+} |
| 61 |
+ |
| 62 |
src_configure() { |
| 63 |
local mycmakeargs=( |
| 64 |
-DDEV_BUILD=$(usex devbuild) |
| 65 |
|
| 66 |
diff --git a/games-strategy/colobot/colobot-9999.ebuild b/games-strategy/colobot/colobot-9999.ebuild |
| 67 |
index b4179756b90..49d5ea90727 100644 |
| 68 |
--- a/games-strategy/colobot/colobot-9999.ebuild |
| 69 |
+++ b/games-strategy/colobot/colobot-9999.ebuild |
| 70 |
@@ -3,8 +3,6 @@ |
| 71 |
|
| 72 |
EAPI=7 |
| 73 |
|
| 74 |
-# upstream CMakeLists.txt are buggy |
| 75 |
-CMAKE_MAKEFILE_GENERATOR=emake |
| 76 |
inherit cmake-utils desktop git-r3 xdg-utils |
| 77 |
|
| 78 |
DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics" |
| 79 |
@@ -12,12 +10,17 @@ HOMEPAGE="https://colobot.info/" |
| 80 |
EGIT_REPO_URI="https://github.com/colobot/colobot" |
| 81 |
EGIT_SUBMODULES=() |
| 82 |
|
| 83 |
-LICENSE="GPL-3" |
| 84 |
+LICENSE="GPL-3+" |
| 85 |
SLOT="0" |
| 86 |
KEYWORDS="" |
| 87 |
IUSE="devbuild doc +openal test tools" |
| 88 |
RESTRICT="!test? ( test )" |
| 89 |
|
| 90 |
+# perl for pod2man |
| 91 |
+BDEPEND=" |
| 92 |
+ app-text/po4a |
| 93 |
+ dev-lang/perl |
| 94 |
+ sys-devel/gettext" |
| 95 |
DEPEND=" |
| 96 |
dev-games/physfs |
| 97 |
dev-libs/boost:= |
| 98 |
@@ -30,11 +33,18 @@ DEPEND=" |
| 99 |
media-libs/sdl2-image |
| 100 |
media-libs/sdl2-ttf |
| 101 |
media-sound/vorbis-tools |
| 102 |
- sys-devel/gettext |
| 103 |
openal? ( media-libs/openal )" |
| 104 |
RDEPEND="${DEPEND} |
| 105 |
games-strategy/colobot-data" |
| 106 |
|
| 107 |
+src_prepare() { |
| 108 |
+ cmake-utils_src_prepare |
| 109 |
+ |
| 110 |
+ # we need to call it explicitly to help Ninja figure out the deps |
| 111 |
+ cd desktop || die |
| 112 |
+ po4a po4a.cfg || die |
| 113 |
+} |
| 114 |
+ |
| 115 |
src_configure() { |
| 116 |
local mycmakeargs=( |
| 117 |
-DDEV_BUILD=$(usex devbuild) |
Archives