gentoo resync : 25.11.2020

3 files changed, 23 insertions, 4 deletions

diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest
index feaa0431b45a..199806ef108f 100644
--- a/games-strategy/megaglest/Manifest
+++ b/games-strategy/megaglest/Manifest
@@ -1,6 +1,7 @@
 AUX megaglest-3.11.1-cmake.patch 897 BLAKE2B 3076a11cbb18263aabfabdaadb4e201d26b7db6e55e32278c0f37ebd938ae8a41cccb906bcf30ff99a32f6ecb35d77512fd3904610443847d1e3bb3212122902 SHA512 f49580a2b87fbc1e9aa3bec7313bdff36f78404aa97ac9f0cef790202c7d92439ad3fd8a9bdc991540048adb771e22f36c946f44a967cacae5157ef98b41c6cc
+AUX megaglest-3.11.1-miniupnpc-api-version-16.patch 1334 BLAKE2B ae9ad1641d8624c59bd69046b00be6bbb8395baee2c72e9929ecc070d6b550cbe311cd071ad0d16539175df263da08900e5668787a4ae9232202de6e8b81da43 SHA512 a91a551da9cf67c5984ac359e6f56d97e873b52de02ff1dfc73ac516f34f9f9704e3958ad3371e6609f048ff198e9b3dfbde0a3c97e1b0253748fd41d39b0443
 AUX megaglest-3.11.1-miniupnpc.patch 1299 BLAKE2B e56123ca017cf7b244c449e7b77385d9adc5066873e2ff220eed0344752405019abb13a7dfd0ade027dedd7064e65cf4d6e0509b44986aa5692d7af73b701f7f SHA512 62bf0ff8fa167cecae9f7bf65e5295d609afcdb9fdcb3bf502366eb775fa8d3d39c12001d320a9dc42e12075004c86b7d118eb517d6a57473e03aa26944f8bd4
 AUX megaglest-3.11.1-static-build.patch 1939 BLAKE2B 6d71cdc521f3bcf519a3f98bee00bf45951c26f895c3fe74cd03f3ea74c7a28f370726e82385ce6e6af46a81fa77999b28ae266bdbb8b34cf9d1a5e66abb8bef SHA512 c83c8ed2700cd951516d497ac2a2cadbbb9fe56634e368a252ea7186266ada0bb744edb05fc2d8f1483a5f968854e46606f54926b50677cf424503b6c496dee5
 DIST megaglest-source-3.11.1.tar.xz 2863180 BLAKE2B 01923ad4b29cc7042f0a26ba44a6a023020cbe2071b26b40c3332d763430dd559eb9eb7041182e154a0f1832866c759e08f21a677fcb5f2dba134127b0624b30 SHA512 9e1d8eccff1889199ff0e4b0f1cc3d0193306cd9271a2c98f12a49d61a09789d0813d5f3dadfe7701d2446976992834c63287f0227d660dc9cc9d2ecef65e225
-EBUILD megaglest-3.11.1-r1.ebuild 4505 BLAKE2B 4740e92ac4cc3159ee3e52500a089cad5ebfa530196989737711bdd0fbd86a6fcede17a59190f02450a3b834f502f8b3f263af0325c1ad0d47c091a2dce7735e SHA512 7df2fe631b17a88fead0cd758bcbd8cc7b4f94bf5f5cd4bc541ab527d204c3e769929e573c4ee586a614ff4ccc90ca99cf1bccc73a7b512c7fe119ee93455a87
+EBUILD megaglest-3.11.1-r1.ebuild 4599 BLAKE2B 3e2c93a8883e370b796e90f5eab608551bcd4862013535c65c9b253ba5598153df9edfdd74abbf3483b4db38a2bf12239525c18b1e5f7fb61d01a0dbb5435b2d SHA512 e4adcc2397228c260b196a6b97fb85e552236521272e2a3c40c0d92bf56266f6d5c3f29ca624ba1737f66c29b8549ad1d53e4345aca2a23fb6cc1f998abe0459
 MISC metadata.xml 1621 BLAKE2B c8cbe108c70355825dfc84d74a64380ca7fd84b335abee058738e2139f00a25c3e79f6a7a3faa0da5cd06051809315ef482cf661ab29bac7f1254f41abdab8fc SHA512 b2bb0fc5043314a798b697ca6e337b7b4896475502c14c0e31ebf8b9d56e6629ef8c4dded03338b1ec7669db5a3ab84021177893dae2e0fae9d661d1f27216d1
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch
new file mode 100644
index 000000000000..a793c122b210
--- /dev/null
+++ b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc-api-version-16.patch
@@ -0,0 +1,17 @@
+https://github.com/MegaGlest/megaglest-source/commit/a85d12aed1983eb69d630b431b81ae656d83b3ac
+
+--- /source/shared_lib/sources/platform/posix/socket.cpp
++++ /source/shared_lib/sources/platform/posix/socket.cpp
+@@ -2610,8 +2610,10 @@
+ 				if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP device found: %s %s\n", dev->descURL, dev->st);
+ 
+ 				//printf("UPnP device found: [%s] [%s] lanaddr [%s]\n", dev->descURL, dev->st,lanaddr);
+-#if (defined(MINIUPNPC_API_VERSION)  && MINIUPNPC_API_VERSION >= 9) || (!defined(MINIUPNPC_VERSION_PRE1_7) && !defined(MINIUPNPC_VERSION_PRE1_6))
+-				char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])),0);
++#if (defined(MINIUPNPC_API_VERSION)  && MINIUPNPC_API_VERSION >= 16)
++				char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])), 0, NULL);
++#elif (defined(MINIUPNPC_API_VERSION)  && MINIUPNPC_API_VERSION >= 9) || (!defined(MINIUPNPC_VERSION_PRE1_7) && !defined(MINIUPNPC_VERSION_PRE1_6))
++                char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])), 0);
+ #else
+ 				char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])));
+ #endif
diff --git a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
index ef99043c0a34..ca99c5450f14 100644
--- a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
+++ b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 2010-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # google-breakpad
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="manual"
 inherit eutils flag-o-matic cmake-utils virtualx wxwidgets gnome2-utils games
 
 DESCRIPTION="Cross-platform 3D realtime strategy game"
-HOMEPAGE="http://www.megaglest.org/"
+HOMEPAGE="https://megaglest.org/ https://github.com/MegaGlest/megaglest-source"
 SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/megaglest-source-${PV}.tar.xz"
 
 LICENSE="GPL-3 BitstreamVera"
@@ -71,7 +71,8 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${P}-static-build.patch \
 		"${FILESDIR}"/${P}-cmake.patch \
-		"${FILESDIR}"/${P}-miniupnpc.patch
+		"${FILESDIR}"/${P}-miniupnpc.patch \
+		"${FILESDIR}"/${P}-miniupnpc-api-version-16.patch
 }
 
 src_configure() {