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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 88E4C1382C5 for ; Tue, 18 May 2021 22:01:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6587E05C1; Tue, 18 May 2021 22:01:03 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8C4C1E05C1 for ; Tue, 18 May 2021 22:01:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C736340C59 for ; Tue, 18 May 2021 22:01:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8043863D for ; Tue, 18 May 2021 22:01:00 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1621375258.7e781edca0032b004cf61b58e3fa348fbc6ef5f6.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/kajaani-kombat/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild X-VCS-Directories: games-arcade/kajaani-kombat/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 7e781edca0032b004cf61b58e3fa348fbc6ef5f6 X-VCS-Branch: master Date: Tue, 18 May 2021 22:01:00 +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: d313860c-2530-4ccf-ae11-c34810cba62b X-Archives-Hash: 1aa1b2ce611c25498d65b10c9325b3c8 commit: 7e781edca0032b004cf61b58e3fa348fbc6ef5f6 Author: Sergei Trofimovich gentoo org> AuthorDate: Tue May 18 21:49:28 2021 +0000 Commit: Sergei Trofimovich gentoo 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 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() {