[gentoo-commits] repo/gentoo:master commit in: games-emulation/gnuboy/, games-emulation/gnuboy/files/

["Sam James" <sam@gentoo.org>]

commit:     91aff97f2dac6a7897dff1da831d3d9243955307
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 19 00:17:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 19 00:39:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91aff97f

games-emulation/gnuboy: update EAPI 6 -> 7, add libsdl[joystick]

Closes: https://bugs.gentoo.org/743100
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gnuboy/files/gnuboy-1.0.3-include.patch        |  5 ++---
 games-emulation/gnuboy/gnuboy-1.0.3-r2.ebuild      | 25 +++++++++++-----------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/games-emulation/gnuboy/files/gnuboy-1.0.3-include.patch b/games-emulation/gnuboy/files/gnuboy-1.0.3-include.patch
index 15573000511..61b776f0008 100644
--- a/games-emulation/gnuboy/files/gnuboy-1.0.3-include.patch
+++ b/games-emulation/gnuboy/files/gnuboy-1.0.3-include.patch
@@ -1,6 +1,5 @@
-diff -ru gnuboy-1.0.3.orig/defs.h gnuboy-1.0.3/defs.h
---- gnuboy-1.0.3.orig/defs.h	2001-01-23 07:04:22.000000000 -0500
-+++ gnuboy-1.0.3/defs.h	2014-07-04 03:56:46.685149736 -0400
+--- a/defs.h
++++ b/defs.h
 @@ -4,6 +4,10 @@
  #ifndef __DEFS_H__
  #define __DEFS_H__

diff --git a/games-emulation/gnuboy/gnuboy-1.0.3-r2.ebuild b/games-emulation/gnuboy/gnuboy-1.0.3-r2.ebuild
index 177799b9c23..f48d05c9305 100644
--- a/games-emulation/gnuboy/gnuboy-1.0.3-r2.ebuild
+++ b/games-emulation/gnuboy/gnuboy-1.0.3-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools
 
 DESCRIPTION="Gameboy emulator with multiple renderers"
@@ -12,22 +13,24 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X sdl"
+REQUIRED_USE="!X? ( sdl )"
 
 RDEPEND="
 	sdl? ( media-libs/libsdl )
-	!X? ( media-libs/libsdl )
 	X? ( x11-libs/libXext )
 "
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-exec-stack.patch
+	"${FILESDIR}"/${P}-linux-headers.patch
+	"${FILESDIR}"/${P}-include.patch
+)
+
 src_prepare() {
 	default
-	eapply \
-		"${FILESDIR}"/${P}-exec-stack.patch \
-		"${FILESDIR}"/${P}-linux-headers.patch \
-		"${FILESDIR}"/${P}-include.patch
 
 	mv configure.in configure.ac || die
 	eautoreconf
@@ -36,10 +39,6 @@ src_prepare() {
 src_configure() {
 	local myconf
 
-	if ! use X ; then
-		myconf="--with-sdl"
-	fi
-
 	econf \
 		$(use_with X x) \
 		$(use_with sdl) \
@@ -50,11 +49,11 @@ src_configure() {
 }
 
 src_install() {
-	for f in sdlgnuboy xgnuboy
-	do
+	for f in sdlgnuboy xgnuboy; do
 		if [[ -f ${f} ]] ; then
 			dobin ${f}
 		fi
 	done
+
 	dodoc README docs/{CHANGES,CONFIG,CREDITS,FAQ,HACKING,WHATSNEW}
 }