gentoo resync : 29.12.2022

4 files changed, 191 insertions, 10 deletions

diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 1032673ca064..5706c3eac321 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -2,6 +2,8 @@ AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2d
 AUX flightgear-2020.3.8-cmake.patch 2050 BLAKE2B 8fa39bd0041556620f79088b6f9ff29eec4b445911f664ac1d3b4a71af479292538d0c44d55b71fa1fbb87771ad9d4917b8c874d5270f716ac63406ec62098aa SHA512 5c1c744c135f422786cab37c0425a143b5e5f078442a051122586fd9fe299bdc953cc6cf9c9c7ab9fb1e5731f3e1f1dac33653e132b95d5ef390a6bc06a1ed2a
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
 DIST flightgear-2020.3.12.tar.bz2 8929319 BLAKE2B e84b0519d69f46d5951372deed59f9b1219739710b3374d0bc0041127f8e4b7869c43b20169a9ac3a89d4e121f9da27d01c6db98e683bc3f80da6b1930e1a7c0 SHA512 91e04ae6dc5d12e799bab10b3c4321e77f8d995469453453fdff26a9858f40056dbe8c095423397fcbef307994042c377eb37532af2732674f39e5624c950e9c
-EBUILD flightgear-2020.3.12.ebuild 4298 BLAKE2B 971ff3d8fe90368bc9f4280087937930749adeab00610626c7283823eeffc9682324f2704960e428d49e248f638da04a03d5c8a0256d07f18a67b165d76f2730 SHA512 e05b7835a46c0e837572ae00eb0b990c2998eb869ef19669dbaca646143603f9a8ba935c3cb5caf73a31e9c1452a83027e4c46ea0db05319bb23195ee564c814
-EBUILD flightgear-9999.ebuild 4348 BLAKE2B 0f084f038d9b973fc9fa1fb652e1388d31ecfdc9740e9b6ce83aeca262809fa7c8acbe1fff7a16fb08cfd77fc4d46249b01efcc6ad21e27d6692b385bcdd786c SHA512 764f056eb4935d2562df4dab29d393aed0884f3568c414ed36e55ab647747c039151a5d9353747cd1aa4e86479df9097e9a4ffbf698fa63a53adcced270139b5
+DIST flightgear-2020.3.13.tar.bz2 8930824 BLAKE2B c859614b51d251ce4ac0b5a8a44e80602607902e0bcb00bb35d5b7c419fca9cdde70fccd3013fcced9ef42eafe21d64d91a33525afa0de41f2449d452a59ed82 SHA512 4623af52c0c1fd86ab2bf32bf95bc7be1bc4f867927b7f2ff1d453a4b6e5dbe4c4c094dd23050133e00b3d6b904f77fac396e0d093a99692d18c47823d637f7f
+EBUILD flightgear-2020.3.12.ebuild 4414 BLAKE2B 59bfcae4d1fe678bef067b177987fa78fd780f8b0940d594fee7a508e8de3b800ce19c98cb05cc396529734cabfaf927fd100a38f151325d98f4ff2ae997d520 SHA512 57bb5e467adcd9dbc54df879e33360cb95196ec6dba23bb3d84b261b2c4de3b70b92bed5b232f199586cddecfcf2a9107f1ab12097f1538cf9fba3f86fc09d43
+EBUILD flightgear-2020.3.13.ebuild 4335 BLAKE2B fe91127866cc3adcf29f8c025ba045a8ac364d15a5914f2952311eb7ee914d0b49ae7d93fbcd747f46938667a0786c6d2ca7b2cf7873274433d52efc473cf53a SHA512 37b1843d7b75b63187206c484d6bd81d09369f564c19b512ff9c7b2fb10834dd535a798a5de8e8eb952bf3fc4fe138129102047d3c8601605e0c49c76779bb3b
+EBUILD flightgear-9999.ebuild 4464 BLAKE2B c47c90f174adf357453b0b0714f5093ed9b1f97d1ac0fab3984134495ad49764b1df0eb3c3ca2371a7a99a1c0a77aefcf02f4687893d85631f94139b5e14ad38 SHA512 6e0d779e75c0809f359f19f0abe133fc7e6e890ece6b3c25078f85bcb6744ce38e879ba17cf0b7cda007c69ec7e69ab621b8ead7de7f314d785be4758ef88f2e
 MISC metadata.xml 868 BLAKE2B 304c520696a5a370762f5748b0e90282e7faed02afd2771805f4e842c10e26e7979456e7141caa407edbeead252c3fc959c50aaebe82bdad65d1509b447f7dea SHA512 56373af9228b7943e6be81ca73b1660a4818aaf800f9d3ad02cafe85bdd8e02f3f939a7d5f397396d78f1fe1207f05cdce70da883613c546040e5a7921e2548f
diff --git a/games-simulation/flightgear/flightgear-2020.3.12.ebuild b/games-simulation/flightgear/flightgear-2020.3.12.ebuild
index baafbbda8846..749751eb1080 100644
--- a/games-simulation/flightgear/flightgear-2020.3.12.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -52,8 +52,7 @@ COMMON_DEPEND="
 "
 # 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 )
+	dev-libs/boost
 	utils? (
 		x11-libs/libXi
 		x11-libs/libXmu
@@ -62,6 +61,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	~games-simulation/${PN}-data-${PV}
 "
+BDEPEND="qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2020.3.8-cmake.patch"
@@ -70,7 +70,11 @@ PATCHES=(
 DOCS=(AUTHORS ChangeLog NEWS README Thanks)
 
 pkg_pretend() {
-	use openmp && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_configure() {
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..49a222d30548
--- /dev/null
+++ b/games-simulation/flightgear/flightgear-2020.3.13.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2022 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
+	utils? (
+		x11-libs/libXi
+		x11-libs/libXmu
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	~games-simulation/${PN}-data-${PV}
+"
+BDEPEND="qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2020.3.8-cmake.patch"
+)
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && 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
+}
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index f48409f1c9d4..19115fd74b49 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -54,8 +54,7 @@ COMMON_DEPEND="
 "
 # 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 )
+	dev-libs/boost
 	utils? (
 		x11-libs/libXi
 		x11-libs/libXmu
@@ -64,6 +63,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	~games-simulation/${PN}-data-${PV}
 "
+BDEPEND="qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2020.3.5-cmake.patch"
@@ -72,7 +72,11 @@ PATCHES=(
 DOCS=(AUTHORS ChangeLog NEWS README Thanks)
 
 pkg_pretend() {
-	use openmp && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_configure() {