gentoo resync : 29.01.2021

5 files changed, 6 insertions, 30 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index b65c32b8a2ec..baa1d593d7e4 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index ae9fd41309d5..adb92d50c37a 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,7 +1,6 @@
 AUX simgear-2019.1.1-gdal3.patch 388 BLAKE2B 364d5f6692809c67d73a3191f387cbd9735e7183a25696e612827c1a796c872ee5d4a09085fa8a24a0fd524725fdeca9303c5c5ee71981de054ab5a8833d5285 SHA512 44d59cf379c8c7d82b87a31a4d29dd02aaa865c37f12c7e565c641bf3fb14497f4d63b69bbc973551b53d74919ddce5495e3f29b598ed87a6a4565e22ec81667
-AUX simgear-2020.1.2-boost.patch 299 BLAKE2B e62fa6dd8cd88306e5cc1b043f5bc174fd64b228517d7dc48c32f5174de807af073ef0b41aa00aa3567d91dd0a2571bfbc036dda4da2135e208b076185d42448 SHA512 bdbf7e15927d62a1e78486ca6ecdd7a9f7306f5d4e0fe2fad7de18556758b3c92d8cf794c309e4a66f8b3b96941de5b0ff1a3266e136518c2da6f1198c2eada8
 AUX simgear-2020.1.2-do-not-assume-libc++-clang.patch 629 BLAKE2B 1ce89c84f6ac94d7f29a3d9fc8b66cd972dcca809188ac487f7b1d961b9bad6ecdaf31882e5a0beb239cf2fb0d946bff7c5838dca7ac7872cbab22480a7b7aed SHA512 a294c55b84331bdabdea5d950b5a9a53c17eb4b949a863cb0b77c9dd585cb6a43b74f86323e1cc4de48564e064927cd49d7dec032361e50f75bfc82351319a26
-DIST simgear-2020.1.2.tar.bz2 1393059 BLAKE2B 62fa15d88368177e23cf52edf51e8c56252399d8f2661e518911c1093a0d7f9f11069da8d65b479f2d4b45792dcd011194e57fa99ac3991f749e8196aaff9552 SHA512 c2e835de471f374a6c33cfd1769b7079d178ee66075bfe87cc9eb1f06dc2648db93c31f62f0ac7a664703406817cb1e909a531812cb76c99cd8751eb7e6782e7
-EBUILD simgear-2020.1.2.ebuild 1634 BLAKE2B 0bc81b0d4a0b2bdcdc87d0291774943827804be5e6519303e7c356a936abad003bdf097bd2a627475a22a8a01da2151c808716a1d11bb87e558082ca355aceaa SHA512 f150a4b40b863afd0e1ca46bda8bf594f52a03d0ca90d878c33849a452008a5e757a5d0709d5fe179ff0c52e315c0309cb1097973b9ade1b6c0773cc8574c3f4
-EBUILD simgear-9999.ebuild 1601 BLAKE2B 2abe5a461a36bc073eb134133a2b648fd1b699441e99730bad0f01497c4005d492f7363dcb1e59f4325e6b2a709f53f6365a9b227b9bd9f5b2dce916d4c608bd SHA512 37a6cc57913c1a5d4d313748bafe6f93eb55c1c35c6c5389f2f65dba67d13504cebcac050e5d867e0021689f8d77c30b4986a8e3f1525c6becd32cd823119c44
+DIST simgear-2020.3.6.tar.bz2 1408963 BLAKE2B 55583e9a7463bb16bfa2ff6bbcd60b8160adf57246b3820371cd262a7376425fbed75ecc18396782eb9e62ddf540c352ad3417d38cf62c42e2a24b9439da958a SHA512 eaa8e3663c5fb486ea0fdad26c490fa49472596157d8d19e60426d5a1d340dfda4e5e3d82f68542bb6d9689abb8e867dc33761ea578b9c8f6c07aeb4b942880e
+EBUILD simgear-2020.3.6.ebuild 1487 BLAKE2B 3c5cefe732a744b7b85c76d4e1d84e10266cf3d174ba258f9b63151612422317db2645d052de823a7b08512e90875248635a7594013b3b6a5a3e4a844f82aed4 SHA512 75240ff70ec955fa3326f9a80ba154a83735b19937c943c5134a0db2bb08cddd57e1c33985b982c93c86833c0a898b3b0670d538d2497bf0c471f13bd493888e
+EBUILD simgear-9999.ebuild 1549 BLAKE2B 510266f574a163238cef82216bf0600344af02759be07f22e4373fc69ecb5af53cd4e9ec2d352316531f149abc710f3e87bbbe5d234e3511ca8991509ce3071d SHA512 0a27cbc7492698c49bea76703bcc74f6f3733945177bd2c5822f606206cd5ddeb768ed4797bc2005c795111e24e48df7a4fb0918571eadbcca990e51daa1c192
 MISC metadata.xml 911 BLAKE2B 978dd6e83dce780a6b6250e86def3f5f3052d7c09cda9d4974ec9f63d151cb0040c9434cde00007a8821b28854d2c49c5a040e29f176d1ebb91600e97ba09f17 SHA512 59839dd8b60cbf26b548157edf6f30255c2ca81545df77d39d47cebbf2eec561014c698ac15028765921fb9a7a570f5032f699f71fc135c5bbad211ce6b0a5a8
diff --git a/dev-games/simgear/files/simgear-2020.1.2-boost.patch b/dev-games/simgear/files/simgear-2020.1.2-boost.patch
deleted file mode 100644
index d28853cb3811..000000000000
--- a/dev-games/simgear/files/simgear-2020.1.2-boost.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -227,7 +227,7 @@
- endif()
-
- find_package(Boost REQUIRED)
--set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION")
-+set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION -DBOOST_NO_STDLIB_CONFIG")
- include(BoostTestTargets)
-
- if(SIMGEAR_HEADLESS)
diff --git a/dev-games/simgear/simgear-2020.1.2.ebuild b/dev-games/simgear/simgear-2020.3.6.ebuild
index c8ea38b80be6..27e64f9ebd30 100644
--- a/dev-games/simgear/simgear-2020.1.2.ebuild
+++ b/dev-games/simgear/simgear-2020.3.6.ebuild
@@ -35,7 +35,6 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
-	"${FILESDIR}/${P}-boost.patch"
 	"${FILESDIR}/${PN}-2020.1.2-do-not-assume-libc++-clang.patch"
 )
 
@@ -54,8 +53,7 @@ src_configure() {
 		-DENABLE_OPENMP=$(usex openmp)
 		-DENABLE_PKGUTIL=ON
 		-DENABLE_RTI=OFF
-		-DENABLE_SIMD=OFF # see CPU_FLAGS
-		-DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
+		-DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
 		-DENABLE_SOUND=ON
 		-DENABLE_TESTS=$(usex test)
 		-DSIMGEAR_HEADLESS=OFF
@@ -65,10 +63,5 @@ src_configure() {
 		-DUSE_AEONWAVE=OFF
 		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
 	)
-
-	if use cpu_flags_x86_sse2; then
-		append-flags -msse2 -mfpmath=sse
-	fi
-
 	cmake_src_configure
 }
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index e4fa4059f41d..edb882cd32f0 100644
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.ebuild
@@ -37,6 +37,7 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
+	"${FILESDIR}/${PN}-2020.1.2-do-not-assume-libc++-clang.patch"
 )
 
 pkg_pretend() {
@@ -54,8 +55,7 @@ src_configure() {
 		-DENABLE_OPENMP=$(usex openmp)
 		-DENABLE_PKGUTIL=ON
 		-DENABLE_RTI=OFF
-		-DENABLE_SIMD=OFF # see CPU_FLAGS
-		-DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
+		-DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
 		-DENABLE_SOUND=ON
 		-DENABLE_TESTS=$(usex test)
 		-DSIMGEAR_HEADLESS=OFF
@@ -65,10 +65,5 @@ src_configure() {
 		-DUSE_AEONWAVE=OFF
 		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
 	)
-
-	if use cpu_flags_x86_sse2; then
-		append-flags -msse2 -mfpmath=sse
-	fi
-
 	cmake_src_configure
 }