| 1 |
flameeyes 10/02/01 16:46:00 |
| 2 |
|
| 3 |
Modified: ChangeLog activerecord-2.3.5-r1.ebuild |
| 4 |
Log: |
| 5 |
Add JRuby support, and yes the dependencies here are quite… funny. |
| 6 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.130 dev-ruby/activerecord/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/activerecord/ChangeLog?rev=1.130&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/activerecord/ChangeLog?rev=1.130&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/activerecord/ChangeLog?r1=1.129&r2=1.130 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v |
| 18 |
retrieving revision 1.129 |
| 19 |
retrieving revision 1.130 |
| 20 |
diff -u -r1.129 -r1.130 |
| 21 |
--- ChangeLog 25 Jan 2010 17:10:49 -0000 1.129 |
| 22 |
+++ ChangeLog 1 Feb 2010 16:45:59 -0000 1.130 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for dev-ruby/activerecord |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.129 2010/01/25 17:10:49 flameeyes Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.130 2010/02/01 16:45:59 flameeyes Exp $ |
| 28 |
+ |
| 29 |
+ 01 Feb 2010; Diego E. Pettenò <flameeyes@g.o> |
| 30 |
+ activerecord-2.3.5-r1.ebuild: |
| 31 |
+ Add JRuby support, and yes the dependencies here are quite… funny. |
| 32 |
|
| 33 |
25 Jan 2010; Diego E. Pettenò <flameeyes@g.o> |
| 34 |
activerecord-2.3.5-r1.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.6 dev-ruby/activerecord/activerecord-2.3.5-r1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/activerecord/activerecord-2.3.5-r1.ebuild?rev=1.6&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/activerecord/activerecord-2.3.5-r1.ebuild?rev=1.6&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/activerecord/activerecord-2.3.5-r1.ebuild?r1=1.5&r2=1.6 |
| 43 |
|
| 44 |
Index: activerecord-2.3.5-r1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-2.3.5-r1.ebuild,v |
| 47 |
retrieving revision 1.5 |
| 48 |
retrieving revision 1.6 |
| 49 |
diff -u -r1.5 -r1.6 |
| 50 |
--- activerecord-2.3.5-r1.ebuild 25 Jan 2010 17:10:49 -0000 1.5 |
| 51 |
+++ activerecord-2.3.5-r1.ebuild 1 Feb 2010 16:45:59 -0000 1.6 |
| 52 |
@@ -1,9 +1,9 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $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 $ |
| 56 |
+# $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 $ |
| 57 |
|
| 58 |
EAPI=2 |
| 59 |
-USE_RUBY="ruby18" |
| 60 |
+USE_RUBY="ruby18 jruby" |
| 61 |
|
| 62 |
# this is not null so that the dependencies will actually be filled |
| 63 |
RUBY_FAKEGEM_TASK_TEST="none" |
| 64 |
@@ -22,10 +22,12 @@ |
| 65 |
IUSE="mysql postgres sqlite3" #sqlite |
| 66 |
|
| 67 |
ruby_add_rdepend "~dev-ruby/activesupport-${PV}" |
| 68 |
+ |
| 69 |
#ruby_add_rdepend sqlite ">=dev-ruby/sqlite-ruby-2.2.2" |
| 70 |
-ruby_add_rdepend sqlite3 "dev-ruby/sqlite3-ruby" |
| 71 |
-ruby_add_rdepend mysql ">=dev-ruby/mysql-ruby-2.7" |
| 72 |
-ruby_add_rdepend postgres "dev-ruby/pg" |
| 73 |
+USE_RUBY=ruby18 ruby_add_rdepend "ruby_targets_ruby18 sqlite3" "dev-ruby/sqlite3-ruby" |
| 74 |
+USE_RUBY=ruby18 ruby_add_rdepend "ruby_targets_ruby18 mysql" ">=dev-ruby/mysql-ruby-2.7" |
| 75 |
+USE_RUBY=ruby18 ruby_add_rdepend "ruby_targets_ruby18 postgres" "dev-ruby/pg" |
| 76 |
+ |
| 77 |
ruby_add_bdepend test ">=dev-ruby/mocha-0.9.5 virtual/ruby-test-unit" |
| 78 |
|
| 79 |
all_ruby_prepare() { |
| 80 |
@@ -34,9 +36,15 @@ |
| 81 |
} |
| 82 |
|
| 83 |
each_ruby_test() { |
| 84 |
- if use sqlite3; then |
| 85 |
- ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed" |
| 86 |
- fi |
| 87 |
+ case ${RUBY} in |
| 88 |
+ *jruby) |
| 89 |
+ ;; |
| 90 |
+ *) |
| 91 |
+ if use sqlite3; then |
| 92 |
+ ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed" |
| 93 |
+ fi |
| 94 |
+ ;; |
| 95 |
+ esac |
| 96 |
# |
| 97 |
# if use sqlite; then |
| 98 |
# ${RUBY} -S rake test_sqlite || die "sqlite3 tests failed" |
Archives