gentoo resync : 28.04.2021

5 files changed, 54 insertions, 40 deletions

diff --git a/games-arcade/briquolo/Manifest b/games-arcade/briquolo/Manifest
index e62eac1e331f..8b4209617c6d 100644
--- a/games-arcade/briquolo/Manifest
+++ b/games-arcade/briquolo/Manifest
@@ -1,5 +1,6 @@
-AUX briquolo-0.5.7-gcc43.patch 2954 BLAKE2B 40661c665dadefa60d7b08f0b7a2873beb291a4f4feafe3c3c3807d236ff8bbc743ad600843e19086d16e5eb40f23fe59ec3df14b28bb35c8a7bf7f134648ef4 SHA512 fdee3f69b425591969a351001722a8820d1b78b0107a358c6f60b6c40636a88f1ad657020ed80edd5403f804e3db7af181ba89235e08f660768e4b53f59f499a
-AUX briquolo-0.5.7-libpng14.patch 1058 BLAKE2B d34416489d59adbcbc2d406a6f5983056f1f7c36f2de506ddf881796c8717e471c4c043d9292604ed8f36b1a02642c281827d432e6b3723b2af1e5f374985760 SHA512 0d936eaf6bcb4de420ac45d2d0f41cee8b5b533e329946ddb656da689397e435ceec036ecba53abdec01a52964d56e23dce63d858c4caf77a7e997072ab4da13
+AUX briquolo-0.5.7-gcc43.patch 1967 BLAKE2B 0d7347e002022d12b95f3791beabc5b62e8f89bfccb0581b5907fcba024c6666962b50b50ef8a2bc3f4fcd8adb9b148ba7c70a0ee509f245444e9d4949f86bb8 SHA512 deb255f7201e3714b9a230a6b228d2789b9eba3a85fb930b92277a57c07bc8ac6a38f7028e3cfab8a298ad4833fe61c1dbcade3f0ac06381668dca337e1b8ca5
+AUX briquolo-0.5.7-libpng14.patch 1062 BLAKE2B 18049d54ed528cdbdfc712b85706b224609f05b129fa737aa4340fa25ee6b03f6b8e4eb764593781a93ab08dbf8229aee495fe809170fea0de1721477b1d6379 SHA512 0086a0cc8862c5c1c2000f8776bfcec1812a626eecdb15df4785bbd476e88fd55100d3f47877948c2af7500aba8f60f6c61fb19667e3823670a64f17eaa9c1b8
+AUX briquolo-0.5.7-respect-AR.patch 193 BLAKE2B c8594ba787c551a5f7a03ead31a79f55827dd879f245761f0556e5da61b88e5d6bd58861d7ff62d084bdc17da3be1ebe8c99eb1750cd19175ade6101d1d993a2 SHA512 027b30d972abf32644a45ea04cee69d73fa55a4292ba47a3de6b87a817e3e9bea00b28072864365f451948ea9aa1993de400523956be43a730bf74391e96ded0
 DIST briquolo-0.5.7.tar.bz2 2588084 BLAKE2B 4ec87a161df72f9cc0df592a5b18cdf7a42e9f66675b6eeec20f57f6be599942940eb341dc4927405a1402f1356f52bdd1bea2a6b72c5f36abf229c1ef42e5be SHA512 4ef78193c80ac3554b72149b8da9b5cfd5b8fd68932e5b52666d74642e94a7a3a596dbb6d2865cba526929dd6d9be89743847d5e77b6fbc687c32394bc3be3d2
-EBUILD briquolo-0.5.7.ebuild 1135 BLAKE2B a40a56a0540fe4d9dec44f629aa71851daf79b0d8101ebaa73c0461c8d650cfba48918045a9a8296c749af034065d8ea288c823cd8cbf71f717e17a96aedc94f SHA512 7cf0ea9fcf2b481e71af9973aa7d658771b4fcccb0dc314b545d9a7af4927cd1d3fd9155110b43e342ea67a3306d7c0957076417a231ee2ad6685e57b54c4165
+EBUILD briquolo-0.5.7.ebuild 1206 BLAKE2B 9c8e4268007e49e425a2c37ddc7335c585c064e01534a47e18d1a86fbbef180bab4bfaa766fb355c45c9f9e0f14b4a40d089808d6cf38d07976ab33f92548690 SHA512 e1d911fe8c3541334d81a77c47b15be3c6e63d97d2b09b95a9e179c7bfdece32edf3c04016e2011d9f75e355f0bde4f9893895036b8ad6f2bc3151edf12e72c8
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild b/games-arcade/briquolo/briquolo-0.5.7.ebuild
index 07776ecc7735..d58d4462cad1 100644
--- a/games-arcade/briquolo/briquolo-0.5.7.ebuild
+++ b/games-arcade/briquolo/briquolo-0.5.7.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit autotools desktop
 
 DESCRIPTION="Breakout with 3D representation based on OpenGL"
 HOMEPAGE="http://briquolo.free.fr/en/index.html"
@@ -13,39 +14,48 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
-RDEPEND="virtual/opengl
+RDEPEND="
+	virtual/opengl
 	virtual/glu
 	media-libs/libsdl[joystick,sound,video]
 	media-libs/sdl-mixer
 	media-libs/sdl-ttf
 	media-libs/libpng:0
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-libpng14.patch
+	"${FILESDIR}"/${P}-respect-AR.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
-	# no thanks we'll take care of it.
+	default
+
+	# No thanks, we'll take care of it.
 	sed -i \
 		-e '/^SUBDIRS/s/desktop//' \
-		Makefile.in || die
+		Makefile.{in,am} || die
 	sed -i \
 		-e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" \
 		-e 's:=.*share/locale:=/usr/share/locale:' \
-		configure || die
+		configure{,.ac} || die
 	sed -i \
 		-e 's:$(datadir)/locale:/usr/share/locale:' \
 		po/Makefile.in.in || die
+
+	eautoreconf
 }
 
 src_configure() {
-	egamesconf $(use_enable nls)
+	econf $(use_enable nls)
 }
 
 src_install() {
 	default
 	doicon desktop/briquolo.svg
 	make_desktop_entry briquolo Briquolo
-	prepgamesdirs
 }
diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-gcc43.patch b/games-arcade/briquolo/files/briquolo-0.5.7-gcc43.patch
index 13e932a1c69e..ba2690792dd5 100644
--- a/games-arcade/briquolo/files/briquolo-0.5.7-gcc43.patch
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-gcc43.patch
@@ -1,6 +1,5 @@
-diff -ru src.orig/Constante.cpp src/Constante.cpp
---- src.orig/Constante.cpp	2008-03-22 05:40:33.000000000 -0400
-+++ src/Constante.cpp	2008-06-11 23:16:46.000000000 -0400
+--- a/src/Constante.cpp
++++ b/src/Constante.cpp
 @@ -27,6 +27,7 @@
  #define DATADIR_BRIQUOLO "./"
  #define PACKAGE "briquolo"
@@ -9,9 +8,8 @@ diff -ru src.orig/Constante.cpp src/Constante.cpp
  
  #ifdef WIN32
  #define WIN32_LEAN_AND_MEAN
-diff -ru src.orig/MOGL/MOGL_EnsembleObjet.cpp src/MOGL/MOGL_EnsembleObjet.cpp
---- src.orig/MOGL/MOGL_EnsembleObjet.cpp	2008-03-24 09:12:36.000000000 -0400
-+++ src/MOGL/MOGL_EnsembleObjet.cpp	2008-06-11 23:17:11.000000000 -0400
+--- a/src/MOGL/MOGL_EnsembleObjet.cpp
++++ b/src/MOGL/MOGL_EnsembleObjet.cpp
 @@ -24,7 +24,8 @@
  #include "MOGL_Armature.h"
  #include "MOGL_Peau.h"
@@ -22,9 +20,8 @@ diff -ru src.orig/MOGL/MOGL_EnsembleObjet.cpp src/MOGL/MOGL_EnsembleObjet.cpp
  
  //#include <mmsystem.h>
  
-diff -ru src.orig/MOGL/MOGL_GestionnaireObjet.cpp src/MOGL/MOGL_GestionnaireObjet.cpp
---- src.orig/MOGL/MOGL_GestionnaireObjet.cpp	2008-03-24 08:56:13.000000000 -0400
-+++ src/MOGL/MOGL_GestionnaireObjet.cpp	2008-06-11 23:18:45.000000000 -0400
+--- a/src/MOGL/MOGL_GestionnaireObjet.cpp
++++ b/src/MOGL/MOGL_GestionnaireObjet.cpp
 @@ -21,6 +21,7 @@
   *****************************************************************************/
  #include "../I18n.h"
@@ -33,9 +30,8 @@ diff -ru src.orig/MOGL/MOGL_GestionnaireObjet.cpp src/MOGL/MOGL_GestionnaireObje
  
  bool MOGL_GestionnaireObjet::ChargerObjetASCTriangle(const char * p_NomFichier, const MOGL_GestionnaireTexture & p_GM,
                                                       MOGL_Objet & p_Objet)
-diff -ru src.orig/MOGL/MOGL_GestionnaireObjet.h src/MOGL/MOGL_GestionnaireObjet.h
---- src.orig/MOGL/MOGL_GestionnaireObjet.h	2006-03-07 15:31:24.000000000 -0500
-+++ src/MOGL/MOGL_GestionnaireObjet.h	2008-06-11 23:20:07.000000000 -0400
+--- a/src/MOGL/MOGL_GestionnaireObjet.h
++++ b/src/MOGL/MOGL_GestionnaireObjet.h
 @@ -24,7 +24,8 @@
  
  #include <vector>
@@ -46,9 +42,8 @@ diff -ru src.orig/MOGL/MOGL_GestionnaireObjet.h src/MOGL/MOGL_GestionnaireObjet.
  
  #include "MOGL_Triangle.h"
  #include "MOGL_Objet.h"
-diff -ru src.orig/MOGL/MOGL_Image.h src/MOGL/MOGL_Image.h
---- src.orig/MOGL/MOGL_Image.h	2006-03-07 15:53:11.000000000 -0500
-+++ src/MOGL/MOGL_Image.h	2008-06-11 23:20:51.000000000 -0400
+--- a/src/MOGL/MOGL_Image.h
++++ b/src/MOGL/MOGL_Image.h
 @@ -24,6 +24,7 @@
  
  #include "MOGL_Structure.h"
@@ -57,9 +52,8 @@ diff -ru src.orig/MOGL/MOGL_Image.h src/MOGL/MOGL_Image.h
  
  using namespace std;
  
-diff -ru src.orig/MOGL/MOGL_Objet.cpp src/MOGL/MOGL_Objet.cpp
---- src.orig/MOGL/MOGL_Objet.cpp	2006-03-07 15:31:24.000000000 -0500
-+++ src/MOGL/MOGL_Objet.cpp	2008-06-11 23:21:05.000000000 -0400
+--- a/src/MOGL/MOGL_Objet.cpp
++++ b/src/MOGL/MOGL_Objet.cpp
 @@ -20,6 +20,7 @@
   *
   *****************************************************************************/
@@ -68,9 +62,8 @@ diff -ru src.orig/MOGL/MOGL_Objet.cpp src/MOGL/MOGL_Objet.cpp
  
  //MOGL_Objet::MOGL_Objet(): MOGL_ObjetAbstrait(), MOGL_ElementArbre()
  MOGL_Objet::MOGL_Objet(): MOGL_Noeud(), _ModifieTriangle(true), _ModifieStrip(true),
-diff -ru src.orig/MOGL/MOGL_Peau.cpp src/MOGL/MOGL_Peau.cpp
---- src.orig/MOGL/MOGL_Peau.cpp	2006-03-07 15:31:24.000000000 -0500
-+++ src/MOGL/MOGL_Peau.cpp	2008-06-11 23:21:17.000000000 -0400
+--- a/src/MOGL/MOGL_Peau.cpp
++++ b/src/MOGL/MOGL_Peau.cpp
 @@ -20,6 +20,7 @@
   *
   *****************************************************************************/
diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch b/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch
index d325bac02578..201922e24e61 100644
--- a/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/show_bug.cgi?id=308667
 
---- src/MOGL/MOGL_Image.cpp
-+++ src/MOGL/MOGL_Image.cpp
+--- a/src/MOGL/MOGL_Image.cpp
++++ b/src/MOGL/MOGL_Image.cpp
 @@ -183,7 +183,7 @@ bool MOGL_Image::ChargerPNG(const char *
    info_ptr = png_create_info_struct(png_ptr);
    if (info_ptr == NULL)
diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-respect-AR.patch b/games-arcade/briquolo/files/briquolo-0.5.7-respect-AR.patch
new file mode 100644
index 000000000000..2cccf8341e9a
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-respect-AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,6 +16,7 @@ AM_INIT_AUTOMAKE(dist-bzip2)
+ # Checks for programs.
+ AC_PROG_CXX
+ AC_PROG_CC
++AM_PROG_AR
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ AC_PROG_YACC