1 |
commit: 8ab62f779ba52e3ccafdb38ce55303da14d70beb |
2 |
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 28 00:50:15 2016 +0000 |
4 |
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 28 00:51:56 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ab62f77 |
7 |
|
8 |
games-simulation/flightgear: Version bump 2016.2.1, bug 584302. |
9 |
|
10 |
dev-games/simgear/Manifest | 1 + |
11 |
.../files/simgear-2016.2.1-unbundle-udns.patch | 144 +++++++++++++++++++++ |
12 |
dev-games/simgear/metadata.xml | 1 + |
13 |
dev-games/simgear/simgear-2016.1.1.ebuild | 1 - |
14 |
...ear-2016.1.1.ebuild => simgear-2016.2.1.ebuild} | 13 +- |
15 |
dev-games/simgear/simgear-9999.ebuild | 13 +- |
16 |
games-simulation/flightgear-data/Manifest | 1 + |
17 |
.../flightgear-data-2016.2.1.ebuild | 27 ++++ |
18 |
games-simulation/flightgear/Manifest | 1 + |
19 |
...gear-9999.ebuild => flightgear-2016.2.1.ebuild} | 9 +- |
20 |
games-simulation/flightgear/flightgear-9999.ebuild | 1 - |
21 |
11 files changed, 196 insertions(+), 16 deletions(-) |
22 |
|
23 |
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest |
24 |
index a9e5a71..6fa9e7b 100644 |
25 |
--- a/dev-games/simgear/Manifest |
26 |
+++ b/dev-games/simgear/Manifest |
27 |
@@ -1,2 +1,3 @@ |
28 |
DIST simgear-2016.1.1.tar.bz2 1065810 SHA256 dbbc40115bc41563d930102484a3682e9fa4dda6f120feaa1fe82e0eb9d96c0d SHA512 ccc3384beef2e2ff3819928f22289a774da28c1df11f42ddc58ad4913c2c329a2cc14ca0359a312b9684ae31e598dda8a7a49e27c9148d079858dc0bf8e6ae63 WHIRLPOOL 2cf05f28c3318ea678f728c87e447c73934348b8862c97602b264f63bbecca82fd7e6db17affe84c78e1a9c42e31ad64aca243e97723e3e54ffca8481609ba50 |
29 |
+DIST simgear-2016.2.1.tar.bz2 1161873 SHA256 601d4ef75a7f9e7012f85d6f63219f3e2ef90f98249eaa5d16cc6b1a3c737a0a SHA512 22046873b67c2dd530d9734f799ea8a7238f6ffb58999b5a1d72053c4837212906048ec681cb2b704cd55d6b7aba03729d4f6a6a7e351f1e5aa2e497cc78d937 WHIRLPOOL 4f4fd697b301dfcd27a623d9475e63a46709d1e27b0324bdf097a8260d2759e7dedb16de6dbf1a82430dc3d80a32b58abf3bc82026894b83c2ec5c06391dcdcf |
30 |
DIST simgear-3.4.0.tar.bz2 1057455 SHA256 927d66fe72aacb9dacced4506430bd5fc7726bc8d3d07d6f1866bc4cb11a5894 SHA512 9ebf49ea2f024f0e52a4d18ba6f77361e7b9f51a0e7238661b4b2fd9db0176bdd948612d9b4aec3ae4d8210676e7533dfc0308b9c71bdeb22e99a68b90d81320 WHIRLPOOL bb48b6640409a96816ade77c22a91f88c452d339165dd0241354c26ff27572a14538ecfd91265c239def4621657be8766c081cffc237711a691d7ef54461b548 |
31 |
|
32 |
diff --git a/dev-games/simgear/files/simgear-2016.2.1-unbundle-udns.patch b/dev-games/simgear/files/simgear-2016.2.1-unbundle-udns.patch |
33 |
new file mode 100644 |
34 |
index 0000000..40bad3c |
35 |
--- /dev/null |
36 |
+++ b/dev-games/simgear/files/simgear-2016.2.1-unbundle-udns.patch |
37 |
@@ -0,0 +1,144 @@ |
38 |
+From 2b15b6b8adce06107866fff0028503c1b92b0de4 Mon Sep 17 00:00:00 2001 |
39 |
+From: Maciej Mrozowski <reavertm@×××××.com> |
40 |
+Date: Thu, 26 May 2016 02:24:19 +0200 |
41 |
+Subject: [PATCH] Add SYSTEM_UDNS CMake option. Remove spurious EXPAT_LIBRARIES |
42 |
+ linking when using bundled expat. |
43 |
+ |
44 |
+--- |
45 |
+ 3rdparty/CMakeLists.txt | 2 +- |
46 |
+ CMakeLists.txt | 19 ++++++++++++++----- |
47 |
+ CMakeModules/FindUdns.cmake | 42 ++++++++++++++++++++++++++++++++++++++++++ |
48 |
+ simgear/CMakeLists.txt | 11 ++++++++++- |
49 |
+ 4 files changed, 67 insertions(+), 7 deletions(-) |
50 |
+ create mode 100644 CMakeModules/FindUdns.cmake |
51 |
+ |
52 |
+diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt |
53 |
+index e9b5282..a03a82d 100644 |
54 |
+--- a/3rdparty/CMakeLists.txt |
55 |
++++ b/3rdparty/CMakeLists.txt |
56 |
+@@ -4,6 +4,6 @@ endif() |
57 |
+ |
58 |
+ add_subdirectory(utf8) |
59 |
+ |
60 |
+-if (ENABLE_DNS) |
61 |
++if (ENABLE_DNS AND NOT SYSTEM_UDNS) |
62 |
+ add_subdirectory(udns) |
63 |
+ endif() |
64 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
65 |
+index a67d65e..7de1a0a 100644 |
66 |
+--- a/CMakeLists.txt |
67 |
++++ b/CMakeLists.txt |
68 |
+@@ -114,12 +114,14 @@ endif() |
69 |
+ |
70 |
+ if (NOT MSVC) |
71 |
+ option(SIMGEAR_SHARED "Set to ON to build SimGear as a shared library/framework" OFF) |
72 |
+-option(SYSTEM_EXPAT "Set to ON to build SimGear using the system libExpat" OFF) |
73 |
++option(SYSTEM_EXPAT "Set to ON to build SimGear using the system expat library" OFF) |
74 |
++option(SYSTEM_UDNS "Set to ON to build SimGear using the system udns library" OFF) |
75 |
+ else() |
76 |
+ # Building SimGear DLLs is currently not supported for MSVC. |
77 |
+ set(SIMGEAR_SHARED OFF) |
78 |
+-# Using a system expat is currently not supported for MSVC - it would require shared simgear (DLL). |
79 |
++# Using external 3rd party libraries is currently not supported for MSVC - it would require shared simgear (DLL). |
80 |
+ set(SYSTEM_EXPAT OFF) |
81 |
++set(SYSTEM_UDNS OFF) |
82 |
+ endif() |
83 |
+ |
84 |
+ option(SIMGEAR_HEADLESS "Set to ON to build SimGear without GUI/graphics support" OFF) |
85 |
+@@ -426,9 +428,16 @@ endif() |
86 |
+ install (FILES ${PROJECT_BINARY_DIR}/simgear/simgear_config.h DESTINATION include/simgear/) |
87 |
+ |
88 |
+ include_directories(3rdparty/utf8/source) |
89 |
+-if (ENABLE_DNS) |
90 |
+- message(STATUS "DNS resolver: ENABLED") |
91 |
+- include_directories(3rdparty/udns) |
92 |
++ |
93 |
++if(ENABLE_DNS) |
94 |
++ if(SYSTEM_UDNS) |
95 |
++ message(STATUS "Requested to use system udns library, forcing SIMGEAR_SHARED to true") |
96 |
++ set(SIMGEAR_SHARED ON) |
97 |
++ find_package(Udns REQUIRED) |
98 |
++ else() |
99 |
++ message(STATUS "DNS resolver: ENABLED") |
100 |
++ include_directories(3rdparty/udns) |
101 |
++ endif() |
102 |
+ else() |
103 |
+ message(STATUS "DNS resolver: DISABLED") |
104 |
+ endif() |
105 |
+diff --git a/CMakeModules/FindUdns.cmake b/CMakeModules/FindUdns.cmake |
106 |
+new file mode 100644 |
107 |
+index 0000000..a436361 |
108 |
+--- /dev/null |
109 |
++++ b/CMakeModules/FindUdns.cmake |
110 |
+@@ -0,0 +1,42 @@ |
111 |
++# - Try to find UDNS library |
112 |
++# Once done this will define |
113 |
++# |
114 |
++# UDNS_FOUND - system has UDNS |
115 |
++# UDNS_INCLUDE_DIRS - the UDNS include directory |
116 |
++# UDNS_LIBRARIES - Link these to use UDNS |
117 |
++# UDNS_DEFINITIONS - Compiler switches required for using UDNS |
118 |
++# |
119 |
++# Copyright (c) 2016 Maciej Mrozowski <reavertm@×××××.com> |
120 |
++# |
121 |
++# Distributed under the Boost Software License, Version 1.0. |
122 |
++# (See accompanying file LICENSE_1_0.txt or copy at |
123 |
++# http://www.boost.org/LICENSE_1_0.txt) |
124 |
++ |
125 |
++ |
126 |
++if (UDN_LIBRARIES AND UDN_INCLUDE_DIRS) |
127 |
++ # in cache already |
128 |
++ set(UDNS_FOUND TRUE) |
129 |
++else () |
130 |
++ set(UDNS_DEFINITIONS "") |
131 |
++ |
132 |
++ find_path(UDNS_INCLUDE_DIRS NAMES udns.h) |
133 |
++ find_library(UDNS_LIBRARIES NAMES udns) |
134 |
++ |
135 |
++ if (UDNS_INCLUDE_DIRS AND UDNS_LIBRARIES) |
136 |
++ set(UDNS_FOUND TRUE) |
137 |
++ endif () |
138 |
++ |
139 |
++ if (UDNS_FOUND) |
140 |
++ if (NOT Udns_FIND_QUIETLY) |
141 |
++ message(STATUS "Found UDNS: ${UDNS_LIBRARIES}") |
142 |
++ endif () |
143 |
++ else () |
144 |
++ if (Udns_FIND_REQUIRED) |
145 |
++ message(FATAL_ERROR "Could not find UDNS") |
146 |
++ endif () |
147 |
++ endif () |
148 |
++ |
149 |
++ # show the UDNS_INCLUDE_DIRS and UDNS_LIBRARIES variables only in the advanced view |
150 |
++ mark_as_advanced(UDNS_INCLUDE_DIRS UDNS_LIBRARIES) |
151 |
++ |
152 |
++endif () |
153 |
+diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt |
154 |
+index 5976833..516ea6c 100644 |
155 |
+--- a/simgear/CMakeLists.txt |
156 |
++++ b/simgear/CMakeLists.txt |
157 |
+@@ -128,11 +128,20 @@ target_link_libraries(SimGearCore |
158 |
+ ${ZLIB_LIBRARY} |
159 |
+ ${RT_LIBRARY} |
160 |
+ ${DL_LIBRARY} |
161 |
+- ${EXPAT_LIBRARIES} |
162 |
+ ${CMAKE_THREAD_LIBS_INIT} |
163 |
+ ${COCOA_LIBRARY} |
164 |
+ ${CURL_LIBRARIES}) |
165 |
+ |
166 |
++if(SYSTEM_EXPAT) |
167 |
++ target_link_libraries(SimGearCore |
168 |
++ ${EXPAT_LIBRARIES}) |
169 |
++endif() |
170 |
++ |
171 |
++if(ENABLE_DNS AND SYSTEM_UDNS) |
172 |
++ target_link_libraries(SimGearCore |
173 |
++ ${UDNS_LIBRARIES}) |
174 |
++endif() |
175 |
++ |
176 |
+ if(NOT SIMGEAR_HEADLESS) |
177 |
+ target_link_libraries(SimGearScene |
178 |
+ SimGearCore |
179 |
+-- |
180 |
+2.7.3 |
181 |
+ |
182 |
|
183 |
diff --git a/dev-games/simgear/metadata.xml b/dev-games/simgear/metadata.xml |
184 |
index 0971f9a..37fa7b4 100644 |
185 |
--- a/dev-games/simgear/metadata.xml |
186 |
+++ b/dev-games/simgear/metadata.xml |
187 |
@@ -14,6 +14,7 @@ SimGear is a set of open-source libraries designed to be used as building blocks |
188 |
quickly assembling 3d simulations, games, and visualization applications. |
189 |
</longdescription> |
190 |
<use> |
191 |
+ <flag name="dns">Enables DNS resolver via <pkg>net-libs/udns</pkg></flag> |
192 |
<flag name="subversion">Enables terrasync scenery downloader</flag> |
193 |
</use> |
194 |
</pkgmetadata> |
195 |
|
196 |
diff --git a/dev-games/simgear/simgear-2016.1.1.ebuild b/dev-games/simgear/simgear-2016.1.1.ebuild |
197 |
index 899b65f..de8291d 100644 |
198 |
--- a/dev-games/simgear/simgear-2016.1.1.ebuild |
199 |
+++ b/dev-games/simgear/simgear-2016.1.1.ebuild |
200 |
@@ -4,7 +4,6 @@ |
201 |
|
202 |
EAPI=6 |
203 |
|
204 |
-CMAKE_WARN_UNUSED_CLI=1 |
205 |
inherit eutils cmake-utils |
206 |
|
207 |
DESCRIPTION="Development library for simulation games" |
208 |
|
209 |
diff --git a/dev-games/simgear/simgear-2016.1.1.ebuild b/dev-games/simgear/simgear-2016.2.1.ebuild |
210 |
similarity index 82% |
211 |
copy from dev-games/simgear/simgear-2016.1.1.ebuild |
212 |
copy to dev-games/simgear/simgear-2016.2.1.ebuild |
213 |
index 899b65f..9104575 100644 |
214 |
--- a/dev-games/simgear/simgear-2016.1.1.ebuild |
215 |
+++ b/dev-games/simgear/simgear-2016.2.1.ebuild |
216 |
@@ -4,7 +4,6 @@ |
217 |
|
218 |
EAPI=6 |
219 |
|
220 |
-CMAKE_WARN_UNUSED_CLI=1 |
221 |
inherit eutils cmake-utils |
222 |
|
223 |
DESCRIPTION="Development library for simulation games" |
224 |
@@ -14,15 +13,16 @@ SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2" |
225 |
LICENSE="GPL-2" |
226 |
KEYWORDS="~amd64 ~ppc ~x86" |
227 |
SLOT="0" |
228 |
-IUSE="curl debug subversion test" |
229 |
+IUSE="+dns debug subversion test" |
230 |
|
231 |
COMMON_DEPEND=" |
232 |
dev-libs/expat |
233 |
>=dev-games/openscenegraph-3.2.0 |
234 |
media-libs/openal |
235 |
+ net-misc/curl |
236 |
sys-libs/zlib |
237 |
virtual/opengl |
238 |
- curl? ( net-misc/curl ) |
239 |
+ dns? ( net-libs/udns ) |
240 |
" |
241 |
DEPEND="${COMMON_DEPEND} |
242 |
>=dev-libs/boost-1.44 |
243 |
@@ -31,11 +31,15 @@ RDEPEND="${COMMON_DEPEND} |
244 |
subversion? ( dev-vcs/subversion ) |
245 |
" |
246 |
|
247 |
+PATCHES=( |
248 |
+ "${FILESDIR}/simgear-2016.2.1-unbundle-udns.patch" |
249 |
+) |
250 |
+ |
251 |
DOCS=(AUTHORS ChangeLog NEWS README Thanks) |
252 |
|
253 |
src_configure() { |
254 |
local mycmakeargs=( |
255 |
- -DENABLE_CURL=$(usex curl) |
256 |
+ -DENABLE_DNS=$(usex dns) |
257 |
-DENABLE_PKGUTIL=ON |
258 |
-DENABLE_RTI=OFF |
259 |
-DENABLE_SOUND=ON |
260 |
@@ -43,6 +47,7 @@ src_configure() { |
261 |
-DSIMGEAR_HEADLESS=OFF |
262 |
-DSIMGEAR_SHARED=ON |
263 |
-DSYSTEM_EXPAT=ON |
264 |
+ -DSYSTEM_UDNS=ON |
265 |
) |
266 |
cmake-utils_src_configure |
267 |
} |
268 |
|
269 |
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild |
270 |
index f151217..2c5c92d 100644 |
271 |
--- a/dev-games/simgear/simgear-9999.ebuild |
272 |
+++ b/dev-games/simgear/simgear-9999.ebuild |
273 |
@@ -4,7 +4,6 @@ |
274 |
|
275 |
EAPI=6 |
276 |
|
277 |
-CMAKE_WARN_UNUSED_CLI=1 |
278 |
inherit eutils cmake-utils git-r3 |
279 |
|
280 |
DESCRIPTION="Development library for simulation games" |
281 |
@@ -16,15 +15,16 @@ EGIT_BRANCH="next" |
282 |
LICENSE="GPL-2" |
283 |
KEYWORDS="" |
284 |
SLOT="0" |
285 |
-IUSE="curl debug subversion test" |
286 |
+IUSE="+dns debug subversion test" |
287 |
|
288 |
COMMON_DEPEND=" |
289 |
dev-libs/expat |
290 |
>=dev-games/openscenegraph-3.2.0 |
291 |
media-libs/openal |
292 |
+ net-misc/curl |
293 |
sys-libs/zlib |
294 |
virtual/opengl |
295 |
- curl? ( net-misc/curl ) |
296 |
+ dns? ( net-libs/udns ) |
297 |
" |
298 |
DEPEND="${COMMON_DEPEND} |
299 |
>=dev-libs/boost-1.44 |
300 |
@@ -33,11 +33,15 @@ RDEPEND="${COMMON_DEPEND} |
301 |
subversion? ( dev-vcs/subversion ) |
302 |
" |
303 |
|
304 |
+PATCHES=( |
305 |
+ "${FILESDIR}/simgear-2016.2.1-unbundle-udns.patch" |
306 |
+) |
307 |
+ |
308 |
DOCS=(AUTHORS ChangeLog NEWS README Thanks) |
309 |
|
310 |
src_configure() { |
311 |
local mycmakeargs=( |
312 |
- -DENABLE_CURL=$(usex curl) |
313 |
+ -DENABLE_DNS=$(usex dns) |
314 |
-DENABLE_PKGUTIL=ON |
315 |
-DENABLE_RTI=OFF |
316 |
-DENABLE_SOUND=ON |
317 |
@@ -45,6 +49,7 @@ src_configure() { |
318 |
-DSIMGEAR_HEADLESS=OFF |
319 |
-DSIMGEAR_SHARED=ON |
320 |
-DSYSTEM_EXPAT=ON |
321 |
+ -DSYSTEM_UDNS=ON |
322 |
) |
323 |
cmake-utils_src_configure |
324 |
} |
325 |
|
326 |
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest |
327 |
index cc1eccf..0600b5f 100644 |
328 |
--- a/games-simulation/flightgear-data/Manifest |
329 |
+++ b/games-simulation/flightgear-data/Manifest |
330 |
@@ -1,2 +1,3 @@ |
331 |
DIST FlightGear-2016.1.1-data.tar.bz2 1266743984 SHA256 36016ac5ab83fc6ad44c5cebe0f4fa7a14cf55ff5b699016abdeacf5a04c4c18 SHA512 605d610d001f959e2434228b9c3741af0df5fd047af31e1d60ad5bdb1041cde3299cab622014735cff6534d2a8f0edbe44ab3528bae2072454aaf0b363e765b8 WHIRLPOOL 3c1c50d2a47a9c68839cea1c24439c1052fc8b4a8ff7ee4378913fe3aaa9c4f08feb3a2a8aca520087aa745a4bda0ef43d8ea4679072cd56ff1311acf27261e3 |
332 |
+DIST FlightGear-2016.2.1-data.tar.bz2 1562126790 SHA256 225b32f4d813635ece72f09541640e818fba95386ff8715015693978c37eaace SHA512 1c22d2afcb33ef8552fa9712a25fc116e31d585f4973339b134b6461421da1b47c3e5c795c5f1ee99d13a1c107f3a7a615c07843de2332a1e9f729bc64dd269d WHIRLPOOL b664f65c23342c0e13d58c431896019085780cf413da4c3350e3e22efb3aa1686fee6f3e1b97568711d5218eb2f1dab554d2d5559f06358c75eff1e711fcb7b8 |
333 |
DIST FlightGear-data-3.4.0.tar.bz2 1145893777 SHA256 8cefa7c323d974d8e51fd23c97ae79dc731e65b81e1729cb1bc9bc1f99df128b SHA512 791ff1b1f7f759ccc73f738ba6cb6fd050d1341ae031a872745b4c1145cdb92de62193df7ea6e9fe05a1c95a60fa664da56015d643244d38c7b0b72a2c3146d9 WHIRLPOOL 0abaa4da7e9032469da80500fc23c84d6b696fc596529853a3a614bb3627ef6081c12ea78e6e8c987e6b11b303cca0d8da5c9628164d2a93bed452230302a655 |
334 |
|
335 |
diff --git a/games-simulation/flightgear-data/flightgear-data-2016.2.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2016.2.1.ebuild |
336 |
new file mode 100644 |
337 |
index 0000000..1a1745f |
338 |
--- /dev/null |
339 |
+++ b/games-simulation/flightgear-data/flightgear-data-2016.2.1.ebuild |
340 |
@@ -0,0 +1,27 @@ |
341 |
+# Copyright 1999-2016 Gentoo Foundation |
342 |
+# Distributed under the terms of the GNU General Public License v2 |
343 |
+# $Id$ |
344 |
+ |
345 |
+EAPI=6 |
346 |
+ |
347 |
+DESCRIPTION="FlightGear data files" |
348 |
+HOMEPAGE="http://www.flightgear.org/" |
349 |
+SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2" |
350 |
+ |
351 |
+LICENSE="GPL-2" |
352 |
+SLOT="0" |
353 |
+KEYWORDS="~amd64 ~ppc ~x86" |
354 |
+IUSE="" |
355 |
+ |
356 |
+# data files split to separate package since 2.10.0 |
357 |
+RDEPEND=" |
358 |
+ !<games-simulation/flightgear-2.10.0 |
359 |
+" |
360 |
+ |
361 |
+S=${WORKDIR}/fgdata |
362 |
+ |
363 |
+src_install() { |
364 |
+ insinto /usr/share/flightgear |
365 |
+ rm -fr .git |
366 |
+ doins -r * |
367 |
+} |
368 |
|
369 |
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest |
370 |
index cce1b8f..1e2f003 100644 |
371 |
--- a/games-simulation/flightgear/Manifest |
372 |
+++ b/games-simulation/flightgear/Manifest |
373 |
@@ -1,2 +1,3 @@ |
374 |
DIST flightgear-2016.1.1.tar.bz2 7541607 SHA256 acdffb8a6a000cd44b23816f5d1467dbcf375d3cbd6233b2998467bd55dd60ac SHA512 bcebbf100e383a808154dbdf2b0f28ffcf0e3c0415a2db90e0daabb0073e83be69b3989dfc9e299c35fa6e39ddb5b9d4dfefd7f4c23ca8cd981768d8ab89e9c0 WHIRLPOOL d431c59c160a383c4f91f34f1e7ad322502704a4693c6c189cf258958703b0fe97290ab9db60a7de93f99511c79993c1a02de5ae559be0f0fab83b1bea371791 |
375 |
+DIST flightgear-2016.2.1.tar.bz2 7556269 SHA256 b554170ca6b5943fd90496759b055fb60f362ea96f6c46dfff89e3d12c940a94 SHA512 679cb8e6aa4c2d601e7b984da6e4317fd454d14b1357d08cc64350eb973a6700a0dddd18b50cd50fcdce48fba2864ce0f7484b67a15e38cb5f5e8e7d4fc7b017 WHIRLPOOL 6d04982bb107d59094facb4d0430cb25de5ea994f25f1ea3a18351626335c1bc136228e376fd680baacb1e731718b49c317adb390737fd5641b51f8228303c48 |
376 |
DIST flightgear-3.4.0.tar.bz2 7522457 SHA256 b5645d05b50728a89f091292bc557f440d8f8719dd9cebf7f5bf3fa8ea795780 SHA512 10626d00b34255753dc5a5c82076909c296219472faf51c38460cc357ac014b40bd127454f28b2d857f1a1a299716430fd8f04dc7881552b3c24dee6eb616b1e WHIRLPOOL 636ca7e012175141bc4b081cb6137e5348d49b873d241c5d0f1ed0a2581b32d2f23f4fe0ed97d5a1b72440afd14687e5de4e6ebeeaf07b4e854b0ca47875b82f |
377 |
|
378 |
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-2016.2.1.ebuild |
379 |
similarity index 94% |
380 |
copy from games-simulation/flightgear/flightgear-9999.ebuild |
381 |
copy to games-simulation/flightgear/flightgear-2016.2.1.ebuild |
382 |
index 2d73c20..87a25f2 100644 |
383 |
--- a/games-simulation/flightgear/flightgear-9999.ebuild |
384 |
+++ b/games-simulation/flightgear/flightgear-2016.2.1.ebuild |
385 |
@@ -4,18 +4,15 @@ |
386 |
|
387 |
EAPI=6 |
388 |
|
389 |
-CMAKE_WARN_UNUSED_CLI=1 |
390 |
-inherit cmake-utils bash-completion-r1 git-r3 |
391 |
+inherit cmake-utils bash-completion-r1 |
392 |
|
393 |
DESCRIPTION="Open Source Flight Simulator" |
394 |
HOMEPAGE="http://www.flightgear.org/" |
395 |
-EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/${PN} |
396 |
- git://mapserver.flightgear.org/${PN}" |
397 |
-EGIT_BRANCH="next" |
398 |
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2" |
399 |
|
400 |
LICENSE="GPL-2" |
401 |
SLOT="0" |
402 |
-KEYWORDS="" |
403 |
+KEYWORDS="~amd64 ~ppc ~x86" |
404 |
IUSE="dbus debug examples qt5 test +udev +utils vim-syntax" |
405 |
|
406 |
COMMON_DEPEND=" |
407 |
|
408 |
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild |
409 |
index 2d73c20..d512c59 100644 |
410 |
--- a/games-simulation/flightgear/flightgear-9999.ebuild |
411 |
+++ b/games-simulation/flightgear/flightgear-9999.ebuild |
412 |
@@ -4,7 +4,6 @@ |
413 |
|
414 |
EAPI=6 |
415 |
|
416 |
-CMAKE_WARN_UNUSED_CLI=1 |
417 |
inherit cmake-utils bash-completion-r1 git-r3 |
418 |
|
419 |
DESCRIPTION="Open Source Flight Simulator" |