QA: Rename "audio" USE flag to "sound", bug 357661.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

7 files changed, 59 insertions, 60 deletions

diff --git a/media-libs/libsdl2/ChangeLog b/media-libs/libsdl2/ChangeLog
index a85c14123f77..870d2334363d 100644
--- a/media-libs/libsdl2/ChangeLog
+++ b/media-libs/libsdl2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libsdl2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/ChangeLog,v 1.17 2014/05/13 23:00:18 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/ChangeLog,v 1.18 2014/05/15 12:34:42 ulm Exp $
+
+  15 May 2014; Ulrich Müller <ulm@gentoo.org> libsdl2-2.0.1-r1.ebuild,
+  libsdl2-2.0.2.ebuild, libsdl2-2.0.2-r1.ebuild, libsdl2-2.0.3.ebuild:
+  QA: Rename "audio" USE flag to "sound", bug 357661.
 
   13 May 2014; Julian Ospald <hasufell@gentoo.org> libsdl2-2.0.2-r1.ebuild,
   libsdl2-2.0.3.ebuild, +files/libsdl2-2.0.2-gles-wayland.patch,
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index e1492d0a10fe..8b1b72acc7a7 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -9,28 +9,23 @@ AUX libsdl2-2.0.3-static-libs.patch 4633 SHA256 aa3ce99668a0a504e22b8f4d6d225855
 DIST SDL2-2.0.1.tar.gz 3660224 SHA256 0ae7e902a26777614a011fe7053ca7e8b14843db3c42ca117564d208cf6732f0 SHA512 012125d72b6baa677c4c4d4747a058d7c0e406d84b21712fe538bd8ecfc1d74cbc0569ce25046a766266460c9e040d2f2c62ccc52fd6e371683999c95c314c33 WHIRLPOOL 353d2909e3738b13885b26d57f2d690ac55c4992650dba552b0ba17d35d4b04946828d76b621de69201aed1676be8dc7ce11bb4c72af95b96df0481fc3785084
 DIST SDL2-2.0.2.tar.gz 3812882 SHA256 590157f85a8a8b52723848169a74eec6ca07ab4a75cec15beedde648f980e850 SHA512 73f628a893d3e7efb2180783ab5ea0103e943dddbd4e0b2b7e1add5c2cf975c85179da6e09747ad1a9d8a25067d6fc9e4467927cf111762ae322600ab810a348 WHIRLPOOL 1e396f2621fbdb6bb10f06b5828271aad23ab5d5c07254ebeaf760cf1b170441ccc89db233749b4ac4fa7341e4204ba1cd705d08ed0490b07a1855d38aa08051
 DIST SDL2-2.0.3.tar.gz 3871267 SHA256 a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c SHA512 b6d2485154fbc07ab86a4305485e116d35fac25a97033b9e1c65ee0eb8251a18209cb1de3a914d9c0ddc53aa1ffac66c865b111d218e79eb5a10ed00dfec7540 WHIRLPOOL d88658953cb668b8d4167b799b4a2e9b90a426fddd0cdddb4914420063e5768c609c2b4a954b50c14cbc5728894646db6bad0e5244ef6a563d4e2ec3da26298b
-EBUILD libsdl2-2.0.1-r1.ebuild 3497 SHA256 b58f136902cb96dd79a0537a684dbd6a8e5d38c9a62a223ad6a1e4eb6e1e4761 SHA512 ccaadae89739986ee3b19ad3bed0e3cb319e2603cdbfcc47ec7d8be87b798b2c04dca813316942939a74ec97d63e1c729288a27a4f7b3b674064705acbe6c539 WHIRLPOOL a499471c4c9d3ab9ab0fa8049fd688d9f38343bed1416d8333b1e787c6f26f47d3876f1a29bc7539af0387757a3d0b514fa969bd1b8aefe13a8d3b8ed95942a2
-EBUILD libsdl2-2.0.2-r1.ebuild 4323 SHA256 4bd212a5a24891420d0506b83d22a3573ac0d58ba0a63170060c189de3f579af SHA512 7e1a07c36c7e173e5920ebe115b2ea1729f6325f80c384dcab8eb65f39b48bf245474f11f0ce39fab08fdac42cb103b679153a4fe9890573f4e952c01337325b WHIRLPOOL 62b9deebdc8091b4ba4c14aa09055f81d6f8740d68e4c718194b375a00354e3f48495229d7425860b0bb6bec319fe9fd70e348652ba53c12228c3f38f49f4eb0
-EBUILD libsdl2-2.0.2.ebuild 3494 SHA256 c999a442f19fb1818fdeb9323aa4f40483e85162f9f0c18ade8c5ecfde4cd257 SHA512 17cb93af4d94931c82d9529b12f29d61fd0df5a8bb9a56577e28c599166ec58edc7aa0a9241ad26833a44428c4a70f28f9c282e26fa627b4e26edbebbdeff21b WHIRLPOOL d50c84f900981b793dd1971b943499d33f8c63a740232ccd349e49e98c5ed78b7211b40663ab0dc11222b80affd901ac5f4f41659fbadf394476b9fab185724b
-EBUILD libsdl2-2.0.3.ebuild 4320 SHA256 a2f57d77c028c1bb4a9cc75e836651f80c661c87c5e3b2102c3b1530c1757680 SHA512 014b14bd68b49e92ac4a7bfdac9571a1b3f806008efa74cc6712672e6a2c51fb3bfcfbca411bf976250ae36512dd4cd84e1475f48f201430695d65a68d903d98 WHIRLPOOL bf5f91a747739bdedd6ff8e15d936cf39a59a6be7b87f3f7e6cac41fb473cf3921bea5b159ec1df81bb1c12138515b26fab26dbaf2409fc6e2a951e647afbd8d
-MISC ChangeLog 2968 SHA256 0d9c9e83c68813b2ff31bd49fd060bd5d21c833a0fde43bfa1846dcab1588b38 SHA512 01f9cb4949fa0df981bc5a8329a680690444f34f6683d23a484e15c5710fd2907741787b02f728145ef330231305f9873aa45084ba8be9bed021fb2ee943731c WHIRLPOOL bcfd2c2e7149847c04fb5683485ace6574270e458961a6c1abd5471f2b0163a3d50f87cefb80665c5e34bbd1279b4d72561b4c8d7fcfd998b4718d222099dfb0
-MISC metadata.xml 1532 SHA256 b0de84edcfbcf286934f7adf119917dcd138c0570d78b25286f25b3a2d110da9 SHA512 fe8e84981baee1567e80430a2352feffa03915864b871916c13cfec4fd734c12dd6d9195ed20da26e7985dcd39c55498d1f55ac0a5dd61c2d4100e6e964b5e79 WHIRLPOOL dfda175811d3dc27eadc3e7b61920c6257ad9e062626cd786adaf0a1c52ab283f8814feb85d0121bfd01ce52cab56f587c078b3d20aa1fc954a1986d176bb4aa
+EBUILD libsdl2-2.0.1-r1.ebuild 3498 SHA256 0c05adbe392d218db5ff6284826c735727c410bcf492272d351f95f0c2a7ab04 SHA512 b6aaff8063ec80af0c48b659c49b98046ee191823bc9f1558c4d0563ff505430cc037e5d22d420cf6b5e3d7522d4b76117eb9354ae6668408878cc73ddcf02d2 WHIRLPOOL af138602ebe17f4378a82a8ed53ecc13177206510546541fe93c3c2704e46e50f917b33001651870a5b9287951573c6e3b04b20b464afd26555a0a1ad1209db8
+EBUILD libsdl2-2.0.2-r1.ebuild 4324 SHA256 41f300491a4970113f5da3c8bf44f79401ff52ba30d9e99810e0d6fb42606569 SHA512 cedc357cdf3af5e786db8d35761db41d3365787209092fce564837620d96b8de9107bdf69378056775418b9772c6bfb7cd68b138509ac4547427493deae2d5e2 WHIRLPOOL 8065913b0881a95dad78d0f552ce8670c34fb1b6b825e745265164426228d1aa25bec63f72bd85a4f2b2cd263bef59e95a6ae6f30a9da81f639f18a1b5158011
+EBUILD libsdl2-2.0.2.ebuild 3495 SHA256 5045f7034307655eab3a933e139120564881696918dd5cfa8dfda8890f13fc0a SHA512 2f031675ed16b0bbb6925f4e89a97fc0441adcd0dc02c4bf929fa972de47be27f548ed4ca64830ca6ee2b3e7fb04a455b2390451a929d69e85c93351fafc7dbf WHIRLPOOL 6eaea69388f57aaf51a16fb28be0f7b533d63480632e7433146f816d8946299f366a8dcc9b4bfb3385e27523f5acd31a6f3d3bb78022fbf2f19c27631ea0dc28
+EBUILD libsdl2-2.0.3.ebuild 4321 SHA256 365666fabc695fb72f532368f11b3156423ae1fd6ae889d08e45263361394ed2 SHA512 5b79117f4fcc2751aa38ff0450adc0ba81b08c2ea02042a9414a398a068fdb32e2211d28bb92154a22240848c5b3d67f114b1c2011a2fd0027ec13f69ac5f7f6 WHIRLPOOL 0846079a5b326192ed50d9ea883985020431703e287de30bebf550deeb1f7128180f3164a107f7016d977d7630ec9f50c6cff81994ffb5696d0e1a775dd385d4
+MISC ChangeLog 3161 SHA256 083f702a0c8f6b2a445adec16cc8bd2c26650b3c01470dd5d55b5276d33c5a22 SHA512 c078580a045dd74b7da5174d370e357fd9ddddf8b1f944eead5ff8e1dc89ad5bbfe5d4c71acb357b5a9d90feb3daee4f5c1b92235dd1b33de007c3cb50c61906 WHIRLPOOL bdf7d80e122efd7b921e8448f67aecf88fec4205a13e5954ccf8aec72f6595c4e95ded227b05be08b3186135e2d3a18b5c060c42bd2403c8f073db98c5b4a13a
+MISC metadata.xml 1532 SHA256 ead452636f1a7a15434b332e243cadd8be1f9e85d980f5fb03a306f9d0e6d3e6 SHA512 a5a50d8e9ed9afd6b4408441f445eb65dc55ac24bcc4d5b6e9da8a1655981bf1fe5bd8e0c18b83e8b475f541596586050de312f03b2c0322772714fad687647c WHIRLPOOL 8a4c2b4c86a0b1dfc075200a7d96a2f23df1c402ba215fe3f6806af51b683f6e9ab77d3564a993f7fe6e533562af3f0e8af8f2f9984e8f926f8799ecde076fad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTcqQEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgEBgQAKdkiyWTLxQOASAN8u1F+mUS
-mDAG2lux201LCLCTwGSRELqMfw7rJiN9F3hddTICnxWyfOdHoHZVzPe3eOErO8YA
-oJDY3EB7P9aGbjQxo0mGtb0u8xau6L5w56SLG6PgrNGTPkcpsOth8PN9c1L+Tpve
-v/MyO4vmB97NBGGM8Is8UJEfYGHZZ+NylxPxU5Ek9cWYGATDjMEuvYA5xrxhBhYk
-8IpbIPrSY1TwV+jYMPWNrZtEFKrmS99vpkXDIThVlIhpkAiBz5mN/nNSAL8JUZ13
-w7ugqOhZ5uK7YEgdAA0L4w9VW67Oi8KQZNaEQYcW0X4qQupuAh6O8bcAvYR6ykdK
-cIkIAgtCsBF8zIyvnZ8RLmNzJeZBiC5SXttMV8qMyFvR+WmDE7ixgBE5i2N7OCAX
-TJbTKoFogecImuwSsH/RMk17s3hojezEcI2E52wVzCAgC40QZLv7PIErR4fUWD8m
-DVxj5c+zt8u99AE/1sMkRdJLjrADv+hNDfRy5PS1vYiIZFEMonbiSvh64YuF0G8F
-PI0wc3Mz59WQfgMUCB8Q3ezU/qzuR9yQ+6ODzok/tX0e3WOEvfu6NK6AdzNNDfSZ
-z1QdXaeg5bOmT3RTp/WzR79vEru8WOVVVOmJzvEvDrehOCoX+IeFtt2BjOnJ06dD
-G0HEbPbXN9REPcCPpLES
-=f9fa
+iQGcBAEBCAAGBQJTdLR7AAoJEJQzkH1pP7W43rIMAKp2SNMPougaKIbFaJwH1Fjw
+tLcZ4JKLm41pBmyOm9cPCRz1ebTwSlIPGdLVjrSzspIO5qIJh70BXWzCfj1hB043
+ewQGC7Lok2eJtgDy8w0AJq2vmLC9ABib0VHaf/SKXjUO3SIcrG2LpIPcKwSMEGHG
+m/7wN8KFzJBKap6U5UUlfO78QD799jGii+R1ltUugE+hDdOmt6Pv/NogSoY4PN0U
+UdV2EhNStdnGrbrxmzQ8NElKjdRBISUuWzFE0NuMFU7Lp48vcSaDaJgwOx17zo2N
+8OIF4DvBjNVRKtQIWLR+dSXntctgXTtbedXiDzjzDBDrHe0TGl/fWeyFAF9lmAN6
+MerEWpuqJdAE/r9V0wVsuMQ/ilwFySqgNL0o6rRwvue2ldCFNyxIgdgPJvzIKGvq
+yKs7MaXORJ2vurDGesPX1pU7CoGdRfXDd5R6IvbCr8hhhcODnBRLr2dgWgJfXIyp
+lvxYBEeL5zbCV24wsF8fJvWs5IGa76UuC22aOXVwEg==
+=w+QG
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsdl2/libsdl2-2.0.1-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.1-r1.ebuild
index d0d966f58dcf..91d3c08bb9a3 100644
--- a/media-libs/libsdl2/libsdl2-2.0.1-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.1-r1.ebuild,v 1.4 2014/04/05 15:59:09 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.1-r1.ebuild,v 1.5 2014/05/15 12:34:42 ulm Exp $
 
 EAPI=5
 inherit autotools flag-o-matic toolchain-funcs eutils
@@ -14,14 +14,14 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="3dnow alsa altivec +audio custom-cflags dbus fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib udev +video X xinerama xscreensaver"
+IUSE="3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio +sound sse sse2 static-libs +threads tslib udev +video X xinerama xscreensaver"
 REQUIRED_USE="
-	alsa? ( audio )
-	fusionsound? ( audio )
+	alsa? ( sound )
+	fusionsound? ( sound )
 	gles? ( video )
-	nas? ( audio )
+	nas? ( sound )
 	opengl? ( video )
-	pulseaudio? ( audio )
+	pulseaudio? ( sound )
 	xinerama? ( X )
 	xscreensaver? ( X )"
 
@@ -67,7 +67,7 @@ src_configure() {
 	# sorted by `./configure --help`
 	econf \
 		$(use_enable static-libs static) \
-		$(use_enable audio) \
+		$(use_enable sound audio) \
 		$(use_enable video) \
 		--enable-render \
 		--enable-events \
@@ -98,8 +98,8 @@ src_configure() {
 		--disable-nas-shared \
 		--disable-sndio \
 		--disable-sndio-shared \
-		$(use_enable audio diskaudio) \
-		$(use_enable audio dummyaudio) \
+		$(use_enable sound diskaudio) \
+		$(use_enable sound dummyaudio) \
 		$(use_enable X video-x11) \
 		--disable-x11-shared \
 		$(use_enable X video-x11-xcursor) \
diff --git a/media-libs/libsdl2/libsdl2-2.0.2-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.2-r1.ebuild
index 114bc4a17da9..4ea33c562708 100644
--- a/media-libs/libsdl2/libsdl2-2.0.2-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.2-r1.ebuild,v 1.5 2014/05/13 23:00:18 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.2-r1.ebuild,v 1.6 2014/05/15 12:34:42 ulm Exp $
 
 # TODO: convert FusionSound #484250
 
@@ -16,14 +16,14 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="3dnow alsa altivec +audio custom-cflags dbus fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
+IUSE="3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio +sound sse sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
 REQUIRED_USE="
-	alsa? ( audio )
-	fusionsound? ( audio )
+	alsa? ( sound )
+	fusionsound? ( sound )
 	gles? ( video )
-	nas? ( audio )
+	nas? ( sound )
 	opengl? ( video )
-	pulseaudio? ( audio )
+	pulseaudio? ( sound )
 	xinerama? ( X )
 	xscreensaver? ( X )"
 
@@ -78,7 +78,7 @@ multilib_src_configure() {
 	# sorted by `./configure --help`
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable static-libs static) \
-		$(use_enable audio) \
+		$(use_enable sound audio) \
 		$(use_enable video) \
 		--enable-render \
 		--enable-events \
@@ -109,8 +109,8 @@ multilib_src_configure() {
 		--disable-nas-shared \
 		--disable-sndio \
 		--disable-sndio-shared \
-		$(use_enable audio diskaudio) \
-		$(use_enable audio dummyaudio) \
+		$(use_enable sound diskaudio) \
+		$(use_enable sound dummyaudio) \
 		$(use_enable X video-x11) \
 		--disable-x11-shared \
 		$(use_enable wayland video-wayland) \
diff --git a/media-libs/libsdl2/libsdl2-2.0.2.ebuild b/media-libs/libsdl2/libsdl2-2.0.2.ebuild
index 0db26c3ded82..435b84099cb7 100644
--- a/media-libs/libsdl2/libsdl2-2.0.2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.2.ebuild,v 1.3 2014/04/05 15:59:09 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.2.ebuild,v 1.4 2014/05/15 12:34:42 ulm Exp $
 
 EAPI=5
 inherit autotools flag-o-matic toolchain-funcs eutils
@@ -14,14 +14,14 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="3dnow alsa altivec +audio custom-cflags dbus fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib udev +video X xinerama xscreensaver"
+IUSE="3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio +sound sse sse2 static-libs +threads tslib udev +video X xinerama xscreensaver"
 REQUIRED_USE="
-	alsa? ( audio )
-	fusionsound? ( audio )
+	alsa? ( sound )
+	fusionsound? ( sound )
 	gles? ( video )
-	nas? ( audio )
+	nas? ( sound )
 	opengl? ( video )
-	pulseaudio? ( audio )
+	pulseaudio? ( sound )
 	xinerama? ( X )
 	xscreensaver? ( X )"
 
@@ -67,7 +67,7 @@ src_configure() {
 	# sorted by `./configure --help`
 	econf \
 		$(use_enable static-libs static) \
-		$(use_enable audio) \
+		$(use_enable sound audio) \
 		$(use_enable video) \
 		--enable-render \
 		--enable-events \
@@ -98,8 +98,8 @@ src_configure() {
 		--disable-nas-shared \
 		--disable-sndio \
 		--disable-sndio-shared \
-		$(use_enable audio diskaudio) \
-		$(use_enable audio dummyaudio) \
+		$(use_enable sound diskaudio) \
+		$(use_enable sound dummyaudio) \
 		$(use_enable X video-x11) \
 		--disable-x11-shared \
 		$(use_enable X video-x11-xcursor) \
diff --git a/media-libs/libsdl2/libsdl2-2.0.3.ebuild b/media-libs/libsdl2/libsdl2-2.0.3.ebuild
index d2c59dd2d6e7..b17f2929491e 100644
--- a/media-libs/libsdl2/libsdl2-2.0.3.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.3.ebuild,v 1.2 2014/05/13 23:00:18 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.3.ebuild,v 1.3 2014/05/15 12:34:42 ulm Exp $
 
 # TODO: convert FusionSound #484250
 
@@ -16,14 +16,14 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="3dnow alsa altivec +audio custom-cflags dbus fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
+IUSE="3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio +sound sse sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
 REQUIRED_USE="
-	alsa? ( audio )
-	fusionsound? ( audio )
+	alsa? ( sound )
+	fusionsound? ( sound )
 	gles? ( video )
-	nas? ( audio )
+	nas? ( sound )
 	opengl? ( video )
-	pulseaudio? ( audio )
+	pulseaudio? ( sound )
 	xinerama? ( X )
 	xscreensaver? ( X )"
 
@@ -78,7 +78,7 @@ multilib_src_configure() {
 	# sorted by `./configure --help`
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable static-libs static) \
-		$(use_enable audio) \
+		$(use_enable sound audio) \
 		$(use_enable video) \
 		--enable-render \
 		--enable-events \
@@ -109,8 +109,8 @@ multilib_src_configure() {
 		--disable-nas-shared \
 		--disable-sndio \
 		--disable-sndio-shared \
-		$(use_enable audio diskaudio) \
-		$(use_enable audio dummyaudio) \
+		$(use_enable sound diskaudio) \
+		$(use_enable sound dummyaudio) \
 		$(use_enable X video-x11) \
 		--disable-x11-shared \
 		$(use_enable wayland video-wayland) \
diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml
index 78ca1ace025e..008e512a52c7 100644
--- a/media-libs/libsdl2/metadata.xml
+++ b/media-libs/libsdl2/metadata.xml
@@ -21,14 +21,14 @@
 		Perl, PHP, Pike, Python, and Ruby.
 	</longdescription>
 	<use>
-		<flag name="audio">Control audio support (disable at your own risk)
-		</flag>
 		<flag name="fusionsound">use FusionSound audio driver</flag>
 		<flag name="gles">include OpenGL ES support</flag>
 		<flag name="haptic">Enable the haptic (force feedback) subsystem
 		</flag>
 		<flag name="joystick">Control joystick support
 			  (disable at your own risk)</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)