gentoo resync : 31.05.2021

4 files changed, 9 insertions, 6 deletions

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index c0f530bc217a..0cb96d825b3e 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,6 +1,6 @@
 AUX scummvm-2.2.0-fluidsynth-2.2.patch 5627 BLAKE2B 42a4d2bc56ffb9f13bce8de4af27511e0603ce8abcc17fa8ca2501e1e0fd464bdc57b2b81c7b98ca9a7d57149d1d848de1986127e7f777a8673d0f83f67b7f08 SHA512 b69d7fc1d14ea4f4cdbb0105d294b00f5f0248b8d37920cac8e11c54ee3ef1636dbde2f304d6e1b5c924aa1a8714697f2d3f8583c588961c0ff7162ba5d67c71
 AUX scummvm-2.2.0-ultima_engine_lua_dep.patch 785 BLAKE2B 73c9ef3272ce9c71d1575775a966ff38b8369ab6cb68b3ce17353dc4b0ba7590020f7288451cfe5cb2ee94ccacfa33da1ca02389d82bcc8d8570e4f2139aaa58 SHA512 bb1e67955834b8e0544e58258f31e5fe8ba0e4ec701426cad6c032714708ce6928698de42b8a3ba7b1c0bb0eda87c6fd87c5162e396595956e70df0aa5beaac1
 DIST scummvm-2.2.0.tar.xz 63652348 BLAKE2B b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b SHA512 001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e
-EBUILD scummvm-2.2.0-r1.ebuild 3055 BLAKE2B f0c889a16fad8891ce657b71f5b00e85f263c94d3adfc256720e9512b188a33bf6236dee7e0407db1c2620e5f90ab20d04d0c581120c303a0cd8f55856648cf3 SHA512 615e638aeb605b8386721d45a9564072ecf287942fedc750649149f4be319901ea60f495c8ec5cc9012cf6b275ff64a6efce7f4b8d8df558f46e48271fd0823c
-EBUILD scummvm-9999.ebuild 2995 BLAKE2B 1a484a278b024fe7a2ac4210f3a18b4a860c5c66ef313c2855b2dfce328c74dd507278042998e0503830851045ea86664d1d106175dfedb0422acd5c66a3feef SHA512 7417b5169f5b3b2e818749940b55bea092888bd216e960bbe76e33f1cb9c4a6278fbb8f431f1b1caefb1b60e0faf7c997bcf63edd5743049a231c413aa351d1d
-MISC metadata.xml 1119 BLAKE2B 69d76e676244d618d769418d210acc4a705ef155215ced601bd1cb7075faf99789f9d771d8333d13a7e62f54846a31f14c4b4f00860a0927f2593ae2786e7cfd SHA512 41dc677a597ced02d76ea1610ad1e7a68cfba4c9622d2e9144eea61574752fbd7958ea7452c3213685c34ea89d24631adc96a93991bd27f32bf29677be31787d
+EBUILD scummvm-2.2.0-r1.ebuild 3083 BLAKE2B be5bcd2c84bce46dc2ef1fd3af0e01c4099bb98a3ac2a2524e14f9d234c4cba56b4df867a6ac1ea13d8d7fe7a189ad435671756cd5751108c7cd70b96f67e0ee SHA512 a218edbee1a4f0388e223f448f6cd7128f342cb38ffb50467ec898a90fd29f8ee31043a5ffd26cc837c50a873bf7f08ce94f4a9eeefde699871582151b8a464b
+EBUILD scummvm-9999.ebuild 3023 BLAKE2B 1db51f2c18df2dff4721f496e4a51ce46ba85aa6e70be1d0a8892ef35bb8fe858734120188860b6cf6a22d94d09dbc9c37811ac39c91aa066057006fd9c6ae3e SHA512 df839f3191fdcf8098e3796f4e51ae2c0aad1293034c7d0e2f7eb33c8fb66a03b4ad603fad44449a5e15770ceb2844b5075d160b744c74eb110152c5fa632e8b
+MISC metadata.xml 1214 BLAKE2B 39ff67a7d7dc25406d9418349d47631fb1bbd4d10b4e6c86dc35188987e6177cffc64087ebed51137ed00431605997479ca45a426f3cfdd7f1bc30dc98eba42f SHA512 02fe128e97f053e669fcb5b65a317689c492b4ea0bb1873ccf77f70c2de8b6dd7532d55026b94a87fc6a8c5c71c44a736c3a571d94d78af71a79cbdd99a53e8a
diff --git a/games-engines/scummvm/metadata.xml b/games-engines/scummvm/metadata.xml
index dd278d4911d0..4b13f3aa2adc 100644
--- a/games-engines/scummvm/metadata.xml
+++ b/games-engines/scummvm/metadata.xml
@@ -15,6 +15,7 @@
     <flag name="glew">enable support for OpenGL Extension Wrangler Library (<pkg>media-libs/glew</pkg>)</flag>
     <flag name="mpeg2">enable mpeg2 codec for cutscenes</flag>
     <flag name="net">enable cloud support via <pkg>media-libs/sdl2-net</pkg></flag>
+    <flag name="sndio">Enable support for MIDI music using <pkg>media-sound/sndio</pkg></flag>
     <flag name="speech">enable text-to-speech support through <pkg>app-accessibility/speech-dispatcher</pkg></flag>
     <flag name="unsupported">enable unsupported and/or broken game engines (you're on your own)</flag>
   </use>
diff --git a/games-engines/scummvm/scummvm-2.2.0-r1.ebuild b/games-engines/scummvm/scummvm-2.2.0-r1.ebuild
index f4ab2f0515e9..b6022c564f3f 100644
--- a/games-engines/scummvm/scummvm-2.2.0-r1.ebuild
+++ b/games-engines/scummvm/scummvm-2.2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="a52 aac alsa debug flac fluidsynth fribidi +gtk jpeg lua mpeg2 mp3 +net opengl png speech theora truetype unsupported vorbis zlib"
+IUSE="a52 aac alsa debug flac fluidsynth fribidi +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
 RDEPEND="
@@ -99,6 +99,7 @@ src_configure() {
 		$(use_enable mpeg2)
 		$(use_enable net sdlnet)
 		$(use_enable png)
+		$(use_enable sndio)
 		$(use_enable speech tts)
 		$(use_enable theora theoradec)
 		$(use_enable truetype freetype2)
diff --git a/games-engines/scummvm/scummvm-9999.ebuild b/games-engines/scummvm/scummvm-9999.ebuild
index 22e410bbb259..f6a91ef83cd0 100644
--- a/games-engines/scummvm/scummvm-9999.ebuild
+++ b/games-engines/scummvm/scummvm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/scummvm/scummvm"
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
 KEYWORDS=""
-IUSE="a52 aac alsa debug flac fluidsynth fribidi glew +gtk jpeg lua mpeg2 mp3 +net opengl png speech theora truetype unsupported vorbis zlib"
+IUSE="a52 aac alsa debug flac fluidsynth fribidi glew +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
 RDEPEND="
@@ -98,6 +98,7 @@ src_configure() {
 		$(use_enable mpeg2)
 		$(use_enable net sdlnet)
 		$(use_enable png)
+		$(use_enable sndio)
 		$(use_enable speech tts)
 		$(use_enable theora theoradec)
 		$(use_enable truetype freetype2)