* [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/, games-simulation/flightgear/, ...
@ 2022-05-13 19:48 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-05-13 19:48 UTC (permalink / raw
To: gentoo-commits
commit: 58936926ea438ec0f96f2800a91e149656575d99
Author: Michal Privoznik <mprivozn <AT> redhat <DOT> com>
AuthorDate: Wed Mar 23 04:31:29 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 13 19:36:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58936926
games-simulation/flightgear: version bump 2020.3.13
Signed-off-by: Michal Privoznik <mprivozn <AT> redhat.com>
Closes: https://github.com/gentoo/gentoo/pull/24720
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-games/simgear/Manifest | 1 +
dev-games/simgear/simgear-2020.3.13.ebuild | 68 +++++++++
games-simulation/flightgear-data/Manifest | 1 +
.../flightgear-data-2020.3.13.ebuild | 21 +++
games-simulation/flightgear/Manifest | 1 +
.../flightgear/flightgear-2020.3.13.ebuild | 167 +++++++++++++++++++++
6 files changed, 259 insertions(+)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index f1368969e3dd..922b810f5fd1 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1 +1,2 @@
DIST simgear-2020.3.12.tar.bz2 1415062 BLAKE2B bed00dabb8d2ac937cb2fa7a8782c32568dc106d857dd2e9a7f3d2c99ad1372ffcd3c571b899920122e711ce1e561a9895762fb199f1cac947bb68769066b555 SHA512 2292c5c43b485fdf4b814b25eae8caa2ed16e043a159328aa5e35a27f9a4fd250219e8b506da1361916bd1d314bb857d3bd1343b1b6b34890bf06c63705c8dbc
+DIST simgear-2020.3.13.tar.bz2 1415729 BLAKE2B ed8a5daddba84811318ed92acd6a998785c4159b7e9bf39245e3fc0863e75ae8475283e123c7b185cae8d1113b1fc860758f347f3e19c2749322b280445a2a9f SHA512 1128c6026cebc902f1d411a6013b3d406664ebae5b209248d15c55895823715066d18ca442af2642577d69c6f68d6d02daf64ebbc9bfe43142aae30b9ce1ae62
diff --git a/dev-games/simgear/simgear-2020.3.13.ebuild b/dev-games/simgear/simgear-2020.3.13.ebuild
new file mode 100644
index 000000000000..03d49387c0ed
--- /dev/null
+++ b/dev-games/simgear/simgear-2020.3.13.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Development library for simulation games"
+HOMEPAGE="https://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="cpu_flags_x86_sse2 +dns debug gdal openmp subversion test"
+RESTRICT="!test? ( test )"
+
+# TODO aeonwave
+COMMON_DEPEND="
+ app-arch/xz-utils
+ dev-libs/expat
+ dev-games/openscenegraph
+ media-libs/openal
+ net-misc/curl
+ sys-libs/zlib
+ virtual/opengl
+ dns? ( net-libs/udns )
+ gdal? ( sci-libs/gdal )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.44
+"
+RDEPEND="${COMMON_DEPEND}
+ subversion? ( dev-vcs/subversion )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
+ "${FILESDIR}/${PN}-2020.1.2-do-not-assume-libc++-clang.patch"
+)
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DNS=$(usex dns)
+ -DENABLE_GDAL=$(usex gdal)
+ -DENABLE_OPENMP=$(usex openmp)
+ -DENABLE_PKGUTIL=ON
+ -DENABLE_RTI=OFF
+ -DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
+ -DENABLE_SOUND=ON
+ -DENABLE_TESTS=$(usex test)
+ -DSIMGEAR_HEADLESS=OFF
+ -DSIMGEAR_SHARED=ON
+ -DSYSTEM_EXPAT=ON
+ -DSYSTEM_UDNS=ON
+ -DUSE_AEONWAVE=OFF
+ -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
+ )
+ cmake_src_configure
+}
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index dc86542310ac..55a83e4a3ae1 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1 +1,2 @@
DIST FlightGear-2020.3.12-data.txz 1787955196 BLAKE2B 648994bb8a70416d9fbf9fbb71c91d6652db4f915ce39938ad870f6de4a745c7f6df36025726fe29d67a598f1ce64718d12b7be5b81ebb83318246cd991fac1a SHA512 7bb97c0b2ee59b300a95f331bfd12e39aaaa7d3320e33cc4e72ea3c5fae196af52e97d9ed7f6af274162ecdd00642e729d96165df5dcbcb95e2853cf7c1df463
+DIST FlightGear-2020.3.13-data.txz 1789344308 BLAKE2B 869ee6fd1d8eb35d6ba4650ea4c1deeafd2e3cc79516711de607c97ade754fcd2a30649f547822778d0599975a71749afa1de5285377a2039c50bea05ef3bad6 SHA512 04a37a0936a8357356147621cff7be2998665356717df13057edb1c3b369c40a389a2fe1a0a35eb5a814b2205ac828bfba2d81a7b844ec1906046a944d65defd
diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild
new file mode 100644
index 000000000000..f6a2970e8ba8
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-2020.3.13.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="FlightGear data files"
+HOMEPAGE="https://www.flightgear.org/"
+SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.txz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/fgdata
+
+src_install() {
+ insinto /usr/share/flightgear
+ rm -fr .git
+ doins -r *
+}
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 50074be20454..63e6ad1110d2 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1,2 @@
DIST flightgear-2020.3.12.tar.bz2 8929319 BLAKE2B e84b0519d69f46d5951372deed59f9b1219739710b3374d0bc0041127f8e4b7869c43b20169a9ac3a89d4e121f9da27d01c6db98e683bc3f80da6b1930e1a7c0 SHA512 91e04ae6dc5d12e799bab10b3c4321e77f8d995469453453fdff26a9858f40056dbe8c095423397fcbef307994042c377eb37532af2732674f39e5624c950e9c
+DIST flightgear-2020.3.13.tar.bz2 8930824 BLAKE2B c859614b51d251ce4ac0b5a8a44e80602607902e0bcb00bb35d5b7c419fca9cdde70fccd3013fcced9ef42eafe21d64d91a33525afa0de41f2449d452a59ed82 SHA512 4623af52c0c1fd86ab2bf32bf95bc7be1bc4f867927b7f2ff1d453a4b6e5dbe4c4c094dd23050133e00b3d6b904f77fac396e0d093a99692d18c47823d637f7f
diff --git a/games-simulation/flightgear/flightgear-2020.3.13.ebuild b/games-simulation/flightgear/flightgear-2020.3.13.ebuild
new file mode 100644
index 000000000000..c052d32d8134
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2020.3.13.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="Open Source Flight Simulator"
+HOMEPAGE="https://www.flightgear.org/"
+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"
+
+# Needs --fg-root with path to flightgear-data passed to test runner passed,
+# not really worth patching
+RESTRICT="test"
+
+# zlib is some strange auto-dep from simgear
+COMMON_DEPEND="
+ dev-db/sqlite:3
+ dev-games/openscenegraph[jpeg,png]
+ ~dev-games/simgear-${PV}[gdal=]
+ media-libs/openal
+ >=media-libs/plib-1.8.5
+ >=media-libs/speex-1.2.0:0
+ media-libs/speexdsp:0
+ media-sound/gsm
+ sys-libs/zlib
+ virtual/glu
+ x11-libs/libX11
+ dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+ gdal? ( >=sci-libs/gdal-2.0.0:0 )
+ qt5? (
+ >=dev-qt/qtcore-5.7.1:5
+ >=dev-qt/qtdeclarative-5.7.1:5
+ >=dev-qt/qtgui-5.7.1:5
+ >=dev-qt/qtnetwork-5.7.1:5
+ >=dev-qt/qtwidgets-5.7.1:5
+ )
+ udev? ( virtual/udev )
+ utils? (
+ media-libs/freeglut
+ media-libs/freetype:2
+ media-libs/glew:0
+ media-libs/libpng:0
+ virtual/opengl
+ qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 )
+ )
+"
+# libXi and libXmu are build-only-deps according to FindGLUT.cmake
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.44
+ qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )
+ utils? (
+ x11-libs/libXi
+ x11-libs/libXmu
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ ~games-simulation/${PN}-data-${PV}
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2020.3.8-cmake.patch"
+)
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+pkg_pretend() {
+ use openmp && tc-check-openmp
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=OFF
+ -DENABLE_AUTOTESTING=OFF
+ -DENABLE_COMPOSITOR=OFF
+ -DENABLE_FGCOM=$(usex utils)
+ -DENABLE_FGELEV=$(usex utils)
+ -DENABLE_FGJS=$(usex utils)
+ -DENABLE_FGVIEWER=$(usex utils)
+ -DENABLE_GDAL=$(usex gdal)
+ -DENABLE_GPSSMOOTH=$(usex utils)
+ -DENABLE_HID_INPUT=$(usex udev)
+ -DENABLE_JS_DEMO=$(usex utils)
+ -DENABLE_JSBSIM=ON
+ -DENABLE_LARCSIM=ON
+ -DENABLE_METAR=$(usex utils)
+ -DENABLE_OPENMP=$(usex openmp)
+ -DENABLE_PLIB_JOYSTICK=ON # NOTE look for defaults changes in CMake
+ -DENABLE_PROFILE=OFF
+ -DENABLE_QT=$(usex qt5)
+ -DENABLE_RTI=OFF
+ -DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
+ -DENABLE_STGMERGE=ON
+ -DENABLE_SWIFT=OFF # swift pilot client not packaged yet
+ -DENABLE_TERRASYNC=$(usex utils)
+ -DENABLE_TRAFFIC=$(usex utils)
+ -DENABLE_UIUC_MODEL=ON
+ -DENABLE_YASIM=ON
+ -DEVENT_INPUT=$(usex udev)
+ -DFG_BUILD_TYPE=Release
+ -DFG_DATA_DIR=/usr/share/${PN}
+ -DJSBSIM_TERRAIN=ON
+ -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
+ -DSP_FDMS=ON
+ -DSYSTEM_CPPUNIT=OFF # NOTE we do not build tests anyway
+ -DSYSTEM_FLITE=OFF
+ -DSYSTEM_HTS_ENGINE=OFF
+ -DSYSTEM_SPEEX=ON
+ -DSYSTEM_GSM=ON
+ -DSYSTEM_SQLITE=ON
+ -DUSE_AEONWAVE=OFF
+ -DUSE_DBUS=$(usex dbus)
+ -DWITH_FGPANEL=$(usex utils)
+ )
+ if use gdal && use utils; then
+ mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
+ else
+ mycmakeargs+=(-DENABLE_DEMCONVERT=OFF)
+ fi
+ if use qt5 && use utils; then
+ mycmakeargs+=(-DENABLE_FGQCANVAS=ON)
+ else
+ mycmakeargs+=(-DENABLE_FGQCANVAS=OFF)
+ fi
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # Install bash completion (TODO zsh)
+ # Uncomment below when scripts stops writing files...
+# sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
+# -i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
+# newbashcomp scripts/completion/fg-completion.bash ${PN}
+
+ # Install examples and other misc files
+ if use examples; then
+ docompress -x /usr/share/doc/"${PF}"/{examples,tools}
+ docinto examples
+ dodoc -r scripts/java scripts/perl scripts/python
+ docinto examples/c++
+ dodoc -r scripts/example/*
+ docinto tools
+ dodoc -r scripts/atis scripts/tools/*
+ 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
+}
+
+pkg_postinst() {
+ if use qt5; then
+ einfo "To use launcher, run fgfs with '--launcher' parameter"
+ fi
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/, games-simulation/flightgear/, ...
@ 2022-12-10 20:31 Maciej Mrozowski
0 siblings, 0 replies; 2+ messages in thread
From: Maciej Mrozowski @ 2022-12-10 20:31 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-10 20:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-13 19:48 [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear-data/, games-simulation/flightgear/, Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-12-10 20:31 Maciej Mrozowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox