Gentoo Archives: gentoo-commits

From: "Azamat H. Hackimov" <winterheart@××××××.ru>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gamerlay:master commit in: games-sports/stuntrally/
Date: Sat, 01 Dec 2018 15:41:25
Message-Id: 1543678847.430df1cbd2e1dd2ef345572772a8f415a3680c64.winterheart@gentoo
1 commit: 430df1cbd2e1dd2ef345572772a8f415a3680c64
2 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
3 AuthorDate: Sat Dec 1 14:24:33 2018 +0000
4 Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
5 CommitDate: Sat Dec 1 15:40:47 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=430df1cb
7
8 games-sports/stuntrally: additional fixes
9
10 Added media-libs/libsdl2[haptic] dep, build bundled libraries statically
11
12 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
13 Package-Manager: Portage-2.3.51, Repoman-2.3.11
14
15 games-sports/stuntrally/stuntrally-2.6.ebuild | 18 ++++++++++--------
16 games-sports/stuntrally/stuntrally-9999.ebuild | 18 ++++++++++--------
17 2 files changed, 20 insertions(+), 16 deletions(-)
18
19 diff --git a/games-sports/stuntrally/stuntrally-2.6.ebuild b/games-sports/stuntrally/stuntrally-2.6.ebuild
20 index 49d0882..06b7065 100644
21 --- a/games-sports/stuntrally/stuntrally-2.6.ebuild
22 +++ b/games-sports/stuntrally/stuntrally-2.6.ebuild
23 @@ -12,7 +12,7 @@ HOMEPAGE="http://stuntrally.tuxfamily.org/"
24
25 SLOT="0"
26 LICENSE="GPL-3"
27 -IUSE="dedicated +game editor static-libs"
28 +IUSE="dedicated +game editor"
29
30 if [[ ${PV} = 9999* ]]; then
31 SRC_URI=""
32 @@ -24,11 +24,11 @@ else
33 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
34 fi
35
36 -RDEPEND="
37 +DEPEND="
38 game? (
39 dev-games/ogre[cg,boost,ois,freeimage,opengl,zip,-double-precision]
40 dev-games/mygui[ogre]
41 - media-libs/libsdl2
42 + media-libs/libsdl2[haptic]
43 media-libs/libvorbis
44 media-libs/libogg
45 media-libs/openal
46 @@ -38,7 +38,9 @@ RDEPEND="
47 net-libs/enet:1.3
48 virtual/libstdc++
49 "
50 -DEPEND="${RDEPEND}"
51 +RDEPEND="${DEPEND}
52 + ~games-sports/stuntrally-tracks-${PV}
53 +"
54 PDEPEND="${LIVE_PDEPEND}"
55
56 REQUIRED_USE="editor? ( game )"
57 @@ -51,10 +53,10 @@ DOCS=(Readme.txt)
58
59 src_configure() {
60 local mycmakeargs=(
61 - -DBUILD_MASTER_SERVER=$(usex dedicated ON OFF)
62 - -DBUILD_GAME=$(usex game ON OFF)
63 - -DBUILD_EDITOR=$(usex editor ON OFF)
64 - -DBUILD_SHARED_LIBS=$(usex !static-libs ON OFF)
65 + -DBUILD_MASTER_SERVER=$(usex dedicated)
66 + -DBUILD_GAME=$(usex game)
67 + -DBUILD_EDITOR=$(usex editor)
68 + -DBUILD_SHARED_LIBS=OFF
69 )
70 cmake-utils_src_configure
71 }
72
73 diff --git a/games-sports/stuntrally/stuntrally-9999.ebuild b/games-sports/stuntrally/stuntrally-9999.ebuild
74 index 13fa61b..6e9d7bf 100644
75 --- a/games-sports/stuntrally/stuntrally-9999.ebuild
76 +++ b/games-sports/stuntrally/stuntrally-9999.ebuild
77 @@ -12,7 +12,7 @@ HOMEPAGE="http://stuntrally.tuxfamily.org/"
78
79 SLOT="0"
80 LICENSE="GPL-3"
81 -IUSE="dedicated +game editor static-libs"
82 +IUSE="dedicated +game editor"
83
84 if [[ ${PV} = 9999* ]]; then
85 SRC_URI=""
86 @@ -24,11 +24,11 @@ else
87 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
88 fi
89
90 -RDEPEND="
91 +DEPEND="
92 game? (
93 dev-games/ogre[cg,boost,ois,freeimage,opengl,zip,-double-precision]
94 dev-games/mygui[ogre]
95 - media-libs/libsdl2
96 + media-libs/libsdl2[haptic]
97 media-libs/libvorbis
98 media-libs/libogg
99 media-libs/openal
100 @@ -38,7 +38,9 @@ RDEPEND="
101 net-libs/enet:1.3
102 virtual/libstdc++
103 "
104 -DEPEND="${RDEPEND}"
105 +RDEPEND="${DEPEND}
106 + ~games-sports/stuntrally-tracks-${PV}
107 +"
108 PDEPEND="${LIVE_PDEPEND}"
109
110 REQUIRED_USE="editor? ( game )"
111 @@ -47,10 +49,10 @@ DOCS=(Readme.txt)
112
113 src_configure() {
114 local mycmakeargs=(
115 - -DBUILD_MASTER_SERVER=$(usex dedicated ON OFF)
116 - -DBUILD_GAME=$(usex game ON OFF)
117 - -DBUILD_EDITOR=$(usex editor ON OFF)
118 - -DBUILD_SHARED_LIBS=$(usex !static-libs ON OFF)
119 + -DBUILD_MASTER_SERVER=$(usex dedicated)
120 + -DBUILD_GAME=$(usex game)
121 + -DBUILD_EDITOR=$(usex editor)
122 + -DBUILD_SHARED_LIBS=OFF
123 )
124 cmake-utils_src_configure
125 }