gentoo resync : 21.06.2020

8 files changed, 114 insertions, 58 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index dcedd6f57682..372a62926e5c 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/atari800/Manifest b/games-emulation/atari800/Manifest
index 763c6f2f7a09..e14f401d8c6b 100644
--- a/games-emulation/atari800/Manifest
+++ b/games-emulation/atari800/Manifest
@@ -1,6 +1,9 @@
 AUX atari800-3.1.0-tgetent-detection.patch 690 BLAKE2B 49016e922f66214dadd0da179679e61f9359f93020d964f4ccd4b0b27da5ceb0fcdc0eedee6b891f8090bfe2c2d4fb23bbbc8130e660a1b84df8434101248f90 SHA512 dc045dc72b011fe2fab1b440a5fc50c3a34dcb4cd867efa9a8276cc770f21778732adf6c59e5a3daec0cd37364a83f877c739d1120d468af9372d088895850e5
+AUX atari800-4.2.0.cfg 682 BLAKE2B 78df9048da4010676e9b0b60705ccc4722e7b81602585c3040f846088a7acd6a04133b3cde163f01b0096997eb6182d96d3782e04d8611ba8dc0f81c1e67abdd SHA512 357eb14d270297a90b52d33da98958e434847b84a00896b0cf93257955cab1fb4a214ac0a2a081a8773def9e99a95c6a6ad127b3dd4e7ed9fcbdec57b66d6fad
 AUX atari800.cfg 467 BLAKE2B 76caa8d4f73d292adb36ce66186bf657a25f4ef5404f0dedc0456fa933bc672bc5a89819b92555d88033bc47bdff4cd5b376571de01339a1b60a82a3210dcd11 SHA512 17f43f9f1b8dcf1513eefc8b89e94ecdaeb3f4e324a669e09c1f8b180e3c545b474164f73bc4c319dde27dda8effa1f2786957854ade81d161221e081c87d358
 DIST atari800-3.1.0.tar.gz 1492289 BLAKE2B cad7a3111bf714321d01aff1f8b30408efc1eca0876d9b795395d62d18eabdf78b71d3b2af887e8ba03e33e3824fcd5b45070e39cddd0e5ad0bda2d853f724b1 SHA512 c8f035c9be000c67dd854a14a236d165e6e2d30b5138f8772c6ea5c5290b0410525570e3ed9dcb2f9bcb129f97a36e6eef5993f0a5ad3cc993c6b59b127bcabe
+DIST atari800-4.2.0-src.tgz 7047710 BLAKE2B eac4b2da03d2ff5ec9e18dda41e0345975ed16c1cee23d15d2633211b7d4835b7a26c79fbf1672bb9ce3b82d52c7273e717371a0065ba29807f76d823eeb9855 SHA512 1236a8e05bf878e4514ae8e9f1556e0961a7f11ff0333eef415af455d217f712d5c6ededdd343dff6ba1aab777e19997bf9ecb859408187d69fc141301ecba31
 DIST xf25.zip 188942 BLAKE2B c10b9108eebc571ac334ea6fca76d227e3d2fcde1595e8823a3d178dc31d9efa9b209572ee03875461289093615470192cf5c9a06cf0b4363d097a9eac201db4 SHA512 306612fc2af41ed10d76103af83e141cfd8bd3ba2ea3cbd1d0b81d4d5b0108c06948a5c626648c8a2424536757a42a3f8b9af1fb63fa3c31096447ffed0f9923
 EBUILD atari800-3.1.0-r1.ebuild 1923 BLAKE2B c45ea37a93eae7cc5210eff2881cf49551efc0ecb0a3389e01f87018d351d37c192b5eb7069632bb4bbed7798c6a22bf7195d45528d8ac90896f050d64098379 SHA512 1441786da84d3aef99245c94c266380faff56b3be2a34c767b023ef22467e5d450d7c8a99371ef187238cfa81bbb7a571535b8877cf6c650480b225b1792b833
-MISC metadata.xml 1020 BLAKE2B 7c82700f98deef24331b65ec790956f3944fc2ad74f670e93babf9e129044fa126f71f961d609034b527a14cc1e052e47fe95eacf33ac7e0feeacf8e89540a07 SHA512 4e1ac81b84a99cff88a4ee5d18a761fe7c44107787b3f3576e45668c4496750557d47aed60311496318da449554f367896f9bc112260af414a0221e66595e176
+EBUILD atari800-4.2.0.ebuild 1362 BLAKE2B 1cf5f3dbecf4f7b5948ea7a619fdaec953c8743db55a2ec61df90b1444a74aebeeee0d6b9c84ea3fb833cb95d78bbadaea21d5a2716f1ae721699246ace0281e SHA512 d734f3b3e0eabbf7bbafbc32530478c3eab9619560c5aa38ddd76e20df1ce9007ff65464a0a5f013ae4a34fdef067d5358f14cd21922fd7e58b5a4da5fe49488
+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.ebuild
new file mode 100644
index 000000000000..dd1008578547
--- /dev/null
+++ b/games-emulation/atari800/atari800-4.2.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop autotools
+
+DESCRIPTION="Atari 800 emulator"
+HOMEPAGE="https://atari800.github.io/"
+SRC_URI="
+	https://github.com/atari800/atari800/releases/download/ATARI800_${PV//./_}/${P}-src.tgz
+	https://sourceforge.net/projects/${PN}/files/ROM/Original%20XL%20ROM/xf25.zip"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="opengl readline +sdl +sound"
+
+RDEPEND="
+	sdl? (
+		>=media-libs/libsdl-1.2.0[opengl?,sound?,video]
+	)
+	!sdl? (
+		sys-libs/ncurses:=
+	)
+	readline? (
+		sys-libs/readline:=
+		sys-libs/ncurses:=
+	)
+	media-libs/libpng:=
+	sys-libs/zlib
+"
+DEPEND=${RDEPEND}
+BDEPEND="
+	app-arch/unzip
+"
+
+src_prepare() {
+	default
+
+	# Bug 544608
+	eapply -p2 "${FILESDIR}/atari800-3.1.0-tgetent-detection.patch"
+	eautoreconf
+}
+
+src_configure() {
+	local video=ncurses
+	local sound=no
+
+	if use sdl; then
+		video=sdl
+		use sound && sound=sdl
+	elif use sound; then
+		sound=oss
+	fi
+
+	local myconf=(
+		$(use_with opengl)
+		$(use_with readline)
+		--with-video=${video}
+		--with-sound=${sound}
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	insinto "/usr/share/${PN}"
+	doins "${WORKDIR}/"*.ROM
+	insinto /etc
+	newins "${FILESDIR}"/atari800-4.2.0.cfg atari800.cfg
+	newicon data/atari2.svg ${PN}.svg
+	make_desktop_entry ${PN} "Atari 800 emulator"
+}
diff --git a/games-emulation/atari800/files/atari800-4.2.0.cfg b/games-emulation/atari800/files/atari800-4.2.0.cfg
new file mode 100644
index 000000000000..6e79c110dbd8
--- /dev/null
+++ b/games-emulation/atari800/files/atari800-4.2.0.cfg
@@ -0,0 +1,31 @@
+Atari 800 Emulator, Version 4.2.0
+ROM_OS_A_NTSC=
+ROM_OS_A_PAL=
+ROM_OS_B_NTSC=
+ROM_OS_AA00R10=
+ROM_OS_AA00R11=
+ROM_OS_BB00R1=
+ROM_OS_BB01R2=/usr/share/atari800/ATARIXL.ROM
+ROM_OS_BB02R3=
+ROM_OS_BB02R3V4=
+ROM_OS_CC01R4=
+ROM_OS_BB01R3=
+ROM_OS_BB01R4=
+ROM_OS_BB01R59=
+ROM_OS_BB01R59A=
+ROM_5200=
+ROM_5200_A=
+ROM_BASIC_A=
+ROM_BASIC_B=
+ROM_BASIC_C=/usr/share/atari800/ATARIBAS.ROM
+ROM_XEGAME=
+ROM_400/800_CUSTOM=/usr/share/atari800/ATARIOSB.ROM
+ROM_XL/XE_CUSTOM=/usr/share/atari800/ATARIXL.ROM
+ROM_5200_CUSTOM=
+ROM_BASIC_CUSTOM=/usr/share/atari800/ATARIBAS.ROM
+ROM_XEGAME_CUSTOM=
+OS_400/800_VERSION=AUTO
+OS_XL/XE_VERSION=AUTO
+OS_5200_VERSION=AUTO
+BASIC_VERSION=AUTO
+XEGS_GAME_VERSION=AUTO
diff --git a/games-emulation/atari800/metadata.xml b/games-emulation/atari800/metadata.xml
index 610c1b8077a2..4c367c3a4ccb 100644
--- a/games-emulation/atari800/metadata.xml
+++ b/games-emulation/atari800/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
+  </maintainer>
   <maintainer type="project">
     <email>games@gentoo.org</email>
     <name>Gentoo Games Project</name>
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index a0897d2e55e8..3afe76bc11ab 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,9 +1,8 @@
-AUX mgba-0.8.0-no_sdl.patch 1465 BLAKE2B 07ca5575da44b787ee1a25c41558f7e198bb89b999036d80c5ac5501922dd7ed8d9232686c23c7d8e00abc69a18c70c3f8094b81d30de9fda081663b83f706bc SHA512 848e3b47d7c4a9dcbbe292fb59a351dcb00a60af2999e9d8be66a0a294f7f32e745fedbbad625e83707efcffeeae23ea4bd915c3f598c88185b9a0cb54fc95ac
 DIST mgba-0.7.3.tar.gz 11228977 BLAKE2B 2b70bb97470558e6c10391b782f0f80e0466b2f16df07971ed378801d359157692ce56c61f4432640ed679d43dc2445a1ea45b3402c1b488fb534213d8594271 SHA512 131f850699f17a7496f7428b85b50f38b99acec4c87d5d28ba4e3af94f095a1b6d177ea731838b2971362b46c52accef9cbec98433ecfaccc080371092c7d789
-DIST mgba-0.8.0.tar.gz 11797469 BLAKE2B ddf1e7fe291c3bab0391a916e2e34b1adc280d6eb40ac730a5b6fe754f947061709103c480658f1fe90f9677a5cc7334200e6b16bc73d22bb178c93e8ef51de8 SHA512 47a267f7998535bbbe1fafb6e2a4d708bdafe9601f7bd50f16f37d79d78a991d49d360a2a571fc6b09ddd21450244a8c0bc37aa08d5e38b4896c25cc6f615bb2
 DIST mgba-0.8.1.tar.gz 11893993 BLAKE2B 0b5db35927111a23defaf33ea67b00613c01302940db8bfe6c21aab4ec39bdb089ddbd6238ca7ccd35010724b058f78cee3ca3cbc6d7fbe0047f25a152b208fa SHA512 7873bde6a74e8a1509a3b5bba602da1c747ca1eff72adcf11f7b2572298d94766570fea0b920cb28c8b63a7d8237a15876b9feb9169edbf331b2d72f340734e2
+DIST mgba-0.8.2.tar.gz 12014352 BLAKE2B 5a22d186b2732ba66698ac3fe47cd6ce841ca36ba856e5344948cf14a73aa9368658d94f0e6fb4fd78ae0a454c6d534182ecce221b3b24d62dde511c0aaa02a2 SHA512 181abab9e94964e2027cb039ded6128af1364e1442c418b8703263c9e0c5befeb7aca4d925fb44f3e25e8711a2cc22b198ea00483c42aea3b1c7ba077223d426
 EBUILD mgba-0.7.3.ebuild 2425 BLAKE2B cfa4b58b92702bf6a5e9d29f1f2428c78c9523b553a752ed8ff3707b5bcb1bb618b8bc2276eea95aa608172fe7b8bb579040d6e2838d2b38cd084d41144d6a13 SHA512 4e6332c4ac92832354ae6509b8d8ab512d6353e6df30e73ae9e1158fa907a9c96e214417cdebec51506e89e482504cb254cd8cdd1d37de3903d7f00c2b932d7a
-EBUILD mgba-0.8.0.ebuild 2525 BLAKE2B 4d4b24c5b4e0310505b3f779642c03f4455949f58f453542d0d210c9bf128959cccca9ddb15c9c246567fa340f95dca33762eb93cd03cc1b31428e13bea065b7 SHA512 e7cf1dd6e6283d819b59080a7812946fb290ab4534c2dab7c9feb4437dbc501f166f41f863668b3d23b9a620dc352ea57653e4d7fe129253902d0c62bbb59086
 EBUILD mgba-0.8.1.ebuild 2471 BLAKE2B b3cb801563d30d76ae973fc34ed752620463918d36f3ccdbab67dd7999656264dd26cbc7be1be450ee1d2571473f97d0b26d21d33a189f5a7b35cd2fe517885c SHA512 a94de95d49f83096808b4b0ba927ad751dfbf0951c84d3698fa51f25377e5946b488b02ab96f866e8460524ee8bef456ee9c9087fc41da27cd1b9913df4138d4
+EBUILD mgba-0.8.2.ebuild 2471 BLAKE2B b3cb801563d30d76ae973fc34ed752620463918d36f3ccdbab67dd7999656264dd26cbc7be1be450ee1d2571473f97d0b26d21d33a189f5a7b35cd2fe517885c SHA512 a94de95d49f83096808b4b0ba927ad751dfbf0951c84d3698fa51f25377e5946b488b02ab96f866e8460524ee8bef456ee9c9087fc41da27cd1b9913df4138d4
 EBUILD mgba-9999.ebuild 2471 BLAKE2B b3cb801563d30d76ae973fc34ed752620463918d36f3ccdbab67dd7999656264dd26cbc7be1be450ee1d2571473f97d0b26d21d33a189f5a7b35cd2fe517885c SHA512 a94de95d49f83096808b4b0ba927ad751dfbf0951c84d3698fa51f25377e5946b488b02ab96f866e8460524ee8bef456ee9c9087fc41da27cd1b9913df4138d4
 MISC metadata.xml 504 BLAKE2B c297828f1153ba0fa214bd849c22af964f8d5c0134f361956c80ea6239424aeb5eeb83f98a65dc7c924f9f7238223064fa25b3ee048e0e456fb9cdc432500b17 SHA512 2f481e401b55e4aa7089851c9869ec9aee349321a0f720b038e673f3f815c59be9c4cd0db667330ca1273bc7ebaf9671733e2b53e9f2fc34bc655709fbebca15
diff --git a/games-emulation/mgba/files/mgba-0.8.0-no_sdl.patch b/games-emulation/mgba/files/mgba-0.8.0-no_sdl.patch
deleted file mode 100644
index d89828976cd2..000000000000
--- a/games-emulation/mgba/files/mgba-0.8.0-no_sdl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From aa3403401bfb7259795313603929586bee91ce1b Mon Sep 17 00:00:00 2001
-From: Vicki Pfau <vi@endrift.com>
-Date: Fri, 31 Jan 2020 18:09:58 -0800
-Subject: [PATCH] Qt: Fix non-SDL build (fixes #1656)
-
----
- CHANGES                             |  3 +++
- src/platform/qt/InputController.cpp | 12 ++++++++++++
- 2 files changed, 15 insertions(+)
-
-diff --git a/CHANGES b/CHANGES
-index 7aac48d6..6418b059 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -1,3 +1,6 @@
-+Misc:
-+ - Qt: Fix non-SDL build (fixes mgba.io/i/1656)
-+
- 0.8.0: (2020-01-21)
- Features:
-  - Improved logging configuration
-diff --git a/src/platform/qt/InputController.cpp b/src/platform/qt/InputController.cpp
-index 77ee0704..c6a598ce 100644
---- a/src/platform/qt/InputController.cpp
-+++ b/src/platform/qt/InputController.cpp
-@@ -271,9 +271,21 @@ void InputController::setPreferredGamepad(uint32_t type, int index) {
- 	if (!m_config) {
- 		return;
- 	}
-+#ifdef BUILD_SDL
- 	char name[34] = {0};
-+#if SDL_VERSION_ATLEAST(2, 0, 0)
- 	SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(SDL_JoystickListGetPointer(&s_sdlEvents.joysticks, index)->joystick), name, sizeof(name));
-+#else
-+	const char* name = SDL_JoystickName(SDL_JoystickIndex(SDL_JoystickListGetPointer(&s_sdlEvents.joysticks, index)->joystick));
-+	if (!name) {
-+		return;
-+	}
-+#endif
- 	mInputSetPreferredDevice(m_config->input(), "gba", type, m_playerId, name);
-+#else
-+	UNUSED(type);
-+	UNUSED(index);
-+#endif
- }
- 
- mRumble* InputController::rumble() {
--- 
-2.25.0
-
diff --git a/games-emulation/mgba/mgba-0.8.0.ebuild b/games-emulation/mgba/mgba-0.8.2.ebuild
index c8853a7ffd1b..be2689f439b2 100644
--- a/games-emulation/mgba/mgba-0.8.0.ebuild
+++ b/games-emulation/mgba/mgba-0.8.2.ebuild
@@ -41,10 +41,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-no_sdl.patch" #707578
-)
-
 src_prepare() {
 	xdg_environment_reset
 	cmake_src_prepare