Index: flag-o-matic.eclass
===================================================================
RCS file: /home/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v
retrieving revision 1.41
diff -u -b -B -w -p -r1.41 flag-o-matic.eclass
--- flag-o-matic.eclass	16 Mar 2004 21:37:09 -0000	1.41
+++ flag-o-matic.eclass	28 Mar 2004 22:47:23 -0000
@@ -312,23 +312,19 @@ filter-ldflags() {
 }
 
 etexec-flags() {
-	has_version sys-devel/hardened-gcc
-	if [ $? == 0 ] ; then
-		if [ "`is-flag -yet_exec`" != "true" ]; then
-			debug-print ">>> appending flags -yet_exec"
-			append-flags -yet_exec
-			append-ldflags -yet_exec
-		fi
+	if [ "`is-flag -nopie`" != "true" ]; then
+		debug-print ">>> appending flags -nopie"
+		append-flags -nopie
+		append-ldflags -nopie
+		export GCC_NOPIE=1
 	fi
 }
 
 fstack-flags() {
-	has_version sys-devel/hardened-gcc
-	if [ $? == 0 ] ; then
-		if [ "`is-flag -yno_propolice`" != "true" ]; then
-			debug-print ">>> appending flags -yno_propolice"
-			append-flags -yno_propolice
-			append-ldflags -yno_propolice
-		fi
+	if [ "`is-flag -fno-stack-protector`" != "true" ]; then
+		debug-print ">>> appending flags -fno-stack-protector"
+		append-flags -fno-stack-protector
+		append-ldflags -fno-stack-protector
+		export GCC_NOSSP=1
 	fi
 }