gentoo resync : 24.07.2021

4 files changed, 51 insertions, 54 deletions

diff --git a/games-simulation/crashtest/Manifest b/games-simulation/crashtest/Manifest
index f688984c9769..4c7da92dd7c6 100644
--- a/games-simulation/crashtest/Manifest
+++ b/games-simulation/crashtest/Manifest
@@ -1,4 +1,4 @@
-AUX crashtest-1.1-gentoo.patch 2907 BLAKE2B 5d99f7943f568877d31a1d3cadcbb670487db8923275d44384d9e4a2897320b7c963c59163cb7076ff995617f11d8b1c3482a0cca4b02cc28a5ff5b4ce7e7f9f SHA512 6b657329db9eba28de9dcbf33bfd46002e89e0a5a348a9109742cfa6b0ab6a431a8c5edd880201b40ab0dcc4cc5b27be16dc5e38e16621596ec62ea07676c716
+AUX crashtest-1.1-gentoo.patch 2682 BLAKE2B 8350921502fbd7242fa9a6282c9392a19beaed85a21c1b312d1d63371848d632889108e3888fb8b1324e96e967cc0d28fb5d5c0920b0e0bd1c7168d984260fa3 SHA512 4fb5b594fd65c3cbe5c458d96041d52b591898fed4193c252d2e1dfcba3e205031a469627291e341069c07498e0036bd85a842bcb4322e0a602d87e26c7a37f1
 DIST crashtest-1.1.tar.gz 134769 BLAKE2B 16c7be2723d705bbcfc4457a0d7bb545ddaacfb9009cc184c849c59a1c356c67d0151bd7bbb0d1909efb89d24e18657038fe0dd66e218e0c7ed24c67ba82089b SHA512 f361b5f202cdcdca871357eb2a2158af2958f4058b6754c63dc5a20c3e08e2ef532e984596d0daac073f2321b2db02e3f8c2a0a4998450fc953c1661d712d59c
-EBUILD crashtest-1.1-r1.ebuild 831 BLAKE2B b57fac9716e9a510d5971ad00a16493c3594ceb018e180fbcc62090cb75ca4187587ce7863ecbbe06a17ce91354b26656f62d0c0c08e7eec9a9de5861f9eb6f6 SHA512 312efd5ef21b25f35c8f78e1088d909afdf8ec56beb7dc2c3c043c5db18c3d68b726ca9590fd4e484299fe508c7b9e6f0eb6c898becd8c49cc2f7be607346112
+EBUILD crashtest-1.1-r2.ebuild 820 BLAKE2B fc6085f60a0e57378f18ebec3000d1804b65cc6eea0359e6c07d5e3ef7ea277016dc200e6ce3d4a6872df84e89d4d3a882d38dfdc99c297ce35ef39b4d325e9a SHA512 03fd1c50d5f2c8871c201982511b6d3d43a8774f578f4874d51ad2742ee3aa92f8658effc2132df9421e826f1129f95d4e6cb82144ab574e2271c890d303fe84
 MISC metadata.xml 562 BLAKE2B ae31c43ea940ab17bf1295a254c715d4c3a9460a38617deeb7e41e075b04cc20ad2c7710fa66ffc124c9441d00787902ca423537a494c4eaed57c933abf23cb2 SHA512 94005d1dd7a8f13dc37e0c81290486eb34dfda05a2808eb9b4908b5ba7ba722e0435acdde3d2da082e61a70e60eb2e6df70cd0d59589ccb913a6e6e87b81bc55
diff --git a/games-simulation/crashtest/crashtest-1.1-r1.ebuild b/games-simulation/crashtest/crashtest-1.1-r1.ebuild
deleted file mode 100644
index 1faed8379238..000000000000
--- a/games-simulation/crashtest/crashtest-1.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic
-
-DESCRIPTION="Educational car crash simulator"
-HOMEPAGE="http://www.stolk.org/crashtest/"
-SRC_URI="http://www.stolk.org/crashtest/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-games/ode
-	media-libs/alsa-lib
-	media-libs/freeglut
-	x11-libs/fltk:1[opengl]
-	virtual/opengl
-	virtual/glu"
-DEPEND="${RDEPEND}
-	>=media-libs/plib-1.8.4"
-
-S=${WORKDIR}/${P}/src-${PN}
-
-PATCHES=(
-	"${FILESDIR}/${P}"-gentoo.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
-		-e "s:@GENTOO_BINDIR@:/usr/bin:" \
-		Makefile ${PN}.cxx || die
-	append-cppflags -DHAVE_ISNANF
-}
-
-src_install() {
-	default
-	make_desktop_entry ${PN} Crashtest
-}
diff --git a/games-simulation/crashtest/crashtest-1.1-r2.ebuild b/games-simulation/crashtest/crashtest-1.1-r2.ebuild
new file mode 100644
index 000000000000..ff27796a7f4c
--- /dev/null
+++ b/games-simulation/crashtest/crashtest-1.1-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Educational car crash simulator"
+HOMEPAGE="http://www.stolk.org/crashtest/"
+SRC_URI="http://www.stolk.org/crashtest/${P}.tar.gz"
+S="${WORKDIR}/${P}/src-${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-games/ode:=
+	media-libs/freeglut
+	media-libs/plib
+	virtual/glu
+	virtual/opengl
+	x11-libs/fltk:1[opengl]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "s|@GENTOO_DATADIR@|${EPREFIX}/usr/share/${PN}|" \
+		-e "s|@GENTOO_BINDIR@|${EPREFIX}/usr/bin|" \
+		-i Makefile ${PN}.cxx || die
+
+	tc-export CXX
+}
+
+src_install() {
+	default
+
+	make_desktop_entry ${PN} Crashtest applications-games
+}
diff --git a/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch b/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch
index b384c87278c2..8e8a7d9aff61 100644
--- a/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch
+++ b/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch
@@ -1,6 +1,5 @@
-diff -ru a/Makefile b/Makefile
---- a/Makefile	2009-02-15 17:11:31.000000000 -0500
-+++ b/Makefile	2009-10-14 01:00:13.900627555 -0400
+--- a/Makefile
++++ b/Makefile
 @@ -1,34 +1,12 @@
 -# EDIT THESE SETTINGS
 -
@@ -29,7 +28,7 @@ diff -ru a/Makefile b/Makefile
  
 -LIBS= $(ODEPREFIX)/lib/libode.a -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL `fltk-config --use-gl --use-images --ldflags`
 -
-+LIBS= `ode-config --libs` -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL -lasound `fltk-config --use-gl --use-images --ldflags` -lglut
++LIBS= `ode-config --libs` -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL `fltk-config --use-gl --use-images --ldflags` -lglut
  
  all: crashtest
  
@@ -69,9 +68,8 @@ diff -ru a/Makefile b/Makefile
  	# Models
  	install -m 644 models/testground.3ds $(GAMEDIR)/models/testground.3ds
  	install -m 644 models/biped_torso.3ds $(GAMEDIR)/models/biped_torso.3ds
-diff -ru a/crashtest.cxx b/crashtest.cxx
---- a/crashtest.cxx	2009-02-15 17:08:24.000000000 -0500
-+++ b/crashtest.cxx	2009-10-14 01:01:25.822753522 -0400
+--- a/crashtest.cxx
++++ b/crashtest.cxx
 @@ -615,13 +615,7 @@
  
  int main(int argc, char *argv[])