diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 278eb166d7879..7bdb723ba276b 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,7 +1,7 @@
-DIST rspec-core-2.14.8-git.tgz 195949 SHA256 757febdcc4465b62fb41572e1fb7e0deb86f903127cb2941ea65d2c1d4ac29db SHA512 2be487f0a820cb959771b0c2a725aa7a43cd80a76f85ed42f3341420cefa4ba6413b5dbd86e8fba9f5515afef3e895e0f1f2f8239d50f0b764f037d5f0791095 WHIRLPOOL 5b2422d7f1d087caf654ea04d81f269ae90be63eb73135d34691839c27e6dfa152aac425f64a860b3af50ef0bf513ac7f4a68c979c254083f187e57a96c20fe3
-DIST rspec-core-2.99.2-git.tgz 212935 SHA256 75794e3f94f3323b1212b93e827d37d6ab2813dea2f5f927929b40e9ee170c43 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44 WHIRLPOOL 5584be2da2310688155c4fe600a4a36f68434440ebc00b063e9fcdcb3188138831a210f482ac86a469984fcf9838d795511ea02433020ecc6bc1d6aacc8c72bd
-DIST rspec-core-3.3.2-git.tgz 332730 SHA256 aef9a2867a435aa7be57826c850e88e593232077dc42f12bfed89a92c7704d26 SHA512 6cadfa43d63df8d24105d88d6e8b22a495a30f04b289c71c8887ea3fead9ec8f071a6c734a140b1e4910f25094fd36c7c37b54a0724e734233ca584202f0cf32 WHIRLPOOL 1e385223ea8c9b32bfc6ecc93146ccad793441bae3426f6cb4acc07d7a1f2bc6e20be11597fcd27f3c6bb207482213e2eaf214835041df631d06b9bc524e5b70
-DIST rspec-core-3.5.3-git.tgz 368960 SHA256 26a5788977ba1ce6889924e6e944d1a08becb059593f297b4f4dd58b600b037a SHA512 c8f983018e33bd111c75671d7208b38704dd0fddb22cca2b08a59a1e5ceb0939ed56ee4015df758f5d766fbe2390279c1d670f6fff4eef222f44621f48c581ef WHIRLPOOL 86afe335378b5e9e94ee53546d6e87c531bee71cc1ed5a79f1549d593f6912a6a07dfac2b783aaaaf808bba8405e6e1cbc5b20fc275ca80ce504bed1b4991fd2
-DIST rspec-core-3.5.4-git.tgz 369170 SHA256 6e7f0cbccf13f774936b25100f743682bb4359040f926a7aa83dce9d7e80209e SHA512 c672381e9233b6f8c6e92ed70d084ff7a558edd6ca7d5a09a28fff1554975b952b6fab94483324b5bd6a62ff7aac576e7a216dbb3972749ef0210fe1cd05411d WHIRLPOOL 816b9dc1648afd11965457b147a5748ea50fd9cef8b5e266a83131b532642f5882bde9099e037ee9f5bea2fa2bc2bca1140494d33f252ea7819b033a4b8dda99
-DIST rspec-core-3.6.0-git.tgz 375590 SHA256 8994ff9ef23e11262d2c0cc7c54ffaa3ce73c3d2fd01fc0c089f46a31e7667fa SHA512 cecd3885652e18ba1ffed45e40d12c932ba0d880e96b2f1d264709f55dbda8d6b0c78c3bf4bb940d246b84261d1b80038618735f65302ff62646165b2e932be1 WHIRLPOOL 7923ccf7959f5fdc23f27ba0a4619b582a6a16ff20dc27eee82a17436ba9c278eaf996f4e851fac8c9a2802cda30ef1928ab5a4bc20269fe66ac4df540d6b827
-DIST rspec-core-3.7.0-git.tgz 376565 SHA256 502b7dc92919e593c748840bbcbdf74e27d0b4a58e58838b9ffc13bdaea3bc34 SHA512 071bd2a5c905d4ce621f2d7255b882a9d34cf42001cb2995fdb05a91387805929198c32e53cf4c2df2a43d179d2c49337214066be87eb50ab044b5f70aba8c54 WHIRLPOOL 48d98d14f716a836a75d25ee523b10ce64e4a1dce91df953ab60320f41d9661c12509e9f788625311b3217eb10f760249c3aa454b28cee4c8d196206d6c26d2f
+DIST rspec-core-2.14.8-git.tgz 195949 BLAKE2B c249da4a6a46019a96cf67428bbf73d9033f98d8f3bae19f9cecc8fa183249e7987f52b01aed3e2b7067a6f7b671e1e23cf78922d0a0d827e4f537395dcdf9a9 SHA512 2be487f0a820cb959771b0c2a725aa7a43cd80a76f85ed42f3341420cefa4ba6413b5dbd86e8fba9f5515afef3e895e0f1f2f8239d50f0b764f037d5f0791095
+DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab63230ab07ea97928d6f66face8d07ab54d87f19535f5f235c441b2da6dec17ef2a889e9ccd7e83d987086e24afd1b82 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44
+DIST rspec-core-3.3.2-git.tgz 332730 BLAKE2B 07077848d04f5628510f01ddf57b47f373b7e9dfd422ef21984af71ec62a9d92b5eaf40e5f61cda4f6def015301bad19af5c911b57503ea112be274614037189 SHA512 6cadfa43d63df8d24105d88d6e8b22a495a30f04b289c71c8887ea3fead9ec8f071a6c734a140b1e4910f25094fd36c7c37b54a0724e734233ca584202f0cf32
+DIST rspec-core-3.5.3-git.tgz 368960 BLAKE2B ba4db57ac16dbd98960f7e5bad4ae7382afc5caddfeebeea6e547554d240d030639f9edb00f5c101a843adb18992ed5cd9430a20e5a3d9783557ff62f1def6b2 SHA512 c8f983018e33bd111c75671d7208b38704dd0fddb22cca2b08a59a1e5ceb0939ed56ee4015df758f5d766fbe2390279c1d670f6fff4eef222f44621f48c581ef
+DIST rspec-core-3.5.4-git.tgz 369170 BLAKE2B c95fa7740bcc1b586b4e26be1db4cb52bb470cb23c9ef74dc644d0ea7c4ca769ab62e587ecff2a16cd6f656e9f3bbdc81b199765f9397dddbe28a8cdce6a1945 SHA512 c672381e9233b6f8c6e92ed70d084ff7a558edd6ca7d5a09a28fff1554975b952b6fab94483324b5bd6a62ff7aac576e7a216dbb3972749ef0210fe1cd05411d
+DIST rspec-core-3.6.0-git.tgz 375590 BLAKE2B e8b4987ea3d5cc3a403eaec98243e4c4be6c9eace798bc97599020543401ecd036c6121a6736995fb716aabd1a2016393506bee1e3076c61b0c49173d991d990 SHA512 cecd3885652e18ba1ffed45e40d12c932ba0d880e96b2f1d264709f55dbda8d6b0c78c3bf4bb940d246b84261d1b80038618735f65302ff62646165b2e932be1
+DIST rspec-core-3.7.0-git.tgz 376565 BLAKE2B 86b0584883047c83e4fddfd09924a5b68828f53e2018d2513cd79484a390d1b7b89e8176b0098b8869d5ed7206c132d77a0d8ef2ffb5447da317460b152e5e23 SHA512 071bd2a5c905d4ce621f2d7255b882a9d34cf42001cb2995fdb05a91387805929198c32e53cf4c2df2a43d179d2c49337214066be87eb50ab044b5f70aba8c54
diff --git a/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild b/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
index 252675f496fff..e06222659137f 100644
--- a/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby22"
 
 RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
 
@@ -35,9 +35,6 @@ ruby_add_bdepend "test? (
 		>=dev-ruby/rspec-mocks-2.12.0:2
 	)"
 
-# Skip yard for ruby21 for now since we can't bootstrap otherwise.
-USE_RUBY=${USE_RUBY/ruby21/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
 all_ruby_prepare() {
 	# Don't set up bundler: it doesn't understand our setup.
 	sed -i -e '/[Bb]undler/d' Rakefile || die
@@ -72,12 +69,6 @@ each_ruby_prepare() {
 	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
 }
 
-all_ruby_compile() {
-	if use doc ; then
-		yardoc || die
-	fi
-}
-
 each_ruby_test() {
 	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
 }