gentoo resync : 15.12.2019

20 files changed, 41 insertions, 366 deletions

diff --git a/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
index 632db8344465..b059293c8f03 100644
--- a/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,6 +57,7 @@ pkg_setup() {
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
+	"${FILESDIR}"/${PN}-0.0.23b-header_includes_fix.patch
 )
 
 src_configure() {
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index bd2e6c1f7052..8073081b8856 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1,6 +1,7 @@
 AUX 0ad-0.0.21_alpha-gentoo.patch 3905 BLAKE2B 265020af1e1df234d0932c6294e0cda9c0f48bc1b311d6770c8347431c17e5e99c68f4c52cf6e1277ffb2e57431a6c237d2dc4f452e563eb343b06f62ab1eede SHA512 592e9fdff6ef6d88efc9c4a5c856e41240845187cc4a4b3d9d6b5c616eb1f664fdf702b7b0a30cdfeedd6d87ac0fab913df477567b84d42e13d2cf2761cfdec8
+AUX 0ad-0.0.23b-header_includes_fix.patch 463 BLAKE2B 9148cd302596bd1d37df7d93e72794530cf38eadeb26af1a05dda96c9dfde5022e2346eb92d165b434d82450deee06d539c89855bcad6a41285e087fd3417904 SHA512 df4cbe5f8c00c2ec4539794dfa4904a129e4730ae109e7678d9e201370ea00a00b1352ebf1f9fba46fcf48f0a7f46de1ec51613aa58f56ecd4a0f5f051c0524f
 DIST 0ad-0.0.23-alpha-unix-build.tar.xz 31907988 BLAKE2B 567b9e1b5cd653206194e042f4f0859cd4f9afe75d52d3f480a328b76fdcdd746254502fbf284f790b4932c912ff31453bbc8c986c879ad76baa3d2a5db802c9 SHA512 4a1c86b19e0d8ec7d9b8bf75428df0255f95e7f991f419734f9b6ddc288a537405a34c5d7081f1a97475155c49013af85dee5c0265c35c7dbc003b46637a03d7
 DIST 0ad-0.0.23b-alpha-unix-build.tar.xz 31922812 BLAKE2B db7d6bf1a2bb084870b914cf974bfdb19812ff6f9391e5bc5213ae215fc670b77bd4508a5432aa3e47bf327bd37d4bb14961ab3332b165b53327c3f01a935ac1 SHA512 82934313c46c4fd89e3841d5bbf901904abbd2108e9749529d7282bd24ac53b9e6878681c06e6019f4d8ec0e425c28300b0aafc9610a66a331777ffb58ed6135
 EBUILD 0ad-0.0.23_alpha.ebuild 3408 BLAKE2B bb6fbd77a2e9a0b27f086b33bb347ac5c5a8c76277b967359dfd8b4c7b6ea4b3f296aa150bacc3b3dd9a1460e5ebda436ad1429c5c1eaefe826a64403417ac1c SHA512 99db5ad39c1e0fe4ec9762df7c27e5ae12a1234007cd5d6e229110471affa705373015bb6e42e23b1f8ace93c5a3bae4afc204d966c5940f810415cd255186bc
-EBUILD 0ad-0.0.23b_alpha.ebuild 3405 BLAKE2B 604eeb83f57a526ae2b2af60ac81f8f0b7704c4c3596c64a4b171d55297ead1d51a36379e04e2dc65d7f0ccf8b693063960327557d82e30d2c2111bee64d6d82 SHA512 75e3cc52724798374c2c9818ec180ccec2d6bc41699ff7eb1c2e91bda38afa9f2f2550838b2ea5b72a94e2909d2cd12bb66e38ec4799acc0d6e92f8c8526ebc6
+EBUILD 0ad-0.0.23b_alpha.ebuild 3460 BLAKE2B f1f499342e8cb4a5512826d8e92cf3677ca5019223d1b6f89cf0d0c1f8427d393ef4057a4c6539c8360fcbf1335bb7b362ed0801f7aac910b6106a2fee3729e1 SHA512 f2c223998a211cfb9378cadef51e986bb1a3e63fafd5cc0acc41ae1f28d1ed8e7b4c529a609f5c7415b99764b927acebdbda83ab8cb264441b3159b0c910b325
 MISC metadata.xml 668 BLAKE2B 9bfa86da2d6e1631217082f88905d8d8be7a2c91248839b9a0f5da9d0c214552b11f4af861eb04072e4645b47505d83d0b93c1313f7a3857b1006f94a699b3b2 SHA512 7aab21c31587f1cce5b4635ace0fbbb5bcdc2a6d811df68494ac1fb251fbfc75911cfa3a9e1a60c28f684f64a919164c6e3504fd3fbba3b0ec05afe8278ae343
diff --git a/games-strategy/0ad/files/0ad-0.0.23b-header_includes_fix.patch b/games-strategy/0ad/files/0ad-0.0.23b-header_includes_fix.patch
new file mode 100644
index 000000000000..60bf9d1679be
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.23b-header_includes_fix.patch
@@ -0,0 +1,20 @@
+--- 0ad-0.0.23b-alpha/source/ps/CLogger.h
++++ 0ad-0.0.23b-alpha/source/ps/CLogger.h
+@@ -22,6 +22,7 @@
+ #include <string>
+ #include <set>
+ #include <sstream>
++#include <deque>
+ 
+ #include "ps/ThreadUtil.h"
+ #include "third_party/cppformat/format.h"
+--- 0ad-0.0.23b-alpha/source/ps/Profiler2GPU.cpp
++++ 0ad-0.0.23b-alpha/source/ps/Profiler2GPU.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include "precompiled.h"
+ 
++#include <stack>
+ #include "Profiler2GPU.h"
+ 
+ #include "lib/ogl.h"
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index cdabf473d697..5350c1dbce5e 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest
index 9977c75a3225..cfef8b6cda00 100644
--- a/games-strategy/colobot/Manifest
+++ b/games-strategy/colobot/Manifest
@@ -1,6 +1,6 @@
 DIST colobot-0.1.11.tar.gz 1430595 BLAKE2B 6e4a23f17631031a6f502b045637949d99bfcf8aa723f11c406c8cdb9b201b9a2771de8b8c92829bc890848a19eb182bc30a45a51e6d281ce64370f6c7a0d8a5 SHA512 fe32bc56b6fae9435c74a73b694b7d2b93667e5d15b1c57a7558e492613f0a5d4cab72ff341ab4c921150137282cc71292a1e31eb1ed06c752de33c50120f20e
 DIST colobot-gold-0.1.12-alpha.tar.gz 1468594 BLAKE2B 2b470e8b074e4a973b751062dca2358396066d8816c2b1b5b44649b798610dccd73ab5fed4086f2aa8d4495f3de69dd8b72b45f97f23f66b18a50fc976bf25ef SHA512 63647a16b376db6544830f96e7d323c0f58003645bf636abd1cab0ffd47b39b0bef47191d584f5156b75324d75dfdfdcabe8b89be565087c37c367ca366f3cbe
-EBUILD colobot-0.1.11.ebuild 1372 BLAKE2B b40e81306d7fc183e9d523db5d60cd19a88880e010584bc4ccb762734ad34fe7ffc1ff50660cdd80e38edca4edfb915c047d4da93caafb82d1fec0c5779879e3 SHA512 19012df06321273072c51cd9408c80f487f53e979c0eaf31edf1fab574d3a41d4a37582a05888f4486891ae057e5341905f28dd686a8e94552d9fb38062cd0cd
+EBUILD colobot-0.1.11.ebuild 1396 BLAKE2B add1b2c941611d1211eb5bca0c66a6590165fc6a142da9643b54dbc4a11166921878c8496d40cf2a68d377adef02ab9b3deb41854f43cd90d3af8e6f63ba84c1 SHA512 defd48a69a000859dd2999e8d1e9c167c66d54beb118a4bf75b64de20bcaceab79b489073f08a7ad280ef700d12c3110a2207500ea5622208137bd2f8079da1f
 EBUILD colobot-0.1.12.ebuild 1478 BLAKE2B a66d5c4aa584706868cfa8f76a368f6c614f48767a086946eafad83a44ae44d3c24a70650f4aa88971998495b70ff1122d02fded40193eda6f8fe07fb7de4080 SHA512 fcb8e33bccbf67cb835732630f1b84009202cce3a02dd7a497050f8fd91c3cb4ae54f62e3b24c62e1aa2687a4067aeced47cea1c7f5fe15a7707c451478bda83
 EBUILD colobot-9999.ebuild 1422 BLAKE2B 3c0d22a6df76aa3303567bff0b42c0e52aa765b0ec7e1dc6822125a949fcf94b89bc5957778e3aa2553a36c316105d96edcd9351629bb809b2a6187967ef1391 SHA512 791b6935cedfd32412d2fabf75cc388d7cc21bdd17262b713efbce5c1627e72fa78e152d305cc4b7aa59cdbed5b94f124b4a0e6cc7df6aa9081f3c2c9fa645de
 MISC metadata.xml 418 BLAKE2B b30194895d7f35dc6b2bf5ed2d6153ab03832eff44536e837058b4c5641760c55ea846a3ffe91027d8892ab7ccd4a36be688b89a5909c57ca57a18f8a610f022 SHA512 6ffc5220d200c722b0e7da2ee8734282ea0fabd7d319f8a21cd88da6743312c869f44bd3b14af7031ce970feb9b6c4349236db2a7aee69ea8041e3b000812e3c
diff --git a/games-strategy/colobot/colobot-0.1.11.ebuild b/games-strategy/colobot/colobot-0.1.11.ebuild
index 02e4757ef02e..f1765e2658c2 100644
--- a/games-strategy/colobot/colobot-0.1.11.ebuild
+++ b/games-strategy/colobot/colobot-0.1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,6 +21,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="devbuild test tools doc +openal"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-games/physfs
diff --git a/games-strategy/crimson/Manifest b/games-strategy/crimson/Manifest
index 5b018af99190..6d6e25960033 100644
--- a/games-strategy/crimson/Manifest
+++ b/games-strategy/crimson/Manifest
@@ -1,3 +1,3 @@
 DIST crimson-0.5.3.tar.bz2 882366 BLAKE2B 6faece818105d29dd2d141b925b332cfd5214dd918f5c07cacd2f6cdfcd6a58c86e6ab1cc2fce396fbf24839f5dded619e92a786f03663e78068926a8d0e6be3 SHA512 9632317c4b258ed5e501ad1d058706ed654fc621b07099f65d93e29fe92e53fc8f6bbffa13c70fc2129f30695d3f10e85174234dc96cc171631b3465d2b7cffc
-EBUILD crimson-0.5.3-r1.ebuild 939 BLAKE2B edc3f30e9e491dd3fe94acd0ef3bafaa153021dd465ca4b63dd4ec8b0b5ee0c25abde13e47b09326eb10f0c0beaad0f019df2744331f02badadadd78e4e1721a SHA512 fe6a679dc47f6297fec3864f2f2f9f6b4abb0bf7a2a2250a4df6b7994fd99dbf2d3838c6e4844f105732950ea4981cd6743675036be7aed675baa047dc0d1e4c
+EBUILD crimson-0.5.3-r1.ebuild 963 BLAKE2B 2904cfac589b34ee69a66f95717763af9f944a8ea3d7d04aca64fac5aaaae45be6b248c5bef775106f16d11b34c895fea2bde5567623271e84e20ca2caafb222 SHA512 0f0e9e5f5f316e329034670d16c469a918e87d5cbb4678cc1b4be2fbab0bf7d352d351275977f56fb89a42ca6014bf4399c487ce2167cc1cf9229c8150237825
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/crimson/crimson-0.5.3-r1.ebuild b/games-strategy/crimson/crimson-0.5.3-r1.ebuild
index ad228438eb35..3479d4caac61 100644
--- a/games-strategy/crimson/crimson-0.5.3-r1.ebuild
+++ b/games-strategy/crimson/crimson-0.5.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test zlib"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	media-libs/libsdl[sound,video]
diff --git a/games-strategy/heroes3/Manifest b/games-strategy/heroes3/Manifest
deleted file mode 100644
index 168420e6169e..000000000000
--- a/games-strategy/heroes3/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX heroes3-wrapper.sh 195 BLAKE2B 8c588f523487201cc7323f49e0912c32dee2699d04ed4ac9bea55aa588918fc797c93d2fbeb04aa5a726ebce01e0862d5e21a80d477f1e32f535f5c5c9d771ef SHA512 ac1871676ffb0c818ddd9dcadad031d3e296982a989dcc91241b2630eb773e341058e1d4406374a21bcc0f6c8caba94398541ddbc540e7c140660838ef3ed0c8
-DIST heroes3-1.3.1a-cdrom-x86.run 3012188 BLAKE2B 9a76fef81737fd4d0bd6d6c75a5c845a8fef00e739463737996b2065cc9be0c773c198d76310ceafb25cd60b01ded7862cc3ef906eebbe91d50d5f34d454a23a SHA512 d0cb902386361b17009aece0d0508a0c19683c71acf3abe11a7f50ec2d4710a89cda3f5f9da326b58e9b945da5f62533dea54457e141ce71ebc3e9945dca814d
-DIST heroes3-1.3.1a-ppc.run 2643068 BLAKE2B bb975aca97d5b753badb6f0511f2bc88f3ace3488f82a1d70ddd5cadf78f8ab57c4472f6d3d3e9f69728d1008d51ab31a816660611e421873f7b773bf76fb23e SHA512 3578dbed0ed9fd47f67e6abaec4b4d66628160509e68dc3bea7b5288230e344b5b8f9d380c6a35ffc9d084d0e2a54ce84df72b13bfb609fa4d7edd1456264276
-EBUILD heroes3-1.3.1a-r2.ebuild 5490 BLAKE2B a28b071bb1d6aa050206caf1bb60fab3cd57efe9cdb69f4176e6e8e56615acc624b4d1ab62b895330d0e6a42adfa9da1989a9a9ddf39a4ab68dfa678e4a22041 SHA512 51047c467215e0127630dbb056107220f4bf71d6b03006f509e49f4073a19275681790c07cf73e13037a90cc1923a5f56d63a96db14639ef62f4d3fd12b1f427
-MISC metadata.xml 451 BLAKE2B ea23bfe60a36d79f73d5ec04c4b58fe66241baff684458e6121f0f247ee8516767f372551e8b17933cbdb4271d3e99f6028c9a99136daa6e8b558e7a918acf2a SHA512 d4b4f5dd75aec49703e77221d3811c20f72405f45f5ac7990e46a8cf8d639f3c53c5bfae13e6615c0a0ac16ee57073c8e92de355f7e1ac934d9be6b90bce6990
diff --git a/games-strategy/heroes3/files/heroes3-wrapper.sh b/games-strategy/heroes3/files/heroes3-wrapper.sh
deleted file mode 100644
index 3847c539ed76..000000000000
--- a/games-strategy/heroes3/files/heroes3-wrapper.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-DIR="${HOME}/.loki/heroes3"
-
-if [ ! -d "${DIR}" ]; then
-    echo "* Creating '${DIR}'"
-    mkdir -p ${DIR}
-fi
-
-# fixes bug #93604
-cd ${DIR}
-
-exec GAMES_PREFIX_OPT/heroes3/heroes3 ${@}
diff --git a/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild b/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
deleted file mode 100644
index 46b85c58595f..000000000000
--- a/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-#	[x] Base Install Required (+4 MB)
-#	[x] Scenarios (+7 MB)
-#	[x] Sounds and Graphics (+118 MB)
-#	[x] Music (+65 MB)
-#	[x] Videos (+147 MB)
-#	--------------------
-#	Total 341 MB
-
-EAPI=5
-LANGS="de es pl"
-LANGPACKPREFIX="${PN}-lang"
-LANGPACKBASE="http://babelize.org/download/"
-LANGPACKPATHPREFIX="${LANGPACKBASE}/${LANGPACKPREFIX}"
-LANGPACKVERSION=1.0.4
-
-inherit eutils unpacker cdrom games
-
-DESCRIPTION="Heroes of Might and Magic III: The Restoration of Erathia"
-HOMEPAGE="http://www.lokigames.com/products/heroes3/"
-
-# Since I do not have a PPC machine to test with, I will leave the PPC stuff in
-# here so someone else can stabilize loki_setupdb and loki_patch for PPC and
-# then KEYWORD this appropriately.
-SRC_URI="x86? ( mirror://lokigames/${PN}/${P}-cdrom-x86.run )
-	amd64? ( mirror://lokigames/${PN}/${P}-cdrom-x86.run )
-	ppc? ( mirror://lokigames/${PN}/${P}-ppc.run )"
-# This is commented because the server is unreachable.
-#	linguas_es? ( ${LANGPACKPATHPREFIX}-es.tar.gz )
-#	linguas_de? ( ${LANGPACKPATHPREFIX}-de.tar.gz )
-#	linguas_pl? ( ${LANGPACKPATHPREFIX}-pl.tar.gz )"
-
-#		${LANGPACKBASE}/${PN}-localize-${LANGPACKVERSION}.run
-
-LICENSE="LOKI-EULA"
-SLOT="0"
-IUSE="nocd maps music sounds videos"
-#linguas_en linguas_es linguas_pl linguas_de"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="strip mirror bindist"
-
-DEPEND="=dev-util/xdelta-1*
-	games-util/loki_patch"
-RDEPEND="!ppc? ( sys-libs/lib-compat-loki )"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-pkg_setup() {
-	games_pkg_setup
-#	strip-linguas en ${LANGS}
-
-	use nocd && fullinstall=1
-	use sounds && use videos && use maps && fullinstall=1
-
-	[[ ${fullinstall} -eq 1 ]] \
-		&& ewarn "The full installation takes about 341 MB of space!"
-
-#	if [[ -n "${fullinstall}" ]]
-#	then
-#		langcount=0
-#		for i in ${LINGUAS}
-#		do
-#			i="${i/_/-}"
-#			if [[ ${i} != "en" ]]
-#			then
-#				let $((++langcount))
-#				if [[ $langcount = 2 ]]
-#				then
-#					eerror "Heroes3 only supports one localization at once!"
-#					die "Localization is only supported when Heroes3 is in a single language!"
-#				fi
-#			fi
-#		done
-#	else
-#		for i in ${LINGUAS}
-#		do
-#			i="${i/_/-}"
-#			if [[ ${i} != "en" ]]
-#			then
-#				eerror "Full installation (nocd flag or data + video + maps flags) is needed for ${i} language!"
-#				die "Localization is only supported when Heroes3 is fully locally installed!"
-#			fi
-#		done
-#	fi
-}
-
-src_unpack() {
-	cdrom_get_cds hiscore.tar.gz
-	(use x86 || use amd64) && unpack_makeself ${P}-cdrom-x86.run
-	use ppc && unpack_makeself ${P}-ppc.run
-
-#	for i in ${LINGUAS}
-#	do
-#		i="${i/_/-}"
-#		if [[ ${i} != "en" ]]
-#		then
-#			mkdir localize
-#			cd localize
-##			unpack_makeself ${PN}-localize-${LANGPACKVERSION}.run
-#			unpack ${LANGPACKPREFIX}-${i}.tar.gz
-#			break
-#		fi
-#	done
-}
-
-src_install() {
-	exeinto "${dir}"
-	insinto "${dir}"
-	einfo "Copying files... this may take a while..."
-	doexe "${CDROM_ROOT}"/bin/x86/${PN}
-	doins "${CDROM_ROOT}"/{Heroes_III_Tutorial.pdf,README,icon.{bmp,xpm}}
-
-	if use nocd
-	then
-		doins -r "${CDROM_ROOT}"/{data,maps,mp3}
-	else
-		if use maps
-		then
-			doins -r "${CDROM_ROOT}"/maps
-		fi
-		if use music
-		then
-			doins -r "${CDROM_ROOT}"/mp3
-		fi
-		if use sounds
-		then
-			insinto "${dir}"/data
-			doins "${CDROM_ROOT}"/data/{*.lod,*.snd}
-		fi
-		if use videos
-		then
-			doins -r "${CDROM_ROOT}"/data/video
-		fi
-	fi
-
-#	if [[ -n "${fullinstall}" ]]
-#	then
-#		for i in ${LINGUAS}
-#		do
-#			i="${i/_/-}"
-#			if [[ ${i} != "en" ]]
-#			then
-#				find "${S}/localize/${i}" -type f | while read xfile
-#				do
-#					local file=$(echo "${xfile}" | \
-#						sed "s#^${S}/localize/${i}/##;s#\.xdelta\$##")
-#					ebegin "Localizing ${file}"
-#					xdelta patch "${xfile}" "${Ddir}/${file}" "${Ddir}/${file}.xdp"
-#					local retval=$?
-#					if [[ $retval = 0 ]]
-#					then
-#						mv -f  "${Ddir}/${file}.xdp" "${Ddir}/${file}"
-#					else
-#						rm -f "${Ddir}/${file}.xdp"
-#					fi
-#					eend $retval "File $file could not be localized/patched! Original english version untouched..."
-#				done
-#				break
-#			fi
-#		done
-#	fi
-
-	tar zxf "${CDROM_ROOT}"/hiscore.tar.gz -C "${Ddir}" || die
-
-	cd "${S}"
-	loki_patch --verify patch.dat
-	loki_patch patch.dat "${Ddir}" >& /dev/null || die
-
-	# now, since these files are coming off a cd, the times/sizes/md5sums wont
-	# be different ... that means portage will try to unmerge some files (!)
-	# we run touch on ${D} so as to make sure portage doesnt do any such thing
-	find "${Ddir}" -exec touch '{}' \;
-
-	newicon "${CDROM_ROOT}"/icon.xpm heroes3.xpm
-
-	prepgamesdirs
-	make_desktop_entry heroes3 "Heroes of Might and Magic III" "heroes3"
-
-	if ! use ppc
-	then
-		einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'."
-		dosym /lib/loki_ld-linux.so.2 "${dir}"/ld-linux.so.2
-		dosym /usr/lib/loki_libc.so.6 "${dir}"/libc.so.6
-		dosym /usr/lib/loki_libnss_files.so.2 "${dir}"/libnss_files.so.2
-	fi
-
-	elog "Changing 'hiscore.dat' to be writeable for group 'games'."
-	fperms g+w "${dir}/data/hiscore.dat"
-
-	# in order to play campaign games, put this wrapper in place.
-	# it changes CWD to a user-writeable directory before executing heroes3.
-	# (fixes bug #93604)
-	einfo "Preparing wrapper."
-	cp "${FILESDIR}"/heroes3-wrapper.sh "${T}"/heroes3 || die
-	sed -i -e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" "${T}"/heroes3 || die
-	dogamesbin "${T}"/heroes3
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "To play the game run:"
-	elog " heroes3"
-}
diff --git a/games-strategy/heroes3/metadata.xml b/games-strategy/heroes3/metadata.xml
deleted file mode 100644
index 5ae90d93661b..000000000000
--- a/games-strategy/heroes3/metadata.xml
+++ /dev/null
@@ -1,13 +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>
-  <use>
-    <flag name="maps">Installs optional map data</flag>
-    <flag name="music">Installs optional music data</flag>
-    <flag name="sounds">Installs optional sound data</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-strategy/naev/Manifest b/games-strategy/naev/Manifest
index 113e0384af04..86f70c19e617 100644
--- a/games-strategy/naev/Manifest
+++ b/games-strategy/naev/Manifest
@@ -1,4 +1,4 @@
 DIST naev-0.6.1.tar.bz2 1047908 BLAKE2B 3763440c64f89c5ceb5993a3e4ee356d0cc615df8b70dba14ce0fb35d12a0a136e82958349887d9c5a719e14d9ddfc47beb524b88650ea6f7a6859a6422d6898 SHA512 4766c80b49de5a7e748948f0404ac54edbc5afa80618150d1f993d66c7462ea73bfc5220d73073cb51cd76ff5dc6ecdf935d6f843051943136ceefaea9837203
 DIST ndata-0.6.1.zip 303984255 BLAKE2B 154d8b326e2596cfe16fc646e7d482c07d7015253b6933889d12b93a2ee7e28649b1f3ffcb0c0ed2bfe9d1e3654623cab00113486d05fe6fd1262ce989bf9c25 SHA512 71c3024e1713b094b63cb0de3c70239d61c54142b715e61d5206c5eb3cb8c7a851fc1b388ecf891110dd8bb5c2b3759af71d20f39cb6e629c71b27386a57d7fe
-EBUILD naev-0.6.1-r1.ebuild 1545 BLAKE2B 44c10dd5764f76cfb8c693d5b75072d0262f91ee88e1d0769cc931508b494f710536b6c4bf922b9a97de65f04752a8c4d416ec2323e26677900321725f6a2da9 SHA512 787650821eb5ca41c6c816961fee73b30ed915c2c2ad1fc95c1b389e32230ce809f41e92d601aa662af867db361b6404ebb66f85902b1de4b178cf52268272a0
+EBUILD naev-0.6.1-r1.ebuild 1565 BLAKE2B aebb3c6cd694faae485311e8d6c3ce68ffd8babaf40c80c5ae6a905e98dd17306b93e0d6095101f3f5de470980a265b6bdcbd0932ec1ea6401cfbd901ced8fa8 SHA512 653098bafd66c78558c3e5e55b8470b9b887ea2bf066c7fbf7abf49071c5afdf683c96750232c64590dd0f646b1fd61f95908651eb3b05ff3321e0d13dd7e304
 MISC metadata.xml 480 BLAKE2B 5769dca136bfc7d26f0b5acb60ee6598d75651b7a58d9899b6da0839180a95bee9d183c229026773ec5641e07637e3dbbfbe4fe6f77b0c466fdf62dfb01fc4cc SHA512 d42e9402581393d47976730560c1850d41e0bdd5d8bf842781222b4621db4c5c55ed5b3a886106d7bc43c3830e38bfef55182478fa7eae8bc6342cd1ec293f62
diff --git a/games-strategy/naev/naev-0.6.1-r1.ebuild b/games-strategy/naev/naev-0.6.1-r1.ebuild
index c7932c3eb325..c8999020f3fe 100644
--- a/games-strategy/naev/naev-0.6.1-r1.ebuild
+++ b/games-strategy/naev/naev-0.6.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit flag-o-matic gnome2-utils
 
 DESCRIPTION="A 2D space trading and combat game, in a similar vein to Escape Velocity"
-HOMEPAGE="http://blog.naev.org/"
+HOMEPAGE="https://github.com/naev/naev"
 SRC_URI="mirror://sourceforge/naev/${P}.tar.bz2
 	mirror://sourceforge/naev/ndata-${PV}.zip"
 
@@ -28,6 +28,7 @@ RDEPEND="
 	openal? ( media-libs/openal )
 "
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	virtual/pkgconfig
 "
 
diff --git a/games-strategy/smac/Manifest b/games-strategy/smac/Manifest
deleted file mode 100644
index 2961c95d4a77..000000000000
--- a/games-strategy/smac/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST smac-6.0a-x86.run 6801730 BLAKE2B 95d50c79cde06c4abb5473d7a67f4a66205f7147b7796c9f5e62273776083ce592ec748fd4db559b57568075fb53b4d44db05b2cf14e450ed5757898da6c26d7 SHA512 b71dd1ee46d37d66131cf6fc15c6a406719989021c8dbb6e74cded18c5520ee9ba4bbdfc5bdfc0ddfa67fa2e846365636be41d87a6440473e8ae5ebf542b7744
-DIST smac-install-ppc.run 18528928 BLAKE2B f5c9689c192ebd8ae03d5bb5d4db6deb2b19c5924ce87426cb9140163c9b53a1c4b0ba8592d8b823b2b73847cbf4ffa6d400000a3cf458dd5473ab6bd0aef965 SHA512 99fc6edca2c9e64bfc0cab644cbd061c3842359c16e5e6537a2aa2df4cd2a1a6a39169a2b9540199b08f7aee28f4e2cfad814499fdd55b5edf7ab9b19c12d793
-EBUILD smac-6.0a.ebuild 3081 BLAKE2B f4307008823a84ab2f47d445fd8e97a53f78b5320a6afc1e58cc79a6d5a4a15c5569995a02f9ed6eb3e2d2e8ee66062a5b9397546b8e94b32d6209d1e9bbbc72 SHA512 d581ce47fe9b14d2b2652c435972c2af563a4d956dba74583c8a8b8f645f6deeb4e5fc299fcb02f1981868213bba884c6c6388cb1393bfd6ee0ac4c951195061
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/smac/metadata.xml b/games-strategy/smac/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/smac/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/games-strategy/smac/smac-6.0a.ebuild b/games-strategy/smac/smac-6.0a.ebuild
deleted file mode 100644
index 098890ca9b4c..000000000000
--- a/games-strategy/smac/smac-6.0a.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker cdrom games
-
-DESCRIPTION="Linux port of the popular strategy game from Firaxis"
-HOMEPAGE="http://www.lokigames.com/products/smac/"
-SRC_URI="x86? ( mirror://lokigames/${PN}/${P}-x86.run )
-	amd64? ( mirror://lokigames/${PN}/${P}-x86.run )
-	ppc? ( http://mirrors.dotsrc.org/lokigames/installers/${PN}/${PN}-install-ppc.run )"
-
-LICENSE="LOKI-EULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+videos"
-RESTRICT="strip mirror bindist"
-
-DEPEND="games-util/loki_patch"
-RDEPEND="sys-libs/glibc
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	!ppc? ( sys-libs/lib-compat-loki )
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer
-	media-libs/smpeg
-	media-libs/freetype
-	sys-libs/zlib"
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-src_unpack() {
-	cdrom_get_cds Alien_Crossfire_Manual.pdf
-	mkdir -p "${S}"/a
-	cd "${S}"/a
-	use x86 || use amd64 && unpack_makeself ${P}-x86.run
-	use ppc && unpack_makeself ${PN}-install-ppc.run
-}
-
-src_install() {
-	einfo "Copying files... this may take a while..."
-	exeinto "${dir}"
-	doexe "${CDROM_ROOT}"/bin/x86/{smac,smacx,smacpack}
-
-	insinto "${dir}"
-	doins ${CDROM_ROOT}/{{Alien_Crossfire,Alpha_Centauri}_Manual.pdf,QuickStart.txt,README,icon.{bmp,xpm}}
-
-	cd "${Ddir}"
-	tar xzf "${CDROM_ROOT}"/data.tar.gz || die
-	insinto "${dir}"/data
-	doins "${CDROM_ROOT}"/data/*.{pcx,cvr,flc,gif}
-	doins -r "${CDROM_ROOT}"/data/{facs,fx,projs,techs,voices}
-
-	if use videos ; then
-		doins -r "${CDROM_ROOT}"/data/movies
-	fi
-
-	cd "${S}"/a
-	if use ppc ; then
-		cd ${P}-ppc
-	fi
-	loki_patch --verify patch.dat
-	loki_patch patch.dat "${Ddir}" >& /dev/null || die
-
-	# now, since these files are coming off a cd, the times/sizes/md5sums wont
-	# be different ... that means portage will try to unmerge some files (!)
-	# we run touch on ${D} so as to make sure portage doesnt do any such thing
-	find "${Ddir}" -exec touch '{}' +
-
-	newicon "${CDROM_ROOT}"/icon.xpm smac.xpm
-
-	games_make_wrapper ${PN}pack ./${PN}pack "${dir}" "${dir}"
-	games_make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
-	games_make_wrapper ${PN}x ./${PN}x "${dir}" "${dir}"
-	make_desktop_entry smacpack "Sid Meier's SMAC Planetary Pack" smacpack
-	make_desktop_entry smac "Sid Meier's Alpha Centauri" smac
-	make_desktop_entry smacx "Sid Meier's Alpha Centauri - Alien Crossfire" smac
-	prepgamesdirs
-
-	if use x86 || use amd64 ; then
-	    einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'."
-	    dosym /lib/loki_ld-linux.so.2 "${dir}"/ld-linux.so.2 && \
-	    dosym /usr/lib/loki_libc.so.6 "${dir}"/libc.so.6 && \
-	    dosym /usr/lib/loki_libnss_files.so.2 "${dir}"/libnss_files.so.2
-	fi
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "To start Sid Meyer's SMAC Planetary Pack run:"
-	elog " smac"
-	elog "To play Sid Meyer's Alpha Centauri run:"
-	elog " smac"
-	elog "To play Alien Crossfire run:"
-	elog " smacx"
-	elog "Be sure to enable CONFIG_UID16 in your kernel config or"
-	elog "the game will error." # bug 340303
-}
diff --git a/games-strategy/tornado/Manifest b/games-strategy/tornado/Manifest
index f4205c372155..435f770a2b1a 100644
--- a/games-strategy/tornado/Manifest
+++ b/games-strategy/tornado/Manifest
@@ -1,4 +1,4 @@
 AUX tornado-1.4-r2-gentoo.patch 13288 BLAKE2B 35b3eb05fd6894ec5733e42b2423f19f3ef4ff2e71b90f6f71380fdaec0ad862caafd15a8fb7f0785927f8fee0fdead741dc4bfb34343b510fd330ac649f893e SHA512 683a5dcac5fc12b065ebb4dfc5c9972a6fe6c87ee645cdbdf038313068ae43cc1e022ad8772c6f509f7bc102862bda6cc34ce5ccf132fc06f7d1cabd2d93817a
 DIST tornado-1.4.tar.gz 56341 BLAKE2B 81b99ab6484c5267c90792cfefb9dad638d8057224e4eb755dde85638e17bfb5cc17fe64bf84b0d631905493e8e1e276f0842b4f9bbe2eb40e740931a8f422a8 SHA512 32a9e078c0d0498befff78f5cafaa1e45ee2ad45d661f7d89e9038f8ca44c34b27ca846e3e4d68a15f203da20b5f6aeb41826c00159d66d9640f3b2bdd6b6e12
-EBUILD tornado-1.4-r2.ebuild 740 BLAKE2B f762b2cac420201ed1df9e77c58e19c79d9f9c113e0159f77a7d9b03c61f120ea856e7561994fe0e64db582161abed2a6288789053adb32d716e9007c1380640 SHA512 463357f175bd3707fd95f8274f248b71fd1df335bfc24e3aed9b2162a753edce7c82e23d46d9fc8e2d40f08edb93babe5a88e97f95b7ddbafef568818dda7c20
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
+EBUILD tornado-1.4-r2.ebuild 758 BLAKE2B 2fa73141de0e2fcabab32ae6df569f45d789312445b8b55057e7b446097b417d1998be9643f95837cac7f6c289cd5e95c9c8b70b7ee1374a7a4dcb7fbaa07407 SHA512 a76a01381e5911d1977a7df6fe25582a3c64792f4e8eb973930b5f5e05ed671d5cdc0b27a76ecbc7fe02aa33c01cb4d6b5b04f85b73cf1260c11d63b02b4316e
+MISC metadata.xml 324 BLAKE2B 0f55b12563dec62df2173a78c547b96968f11c45f7360345cfebe13d4eb4a3772817c674beb82cffe178b663b041c14ca6473a68c6f5411748b8131191430e46 SHA512 2b00c1db92f99aaf62fc3a76e0062c63f3608fc1e48838be2d7b9ddb09788f11fbf63156aa10cc88ae5d30fcd5409f59ca19b65d3c6ec5cf6412ea97244d72b5
diff --git a/games-strategy/tornado/metadata.xml b/games-strategy/tornado/metadata.xml
index 78274e0fa550..295f0bba0d68 100644
--- a/games-strategy/tornado/metadata.xml
+++ b/games-strategy/tornado/metadata.xml
@@ -5,4 +5,7 @@
 	<email>games@gentoo.org</email>
 	<name>Gentoo Games Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">kouya/tornado</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/games-strategy/tornado/tornado-1.4-r2.ebuild b/games-strategy/tornado/tornado-1.4-r2.ebuild
index c2a5f7c2f76c..8ba22468f47e 100644
--- a/games-strategy/tornado/tornado-1.4-r2.ebuild
+++ b/games-strategy/tornado/tornado-1.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Clone of a C64 game -  destroy the opponent's house"
 HOMEPAGE="https://github.com/kouya/tornado"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/kouya/tornado/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"