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

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

7 files changed, 33 insertions, 28 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 6d802a4d7b88..beee4f2d88e8 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.215 2014/04/30 13:43:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.216 2014/05/15 16:15:03 ulm Exp $
+
+  15 May 2014; Ulrich Müller <ulm@gentoo.org> libsdl-1.2.14-r6.ebuild,
+  libsdl-1.2.15-r2.ebuild, libsdl-1.2.15-r3.ebuild, libsdl-1.2.15-r4.ebuild,
+  libsdl-1.2.15-r5.ebuild, metadata.xml:
+  QA: Rename "audio" USE flag to "sound", bug 357661.
 
   30 Apr 2014; Michał Górny <mgorny@gentoo.org> libsdl-1.2.15-r5.ebuild:
   Fix typo in function name.
diff --git a/media-libs/libsdl/libsdl-1.2.14-r6.ebuild b/media-libs/libsdl/libsdl-1.2.14-r6.ebuild
index 7f130412deec..c295188c7755 100644
--- a/media-libs/libsdl/libsdl-1.2.14-r6.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.14-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.14-r6.ebuild,v 1.6 2011/05/22 23:59:29 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.14-r6.ebuild,v 1.7 2014/05/15 16:15:03 ulm Exp $
 
 EAPI=2
 inherit flag-o-matic multilib toolchain-funcs eutils libtool
@@ -13,12 +13,12 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 # WARNING:
-# if you disable the audio, video, joystick use flags or turn on the custom-cflags use flag
+# if you disable the sound, video, joystick use flags or turn on the custom-cflags use flag
 # in USE and something breaks, you pick up the pieces.  Be prepared for
 # bug reports to be marked INVALID.
-IUSE="oss alsa nas X dga xv xinerama fbcon directfb ggi svga tslib aalib opengl libcaca +audio +video +joystick custom-cflags pulseaudio ps3 static-libs"
+IUSE="oss alsa nas X dga xv xinerama fbcon directfb ggi svga tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio ps3 static-libs"
 
-RDEPEND="audio? ( >=media-libs/audiofile-0.1.9 )
+RDEPEND="sound? ( >=media-libs/audiofile-0.1.9 )
 	alsa? ( media-libs/alsa-lib )
 	nas? (
 		media-libs/nas
@@ -55,10 +55,10 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/SDL-${PV}
 
 pkg_setup() {
-	if use !audio || use !video || use !joystick ; then
+	if use !sound || use !video || use !joystick ; then
 		ewarn "Since you've chosen to turn off some of libsdl's functionality,"
 		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
-		ewarn "libsdl with the audio, video, and joystick flags in USE."
+		ewarn "libsdl with the sound, video, and joystick flags in USE."
 		ewarn "You need to know what you're doing to selectively turn off parts of libsdl."
 		epause 30
 	fi
@@ -88,7 +88,7 @@ src_configure() {
 		myconf="${myconf} --enable-nasm"
 	fi
 	use custom-cflags || strip-flags
-	use audio || myconf="${myconf} --disable-audio"
+	use sound || myconf="${myconf} --disable-audio"
 	use video \
 		&& myconf="${myconf} --enable-video-dummy" \
 		|| myconf="${myconf} --disable-video"
diff --git a/media-libs/libsdl/libsdl-1.2.15-r2.ebuild b/media-libs/libsdl/libsdl-1.2.15-r2.ebuild
index c62ebd707b18..86ed5b5c53d5 100644
--- a/media-libs/libsdl/libsdl-1.2.15-r2.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r2.ebuild,v 1.9 2012/08/27 17:40:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r2.ebuild,v 1.10 2014/05/15 16:15:03 ulm Exp $
 
 EAPI=2
 inherit flag-o-matic multilib toolchain-funcs eutils libtool
@@ -15,9 +15,9 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x8
 # WARNING:
 # If you turn on the custom-cflags use flag in USE and something breaks,
 # you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
-IUSE="oss alsa nas X dga xv xinerama fbcon directfb ggi svga tslib aalib opengl libcaca +audio +video +joystick custom-cflags pulseaudio ps3 static-libs"
+IUSE="oss alsa nas X dga xv xinerama fbcon directfb ggi svga tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio ps3 static-libs"
 
-RDEPEND="audio? ( >=media-libs/audiofile-0.1.9 )
+RDEPEND="sound? ( >=media-libs/audiofile-0.1.9 )
 	alsa? ( media-libs/alsa-lib )
 	nas? (
 		media-libs/nas
@@ -79,7 +79,7 @@ src_configure() {
 		myconf="${myconf} --enable-nasm"
 	fi
 	use custom-cflags || strip-flags
-	use audio || myconf="${myconf} --disable-audio"
+	use sound || myconf="${myconf} --disable-audio"
 	use video \
 		&& myconf="${myconf} --enable-video-dummy" \
 		|| myconf="${myconf} --disable-video"
diff --git a/media-libs/libsdl/libsdl-1.2.15-r3.ebuild b/media-libs/libsdl/libsdl-1.2.15-r3.ebuild
index bbbe59a512be..fa562441580b 100644
--- a/media-libs/libsdl/libsdl-1.2.15-r3.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r3.ebuild,v 1.1 2013/05/10 06:20:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r3.ebuild,v 1.2 2014/05/15 16:15:03 ulm Exp $
 
 EAPI=2
 inherit flag-o-matic multilib toolchain-funcs eutils libtool
@@ -15,9 +15,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6
 # WARNING:
 # If you turn on the custom-cflags use flag in USE and something breaks,
 # you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
-IUSE="oss alsa nas X dga xv xinerama fbcon directfb ggi svga tslib aalib opengl libcaca +audio +video +joystick custom-cflags pulseaudio ps3 static-libs"
+IUSE="oss alsa nas X dga xv xinerama fbcon directfb ggi svga tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio ps3 static-libs"
 
-RDEPEND="audio? ( >=media-libs/audiofile-0.1.9 )
+RDEPEND="sound? ( >=media-libs/audiofile-0.1.9 )
 	alsa? ( media-libs/alsa-lib )
 	nas? (
 		media-libs/nas
@@ -80,7 +80,7 @@ src_configure() {
 		myconf="${myconf} --enable-nasm"
 	fi
 	use custom-cflags || strip-flags
-	use audio || myconf="${myconf} --disable-audio"
+	use sound || myconf="${myconf} --disable-audio"
 	use video \
 		&& myconf="${myconf} --enable-video-dummy" \
 		|| myconf="${myconf} --disable-video"
diff --git a/media-libs/libsdl/libsdl-1.2.15-r4.ebuild b/media-libs/libsdl/libsdl-1.2.15-r4.ebuild
index f6718d5e4021..472aa576f54e 100644
--- a/media-libs/libsdl/libsdl-1.2.15-r4.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r4.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/libsdl/libsdl-1.2.15-r4.ebuild,v 1.11 2014/01/15 09:20:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r4.ebuild,v 1.12 2014/05/15 16:15:03 ulm Exp $
 
 EAPI=5
 inherit autotools flag-o-matic multilib toolchain-funcs eutils
@@ -15,9 +15,9 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x
 # WARNING:
 # If you turn on the custom-cflags use flag in USE and something breaks,
 # you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
-IUSE="oss alsa nas X dga xv xinerama fbcon directfb ggi svga tslib aalib opengl libcaca +audio +video +joystick custom-cflags pulseaudio ps3 static-libs"
+IUSE="oss alsa nas X dga xv xinerama fbcon directfb ggi svga tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio ps3 static-libs"
 
-RDEPEND="audio? ( >=media-libs/audiofile-0.1.9 )
+RDEPEND="sound? ( >=media-libs/audiofile-0.1.9 )
 	alsa? ( media-libs/alsa-lib )
 	nas? (
 		media-libs/nas
@@ -79,7 +79,7 @@ src_configure() {
 		myconf="${myconf} --enable-nasm"
 	fi
 	use custom-cflags || strip-flags
-	use audio || myconf="${myconf} --disable-audio"
+	use sound || myconf="${myconf} --disable-audio"
 	use video \
 		&& myconf="${myconf} --enable-video-dummy" \
 		|| myconf="${myconf} --disable-video"
diff --git a/media-libs/libsdl/libsdl-1.2.15-r5.ebuild b/media-libs/libsdl/libsdl-1.2.15-r5.ebuild
index 4b15112088ff..50e8038db79b 100644
--- a/media-libs/libsdl/libsdl-1.2.15-r5.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r5.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/libsdl/libsdl-1.2.15-r5.ebuild,v 1.3 2014/04/30 13:43:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r5.ebuild,v 1.4 2014/05/15 16:15:03 ulm Exp $
 
 # TODO: convert media-libs/libggi to multilib
 
@@ -17,14 +17,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6
 # WARNING:
 # If you turn on the custom-cflags use flag in USE and something breaks,
 # you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
-IUSE="oss alsa nas X dga xv xinerama fbcon ggi svga tslib aalib opengl libcaca +audio +video +joystick custom-cflags pulseaudio ps3 static-libs"
+IUSE="oss alsa nas X dga xv xinerama fbcon ggi svga tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio ps3 static-libs"
 
 RDEPEND="
 	abi_x86_32? (
 		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
 		!<=app-emulation/emul-linux-x86-sdl-20140406
 	)
-	audio? ( >=media-libs/audiofile-0.1.9[${MULTILIB_USEDEP}] )
+	sound? ( >=media-libs/audiofile-0.1.9[${MULTILIB_USEDEP}] )
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
 	nas? (
 		media-libs/nas[${MULTILIB_USEDEP}]
@@ -98,7 +98,7 @@ multilib_src_configure() {
 		myconf="${myconf} --enable-nasm"
 	fi
 	use custom-cflags || strip-flags
-	use audio || myconf="${myconf} --disable-audio"
+	use sound || myconf="${myconf} --disable-audio"
 	use video \
 		&& myconf="${myconf} --enable-video-dummy" \
 		|| myconf="${myconf} --disable-video"
diff --git a/media-libs/libsdl/metadata.xml b/media-libs/libsdl/metadata.xml
index 0ee2113934ce..105966b483da 100644
--- a/media-libs/libsdl/metadata.xml
+++ b/media-libs/libsdl/metadata.xml
@@ -19,9 +19,9 @@ several other languages, including Ada, Eiffel, Java, Lua, ML, Perl,
 PHP, Pike, Python, and Ruby.
 </longdescription>
   <use>
-	<flag name="audio">Control audio support (disable at your own risk)</flag>
 	<flag name="joystick">Control joystick support (disable at your own risk)</flag>
 	<flag name="ps3">Build the PS3 video driver</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>
   </use>