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

2024-01-03 Thread Sam James
commit: 79a79c9c66c7fa273e108a4aece0f8b5cff10688
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  3 11:51:10 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  3 11:51:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79a79c9c

games-strategy/seven-kingdoms: Stabilize 2.15.5 ppc64, #921267

Signed-off-by: Sam James  gentoo.org>

 games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild 
b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild
index 1e339923691e..47fa2092c441 100644
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${MY_PV}/${M
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 
 DEPEND="net-libs/enet:1.3=
media-libs/libsdl2[X,video]



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

2023-10-10 Thread Sergey Popov
commit: 29e4850a4c5d5fe876504260a68b8175ab52b376
Author: Sergey Popov  gentoo  org>
AuthorDate: Tue Oct 10 14:12:32 2023 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Tue Oct 10 14:14:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e4850a

games-strategy/seven-kingdoms: version bump

Signed-off-by: Sergey Popov  gentoo.org>

 games-strategy/seven-kingdoms/Manifest |  1 +
 .../seven-kingdoms/seven-kingdoms-2.15.6.ebuild| 42 ++
 2 files changed, 43 insertions(+)

diff --git a/games-strategy/seven-kingdoms/Manifest 
b/games-strategy/seven-kingdoms/Manifest
index 6b973c85c5cc..20c6c79336cf 100644
--- a/games-strategy/seven-kingdoms/Manifest
+++ b/games-strategy/seven-kingdoms/Manifest
@@ -1,2 +1,3 @@
 DIST 7kaa-2.15.5.tar.xz 47501772 BLAKE2B 
3ab52031d7426485c0ccdb3ae93fde37a97c3aa3ce4f1cb686cf57aca149223b7399cca1439a96e6540de31c126c1c91a42f6635428bd6ea9c1874a38a0538b1
 SHA512 
12ea1a9d49eb4c7759a34b462ae74dfb46dc4b976096653e122b91572664f50fdda17f3d6d58d700bd5ba28b385e5f9f48b72560f7560a36dfb24d76d5aa7881
+DIST 7kaa-2.15.6.tar.gz 73334247 BLAKE2B 
7ef2926df74f230208c438223d963362b96327c5a8dd002ec32a7af6c2c3ae910f8cbffd2f974b0a0b178b479bc798c8be9a70e99fda93797519f041c9e18aec
 SHA512 
8387680b39a203a50bcf466424a4401416d9f60aa00078e4e78a44b89e7afc722a62e81a1f3b5cdb20e323983e4a6506919340261fb6b2829e3ca275e648a64f
 DIST 7kaa.png 559 BLAKE2B 
0379e60a5355c93cddf2a5f30b5e84711f77df073db4e85eee13d51654180572cd73dc96e8a9b954101e8b0ecacd879d6fa9e57feb70b66d1bdd043d07a40113
 SHA512 
0ec1ba67107a7823943704879efaf12297c5441c43b54f49684550927b10dc40c657fe93eb7c4cc85208d08194f179c9602fd8df6545776f3e1b4481803b16e6

diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.6.ebuild 
b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.6.ebuild
new file mode 100644
index ..c0d6f65b1f17
--- /dev/null
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+MY_PN="7kaa"
+MY_PV="$(ver_rs 3- '')"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Seven Kingdoms: Ancient Adversaries"
+HOMEPAGE="https://7kfans.com/";
+SRC_URI="mirror://sourceforge/skfans/${MY_P}.tar.gz
+   https://dev.gentoo.org/~pinkbyte/distfiles/${MY_PN}.png";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND="net-libs/enet:1.3=
+   media-libs/libsdl2[X,video]
+   media-libs/openal
+   net-misc/curl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+   unpack ${MY_P}.tar.gz
+}
+
+src_compile() {
+   emake AR="$(tc-getAR)"
+}
+
+src_install() {
+   default
+
+   doicon "${DISTDIR}/${MY_PN}.png"
+   make_desktop_entry "${MY_PN}" "Seven Kingdoms: Ancient Adversaries" 
"${MY_PN}" "Game;StrategyGame"
+}



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

2023-07-31 Thread Sergey Popov
commit: 438973c52e3f7342c5a06cc03dd97de720296bdf
Author: Brahmajit Das  gmail  com>
AuthorDate: Wed Jul 19 07:47:21 2023 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Mon Jul 31 07:04:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438973c5

games-strategy/seven-kingdoms: Fix C++17 does not allow register storage class

Closes: https://bugs.gentoo.org/895996
Closes: https://github.com/gentoo/gentoo/pull/31954
Signed-off-by: Brahmajit Das  gmail.com>
Signed-off-by: Sergey Popov  gentoo.org>

 .../files/seven-kingdoms-2.15.5-c++17.patch| 23 ++
 .../seven-kingdoms/seven-kingdoms-2.15.5.ebuild|  4 
 2 files changed, 27 insertions(+)

diff --git 
a/games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.5-c++17.patch 
b/games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.5-c++17.patch
new file mode 100644
index ..5f8e8dd7bb6d
--- /dev/null
+++ b/games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.5-c++17.patch
@@ -0,0 +1,23 @@
+Bug: https://bugs.gentoo.org/895996
+--- a/src/OMISC.cpp
 b/src/OMISC.cpp
+@@ -608,7 +608,7 @@ int Misc::str_icmpx( const char* str1, const char* str2 )
+err_when( !str1 || !str2 );
+ 
+int i;
+-   register int a,b;
++   int a,b;
+ 
+ 
+for (i=0 ; (a=str1[i]) != '\0' && (b=str2[i]) != '\0' ; i++)
+--- a/src/OSPATHBT.cpp
 b/src/OSPATHBT.cpp
+@@ -50,7 +50,7 @@ void NodePriorityQueue::reset_priority_queue()
+ void NodePriorityQueue::insert_node(Node *insertNode)
+ {
+   unsigned int i = ++size;
+-  register int f=insertNode->node_f;
++  int f=insertNode->node_f;
+   Node **localElements = elements;
+   
+   while(i>1 && localElements[i/2]->node_f > f)

diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild 
b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild
index 2499b114bada..1e339923691e 100644
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild
@@ -26,6 +26,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+   "${FILESDIR}/${P}-c++17.patch"
+)
+
 src_unpack() {
unpack ${MY_P}.tar.xz
 }



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

2023-05-15 Thread Sergey Popov
commit: 02846f9bece07f818d6b4c1c776e8cc851d1f52d
Author: Sergey Popov  gentoo  org>
AuthorDate: Mon May 15 10:26:17 2023 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Mon May 15 10:26:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02846f9b

games-strategy/seven-kingdoms: drop old version

Signed-off-by: Sergey Popov  gentoo.org>

 games-strategy/seven-kingdoms/Manifest |  1 -
 .../seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild | 42 --
 2 files changed, 43 deletions(-)

diff --git a/games-strategy/seven-kingdoms/Manifest 
b/games-strategy/seven-kingdoms/Manifest
index 5da492798d51..6b973c85c5cc 100644
--- a/games-strategy/seven-kingdoms/Manifest
+++ b/games-strategy/seven-kingdoms/Manifest
@@ -1,3 +1,2 @@
-DIST 7kaa-2.15.4p1.tar.xz 46927880 BLAKE2B 
b32b819bef5918f2de378893224dcb7a27af6afe4e09791d59a2208f92aa8b82f3d9936553734a8b1cdfec93a8cc5562c65a78a15734fa1457dc94a64a49ed93
 SHA512 
eac0ca91755f828cfc8b0ea07ad1d0c08030c60ac236473992cc7887f8da43a3246a1f375f569e4fc71afaf7c5797ae6911b8b617217077429e5f5c51af4f4b6
 DIST 7kaa-2.15.5.tar.xz 47501772 BLAKE2B 
3ab52031d7426485c0ccdb3ae93fde37a97c3aa3ce4f1cb686cf57aca149223b7399cca1439a96e6540de31c126c1c91a42f6635428bd6ea9c1874a38a0538b1
 SHA512 
12ea1a9d49eb4c7759a34b462ae74dfb46dc4b976096653e122b91572664f50fdda17f3d6d58d700bd5ba28b385e5f9f48b72560f7560a36dfb24d76d5aa7881
 DIST 7kaa.png 559 BLAKE2B 
0379e60a5355c93cddf2a5f30b5e84711f77df073db4e85eee13d51654180572cd73dc96e8a9b954101e8b0ecacd879d6fa9e57feb70b66d1bdd043d07a40113
 SHA512 
0ec1ba67107a7823943704879efaf12297c5441c43b54f49684550927b10dc40c657fe93eb7c4cc85208d08194f179c9602fd8df6545776f3e1b4481803b16e6

diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild 
b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild
deleted file mode 100644
index fccfe63df907..
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs
-
-MY_PN="7kaa"
-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${MY_PV}/${MY_P}.tar.xz
-   https://dev.gentoo.org/~pinkbyte/distfiles/${MY_PN}.png";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="net-libs/enet:1.3=
-   media-libs/libsdl2[X,video]
-   media-libs/openal
-   net-misc/curl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-   unpack ${MY_P}.tar.xz
-}
-
-src_compile() {
-   emake AR="$(tc-getAR)"
-}
-
-src_install() {
-   default
-
-   doicon "${DISTDIR}/${MY_PN}.png"
-   make_desktop_entry "${MY_PN}" "Seven Kingdoms: Ancient Adversaries" 
"${MY_PN}" "Game;StrategyGame"
-}



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

2022-09-26 Thread Sergey Popov
commit: 7490b07ab7f88ce550394d773dc24c6dca64f2ee
Author: Sergey Popov  gentoo  org>
AuthorDate: Mon Sep 26 08:02:12 2022 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Mon Sep 26 08:02:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7490b07a

games-strategy/seven-kingdoms: stabilize 2.15.5 for amd64, x86

Signed-off-by: Sergey Popov  gentoo.org>

 games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild 
b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild
index a373d5653851..2499b114bada 100644
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${MY_PV}/${M
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 DEPEND="net-libs/enet:1.3=
media-libs/libsdl2[X,video]



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

2022-06-17 Thread Arthur Zamarin
commit: d0fe6e3e3ab6d7ea8fd79e24eeba2564687f7229
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun 17 10:25:27 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun 17 10:25:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0fe6e3e

games-strategy/seven-kingdoms: Keyword 2.15.5 ppc64, #852227

Signed-off-by: Arthur Zamarin  gentoo.org>

 games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild 
b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild
index 003704713e9f..a373d5653851 100644
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${MY_PV}/${M
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 DEPEND="net-libs/enet:1.3=
media-libs/libsdl2[X,video]



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

2022-05-04 Thread Sergey Popov
commit: bd913148f9734ab32fbc09977ab91fec72f24735
Author: Sergey Popov  gentoo  org>
AuthorDate: Wed May  4 13:15:22 2022 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Wed May  4 13:15:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd913148

games-strategy/seven-kingdoms: version bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Sergey Popov  gentoo.org>

 games-strategy/seven-kingdoms/Manifest |  1 +
 .../seven-kingdoms/seven-kingdoms-2.15.5.ebuild| 42 ++
 2 files changed, 43 insertions(+)

diff --git a/games-strategy/seven-kingdoms/Manifest 
b/games-strategy/seven-kingdoms/Manifest
index abd9ab4ababe..5da492798d51 100644
--- a/games-strategy/seven-kingdoms/Manifest
+++ b/games-strategy/seven-kingdoms/Manifest
@@ -1,2 +1,3 @@
 DIST 7kaa-2.15.4p1.tar.xz 46927880 BLAKE2B 
b32b819bef5918f2de378893224dcb7a27af6afe4e09791d59a2208f92aa8b82f3d9936553734a8b1cdfec93a8cc5562c65a78a15734fa1457dc94a64a49ed93
 SHA512 
eac0ca91755f828cfc8b0ea07ad1d0c08030c60ac236473992cc7887f8da43a3246a1f375f569e4fc71afaf7c5797ae6911b8b617217077429e5f5c51af4f4b6
+DIST 7kaa-2.15.5.tar.xz 47501772 BLAKE2B 
3ab52031d7426485c0ccdb3ae93fde37a97c3aa3ce4f1cb686cf57aca149223b7399cca1439a96e6540de31c126c1c91a42f6635428bd6ea9c1874a38a0538b1
 SHA512 
12ea1a9d49eb4c7759a34b462ae74dfb46dc4b976096653e122b91572664f50fdda17f3d6d58d700bd5ba28b385e5f9f48b72560f7560a36dfb24d76d5aa7881
 DIST 7kaa.png 559 BLAKE2B 
0379e60a5355c93cddf2a5f30b5e84711f77df073db4e85eee13d51654180572cd73dc96e8a9b954101e8b0ecacd879d6fa9e57feb70b66d1bdd043d07a40113
 SHA512 
0ec1ba67107a7823943704879efaf12297c5441c43b54f49684550927b10dc40c657fe93eb7c4cc85208d08194f179c9602fd8df6545776f3e1b4481803b16e6

diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild 
b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild
new file mode 100644
index ..003704713e9f
--- /dev/null
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+MY_PN="7kaa"
+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${MY_PV}/${MY_P}.tar.xz
+   https://dev.gentoo.org/~pinkbyte/distfiles/${MY_PN}.png";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="net-libs/enet:1.3=
+   media-libs/libsdl2[X,video]
+   media-libs/openal
+   net-misc/curl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+   unpack ${MY_P}.tar.xz
+}
+
+src_compile() {
+   emake AR="$(tc-getAR)"
+}
+
+src_install() {
+   default
+
+   doicon "${DISTDIR}/${MY_PN}.png"
+   make_desktop_entry "${MY_PN}" "Seven Kingdoms: Ancient Adversaries" 
"${MY_PN}" "Game;StrategyGame"
+}



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

2020-12-15 Thread Sergey Popov
commit: b076546a8226b186e79699cb3203c5fc772c4a43
Author: Sergey Popov  gentoo  org>
AuthorDate: Tue Dec 15 08:40:09 2020 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Tue Dec 15 08:40:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b076546a

games-strategy/seven-kingdoms: drop old

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sergey Popov  gentoo.org>

 games-strategy/seven-kingdoms/Manifest |  1 -
 .../seven-kingdoms/seven-kingdoms-2.14.7.ebuild| 41 --
 2 files changed, 42 deletions(-)

diff --git a/games-strategy/seven-kingdoms/Manifest 
b/games-strategy/seven-kingdoms/Manifest
index f668f78f342..abd9ab4abab 100644
--- a/games-strategy/seven-kingdoms/Manifest
+++ b/games-strategy/seven-kingdoms/Manifest
@@ -1,3 +1,2 @@
-DIST 7kaa-2.14.7.tar.xz 31342092 BLAKE2B 
1e2456ff8e40eace3185f842aad1d436e7e336eb4489a1a23022c89e7695ef1fc6f632d884d5d992c63f8b67f8b045fbda37e2fa3a07e9be13b9801d959b1e93
 SHA512 
5c2067a842af18f2eaa21267ee0c48064eecfc6b967eb2abf967f2bf782a9699186b038d87de03fad71b5d88ec9fc1cfddd7521cb90c255a3a8d2aa586d3f2c1
 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/seven-kingdoms-2.14.7.ebuild 
b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
deleted file mode 100644
index e76f54f6280..000
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-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}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-   unpack ${MY_P}.tar.xz
-}
-
-src_compile() {
-   emake AR="$(tc-getAR)"
-}
-
-src_install() {
-   default
-
-   doicon "${DISTDIR}/${MY_PN}.png"
-   make_desktop_entry "${MY_PN}" "Seven Kingdoms: Ancient Adversaries" 
"${MY_PN}" "Game;StrategyGame"
-}



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

2020-12-15 Thread Sergey Popov
commit: 87e5f60c96aaae1f384ad2d2c79ea8ca87a532dd
Author: Sergey Popov  gentoo  org>
AuthorDate: Tue Dec 15 08:39:47 2020 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Tue Dec 15 08:39:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87e5f60c

games-strategy/seven-kingdoms-2.15.4_p1: stable for amd64/x86

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sergey Popov  gentoo.org>

 games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild 
b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild
index a23677ae1b8..fccfe63df90 100644
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${MY_PV}/${M
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="net-libs/enet:1.3=
media-libs/libsdl2[X,video]



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

2020-11-15 Thread Sergey Popov
commit: c0281fe73e67f5ba86e7ae474b6a44002219e025
Author: Sergey Popov  gentoo  org>
AuthorDate: Sun Nov 15 16:30:31 2020 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Sun Nov 15 16:33:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0281fe7

games-strategy/seven-kingdoms: respect AR variable

Reported-by: Agostino Sarubbo  gentoo.org>
Closes: https://bugs.gentoo.org/740770
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergey Popov  gentoo.org>

 games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild | 8 ++--
 games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild | 6 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild 
b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
index 33a7974f04b..e76f54f6280 100644
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 MY_PN="7kaa"
 MY_P="${MY_PN}-${PV}"
@@ -29,6 +29,10 @@ src_unpack() {
unpack ${MY_P}.tar.xz
 }
 
+src_compile() {
+   emake AR="$(tc-getAR)"
+}
+
 src_install() {
default
 

diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild 
b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild
index f8f2227e3f7..5e61bb4e116 100644
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop
+inherit desktop toolchain-funcs
 
 MY_PN="7kaa"
 MY_P="${MY_PN}-${PV}"
@@ -31,6 +31,10 @@ src_unpack() {
unpack ${MY_P}.tar.xz
 }
 
+src_compile() {
+   emake AR="$(tc-getAR)"
+}
+
 src_install() {
default
 



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

2020-11-15 Thread Sergey Popov
commit: ea9bacef363430021e94a8b760bdb950ed8fd1b9
Author: Sergey Popov  gentoo  org>
AuthorDate: Sun Nov 15 16:31:16 2020 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Sun Nov 15 16:33:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea9bacef

games-strategy/seven-kingdoms: version bump, drop old

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergey Popov  gentoo.org>

 games-strategy/seven-kingdoms/Manifest |  2 +-
 .../files/seven-kingdoms-2.15.2-fortify.patch  | 26 --
 ...15.2.ebuild => seven-kingdoms-2.15.4_p1.ebuild} |  7 +++---
 3 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/games-strategy/seven-kingdoms/Manifest 
b/games-strategy/seven-kingdoms/Manifest
index f7545bdcaeb..f668f78f342 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 9377287a608..000
--- a/games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.2-fortify.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 5f765d8f0ef76c227277c3f9e3162f9deac654db
-Author: Jesse Allen 
-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
similarity index 89%
rename from games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild
rename to games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild
index 5e61bb4e116..a23677ae1b8 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() {



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

2020-09-04 Thread Sam James
commit: 7554be4b7926fe3e2033a726e8b92a20201cfec1
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  5 00:43:02 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  5 00:43:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7554be4b

games-strategy/seven-kingdoms: arm64 keyworded (bug #730914)

Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild 
b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild
index 65590558225..f8f2227e3f7 100644
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${PV}/${MY_P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND="net-libs/enet:1.3=
media-libs/libsdl2[X,video]



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

2019-06-27 Thread Sergey Popov
commit: 50cec8f14daee72e700390724bc44f7d8e54e985
Author: Sergey Popov  gentoo  org>
AuthorDate: Thu Jun 27 09:04:45 2019 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Thu Jun 27 09:06:16 2019 +
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  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 000..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 
+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 @@


skfans
+   the3dfxdude/7kaa

 

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 000..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"
+}



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

2018-05-24 Thread Pacho Ramos
commit: bfd7de602b1ea557571e7e8c724578f5de148f42
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed May 23 18:55:22 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu May 24 18:03:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfd7de60

games-strategy/seven-kingdoms: Drop old

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 games-strategy/seven-kingdoms/Manifest |  1 -
 games-strategy/seven-kingdoms/metadata.xml |  3 --
 .../seven-kingdoms/seven-kingdoms-2.14.4.ebuild| 59 --
 3 files changed, 63 deletions(-)

diff --git a/games-strategy/seven-kingdoms/Manifest 
b/games-strategy/seven-kingdoms/Manifest
index a08a54981cb..809b2a0d458 100644
--- a/games-strategy/seven-kingdoms/Manifest
+++ b/games-strategy/seven-kingdoms/Manifest
@@ -1,3 +1,2 @@
 DIST 7kaa-2.14.7.tar.xz 31342092 BLAKE2B 
1e2456ff8e40eace3185f842aad1d436e7e336eb4489a1a23022c89e7695ef1fc6f632d884d5d992c63f8b67f8b045fbda37e2fa3a07e9be13b9801d959b1e93
 SHA512 
5c2067a842af18f2eaa21267ee0c48064eecfc6b967eb2abf967f2bf782a9699186b038d87de03fad71b5d88ec9fc1cfddd7521cb90c255a3a8d2aa586d3f2c1
-DIST 7kaa-source-2.14.4.tar.bz2 27366752 BLAKE2B 
d80c5dcf0982cc2dddf29559c4f096392d88b916701e1fa21d2885aba254c8214920dd1be45a7ea6931e8f025647946d19b4158a22b824aa18e75c18ace8fe99
 SHA512 
7ee39aba89993d9f0041ab991e053069e0c3ab4298f74c0ec95e3f30f49a71731ef37d8870b1ab9afd97b1c4618a879492976006b8a513bfc4bc44dfac591bf0
 DIST 7kaa.png 559 BLAKE2B 
0379e60a5355c93cddf2a5f30b5e84711f77df073db4e85eee13d51654180572cd73dc96e8a9b954101e8b0ecacd879d6fa9e57feb70b66d1bdd043d07a40113
 SHA512 
0ec1ba67107a7823943704879efaf12297c5441c43b54f49684550927b10dc40c657fe93eb7c4cc85208d08194f179c9602fd8df6545776f3e1b4481803b16e6

diff --git a/games-strategy/seven-kingdoms/metadata.xml 
b/games-strategy/seven-kingdoms/metadata.xml
index 2010db74663..4a1da05f952 100644
--- a/games-strategy/seven-kingdoms/metadata.xml
+++ b/games-strategy/seven-kingdoms/metadata.xml
@@ -5,9 +5,6 @@
pinkb...@gentoo.org
Sergey Popov

-   
-   Enable support for multiplayer via 
media-libs/sdl-net
-   

skfans


diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.4.ebuild 
b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.4.ebuild
deleted file mode 100644
index b82832b9468..000
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils games
-
-MY_PN="7kaa"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Seven Kingdoms: Ancient Adversaries"
-HOMEPAGE="http://7kfans.com/";
-SRC_URI="mirror://sourceforge/skfans/${MY_PN}-source-${PV}.tar.bz2
-   https://dev.gentoo.org/~pinkbyte/distfiles/${MY_PN}.png";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="network"
-
-DEPEND="media-libs/libsdl[X,video]
-   media-libs/openal
-   network? ( media-libs/sdl-net )
-   !games-strategy/seven-kingdoms-data"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( README )
-
-src_prepare() {
-   sed -i -e '/#include /a\#include ' 
src/multiplayer/common/player_desc.cpp || die 'sed failed'
-
-   autotools-utils_src_prepare
-}
-
-src_configure() {
-   # In current state debugging works only on Windows :-/
-   egamesconf \
-   $(use_enable network) \
-   --disable-debug \
-   --without-directx \
-   --without-wine \
-   --datadir="${GAMES_DATADIR}/${MY_PN}"
-}
-
-src_install() {
-   autotools-utils_src_install
-
-   newgamesbin "src/client/${MY_PN}" "${MY_PN}.bin"
-   doicon "${DISTDIR}/${MY_PN}.png"
-   games_make_wrapper "${MY_PN}" "${GAMES_BINDIR}/${MY_PN}.bin" 
"${GAMES_DATADIR}/${MY_PN}"
-   make_desktop_entry "${MY_PN}" "Seven Kingdoms: Ancient Adversaries" 
"${MY_PN}" "Game;StrategyGame"
-
-   prepgamesdirs
-}



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

2018-05-17 Thread Thomas Deutschmann
commit: f486ed6ee2136e186bc99c48682f8285e99eb162
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu May 17 15:22:34 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu May 17 15:22:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f486ed6e

games-strategy/seven-kingdoms: x86 stable (bug #654658)

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild 
b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
index 3b519d0998d..33a7974f04b 100644
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${PV}/${MY_P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="net-libs/enet:1.3=
media-libs/libsdl2[X,video]



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

2018-05-16 Thread Agostino Sarubbo
commit: 216e520697e72bafde88875108bff941c071e948
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed May 16 12:22:27 2018 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed May 16 12:22:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=216e5206

games-strategy/seven-kingdoms: amd64 stable wrt bug #654658

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="amd64"

 games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild 
b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
index 012fe8f1bc6..3b519d0998d 100644
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${PV}/${MY_P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="net-libs/enet:1.3=
media-libs/libsdl2[X,video]



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

2017-12-20 Thread David Seifert
commit: a40dabaa7431824a80d6eb760e34046abd4375b0
Author: David Seifert  gentoo  org>
AuthorDate: Wed Dec 20 21:30:32 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Dec 21 01:55:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a40dabaa

games-strategy/seven-kingdoms: Remove old

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 games-strategy/seven-kingdoms/Manifest |  1 -
 .../seven-kingdoms/seven-kingdoms-2.14.5.ebuild| 55 --
 2 files changed, 56 deletions(-)

diff --git a/games-strategy/seven-kingdoms/Manifest 
b/games-strategy/seven-kingdoms/Manifest
index 6262ba5841b..a08a54981cb 100644
--- a/games-strategy/seven-kingdoms/Manifest
+++ b/games-strategy/seven-kingdoms/Manifest
@@ -1,4 +1,3 @@
-DIST 7kaa-2.14.5.tar.xz 31223408 BLAKE2B 
331554b6a751d4672a8575db84fec643a9f6d09a81f9c70eefea73827c6697319958a04fe87b85be470b57dee4bf6e31132dafd231494e7d594c10fcd5f162ac
 SHA512 
cd797e63ba377d1f7b3e37cd775afd381ad015baf90bdfe00bc3f8741f745548b8abdd61e4b334e9fa54a5c04b48493ba8a90fbebef3f977517f12563d1efddd
 DIST 7kaa-2.14.7.tar.xz 31342092 BLAKE2B 
1e2456ff8e40eace3185f842aad1d436e7e336eb4489a1a23022c89e7695ef1fc6f632d884d5d992c63f8b67f8b045fbda37e2fa3a07e9be13b9801d959b1e93
 SHA512 
5c2067a842af18f2eaa21267ee0c48064eecfc6b967eb2abf967f2bf782a9699186b038d87de03fad71b5d88ec9fc1cfddd7521cb90c255a3a8d2aa586d3f2c1
 DIST 7kaa-source-2.14.4.tar.bz2 27366752 BLAKE2B 
d80c5dcf0982cc2dddf29559c4f096392d88b916701e1fa21d2885aba254c8214920dd1be45a7ea6931e8f025647946d19b4158a22b824aa18e75c18ace8fe99
 SHA512 
7ee39aba89993d9f0041ab991e053069e0c3ab4298f74c0ec95e3f30f49a71731ef37d8870b1ab9afd97b1c4618a879492976006b8a513bfc4bc44dfac591bf0
 DIST 7kaa.png 559 BLAKE2B 
0379e60a5355c93cddf2a5f30b5e84711f77df073db4e85eee13d51654180572cd73dc96e8a9b954101e8b0ecacd879d6fa9e57feb70b66d1bdd043d07a40113
 SHA512 
0ec1ba67107a7823943704879efaf12297c5441c43b54f49684550927b10dc40c657fe93eb7c4cc85208d08194f179c9602fd8df6545776f3e1b4481803b16e6

diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.5.ebuild 
b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.5.ebuild
deleted file mode 100644
index 1f8f9a54ed1..000
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils games
-
-MY_PN="7kaa"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Seven Kingdoms: Ancient Adversaries"
-HOMEPAGE="http://7kfans.com/";
-SRC_URI="mirror://sourceforge/skfans/${MY_PN}-${PV}.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
-   !games-strategy/seven-kingdoms-data"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( README )
-
-src_unpack() {
-   unpack ${MY_PN}-${PV}.tar.xz
-}
-
-src_prepare() {
-   epatch_user
-}
-
-src_configure() {
-   # In current state debugging works only on Windows :-/
-   egamesconf \
-   --disable-debug \
-   --without-wine \
-   --datadir="${GAMES_DATADIR}/${MY_PN}"
-}
-
-src_install() {
-   default
-
-   newgamesbin "src/client/${MY_PN}" "${MY_PN}.bin"
-   doicon "${DISTDIR}/${MY_PN}.png"
-   games_make_wrapper "${MY_PN}" "${GAMES_BINDIR}/${MY_PN}.bin" 
"${GAMES_DATADIR}/${MY_PN}"
-   make_desktop_entry "${MY_PN}" "Seven Kingdoms: Ancient Adversaries" 
"${MY_PN}" "Game;StrategyGame"
-
-   prepgamesdirs
-}



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

2017-07-30 Thread David Seifert
commit: c74ba037a9433072a4f10235b4e6084c0c4426f0
Author: David Hicks  hicks  id  au>
AuthorDate: Fri Jul 28 11:56:13 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jul 30 09:53:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c74ba037

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

Changes made:
* Download source from new official GitHub repository
* Prefer https for official webpage
* Use EAPI=6
* Remove src_prepare as the default in EAPI 6 now includes user patches
* Add new curl dependency (required for full multi-player ability)
* Remove deprecated games eclass dependency and use of functions
* Update the data directory to /usr/share/
* --without-wine is not required as this is the default
* --disable-debug is not required as this is the default
* No need to specify DOCS as README will be picked up automatically
* Remove package exclusion games-strategy/seven-kingdoms-data as this
package is no longer in the tree

Gentoo-Bug: 626426
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5233

 games-strategy/seven-kingdoms/Manifest |  1 +
 .../seven-kingdoms/seven-kingdoms-2.14.7.ebuild| 37 ++
 2 files changed, 38 insertions(+)

diff --git a/games-strategy/seven-kingdoms/Manifest 
b/games-strategy/seven-kingdoms/Manifest
index 78caac3ff9e..c075a847835 100644
--- a/games-strategy/seven-kingdoms/Manifest
+++ b/games-strategy/seven-kingdoms/Manifest
@@ -1,3 +1,4 @@
 DIST 7kaa-2.14.5.tar.xz 31223408 SHA256 
c7f04fa640d324ed8f1523da49945acd0f1ee2a99e3ee82ee29b52d2f735e464 SHA512 
cd797e63ba377d1f7b3e37cd775afd381ad015baf90bdfe00bc3f8741f745548b8abdd61e4b334e9fa54a5c04b48493ba8a90fbebef3f977517f12563d1efddd
 WHIRLPOOL 
0a786e9657568349579fa7ce2fe907942ffbcec1e03eb07b22a3ede915005a57389957960971df9680f7f8cb1a0b281e9da289500b9bf1e5c3e414aa60769451
+DIST 7kaa-2.14.7.tar.xz 31342092 SHA256 
9425cfb7f11a915e82d4696649db35a4d53969a9479a4705b403206df462e543 SHA512 
5c2067a842af18f2eaa21267ee0c48064eecfc6b967eb2abf967f2bf782a9699186b038d87de03fad71b5d88ec9fc1cfddd7521cb90c255a3a8d2aa586d3f2c1
 WHIRLPOOL 
89feb88acfa19e93a1d2e3820f1fe0d20c8225acff22d444616bd55e6c8ad214f7f6b3e3b830803c3c9c3cafa778da8b9adcbc937ef4f7db9dc36577011aa9b1
 DIST 7kaa-source-2.14.4.tar.bz2 27366752 SHA256 
60b61f321db6c295330fb3fb21894bc41cb6e0bd797aff9abe45cf2392b49fa1 SHA512 
7ee39aba89993d9f0041ab991e053069e0c3ab4298f74c0ec95e3f30f49a71731ef37d8870b1ab9afd97b1c4618a879492976006b8a513bfc4bc44dfac591bf0
 WHIRLPOOL 
4568d36278d4a286e0395b79ec06c03905b5e69be827faa80f4808c8b8fa097a65ac69ee5c58020dfcf21aa00649eaab2a3ac87a636b680167b4c83b3d3e5f73
 DIST 7kaa.png 559 SHA256 
354f64479b55df2021ca67366abb4724218ca3676fde9e735bfb2218bc1559f4 SHA512 
0ec1ba67107a7823943704879efaf12297c5441c43b54f49684550927b10dc40c657fe93eb7c4cc85208d08194f179c9602fd8df6545776f3e1b4481803b16e6
 WHIRLPOOL 
cb896939453d8ed6fc425931bb1f5b74c62aeea67e71e4645fe79fc69fb13fae89d4959651fd95dcbb416c378b4ef44873dc6ebdabc1f2bb1fed3753332209da

diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild 
b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
new file mode 100644
index 000..012fe8f1bc6
--- /dev/null
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+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}"
+
+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"
+}