Added ~mips to KEYWORDS and added a check for the berkdb USE flag if we're on a mips system. MySQL apparently has issues when linked to berkeley db on mips.

5 files changed, 60 insertions, 46 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 07e1d4fc709c..03294d8bfb49 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.84 2004/01/10 18:49:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.85 2004/02/04 10:14:27 kumba Exp $
+
+  04 Feb 2004; Joshua Kinard <kumba@gentoo.org> mysql-4.0.17.ebuild:
+  Added ~mips to KEYWORDS and added a check for the berkdb USE flag if we're on
+  a mips system. MySQL apparently has issues when linked to berkeley db.
 
 *mysql-4.0.17 (10 Jan 2004)
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 4f44ad073810..3b825ec8c011 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,54 +1,54 @@
-MD5 9632ca3b67f732ea56a8f45547ecb8ae mysql-3.23.57-r1.ebuild 6609
+MD5 203faedd9f7e636242c4b7481fbe531d ChangeLog 14003
+MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163
+MD5 b83f95fbf826910721b4211ab78eeb65 mysql-3.23.52-r1.ebuild 5874
 MD5 78fe89ca388be595d04b6eededc664a3 mysql-3.23.56.ebuild 6549
-MD5 ff1b26ec554b3c94deb3c56369a0421c mysql-4.0.14-r2.ebuild 7583
-MD5 11c814b92c12eee3e8bb493fcf740a10 mysql-4.0.17.ebuild 7593
+MD5 9632ca3b67f732ea56a8f45547ecb8ae mysql-3.23.57-r1.ebuild 6609
+MD5 10d000d3030fee06b9e3388c2d30a835 mysql-3.23.57.ebuild 6552
 MD5 bffd704bcecb24a8bb26835dd10835f6 mysql-4.0.12.ebuild 6773
-MD5 01aa121c83d53d482631bdee3de3e2db mysql-4.0.15-r1.ebuild 7707
-MD5 00510396054168fba8d17ab1b719bdd6 mysql-4.0.14.ebuild 6932
-MD5 b83f95fbf826910721b4211ab78eeb65 mysql-3.23.52-r1.ebuild 5874
-MD5 bf8df935e69b40022ad01b230057518a mysql-4.0.14-r1.ebuild 7430
-MD5 574eaedd27272933c6a85f8612aae747 mysql-4.0.16.ebuild 7532
 MD5 4e94ec432a61436cf02478c151ee22a3 mysql-4.0.13-r4.ebuild 7305
-MD5 10d000d3030fee06b9e3388c2d30a835 mysql-3.23.57.ebuild 6552
-MD5 3c439b07f29fc7539472b2a29bab797b ChangeLog 13780
+MD5 bf8df935e69b40022ad01b230057518a mysql-4.0.14-r1.ebuild 7430
+MD5 ff1b26ec554b3c94deb3c56369a0421c mysql-4.0.14-r2.ebuild 7583
+MD5 00510396054168fba8d17ab1b719bdd6 mysql-4.0.14.ebuild 6932
+MD5 01aa121c83d53d482631bdee3de3e2db mysql-4.0.15-r1.ebuild 7707
 MD5 2b2f1f26832190e10e32faa219c80e42 mysql-4.0.15.ebuild 7589
-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
-MD5 707d18c98dd9d86533b53330a2daadd2 files/mysql-4.0.rc6 951
-MD5 59d4ed13d13e7adcc754c5c35f4f04f3 files/mysql-4.0.15.rc6 964
+MD5 574eaedd27272933c6a85f8612aae747 mysql-4.0.16.ebuild 7532
+MD5 f7280477443829eb91cc5e0ab4230a92 mysql-4.0.17.ebuild 7893
 MD5 015a823e06d7181373b0601e4a17c284 files/digest-mysql-3.23.52-r1 67
+MD5 296a01da527263926d20aca0446bc87d files/digest-mysql-3.23.56 67
+MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57 67
 MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57-r1 67
-MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
-MD5 d3830060b3f74d6c0916ed85a6bbf02d files/mysql-3.23-install-db-sh.diff 1368
-MD5 7d92ba9c74a73bf3c852a5c078c16d29 files/rebuilder.sh 1557
 MD5 a77a12a8e251ca0d82d3027b7b50c762 files/digest-mysql-4.0.12 1371
+MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r4 66
 MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14 66
+MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14-r1 66
+MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14-r2 66
 MD5 68e456716a2026e49c85766696180bfc files/digest-mysql-4.0.15 66
+MD5 68e456716a2026e49c85766696180bfc files/digest-mysql-4.0.15-r1 66
 MD5 b3d105fcbd2750964387bfcc010c145e files/digest-mysql-4.0.16 66
 MD5 02c1c39a55937905f61ff17dcdb2ec0a files/digest-mysql-4.0.17 66
-MD5 ee578e3021841ef9dba4175403564136 files/mysql-4.0-db-3.2.1.diff 1047
-MD5 f2905bbcc3f148a2ad689792917bd78d files/mysql-4.0.16-install-db-sh.diff 1429
-MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
-MD5 5bfc671c63667e6f4c8d48f9edc6076e files/mysql.init 904
-MD5 fc80f877fa97f0f3a52ee684ce7f54b2 files/mysql-4.0.16-mysqld-safe-sh.diff 1562
-MD5 f635289f8422fdf26ba3c3dbdf99c4e2 files/mysql-4.0.14-mysqld-safe-sh.diff 1503
-MD5 e68c5d7e3c48028c4cf7e55ea8396013 files/mysql-4.0-install-db-sh.diff 1271
-MD5 e501d0f33d9d0be73b37c310099011d2 files/mysql-4.0.14-security-28394.patch 654
 MD5 47c66444b6a1e2243eadf931d52d34b2 files/my.cnf 1229
+MD5 75e99b8e628e380551260d64553a9a10 files/my.cnf-4.0.14-r1 2813
+MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
+MD5 d3830060b3f74d6c0916ed85a6bbf02d files/mysql-3.23-install-db-sh.diff 1368
+MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
+MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
+MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
+MD5 f49e58771365cb075ece153403811872 files/mysql-3.23.51-tcpd.patch 601
 MD5 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366
+MD5 ee578e3021841ef9dba4175403564136 files/mysql-4.0-db-3.2.1.diff 1047
+MD5 e68c5d7e3c48028c4cf7e55ea8396013 files/mysql-4.0-install-db-sh.diff 1271
 MD5 d1e79f7a155e45c69558f083fcb1139d files/mysql-4.0-my-print-defaults.diff 240
-MD5 f49e58771365cb075ece153403811872 files/mysql-3.23.51-tcpd.patch 601
-MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
-MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
-MD5 296a01da527263926d20aca0446bc87d files/digest-mysql-3.23.56 67
-MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57 67
+MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
+MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
+MD5 152b9a8feef16df47b56c316c5c0601e files/mysql-4.0.13-thrssl.patch 813
+MD5 f635289f8422fdf26ba3c3dbdf99c4e2 files/mysql-4.0.14-mysqld-safe-sh.diff 1503
 MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465
-MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
-MD5 75e99b8e628e380551260d64553a9a10 files/my.cnf-4.0.14-r1 2813
+MD5 e501d0f33d9d0be73b37c310099011d2 files/mysql-4.0.14-security-28394.patch 654
+MD5 59d4ed13d13e7adcc754c5c35f4f04f3 files/mysql-4.0.15.rc6 964
+MD5 f2905bbcc3f148a2ad689792917bd78d files/mysql-4.0.16-install-db-sh.diff 1429
+MD5 fc80f877fa97f0f3a52ee684ce7f54b2 files/mysql-4.0.16-mysqld-safe-sh.diff 1562
 MD5 9b5ad94f6e99e65bc3373c9dd15dff08 files/mysql-4.0.17-thrssl.patch 637
-MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r4 66
-MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14-r1 66
-MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14-r2 66
-MD5 68e456716a2026e49c85766696180bfc files/digest-mysql-4.0.15-r1 66
-MD5 152b9a8feef16df47b56c316c5c0601e files/mysql-4.0.13-thrssl.patch 813
+MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
+MD5 707d18c98dd9d86533b53330a2daadd2 files/mysql-4.0.rc6 951
+MD5 5bfc671c63667e6f4c8d48f9edc6076e files/mysql.init 904
+MD5 7d92ba9c74a73bf3c852a5c078c16d29 files/rebuilder.sh 1557
diff --git a/dev-db/mysql/mysql-4.0.12.ebuild b/dev-db/mysql/mysql-4.0.12.ebuild
index 019b92cdd06c..0c2474d00cb6 100644
--- a/dev-db/mysql/mysql-4.0.12.ebuild
+++ b/dev-db/mysql/mysql-4.0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.12.ebuild,v 1.7 2003/12/05 21:07:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.12.ebuild,v 1.8 2004/02/04 10:14:27 kumba Exp $
 
 #to accomodate -laadeedah releases
 NEWP=${P}
@@ -19,7 +19,7 @@ SRC_URI="ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/${SDIR}/${NEWP}.tar.gz
 	ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/${SDIR}/${NEWP}.tar.gz
 	ftp://mysql.valueclick.com/pub/mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
 
-KEYWORDS="~x86 ~sparc ~ppc arm"
+KEYWORDS="~x86 ~sparc ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="static readline innodb berkdb tcpd ssl debug"
diff --git a/dev-db/mysql/mysql-4.0.13-r4.ebuild b/dev-db/mysql/mysql-4.0.13-r4.ebuild
index a787a739f63f..3a5e404a90b1 100644
--- a/dev-db/mysql/mysql-4.0.13-r4.ebuild
+++ b/dev-db/mysql/mysql-4.0.13-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.13-r4.ebuild,v 1.3 2003/12/05 21:07:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.13-r4.ebuild,v 1.4 2004/02/04 10:14:27 kumba Exp $
 
 inherit eutils
 #to accomodate -laadeedah releases
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.mysql.com/"
 SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
 RESTRICT="nomirror"
 
-KEYWORDS="x86 sparc ppc arm amd64 hppa"
+KEYWORDS="x86 sparc ppc amd64 hppa"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="static readline innodb berkdb tcpd ssl perl debug"
diff --git a/dev-db/mysql/mysql-4.0.17.ebuild b/dev-db/mysql/mysql-4.0.17.ebuild
index bf4c82cfbf79..4752d2b109ee 100644
--- a/dev-db/mysql/mysql-4.0.17.ebuild
+++ b/dev-db/mysql/mysql-4.0.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.17.ebuild,v 1.2 2004/01/10 18:49:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.17.ebuild,v 1.3 2004/02/04 10:14:27 kumba Exp $
 
 inherit eutils
 #to accomodate -laadeedah releases
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.mysql.com/"
 SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
 RESTRICT="nomirror"
 
-KEYWORDS="ia64 ~x86 ~sparc ~ppc ~arm amd64 ~hppa ~alpha"
+KEYWORDS="ia64 ~x86 ~sparc ~ppc ~arm amd64 ~hppa ~alpha ~mips"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="static readline innodb berkdb tcpd ssl perl debug"
@@ -45,6 +45,16 @@ warning() {
 
 pkg_setup() {
 	warning
+
+	# MySQL on mips cannot link to berkdb due to issues.
+	if [ "`use mips`" ]; then
+		if [ "`use berkdb`" ]; then
+			echo -e ""
+			eerror "You cannot link MySQL into berkeley db on mips.  Please remove the \"berkdb\""
+			eerror "flag from your USE settings and try again."
+			echo -e ""
+		fi
+	fi
 }
 
 src_unpack() {