| 1 |
commit: 2aa0c15bc18645a3a4d7ad594d7a063533aa1d9b |
| 2 |
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 6 02:10:45 2018 +0000 |
| 4 |
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 6 02:12:42 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aa0c15b |
| 7 |
|
| 8 |
[games-simulation/flightgear] Version bump 2018.1.1, remove old. |
| 9 |
|
| 10 |
dev-games/simgear/Manifest | 6 +- |
| 11 |
.../simgear-2017.2.1-boost-1.65-tr1-removal.patch | 47 ---------------- |
| 12 |
.../files/simgear-2017.2.1-gdal-underlinking.patch | 28 ---------- |
| 13 |
dev-games/simgear/simgear-2016.4.4.ebuild | 51 ----------------- |
| 14 |
dev-games/simgear/simgear-2017.1.2.ebuild | 51 ----------------- |
| 15 |
dev-games/simgear/simgear-2017.1.3.ebuild | 51 ----------------- |
| 16 |
dev-games/simgear/simgear-2017.2.1.ebuild | 65 ---------------------- |
| 17 |
...ear-2017.3.1.ebuild => simgear-2018.1.1.ebuild} | 0 |
| 18 |
games-simulation/flightgear-data/Manifest | 2 +- |
| 19 |
....3.1.ebuild => flightgear-data-2018.1.1.ebuild} | 0 |
| 20 |
games-simulation/flightgear/Manifest | 2 +- |
| 21 |
...-2017.3.1.ebuild => flightgear-2018.1.1.ebuild} | 16 +++--- |
| 22 |
games-simulation/flightgear/flightgear-9999.ebuild | 16 +++--- |
| 23 |
13 files changed, 19 insertions(+), 316 deletions(-) |
| 24 |
|
| 25 |
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest |
| 26 |
index 884cf4bd9b8..79038a8ba4a 100644 |
| 27 |
--- a/dev-games/simgear/Manifest |
| 28 |
+++ b/dev-games/simgear/Manifest |
| 29 |
@@ -1,5 +1 @@ |
| 30 |
-DIST simgear-2016.4.4.tar.bz2 1200320 BLAKE2B d6e3805a7e3255010c704634145d4a5dd8ee3a5aa21a0a1816c993417f11c2304dcf6c2d40775216ab0c2d4f83b6755b68fdfbc407f631a3f472777fb88901e1 SHA512 f7b9124e40dba347cd73304fc1b20a5b6d09eb476bc41949d5be615be968a6a66f64141b87819bfa357bd1fd376b2e1fc18334eb1d4df2d4f1e3f95ef4a1928d |
| 31 |
-DIST simgear-2017.1.2.tar.bz2 1235662 BLAKE2B ec9555f66829d95b605b353435186f1d240d24c9450e54738bbd705d5efc81a0a25366ae4ce56ceecb06c1f6cd4d2c62c298b2fe1d98cf154d91adc25c061568 SHA512 5746262873f9ca9183bf5bcfbff1493637faa68c8d070a5683f991b414b69b0e432f181394db0c39c939b3d6e433288a143eb3489a407c38f3d26c9033027404 |
| 32 |
-DIST simgear-2017.1.3.tar.bz2 1235062 BLAKE2B 133f6a2875b085fa495a192751fe29aaa87ec221725fdf23b182648f567e3e2dae635b150dcee6fd379682705357536fd78ac8ea880a959ca8a9cf562d105b73 SHA512 600f883ad92d37bf76d5e6beb066da340c7af927b0f2d51ce290cccaf23d1f3289b1aa31d3aa6cc17a4b9bc57c7180f03e234e08601e4169f26624678bf551aa |
| 33 |
-DIST simgear-2017.2.1.tar.bz2 1290780 BLAKE2B 45218a077a5d90b726a1a44d335e226f01e0d811223c4f0e5c63b6cafd867d5f6127b45fcc23c27521d5c7f10cdc6244bed2f5c97d3dc6c29b6a5708bb1aa2b0 SHA512 168f5e3eab7cdd44643a62e1970c6329ac1121ca98e36c4134d963237e70304a20b7c8df3b438e24c204d51569d6863ef8b16098462d850f72a5f11a10ccbfd5 |
| 34 |
-DIST simgear-2017.3.1.tar.bz2 1302704 BLAKE2B 457b2de4af253eb1299cf5974336f5684e37d045e60a134095fd480e6110846c6985614f8fffc4e347e74fe59f23834e32aaddf8e49e73dede97327d466f729e SHA512 339c9af78e8c0490caec69be34b54f947751a9677cbb1163e73917f6aaa8f3d965ccf8058222c48ca4249cba4bb509205143f846de84595e92abdcd93e64c901 |
| 35 |
+DIST simgear-2018.1.1.tar.bz2 1303653 BLAKE2B 44b98c2ba8ae292c3736d04813869df528d7ca14bbdc1773e1f4bd4b7b4899b5fd8605a7ada5dcc2d5e863e82ee2f1e1d2b980d3bd775c92325ad3ca834306c3 SHA512 3de7a15dc7b60e9e7466950c1b466d0daefea84b4730a9b8cf5e26c41cece5fd03ccf57b0f3cb977093482beb734560812e347003e19e0bb4b40d81820a11563 |
| 36 |
|
| 37 |
diff --git a/dev-games/simgear/files/simgear-2017.2.1-boost-1.65-tr1-removal.patch b/dev-games/simgear/files/simgear-2017.2.1-boost-1.65-tr1-removal.patch |
| 38 |
deleted file mode 100644 |
| 39 |
index a9ebe507cee..00000000000 |
| 40 |
--- a/dev-games/simgear/files/simgear-2017.2.1-boost-1.65-tr1-removal.patch |
| 41 |
+++ /dev/null |
| 42 |
@@ -1,47 +0,0 @@ |
| 43 |
---- a/simgear/scene/material/Effect.cxx |
| 44 |
-+++ b/simgear/scene/material/Effect.cxx |
| 45 |
-@@ -32,7 +32,7 @@ |
| 46 |
- #include <map> |
| 47 |
- #include <queue> |
| 48 |
- #include <utility> |
| 49 |
--#include <boost/tr1/unordered_map.hpp> |
| 50 |
-+#include <boost/unordered_map.hpp> |
| 51 |
- |
| 52 |
- #include <boost/bind.hpp> |
| 53 |
- #include <boost/foreach.hpp> |
| 54 |
-@@ -832,13 +832,13 @@ |
| 55 |
- |
| 56 |
- // XXX Should these be protected by a mutex? Probably |
| 57 |
- |
| 58 |
--typedef tr1::unordered_map<ProgramKey, ref_ptr<Program>, |
| 59 |
-+typedef boost::unordered_map<ProgramKey, ref_ptr<Program>, |
| 60 |
- boost::hash<ProgramKey>, ProgramKey::EqualTo> |
| 61 |
- ProgramMap; |
| 62 |
- ProgramMap programMap; |
| 63 |
- ProgramMap resolvedProgramMap; // map with resolved shader file names |
| 64 |
- |
| 65 |
--typedef tr1::unordered_map<ShaderKey, ref_ptr<Shader>, boost::hash<ShaderKey> > |
| 66 |
-+typedef boost::unordered_map<ShaderKey, ref_ptr<Shader>, boost::hash<ShaderKey> > |
| 67 |
- ShaderMap; |
| 68 |
- ShaderMap shaderMap; |
| 69 |
- |
| 70 |
---- a/simgear/scene/material/Effect.hxx |
| 71 |
-+++ b/simgear/scene/material/Effect.hxx |
| 72 |
-@@ -19,7 +19,7 @@ |
| 73 |
- |
| 74 |
- #include <vector> |
| 75 |
- #include <string> |
| 76 |
--#include <boost/tr1/unordered_map.hpp> |
| 77 |
-+#include <boost/unordered_map.hpp> |
| 78 |
- |
| 79 |
- #include <boost/functional/hash.hpp> |
| 80 |
- |
| 81 |
-@@ -127,7 +127,7 @@ |
| 82 |
- bool operator()(const Key& lhs, const Key& rhs) const; |
| 83 |
- }; |
| 84 |
- }; |
| 85 |
-- typedef std::tr1::unordered_map<Key, osg::observer_ptr<Effect>, |
| 86 |
-+ typedef boost::unordered_map<Key, osg::observer_ptr<Effect>, |
| 87 |
- boost::hash<Key>, Key::EqualTo> Cache; |
| 88 |
- Cache* getCache() |
| 89 |
- { |
| 90 |
|
| 91 |
diff --git a/dev-games/simgear/files/simgear-2017.2.1-gdal-underlinking.patch b/dev-games/simgear/files/simgear-2017.2.1-gdal-underlinking.patch |
| 92 |
deleted file mode 100644 |
| 93 |
index 63eb79ed35c..00000000000 |
| 94 |
--- a/dev-games/simgear/files/simgear-2017.2.1-gdal-underlinking.patch |
| 95 |
+++ /dev/null |
| 96 |
@@ -1,28 +0,0 @@ |
| 97 |
-From 9971d517fdf351e40467c88915d3e30e56f999d4 Mon Sep 17 00:00:00 2001 |
| 98 |
-From: Maciej Mrozowski <reavertm@×××××.com> |
| 99 |
-Date: Thu, 15 Jun 2017 04:58:03 +0200 |
| 100 |
-Subject: [PATCH] Link shared SimGearScene with libgdal when enabled |
| 101 |
- |
| 102 |
---- |
| 103 |
- simgear/CMakeLists.txt | 5 +++++ |
| 104 |
- 1 file changed, 5 insertions(+) |
| 105 |
- |
| 106 |
-diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt |
| 107 |
-index 18c2e04c..6c7cb495 100644 |
| 108 |
---- a/simgear/CMakeLists.txt |
| 109 |
-+++ b/simgear/CMakeLists.txt |
| 110 |
-@@ -173,6 +173,11 @@ if(NOT SIMGEAR_HEADLESS) |
| 111 |
- ${OPENGL_LIBRARY} |
| 112 |
- ${JPEG_LIBRARY}) |
| 113 |
- |
| 114 |
-+ if(ENABLE_GDAL) |
| 115 |
-+ target_link_libraries(SimGearScene |
| 116 |
-+ ${GDAL_LIBRARIES}) |
| 117 |
-+ endif() |
| 118 |
-+ |
| 119 |
- # only actually needed by canvas/KeyboardEvent.cxx |
| 120 |
- target_include_directories(SimGearScene PRIVATE ${PROJECT_SOURCE_DIR}/3rdparty/utf8/source) |
| 121 |
- endif() |
| 122 |
--- |
| 123 |
-2.13.0 |
| 124 |
- |
| 125 |
|
| 126 |
diff --git a/dev-games/simgear/simgear-2016.4.4.ebuild b/dev-games/simgear/simgear-2016.4.4.ebuild |
| 127 |
deleted file mode 100644 |
| 128 |
index f2c7c954e25..00000000000 |
| 129 |
--- a/dev-games/simgear/simgear-2016.4.4.ebuild |
| 130 |
+++ /dev/null |
| 131 |
@@ -1,51 +0,0 @@ |
| 132 |
-# Copyright 1999-2017 Gentoo Foundation |
| 133 |
-# Distributed under the terms of the GNU General Public License v2 |
| 134 |
- |
| 135 |
-EAPI=6 |
| 136 |
- |
| 137 |
-inherit eutils cmake-utils |
| 138 |
- |
| 139 |
-DESCRIPTION="Development library for simulation games" |
| 140 |
-HOMEPAGE="http://www.simgear.org/" |
| 141 |
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2" |
| 142 |
- |
| 143 |
-LICENSE="GPL-2" |
| 144 |
-KEYWORDS="amd64 x86" |
| 145 |
-SLOT="0" |
| 146 |
-IUSE="+dns debug subversion test" |
| 147 |
- |
| 148 |
-COMMON_DEPEND=" |
| 149 |
- dev-libs/expat |
| 150 |
- >=dev-games/openscenegraph-3.2.0 |
| 151 |
- media-libs/openal |
| 152 |
- net-misc/curl |
| 153 |
- sys-libs/zlib |
| 154 |
- virtual/opengl |
| 155 |
- dns? ( net-libs/udns ) |
| 156 |
-" |
| 157 |
-DEPEND="${COMMON_DEPEND} |
| 158 |
- >=dev-libs/boost-1.44 |
| 159 |
-" |
| 160 |
-RDEPEND="${COMMON_DEPEND} |
| 161 |
- subversion? ( dev-vcs/subversion ) |
| 162 |
-" |
| 163 |
- |
| 164 |
-DOCS=(AUTHORS ChangeLog NEWS README Thanks) |
| 165 |
- |
| 166 |
-src_configure() { |
| 167 |
- local mycmakeargs=( |
| 168 |
- -DENABLE_DNS=$(usex dns) |
| 169 |
- -DENABLE_PKGUTIL=ON |
| 170 |
- -DENABLE_RTI=OFF |
| 171 |
- -DENABLE_SIMD=OFF |
| 172 |
- -DENABLE_SOUND=ON |
| 173 |
- -DENABLE_TESTS=$(usex test) |
| 174 |
- -DSIMGEAR_HEADLESS=OFF |
| 175 |
- -DSIMGEAR_SHARED=ON |
| 176 |
- -DSYSTEM_EXPAT=ON |
| 177 |
- -DSYSTEM_UDNS=ON |
| 178 |
- -DUSE_AEONWAVE=OFF |
| 179 |
- -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it |
| 180 |
- ) |
| 181 |
- cmake-utils_src_configure |
| 182 |
-} |
| 183 |
|
| 184 |
diff --git a/dev-games/simgear/simgear-2017.1.2.ebuild b/dev-games/simgear/simgear-2017.1.2.ebuild |
| 185 |
deleted file mode 100644 |
| 186 |
index d3914e9c36c..00000000000 |
| 187 |
--- a/dev-games/simgear/simgear-2017.1.2.ebuild |
| 188 |
+++ /dev/null |
| 189 |
@@ -1,51 +0,0 @@ |
| 190 |
-# Copyright 1999-2017 Gentoo Foundation |
| 191 |
-# Distributed under the terms of the GNU General Public License v2 |
| 192 |
- |
| 193 |
-EAPI=6 |
| 194 |
- |
| 195 |
-inherit eutils cmake-utils |
| 196 |
- |
| 197 |
-DESCRIPTION="Development library for simulation games" |
| 198 |
-HOMEPAGE="http://www.simgear.org/" |
| 199 |
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2" |
| 200 |
- |
| 201 |
-LICENSE="GPL-2" |
| 202 |
-KEYWORDS="~amd64 ~x86" |
| 203 |
-SLOT="0" |
| 204 |
-IUSE="+dns debug subversion test" |
| 205 |
- |
| 206 |
-COMMON_DEPEND=" |
| 207 |
- dev-libs/expat |
| 208 |
- >=dev-games/openscenegraph-3.2.0 |
| 209 |
- media-libs/openal |
| 210 |
- net-misc/curl |
| 211 |
- sys-libs/zlib |
| 212 |
- virtual/opengl |
| 213 |
- dns? ( net-libs/udns ) |
| 214 |
-" |
| 215 |
-DEPEND="${COMMON_DEPEND} |
| 216 |
- >=dev-libs/boost-1.44 |
| 217 |
-" |
| 218 |
-RDEPEND="${COMMON_DEPEND} |
| 219 |
- subversion? ( dev-vcs/subversion ) |
| 220 |
-" |
| 221 |
- |
| 222 |
-DOCS=(AUTHORS ChangeLog NEWS README Thanks) |
| 223 |
- |
| 224 |
-src_configure() { |
| 225 |
- local mycmakeargs=( |
| 226 |
- -DENABLE_DNS=$(usex dns) |
| 227 |
- -DENABLE_PKGUTIL=ON |
| 228 |
- -DENABLE_RTI=OFF |
| 229 |
- -DENABLE_SIMD=ON |
| 230 |
- -DENABLE_SOUND=ON |
| 231 |
- -DENABLE_TESTS=$(usex test) |
| 232 |
- -DSIMGEAR_HEADLESS=OFF |
| 233 |
- -DSIMGEAR_SHARED=ON |
| 234 |
- -DSYSTEM_EXPAT=ON |
| 235 |
- -DSYSTEM_UDNS=ON |
| 236 |
- -DUSE_AEONWAVE=OFF |
| 237 |
- -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it |
| 238 |
- ) |
| 239 |
- cmake-utils_src_configure |
| 240 |
-} |
| 241 |
|
| 242 |
diff --git a/dev-games/simgear/simgear-2017.1.3.ebuild b/dev-games/simgear/simgear-2017.1.3.ebuild |
| 243 |
deleted file mode 100644 |
| 244 |
index d3914e9c36c..00000000000 |
| 245 |
--- a/dev-games/simgear/simgear-2017.1.3.ebuild |
| 246 |
+++ /dev/null |
| 247 |
@@ -1,51 +0,0 @@ |
| 248 |
-# Copyright 1999-2017 Gentoo Foundation |
| 249 |
-# Distributed under the terms of the GNU General Public License v2 |
| 250 |
- |
| 251 |
-EAPI=6 |
| 252 |
- |
| 253 |
-inherit eutils cmake-utils |
| 254 |
- |
| 255 |
-DESCRIPTION="Development library for simulation games" |
| 256 |
-HOMEPAGE="http://www.simgear.org/" |
| 257 |
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2" |
| 258 |
- |
| 259 |
-LICENSE="GPL-2" |
| 260 |
-KEYWORDS="~amd64 ~x86" |
| 261 |
-SLOT="0" |
| 262 |
-IUSE="+dns debug subversion test" |
| 263 |
- |
| 264 |
-COMMON_DEPEND=" |
| 265 |
- dev-libs/expat |
| 266 |
- >=dev-games/openscenegraph-3.2.0 |
| 267 |
- media-libs/openal |
| 268 |
- net-misc/curl |
| 269 |
- sys-libs/zlib |
| 270 |
- virtual/opengl |
| 271 |
- dns? ( net-libs/udns ) |
| 272 |
-" |
| 273 |
-DEPEND="${COMMON_DEPEND} |
| 274 |
- >=dev-libs/boost-1.44 |
| 275 |
-" |
| 276 |
-RDEPEND="${COMMON_DEPEND} |
| 277 |
- subversion? ( dev-vcs/subversion ) |
| 278 |
-" |
| 279 |
- |
| 280 |
-DOCS=(AUTHORS ChangeLog NEWS README Thanks) |
| 281 |
- |
| 282 |
-src_configure() { |
| 283 |
- local mycmakeargs=( |
| 284 |
- -DENABLE_DNS=$(usex dns) |
| 285 |
- -DENABLE_PKGUTIL=ON |
| 286 |
- -DENABLE_RTI=OFF |
| 287 |
- -DENABLE_SIMD=ON |
| 288 |
- -DENABLE_SOUND=ON |
| 289 |
- -DENABLE_TESTS=$(usex test) |
| 290 |
- -DSIMGEAR_HEADLESS=OFF |
| 291 |
- -DSIMGEAR_SHARED=ON |
| 292 |
- -DSYSTEM_EXPAT=ON |
| 293 |
- -DSYSTEM_UDNS=ON |
| 294 |
- -DUSE_AEONWAVE=OFF |
| 295 |
- -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it |
| 296 |
- ) |
| 297 |
- cmake-utils_src_configure |
| 298 |
-} |
| 299 |
|
| 300 |
diff --git a/dev-games/simgear/simgear-2017.2.1.ebuild b/dev-games/simgear/simgear-2017.2.1.ebuild |
| 301 |
deleted file mode 100644 |
| 302 |
index 10aad3a8c38..00000000000 |
| 303 |
--- a/dev-games/simgear/simgear-2017.2.1.ebuild |
| 304 |
+++ /dev/null |
| 305 |
@@ -1,65 +0,0 @@ |
| 306 |
-# Copyright 1999-2017 Gentoo Foundation |
| 307 |
-# Distributed under the terms of the GNU General Public License v2 |
| 308 |
- |
| 309 |
-EAPI=6 |
| 310 |
- |
| 311 |
-inherit cmake-utils toolchain-funcs |
| 312 |
- |
| 313 |
-DESCRIPTION="Development library for simulation games" |
| 314 |
-HOMEPAGE="http://www.simgear.org/" |
| 315 |
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2" |
| 316 |
- |
| 317 |
-LICENSE="GPL-2" |
| 318 |
-SLOT="0" |
| 319 |
-KEYWORDS="~amd64 ~x86" |
| 320 |
-IUSE="+dns debug gdal openmp subversion test" |
| 321 |
- |
| 322 |
-COMMON_DEPEND=" |
| 323 |
- dev-libs/expat |
| 324 |
- >=dev-games/openscenegraph-3.2.0 |
| 325 |
- media-libs/openal |
| 326 |
- net-misc/curl |
| 327 |
- sys-libs/zlib |
| 328 |
- virtual/opengl |
| 329 |
- dns? ( net-libs/udns ) |
| 330 |
- gdal? ( sci-libs/gdal ) |
| 331 |
-" |
| 332 |
-DEPEND="${COMMON_DEPEND} |
| 333 |
- >=dev-libs/boost-1.44 |
| 334 |
-" |
| 335 |
-RDEPEND="${COMMON_DEPEND} |
| 336 |
- subversion? ( dev-vcs/subversion ) |
| 337 |
-" |
| 338 |
- |
| 339 |
-PATCHES=( |
| 340 |
- "${FILESDIR}"/${PN}-2017.2.1-gdal-underlinking.patch |
| 341 |
- "${FILESDIR}"/${PN}-2017.2.1-boost-1.65-tr1-removal.patch |
| 342 |
-) |
| 343 |
- |
| 344 |
-pkg_pretend() { |
| 345 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 346 |
-} |
| 347 |
- |
| 348 |
-pkg_setup() { |
| 349 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 350 |
-} |
| 351 |
- |
| 352 |
-src_configure() { |
| 353 |
- local mycmakeargs=( |
| 354 |
- -DENABLE_DNS=$(usex dns) |
| 355 |
- -DENABLE_GDAL=$(usex gdal) |
| 356 |
- -DENABLE_OPENMP=$(usex openmp) |
| 357 |
- -DENABLE_PKGUTIL=ON |
| 358 |
- -DENABLE_RTI=OFF |
| 359 |
- -DENABLE_SIMD=ON |
| 360 |
- -DENABLE_SOUND=ON |
| 361 |
- -DENABLE_TESTS=$(usex test) |
| 362 |
- -DSIMGEAR_HEADLESS=OFF |
| 363 |
- -DSIMGEAR_SHARED=ON |
| 364 |
- -DSYSTEM_EXPAT=ON |
| 365 |
- -DSYSTEM_UDNS=ON |
| 366 |
- -DUSE_AEONWAVE=OFF |
| 367 |
- -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it |
| 368 |
- ) |
| 369 |
- cmake-utils_src_configure |
| 370 |
-} |
| 371 |
|
| 372 |
diff --git a/dev-games/simgear/simgear-2017.3.1.ebuild b/dev-games/simgear/simgear-2018.1.1.ebuild |
| 373 |
similarity index 100% |
| 374 |
rename from dev-games/simgear/simgear-2017.3.1.ebuild |
| 375 |
rename to dev-games/simgear/simgear-2018.1.1.ebuild |
| 376 |
|
| 377 |
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest |
| 378 |
index d9a6d8b1fae..4a6111a05fa 100644 |
| 379 |
--- a/games-simulation/flightgear-data/Manifest |
| 380 |
+++ b/games-simulation/flightgear-data/Manifest |
| 381 |
@@ -1 +1 @@ |
| 382 |
-DIST FlightGear-2017.3.1-data.tar.bz2 1560855079 BLAKE2B 792f3dfa200597b106455c26389c2284f13a6823c58aa911b211e2a51bbee4da4eeee79baa7c91a7d936ca498928206819c937e363c0d5f85e679136a90718e3 SHA512 9a3a68103bbb0f74d7f019b45cca00e686122618c1b5142231ba0c8b83f1283956782d3ea4372b1d96d653ea45f7087c32f39f26fe97695faddad0be12f8d9ff |
| 383 |
+DIST FlightGear-2018.1.1-data.tar.bz2 1576049981 BLAKE2B cfcf028ca04ed785ba7c65979e6566ab773d8af869a9b62050969295eafecf7d1f5b6162f498af96786fa23a46e886390f240b56c83e7107473f59552a1155a5 SHA512 022f102f95c9cd8b153d991dad55ecd182e71aa0f3ecfe1502a35d6dcda0746a1fd183f808e59aba8c7f3a0cc9ae1f2f91ff49565bff4c7bc5a1c4889fcc127f |
| 384 |
|
| 385 |
diff --git a/games-simulation/flightgear-data/flightgear-data-2017.3.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2018.1.1.ebuild |
| 386 |
similarity index 100% |
| 387 |
rename from games-simulation/flightgear-data/flightgear-data-2017.3.1.ebuild |
| 388 |
rename to games-simulation/flightgear-data/flightgear-data-2018.1.1.ebuild |
| 389 |
|
| 390 |
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest |
| 391 |
index b8cd56b5111..0f960baf586 100644 |
| 392 |
--- a/games-simulation/flightgear/Manifest |
| 393 |
+++ b/games-simulation/flightgear/Manifest |
| 394 |
@@ -1 +1 @@ |
| 395 |
-DIST flightgear-2017.3.1.tar.bz2 8098283 BLAKE2B b95c2d047e130f9c856afb1362256dc698bec6afd6d8118e079816fb59db1ebc321f04316123a9a615e5dee1f5c433faa176924eb6d48bf3bc3471d10f9ff238 SHA512 e91268b4fc6a5b04761cf64e003e9962e5a66a91c0f089a1de220ef7cc438250dbd93ed99773c09f19255604c4cc5a0b65b80fe19e663fa0eae8107374527b4b |
| 396 |
+DIST flightgear-2018.1.1.tar.bz2 8158999 BLAKE2B 5d7ca65c0b2627c7b34681e0af8e060f67cbed80d7e313c056fb92f026bc2355af66bbb6b377573db32f5101c63f1fa04521ba7fdffd584a56ae1049d1bcce83 SHA512 962be602a8c294081109ee1893383ac22dd83a0511fdb600d24d5dc9eca24d19687eaeed545695259502431e6d8c8bcdafe26846636ad40be28f5c2e4b0cfe93 |
| 397 |
|
| 398 |
diff --git a/games-simulation/flightgear/flightgear-2017.3.1.ebuild b/games-simulation/flightgear/flightgear-2018.1.1.ebuild |
| 399 |
similarity index 92% |
| 400 |
rename from games-simulation/flightgear/flightgear-2017.3.1.ebuild |
| 401 |
rename to games-simulation/flightgear/flightgear-2018.1.1.ebuild |
| 402 |
index 23182087a6f..35f1c329193 100644 |
| 403 |
--- a/games-simulation/flightgear/flightgear-2017.3.1.ebuild |
| 404 |
+++ b/games-simulation/flightgear/flightgear-2018.1.1.ebuild |
| 405 |
@@ -1,4 +1,4 @@ |
| 406 |
-# Copyright 1999-2017 Gentoo Foundation |
| 407 |
+# Copyright 1999-2018 Gentoo Foundation |
| 408 |
# Distributed under the terms of the GNU General Public License v2 |
| 409 |
|
| 410 |
EAPI=6 |
| 411 |
@@ -29,11 +29,11 @@ COMMON_DEPEND=" |
| 412 |
dbus? ( >=sys-apps/dbus-1.6.18-r1 ) |
| 413 |
gdal? ( >=sci-libs/gdal-2.0.0:0 ) |
| 414 |
qt5? ( |
| 415 |
- >=dev-qt/qtcore-5.4.1:5 |
| 416 |
- >=dev-qt/qtdeclarative-5.4.1:5 |
| 417 |
- >=dev-qt/qtgui-5.4.1:5 |
| 418 |
- >=dev-qt/qtnetwork-5.4.1:5 |
| 419 |
- >=dev-qt/qtwidgets-5.4.1:5 |
| 420 |
+ >=dev-qt/qtcore-5.7.1:5 |
| 421 |
+ >=dev-qt/qtdeclarative-5.7.1:5 |
| 422 |
+ >=dev-qt/qtgui-5.7.1:5 |
| 423 |
+ >=dev-qt/qtnetwork-5.7.1:5 |
| 424 |
+ >=dev-qt/qtwidgets-5.7.1:5 |
| 425 |
) |
| 426 |
udev? ( virtual/udev ) |
| 427 |
utils? ( |
| 428 |
@@ -42,7 +42,7 @@ COMMON_DEPEND=" |
| 429 |
media-libs/glew:0 |
| 430 |
media-libs/libpng:0 |
| 431 |
virtual/opengl |
| 432 |
- qt5? ( >=dev-qt/qtwebsockets-5.4.1:5 ) |
| 433 |
+ qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) |
| 434 |
) |
| 435 |
" |
| 436 |
# libXi and libXmu are build-only-deps according to FindGLUT.cmake |
| 437 |
@@ -75,10 +75,10 @@ src_configure() { |
| 438 |
-DENABLE_FLITE=OFF |
| 439 |
-DENABLE_GDAL=$(usex gdal) |
| 440 |
-DENABLE_GPSSMOOTH=$(usex utils) |
| 441 |
+ -DENABLE_HID_INPUT=$(usex udev) |
| 442 |
-DENABLE_JS_DEMO=$(usex utils) |
| 443 |
-DENABLE_JSBSIM=ON |
| 444 |
-DENABLE_LARCSIM=ON |
| 445 |
- -DENABLE_LOGGING=$(usex test) |
| 446 |
-DENABLE_METAR=$(usex utils) |
| 447 |
-DENABLE_OPENMP=$(usex openmp) |
| 448 |
-DENABLE_PROFILE=OFF |
| 449 |
|
| 450 |
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild |
| 451 |
index 2a386a47842..3807c996da0 100644 |
| 452 |
--- a/games-simulation/flightgear/flightgear-9999.ebuild |
| 453 |
+++ b/games-simulation/flightgear/flightgear-9999.ebuild |
| 454 |
@@ -1,4 +1,4 @@ |
| 455 |
-# Copyright 1999-2017 Gentoo Foundation |
| 456 |
+# Copyright 1999-2018 Gentoo Foundation |
| 457 |
# Distributed under the terms of the GNU General Public License v2 |
| 458 |
|
| 459 |
EAPI=6 |
| 460 |
@@ -31,11 +31,11 @@ COMMON_DEPEND=" |
| 461 |
dbus? ( >=sys-apps/dbus-1.6.18-r1 ) |
| 462 |
gdal? ( >=sci-libs/gdal-2.0.0:0 ) |
| 463 |
qt5? ( |
| 464 |
- >=dev-qt/qtcore-5.4.1:5 |
| 465 |
- >=dev-qt/qtdeclarative-5.4.1:5 |
| 466 |
- >=dev-qt/qtgui-5.4.1:5 |
| 467 |
- >=dev-qt/qtnetwork-5.4.1:5 |
| 468 |
- >=dev-qt/qtwidgets-5.4.1:5 |
| 469 |
+ >=dev-qt/qtcore-5.7.1:5 |
| 470 |
+ >=dev-qt/qtdeclarative-5.7.1:5 |
| 471 |
+ >=dev-qt/qtgui-5.7.1:5 |
| 472 |
+ >=dev-qt/qtnetwork-5.7.1:5 |
| 473 |
+ >=dev-qt/qtwidgets-5.7.1:5 |
| 474 |
) |
| 475 |
udev? ( virtual/udev ) |
| 476 |
utils? ( |
| 477 |
@@ -44,7 +44,7 @@ COMMON_DEPEND=" |
| 478 |
media-libs/glew:0 |
| 479 |
media-libs/libpng:0 |
| 480 |
virtual/opengl |
| 481 |
- qt5? ( >=dev-qt/qtwebsockets-5.4.1:5 ) |
| 482 |
+ qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) |
| 483 |
) |
| 484 |
" |
| 485 |
# libXi and libXmu are build-only-deps according to FindGLUT.cmake |
| 486 |
@@ -77,10 +77,10 @@ src_configure() { |
| 487 |
-DENABLE_FLITE=OFF |
| 488 |
-DENABLE_GDAL=$(usex gdal) |
| 489 |
-DENABLE_GPSSMOOTH=$(usex utils) |
| 490 |
+ -DENABLE_HID_INPUT=$(usex udev) |
| 491 |
-DENABLE_JS_DEMO=$(usex utils) |
| 492 |
-DENABLE_JSBSIM=ON |
| 493 |
-DENABLE_LARCSIM=ON |
| 494 |
- -DENABLE_LOGGING=$(usex test) |
| 495 |
-DENABLE_METAR=$(usex utils) |
| 496 |
-DENABLE_OPENMP=$(usex openmp) |
| 497 |
-DENABLE_PROFILE=OFF |
Archives