gentoo resync : 12.05.2022

4 files changed, 38 insertions, 117 deletions

diff --git a/app-emulation/fs-uae/Manifest b/app-emulation/fs-uae/Manifest
index 4419fa65583a..c723c71d57af 100644
--- a/app-emulation/fs-uae/Manifest
+++ b/app-emulation/fs-uae/Manifest
@@ -1,8 +1,7 @@
 AUX fs-uae-3.0.0-Xatom.h.patch 669 BLAKE2B 3463b8f19551b8ea3d634bc75f9de2fb77685af9c24e1fba555991d1d094f4d75be048e4d9a7852bfd8882b1e9826f174550bc3953e3ec636193aaa647462d12 SHA512 af86c772049d8ff5eef36c8988888891ea60a68e929d752c8f1c9e325af584175f14496a2099654381bb33a3adecb913991e129fee05524ecad4a166228dbd68
 AUX fs-uae-3.0.0-libmpeg2.patch 1078 BLAKE2B 119d797854beb0148af9a77003b7b06696d9a474645ff15181044dcffd783a91f89a66cf90b072603c4f324b95a4a0cf124abefc6adc71b9be4b8a92f36060ac SHA512 8624c3404b627321a2b6673271be27daa24924a8c56903c870fd5a6f2dc50c18fd97810a1aab3cd684a5a97544c1e64f68c855c822d3e5bb5981faf264d28ae7
 AUX fs-uae-3.1.35-deepbind.patch 1150 BLAKE2B 2b75ae7e8ad353af78d02afec6e2c27f4bf442d201bd67ff9548e2c26d5ac2d15199ff1f649c0e1e6ed662e433bd103420f737d0a50db030bccc6eb687905fa6 SHA512 a645a05f16a9825d9f3f2ff798f0982687b8cae4accad1685e047e98648680e7b785d9efe0676c68ed9caf57ea39d08a70c60c3dc810117db714b800ef67a9a0
-DIST fs-uae-3.1.62.tar.xz 3632040 BLAKE2B 7d38a7bedca979c88d1c7566ae3a3c3df8009b2c02aec28753b6dc72d27049de37c5c0d3436fe5e8309511e9710ae3238f6f2d7eea36285acf4807294621bce5 SHA512 bafa9b012042c2b973ea0e5aaac88404f00bdfac85a2239513088d5432bda631242244f66f72b5879794815167409b127ee0a9dd320dd90ba8dac16019adbb28
+AUX fs-uae-3.1.66-musl.patch 872 BLAKE2B 8ba30e637fb6b9044c2e81a6158125bcd84d97684008673f541aa444d793aeb257c4b4dda110067a572fc91404a4998b18557dae514395d23bb33493e71d1fae SHA512 07de2603ed85e52d08e76386fdddeb31fbf481876192755d48ddb185ff72d870cf8d288ae6998d7ff3eff7531be3c058df4988ae1124b2abe0506e31ddcace13
 DIST fs-uae-3.1.66.tar.xz 3627688 BLAKE2B 9c7742b78055b4c2409c4527ab3b5daac829fa8d09363c5640ce433770ec0f7f6417cfa5dc7689bfdf747083bad654a8d433216b2c94e93ef3189f7e6f7213d9 SHA512 3d93c6481d4aebb21607fa6cd0716bb809a902a5e6e20cda97751f7878157a0737b80df1290c2e1cf4e13f1e9a824b750c52479cd05e56bff291be7471d167a1
-EBUILD fs-uae-3.1.62.ebuild 2400 BLAKE2B 5e31924b72f1a65d2ef5060a8f47d890853ca8a40756769ed51262b7aaa274f9b9e6844a9da8a6873ae911bd01d4f6240f3543f46ff9c07b43bf8ea0a2a86b05 SHA512 564e14724ffea0b1e82f47df402780e5bbd1c9200014ab50c9dd89bf3e14fcb2abebed5e1068ff3dc09e21169fa52e1c35632877952a8473784be05816daa753
-EBUILD fs-uae-3.1.66.ebuild 2400 BLAKE2B 5e31924b72f1a65d2ef5060a8f47d890853ca8a40756769ed51262b7aaa274f9b9e6844a9da8a6873ae911bd01d4f6240f3543f46ff9c07b43bf8ea0a2a86b05 SHA512 564e14724ffea0b1e82f47df402780e5bbd1c9200014ab50c9dd89bf3e14fcb2abebed5e1068ff3dc09e21169fa52e1c35632877952a8473784be05816daa753
+EBUILD fs-uae-3.1.66.ebuild 2439 BLAKE2B ad8ffd11c78979c5a25db37249dff1064007640f5350fceccc1247c79219d60184e7f05d8cee5f0996d7b731f93b357af6a3e5f19df2cc45bce75a41d1a3bdbd SHA512 f296f030268264ccc39d58061a2461f2a05758e363426e4f967b919d8f27858bc1b459f0a1645f6dcfb5a3407a89bbd3b7760adb989ae710d02b2e4fbed4f25d
 MISC metadata.xml 534 BLAKE2B 06da96462379543ad704ca1227e546f26e5578f1f62b14debe6297a659e250708b1c6b60d4e60805142f76b12b0c31812060af661f2166749aac811b82edc695 SHA512 2366d8d0d180a639d65aa1e7092cc9669f6d2ae07b3ce3ed6386e15795f141067ec93014f87bb6b0c57c51dfbb4c33ae5886f541a0634432c53a5541eb68f229
diff --git a/app-emulation/fs-uae/files/fs-uae-3.1.66-musl.patch b/app-emulation/fs-uae/files/fs-uae-3.1.66-musl.patch
new file mode 100644
index 000000000000..cc78261ebe40
--- /dev/null
+++ b/app-emulation/fs-uae/files/fs-uae-3.1.66-musl.patch
@@ -0,0 +1,35 @@
+From 5d7287d1aa99f100e560b5a2d231e49b64a18da3 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 17 Apr 2022 10:29:22 +0100
+Subject: [PATCH] Don't return NULL in mapped_malloc when a bool is expected
+
+This was apparently breaking the build under musl.
+---
+ src/memory.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/memory.cpp b/src/memory.cpp
+index 3cd7dee6..18d1283a 100644
+--- a/src/memory.cpp
++++ b/src/memory.cpp
+@@ -1872,7 +1872,7 @@ bool mapped_malloc (addrbank *ab)
+ 	if (id == -1) {
+ 		nocanbang ();
+ 		if (recurse)
+-			return NULL;
++			return false;
+ 		recurse++;
+ 		mapped_malloc (ab);
+ 		recurse--;
+@@ -1904,7 +1904,7 @@ bool mapped_malloc (addrbank *ab)
+ 		return ab->baseaddr != NULL;
+ 	}
+ 	if (recurse)
+-		return NULL;
++		return false;
+ 	nocanbang ();
+ 	recurse++;
+ 	mapped_malloc (ab);
+-- 
+2.34.1
+
diff --git a/app-emulation/fs-uae/fs-uae-3.1.62.ebuild b/app-emulation/fs-uae/fs-uae-3.1.62.ebuild
deleted file mode 100644
index 5cb3b91f1ede..000000000000
--- a/app-emulation/fs-uae/fs-uae-3.1.62.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools xdg
-
-DESCRIPTION="Integrates the most accurate Amiga emulation code available from WinUAE"
-HOMEPAGE="https://fs-uae.net/"
-SRC_URI="https://fs-uae.net/files/FS-UAE/Stable/${PV}/${P}.tar.xz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE="fmv glew +jit"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-libs/libpng:0=
-	media-libs/libsdl2[opengl,X]
-	media-libs/openal
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libdrm
-	x11-libs/libX11
-	fmv? ( media-libs/libmpeg2 )
-	glew? ( media-libs/glew:0= )
-"
-
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-BDEPEND="
-	app-arch/zip
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.0-libmpeg2.patch
-	"${FILESDIR}"/${PN}-3.0.0-Xatom.h.patch
-	"${FILESDIR}"/${PN}-3.1.35-deepbind.patch
-)
-
-src_prepare() {
-	default
-	AT_NO_RECURSIVE=1 eautoreconf
-
-	# Ensure bundled libraries are not used. Udis86 is unused
-	# regardless. Only FLAC headers are bundled and the library is never
-	# used? Lua is bundled but differs from upstream. We keep the
-	# default of disabling the Lua feature anyway as it is unfinished.
-	rm -r libmpeg2/ libudis86/ || die
-}
-
-src_configure() {
-	# Qt and Udis86 are unused.
-	econf \
-		--enable-a2065 \
-		--enable-action-replay \
-		--enable-aga \
-		--enable-arcadia \
-		--enable-bsdsocket \
-		--enable-caps \
-		--enable-cd32 \
-		--enable-cdtv \
-		--enable-codegen \
-		--enable-dms \
-		--enable-drivesound \
-		--enable-fdi2raw \
-		--enable-gfxboard \
-		--disable-lua \
-		--enable-netplay \
-		--enable-ncr \
-		--enable-ncr9x \
-		--enable-parallel-port \
-		--enable-prowizard \
-		--enable-savestate \
-		--enable-scp \
-		--enable-serial-port \
-		--enable-slirp \
-		--enable-softfloat \
-		--enable-qemu-cpu \
-		--enable-qemu-slirp \
-		--enable-uaenative \
-		--enable-uaenet \
-		--enable-uaescsi \
-		--enable-uaeserial \
-		--disable-udis86 \
-		--enable-vpar \
-		--enable-xml-shader \
-		--enable-zip \
-		--without-cef \
-		--with-glad \
-		--without-qt \
-		$(use_enable jit) \
-		$(use_enable jit jit-fpu) \
-		$(use_with fmv libmpeg2) \
-		$(use_with glew)
-}
-
-src_install() {
-	default
-
-	# Needed for QEMU-UAE.
-	insinto /usr/include/uae
-	doins src/include/uae/{api,attributes,log,ppc,qemu,types}.h
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "Install app-emulation/fs-uae-launcher for a better graphical interface."
-}
diff --git a/app-emulation/fs-uae/fs-uae-3.1.66.ebuild b/app-emulation/fs-uae/fs-uae-3.1.66.ebuild
index 5cb3b91f1ede..2853da73fb7d 100644
--- a/app-emulation/fs-uae/fs-uae-3.1.66.ebuild
+++ b/app-emulation/fs-uae/fs-uae-3.1.66.ebuild
@@ -41,6 +41,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.0-libmpeg2.patch
 	"${FILESDIR}"/${PN}-3.0.0-Xatom.h.patch
 	"${FILESDIR}"/${PN}-3.1.35-deepbind.patch
+	"${FILESDIR}"/${PN}-3.1.66-musl.patch
 )
 
 src_prepare() {