From 4ef291337344d83bde2526d6917be15ce8ad3716 Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Sat, 5 Nov 2011 17:43:44 +0000 Subject: dev-ruby/yajl-ruby is mandatory when testing for all targets except jruby. Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- dev-ruby/multi_json/ChangeLog | 5 ++++- dev-ruby/multi_json/Manifest | 10 +++++----- dev-ruby/multi_json/multi_json-1.0.3.ebuild | 6 +++++- 3 files changed, 14 insertions(+), 7 deletions(-) (limited to 'dev-ruby') diff --git a/dev-ruby/multi_json/ChangeLog b/dev-ruby/multi_json/ChangeLog index cdb99512c68b..363fdccc020d 100644 --- a/dev-ruby/multi_json/ChangeLog +++ b/dev-ruby/multi_json/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-ruby/multi_json # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/ChangeLog,v 1.6 2011/07/19 04:43:26 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/ChangeLog,v 1.7 2011/11/05 17:43:44 graaff Exp $ + + 05 Nov 2011; Hans de Graaff multi_json-1.0.3.ebuild: + dev-ruby/yajl-ruby is mandatory when testing for all targets except jruby. *multi_json-1.0.3 (19 Jul 2011) diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest index ace42f4149a5..3823fc8aa9e7 100644 --- a/dev-ruby/multi_json/Manifest +++ b/dev-ruby/multi_json/Manifest @@ -8,13 +8,13 @@ DIST multi_json-1.0.2.gem 12800 RMD160 53225e9230a39e2a9519dde0165ca1f09ab24007 DIST multi_json-1.0.3.gem 13312 RMD160 05eac0ab20b14c144d20828bd886ac4a3f5d0706 SHA1 76007bc5b36b04733756ca8d960dc5db4d7f8c6e SHA256 ab272b4669783a73efe194e080f3fc1a3d35fa3f69105b8ca0afb2d0d1808789 EBUILD multi_json-0.0.4.ebuild 1052 RMD160 c1cb7aa055059069d8f1f10ad38bb365aadebff5 SHA1 a1c58ce1b8b867134d37d439c3eb5c16e25f589c SHA256 6255ccedfa1fadb18653f56b199851a1dd92a0e78f757f0fef3466590c28fa5a EBUILD multi_json-1.0.2.ebuild 1236 RMD160 21a2288bac2c1778efb6ca2a2f6a7dd54b8ec8ab SHA1 ba87f0911754517f2349fa3e334662c322e94163 SHA256 b7d5ccafeb0d95ce7769c9101413919ab9fa410403363c3d21676cbd3ce76581 -EBUILD multi_json-1.0.3.ebuild 1559 RMD160 a5b43b24ff0b6ccec902389cd0b9a711e6e776ba SHA1 dbcdec2debc9092992d6d1064863b6b80a42543e SHA256 feff160b9203483221bf93a3b8b03e641472388f478f0d6fae4d98ee4d6e58da -MISC ChangeLog 1594 RMD160 519a850b49e01132c763203557a09b490b26047d SHA1 9fa0f0b0df8fc7f3353d765a9918d201a2a0d42f SHA256 4db34a602cb50b2e037daafa1727fb05566ae91f897a67eed9eba41bfcb1954f +EBUILD multi_json-1.0.3.ebuild 1751 RMD160 40c0b234da1a5a6b283cd2fd72ab2ecf89f15dfa SHA1 e243d37785f063ee0406453c3a017643b3a6b25d SHA256 3ea2630c0b712d7dc64d8f68adb22ce90aec4b73b0dd81a45e4db123e6b89142 +MISC ChangeLog 1747 RMD160 aaf8cc4731960b07ed4d302ac129ef9ecd0a3bfd SHA1 4b81bff82d56d3c8dd886e2d35e747a2bd68de7b SHA256 41a7eb3d306dbcc16f25b00e2228207a35d89d5f0e9638bf9cb9c410f5cf7afb MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk4lC3QACgkQiIP6VqMIqNduiwD5AamRVlOHBpnrhBOnFC982pgh -1BAclx0gXDDlwb73zxoA/j0dfQlphb6otiPHTtct3THPDu0q429SAzmT4cDaejSS -=U39K +iF4EAREIAAYFAk61ddsACgkQiIP6VqMIqNdH+wD/UcpRWp7jtvtZCqh7s6cx3lo+ +2snyQJVLMWQAE5ley3UA/0xq8W1eKF5CkatmcbAF7nBTvn8D99uFlfOen/FyXarE +=7Kil -----END PGP SIGNATURE----- diff --git a/dev-ruby/multi_json/multi_json-1.0.3.ebuild b/dev-ruby/multi_json/multi_json-1.0.3.ebuild index 9772aa8d861f..0617db5f5259 100644 --- a/dev-ruby/multi_json/multi_json-1.0.3.ebuild +++ b/dev-ruby/multi_json/multi_json-1.0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.0.3.ebuild,v 1.1 2011/07/19 04:43:26 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.0.3.ebuild,v 1.2 2011/11/05 17:43:44 graaff Exp $ EAPI=2 @@ -35,6 +35,10 @@ RUBY_PATCHES=( "${FILESDIR}/${P}-gentoo.patch" ) ruby_add_bdepend "test? ( dev-ruby/rspec:2 dev-ruby/json )" +USE_RUBY=ruby18 ruby_add_bdepend "test? ( dev-ruby/yajl-ruby )" +USE_RUBY=ruby19 ruby_add_bdepend "test? ( dev-ruby/yajl-ruby )" +USE_RUBY=ree18 ruby_add_bdepend "test? ( dev-ruby/yajl-ruby )" + all_ruby_prepare() { sed -i -e '/[Bb]undler/d' Rakefile spec/helper.rb || die "Unable to remove bundler." rm Gemfile || die "Unable to remove bundler Gemfile." -- cgit v1.2.3-65-gdbad