6 files changed, 36 insertions, 12 deletions
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index bea3a18c7f00..99dc446840fa 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/crrcsim/Manifest b/games-simulation/crrcsim/Manifest
index 55b0deb58a05..9f3198937369 100644
--- a/games-simulation/crrcsim/Manifest
+++ b/games-simulation/crrcsim/Manifest
@@ -1,4 +1,5 @@
 AUX crrcsim-0.9.13-gcc6.patch 461 BLAKE2B 7e2016db5781e0158e27d999fb1d88d07dc6294740466c736a2e42eb46547fdb35ac112b6c8e93a5571103d28d6037a6acdb2be752bfb2650cc349538e72c3f4 SHA512 34bda65c0791622adb8436d08b60e6a877c2a3bbb12f93379686c39c2c572364c0fa265011bbc788229fa2ddaa3bfa3be8397d2ff98ea967f423fa3cd48465e9
+AUX crrcsim-0.9.13-overlink.patch 799 BLAKE2B fbca814624f226337e26c532c97f385fa10755e159af6819b717843dcab27dadcdd9f359e6e1b53e59e9885230841be52f893ddbfb7da45de416d9b808d8b966 SHA512 df4f0201a760fd88663cb094e6d6939e5920659a4580ca2c54622c1f1ad347e4e22e3e529036ee1e69ff924794cebbee2326e4f73bac82fa7d40d59178eb1f1e
 DIST crrcsim-0.9.13.tar.gz 8337392 BLAKE2B ccaaf3a4255b2082fc52712d49302c7de1347b87e9489c6d859662365f1cd5af538fe76cee232aed61b0c1b68138c47a2e34e128071c3e098e20f1d51c1c409c SHA512 b687837e07abc07606404d920288984abe7e304afb69158fd840d83bcfe1e9acc4afd8462c0c759df67d50a15ca3753eaf48c4526b201e64a2d641fa3aa8c1ab
-EBUILD crrcsim-0.9.13-r2.ebuild 846 BLAKE2B 6873b4de3092315aada2e3578a5558156c6d470ca2b505e10aaa6da26b5f5d81d1c911576feacab6d329b0b63ed98dfd27f136ff4b5b8769716521d5135d09aa SHA512 dd0928a8e76f8ef6a3fdc9151c6b3c55a77a28a448008f29d45351589cfd3964701ae3c014d142438ebbb0b8a763ad548b4f17ba32cdc18fac464743ebea5497
+EBUILD crrcsim-0.9.13-r2.ebuild 896 BLAKE2B a573fa7df27fa1b3ca5a830d99d353359165c516549c929ffe6789bda70baf5773762980cbb6f78ff2748f388fde58b6d3ca7b48eb6659fda38dba5b0f5a0e4a SHA512 4c5253939fbfe43bdd2406915a6fe3953db5db0e1d60e2b5b982f7293dbc1a07e732ab1a028ecd0f72144a2bdf74e51798ea654f302ce96b9632be0b2f203558
 MISC metadata.xml 330 BLAKE2B 24c61e826448ee0ceecc562776289a0a80c259c718cce5dc0f23523b5091a329933eb6a98c46ecd038b856db3f1d86588d82d62924b5d40dd0ee64c569c1e9ff SHA512 a57fe17fafb1d4cca975665b68283233a1f6b62e25bf903cd5ef7954572f3963471d453da9c569044405ab005105f6d35ae28b679d35eebd01ba61d0166349c8
diff --git a/games-simulation/crrcsim/crrcsim-0.9.13-r2.ebuild b/games-simulation/crrcsim/crrcsim-0.9.13-r2.ebuild
index f32c81a4c523..2885d6f78f0c 100644
--- a/games-simulation/crrcsim/crrcsim-0.9.13-r2.ebuild
+++ b/games-simulation/crrcsim/crrcsim-0.9.13-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit desktop
+inherit autotools desktop
 
 DESCRIPTION="Model-airplane flight simulation program"
 HOMEPAGE="https://sourceforge.net/projects/crrcsim/"
@@ -28,16 +28,19 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-overlink.patch
 )
 
 DOCS=( AUTHORS HISTORY )
 
-src_configure() {
-	econf ac_cv_header_portaudio_h=$(usex portaudio)
+src_prepare() {
+	default
+
+	eautoreconf
 }
 
-src_compile() {
-	emake CGAL_LIBS=
+src_configure() {
+	econf ac_cv_header_portaudio_h=$(usex portaudio)
 }
 
 src_install() {
diff --git a/games-simulation/crrcsim/files/crrcsim-0.9.13-overlink.patch b/games-simulation/crrcsim/files/crrcsim-0.9.13-overlink.patch
new file mode 100644
index 000000000000..42bcc6e3d995
--- /dev/null
+++ b/games-simulation/crrcsim/files/crrcsim-0.9.13-overlink.patch
@@ -0,0 +1,20 @@
+With CGAL now being header-only and boost-1.77.0 dropping thread-mt (not
+actually linking with it), these link attempts just cause unnecessary issues.
+
+https://bugs.gentoo.org/790779
+https://bugs.gentoo.org/808727
+--- a/configure.ac
++++ b/configure.ac
+@@ -227,5 +227,4 @@
+       has_CGAL="yes  (found CGAL > v3)"
+       AC_CHECK_LIB(gmp,__gmpq_init,,AC_MSG_ERROR([gmp library not found. Please install it.]))
+-      AC_CHECK_LIB(boost_thread-mt,main,,AC_MSG_ERROR([boost_thread-mt library not found. Please install it.]))
+     else
+       AC_DEFINE([CGAL_VERSION3], [1], [CGAL_VERSION3 compatibility])
+@@ -233,5 +232,5 @@
+     fi   
+     CGAL_CFLAGS=-frounding-math
+-    CGAL_LIBS=-lCGAL
++    CGAL_LIBS=
+     AC_DEFINE([WINDDATA3D], [1], [Import code for wind data, needs CGAL, 0 to disable])
+ else
diff --git a/games-simulation/searchandrescue/Manifest b/games-simulation/searchandrescue/Manifest
index 6145bba30f1f..c66a76f902e3 100644
--- a/games-simulation/searchandrescue/Manifest
+++ b/games-simulation/searchandrescue/Manifest
@@ -1,5 +1,5 @@
 DIST SearchAndRescue-1.7.0.tar 6256640 BLAKE2B 9ccf63408499bd5f44a1eb6d24656ca5403eb732bd166ccd263d5fdd6f29e5168a563cda4e59eff74d39fa832876f0f04451042baf99d332d748828d0f03b7de SHA512 36295e7c20e685068ba6448b5f579eb53fedba663f76ac1d0db1da1765fbbfe6c1c4728e8a90680250ebbb3f4ad181fbe5bdd2f0fc703c774ec27dc829feacc9
 DIST SearchAndRescue-data-1.7.0.tar 52141474 BLAKE2B 2f43e1349d27c11e441d01d7421d9e5b9145d99c6685ddfb1e2a713269123f9cfc2c655359fa65fa09844dcbf3958bc9d4b2c51c4f9c03e401e2bc40f8953f40 SHA512 a323c50a2c64705ebd43c27e836f088094085bc4f5d219a9b0341cc3b16aafe96e364eb36162a7acb6a59aefe6304767f497e2d7bb0dc29d881f51e6535a6295
 DIST SearchAndRescue-data-guadarrama-1.7.0.tar 41738769 BLAKE2B 8c0d02ca8bce7d70eb1016d4676eb35da5c20d1e2c5e65602d8d7414e2ee8bec9bf13399dd3576a3379b62ebc3d7fd7ba85ea33cc1ff2c179278a59bf623daf3 SHA512 1c9615858fc778832566991ee4802c0929c81a9b0b720e5db90b4bb0baff718fa0ba589fe33444ee7eb040622081d60c10036af2b199bf2bd0a7f5f45ba71c72
-EBUILD searchandrescue-1.7.0.ebuild 1935 BLAKE2B 255dcb5f9b3e83c5464726864307b57cc32e5b1a3d2536588900c9d8672b5bfb91ce5c22a2e996c6ce0ac51b0e2220adf11331984036b1151711a83810b5b141 SHA512 3cf1bfcde071509464704e72f3023bd0e6870983018c6062afb551b25d39f5e044edccc1ef793c518b0593d0de71d634e7659afd0b99c16bdbb4541658cee80c
+EBUILD searchandrescue-1.7.0-r1.ebuild 1959 BLAKE2B a57ddfd02cfdbdd1d20744927b1ddd50367450f4bacd7d430295f60f0aba7bb479836b98f4a894b24016ccaf1413e6e2be832a19802f54cfb492b80e3619724b SHA512 654f60e0687884c587c6a849bbfa7fa4b2d5ae34fe6fab7ddfd71e5fcf3e87408e02b390ac60eab9a9577e3f4f79aeb26098f041a71fcd841e3246392c21cd91
 MISC metadata.xml 338 BLAKE2B 75bbcfd013fbf4ea2aea09b64bb19a03e1e3f1490d77f4ed7f07af069ccc9c0643e5e1d0368d4dab289c709a49306645befbb28a087c59779415ab0bee0f6ab6 SHA512 434ce984794eb43c0e4083cefe03dff01118cc3b9aa64d43c7bfbfccaae20212baa111dce95ac79a9b9e94f9fc405e30bd09bd7fc845bba749e5659ae26ce388
diff --git a/games-simulation/searchandrescue/searchandrescue-1.7.0.ebuild b/games-simulation/searchandrescue/searchandrescue-1.7.0-r1.ebuild
index a6949977970e..0d86fc160b73 100644
--- a/games-simulation/searchandrescue/searchandrescue-1.7.0.ebuild
+++ b/games-simulation/searchandrescue/searchandrescue-1.7.0-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit desktop flag-o-matic prefix toolchain-funcs xdg
 
 MY_PN=SearchAndRescue
@@ -10,13 +11,14 @@ HOMEPAGE="http://searchandrescue.sourceforge.net/"
 SRC_URI="mirror://sourceforge/searchandrescue/${MY_PN}-${PV}.tar.gz -> ${MY_PN}-${PV}.tar
 	mirror://sourceforge/searchandrescue/${MY_PN}-data-${PV}.tar.gz -> ${MY_PN}-data-${PV}.tar
 	mirror://sourceforge/searchandrescue/${MY_PN}-data-guadarrama-${PV}.tar.gz -> ${MY_PN}-data-guadarrama-${PV}.tar"
+S="${WORKDIR}"/${PN}_${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	media-libs/libsdl
+	media-libs/libsdl[joystick]
 	media-libs/sdl-mixer
 	virtual/glu
 	virtual/opengl
@@ -31,8 +33,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-S=${WORKDIR}/${PN}_${PV}
-
 src_unpack() {
 	unpack ${MY_PN}-${PV}.tar
 	mkdir data || die
@@ -52,7 +52,7 @@ src_prepare() {
 }
 
 src_configure() {
-	export CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" \
+	export CC="$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" \
 		   CPP="$(tc-getCXX) ${LDFLAGS}"
 
 	append-flags -DNEW_GRAPHICS -DHAVE_SDL_MIXER