Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/warzone2100/
Date: Thu, 29 Sep 2016 12:46:52
Message-Id: 1475153202.5a6e10c7cb397e2c73187c50014263be6bb69228.polynomial-c@gentoo
1 commit: 5a6e10c7cb397e2c73187c50014263be6bb69228
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 29 12:46:29 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 29 12:46:42 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a6e10c7
7
8 games-strategy/warzone2100: Renamed "qt5" USE flag to "sdl".
9
10 Fixed some dependencies.
11
12 Package-Manager: portage-2.3.1
13 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
14
15 games-strategy/warzone2100/warzone2100-3.2.1.ebuild | 12 ++++++------
16 1 file changed, 6 insertions(+), 6 deletions(-)
17
18 diff --git a/games-strategy/warzone2100/warzone2100-3.2.1.ebuild b/games-strategy/warzone2100/warzone2100-3.2.1.ebuild
19 index ccafd8b..89d5ca1 100644
20 --- a/games-strategy/warzone2100/warzone2100-3.2.1.ebuild
21 +++ b/games-strategy/warzone2100/warzone2100-3.2.1.ebuild
22 @@ -22,14 +22,16 @@ LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain"
23 SLOT="0"
24 KEYWORDS="~amd64 ~ppc ~x86"
25 # upstream requested debug support
26 -IUSE="debug nls qt5 videos"
27 +IUSE="debug nls sdl videos"
28
29 # TODO: unbundle miniupnpc and quesoglc
30 # quesoglc-0.7.2 is buggy: http://developer.wz2100.net/ticket/2828
31 RDEPEND=">=dev-games/physfs-2[zip]
32 dev-libs/fribidi
33 dev-qt/qtcore:5
34 + dev-qt/qtgui:5
35 dev-qt/qtscript:5
36 + dev-qt/qtwidgets:5
37 media-libs/fontconfig
38 media-libs/freetype:2
39 media-libs/glew:=
40 @@ -44,13 +46,11 @@ RDEPEND=">=dev-games/physfs-2[zip]
41 x11-libs/libX11
42 x11-libs/libXrandr
43 nls? ( virtual/libintl )
44 - qt5? (
45 - dev-qt/qtgui:5
46 + !sdl? (
47 dev-qt/qtopengl:5
48 - dev-qt/qtwidgets:5
49 dev-qt/qtx11extras:5
50 )
51 - !qt5? ( media-libs/libsdl[opengl,video,X] )"
52 + sdl? ( media-libs/libsdl2[opengl,video,X] )"
53 DEPEND="${RDEPEND}
54 app-arch/zip
55 virtual/pkgconfig
56 @@ -80,7 +80,7 @@ src_configure() {
57 --with-applicationdir=/usr/share/applications \
58 $(use_enable debug debug relaxed) \
59 $(use_enable nls) \
60 - --with-backend=$(usex qt5 "qt" "sdl")
61 + --with-backend=$(usex sdl "sdl" "qt")
62 }
63
64 src_compile() {