gentoo resync : 28.04.2021

5 files changed, 19 insertions, 24 deletions

diff --git a/games-sports/foobillard/files/foobillard-3.0a-as-needed.patch b/games-sports/foobillard/files/foobillard-3.0a-as-needed.patch
index 272f9c711778..cb3f4236b719 100644
--- a/games-sports/foobillard/files/foobillard-3.0a-as-needed.patch
+++ b/games-sports/foobillard/files/foobillard-3.0a-as-needed.patch
@@ -1,10 +1,10 @@
---- foobillard-3.0a.old/src/Makefile.am	2004-02-25 07:23:56.000000000 +0100
-+++ foobillard-3.0a/src/Makefile.am	2008-12-06 21:57:03.000000000 +0100
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -83,6 +83,5 @@ AM_CFLAGS = -Wall `freetype-config --cfl
  
  #LIBS   = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz
  #LIBS   = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz
--AM_LDFLAGS = ${all_libraries} `pkg-config --libs freetype2` ${SDL_LIBS} ${GLUT_LIBS}
+-AM_LDFLAGS = ${all_libraries} `${PKG_CONFIG} --libs freetype2` ${SDL_LIBS} ${GLUT_LIBS}
  #LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz -L/home/floh/nvsdk/OpenGL/lib/ -lnvparse
 -LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz
-+LIBS = ${all_libraries} `pkg-config --libs freetype2` ${SDL_LIBS} ${GLUT_LIBS} ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz
++LIBS = ${all_libraries} `${PKG_CONFIG} --libs freetype2` ${SDL_LIBS} ${GLUT_LIBS} ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz
diff --git a/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch b/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch
index 3b7fc953a4de..08fa262f415f 100644
--- a/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch
+++ b/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch
@@ -1,7 +1,5 @@
-Index: foobillard-3.0a/configure.in
-===================================================================
---- foobillard-3.0a.orig/configure.in
-+++ foobillard-3.0a/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -13,7 +13,7 @@ dnl Checks for libraries.
  
  dnl Checks for header files.
@@ -11,10 +9,8 @@ Index: foobillard-3.0a/configure.in
  
  dnl Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
-Index: foobillard-3.0a/src/billard3d.c
-===================================================================
---- foobillard-3.0a.orig/src/billard3d.c
-+++ foobillard-3.0a/src/billard3d.c
+--- a/src/billard3d.c
++++ b/src/billard3d.c
 @@ -24,7 +24,11 @@
  #include <string.h>
  #include <math.h>
diff --git a/games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch b/games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch
index b01c53ecbc8b..2fc284580aad 100644
--- a/games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch
+++ b/games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch
@@ -1,5 +1,5 @@
---- foobillard-3.0a/configure.in
-+++ foobillard-3.0a/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -13,7 +13,7 @@
  
  dnl Checks for header files.
@@ -9,14 +9,14 @@
  
  dnl Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
---- foobillard-3.0a/src/Makefile.am
-+++ foobillard-3.0a/src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -50,7 +50,7 @@
  #CC     = gcc
  #CXXFLAGS = -O6 -s
  #CFLAGS = -DXMESA -Wall -O3 -I$(INCDIR)
 -#CFLAGS = -Wall -O3 -I$(INCDIR) `freetype-config --cflags`
-+#CFLAGS = -Wall -O3 -I$(INCDIR) `pkg-config --cflags freetype2`
++#CFLAGS = -Wall -O3 -I$(INCDIR) `${PKG_CONFIG} --cflags freetype2`
  if USE_SDL
  SDL_CFLAGS = `sdl-config --cflags` -DUSE_SDL
  SDL_LIBS   = `sdl-config --libs`
@@ -25,11 +25,11 @@
  endif
  
 -AM_CFLAGS = -Wall `freetype-config --cflags` ${SDL_CFLAGS} ${NVIDIA_CFLAGS} ${SOUND_CFLAGS} ${DEBUG_CFLAGS}
-+AM_CFLAGS = -Wall `pkg-config --cflags freetype2` ${SDL_CFLAGS} ${NVIDIA_CFLAGS} ${SOUND_CFLAGS} ${DEBUG_CFLAGS}
++AM_CFLAGS = -Wall `${PKG_CONFIG} --cflags freetype2` ${SDL_CFLAGS} ${NVIDIA_CFLAGS} ${SOUND_CFLAGS} ${DEBUG_CFLAGS}
  
  #LIBS   = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz
  #LIBS   = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz
 -AM_LDFLAGS = ${all_libraries} `freetype-config --libs` ${SDL_LIBS} ${GLUT_LIBS}
-+AM_LDFLAGS = ${all_libraries} `pkg-config --libs freetype2` ${SDL_LIBS} ${GLUT_LIBS}
++AM_LDFLAGS = ${all_libraries} `${PKG_CONFIG} --libs freetype2` ${SDL_LIBS} ${GLUT_LIBS}
  #LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz -L/home/floh/nvsdk/OpenGL/lib/ -lnvparse
  LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz
diff --git a/games-sports/foobillard/files/foobillard-3.0a-gl-clamp.patch b/games-sports/foobillard/files/foobillard-3.0a-gl-clamp.patch
index 972d14cabb0a..3d185e8d2776 100644
--- a/games-sports/foobillard/files/foobillard-3.0a-gl-clamp.patch
+++ b/games-sports/foobillard/files/foobillard-3.0a-gl-clamp.patch
@@ -1,6 +1,5 @@
-diff -ur foobillard-3.0a/src/table.c foobillard-3.0a-glclamp/src/table.c
---- foobillard-3.0a/src/table.c	2004-01-11 21:53:02.000000000 +0000
-+++ foobillard-3.0a-glclamp/src/table.c	2011-02-21 09:14:36.000000000 +0000
+--- a/src/table.c
++++ b/src/table.c
 @@ -1214,8 +1214,8 @@
                            GL_UNSIGNED_BYTE, tabletexdata);
          glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, options_tex_min_filter);
diff --git a/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch b/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch
index 8a9a33c43ea4..82e80cef0b7f 100644
--- a/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch
+++ b/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch
@@ -1,5 +1,5 @@
---- a/src/ball.c.orig	2004-06-02 07:00:57.000000000 -0400
-+++ b/src/ball.c	2004-06-02 07:03:52.000000000 -0400
+--- a/src/ball.c
++++ b/src/ball.c
 @@ -1821,6 +1821,7 @@
              } else if( options_cuberef && cuberef_binds!=0 ){
                  glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, cuberef_binds[i]);