Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.20
diff -u -B -r1.20 mysql.eclass
--- mysql.eclass	28 Feb 2006 12:52:27 -0000	1.20
+++ mysql.eclass	1 Mar 2006 09:53:04 -0000
@@ -133,11 +133,6 @@
 	sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
 	rm -f scripts/mysqlbug
 
-	# Multilib issue with zlib detection
-	mysql_version_is_at_least "5.00.15.00" \
-	&& sed -i -e "s:zlib_dir/lib:zlib_dir/$(get_libdir):g" \
-		"${S}/config/ac-macros/zlib.m4"
-
 	# Make charsets install in the right place
 	find . -name 'Makefile.am' \
 		-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
@@ -362,7 +357,6 @@
 		--enable-thread-safe-client \
 		--with-comment="Gentoo Linux ${PF}" \
 		--with-unix-socket-path="/var/run/mysqld/mysqld.sock" \
-		--with-zlib-dir=/usr \
 		--with-lib-ccflags="-fPIC" \
 		--without-readline \
 		--without-docs \