gentoo resync : 08.07.2021

4 files changed, 59 insertions, 7 deletions

diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz
index 3bd41c139ad1..0a7e87918024 100644
--- a/games-sports/Manifest.gz
+++ b/games-sports/Manifest.gz
diff --git a/games-sports/stormbaancoureur/Manifest b/games-sports/stormbaancoureur/Manifest
index 1e14f74bd6f1..62aec03a8001 100644
--- a/games-sports/stormbaancoureur/Manifest
+++ b/games-sports/stormbaancoureur/Manifest
@@ -1,4 +1,5 @@
+AUX stormbaancoureur-2.1.6-clang.patch 2068 BLAKE2B af61ae6e78f81a8f4533f46e0a00bd25df32666b19f241c3230eda3fa9b274262f4842f3f024e0995c76d21778d88ffaa79c47690f814276b5cb2f1634758b8f SHA512 20955a7cf84bff84efd9bc9d0e55958975cc53a56674d963f84f8d13d87c46881fb939413428f887c900c5a7c742657b4bc30083343f432821402ad5fc98f844
 AUX stormbaancoureur-2.1.6-gentoo.patch 3705 BLAKE2B 292965ef5bd4492a59bb3a02e7bc22e4cdec90f2e92a703cb63bacd854d140e68139c6236357443d69429e2355adefc8307f2d4baddfb3cdfb26d5941c40e5ef SHA512 a879e05a420cf98760f245c66f60f985e0444bda1be5bde1ec509954d5d3fc184c11d96fb3a199122f6f3a9789ca2ad557e85a7d0380a2ce2e0ca410f820680b
 DIST stormbaancoureur-2.1.6.tar.gz 3976459 BLAKE2B 3dafe0777db4dfec0ec9daf8a41c6cb1aa52ceb60f037fee64af77a7f991ed500234a33a1f5c9cd237a85f464cb5e65709f6d9d4e9417b955c24ea3be8dc0f6b SHA512 af949efc966aa088e75aadae27cd6b7e4e342d3fa00563a756ce6fb90b0ea64071f2e85087644fb6472db81c6a92584b485c5dcc71653cc54d90231e60bafd08
-EBUILD stormbaancoureur-2.1.6-r1.ebuild 847 BLAKE2B 881673a5ef46a819902dec020cce34f24326def0e3134da64858446442cfba3c854fa569ab7ff28589f8cd7fae2b0b6820918cb6c5e532bb593248601f6a2bba SHA512 ee915e7d7049097eae84f09259eef6ffbf1817aabfcfae7ef9b3a3e000c51a942cacbe3713c2a0be85c86cc39abbf3c4690aa803ab92ffdfccb5f487cf931bbc
+EBUILD stormbaancoureur-2.1.6-r2.ebuild 984 BLAKE2B 255296f36feab07e6449e030b33b18d378104ef23952ae2dfbda97ddbbaf9c89a9b514d7eb06efa8b3a7b177948d11a7511a5b583f770774b77c3ee96c47f936 SHA512 49b0af33d7ee4091786d528017cd6d302e594b37ab3db1c2ae954d028bf825e2e80ad3cfe7ae92db75c315cb2ec1cb93b134fbfd160f2c9305c7aae207d9b744
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-sports/stormbaancoureur/files/stormbaancoureur-2.1.6-clang.patch b/games-sports/stormbaancoureur/files/stormbaancoureur-2.1.6-clang.patch
new file mode 100644
index 000000000000..7ef2a8e69203
--- /dev/null
+++ b/games-sports/stormbaancoureur/files/stormbaancoureur-2.1.6-clang.patch
@@ -0,0 +1,47 @@
+Fix build with clang
+Bug: https://bugs.gentoo.org/739386
+
+--- a/carpettrack.h
++++ b/carpettrack.h
+@@ -15,7 +15,7 @@ class CarpetTrack
+       trackspace = dSimpleSpaceCreate(staticspace);
+       track  = new StaticWorldObject(trackmodel, trackspace, initialpos);
+       sgVec3 sz = { 2.0, 1.2, 0.08 };
+-      sgVec3 cpos = { initialpos[0]+5, initialpos[1], initialpos[2]+0.6 };
++      sgVec3 cpos = { initialpos[0]+5, initialpos[1], initialpos[2]+0.6f };
+       carpet = new DynamicBoxObject(carpetmodel, world, trackspace, cpos, sz);
+       carpet->name = "carpet";
+       carpet->SetMass(1.0);
+--- a/doorstand.h
++++ b/doorstand.h
+@@ -63,7 +63,7 @@ class DoorStand : public WorldObject
+ 
+       // Do the door
+       dReal sz[3] = { 0.1, 1.4, 1.6 };
+-      dReal ps[3] = { initialpos[0], initialpos[1], initialpos[2]+0.85 };
++      dReal ps[3] = { initialpos[0], initialpos[1], initialpos[2]+0.85f };
+       door_body = dBodyCreate(world);
+       dBodySetAutoDisableFlag(door_body, false);
+       dBodySetPosition(door_body, ps[0], ps[1], ps[2]);
+--- a/spikejump.h
++++ b/spikejump.h
+@@ -17,7 +17,7 @@ class SpikeJump
+       spikespace = dSimpleSpaceCreate(staticspace);
+       spikegate = new StaticWorldObject(spikemodel, spikespace, initialpos);
+       sgVec3 sz = { 2.0, 1.2, 0.08 };
+-      sgVec3 cpos = { initialpos[0], initialpos[1], initialpos[2]+0.6 };
++      sgVec3 cpos = { initialpos[0], initialpos[1], initialpos[2]+0.6f };
+       jumpboard = new DynamicBoxObject(boardmodel, world, spikespace, cpos, sz);
+       jumpboard->name = "jumpboard";
+       jumpboard->SetMass(1.0);
+--- a/ferriswheel.h
++++ b/ferriswheel.h
+@@ -20,7 +20,7 @@ class FerrisWheelCart : public DynamicObject
+       dBodySetPosition (body,initialpos[0],initialpos[1],initialpos[2]-1.45);
+ 
+       dReal sizes[2][3] = {{ 2.0, 2.9, 0.1 },  {0.2, 0.3, 1.5}};
+-      dReal xlats[2][4] = {{initialpos[0], initialpos[1], initialpos[2]-1.45}, {0,0,0.70}};
++      dReal xlats[2][4] = {{initialpos[0], initialpos[1], initialpos[2]-1.45f}, {0,0,0.70}};
+ 
+       dMass m;
+       dMassSetZero(&m);
diff --git a/games-sports/stormbaancoureur/stormbaancoureur-2.1.6-r1.ebuild b/games-sports/stormbaancoureur/stormbaancoureur-2.1.6-r2.ebuild
index 9fe138c0c52f..a1239ecaa187 100644
--- a/games-sports/stormbaancoureur/stormbaancoureur-2.1.6-r1.ebuild
+++ b/games-sports/stormbaancoureur/stormbaancoureur-2.1.6-r2.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit desktop
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Simulated obstacle course for automobiles"
 HOMEPAGE="http://www.stolk.org/stormbaancoureur/"
 SRC_URI="http://www.stolk.org/stormbaancoureur/download/${P}.tar.gz"
+S="${WORKDIR}/${P}/src-stormbaancoureur"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="
-	>=dev-games/ode-0.8
+	>=dev-games/ode-0.8[-double-precision]
 	media-libs/alsa-lib
 	media-libs/freeglut
 	>=media-libs/plib-1.8.4
@@ -23,10 +23,9 @@ DEPEND="
 	virtual/opengl"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${P}/src-${PN}
-
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-clang.patch
 )
 
 src_prepare() {
@@ -35,6 +34,11 @@ src_prepare() {
 	sed -ie "s:GENTOODIR:/usr/share/${PN}:" main.cxx || die
 }
 
+src_compile() {
+	tc-export CXX
+	emake LIBDIRNAME=$(get_libdir)
+}
+
 src_install() {
 	dobin ${PN}
 	insinto /usr/share/${PN}