[gentoo-commits] repo/gentoo:master commit in: games-sports/trigger/

[Sam James]

commit:     ea9d025668dbe8ec90b089e6b7459657f0e78d54
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  7 04:40:27 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb  7 04:41:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea9d0256

games-sports/trigger: update EAPI 6 -> 8, fix joystick dependency

Closes: https://bugs.gentoo.org/832817
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-sports/trigger/trigger-0.6.1-r1.ebuild | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/games-sports/trigger/trigger-0.6.1-r1.ebuild b/games-sports/trigger/trigger-0.6.1-r1.ebuild
index 71a5f7d7bfd1..cd17773e871f 100644
--- a/games-sports/trigger/trigger-0.6.1-r1.ebuild
+++ b/games-sports/trigger/trigger-0.6.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit desktop toolchain-funcs
 
@@ -10,49 +10,48 @@ MY_P=${MY_PN}-${PV}
 DESCRIPTION="Free OpenGL rally car racing game"
 HOMEPAGE="http://trigger-rally.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	dev-games/physfs
 	media-libs/freealut
-	media-libs/libsdl
+	media-libs/libsdl[joystick]
 	media-libs/openal
 	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-mixer
 	virtual/glu
 	virtual/opengl"
-DEPEND="${RDEPEND}
-	dev-util/ftjam"
-
-S=${WORKDIR}/${MY_P}
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/ftjam"
 
 PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
 
-pkg_setup() {
+src_configure() {
 	# Otherwise build fails with:
 	# ...skipped trigger for lack of libpengine.a...
 	tc-export AR
-}
 
-src_configure() {
 	econf --datadir=/usr/share/games/${PN}
 }
 
 src_compile() {
 	AR="${AR} cru" jam -dx -qa || die
-
 }
 
 src_install() {
 	dobin ${PN}
+
 	insinto /usr/share/games/${PN}
 	doins -r data/*
+
 	newicon data/textures/life_helmet.png ${PN}.png
+
 	make_desktop_entry ${PN} Trigger
+
 	dodoc doc/*.txt
 }