gentoo (valentine's day) resync : 14.02.2021

6 files changed, 32 insertions, 15 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index c7d68feb0064..cbe547614167 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/atari800/Manifest b/games-emulation/atari800/Manifest
index b259d05b6d77..166f659d310a 100644
--- a/games-emulation/atari800/Manifest
+++ b/games-emulation/atari800/Manifest
@@ -2,5 +2,5 @@ AUX atari800-3.1.0-tgetent-detection.patch 690 BLAKE2B 49016e922f66214dadd0da179
 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 1362 BLAKE2B 1cf5f3dbecf4f7b5948ea7a619fdaec953c8743db55a2ec61df90b1444a74aebeeee0d6b9c84ea3fb833cb95d78bbadaea21d5a2716f1ae721699246ace0281e SHA512 d734f3b3e0eabbf7bbafbc32530478c3eab9619560c5aa38ddd76e20df1ce9007ff65464a0a5f013ae4a34fdef067d5358f14cd21922fd7e58b5a4da5fe49488
+EBUILD atari800-4.2.0.ebuild 1393 BLAKE2B 505c9360f051eb7e72f5830cd1b1e26e5c17e1ee1a1eda5c565eab28d5eac6089c9ba5a3541780d484de653a9ac21774df14142c3daf99584886f5c093c0a936 SHA512 086362da958d0b9c9ebf4a3f746c85cafd2e2cdef57962f70b2ac97b313b2455a96def718c9a27769334c5d44e6d96f082f56005d3810ea1b37c2e4058d53712
 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
index dd1008578547..f49f59bcd447 100644
--- a/games-emulation/atari800/atari800-4.2.0.ebuild
+++ b/games-emulation/atari800/atari800-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,6 +14,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="opengl readline +sdl +sound"
+REQUIRED_USE="opengl? ( sdl )"
 
 RDEPEND="
 	sdl? (
diff --git a/games-emulation/lxdream/Manifest b/games-emulation/lxdream/Manifest
index 3f6f44fa23ae..53ce116ad9a4 100644
--- a/games-emulation/lxdream/Manifest
+++ b/games-emulation/lxdream/Manifest
@@ -1,4 +1,5 @@
+AUX lxdream-0.9.1-fno-common.patch 410 BLAKE2B 24a2033b512bebb958729c8d6d092724c22225bdabaf2e94e90595abf9bd9ee89c24e83330bbcfb59df4ffa7eb81b2dff25d8333433a749046b08520b9c65409 SHA512 f51db064eebc3bfc852371935eedde8a3646b2269db6355a92767a7ba642d2efa97eb0e7fce5881d26e57fd9c88fcbb2370d118274431914913538f5208d360d
 AUX lxdream-0.9.1-glib-single-include.patch 10725 BLAKE2B 01a76a7e7a6477fcf8e9a9b9b44f7fff04b9c6c88fd361ff47b0ef9c754eb263c89c846b3919d2a48bfc2e4c79e123cc45fbb5008c2a7378772342a08ec7099d SHA512 1e8130ae228799f6b0b53895edb309579d47f93e1f5f7e88387bc9b2e97d201603f43eebc084604e8e5b2b3a93be68daa040c995a7eed59f7b3aaeb903b606dc
 DIST lxdream-0.9.1.tar.gz 2556802 BLAKE2B c69452e95d833c42c930f45e8a9d407e8d1246b2f67c21c2763ae5583d271caa9e28b111a0aa6ec7f5ff7ea9867c18d53ebe1a39bd37a2f47e68544e71c6f6e0 SHA512 f56119e99f82931bb22cc596938caba09f02da9a7e74b6c8ce79880214e3566a9a8091b31f89d5dc56f0802d00ac485ce22c3468350d44b2e1cf140f22983055
-EBUILD lxdream-0.9.1-r3.ebuild 1471 BLAKE2B 53ee11261682157003d766ce90c2cd46c81c49529af10cd528a46f3a2039c3eed3d2997941b8d21c4680798e029f13acef5554ed79d94f0c1ec853554b06bb8d SHA512 047aa12d2f4e4667a593449a173438ab6cddeedf4b7a90cecb8015aeff8963b28d04fed8dceb340fe4ee8c8643bd21f9a4a3f00228bb5154dddac3c3d940520f
+EBUILD lxdream-0.9.1-r3.ebuild 1537 BLAKE2B 9d34d02a69252dfaaa74510921f5e8e614f1dc7a23ed4b911abc990c608d72ddc1262cd4922bc7cef17c2101b68b77e9a2c72a6cee30ecd75242e628c06cb49e SHA512 bc33447f49810bbda2fc1023169427bfeb0f8568159de2bb2df31aed99f1d9bd7bcf460b06f65ead0cc0732f4ded415258c4b3593cec88f6a76d387c7b713781
 MISC metadata.xml 379 BLAKE2B 9407fbbb5013bc923a712f50b05cfe8c14d7648bf673a28dcb798d591e52c34e105a95d196d8d95f348eaf0e0c710f6a7263acc51a0f643bdc546093cc159c7f SHA512 ec81121ea013b5ee3e2863c317bad1c4e6c324f44d41202be5f105b7d0416f52d8a5144a9ab354dceb8793c947bf7cc85b192aaee65b0e3f44cfae19340e9399
diff --git a/games-emulation/lxdream/files/lxdream-0.9.1-fno-common.patch b/games-emulation/lxdream/files/lxdream-0.9.1-fno-common.patch
new file mode 100644
index 000000000000..d325963eac28
--- /dev/null
+++ b/games-emulation/lxdream/files/lxdream-0.9.1-fno-common.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/740382
+--- a/src/sh4/sh4trans.h
++++ b/src/sh4/sh4trans.h
+@@ -130,7 +130,7 @@ gboolean sh4_translate_flush_cache( void );
+  * Either returns immediately (to skip the breakpoint), or aborts the current
+  * cycle and never returns.
+  */
+-void FASTCALL sh4_translate_breakpoint_hit( sh4vma_t pc );
++extern void FASTCALL sh4_translate_breakpoint_hit( sh4vma_t pc );
+ 
+ #ifdef __cplusplus
+ }
diff --git a/games-emulation/lxdream/lxdream-0.9.1-r3.ebuild b/games-emulation/lxdream/lxdream-0.9.1-r3.ebuild
index 40c8736acefc..e4b53ffde512 100644
--- a/games-emulation/lxdream/lxdream-0.9.1-r3.ebuild
+++ b/games-emulation/lxdream/lxdream-0.9.1-r3.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit flag-o-matic xdg
 
 DESCRIPTION="An emulator for the Sega Dreamcast system"
-HOMEPAGE="http://www.lxdream.org/"
+HOMEPAGE="https://github.com/lxdream/lxdream"
 SRC_URI="http://www.lxdream.org/count.php?file=${P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -16,25 +17,27 @@ IUSE="debug profile pulseaudio sdl" #lirc
 
 RDEPEND="
 	app-misc/lirc
-
 	media-libs/alsa-lib
 	media-libs/libpng:0=
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl[sound] )
 	virtual/opengl
 	x11-libs/gtk+:2
-"
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl[sound] )"
 DEPEND="${RDEPEND}
+	!!gnustep-base/gnustep-gui" #377635
+BDEPEND="
 	virtual/pkgconfig
 	sys-devel/gettext
-	virtual/os-headers
-	!!gnustep-base/gnustep-gui" #377635
+	virtual/os-headers"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-glib-single-include.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_prepare() {
 	default
 
-	eapply "${FILESDIR}/${PN}-0.9.1-glib-single-include.patch"
-
 	# Make .desktop file pass desktop-file-validate
 	sed -i \
 		-e '/Encoding/d' \
@@ -54,7 +57,7 @@ src_configure() {
 	# lirc configure option is not recognized
 	# $(use_with lirc) \
 	econf \
-		--datadir="/usr/share" \
+		--datadir="${EPREFIX}/usr/share" \
 		$(use_enable debug trace) \
 		$(use_enable debug watch) \
 		$(use_enable profile profiled) \