commit: 211b81b4a7327a203d8374bbc3619c2607905fa7 Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> AuthorDate: Sat Dec 10 17:52:35 2022 +0000 Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> CommitDate: Sat Dec 10 20:30:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=211b81b4
games-simulation/flightgear: version bump, remove old, remove unnecessary USE flag, compilation of libiaxclient (for fgcom) should be conditional, fixes bug 855542 Bug: https://bugs.gentoo.org/855542 Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org> dev-games/simgear/Manifest | 2 +- ...{simgear-2020.3.13.ebuild => simgear-2020.3.17.ebuild} | 0 games-simulation/flightgear-data/Manifest | 2 +- ...-2020.3.13.ebuild => flightgear-data-2020.3.17.ebuild} | 0 games-simulation/flightgear/Manifest | 2 +- ...tgear-2020.3.13.ebuild => flightgear-2020.3.17.ebuild} | 15 +++++++-------- games-simulation/flightgear/flightgear-9999.ebuild | 15 +++++++-------- 7 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest index 18ba3e11e241..5d85924f4846 100644 --- a/dev-games/simgear/Manifest +++ b/dev-games/simgear/Manifest @@ -1 +1 @@ -DIST simgear-2020.3.13.tar.bz2 1415729 BLAKE2B ed8a5daddba84811318ed92acd6a998785c4159b7e9bf39245e3fc0863e75ae8475283e123c7b185cae8d1113b1fc860758f347f3e19c2749322b280445a2a9f SHA512 1128c6026cebc902f1d411a6013b3d406664ebae5b209248d15c55895823715066d18ca442af2642577d69c6f68d6d02daf64ebbc9bfe43142aae30b9ce1ae62 +DIST simgear-2020.3.17.tar.bz2 1418448 BLAKE2B d3541c31fcf8571ba73d7fe3952c6d30146f33ffe776962670f9607d5d8e02dc24095e35933887aed3b1dcddb4d6b94e19e5317364f651d69d787afde45a30a5 SHA512 019ea59af6679c4a899a044c38f60c21c15469528d1bab8b0d4388810b045af7812c3c561eee7190a5464adae0c14d16d528f08c69b37291d4e1b35665cbefce diff --git a/dev-games/simgear/simgear-2020.3.13.ebuild b/dev-games/simgear/simgear-2020.3.17.ebuild similarity index 100% rename from dev-games/simgear/simgear-2020.3.13.ebuild rename to dev-games/simgear/simgear-2020.3.17.ebuild diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest index eed50f9ba949..0dbe1ca1f82b 100644 --- a/games-simulation/flightgear-data/Manifest +++ b/games-simulation/flightgear-data/Manifest @@ -1 +1 @@ -DIST FlightGear-2020.3.13-data.txz 1789344308 BLAKE2B 869ee6fd1d8eb35d6ba4650ea4c1deeafd2e3cc79516711de607c97ade754fcd2a30649f547822778d0599975a71749afa1de5285377a2039c50bea05ef3bad6 SHA512 04a37a0936a8357356147621cff7be2998665356717df13057edb1c3b369c40a389a2fe1a0a35eb5a814b2205ac828bfba2d81a7b844ec1906046a944d65defd +DIST FlightGear-2020.3.17-data.txz 1789324280 BLAKE2B abb1384be2922a80a4abf1c5a540e160c94e74c63ec1ce337f2be253a49c54ee499b9cea752bead41ee4ff1a235b7f78c9143579b602b4a911f46bdb7766e15c SHA512 b15a8ae46709594d9aca5442c51b0cf5b2a804f5b39135bfa9c413ce4aca74db1955a399eb93abf38f1e265199e09ac0ecf05e518a23eeb35aeaa5cbc09277a0 diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.3.17.ebuild similarity index 100% rename from games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild rename to games-simulation/flightgear-data/flightgear-data-2020.3.17.ebuild diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest index 14563fdf8a8c..229eec39eb6a 100644 --- a/games-simulation/flightgear/Manifest +++ b/games-simulation/flightgear/Manifest @@ -1 +1 @@ -DIST flightgear-2020.3.13.tar.bz2 8930824 BLAKE2B c859614b51d251ce4ac0b5a8a44e80602607902e0bcb00bb35d5b7c419fca9cdde70fccd3013fcced9ef42eafe21d64d91a33525afa0de41f2449d452a59ed82 SHA512 4623af52c0c1fd86ab2bf32bf95bc7be1bc4f867927b7f2ff1d453a4b6e5dbe4c4c094dd23050133e00b3d6b904f77fac396e0d093a99692d18c47823d637f7f +DIST flightgear-2020.3.17.tar.bz2 8934871 BLAKE2B e9cb4a18c119c813531af3d47f6378b0b8cb68a2b33453fedc0c5c1c68160b3d887eb497955118bb99b7297ed72714ee2ecc1c956599d1dbf0e8ca864eedefe0 SHA512 f083f91094b01ee78ad06c24a3ff784d119f27aebdf41d0a0f2ce41948acc3dc9b337ddce7aab3731eb3b2d7ae5fc6244505b019b6d49a8df61297453c291430 diff --git a/games-simulation/flightgear/flightgear-2020.3.13.ebuild b/games-simulation/flightgear/flightgear-2020.3.17.ebuild similarity index 93% rename from games-simulation/flightgear/flightgear-2020.3.13.ebuild rename to games-simulation/flightgear/flightgear-2020.3.17.ebuild index 49a222d30548..52f9aeb065dc 100644 --- a/games-simulation/flightgear/flightgear-2020.3.13.ebuild +++ b/games-simulation/flightgear/flightgear-2020.3.17.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake bash-completion-r1 toolchain-funcs +inherit cmake toolchain-funcs DESCRIPTION="Open Source Flight Simulator" HOMEPAGE="https://www.flightgear.org/"; @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2" LICENSE="GPL-2" KEYWORDS="~amd64 ~x86" SLOT="0" -IUSE="cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils vim-syntax" +IUSE="cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils" # Needs --fg-root with path to flightgear-data passed to test runner passed, # not really worth patching @@ -89,6 +89,7 @@ src_configure() { -DENABLE_GDAL=$(usex gdal) -DENABLE_GPSSMOOTH=$(usex utils) -DENABLE_HID_INPUT=$(usex udev) + -DENABLE_IAX=$(usex utils) -DENABLE_JS_DEMO=$(usex utils) -DENABLE_JSBSIM=ON -DENABLE_LARCSIM=ON @@ -156,12 +157,10 @@ src_install() { fi # Install nasal script syntax - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins scripts/syntax/{ac3d,nasal}.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - doins "${FILESDIR}"/{ac3d,nasal}.vim - fi + insinto /usr/share/vim/vimfiles/syntax + doins scripts/syntax/{ac3d,nasal}.vim + insinto /usr/share/vim/vimfiles/ftdetect/ + doins "${FILESDIR}"/{ac3d,nasal}.vim } pkg_postinst() { diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild index 19115fd74b49..6ca93526d600 100644 --- a/games-simulation/flightgear/flightgear-9999.ebuild +++ b/games-simulation/flightgear/flightgear-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake bash-completion-r1 toolchain-funcs git-r3 +inherit cmake toolchain-funcs git-r3 DESCRIPTION="Open Source Flight Simulator" HOMEPAGE="https://www.flightgear.org/"; @@ -14,7 +14,7 @@ EGIT_BRANCH="next" LICENSE="GPL-2" KEYWORDS="" SLOT="0" -IUSE="cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils vim-syntax" +IUSE="cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils" # Needs --fg-root with path to flightgear-data passed to test runner passed, # not really worth patching @@ -91,6 +91,7 @@ src_configure() { -DENABLE_GDAL=$(usex gdal) -DENABLE_GPSSMOOTH=$(usex utils) -DENABLE_HID_INPUT=$(usex udev) + -DENABLE_IAX=$(usex utils) -DENABLE_JS_DEMO=$(usex utils) -DENABLE_JSBSIM=ON -DENABLE_LARCSIM=ON @@ -158,12 +159,10 @@ src_install() { fi # Install nasal script syntax - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins scripts/syntax/{ac3d,nasal}.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - doins "${FILESDIR}"/{ac3d,nasal}.vim - fi + insinto /usr/share/vim/vimfiles/syntax + doins scripts/syntax/{ac3d,nasal}.vim + insinto /usr/share/vim/vimfiles/ftdetect/ + doins "${FILESDIR}"/{ac3d,nasal}.vim } pkg_postinst() {
