gentoo (valentine's day) resync : 14.02.2021

3 files changed, 29 insertions, 13 deletions

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) \