[gentoo-commits] repo/gentoo:master commit in: games-arcade/kajaani-kombat/

[Sergei Trofimovich]

commit:     7e781edca0032b004cf61b58e3fa348fbc6ef5f6
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue May 18 21:49:28 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue May 18 22:00:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e781edc

games-arcade/kajaani-kombat: use tool-refixed $CXX

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
index 2aeaac0b139..f61f69728ca 100644
--- a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
+++ b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop
+EAPI=7
+inherit desktop toolchain-funcs
 
 DESCRIPTION="A rampart-like game set in space"
 HOMEPAGE="http://kombat.kajaani.net/"
@@ -23,16 +23,22 @@ DEPEND="media-libs/libsdl[sound,video]
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-makefile.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
+
 src_prepare() {
 	default
-	eapply "${FILESDIR}/${PV}-makefile.patch" \
-		"${FILESDIR}"/${P}-ldflags.patch
+
 	sed -i \
 		-e "s:GENTOODIR:/usr/share/${PN}/:" \
 		Makefile || die
 	sed -i \
 		-e 's/IMG_Load/img_load/' \
 		gui_screens.cpp || die
+
+	tc-export CXX
 }
 
 src_install() {