--- libXt-1.0.5.ebuild	2009-03-26 20:01:08.000000000 +0000
+++ libXt-1.0.5.ebuild.new	2009-03-26 20:13:23.000000000 +0000
@@ -4,7 +4,6 @@
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
-PATCHES="${FILESDIR}/libXt-1.0.5-cross.patch"
 
 inherit x-modular flag-o-matic
 
@@ -27,3 +26,21 @@
 	filter-ldflags -Bdirect
 	filter-ldflags -Wl,-Bdirect
 }
+
+x-modular_src_compile() {
+	x-modular_src_configure
+
+	# [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makestr'
+	if tc-is-cross-compiler; then
+		( filter-flags -m* ; cd util && make CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS="" clean all )
+	fi
+
+	x-modular_src_make
+
+	# [Cross-Compile Love] Recompile 'makestr' with the target compiler,
+	# just in case we want to install it.
+	if tc-is-cross-compiler; then
+		( cd util && make clean all )
+	fi
+}
+