diff options
author | Sergey Popov <pinkbyte@gentoo.org> | 2020-11-15 19:31:16 +0300 |
---|---|---|
committer | Sergey Popov <pinkbyte@gentoo.org> | 2020-11-15 19:33:26 +0300 |
commit | ea9bacef363430021e94a8b760bdb950ed8fd1b9 (patch) | |
tree | 008ff49861328be2fed87bd6ce2e64d95e6be03e /games-strategy/seven-kingdoms | |
parent | games-strategy/seven-kingdoms: respect AR variable (diff) | |
download | gentoo-ea9bacef363430021e94a8b760bdb950ed8fd1b9.tar.gz gentoo-ea9bacef363430021e94a8b760bdb950ed8fd1b9.tar.bz2 gentoo-ea9bacef363430021e94a8b760bdb950ed8fd1b9.zip |
games-strategy/seven-kingdoms: version bump, drop old
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergey Popov <pinkbyte@gentoo.org>
Diffstat (limited to 'games-strategy/seven-kingdoms')
-rw-r--r-- | games-strategy/seven-kingdoms/Manifest | 2 | ||||
-rw-r--r-- | games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.2-fortify.patch | 26 | ||||
-rw-r--r-- | games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild (renamed from games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild) | 7 |
3 files changed, 4 insertions, 31 deletions
diff --git a/games-strategy/seven-kingdoms/Manifest b/games-strategy/seven-kingdoms/Manifest index f7545bdcaeb3..f668f78f342a 100644 --- a/games-strategy/seven-kingdoms/Manifest +++ b/games-strategy/seven-kingdoms/Manifest @@ -1,3 +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-2.15.4p1.tar.xz 46927880 BLAKE2B b32b819bef5918f2de378893224dcb7a27af6afe4e09791d59a2208f92aa8b82f3d9936553734a8b1cdfec93a8cc5562c65a78a15734fa1457dc94a64a49ed93 SHA512 eac0ca91755f828cfc8b0ea07ad1d0c08030c60ac236473992cc7887f8da43a3246a1f375f569e4fc71afaf7c5797ae6911b8b617217077429e5f5c51af4f4b6 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 deleted file mode 100644 index 9377287a6089..000000000000 --- a/games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.2-fortify.patch +++ /dev/null @@ -1,26 +0,0 @@ -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/seven-kingdoms-2.15.2.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild index 5e61bb4e116d..a23677ae1b8b 100644 --- a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild +++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild @@ -6,11 +6,12 @@ EAPI=7 inherit desktop toolchain-funcs MY_PN="7kaa" -MY_P="${MY_PN}-${PV}" +MY_PV="$(ver_rs 3- '')" +MY_P="${MY_PN}-${MY_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 +SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${MY_PV}/${MY_P}.tar.xz https://dev.gentoo.org/~pinkbyte/distfiles/${MY_PN}.png" LICENSE="GPL-2" @@ -23,8 +24,6 @@ DEPEND="net-libs/enet:1.3= net-misc/curl" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${P}-fortify.patch" ) - S="${WORKDIR}/${MY_P}" src_unpack() { |