diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /games-strategy/scorched3d | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'games-strategy/scorched3d')
| -rw-r--r-- | games-strategy/scorched3d/Manifest | 2 | ||||
| -rw-r--r-- | games-strategy/scorched3d/scorched3d-44-r2.ebuild | 23 |
2 files changed, 10 insertions, 15 deletions
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest index 1050b3936f30..7262beaee39c 100644 --- a/games-strategy/scorched3d/Manifest +++ b/games-strategy/scorched3d/Manifest @@ -7,5 +7,5 @@ AUX scorched3d-44-odbc.patch 503 BLAKE2B 90c212fd77732bad90d5455e967cbc18f3e28c6 AUX scorched3d-44-win32.patch 464 BLAKE2B 51362a695212dd8d37013c1b4a11d77fb1b8564b54e3ec9ce3e0165ee83e42d65883dc3df964180d975885a555b1ae02e87fc20cc3c85d4507308110ee7cf810 SHA512 992224f65f80527276c0b6e139ea44c6c29a2fbfa3a0af78e2f2366897dbd51e9988b065aa21ac95cf9b1a0efc8866e2e45646e1851f8afd195651b3c47a81dd AUX scorched3d-44-wxgtk.patch 7001 BLAKE2B b120e1cc12343fa5be2e4348930d2656eb2c727224a8e9e63f00dfb4da71888918d3fcccc1a9a439737ce2f6fbe6224be06d4801b4cb857ad1e4765d2c444e4e SHA512 99e21ff6854bbea676c8ea0a5ef2b28a4d6020b34fbae134d9346d4febb7b6defbd39cb712f29b3dcff7ac829b2e76275a85d7d740e921835898f550c4471120 DIST Scorched3D-44-src.tar.gz 41689613 BLAKE2B 61f5536ad6e9dedeb0e778f90d73aa918f890632385278d4d788a43f1e199e817d6199f923c264dadbe8084fa53c32968b599c9b08784de0d5752069f9bed818 SHA512 27341d12ef9db5b64c1051a8abe45cef8a957e26c2cd8928f64c071589052d2857fc6f8104772bb67d5d348aef14122a117d9e00d61e4d9f963f3b5bbe5859ca -EBUILD scorched3d-44-r2.ebuild 2301 BLAKE2B ff038355d46948eef5702741babf7e15932295f04889757c4543ce8c8fd7cf8cfcd4cd59821796f82891c9b82a088f50cb800f02ed33b72ce3de4c94a113bd01 SHA512 fbc910fdc1ab6385ca6f8e1f5a6ccabb4c845d041aea151e98644b26c8e190426057eff38f8fe91a9089d25ffa61d5a1eb82fdb3e19159b9857908f43ba52bdb +EBUILD scorched3d-44-r2.ebuild 2304 BLAKE2B ef34d75cc048db10b3ccce46c38295951db7fb189e93911d6936c3ca4864b60ea298ffad473778b2a46679681872e35ff0a5aa0cc5fe8889baf1a7b79bbbc3b8 SHA512 70e44e513480ad18276e89e981dd0b06b18e4404439f9be5f9cdefce97e2fc432133c088290d56615a775e1c835251ea28690ef70bcf410012c070a5c284600e MISC metadata.xml 333 BLAKE2B da791c5728d5a17950492280dcf23b0543b6c444885f852b491a8eaa65f2befcd755470183e8084034a16fb6507b073b2de91afdb00d4db2eaca68077495daa8 SHA512 91b1e0f50ec4635e81ee904179228d25b8168bf74d00eacb734365514e43e681879c121cc2f60302b446367b8b6fb388842e28890719f6785fb5bf389f638171 diff --git a/games-strategy/scorched3d/scorched3d-44-r2.ebuild b/games-strategy/scorched3d/scorched3d-44-r2.ebuild index 384864e070c0..2916571b3d99 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 |