--- /usr/portage/eclass/gnome2.eclass	2008-03-22 11:36:17.000000000 +0100
+++ gnome2.eclass	2009-02-08 22:28:45.000000000 +0100
@@ -12,10 +12,18 @@
 #
 
 
 inherit fdo-mime libtool gnome.org gnome2-utils
 
+case "${EAPI:-0}" in
+	0|1)
+		EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
+		;;
+	*)
+		EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm
+		;;
+esac
 
 # Extra configure opts passed to econf
 G2CONF=${G2CONF:-""}
 
 # Extra options passed to elibtoolize
@@ -36,11 +44,14 @@
 
 
 gnome2_src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	has ${EAPI:-0} 0 1 && gnome2_src_prepare
+}
 
+gnome2_src_prepare() {
 	# Prevent scrollkeeper access violations
 	gnome2_omf_fix
 
 	# Run libtoolize
 	elibtoolize ${ELTCONF}
@@ -65,11 +76,11 @@
 	# GST_REGISTRY is to work around gst-inspect trying to read/write /root
 	GST_REGISTRY="${S}/registry.xml" econf "$@" ${G2CONF} || die "configure failed"
 }
 
 gnome2_src_compile() {
-	gnome2_src_configure "$@"
+	has ${EAPI:-0} 0 1 && gnome2_src_configure "$@"
 	emake || die "compile failure"
 }
 
 gnome2_src_install() {
 	# if this is not present, scrollkeeper-update may segfault and
@@ -135,6 +146,5 @@
 		gnome2_scrollkeeper_update
 	fi
 }
 
 # pkg_prerm
-EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm