gentoo resync : 21.08.2021

4 files changed, 63 insertions, 10 deletions

diff --git a/games-emulation/atari800/Manifest b/games-emulation/atari800/Manifest
index 166f659d310a..1044275e81ce 100644
--- a/games-emulation/atari800/Manifest
+++ b/games-emulation/atari800/Manifest
@@ -1,6 +1,7 @@
-AUX atari800-3.1.0-tgetent-detection.patch 690 BLAKE2B 49016e922f66214dadd0da179679e61f9359f93020d964f4ccd4b0b27da5ceb0fcdc0eedee6b891f8090bfe2c2d4fb23bbbc8130e660a1b84df8434101248f90 SHA512 dc045dc72b011fe2fab1b440a5fc50c3a34dcb4cd867efa9a8276cc770f21778732adf6c59e5a3daec0cd37364a83f877c739d1120d468af9372d088895850e5
+AUX atari800-3.1.0-tgetent-detection.patch 671 BLAKE2B 53a2e53316957849c9d5e2bb74896026532e1889f7c28b350753d6e2934ed2d27c27a18dd2e3964420c03f3c78553e0e3aa67c025d27c0195953608194ba0905 SHA512 844f95c4f735bd49dd76256fb01a5fef540eca00f12006350393b46e474fe75463573331fb2671bcbbbe6f7ce8c4b2f836c74dc986fd7dd1a687bf4f6ba6a19a
+AUX atari800-4.2.0-bashisms.patch 1582 BLAKE2B deb25311acf1ace15168d0af4e010bd94bb9a675a8f78df3a2490a0cb9e9cb65418640080111dfee5bb3737bc2ade75dc007a4f3c9bbf48221f241c8682c975b SHA512 c48f853d078b15ba10c9b20a56e349f8705840d9da5ee04bf6d1d6b6ca1c9068b50467729a3e63672304246f1f20958c8e8bef4ec7d83c0c91b750b67656991c
 AUX atari800-4.2.0.cfg 682 BLAKE2B 78df9048da4010676e9b0b60705ccc4722e7b81602585c3040f846088a7acd6a04133b3cde163f01b0096997eb6182d96d3782e04d8611ba8dc0f81c1e67abdd SHA512 357eb14d270297a90b52d33da98958e434847b84a00896b0cf93257955cab1fb4a214ac0a2a081a8773def9e99a95c6a6ad127b3dd4e7ed9fcbdec57b66d6fad
 DIST atari800-4.2.0-src.tgz 7047710 BLAKE2B eac4b2da03d2ff5ec9e18dda41e0345975ed16c1cee23d15d2633211b7d4835b7a26c79fbf1672bb9ce3b82d52c7273e717371a0065ba29807f76d823eeb9855 SHA512 1236a8e05bf878e4514ae8e9f1556e0961a7f11ff0333eef415af455d217f712d5c6ededdd343dff6ba1aab777e19997bf9ecb859408187d69fc141301ecba31
 DIST xf25.zip 188942 BLAKE2B c10b9108eebc571ac334ea6fca76d227e3d2fcde1595e8823a3d178dc31d9efa9b209572ee03875461289093615470192cf5c9a06cf0b4363d097a9eac201db4 SHA512 306612fc2af41ed10d76103af83e141cfd8bd3ba2ea3cbd1d0b81d4d5b0108c06948a5c626648c8a2424536757a42a3f8b9af1fb63fa3c31096447ffed0f9923
-EBUILD atari800-4.2.0.ebuild 1393 BLAKE2B 505c9360f051eb7e72f5830cd1b1e26e5c17e1ee1a1eda5c565eab28d5eac6089c9ba5a3541780d484de653a9ac21774df14142c3daf99584886f5c093c0a936 SHA512 086362da958d0b9c9ebf4a3f746c85cafd2e2cdef57962f70b2ac97b313b2455a96def718c9a27769334c5d44e6d96f082f56005d3810ea1b37c2e4058d53712
+EBUILD atari800-4.2.0-r1.ebuild 1502 BLAKE2B e880601e15c1581698677ec856581bed8a3509b14d9fe007f9e64ca487265eb537fb9662e2a5687aa76036d2fa670c3bf2d6bdf49dd3385f290f53235b3cde58 SHA512 de527a7266603ff75a7f41511915110d14b83533056045d863d0401112886239a3d5db5436ee9342ad8d359fd8198e4945022f7dbaf184d334a8df6575add5ac
 MISC metadata.xml 1134 BLAKE2B 80b312e7a4f7c30291d48abfbd7e001b0c4a288326b65d7607715ac8353c8f78b8e2b0c18d0414f66c9deb2184fee90f5da774c07eb33a83d5e6d3618254eaf5 SHA512 ffdf180d2119072cab24fd96229a643cb4f3862fbfe20562a0d95263454cdef5c48fa20be80383cb3043802be02d2a1036684981bd885d6a691776903de96d34
diff --git a/games-emulation/atari800/atari800-4.2.0.ebuild b/games-emulation/atari800/atari800-4.2.0-r1.ebuild
index f49f59bcd447..25d867bd8214 100644
--- a/games-emulation/atari800/atari800-4.2.0.ebuild
+++ b/games-emulation/atari800/atari800-4.2.0-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit desktop autotools
+
+inherit autotools desktop
 
 DESCRIPTION="Atari 800 emulator"
 HOMEPAGE="https://atari800.github.io/"
@@ -18,7 +19,7 @@ REQUIRED_USE="opengl? ( sdl )"
 
 RDEPEND="
 	sdl? (
-		>=media-libs/libsdl-1.2.0[opengl?,sound?,video]
+		>=media-libs/libsdl-1.2.0[joystick,opengl?,sound?,video]
 	)
 	!sdl? (
 		sys-libs/ncurses:=
@@ -30,16 +31,20 @@ RDEPEND="
 	media-libs/libpng:=
 	sys-libs/zlib
 "
-DEPEND=${RDEPEND}
+DEPEND="${RDEPEND}"
 BDEPEND="
 	app-arch/unzip
 "
 
 src_prepare() {
-	default
+	local PATCHES=(
+		# Bug 544608
+		"${FILESDIR}"/atari800-3.1.0-tgetent-detection.patch
+		# https://github.com/atari800/atari800/pull/140
+		"${FILESDIR}"/${P}-bashisms.patch
+	)
 
-	# Bug 544608
-	eapply -p2 "${FILESDIR}/atari800-3.1.0-tgetent-detection.patch"
+	default
 	eautoreconf
 }
 
diff --git a/games-emulation/atari800/files/atari800-3.1.0-tgetent-detection.patch b/games-emulation/atari800/files/atari800-3.1.0-tgetent-detection.patch
index 018e423af6b4..487577e5b1a4 100644
--- a/games-emulation/atari800/files/atari800-3.1.0-tgetent-detection.patch
+++ b/games-emulation/atari800/files/atari800-3.1.0-tgetent-detection.patch
@@ -1,6 +1,6 @@
 diff -ruN atari800-3.1.0/src/configure.ac new/src/configure.ac
---- atari800-3.1.0/src/configure.ac	2014-04-12 15:58:16.000000000 +0200
-+++ new/src/configure.ac	2015-03-26 23:36:24.419178078 +0100
+--- src/configure.ac	2014-04-12 15:58:16.000000000 +0200
++++ src/configure.ac	2015-03-26 23:36:24.419178078 +0100
 @@ -982,7 +982,7 @@
  dnl existence of the tgetent symbol in readline. If not, we search for tgetent
  dnl in a few other libraries. All done with a single AC_SEARCH_LIBS statement.
diff --git a/games-emulation/atari800/files/atari800-4.2.0-bashisms.patch b/games-emulation/atari800/files/atari800-4.2.0-bashisms.patch
new file mode 100644
index 000000000000..117bf1feee86
--- /dev/null
+++ b/games-emulation/atari800/files/atari800-4.2.0-bashisms.patch
@@ -0,0 +1,47 @@
+From 92b1d0d2ea8cc87bf6a9b9084aa76ca3580d5e4e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 19 Aug 2021 09:26:41 +0200
+Subject: [PATCH] configure.ac: Fix compatibility with dash shell
+
+Fix the compatibility of the configure script with the dash shell
+by replacing the use of bash-specific '==' operator with plain '='.
+The calls in question do not utilize the pattern-matching behavior
+of '=='.
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c872a9b3..283c90e2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -709,7 +709,7 @@ AC_DEFUN([A8_OPTION],[
+     fi
+ ])
+ 
+-if [[ "$a8_target" == "libatari800" ]]; then
++if [[ "$a8_target" = "libatari800" ]]; then
+     WANT_NEW_CYCLE_EXACT=yes
+     WANT_VERY_SLOW=no
+     WANT_CRASH_MENU=no
+@@ -1040,7 +1040,7 @@ if [[ "$with_sound" != no ]]; then
+               VOICEBOX,[Define to emulate the Alien Group Voice Box.]
+              )
+ 
+-    if [[ "$with_sound" == "libatari800" ]]; then
++    if [[ "$with_sound" = "libatari800" ]]; then
+         WANT_SOUND_CALLBACK=no
+         WANT_CONSOLE_SOUND=yes
+         WANT_SERIO_SOUND=yes
+@@ -1094,7 +1094,7 @@ A8_OPTION(pokeyrec,$WANT_POKEYREC,
+           [Provide Pokey registers recording (default=ON)],
+           POKEYREC,[Define to add Pokey registers recording.]
+          )
+-if [[ "$WANT_POKEYREC" == "yes" ]]; then
++if [[ "$WANT_POKEYREC" = "yes" ]]; then
+     AC_SYS_LARGEFILE
+ fi
+ AM_CONDITIONAL([WANT_POKEYREC], test "$WANT_POKEYREC" = "yes")
+-- 
+2.33.0
+