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/, games-sports/stuntrally-tracks/
Date: Tue, 16 Aug 2022 02:23:25
Message-Id: 1660615894.b59746c409ff7ea4ec44d6abec9cdde3ef169cfb.winterheart@gentoo
1 commit: b59746c409ff7ea4ec44d6abec9cdde3ef169cfb
2 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
3 AuthorDate: Tue Aug 16 02:11:34 2022 +0000
4 Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
5 CommitDate: Tue Aug 16 02:11:34 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=b59746c4
7
8 games-sports/stuntrally{,-tracks}: update packages
9
10 Migrate to cmake.eclass
11
12 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
13
14 .../stuntrally-tracks/stuntrally-tracks-2.6.ebuild | 8 +--
15 .../stuntrally-tracks-9999.ebuild | 31 -----------
16 games-sports/stuntrally/stuntrally-2.6.ebuild | 25 +++------
17 games-sports/stuntrally/stuntrally-9999.ebuild | 63 ----------------------
18 4 files changed, 11 insertions(+), 116 deletions(-)
19
20 diff --git a/games-sports/stuntrally-tracks/stuntrally-tracks-2.6.ebuild b/games-sports/stuntrally-tracks/stuntrally-tracks-2.6.ebuild
21 index fe2ff9d..690d5f2 100644
22 --- a/games-sports/stuntrally-tracks/stuntrally-tracks-2.6.ebuild
23 +++ b/games-sports/stuntrally-tracks/stuntrally-tracks-2.6.ebuild
24 @@ -1,9 +1,9 @@
25 # Copyright 1999-2018 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 -EAPI=6
29 +EAPI=8
30
31 -inherit cmake-utils
32 +inherit cmake
33
34 DESCRIPTION="A set of tracks for ${CATEGORY}/${P//-tracks}"
35 HOMEPAGE="http://stuntrally.tuxfamily.org/"
36 @@ -21,9 +21,9 @@ src_configure() {
37 local mycmakeargs+=(
38 -DSHARE_INSTALL="/usr/share/stuntrally"
39 )
40 - cmake-utils_src_configure
41 + cmake_src_configure
42 }
43
44 src_install() {
45 - cmake-utils_src_install
46 + cmake_src_install
47 }
48
49 diff --git a/games-sports/stuntrally-tracks/stuntrally-tracks-9999.ebuild b/games-sports/stuntrally-tracks/stuntrally-tracks-9999.ebuild
50 deleted file mode 100644
51 index 60248df..0000000
52 --- a/games-sports/stuntrally-tracks/stuntrally-tracks-9999.ebuild
53 +++ /dev/null
54 @@ -1,31 +0,0 @@
55 -# Copyright 1999-2018 Gentoo Authors
56 -# Distributed under the terms of the GNU General Public License v2
57 -
58 -EAPI=6
59 -
60 -inherit cmake-utils git-r3
61 -
62 -DESCRIPTION="A set of tracks for ${CATEGORY}/${P//-tracks}"
63 -HOMEPAGE="https://stuntrally.tuxfamily.org/"
64 -
65 -SLOT="0"
66 -LICENSE="GPL-3"
67 -IUSE=""
68 -
69 -SRC_URI=""
70 -KEYWORDS=""
71 -EGIT_REPO_URI="https://github.com/stuntrally/tracks"
72 -EGIT_PROJECT="${PN}"
73 -# Shallowing, since we don't want to fetch few GB of history
74 -#EGIT_OPTIONS="--depth 1"
75 -
76 -src_configure() {
77 - local mycmakeargs+=(
78 - -DSHARE_INSTALL="/usr/share/stuntrally"
79 - )
80 - cmake-utils_src_configure
81 -}
82 -
83 -src_install() {
84 - cmake-utils_src_install
85 -}
86
87 diff --git a/games-sports/stuntrally/stuntrally-2.6.ebuild b/games-sports/stuntrally/stuntrally-2.6.ebuild
88 index 73b57fb..b5fcc82 100644
89 --- a/games-sports/stuntrally/stuntrally-2.6.ebuild
90 +++ b/games-sports/stuntrally/stuntrally-2.6.ebuild
91 @@ -1,11 +1,9 @@
92 # Copyright 1999-2018 Gentoo Authors
93 # Distributed under the terms of the GNU General Public License v2
94
95 -EAPI=6
96 +EAPI=8
97
98 -[[ ${PV} = 9999* ]] && GIT="git-r3"
99 -
100 -inherit cmake-utils ${GIT}
101 +inherit cmake
102
103 DESCRIPTION="Rally game focused on closed rally tracks with possible stunt elements."
104 HOMEPAGE="http://stuntrally.tuxfamily.org/"
105 @@ -13,16 +11,8 @@ HOMEPAGE="http://stuntrally.tuxfamily.org/"
106 SLOT="0"
107 LICENSE="GPL-3"
108 IUSE="dedicated +game editor"
109 -
110 -if [[ ${PV} = 9999* ]]; then
111 - SRC_URI=""
112 - KEYWORDS=""
113 - EGIT_REPO_URI="https://github.com/stuntrally/stuntrally"
114 - LIVE_PDEPEND="=${CATEGORY}/${PN}-tracks-${PV}"
115 -else
116 - KEYWORDS="~amd64 ~x86"
117 - SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
118 -fi
119 +KEYWORDS="~amd64 ~x86"
120 +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
121
122 DEPEND="
123 game? (
124 @@ -32,11 +22,10 @@ DEPEND="
125 media-libs/libvorbis
126 media-libs/libogg
127 media-libs/openal
128 - sci-physics/bullet[bullet3,extras]
129 + sci-physics/bullet[extras]
130 )
131 dev-libs/boost
132 net-libs/enet:1.3
133 - virtual/libstdc++
134 "
135 RDEPEND="${DEPEND}
136 ~games-sports/stuntrally-tracks-${PV}
137 @@ -59,9 +48,9 @@ src_configure() {
138 -DBUILD_SHARED_LIBS=OFF
139 -DSHARE_INSTALL="share/stuntrally"
140 )
141 - cmake-utils_src_configure
142 + cmake_src_configure
143 }
144
145 src_install() {
146 - cmake-utils_src_install
147 + cmake_src_install
148 }
149
150 diff --git a/games-sports/stuntrally/stuntrally-9999.ebuild b/games-sports/stuntrally/stuntrally-9999.ebuild
151 deleted file mode 100644
152 index bbf601b..0000000
153 --- a/games-sports/stuntrally/stuntrally-9999.ebuild
154 +++ /dev/null
155 @@ -1,63 +0,0 @@
156 -# Copyright 1999-2018 Gentoo Authors
157 -# Distributed under the terms of the GNU General Public License v2
158 -
159 -EAPI=6
160 -
161 -[[ ${PV} = 9999* ]] && GIT="git-r3"
162 -
163 -inherit ${GIT} cmake-utils
164 -
165 -DESCRIPTION="Rally game focused on closed rally tracks with possible stunt elements."
166 -HOMEPAGE="http://stuntrally.tuxfamily.org/"
167 -
168 -SLOT="0"
169 -LICENSE="GPL-3"
170 -IUSE="dedicated +game editor"
171 -
172 -if [[ ${PV} = 9999* ]]; then
173 - SRC_URI=""
174 - KEYWORDS=""
175 - EGIT_REPO_URI="https://github.com/stuntrally/stuntrally"
176 -# ^ dead
177 -# EGIT_REPO_URI="https://github.com/akien-mga/stuntrally"
178 -# EGIT_BRANCH="ogre-1.11"
179 -# ^ TODO (ogre-1.11 is hardmasked for now)
180 - LIVE_PDEPEND="~${CATEGORY}/${PN}-tracks-${PV}"
181 -else
182 - KEYWORDS="~amd64 ~x86"
183 - SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
184 -fi
185 -
186 -DEPEND="
187 - game? (
188 - dev-games/ogre[cg,boost,ois,freeimage,opengl,zip,-double-precision]
189 - dev-games/mygui[ogre,plugins]
190 - media-libs/libsdl2[haptic]
191 - media-libs/libvorbis
192 - media-libs/libogg
193 - media-libs/openal
194 - sci-physics/bullet[bullet3,extras]
195 - )
196 - dev-libs/boost
197 - net-libs/enet:1.3
198 - virtual/libstdc++
199 -"
200 -RDEPEND="${DEPEND}
201 - ~games-sports/stuntrally-tracks-${PV}
202 -"
203 -PDEPEND="${LIVE_PDEPEND}"
204 -
205 -REQUIRED_USE="editor? ( game )"
206 -
207 -DOCS=(Readme.txt)
208 -
209 -src_configure() {
210 - local mycmakeargs=(
211 - -DBUILD_MASTER_SERVER=$(usex dedicated)
212 - -DBUILD_GAME=$(usex game)
213 - -DBUILD_EDITOR=$(usex editor)
214 - -DBUILD_SHARED_LIBS=OFF
215 - -DSHARE_INSTALL="share/stuntrally"
216 - )
217 - cmake-utils_src_configure
218 -}