gentoo resync : 22.05.2021

4 files changed, 9 insertions, 6 deletions

diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index a42145fc4f54..19ba08a7b972 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -6,6 +6,6 @@ AUX libsdl2-2.0.14-vulkan.patch 554 BLAKE2B 654415d20fc1782ee8d3a979355dcb743537
 DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0 SHA512 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317
 DIST SDL2-2.0.14.tar.gz 6089974 BLAKE2B 5982c66430f8ae62094dbc216781efafd3a07c50efd16bc8307d5048227011d4710d5af1b15be01a55fa6f3ae41eedf9c2df67bafd98042e3b2978a05e7ffd27 SHA512 ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee
 EBUILD libsdl2-2.0.12-r2.ebuild 5880 BLAKE2B b762d683d18fca57041ef5abdc328258bd8ae7f9bb79f1b3baae9aa40337acc873a71ba1c558754bb08862b5e39bcce37d68625fd770965bac3cdcc5f65a249b SHA512 4c5ce2040cbedede83c4103aaa6a4fea4c4d26d654b0ae3da1ea8d704d64e3e7b9f7f7cf89b208d8900c61a29ba85ad2f5948ad2905ba499ba8017dd2574c8dd
-EBUILD libsdl2-2.0.14-r1.ebuild 6042 BLAKE2B fdfa03ea09941f9bc5f25a849025bfd4449b36397c7a0a8fe369f50ddf7e097f4bce95564eb65fd43a0f5e988e4722729b50cd64cb154d1605684b9e4af4fadc SHA512 79c358c001ae930a5136aa4d09cd6f35d63f3b98d8d1502a039029f481e2d3691bc83056d2ecfafe696c894d91c0ca7c3fe736a087e13b6bd32d3f82962b8e18
-EBUILD libsdl2-2.0.14-r2.ebuild 6155 BLAKE2B db8f074cfd21ca9dd922c79228d5ff85d191872909c8da1bae03ed2613919300a37e8c9929d7295103cb29be96189db1da424c3a5bfad2d7ec517dfa64920004 SHA512 21e44e143bc637862fb9a6c760857205fe1a11abae1d055cf236b2a40ad27b2ab080c80797f46731e422f67050c4d2761f2595ac3dbda2e18062401d1676e8fc
-MISC metadata.xml 1863 BLAKE2B 96b91c7b6e7dd08e8410626cedfdd6b5e563be61356573405c740d0f2ef5fa1dc6e060a38fcd4b60a5adab81591ab7d9cd2196be68bf9f705a1d0244982418bb SHA512 60ddaf41efbbcddfe9f4a9a02e82108831c6326c86410d16d9e4c5dc008cddef3f7159e2d2d2612c2d278f235f0604c0350771d17dc620d46986699e455751c3
+EBUILD libsdl2-2.0.14-r1.ebuild 6040 BLAKE2B 568f3cf2814d110c76c5eebbb5ecad94315c6b1406afebf10c8d2d92a7a8095126499fafdecc2b87032840e555264053d176688d57977f031c9b89f9bdbddcc4 SHA512 f3ab38be41cf3450e3943dcfb4426f36e81e172acd05b58a847927e83257051daec0f9f5f600bafd20939899279f1dfa466f3f9aeb0ad9030dd603e5a196770a
+EBUILD libsdl2-2.0.14-r2.ebuild 6235 BLAKE2B a9b2f8f8bbc5566113b9ecf99e813213bbfd06b5cc13112cadc6db8de5f6025dc7773aaef0d10621deabad709382d335edb934f6ae79df248bfad97fbc965c74 SHA512 5d799b2bdaa0f0ed111c6ad429540a6fbf7cd77692610cd3577347314d371970452593521f4076de26e1800247b2f7df57535bc0f967228fed24e8830e3c7c67
+MISC metadata.xml 1951 BLAKE2B 4d14f24a1f7e5db8a4ff7d3197cd54931319c510fddf0da0113a1cb2fdfc8b8bd4d6415ee6f70c6bb6ae2055e18b9bfb511dd080aa26743ae0da05c2d1f26573 SHA512 68738817cbcc9fd12209ee8ff30029a58af736566a1f47b418bb08045c0a58d04be9b5ad496e5ad5ee5ab5f58369e187d408ec16f6f24e6288d22f45f2c4abbd
diff --git a/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild
index 80f626e5bab7..263553b6bc07 100644
--- a/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.14-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus fcitx4 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libsdl2/libsdl2-2.0.14-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.14-r2.ebuild
index e6a22bd2b6b1..50f6d8e1fe46 100644
--- a/media-libs/libsdl2/libsdl2-2.0.14-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.14-r2.ebuild
@@ -14,7 +14,7 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
+IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
 	alsa? ( sound )
 	fcitx4? ( dbus )
@@ -25,6 +25,7 @@ REQUIRED_USE="
 	nas? ( sound )
 	opengl? ( video )
 	pulseaudio? ( sound )
+	sndio? ( sound )
 	vulkan? ( video )
 	wayland? ( gles2 )
 	xinerama? ( X )
@@ -52,6 +53,7 @@ CDEPEND="
 		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
 	)
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
 	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
 	wayland? (
 		>=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}]
@@ -154,7 +156,7 @@ multilib_src_configure() {
 		$(use_enable libsamplerate)
 		$(use_enable nas)
 		--disable-nas-shared
-		--disable-sndio
+		$(use_enable sndio)
 		--disable-sndio-shared
 		$(use_enable sound diskaudio)
 		$(use_enable sound dummyaudio)
diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml
index a35fb97837a8..7c587dc6d2ec 100644
--- a/media-libs/libsdl2/metadata.xml
+++ b/media-libs/libsdl2/metadata.xml
@@ -31,6 +31,7 @@
 		<flag name="ibus">Enable support for <pkg>app-i18n/ibus</pkg></flag>
 		<flag name="joystick">Control joystick support (disable at your own risk)</flag>
 		<flag name="kms">Build the KMSDRM video driver</flag>
+		<flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
 		<flag name="sound">Control audio support (disable at your own risk)</flag>
 		<flag name="tslib">Build with tslib support for touchscreen devices</flag>
 		<flag name="video">Control video support (disable at your own risk)</flag>