gentoo resync : 14.12.2020

17 files changed, 312 insertions, 320 deletions

diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 622fb4b8295a..597c1e172cf4 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/bastion/Manifest b/games-rpg/bastion/Manifest
index d3a3f49393f2..85f405a58b94 100644
--- a/games-rpg/bastion/Manifest
+++ b/games-rpg/bastion/Manifest
@@ -1,3 +1,3 @@
-DIST Bastion-HIB-2012-06-20.sh 1055161705 BLAKE2B 615ff88a3fab37aa70e60d1e692cb0b6a1e03dd90bf6294c65a134cbceb4d59675c341c4fca0b4e08ebda24007df727f09c31adfbe2f5f0e97d8e3b9010af4e1 SHA512 e81b5dfa6f61ec2b35b30693c156a612cd3242c2169f4414b6d66839b7d8cc2e6ea8776f55baae67fa8131ee96bc221e1a15004410612eecaa9f7204dcc673ad
-EBUILD bastion-20120620-r1.ebuild 1749 BLAKE2B 8a92179f1d52226ff9b2189f4f2b65b4e53e568ed3d680036e36175f385d21fdc774238fdb5e107c4ce37dc71556e9de5457c78df2d903cb7912ffac2251f86e SHA512 95a2351a3567ca733301a49373ba55ca098e23e33b522e369ac5e5f6c989a1c8249cf502c5d749cae2b6d64f4a66ad3fb6668c91d2d18c27c50324e6a196e9be
+DIST bastion-10162016-bin 1080484945 BLAKE2B 0f755c54ff975afbb3ee087990849831fd405ddbe8ce83a062ba70d25ca6cbe69c9baf2535e8b1892fbbf4375830a3c7fe1ae7eb247d1ed3e46e2b10330270ca SHA512 108e181ad2a9a7eaedc84700f9399fd32d221259eea5200a41dfe21663cf6d3ac8ebd0c168095a7b9f6e71b953cc45203874bb4d32d319ee3547c99da924c8bc
+EBUILD bastion-20161016.ebuild 1488 BLAKE2B ad7dff0f77b173188bb12692b650e25226166d4d0c4a97b0b2bdd2a7d69afd5370208a533d5d2e27ebf89fdcfa9bb7338b1a22e254cfb3b32cfab76dfcd43509 SHA512 f9fce5ddb3eb0d3ae1d9afd53586c79c686d61f2a8a2dd7f5edc2ad2b3f4c15f89e7eeec5d8d1fa5a73fcfdb77a1948c396a8eb9e6c2dad11ea5793ea86f05b7
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/bastion/bastion-20120620-r1.ebuild b/games-rpg/bastion/bastion-20120620-r1.ebuild
deleted file mode 100644
index e35826a5faa6..000000000000
--- a/games-rpg/bastion/bastion-20120620-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnome2-utils check-reqs unpacker games
-
-TIMESTAMP=${PV:0:4}-${PV:4:2}-${PV:6:2}
-DESCRIPTION="An original action role-playing game set in a lush imaginative world"
-HOMEPAGE="https://supergiantgames.com/games/bastion/"
-SRC_URI="Bastion-HIB-${TIMESTAMP}.sh"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/Bastion.bin*
-	${MYGAMEDIR#/}/lib/*
-	${MYGAMEDIR#/}/lib64/*"
-
-# mono shit: vague dependencies
-RDEPEND="
-	virtual/opengl
-	media-libs/freealut
-	media-libs/openal
-	media-libs/sdl-gfx
-	media-libs/sdl-image
-	media-libs/sdl-mixer
-	media-libs/sdl-net
-	media-libs/sdl-ttf
-	media-libs/smpeg
-	x11-libs/libX11
-	x11-libs/libXft"
-
-CHECKREQS_DISK_BUILD="2400M"
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to your DISTDIR directory."
-}
-
-src_unpack() {
-	myarch=$(usex amd64 "x86_64" "x86")
-
-	unpack_makeself
-
-	mv instarchive_all{,.tar.lzma} || die
-	mv instarchive_linux_${myarch}{,.tar.lzma} || die
-
-	mkdir ${P} || die
-	cd ${P} || die
-
-	unpack ./../instarchive_{all,linux_${myarch}}.tar.lzma
-}
-
-src_install() {
-	insinto "${MYGAMEDIR}"
-	doins -r *
-
-	newicon -s 256 Bastion.png ${PN}.png
-	make_desktop_entry ${PN}
-	games_make_wrapper ${PN} "./Bastion.bin.${myarch}" "${MYGAMEDIR}" "${MYGAMEDIR}/$(get_libdir)"
-
-	fperms +x "${MYGAMEDIR}"/Bastion.bin.${myarch}
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/bastion/bastion-20161016.ebuild b/games-rpg/bastion/bastion-20161016.ebuild
new file mode 100644
index 000000000000..d0388d065a8f
--- /dev/null
+++ b/games-rpg/bastion/bastion-20161016.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop check-reqs unpacker wrapper xdg
+
+TIMESTAMP=${PV:4:2}${PV:6:2}${PV:0:4}
+DESCRIPTION="An original action role-playing game set in a lush imaginative world"
+HOMEPAGE="https://supergiantgames.com/games/bastion/"
+SRC_URI="bastion-${TIMESTAMP}-bin"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch splitdebug"
+
+DIR="/opt/${PN}"
+QA_PREBUILT="${DIR#/}/*"
+
+# Being a Mono-based game, it is tricky to determine the precise
+# dependencies. These were found by trial and error.
+RDEPEND="
+	media-libs/libsdl2[joystick,opengl,sound,video]
+	media-libs/libvorbis
+"
+BDEPEND="
+	app-arch/unzip
+"
+
+CHECKREQS_DISK_BUILD="2400M"
+S="${WORKDIR}/data"
+
+pkg_nofetch() {
+	einfo "Please buy and download ${SRC_URI} from:"
+	einfo "  https://www.humblebundle.com/store/${PN}"
+	einfo "and move it to your distfiles directory."
+}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_prepare() {
+	default
+	rm -v lib*/libSDL2-2.0.so.0 || die
+}
+
+src_install() {
+	local \
+		arch=$(usex amd64 x86_64 x86) \
+		libdir=lib$(usex amd64 64 "")
+
+	insinto "${DIR}"
+	doins -r *.dll* Bastion.exe steam_appid.txt Content/ mono/
+
+	exeinto "${DIR}"
+	doexe Bastion.bin.${arch}
+
+	exeinto "${DIR}"/${libdir}
+	doexe ${libdir}/*.so*
+
+	dodoc Linux.README
+
+	make_wrapper ${PN} "env -u TERM \"${EPREFIX}${DIR}/Bastion.bin.${arch}\""
+	make_desktop_entry ${PN} Bastion applications-games
+}
diff --git a/games-rpg/dungeon-defenders/Manifest b/games-rpg/dungeon-defenders/Manifest
index 7a837df3fc33..63bec5b427a1 100644
--- a/games-rpg/dungeon-defenders/Manifest
+++ b/games-rpg/dungeon-defenders/Manifest
@@ -1,3 +1,3 @@
 DIST dundef-linux-03052013.mojo.run 5384683543 BLAKE2B 76b4f8b64ffc89f2e53b36a6002b312c6523840d9ac96acacf7ec094271af70302ff26b8a73e2b16828cd90311a3f6b45b930b3e3d8083ea4ee7b8bda2ca27c9 SHA512 911d1691411d870cee62d08b0c559ac80588edc9ba0c9d622c7528f7f8635d86eae962f7a2b1bfed27be1d780c033216374f69072ed7828e8624855e9b0b9aca
-EBUILD dungeon-defenders-20130305.ebuild 2644 BLAKE2B d60a8b5051a3f8858470e14ce2abc5594c7b50ea922aa18257bf9636a1108d889a6b7b9856cec7e1616d26ef97c385e31b3ed843ca5f50695212afce57493e27 SHA512 e993a8c4221d81659da8097ad4a83342651644b5099568e2e440f0dee5e99595ab16c302e2319912b612950b906e6fdd69d46a046e9a873c5dd23f74686fd92b
-MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
+EBUILD dungeon-defenders-20130305-r1.ebuild 1707 BLAKE2B 8a26093f7b979ad08e1ee7045214ce8afa54acd6ab493ad072e86e850cd95f1b0ce80b20aa6ae415201d12b08bd7075e75d047cdf413f74599c8c06278a18279 SHA512 dd4c4c24786d638a2b3ea635ecd132408795cfe16fbb8098f761223cfd1a7ce21ba76c8484a5bab3293a926e475fb59835ef795611d42b59f7b6e19f7fcb5844
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/dungeon-defenders/dungeon-defenders-20130305-r1.ebuild b/games-rpg/dungeon-defenders/dungeon-defenders-20130305-r1.ebuild
new file mode 100644
index 000000000000..e6bbd621a3e8
--- /dev/null
+++ b/games-rpg/dungeon-defenders/dungeon-defenders-20130305-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs desktop unpacker wrapper xdg
+
+TIMESTAMP="${PV:4:2}${PV:6:2}${PV:0:4}"
+DESCRIPTION="A hybrid of two hot genres: Tower Defense and cooperative online Action-RPG"
+HOMEPAGE="https://www.humblebundle.com/store/dungeon-defenders-collection"
+SRC_URI="dundef-linux-${TIMESTAMP}.mojo.run"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch splitdebug"
+
+BDEPEND="
+	app-arch/unzip
+"
+RDEPEND="
+	media-libs/libsdl2[abi_x86_32,opengl,video]
+	media-libs/openal[abi_x86_32]
+	virtual/opengl[abi_x86_32]
+	x11-misc/xdg-utils
+"
+
+DIR="/opt/${PN}"
+QA_PREBUILT="${DIR#/}/*"
+
+CHECKREQS_DISK_BUILD="5916M"
+S="${WORKDIR}/data"
+
+pkg_nofetch() {
+	einfo "Please buy and download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to your distfiles directory."
+}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_prepare() {
+	default
+
+	# https://bugzilla.icculus.org/show_bug.cgi?id=5894
+	sed -i 's/LobbyLevel_Valentines2013\.udk/LobbyLevel.udk/' UDKGame/Config/DefaultDunDef.ini || die
+
+	# Remove bundled binaries.
+	rm -v UDKGame/Binaries/{*.so*,xdg-open} || die
+}
+
+src_install() {
+	# Move the data rather than copying. The game consumes over 5GB so a
+	# needless copy should really be avoided!
+	dodir "${DIR}"
+	mv -v Engine/ UDKGame/ "${ED}${DIR}" || die
+
+	# Use system xdg-open script, location is hardcoded.
+	dosym ../../../../usr/bin/xdg-open "${DIR}"/UDKGame/Binaries/xdg-open
+
+	make_wrapper ${PN} ./DungeonDefenders-x86 "${DIR}"/UDKGame/Binaries
+	newicon -s 48 DunDefIcon.png ${PN}.png
+	make_desktop_entry ${PN} "Dungeon Defenders"
+
+	dodoc README-linux.txt
+}
diff --git a/games-rpg/dungeon-defenders/dungeon-defenders-20130305.ebuild b/games-rpg/dungeon-defenders/dungeon-defenders-20130305.ebuild
deleted file mode 100644
index 01a66c03c0a8..000000000000
--- a/games-rpg/dungeon-defenders/dungeon-defenders-20130305.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: unbundle SDL-2 when it gets released
-
-EAPI=5
-inherit check-reqs eutils gnome2-utils unpacker games
-
-TIMESTAMP="${PV:4:2}${PV:6:2}${PV:0:4}"
-MY_PN="DungeonDefenders"
-DESCRIPTION="A hybrid of two hot genres: Tower Defense and cooperative online Action-RPG"
-HOMEPAGE="http://dungeondefenders.com/"
-SRC_URI="dundef-linux-${TIMESTAMP}.mojo.run"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libs"
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/UDKGame/Binaries/${MY_PN}-x86
-	${MYGAMEDIR#/}/UDKGame/Binaries/libSDL2-2.0.so.0"
-CHECKREQS_DISK_BUILD="5916M"
-
-# linked against pulseaudio
-# without SDL-2 only linkage: opengl, openal
-DEPEND="app-arch/unzip"
-RDEPEND="
-	x11-misc/xdg-utils
-	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-	>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXScrnSaver[abi_x86_32(-)]
-	x11-libs/libXcursor[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/libXi[abi_x86_32(-)]
-	x11-libs/libXinerama[abi_x86_32(-)]
-	x11-libs/libXrandr[abi_x86_32(-)]
-	x11-libs/libXxf86vm[abi_x86_32(-)]
-	!bundled-libs? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )"
-
-S=${WORKDIR}/data
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to your DISTDIR directory."
-	einfo
-}
-
-src_unpack() {
-	unpack_zip ${A}
-}
-
-src_prepare() {
-	# https://bugzilla.icculus.org/show_bug.cgi?id=5894
-	sed -i \
-		-e 's/LobbyLevel_Valentines2013.udk/LobbyLevel.udk/' \
-		UDKGame/Config/DefaultDunDef.ini || die
-
-	# Remove the binaries that we're unbundling and unnecessary stuff
-	rm -v UDKGame/Binaries/xdg-open || die
-	if ! use bundled-libs ; then
-		einfo "Removing bundled libs..."
-		rm -v UDKGame/Binaries/libopenal.so.1 || die
-	fi
-}
-
-src_install() {
-	# Move the data rather than copying. The game consumes over 5GB so
-	# a needless copy should really be avoided!
-	dodir "${MYGAMEDIR}"
-	mv -v Engine UDKGame "${D}${MYGAMEDIR}" || die
-
-	# use system xdg-open script, location is hardcoded
-	dosym /usr/bin/xdg-open "${MYGAMEDIR}"/UDKGame/Binaries/xdg-open
-
-	newicon -s 48 DunDefIcon.png ${PN}.png
-	make_desktop_entry "${PN}" "Dungeon Defenders"
-	games_make_wrapper ${PN} "./${MY_PN}-x86" "${MYGAMEDIR}/UDKGame/Binaries"
-
-	dodoc README-linux.txt
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/dungeon-defenders/metadata.xml b/games-rpg/dungeon-defenders/metadata.xml
index b878aaa1812d..26079e608bed 100644
--- a/games-rpg/dungeon-defenders/metadata.xml
+++ b/games-rpg/dungeon-defenders/metadata.xml
@@ -5,9 +5,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<use>
-		<flag name="bundled-libs">
-			Use the upstream provided bundled libraries.
-		</flag>
-	</use>
 </pkgmetadata>
diff --git a/games-rpg/kqlives/Manifest b/games-rpg/kqlives/Manifest
index 9dcf7f2561fa..d3a89d42c7dc 100644
--- a/games-rpg/kqlives/Manifest
+++ b/games-rpg/kqlives/Manifest
@@ -3,5 +3,6 @@ AUX kqlives-0.99_dumb2.patch 551 BLAKE2B f903482f3256a2fdeb896ffa2641615dd685ccb
 AUX kqlives-0.99_gcc10.patch 490 BLAKE2B b9fa88b7faf79c39d7d027072759e992e70b55f31a169b0adf97c1116d4e20f920dafa649f0e45e14394505652c8897cc6e14c427a7c05a80ea8d07c398f03de SHA512 75cea1dbbc3f02e8ff724822c2ab8c398aebc9a98e99043642fc1ecfb14e74eac79534cf54e893f0fb2aef578b0028697b658536db2b0dc423664fae6f991bfb
 AUX kqlives.xpm 1404 BLAKE2B f2aae7268857f5c5e4e9a724a2b3a97a930741bf051bbd59cb6e36e4dabe09c29cc17d5b010c1c1ffb0cfaf9f2440e2350cca88adbea76d7429be176b74b6caf SHA512 32aeaa6e80c906f894773a12fa3bfdd2c52f15b11fe00bd99020d1577441a13573abb02a1fb0f11bb875fc1c61bfdc56285b805a5fd423d9ecc42ceb32eb8e66
 DIST kq-0.99.tar.gz 3642143 BLAKE2B 7279d3ab2808caab77c08283cc6aaab84fcef3814c3c259528320d6516fa8937a62d033b899aaaca4b562affed113faab5fac443ed3487565796377092df0f90 SHA512 fa343561679baf2201fb7107153ca07b715c1e56c9a4cb17db0f04759dd859436e8daa6a364d62ad57d138dbb5d8c680e35cafecea1a8f7f217ec190bfdd7918
+EBUILD kqlives-0.99-r100.ebuild 1106 BLAKE2B 952491a15f2eaf1bf0fd316a4ca9eaa5eba936aaa34b66f4d305df8c882712b9eeef27d6118da91fc9aafe19c5607ea6582bc46e65b9ac87538f23dc2cbeabe5 SHA512 ccb55dde7d04731c47cd193995b32f9f5e4a99a8f85bcf8fa6e8db863ac2944fe5d6aefa4b472174c5e4998f4455f84738b6d7dcd20cd552689079d79ddf6e54
 EBUILD kqlives-0.99-r2.ebuild 1039 BLAKE2B dad1b1949b94fe87ed286a0b0e6822b4cad4bdf202a67cf24c59f4c0cd82f2e39d576f524406c1cbe89fa96b8c26e2dc55bb168dcc78178003d99759a9aa875f SHA512 24d5fce808bef484563235ebe1430e26c25aa0bc628f92c8f711863aa1c346b0e97251b1fd05cc836d4a9e7486e8c59dfb6000a5649cbd3fa339905ec8b7fce4
 MISC metadata.xml 409 BLAKE2B 9429ac5342781ed6109743d9b39da1e2094276c6464b7ad982cdbd5d30d8634400890edbb70abbd8c709b3a8c3def37e09a17d60df37e1ce8caeda41ff3869e7 SHA512 d341ddc4a801b649ae83022f3ea04480f59569b2cf91c106ace77735d1d7902fd10a739f41014c1928aae05f66643826390bdfc7917fbfa7106b3656a286edbc
diff --git a/games-rpg/kqlives/kqlives-0.99-r100.ebuild b/games-rpg/kqlives/kqlives-0.99-r100.ebuild
new file mode 100644
index 000000000000..30186ea2a594
--- /dev/null
+++ b/games-rpg/kqlives/kqlives-0.99-r100.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+
+inherit autotools desktop lua-single
+
+MY_P=${P/lives}
+
+DESCRIPTION="A console-style role playing game"
+HOMEPAGE="http://kqlives.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cheats nls"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	>=gnome-base/libglade-2.4
+	media-libs/allegro:0
+	>=media-libs/dumb-2.0.3[allegro]
+	>=x11-libs/gtk+-2.8:2
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${P}_autoconf.patch"	# Fix #597790
+	"${FILESDIR}/${P}_dumb2.patch"		# >=media-libs/dumb-2.0.3 support
+	"${FILESDIR}/${P}_gcc10.patch"		# Fix #661422
+)
+
+src_prepare() {
+	default
+	mv debian/{kq,${PN}}.6 || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable cheats) \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+	doicon "${FILESDIR}"/${PN}.xpm
+	make_desktop_entry ${PN} KqLives ${PN}
+}
diff --git a/games-rpg/sumwars/Manifest b/games-rpg/sumwars/Manifest
index e2ea4f79992a..4cb596ae9f3c 100644
--- a/games-rpg/sumwars/Manifest
+++ b/games-rpg/sumwars/Manifest
@@ -1,3 +1,5 @@
+AUX sumwars-0.5.8-cmake_lua_version.patch 286 BLAKE2B abe2013a9e0928cac9625719014eeb3cae3592938fc16930c73d6ffebf188c1b4120abc51d9c0a77896479384e9153cceb25ff87b30390873690b7d23b71b975 SHA512 5962aa04b8c296b30248de424375107274119971e9db3020d0b66f121b36cb65f840423a097839674311ffa986d73a93e735c6e4fb592a971c6eec890c9e4af1
 DIST sumwars-0.5.8-src.tar.bz2 107811288 BLAKE2B d7eef29ae9ba91d7a368730169d49c4b84e5db5cdbd4be7aa183e91baa50fd45be2b91928903e9cb17d947c2a4947094138c65efe076cdc85f14fbfacadddbd1 SHA512 ccf156f4484b0aeb8984631321d6691dc180ad63fdfa59d92aaa05ada3e871fc10656f32f9ba1b65abe7342e1481e14ca01f025ffc0ec5797cd8e91d97240cf1
 EBUILD sumwars-0.5.8-r1.ebuild 1917 BLAKE2B 270f82d9eb275df0f211ffdf752e8278190d37a1f9b5954406d2e33c094e6fd684f6a4f9be68b7f9ad17d570f95a12bf0c636a72a45aa0730ad06a354c0bda18 SHA512 35ec46e0888370d1d896c154089e9d65dba0a86ff81decbc6dc2bb6c0478b1bc6b45e2062586d3b272ad7d20a2925189755a0ffe64ba708182a98fa93224eb73
+EBUILD sumwars-0.5.8-r100.ebuild 2053 BLAKE2B 290340af0e0a176c5f20ccd4a7be053a1cc849c1f4567691fe13f5704c7babfc8fbe8292f399e2c57c61b78d4f3f1f8ef8a1e39b006912be9bc7295f7e0b4111 SHA512 a856057bdbbb59b88a7099961ebe7a65e129533c303945bf7e7759c5e025b36732317a472ea51d76e170c9f66f490af47f41110c5c56f3dbd6e01e8d97e2c899
 MISC metadata.xml 521 BLAKE2B 773a7729ffb1deb23e15e7ad061596099bfce5e590fd6a4dd04014527df7ab7a91384b86429221960e54331ab094472277e0f23a9ea8e61f1b02a869437a57a7 SHA512 8ff8a6777a1d50900f210f97c22a80c68491d452c550550578cd0481653d4dbc52e3e88ae40dfcd547c62f0f43ad15c5d766330522e04a096c59a93265a470c0
diff --git a/games-rpg/sumwars/files/sumwars-0.5.8-cmake_lua_version.patch b/games-rpg/sumwars/files/sumwars-0.5.8-cmake_lua_version.patch
new file mode 100644
index 000000000000..eed17e93dcd5
--- /dev/null
+++ b/games-rpg/sumwars/files/sumwars-0.5.8-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -179,7 +179,7 @@
+  FIND_PACKAGE(GNUWIN REQUIRED)
+ ENDIF (WIN32)
+ FIND_PACKAGE(OIS REQUIRED)
+-FIND_PACKAGE(Lua REQUIRED)
++FIND_PACKAGE(Lua ${LUA_VERSION} EXACT REQUIRED)
+ FIND_PACKAGE(CEGUI REQUIRED)
+ SET(CEGUI_VERSION_RESOURCES "gui_0.8")
+ 
diff --git a/games-rpg/sumwars/sumwars-0.5.8-r100.ebuild b/games-rpg/sumwars/sumwars-0.5.8-r100.ebuild
new file mode 100644
index 000000000000..f6f1badd5aec
--- /dev/null
+++ b/games-rpg/sumwars/sumwars-0.5.8-r100.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+inherit cmake desktop flag-o-matic lua-single xdg-utils
+
+DESCRIPTION="a multi-player, 3D action role-playing game"
+HOMEPAGE="http://sumwars.org"
+SRC_URI="mirror://sourceforge/sumwars/${P//_/-}-src.tar.bz2"
+
+LICENSE="GPL-3 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+tools debug"
+
+LANGS="de en it pl pt ru uk"
+for L in ${LANGS} ; do
+	IUSE="${IUSE} l10n_${L}"
+done
+unset L
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}
+	>=dev-games/cegui-0.8[ogre]
+	>=dev-games/ogre-1.7.4-r1[freeimage,opengl]
+	dev-games/ois
+	dev-games/physfs
+	>=dev-libs/tinyxml-2.6.2-r2
+	media-libs/freealut
+	media-libs/openal
+	media-libs/libogg
+	media-libs/libvorbis
+	>=net-libs/enet-1.3.0
+	x11-libs/libX11
+	x11-libs/libXrandr
+	tools? ( dev-libs/boost )"
+DEPEND=${RDEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.8-cmake_lua_version.patch
+)
+CMAKE_REMOVE_MODULES_LIST="FindLua FindLua51"
+
+S=${WORKDIR}/${PN}-${PV%_*}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+
+	use debug && CMAKE_BUILD_TYPE=Debug
+
+	local l langs
+	for l in ${LANGS}; do
+		if use l10n_${l}; then
+			langs="${langs} ${l}"
+		fi
+	done
+
+	[[ -z "${langs}" ]] && langs="en"
+
+	# configure sumwars with cmake
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX=""
+		-DLUA_VERSION="$(lua_get_version)"
+		-DSUMWARS_BUILD_TOOLS="$(usex tools)"
+		-DSUMWARS_DOC_DIR="/usr/share/doc/${PF}"
+		-DSUMWARS_EXECUTABLE_DIR="/usr/bin"
+		-DSUMWARS_LANGUAGES="${langs}"
+		-DSUMWARS_NO_ENET=ON
+		-DSUMWARS_NO_TINYXML=ON
+		-DSUMWARS_PORTABLE_MODE=OFF
+		-DSUMWARS_POST_BUILD_COPY=OFF
+		-DSUMWARS_RANDOM_REGIONS=ON
+		-DSUMWARS_SHARE_DIR="/usr/share/${PN}"
+		-DSUMWARS_STANDALONE_MODE=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	newicon -s 128 share/icon/SumWarsIcon_128x128.png ${PN}.png
+	make_desktop_entry ${PN} "Summoning Wars"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-rpg/twclone/Manifest b/games-rpg/twclone/Manifest
deleted file mode 100644
index 3a6a08ed143b..000000000000
--- a/games-rpg/twclone/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX twclone-0.14-format.patch 2700 BLAKE2B 35c25983f3d8544405ecb4095c52866b7b3043aca6b32c1dedd25f3e5c8e7c22e0343bb1c1f7f4d662304a12abdf0c2380a55ce53a4f39c9e76229b00ee511de SHA512 ee5f7aebe920270194bb28ff9d788d040c50c3dffcfc4f2b05ccb05c61e8e1bef53b6e030cd1be9291121ad33e6345cbcb99c02f79d7eccc7a5c009556a636b3
-DIST twclone-source-0.14.tar.gz 163065 BLAKE2B 58d5fb13c5d6dc6bb5f73d2f4da8eace8aad7625a464b45099bd21d9cd8c3d29b25714f73e505d895b7fd8815c0dd3227a289009b7298ebaf83b0ada58deff73 SHA512 66a63e2cc5fe82fb5a5b1f887c9eb3bf8b89044f7f7d489b67e5bb15a21426a5a0eb27b53ab59c05c784fc6fb7ffaadcfc5453fc55943959db859a053adb7843
-EBUILD twclone-0.14-r1.ebuild 556 BLAKE2B 243f28a30624aa42dd70d4b0d1389cf9a5192b7aa25a5de583ce1c433e3f6a2cbbb65496825041c00fca762f04b66cc036924220748072bdbd26a238c43892a6 SHA512 18f5be3eb6e6d0fef5eddfccf4f7b2344aeb2dae7cec2a05160da1ae785a2ec43578f21547ff71c7b6aac9a9457ca7702c2edcb3af90d68d3532cc7007121d32
-MISC metadata.xml 687 BLAKE2B bdfc645799af71efafb6ab5c399dd7243f60584ec3be6333f40830cfdbf21618358eb210abcbd8c8d2c6cbfefdf8735886892781b4e9a7587c7f4f7f3eb21e53 SHA512 376bb763d716ad1cb9513b72f9b301b013339aad3d3df02124d14e653275b322dc18ff4c7d87899a424b2d75cb09f090b516845d6e3e7f46f91e98273abf7320
diff --git a/games-rpg/twclone/files/twclone-0.14-format.patch b/games-rpg/twclone/files/twclone-0.14-format.patch
deleted file mode 100644
index d9d1a1c52516..000000000000
--- a/games-rpg/twclone/files/twclone-0.14-format.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- a/bigbang.c	2015-10-27 09:21:51.172611109 +0100
-+++ b/bigbang.c	2015-10-27 09:25:41.117233447 +0100
-@@ -530,13 +530,11 @@
-     planetfile = fopen ("./planets.data", "w");
-     for (loop = 1; loop <= 299 - strlen(terraInfo); loop++)
-         strcat(terraInfo, " ");
--    strcat(terraInfo, "\n");
--    fprintf (planetfile, terraInfo);
-+    fprintf (planetfile, "%s\n", terraInfo);
-     sprintf (ferrinfo, "%d:%d:Ferringhi:1:-2:Unknown:1000:1000:1000:0:0:0:0:3:100000:20:30:10:0:0:0:0:", 2, ferringhiSector);
-     for (loop = 1; loop <= 299 - strlen(ferrinfo); loop++)
-         strcat(ferrinfo, " ");
--    strcat(ferrinfo, "\n");
--    fprintf(planetfile, ferrinfo);
-+    fprintf(planetfile, "%s\n", ferrinfo);
-     randomPlanetInfo = malloc (sizeof (strNameLength));
-     if (numRandomPlanets > 0)
-     {
-@@ -552,8 +550,7 @@
-                      , c, tempint, randomname (randomPlanetInfo), randomnum(1,5));
-             for (loop = 1; loop <= 299 - strlen(ferrinfo); loop++)
-                 strcat(ferrinfo, " ");
--            strcat(ferrinfo, "\n");
--            fprintf(planetfile, ferrinfo);
-+            fprintf(planetfile, "%s\n", ferrinfo);
- 
-             c++;
-         }
-@@ -616,10 +613,9 @@
-         fileline = strcat (fileline, ":");
-         if (sectorlist[x]->nebulae != NULL)
-             fileline = strcat (fileline, sectorlist[x]->nebulae);
--        fileline = strcat (fileline, ":\n");
-         /*  Later put in whitespace buffer for saving */
-         /*  Not needed until user created beacons put in */
--        fprintf (file, fileline);
-+        fprintf (file, "%s:\n", fileline);
-     }
-     fclose (file);
-     free (fileline);
-@@ -646,8 +642,7 @@
-         len = (int) strlen (fileline);
-         for (y = 0; y <= 99 - len; y++)
-             strcat (fileline, " ");
--        strcat (fileline, "\n");
--        fprintf (file, fileline);
-+        fprintf (file, "%s\n", fileline);
-     }
-     fclose (file);
- 
---- a/config.c	2015-10-27 09:30:00.091283678 +0100
-+++ b/config.c	2015-10-27 09:30:25.068806593 +0100
-@@ -140,9 +140,8 @@
- 
-   for (loop=0; loop < 199 - strlen(buffer); loop++)
- 		strcat(buffer, " ");
--  strcat(buffer, "\n");
- 
--  fprintf(configfile, buffer);
-+  fprintf(configfile, "%s\n", buffer);
- 
-   fclose(configfile);
-   free(buffer);
---- a/planet.c	2015-10-27 09:31:44.867282757 +0100
-+++ b/planet.c	2015-10-27 09:32:17.083667674 +0100
-@@ -59,8 +59,7 @@
- 		addint(stufftosave, planets[index]->citdl->upgradestart, ':', BUFF_SIZE);
- 		for (loop=0; loop< 399 - strlen(stufftosave); loop++)
- 			strcat(stufftosave, " ");
--		strcat(stufftosave, "\n");
--		fprintf(planetfile, stufftosave);
-+		fprintf(planetfile, "%s\n", stufftosave);
- 		}
- 	}
- 	fclose(planetfile);
diff --git a/games-rpg/twclone/metadata.xml b/games-rpg/twclone/metadata.xml
deleted file mode 100644
index 56bd9d00cd1f..000000000000
--- a/games-rpg/twclone/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>
-How many of you remeber the BBS days back in the late 80's and early 90's? 
-Back when you would call in play games and go on with your life? Well I'm 
-trying to duplicate one of those old games. It was called Trade Wars 
-2002(Created by Martech Software). So I decided to make a game similar to it 
-that runs in Linux.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">twclone</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/twclone/twclone-0.14-r1.ebuild b/games-rpg/twclone/twclone-0.14-r1.ebuild
deleted file mode 100644
index 95f7c5550971..000000000000
--- a/games-rpg/twclone/twclone-0.14-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-source-${PV}"
-DESCRIPTION="Clone of BBS Door game Trade Wars 2002"
-HOMEPAGE="http://twclone.sourceforge.net/"
-SRC_URI="mirror://sourceforge/twclone/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-format.patch
-)
-
-src_install() {
-	DOCS="AUTHORS ChangeLog PROTOCOL README TODO" \
-		default
-	cd "${D}/usr/bin"
-	for f in * ; do
-		mv {,${PN}-}${f}
-	done
-}