From: Herbie Hopkins <herbs@gentoo.org>
Date: Thu, 24 Nov 2005 00:55:05 +0000 (+0000)
Subject: multilib fix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=999fb3a7eeb6b6c5f7265f781ce8209ef5c50dea;p=gentoo.git

multilib fix
Package-Manager: portage-2.0.53_rc7
---

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 2666f197b859..f3c5d34d6ce7 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.266 2005/11/23 19:44:22 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.267 2005/11/24 00:55:05 herbs Exp $
+
+  24 Nov 2005; Herbie Hopkins <herbs@gentoo.org> mysql-5.0.16-r2.ebuild,
+  mysql-5.0.16-r30.ebuild:
+  Fix small multilib problem (only occurs on no-symlinks profile)
 
 *mysql-5.0.16-r2 (23 Nov 2005)
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 159d5467b697..a88bc6cd6225 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,4 +1,7 @@
-MD5 8a233712247b5c8463f228de237d4b3e ChangeLog 50676
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 75dc5ca1dea66127370bd5227416ad03 ChangeLog 50844
 MD5 c6fcd70c34bed04e59808ec71c5bedfb files/digest-mysql-3.23.58-r1 140
 MD5 0feb3b501c47708ea13707c8e4cdde9c files/digest-mysql-4.0.25-r2 139
 MD5 201c8b31cd9eb58eec712e37d6f0c328 files/digest-mysql-4.0.26 139
@@ -27,5 +30,12 @@ MD5 432e8894444e71bc477ef7a68ce5d819 mysql-4.1.14.ebuild 18859
 MD5 767951c93752fe52f33984b3cfa8220a mysql-4.1.15-r30.ebuild 22453
 MD5 3d68365651cc7d8a0eedccda80ae5bd8 mysql-4.1.15.ebuild 22508
 MD5 ed292dce42e38a400c1f274b65c25296 mysql-5.0.15.ebuild 19008
-MD5 56222c53e6663e803bb9b5d2bce33a72 mysql-5.0.16-r2.ebuild 21938
-MD5 114777e0dfbf33d756de4c2ccfed46cd mysql-5.0.16-r30.ebuild 22512
+MD5 1a25be83666cf467574c116d7630aac1 mysql-5.0.16-r2.ebuild 22067
+MD5 5c77c4645b044477bd47441d001eacb0 mysql-5.0.16-r30.ebuild 22641
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhQ+S2G5bA0cA/ScRAiCFAKCHBqIPs2CMA6lR1rP9NnNkhBQTZACgzSNd
+a+qhhgBASzNQbRRprjNMhyc=
+=per+
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/mysql-5.0.16-r2.ebuild b/dev-db/mysql/mysql-5.0.16-r2.ebuild
index 8e9b95b28cf6..9f30e1ca1a28 100644
--- a/dev-db/mysql/mysql-5.0.16-r2.ebuild
+++ b/dev-db/mysql/mysql-5.0.16-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r2.ebuild,v 1.1 2005/11/23 19:44:22 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r2.ebuild,v 1.2 2005/11/24 00:55:05 herbs Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -220,6 +220,10 @@ src_unpack() {
 	sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
 	rm -f scripts/mysqlbug
 
+	# Multilib issue with zlib detection
+	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' {} \;
diff --git a/dev-db/mysql/mysql-5.0.16-r30.ebuild b/dev-db/mysql/mysql-5.0.16-r30.ebuild
index d18910b9cfb2..f8270da519a0 100644
--- a/dev-db/mysql/mysql-5.0.16-r30.ebuild
+++ b/dev-db/mysql/mysql-5.0.16-r30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r30.ebuild,v 1.2 2005/11/23 19:44:22 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r30.ebuild,v 1.3 2005/11/24 00:55:05 herbs Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -218,6 +218,10 @@ src_unpack() {
 	sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
 	rm -f scripts/mysqlbug
 
+	# Multilib issue with zlib detection
+	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' {} \;