diff -r 1c17a326aa3f dev-lang/python/python-2.5.1-r2.ebuild
--- a/dev-lang/python/python-2.5.1-r2.ebuild	Thu Sep 06 16:29:17 2007 -0400
+++ b/dev-lang/python/python-2.5.1-r2.ebuild	Mon Sep 10 17:22:22 2007 -0400
@@ -62,11 +62,15 @@ src_unpack() {
 	cd "${S}"
 
 	if tc-is-cross-compiler ; then
-		[[ $(python -V) != ${PV} ]] && \
+		[[ "$(python -V 2>&1)" != "Python ${PV}" ]] && \
 			die "Crosscompiling requires the same host and build versions."
-	else
-		rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch
-	fi
+		epatch ${FILESDIR}/python-2.4.4-test-cross.patch || \
+			die "cross patch failed"
+		epatch ${FILESDIR}/python-2.5.1-cross.patch || \
+			die "cross patch failed"
+		export ac_cv_printf_zd_format=no
+	fi
+	rm "${WORKDIR}/${PV}"/*_all_crosscompile.patch
 
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}"
 	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
@@ -144,18 +148,6 @@ src_compile() {
 
 	src_configure
 
-	if tc-is-cross-compiler ; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
-		./configure --with-cxx=no || die "cross-configure failed"
-		emake python Parser/pgen || die "cross-make failed"
-		mv python hostpython
-		mv Parser/pgen Parser/hostpgen
-		make distclean
-		sed -i \
-			-e '/^HOSTPYTHON/s:=.*:=./hostpython:' \
-			-e '/^HOSTPGEN/s:=.*:=./Parser/hostpgen:' \
-			Makefile.pre.in || die
-	fi
 
 	# export CXX so it ends up in /usr/lib/python2.x/config/Makefile
 	tc-export CXX