From: Robin H. Johnson <robbat2@gentoo.org>
Date: Tue, 6 Mar 2007 11:43:21 +0000 (+0000)
Subject: Bug #167758 - fix to support libtool-1.5.23b.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eee81571bd8551ed1b2c80fc98b0675c70151db7;p=gentoo.git

Bug #167758 - fix to support libtool-1.5.23b.
Package-Manager: portage-2.1.2.1
---

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 23b1cb9d7258..57ec0f7fab82 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.388 2007/03/04 12:31:49 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.389 2007/03/06 11:43:21 robbat2 Exp $
+
+  06 Mar 2007; Robin H. Johnson <robbat2@gentoo.org> mysql-5.0.34.ebuild:
+  Bug #167758 - fix to support libtool-1.5.23b.
 
 *mysql-5.0.34 (04 Mar 2007)
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index e5510efe0ccd..8d85c090f73f 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -49,14 +49,14 @@ EBUILD mysql-5.0.32.ebuild 2035 RMD160 034ca18af4539c6cc6440a6ac79a49d0ab429cdc
 MD5 23587316b99d3c689a0ef2d5a603a8c3 mysql-5.0.32.ebuild 2035
 RMD160 034ca18af4539c6cc6440a6ac79a49d0ab429cdc mysql-5.0.32.ebuild 2035
 SHA256 5aae1d10c426a63f6860727527c58d925ad2846d2d351f5847f9a0822f1cafd2 mysql-5.0.32.ebuild 2035
-EBUILD mysql-5.0.34.ebuild 20777 RMD160 629bb03eb8282c0257463848197de71307656015 SHA1 e467f84bb9534ebfcdd87ecefc13045845a0dbe2 SHA256 fd24ca50f85a9277bb0d77ff4bd94e1a7ef8ac193b0461abe4f79610cecec4de
-MD5 0f337aaf203f9c5f43208750f2fc207b mysql-5.0.34.ebuild 20777
-RMD160 629bb03eb8282c0257463848197de71307656015 mysql-5.0.34.ebuild 20777
-SHA256 fd24ca50f85a9277bb0d77ff4bd94e1a7ef8ac193b0461abe4f79610cecec4de mysql-5.0.34.ebuild 20777
-MISC ChangeLog 78927 RMD160 9b5dcfb4f9b31a0919ab68deecad12e3f3ad1bbd SHA1 e6b40dafd2dabe884880272226cf9570ec49ff6f SHA256 3e9e1220fc1a02c9c883fff136f10a5570e627d7336b07898555c8fbf4f444a2
-MD5 0b638a8d75550b2ccd4fd867ffaa15f4 ChangeLog 78927
-RMD160 9b5dcfb4f9b31a0919ab68deecad12e3f3ad1bbd ChangeLog 78927
-SHA256 3e9e1220fc1a02c9c883fff136f10a5570e627d7336b07898555c8fbf4f444a2 ChangeLog 78927
+EBUILD mysql-5.0.34.ebuild 20893 RMD160 7394ad6def649f07369226f92919830944a711d6 SHA1 8a8a6939955518e4fdd4b047149cbb5f78eb47c6 SHA256 9f38ebc70086ca4126d5dd5f0544d1e9318b68ca3b363ca54e172452007a55f7
+MD5 1bd39a87b78827c05dc0976084c6e37b mysql-5.0.34.ebuild 20893
+RMD160 7394ad6def649f07369226f92919830944a711d6 mysql-5.0.34.ebuild 20893
+SHA256 9f38ebc70086ca4126d5dd5f0544d1e9318b68ca3b363ca54e172452007a55f7 mysql-5.0.34.ebuild 20893
+MISC ChangeLog 79053 RMD160 05c605b11aac4fad4f4de272079ce53c0b11a2f0 SHA1 6a96dd679941b2e007f89d9223e04b5ccc0fa7da SHA256 da59f7ecf38236d17cc078024c2c606cdab3f2a7dfc834ecdf3fe4a717436792
+MD5 d6ff2dc2945cfebfd81e04578a7f4e13 ChangeLog 79053
+RMD160 05c605b11aac4fad4f4de272079ce53c0b11a2f0 ChangeLog 79053
+SHA256 da59f7ecf38236d17cc078024c2c606cdab3f2a7dfc834ecdf3fe4a717436792 ChangeLog 79053
 MISC metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee SHA1 5eb253a678d6faa0f1c6b3c5720a804ed8923566 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7
 MD5 f1c86d989c7ea2451931e7e2c3530f8c metadata.xml 159
 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee metadata.xml 159
diff --git a/dev-db/mysql/mysql-5.0.34.ebuild b/dev-db/mysql/mysql-5.0.34.ebuild
index f82cff8857d4..20a994276479 100644
--- a/dev-db/mysql/mysql-5.0.34.ebuild
+++ b/dev-db/mysql/mysql-5.0.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.34.ebuild,v 1.1 2007/03/04 12:31:49 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.34.ebuild,v 1.2 2007/03/06 11:43:21 robbat2 Exp $
 
 MY_EXTRAS_VER="20070217"
 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
@@ -358,6 +358,8 @@ src_unpack() {
 	if mysql_check_version_range "4.1 to 5.0.99.99" \
 	&& use berkdb ; then
 		[[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
+		cp -f /usr/share/aclocal/libtool.m4 ${S}/bdb/dist/aclocal/libtool.ac \
+		|| die "Could not copy in libtool.m4"
 		pushd "bdb/dist" \
 		&& sh s_all \
 		|| die "Failed bdb reconfigure" \