Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/hedgewars/
Date: Thu, 03 Jan 2019 14:40:43
Message-Id: 1546526373.9d326b51861ecdc2eac31c23f74b953dbcb184d1.asturm@gentoo
1 commit: 9d326b51861ecdc2eac31c23f74b953dbcb184d1
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 3 09:45:54 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 3 14:39:33 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d326b51
7
8 games-strategy/hedgewars: EAPI-7 bump
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 games-strategy/hedgewars/hedgewars-0.9.25.ebuild | 27 ++++++++++++------------
14 1 file changed, 14 insertions(+), 13 deletions(-)
15
16 diff --git a/games-strategy/hedgewars/hedgewars-0.9.25.ebuild b/games-strategy/hedgewars/hedgewars-0.9.25.ebuild
17 index d68363f14f7..3c4e4100aff 100644
18 --- a/games-strategy/hedgewars/hedgewars-0.9.25.ebuild
19 +++ b/games-strategy/hedgewars/hedgewars-0.9.25.ebuild
20 @@ -1,7 +1,7 @@
21 -# Copyright 1999-2018 Gentoo Authors
22 +# Copyright 1999-2019 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 -EAPI=6
26 +EAPI=7
27
28 CMAKE_MAKEFILE_GENERATOR=emake
29 inherit cmake-utils xdg-utils
30 @@ -13,6 +13,7 @@ DESCRIPTION="A turn-based strategy, artillery, action and comedy game"
31 HOMEPAGE="https://www.hedgewars.org/"
32 SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2
33 mirror://debian/pool/main/h/${PN}/${PN}_0.9.23-dfsg-${DEB_PATCH_VER}.debian.tar.xz"
34 +
35 LICENSE="GPL-2 Apache-2.0 FDL-1.3"
36 SLOT="0"
37 KEYWORDS="~amd64 ~x86"
38 @@ -22,7 +23,7 @@ QA_FLAGS_IGNORED="/usr/bin/hwengine" # pascal sucks
39 QA_PRESTRIPPED="/usr/bin/hwengine" # pascal sucks
40
41 # qtcore:5= - depends on private header
42 -CDEPEND="
43 +DEPEND="
44 >=dev-games/physfs-3.0.1
45 dev-lang/lua:0=
46 dev-qt/qtcore:5=
47 @@ -35,13 +36,16 @@ CDEPEND="
48 media-libs/sdl2-mixer:=[vorbis]
49 media-libs/sdl2-net:=
50 media-libs/sdl2-ttf:=
51 - sys-libs/zlib:=
52 + sys-libs/zlib
53 !x86? (
54 libav? ( media-video/libav:= )
55 !libav? ( media-video/ffmpeg:= )
56 )"
57 -DEPEND="${CDEPEND}
58 - !x86? ( >=dev-lang/fpc-2.4 )
59 +RDEPEND="${DEPEND}
60 + app-arch/xz-utils
61 + >=media-fonts/dejavu-2.28
62 + media-fonts/wqy-zenhei"
63 +BDEPEND="
64 dev-qt/linguist-tools:5
65 server? (
66 >=dev-lang/ghc-6.10
67 @@ -58,14 +62,11 @@ DEPEND="${CDEPEND}
68 dev-haskell/yaml
69 >=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6
70 )
71 + !x86? ( >=dev-lang/fpc-2.4 )
72 x86? (
73 >=dev-lang/ghc-6.10
74 dev-haskell/parsec
75 )"
76 -RDEPEND="${CDEPEND}
77 - app-arch/xz-utils
78 - >=media-fonts/dejavu-2.28
79 - media-fonts/wqy-zenhei"
80
81 S="${WORKDIR}"/${MY_P}
82
83 @@ -79,9 +80,9 @@ src_configure() {
84 -DDATA_INSTALL_DIR="${EPREFIX}/usr/share/${PN}"
85 -Dtarget_binary_install_dir="${EPREFIX}/usr/bin"
86 -Dtarget_library_install_dir="${EPREFIX}/usr/$(get_libdir)"
87 - -DNOSERVER=$(usex server FALSE TRUE)
88 - -DBUILD_ENGINE_C=$(usex x86 ON OFF)
89 - -DNOVIDEOREC=$(usex x86 TRUE FALSE)
90 + -DNOSERVER=$(usex !server)
91 + -DBUILD_ENGINE_C=$(usex x86)
92 + -DNOVIDEOREC=$(usex !x86)
93 -DCMAKE_VERBOSE_MAKEFILE=TRUE
94 -DPHYSFS_SYSTEM=ON
95 # Need to tell the build system where the fonts are located