gentoo resync : 10.02.2020

8 files changed, 21 insertions, 16 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index bbdcf966ed46..ee7052d9b1cc 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/crrcsim/Manifest b/games-simulation/crrcsim/Manifest
index 8402d7d24450..282b1b8717df 100644
--- a/games-simulation/crrcsim/Manifest
+++ b/games-simulation/crrcsim/Manifest
@@ -2,5 +2,5 @@ AUX crrcsim-0.9.13-buildsystem.patch 2183 BLAKE2B 2f1fb768f93e7d3db1fbd7a2a30c82
 AUX crrcsim-0.9.13-gcc6.patch 461 BLAKE2B 7e2016db5781e0158e27d999fb1d88d07dc6294740466c736a2e42eb46547fdb35ac112b6c8e93a5571103d28d6037a6acdb2be752bfb2650cc349538e72c3f4 SHA512 34bda65c0791622adb8436d08b60e6a877c2a3bbb12f93379686c39c2c572364c0fa265011bbc788229fa2ddaa3bfa3be8397d2ff98ea967f423fa3cd48465e9
 AUX crrcsim-cgal_gmp.patch 352 BLAKE2B 1a9cf7250753c1a0099dd07b5020b7c5af89dffa8387d68f71c51e21a7803ecb2395144de65915ce84cf077b522fecc5790d26190abf9673fef687d1e16f0d6b SHA512 1b8302f71e220df54b73819988f866a7e35ec6b11d271a6a57ad886372fba4eb1a02367ab9942030baf04fbeb5fa093d23e38de2614c39c2c75e76795ec69274
 DIST crrcsim-0.9.13.tar.gz 8337392 BLAKE2B ccaaf3a4255b2082fc52712d49302c7de1347b87e9489c6d859662365f1cd5af538fe76cee232aed61b0c1b68138c47a2e34e128071c3e098e20f1d51c1c409c SHA512 b687837e07abc07606404d920288984abe7e304afb69158fd840d83bcfe1e9acc4afd8462c0c759df67d50a15ca3753eaf48c4526b201e64a2d641fa3aa8c1ab
-EBUILD crrcsim-0.9.13.ebuild 1209 BLAKE2B 909e462a8c52b7039ca8ce5a0d3aca5aa52bb21e2dca7893ee5d17f08627b444f76c13c1b8fe6ebe5e91ad3c193aa353bfbff241821dffe038eca498446a836a SHA512 cf82ae112798b1b6002adbcd379ce4288acedfed5bdd1d560b983193d876eb2afd3274437d8aff6dcaa7b544c4111708fb698c9d7109cec02c909f34e11e0f60
+EBUILD crrcsim-0.9.13.ebuild 1205 BLAKE2B 085c079e3a71f53cdfc8d89f9257cc1f5a65a4b0792141ba2e76f41a7fd511a6557c17951e655d5e747991e7d8bc8b87644b9f1f4a423117ca7600ac68c29667 SHA512 c3842dd67323d227561bc41f1db058d4237e6b7e0d218d4e8f534431ce2a9111dcb9bfcb785697aa76deca1e80d6c9d3e48a8d2ef2f2cdeb1f762e47ed3960a3
 MISC metadata.xml 330 BLAKE2B 24c61e826448ee0ceecc562776289a0a80c259c718cce5dc0f23523b5091a329933eb6a98c46ecd038b856db3f1d86588d82d62924b5d40dd0ee64c569c1e9ff SHA512 a57fe17fafb1d4cca975665b68283233a1f6b62e25bf903cd5ef7954572f3963471d453da9c569044405ab005105f6d35ae28b679d35eebd01ba61d0166349c8
diff --git a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
index 4d20e437844b..2345ffb53a16 100644
--- a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
+++ b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
@@ -37,8 +37,8 @@ src_prepare() {
 src_configure() {
 	econf \
 		--datadir="/usr/share" \
-		--datarootdir="${EPREFIX%/}/usr/share" \
-		--docdir="${EPREFIX%/}/usr/share/doc/${PF}" \
+		--datarootdir="${EPREFIX}/usr/share" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_with portaudio)
 }
 
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 632da9cbf15a..f38bed658847 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -2,6 +2,6 @@ AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2d
 AUX flightgear-2018.3.2-cmake.patch 1322 BLAKE2B 4b68e744cf0cd7ea9582025980d055f8def5d5d1c82cabf133d4d1f9e35d501e28fdba1fca51ed409caa6398043fa52a82f68f77ce8f34a3f0a3ce45fa526352 SHA512 5ae183a04df6f12e23e87649210249a0857d5915aba40198507d2e45ee6fba6b997575df40457cb8e214b9fe9f4b81f4bec8fadb3875f1bbebf0c3181ba4fce3
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
 DIST flightgear-2019.1.1.tar.bz2 8440986 BLAKE2B da387456aaa6e8b86a8a865989f40c6bbcef4bf378175628c26fb172161cc3b278e4b16a3a270b7ed7fcf70329a88754c9a875a14f919fa90f284a485c909cce SHA512 edcc464af0bde4766e61137211276d77a6bb297567b0168dfaf3b97fdb9a595e5e8a0b84232680fcc975cf195261b9751edb79ae73123333feb31ab3d7215d8c
-EBUILD flightgear-2019.1.1.ebuild 4327 BLAKE2B 71b5479c5f2d082e765e9ec235e11c16c501430d6ae87f5b573fc94fc53e86067a80671f03b062f4823dfd961fb674199d2afa1a0195bf0d09a05c6bd95094a9 SHA512 5c02a2cdf92c826d55882983c863c0bcc623b333fd2d9235aa99a9ded4404ea9efdf9f4d6a53e0ef8c0301c6471124451494db2a91a20eb879b4c4fb7d7637ba
-EBUILD flightgear-9999.ebuild 4358 BLAKE2B 99e4fc1717e36ff393fb23de058daeca6b1837b224daea3cd0e2515b9d16f305e262e64ab4ff30ec6d88c6eed5d1c047e6be460f01eb9aef951f96aaea03411c SHA512 c443982a2dc2b33a4b3db3976ca2c6bb997fef4c0b51c290f6438a8a0a64bbd1064992a8766a13a23647395d76fbf99d01cd92599a19c5190e2628dfb83bf085
+EBUILD flightgear-2019.1.1.ebuild 4373 BLAKE2B afea502ee7e1ebc2dda52a53a89b66d5fe4db011d711cb9c4582fa2addc7cbb0c057f73c522708f2cf6fd11ffedc1e42e676e26c595bb52c0c1d43d9eb01c4fb SHA512 ca8d29f60f4a54085f1997ec5824f4bfb87537a390f1d4bcad66275a01a7f400675163059d91026450e80d92398dfa84005242db1a010bac31e67d429d13e9c9
+EBUILD flightgear-9999.ebuild 4404 BLAKE2B ffb54ae7eabdd3a14856a3fe990efe3413a3f095389f2bb4d711ddf931e44d66e50382e46e14f598b5889f94cb2724c87963bf45b4353f8f462bb59533e80f4b SHA512 a7bfc2131c1ba2de71ccaf3b9336d03ed33018e2724e0db676adf9550826264041c0915a9bd4be48234324375bfba53c0da413aeadbf575fcc089f8f6062ef4e
 MISC metadata.xml 867 BLAKE2B b6bb892bffffec9fa00677768455fc49dd49164fae26b1c6ae70ac905feeaca79d670f4041294fb94e7c11d741a68bc6e3205e34aba5caf36da77fc808fdff8c SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943
diff --git a/games-simulation/flightgear/flightgear-2019.1.1.ebuild b/games-simulation/flightgear/flightgear-2019.1.1.ebuild
index 5eb17e2184a5..a8847f1ad50a 100644
--- a/games-simulation/flightgear/flightgear-2019.1.1.ebuild
+++ b/games-simulation/flightgear/flightgear-2019.1.1.ebuild
@@ -92,6 +92,8 @@ src_configure() {
 		-DENABLE_PROFILE=OFF
 		-DENABLE_QT=$(usex qt5)
 		-DENABLE_RTI=OFF
+		-DENABLE_SIMD=OFF # see CPU_FLAGS
+		-DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
 		-DENABLE_STGMERGE=ON
 		-DENABLE_TERRASYNC=$(usex utils)
 		-DENABLE_TRAFFIC=$(usex utils)
@@ -114,7 +116,7 @@ src_configure() {
 		-DWITH_FGPANEL=$(usex utils)
 	)
 	if use cpu_flags_x86_sse2; then
-		append-flags -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize
+		append-flags -msse2 -mfpmath=sse
 	fi
 	if use gdal && use utils; then
 		mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 6303c1ab598d..ce6c889aeb77 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -14,7 +14,7 @@ EGIT_BRANCH="next"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0"
-IUSE="dbus debug examples gdal openmp qt5 +udev +utils vim-syntax"
+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
@@ -81,7 +81,6 @@ src_configure() {
 		-DENABLE_FGELEV=$(usex utils)
 		-DENABLE_FGJS=$(usex utils)
 		-DENABLE_FGVIEWER=$(usex utils)
-		-DENABLE_FLITE=OFF
 		-DENABLE_GDAL=$(usex gdal)
 		-DENABLE_GPSSMOOTH=$(usex utils)
 		-DENABLE_HID_INPUT=$(usex udev)
@@ -94,6 +93,8 @@ src_configure() {
 		-DENABLE_PROFILE=OFF
 		-DENABLE_QT=$(usex qt5)
 		-DENABLE_RTI=OFF
+		-DENABLE_SIMD=OFF # see CPU_FLAGS
+		-DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
 		-DENABLE_STGMERGE=ON
 		-DENABLE_TERRASYNC=$(usex utils)
 		-DENABLE_TRAFFIC=$(usex utils)
@@ -106,8 +107,8 @@ src_configure() {
 		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
 		-DSP_FDMS=ON
 		-DSYSTEM_CPPUNIT=OFF # NOTE we do not build tests anyway
-		-DSYSTEM_FLITE=ON
-		-DSYSTEM_HTS_ENGINE=ON
+		-DSYSTEM_FLITE=OFF
+		-DSYSTEM_HTS_ENGINE=OFF
 		-DSYSTEM_SPEEX=ON
 		-DSYSTEM_GSM=ON
 		-DSYSTEM_SQLITE=ON
@@ -116,7 +117,7 @@ src_configure() {
 		-DWITH_FGPANEL=$(usex utils)
 	)
 	if use cpu_flags_x86_sse2; then
-		append-flags -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize
+		append-flags -msse2 -mfpmath=sse
 	fi
 	if use gdal && use utils; then
 		mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
diff --git a/games-simulation/singularity/Manifest b/games-simulation/singularity/Manifest
index c5a28d451211..13db3ea56d1b 100644
--- a/games-simulation/singularity/Manifest
+++ b/games-simulation/singularity/Manifest
@@ -1,4 +1,4 @@
 DIST endgame-singularity-music-007.zip 51774799 BLAKE2B 78595b16e422d2312be860686aca9401f6f1eed35fe40dbbc3a3999b1feb5e32aa6d51a66d94c9241aca2b6606bb7135491298b94c8033a1437c2cd7b23f9120 SHA512 ab46e77c833085f0c5b1b46fef72ab807e79ca422ad043ef67a4bf4384cb0177319f21b4bd01496e6c3fc6fe9a2f36ec256e19f0e829ad7bf9f0c5bd38bf0fe5
 DIST singularity-1.0a1.tar.gz 1927083 BLAKE2B aeed099dd33c135f5b2e21f5e907646f32aaa0879a1b2e1f09c19045499ae52b004a8f52fee72bfe0977805899e4c7cdff6abf36e9fd3604f73cba7e395c265e SHA512 8ce624a50819e0abc04fd81a1d7658eab64ea8325de0a5790ec2a92e5fa6b62cfef8fe705fe8b209194c05927e3cf5adfc6f48934e0a70edf8b251c24084fc25
-EBUILD singularity-1.0_alpha1.ebuild 1244 BLAKE2B a713c6bb60a887afde322b73483c8d387b7ea4d23a5b294cfbaa6c7513c49f1356ec4200057abeebb3c590c5dded3872da0954c36c14b5a72146bb7a1519f9fd SHA512 805522acd2b6812cc98da1ba53b0bd7710906073ff1ef168e7b3a9baca300ce96bb14d696e1b46ee604e641700b377899ec9a287d7bdf0980b30d0afa9cd3092
+EBUILD singularity-1.0_alpha1-r1.ebuild 1294 BLAKE2B 2b620f4eb89cd9974670f4cf3fc78538aa7df113dc2c43df0020d25501161761cf27215cf7a7a6b15072e9442f52adfa8907ff1cf078dae899d2e5f4eb3588de SHA512 cfb5fb0a506e1057a1b1478e853e5f589943a272eee4dec59f4426f826db43e356a10c399dacd7ddd7f9022a89a78536286d8c6d12cf495b762d50c1c57c2704
 MISC metadata.xml 342 BLAKE2B 599486446074178c42f941d12e8babc285e015798d4c925f93d52040278ebba1d538223639d0d03d387901fbf216d0adb5c514f2a49318da3571509e03b52ec5 SHA512 558b706d3e1ac877859ef93f34cebbca1e477a8dc92ef7448b288c8794fc8ae9e5a62b54e9ec8f553637db7a6b051c3908c036bf704bcbd4d44a030aa7fde983
diff --git a/games-simulation/singularity/singularity-1.0_alpha1.ebuild b/games-simulation/singularity/singularity-1.0_alpha1-r1.ebuild
index d54f147ac48d..644b755a6c29 100644
--- a/games-simulation/singularity/singularity-1.0_alpha1.ebuild
+++ b/games-simulation/singularity/singularity-1.0_alpha1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,9 +18,11 @@ KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]
-	dev-python/polib[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygame[${PYTHON_MULTI_USEDEP}]
+		dev-python/polib[${PYTHON_MULTI_USEDEP}]
+	')
 "
 DEPEND="${RDEPEND}"
 BDEPEND="app-arch/unzip"