diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-02-01 16:45:59 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-02-01 16:45:59 +0000 |
| commit | 4905bbd52776fa966dd01c350d0adf0058ab7b01 (patch) | |
| tree | b348486b57c2a987f31c8652996bf1472e06f7b3 /dev-ruby/activerecord | |
| parent | Add support for JRuby. (diff) | |
| download | gentoo-2-4905bbd52776fa966dd01c350d0adf0058ab7b01.tar.gz gentoo-2-4905bbd52776fa966dd01c350d0adf0058ab7b01.tar.bz2 gentoo-2-4905bbd52776fa966dd01c350d0adf0058ab7b01.zip | |
Add JRuby support, and yes the dependencies here are quite… funny.
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/activerecord')
| -rw-r--r-- | dev-ruby/activerecord/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-ruby/activerecord/activerecord-2.3.5-r1.ebuild | 24 |
2 files changed, 21 insertions, 9 deletions
diff --git a/dev-ruby/activerecord/ChangeLog b/dev-ruby/activerecord/ChangeLog index a31aaefb7d31..2440c6c214cc 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.129 2010/01/25 17:10:49 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.130 2010/02/01 16:45:59 flameeyes Exp $ + + 01 Feb 2010; Diego E. Pettenò <flameeyes@gentoo.org> + activerecord-2.3.5-r1.ebuild: + Add JRuby support, and yes the dependencies here are quite… funny. 25 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org> activerecord-2.3.5-r1.ebuild: diff --git a/dev-ruby/activerecord/activerecord-2.3.5-r1.ebuild b/dev-ruby/activerecord/activerecord-2.3.5-r1.ebuild index b27bc028ebd6..e4961e74c532 100644 --- a/dev-ruby/activerecord/activerecord-2.3.5-r1.ebuild +++ b/dev-ruby/activerecord/activerecord-2.3.5-r1.ebuild @@ -1,9 +1,9 @@ # 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.5-r1.ebuild,v 1.5 2010/01/25 17:10:49 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-2.3.5-r1.ebuild,v 1.6 2010/02/01 16:45:59 flameeyes Exp $ EAPI=2 -USE_RUBY="ruby18" +USE_RUBY="ruby18 jruby" # this is not null so that the dependencies will actually be filled RUBY_FAKEGEM_TASK_TEST="none" @@ -22,10 +22,12 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos IUSE="mysql postgres sqlite3" #sqlite ruby_add_rdepend "~dev-ruby/activesupport-${PV}" + #ruby_add_rdepend sqlite ">=dev-ruby/sqlite-ruby-2.2.2" -ruby_add_rdepend sqlite3 "dev-ruby/sqlite3-ruby" -ruby_add_rdepend mysql ">=dev-ruby/mysql-ruby-2.7" -ruby_add_rdepend postgres "dev-ruby/pg" +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" all_ruby_prepare() { @@ -34,9 +36,15 @@ all_ruby_prepare() { } each_ruby_test() { - if use sqlite3; then - ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed" - fi + case ${RUBY} in + *jruby) + ;; + *) + if use sqlite3; then + ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed" + fi + ;; + esac # # if use sqlite; then # ${RUBY} -S rake test_sqlite || die "sqlite3 tests failed" |