gentoo resync : 05.12.2021

2 files changed, 12 insertions, 12 deletions

diff --git a/app-emulation/fs-uae/Manifest b/app-emulation/fs-uae/Manifest
index abcd12c5e916..cd0e3d23bb28 100644
--- a/app-emulation/fs-uae/Manifest
+++ b/app-emulation/fs-uae/Manifest
@@ -2,8 +2,8 @@ AUX fs-uae-3.0.0-Xatom.h.patch 669 BLAKE2B 3463b8f19551b8ea3d634bc75f9de2fb77685
 AUX fs-uae-3.0.0-libmpeg2.patch 1078 BLAKE2B 119d797854beb0148af9a77003b7b06696d9a474645ff15181044dcffd783a91f89a66cf90b072603c4f324b95a4a0cf124abefc6adc71b9be4b8a92f36060ac SHA512 8624c3404b627321a2b6673271be27daa24924a8c56903c870fd5a6f2dc50c18fd97810a1aab3cd684a5a97544c1e64f68c855c822d3e5bb5981faf264d28ae7
 AUX fs-uae-3.1.35-ar.patch 609 BLAKE2B 3e31b1cd19aaa88f73cb806d91b8187d7cf23338caec519afe29553fabcc7884fcc1c95a87731f1459b6e64c8eacfda060aec221a0342f4b5983fa80cc623b61 SHA512 0d808e8f6782ce4f9653ab3a100483a6f3e5d9104f8b0afc67ea7010beae7ebf4d1fb44a9a97bf21c119547d7fa2730a046f6e64cf24606f1e78c8a8ca0ad617
 AUX fs-uae-3.1.35-deepbind.patch 1150 BLAKE2B 2b75ae7e8ad353af78d02afec6e2c27f4bf442d201bd67ff9548e2c26d5ac2d15199ff1f649c0e1e6ed662e433bd103420f737d0a50db030bccc6eb687905fa6 SHA512 a645a05f16a9825d9f3f2ff798f0982687b8cae4accad1685e047e98648680e7b785d9efe0676c68ed9caf57ea39d08a70c60c3dc810117db714b800ef67a9a0
-DIST fs-uae-3.0.5.tar.gz 4819884 BLAKE2B 0a82e0635ed02c1b4f04610555370c80ea12a870a73fd00cc98adefcefada2deed293c437202af34fc98e2f695fe1b08df918eca71b504e5b94e5ab3a099d9ed SHA512 b34ffb818040c7bf67022f26e1dbc9ebf06742a354212f2b0d2aa6b8e04c60807893a16ff965c819395f4c3fb3c43c35b38dce848b86fa046a211e12414385c7
 DIST fs-uae-3.1.35.tar.gz 4817547 BLAKE2B 5f75a1e262ba8d642401a03ac5b2494be37b8bab8f014a48208cc6e0b2e33373a7ce6146065f41404d8fcbd60fe71582319abe51521336c2d7c04668c3adacd9 SHA512 96bec936f867fc42eb9f61058887c027da0bab1c8df196ab62a714b1f28c92aafe6c4a61d441e5c7b5d8aee28c90d68812d0f6049c610e2ef9eebdd7e3edf013
-EBUILD fs-uae-3.0.5.ebuild 2441 BLAKE2B dc324751f374098920fe05b64d3e784cda02ed8566772edffad946d20cf414c0396e5c438a5df92d9161982c77881520d2cac648d0168f1df25cc1260740cc7d SHA512 19ed36eb650ae6945c92b8a3e12d01333cdc59f39a77e80521d57c2e301d5832b7120f0ce34e049fb0e49d141af3b8a1a1ebd0acf5bda56c0d7d5de5313c7202
+DIST fs-uae-3.1.62.tar.xz 3632040 BLAKE2B 7d38a7bedca979c88d1c7566ae3a3c3df8009b2c02aec28753b6dc72d27049de37c5c0d3436fe5e8309511e9710ae3238f6f2d7eea36285acf4807294621bce5 SHA512 bafa9b012042c2b973ea0e5aaac88404f00bdfac85a2239513088d5432bda631242244f66f72b5879794815167409b127ee0a9dd320dd90ba8dac16019adbb28
 EBUILD fs-uae-3.1.35.ebuild 2424 BLAKE2B 7e89a987c552a31ddec228f33b9e084381c66b40dbccee712a0e6f3b69b0ac193a44ea08c7bed660d113d3c8f27852f1af23e873d486fb45da0e9b6e30b6538a SHA512 1edf3a4dc15ddd4ee2ae636341085c637be95c49e2c0cf42c7ec5e887213ede5337bba552acfdb2b78b8d2050e3843c42c953c8770a855c25e5115a48cb909c6
+EBUILD fs-uae-3.1.62.ebuild 2400 BLAKE2B 5e31924b72f1a65d2ef5060a8f47d890853ca8a40756769ed51262b7aaa274f9b9e6844a9da8a6873ae911bd01d4f6240f3543f46ff9c07b43bf8ea0a2a86b05 SHA512 564e14724ffea0b1e82f47df402780e5bbd1c9200014ab50c9dd89bf3e14fcb2abebed5e1068ff3dc09e21169fa52e1c35632877952a8473784be05816daa753
 MISC metadata.xml 534 BLAKE2B 06da96462379543ad704ca1227e546f26e5578f1f62b14debe6297a659e250708b1c6b60d4e60805142f76b12b0c31812060af661f2166749aac811b82edc695 SHA512 2366d8d0d180a639d65aa1e7092cc9669f6d2ae07b3ce3ed6386e15795f141067ec93014f87bb6b0c57c51dfbb4c33ae5886f541a0634432c53a5541eb68f229
diff --git a/app-emulation/fs-uae/fs-uae-3.0.5.ebuild b/app-emulation/fs-uae/fs-uae-3.1.62.ebuild
index dab8a94a18e3..5cb3b91f1ede 100644
--- a/app-emulation/fs-uae/fs-uae-3.0.5.ebuild
+++ b/app-emulation/fs-uae/fs-uae-3.1.62.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+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/stable/${PV}/${P}.tar.gz"
+SRC_URI="https://fs-uae.net/files/FS-UAE/Stable/${PV}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="fmv glew"
+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
@@ -39,6 +40,7 @@ BDEPEND="
 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() {
@@ -50,10 +52,6 @@ src_prepare() {
 	# 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
-
-	# Fix building with GCC 11 / C++-17. This code was removed from master so
-	# this change has not been sent upstream.
-	sed -i "s/ throw([^)]*)//g" src/dosbox/setup.h || die
 }
 
 src_configure() {
@@ -72,8 +70,7 @@ src_configure() {
 		--enable-drivesound \
 		--enable-fdi2raw \
 		--enable-gfxboard \
-		--enable-jit \
-		--enable-jit-fpu \
+		--disable-lua \
 		--enable-netplay \
 		--enable-ncr \
 		--enable-ncr9x \
@@ -94,8 +91,11 @@ src_configure() {
 		--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)
 }