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 D6B361382C5 for ; Sun, 4 Apr 2021 22:29:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19B38E0825; Sun, 4 Apr 2021 22:29:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 EEBDCE0825 for ; Sun, 4 Apr 2021 22:29:34 +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 D22F433DDA5 for ; Sun, 4 Apr 2021 22:29:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29B414E9 for ; Sun, 4 Apr 2021 22:29:32 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1617575309.6cba898d0f8b83f27d255855eaa85a0a2d040704.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/scorched3d/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/scorched3d/scorched3d-44-r2.ebuild X-VCS-Directories: games-strategy/scorched3d/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 6cba898d0f8b83f27d255855eaa85a0a2d040704 X-VCS-Branch: master Date: Sun, 4 Apr 2021 22:29:32 +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: da78a547-14bf-4909-8d85-500336d7c208 X-Archives-Hash: 4724aa20d0fe67b2336f95669f65a57d commit: 6cba898d0f8b83f27d255855eaa85a0a2d040704 Author: David Seifert gentoo org> AuthorDate: Sun Apr 4 22:28:29 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Apr 4 22:28:29 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cba898d games-strategy/scorched3d: Port to EAPI 7 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: David Seifert gentoo.org> games-strategy/scorched3d/scorched3d-44-r2.ebuild | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/games-strategy/scorched3d/scorched3d-44-r2.ebuild b/games-strategy/scorched3d/scorched3d-44-r2.ebuild index 384864e070c..2916571b3d9 100644 --- a/games-strategy/scorched3d/scorched3d-44-r2.ebuild +++ b/games-strategy/scorched3d/scorched3d-44-r2.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -WX_GTK_VER=3.0 - -inherit autotools eutils wxwidgets +WX_GTK_VER="3.0" +inherit autotools desktop edos2unix wxwidgets DESCRIPTION="Multi-player tank battle in 3D (OpenGL)" HOMEPAGE="http://www.scorched3d.co.uk/" SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz" +S="${WORKDIR}/scorched" LICENSE="GPL-2" SLOT="0" @@ -37,10 +37,8 @@ RDEPEND=" sci-libs/fftw:3.0= ) mysql? ( virtual/mysql )" -DEPEND="${RDEPEND} - !dedicated? ( virtual/pkgconfig )" - -S=${WORKDIR}/scorched +DEPEND="${RDEPEND}" +BDEPEND="!dedicated? ( virtual/pkgconfig )" PATCHES=( "${FILESDIR}"/${P}-fixups.patch @@ -53,10 +51,6 @@ PATCHES=( "${FILESDIR}"/${P}-fix-c++14.patch ) -pkg_setup() { - setup-wxwidgets -} - src_prepare() { edos2unix \ src/launcher/wxdialogs/SettingsDialog.cpp \ @@ -68,6 +62,7 @@ src_prepare() { } src_configure() { + setup-wxwidgets econf \ --datadir="${EPREFIX}"/usr/share/${PN} \ --with-fftw="${EPREFIX}"/usr \ @@ -84,7 +79,7 @@ src_install() { default # remove bundled fonts - rm "${ED%/}"/usr/share/${PN}/data/fonts/* || die + rm "${ED}"/usr/share/${PN}/data/fonts/* || die dosym ../../../fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/data/fonts/dejavusans.ttf dosym ../../../fonts/dejavu/DejaVuSansCondensed-Bold.ttf /usr/share/${PN}/data/fonts/dejavusconbd.ttf dosym ../../../fonts/dejavu/DejaVuSansMono-Bold.ttf /usr/share/${PN}/data/fonts/dejavusmobd.ttf