7 files changed, 81 insertions, 4 deletions
diff --git a/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
index 7c7373e81a78..e910f14e5bd2 100644
--- a/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
+++ b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
@@ -103,6 +103,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-libxml2-2.12.patch
 	# https://code.wildfiregames.com/D5267
 	"${FILESDIR}"/${P}-boost-1.85.patch
+	"${FILESDIR}"/${P}-miniupnpc.patch
 )
 
 pkg_setup() {
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index 8bf401727124..b68b22b6fd16 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -3,9 +3,10 @@ AUX 0ad-0.0.25b_alpha-fix-setuptools.patch 8270 BLAKE2B 65ec2d7be8602427a39b3b42
 AUX 0ad-0.0.26_alpha-add-missing-cstdint-include.patch 873 BLAKE2B cc4b621f3f6b1811e3e84262e7ec92a387d3b22a0f40f8405829d494f33700ecf9609cdb73eca90f649b5a270c24682a25d8ba4c9f5fc3468c87d8cb844f2f0c SHA512 576bf24bdc2b1fafb2d6917a40f978c864b5613631ce4630db96976205409799dac4bbf7c978958d1a073c90f2c955da2713202f41e8e1c21135f9683e48ecad
 AUX 0ad-0.0.26_alpha-boost-1.85.patch 1229 BLAKE2B 8aaf7b53806672e7812e7b796d07310995031fc6a36a6861e9133595990d5441ac2e69d0b845f89d7fdc0995c7e1a710d5ecaf861bebb6819892370497508f27 SHA512 e100942db7c69a8833665f7d085edef62224ebcf2aaf4d328290c0e971b62d8a69a037d3fabe6110b9aa906fe4e0a6197e17a8b667e3286888a3fa55ab82a7fa
 AUX 0ad-0.0.26_alpha-libxml2-2.12.patch 9046 BLAKE2B a4c914526ca2fa29a37aa72f390053ff95bd57e7a3a7d7653b30ac62e8ec8a7998082bd3bd2102654467242e32559c3cc517d813f60685b444ce0ffbf42b92eb SHA512 419af3d589c1465659e5077784d758db4d3b7fa36ac1e7a3e29e6620cc30b784282c299080d1fb8ef8936edc6a7d02d991ae4b911038da2c06705ae9e9945d3a
+AUX 0ad-0.0.26_alpha-miniupnpc.patch 1503 BLAKE2B 52cde93d352f6834529ae9c025a9f7b623939dcffdf714ba4b6c28bd2026934bcff620ae762fced978616421f9f56b614a8f755ff9e24b4a883fcaeaec69ac5e SHA512 d6cc631b8f6f0d96a23af628a6e83012a2e8b46645d6a5ff05d8c4b1f0687c5ea2ea73c50457f6d076c8b37ae47d64a269f9de51502cc7dbe5683148f561ecde
 DIST 0ad-0.0.26-alpha-unix-build.tar.xz 75599800 BLAKE2B ddd589840b0dacee2377ff4e5624f69646b92da4217015d788c6abec097578e44aee6641b6a6945d15f50d8e50673a1d44587c2faf02278d981a0ed30c950214 SHA512 aaf647d5d8454c244015d2a198beeaaebc571a5bc96446f3acff8dbd05f9843029c500bf4162651a5e1fcdb42bd5fb5b4f5c512c78372479fbd8565dd093f272
 DIST 0ad-0.0.26-alpha-unix-build.tar.xz.minisig 333 BLAKE2B 9f3146abda592fe6ab9433f6ee30060bcd4c5b594e00cb3fccc0aebb74652f3bc2ddd7b19a296da7ca13126ea9cc0337750f859e24f46adfcb84272bd2cce452 SHA512 eda542c1c363c7c0e6b235e6d8dfbd96d1c1e7cfca408b7215cf247b96c9f42b8bc206bbb4dd48dc41ee373db17d4a76cba940e454840dc41638dd572c580850
 DIST 0ad-0.0.26-alpha-unix-data.tar.xz 1351511480 BLAKE2B 2f483593b79a6ae87d7582625e89c890cfcf4ad7116348b184dae6c47a814d95a7b9f3018cb79e8f024a61c647abd39d6faf5ad3d3fcbb0c7a0583d0479d9b18 SHA512 8fe29fce68737d5b7001c8c2a7198766583b22556129cd2d927823da9b2c58f224fb1207f35bd03abea9380cf24d00ab6257b0dba86ce3ad1f357d7006f051d6
 DIST 0ad-0.0.26-alpha-unix-data.tar.xz.minisig 332 BLAKE2B fb4ec1bcabad79052a5e391557623ad61234d4948ec919d9a79011037855b6c7c94445d8f1667f1725bf80d15d66d1aa32c4e2b259831fbe088fe79e800515b3 SHA512 6dd55dda4e6cd52642b331aa571bc4ccfe30a33ad12a5d3ccf51c708d05dd74bf3234ca722c2a6501ba797bc1f8fa7c7aeb4d836dc4792bfd0c6bbccdc2c1237
-EBUILD 0ad-0.0.26_alpha-r1.ebuild 8327 BLAKE2B b2f132adbb5ca8ac0a33b9378feb08a3e9cdad78f0a56e687275107881d417a6f4e4bc27a9bc64d2528bbb857f7c31099b12c03354e4f2cce59d857fb0002647 SHA512 903029c8b488aae7b63b2daf542c5b2947bfc474e49221df8c38fe988664f29e763101deb0e9d12caf14e12c266782fc69f2d37bb8e0722270a43fc5f8564346
+EBUILD 0ad-0.0.26_alpha-r1.ebuild 8363 BLAKE2B c687b47bdf2ab5d1400cd72d7d419417d93a4e6b2c9fe0968334e576a9632552203b742baaeea37d5f928e2584917eeb7aee9f9108ddf82d61b1013b2439f1d9 SHA512 e9fe4b421e62be6cfc060dbbad19453f14948ab342196f85d927d0c55c21e639991bbf6e55704c8c615f6a20671f3295120a8326dece8e34c96aff0b59fed541
 MISC metadata.xml 667 BLAKE2B 3460d1e769fd9bab7f44c1387b9ccb6acb8b6030e5e307311aca479a0857a3719c22352e3b496dff2569536675e449f98aeccc62999283d2ebd3b3feefe444ee SHA512 65134f211aa3509589f9d333c0b2ceb7cb2dcfe394d3eb84323f5cafb43d8ec6d65738a38552d3c955eab5e7fcb5b71da575df5a1e21e0cbd49dcc4b89fc0f39
diff --git a/games-strategy/0ad/files/0ad-0.0.26_alpha-miniupnpc.patch b/games-strategy/0ad/files/0ad-0.0.26_alpha-miniupnpc.patch
new file mode 100644
index 000000000000..f17cee4e36f2
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.26_alpha-miniupnpc.patch
@@ -0,0 +1,38 @@
+Adapt to changes from API 18
+
+https://github.com/miniupnp/miniupnp/commit/c0a50ce33e3b99ce8a96fd43049bb5b53ffac62f
+https://bugs.gentoo.org/934315
+
+--- a/source/network/NetServer.cpp	2022-09-23 21:17:14.000000000 +0200
++++ a/source/network/NetServer.cpp	2024-06-14 21:43:26.572418719 +0200
+@@ -302,7 +302,11 @@
+ 	else if ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 0)) != NULL)
+ #endif
+ 	{
++#if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 18
++		ret = UPNP_GetValidIGD(devlist, &urls, &data, internalIPAddress, sizeof(internalIPAddress), NULL, 0);
++#else
+ 		ret = UPNP_GetValidIGD(devlist, &urls, &data, internalIPAddress, sizeof(internalIPAddress));
++#endif
+ 		allocatedUrls = ret != 0; // urls is allocated on non-zero return values
+ 	}
+ 	else
+@@ -321,9 +325,18 @@
+ 		LOGMESSAGE("Net server: found valid IGD = %s", urls.controlURL);
+ 		break;
+ 	case 2:
++#if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 18
++		LOGMESSAGE("Net server: found a valid IGD with a reserved address = %s, will try to continue anyway", urls.controlURL);
++		break;
++	case 3:
++		LOGMESSAGE("Net server: found a valid, not connected IGD = %s, will try to continue anyway", urls.controlURL);
++		break;
++	case 4:
++#else
+ 		LOGMESSAGE("Net server: found a valid, not connected IGD = %s, will try to continue anyway", urls.controlURL);
+ 		break;
+ 	case 3:
++#endif
+ 		LOGMESSAGE("Net server: found a UPnP device unrecognized as IGD = %s, will try to continue anyway", urls.controlURL);
+ 		break;
+ 	default:
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 4c1fd485626c..6c14901fc036 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index 8f27c96aac11..81b718bd5a6d 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -1,6 +1,7 @@
 AUX s25rttr-0.9.0_pre20200723-cmake_lua_version.patch 296 BLAKE2B cabdc87d6184e59f0896762f3d3434a137fed4fd1c2dae84d30dbee5d4903e68ba01c30b92d0d5290dec9b371807c317b462213a421cadd172b78b08407f66aa SHA512 074ac3e70fec0da6bd4a9602052989a8b6c26b5cfef669d6330d9177547bbeeeef2a4e6b9d83a9e9cbdf4ec33df7dcce50a862e3c9e533049ad8452df6073816
 AUX s25rttr-0.9.5-boost.patch 2155 BLAKE2B 75dd2cfb5cb4775c76033996fada2f7577f228855eca4469a3360941f337b6b05bccd65cb734e9ec02be4b7c84839570edab1480cfdb455eef5165edb4adb804 SHA512 baab52badfd10f3ff106c1303382ba320eb2ed655cdf564b8c1b1e1a21e5502258e3b770b855d4acd18e56b609e495b2e9ce1793743fd6a42d5bc69c81806091
 AUX s25rttr-0.9.5-gcc-13.patch 1527 BLAKE2B 23399f2a2d0e350d990a122195a2fbb6ece1f010ad31c7da24c3b7a4356f7cadf793149e40748c98d958ef5a3d0e401e8caeacc4b8872f66e148688e8caca9c5 SHA512 6208a550524d3a3364718a5aaa7b69205c48903394635f03339173920c2481ecd014b4f5e847ba5390a060100c848f7ebd48bd038ea99f9e17a9b72508f10799
+AUX s25rttr-0.9.5-miniupnpc.patch 1468 BLAKE2B 7c6987c3c607a89b165f719cf881ec68f1d2bde1e882624bbd7e6a3a85ec7758daaf862a5ba9b578b78df6ab02dfe69a00ae67f85631c9f754bf3992c6726407 SHA512 4991260fec453a8bfda0b73a5866b7a6916367185be36f7066e9015f78685e5904091babe10f403890a0eed071a98f799ac92c264bea4c4c16fe1d8954ec6655
 DIST s25client_src_v0.9.5.tar.gz 30305585 BLAKE2B 77857743b5a1693ed373cb048c40fed150a4bf3d59f1314ffbb268f3e03ba8db2f44c20962c390f3a8c5b5b443ee0465d5c7bf726998ddf0334a861304211db8 SHA512 4926653075c7ba01e1e4ca516c52ad1694b46557c40c418e2a1f18d0a8fac9d4b73c20adc5403365ad6ba643823ed23dff5296717b3e057c42b17f1c20feb802
-EBUILD s25rttr-0.9.5.ebuild 2713 BLAKE2B e96d000ae6b5a43233d71c4c667d80a6718fa86be07188876893b8b3198752d5c7ed1229e09dc99191402bfa4d4a671cfff9b43f84ca11e031dafce5fffc0d22 SHA512 594a0978fcf94c571e11dc8413a706d99b105cc40feddcc6683d20895d2ccdb577ccb190ddcda194a20de4956290ac3526bea3accaaff8cff2d15e44671734d4
+EBUILD s25rttr-0.9.5-r1.ebuild 2760 BLAKE2B df23b14e92c6259cb2b2ac6f803ea05cab33a1b0795ab16d1fadfcbfd98115e4052801d26f0e29a8e30db3b397fbb57e98a02f93071efa216479e4eb5aee5949 SHA512 970d9f3552a15d667b5510e8f0288198c949e54e125d8170fd050cbc2a01c120f13cb5dde4d85851645cd72c2f6609539f9732462add5d5fb48836efde0ad941
 MISC metadata.xml 348 BLAKE2B bc23c51bcd3458b4f39a6b42dd73f35060319cdae4563a4288ef2ae9dc9e2a85e8bc4b357dff37d70f20abf5d79a4a5c20fb1a8c2ab4c994dd3290ea18d49c34 SHA512 c145a48fb294eb11195885f0cd97095c7258d3286bf1cd926b5d40682aea1767c52a5a163283345fe12416659a9c7500de58993379b0ba3c743f18e172696c6f
diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.5-miniupnpc.patch b/games-strategy/s25rttr/files/s25rttr-0.9.5-miniupnpc.patch
new file mode 100644
index 000000000000..e09c258e2b41
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.9.5-miniupnpc.patch
@@ -0,0 +1,34 @@
+From c7b6e56337cbb03d9ed3aa601cb6e79e7858249a Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 16 Jun 2024 21:22:08 +0100
+Subject: [PATCH] Support miniupnpc API version 18 (release 2.2.8) and adjust
+ status check
+
+getValidIGD was treating non-zero return codes as successful, but only 1
+should really be considered successful in this context.
+
+This maintains compatibility with earlier versions.
+---
+ libs/network/src/UPnP_Other.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/external/libutil/libs/network/src/UPnP_Other.cpp b/libs/network/src/UPnP_Other.cpp
+index d684b9c..8fc9418 100644
+--- a/external/libutil/libs/network/src/UPnP_Other.cpp
++++ b/external/libutil/libs/network/src/UPnP_Other.cpp
+@@ -91,7 +91,11 @@ inline DeviceList discover(int delay, const char* multicastIf = nullptr, const c
+ inline bool getValidIGD(const DeviceList& deviceList, Urls& urls, IGDdatas& data, std::string& lanAddr)
+ {
+     lanAddr.resize(15); // Format: aaa.bbb.ccc.ddd
+-    return UPNP_GetValidIGD(deviceList, &urls, &data, &lanAddr[0], lanAddr.size()) != 0;
++#if (MINIUPNPC_API_VERSION >= 18)
++    return UPNP_GetValidIGD(deviceList, &urls, &data, &lanAddr[0], lanAddr.size(), NULL, 0) == 1;
++#else
++    return UPNP_GetValidIGD(deviceList, &urls, &data, &lanAddr[0], lanAddr.size()) == 1;
++#endif
+ }
+ 
+ inline void addPortMapping(const char* controlURL, const char* servicetype, const std::string& extPort,
+-- 
+2.45.1
+
diff --git a/games-strategy/s25rttr/s25rttr-0.9.5.ebuild b/games-strategy/s25rttr/s25rttr-0.9.5-r1.ebuild
index 1184da066c3a..439ea5525533 100644
--- a/games-strategy/s25rttr/s25rttr-0.9.5.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.9.5-r1.ebuild
@@ -19,14 +19,15 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
-RDEPEND="${LUA_DEPS}
+RDEPEND="
+	${LUA_DEPS}
 	app-arch/bzip2
 	dev-libs/boost:=[nls]
 	>=media-libs/libsamplerate-0.1.9
 	>=media-libs/libsdl2-2.0.10-r2[opengl,sound,video]
 	media-libs/libsndfile
 	media-libs/sdl2-mixer[vorbis,wav]
-	net-libs/miniupnpc
+	net-libs/miniupnpc:=
 	virtual/opengl
 "
 
@@ -44,6 +45,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch
 	"${FILESDIR}"/${PN}-0.9.5-gcc-13.patch
 	"${FILESDIR}"/${PN}-0.9.5-boost.patch
+	"${FILESDIR}"/${PN}-0.9.5-miniupnpc.patch
 )
 
 # Build type is checked but blank is valid.