Block test-unit:2 for testing.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 25 insertions, 14 deletions

diff --git a/dev-ruby/activerecord/ChangeLog b/dev-ruby/activerecord/ChangeLog
index 84deed7d6e79..d0bd9cfd19a8 100644
--- a/dev-ruby/activerecord/ChangeLog
+++ b/dev-ruby/activerecord/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/activerecord
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.136 2010/07/23 07:04:25 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.137 2010/08/15 19:21:00 flameeyes Exp $
+
+  15 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  activerecord-2.3.8-r1.ebuild:
+  Block test-unit:2 for testing.
 
 *activerecord-2.3.8-r1 (23 Jul 2010)
 
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 0b53fcfacda3..edf81ce77b77 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX activerecord-2.3.8-add-index-with-symbol.patch 2588 RMD160 d1cc83d8b13cab18ae92adec027bc0db203f87bf SHA1 2c5cea51ce571183a1ee7e29c1eee575e457564c SHA256 792750e8a065d78235d72d6549694bef3f2b3ffb537c699cd598d19d436a70cd
 DIST activerecord-2.2.3.gem 502784 RMD160 0932353f44e970e16909485de1e45ea196838aa0 SHA1 3c9b3d013775c7367247e5ecd120b1eb211520dd SHA256 49061503098a1abaa50de2498875361b4052354c7900d563d1f89a030d33fd10
@@ -8,14 +8,14 @@ DIST activerecord-2.3.8.gem 965120 RMD160 1831618e803c102599cbf71d555a168317b220
 EBUILD activerecord-2.2.3.ebuild 752 RMD160 805222255f40e1b3521743d320b8a5ce4ff131a3 SHA1 bd6c700159afdb29cb13e8caaed4a4bd5ad57d4a SHA256 3bf99459836dae1dd3abe47326dc896f3ddc12559ea6676cf49b04973470446a
 EBUILD activerecord-2.3.5-r1.ebuild 1593 RMD160 5988b665b81e4561f022b448fe5ebdb9ec3a0d04 SHA1 cc4dcf9cbff63797e8863c193ff5dda2df19ffeb SHA256 924e0fc56b73d8829a80a2e90925b4051f729b0d4925e400159529a5cd6c495a
 EBUILD activerecord-2.3.5.ebuild 759 RMD160 423882174ebb5f77589be12b48d9cee534b3510e SHA1 7c2ea43fa600e4fe892e50b828a5629ae882a4f6 SHA256 e6450804168fbd6756e9b2c7783d10bf01db54889e0219df34128454e282d15e
-EBUILD activerecord-2.3.8-r1.ebuild 1605 RMD160 dbc4ee7dbd72fd86f6fb2d00376c0dceb7b8c6b3 SHA1 13d4c50c314fe5161b52c26ae0c2f1958bac91fe SHA256 96a87149be41685b6abeb7c9a48399c986661b80046cd350a86c4f4534246455
+EBUILD activerecord-2.3.8-r1.ebuild 1533 RMD160 c2fad9137c6d8ecee8f185bd632302582849a568 SHA1 b2ce7275ba81042482aeb60a24afac6b927092d0 SHA256 a7b174a80278652f368c1dd13fb751fb81c1b2d94662c877ca5e9eae9287c69d
 EBUILD activerecord-2.3.8.ebuild 1546 RMD160 5e45b3d66c8c1d7521a34e41fe482b76892394e7 SHA1 5889f3f2a4b36e64e1fde5efedc7c4db347fbd54 SHA256 785013051a00829aebd79f376bf7d90248098322ff5129dd19cbd636c21d7ca9
-MISC ChangeLog 17986 RMD160 3e467fae4deb9ba1437750d508bfe3a45fcab1bb SHA1 c51e2517e4cdff6a5cabfc73da0453f79e58251c SHA256 2cac0aef9117aebb96d080c935c78a4ac26477260e2a6f186ed7e37bbaa68605
+MISC ChangeLog 18111 RMD160 bd52b1ff1040a4ff7f204decf6910d9083831db7 SHA1 78ba5284727e61647ec42d5617f6d1d2a507108b SHA256 8062c0579439dd51a7e4ea0bcdef4c8e2d5ac5af6a7f810fc6e2d9ff8f526ad2
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkxJPv8ACgkQZihJkut28SshdAD9HYSj7RoAwVFd52Xy105HD59r
-qxaKNx/E0omotr7j0CQBAL6+zaxoODBdy8bHviaPPM6xMSPXSDprdp1T6GZpKfW8
-=hkEW
+iEYEARECAAYFAkxoPf0ACgkQAiZjviIA2XgUqwCeN5+KbKbAVNcXzPsgHn/fG+cf
++VQAn2hx2KZYUrzVWyiKGTZp7oXvl9iU
+=c3Kt
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/activerecord/activerecord-2.3.8-r1.ebuild b/dev-ruby/activerecord/activerecord-2.3.8-r1.ebuild
index e15246cc1cb3..2a239a232034 100644
--- a/dev-ruby/activerecord/activerecord-2.3.8-r1.ebuild
+++ b/dev-ruby/activerecord/activerecord-2.3.8-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/dev-ruby/activerecord/activerecord-2.3.8-r1.ebuild,v 1.1 2010/07/23 07:04:25 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-2.3.8-r1.ebuild,v 1.2 2010/08/15 19:21:00 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 jruby"
@@ -24,11 +24,18 @@ IUSE="mysql postgres sqlite3" #sqlite
 ruby_add_rdepend "~dev-ruby/activesupport-${PV}"
 
 #ruby_add_rdepend sqlite ">=dev-ruby/sqlite-ruby-2.2.2"
-USE_RUBY=ruby18 ruby_add_rdepend "ruby_targets_ruby18 sqlite3" "dev-ruby/sqlite3-ruby"
-USE_RUBY=ruby18 ruby_add_rdepend "ruby_targets_ruby18 mysql" ">=dev-ruby/mysql-ruby-2.7"
-USE_RUBY=ruby18 ruby_add_rdepend "ruby_targets_ruby18 postgres" "dev-ruby/pg"
-
-ruby_add_bdepend test ">=dev-ruby/mocha-0.9.5 virtual/ruby-test-unit"
+USE_RUBY=ruby18 \
+	ruby_add_rdepend "
+		sqlite3? ( dev-ruby/sqlite3-ruby )
+		mysql? ( >=dev-ruby/mysql-ruby-2.7 )
+		postgres? ( dev-ruby/pg )"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/mocha-0.9.5
+		virtual/ruby-test-unit
+		!dev-ruby/test-unit:2
+	)"
 
 all_ruby_prepare() {
 	# Custom template not found in package