Version bump.

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

3 files changed, 72 insertions, 17 deletions

diff --git a/dev-ruby/multi_json/ChangeLog b/dev-ruby/multi_json/ChangeLog
index 23a51f0a91fb..4c0044eb61a5 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.26 2013/01/16 01:13:11 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/ChangeLog,v 1.27 2013/07/18 05:44:06 graaff Exp $
+
+*multi_json-1.6.1 (18 Jul 2013)
+
+  18 Jul 2013; Hans de Graaff <graaff@gentoo.org> +multi_json-1.6.1.ebuild:
+  Version bump.
 
   16 Jan 2013; Rick Farina <zerochaos@gentoo.org> multi_json-1.3.6.ebuild,
   multi_json-1.3.7.ebuild, multi_json-1.4.0.ebuild, multi_json-1.5.0.ebuild:
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index cb6cedc64b71..e72fae105bf3 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX multi_json-0.0.4-gentoo.patch 793 SHA256 4bd5d5bed2847e1c4944757e5ba0ff27a994c6a8ef898bdeafeda9be542a08a1 SHA512 70e469ea7f9e312872452aede73e9847e831b5e77ff13bbb07e8a11e9eb747fe5481a15f02a876d2256ce7e2df4912958d6ad52adb0c1318127ba32524723ef7 WHIRLPOOL 2bb2d46e3565fa2a3d74d0f7ad4a5c799f04ef4c4673ac2ad4c22d9da28a0c49b3b5516d597a1a695e801f665b45535a93e27e08f82ce7df4a1a58e527f4c897
 AUX multi_json-1.0.3-gentoo.patch 1939 SHA256 40eda804dfb648493959c18d34ec876f2fc71adcefda2bef19fc93673a2553d4 SHA512 ba1d21d8eace96aebd2d8357392330da242e7e861a8add475d12bb745dc3852228ec6e1b540be506fcce8c585e8f713d0a22df4d89ca2dd0717f687720c1f133 WHIRLPOOL f9c3e3800c02b49172c8f7a36b02e03c4c04501640461438d08d9dd1760c188c38ba40fca24ef34cb548fc9eb3982155c4604d20844807c17850a986066ec518
@@ -7,26 +7,18 @@ DIST multi_json-1.3.6.gem 15872 SHA256 d987e42b2d8117c46fd9dc3b1e29e681b94356b8c
 DIST multi_json-1.3.7.gem 15872 SHA256 94d4aac8090afb2fdc4c6519736b12f7b91ec1e0af2834b64bfd837b9117afbc SHA512 824ebe356469a1e93dc5ba98e321054d10a359a71c9aaa051f5ba168a0814ab4610f2252b969a0c984666665b5559d3b9e29bd006edaf59870d1a121725e43a3 WHIRLPOOL 09f4b8291e5731a350b182b19ad37c82ebc0fded3e236ce0af786b0b23b94621ef0aa2c9d5bb7454fa8814e4d709804f2f67b3d5318f112e56de5547dc17f6c4
 DIST multi_json-1.4.0.gem 15360 SHA256 7ebc47d9b288f79f0a91e6d64dabde57430f7162fe885ca253f08b44746b3f19 SHA512 3502e4acdbf5b777e64c89eb2838a8bac18d15aa5580c1a61eb32fad2f82088e125fb3924216312870937ef2d0c79808e212e7c42e88b5401b32a20110eaa693 WHIRLPOOL 51096327783773957ef678276d95cd77894e4abf6a7713c231f8500c89acedbc1c103f17f2b9bed7a52b7ebfb1e17ab710eb39b8baed31059d61b3e81efd9719
 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.3.6.ebuild 1611 SHA256 dd0e2ca5dc4f1f870ddee9d54e8b1aaa1e61a4771f864ef6c8f6ce9e44a96756 SHA512 14c87c2453b6dcf32ff99b7598c5dd01bb763d98cadf1cd3a34fa233e2785f3a6b67b5b68bb7d7f4fe342da2cb62261e092cf68ca0b4d481ebd4e83da27019cd WHIRLPOOL ba177dd441b54dcc6d32a05d598a400e0c2d25281a9927006bd702f1e22375bc6b63e7bbad7a96e0462be2420c6e668ad4d00f4a78800948a1f1b9997a57af42
 EBUILD multi_json-1.3.7.ebuild 1611 SHA256 a5216b7a44733ff672c7678ecba7938ef4b50158aee47360ff25816bab5575ff SHA512 3a656de86b12d3f9ccc7a573c40d694063a5cde5b67e9c9262f54f9379f1aaf5c68fef68c43f8cb69f66a355cb918634121a82b3d11b585ee048fdea1e7a6928 WHIRLPOOL c2220d0e393a2252dfa459e433d77683e209df2931f02d2d13db5e16758e19fb6e1b7018c5bfd1bae4504b06a9fa0f86920ab8d0aedba1781b76ac18cf6bb0b2
 EBUILD multi_json-1.4.0.ebuild 1611 SHA256 96a757f5d55e5f9d88762c0f6b39af0a19e4421747033ee898e4162f5f72da25 SHA512 246419a818df74fd1b3ebddc8810c1970b0c0fc3cb83865ed55c83b440ec4c0438f102331153575d6bc567c450d535a46096a9651a4bb477a3bc45916c3765fb WHIRLPOOL 5914fc0d5468a676798a762c1b096d48820a7879bdab933cf8eab829c4db5c4c8c14620803f7c8bad4ca44ef09ef50a29b868856d11a52d67e3f7c3bfd09e9ab
 EBUILD multi_json-1.5.0.ebuild 1770 SHA256 fc30288a721bfa3a987ed80ecb912022a6cb769b4c3b6c0619bd14f99d385fc3 SHA512 b1416610878bee098fd994a84e7512b0921825872f4c20238ae93cd59ce62ccab66ed5470ddad912bc30fe0336667226fbb263eaa878b4e565a75bf0a265aaa4 WHIRLPOOL b1e6aacfc3eac7ece4a68f1bf0b8b53ac14408acfcd8ea3bca3e738835e205a353464e090c7fb0976c27d8912b69832a24f7281424940aea039a67dbf19d0a17
-MISC ChangeLog 4250 SHA256 1352a51ef6da1dbfd42413412e4d614f37e3071e7af935ca197b475aeda72e15 SHA512 887a301052b6c3d92e219c98dfd768e29a11daf26731f7e41df29e29df9ad512d777c4729df40200066b13165d1eac0a5b5cf58ceec4c73d7342f862589e71db WHIRLPOOL 2c7ecfe2d93d3393d40ed75e51dcf029c00501ce3165121749713d330d168ec8ba0ae920754332b6290345fc58e137464952b48dd19071f4ddcaec16f2f99430
+EBUILD multi_json-1.6.1.ebuild 2012 SHA256 60ae83e15a844e3291e717ebe3154af077e9258603e0c159d72ef6f7cdc29741 SHA512 6d66e2c9120f14b1d4e8d083c792d4201403897c2e190bb16c18f8c9b261628f1585f3e0571b59c47c38ce08b67e416b87e1174199bf1e3ac501944c5924ebbc WHIRLPOOL 5a690e39f3958f843043ffd568f862bbe170c5d770ca6c89501bf1dea2958b542234928efb4ab4786057b038b2e71109fd3171cf37d4983023fa4a43d5493e78
+MISC ChangeLog 4373 SHA256 39fa429bf3442aad01452b212fe4a3aa2e88cda0795b3dc733fad737dce4ee2a SHA512 285fc542a474ec3b8df551c59cc0d46a2b29db26581d4d7f698d4e273acd00801a7a44bce3cb9619d1d0c4ed5242736c21ec150354e5863f0c99eaafbcf981ff WHIRLPOOL 344c6cfd73cd0f400be77bec347e07764f91836227f7a1a5c6d6d41c8792b9c17768de9d13818e1729f4dbc5aa8484c7833fdf3154a709d3e9e2bd1749a15edf
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJQ9f7rAAoJEKXdFCfdEflKs5MP/AqkMSbB92rxMA5/qtq/8GI1
-uCqnLnbN34Zf0fUAEXFwd4s+XPmfmew312KwIyjxNWBNIATLb9aC9Tv4HnUfmG3U
-gbdl4Yz5a92zdxbASNPZtkZ02WjyunE2aoRwFQ+dh6m5bQTg6C7c86LDywDpJRIJ
-alqlqkisSbGJi8OhBb8kkxcDbbfLpGyRRA/MAOe4N6jaPReqa4bRNx7mt1vMO3lp
-sq6kNEsnjxriAHcBtA15JrrA7WLHtYuB0XZ6glYN+MoTGKIbiRKb4BS9354YA7Mu
-Zht6oPai0pSh/msQt1I2GOnWb3nBC8SFQ/t+QVl9ko1ZWtLzEvXT0325A67urPTi
-mqFDW6jAgmYO6cL8wHN0Td1a4W8LMoxgyn9BcgHWpWZM2RTWw4mTd1i0cJHcfEZP
-0pNmPzS4kvvpE+Ea2n5mnGU9h2gW9a6xsvqKlZ7e0rmYy9Olu/BtkmT449i0hZA9
-56Q7L0/oZ3BUUi6W6iPsq04tSAtCDLxnYN7z5N00y7pt69ZMfKjGd1XKdfVyUx0K
-vbhyROFSeY9USx5/CFGXv3RqPZG2nc/gDZh7RutzfPPxDukNl8zKuRD2N/KHSJ7q
-S00WQtMux857uEvZ7z9nI9U/bphFxecRiUnLz8W9bsJ5M5DpAbhxMr27FyPbAFKK
-lHOcz9rAE+IbchIo4lmk
-=+odK
+iF4EAREIAAYFAlHngK0ACgkQiIP6VqMIqNdf9QEAgUvwJctEQ8vR3Hj3AbBCMxoh
+NxbkkA2LHtaiq0Q1wz0BAIgIcgYOZwRfN+rpDdntiRJRShYES1dNL8BWpsRnfChl
+=euj5
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/multi_json/multi_json-1.6.1.ebuild b/dev-ruby/multi_json/multi_json-1.6.1.ebuild
new file mode 100644
index 000000000000..44a0afb99b89
--- /dev/null
+++ b/dev-ruby/multi_json/multi_json-1.6.1.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.ebuild,v 1.1 2013/07/18 05:44:06 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 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 ~ppc64 ~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
+}