gentoo auto-resync : 31:07:2023 - 10:44:36

4 files changed, 29 insertions, 1 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index cdc06b1ce1bc..543fa9b09bc2 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 dab5e04213c4..ef225f1b2550 100644
--- a/games-strategy/seven-kingdoms/Manifest
+++ b/games-strategy/seven-kingdoms/Manifest
@@ -1,4 +1,5 @@
+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.png 559 BLAKE2B 0379e60a5355c93cddf2a5f30b5e84711f77df073db4e85eee13d51654180572cd73dc96e8a9b954101e8b0ecacd879d6fa9e57feb70b66d1bdd043d07a40113 SHA512 0ec1ba67107a7823943704879efaf12297c5441c43b54f49684550927b10dc40c657fe93eb7c4cc85208d08194f179c9602fd8df6545776f3e1b4481803b16e6
-EBUILD seven-kingdoms-2.15.5.ebuild 884 BLAKE2B c200f66aad234885cae4e505686321d06421ef3799d9849ac2ecf39912e5fbe88b9af951ce3cca950a5077bb73385e10a66ff292c9602fe2edbd9125da8fbb89 SHA512 c3b426b9e77725085c8980b3c67218bc0b6f8e0cb51e9157506f07a4914eebcaac7cd638e02c2b3349e0ab3daaf1c8c0b53e573017595328f4ca1d794690ee02
+EBUILD seven-kingdoms-2.15.5.ebuild 929 BLAKE2B 22590ca11c5c591bc4cfa61827f03823a7b815f0623f6d78b584360e8aa7f8320a9d1e650cc1f76aba6088c1420bccd97e7f7c843e8daa7a8fa2907f68f74909 SHA512 868a41f958cfb5011c15ff67ae13981ae1995fe6192f3222c2fd5d97710ad7e835870cb0b3495e63c6faf51c1ebf28c969da31fe688de5bf0e58eac69ad57aa8
 MISC metadata.xml 380 BLAKE2B 32f34684fc68a2e26bbfc87d8ba634a6cd23a489f8ba3927f09fd40b9f66e289711b45331f11922e7062f7da4cea0d210e60af79faba88b0a9202076183a7959 SHA512 a614006a602839d04f7f20f4069063d123d4b8786ff103a20349933e0304860d790e52f44ce2649d1452f9027d8e3110267b7958738aab4dfd5105ee4d4a43e5
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 000000000000..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
 }