Complementary patch to Herbie Hopkins' patch attached to gentoo bug #111073. His patch fixes up issues where mysql ebuilds using mysql.eclass don't locate zlib properly on multilib 64-bit systems. This patch applies the same fixage to *all* other affected ebuilds (which aren't using the eclass), including version 4.1.14 which is marked stable at the time of writing. kerframil@gmail.com --- /usr/portage/dev-db/mysql/mysql-4.1.14.ebuild 2006-02-18 07:05:36.000000000 -0500 +++ mysql-4.1.14.ebuild 2006-03-01 20:28:38.000000000 -0500 @@ -345,7 +345,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" \ ${myconf} || die "bad ./configure" --- /usr/portage/dev-db/mysql/mysql-4.1.16.ebuild 2006-02-18 07:05:36.000000000 -0500 +++ mysql-4.1.16.ebuild 2006-03-01 20:30:31.000000000 -0500 @@ -476,7 +476,6 @@ --enable-thread-safe-client \ --with-comment="Gentoo Linux ${PF}" \ --with-unix-socket-path="/var/run/mysqld/mysqld${MY_SUFFIX}.sock" \ - --with-zlib-dir=/usr \ --with-lib-ccflags="-fPIC" \ --without-readline \ --without-docs \ --- /usr/portage/dev-db/mysql/mysql-5.0.18.ebuild 2006-02-18 07:05:36.000000000 -0500 +++ mysql-5.0.18.ebuild 2006-03-01 20:31:04.000000000 -0500 @@ -234,11 +234,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' {} \; @@ -476,7 +471,6 @@ --enable-thread-safe-client \ --with-comment="Gentoo Linux ${PF}" \ --with-unix-socket-path="/var/run/mysqld/mysqld${MY_SUFFIX}.sock" \ - --with-zlib-dir=/usr \ --with-lib-ccflags="-fPIC" \ --without-readline \ --without-docs \