4 files changed, 64 insertions, 45 deletions
diff --git a/app-emulation/uade/Manifest b/app-emulation/uade/Manifest
index 7aabe2d84d77..e8c3f666a55f 100644
--- a/app-emulation/uade/Manifest
+++ b/app-emulation/uade/Manifest
@@ -1,4 +1,4 @@
 AUX uade-2.13-configure.patch 620 BLAKE2B 4266246e968f5bcbfee755896047c5c0587a5199d8fc7882b4f9665175865a94491d6bfceaf3549b6f825e46688ab2f6164f6b4111101212f907d9bdec3f2b28 SHA512 08d5caa315054553414961cd44149f949099341f9c91b4dd7ee957649fa029b9c1927f583bd581e6b213f381b3eb43fe5097a87747ce7e36e94487fafdc96c76
 DIST uade-2.13.tar.bz2 2897931 BLAKE2B 7d5ba128fc53bb683a6a21616e3c9c2a7376361086f3d91a59026ac89eb48d9520f89342914078ccb4614a16826a8c90f86a6052caffc9d5cc4e1e0ab6b092f0 SHA512 675c3369ed55a314cab81ae7ba8a09b277ab1cfe2354eac92194f746803ec2464b7603d665cf30da41caef5997c21515e69f0313d8d2b079c242a08fef786183
-EBUILD uade-2.13-r1.ebuild 821 BLAKE2B 56bbaf3dc9be81d371389e55a72a7affdd2d22bb92459a2cd57ce7e3a7df265febcd173a5ce7a0ef33b5ef0536d86890b0413cc003fe3de986ba0412eed731f1 SHA512 7947a265d8589cc2e7d4d57bf0139f3344235ab8764f0e2eff329ac1b04cd2d6948f8c63ee2f70a1ed249465b1ca03f5f9ac9072303a9ed12c43b7eb5dd92e6b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
+EBUILD uade-2.13-r2.ebuild 1094 BLAKE2B 5190440d95bdf09b30a86213a2c606711c54fa8b42cc56aaacd9fbad66e13f326d5644654ceba1dae7a81ff22673166cdcd2cd12b376d622f476755290ff8605 SHA512 0d880e1cf49d0911861454c7bd2adfcabfa4a22ae0abac0b912bbb3c9800338471d860782dac2e4c17288087d5308296f80fc7924329c3c9088bea2e1640c768
+MISC metadata.xml 458 BLAKE2B 7d6d4f3e6ab3457edd8025f2605766f225fb7d9ef2bd9501b0459fe4d2f853bbd27745fb400d15b9e6a2db617d0f5b7808cb59ab3530e4fadf4bc7cdcb3921b9 SHA512 9f47cbb66ea75cb7f4769c282afef9c522e06154b198b7d757644ad9888da291b09ae92890a2e7b4b483473ee23a8794f9c570200de3e16ca210a0dc21d7b0d3
diff --git a/app-emulation/uade/metadata.xml b/app-emulation/uade/metadata.xml
index 78274e0fa550..c4c4b8d8413a 100644
--- a/app-emulation/uade/metadata.xml
+++ b/app-emulation/uade/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="fuse">Enable <pkg>sys-fs/fuse</pkg> uadefs frontend for on-the-fly WAV conversion</flag>
+	</use>
+	<upstream>
+		<remote-id type="gitlab">uade-music-player/uade</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/uade/uade-2.13-r1.ebuild b/app-emulation/uade/uade-2.13-r1.ebuild
deleted file mode 100644
index 28ceda581e45..000000000000
--- a/app-emulation/uade/uade-2.13-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Unix Amiga Delitracker Emulator - plays old Amiga tunes through UAE emulation"
-HOMEPAGE="https://zakalwe.fi/uade"
-SRC_URI="https://zakalwe.fi/uade/uade2/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="media-libs/libao"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog doc/BUGS doc/PLANS )
-
-PATCHES=( "${FILESDIR}"/${P}-configure.patch )
-
-src_configure() {
-	tc-export CC
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--package-prefix="${D}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-text-scope \
-		--without-xmms \
-		--without-audacious || die
-}
-
-src_install() {
-	default
-	doman doc/uade123.1
-}
diff --git a/app-emulation/uade/uade-2.13-r2.ebuild b/app-emulation/uade/uade-2.13-r2.ebuild
new file mode 100644
index 000000000000..262a54d90331
--- /dev/null
+++ b/app-emulation/uade/uade-2.13-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Unix Amiga Delitracker Emulator - plays old Amiga tunes through UAE emulation"
+HOMEPAGE="https://zakalwe.fi/uade"
+SRC_URI="https://zakalwe.fi/uade/uade2/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="fuse"
+
+RDEPEND="
+	media-libs/libao
+	fuse? ( sys-fs/fuse:0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-configure.patch
+)
+
+DOCS=( AUTHORS ChangeLog doc/BUGS doc/PLANS )
+
+src_prepare() {
+	default
+
+	# needed to avoid ${D} VariableScope undefined behavior in src_configure
+	find . -name Makefile.in -exec sed -i 's|{PACKAGEPREFIX}|$(DESTDIR)|' {} + || die
+}
+
+src_configure() {
+	tc-export CC
+
+	# not autotools generated
+	local configure=(
+		./configure
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--with-text-scope
+		--without-audacious
+		--without-xmms
+		$(use_with fuse uadefs)
+		${EXTRA_ECONF}
+	)
+	echo ${configure[*]}
+	"${configure[@]}" || die
+}