diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-08-15 19:21:00 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-08-15 19:21:00 +0000 |
| commit | d59f9c99ecd68e898545cb13e24ed7a178304413 (patch) | |
| tree | 91ccb2807aa117da05d67e6f3970837e134f9daa /dev-ruby | |
| parent | Block test-unit:2 for testing. (diff) | |
| download | gentoo-2-d59f9c99ecd68e898545cb13e24ed7a178304413.tar.gz gentoo-2-d59f9c99ecd68e898545cb13e24ed7a178304413.tar.bz2 gentoo-2-d59f9c99ecd68e898545cb13e24ed7a178304413.zip | |
Block test-unit:2 for testing.
(Portage version: 2.2_rc67/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'dev-ruby')
| -rw-r--r-- | dev-ruby/activerecord/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-ruby/activerecord/activerecord-2.3.8-r1.ebuild | 19 |
2 files changed, 18 insertions, 7 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/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 |