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

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

6 files changed, 43 insertions, 39 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/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)