gentoo (valentine's day) resync : 14.02.2021

3 files changed, 14 insertions, 2 deletions

diff --git a/games-fps/quake2-icculus/Manifest b/games-fps/quake2-icculus/Manifest
index 1121d6a33ef9..7d4c8c4e0f3b 100644
--- a/games-fps/quake2-icculus/Manifest
+++ b/games-fps/quake2-icculus/Manifest
@@ -3,6 +3,7 @@ AUX 0.16-rogue-nan.patch 170 BLAKE2B 76beecbd38d07bad65595a049aea6802f7575d65e16
 AUX README-postinstall 3083 BLAKE2B 364510b4eb37b6623e8346c74743b27156f99938fc9726929500c4488fd9d8a54b45d762586bfb43996d27f8aab09b2cd2feda08cad2aba0be534f4b8ca303e0 SHA512 cc7441ce14117ea765a7df98b3de0370b251f444289fd8aaa03c97ea5b383d626088977bc30dfc7a30124dedce4796b5d6392dad7e3d203ee2257d71a9b49bfe
 AUX quake2-icculus-0.16.1-alsa.patch 4386 BLAKE2B f85c0332ee7ff5fec98dcc5762cf63733f8442e76864cbd844dc19426f14eb22b4d3fec7fea8592fc9fe95cb55193324cefb87076fefb254cb7773cd2423f567 SHA512 8bb9e4d6f551ebe3e6715e044453affd7edd749650791fca32b5286038e75a59685c7d47efce8ac7b9dff488e6c2952dfdc68807f3365d276afb4b7387ad5dbc
 AUX quake2-icculus-0.16.1-amd64.patch 534 BLAKE2B 8f3afa80b23784a6683762a94b651b5999a7570ae954c87e5bf963ea52bf1fbdb3150c22715b4d4711b31892e3d67ef01bdfbb3285338add10bcbba0aaa335c2 SHA512 03faf4b85aa176a267847196fb56204b6d02bde0ebef858a34edb3c87cb41e57636d9b6e5b3be44163e918cb4b3ff38299b2db9de90690179108ee77146b942d
+AUX quake2-icculus-0.16.1-fno-common.patch 389 BLAKE2B e8dc118ea7af1f76e4eb5cde68cba3cd858e26cdb67a2ca9d37a9dbdd476651a45041419fedde7726f3b9054d4936313136bb00bc319a49884a817e50a570daf SHA512 26d72187bd580e18f3eb7e235a3b3e2589968508cc2d3363c2c828f79b9aec8b03c4e23d47a79b988f276ea69d3bd012ab7b866b55c4c69f7f49a75dd41b3944
 AUX quake2-icculus-0.16.1-gcc41.patch 292 BLAKE2B 393df8fbd236fb3eb509fa640c650144e734f15baf3b1f985ca0a0d81810e227e87b4a19ceb5db95067b40370ce7dab1e641f48a9ecd00d7f0bcaa3726f9bc56 SHA512 87193f69670e7cd6573bd4ff550202fda2702a5d7dfadb3af31f673b8910958ec3718e0d7ae558666c6a6921c43d543626dc8eaa0e3822345f33aecdbdf7ee50
 AUX quake2-icculus-0.16.1-gentoo-paths.patch 6419 BLAKE2B ed3fe4cd3f812b6dda63bd017eca74a57dafe0ae56a877a30e814c486b4378a04a7c0525f71a13804f653febec5b6ff855be5cea3b8c4a4ca9bccf0e2d441e4f SHA512 91a83f82b013245256db386a212c044bfbd637e1685e532d2ca75959e6870e65f3763f6d83c85db184d46a0ed77b5d4a53c4f7421b55b82a4709bdfc70d0f307
 AUX quake2-icculus-0.16.1-gnusource.patch 316 BLAKE2B 344afcbda64c0a52e06a91cbcfd4a53f9badf8c0d25ac384525e84eff164a1f103df9289d5a691b413e5e1a1a2749872841ad18ff4e3517465fb1c1cd729edce SHA512 0e1bed0bfd7ab31ad574a17534a49e89b44ef99308b90d9a30726f7d39ec4606514643e064968a5d9e53dd7a20394d5a27162fba06f37713ee3bc1e65f31b76b
@@ -16,5 +17,5 @@ DIST maxpak.pak 3282742 BLAKE2B 3ad4dd5aade5747b100a24499bae0f0d7fd5cc610e4671c1
 DIST quake2-r0.16.1.tar.gz 1525384 BLAKE2B b95db08ed3799d2788a20d24f63ea3a84d7ff4b581ee5f01dc5d588a1d5af50d52586a04ca28d9942e953d028e140112737432e499edcebf999085a29c63fcfb SHA512 63e8fa10446698b1f1cbd20b4bbfeec75d7620cb6454bb90b853cd2a3d6cd9040041a164666a5e015c3a8289423127f9164b500f57793505f6e4671dec932cf2
 DIST roguesrc320.shar.Z 626769 BLAKE2B f6d79630ee41e834ad07907f886766fdc9fd99152c2a1964629d2c74de259b9a232f691e5e3c4ad26ff3239d127f06d20878422dd7c1b896591db7c732a41ef7 SHA512 330db4966b758b8e363eb8d699b30ce5ec7d9fa581936288e7267000d0815996388adebc0206a8903734cdc1c5658616b15518a2bf888ad9e6059f8155960141
 DIST xatrixsrc320.shar.Z 455917 BLAKE2B 646801fad3c7eaac4957a971f507b13fff0ea6ae0423cb7fe8e8276666c4f89165384e2e2148e828b692533f9f582b64db849efe8d858e51026b9fb847282101 SHA512 6723440d3cfdaf7f9b260d5777d9823937a4c3ee800c8c204e8a5c3d29f2b37f6bdc7c0786025a19d040b5692aa54b99b9db2dc121bc0ca2b53c8763b4ab4dfa
-EBUILD quake2-icculus-0.16.1-r1.ebuild 5197 BLAKE2B 0ecece40469fbca27259502d3a2623d9fee73257b8c679e86ab78e3998f059cd23e1e9d3b45a2610420f1c9575f97d81de8d0340cfec4f601f18f0f17cbfc1d6 SHA512 eb648f823a1798427537ad48d0fdf8602ad3ce53391195ff42df21353464df9e575281ba348b4c33352782d07794140db4f8eb208313fb439d23461097714c96
+EBUILD quake2-icculus-0.16.1-r1.ebuild 5237 BLAKE2B 0e99364cb00cfcfcc7a3a9089f9d4318931c1a69543139587ebb2de4accd75f560917c8ba668c04a52dedab7024cf7830511e2e434ead016b08703d2d56c6fd9 SHA512 fa8088fc242db69f2631551be45554f868622302e4dbcf5e23f0185f2589c23c2cefc4a264b944d3063004b786fe21f1f45d9d0f67420cc244eae8710870a99b
 MISC metadata.xml 612 BLAKE2B 0e452fab96a1eaa0cdbb5113cd957576e968eef662103403cef968ae05b909a3d3bc25939dfbb4d36a191d18853e1af0d342ce37cbd6a30defc4fb5ac9e4285c SHA512 0c143ca3470f6b33b35d660e3ad55678356e7139cab94589d18947617988f63f8c69485167d9d8c3e21ef231b0521f993a5063df26ae3e5e5cf4c64bee30d45b
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-fno-common.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-fno-common.patch
new file mode 100644
index 000000000000..8392ec63b784
--- /dev/null
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-fno-common.patch
@@ -0,0 +1,10 @@
+--- a/src/client/client.h
++++ b/src/client/client.h
+@@ -49,7 +49,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #ifdef QMAX
+ #define random()	((rand () & 0x7fff) / ((float)0x7fff))
+ #define crandom()	(2.0 * (random() - 0.5))
+-vec3_t clientOrg; //lerped org of client for server->client side effects
+ 
+ void vectoangles2 (vec3_t value1, vec3_t angles);
+ 
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
index 13756e436dc6..5a5e6b994311 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
@@ -70,7 +70,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-x11_soft.patch \
 		"${FILESDIR}"/${P}-x11_mouse.patch \
 		"${FILESDIR}"/${P}-alsa.patch \
-		"${FILESDIR}"/${P}-ia64.patch
+		"${FILESDIR}"/${P}-ia64.patch \
+		"${FILESDIR}"/${P}-fno-common.patch
 
 	if use xatrix ; then
 		epatch "${FILESDIR}/${P}"-gcc41.patch