| 1 |
commit: cf47a4133927024cd913c2d1fbce221a07025c68 |
| 2 |
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 29 01:20:56 2018 +0000 |
| 4 |
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 29 01:24:07 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf47a413 |
| 7 |
|
| 8 |
games-simulation/flightgear: Restrict >=osg-3.5.6, bug 673822. Remove old. |
| 9 |
|
| 10 |
Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
games-simulation/flightgear/Manifest | 2 - |
| 14 |
.../files/flightgear-2018.2.1-cmake.patch | 11 -- |
| 15 |
.../flightgear/flightgear-2018.1.1.ebuild | 144 -------------------- |
| 16 |
.../flightgear/flightgear-2018.2.1.ebuild | 150 --------------------- |
| 17 |
.../flightgear/flightgear-2018.3.1.ebuild | 2 +- |
| 18 |
games-simulation/flightgear/flightgear-9999.ebuild | 2 +- |
| 19 |
6 files changed, 2 insertions(+), 309 deletions(-) |
| 20 |
|
| 21 |
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest |
| 22 |
index 5aa37127dd3..0d282499cf9 100644 |
| 23 |
--- a/games-simulation/flightgear/Manifest |
| 24 |
+++ b/games-simulation/flightgear/Manifest |
| 25 |
@@ -1,3 +1 @@ |
| 26 |
-DIST flightgear-2018.1.1.tar.bz2 8158999 BLAKE2B 5d7ca65c0b2627c7b34681e0af8e060f67cbed80d7e313c056fb92f026bc2355af66bbb6b377573db32f5101c63f1fa04521ba7fdffd584a56ae1049d1bcce83 SHA512 962be602a8c294081109ee1893383ac22dd83a0511fdb600d24d5dc9eca24d19687eaeed545695259502431e6d8c8bcdafe26846636ad40be28f5c2e4b0cfe93 |
| 27 |
-DIST flightgear-2018.2.1.tar.bz2 8344999 BLAKE2B fc5fbd43bcc2e40ed3245aa5059b0e5a40918a707cbddc8383de191e29f6cdfaa6960f6cfffb201b20ad10f5da0f343a693768d38be2788fd2582f7b5dc2419c SHA512 d308eebf6d6017794c086d534f6543c03a54e55bd7f48caf8359d5a84776406eac8cd8f32252efb2cd8bbb82c9c15fe4d7e3229ff2483e7a9772bd532331be03 |
| 28 |
DIST flightgear-2018.3.1.tar.bz2 8404294 BLAKE2B b90d64bc7381baef3adf3f2b77acb6822562d76319e85bebeda977754c281cd48b4ce137d910cc9f96947cfe1b7612c6ff45f2ed49775348b651944bb8796ba4 SHA512 ad07cdf90b1890519a22a1f79374b2d11e70191d85bc76d50913708a250801c3e091228999011367e374572a46c60f572f8b138d6a7c9fd2155f63107667d93c |
| 29 |
|
| 30 |
diff --git a/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch b/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch |
| 31 |
deleted file mode 100644 |
| 32 |
index eca04212833..00000000000 |
| 33 |
--- a/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,11 +0,0 @@ |
| 36 |
-diff -ruN flightgear-2018.2.1/CMakeLists.txt my/CMakeLists.txt |
| 37 |
---- flightgear-2018.2.1/CMakeLists.txt 2018-06-03 09:47:23.000000000 +0200 |
| 38 |
-+++ my/CMakeLists.txt 2018-06-07 01:09:14.621303443 +0200 |
| 39 |
-@@ -596,4 +596,6 @@ |
| 40 |
- |
| 41 |
- |
| 42 |
- # The test suite. |
| 43 |
--add_subdirectory(test_suite EXCLUDE_FROM_ALL) |
| 44 |
-+if(ENABLE_TESTS) |
| 45 |
-+ add_subdirectory(test_suite EXCLUDE_FROM_ALL) |
| 46 |
-+endif() |
| 47 |
|
| 48 |
diff --git a/games-simulation/flightgear/flightgear-2018.1.1.ebuild b/games-simulation/flightgear/flightgear-2018.1.1.ebuild |
| 49 |
deleted file mode 100644 |
| 50 |
index 596290c956b..00000000000 |
| 51 |
--- a/games-simulation/flightgear/flightgear-2018.1.1.ebuild |
| 52 |
+++ /dev/null |
| 53 |
@@ -1,144 +0,0 @@ |
| 54 |
-# Copyright 1999-2018 Gentoo Authors |
| 55 |
-# Distributed under the terms of the GNU General Public License v2 |
| 56 |
- |
| 57 |
-EAPI=6 |
| 58 |
- |
| 59 |
-inherit cmake-utils bash-completion-r1 toolchain-funcs |
| 60 |
- |
| 61 |
-DESCRIPTION="Open Source Flight Simulator" |
| 62 |
-HOMEPAGE="http://www.flightgear.org/" |
| 63 |
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2" |
| 64 |
- |
| 65 |
-LICENSE="GPL-2" |
| 66 |
-KEYWORDS="~amd64 ~x86" |
| 67 |
-SLOT="0" |
| 68 |
-IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax" |
| 69 |
- |
| 70 |
-# zlib is some strange auto-dep from simgear |
| 71 |
-COMMON_DEPEND=" |
| 72 |
- dev-db/sqlite:3 |
| 73 |
- >=dev-games/openscenegraph-3.2.0:=[jpeg,png] |
| 74 |
- ~dev-games/simgear-${PV}[gdal=] |
| 75 |
- media-libs/openal |
| 76 |
- >=media-libs/speex-1.2.0:0 |
| 77 |
- media-libs/speexdsp:0 |
| 78 |
- media-sound/gsm |
| 79 |
- sys-libs/zlib |
| 80 |
- virtual/glu |
| 81 |
- x11-libs/libX11 |
| 82 |
- dbus? ( >=sys-apps/dbus-1.6.18-r1 ) |
| 83 |
- gdal? ( >=sci-libs/gdal-2.0.0:0 ) |
| 84 |
- qt5? ( |
| 85 |
- >=dev-qt/qtcore-5.7.1:5 |
| 86 |
- >=dev-qt/qtdeclarative-5.7.1:5 |
| 87 |
- >=dev-qt/qtgui-5.7.1:5 |
| 88 |
- >=dev-qt/qtnetwork-5.7.1:5 |
| 89 |
- >=dev-qt/qtwidgets-5.7.1:5 |
| 90 |
- ) |
| 91 |
- udev? ( virtual/udev ) |
| 92 |
- utils? ( |
| 93 |
- media-libs/freeglut |
| 94 |
- media-libs/freetype:2 |
| 95 |
- media-libs/glew:0 |
| 96 |
- media-libs/libpng:0 |
| 97 |
- virtual/opengl |
| 98 |
- qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) |
| 99 |
- ) |
| 100 |
-" |
| 101 |
-# libXi and libXmu are build-only-deps according to FindGLUT.cmake |
| 102 |
-DEPEND="${COMMON_DEPEND} |
| 103 |
- >=dev-libs/boost-1.44 |
| 104 |
- >=media-libs/plib-1.8.5 |
| 105 |
- utils? ( |
| 106 |
- x11-libs/libXi |
| 107 |
- x11-libs/libXmu |
| 108 |
- ) |
| 109 |
-" |
| 110 |
-RDEPEND="${COMMON_DEPEND} |
| 111 |
- ~games-simulation/${PN}-data-${PV} |
| 112 |
-" |
| 113 |
- |
| 114 |
-DOCS=(AUTHORS ChangeLog NEWS README Thanks) |
| 115 |
- |
| 116 |
-pkg_pretend() { |
| 117 |
- use openmp && tc-check-openmp |
| 118 |
-} |
| 119 |
- |
| 120 |
-src_configure() { |
| 121 |
- local mycmakeargs=( |
| 122 |
- -DENABLE_DEMCONVERT=$(usex gdal && usex utils) |
| 123 |
- -DENABLE_FGCOM=$(usex utils) |
| 124 |
- -DENABLE_FGELEV=$(usex utils) |
| 125 |
- -DENABLE_FGJS=$(usex utils) |
| 126 |
- -DENABLE_FGQCANVAS=$(usex qt5 && usex utils) |
| 127 |
- -DENABLE_FGVIEWER=$(usex utils) |
| 128 |
- -DENABLE_FLITE=OFF |
| 129 |
- -DENABLE_GDAL=$(usex gdal) |
| 130 |
- -DENABLE_GPSSMOOTH=$(usex utils) |
| 131 |
- -DENABLE_HID_INPUT=$(usex udev) |
| 132 |
- -DENABLE_JS_DEMO=$(usex utils) |
| 133 |
- -DENABLE_JSBSIM=ON |
| 134 |
- -DENABLE_LARCSIM=ON |
| 135 |
- -DENABLE_METAR=$(usex utils) |
| 136 |
- -DENABLE_OPENMP=$(usex openmp) |
| 137 |
- -DENABLE_PROFILE=OFF |
| 138 |
- -DENABLE_QT=$(usex qt5) |
| 139 |
- -DENABLE_RTI=OFF |
| 140 |
- -DENABLE_TERRASYNC=$(usex utils) |
| 141 |
- -DENABLE_TESTS=$(usex test) |
| 142 |
- -DENABLE_TRAFFIC=$(usex utils) |
| 143 |
- -DENABLE_UIUC_MODEL=ON |
| 144 |
- -DENABLE_YASIM=ON |
| 145 |
- -DEVENT_INPUT=$(usex udev) |
| 146 |
- -DFG_BUILD_TYPE=Release |
| 147 |
- -DFG_DATA_DIR=/usr/share/${PN} |
| 148 |
- -DJSBSIM_TERRAIN=ON |
| 149 |
- -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear |
| 150 |
- -DSP_FDMS=ON |
| 151 |
- -DSYSTEM_FLITE=ON |
| 152 |
- -DSYSTEM_HTS_ENGINE=ON |
| 153 |
- -DSYSTEM_SPEEX=ON |
| 154 |
- -DSYSTEM_GSM=ON |
| 155 |
- -DSYSTEM_SQLITE=ON |
| 156 |
- -DUSE_AEONWAVE=OFF |
| 157 |
- -DUSE_DBUS=$(usex dbus) |
| 158 |
- -DWITH_FGPANEL=$(usex utils) |
| 159 |
- ) |
| 160 |
- |
| 161 |
- cmake-utils_src_configure |
| 162 |
-} |
| 163 |
- |
| 164 |
-src_install() { |
| 165 |
- cmake-utils_src_install |
| 166 |
- |
| 167 |
- # Install bash completion (TODO zsh) |
| 168 |
- # Uncomment below when scripts stops writing files... |
| 169 |
-# sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \ |
| 170 |
-# -i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT' |
| 171 |
-# newbashcomp scripts/completion/fg-completion.bash ${PN} |
| 172 |
- |
| 173 |
- # Install examples and other misc files |
| 174 |
- if use examples; then |
| 175 |
- insinto /usr/share/doc/"${PF}"/examples |
| 176 |
- doins -r scripts/java scripts/perl scripts/python |
| 177 |
- insinto /usr/share/doc/"${PF}"/examples/c++ |
| 178 |
- doins -r scripts/example/* |
| 179 |
- insinto /usr/share/doc/"${PF}"/tools |
| 180 |
- doins -r scripts/atis scripts/tools/* |
| 181 |
- fi |
| 182 |
- |
| 183 |
- # Install nasal script syntax |
| 184 |
- if use vim-syntax; then |
| 185 |
- insinto /usr/share/vim/vimfiles/syntax |
| 186 |
- doins scripts/syntax/{ac3d,nasal}.vim |
| 187 |
- insinto /usr/share/vim/vimfiles/ftdetect/ |
| 188 |
- doins "${FILESDIR}"/{ac3d,nasal}.vim |
| 189 |
- fi |
| 190 |
-} |
| 191 |
- |
| 192 |
-pkg_postinst() { |
| 193 |
- einfo "Please note that data files location changed to /usr/share/flightgear" |
| 194 |
- if use qt5; then |
| 195 |
- einfo "To use launcher, run fgfs with '--launcher' parameter" |
| 196 |
- fi |
| 197 |
-} |
| 198 |
|
| 199 |
diff --git a/games-simulation/flightgear/flightgear-2018.2.1.ebuild b/games-simulation/flightgear/flightgear-2018.2.1.ebuild |
| 200 |
deleted file mode 100644 |
| 201 |
index f9b21c91e09..00000000000 |
| 202 |
--- a/games-simulation/flightgear/flightgear-2018.2.1.ebuild |
| 203 |
+++ /dev/null |
| 204 |
@@ -1,150 +0,0 @@ |
| 205 |
-# Copyright 1999-2018 Gentoo Authors |
| 206 |
-# Distributed under the terms of the GNU General Public License v2 |
| 207 |
- |
| 208 |
-EAPI=6 |
| 209 |
- |
| 210 |
-inherit cmake-utils bash-completion-r1 toolchain-funcs |
| 211 |
- |
| 212 |
-DESCRIPTION="Open Source Flight Simulator" |
| 213 |
-HOMEPAGE="http://www.flightgear.org/" |
| 214 |
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2" |
| 215 |
- |
| 216 |
-LICENSE="GPL-2" |
| 217 |
-KEYWORDS="~amd64 ~x86" |
| 218 |
-SLOT="0" |
| 219 |
-IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax" |
| 220 |
- |
| 221 |
-# zlib is some strange auto-dep from simgear |
| 222 |
-COMMON_DEPEND=" |
| 223 |
- dev-db/sqlite:3 |
| 224 |
- >=dev-games/openscenegraph-3.2.0:=[jpeg,png] |
| 225 |
- ~dev-games/simgear-${PV}[gdal=] |
| 226 |
- media-libs/openal |
| 227 |
- >=media-libs/speex-1.2.0:0 |
| 228 |
- media-libs/speexdsp:0 |
| 229 |
- media-sound/gsm |
| 230 |
- sys-libs/zlib |
| 231 |
- virtual/glu |
| 232 |
- x11-libs/libX11 |
| 233 |
- dbus? ( >=sys-apps/dbus-1.6.18-r1 ) |
| 234 |
- gdal? ( >=sci-libs/gdal-2.0.0:0 ) |
| 235 |
- qt5? ( |
| 236 |
- >=dev-qt/qtcore-5.7.1:5 |
| 237 |
- >=dev-qt/qtdeclarative-5.7.1:5 |
| 238 |
- >=dev-qt/qtgui-5.7.1:5 |
| 239 |
- >=dev-qt/qtnetwork-5.7.1:5 |
| 240 |
- >=dev-qt/qtwidgets-5.7.1:5 |
| 241 |
- ) |
| 242 |
- udev? ( virtual/udev ) |
| 243 |
- utils? ( |
| 244 |
- media-libs/freeglut |
| 245 |
- media-libs/freetype:2 |
| 246 |
- media-libs/glew:0 |
| 247 |
- media-libs/libpng:0 |
| 248 |
- virtual/opengl |
| 249 |
- qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) |
| 250 |
- ) |
| 251 |
-" |
| 252 |
-# libXi and libXmu are build-only-deps according to FindGLUT.cmake |
| 253 |
-DEPEND="${COMMON_DEPEND} |
| 254 |
- >=dev-libs/boost-1.44 |
| 255 |
- >=media-libs/plib-1.8.5 |
| 256 |
- utils? ( |
| 257 |
- x11-libs/libXi |
| 258 |
- x11-libs/libXmu |
| 259 |
- ) |
| 260 |
- test? ( dev-util/cppunit ) |
| 261 |
-" |
| 262 |
-RDEPEND="${COMMON_DEPEND} |
| 263 |
- ~games-simulation/${PN}-data-${PV} |
| 264 |
-" |
| 265 |
- |
| 266 |
-PATCHES=("${FILESDIR}/${P}-cmake.patch") |
| 267 |
- |
| 268 |
-DOCS=(AUTHORS ChangeLog NEWS README Thanks) |
| 269 |
- |
| 270 |
-pkg_pretend() { |
| 271 |
- use openmp && tc-check-openmp |
| 272 |
-} |
| 273 |
- |
| 274 |
-src_configure() { |
| 275 |
- local mycmakeargs=( |
| 276 |
- -DENABLE_AUTOTESTING=OFF |
| 277 |
- -DENABLE_DEMCONVERT=$(usex gdal && usex utils) |
| 278 |
- -DENABLE_FGCOM=$(usex utils) |
| 279 |
- -DENABLE_FGELEV=$(usex utils) |
| 280 |
- -DENABLE_FGJS=$(usex utils) |
| 281 |
- -DENABLE_FGQCANVAS=$(usex qt5 && usex utils) |
| 282 |
- -DENABLE_FGVIEWER=$(usex utils) |
| 283 |
- -DENABLE_FLITE=OFF |
| 284 |
- -DENABLE_GDAL=$(usex gdal) |
| 285 |
- -DENABLE_GPSSMOOTH=$(usex utils) |
| 286 |
- -DENABLE_HID_INPUT=$(usex udev) |
| 287 |
- -DENABLE_JS_DEMO=$(usex utils) |
| 288 |
- -DENABLE_JSBSIM=ON |
| 289 |
- -DENABLE_LARCSIM=ON |
| 290 |
- -DENABLE_METAR=$(usex utils) |
| 291 |
- -DENABLE_OPENMP=$(usex openmp) |
| 292 |
- -DENABLE_PLIB_JOYSTICK=ON # NOTE look for defaults changes in CMake |
| 293 |
- -DENABLE_PROFILE=OFF |
| 294 |
- -DENABLE_QT=$(usex qt5) |
| 295 |
- -DENABLE_RTI=OFF |
| 296 |
- -DENABLE_TERRASYNC=$(usex utils) |
| 297 |
- -DENABLE_TESTS=$(usex test) |
| 298 |
- -DENABLE_TRAFFIC=$(usex utils) |
| 299 |
- -DENABLE_UIUC_MODEL=ON |
| 300 |
- -DENABLE_YASIM=ON |
| 301 |
- -DEVENT_INPUT=$(usex udev) |
| 302 |
- -DFG_BUILD_TYPE=Release |
| 303 |
- -DFG_DATA_DIR=/usr/share/${PN} |
| 304 |
- -DJSBSIM_TERRAIN=ON |
| 305 |
- -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear |
| 306 |
- -DSP_FDMS=ON |
| 307 |
- -DSYSTEM_CPPUNIT=ON |
| 308 |
- -DSYSTEM_FLITE=ON |
| 309 |
- -DSYSTEM_HTS_ENGINE=ON |
| 310 |
- -DSYSTEM_SPEEX=ON |
| 311 |
- -DSYSTEM_GSM=ON |
| 312 |
- -DSYSTEM_SQLITE=ON |
| 313 |
- -DUSE_AEONWAVE=OFF |
| 314 |
- -DUSE_DBUS=$(usex dbus) |
| 315 |
- -DWITH_FGPANEL=$(usex utils) |
| 316 |
- ) |
| 317 |
- |
| 318 |
- cmake-utils_src_configure |
| 319 |
-} |
| 320 |
- |
| 321 |
-src_install() { |
| 322 |
- cmake-utils_src_install |
| 323 |
- |
| 324 |
- # Install bash completion (TODO zsh) |
| 325 |
- # Uncomment below when scripts stops writing files... |
| 326 |
-# sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \ |
| 327 |
-# -i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT' |
| 328 |
-# newbashcomp scripts/completion/fg-completion.bash ${PN} |
| 329 |
- |
| 330 |
- # Install examples and other misc files |
| 331 |
- if use examples; then |
| 332 |
- insinto /usr/share/doc/"${PF}"/examples |
| 333 |
- doins -r scripts/java scripts/perl scripts/python |
| 334 |
- insinto /usr/share/doc/"${PF}"/examples/c++ |
| 335 |
- doins -r scripts/example/* |
| 336 |
- insinto /usr/share/doc/"${PF}"/tools |
| 337 |
- doins -r scripts/atis scripts/tools/* |
| 338 |
- fi |
| 339 |
- |
| 340 |
- # Install nasal script syntax |
| 341 |
- if use vim-syntax; then |
| 342 |
- insinto /usr/share/vim/vimfiles/syntax |
| 343 |
- doins scripts/syntax/{ac3d,nasal}.vim |
| 344 |
- insinto /usr/share/vim/vimfiles/ftdetect/ |
| 345 |
- doins "${FILESDIR}"/{ac3d,nasal}.vim |
| 346 |
- fi |
| 347 |
-} |
| 348 |
- |
| 349 |
-pkg_postinst() { |
| 350 |
- einfo "Please note that data files location changed to /usr/share/flightgear" |
| 351 |
- if use qt5; then |
| 352 |
- einfo "To use launcher, run fgfs with '--launcher' parameter" |
| 353 |
- fi |
| 354 |
-} |
| 355 |
|
| 356 |
diff --git a/games-simulation/flightgear/flightgear-2018.3.1.ebuild b/games-simulation/flightgear/flightgear-2018.3.1.ebuild |
| 357 |
index 4605cdbeecb..0a793b2009a 100644 |
| 358 |
--- a/games-simulation/flightgear/flightgear-2018.3.1.ebuild |
| 359 |
+++ b/games-simulation/flightgear/flightgear-2018.3.1.ebuild |
| 360 |
@@ -21,7 +21,7 @@ RESTRICT="test" |
| 361 |
# zlib is some strange auto-dep from simgear |
| 362 |
COMMON_DEPEND=" |
| 363 |
dev-db/sqlite:3 |
| 364 |
- >=dev-games/openscenegraph-3.2.0:=[jpeg,png] |
| 365 |
+ <dev-games/openscenegraph-3.5.6:=[jpeg,png] |
| 366 |
~dev-games/simgear-${PV}[gdal=] |
| 367 |
media-libs/openal |
| 368 |
>=media-libs/speex-1.2.0:0 |
| 369 |
|
| 370 |
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild |
| 371 |
index 2f9f42b418e..7dd168e9627 100644 |
| 372 |
--- a/games-simulation/flightgear/flightgear-9999.ebuild |
| 373 |
+++ b/games-simulation/flightgear/flightgear-9999.ebuild |
| 374 |
@@ -23,7 +23,7 @@ RESTRICT="test" |
| 375 |
# zlib is some strange auto-dep from simgear |
| 376 |
COMMON_DEPEND=" |
| 377 |
dev-db/sqlite:3 |
| 378 |
- >=dev-games/openscenegraph-3.2.0:=[jpeg,png] |
| 379 |
+ <dev-games/openscenegraph-3.5.6:=[jpeg,png] |
| 380 |
~dev-games/simgear-${PV}[gdal=] |
| 381 |
media-libs/openal |
| 382 |
>=media-libs/speex-1.2.0:0 |
Archives