gentoo resync : 25.09.2021

6 files changed, 18 insertions, 4 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 5ce2585a9340..53f5c92c5b64 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 1f79713fc7d2..c7103b81ea91 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,4 +1,4 @@
-DIST FlightGear-2020.3.8-data.txz 1826816084 BLAKE2B 23ca8cc89662d120b21ac68f7d41fe47b1d17bfe3d23579e3a4ce44136e170682939002a5fe03223e9c92329ec737f0dd9e9f9d5d44604f4ff3ade8d957e5c17 SHA512 76f71873d9c017ef53cf8145886ae00163f95769dfe5b69a85d7a3f104358c3c96bd1e958762201716359097976a77a35b204eb0c78526bea3c50d85216b19bc
-EBUILD flightgear-data-2020.3.8.ebuild 409 BLAKE2B f818a83911a28b22811e65c4eb154ce1a23056a2c5a226954c461c0041df94fde90ccde3f8f0b3872b47c624943f071cb70c7534a689a68a036c2d7edd944e4c SHA512 4ae3615be1a1e0c96c27b6853f81315286295371f2481487b6aa42853cc573ebe71105832a322c8e70b90b56105aebbf6393a6e324a9c6777fab027538278128
+DIST FlightGear-2020.3.11-data.txz 1736954520 BLAKE2B d5f3fd8facc93fab140171fad04ee0c331c4ab35c893ee762bb0b6250ee632c820e7570de57d2dfd6348fb9aaefdba209e845d00f67737b24eff17b025b30aa4 SHA512 b46193d4e9138ec58da048d9c3a36d47ae7204673fb9524f23b3d52dab02db8ef52fe8d67b7fd648222aac8585dd7e2fa5484317fdd07e07a58f3816f1378702
+EBUILD flightgear-data-2020.3.11.ebuild 409 BLAKE2B f818a83911a28b22811e65c4eb154ce1a23056a2c5a226954c461c0041df94fde90ccde3f8f0b3872b47c624943f071cb70c7534a689a68a036c2d7edd944e4c SHA512 4ae3615be1a1e0c96c27b6853f81315286295371f2481487b6aa42853cc573ebe71105832a322c8e70b90b56105aebbf6393a6e324a9c6777fab027538278128
 EBUILD flightgear-data-9999.ebuild 441 BLAKE2B abb508976894bf77fe2fa60c817920481a5dc0487a1379e71ff3104b9ca8cbe19953adc5f4a14ff5a74a0e6900fea89741b446137664104daf8eb119508225da SHA512 f0c40c5eff961a0d8680cf844a1fae4eff777469ae0fbbf9aed6ff088db1ae85a95b6494c7d06539b697d317a4567c534fd8bbe2173f6516e7747d58baded284
 MISC metadata.xml 446 BLAKE2B 47c1c761df5dc2bbbf1972f9541aae416b6758b520f429309fd81e91bc332d78e497c9e6b2504c979fbf6a79287452ba86f060746c57436ec22bba65f177f283 SHA512 f1dc6aa3888410f471884143f136178c890a7bf31c67d61ab049587dca205b966a21a57c670d4c047703264f470955899ccc5f42d8cde5412be8bfc6f52abcaa
diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.8.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.3.11.ebuild
index f6a2970e8ba8..f6a2970e8ba8 100644
--- a/games-simulation/flightgear-data/flightgear-data-2020.3.8.ebuild
+++ b/games-simulation/flightgear-data/flightgear-data-2020.3.11.ebuild
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index d221b2ab4e5c..5ce1aafd07df 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,7 +1,8 @@
 AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2dd7aae8f23f1cd853d29d071a0b9691cf5b8e8b262355b40752f43bccaa318065992d709b SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da
+AUX flightgear-2020.3.11-fix-assert.patch 490 BLAKE2B 4bfeaa11b36568080a0e68787899eeb7e9f9737c8fd15beb5e3346a9bddf04d0d92d00722986eff791fd485de577c15efadd390814851299e7c410e9ab1cfad9 SHA512 595f63fd7ccaab8ea38ce0367f2cbde765154ef0ae1d104f439d15eb5e1ec49480ea48c469f194ae0e3d156ebf6a1d976f0f2b581d218f95870aacad5750ac09
 AUX flightgear-2020.3.8-cmake.patch 2050 BLAKE2B 8fa39bd0041556620f79088b6f9ff29eec4b445911f664ac1d3b4a71af479292538d0c44d55b71fa1fbb87771ad9d4917b8c874d5270f716ac63406ec62098aa SHA512 5c1c744c135f422786cab37c0425a143b5e5f078442a051122586fd9fe299bdc953cc6cf9c9c7ab9fb1e5731f3e1f1dac33653e132b95d5ef390a6bc06a1ed2a
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
-DIST flightgear-2020.3.8.tar.bz2 8922064 BLAKE2B b345e8a5e733d48c1e061feb11ed96f130ab2d4832c478e9251092862668007eb7e39b29720c7274b91d63eff34cb21597fa6384b6837a5949feeceb6db62331 SHA512 b2c5afeae65558bf086ce20b22a2802580b3ac177f049a8df3b70437adbc6fee067673372c19c14a1c10ffac81a4a77fb13c68d342094a84605190fd3f5442e9
-EBUILD flightgear-2020.3.8.ebuild 4298 BLAKE2B dc64fda8fc58eb226d3c7e61c3db1dbca204fda72c133e6ce8ec94b46cd87782df0b576c08f8706c144019af1dab58f59a6763219780eabe0c099d5b0fe5469f SHA512 f63f1bb890db65fc9df7461634f9ae395dadd5d14ece5569e6f87a3aa0c252e634c7ab890a12eb21efa5ba44fb5fcb59412454c89ccdc07d51a3f42d627d9e17
+DIST flightgear-2020.3.11.tar.bz2 8926212 BLAKE2B 03b3203fb688fe842247f8ac11957f438f02154cbc992bb98076ab3dd6fcac5f3241509cc1c621f3b647487b772257763d154c756792ce8ff738ff5396fe07ef SHA512 9a7c6f262da8daf3d954df7a2a8a96e555f3212c1d949211d0dbddd08a8f7380fa8f4986d60f48e17db563154d250184ee772b79b10277a2c5819fabec3930ee
+EBUILD flightgear-2020.3.11.ebuild 4346 BLAKE2B dd769930c84e0703121e0b339f854201b416056339185cf8728324da3543012a56f2ae7ba5c8e26b481fa82dd541848981cdb2bdd55497c94133efdb723d05bb SHA512 871064ed22a065a10157819d1c96b9c9bbc1cb59f2bd8ae8e9c421d9aaf37c27efd66e6789ca2ddd25eee791ff929c8a234c4e667f3bc3a1cfff429850154da6
 EBUILD flightgear-9999.ebuild 4348 BLAKE2B 612e0e71deb278b5ccdcff04a815a8fb0813ee0680e76234bec5d55bb1c4368c24fc825a4775f6073423ba66ef02534200ef9d38ed5c24f64e211d8846e414b7 SHA512 ff32d8cf76d6f719b7469919cf3c441653208903b26557e6609871596e45429c4d3a15acd0a720a67e63f80df3bde198d56bc282a3a43a5ae800c72ed7f37f74
 MISC metadata.xml 868 BLAKE2B 304c520696a5a370762f5748b0e90282e7faed02afd2771805f4e842c10e26e7979456e7141caa407edbeead252c3fc959c50aaebe82bdad65d1509b447f7dea SHA512 56373af9228b7943e6be81ca73b1660a4818aaf800f9d3ad02cafe85bdd8e02f3f939a7d5f397396d78f1fe1207f05cdce70da883613c546040e5a7921e2548f
diff --git a/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch b/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch
new file mode 100644
index 000000000000..f35cf2c426a4
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch
@@ -0,0 +1,12 @@
+diff -ruN flightgear-2020.3.11/src/Navaids/PositionedOctree.cxx fgfs-my/src/Navaids/PositionedOctree.cxx
+--- flightgear-2020.3.11/src/Navaids/PositionedOctree.cxx	2021-07-29 11:35:40.000000000 +0200
++++ fgfs-my/src/Navaids/PositionedOctree.cxx	2021-09-16 23:01:20.989931176 +0200
+@@ -148,7 +148,7 @@
+ 
+ void Leaf::insertChild(FGPositioned::Type ty, PositionedID id)
+ {
+-  assert(childrenLoaded);
++  assert(_childrenLoaded);
+   children.insert(children.end(), TypedPositioned(ty, id));
+ }
+ 
diff --git a/games-simulation/flightgear/flightgear-2020.3.8.ebuild b/games-simulation/flightgear/flightgear-2020.3.11.ebuild
index d985a68664d6..63fa5defb424 100644
--- a/games-simulation/flightgear/flightgear-2020.3.8.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.11.ebuild
@@ -65,6 +65,7 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2020.3.8-cmake.patch"
+	"${FILESDIR}/${PN}-2020.3.11-fix-assert.patch"
 )
 
 DOCS=(AUTHORS ChangeLog NEWS README Thanks)