Marked 4.0.18-r2 stable on mips, removed berkdb check on mips from pkg_setup, and added mips to list of arches that need to build w/o berkdb.

7 files changed, 28 insertions, 72 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 727023fa7bf6..ea8aad991f42 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,12 @@
 # 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.104 2004/05/20 06:45:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.105 2004/05/25 01:45:56 kumba Exp $
+
+  24 May 2004; Joshua Kinard <kumba@gentoo.org> mysql-4.0.18-r1.ebuild,
+  mysql-4.0.18-r2.ebuild, mysql-4.0.18.ebuild, mysql-4.0.19.ebuild,
+  mysql-4.0.20.ebuild:
+  Marked 4.0.18-r2 stable on mips, removed berkdb check on mips from pkg_setup,
+  and added mips to list of arches that need to build w/o berkdb.
 
   19 May 2004; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.18-r2.ebuild,
   mysql-4.0.20.ebuild:
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 09d559e333fa..9dbae73c94b6 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,4 +1,4 @@
-MD5 acd43379f83d6c3ff8f946b5698b1120 ChangeLog 16439
+MD5 7a0e5352d20d0f9b59e89cd014bead3f ChangeLog 16749
 MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163
 MD5 c8b57d37000785a37441b27fefd03c35 mysql-3.23.52-r1.ebuild 5876
 MD5 ed43563aae8ad4424a3cd41253648649 mysql-3.23.56.ebuild 6554
@@ -13,11 +13,11 @@ MD5 4009aa34d12cb1694909d42e9dd89b4e mysql-4.0.15-r1.ebuild 7702
 MD5 b8dce8595473c0f3462af8dc9304edbe mysql-4.0.15.ebuild 7584
 MD5 7130270f9943012b55212c15ed001162 mysql-4.0.16.ebuild 7526
 MD5 12c6d7cf5533817384e83a94caff4613 mysql-4.0.17.ebuild 7979
-MD5 0ed9c337db2230c563d326e178ca80bb mysql-4.0.18-r1.ebuild 8128
-MD5 cbe76f160d1197a15323ea5318323608 mysql-4.0.18.ebuild 7958
-MD5 6be83fe764c6bb036f703c2e19815bf8 mysql-4.0.18-r2.ebuild 8137
-MD5 97d770ed72a71b1b0634248e39050fb3 mysql-4.0.19.ebuild 8223
-MD5 a1c52b8433e270655ea39e690f0b3799 mysql-4.0.20.ebuild 8144
+MD5 f70a9b8d2ede9db440ec1c3b8c76852b mysql-4.0.18-r1.ebuild 7846
+MD5 b50a64436217c20256817749467a82e9 mysql-4.0.18-r2.ebuild 7854
+MD5 96ab1015a81ca93a854752fa76fb637c mysql-4.0.18.ebuild 7676
+MD5 3330a9cb057c35280573983f4c951b0e mysql-4.0.19.ebuild 7941
+MD5 a072f5e3b54978a4e56328df341900d5 mysql-4.0.20.ebuild 7862
 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
@@ -33,6 +33,9 @@ MD5 b3d105fcbd2750964387bfcc010c145e files/digest-mysql-4.0.16 66
 MD5 02c1c39a55937905f61ff17dcdb2ec0a files/digest-mysql-4.0.17 66
 MD5 748cfc1902ce23fac508e803ed6907ee files/digest-mysql-4.0.18 66
 MD5 748cfc1902ce23fac508e803ed6907ee files/digest-mysql-4.0.18-r1 66
+MD5 748cfc1902ce23fac508e803ed6907ee files/digest-mysql-4.0.18-r2 66
+MD5 b776101113ddfd5cda3cdc0ccf2f08c1 files/digest-mysql-4.0.19 66
+MD5 577f09c36de46438158d16c2c855ec13 files/digest-mysql-4.0.20 66
 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
@@ -59,13 +62,10 @@ MD5 58c4d09c5c2712254b1881a6fcc7abff files/mysql-4.0.18-gentoo-nptl.diff 587
 MD5 68cbaa353f522c0a404a4d07693f917d files/mysql-4.0.18-install-db-sh.diff 1473
 MD5 a76ec36b83c2f0dbfba65c993f75d135 files/mysql-4.0.18-mysqlbugsecurity.diff 672
 MD5 d20c23adca5b8731ebfab4d1b5771dab files/mysql-4.0.18-mysqld-safe-sh.diff 1307
+MD5 ad5636b398982a23f6fc58f18a2114fc files/mysql-4.0.18-mysqldmultisecurity.diff 3863
 MD5 f599e8b3eb4636bb61721525dc15f5f5 files/mysql-4.0.18-thrssl.patch 723
 MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
 MD5 a45105d9d4ec0baca32ac9cca0350f17 files/mysql-4.0.rc6 940
 MD5 6f8de46485ea7dcf886e1747fb117427 files/mysql-gentoo-nptl.diff 654
 MD5 b959fc15281a858c87b587033a432334 files/mysql.init 893
 MD5 7d92ba9c74a73bf3c852a5c078c16d29 files/rebuilder.sh 1557
-MD5 748cfc1902ce23fac508e803ed6907ee files/digest-mysql-4.0.18-r2 66
-MD5 b776101113ddfd5cda3cdc0ccf2f08c1 files/digest-mysql-4.0.19 66
-MD5 577f09c36de46438158d16c2c855ec13 files/digest-mysql-4.0.20 66
-MD5 ad5636b398982a23f6fc58f18a2114fc files/mysql-4.0.18-mysqldmultisecurity.diff 3863
diff --git a/dev-db/mysql/mysql-4.0.18-r1.ebuild b/dev-db/mysql/mysql-4.0.18-r1.ebuild
index 0e190a2890d1..89a0dce894d4 100644
--- a/dev-db/mysql/mysql-4.0.18-r1.ebuild
+++ b/dev-db/mysql/mysql-4.0.18-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.18-r1.ebuild,v 1.7 2004/05/23 13:36:43 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.18-r1.ebuild,v 1.8 2004/05/25 01:45:56 kumba Exp $
 
 inherit eutils
 #to accomodate -laadeedah releases
@@ -45,16 +45,6 @@ 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() {
@@ -106,7 +96,7 @@ src_compile() {
 
 	#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 || use alpha || use hppa
+	if use sparc || use sparc64 || use alpha || use hppa || use mips
 	then
 		myconf="${myconf} --without-berkeley-db"
 	else
diff --git a/dev-db/mysql/mysql-4.0.18-r2.ebuild b/dev-db/mysql/mysql-4.0.18-r2.ebuild
index d87dad241ae1..b13a96f5a494 100644
--- a/dev-db/mysql/mysql-4.0.18-r2.ebuild
+++ b/dev-db/mysql/mysql-4.0.18-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.18-r2.ebuild,v 1.3 2004/05/23 13:36:43 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.18-r2.ebuild,v 1.4 2004/05/25 01:45:56 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 amd64 hppa alpha ~mips s390"
+KEYWORDS="~ia64 x86 sparc ppc amd64 hppa alpha mips s390"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="static readline innodb berkdb tcpd ssl perl debug"
@@ -45,16 +45,6 @@ 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() {
@@ -108,7 +98,7 @@ src_compile() {
 
 	#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 || use alpha || use hppa
+	if use sparc || use sparc64 || use alpha || use hppa || use mips
 	then
 		myconf="${myconf} --without-berkeley-db"
 	else
diff --git a/dev-db/mysql/mysql-4.0.18.ebuild b/dev-db/mysql/mysql-4.0.18.ebuild
index f828d21007ef..a3ffc86d51d0 100644
--- a/dev-db/mysql/mysql-4.0.18.ebuild
+++ b/dev-db/mysql/mysql-4.0.18.ebuild
@@ -1,6 +1,6 @@
 # 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.18.ebuild,v 1.4 2004/05/23 13:36:43 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.18.ebuild,v 1.5 2004/05/25 01:45:56 kumba Exp $
 
 inherit eutils
 #to accomodate -laadeedah releases
@@ -45,16 +45,6 @@ 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() {
@@ -102,7 +92,7 @@ src_compile() {
 
 	#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 || use alpha || use hppa
+	if use sparc || use sparc64 || use alpha || use hppa || use mips
 	then
 		myconf="${myconf} --without-berkeley-db"
 	else
diff --git a/dev-db/mysql/mysql-4.0.19.ebuild b/dev-db/mysql/mysql-4.0.19.ebuild
index 8cfcc594b1cf..f8823862c25c 100644
--- a/dev-db/mysql/mysql-4.0.19.ebuild
+++ b/dev-db/mysql/mysql-4.0.19.ebuild
@@ -1,6 +1,6 @@
 # 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.19.ebuild,v 1.2 2004/05/23 13:36:43 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.19.ebuild,v 1.3 2004/05/25 01:45:56 kumba Exp $
 
 inherit eutils
 #to accomodate -laadeedah releases
@@ -45,16 +45,6 @@ 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() {
@@ -108,7 +98,7 @@ src_compile() {
 
 	#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 || use alpha || use hppa
+	if use sparc || use sparc64 || use alpha || use hppa || use mips
 	then
 		myconf="${myconf} --without-berkeley-db"
 	else
diff --git a/dev-db/mysql/mysql-4.0.20.ebuild b/dev-db/mysql/mysql-4.0.20.ebuild
index 3341f4477118..121b63ec27dc 100644
--- a/dev-db/mysql/mysql-4.0.20.ebuild
+++ b/dev-db/mysql/mysql-4.0.20.ebuild
@@ -1,6 +1,6 @@
 # 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.20.ebuild,v 1.3 2004/05/23 13:36:43 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.20.ebuild,v 1.4 2004/05/25 01:45:56 kumba Exp $
 
 inherit eutils
 #to accomodate -laadeedah releases
@@ -45,16 +45,6 @@ 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() {
@@ -108,7 +98,7 @@ src_compile() {
 
 	#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 || use alpha || use hppa
+	if use sparc || use sparc64 || use alpha || use hppa || use mips
 	then
 		myconf="${myconf} --without-berkeley-db"
 	else