Add USE=custom-flags and restore strip-flags #257038 by Mr. Bones.

(Portage version: 2.2_rc54/cvs/Linux x86_64)

39 files changed, 150 insertions, 127 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 3971fce86111..dbaaaa5ed5ca 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.284 2009/11/15 02:00:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.285 2009/12/03 03:04:41 vapier Exp $
+
+  03 Dec 2009; Mike Frysinger <vapier@gentoo.org> wine-1.0.ebuild,
+  wine-1.0.1.ebuild, wine-1.1.0.ebuild, wine-1.1.1.ebuild,
+  wine-1.1.2.ebuild, wine-1.1.3.ebuild, wine-1.1.4.ebuild,
+  wine-1.1.5.ebuild, wine-1.1.6.ebuild, wine-1.1.7.ebuild,
+  wine-1.1.8.ebuild, wine-1.1.9.ebuild, wine-1.1.10.ebuild,
+  wine-1.1.11.ebuild, wine-1.1.12.ebuild, wine-1.1.13.ebuild,
+  wine-1.1.14.ebuild, wine-1.1.15.ebuild, wine-1.1.16.ebuild,
+  wine-1.1.17.ebuild, wine-1.1.18.ebuild, wine-1.1.19.ebuild,
+  wine-1.1.20.ebuild, wine-1.1.21.ebuild, wine-1.1.22.ebuild,
+  wine-1.1.23.ebuild, wine-1.1.24.ebuild, wine-1.1.25.ebuild,
+  wine-1.1.26.ebuild, wine-1.1.27.ebuild, wine-1.1.28.ebuild,
+  wine-1.1.29.ebuild, wine-1.1.30.ebuild, wine-1.1.31.ebuild,
+  wine-1.1.32.ebuild, wine-1.1.33.ebuild, wine-9999.ebuild, metadata.xml:
+  Add USE=custom-flags and restore strip-flags #257038 by Mr. Bones.
 
 *wine-1.1.33 (15 Nov 2009)
 
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index 9a8f34e589d6..6b6db189825e 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -9,6 +9,7 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
 </longdescription> 
 <use>
 	<flag name='capi'>Enable ISDN support via CAPI</flag>
+	<flag name='custom-cflags'>Bypass strip-flags; use are your own peril</flag>
 	<flag name='gecko'>Add support for the Gecko engine when using iexplore</flag>
 	<flag name='perl'>Install helpers written in perl (winedump/winemaker)</flag>
 	<flag name='samba'>Add support for NTLM auth. see
diff --git a/app-emulation/wine/wine-1.0.1.ebuild b/app-emulation/wine/wine-1.0.1.ebuild
index a9f66807d84c..edf6ce31c3c5 100644
--- a/app-emulation/wine/wine-1.0.1.ebuild
+++ b/app-emulation/wine/wine-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.0.1.ebuild,v 1.3 2009/08/26 21:57:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.0.1.ebuild,v 1.4 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="1"
 
@@ -24,7 +24,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="alsa cups dbus esd +gecko hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
+IUSE="alsa cups custom-cflags dbus esd +gecko hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -120,8 +120,7 @@ src_compile() {
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
 	config_cache lcms lcms.h
 
-	strip-flags
-
+	use custom-cflags || strip-flags
 	use amd64 && multilib_toolchain_setup x86
 
 	#	$(use_enable amd64 win64)
diff --git a/app-emulation/wine/wine-1.0.ebuild b/app-emulation/wine/wine-1.0.ebuild
index 81e3943c7175..23d9fb884ece 100644
--- a/app-emulation/wine/wine-1.0.ebuild
+++ b/app-emulation/wine/wine-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.0.ebuild,v 1.4 2009/08/26 21:57:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.0.ebuild,v 1.5 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="1"
 
@@ -24,7 +24,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="alsa cups dbus esd +gecko hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
+IUSE="alsa cups custom-cflags dbus esd +gecko hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -120,8 +120,7 @@ src_compile() {
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
 	config_cache lcms lcms.h
 
-	strip-flags
-
+	use custom-cflags || strip-flags
 	use amd64 && multilib_toolchain_setup x86
 
 	#	$(use_enable amd64 win64)
diff --git a/app-emulation/wine/wine-1.1.0.ebuild b/app-emulation/wine/wine-1.1.0.ebuild
index c26d058c4cbb..530071b2e8ce 100644
--- a/app-emulation/wine/wine-1.1.0.ebuild
+++ b/app-emulation/wine/wine-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.0.ebuild,v 1.6 2009/08/26 21:57:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.0.ebuild,v 1.7 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="1"
 
@@ -24,7 +24,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="alsa cups dbus esd +gecko hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
+IUSE="alsa cups custom-cflags dbus esd +gecko hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -120,8 +120,7 @@ src_compile() {
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
 	config_cache lcms lcms.h
 
-	strip-flags
-
+	use custom-cflags || strip-flags
 	use amd64 && multilib_toolchain_setup x86
 
 	#	$(use_enable amd64 win64)
diff --git a/app-emulation/wine/wine-1.1.1.ebuild b/app-emulation/wine/wine-1.1.1.ebuild
index 9f2df7424011..d7259ff46716 100644
--- a/app-emulation/wine/wine-1.1.1.ebuild
+++ b/app-emulation/wine/wine-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.1.ebuild,v 1.5 2009/08/26 21:57:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.1.ebuild,v 1.6 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="1"
 
@@ -24,7 +24,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="alsa cups dbus esd +gecko hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
+IUSE="alsa cups custom-cflags dbus esd +gecko hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -120,8 +120,7 @@ src_compile() {
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
 	config_cache lcms lcms.h
 
-	strip-flags
-
+	use custom-cflags || strip-flags
 	use amd64 && multilib_toolchain_setup x86
 
 	#	$(use_enable amd64 win64)
diff --git a/app-emulation/wine/wine-1.1.10.ebuild b/app-emulation/wine/wine-1.1.10.ebuild
index 08adbe325481..8ff8954d5f46 100644
--- a/app-emulation/wine/wine-1.1.10.ebuild
+++ b/app-emulation/wine/wine-1.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.10.ebuild,v 1.4 2009/08/26 21:57:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.10.ebuild,v 1.5 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="1"
 
@@ -24,7 +24,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -121,8 +121,7 @@ src_compile() {
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
 	config_cache lcms lcms.h
 
-	strip-flags
-
+	use custom-cflags || strip-flags
 	use amd64 && multilib_toolchain_setup x86
 
 	#	$(use_enable amd64 win64)
diff --git a/app-emulation/wine/wine-1.1.11.ebuild b/app-emulation/wine/wine-1.1.11.ebuild
index 3ca6d0dc8748..3cfd0d9c7d43 100644
--- a/app-emulation/wine/wine-1.1.11.ebuild
+++ b/app-emulation/wine/wine-1.1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.11.ebuild,v 1.4 2009/08/26 21:57:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.11.ebuild,v 1.5 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="1"
 
@@ -24,7 +24,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -121,8 +121,7 @@ src_compile() {
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
 	config_cache lcms lcms.h
 
-	strip-flags
-
+	use custom-cflags || strip-flags
 	use amd64 && multilib_toolchain_setup x86
 
 	#	$(use_enable amd64 win64)
diff --git a/app-emulation/wine/wine-1.1.12.ebuild b/app-emulation/wine/wine-1.1.12.ebuild
index 880368d15432..3a4f377dd3a7 100644
--- a/app-emulation/wine/wine-1.1.12.ebuild
+++ b/app-emulation/wine/wine-1.1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.12.ebuild,v 1.4 2009/08/26 21:57:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.12.ebuild,v 1.5 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="1"
 
@@ -25,7 +25,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -122,8 +122,7 @@ src_compile() {
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
 	config_cache lcms lcms.h
 
-	strip-flags
-
+	use custom-cflags || strip-flags
 	use amd64 && multilib_toolchain_setup x86
 
 	#	$(use_enable amd64 win64)
diff --git a/app-emulation/wine/wine-1.1.13.ebuild b/app-emulation/wine/wine-1.1.13.ebuild
index 8b12f6c1c083..2fb37c3334b4 100644
--- a/app-emulation/wine/wine-1.1.13.ebuild
+++ b/app-emulation/wine/wine-1.1.13.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.13.ebuild,v 1.15 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.13.ebuild,v 1.16 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -94,6 +94,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	# XXX: should check out these flags too:
diff --git a/app-emulation/wine/wine-1.1.14.ebuild b/app-emulation/wine/wine-1.1.14.ebuild
index a71663ce68ff..f25b51772be4 100644
--- a/app-emulation/wine/wine-1.1.14.ebuild
+++ b/app-emulation/wine/wine-1.1.14.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.14.ebuild,v 1.10 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.14.ebuild,v 1.11 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -94,6 +94,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	# XXX: should check out these flags too:
diff --git a/app-emulation/wine/wine-1.1.15.ebuild b/app-emulation/wine/wine-1.1.15.ebuild
index 787dde8e9daa..cf5852a86f23 100644
--- a/app-emulation/wine/wine-1.1.15.ebuild
+++ b/app-emulation/wine/wine-1.1.15.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.15.ebuild,v 1.12 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.15.ebuild,v 1.13 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -96,6 +96,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	# XXX: should check out these flags too:
diff --git a/app-emulation/wine/wine-1.1.16.ebuild b/app-emulation/wine/wine-1.1.16.ebuild
index 483216ee668d..d153fb5a2d18 100644
--- a/app-emulation/wine/wine-1.1.16.ebuild
+++ b/app-emulation/wine/wine-1.1.16.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.16.ebuild,v 1.11 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.16.ebuild,v 1.12 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -95,6 +95,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	# XXX: should check out these flags too:
diff --git a/app-emulation/wine/wine-1.1.17.ebuild b/app-emulation/wine/wine-1.1.17.ebuild
index 4dd088fe5676..e4cd0f4c13bd 100644
--- a/app-emulation/wine/wine-1.1.17.ebuild
+++ b/app-emulation/wine/wine-1.1.17.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.17.ebuild,v 1.8 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.17.ebuild,v 1.9 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -95,6 +95,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	# XXX: should check out these flags too:
diff --git a/app-emulation/wine/wine-1.1.18.ebuild b/app-emulation/wine/wine-1.1.18.ebuild
index 9ab20ecbdefd..86c182d1ef0c 100644
--- a/app-emulation/wine/wine-1.1.18.ebuild
+++ b/app-emulation/wine/wine-1.1.18.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.18.ebuild,v 1.8 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.18.ebuild,v 1.9 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -95,6 +95,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	# XXX: should check out these flags too:
diff --git a/app-emulation/wine/wine-1.1.19.ebuild b/app-emulation/wine/wine-1.1.19.ebuild
index a6688387a02b..6eb56b8a75d4 100644
--- a/app-emulation/wine/wine-1.1.19.ebuild
+++ b/app-emulation/wine/wine-1.1.19.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.19.ebuild,v 1.8 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.19.ebuild,v 1.9 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -95,6 +95,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	# XXX: should check out these flags too:
diff --git a/app-emulation/wine/wine-1.1.2.ebuild b/app-emulation/wine/wine-1.1.2.ebuild
index c16314d6c410..41655e3e1976 100644
--- a/app-emulation/wine/wine-1.1.2.ebuild
+++ b/app-emulation/wine/wine-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.2.ebuild,v 1.5 2009/08/26 21:57:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.2.ebuild,v 1.6 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="1"
 
@@ -24,7 +24,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="alsa cups dbus esd +gecko hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
+IUSE="alsa cups custom-cflags dbus esd +gecko hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -120,8 +120,7 @@ src_compile() {
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
 	config_cache lcms lcms.h
 
-	strip-flags
-
+	use custom-cflags || strip-flags
 	use amd64 && multilib_toolchain_setup x86
 
 	#	$(use_enable amd64 win64)
diff --git a/app-emulation/wine/wine-1.1.20.ebuild b/app-emulation/wine/wine-1.1.20.ebuild
index 9b8b2fb640e8..6faa0908c5a3 100644
--- a/app-emulation/wine/wine-1.1.20.ebuild
+++ b/app-emulation/wine/wine-1.1.20.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.20.ebuild,v 1.8 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.20.ebuild,v 1.9 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -95,6 +95,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	# XXX: should check out these flags too:
diff --git a/app-emulation/wine/wine-1.1.21.ebuild b/app-emulation/wine/wine-1.1.21.ebuild
index b0c085f0e442..5777ead365c8 100644
--- a/app-emulation/wine/wine-1.1.21.ebuild
+++ b/app-emulation/wine/wine-1.1.21.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.21.ebuild,v 1.7 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.21.ebuild,v 1.8 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -95,6 +95,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	# XXX: should check out these flags too:
diff --git a/app-emulation/wine/wine-1.1.22.ebuild b/app-emulation/wine/wine-1.1.22.ebuild
index 906c85396cea..c45c090dac34 100644
--- a/app-emulation/wine/wine-1.1.22.ebuild
+++ b/app-emulation/wine/wine-1.1.22.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.22.ebuild,v 1.4 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.22.ebuild,v 1.5 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -95,6 +95,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	# XXX: should check out these flags too:
diff --git a/app-emulation/wine/wine-1.1.23.ebuild b/app-emulation/wine/wine-1.1.23.ebuild
index 77fe3f6c0189..1fbe1996129f 100644
--- a/app-emulation/wine/wine-1.1.23.ebuild
+++ b/app-emulation/wine/wine-1.1.23.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.23.ebuild,v 1.4 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.23.ebuild,v 1.5 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -95,6 +95,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	# XXX: should check out these flags too:
diff --git a/app-emulation/wine/wine-1.1.24.ebuild b/app-emulation/wine/wine-1.1.24.ebuild
index 465738427a90..de34cab0fdf0 100644
--- a/app-emulation/wine/wine-1.1.24.ebuild
+++ b/app-emulation/wine/wine-1.1.24.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.24.ebuild,v 1.4 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.24.ebuild,v 1.5 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -95,6 +95,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	# XXX: should check out these flags too:
diff --git a/app-emulation/wine/wine-1.1.25.ebuild b/app-emulation/wine/wine-1.1.25.ebuild
index 83a4210fab7c..a8ad64804d5e 100644
--- a/app-emulation/wine/wine-1.1.25.ebuild
+++ b/app-emulation/wine/wine-1.1.25.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.25.ebuild,v 1.4 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.25.ebuild,v 1.5 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -95,6 +95,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	# XXX: should check out these flags too:
diff --git a/app-emulation/wine/wine-1.1.26.ebuild b/app-emulation/wine/wine-1.1.26.ebuild
index 736d745264d3..81fa5addf3c8 100644
--- a/app-emulation/wine/wine-1.1.26.ebuild
+++ b/app-emulation/wine/wine-1.1.26.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.26.ebuild,v 1.4 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.26.ebuild,v 1.5 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -95,6 +95,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	# XXX: should check out these flags too:
diff --git a/app-emulation/wine/wine-1.1.27.ebuild b/app-emulation/wine/wine-1.1.27.ebuild
index 7da9d779bb30..623cb0746630 100644
--- a/app-emulation/wine/wine-1.1.27.ebuild
+++ b/app-emulation/wine/wine-1.1.27.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.27.ebuild,v 1.5 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.27.ebuild,v 1.6 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls gsm hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls gsm hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -96,6 +96,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	# XXX: should check out these flags too:
diff --git a/app-emulation/wine/wine-1.1.28.ebuild b/app-emulation/wine/wine-1.1.28.ebuild
index 5861e0cef1d0..77d81b2e775d 100644
--- a/app-emulation/wine/wine-1.1.28.ebuild
+++ b/app-emulation/wine/wine-1.1.28.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.28.ebuild,v 1.5 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.28.ebuild,v 1.6 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls gsm hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl test win64 +X xcomposite xinerama xml"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls gsm hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl test win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -96,6 +96,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	# XXX: should check out these flags too:
diff --git a/app-emulation/wine/wine-1.1.29.ebuild b/app-emulation/wine/wine-1.1.29.ebuild
index 49961742aba9..72091c3b0106 100644
--- a/app-emulation/wine/wine-1.1.29.ebuild
+++ b/app-emulation/wine/wine-1.1.29.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.29.ebuild,v 1.5 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.29.ebuild,v 1.6 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls gsm hal jack jpeg lcms ldap mp3 nas ncurses +opengl oss png samba scanner ssl test win64 +X xcomposite xinerama xml"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls gsm hal jack jpeg lcms ldap mp3 nas ncurses +opengl oss png samba scanner ssl test win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -97,6 +97,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	# XXX: should check out these flags too:
diff --git a/app-emulation/wine/wine-1.1.3.ebuild b/app-emulation/wine/wine-1.1.3.ebuild
index bd7887f823a2..9a2e13099cc6 100644
--- a/app-emulation/wine/wine-1.1.3.ebuild
+++ b/app-emulation/wine/wine-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.3.ebuild,v 1.5 2009/08/26 21:57:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.3.ebuild,v 1.6 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="1"
 
@@ -24,7 +24,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="alsa cups dbus esd +gecko hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
+IUSE="alsa cups custom-cflags dbus esd +gecko hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -120,8 +120,7 @@ src_compile() {
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
 	config_cache lcms lcms.h
 
-	strip-flags
-
+	use custom-cflags || strip-flags
 	use amd64 && multilib_toolchain_setup x86
 
 	#	$(use_enable amd64 win64)
diff --git a/app-emulation/wine/wine-1.1.30.ebuild b/app-emulation/wine/wine-1.1.30.ebuild
index dd4d57686baf..7f1707c9211c 100644
--- a/app-emulation/wine/wine-1.1.30.ebuild
+++ b/app-emulation/wine/wine-1.1.30.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.30.ebuild,v 1.3 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.30.ebuild,v 1.4 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa capi cups dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl oss png samba scanner ssl test +threads win64 +X xcomposite xinerama xml"
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl oss png samba scanner ssl test +threads win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -101,6 +101,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	econf \
diff --git a/app-emulation/wine/wine-1.1.31.ebuild b/app-emulation/wine/wine-1.1.31.ebuild
index 025a5cfb8e27..44ef758ffa68 100644
--- a/app-emulation/wine/wine-1.1.31.ebuild
+++ b/app-emulation/wine/wine-1.1.31.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.31.ebuild,v 1.2 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.31.ebuild,v 1.3 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa capi cups dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl oss +perl png samba scanner ssl test +threads win64 +X xcomposite xinerama xml"
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl oss +perl png samba scanner ssl test +threads win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -100,6 +100,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	econf \
diff --git a/app-emulation/wine/wine-1.1.32.ebuild b/app-emulation/wine/wine-1.1.32.ebuild
index ba745800df57..db3445de9b4d 100644
--- a/app-emulation/wine/wine-1.1.32.ebuild
+++ b/app-emulation/wine/wine-1.1.32.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.32.ebuild,v 1.2 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.32.ebuild,v 1.3 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa capi cups dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl oss +perl png samba scanner ssl test +threads win64 +X xcomposite xinerama xml"
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl oss +perl png samba scanner ssl test +threads win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -100,6 +100,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	econf \
diff --git a/app-emulation/wine/wine-1.1.33.ebuild b/app-emulation/wine/wine-1.1.33.ebuild
index 038963ef86e4..b66f6836fcc9 100644
--- a/app-emulation/wine/wine-1.1.33.ebuild
+++ b/app-emulation/wine/wine-1.1.33.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.33.ebuild,v 1.2 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.33.ebuild,v 1.3 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa capi cups dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl oss +perl png samba scanner ssl test +threads +truetype win64 +X xcomposite xinerama xml"
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl oss +perl png samba scanner ssl test +threads +truetype win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
@@ -101,6 +101,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	econf \
diff --git a/app-emulation/wine/wine-1.1.4.ebuild b/app-emulation/wine/wine-1.1.4.ebuild
index fd6be22b1833..fbb576c514ea 100644
--- a/app-emulation/wine/wine-1.1.4.ebuild
+++ b/app-emulation/wine/wine-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.4.ebuild,v 1.6 2009/08/26 21:57:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.4.ebuild,v 1.7 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="1"
 
@@ -24,7 +24,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="alsa cups dbus esd +gecko hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
+IUSE="alsa cups custom-cflags dbus esd +gecko hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -121,8 +121,7 @@ src_compile() {
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
 	config_cache lcms lcms.h
 
-	strip-flags
-
+	use custom-cflags || strip-flags
 	use amd64 && multilib_toolchain_setup x86
 
 	#	$(use_enable amd64 win64)
diff --git a/app-emulation/wine/wine-1.1.5.ebuild b/app-emulation/wine/wine-1.1.5.ebuild
index b0bec9d4dc67..afeff9be0d7d 100644
--- a/app-emulation/wine/wine-1.1.5.ebuild
+++ b/app-emulation/wine/wine-1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.5.ebuild,v 1.4 2009/08/26 21:57:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.5.ebuild,v 1.5 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="1"
 
@@ -24,7 +24,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="alsa cups dbus esd +gecko hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
+IUSE="alsa cups custom-cflags dbus esd +gecko hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -120,8 +120,7 @@ src_compile() {
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
 	config_cache lcms lcms.h
 
-	strip-flags
-
+	use custom-cflags || strip-flags
 	use amd64 && multilib_toolchain_setup x86
 
 	#	$(use_enable amd64 win64)
diff --git a/app-emulation/wine/wine-1.1.6.ebuild b/app-emulation/wine/wine-1.1.6.ebuild
index 46be682310d2..2491b9bfd14e 100644
--- a/app-emulation/wine/wine-1.1.6.ebuild
+++ b/app-emulation/wine/wine-1.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.6.ebuild,v 1.5 2009/08/26 21:57:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.6.ebuild,v 1.6 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="1"
 
@@ -24,7 +24,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -121,8 +121,7 @@ src_compile() {
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
 	config_cache lcms lcms.h
 
-	strip-flags
-
+	use custom-cflags || strip-flags
 	use amd64 && multilib_toolchain_setup x86
 
 	#	$(use_enable amd64 win64)
diff --git a/app-emulation/wine/wine-1.1.7.ebuild b/app-emulation/wine/wine-1.1.7.ebuild
index 7df4bdeacc96..6bacc19644e7 100644
--- a/app-emulation/wine/wine-1.1.7.ebuild
+++ b/app-emulation/wine/wine-1.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.7.ebuild,v 1.5 2009/08/26 21:57:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.7.ebuild,v 1.6 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="1"
 
@@ -24,7 +24,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -121,8 +121,7 @@ src_compile() {
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
 	config_cache lcms lcms.h
 
-	strip-flags
-
+	use custom-cflags || strip-flags
 	use amd64 && multilib_toolchain_setup x86
 
 	#	$(use_enable amd64 win64)
diff --git a/app-emulation/wine/wine-1.1.8.ebuild b/app-emulation/wine/wine-1.1.8.ebuild
index 9def5444de1e..6bc7cd7c9558 100644
--- a/app-emulation/wine/wine-1.1.8.ebuild
+++ b/app-emulation/wine/wine-1.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.8.ebuild,v 1.4 2009/08/26 21:57:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.8.ebuild,v 1.5 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="1"
 
@@ -24,7 +24,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -121,8 +121,7 @@ src_compile() {
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
 	config_cache lcms lcms.h
 
-	strip-flags
-
+	use custom-cflags || strip-flags
 	use amd64 && multilib_toolchain_setup x86
 
 	#	$(use_enable amd64 win64)
diff --git a/app-emulation/wine/wine-1.1.9.ebuild b/app-emulation/wine/wine-1.1.9.ebuild
index acc5c457e8f9..3759b26781c2 100644
--- a/app-emulation/wine/wine-1.1.9.ebuild
+++ b/app-emulation/wine/wine-1.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.9.ebuild,v 1.4 2009/08/26 21:57:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.9.ebuild,v 1.5 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="1"
 
@@ -24,7 +24,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
+IUSE="alsa cups custom-cflags dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss samba scanner xml +X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -121,8 +121,7 @@ src_compile() {
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
 	config_cache lcms lcms.h
 
-	strip-flags
-
+	use custom-cflags || strip-flags
 	use amd64 && multilib_toolchain_setup x86
 
 	#	$(use_enable amd64 win64)
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 6519b54243f0..3e8086caca7f 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.47 2009/12/03 02:56:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.48 2009/12/03 03:04:41 vapier Exp $
 
 EAPI="2"
 
-inherit multilib eutils
+inherit eutils flag-o-matic multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa capi cups dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl oss +perl png samba scanner ssl test +threads +truetype win64 +X xcomposite xinerama xml"
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl oss +perl png samba scanner ssl test +threads +truetype win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
@@ -101,6 +101,7 @@ src_prepare() {
 src_configure() {
 	export LDCONFIG=/bin/true
 
+	use custom-cflags || strip-flags
 	use amd64 && ! use win64 && multilib_toolchain_setup x86
 
 	econf \