gentoo resync : 28.04.2021

14 files changed, 123 insertions, 112 deletions

diff --git a/games-fps/quake2-icculus/Manifest b/games-fps/quake2-icculus/Manifest
index 7d4c8c4e0f3b..a3990d949be1 100644
--- a/games-fps/quake2-icculus/Manifest
+++ b/games-fps/quake2-icculus/Manifest
@@ -1,21 +1,21 @@
-AUX 0.16-rogue-armor.patch 240 BLAKE2B 5643b1af747e3b6d34d21f8ee830d6d5bec91e356e724dfb66e6840df3a594af7ebfe9a442979801fc3096b35b6485f9cd41db3295b154cdf096526779e34fca SHA512 591fccd0cbc1225982b6d95d4818a4d0ff409717de8799b1d49f424633169d8a8187206220c24b60a341337aec2e297dfd8517dd478223e7d557ee85f6ecc453
-AUX 0.16-rogue-nan.patch 170 BLAKE2B 76beecbd38d07bad65595a049aea6802f7575d65e1640cef2a05ce5ecef8031d333af2df56995bcf2b420034e663896d89dadc362959786a92eea0078d609c3c SHA512 3d9b3a95a85a6fa39f2c6f7ad5e49b313b723bfb0fa88392f8690df27c16a7d6ad7617043b6fd66dc87cbbac9b01b941b8cbc8ecf4e045b908e844832c80d26a
+AUX 0.16-rogue-armor.patch 231 BLAKE2B a913e4bd4ea987967af1f35c1fd25e69ea69d81395419390d17164f6f59b98fcd1bfdd38792d0c59da08fc05ee15be3fa75e5f1ee7c96eb9344cf5071297839c SHA512 2e1b80fff54e5b069f9b41ee400c7d72b118b7243f5e8c61e6d187c92e3fb5e8f483fba1b81fc53aab661236e14400959facc008e66b193255b70316832f8b2b
+AUX 0.16-rogue-nan.patch 161 BLAKE2B a80bf2cf61545c1deb682de842f4d43bc4b65ed73cfdb24a090f36b463a77006316d4a194c434ecb4dfd2ff94569af033624731470a5c631406a151e46ac8719 SHA512 4ecf761ace381d08529ab2c1e0ccd5f0e11f26bacbbd874c1d37a9d1656e21e20e71f4d8a25d298e73ccd2f0b4f3cb226106e417c11816e3e42b21c27c8969d2
 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-alsa.patch 4386 BLAKE2B 3ca70a0019a89eef53ef21e9980ece4b4c131e51015b3ffc59f3ece67becfe292a0228d6e05a2ce1bca29ed41075f18593c0374986c04fac2d558ce83ed30ac0 SHA512 75184e826611c6341e7bd128c5a0c8485ec4348d7ea65edd4b8e25f7342a13c47675b809a9522be7ba29b492b643c723ead720b8c7074b217c205cd7a658a487
+AUX quake2-icculus-0.16.1-amd64.patch 538 BLAKE2B 4ef45493f21b12d68c25e1c4568f4a964b69e6e73dd1fef2b04e020a65ce134b58fb4689a44c344906b50b59de98398af622245bd26918d881382242f83dbdcb SHA512 7e493d09dd958d8ed10629057edaeef0dd78b2f34a0f75f2538fcff23474e96a99e3b985233d2e5a736102c92d0999e919aee94bb7141bb311c082e19e191565
 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
-AUX quake2-icculus-0.16.1-ia64.patch 2399 BLAKE2B e4dcbc6528f0859ac791627f4a043c479e8a6024c1947196d540e11e53f9909f1151f26b8eaa272e371190f7287f323304ab7f5518704702aad64569278d4ee3 SHA512 fce5f699ecabe8ca9f215507172be537c8850fc91ed44224a588780bf76901d60486c220d5bf821b70fe9d2687f6ec9d966b78008de1f6cf4f1ac3644bb66844
-AUX quake2-icculus-0.16.1-ldflags.patch 1537 BLAKE2B d91b2a7f43f50ef615628e62951701ae4d920f2d8e9cc6f4d5e55368c00c80f2fbc9940df1bcc786b51e85e28fbb43e0c70d04225002a22f302d01a4775185dd SHA512 c4a1dc06b02c227e0cbb8e289b2eab864f5f599f0f92cb376d2a6be7d746774b89fddba21c003c91908a9a140fe639e1588dcff28cccc1a531a6eff8e8f4ccf0
-AUX quake2-icculus-0.16.1-no-asm-io.patch 513 BLAKE2B dbfb2134697e0fdedb47019595a740dfc9c56fa0cb7e21f40cf3a785b20a859d63eb81917cf95157866fd467cd8b0e4f4a8ffa1a871b35679d68c4d77d64bca5 SHA512 ad2d62ce9c69f10683bd5a0970339c82acdf9543b802a0ed070fb025efab6b3aad6e352cc29de5e3120449a3b679823feb920dc175f33b00d230cb9082be3f16
-AUX quake2-icculus-0.16.1-x11_mouse.patch 330 BLAKE2B 0b3da68e551dd76104c29acb9956393d29cd74462c38e9546575ce8951bbf05a14d2f01bd1246aaee842b59e46b25e90fd64e889a5e113dc325aaf7aa948b4e1 SHA512 4387615cab034dd37fb502e7f7411a9cf5ac9370ef474e123c1ea550d79fb06c838ac1de6e443d3e9aeea73ec905bd7464f57f9a561d4eca90852abace20eea0
-AUX quake2-icculus-0.16.1-x11_soft.patch 1128 BLAKE2B 0a0ffe6ced6a6b18f2a1f888d4f329f49b0ddd1ab8c31b20e37cbb6de9dbc703e681ca117aac0eb9e5c98b9b5e5e35b9c3fa6edc6f1925bbbfc7f8d2e21b8e8f SHA512 c8d479919fd4440041d1f2e3a020c45cfb6522d6ff675845bd646c0b736d6ce4b400bcdf99b7f4d456938e8e946e02e40ebab4d574779fb86cff49e4213abc1f
+AUX quake2-icculus-0.16.1-gcc41.patch 292 BLAKE2B 43ec1123bd8bb30453d0e39669da225e2e2d0bffefe0996f5ff9d25ae4d7ac5bc2f2011797dd9f1e5ecf70abc1d45a2a26d5a9bd146d25254e541155ad24ea83 SHA512 41024062095d427976cc4c4311465010c6f3d791852fbc22fd36f4affb6cc327619c53d0545fd222e8ac73a2c0c22a4c2af04b69eadabb27a9cafaf4f6f93c30
+AUX quake2-icculus-0.16.1-gentoo-paths.patch 6439 BLAKE2B 517614b736b315b32752cccfd9e1cdbdea56a6dcc51b3a27e2465ad1b03cb08f03b0b9b5548ea20a6116d923b33f762814d6b3a66c0effbf8930b030828a6561 SHA512 21e96fb9807d0300919ab24d343167da798c0dbc317a923b6ec53ec691f2a71c6250c1b084e928b548ecde5d868d5e4d3d019b28ca0b87979265c4c8384f01c3
+AUX quake2-icculus-0.16.1-gnusource.patch 281 BLAKE2B 2aa26352c9a0745caf821164a463c2ed0cfc785d6c23d2611882e9506703d7ea77a56c10588bbd5abb273778ce9248e32bf134c1dcea5e35fe01cff16981bf92 SHA512 7cf69b146d88096d90a79a640f1618ee52c36fcdf108fe80270dc612661c9f95a09d844b5bb27c807c0d69815bd92bb014096a8642bf8f7f6adba5c7ac496a0f
+AUX quake2-icculus-0.16.1-ia64.patch 2337 BLAKE2B 5b773bd795f2a286c39246331776e7773d0be7d6df08547854c95c8306e36adc76413864683699238054d59fce7f1a613e426fed2a3e86a6d9799622e9dea7fd SHA512 b35400d05030184b7a5dacaca8149be607aada0528d1c9ce0c9e0396a0db7fcab8845ca2537cccacd3e1b202d6377af34b1088a741949115fb989ce61c059143
+AUX quake2-icculus-0.16.1-ldflags.patch 1537 BLAKE2B 751d0e2023c83e30ca803b42a2d2dc0e1a7f2eaae3ca9fa7982d9712fbc7dbb8ba47d1d748ebf08df9f51b4c543de1bf79485a7ba12837eac8b90c4c77bb1c17 SHA512 99c874085b0830ec79d2b69ef2c751785732ff5edceb7f85a7793051f97d4184e41c3ec228bf167649402c5bcf49e50f248994f33c901d9a8b39ef290c9b9f1a
+AUX quake2-icculus-0.16.1-no-asm-io.patch 521 BLAKE2B 35b20680a4f8aec522ad6f861c248f1d5035e9636b905da805376d9f1ac5cbb4f6e4e0475fc62aefca203e77b84f5835f3f6b63d589d83c0ade21146793476aa SHA512 cbf464478ecee90bc0ba1c624672b74e3759a562c971b68c6e88d8a40865b6f9fd5f08cc9a21edf520eb7452e8a60bf8301d11a0f3eef792c5321fdbb9c369db
+AUX quake2-icculus-0.16.1-x11_mouse.patch 330 BLAKE2B 59e0abf37b21d215cbffb0d52eaf39b32b2bd8aa0165bdd43976178920cf63190ca62b07cfd4c6d616317c949c2947895334d2029ce3aaf4448df7e33b99ab50 SHA512 706cf107eb10141451ec2fa3fd3b352e80fbf1d7d33b53417f288a5da3c34bc4c42302dbd3be82f0ecf983d54f2fd132ead84f977f20324e80417764649e0a54
+AUX quake2-icculus-0.16.1-x11_soft.patch 1128 BLAKE2B 04f2d3795e84bc9287c4c87addc0065d4bdec5581e003b3bf7e8599305318733a9c0ea0dc5dce6d2ff18821112a412910c07349dfe5815950c041f391d66df74 SHA512 7a6d488361a9307e6ea3fda72b285760ac2529dcb5de2d3f593777033eed1b4c93fb75502de5d90ffa10831f24f72159e2bf76b4916541a7ed1dd30c7dca6911
 AUX quake2.xpm 1234 BLAKE2B 7525cb6b2be194822bd57554c7de5e4fcc9f7db9363e3216acac8dd13d8bd17810ff19f18000027f4de112b464a13aaf37c6be5370261283abac7d0a9f6ab8c4 SHA512 e7ed561123c2919a514ba7e4bcd32214bb368764cb53ad314b2816abefa0368247c0a9d463d9e96217c3583aa30f0f79b80bb5f798f6af857f4a0b069ab57e80
 DIST maxpak.pak 3282742 BLAKE2B 3ad4dd5aade5747b100a24499bae0f0d7fd5cc610e4671c1eafb3fc9fe50cbb955bb1d0d0cbaa19b08be7c07499c6a488200f1d811fb2fbe98e190dd58b324b8 SHA512 49eef504190323add8bbe6fd007ee51a17dc843898a2199a44a0b214a14da90202070f9eb025503c58b64d6306832bdb6c0d04efe927ea651eb83b0517a59782
 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 5237 BLAKE2B 0e99364cb00cfcfcc7a3a9089f9d4318931c1a69543139587ebb2de4accd75f560917c8ba668c04a52dedab7024cf7830511e2e434ead016b08703d2d56c6fd9 SHA512 fa8088fc242db69f2631551be45554f868622302e4dbcf5e23f0185f2589c23c2cefc4a264b944d3063004b786fe21f1f45d9d0f67420cc244eae8710870a99b
+EBUILD quake2-icculus-0.16.1-r2.ebuild 5275 BLAKE2B d3ace24fc61e02223bd159e042858c039a8728d702fd7816f4a8aac354f54c548ae888ed7f832587c9336fb4e20648af0646beb184a090bc71ff47c1de1540d0 SHA512 8ec7804b03f95be8032b9615372a1ea54ea84602670fcb0961626151d8c4bc5af5d619c7f52e33a9b2907a52f096faa85f65b68453f8e82b5c7020e9b7a1fb90
 MISC metadata.xml 612 BLAKE2B 0e452fab96a1eaa0cdbb5113cd957576e968eef662103403cef968ae05b909a3d3bc25939dfbb4d36a191d18853e1af0d342ce37cbd6a30defc4fb5ac9e4285c SHA512 0c143ca3470f6b33b35d660e3ad55678356e7139cab94589d18947617988f63f8c69485167d9d8c3e21ef231b0521f993a5063df26ae3e5e5cf4c64bee30d45b
diff --git a/games-fps/quake2-icculus/files/0.16-rogue-armor.patch b/games-fps/quake2-icculus/files/0.16-rogue-armor.patch
index 194f965a0501..bed337e4ce31 100644
--- a/games-fps/quake2-icculus/files/0.16-rogue-armor.patch
+++ b/games-fps/quake2-icculus/files/0.16-rogue-armor.patch
@@ -1,5 +1,5 @@
---- src/rogue/g_local.h.orig
-+++ src/rogue/g_local.h
+--- a/rogue/g_local.h
++++ b/rogue/g_local.h
 @@ -545,9 +545,6 @@
  extern	int	sm_meat_index;
  extern	int	snd_fry;
diff --git a/games-fps/quake2-icculus/files/0.16-rogue-nan.patch b/games-fps/quake2-icculus/files/0.16-rogue-nan.patch
index 0961fa68a985..09da62bee201 100644
--- a/games-fps/quake2-icculus/files/0.16-rogue-nan.patch
+++ b/games-fps/quake2-icculus/files/0.16-rogue-nan.patch
@@ -1,5 +1,5 @@
---- src/rogue/g_local.h.orig
-+++ src/rogue/g_local.h
+--- a/rogue/g_local.h
++++ b/rogue/g_local.h
 @@ -24,3 +24,3 @@
  #ifndef _WIN32
 -#include <nan.h>
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch
index 185359373c4b..a27fc035cd4c 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch
@@ -1,5 +1,5 @@
---- src/linux/snd_alsa.c.old
-+++ src/linux/snd_alsa.c
+--- a/src/linux/snd_alsa.c
++++ b/src/linux/snd_alsa.c
 @@ -22,13 +22,22 @@
  	$Id: quake2-icculus-0.16.1-alsa.patch,v 1.2 2015/03/27 06:40:34 mr_bones_ Exp $
  */
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-amd64.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-amd64.patch
index b3291827996c..30966c813d7c 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-amd64.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-amd64.patch
@@ -4,8 +4,8 @@ glx renderer by default.
 
 http://bugs.gentoo.org/show_bug.cgi?id=86552
 
---- src/linux/vid_so.c
-+++ src/linux/vid_so.c
+--- a/src/linux/vid_so.c
++++ b/src/linux/vid_so.c
 @@ -435,6 +440,9 @@ VID_Init
  */
  void VID_Init (void)
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch
index 626cf5a1b64d..1ea4d41df80a 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch
@@ -1,5 +1,5 @@
---- src/xatrix/g_local.h.old
-+++ src/xatrix/g_local.h
+--- a/src/xatrix/g_local.h
++++ b/src/xatrix/g_local.h
 @@ -446,11 +446,6 @@
  extern	int	sm_meat_index;
  extern	int	snd_fry;
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch
index 61f0bb2286e5..4631d3ca92f4 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -74,35 +74,46 @@ endif
  
  CC=gcc
@@ -85,8 +85,8 @@
  
  targets: $(TARGETS)
  
---- src/linux/qgl_linux.c
-+++ src/linux/qgl_linux.c
+--- a/src/linux/qgl_linux.c
++++ b/src/linux/qgl_linux.c
 @@ -3006,13 +3006,17 @@ qboolean QGL_Init( const char *dllname )
  //				dllname, dlerror());
  
@@ -108,8 +108,8 @@
  		}
  		Com_Printf ("Using %s for OpenGL...", fn); 
  	} else {
---- src/linux/vid_so.c
-+++ src/linux/vid_so.c
+--- a/src/linux/vid_so.c
++++ b/src/linux/vid_so.c
 @@ -237,13 +237,17 @@ qboolean VID_LoadRefresh( char *name )
  	//regain root
  	seteuid(saved_euid);
@@ -154,8 +154,8 @@
  }
  
  /*****************************************************************************/
---- src/qcommon/files.c
-+++ src/qcommon/files.c
+--- a/src/qcommon/files.c
++++ b/src/qcommon/files.c
 @@ -60,6 +60,7 @@ typedef struct pack_s
  
  char	fs_gamedir[MAX_OSPATH];
@@ -195,8 +195,8 @@
  
  	//
  	// then add a '.quake2/baseq2' directory in home directory by default
---- src/qcommon/qcommon.h
-+++ src/qcommon/qcommon.h
+--- a/src/qcommon/qcommon.h
++++ b/src/qcommon/qcommon.h
 @@ -74,6 +74,13 @@ Foundation, Inc., 59 Temple Place - Suit
  
  #endif
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch
index ad1f37309c30..42041978509f 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch
@@ -1,5 +1,5 @@
---- quake2-r0.16.1/src/linux/q_shlinux.c
-+++ quake2-r0.16.1-modified/src/linux/q_shlinux.c
+--- a/src/linux/q_shlinux.c
++++ b/src/linux/q_shlinux.c
 @@ -17,6 +17,9 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch
index ae1aa2e4068c..fe61bf501658 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch
@@ -1,5 +1,5 @@
---- quake2-r0.16.1.orig/Makefile
-+++ quake2-r0.16.1/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -54,24 +54,26 @@ endif
  
  
@@ -74,8 +74,8 @@
   ifeq ($(strip $(BUILD_SVGA)),YES)
    $(warning Warning: SVGAlib support not supported for $(ARCH))
   endif
---- quake2-r0.16.1.orig/src/linux/sys_linux.c
-+++ quake2-r0.16.1/src/linux/sys_linux.c
+--- a/src/linux/sys_linux.c
++++ b/src/linux/sys_linux.c
 @@ -216,16 +216,18 @@ void *Sys_GetGameAPI (void *parms)
  	char	*path;
  	char	*str_p;
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch
index 978c9c9820ea..765c146dd4ec 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.old
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -169,18 +169,18 @@
  DEBUG_CFLAGS=$(BASE_CFLAGS) -g
  
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-no-asm-io.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-no-asm-io.patch
index d94925b83e4b..0a1eecef2afa 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-no-asm-io.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-no-asm-io.patch
@@ -3,8 +3,8 @@ http://bugs.gentoo.org/193107
 asm/io.h does not exist with sanitized kernel headers, nor do these source
 files actually need the header, so punt it
 
---- src/linux/rw_in_aa.c
-+++ src/linux/rw_in_aa.c
+--- a/src/linux/rw_in_aa.c
++++ b/src/linux/rw_in_aa.c
 @@ -46,7 +46,6 @@
  #include <sys/mman.h>

  

@@ -13,8 +13,8 @@ files actually need the header, so punt it
  #include <sys/vt.h>

  #endif

  

---- src/linux/rw_aa.c
-+++ src/linux/rw_aa.c
+--- a/src/linux/rw_aa.c
++++ b/src/linux/rw_aa.c
 @@ -63,7 +63,6 @@
  #include <dlfcn.h>

  #if defined (__linux__)

diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch
index 6dc6f0f1ddfb..5d2a85a68e9b 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch
@@ -1,5 +1,5 @@
---- src/linux/rw_x11.c.old
-+++ src/linux/rw_x11.c
+--- a/src/linux/rw_x11.c
++++ b/src/linux/rw_x11.c
 @@ -989,8 +989,8 @@
  	} 
  	else 
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch
index e23caf9db09f..cd0f2c807ae0 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch
@@ -1,8 +1,8 @@
 
 the x11 software renderer just needs some tweaks to get working
 
---- Makefile.old
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -358,7 +358,7 @@
   endif
  
@@ -12,8 +12,8 @@ the x11 software renderer just needs some tweaks to get working
   endif
  
   ifeq ($(strip $(BUILD_GLX)),YES)
---- src/linux/rw_x11.c.old
-+++ src/linux/rw_x11.c
+--- a/src/linux/rw_x11.c
++++ b/src/linux/rw_x11.c
 @@ -53,7 +53,7 @@
  #include <X11/Xatom.h>
  #include <X11/keysym.h>
@@ -32,8 +32,8 @@ the x11 software renderer just needs some tweaks to get working
  #ifdef REDBLUE
  static PIXEL16 st2d_8to16table_s[2][256];
  static PIXEL24 st2d_8to24table_s[2][256];
---- src/ref_soft/r_poly.c.old
-+++ src/ref_soft/r_poly.c
+--- a/src/ref_soft/r_poly.c
++++ b/src/ref_soft/r_poly.c
 @@ -994,7 +994,7 @@
  		scale = yscale * pout->zi;
  		pout->v = (ycenter - scale * transformed[1]);
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r2.ebuild
index 5a5e6b994311..ef6f7b8b34a4 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs games
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 MY_P="quake2-r${PV}"
 DESCRIPTION="The icculus.org Linux port of iD's Quake 2 engine"
@@ -11,6 +12,7 @@ SRC_URI="http://icculus.org/quake2/files/${MY_P}.tar.gz
 	qmax? ( http://icculus.org/quake2/files/maxpak.pak )
 	rogue? ( mirror://idsoftware/quake2/source/roguesrc320.shar.Z )
 	xatrix? ( mirror://idsoftware/quake2/source/xatrixsrc320.shar.Z )"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -33,11 +35,21 @@ DEPEND="${UIDEPEND}
 	rogue? ( app-arch/sharutils )
 	xatrix? ( app-arch/sharutils )"
 
-S=${WORKDIR}/${MY_P}
+PATCHES=(
+	# -amd64.patch # make sure this is still needed in future versions
+	"${FILESDIR}"/${P}-amd64.patch
+	"${FILESDIR}"/${P}-gentoo-paths.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-no-asm-io.patch
+	"${FILESDIR}"/${P}-gnusource.patch
+	"${FILESDIR}"/${P}-x11_soft.patch
+	"${FILESDIR}"/${P}-x11_mouse.patch
+	"${FILESDIR}"/${P}-alsa.patch
+	"${FILESDIR}"/${P}-ia64.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 pkg_setup() {
-	games_pkg_setup
-
 	if ! use qmax && $( use opengl || use sdl ) ; then
 		elog "The 'qmax' graphical improvements are recommended."
 		echo
@@ -46,39 +58,33 @@ pkg_setup() {
 
 src_prepare() {
 	# Now we deal with the silly rogue / xatrix addons ... this is ugly :/
-	ln -s $(type -P echo) "${T}"/more
+	ln -s $(type -P echo) "${T}"/more || die
+
 	for g in rogue xatrix ; do
 		use ${g} || continue
-		mkdir -p src/${g}
-		pushd src/${g}
+		mkdir -p src/${g} || die
+
+		pushd src/${g} || die
+
 		local shar=../../../${g}src320.shar
 		sed -i -e 's:^read ans:ans=yes :' ${shar} || die
-		echo ">>> Unpacking ${shar} to ${PWD}"
+		elog "Unpacking ${shar} to ${PWD}"
 		env PATH="${T}:${PATH}" unshar ${shar} || die
-		popd
+
+		popd || die
 	done
-	sed -i -e 's:jpeg_mem_src:_&:' src/ref_candygl/gl_image.c || die
 
+	sed -i -e 's:jpeg_mem_src:_&:' src/ref_candygl/gl_image.c || die
 	sed -i -e 's:BUILD_SOFTX:BUILD_X11:' Makefile || die
-	# -amd64.patch # make sure this is still needed in future versions
-	epatch \
-		"${FILESDIR}"/${P}-amd64.patch \
-		"${FILESDIR}"/${P}-gentoo-paths.patch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-no-asm-io.patch \
-		"${FILESDIR}"/${P}-gnusource.patch \
-		"${FILESDIR}"/${P}-x11_soft.patch \
-		"${FILESDIR}"/${P}-x11_mouse.patch \
-		"${FILESDIR}"/${P}-alsa.patch \
-		"${FILESDIR}"/${P}-ia64.patch \
-		"${FILESDIR}"/${P}-fno-common.patch
+
+	default
 
 	if use xatrix ; then
-		epatch "${FILESDIR}/${P}"-gcc41.patch
+		eapply "${FILESDIR}/${P}"-gcc41.patch
 	fi
 	if use rogue ; then
-		cd src
-		epatch \
+		cd src || die
+		eapply \
 			"${FILESDIR}"/0.16-rogue-nan.patch \
 			"${FILESDIR}"/0.16-rogue-armor.patch
 	fi
@@ -123,38 +129,41 @@ src_compile() {
 			BUILD_ARTS=NO \
 			BUILD_ALSA=$(yesno alsa) \
 			SDLDIR=/usr/lib \
-			DEFAULT_BASEDIR="${GAMES_DATADIR}/quake2" \
-			DEFAULT_LIBDIR="$(games_get_libdir)/${PN}${libsuffix}" \
+			DEFAULT_BASEDIR="/usr/share/quake2" \
+			DEFAULT_LIBDIR="/usr/$(get_libdir)/${PN}${libsuffix}" \
 			OPT_CFLAGS="${CFLAGS}" \
 			CC="$(tc-getCC)"
+
 		# now we save the build dir ... except for the object files ...
-		rm release*/*/*.o
-		mv release* my-rel-${BUILD_QMAX}
-		cd my-rel-${BUILD_QMAX}
-		rm -rf ref_{gl,soft} ded game client ctf/*.o
-		mkdir baseq2
-		mv game*.so baseq2/
-		cd ..
+		rm release*/*/*.o || die
+		mv release* my-rel-${BUILD_QMAX} || die
+		cd my-rel-${BUILD_QMAX} || die
+		rm -rf ref_{gl,soft} ded game client ctf/*.o || die
+		mkdir baseq2 || die
+		mv game*.so baseq2/ || die
+		cd .. || die
 	done
 }
 
 src_install() {
-	local q2dir=$(games_get_libdir)/${PN}
-	local q2maxdir=$(games_get_libdir)/${PN}-qmax
+	local q2dir=/usr/$(get_libdir)/${PN}
+	local q2maxdir=/usr/$(get_libdir)/${PN}-qmax
 
 	dodoc readme.txt README TODO "${FILESDIR}"/README-postinstall
 
 	# regular q2 files
 	dodir "${q2dir}"
-	cp -rf my-rel-NO/* "${D}/${q2dir}"/
-	dogamesbin "${D}/${q2dir}"/quake2
-	rm "${D}/${q2dir}"/quake2
+	cp -rf my-rel-NO/* "${ED}/${q2dir}"/ || die
+
+	dobin "${ED}/${q2dir}"/quake2
+	rm "${ED}/${q2dir}"/quake2 || die
+
 	use dedicated \
-		&& dogamesbin "${D}/${q2dir}"/q2ded \
-		&& rm "${D}/${q2dir}"/q2ded
+		&& dobin "${ED}/${q2dir}"/q2ded \
+		&& rm "${ED}/${q2dir}"/q2ded
 	use sdl \
-		&& dogamesbin "${D}/${q2dir}"/sdlquake2 \
-		&& rm "${D}/${q2dir}"/sdlquake2
+		&& dobin "${ED}/${q2dir}"/sdlquake2 \
+		&& rm "${ED}/${q2dir}"/sdlquake2
 
 	doicon "${FILESDIR}"/quake2.xpm
 	make_desktop_entry quake2 "Quake 2" quake2
@@ -162,30 +171,32 @@ src_install() {
 	# q2max files
 	if use qmax ; then
 		dodir "${q2maxdir}"
-		cp -rf my-rel-YES/* "${D}/${q2maxdir}"/ || die
-		newgamesbin "${D}/${q2maxdir}"/quake2 quake2-qmax
-		rm "${D}/${q2maxdir}"/quake2
-		use dedicated \
-			&& newgamesbin "${D}/${q2maxdir}"/q2ded q2ded-qmax \
-			&& rm "${D}/${q2maxdir}"/q2ded
-		use sdl \
-			&& newgamesbin "${D}/${q2maxdir}"/sdlquake2 sdlquake2-qmax \
-			&& rm "${D}/${q2maxdir}"/sdlquake2
+
+		cp -rf my-rel-YES/* "${ED}/${q2maxdir}"/ || die
+
+		newbin "${ED}/${q2maxdir}"/quake2 quake2-qmax
+		rm "${ED}/${q2maxdir}"/quake2 || die
+
+		if use dedicated ; then
+			newbin "${ED}/${q2maxdir}"/q2ded q2ded-qmax
+			rm "${ED}/${q2maxdir}"/q2ded || die
+		fi
+
+		if use sdl ; then
+			newbin "${ED}/${q2maxdir}"/sdlquake2 sdlquake2-qmax
+			rm "${ED}/${q2maxdir}"/sdlquake2 || die
+		fi
 
 		insinto "${q2maxdir}"/baseq2
 		doins "${DISTDIR}"/maxpak.pak
 
 		make_desktop_entry quake2-qmax Quake2-qmax quake2
 	fi
-
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-
 	elog "Go read README-postinstall in /usr/share/doc/${PF}"
-	elog "right now! It's important - This install is just the engine, you still need"
+	elog "right now! It's important - this install is just the engine, you still need"
 	elog "the data paks. Go read."
 
 	if use demo && ! has_version "games-fps/quake2-demodata[symlink]" ; then