Backport more false positive disabling.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 0224cd4e970ee4a7ab3151033b6efe2ec69fb3a5..4081239478730d488e0e9355b2659caefca19485 100644 (file)
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,9 @@
 # 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.514 2010/03/08 20:58:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.515 2010/03/08 21:01:53 robbat2 Exp $
+
+  08 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.0.90-r2.ebuild:
+  Backport more false positive disabling.
 
   08 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.39-r1.ebuild,
   mysql-5.1.44.ebuild, mysql-5.1.44-r1.ebuild:

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index ed4bc1c8cea64f683b8d17c6dfbfea86bd577ec5..2e3bb7f60f99f62d741315927aabb0da3cc2fe46 100644 (file)
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -51,12 +51,12 @@ EBUILD mysql-5.0.84.ebuild 5728 RMD160 e6168a3c0a6c7b282fba4a2a4de2d8a77315fd3c
 EBUILD mysql-5.0.87.ebuild 5498 RMD160 e5c016baedb2fc2bea338612220656fc36eead4b SHA1 6c31344784680fe2f033c9cd57bb5d210dd81c1d SHA256 6cdec172f8805370a32809e12c5aef4ebf78bc80678a8c0365bc3f25128aa85a
 EBUILD mysql-5.0.88.ebuild 5515 RMD160 db7ceab652c3c7559ed7abe1af72af08bfdd5ce5 SHA1 4d9ebb049e09624d016378b48e8e5e21e4ffce3d SHA256 89e4025a8148807ab066224836c7cd70110a2fe08b2d6ff412773b109c728707
 EBUILD mysql-5.0.90-r1.ebuild 5501 RMD160 bbeccc03388ba02cb748170d3b8462969275dc78 SHA1 dfa2bed27451a4a8beb971e56c10ab0185d34125 SHA256 8349633f2d18da118bf2c8093c4d5e16de40eb7e5d1254014f9bf5f51fe6012e
-EBUILD mysql-5.0.90-r2.ebuild 5493 RMD160 3b0def9f2bc2e53f235eecf3b1993e4b2ca8c833 SHA1 f00256473b98bc4b477e9a61cc3c1f06303bfdbb SHA256 dd682cd3d7d89f9f8fd1960faabfad60ce23f9b3f801de1a9bc36f4746006b97
+EBUILD mysql-5.0.90-r2.ebuild 5981 RMD160 7c3da03a9e9b7f3c8d1072492fd32fbeaa15ffac SHA1 d0d48901dc67cca1b2dfc026ead663c140259606 SHA256 6ac54f987f1e7ecd532b5a55118e4fee1b442ae688dbea15f6dad36a0b9dbc29
 EBUILD mysql-5.0.90.ebuild 5498 RMD160 5505ceaeee0b324232317ead5bd355f3be355f91 SHA1 dd4fe65ab2297d76330e215f713b9abbdb9bd3b2 SHA256 8fa1058aadfbf449c25636ecbfe21474ec245f869ac54cc59210de602f27dbe8
 EBUILD mysql-5.1.39-r1.ebuild 6356 RMD160 7894d7045e3df7e3ba84d91d571b1d7ddfd74e36 SHA1 8af510054e18e46db6d5f86645e3597628d9a96e SHA256 3c30b5a8bfb4999c47df6e58062833e4b43c253733191f7080f88965842672f6
 EBUILD mysql-5.1.44-r1.ebuild 6657 RMD160 7e732b99ffe538db65c46871557c5d7b14bb2bf6 SHA1 2b50723e8b52b764fde6e1932c8cb28cd0ef19a9 SHA256 b335570e37912eab210917b43a2ea1e682653bfe778b14843fdbb51cc3dc73d2
 EBUILD mysql-5.1.44.ebuild 6308 RMD160 dbd499803dc29686e81eae51de5c4e5b88711df2 SHA1 94edd5368ea4302afc7ff7e5e5f3aecbed90fd66 SHA256 097d3f4b0b38e6577eeaea1400e5d84e6907d322a271751d3c59db9ea75da869
 EBUILD mysql-5.4.3_beta.ebuild 6552 RMD160 c0e943242b3fd898b52b589b1343828ab3452360 SHA1 a692041ee535fc7f2bfca053cab7fa9a4e3bb2d6 SHA256 c02698c229c49011d9ed2b97a6e795157fe93a1e07e70a4a1a30590ecc00f2c4
 EBUILD mysql-5.5.1_alpha_pre2.ebuild 6780 RMD160 fafa406cc9d903c2722ef94d2463c8fa8473bb2b SHA1 00fb6df947a8a89f53014ae4de8ba5bf19c511c1 SHA256 1c0bc1df968ef5b73274639205157132246428e2ef103ca551d03d5cd799ed39
-MISC ChangeLog 100272 RMD160 fe2fc43e42236f39706aa8e1015353d287ab7166 SHA1 7e7aed598270c4256469ba105aea5f1c147be1a3 SHA256 0332f2eac874d4429ee84f6d9f6979015c49317bdeea9c2e3071a7c0185ba48a
+MISC ChangeLog 100392 RMD160 0ec4f17fd6634f67eed07a356d7e8b77a2f633cd SHA1 fa931ad8b1209c8c2b9ddc281e039534768cc6fa SHA256 13ab1e652c7b89114e017525bac15478c59faab6d4667a397c87968c7efc367c
 MISC metadata.xml 1389 RMD160 711fe2927a95bff06abbba5209a1e03fd99ba7b5 SHA1 adaf717edeadad3ebe8e7b486d75477b2ec5433b SHA256 562726facccb1c1808b74c0e17f052ca03c92c0ada689375e527b2a5405a5a0a

diff --git a/dev-db/mysql/mysql-5.0.90-r2.ebuild b/dev-db/mysql/mysql-5.0.90-r2.ebuild
index aabadcf1a836551da2cd607f3a3ca513fbfa9ffc..2285ad8554650e764a4f02016bce94e65e2f13bc 100644 (file)
--- a/dev-db/mysql/mysql-5.0.90-r2.ebuild
+++ b/dev-db/mysql/mysql-5.0.90-r2.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.0.90-r2.ebuild,v 1.3 2010/03/06 21:34:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.90-r2.ebuild,v 1.4 2010/03/08 21:01:53 robbat2 Exp $
 
 MY_EXTRAS_VER="20100221-0021Z"
 EAPI=2
@@ -123,7 +123,7 @@ src_test() {
                # expired/invalid.
                case ${PV} in
                        5.0.*|5.1.*)
-                               for t in openssl_1 rpl_openssl rpl_ssl ssl ssl_8k_key \
+                               for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \
                                        ssl_compress ssl_connect ; do \
                                        mysql_disable_test \
                                                "$t" \
@@ -131,6 +131,22 @@ src_test() {
                                done
                        ;;
                esac
+               
+               # These are also failing in MySQL 5.0 for now, and are believed to be
+               # false positives:
+               #
+               # main.mysql_comment, main.mysql_upgrade:
+               # fails due to USE=-latin1 / utf8 default
+               #
+               # main.mysql_client_test:
+               # segfaults at random under Portage only, suspect resource limits.
+               case ${PV} in
+                       5.0.*)
+                       for t in main.mysql_client_test main.mysql_comments main.mysql_upgrade; do
+                               mysql_disable_test  "$t" "False positives in Gentoo"
+                       done
+                       ;;
+               esac
 
                # create directories because mysqladmin might right out of order
                mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}