gentoo resync : 08.07.2021

19 files changed, 254 insertions, 268 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index bb0e628cc30e..5afcf09dc921 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index d68baced5a32..c7361dfb4dfd 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,5 +1,5 @@
 AUX dolphin-5.0_p20210506-musl.patch 779 BLAKE2B 5f962082cf58377801a266ec987417b731332e31ce6d79bb8e66204f6299dc1912aea760a9545ac671b090e6a3625c54b9e00583695790bd5c51ba54d524e0d7 SHA512 7a611de89b84e0f706c37d2aacdfb62cb4115098ad1b31daa4e40bd47e3793ab59f626fced184965361ba776891a63d02d66a54f8b69f675b6b88047a283bd9e
 DIST dolphin-5.0_p20210506.tar.gz 42098693 BLAKE2B bb9e5b5eb344bd944753c0198d5835109399fdfae46e6858833e5f279ff1979d39e0c512bedb96a91a1241fff525c6f945d16ce1a6b6cc22798490d73b853862 SHA512 5d23e9356995011a0e7b07622d58c8dddc5134a4ec83b3d9343b9eca8d0d2c200ea8c9a299c6aa2550ca74d8e28e258531368f7c167fe620053eb2a0f73b1f2f
-EBUILD dolphin-5.0_p20210506.ebuild 4817 BLAKE2B dadfd063ee1ab17262bd26eebb005843b3c5d09f3ff3370201eb4abb157fe8be024f09489baad716f7608fe235d355bd3205ddf46107c44e02cf9c4a8af151a8 SHA512 0dbbaa92a81d5f1367a768cc1588c1fa68248cf46043ecbbfb1e8b76bafb0e8ae8c2c0646952fe9e97d8e734ca5203676c92ad8abb24100131a10878d5c00e28
-EBUILD dolphin-9999.ebuild 4790 BLAKE2B 7265a71932941ab75c1836237b380be893563c532e45e414d6880cb8d2e446ff53718a3b961b6eb1a3a04724a9e058f2cf432854d608e0ff6a79e8f01b87b638 SHA512 535fcef911387f2ee2f271a0b42ca36065030640728d745b96cdaae2c4744eda626c171576459d29abb6ee7d0ece31d64417029f39cd166ce7197945973bc5bc
+EBUILD dolphin-5.0_p20210506.ebuild 4817 BLAKE2B 5285d51e4404f2ae273c8315b143a18f5587356ad1d8c6b1c4fa369d5e9737742bb5b6af4c3c3f7d04e63edf5052245632256eed16136dfcc3beca83f861fb96 SHA512 f785395201fefb634972bd1c5b4538cb5e2534f1a4716f744ba1424f61deed7c833d406bfea71197d8a297e593d372c3b93c19447925ec8f72f518a900a016b6
+EBUILD dolphin-9999.ebuild 4790 BLAKE2B 4b126fd562906496952c1be7263f66dcde641d3fae975e23653438fb5badf67626f106d6c940cbda631f04adbc6698a56c96d00615d821dd4d44efc62ea9dc3e SHA512 d1ece90d6a1ef89fc2811383bfbf60d125deeae15052cd5a54d44c1bde8d3c715091a1db4a63f0e2fad9285f56c814119336ec269508dbd02115c6fa95c1d487
 MISC metadata.xml 856 BLAKE2B 982e3d9ee65ed158e831ccb72d144944eaab8efd8f535f120f2d9e14f8332a980244bb23ee7fe0ca6c1ca8b6f2cdc6c1c766439b4416e17fc8df93fc24ca7655 SHA512 994efa4a7b1504a2d02f4d470382c212f0b9c2f929bbc67483b1a4efa4e68d4422216737dca65977ad99afd26fb6772224f6b1902a0eb6b869f155cf010aff33
diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild b/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild
index fd44c78fa9e2..5a9c3f739250 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PLOCALES="ar ca cs da de el en es fa fr hr hu it ja ko ms nb nl pl pt pt_BR ro ru sr sv tr zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit cmake desktop xdg-utils l10n pax-utils
+inherit cmake desktop xdg-utils pax-utils plocale
 
 if [[ ${PV} == *9999 ]]
 then
@@ -123,15 +123,15 @@ src_prepare() {
 
 	remove_locale() {
 		# Ensure preservation of the backup locale when no valid LINGUA is set
-		if [[ "${PLOCALE_BACKUP}" == "${1}" ]] && [[ "${PLOCALE_BACKUP}" == "$(l10n_get_locales)" ]]; then
+		if [[ "${PLOCALE_BACKUP}" == "${1}" ]] && [[ "${PLOCALE_BACKUP}" == "$(plocale_get_locales)" ]]; then
 			return
 		else
 			rm "Languages/po/${1}.po" || die
 		fi
 	}
 
-	l10n_find_plocales_changes "Languages/po/" "" '.po'
-	l10n_for_each_disabled_locale_do remove_locale
+	plocale_find_changes "Languages/po/" "" '.po'
+	plocale_for_each_disabled_locale remove_locale
 
 	# About 50% compile-time speedup
 	use vulkan || sed -i -e '/Externals\/glslang/d' CMakeLists.txt
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index b8b8e1e3b4e3..b2fd4d445542 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PLOCALES="ar ca cs da de el en es fa fr hr hu it ja ko ms nb nl pl pt pt_BR ro ru sr sv tr zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit cmake desktop xdg-utils l10n pax-utils
+inherit cmake desktop xdg-utils pax-utils plocale
 
 if [[ ${PV} == *9999 ]]
 then
@@ -122,15 +122,15 @@ src_prepare() {
 
 	remove_locale() {
 		# Ensure preservation of the backup locale when no valid LINGUA is set
-		if [[ "${PLOCALE_BACKUP}" == "${1}" ]] && [[ "${PLOCALE_BACKUP}" == "$(l10n_get_locales)" ]]; then
+		if [[ "${PLOCALE_BACKUP}" == "${1}" ]] && [[ "${PLOCALE_BACKUP}" == "$(plocale_get_locales)" ]]; then
 			return
 		else
 			rm "Languages/po/${1}.po" || die
 		fi
 	}
 
-	l10n_find_plocales_changes "Languages/po/" "" '.po'
-	l10n_for_each_disabled_locale_do remove_locale
+	plocale_find_changes "Languages/po/" "" '.po'
+	plocale_for_each_disabled_locale remove_locale
 
 	# About 50% compile-time speedup
 	use vulkan || sed -i -e '/Externals\/glslang/d' CMakeLists.txt
diff --git a/games-emulation/dosbox-staging/Manifest b/games-emulation/dosbox-staging/Manifest
index 4e6e80f7fe04..ca17698457b1 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,10 +1,5 @@
-AUX dosbox-staging-0.75.1-ar.patch 370 BLAKE2B 8df10e9efd58665f6918b80f3b3ab4c1a601e460223a8d1737b02fba854f297a3f7b79f45b759dad12303fe23be511be2939367a56a211b7af3ba1b051518f47 SHA512 f12ee40e1124fb796465c8860052c6ca79e726cc0b3f30a4dd106d584638eb92b20a26d8c7219ebb5c5492a98520d528db4d67120b1c3065530a7565e2c8dbb9
-AUX dosbox-staging-0.75.1-pthread.patch 378 BLAKE2B d0b5fe1e9927592fac4d87863587f8a5e53089e1f52db234ceca975034768e8b84ca3976ddf66943fa42ed2c9644f109b015ba35677151bc70b6ffa9ffee80c8 SHA512 8decb24a22fdceeebe45fcff73d99ae1eeebf8f9c679f25cb049c804c5ea74ed297593839aef509ea63afc0a36f5821750be93c14cb5872af163f5c815156b30
-DIST dosbox-staging-0.75.1.tar.gz 1806471 BLAKE2B 5f9f8038327eb46c2c2b5035ca8e2cc93660bb6ce1dfa9572bf67278f14455db723104c0ab4e90b805cc7dbf253f61528ad6a31edb574af57e106f613958aede SHA512 3e14354e4eb697514c4348af2e73e9f2fb84cc3796b5cfea37faac355bd93a54b0f9c717bf0ab75d824cf34e3ee0d40546e2bbf80bc924a37bd8f981f054e4e9
-DIST dosbox-staging-0.75.2.tar.gz 1816233 BLAKE2B 0cb3224a1fe0e01e5069b78c91191f33b6d84dfb21b00ed8cd832225e68e5f66e841506bc7c887da462727b931a6c72b84dbf5e48e4dde21dbf62ffa3da4edc6 SHA512 2988b2cc44d041193d900efc4c6fa516aca6246e51c1dece9b207bd3549a8c76c5bcb2f3f5a90da6bb2b573663bddd0020274f17130548aef9cef1f4adf79220
 DIST dosbox-staging-0.76.0.tar.gz 1908605 BLAKE2B 71b3c3d6a6444e2442d54b1db365ea66c9ee3db703be876facb8425355d82d817c080e005cefd103714e15fc7d1c17d6329c28d67bf74c143d0428e4f58e5142 SHA512 8c0357bcec08cac2cd2b306edd8b51ad05e16a3c3efb1f4c77e1d942f285493cae8aab45f1633e9c168c0b4b45aa289cf3ffc72685dc004d83127cdb6c76ae9d
-EBUILD dosbox-staging-0.75.1-r1.ebuild 1144 BLAKE2B fe3b39890f8a3f81748b11b338a7480f5a84572bcf0dd00acb53681707a16d9f56fb1befd32871fa64263d81c8080dc608eb5a05067ef223b2002a8ede96357e SHA512 5be3d7dd10c9fe2ecd399ccb204b09706214086bbb230ed5c6ef2f283db4a7c181d5a5126db489214654f02484a186c401d19d7bed28e85f23ad1a24ae8bcf74
-EBUILD dosbox-staging-0.75.1-r2.ebuild 1186 BLAKE2B f511b38ee74bef77a5ec74d43c6c0ace4fe77e1efd43f875d2aae9ee5c437f8e666854f314ed5b1f8398f6e04a4d605e9d8ffb41bf688769ab2de93d6986f867 SHA512 199f8186d8d6fb6eca81cb3959bcb353514353a25d5779e49ef3f50e0b852143df353ba2aa516d11e5be7e5668df8223b64127e716f92406488724e28303587d
-EBUILD dosbox-staging-0.75.2.ebuild 1163 BLAKE2B caf74b9aaa814a9c3143acfa691b96dc38d6f6aaddded408c0269feda1e48fc2a5a6cd1562673d31d98dec0b2cffca5d332371c7601a9010b6d3590231efbdf9 SHA512 221c432915666c9bf78b53e32fe9670502ff27b0d41f15f0b10c4422bceaf0ada4f387be63707e8b581d5d121cac5afff65a0105c69a52c66a8ae047a89a434e
+DIST dosbox-staging-0.77.0.tar.gz 2579927 BLAKE2B 2a8381451ec110ca5350afc70c45f158329bd273b381ff61856ab721a0b194c7d501402453e9a36b90663ee8f6697dce8f64b05adf56efa8df2fd68161e420b6 SHA512 37259fecc091f1e318c2385d6e6fdc3b4ad0905ce63a7db1fc812c924bf8c01640692aca4f08b87d06e6001e50f3f2f4bb63c3715aa9cdfeebd205ed345558a0
 EBUILD dosbox-staging-0.76.0.ebuild 1431 BLAKE2B d6fefe9c171bd48de4246e239d95ebc78bbc02cf1aa138712cc3a2ed76fa9a5a5a181770e8d3f2173079770ef56b4adb83f8843d2fbfcfa6996c8806936912c6 SHA512 3fa322c2f91c97d0f86befc97c93d0e4dd4dcdba56055a97a8dd0fe85907e7319353cf85790dfc790fe811a9ba8990eaece8d86040255cf55f99ea8b502b5ea5
-MISC metadata.xml 710 BLAKE2B 45d197041761e16f354db34d0de96caca1ae85803249cbe2f617263b65603bfc609739bb498cfccc8ebc847168d0f545ff25eecc7ac7bc528532558b906f8130 SHA512 5ccb4a8c37351fd9914d51e51adc0c6c76024bf089210d8517c26410c2cff338909d5cffcf0be4f6ee74d931d57f6418112a93ce6a0b620540da21d224fb9afc
+EBUILD dosbox-staging-0.77.0-r1.ebuild 1458 BLAKE2B 0e0f6a28fe7851bded45749a2322b9b9225335c14923ed4ce1aeeb915f0a5a2eb21daba8b7862d8fdffc267210354053c10b0e038a7c5e41beb0020490c05c7b SHA512 88e4b4aa99fd3c25475aca2e522a23300b9af2628c7f64b9a8832105a350d99f451d6634b5336b11fdee173374d34975f41f46df25840c09178fb3286bf1f4a5
+MISC metadata.xml 797 BLAKE2B 0ed46471b4346f54c7072632f46f3b430b4b7952dae71f4bbc1f87eeb818db285eace15573b3e236ea24baa23622479ab5150df0ad01a0f34d8204ea49b28c78 SHA512 c20d218c8b4eff1ac91c33f02adda6be7bdfd0301add882b612ea2d2513782e3ef160b3a84c99e22a3c2707d90ddcc5b0fb76558fdc0d64c6c2831bcd4a44a07
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild
deleted file mode 100644
index afdf9f7951fe..000000000000
--- a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop
-
-DESCRIPTION="Modernized DOSBox soft-fork"
-HOMEPAGE="https://dosbox-staging.github.io/"
-SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug dynrec network opengl opus"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	debug? ( sys-libs/ncurses:0= )
-	network? ( media-libs/sdl2-net )
-	opengl? ( virtual/opengl )
-	opus? ( media-libs/opusfile )
-	media-libs/libpng:0=
-	media-libs/libsdl2[joystick,opengl?,video,X]
-	sys-libs/zlib
-	!games-emulation/dosbox"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-pthread.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable alsa alsa-midi) \
-		$(use_enable debug) \
-		$(use_enable !dynrec dynamic-x86) \
-		$(use_enable dynrec) \
-		$(use_enable network) \
-		$(use_enable opengl) \
-		$(use_enable opus opus-cdda)
-}
-
-src_install() {
-	default
-	doicon contrib/icons/${PN}.svg
-	make_desktop_entry dosbox DOSBox-staging ${PN}
-}
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild
deleted file mode 100644
index bdedc780583a..000000000000
--- a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop xdg
-
-DESCRIPTION="Modernized DOSBox soft-fork"
-HOMEPAGE="https://dosbox-staging.github.io/"
-SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug dynrec network opengl opus"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	debug? ( sys-libs/ncurses:0= )
-	network? ( media-libs/sdl2-net )
-	opengl? ( virtual/opengl )
-	opus? ( media-libs/opusfile )
-	media-libs/libpng:0=
-	media-libs/libsdl2[joystick,opengl?,video,X]
-	sys-libs/zlib
-	!games-emulation/dosbox"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-ar.patch
-	"${FILESDIR}"/${P}-pthread.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable alsa alsa-midi) \
-		$(use_enable debug) \
-		$(use_enable !dynrec dynamic-x86) \
-		$(use_enable dynrec) \
-		$(use_enable network) \
-		$(use_enable opengl) \
-		$(use_enable opus opus-cdda)
-}
-
-src_install() {
-	default
-	doicon -s scalable contrib/icons/${PN}.svg
-	domenu contrib/linux/dosbox-staging.desktop
-}
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.2.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.75.2.ebuild
deleted file mode 100644
index 75de6e5a03a1..000000000000
--- a/games-emulation/dosbox-staging/dosbox-staging-0.75.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop flag-o-matic xdg
-
-DESCRIPTION="Modernized DOSBox soft-fork"
-HOMEPAGE="https://dosbox-staging.github.io/"
-SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug dynrec network opengl opus"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	debug? ( sys-libs/ncurses:0= )
-	network? ( media-libs/sdl2-net )
-	opengl? ( virtual/opengl )
-	opus? ( media-libs/opusfile )
-	media-libs/libpng:0=
-	media-libs/libsdl2[joystick,opengl?,video,X]
-	sys-libs/zlib
-	!games-emulation/dosbox"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use debug || append-cppflags -DNDEBUG
-	econf \
-		$(use_enable alsa alsa-midi) \
-		$(use_enable debug) \
-		$(use_enable !dynrec dynamic-x86) \
-		$(use_enable dynrec) \
-		$(use_enable network) \
-		$(use_enable opengl) \
-		$(use_enable opus opus-cdda)
-}
-
-src_install() {
-	default
-	doicon -s scalable contrib/icons/${PN}.svg
-	domenu contrib/linux/dosbox-staging.desktop
-}
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.77.0-r1.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.77.0-r1.ebuild
new file mode 100644
index 000000000000..5815a612b2b1
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.77.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson xdg
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/"
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	debug? ( sys-libs/ncurses:0= )
+	fluidsynth? (
+		media-sound/fluid-soundfont
+		media-sound/fluidsynth
+	)
+	mt-32? ( media-libs/munt-mt32emu )
+	network? ( media-libs/sdl2-net )
+	opengl? ( virtual/opengl )
+	media-libs/libpng:0=
+	media-libs/libsdl2[joystick,opengl?,video,X]
+	media-libs/opusfile
+	sys-libs/zlib
+	!games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+DOCS=( AUTHORS README THANKS )
+
+src_prepare() {
+	default
+
+	# We do not have default.sf2, use actual name from fluid-soundfont
+	sed -e "s/default.sf2/FluidR3_GM.sf2/" \
+		-i src/midi/midi_fluidsynth.cpp || die
+
+	# Disable license and docs install (handled by ebuild)
+	sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use alsa use_alsa)
+		$(meson_use debug)
+		-Ddynamic_core=$(usex dynrec dynrec dyn-x86)
+		$(meson_use fluidsynth use_fluidsynth)
+		$(meson_use mt-32 use_mt32emu)
+		$(meson_use network use_sdl2_net)
+		$(meson_use opengl use_opengl)
+	)
+	meson_src_configure
+}
diff --git a/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-ar.patch b/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-ar.patch
deleted file mode 100644
index fb2c24267f05..000000000000
--- a/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-ar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur dosbox-staging-0.75.1.orig/configure.ac dosbox-staging-0.75.1/configure.ac
---- dosbox-staging-0.75.1.orig/configure.ac	2020-08-19 10:49:45.000000000 +0200
-+++ dosbox-staging-0.75.1/configure.ac	2020-09-04 23:03:11.375920481 +0200
-@@ -17,6 +17,7 @@
- AC_CONFIG_HEADER(config.h)
- 
- dnl Checks for programs.
-+AM_PROG_AR
- AC_PROG_MAKE_SET
- AC_PROG_CC
- AC_PROG_CPP
diff --git a/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-pthread.patch b/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-pthread.patch
deleted file mode 100644
index 1aa7de682bd2..000000000000
--- a/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-pthread.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dosbox-staging-0.75.1/configure.ac.orig	2020-08-20 14:25:41.295432272 +0200
-+++ dosbox-staging-0.75.1/configure.ac	2020-08-20 14:26:00.614461707 +0200
-@@ -37,7 +37,7 @@
-             :,
- 	    AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
- )
--LIBS="$LIBS $SDL_LIBS"
-+LIBS="$LIBS -lpthread $SDL_LIBS"
- CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
- 
- dnl Checks for header files.
diff --git a/games-emulation/dosbox-staging/metadata.xml b/games-emulation/dosbox-staging/metadata.xml
index f9ff028304d3..02a2086f27a3 100644
--- a/games-emulation/dosbox-staging/metadata.xml
+++ b/games-emulation/dosbox-staging/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="dynrec">Use recompiling cpu core instead of dynamic x86/x64 specific cpu core</flag>
 		<flag name="fluidsynth">use <pkg>media-sound/fluidsynth</pkg> for MIDI emulation</flag>
+		<flag name="mt-32">use <pkg>media-libs/munt-mt32emu</pkg> for MT-32 emulation</flag>
 		<flag name="network">Enable networking features (modem, ipx)</flag>
 		<flag name="opus">Support compressed audio tracks (.opus) used with CDROM images</flag>
 	</use>
diff --git a/games-emulation/gens/Manifest b/games-emulation/gens/Manifest
index d04d7ed0c957..380780095458 100644
--- a/games-emulation/gens/Manifest
+++ b/games-emulation/gens/Manifest
@@ -5,5 +5,5 @@ AUX gens-2.15.5-ovflfix.patch 581 BLAKE2B a4b44f6b59e03021f9b68603b0011d88fc1428
 AUX gens-2.15.5-romsdir.patch 575 BLAKE2B 2af287d30b5ff6c28a306fb35733cd8a715ffe1ae20da117b5f9dd3520f54c39a906d9bcd6b6003ce2cb4bd09d55d10bf25164d71f9400548360b9736cb5aa06 SHA512 73b75f4b8087931b20b1b8c220ce64e957ca0cdeb91a59a90b29b4376420e567093f0ae6d6525cdf3930f555720b27c9f152ec5bbf0365743a0bac236da115e6
 AUX gens-2.15.5-zlib-OF.patch 196 BLAKE2B 44fda98c9270c05601d8464ac93c2d1e9174227c2b253617566fb908ed2e10f8feeebf61afe59abe560d5f239da5022a2174cd3db46d7acef164d7d6e40b4f71 SHA512 8444e5c32afaa845d93d75801723c50527a0d860de862f203aaf2f212109e4520cb517ae9d58f77200a75a48b9d5fe1952aec68b502b39a2c2e480c034347c2d
 DIST gens-2.15.5.tar.gz 741852 BLAKE2B 17501077737ea7320f9675c130c89cc0e078ad413e7af32c55c5db8d0fa2ba099db26d1272c32e09e86bb11fd49f364b0597540261414d366198afb24a10bc7a SHA512 7163f6a1e09bac420e0e4aa0f8f3ed255406d9aff3cc7366c40226e7fece78baca5428d0fe87daf0f12f6e10b428477a795b54d008db5e3dcbf7692ed9d9fe7d
-EBUILD gens-2.15.5-r2.ebuild 1118 BLAKE2B 1493700d0f84b25879dc3df34a6d67abb5b9521f3ad106a1162745bfcc2af660287c65ffb8d85daa1055dc32efbcca45a2f8d97a11cd2aeb4d00ce048c694ed3 SHA512 0586ff087275680037a9060f1ebdb9d7d9440517369ec26f6f111b0ce69267d5acea31e3bf9314b66a3c9f02f541d5aaf27908e314b5fd972096ea2899abc04e
+EBUILD gens-2.15.5-r2.ebuild 1050 BLAKE2B 92663ccda612f6d518f472fc08729425ba9ee1138b037e011dc9a1a056607c002d2de74e8990b1418c3e1866d9a044516e2a34c611f8e42080ccc85be7d732a6 SHA512 edd88978182cc7eab198097ec26665c3b19c1df3a33a16f4ba5d9d790631fece50d351ec35cda1c6c09ce8c715aed8705cc27821d39adc4b5f9a8fdca1032c3e
 MISC metadata.xml 327 BLAKE2B 2eb11640da9741a65ebe22b58a03e88d5432c69cef02a4db90801bc65d06987e3a8056401efca51ed70846666922d312bb1f38189cea7a53e9e0c1afbde55fa9 SHA512 651fefa76d513b3f2a0ecf865547bf7046605ef21fa689e620820464a28b3b2e5b288623e7ca71bcae93cc016871240025caf1fdb04a45a0695ec457098434b4
diff --git a/games-emulation/gens/gens-2.15.5-r2.ebuild b/games-emulation/gens/gens-2.15.5-r2.ebuild
index 7b8c385e9b04..b4c3edece97b 100644
--- a/games-emulation/gens/gens-2.15.5-r2.ebuild
+++ b/games-emulation/gens/gens-2.15.5-r2.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-MULTILIB_COMPAT=( abi_x86_32 )
+inherit desktop flag-o-matic multilib
 
-inherit desktop flag-o-matic multilib-build
-
-DESCRIPTION="A Sega Genesis/CD/32X emulator"
+DESCRIPTION="Sega Genesis/CD/32X emulator"
 HOMEPAGE="https://sourceforge.net/projects/gens/"
 SRC_URI="mirror://sourceforge/gens/${P}.tar.gz"
 
@@ -16,12 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	media-libs/libsdl[${MULTILIB_USEDEP},joystick,video]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/opengl[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:2[${MULTILIB_USEDEP}]"
+	media-libs/libsdl[abi_x86_32(-),joystick,video]
+	sys-libs/zlib:=[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
+	x11-libs/gtk+:2[abi_x86_32(-)]"
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-lang/nasm-0.98"
+BDEPEND="dev-lang/nasm"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-romsdir.patch
@@ -43,8 +41,9 @@ src_configure() {
 
 src_install() {
 	default
+
 	dodoc gens.txt history.txt
 
 	newicon pixmaps/gens_small.png gens.png
-	make_desktop_entry "gens" "Gens"
+	make_desktop_entry gens Gens
 }
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
index 612747d4a964..9f013daa19e2 100644
--- a/games-emulation/ppsspp/Manifest
+++ b/games-emulation/ppsspp/Manifest
@@ -8,5 +8,16 @@ DIST ppsspp-1.11.3-ext_native_tools_prebuilt.tar.gz 897571 BLAKE2B b1c959a0cd1c6
 DIST ppsspp-1.11.3-ext_rapidjson.tar.gz 1054419 BLAKE2B 40b8ba0884943de2179b21d7a56716efed2ec5b4098aa33c061e52703b0952930fe2f1bda8cb6ec4a75b947753011e9d06fda953a3862e321d2a0187cd60385d SHA512 3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc
 DIST ppsspp-1.11.3-ffmpeg.tar.gz 396041681 BLAKE2B be67e136b232e6937061d1a7cc37a4302786105a27c454422acdfff3905dcfa58c9fcbdcdb4b6642222d57f69f427a6892ac34018bf34e70f3c66e7708cacb63 SHA512 5417476ba2eeaee9c30bee8297b70a5557f9ec10270d301cb2820f4711be24dbadc4c1ca58b0c4bfb588dfd0aa0d63e676c9b890c471b05f2298bfececbac6b4
 DIST ppsspp-1.11.3.tar.gz 30067677 BLAKE2B 7c5456d38c55c6c1d6a873d869c6df4f31d271f3dec75fd0c5b4f1f4db6ad8a22ad456ba183f0df84d8e2d293bef6c454843f8149c186a86fcbee127aeee7d9a SHA512 5890ae34f2aa4125a816a0fade46a7422385a0652ff04470c56fe653e3a2a697d55bc77f1d7d119bdfa8dbad313d6a1de18a03d1960eaaa9e987b5ddcfed2f48
+DIST ppsspp-1.11.3_p20210627-assets_lang.tar.gz 664123 BLAKE2B 8d96634eb3e930f7f97e8ac24d97eba1e2e7fce3a8f4dbe5a8a4c0c0438a24e981769c3638d7e7770eb1a3af2827a3ece0996fdba8cf668d2c058e3d20741e94 SHA512 691cb38c65ca20700dc5b91c0dc02eec1839f153e042c87f8f4fd480e44c823c0ece9f4752f5e597f2aa4b5cfb22aaf49d76ff990eb2dd5231cc4065dd62566d
+DIST ppsspp-1.11.3_p20210627-ext_SPIRV-Cross.tar.gz 1441538 BLAKE2B 011a0bc8fea2a5986b5884f315d877d0de111dbda226cc6aa5eaf11c0b2cb14acfd94c1279fb80f0a48b27d1a2117487f634a0888f7499d733261c0ced94ea89 SHA512 be77131814691dfbe65de3a2d3ea65de98c7169824997056637bbce39485327ff0f64e7eed8588237615948824e1f9dff1d083472b8cbccd3748a52379411e4e
+DIST ppsspp-1.11.3_p20210627-ext_armips.tar.gz 197263 BLAKE2B 2b2cbeaabf5fb5f0b5cbf8c93ea61d4546e04054f54be5a7dad081ca0aaacf09d1fe1cc710fd0c66f28c7d4c84b98961a6d96bb9cea941f8b02492c1dff6344d SHA512 2a94e2c7b7280c00a39c8fc92d81ed15fc4b3270a124ef882e3cd8878db6ec827aefa06b0e646a60916636a95e4ebfa886e9878ba70c6bcfcd048def457368be
+DIST ppsspp-1.11.3_p20210627-ext_discord-rpc.tar.gz 2108078 BLAKE2B e89ee4a196167cabaecfab82d191516eb0cf0fa89e35f95b6d118d5baad25f5d13d9002a8dcfe4aba099af7b9c1eb72835eb3baa9e4deaedd2754e99687b5967 SHA512 06205287addabfb343ccd9af997b693ed221fe564355d3629d4dee6c003e768b3f65f2b34eb04ef29807a15c5fa34b04c664212b7e0d15b09ad9a4e4be10a560
+DIST ppsspp-1.11.3_p20210627-ext_glslang.tar.gz 3300622 BLAKE2B 0f0d8e043662962f13c4277da335def78a88dd1b35ac2e40b0192f0783c43fd97367d63663764591a5b1eef1bc62c681aa54a402e69c36a8dc50b3595e9e8ba9 SHA512 39b7fd1332dc2f6e29c920961e2a48a33cb7fb36753a0ee5ea8897cb2ad11cec67808ec671cd1bdecbb03eb17f4e83a711013bb20a8cc0831879eb9fbe432bcd
+DIST ppsspp-1.11.3_p20210627-ext_miniupnp.tar.gz 449099 BLAKE2B b2bcdee23c817cf309dd9516e32e06f7e1eadc9ae24db3519a2b4e3861417fb79c0708d6d67e8baec3de9e6c5c2bb0a6daff648bf63f7c419192729957e9959c SHA512 f86f558699e75e7f8a58bbb5e94c2a32d703432cef05ffeac0da129113a1fe485cc5ad43b1fcfda11ee1ee398fa434511eccc37633eb5d3dfe8af864097669de
+DIST ppsspp-1.11.3_p20210627-ext_native_tools_prebuilt.tar.gz 897571 BLAKE2B b1c959a0cd1c61f65b3d7e2c204e9b60fc00e551d72ef3edcb8a3c8851e1e8d1dd3b0f79594ffd0ec767ba0ca34ae7fc8d3a5171ca5b449fcbab8ab9f63e22a9 SHA512 5e1b3d8c0cf581014e6fa375b865725a383128818df6e5135a03b1513807d2b8f615a7e58d37ca805d0603ea75d24e41fe079eaf4f41e94af1077d4c4b0c5a93
+DIST ppsspp-1.11.3_p20210627-ext_rapidjson.tar.gz 1054419 BLAKE2B 40b8ba0884943de2179b21d7a56716efed2ec5b4098aa33c061e52703b0952930fe2f1bda8cb6ec4a75b947753011e9d06fda953a3862e321d2a0187cd60385d SHA512 3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc
+DIST ppsspp-1.11.3_p20210627-ext_zstd.tar.gz 1858608 BLAKE2B 8d3f3fd3b4d9cab38c4544b3fe7030bb5589b230433a1e479a18975145b83255d84c029a6eb57b5440acf160cdfc46aad1b25145bea004c22b1999b63fdfa933 SHA512 5db2ebd0cbdd9f2a1485f876eddf45df23dcf41bb9c7bedec865a60cb63eeba4a8ce6968de4598f18fe4368b38fa6333c0c7e4bf8ed4848ac83a8e7783ce47cd
+DIST ppsspp-1.11.3_p20210627.tar.gz 28650800 BLAKE2B f6f0c512451df4fe4c7a10525898aeb698f0a36889f7216d766d62366f5b3f3040cf5e422cbaaab44c638e4f12ce27361b5170caae33578ecd33ac1409fecf3d SHA512 a309e722f5ddfeef9acfa23ff92cda0c37cf21d255f7d2f3546cdccc51502e4ad66274dd02c96b94637a4bada022a604191f92f2edf40cb0bbdbdaf6acd73223
 EBUILD ppsspp-1.11.3.ebuild 3383 BLAKE2B e7965bb10149f462062a40b2b8733af337a9fef8e03103be39c0a1c2329a3d4fe84e95f6024c69485ffa5e73ef0d18875d0b46e00751794412f35841a2f4abd2 SHA512 e802d25db5db6cab4944de324da7efd26de67442afe3d3fe0023530ba6165773389d21789dac527f026715a3473e2c8a4aed6663e4263a05416bf3395b183275
+EBUILD ppsspp-1.11.3_p20210627-r1.ebuild 3045 BLAKE2B 1cf0f192a8d2b49fbd56fed743860d714df6b04a38aa0eff56f3c02304adf7423260ad706bb43b55d04befa266899ba48a7cd48a660533b54adb3ddfa3216b33 SHA512 f666f4034b44f2e5d3bdac524efb82f93ffee435bfaf7af22e6e7380ced864390e3331b0d6ca6279c6575e76632c949a1c93c9323f6e80dba445d9e57da210aa
 MISC metadata.xml 809 BLAKE2B 735d1ea6afe35e4eaaa04ce6b87f789d263403cb930431c312cdf1e7413d7d4beb1358105a712f486e8c33dcb12f0e9b423a711a91c12c8d2c2df10d489147d7 SHA512 4d148735f03f70e7fa3582ac3ff7f039148501b48cfeda8bab98cfa8ddae593f67b85d25f58aa8d35cb5ff82ce838237072acb1f674ae3dc42f33e307ed31cfd
diff --git a/games-emulation/ppsspp/ppsspp-1.11.3_p20210627-r1.ebuild b/games-emulation/ppsspp/ppsspp-1.11.3_p20210627-r1.ebuild
new file mode 100644
index 000000000000..a6d35611d326
--- /dev/null
+++ b/games-emulation/ppsspp/ppsspp-1.11.3_p20210627-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg cmake
+
+MY_COMMIT="ff2a6eeda2d00210f1a1f7bc0ab0ad99e7bc60b6"
+
+DESCRIPTION="A PSP emulator written in C++"
+HOMEPAGE="https://www.ppsspp.org/"
+SRC_URI="
+	https://github.com/hrydgard/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://github.com/KhronosGroup/SPIRV-Cross/archive/9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1.tar.gz -> ${P}-ext_SPIRV-Cross.tar.gz
+	https://github.com/Kingcom/armips/archive/7885552b208493a6a0f21663770c446c3ba65576.tar.gz -> ${P}-ext_armips.tar.gz
+	https://github.com/Tencent/rapidjson/archive/73063f5002612c6bf64fe24f851cd5cc0d83eef9.tar.gz -> ${P}-ext_rapidjson.tar.gz
+	https://github.com/facebook/zstd/archive/56421f34e4ab5c17cbac0832bd12413e4f27ecf9.tar.gz -> ${P}-ext_zstd.tar.gz
+	https://github.com/hrydgard/glslang/archive/dc11adde23c455a24e13dd54de9b4ede8bdd7db8.tar.gz -> ${P}-ext_glslang.tar.gz
+	https://github.com/hrydgard/miniupnp/archive/3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e.tar.gz -> ${P}-ext_miniupnp.tar.gz
+	https://github.com/hrydgard/ppsspp-freetype/archive/cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a.tar.gz -> ${P}-ext_native_tools_prebuilt.tar.gz
+	https://github.com/hrydgard/ppsspp-lang/archive/3bf6b18eb0ae68861fbfbb7b43cd764771ca42a9.tar.gz -> ${P}-assets_lang.tar.gz
+	discord? ( https://github.com/discordapp/discord-rpc/archive/963aa9f3e5ce81a4682c6ca3d136cddda614db33.tar.gz -> ${P}-ext_discord-rpc.tar.gz )
+"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 JSON MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="discord qt5"
+RESTRICT="test"
+
+RDEPEND="
+	app-arch/snappy:=
+	dev-libs/libzip:=
+	dev-util/glslang:=
+	media-libs/glew:=
+	media-libs/libpng:=
+	media-libs/libsdl2[joystick]
+	media-video/ffmpeg:=
+	sys-libs/zlib:=
+	virtual/opengl
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[-gles2-only]
+		dev-qt/qtmultimedia:5[-gles2-only]
+		dev-qt/qtopengl:5[-gles2-only]
+		dev-qt/qtwidgets:5[-gles2-only]
+	)
+	!qt5? ( media-libs/libsdl2[X,opengl,sound,video] )
+"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	cd "${S}" || die
+	local list=(
+		assets_lang
+		ext_SPIRV-Cross
+		ext_armips
+		ext_glslang
+		ext_miniupnp
+		ext_native_tools_prebuilt
+		ext_rapidjson
+		ext_zstd
+	)
+	use discord && list+=( ext_discord-rpc )
+
+	local i
+	for i in "${list[@]}"; do
+		tar xf "${DISTDIR}/${P}-${i}.tar.gz" --strip-components 1 -C "${i//_//}" ||
+			die "Failed to unpack ${P}-${i}.tar.gz"
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DHEADLESS=false
+		-DUSE_DISCORD=$(usex discord)
+		-DUSE_SYSTEM_FFMPEG=ON
+		-DUSE_SYSTEM_LIBZIP=ON
+		-DUSE_SYSTEM_SNAPPY=ON
+		-DUSING_QT_UI=$(usex qt5)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r "${BUILD_DIR}/assets"
+
+	local i
+	for i in 16 24 32 48 64 96 128 256 512; do
+		doicon -s ${i} icons/hicolor/${i}x${i}/apps/${PN}.png
+	done
+
+	dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
+	make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))"
+}
diff --git a/games-emulation/stella/Manifest b/games-emulation/stella/Manifest
index 55b8af59e950..d0ddff80cc51 100644
--- a/games-emulation/stella/Manifest
+++ b/games-emulation/stella/Manifest
@@ -1,5 +1,5 @@
-DIST stella-5.1.3-src.tar.xz 1828448 BLAKE2B 1588e4da3c21ab51d967aa3fae49b14ef5f3121e3907aa83629dbabeab5c190660ad5a53319429f721cc93560c212f530a58675b7c543c9a3fed3e395669c145 SHA512 9aaf6118c999e90e4947e490f61ccebb82ba1ebeccb29b2e4ec1226bdeef83bb36d944791d6f915522c5c6fec74a0bd17ac5ce8fcc5f369281f9cedf06a380a5
 DIST stella-6.5.2-src.tar.xz 6220652 BLAKE2B 8bb51ff15b28436eb83b918ca6123956482e4342c4f9560dcea608a856899a65176c9012146d1a2affe22ee0a589e945424e897853890e23ff503d97b893e32f SHA512 dc7685fd166fad578bce62c961419755db7c4b8ac6e6e2e10f0edfa3b0f63bf43d64119483cc47fc86dfe95e09bc800c27392239aeb68a2ccf37d0f224d6493c
-EBUILD stella-5.1.3.ebuild 1353 BLAKE2B 4e9d723e1cf6b68e3c4acc2f5fb87fcd0af30989cb907dc43bbad83c3b8670f70b622486c8ad23a5c7e38f93b09303c0bd5c5182c91757782392da6203f6227e SHA512 9f39dc63c241d9fc4be281f3ba14f44bbfe935fca41ce16aa53c8284b770ae9a9f92de387f13b4f37e6225a0346b683ed51a1b74d000cd81124f22dde2a15f6a
+DIST stella-6.5.3-src.tar.xz 6221588 BLAKE2B 1cee75cd27c14db5a2eaf3a6d88af5b3d081c2577afd4b46b27ef33dd11d676cd5fe981d8ae918373b16d7f50e0151a9e0fc00765fb39370ea50f8322a90b963 SHA512 67fe45c0be510494e4c3ead91ee5f7c9a8ba7059b76beb15e794ef49144c8f0fb57d7c7476f4f299e573e37ea1c41f2fb094ca10974f3bcda797fc69c9bd2986
 EBUILD stella-6.5.2.ebuild 1359 BLAKE2B b3eb5d424060af0ab7aefe4d6cf2c7762bc61b3c304cd288d4206364c144e6cd08f03bb000c97f0844f590ad8ce142717c95aa6c868d145b1bc5985c93944150 SHA512 d80e24ded2edac83a45e0acd21529e2b5337c6ee73e435ef46a3747a13010e3eb01beb328d86821a1bc6f61875f014b82dfac3c9d77dc6cf219a8667ef5e7b3f
+EBUILD stella-6.5.3.ebuild 1181 BLAKE2B af98eb95d88bfd591afba8d05b2da853a053f2b1627a9d3325c3e6211e1eaa043a4793f46d7f8c75957768529b13f6d957eab08c1020140a2980c9d466ff5695 SHA512 5e590e83b530038a79fee476ec4fab0373d3ca725431586e443f9ff426cb29c0a01c42841b347a4c608d669710e60fda748a4a8336fe367d551b22f0f3b73daf
 MISC metadata.xml 386 BLAKE2B 23b063450bf4b6915ed443ff8e9cc0c24858144c867085a6416f73b2299026ab85d4b07f18bbd54db37ce420803eb81561e87323e5eee0cdb99652de2c15d153 SHA512 6d69c2c3b88a206faaf9d80c1c1d8de01d1865bf800e4d4b7997dae4641f99665c0692251cf3d045e766be045069548e42cdb3303cb698f093501f2e79124fa1
diff --git a/games-emulation/stella/stella-5.1.3.ebuild b/games-emulation/stella/stella-5.1.3.ebuild
deleted file mode 100644
index e1a6bdf39dd8..000000000000
--- a/games-emulation/stella/stella-5.1.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils toolchain-funcs
-
-DESCRIPTION="Multi-platform Atari 2600 VCS Emulator"
-HOMEPAGE="https://stella-emu.github.io"
-SRC_URI="https://github.com/stella-emu/${PN}/releases/download/${PV}/${P}-src.tar.xz"
-
-LICENSE="GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="joystick"
-
-RDEPEND="
-	media-libs/libsdl2[joystick?,opengl,video]
-	media-libs/libpng:0=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-
-DOCS=(Announce.txt Changes.txt Copyright.txt README-SDL.txt Readme.txt Todo.txt)
-HTML_DOCS=(docs/.)
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/INSTALL/s/-s //' \
-		-e '/STRIP/d' \
-		-e "/icons/d" \
-		-e '/INSTALL.*DOCDIR/d' \
-		-e '/INSTALL.*\/applications/d' \
-		-e '/CXXFLAGS+=/s/-fomit-frame-pointer//' \
-		Makefile || die
-}
-
-src_configure() {
-	# not an autoconf script
-	CXX=$(tc-getCXX) \
-	./configure \
-		--prefix="/usr" \
-		--bindir="/usr/bin" \
-		--docdir="/usr/share/doc/${PF}" \
-		--datadir="/usr/share" \
-		$(use_enable joystick) \
-		|| die
-}
-
-src_install() {
-	default
-	local i
-
-	for i in 16 22 24 32 48 64 128 ; do
-		newicon -s ${i} src/common/stella-${i}x${i}.png stella.png
-	done
-	domenu src/unix/stella.desktop
-	einstalldocs
-}
-
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-emulation/stella/stella-6.5.3.ebuild b/games-emulation/stella/stella-6.5.3.ebuild
new file mode 100644
index 000000000000..0834d742503d
--- /dev/null
+++ b/games-emulation/stella/stella-6.5.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xdg
+
+DESCRIPTION="Multi-platform Atari 2600 VCS Emulator"
+HOMEPAGE="https://stella-emu.github.io"
+SRC_URI="https://github.com/stella-emu/stella/releases/download/${PV}/${P}-src.tar.xz"
+
+LICENSE="BSD GPL-2+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+joystick png zlib"
+REQUIRED_USE="png? ( zlib )"
+
+RDEPEND="
+	media-libs/libsdl2[joystick?,opengl,sound,video]
+	png? ( media-libs/libpng:= )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}"
+
+DOCS=(
+	Announce.txt Changes.txt README-SDL.txt
+	Readme.txt docs/R77_readme.txt Todo.txt
+)
+
+src_prepare() {
+	default
+
+	sed -i '/CXXFLAGS+=/s/-fomit-frame-pointer//' Makefile || die
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	# not an autotools generated script
+	local configure=(
+		./configure
+		--host=${CHOST}
+		--prefix="${EPREFIX}"/usr
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+		$(use_enable joystick)
+		$(use_enable png)
+		$(use_enable zlib zip)
+		${EXTRA_ECONF}
+	)
+
+	echo ${configure[*]}
+	"${configure[@]}" || die
+}
+
+src_install() {
+	default
+
+	rm "${ED}"/usr/share/doc/${PF}/html/*.txt || die
+}