summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2010-01-18 12:40:08 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2010-01-18 12:40:08 +0000
commitd5793b597a87cbfbac2fd229f20dca89ba120fe9 (patch)
tree86466dc8f1b1582ee6c835e0eec579604c4e3d64 /dev-ruby/nokogiri
parentWork around CMake nuisance, make sure we get a correct install_name on Darwin (diff)
downloadgentoo-2-d5793b597a87cbfbac2fd229f20dca89ba120fe9.tar.gz
gentoo-2-d5793b597a87cbfbac2fd229f20dca89ba120fe9.tar.bz2
gentoo-2-d5793b597a87cbfbac2fd229f20dca89ba120fe9.zip
Enable support for JRuby.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/nokogiri')
-rw-r--r--dev-ruby/nokogiri/ChangeLog6
-rw-r--r--dev-ruby/nokogiri/nokogiri-1.4.1-r1.ebuild15
2 files changed, 16 insertions, 5 deletions
diff --git a/dev-ruby/nokogiri/ChangeLog b/dev-ruby/nokogiri/ChangeLog
index 9c2e7d102248..026ed14361dc 100644
--- a/dev-ruby/nokogiri/ChangeLog
+++ b/dev-ruby/nokogiri/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-ruby/nokogiri
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.24 2010/01/17 13:55:47 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.25 2010/01/18 12:40:08 flameeyes Exp $
+
+ 18 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ nokogiri-1.4.1-r1.ebuild:
+ Enable support for JRuby.
17 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
nokogiri-1.4.1-r1.ebuild:
diff --git a/dev-ruby/nokogiri/nokogiri-1.4.1-r1.ebuild b/dev-ruby/nokogiri/nokogiri-1.4.1-r1.ebuild
index bdb97a9790e3..24cee070f192 100644
--- a/dev-ruby/nokogiri/nokogiri-1.4.1-r1.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.4.1-r1.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.4.1-r1.ebuild,v 1.4 2010/01/17 13:55:47 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.4.1-r1.ebuild,v 1.5 2010/01/18 12:40:08 flameeyes Exp $
EAPI=2
-# jruby → native extension, no Java version available
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby18 ruby19 jruby"
RUBY_FAKEGEM_TASK_DOC="docs"
RUBY_FAKEGEM_DOCDIR="doc"
@@ -32,5 +31,13 @@ all_ruby_prepare() {
}
each_ruby_compile() {
- ${RUBY} -S rake compile || die "extension build failed"
+ case ${RUBY} in
+ *jruby)
+ einfo "NokoGiri does not build a native extension for JRury."
+ einfo "Instead, the FFI library will be used."
+ ;;
+ *)
+ ${RUBY} -S rake compile || die "extension build failed"
+ ;;
+ esac
}