Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.85
diff -u -B -r1.85 gnome2.eclass
--- gnome2.eclass	22 Mar 2008 10:19:05 -0000	1.85
+++ gnome2.eclass	22 Jan 2009 12:24:55 -0000
@@ -38,6 +38,10 @@
 gnome2_src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	gnome2_src_prepare
+}
+
+gnome2_src_prepare() {
 
 	# Prevent scrollkeeper access violations
 	gnome2_omf_fix
@@ -137,4 +141,11 @@
 }
 
 # pkg_prerm
-EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
+case "${EAPI}" in
+	2)
+		EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm
+		;;
+	*)
+		EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
+		;;
+esac