[gentoo-commits] repo/gentoo:master commit in: games-strategy/seven-kingdoms/files/, games-strategy/seven-kingdoms/

[Sergey Popov]

commit:     50cec8f14daee72e700390724bc44f7d8e54e985
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 09:04:45 2019 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 09:06:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50cec8f1

games-strategy/seven-kingdoms: version bump to 2.15.2

Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 games-strategy/seven-kingdoms/Manifest             |  1 +
 .../files/seven-kingdoms-2.15.2-fortify.patch      | 26 +++++++++++++++
 games-strategy/seven-kingdoms/metadata.xml         |  1 +
 .../seven-kingdoms/seven-kingdoms-2.15.2.ebuild    | 39 ++++++++++++++++++++++
 4 files changed, 67 insertions(+)

diff --git a/games-strategy/seven-kingdoms/Manifest b/games-strategy/seven-kingdoms/Manifest
index 809b2a0d458..f7545bdcaeb 100644
--- a/games-strategy/seven-kingdoms/Manifest
+++ b/games-strategy/seven-kingdoms/Manifest
@@ -1,2 +1,3 @@
 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

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 00000000000..9377287a608
--- /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@×××××.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 4a1da05f952..d2c1e496daf 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 00000000000..65590558225
--- /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"
+}