Replaced 'export C{XX}FLAGS=""' with 'unset CFLAGS CXXFLAGS' (bug #17986)

19 files changed, 69 insertions, 72 deletions

diff --git a/app-emulation/nwwine/ChangeLog b/app-emulation/nwwine/ChangeLog
index 509e9f2013be..f7e314ca3831 100644
--- a/app-emulation/nwwine/ChangeLog
+++ b/app-emulation/nwwine/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for app-emulation/nwwine
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/nwwine/ChangeLog,v 1.1 2003/03/28 17:16:14 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/nwwine/ChangeLog,v 1.2 2003/04/01 18:10:12 phoenix Exp $
 
 *nwwine-20020703 (28 Mar 2003)
 
+  01 Apr 2003; phoen][x <phoenix@gentoo.org> nwwine-20020703.ebuild :
+  Replaced 'export C{XX}FLAGS=""' with 'unset CFLAGS CXXFLAGS'.
+  Read bug #17986 for additional information about this.
+
   28 Mar 2003; phoen][x <phoenix@gentoo.org> nwwine-20020703.ebuild, 
   files/wine-20021125-fake_windows.tar.bz2, files/wine-20021125-misc.tar.bz2 :
   Initial import.
diff --git a/app-emulation/nwwine/nwwine-20020703.ebuild b/app-emulation/nwwine/nwwine-20020703.ebuild
index 3bb113c19e75..22502558d925 100644
--- a/app-emulation/nwwine/nwwine-20020703.ebuild
+++ b/app-emulation/nwwine/nwwine-20020703.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/nwwine/nwwine-20020703.ebuild,v 1.1 2003/03/28 17:16:14 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/nwwine/nwwine-20020703.ebuild,v 1.2 2003/04/01 18:10:12 phoenix Exp $
 
 DESCRIPTION="A special version of wine for the Never Winter Nights toolkit"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -32,10 +32,9 @@ src_compile() {
 	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
 	# there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected
 	
-	# the folks at #winehq were really angry about custom optimization
-	export CFLAGS=""
-	export CXXFLAGS=""
-	
+	# use the default setting in ./configure over the /etc/make.conf setting
+	unset CFLAGS CXXFLAGS
+
 	./configure --prefix=/usr/lib/${PN} \
 		--sysconfdir=/etc/${PN} \
 		--host=${CHOST} \
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index cc381b40be8d..a8d8b4845f4f 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/wine
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.30 2003/02/27 15:42:36 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.31 2003/04/01 18:09:22 phoenix Exp $
+
+  01 Apr 2003; phoen][x <phoenix@gentoo.org> *.ebuild :
+  Replaced 'export C{XX}FLAGS=""' with 'unset CFLAGS CXXFLAGS'.
+  Read bug #17986 for additional information about this.
 
 *wine-20030219 (27 Feb 2003)
 
diff --git a/app-emulation/wine/wine-20020804.ebuild b/app-emulation/wine/wine-20020804.ebuild
index 35685f8b6d0c..5cd5337b3535 100644
--- a/app-emulation/wine/wine-20020804.ebuild
+++ b/app-emulation/wine/wine-20020804.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20020804.ebuild,v 1.9 2003/02/28 23:27:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20020804.ebuild,v 1.10 2003/04/01 18:09:22 phoenix Exp $
 
 DESCRIPTION="free implementation of Windows on Unix"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-${PV}.tar.gz"
@@ -33,10 +33,9 @@ src_compile() {
 	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
 	# there's no configure flag for cups, arts and alsa, it's supposed to be autodetected
 	
-	# the folks at #winehq were really angry about custom optimization
-	export CFLAGS=""
-	export CXXFLAGS=""
-	
+	# use the default setting in ./configure over the /etc/make.conf setting
+	unset CFLAGS CXXFLAGS
+
 	./configure --prefix=/usr/lib/wine \
 		--sysconfdir=/etc/wine \
 		--host=${CHOST} \
diff --git a/app-emulation/wine/wine-20020904-r1.ebuild b/app-emulation/wine/wine-20020904-r1.ebuild
index f0e8df6377b0..d81ae52cbbc5 100644
--- a/app-emulation/wine/wine-20020904-r1.ebuild
+++ b/app-emulation/wine/wine-20020904-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20020904-r1.ebuild,v 1.8 2003/02/28 23:27:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20020904-r1.ebuild,v 1.9 2003/04/01 18:09:22 phoenix Exp $
 
 DESCRIPTION="free implementation of Windows on Unix"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-${PV}.tar.gz"
@@ -31,9 +31,8 @@ src_compile() {
 	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
 	# there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected
 	
-	# the folks at #winehq were really angry about custom optimization
-	export CFLAGS=""
-	export CXXFLAGS=""
+	# use the default setting in ./configure over the /etc/make.conf setting
+	unset CFLAGS CXXFLAGS
 	
 	./configure --prefix=/usr/lib/wine \
 		--sysconfdir=/etc/wine \
diff --git a/app-emulation/wine/wine-20020904.ebuild b/app-emulation/wine/wine-20020904.ebuild
index d811bdacc50a..78c8ae29ea99 100644
--- a/app-emulation/wine/wine-20020904.ebuild
+++ b/app-emulation/wine/wine-20020904.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20020904.ebuild,v 1.7 2003/02/28 23:27:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20020904.ebuild,v 1.8 2003/04/01 18:09:22 phoenix Exp $
 
 DESCRIPTION="free implementation of Windows on Unix"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-${PV}.tar.gz"
@@ -31,9 +31,8 @@ src_compile() {
 	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
 	# there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected
 	
-	# the folks at #winehq were really angry about custom optimization
-	export CFLAGS=""
-	export CXXFLAGS=""
+	# use the default setting in ./configure over the /etc/make.conf setting
+	unset CFLAGS CXXFLAGS
 	
 	./configure --prefix=/usr/lib/wine \
 		--sysconfdir=/etc/wine \
diff --git a/app-emulation/wine/wine-20021007.ebuild b/app-emulation/wine/wine-20021007.ebuild
index fb65c94e43ca..11d459b18d94 100644
--- a/app-emulation/wine/wine-20021007.ebuild
+++ b/app-emulation/wine/wine-20021007.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20021007.ebuild,v 1.8 2003/02/28 23:27:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20021007.ebuild,v 1.9 2003/04/01 18:09:22 phoenix Exp $
 
 DESCRIPTION="free implementation of Windows(tm) on Unix"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-${PV}.tar.gz"
@@ -32,9 +32,8 @@ src_compile() {
 	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
 	# there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected
 	
-	# the folks at #winehq were really angry about custom optimization
-	export CFLAGS=""
-	export CXXFLAGS=""
+	# use the default setting in ./configure over the /etc/make.conf setting
+	unset CFLAGS CXXFLAGS
 	
 	./configure --prefix=/usr/lib/wine \
 		--sysconfdir=/etc/wine \
diff --git a/app-emulation/wine/wine-20021031.ebuild b/app-emulation/wine/wine-20021031.ebuild
index 2baa5116ddc4..a94d999c170a 100644
--- a/app-emulation/wine/wine-20021031.ebuild
+++ b/app-emulation/wine/wine-20021031.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20021031.ebuild,v 1.5 2003/02/28 23:27:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20021031.ebuild,v 1.6 2003/04/01 18:09:22 phoenix Exp $
 
 DESCRIPTION="free implementation of Windows(tm) on Unix"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-${PV}.tar.gz"
@@ -31,10 +31,9 @@ src_compile() {
 	use opengl && myconf="--enable-opengl" || myconf="--disable-opengl"
 	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
 	# there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected
-	
-	# the folks at #winehq were really angry about custom optimization
-	export CFLAGS=""
-	export CXXFLAGS=""
+
+	# use the default setting in ./configure over the /etc/make.conf setting
+	unset CFLAGS CXXFLAGS
 	
 	./configure --prefix=/usr/lib/wine \
 		--sysconfdir=/etc/wine \
diff --git a/app-emulation/wine/wine-20021125.ebuild b/app-emulation/wine/wine-20021125.ebuild
index f8ef5a400377..7ce4a252bfb5 100644
--- a/app-emulation/wine/wine-20021125.ebuild
+++ b/app-emulation/wine/wine-20021125.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20021125.ebuild,v 1.5 2003/02/28 23:27:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20021125.ebuild,v 1.6 2003/04/01 18:09:22 phoenix Exp $
 
 DESCRIPTION="free implementation of Windows(tm) on Unix"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-${PV}.tar.gz"
@@ -33,9 +33,8 @@ src_compile() {
 	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
 	# there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected
 	
-	# the folks at #winehq were really angry about custom optimization
-	export CFLAGS=""
-	export CXXFLAGS=""
+	# use the default setting in ./configure over the /etc/make.conf setting
+	unset CFLAGS CXXFLAGS
 	
 	./configure --prefix=/usr/lib/wine \
 		--sysconfdir=/etc/wine \
diff --git a/app-emulation/wine/wine-20030115.ebuild b/app-emulation/wine/wine-20030115.ebuild
index 28d077bd7eb3..8a2a653ac0f5 100644
--- a/app-emulation/wine/wine-20030115.ebuild
+++ b/app-emulation/wine/wine-20030115.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20030115.ebuild,v 1.4 2003/02/28 23:27:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20030115.ebuild,v 1.5 2003/04/01 18:09:22 phoenix Exp $
 
 DESCRIPTION="free implementation of Windows(tm) on Unix"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-${PV}.tar.gz"
@@ -33,10 +33,9 @@ src_compile() {
 	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
 	# there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected
 	
-	# the folks at #winehq were really angry about custom optimization
-	export CFLAGS=""
-	export CXXFLAGS=""
-	
+	# use the default setting in ./configure over the /etc/make.conf setting
+	unset CFLAGS CXXFLAGS
+
 	./configure --prefix=/usr/lib/wine \
 		--sysconfdir=/etc/wine \
 		--host=${CHOST} \
diff --git a/app-emulation/wine/wine-20030219.ebuild b/app-emulation/wine/wine-20030219.ebuild
index a3c7bd272a50..a33432f8140a 100644
--- a/app-emulation/wine/wine-20030219.ebuild
+++ b/app-emulation/wine/wine-20030219.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20030219.ebuild,v 1.2 2003/02/28 23:27:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20030219.ebuild,v 1.3 2003/04/01 18:09:22 phoenix Exp $
 
 DESCRIPTION="free implementation of Windows(tm) on Unix"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-${PV}.tar.gz"
@@ -33,9 +33,8 @@ src_compile() {
 	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
 	# there's no configure flag for cups, arts, alsa and nas, it's supposed to be autodetected
 	
-	# the folks at #winehq were really angry about custom optimization
-	export CFLAGS=""
-	export CXXFLAGS=""
+	# use the default setting in ./configure over the /etc/make.conf setting
+	unset CFLAGS CXXFLAGS
 	
 	./configure --prefix=/usr/lib/wine \
 		--sysconfdir=/etc/wine \
diff --git a/app-emulation/winex/ChangeLog b/app-emulation/winex/ChangeLog
index 707d4e8b3398..5126faf39dc8 100644
--- a/app-emulation/winex/ChangeLog
+++ b/app-emulation/winex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/winex
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/ChangeLog,v 1.22 2003/03/28 14:54:44 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/ChangeLog,v 1.23 2003/04/01 18:06:58 phoenix Exp $
+
+  01 Apr 2003; phoen][x <phoenix@gentoo.org> *.ebuild :
+  Replaced 'export C{XX}FLAGS=""' with 'unset CFLAGS CXXFLAGS'.
+  Read bug #17986 for additional information about this.
 
 *winex-20030328 (28 Mar 2003)
 
diff --git a/app-emulation/winex/winex-20020511-r1.ebuild b/app-emulation/winex/winex-20020511-r1.ebuild
index e2791f3b5354..627ad5bf0e28 100644
--- a/app-emulation/winex/winex-20020511-r1.ebuild
+++ b/app-emulation/winex/winex-20020511-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/winex-20020511-r1.ebuild,v 1.11 2003/02/28 23:30:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/winex-20020511-r1.ebuild,v 1.12 2003/04/01 18:06:58 phoenix Exp $
 
 DESCRIPTION="distribution of Wine with enhanced DirectX for gaming"
 SRC_URI="ftp:/www.ibiblio.org/gentoo/distfiles/${P}.tar.bz2"
@@ -33,9 +33,8 @@ src_compile() {
 	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
 	# there's no configure flag for cups, it's supposed to be autodetected
 	
-	# the folks at #winehq were really angry about custom optimization
-	export CFLAGS=""
-	export CXXFLAGS=""
+	# use the default setting in ./configure over the /etc/make.conf setting
+	unset CFLAGS CXXFLAGS
 	
 	./configure --prefix=/usr \
 	--exec_prefix=/usr/winex \
diff --git a/app-emulation/winex/winex-20020628.ebuild b/app-emulation/winex/winex-20020628.ebuild
index 884031351e45..ece755a57f2d 100644
--- a/app-emulation/winex/winex-20020628.ebuild
+++ b/app-emulation/winex/winex-20020628.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/winex-20020628.ebuild,v 1.11 2003/02/28 23:30:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/winex-20020628.ebuild,v 1.12 2003/04/01 18:06:58 phoenix Exp $
 
 DESCRIPTION="distribution of Wine with enhanced DirectX for gaming"
 SRC_URI="ftp:/www.ibiblio.org/gentoo/distfiles/${P}.tar.bz2"
@@ -33,9 +33,8 @@ src_compile() {
 	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
 	# there's no configure flag for cups, it's supposed to be autodetected
 	
-	# the folks at #winehq were really angry about custom optimization
-	export CFLAGS=""
-	export CXXFLAGS=""
+	# use the default setting in ./configure over the /etc/make.conf setting
+	unset CFLAGS CXXFLAGS
 	
 	./configure --prefix=/usr \
 	--exec_prefix=/usr/winex \
diff --git a/app-emulation/winex/winex-20020804.ebuild b/app-emulation/winex/winex-20020804.ebuild
index cfa9157957ad..f14863fb0f53 100644
--- a/app-emulation/winex/winex-20020804.ebuild
+++ b/app-emulation/winex/winex-20020804.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/winex-20020804.ebuild,v 1.13 2003/02/28 23:30:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/winex-20020804.ebuild,v 1.14 2003/04/01 18:06:58 phoenix Exp $
 
 DESCRIPTION="distribution of Wine with enhanced DirectX for gaming"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
@@ -35,9 +35,8 @@ src_compile() {
 	use opengl && myconf="--enable-opengl" || myconf="--disable-opengl"
 	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
 
-	# the folks at #winehq were really angry about custom optimization
-	unset CFLAGS
-	unset CXXFLAGS
+	# use the default setting in ./configure over the /etc/make.conf setting
+	unset CFLAGS CXXFLAGS
 	
 	./configure --prefix=/usr/lib/winex \
 	--sysconfdir=/etc/winex \
diff --git a/app-emulation/winex/winex-20020807.ebuild b/app-emulation/winex/winex-20020807.ebuild
index eb8e4516cad4..8bac0d07c923 100644
--- a/app-emulation/winex/winex-20020807.ebuild
+++ b/app-emulation/winex/winex-20020807.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/winex-20020807.ebuild,v 1.10 2003/02/28 23:30:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/winex-20020807.ebuild,v 1.11 2003/04/01 18:06:58 phoenix Exp $
 
 DESCRIPTION="distribution of Wine with enhanced DirectX for gaming"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
@@ -34,10 +34,10 @@ src_compile() {
 	use opengl && myconf="--enable-opengl" || myconf="--disable-opengl"
 	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
 
-	# the folks at #winehq were really angry about custom optimization
-	unset CFLAGS
-	unset CXXFLAGS
+	# use the default setting in ./configure over the /etc/make.conf setting
+	unset CFLAGS CXXFLAGS
 	
+
 	./configure --prefix=/usr/lib/winex \
 	--sysconfdir=/etc/winex \
 	--host=${CHOST} \
diff --git a/app-emulation/winex/winex-20021011.ebuild b/app-emulation/winex/winex-20021011.ebuild
index 1ab234a9702c..4567dadcdee6 100644
--- a/app-emulation/winex/winex-20021011.ebuild
+++ b/app-emulation/winex/winex-20021011.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/winex-20021011.ebuild,v 1.10 2003/02/28 23:30:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/winex-20021011.ebuild,v 1.11 2003/04/01 18:06:58 phoenix Exp $
 
 DESCRIPTION="distribution of Wine with enhanced DirectX for gaming"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
@@ -34,10 +34,9 @@ src_compile() {
 	use opengl && myconf="--enable-opengl" || myconf="--disable-opengl"
 	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
 
-	# the folks at #winehq were really angry about custom optimization
-	unset CFLAGS
-	unset CXXFLAGS
-	
+	# use the default setting in ./configure over the /etc/make.conf setting
+	unset CFLAGS CXXFLAGS
+
 	./configure --prefix=/usr/lib/winex \
 		--sysconfdir=/etc/winex \
 		--host=${CHOST} \
diff --git a/app-emulation/winex/winex-20021123.ebuild b/app-emulation/winex/winex-20021123.ebuild
index b0a35efa9437..38df75dda0f5 100644
--- a/app-emulation/winex/winex-20021123.ebuild
+++ b/app-emulation/winex/winex-20021123.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/winex-20021123.ebuild,v 1.7 2003/02/28 23:30:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/winex-20021123.ebuild,v 1.8 2003/04/01 18:06:58 phoenix Exp $
 
 inherit base
 
@@ -44,9 +44,8 @@ src_compile() {
 	use opengl && myconf="--enable-opengl" || myconf="--disable-opengl"
 	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
 
-	# the folks at #winehq were really angry about custom optimization
-	unset CFLAGS
-	unset CXXFLAGS
+	# use the default setting in ./configure over the /etc/make.conf setting
+	unset CFLAGS CXXFLAGS
 	
 	./configure --prefix=/usr/lib/winex \
 		--sysconfdir=/etc/winex \
diff --git a/app-emulation/winex/winex-20030328.ebuild b/app-emulation/winex/winex-20030328.ebuild
index a632c52da01a..b21fc048ac1a 100644
--- a/app-emulation/winex/winex-20030328.ebuild
+++ b/app-emulation/winex/winex-20030328.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/winex-20030328.ebuild,v 1.1 2003/03/28 14:54:44 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex/winex-20030328.ebuild,v 1.2 2003/04/01 18:06:58 phoenix Exp $
 
 inherit base
 
@@ -44,9 +44,8 @@ src_compile() {
 	use opengl && myconf="--enable-opengl" || myconf="--disable-opengl"
 	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
 
-	# the folks at #winehq were really angry about custom optimization
-	unset CFLAGS
-	unset CXXFLAGS
+	# use the default setting in ./configure over the /etc/make.conf setting
+	unset CFLAGS CXXFLAGS
 	
         # patching winex to not compile wcmd and winhelp
 	epatch ${FILESDIR}/winex-20030328.patch