--- /usr/portage/games-puzzle/quadra/quadra-1.1.8.ebuild	2006-05-31 20:05:52.000000000 +0100
+++ quadra-1.1.8.ebuild	2006-08-27 10:20:27.000000000 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/quadra-1.1.8.ebuild,v 1.13 2006/05/31 18:55:36 tupone Exp $
 
-inherit eutils toolchain-funcs games
+inherit eutils games
 
 DESCRIPTION="A tetris clone with multiplayer support"
 HOMEPAGE="http://quadra.sourceforge.net/"
@@ -22,9 +22,8 @@
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	[ $(gcc-major-version) == 3 ] && epatch "${FILESDIR}/${P}-gcc3.patch"
-	epatch "${FILESDIR}/libpng-1.2.5.patch" \
-		"${FILESDIR}/${P}"-gcc41.patch
+	epatch "${FILESDIR}/${P}-gcc3.patch"
+	epatch "${FILESDIR}/libpng-1.2.5.patch"
 	use amd64 && epatch "${FILESDIR}/${P}-amd64.patch"
 	sed -i \
 		-e 's:-pedantic::' config/vars.mk \