version bump

4 files changed, 18 insertions, 9 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 2b8c66087bac..7d0bab0db72f 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,12 +1,16 @@
 # ChangeLog for home/mysql
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.28 2002/12/15 11:58:45 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.29 2002/12/16 19:17:19 woodchip Exp $
 
-*mysql-3.23.54 (13 Dec 2002)
+*mysql-3.23.54a (16 Dec 2002)
+
+  16 Dec 2002; Donny Davies <woodchip@gentoo.org> : Version bump.
 
   15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> mysql-3.23.52-r1.ebuild :
   Add alpha to KEYWORDS
 
+*mysql-3.23.54 (13 Dec 2002)
+
   13 Dec 2002; Donny Davies <woodchip@gentoo.org> : Update to latest.
   This release fixes a remote DoS vulnerability; upgrade reccomended.
 
diff --git a/dev-db/mysql/files/digest-mysql-3.23.54 b/dev-db/mysql/files/digest-mysql-3.23.54
deleted file mode 100644
index 928a0a6d4077..000000000000
--- a/dev-db/mysql/files/digest-mysql-3.23.54
+++ /dev/null
@@ -1 +0,0 @@
-MD5 03e1b9c2a76e4bff4f0ec68b62f3aaca mysql-3.23.54.tar.gz 11291919
diff --git a/dev-db/mysql/files/digest-mysql-3.23.54a b/dev-db/mysql/files/digest-mysql-3.23.54a
new file mode 100644
index 000000000000..811fccc8d6a3
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-3.23.54a
@@ -0,0 +1 @@
+MD5 4b20909fea3717e42ce113ecb6193d74 mysql-3.23.54a.tar.gz 11397615
diff --git a/dev-db/mysql/mysql-3.23.54.ebuild b/dev-db/mysql/mysql-3.23.54a.ebuild
index 713613b86d8b..4c07676899ee 100644
--- a/dev-db/mysql/mysql-3.23.54.ebuild
+++ b/dev-db/mysql/mysql-3.23.54a.ebuild
@@ -1,9 +1,15 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.54.ebuild,v 1.2 2002/12/15 11:58:45 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.54a.ebuild,v 1.1 2002/12/16 19:17:19 woodchip Exp $
 
 IUSE="static readline innodb berkdb tcpd ssl"
 
+# bug #11681; get b0rked code when using -march=k6 with this package.
+inherit flag-o-matic
+replace-flags "-march=k6-3" "-march=i586"
+replace-flags "-march=k6-2" "-march=i586"
+replace-flags "-march=k6" "-march=i586"
+
 SVER=${PV%.*}
 #normal releases:
 SDIR=MySQL-${SVER}
@@ -17,6 +23,7 @@ SRC_URI="ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/${SDIR
 S=${WORKDIR}/${P}
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 ~sparc alpha"
 
 DEPEND="readline? ( >=sys-libs/readline-4.1 )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
@@ -25,8 +32,6 @@ DEPEND="readline? ( >=sys-libs/readline-4.1 )
 	sys-devel/perl
 	sys-apps/procps"
 
-KEYWORDS="x86 ~sparc alpha"
-
 # HEY!
 # the benchmark stuff in /usr/share/mysql/sql-bench and
 # the /usr/bin/mysql_setpermission script need dev-perl/DBD-mysql.
@@ -49,8 +54,8 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-# The following fix is due to a bug with bdb on sparc's. See: 
-# http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
+	# The following fix is due to a bug with bdb on sparc's. See: 
+	# http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
 	if use sparc || use sparc64
 	then
 		myconf="${myconf} --without-berkeley-db"
@@ -98,7 +103,7 @@ src_install() {
 	make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die
 
 	# eeek, not sure whats going on here.. are these needed by anything?
-	use innodb && insinto /usr/lib/mysql && doins ${WORKDIR}/../libs/*
+#	use innodb && insinto /usr/lib/mysql && doins ${WORKDIR}/../libs/*
 
 	# move client libs, install a couple of missing headers
 	mv ${D}/usr/lib/mysql/libmysqlclient*.so* ${D}/usr/lib