gentoo resync : 20.10.2021

4 files changed, 2 insertions, 146 deletions

diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 02574cca58f3..2d2a8f021959 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,8 +1,5 @@
 DIST json-2.3.0.gem 114176 BLAKE2B 329f1305a0cae3d44c74cc7475c7340e86b8447d5e4ffdd5854620669ee4ef5bba0ed7dbc617b0beffb7bfd8b3d79d46ce26feef37685413a4a5a9c230d0ce0c SHA512 9086a64b664f2d774439c0c9f10c2c1cd897684050eb60f8e3ad9256e0b9541deec3bd22fab0bdcf66e3d5bc795720c6923d514b6edb824c9962fc22f162b332
-DIST json-2.3.1.gem 118784 BLAKE2B 6852f5d1733fd5d596b44d095c37d11a129b02fc61dc81afa90aef3623eefdb5515f6755dce42f055954baf2ac45e87620940ccd7c2c839501945923dbe62d18 SHA512 a9a0c54ac1faacc412ad708b630c8bad8c6f99db6862e8fc80c46207f0f0972433fbfe51d0c93a5d91b91c59b1fef5ad8e64e36cc49e32b3e51ff390a380a2a9
 DIST json-2.5.1.tar.gz 131183 BLAKE2B 2ccdf5921ef476b66cb1dbf72cc01763636c82b0eb5d0a5cfc029e14177c7c6766464e7852b11c2424db401f5b931cb64c01d3952929236c9979378a7928ea59 SHA512 4df7ec9b86692376e89c2019c2c1ab3ae9af28fb4742864acc6f985c0551fc10795742cc1124d6435e820617c00d4c5f4aa6c83b21d2fff43ed05cd9d0a89087
 EBUILD json-2.3.0.ebuild 2010 BLAKE2B 6ef2f9402a1ba2e54467f832f1b133c298c16c3664433ea459d0f8bc7d28141eeb9ac1ed11d9b8263fe469c8837b1849ed3859be23d5f44b7fbdf32a79a14abb SHA512 b45f896a497fbdd248152abe45a56b1b81c36a043db82e5d93661432bf6fe9061aaefe378c08e2e160a2d9c87510627aba66920f7e75405bc0b0c505c1fd8c7e
-EBUILD json-2.3.1.ebuild 2011 BLAKE2B c84cc2365edb9c5d5bdbe10e685633bd6686d2010b251bae57cb1b0eb03ffe1f2836dee1d3709d0f28d34c5f92ef46aac6b88603e1420baa05cc961b30fd4771 SHA512 2365221d5f20d97fec7f091ceaa4b5629f3caf8fc1e2f2000cae41815c13ea889fe0ad8430e17605d737576cc95bf98c4a2415cc753be9ba6220d3d92f31f419
-EBUILD json-2.5.1-r1.ebuild 1950 BLAKE2B 9fda187e857a00ee7b04258a4a2cc30b28678b1658de9ccac5859d7edd59d0fecff9368d7125e26675c9e25928284740f9c59e638bb4ace1afd0557e70cf5311 SHA512 41ebb8bc69c7c97a6ff2cdbe9ffb553956d7e3451ec1dc2b70c33328403690ae607c4ca8ac48c05fd07e2a16b95aa9534aa672cfce54f92b69f0d3f32cbbc4e6
-EBUILD json-2.5.1.ebuild 1995 BLAKE2B 74ca3a0ad79c798925abb2ccf15d0f57284ad7e3c2909b3680695f75cffe8326a7f15ca1673edb6c78a261da946692f21b54a263c1ce778656d1b90aacdca05f SHA512 1905491e97d2672b588e0ed8bc45a89eea6e0798121d3626f81a440dd4447a324b085f1d13b1baed51be7a6fea15bae71387cc0f82bf7ef9e426e342aaf423b1
+EBUILD json-2.5.1-r1.ebuild 1943 BLAKE2B 1f6d91db9dc67ba301f40ee890bdf3cf895edaf1f8510f42ed3c45ed9f87e8f8141148d5a0e71483ea1cc43659990ea7ea0b632d63c81550d3150827b2b5e2dd SHA512 aaacdfd48c1f57c35756611d97566952609c3d914b99cfd54128d4b3f817704ec98b54a92f719ce96a7874a5b6c8f7c06c179bb477f8d9d34c8ce072291a7496
 MISC metadata.xml 337 BLAKE2B 6b424567109cd8947377b5f955a9b32d3c12a25001e8d68cf62ac753264a0d8785f0fc60fc2ffbe5ad4e7a16ebd763add075820e4e559b50f6a230ef2f7a61a5 SHA512 e6900f34ad0c2a8310286eae9942432533dd78a14a04fb5d2551be21437cacc1a2d83b40ec93e885b30626cf49491f7db8a19b6e16009b6931cb0fd0c8ca8d5d
diff --git a/dev-ruby/json/json-2.3.1.ebuild b/dev-ruby/json/json-2.3.1.ebuild
deleted file mode 100644
index a71902f0775f..000000000000
--- a/dev-ruby/json/json-2.3.1.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="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 96cfc9286d23..3efecff8b3ca 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=""
 
diff --git a/dev-ruby/json/json-2.5.1.ebuild b/dev-ruby/json/json-2.5.1.ebuild
deleted file mode 100644
index ad69f8dec5de..000000000000
--- a/dev-ruby/json/json-2.5.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-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"
-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 ~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_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)
-}