gentoo auto-resync : 24:02:2025 - 19:24:56

4 files changed, 4 insertions, 76 deletions

diff --git a/games-strategy/seven-kingdoms/Manifest b/games-strategy/seven-kingdoms/Manifest
index c572cf63041e..d63951f3743e 100644
--- a/games-strategy/seven-kingdoms/Manifest
+++ b/games-strategy/seven-kingdoms/Manifest
@@ -1,7 +1,4 @@
-AUX seven-kingdoms-2.15.5-c++17.patch 649 BLAKE2B e2317cd336ca97904b3ae34bac07e7072e819695a30b82e10109f2541147fafa7853da6306e57d08e20f12fcb78a74d02d84bd1342ae68d361f401e60a5fbe1e SHA512 ed2b7efaad75b745ad961f662f75c9e5a62dee6d3c2090d1b14be0d7df3d77351988e90d69de849cd4e4ee62a1c04b994392d9910bee23faaefd3157cd820a3c
-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
-EBUILD seven-kingdoms-2.15.5.ebuild 928 BLAKE2B 467b482b507ab1468d7dc0c75b3c8ee4c984afc5e8204c61b38f4664d782e501f8a237a1607ebc416b2b0d78c737f9cb1c914357d64e81de2b9257947194d69d SHA512 9c0457969ad00035a93f5424c2e496214698309c4be8be9c97f7f26a07433355fc7eb90d5342d87b6bda4e5e75ce34c4b3226017ec28256ec5994e93f8f8a6d6
-EBUILD seven-kingdoms-2.15.6.ebuild 856 BLAKE2B 2cb149683e2e92d0916e58cd0e976e69214b51e1bfaf34a30c9154031fa353dad885fbdaaefd5e22f0cc5955eff9e7ac001171f51d28ce2c46eb0933751dd509 SHA512 997573eac8105363d509d9caf8598dc2e9801a5026998748ca463f3990b9546834dc0f87152086fe05b6144f6fe0bf9f7599d7a19225b39592f549c0f69af33f
+EBUILD seven-kingdoms-2.15.6.ebuild 856 BLAKE2B 1ff68bef79561fdffbd1bb46e348bb4b8fe9ba7d1f2b9c69f0e5b6d9e31b1a00554a0085c05ef439fd3f427f634a2cf9147864c3d17b90fc1504cb12ad6186d9 SHA512 a67f667b71bfe36e064c758ce3bcf13a3451214c37e8b8ca921329e18bc610752ae54b1c7c86dd5164ff04c937b007a59244e805ac599300cc4f556cec1eb77d
 MISC metadata.xml 300 BLAKE2B 62dbb958c14366716a9e0821a9b00a8952e2155ca2835dfac5e93d1281b9fa8f5993d3a26ca005db65be64341728a95f06059cf01b39c540af8c325b7277eb3c SHA512 6cde357ae348b346089a7b85c10cb99b10148004d20d0ec3936acde224f0577caaf33b66e11cfff159c2ba2c64dd072526733ce4e3b5c38c2837d4a90f115c24
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
deleted file mode 100644
index 5f8e8dd7bb6d..000000000000
--- a/games-strategy/seven-kingdoms/files/seven-kingdoms-2.15.5-c++17.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index 47fa2092c441..000000000000
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 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 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}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-c++17.patch"
-)
-
-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"
-}
diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.6.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.6.ebuild
index 4643f5115dea..54cf666acc43 100644
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.6.ebuild
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,6 +14,8 @@ HOMEPAGE="https://7kfans.com/"
 SRC_URI="https://downloads.sourceforge.net/skfans/${MY_P}.tar.gz
 	https://dev.gentoo.org/~pinkbyte/distfiles/${MY_PN}.png"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ppc64 x86"
@@ -24,8 +26,6 @@ DEPEND="net-libs/enet:1.3=
 	net-misc/curl"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 }