[gentoo-commits] proj/mysql:master commit in: dev-db/mysql/

["Robin H. Johnson" <robbat2@gentoo.org>]

commit:     29ff3c75779d22026f09dd5912689727ff95b43c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  2 02:46:15 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Feb  2 02:46:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=29ff3c75

Port test disable from main tree back.

(Portage version: 2.2.0_alpha84/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 dev-db/mysql/Manifest            |    6 +++---
 dev-db/mysql/mysql-5.1.61.ebuild |   10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index bd02b12..e63be05 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -27,7 +27,7 @@ EBUILD mysql-5.0.92.ebuild 6584 RMD160 2bd8c049fca18eb04f3e641018824d714926ed65
 EBUILD mysql-5.1.58-r1.ebuild 8718 RMD160 1f30fee1c2d6c0830f9dd7a048a2755e52f68283 SHA1 42a0225f0d0cf5d491335cd7bfce105a8bebefd7 SHA256 f312b2a0a57512c78a110e00d205f6548859d53e790b994257494f5f1a9e6951
 EBUILD mysql-5.1.59.ebuild 8718 RMD160 1f30fee1c2d6c0830f9dd7a048a2755e52f68283 SHA1 42a0225f0d0cf5d491335cd7bfce105a8bebefd7 SHA256 f312b2a0a57512c78a110e00d205f6548859d53e790b994257494f5f1a9e6951
 EBUILD mysql-5.1.60.ebuild 8718 RMD160 b93a58ca719553e9e644394a102f1db34d277d22 SHA1 67ec0ef859b7671f1bfd023efecd3332d943e21d SHA256 878303790f45832461209587a16a249e86062485e81edb8bf1e8e2e082ac77ff
-EBUILD mysql-5.1.61.ebuild 8718 RMD160 b93a58ca719553e9e644394a102f1db34d277d22 SHA1 67ec0ef859b7671f1bfd023efecd3332d943e21d SHA256 878303790f45832461209587a16a249e86062485e81edb8bf1e8e2e082ac77ff
+EBUILD mysql-5.1.61.ebuild 8888 RMD160 418f097cc87e03c678872dd95ecdc2b44a2140b2 SHA1 abfaf4fa5bb10551db7b742e792e0f6c2d118c88 SHA256 0ea0d451bdd94314896fa8dbe167e38a37aafc7462807c6ede137c5b5e938708
 EBUILD mysql-5.5.10.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
 EBUILD mysql-5.5.12.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
 EBUILD mysql-5.5.14.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
@@ -36,7 +36,7 @@ EBUILD mysql-5.5.16.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46
 EBUILD mysql-5.5.17.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
 EBUILD mysql-5.5.18.ebuild 3916 RMD160 76009aec549974e273045b775534658c28546d46 SHA1 8b64e7397234a413ad32f08fff412c35fa878847 SHA256 74326b102935a0d0f7feb630e6b3e1372177a0d4e3aa506ef3becb9a5155c8e5
 EBUILD mysql-5.5.19.ebuild 4234 RMD160 24933ce6a8d4e778ae1c06eac4804068714b610f SHA1 dcf95ba85ad7ea27421adabbfd73b8e4e51c611a SHA256 31a9962b85f68baf3ff780f56a006a1e3293d304452b33afff0e24a66e032e01
-EBUILD mysql-5.5.20.ebuild 4234 RMD160 26eaee55ff2e336fdad5de7a8833b845c7448bec SHA1 b1450bb0baa3064d8a442b240a2f63e9703254d7 SHA256 39d742b618f84374097279fc3ce11017b0a2dd613046ba262c5dbe07b65cd2dc
+EBUILD mysql-5.5.20.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3
 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
-MISC ChangeLog 8557 RMD160 bb446dda1050e319c96c6a38ce32308345429b71 SHA1 4f5721841f563f980e0eda3a1e57163daad52de8 SHA256 07b9af8932bb03c3412e353086da17c11c8a271347ec89264466303857bb78d9
+MISC ChangeLog 8748 RMD160 299e76c4a6ddd0066591c986231656da131eb51e SHA1 c12dd278dd8d9115384d9d9f8af76bf33bc1b1e8 SHA256 edc9a4c24a4930e75b06e8fd0fe0ba9d3ca4110738d57bbcbeb9e42f2a707c36
 MISC metadata.xml 1252 RMD160 bb7f7acf92051eba2261f50021af2edd12bd87f4 SHA1 84a869403a9a1f201f369680e48284bf069fa3f4 SHA256 2859b3010d1f2b59600ba9c41c79f0ff53f9bcc8d0ef282d552a768a076c1503

diff --git a/dev-db/mysql/mysql-5.1.61.ebuild b/dev-db/mysql/mysql-5.1.61.ebuild
index 0c85a89..9cdf8c2 100644
--- a/dev-db/mysql/mysql-5.1.61.ebuild
+++ b/dev-db/mysql/mysql-5.1.61.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.58.ebuild,v 1.1 2011/07/13 07:37:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.61.ebuild,v 1.2 2012/01/31 20:23:03 robbat2 Exp $
 
 EAPI="4"
 
@@ -19,7 +19,7 @@ inherit toolchain-funcs mysql-v2
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 # This is often broken still
@@ -217,11 +217,15 @@ src_test() {
 			done
 		fi
 
-		# bug 332565
 		if ! use extraengine ; then
+			# bug 332565
 			for t in main.range ; do
 				mysql-v2_disable_test $t "Test $t requires USE=extraengine"
 			done
+			# bug 401673
+			for t in federated.federated_plugin ; do
+				mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)"
+			done
 		fi
 
 		# create directories because mysqladmin might make out of order