gentoo resync : 28.04.2021

3 files changed, 36 insertions, 25 deletions

diff --git a/games-action/towbowl-tactics/Manifest b/games-action/towbowl-tactics/Manifest
index 975ae76685ba..abf5c1f2014b 100644
--- a/games-action/towbowl-tactics/Manifest
+++ b/games-action/towbowl-tactics/Manifest
@@ -1,4 +1,4 @@
-AUX towbowl-tactics-0.5-gentoo.patch 1731 BLAKE2B e7049005e54fb6f10f29fca09d42705f787dbb6c440b2b939b694b050219efaec8aaa8149c3247f8ffe1943bd678cb9b2d035eb86bda08f6496af7e32710e74e SHA512 3292a83b642f23f1549acdb53586a5ea0860b7ace4643cf42bb0248bdbf5a7c5b9f66fcd62e5d2432fb1ba5a029061215657a9d65932523e3dbd51f54843295d
+AUX towbowl-tactics-0.5-gentoo.patch 1477 BLAKE2B 452f98949e50a6638947cf77188a0df095cf6099fc839ee95d7ee7683a37427af302407e6a793229ee3f9db3263f5f200fa8ede11007f797c35a38a8d7d54ff5 SHA512 2e6c34bf4a038e345dc597cef00ff85473620f6d276bfb96342d36e49de8141c100c65705e3644ecf0406a5b599895ea2cf4de39c3411568972a351e7bd5ecc7
 DIST tbt.0.5.src.zip 5321239 BLAKE2B 3391b2b0dd3a88eebfcec722d256720f262fde4ff64111467b53e02911f356cc7f388aad64c1a13bb1e64a59be8065259cd2fe0a1ea79366828a0c19456bb924 SHA512 930d7ba78210e0ad566989279e6d77235c61c641c18da36618de36fcd82d28dd8ca40516ce1384c2a000e4efe86584928cf9c7d2da5fb455f89d358653089f97
-EBUILD towbowl-tactics-0.5.ebuild 1260 BLAKE2B bfc2c1b8854244d95386b05d8f6fe0b671b7e7decfd83a4a640e04bb3a6fc1ee3126ba4971b4432b3f70572236a8e4c2d4cfb8a081a0e34379a0429a8ac0d52e SHA512 b413fd71b1eef923d8df547c3703cdd65a78a28a1a0e56f859f126e4de05656b97e1384af0051f3962bf644a12e3b5b536ffa4ee4336ee6e9f726af985cdf680
+EBUILD towbowl-tactics-0.5-r1.ebuild 1276 BLAKE2B 9f1159e1af455570065298264ea3dad6e0931ddc86104ca8ce988b09d347250717b023ee0defc71dfad8653e50e8fc5834d7aa70d7f41d0211d3a64363590b5d SHA512 8d582ccb28549b66261001a21f835deabf8d8d70f94a7799bdaf4324a809fbca019fc21c2159f0630263a97f485701b79e9af9bfb5aad76f6437f6a5b38ba0db
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/towbowl-tactics/files/towbowl-tactics-0.5-gentoo.patch b/games-action/towbowl-tactics/files/towbowl-tactics-0.5-gentoo.patch
index aa6a950e9a07..be8a3c42a994 100644
--- a/games-action/towbowl-tactics/files/towbowl-tactics-0.5-gentoo.patch
+++ b/games-action/towbowl-tactics/files/towbowl-tactics-0.5-gentoo.patch
@@ -1,6 +1,5 @@
-diff -ru tbt.orig/config.xml tbt/config.xml
---- tbt.orig/config.xml	2003-02-01 15:14:56.000000000 -0500
-+++ tbt/config.xml	2011-01-10 12:08:01.564649048 -0500
+--- a/config.xml
++++ b/config.xml
 @@ -5,5 +5,5 @@
  <screen_h>600</screen_h>
  <sound_enabled>1</sound_enabled>
@@ -8,9 +7,8 @@ diff -ru tbt.orig/config.xml tbt/config.xml
 -<language>0</language>
 +<language>1</language>
  </config>
-diff -ru tbt.orig/src/Makefile tbt/src/Makefile
---- tbt.orig/src/Makefile	2003-02-01 15:07:40.000000000 -0500
-+++ tbt/src/Makefile	2011-01-10 12:07:29.075274834 -0500
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -1,24 +1,20 @@
  TBTHOME = /usr/local/games/tbt
  INCDIR = -I /usr/include/smpeg -I /usr/include/libxml2 -I /usr/include/SDL/ 
diff --git a/games-action/towbowl-tactics/towbowl-tactics-0.5.ebuild b/games-action/towbowl-tactics/towbowl-tactics-0.5-r1.ebuild
index 68970fe0ac94..94a3daf70c8e 100644
--- a/games-action/towbowl-tactics/towbowl-tactics-0.5.ebuild
+++ b/games-action/towbowl-tactics/towbowl-tactics-0.5-r1.ebuild
@@ -1,51 +1,64 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit desktop edos2unix toolchain-funcs
 
 DESCRIPTION="Tow Bowl Tactics is a game based on Games Workshop's Blood Bowl"
 HOMEPAGE="http://www.towbowltactics.com/index_en.html"
 SRC_URI="http://www.towbowltactics.com/download/tbt.${PV}.src.zip"
+S="${WORKDIR}"/tbt/src
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="dev-libs/libxml2
+RDEPEND="
+	dev-libs/libxml2
 	media-libs/smpeg
 	media-libs/libsdl[sound,video]
 	media-libs/sdl-net
 	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-mixer"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/tbt/src
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
 
 src_prepare() {
-	cd  ..
+	cd  .. || die
+
 	edos2unix $(find src -type f) config.xml
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+
+	default
+
 	sed -i \
-	    -e "/^TBTHOME/ s:/.*:${GAMES_DATADIR}/tbt:" \
+	    -e "/^TBTHOME/ s:/.*:/usr/share/tbt:" \
 		src/Makefile || die
 	sed -i \
 		-e "/tbt.ico/ s:\"\./:TBTHOME \"/:" \
 		src/Main.cpp || die
 	sed -i \
-		-e "s:TBTHOME \"/config.xml:\"${GAMES_SYSCONFDIR}/tbt/config.xml:g" \
+		-e "s:TBTHOME \"/config.xml:\"/etc/tbt/config.xml:g" \
 		src/global.h || die
 }
 
+src_configure() {
+	tc-export CXX
+}
+
 src_install() {
-	dogamesbin tbt
-	dodir "${GAMES_DATADIR}/tbt"
-	cp -r ../data ../tbt.ico "${D}${GAMES_DATADIR}/tbt" || die
-	insinto "${GAMES_SYSCONFDIR}/tbt"
+	dobin tbt
+
+	dodir /usr/share/tbt
+	cp -r ../data ../tbt.ico "${ED}"/usr/share/tbt || die
+
+	insinto /etc/tbt
 	doins ../config.xml
+
 	newicon ../data/images/panel/turn.png ${PN}.png
 	make_desktop_entry tbt "Tow Bowl Tactics"
-	prepgamesdirs
 }