Switch USE=noflagstrip to common USE=custom-cflags.

(Portage version: 2.1.4_rc11)

5 files changed, 29 insertions, 25 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 67a348b643a1..b23245adc1f4 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.136 2007/10/21 00:34:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.137 2007/12/30 00:25:20 vapier Exp $
+
+  30 Dec 2007; Mike Frysinger <vapier@gentoo.org> libsdl-1.2.11.ebuild,
+  libsdl-1.2.11-r1.ebuild, libsdl-1.2.11-r2.ebuild, libsdl-1.2.12.ebuild:
+  Switch USE=noflagstrip to common USE=custom-cflags.
 
   21 Oct 2007; Michael Sterrett <mr_bones_@gentoo.org>
   +files/libsdl-1.2.12-c90-comments.patch, libsdl-1.2.12.ebuild:
diff --git a/media-libs/libsdl/libsdl-1.2.11-r1.ebuild b/media-libs/libsdl/libsdl-1.2.11-r1.ebuild
index 563289a71ec2..e852acc09528 100644
--- a/media-libs/libsdl/libsdl-1.2.11-r1.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11-r1.ebuild,v 1.6 2007/03/20 02:50:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11-r1.ebuild,v 1.7 2007/12/30 00:25:20 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils libtool
 
@@ -12,10 +12,10 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd"
 # WARNING:
-# if you have the noaudio, novideo, nojoystick, or noflagstrip use flags
+# if you have the noaudio, novideo, nojoystick, or custom-cflags use flags
 # in USE and something breaks, you pick up the pieces.  Be prepared for
 # bug reports to be marked INVALID.
-IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca noaudio novideo nojoystick noflagstrip"
+IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca noaudio novideo nojoystick custom-cflags"
 
 RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
 	alsa? ( media-libs/alsa-lib )
@@ -59,10 +59,10 @@ pkg_setup() {
 		ewarn "you're doing to selectively turn off parts of libsdl."
 		epause 30
 	fi
-	if use noflagstrip ; then
+	if use custom-cflags ; then
 		ewarn "Since you've chosen to use possibly unsafe CFLAGS,"
 		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
-		ewarn "libsdl without the noflagstrip use flag in USE."
+		ewarn "libsdl without the custom-cflags use flag in USE."
 		epause 10
 	fi
 }
@@ -108,7 +108,7 @@ src_compile() {
 	else
 		myconf="${myconf} --enable-nasm"
 	fi
-	use noflagstrip || strip-flags
+	use custom-cflags || strip-flags
 	use noaudio && myconf="${myconf} --disable-audio"
 	use novideo \
 		&& myconf="${myconf} --disable-video" \
diff --git a/media-libs/libsdl/libsdl-1.2.11-r2.ebuild b/media-libs/libsdl/libsdl-1.2.11-r2.ebuild
index 4d05f2c112ba..57d094d68a61 100644
--- a/media-libs/libsdl/libsdl-1.2.11-r2.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11-r2.ebuild,v 1.11 2007/12/10 23:05:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11-r2.ebuild,v 1.12 2007/12/30 00:25:20 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils libtool
 
@@ -12,10 +12,10 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 # WARNING:
-# if you have the noaudio, novideo, nojoystick, or noflagstrip use flags
+# if you have the noaudio, novideo, nojoystick, or custom-cflags use flags
 # in USE and something breaks, you pick up the pieces.  Be prepared for
 # bug reports to be marked INVALID.
-IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca noaudio novideo nojoystick noflagstrip"
+IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca noaudio novideo nojoystick custom-cflags"
 
 RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
 	alsa? ( media-libs/alsa-lib )
@@ -60,10 +60,10 @@ pkg_setup() {
 		ewarn "you're doing to selectively turn off parts of libsdl."
 		epause 30
 	fi
-	if use noflagstrip ; then
+	if use custom-cflags ; then
 		ewarn "Since you've chosen to use possibly unsafe CFLAGS,"
 		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
-		ewarn "libsdl without the noflagstrip use flag in USE."
+		ewarn "libsdl without the custom-cflags use flag in USE."
 		epause 10
 	fi
 }
@@ -110,7 +110,7 @@ src_compile() {
 	else
 		myconf="${myconf} --enable-nasm"
 	fi
-	use noflagstrip || strip-flags
+	use custom-cflags || strip-flags
 	use noaudio && myconf="${myconf} --disable-audio"
 	use novideo \
 		&& myconf="${myconf} --disable-video" \
diff --git a/media-libs/libsdl/libsdl-1.2.11.ebuild b/media-libs/libsdl/libsdl-1.2.11.ebuild
index 2fb23d31e25c..26980c0bb608 100644
--- a/media-libs/libsdl/libsdl-1.2.11.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11.ebuild,v 1.22 2007/03/20 02:50:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11.ebuild,v 1.23 2007/12/30 00:25:20 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils libtool
 
@@ -12,10 +12,10 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 # WARNING:
-# if you have the noaudio, novideo, nojoystick, or noflagstrip use flags
+# if you have the noaudio, novideo, nojoystick, or custom-cflags use flags
 # in USE and something breaks, you pick up the pieces.  Be prepared for
 # bug reports to be marked INVALID.
-IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca noaudio novideo nojoystick noflagstrip"
+IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca noaudio novideo nojoystick custom-cflags"
 
 RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
 	alsa? ( media-libs/alsa-lib )
@@ -59,10 +59,10 @@ pkg_setup() {
 		ewarn "you're doing to selectively turn off parts of libsdl."
 		epause 30
 	fi
-	if use noflagstrip ; then
+	if use custom-cflags ; then
 		ewarn "Since you've chosen to use possibly unsafe CFLAGS,"
 		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
-		ewarn "libsdl without the noflagstrip use flag in USE."
+		ewarn "libsdl without the custom-cflags use flag in USE."
 		epause 10
 	fi
 }
@@ -106,7 +106,7 @@ src_compile() {
 	else
 		myconf="${myconf} $(use_enable x86 nasm)"
 	fi
-	use noflagstrip || strip-flags
+	use custom-cflags || strip-flags
 	use noaudio && myconf="${myconf} --disable-audio"
 	use novideo \
 		&& myconf="${myconf} --disable-video" \
diff --git a/media-libs/libsdl/libsdl-1.2.12.ebuild b/media-libs/libsdl/libsdl-1.2.12.ebuild
index 2803420f5810..2c212bd08a9b 100644
--- a/media-libs/libsdl/libsdl-1.2.12.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.12.ebuild,v 1.3 2007/12/10 23:05:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.12.ebuild,v 1.4 2007/12/30 00:25:20 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils libtool
 
@@ -12,10 +12,10 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 # WARNING:
-# if you have the noaudio, novideo, nojoystick, or noflagstrip use flags
+# if you have the noaudio, novideo, nojoystick, or custom-cflags use flags
 # in USE and something breaks, you pick up the pieces.  Be prepared for
 # bug reports to be marked INVALID.
-IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca noaudio novideo nojoystick noflagstrip"
+IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca noaudio novideo nojoystick custom-cflags"
 
 RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
 	alsa? ( media-libs/alsa-lib )
@@ -60,10 +60,10 @@ pkg_setup() {
 		ewarn "you're doing to selectively turn off parts of libsdl."
 		epause 30
 	fi
-	if use noflagstrip ; then
+	if use custom-cflags ; then
 		ewarn "Since you've chosen to use possibly unsafe CFLAGS,"
 		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
-		ewarn "libsdl without the noflagstrip use flag in USE."
+		ewarn "libsdl without the custom-cflags use flag in USE."
 		epause 10
 	fi
 }
@@ -88,7 +88,7 @@ src_compile() {
 	else
 		myconf="${myconf} --enable-nasm"
 	fi
-	use noflagstrip || strip-flags
+	use custom-cflags || strip-flags
 	use noaudio && myconf="${myconf} --disable-audio"
 	use novideo \
 		&& myconf="${myconf} --disable-video" \