4 files changed, 4 insertions, 104 deletions
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index cfc18dc3ac75..8577f9a69774 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,8 +1,6 @@
 AUX rdoc-5.1.0-jquery.patch 16770 BLAKE2B 144d10bcfdf6917af0ebec7ff0df90afa4f1626c1b850acc20491c545aba0e5456d3589a6c92931d343409a86ac21f04a16ef679625d5dcde8ff8d1f169f42ca SHA512 13bd0845bae1777d8c38349db3b53fdb019b63ab6e12c0682d1bff144e70e86d629eac16d96cdfbd94402d7406835b56f64cfdfbc232917cb59ae84ab86ca7f2
-DIST rdoc-5.1.0.tar.gz 702376 BLAKE2B 733d77a341ddad10f5b648b6bb492e0f79daa392e2ca371d38236e4c85a1c409699e35dd3f5bc8bc48551b399603bb0a747cb3c5f7f1fbf4765aabffaad575aa SHA512 cd2ed37e8502a3e9093c88c258ac5e39542a23c3dcaedb9b5eb48ce391a694e5b35fbcfd62f01ec6353ac9c40a4b7043b2ff11bbc403d2e03de9a84c52bcefe7
 DIST rdoc-6.1.2.tar.gz 667607 BLAKE2B 4857bcf5f72d93fe4e9ea89acfda9ae82afd61a7ff501d2eea529330d2b8a63d7cc775490648fcff5000ee60417123244518f56a31593af8efccae8f925b21d9 SHA512 a54e36adf9f98117f0b5ae4490a0ab1ce12d9b1de5b7c61ffa326b36ef13885bb8f18147f3548f95a285b15470faba14965bc87088fa3ce584928d8ee396689f
 DIST rdoc-6.2.0.tar.gz 668152 BLAKE2B 9c92b27c427d6229778aba54ce7f12fe883fd3e40151f518f3d023d4f6dd10d4f1f6d05c8d6bcdce80d1ac81ab25cd99ccbe9479a4fcd950b895e14d4fdc4b83 SHA512 15352889833436c0a243e4f79c4ae8113fa3b8c222950baf1fcd272773a7a17198c2cd91a50c92e225c282a37ec743a38d8e9ca4dffe0b66c39d56412fe56ca2
-EBUILD rdoc-5.1.0-r1.ebuild 2727 BLAKE2B e2fc84937be24f123b0ef2bfc3192affc0f259e54938735f537be4c064fd480b6c9ccabebf20a92892bb23f173911e829e2763952854827072ce226aa0e43286 SHA512 5eb5c8c0041c92536d237166b414513636182178c96621dd0c06953d0defc7b4ea83355c63a46195e9d5e1a09a5ace2ad3a3810b22e8e378d85a15a6956f24d2
-EBUILD rdoc-6.1.2.ebuild 2652 BLAKE2B fcb76ce4503d1d1b272395e1336fdf65141b5b97cd622094e22582af049e842ecd5c89049394ffa5043962d42b748399fe29336cf68c2fd1911bbbcfd1e54727 SHA512 0a29f9a13bd066149358a2af259da23c819552ce232f257a0b42ce62e2fe9b692087728699a781d988c702669dd62c454972f7519415be0b89ba285c1a2bb24b
-EBUILD rdoc-6.2.0.ebuild 2688 BLAKE2B 7a8d40ebed94ae8015fbed1e63d46a2015cbbfb8c305ad2298bd25c12d8e2b9344c11b693a2cf3b5c6bdad070329238bc9a9b59deadccd60f8fa7c0d34938d79 SHA512 cb8d42a259dd7ad84b660f7099143a73dfec22bb86e7680e373ce110544cbf55eb4f1d73581ce8c7ce6389dc17ec06b141200f3d220cb300b1e5a311bb13e823
+EBUILD rdoc-6.1.2.ebuild 2646 BLAKE2B aac4b1066c1bce0565f2213e9aa60ab515ced6c6c56bfbf6e665a47b59af4528a764deb80aa5faed36388287c55bd7def614715e8c577b2e9218be60d37c6dcc SHA512 1db7296eec273e831964b533c377bdd1e50e18862a9df99e13fb3465babd67cd5e513d77fc1aec4dab805496aeecdd223513ea6f7dbda6ad8a6a4975488851c7
+EBUILD rdoc-6.2.0.ebuild 2682 BLAKE2B b5e7baa7d3f9b65d3eeb346c2761c08ec8868f02f7d87a7d1ec31a9b6f3a431eb4b7db2c9379ea235267dcdb51be56be967376b95599155ab27fa28fe0b22bca SHA512 f293162e07ed2f9e9130f64a22a4f39fb83ea84040b9b7dd141b3807fd1fcefc32377534c7c48478a90e950d4c70fd748d61a9d592adabb276b19ec9b2387fa4
 MISC metadata.xml 335 BLAKE2B 835d498407155ac5295c70af8a671114c777e5f9371b3d47f9f92a6b102b8e1d58755df0737c34820630464772dc001163e83b5d319707a1c630f4cf2f9ef8de SHA512 3421081016cb99570f9ce9f775097669cd40a709efbbb3c76a20947717bc40d886195a5fda889407d1c436a387c126e07def1eeae01edff53c490ea9c630e992
diff --git a/dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild b/dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild
deleted file mode 100644
index d675067c9fab..000000000000
--- a/dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
-HOMEPAGE="https://github.com/rdoc/rdoc/"
-SRC_URI="https://github.com/rdoc/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND+=">=app-eselect/eselect-ruby-20161226"
-
-RUBY_PATCHES=( "${FILESDIR}/${P}-jquery.patch" )
-
-ruby_add_bdepend "
-	dev-ruby/kpeg
-	dev-ruby/racc
-	test? (
-		dev-ruby/bundler
-		>=dev-ruby/minitest-5.8:5
-	)"
-
-ruby_add_rdepend "dev-ruby/json:2"
-
-all_ruby_prepare() {
-	# Other packages also have use for a nonexistent directory, bug 321059
-	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/test_rdoc*.rb || die
-
-	# Avoid unneeded dependency on bundler, bug 603696
-	sed -i -e '/bundler/ s:^:#:' \
-		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' Rakefile || die
-
-	# Remove test that is depending on the locale, which we can't garantuee.
-	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
-
-	# Remove test depending on FEATURES=userpriv, bug 361959
-	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
-
-	# Remove tests for code that is not included and not listed in Manifest.txt
-	rm -f test/test_rdoc_i18n_{locale,text}.rb \
-	   test/test_rdoc_generator_pot* || die
-
-	# Removal is not included in the upstream patch
-	rm -f  lib/rdoc/generator/template/darkfish/js/jquery.js || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		ruby -Ilib -S exe/rdoc || die
-	fi
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake generate || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'gem "json", "~>2.0"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for bin in rdoc ri; do
-		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
-
-		for version in $(ruby_get_use_implementations); do
-			version=`echo ${version} | cut -c 5-`
-			if use ruby_targets_ruby${version}; then
-				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
-				sed -i -e "1s/env ruby/ruby${version}/" \
-					"${ED}/usr/bin/${bin}${version}" || die
-			fi
-		done
-	done
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/rdoc) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-}
diff --git a/dev-ruby/rdoc/rdoc-6.1.2.ebuild b/dev-ruby/rdoc/rdoc-6.1.2.ebuild
index 6d60f3bcef37..2afc0c8057e7 100644
--- a/dev-ruby/rdoc/rdoc-6.1.2.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.1.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ruby/rdoc/"
 SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-ruby/rdoc/rdoc-6.2.0.ebuild b/dev-ruby/rdoc/rdoc-6.2.0.ebuild
index 22e2b4480b73..2be09233e2b8 100644
--- a/dev-ruby/rdoc/rdoc-6.2.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.2.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ruby/rdoc/"
 SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="doc"