gentoo resync : 05.12.2021

3 files changed, 2 insertions, 77 deletions

diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 05c7f4e52857..7590af19a235 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,7 +1,5 @@
-DIST json-2.3.0.gem 114176 BLAKE2B 329f1305a0cae3d44c74cc7475c7340e86b8447d5e4ffdd5854620669ee4ef5bba0ed7dbc617b0beffb7bfd8b3d79d46ce26feef37685413a4a5a9c230d0ce0c SHA512 9086a64b664f2d774439c0c9f10c2c1cd897684050eb60f8e3ad9256e0b9541deec3bd22fab0bdcf66e3d5bc795720c6923d514b6edb824c9962fc22f162b332
 DIST json-2.5.1.tar.gz 131183 BLAKE2B 2ccdf5921ef476b66cb1dbf72cc01763636c82b0eb5d0a5cfc029e14177c7c6766464e7852b11c2424db401f5b931cb64c01d3952929236c9979378a7928ea59 SHA512 4df7ec9b86692376e89c2019c2c1ab3ae9af28fb4742864acc6f985c0551fc10795742cc1124d6435e820617c00d4c5f4aa6c83b21d2fff43ed05cd9d0a89087
 DIST json-2.6.1.tar.gz 132705 BLAKE2B 5a8e83b8d11e360402324427de5d2520f39ee1567e2fbf3c92c738546792bb5dec4a9a3c36f3286a3de63161bb5d9f9e7b059c2560f7a3fa50271ce2aa3dc0fc SHA512 e9d0ef77d77ae54a0300b490e3e5c445d0b5aefbce1b160454916bd4f4f8f943131223047e6a7416347cc40d9e7fb1870101c3cbf3a2663a9053f07bdfbd13cf
-EBUILD json-2.3.0.ebuild 2010 BLAKE2B 6ef2f9402a1ba2e54467f832f1b133c298c16c3664433ea459d0f8bc7d28141eeb9ac1ed11d9b8263fe469c8837b1849ed3859be23d5f44b7fbdf32a79a14abb SHA512 b45f896a497fbdd248152abe45a56b1b81c36a043db82e5d93661432bf6fe9061aaefe378c08e2e160a2d9c87510627aba66920f7e75405bc0b0c505c1fd8c7e
-EBUILD json-2.5.1-r1.ebuild 1943 BLAKE2B 1f6d91db9dc67ba301f40ee890bdf3cf895edaf1f8510f42ed3c45ed9f87e8f8141148d5a0e71483ea1cc43659990ea7ea0b632d63c81550d3150827b2b5e2dd SHA512 aaacdfd48c1f57c35756611d97566952609c3d914b99cfd54128d4b3f817704ec98b54a92f719ce96a7874a5b6c8f7c06c179bb477f8d9d34c8ce072291a7496
+EBUILD json-2.5.1-r1.ebuild 1942 BLAKE2B 9b3c3d24aa411c7afeeff47f2f282e68a42f98c331957ce7448aa89dbd595c13445e4e6e3a4a85b604a1d8571239523890c123812a86cf2051cacae9bf30f973 SHA512 f6b76f74a51618a776b265ad9d063d0169b085aec169975b59060a3463bef3ca4a1b9599e481ef000fcec5cc0329958b1c504fc810df14e12c4eec25873923ea
 EBUILD json-2.6.1.ebuild 1943 BLAKE2B b7e1cf4dd6f33475647d2deb3d3ac0fbab1ef970556b48a038f4fde902ffb2c0ffae736f895fc5ccca1768c15d0b3194963cfacc17e3b2631803767701dba097 SHA512 1f6930e49ff731e93bc4999b55d0568565d5e47c99df70fe3deed4fcab8af0c2e959f6ab5e96dae9eb79f8db51f6ba67aed8455995334d3ffee283c0b0f0c5f5
 MISC metadata.xml 337 BLAKE2B 6b424567109cd8947377b5f955a9b32d3c12a25001e8d68cf62ac753264a0d8785f0fc60fc2ffbe5ad4e7a16ebd763add075820e4e559b50f6a230ef2f7a61a5 SHA512 e6900f34ad0c2a8310286eae9942432533dd78a14a04fb5d2551be21437cacc1a2d83b40ec93e885b30626cf49491f7db8a19b6e16009b6931cb0fd0c8ca8d5d
diff --git a/dev-ruby/json/json-2.3.0.ebuild b/dev-ruby/json/json-2.3.0.ebuild
deleted file mode 100644
index 815eee4af5c5..000000000000
--- a/dev-ruby/json/json-2.3.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="json.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A JSON implementation as a Ruby extension"
-HOMEPAGE="https://github.com/flori/json"
-LICENSE="Ruby"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="2"
-IUSE=""
-
-RDEPEND="${RDEPEND}"
-DEPEND="${DEPEND}
-	dev-util/ragel"
-
-ruby_add_bdepend "dev-ruby/rake
-	doc? ( dev-ruby/rdoc )
-	test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	# And use rdoc instead of sdoc which we don't have packaged
-	# And don't call git to list files. We're using the pregenerated spec anyway.
-	sed -i \
-		-e '/task :test/ s|:compile,||' \
-		-e 's| => :clean||' \
-		-e 's|sdoc|rdoc|' \
-		-e 's|`git ls-files`|""|' \
-		Rakefile || die "rakefile fix failed"
-
-	# Remove hardcoded and broken -O setting.
-	sed -i -e '/^  \(if\|unless\)/,/^  end/ s:^:#:' \
-		-e '/^unless/,/^end/ s:^:#:' ext/json/ext/*/extconf.rb || die
-
-	# Avoid setting gem since it will not be available yet when installing
-	sed -i -e '/gem/ s:^:#:' tests/test_helper.rb || die
-}
-
-each_ruby_configure() {
-	for ext in parser generator ; do
-		${RUBY} -Cext/json/ext/${ext} extconf.rb || die
-	done
-}
-
-each_ruby_compile() {
-	for ext in parser generator ; do
-		emake V=1 -Cext/json/ext/${ext}
-		cp ext/json/ext/${ext}/${ext}$(get_modname) ext/json/ext/ || die
-	done
-}
-
-each_ruby_test() {
-	for t in pure ext ; do
-		JSON=${T} ${RUBY} -S rake do_test_${t} || die
-	done
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname)
-	ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname)
-}
diff --git a/dev-ruby/json/json-2.5.1-r1.ebuild b/dev-ruby/json/json-2.5.1-r1.ebuild
index 3efecff8b3ca..b60bf87b53cc 100644
--- a/dev-ruby/json/json-2.5.1-r1.ebuild
+++ b/dev-ruby/json/json-2.5.1-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/flori/json"
 SRC_URI="https://github.com/flori/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="2"
 IUSE=""