From 524a2bb69f72386b642032acae8cedf31ca2069d Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Sat, 22 Oct 2011 11:38:14 +0000 Subject: [PATCH] Add support for jruby. Depends on a fixed version of jruby. Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- dev-ruby/rubygems/ChangeLog | 5 ++++- dev-ruby/rubygems/Manifest | 10 +++++----- dev-ruby/rubygems/rubygems-1.8.10.ebuild | 10 ++++++---- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog index 17db790a9e75..0c5d06de2868 100644 --- a/dev-ruby/rubygems/ChangeLog +++ b/dev-ruby/rubygems/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-ruby/rubygems # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.175 2011/10/22 10:10:03 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.176 2011/10/22 11:38:14 graaff Exp $ + + 22 Oct 2011; Hans de Graaff rubygems-1.8.10.ebuild: + Add support for jruby. Depends on a fixed version of jruby. *rubygems-1.8.10 (22 Oct 2011) diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest index d5bc7cbecd50..17360bd80ff8 100644 --- a/dev-ruby/rubygems/Manifest +++ b/dev-ruby/rubygems/Manifest @@ -19,15 +19,15 @@ DIST rubygems-1.8.7.tgz 248796 RMD160 7e309e9705921d10d5d5ec68ed235d5fd14c9776 S EBUILD rubygems-1.3.7-r1.ebuild 2999 RMD160 f3ccf17a65925a8cc36c28d4506c1fc96458c418 SHA1 1d680bc39228c81c3656b4f9e2676e839d7bc3be SHA256 bc3cd7ffa76b9947e05f55f70c3972db65eb013dfa5b76a2e88bbb41d0fdd5b7 EBUILD rubygems-1.3.7-r5.ebuild 3747 RMD160 990a3b8c8babbd04865a4cc464dc33ada66b07c0 SHA1 c62b9d262fa101fa12e74028b97c831349550789 SHA256 cf302064dc8c48da252d8e33dc0b8c92009030af7da2e476bfcc63a9b40cdfeb EBUILD rubygems-1.3.7.ebuild 2995 RMD160 154085ac99dcb1efa2c581df8cd4c67c2fc43dae SHA1 facdf12e411b45651c40e00f9659cd6828ec85f5 SHA256 8047192b5e43b59eeaa0f9ee07f319b3bda6451c1d205cc3740b4385dca9cb73 -EBUILD rubygems-1.8.10.ebuild 3519 RMD160 20aa93a2a04b762dd8d1a92ec8ac6eb95eb1cc2d SHA1 83142ab2824dbc98daac68ac3e6261900610574e SHA256 bc60815b54777cf1b596b121f57954053e6b6d74b008c8d18d31dad8c76262ef +EBUILD rubygems-1.8.10.ebuild 3527 RMD160 62ad30cdac731a999836b0ac34e10ac939381ee4 SHA1 295f48ec24a355fa06dcff981979fab2641c064f SHA256 75f5d1f0e3c8dc98d610e07abb9bed129d6d706ade0e820939c4d9613a53b0a0 EBUILD rubygems-1.8.5.ebuild 3622 RMD160 cc1aeb54b65dfd29ec4401b40a2a29c159cc6f0a SHA1 c4e3a4fa246e38617b05467eb1de31038547968d SHA256 29764ef0617a3d08a00091f29d805cc1799cd7155d71ee38a03be1ef4a0e8541 EBUILD rubygems-1.8.7.ebuild 3579 RMD160 a932db50ad921a9ffb8b3c945931b7ed007f084d SHA1 0e721ed3ab8621f6a42978b7b701638f454fe6b6 SHA256 ff2dbeff9fcbe1fd1a4224752eeb1fd3444e5ac077292ecafd8dd77486d7bff3 -MISC ChangeLog 28053 RMD160 486c75666041eb44b8813adf65dab50256503705 SHA1 6b2a42927b08287c03f6a0fda4fea580f9e5c335 SHA256 60db9f7193e6e085e10bc0d9c4cc5be2da29d38e0477dba047d9eae3b43c499d +MISC ChangeLog 28190 RMD160 65eae2919e3c44075a7935bcd08664714c8597cc SHA1 77187df2421fad60072ad40e90a2e7d7c7c89332 SHA256 2f28cf4476a96ce8658e305fccce436288f7a29818d7b7c53363bd42f169e7ea MISC metadata.xml 247 RMD160 eb1d10b4366542ce2f232dcaf7317341b6b5608f SHA1 fcb6e2a1d6cda6d45640f9c5a5dfcc0fd4f3ab3b SHA256 633ae9912e8dd27f76b9cf53f5ad0d3222db85d9a19a76da7fd5e26f40b144e3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk6ilocACgkQiIP6VqMIqNfksQD/Z5D+nGS2qjBaXP4/pQFgrBp2 -5ZKOnI2FS82ZwZOtEeQA/Aj8rFyWfHOkqSv8ARl0VHaentIjK6PyucKkNyuAD104 -=MCuh +iF4EAREIAAYFAk6iqywACgkQiIP6VqMIqNdxxQD/RE+5sgJUlxfc3vhzcterhnSO +g3kNQ5rW6QGls3PyTwQBAJPES1muSfz+/jd1CIf+VIqnH20sVsJYKyMRqgi/uHmO +=I21C -----END PGP SIGNATURE----- diff --git a/dev-ruby/rubygems/rubygems-1.8.10.ebuild b/dev-ruby/rubygems/rubygems-1.8.10.ebuild index 4f482e3ebb48..dc99a918f0ed 100644 --- a/dev-ruby/rubygems/rubygems-1.8.10.ebuild +++ b/dev-ruby/rubygems/rubygems-1.8.10.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.8.10.ebuild,v 1.1 2011/10/22 10:10:03 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.8.10.ebuild,v 1.2 2011/10/22 11:38:14 graaff Exp $ EAPI="4" # jruby's own RUBY_ENGINE defaults are no longer compatible. -USE_RUBY="ruby18 ree18 ruby19" +USE_RUBY="ruby18 ree18 ruby19 jruby" inherit ruby-ng prefix @@ -19,8 +19,10 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-f SLOT="0" IUSE="server test" -# ruby_targets_jruby? ( >=dev-java/jruby-1.4.0-r5 ) -RDEPEND="ruby_targets_ruby19? ( >=dev-lang/ruby-1.9.3_rc1 )" + +RDEPEND=" + ruby_targets_jruby? ( >=dev-java/jruby-1.5.6-r1 ) + ruby_targets_ruby19? ( >=dev-lang/ruby-1.9.3_rc1 )" # index_gem_repository.rb PDEPEND="server? ( dev-ruby/builder[ruby_targets_ruby18] )" -- 2.26.2