Index: flag-o-matic.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v
retrieving revision 1.31
diff -u -b -B -w -p -r1.31 flag-o-matic.eclass
--- flag-o-matic.eclass	10 Dec 2003 21:13:25 -0000	1.31
+++ flag-o-matic.eclass	19 Dec 2003 16:59:22 -0000
@@ -48,12 +48,12 @@ INHERITED="$INHERITED $ECLASS"
 #### etexec-flags ####
 # hooked function for hardened-gcc that appends 
 # -yet_exec {C,CXX,LD}FLAGS when hardened-gcc is installed
-# and a package is filtering -fPIC
+# and a package is filtering -fPIC,-fpic, -fPIE, -fpie
 #
 #### fstack-flags ####
 # hooked function for hardened-gcc that appends
 # -yno_propolice to {C,CXX,LD}FLAGS when hardened-gcc is installed
-# and a package is filtering -fstack-protector
+# and a package is filtering -fstack-protector, -fstack-protector-all
 #
 
 # C[XX]FLAGS that we allow in strip-flags
@@ -93,8 +93,8 @@ filter-flags() {
 	# we do two loops to avoid the first and last char from being chomped.
 	for x in $@ ; do
 		case "${x}" in
-			-fPIC) etexec-flags;;
-			-fstack-protector) fstack-flags;;
+			-fPIC|-fPIE|-fpie|-fpic) etexec-flags;;
+			-fstack-protector|-fstack-protector-all) fstack-flags;;
 			*) ;;
 		esac
 	done
@@ -114,7 +114,7 @@ append-flags() {
 	CFLAGS="${CFLAGS} $@"
 	CXXFLAGS="${CXXFLAGS} $@"
 	for x in $@; do
-		[ "${x}" = "-fno-stack-protector" ] && fstack-flags
+		[ "${x}" = "-fno-stack-protector" -o "${x}" = "-fno-stack-protector-all" ] && fstack-flags
 	done
 	return 0
 }