gentoo resync : 28.04.2021

12 files changed, 40 insertions, 40 deletions

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]);