--- arj-3.10.21.ebuild	2005-02-28 20:54:58.000000000 +0100
+++ arj-3.10.21.ebuild	2005-02-28 20:53:05.000000000 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-arch/arj/arj-3.10.21.ebuild,v 1.5 2005/01/19 00:55:56 mr_bones_ Exp $
 
-inherit gnuconfig eutils gcc
+inherit gnuconfig eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="Utility for opening arj archives"
 HOMEPAGE="http://arj.sourceforge.net/"
@@ -17,33 +17,9 @@
 DEPEND="virtual/libc"
 
 src_compile() {
-	if [ -x /usr/sbin/gcc-config ]
+	if [ "$(gcc-version)" == "3.4" ];
 	then
-		# Do we have a gcc that use the new layout and gcc-config ?
-		if /usr/sbin/gcc-config --get-current-profile &> /dev/null
-		then
-			export GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)"
-
-			# Just recheck gcc version ...
-			if [ "$(gcc-version)" != "3.2" ] && [ "$(gcc-version)" != "3.3" ]
-			then
-				# See if we can get a gcc profile we know is proper ...
-				if /usr/sbin/gcc-config --get-bin-path ${CHOST}-3.3.4 &> /dev/null
-				then
-					export PATH="$(/usr/sbin/gcc-config --get-bin-path ${CHOST}-3.3.4):${PATH}"
-					export GCC_PROFILE="${CHOST}-3.3.4"
-				else
-					eerror "This build needs gcc-3.2 or gcc-3.3!"
-					eerror
-					eerror "Use gcc-config to change your gcc profile:"
-					eerror
-					eerror "  # gcc-config $CHOST-3.3.4"
-					eerror
-					eerror "or whatever gcc version is relevant."
-					die
-				fi
-			fi
-		fi
+		append-flags -fno-unit-at-a-time
 	fi
 
 	gnuconfig_update