7 files changed, 83 insertions, 14 deletions
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 4b5e8a152979..5d221b704c49 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/seven-kingdoms/Manifest b/games-strategy/seven-kingdoms/Manifest
index 32b874b17bde..490567a61810 100644
--- a/games-strategy/seven-kingdoms/Manifest
+++ b/games-strategy/seven-kingdoms/Manifest
@@ -1,4 +1,7 @@
+AUX seven-kingdoms-2.15.2-fortify.patch 756 BLAKE2B 9a37b62281f0feee39a9dd0bce917be83c59280e0fd37522a01d1859fb3ac9e2c49dc342ef58e22fb8392e3c50eb02e311648bd7df9c6b83b8c1744fbe23ca90 SHA512 c4dda156ef2e745d6e3e37d3dd8f64fdf61717b4c65b6713fa4c0888fb6477f8630da4269d6710349db299fa9c7e0115be5f4408ffec3df8e4c57969aeffb337
 DIST 7kaa-2.14.7.tar.xz 31342092 BLAKE2B 1e2456ff8e40eace3185f842aad1d436e7e336eb4489a1a23022c89e7695ef1fc6f632d884d5d992c63f8b67f8b045fbda37e2fa3a07e9be13b9801d959b1e93 SHA512 5c2067a842af18f2eaa21267ee0c48064eecfc6b967eb2abf967f2bf782a9699186b038d87de03fad71b5d88ec9fc1cfddd7521cb90c255a3a8d2aa586d3f2c1
+DIST 7kaa-2.15.2.tar.xz 46821276 BLAKE2B f5297ebed906937389c86bc4f7ac80a022172ec2c7157d52086ba2742fd2a3231cbb1ee1b8bb8a1c2beba27eb8cee006ce1cce70ea12ef01ede3b1ef4f989a0e SHA512 df053b9934fa3fc32a9a0a239fdafdfb7e441b7e98e280d1c74622f867919be48335ddbc54abb06b12b11e4a84b7a20ebb244fac9e4d7aebb8ad3cbe3192c29a
 DIST 7kaa.png 559 BLAKE2B 0379e60a5355c93cddf2a5f30b5e84711f77df073db4e85eee13d51654180572cd73dc96e8a9b954101e8b0ecacd879d6fa9e57feb70b66d1bdd043d07a40113 SHA512 0ec1ba67107a7823943704879efaf12297c5441c43b54f49684550927b10dc40c657fe93eb7c4cc85208d08194f179c9602fd8df6545776f3e1b4481803b16e6
 EBUILD seven-kingdoms-2.14.7.ebuild 783 BLAKE2B 88eb5caf7fad23b0924878a177f4dc4c7da78e928752ff6082350bc44635ab8b2e0c5286d14d5e36562eb23c6bff40e6e52d2b3d6b7bcbb298cf3df578f1ccf7 SHA512 f360b0580feefb5e53f0639e56aa206af62ac20932c0e624bff9865e449c31fe72d735cc7b204eb073252c6509872f2ce487a5ff00164ce4a79910d3bf3fefcc
-MISC metadata.xml 323 BLAKE2B d6893eaaa3f0dd7c230028000f15ed2964a7e7f4b2e5c710c61e2735aa27dafd4c2cff4deaec887854a68e7102f6df772fa8c1ae9c1286df68f115704e608049 SHA512 09f1b34120c01f3dd5f367a2b4ba99b7b89ef06362843e18bc320c7ce7eaea02cbc6c8a0d33541630758d77c6482bc88138d7cdfa1c4fa6dac7ca559d0feeff8
+EBUILD seven-kingdoms-2.15.2.ebuild 829 BLAKE2B b0af8116f314aa4b1be02572d0683150b5504e6fe6423afc7d20fe1afeb8870f7c0e47533e0bda989333f71fb064d69e80677498bf396121ca90cc2cd200b869 SHA512 235f950a3319c8c929afcff309e8475ba9914a043c1fc915cd7743b45d0d315741ad7fa6d9f81be6f5937ae674487ae5644ca2ec9bb45dd9c1206068f39e1c54
+MISC metadata.xml 379 BLAKE2B e307acc5095abbee8bc3bdab262c6f85dbf01638364fdc3ff6a1ea4d6ca0409f9e3197bb06fc3724327081fa4316811aecd594c4ecfc2288b978ca09831cfe96 SHA512 74215810c5079763bd386dd78cd2edcdefbac5350226beb275d0229247f733c9f09268893b3a9581e5924bd3651b54203b8acd3691ee86a32c52f382d5e22477
diff --git a/games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.2-fortify.patch b/games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.2-fortify.patch
new file mode 100644
index 000000000000..9377287a6089
--- /dev/null
+++ b/games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.2-fortify.patch
@@ -0,0 +1,26 @@
+commit 5f765d8f0ef76c227277c3f9e3162f9deac654db
+Author: Jesse Allen <the3dfxdude@gmail.com>
+Date:   Wed Jun 26 18:11:30 2019 -0700
+
+    LocaleRes: Don't use database field to enable transliteration.
+
+diff --git a/src/LocaleRes.cpp b/src/LocaleRes.cpp
+index 5b4300a..88d975f 100644
+--- a/src/LocaleRes.cpp
++++ b/src/LocaleRes.cpp
+@@ -107,10 +107,13 @@ void LocaleRes::init(const char *locale)
+ 		strcpy(lang, "??");
+ 		strcpy(codeset, "ISO-8859-1");
+ 	}
+-	strcat(codeset, "//TRANSLIT");
+ 
+-	cd = iconv_open(codeset, "");
++	String tocode(codeset);
++	tocode += "//TRANSLIT";
++	cd = iconv_open(tocode, "");
++
+ 	cd_latin = iconv_open("ISO-8859-1", "");
++
+ 	in_buf = mem_add(INIT_BUF_SIZE+1);
+ 	in_buf_size = INIT_BUF_SIZE;
+ 	out_buf = mem_add(INIT_BUF_SIZE+1);
diff --git a/games-strategy/seven-kingdoms/metadata.xml b/games-strategy/seven-kingdoms/metadata.xml
index 4a1da05f9526..d2c1e496dafa 100644
--- a/games-strategy/seven-kingdoms/metadata.xml
+++ b/games-strategy/seven-kingdoms/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">skfans</remote-id>
+		<remote-id type="github">the3dfxdude/7kaa</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild
new file mode 100644
index 000000000000..655905582250
--- /dev/null
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop
+
+MY_PN="7kaa"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Seven Kingdoms: Ancient Adversaries"
+HOMEPAGE="https://7kfans.com/"
+SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~pinkbyte/distfiles/${MY_PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-libs/enet:1.3=
+	media-libs/libsdl2[X,video]
+	media-libs/openal
+	net-misc/curl"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-fortify.patch" )
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${MY_P}.tar.xz
+}
+
+src_install() {
+	default
+
+	doicon "${DISTDIR}/${MY_PN}.png"
+	make_desktop_entry "${MY_PN}" "Seven Kingdoms: Ancient Adversaries" "${MY_PN}" "Game;StrategyGame"
+}
diff --git a/games-strategy/spaz/Manifest b/games-strategy/spaz/Manifest
index bf75eb280bd9..5bb7b1b2cac4 100644
--- a/games-strategy/spaz/Manifest
+++ b/games-strategy/spaz/Manifest
@@ -1,3 +1,3 @@
 DIST spaz-linux-humblebundle-09182012-bin 157466422 BLAKE2B c3b832c4cb8b68bbe353bc019d4af6af335b45e3bcc89209f2a61a840b52448f4d09eaf1544f67995049d377600eae433ce2140171d189afcd7d3c388d67ec78 SHA512 ba62be6a247dfb1ee04db8784b3e173140e7491f2bd68a528ad9c81cab4bc8f807bfeb4593fa37c76e43401420a6f788075cd2541fd16ed7443fe4301a76d50c
-EBUILD spaz-1.605.ebuild 937 BLAKE2B 452bc5b3749bf95ce0280b1074132d2bdc2e351de9b3c835174d6394127b9e8e592c72230b4c133ef46c6c44c58b643ec58129e91c6484e2bf729a0816199402 SHA512 a83d57b143876e915c20f2020097913e3fd63069e69630058e24b92be7c0d7e41d830ebe0a2a62a8af053bb988d4edfcef2cacbea9e341184448e0be1b049f6d
+EBUILD spaz-1.605-r1.ebuild 933 BLAKE2B da2d4f6275db8f7b58629099bea88d7828650af4889f45412fb99f337cb3b577f82cbddb61a0fff33ed11674e824b75fefe12c55f7c4da1d23196835ccd3ace8 SHA512 132a36add3e49c02e7748cc00ac968121bf85adc77804a2ed1ea1073de9a1c6350bdeacd3bb22e45387324789bea71ddf9f78b3dfe8fedb9ac136c06d6583e1a
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/games-strategy/spaz/spaz-1.605.ebuild b/games-strategy/spaz/spaz-1.605-r1.ebuild
index 943dbedf3779..98f1843747b1 100644
--- a/games-strategy/spaz/spaz-1.605.ebuild
+++ b/games-strategy/spaz/spaz-1.605-r1.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit unpacker games
+EAPI=7
+inherit desktop eutils unpacker
 
 DESCRIPTION="Space Pirates and Zombies"
-HOMEPAGE="http://spacepiratesandzombies.com"
+HOMEPAGE="http://minmax-games.com/SpacePiratesAndZombies/"
 SRC_URI="${PN}-linux-humblebundle-09182012-bin"
 LICENSE="LOKI-EULA"
 SLOT="0"
@@ -14,9 +13,12 @@ KEYWORDS="-* ~amd64 ~x86"
 IUSE="alsa pulseaudio"
 RESTRICT="bindist fetch strip"
 
-DEPEND="app-arch/unzip"
-RDEPEND=">=media-libs/openal-1.15.1[alsa?,pulseaudio?,abi_x86_32(-)]
-	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]"
+DEPEND=""
+BDEPEND="app-arch/unzip"
+RDEPEND="
+	>=media-libs/openal-1.15.1[alsa?,pulseaudio?,abi_x86_32(-)]
+	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]
+"
 
 S="${WORKDIR}"/data
 
@@ -27,7 +29,7 @@ src_unpack() {
 }
 
 src_install() {
-	local dir="${GAMES_PREFIX_OPT}/${PN}"
+	local dir="/opt/${PN}"
 
 	insinto "${dir}"
 	exeinto "${dir}"
@@ -37,8 +39,6 @@ src_install() {
 	newicon SPAZ.png spaz.png
 	dodoc README-linux.txt
 
-	games_make_wrapper ${PN} ./SPAZ "${dir}" "${dir}"
+	make_wrapper ${PN} ./SPAZ "${dir}" "${dir}"
 	make_desktop_entry ${PN} "Space Pirates and Zombies" ${PN}
-
-	prepgamesdirs
 }