commit: 6cba898d0f8b83f27d255855eaa85a0a2d040704 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Apr 4 22:28:29 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> 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 <soap <AT> 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
