From c651a22f0b9073d9eb9cc527bf0a070cfe726803 Mon Sep 17 00:00:00 2001
From: "Robin H. Johnson" <robbat2@gentoo.org>
Date: Sun, 26 Dec 2004 06:55:45 +0000
Subject: [PATCH] Bug #75524.

---
 dev-db/mysql/ChangeLog           |  6 +++++-
 dev-db/mysql/Manifest            | 17 +++--------------
 dev-db/mysql/mysql-4.0.23.ebuild |  5 +++--
 dev-db/mysql/mysql-4.1.8.ebuild  |  5 +++--
 4 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index de5857159f9e..0deb1073c6d1 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.151 2004/12/23 17:36:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.152 2004/12/26 06:55:45 robbat2 Exp $
+
+  25 Dec 2004; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.23.ebuild,
+  mysql-4.1.8.ebuild:
+  Bug #75524.
 
 *mysql-4.0.22-r1 (23 Dec 2004)
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 1e39a7b46dca..896522626c8a 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,18 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 13b377458aedd7a42553fea8f5c45fbb mysql-3.23.57-r1.ebuild 6490
 MD5 08977a0b9448cd08009b1158e512f5ac mysql-3.23.56.ebuild 6535
 MD5 82d3e6943b48df0128798b8e4bba6fbf mysql-4.0.22-r1.ebuild 8851
 MD5 5e17dff032df6961c2fa804512cb3d4f mysql-4.1.7.ebuild 8381
 MD5 49ebe7c04e4e2971c911ee5e225561ad mysql-3.23.58.ebuild 6489
-MD5 86777976af049d016c3173938a4f4843 mysql-4.0.23.ebuild 8613
+MD5 5a693ad2af722f8b017ee61d8cce0b40 mysql-4.0.23.ebuild 8621
 MD5 f57faf79f4ad744991e5d6e76ca45edc mysql-3.23.52-r1.ebuild 5851
 MD5 2a761cb155aff6fd0ad3dafdc9bb5fcb mysql-3.23.57.ebuild 6538
 MD5 d24e97ec0ef04280cb9176f6cc8fd9ac mysql-4.0.22.ebuild 8337
 MD5 a9990372dc3f4a3323810ad38c9e1752 mysql-3.23.58-r1.ebuild 6607
-MD5 5a368facb704f7494930fb693007b2b4 mysql-4.1.8.ebuild 8660
-MD5 78bfdbbf0d1dca0c5e398a3d73d159fd ChangeLog 22990
+MD5 e948d93b5b94afb4ce5a1c26249f7d28 mysql-4.1.8.ebuild 8667
+MD5 853354433ffbf456a61289ad0697bf43 ChangeLog 23101
 MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163
 MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
 MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
@@ -63,11 +60,3 @@ MD5 9b5ad94f6e99e65bc3373c9dd15dff08 files/mysql-4.0.17-thrssl.patch 637
 MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22-r1 66
 MD5 152b9a8feef16df47b56c316c5c0601e files/mysql-4.0.13-thrssl.patch 813
 MD5 ad5636b398982a23f6fc58f18a2114fc files/mysql-4.0.18-mysqldmultisecurity.diff 3863
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-Comment: Robbat2 @ Orbis-Terrarum Networks
-
-iD8DBQFBywHdPpIsIjIzwiwRAqtwAJ9Yfk46hlm4DIufDq0YRGlqPvppdACgqVef
-wMrSBh8m/GXkTAjNRnP/Tg4=
-=wpZX
------END PGP SIGNATURE-----
diff --git a/dev-db/mysql/mysql-4.0.23.ebuild b/dev-db/mysql/mysql-4.0.23.ebuild
index b2a0b7fb46a9..dd0bb03412b3 100644
--- a/dev-db/mysql/mysql-4.0.23.ebuild
+++ b/dev-db/mysql/mysql-4.0.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.23.ebuild,v 1.1 2004/12/23 10:56:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.23.ebuild,v 1.2 2004/12/26 06:55:45 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -91,7 +91,8 @@ src_unpack() {
 	# Already included upstream in 4.0.21
 
 	cd ${S}
-	autoreconf --install --force
+	autoconf 
+	libtoolize --copy --force
 	# Saving this for a rainy day, in case we need it again
 	#WANT_AUTOMAKE=1.7 automake
 	gnuconfig_update
diff --git a/dev-db/mysql/mysql-4.1.8.ebuild b/dev-db/mysql/mysql-4.1.8.ebuild
index 403d9ac1bab5..868ed7d9a2b6 100644
--- a/dev-db/mysql/mysql-4.1.8.ebuild
+++ b/dev-db/mysql/mysql-4.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.8.ebuild,v 1.1 2004/12/23 10:56:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.8.ebuild,v 1.2 2004/12/26 06:55:45 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -90,8 +90,9 @@ src_unpack() {
 	fi
 
 	cd ${S}
+	autoconf
 	# this does the libtoolize stuff
-	autoreconf --install --force
+	libtoolize --copy --force
 	# Saving this for a rainy day, in case we need it again
 	#WANT_AUTOMAKE=1.7 automake
 	gnuconfig_update
-- 
2.26.2