Disable cluster from the official test runs. Will be handled by the upcoming mysql-cluster package instead.

(Portage version: 2.2_rc61/cvs/Linux x86_64)

7 files changed, 19 insertions, 13 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 1a3c8b64271f..52a64473dd98 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mysql
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.507 2010/02/10 21:46:53 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.508 2010/02/15 21:27:54 robbat2 Exp $
+
+  15 Feb 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.39.ebuild,
+  mysql-5.1.41.ebuild, mysql-5.1.42.ebuild, mysql-5.1.43.ebuild,
+  mysql-5.4.3_beta.ebuild, mysql-5.5.1_alpha_pre2.ebuild:
+  Disable cluster from the official test runs. Will be handled by the
+  upcoming mysql-cluster package instead.
 
   10 Feb 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   mysql-5.1.39.ebuild, mysql-5.1.41.ebuild, mysql-5.1.42.ebuild,
diff --git a/dev-db/mysql/mysql-5.1.39.ebuild b/dev-db/mysql/mysql-5.1.39.ebuild
index 205a31f48a05..177d074669fc 100644
--- a/dev-db/mysql/mysql-5.1.39.ebuild
+++ b/dev-db/mysql/mysql-5.1.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.39.ebuild,v 1.3 2010/02/10 21:46:53 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.39.ebuild,v 1.4 2010/02/15 21:27:54 robbat2 Exp $
 
 MY_EXTRAS_VER="20100201-0104Z"
 EAPI=2
@@ -29,7 +29,7 @@ RDEPEND="!media-sound/amarok[embedded]"
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
 # Official test instructions:
-# USE='berkdb cluster embedded extraengine perl ssl community' \
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mysql-X.X.XX.ebuild \
 # digest clean package
diff --git a/dev-db/mysql/mysql-5.1.41.ebuild b/dev-db/mysql/mysql-5.1.41.ebuild
index c1c672db8cb1..b72b0a6c293c 100644
--- a/dev-db/mysql/mysql-5.1.41.ebuild
+++ b/dev-db/mysql/mysql-5.1.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.41.ebuild,v 1.3 2010/02/10 21:46:53 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.41.ebuild,v 1.4 2010/02/15 21:27:54 robbat2 Exp $
 
 MY_EXTRAS_VER="20100201-0104Z"
 EAPI=2
@@ -26,7 +26,7 @@ RDEPEND="!media-sound/amarok[embedded]"
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
 # Official test instructions:
-# USE='berkdb cluster embedded extraengine perl ssl community' \
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mysql-X.X.XX.ebuild \
 # digest clean package
diff --git a/dev-db/mysql/mysql-5.1.42.ebuild b/dev-db/mysql/mysql-5.1.42.ebuild
index 9644c272742b..926b1d5587f9 100644
--- a/dev-db/mysql/mysql-5.1.42.ebuild
+++ b/dev-db/mysql/mysql-5.1.42.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.42.ebuild,v 1.3 2010/02/10 21:46:53 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.42.ebuild,v 1.4 2010/02/15 21:27:54 robbat2 Exp $
 
 MY_EXTRAS_VER="20100201-0104Z"
 EAPI=2
@@ -30,7 +30,7 @@ RDEPEND="!media-sound/amarok[embedded]"
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
 # Official test instructions:
-# USE='berkdb cluster embedded extraengine perl ssl community' \
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mysql-X.X.XX.ebuild \
 # digest clean package
diff --git a/dev-db/mysql/mysql-5.1.43.ebuild b/dev-db/mysql/mysql-5.1.43.ebuild
index 1ef7ac46f82e..bdfc70d7d5e4 100644
--- a/dev-db/mysql/mysql-5.1.43.ebuild
+++ b/dev-db/mysql/mysql-5.1.43.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.43.ebuild,v 1.3 2010/02/10 21:46:53 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.43.ebuild,v 1.4 2010/02/15 21:27:54 robbat2 Exp $
 
 MY_EXTRAS_VER="20100201-0104Z"
 EAPI=2
@@ -26,7 +26,7 @@ RDEPEND="!media-sound/amarok[embedded]"
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
 # Official test instructions:
-# USE='berkdb cluster embedded extraengine perl ssl community' \
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mysql-X.X.XX.ebuild \
 # digest clean package
diff --git a/dev-db/mysql/mysql-5.4.3_beta.ebuild b/dev-db/mysql/mysql-5.4.3_beta.ebuild
index 2a9eb149f898..d82b69cd0ee7 100644
--- a/dev-db/mysql/mysql-5.4.3_beta.ebuild
+++ b/dev-db/mysql/mysql-5.4.3_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.4.3_beta.ebuild,v 1.2 2010/02/10 21:46:53 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.4.3_beta.ebuild,v 1.3 2010/02/15 21:27:54 robbat2 Exp $
 
 MY_EXTRAS_VER="20100201-0104Z"
 EAPI=2
@@ -26,7 +26,7 @@ RDEPEND="!media-sound/amarok[embedded]"
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
 # Official test instructions:
-# USE='berkdb cluster embedded extraengine perl ssl community' \
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mysql-X.X.XX.ebuild \
 # digest clean package
diff --git a/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild b/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild
index e7891d3fa83a..3a61faf0bfd5 100644
--- a/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild
+++ b/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.2 2010/02/10 21:46:53 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.3 2010/02/15 21:27:54 robbat2 Exp $
 
 MY_EXTRAS_VER="20100201-0104Z"
 EAPI=2
@@ -28,7 +28,7 @@ RDEPEND="!media-sound/amarok[embedded]"
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
 # Official test instructions:
-# USE='berkdb cluster embedded extraengine perl ssl community' \
+# USE='berkdb -cluster embedded extraengine perl ssl community' \
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mysql-X.X.XX.ebuild \
 # digest clean package