Bug #319667: Disable the multi_repmgr tests in a different way.

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

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 1bb16759daf041d0e0cb0e1e1ca90d3086c2ea1e..1890ef670f9a106dff5c7ba62cc540f4b93897d4 100644 (file)
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.305 2010/05/14 03:20:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.306 2010/05/14 10:56:44 robbat2 Exp $
+
+  14 May 2010; Robin H. Johnson <robbat2@gentoo.org> db-5.0.21-r1.ebuild:
+  Bug #319667: Disable the multi_repmgr tests in a different way.
 
   14 May 2010; Robin H. Johnson <robbat2@gentoo.org> -db-5.0.21.ebuild:
   Remove broken 5.0.21.

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index c85e89f13245bb502c0d20e3562bf61b1e5566a4..23e72ea69e223173932382f6bb6f35085154f59f 100644 (file)
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -81,6 +81,6 @@ EBUILD db-4.7.25_p4.ebuild 4353 RMD160 ee5995cda8b373e842b92ca365adb7ad03b3b4e6
 EBUILD db-4.8.24.ebuild 4431 RMD160 3ed6aa7cd48f9824bdf8b2cb4f44b5fc48fe887c SHA1 968afb91b4c4eef1fc1ee5745a044d38776d0a2e SHA256 ef5d888687d88dab2aac25234df1c6376343aee7d68b9277254d678f043706e5
 EBUILD db-4.8.26.ebuild 4431 RMD160 b5ada7784ee0ff0ecff7bcbd10a72a64abb6271c SHA1 c884f625ead196b4e1afaf428cf394b8008ef4a4 SHA256 ba81971dc4090bc318cdfa6ec02e5dad68693b038a5fa03827f83e677089e5fd
 EBUILD db-4.8.30.ebuild 4431 RMD160 79ad467c23dd37c895542fd4d1cb1839d1dd16dc SHA1 f6e4a3314c118c72aa1da277e1a8c3382c53dbab SHA256 2265aba0c86de5423f17b2b0db0998d14fdcb65a045e9da968b3ecd9840965d2
-EBUILD db-5.0.21-r1.ebuild 5341 RMD160 3447f73996f03d78006879b381bf4094739a1d58 SHA1 927cd54339f20ec134acf53864312528fe22d321 SHA256 8e47b25d2d4daccb1aa285c3bf507b2b5c60784449b4bb94712fbdd7554314bb
-MISC ChangeLog 47934 RMD160 7c9e731bd754e0268275d5562e33c767608bc320 SHA1 3fb371297724da2d7f63e6a9f716e7c2356dc521 SHA256 43008c24a0353ad37dd531f6200bd642df5e209dd11742f7bcbc70268869a71c
+EBUILD db-5.0.21-r1.ebuild 5366 RMD160 473e53358830d7cb37391c98549144df8cd56078 SHA1 89d7a01c4de83e3d14fa08ed81fc714dcd5c37a9 SHA256 6f6e8371ba59d3593592f468e66d83b6e1b737eac1a624445f1c3cba8eb0072a
+MISC ChangeLog 48075 RMD160 fe1f120b6cc4fbe22ed6f98e2eb0da7230a5649a SHA1 4cf1c900da34e48ba9d2057152a09d880cda47f4 SHA256 9e63bc2b5a93c52e710e5901c0ded4ff344f374f3940e4a57326e97f88a1a79c
 MISC metadata.xml 1657 RMD160 f474f2ae4512bb017c5f6d344d5d2d1b03dc6b47 SHA1 f24d5b8ab267859ddc9c1ddb0c10992d31809ec9 SHA256 cb82ec7afe1d3df3b38835aa74a6d467f5b31f98a783df9a01396a546acdf044

diff --git a/sys-libs/db/db-5.0.21-r1.ebuild b/sys-libs/db/db-5.0.21-r1.ebuild
index 6816448e46fc4a7da4b2aa3e6318482e5940fbbe..3303b0001635518f74ee09c73ed91d83b2c3c486 100644 (file)
--- a/sys-libs/db/db-5.0.21-r1.ebuild
+++ b/sys-libs/db/db-5.0.21-r1.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/sys-libs/db/db-5.0.21-r1.ebuild,v 1.1 2010/05/14 03:19:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.0.21-r1.ebuild,v 1.2 2010/05/14 10:56:44 robbat2 Exp $
 
 EAPI=2
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
@@ -188,12 +188,13 @@ src_test() {
        # db_repsite is impossible to build, as upstream strips those sources.
        # db_repsite is used directly in the setup_site_prog,
        # setup_site_prog is called from open_site_prog
-       # which is called only from tests
-       egrep -ril \
-               'open_site_prog|setup_site_prog|db_repsite' \
-               "${S_BASE}/test" \
-               | xargs egrep -l '^# TEST ' \
-               | xargs rename .tcl .tcl.DISABLED
+       # which is called only from tests in the multi_repmgr group.
+       #sed -ri \
+       #       -e '/set subs/s,multi_repmgr,,g' \
+       #       "${S_BASE}/test/testparams.tcl"
+       sed -ri \
+               -e '/multi_repmgr/d' \
+               "${S_BASE}/test/test.tcl"
 
        db_src_test
 }