--- gnome2.eclass	2008-03-22 16:06:17.000000000 +0530
+++ gnome2.eclass	2008-09-30 13:50:48.000000000 +0530
@@ -38,7 +38,10 @@
 gnome2_src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	[[ "${EAPI}" != 2 ]] && gnome2_src_prepare
+}
 
+gnome2_src_prepare() {
 	# Prevent scrollkeeper access violations
 	gnome2_omf_fix
 
@@ -67,7 +70,7 @@
 }
 
 gnome2_src_compile() {
-	gnome2_src_configure "$@"
+	[[ "${EAPI}" != 2 ]] && gnome2_src_configure
 	emake || die "compile failure"
 }
 
@@ -137,4 +140,4 @@
 }
 
 # pkg_prerm
-EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
+EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_configure src_install pkg_preinst pkg_postinst pkg_postrm