Add ruby20. Drop ppc64 due to yard dependency, bug 465948.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 70 insertions, 6 deletions

diff --git a/dev-ruby/multi_json/ChangeLog b/dev-ruby/multi_json/ChangeLog
index 20de127b0b4e..e91dce458765 100644
--- a/dev-ruby/multi_json/ChangeLog
+++ b/dev-ruby/multi_json/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/multi_json
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/ChangeLog,v 1.32 2013/08/25 07:48:14 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/ChangeLog,v 1.33 2013/10/25 06:41:53 graaff Exp $
+
+*multi_json-1.6.1-r1 (25 Oct 2013)
+
+  25 Oct 2013; Hans de Graaff <graaff@gentoo.org> +multi_json-1.6.1-r1.ebuild:
+  Add ruby20. Drop ppc64 due to yard dependency, bug 465948.
 
   25 Aug 2013; Hans de Graaff <graaff@gentoo.org> -multi_json-1.0.4.ebuild:
   Cleanup. There is no need to keep old versions around since multi_json
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index 78254c241927..8711e4f3bb2a 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -6,13 +6,14 @@ AUX multi_json-1.0.3-gentoo.patch 1939 SHA256 40eda804dfb648493959c18d34ec876f2f
 DIST multi_json-1.5.0.gem 15872 SHA256 e94cf8a6db88eb35657b20f5a17631fcc7e46a867f798fce7ef09944442d673a SHA512 5f36d9f3d7d11d090b3ae68fa0d5152f4a89006e3e3cc079d0fefc9297f4dbb4043708627c8de6b8a7bec4ecbc436f8dab7cefd2884ac68ee620cd905e0cd8b0 WHIRLPOOL 8a4979bdc6d78e3629102f4bac8922dd454ea02a92282763d11ae1093e405cb3f6c16c04d2e292701cdf2146ad6fc82b6913957e6d764e0f9d909085bb3074bd
 DIST multi_json-1.6.1.gem 24064 SHA256 8fe5991287b6d1a77719feaa03e460ab1f8c689b326106f6e627c54419d7635c SHA512 1672a4c7cad6ad4f9bd532b425a71ec7be2115675c04f66afbb203f2e1c078543175e4d0e01f118e86e503d29e078f52a6beb043e98af4e51de3c32f5eba402b WHIRLPOOL 5f1cf218f9214d3f2e62aa54c5cc8bf3175269f66d13e6f1f73e4235112bdaa10b88cca9887ca1f4eb2f2cefad8360b4a81add877d16dc767667bc357b62b226
 EBUILD multi_json-1.5.0.ebuild 1762 SHA256 b127abab04a85687cba31abc621b4f4a7492f14e6692741f75eaaeeb21fcfc51 SHA512 88c57644b76bf3f1e55b1d22b3d11a7cb8d4078a8000c9834060f572a2759c756d4e9e620bbcd80ed172b8619a8c4266f262f3df22d72fff44178588e3c5c4b4 WHIRLPOOL 5fa9b9668d6347ac7f706e808d719598b8e9381cba7944b0194680061a054031d5e16d44edbf1bba391dc8f960589e726156da605fcfeb9b658134360fbb4bc0
+EBUILD multi_json-1.6.1-r1.ebuild 2015 SHA256 753dcb35a09258e477b0510971d772668c8b0bba491c047e7e58ec0b21005d91 SHA512 b15e71f53fe3dff76ba57d6c6059f75c5d72fd7a74cd7f5215db089946a4cb7cafeec7f5bffe397c84b0c660d91317585f5745fa5fe0095175878aa412a0364b WHIRLPOOL b59332c8e23100d689a63b7ceea76731f0874a37058ea8a11f16b35d0ad9e5be4322b62595c2bbd0457dd1a5bab3a8a0f695af9f59533a080991e57ed7ee4a3f
 EBUILD multi_json-1.6.1.ebuild 2012 SHA256 60ae83e15a844e3291e717ebe3154af077e9258603e0c159d72ef6f7cdc29741 SHA512 6d66e2c9120f14b1d4e8d083c792d4201403897c2e190bb16c18f8c9b261628f1585f3e0571b59c47c38ce08b67e416b87e1174199bf1e3ac501944c5924ebbc WHIRLPOOL 5a690e39f3958f843043ffd568f862bbe170c5d770ca6c89501bf1dea2958b542234928efb4ab4786057b038b2e71109fd3171cf37d4983023fa4a43d5493e78
-MISC ChangeLog 5083 SHA256 a74f0af6bc721edb044bb43d48689f8ca9edfe35e7458a42eee0bf68da127bea SHA512 fad5899898ac8f62fca583aaf4d4614b49daa48ff713bc4ae96f097e1944c15de135bb36600180fa076d3096a162a60fc5ea033bac203a168a00931264b172e3 WHIRLPOOL 46978b3b7da1092bda01b6d7903acd78653f57b8525be781174b6b52e4e02798e46f0cf3fa54a4433bc509c811ac0f90bc3b9955bd0665bb4fa61932ce08bddc
+MISC ChangeLog 5260 SHA256 4920475735827576055429fe5407b73cc7dd0e5fec6d69159b9a6f051db5ec24 SHA512 d13947795204d0ab92996f241c5614a34fcb4fefe894cf6543f3ffd1765ff5bc8bc132f054d330a360c31c8f710f54bfc48c649f4b1b00d8fd9e889f3816281e WHIRLPOOL 7dc9fc93f114d3a1c23697831bd49167a2460cf6436bf66ba6e6782e643ff1da90196a46653970da65f3a373b7b549361f1dd4f6c63a77159fbd07004334ea39
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlIZtr8ACgkQiIP6VqMIqNfa0gD/fUCAEbg4elwII8/fQbyGMmUR
-D7pd7NzCKkc3n/Wlpn8A/R0+ZvIfTAGy0HhNyMNo7qQxqSrp57kcZrEX1WNaSbea
-=6PBr
+iF4EAREIAAYFAlJqErIACgkQiIP6VqMIqNeB6AD9GS6J/V2suAMYyoW1ofsPayTQ
+4Hj4NN60OzzuBKZW8eIA/3l/6x2MO1WtS4RMtpsTy206eCPa0eRmx3N48P9R7VA4
+=cSF0
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/multi_json/multi_json-1.6.1-r1.ebuild b/dev-ruby/multi_json/multi_json-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..fd658af69f3e
--- /dev/null
+++ b/dev-ruby/multi_json/multi_json-1.6.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 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.6.1-r1.ebuild,v 1.1 2013/10/25 06:41:53 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 ruby20 jruby"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="multi_json.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A gem to provide swappable JSON backends"
+HOMEPAGE="http://github.com/intridea/multi_json"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "|| ( >=dev-ruby/json-1.4 >=dev-ruby/yajl-ruby-0.7 =dev-ruby/activesupport-3* )"
+
+ruby_add_bdepend "doc? ( dev-ruby/rspec:2 dev-ruby/yard )"
+
+ruby_add_bdepend "test? ( dev-ruby/json )"
+
+USE_RUBY="${USE_RUBY/jruby/}" 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."
+
+	# Remove unimportant rspec options not supported by rspec 2.6.
+	rm .rspec || die
+
+	# Remove specs specific to oj since we don't package oj yet.
+	sed -i -e '/defaults to the best available gem/,/^    end/ s:^:#:' spec/multi_json_spec.rb || die
+	sed -i -e '/Oj does not create symbols on parse/,/^    end/ s:^:#:' spec/multi_json_spec.rb
+
+	# Contains hardcoded yajl reference with no special case for jruby
+	sed -i -e '/can set adapter for a block/,/^  end/ s:^:#:' spec/multi_json_spec.rb || die
+
+	# Avoid simplecov which only works with ruby 1.9
+	sed -i -e '/simplecov/d' -e '/SimpleCov.formatter/,/SimpleCov.start/ d' spec/helper.rb || die
+
+	# Remove unpackaged and for our purposes unneeded coveralls
+	sed -i -e '/coveralls/d' spec/helper.rb || die
+}
+
+each_ruby_test() {
+	CI=true each_fakegem_test
+}