From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 16E32158087 for ; Mon, 7 Feb 2022 04:41:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 415A22BC007; Mon, 7 Feb 2022 04:41:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AE39E2BC007 for ; Mon, 7 Feb 2022 04:41:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 552BB342D83 for ; Mon, 7 Feb 2022 04:41:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FC8B1BD for ; Mon, 7 Feb 2022 04:41:30 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1644208877.ea9d025668dbe8ec90b089e6b7459657f0e78d54.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-sports/trigger/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-sports/trigger/trigger-0.6.1-r1.ebuild X-VCS-Directories: games-sports/trigger/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ea9d025668dbe8ec90b089e6b7459657f0e78d54 X-VCS-Branch: master Date: Mon, 7 Feb 2022 04:41:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bff25988-1a7a-4a20-a877-1491e2e30223 X-Archives-Hash: 32e8cf027e03ca3e8dadd42d062bdb63 commit: ea9d025668dbe8ec90b089e6b7459657f0e78d54 Author: Sam James gentoo org> AuthorDate: Mon Feb 7 04:40:27 2022 +0000 Commit: Sam James gentoo 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 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 }