--- /usr/portage/eclass/debug.eclass	2005-08-02 02:05:50.000000000 +0200
+++ debug.eclass	2006-12-04 14:14:50.000000000 +0100
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/debug.eclass,v 1.27 2005/08/01 23:58:44 foser Exp $
+# $Header: $
 #
 # Author: Spider
 #
@@ -8,15 +8,15 @@
 # and to remove "bad" flags from CFLAGS
 
 # Debug ECLASS
-IUSE="debug"
 
-if useq debug; then
+inherit flag-o-matic
+
+if hasq debug ${IUSE}; then
 	# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
 	DEBUG="yes"
 	RESTRICT="${RESTRICT} nostrip"
-	# Remove omit-frame-pointer as some useless folks define that all over the place. they should be shot with a 16 gauge slingshot at least :)
-	# force debug information
-	export CFLAGS="${CFLAGS/-fomit-frame-pointer/} -g"
-	export CXXFLAGS="${CXXFLAGS/-fomit-frame-pointer/} -g"
+	# Remove omit-frame-pointer, force debug information
+	filter-flags -fomit-frame-pointer
+	append-flags -g
 	# einfo "CFLAGS and CXXFLAGS redefined"
 fi