gentoo resync : 20.03.2021

3 files changed, 125 insertions, 2 deletions

diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest
index b1a80def7fba..90b0236ec58a 100644
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@@ -1,5 +1,7 @@
 AUX multiple-definition.patch 508 BLAKE2B 9568d9f736d838ba4506e9bf6fc3f514952d086e1b412e19f56cc0646564a99411086e6a3a9ba106d741c727078a286c49a932d151f93222bbfd5c1f32221c70 SHA512 544a012a352f68e843c796a8ba2a2cf7b4586e3c99b059ef387fc7f343cf42c66de11c17bf9c15f92a819ec3e32fe3588a02bc7095996db7b13f536e66555795
 AUX remove-local-prefix.patch 745 BLAKE2B 752dc9df4ad9b33a84493e4939d9c30687a730ecc628301a4bbc16f46410d73c8f7b64376788721f04c06404685ef300c2dc423c1843258748c377c6d61232a4 SHA512 25771be029e61654398bb1c36b1c31bc44f136e7e369c72faa3869f94807558c0d1b324ac803d79a898410fd14661d02a8286cda19dc25c79ebca6c387b817a3
 DIST fuse-1.5.7.tar.gz 1634568 BLAKE2B 9d2f3c310132dc57336995c31adeb37d727506719d1089b2009a2f44cbfa59fc9c4e9252aeff64cdd22b7326328518b5da33af51be687f321b891b9d1dd2b646 SHA512 ac11e03fc203f98433253fb72d7700cf6285ad8662147f318bb4ceda3888bc865b80d85473a3b2bda9e0971989b1579fc928f41ddabbf01d58358362066be13d
+DIST fuse-1.6.0.tar.gz 1686171 BLAKE2B d1e6b166f2f649f408349b16a5eb40dd414750ed7a805eb6505b6c81be6ed7bcaa4e6f0b14057645172add1b1a77881f90b64767390fe1a64a486168f452d29d SHA512 5096b24b5b3d812942a7ad401b886b6a99f5493686912cb4aff18ede65404ae97a9bcafa6337aaed4378382f2a170918797d7d4570bb809476be5aa9fc625b8b
 EBUILD fuse-1.5.7.ebuild 1913 BLAKE2B e3cbe4591bf23d091555ec8d50cfce8ea5cc4ea42dd21788f29445d36c05802875fe01801401591f06d836c9009b403e09bba4bdf2e1b06930ea380db195abb8 SHA512 483ec51bdd5a493dfcb9fa66b576b5ad67e6fca9b00d81639127a19833344b99b9107e0c4f8d75d923ca825c10e76113461e26489a0f2acf7c545269523f0d1b
-MISC metadata.xml 588 BLAKE2B 4a3aeb05e4788fbd18b8d6f2d741e00f1b6f7a849fa0179afb9aa1d7e6f44f29c3ecaa4a527d280b940e7a5dd2ac7e4557184ffabdfc41f743389847dae71c83 SHA512 8c3695d6e28639e0741888eb51487b898e9452c560f486577d4ba412802a3a33630ef72f9ce8df928aa1a8a80ae238df7a7e49c2f945e43ebe7f5db5936c7163
+EBUILD fuse-1.6.0.ebuild 2916 BLAKE2B 0af606e43136c69fec26f7056225ff7ee2e0ed2ded6c83244a53a9e898b59568a37967507ae0d4537ec695a27c7844a2ee75b2d8e0c6254a3fdc7cc35ec3123d SHA512 1dc13be98ee7b8550836e77ce03acd775c129dee8135ddd99abcc2d3ee6486eb3b14f551de16b6ff4dd0b9198cc8d0b0e0ff4027b8fc662911dafc6c224082d7
+MISC metadata.xml 728 BLAKE2B 53fd75cce07e995581475b414394c05e5acadf5e49b3a6c9fcc4e8f5f34b14209f2628fb2ccee98d1018266888aa76778e63b87124a87a14f179601891153869 SHA512 0ec242e0640d786ed5e82c3e0553e4c054b4e493a7851aa47b1ed817f6826014aa2d1a91f8a398baefe76a5aa2535fb260003386f695a53c9c807b10994926b9
diff --git a/app-emulation/fuse/fuse-1.6.0.ebuild b/app-emulation/fuse/fuse-1.6.0.ebuild
new file mode 100644
index 000000000000..ddec66d72acc
--- /dev/null
+++ b/app-emulation/fuse/fuse-1.6.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall"
+HOMEPAGE="http://fuse-emulator.sourceforge.net"
+SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa ao backend-X backend-fbcon +backend-gtk3 backend-sdl backend-svga gpm joystick memlimit png -pulseaudio +xml +zlib"
+
+# TODO:
+# - allow using sdl audio driver without using for the UI
+# - allow using sdl joystick support with gtk3 or X UI in place of libjsw
+# - when using sdl for one of the above but not the UI, allow using sdl2 instead
+
+# At most one audio driver and at most one UI back-end can be enabled at a time
+REQUIRED_USE="?? ( alsa ao backend-sdl pulseaudio )
+	?? ( backend-X backend-fbcon backend-gtk3 backend-sdl backend-svga )"
+
+RDEPEND="
+	>=app-emulation/libspectrum-1.5.0[zlib?]
+	dev-libs/glib:2
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	backend-X? ( x11-libs/libX11 x11-libs/libXext )
+	backend-gtk3? ( x11-libs/gtk+:3 )
+	backend-sdl? ( media-libs/libsdl[joystick,sound] )
+	backend-svga? ( media-libs/svgalib )
+	gpm? ( backend-fbcon? ( sys-libs/gpm ) )
+	joystick? ( !backend-sdl? ( media-libs/libjsw ) )
+	png? ( media-libs/libpng:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	xml? ( dev-libs/libxml2:2 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	backend-fbcon? ( virtual/linux-sources )"
+BDEPEND="dev-lang/perl
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/remove-local-prefix.patch
+)
+
+_fuse_audio_driver() {
+	if use alsa; then
+		echo "alsa"
+	elif use ao; then
+		echo "libao"
+	elif use backend-sdl; then
+		echo "sdl"
+	elif use pulseaudio; then
+		echo "pulseaudio"
+	else
+		echo "null"
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--enable-desktop-integration
+		--without-win32
+		--with-audio-driver="$(_fuse_audio_driver)"
+		$(use_with gpm)
+		$(use_with joystick)
+		$(use_enable memlimit smallmem)
+		$(use_with png)
+		$(use_with xml libxml2)
+		$(use_with zlib)
+	)
+
+	# The pure-X UI hasn't got its own configure argument, instead it is
+	# what is used under Linux if all other back-ends have been disabled
+	# - and all except the Gtk+ one are off by default.
+	if use backend-X; then
+		myconf+=("--without-gtk")
+	elif use backend-fbcon; then
+		myconf+=("--with-fb")
+	elif use backend-gtk3; then
+		myconf+=("--with-gtk")
+	elif use backend-sdl; then
+		myconf+=("--with-sdl")
+	elif use backend-svga; then
+		myconf+=("--with-svgalib")
+	else
+		myconf+=("--with-null-ui")
+	fi
+
+	if use joystick; then
+		myconf+=( $(use_enable backend-sdl ui-joystick) )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	emake test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if use pulseaudio; then
+		ewarn "The PulseAudio driver in ${PN} is experimental"
+	fi
+}
diff --git a/app-emulation/fuse/metadata.xml b/app-emulation/fuse/metadata.xml
index 04bb5c6c82aa..f6bb92e4f4f6 100644
--- a/app-emulation/fuse/metadata.xml
+++ b/app-emulation/fuse/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fuse-emulator</remote-id>
 	</upstream>
 	<use>
 		<flag name="backend-fbcon">Use framebuffer rendering backend</flag>
+		<flag name="backend-gtk3">Use Gtk+ rendering backend</flag>
 		<flag name="backend-sdl">Use SDL rendering backend</flag>
 		<flag name="backend-svga">Use svgalib rendering backend</flag>
 		<flag name="backend-X">Use X11 rendering backend</flag>