4 files changed, 18 insertions, 14 deletions
diff --git a/dev-ruby/json/ChangeLog b/dev-ruby/json/ChangeLog
index 4067a5608460..ec44cbb64fdc 100644
--- a/dev-ruby/json/ChangeLog
+++ b/dev-ruby/json/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/json
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.140 2013/12/29 17:22:18 maekke Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.141 2014/01/05 10:58:59 graaff Exp $
+
+  05 Jan 2014; Hans de Graaff <graaff@gentoo.org> json-1.6.8.ebuild,
+  json-1.7.7.ebuild:
+  Drop s390 and sh stable flags for ruby.
 
   29 Dec 2013; Markus Meier <maekke@gentoo.org> json-1.8.0.ebuild:
   arm stable, bug #483254
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 4ac0cf46e4ef..f9b853ca6011 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -5,18 +5,18 @@ DIST json-1.6.8.gem 144384 SHA256 2c66ad4038eb4a0823ee8c2d8f0a4cbf66991011b031aa
 DIST json-1.7.7.gem 148480 SHA256 fd702ed46565b354d7508e88bb3c4855f7fdd771ab89435d7ecbbe98deb0b7ec SHA512 b73cc6427854b00fecc36fb6a3da89562b9ef352342d2766da7c22a9311620c12090d84704b9dda9ca35da5893676f1c1b2ced53ca06da27194230825f73b7e8 WHIRLPOOL 29c4a581c60a2311ac77eaec278bb123be18f4c6acac23d286e3116a8a84df3ae5089be0116827e579f5460b803cf3d8066cb8ff9c298a4b045e67c473c0d431
 DIST json-1.8.0.gem 148992 SHA256 87e49cccff3fb2091c53141a605956e8d9a252cda43128714f9fdb51d0ca1729 SHA512 7a8ae0d975e10be06d1026df6c9736e8e724814ea7ef8c92b512c60fd7b4ac18e46a9f44615f57407e58decebc4891e2e97b78a177f7e283cc540619264c4400 WHIRLPOOL 159cd8d1cf95d6f7ca5ed16ec294015f873453a1ec8f9eb3667442c0ca582487e5dfcd78d2106c72c5a3563e1ace5b69f2c256c05a35630f09c3499b95f12505
 DIST json-1.8.1.gem 148992 SHA256 961bfbbfa9fda1e857e9c791e964e6664e0d43bf687b19669dfbc7cdbc5e0200 SHA512 ad729c00a9f7b4940e077a151a1e74f054d9df5bff8bac996634b3df3eb42ad7c732035c4bbb40de92816c3989339b113c4fecebd36ee3f5c301b76169fe4fb7 WHIRLPOOL 01c7444598612055b73dd0cc3f803210b9936028523dd446f3a1808b3e87fa94825c4daf1267472945898def78ce7cf851d9325d2235aa7008d3bba470839e40
-EBUILD json-1.6.8.ebuild 1982 SHA256 01a927c37523bd075c784d23dd220eb441a624edd5dba105c9f77df4faa9a25e SHA512 47a4110ebeb74eb0af0f6125aacf6d36a71f299f0eef1a432299454e99bbe553ace49d6ac1922357b439c82675022ca0240f78441db4d60153dbb3f0db05bdc2 WHIRLPOOL 95ff7f0cdcee79650695b35dac919146869b67319ec61199046f3059cd1a9667c4489e1fb2959c0967e7f88cdd0500aa3e8a479aa89b6e3dfde27731df958fab
+EBUILD json-1.6.8.ebuild 1987 SHA256 3f3a0522c1f8da25b895bfbef44312dd7c35f75d2b2fd57e29757ae89e79a447 SHA512 23d2f8705a775435d136448fdd59a92c2ad42357c4c1ca3db80518b7e746d12934eb3279d66314dce241a6dadef1903a68ec508d0eb3697f0f424dc4e35df5d0 WHIRLPOOL 70fc724d15ee357fbd43a14449efb03b713ea0b5d19f37d49dd4ebc95a347fde8939d7ab5383805f9e875960ec864f0e6422fcc32c7be43766f07225e7d97c01
 EBUILD json-1.7.7-r1.ebuild 2146 SHA256 d45278d30740b3cefff705740f7fb954e20bb2d13e80f712f6e9f64157102407 SHA512 f48a9f528be1328a64b8c12cd4de74ecc050bb8458e764d18c246f650c762602fd332686f660fbfbc717b95c8a588f2e339dbd1059fb86b2697bbaadaa999781 WHIRLPOOL 7db21419888209353d8bbb3a2846a81384f89387e0f2503834b90dab86b9ccd8aee4e0c03a94df5df918e76a42fbcbe08305ef980cda274a0dc9cff79266fb0f
-EBUILD json-1.7.7.ebuild 1994 SHA256 1029fc804a2be258dad78a72143e12f97d871f859d7ae673bdea2587c00fef70 SHA512 83595f04a4eb7da1c7d3fa79dfa0e698e7458f8a6a00f728459f81b2c551ba8c484876f2155357d2a9fd84fc5b140d419608cac011fefdf5a68c5552155d839f WHIRLPOOL f44f2eb684c5695510cec499099274c654779e1befa75194d2609b5b098dbedf3fe420dfaa3ed1625c5401685380aa523c92e34d5143c0798465b0ab5039cc51
+EBUILD json-1.7.7.ebuild 1999 SHA256 11771b6af622e5e10f69d19c5646f259189c5e2b9190b6a57c80350332982b36 SHA512 b136c1bd6deacee44b7dba5052845ddf88cd51b89874463276948883f47016b85948d9faa3fc405a35426c5dc32b09646e32c227e90c5cbf30592a7191f24eef WHIRLPOOL 9126dd12525f6b6ae8da1c4dfe203d7488d4f9998ebcd13915ed42d2848a1f516a36cc8666d4199c3ec7752b7f564f5a742aad0c3f133907ab1682cec5e2e522
 EBUILD json-1.8.0-r1.ebuild 2170 SHA256 63b00c43687f3f144e38a07731bbb2fea2774051ce5c344f8d536185f93c9862 SHA512 2d058d6531a561ffaf233d9155111462fde5668029ab695e1170445798d2b1b6929c1169c68c8e20fbf6481a6fad17355f9ee81adb3822985a8a69ff69e5b2b7 WHIRLPOOL 12f1d4b95bc23a8077a5bb7707d86063b3c8f4e47f8a234166d53e4922c2aa140018cb4105146298c5dc3329c5a51d5039f0d2c06d9b14f7025882c880ba848c
 EBUILD json-1.8.0.ebuild 2143 SHA256 8f0676f7f57a5e6953a46c881401518fe2ff49583b304fe6f62824c790f0eaa2 SHA512 1b73692113ee07b93f048404df594f5616f23488def744bd111a24ed693cfeadf57b60998acc97c4b80120e8f368a7745364a83b9de681655add39393a7d2ac3 WHIRLPOOL dae322d85938e9efd7914e96373481b3c3b738dd566aab1b9750d18293c8e25a233fbd7b89283b790b5607f103d93db8b1491f63944e606ff5d935c140e8e369
 EBUILD json-1.8.1.ebuild 2174 SHA256 174d30b3826159141937642fabefb626c92def4103c0da440372e9f7a5f5fe9d SHA512 a8662b6818a37599dc057250893aae54186fa74771e507d1f6969aec6029aa1807367738d988cf370a17b46f213842a6a209870df5cc87f6f8639c4c3f859c39 WHIRLPOOL 965f3886a10a2b104bb43c125636158cd2dd20cc4ce0557bb43184c5661bbe14b87c89fb7067335c430210b67b2c437d9ae5567a2fa2077af045ec6e7fffae97
-MISC ChangeLog 17199 SHA256 54a2a45452285908c3be4d38666f688c2390fbf482f4d6495f0f3fcd106a046f SHA512 f318972c2f197a78ad247511c81f26082077c557adee4c639b7ca16f92d77cf7a2bbfb35731ad9af9e35cb93eb0508dc128e174353a0d80834513528c813cf2a WHIRLPOOL c1cff9d0fe48910dca06a0f05fddbebfc2fc0e6c62f97c9607e9a0cc42d2bf5e764a05c8d65f025be8f6c655ea79b6819aed52e1af531ae9c86ba1f47fa9eec9
+MISC ChangeLog 17332 SHA256 3f0ec79848ed78f089041e3d5214a673be6ae4fe9a079dae4180a61a0ddacd37 SHA512 f5f79622f34fad9aa4113d461c1b8682073033fca9c3d779974bdb1a7716c501dbcec0dcf4d715abf926db5b55b08c223d7393f73aefad3c22801969d4c09d67 WHIRLPOOL cfcdaf317918bf0f705d7f51015fd5c57435637ab2fcc06285928b906f920da8b0b8c7ec2521f8cd8db30214af48b0094bed19dade93500162b00385dc038827
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLAW/QACgkQkKaRLQcq0GIPwgCdGitPFH9yNkccRcHA7lPheYn1
-VwMAoKCZnMptQz/CgSN+u4uxL09YTqsw
-=Q4I8
+iF4EAREIAAYFAlLJOvQACgkQiIP6VqMIqNcQhAEAi5XBljSEK57H/CsANfKUYL+w
+3otkDpS4OJjxwFngoY8A/RrI58ciYHapejTt3qeK8t7JfMhBDnbIUJpylG2xrmAs
+=VEux
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/json/json-1.6.8.ebuild b/dev-ruby/json/json-1.6.8.ebuild
index e7c47200831c..5da22d68d3b8 100644
--- a/dev-ruby/json/json-1.6.8.ebuild
+++ b/dev-ruby/json/json-1.6.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.6.8.ebuild,v 1.12 2013/02/26 18:53:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.6.8.ebuild,v 1.13 2014/01/05 10:58:59 graaff Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -17,7 +17,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension."
 HOMEPAGE="http://json.rubyforge.org/"
 LICENSE="|| ( Ruby GPL-2 )"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/json/json-1.7.7.ebuild b/dev-ruby/json/json-1.7.7.ebuild
index 1fdd3ee35e69..a2df12047aaa 100644
--- a/dev-ruby/json/json-1.7.7.ebuild
+++ b/dev-ruby/json/json-1.7.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.7.7.ebuild,v 1.12 2013/04/14 11:48:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.7.7.ebuild,v 1.13 2014/01/05 10:58:59 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -17,7 +17,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension."
 HOMEPAGE="http://json.rubyforge.org/"
 LICENSE="|| ( Ruby GPL-2 )"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""