From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 28 Apr 2021 20:21:43 +0100
Subject: gentoo resync : 28.04.2021

---
 games-strategy/xbattleai/Manifest                  |  2 +-
 games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild | 29 ++++++++++++++--------
 2 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'games-strategy/xbattleai')

diff --git a/games-strategy/xbattleai/Manifest b/games-strategy/xbattleai/Manifest
index 3ced68c2c9b2..d3e0a8d1715e 100644
--- a/games-strategy/xbattleai/Manifest
+++ b/games-strategy/xbattleai/Manifest
@@ -1,4 +1,4 @@
 AUX xbattleai-1.2.2-sandbox.patch 4167 BLAKE2B e6336e72f4c466475e164e997bcef44d4c5fd96f457d08f2d1326761fade15e911ab048f05e63e4cadfdd955a90adce763c9b1facace8c33145e49b61482ad54 SHA512 013bd282c53f9a99b530b5a75907f7cc7b6829a0b20b7f77668325e1e12f2d8257019f68d1ccd147ac69d14d217412a31a3dcb3feaf2b55c39ae80545f956076
 DIST xbattleai-1.2.2.tgz 1511991 BLAKE2B f4372d9521ba878b53132a00392b3254d90642e0993920b44235eeb6ef1d874a32c7583983aecabf96ad245795820bb42c59a07c850db655ef7803f9216b61ed SHA512 41ac0f558b3adc697897903f5c9ed0d411867c405f0452282958083db7637c97a19f0ac9727e5123648a12dd2dcc5a304031efaab6089068b9f542e5db185e18
-EBUILD xbattleai-1.2.2-r2.ebuild 989 BLAKE2B 483226fc6c987f27424b9b211049cde75bc2097bd65b56d7cdba96cbad66ea881bafda0c633b87ea7dd1e230efdab8735bbe68b6e9e489b39e0a78ded1389f75 SHA512 60ecbc9efe6394b2527d4d7dda9ea767fd8818e51a5942f5e2661b00997ef78d2a46b7bc75b38f7d3f9061f448603ccded22e35e430862c1d4fc9cb3369d30a7
+EBUILD xbattleai-1.2.2-r2.ebuild 1043 BLAKE2B e67dcaab1d14fc3a1f1e32c61af26cbc6fd083d58735406ad385cbc955336d2f5a49c2a06ec23308cdd621706e61f2fd07ad0ca52ee842529a74b3c90a59e446 SHA512 61eb7f6c7db69f66a14190efa86c5321961e664ebe60ab4957211ccf221254661b80ebf52721c89ad58a1013d9e56d73e55937c489e33d452774668e04ec00a0
 MISC metadata.xml 1356 BLAKE2B 13ecdee27af4359fa0052f3db53c55243a92de5fb9419272f8f97cb576ebbb8bdc04734bb10b72088e6ba31ea6ec9d32c129fb6704f037d30bd41f2a0b81db96 SHA512 fca551005a6b3e52d30e6a53b82e8d961debba3654a4e4f99e8cd23818a15bf4adfbcc1ffbd19cbe892c0118e5b24a5e83846ab7d72f8613c2e02cd58327cf7f
diff --git a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild b/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
index e7b53bcc541e..f76d66031ae2 100644
--- a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
+++ b/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+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/"
@@ -11,7 +12,6 @@ SRC_URI="https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattle
 LICENSE="xbattle"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 # Since this uses similar code and the same binary name as the original XBattle,
 # we want to make sure you can't install both at the same time
@@ -20,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
@@ -33,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
 }
-- 
cgit v1.2.3