games-strategy/xbattleai: update EAPI 6 -> 7, fix build, respect CC

Previous configure results were cached, causing misdetection of nsl. This also added to problems with respecting CC. Closes: https://bugs.gentoo.org/730850 Closes: https://bugs.gentoo.org/650044 Signed-off-by: Sam James <[email protected]>
hanetzer · Apr 12, 2021 · 683c7dc · 683c7dc
1 parent 43ecb11
commit 683c7dc
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild b/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="A multi-player game of strategy and coordination"
 HOMEPAGE="https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattleAI/"
@@ -18,11 +20,18 @@ RDEPEND="
  dev-lang/tk:0
  x11-libs/libX11
  x11-libs/libXext
- !games-strategy/xbattle"
-DEPEND="${RDEPEND}
+ !games-strategy/xbattle
+"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
  app-text/rman
  x11-misc/imake
- x11-base/xorg-proto"
+"
+
+DOCS=( CONTRIBUTORS README README.AI TODO xbattle.dot )
 
 PATCHES=(
  "${FILESDIR}"/${P}-sandbox.patch
@@ -31,10 +40,12 @@ PATCHES=(
 src_prepare() {
  default
  rm -f xbcs/foo.xbc~ || die
+ rm config.cache || die
+
+ tc-export CC
 }
 
 src_install() {
- DOCS="CONTRIBUTORS README README.AI TODO xbattle.dot" \
- default
- mv "${D}/usr/bin/"{,xb_}gauntletCampaign || die
+ default
+ mv "${ED}/usr/bin/"{,xb_}gauntletCampaign || die
 }