commit: 58042585902cac0190e4623d2569ad9d9663e752 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Apr 4 07:15:34 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Apr 4 07:21:47 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58042585
games-arcade/briquolo: port to EAPI 7, games.eclass-- Signed-off-by: Sam James <sam <AT> gentoo.org> games-arcade/briquolo/briquolo-0.5.7.ebuild | 38 ++++++++++++++-------- .../briquolo/files/briquolo-0.5.7-gcc43.patch | 35 ++++++++------------ .../briquolo/files/briquolo-0.5.7-libpng14.patch | 4 +-- .../briquolo/files/briquolo-0.5.7-respect-AR.patch | 10 ++++++ 4 files changed, 50 insertions(+), 37 deletions(-) diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild b/games-arcade/briquolo/briquolo-0.5.7.ebuild index 07776ecc773..fe3a911deb6 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 toolchain-funcs 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 13e932a1c69..ba2690792dd 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 d325bac0257..201922e24e6 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 00000000000..2cccf8341e9 --- /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
