6 files changed, 189 insertions, 10 deletions
diff --git a/dev-ruby/rake/ChangeLog b/dev-ruby/rake/ChangeLog
index ce0d580e4cd7..0f7385066ee5 100644
--- a/dev-ruby/rake/ChangeLog
+++ b/dev-ruby/rake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/rake
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rake/ChangeLog,v 1.145 2013/12/20 15:53:33 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rake/ChangeLog,v 1.146 2013/12/26 09:26:38 graaff Exp $
+
+*rake-0.9.6-r1 (26 Dec 2013)
+
+  26 Dec 2013; Hans de Graaff <graaff@gentoo.org> +rake-0.9.6-r1.ebuild:
+  Add revision for ruby21.
 
   20 Dec 2013; Akinori Hattori <hattya@gentoo.org> rake-0.9.6.ebuild:
   ia64 stable wrt bug #483254
diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest
index 4d942c874faa..ceaa9a9506d9 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -8,13 +8,14 @@ DIST rake-0.9.6.gem 123904 SHA256 0cde8637bc097b984b602d7db77b1982b3a0be5ab014f1
 EBUILD rake-0.8.7-r6.ebuild 1167 SHA256 7acc4b48b73412cfada69a46310efee768cc840b2ae1ebb141ba4e6ffec50396 SHA512 a0d7760094e25b1b3467c9f10637b57f8340d15cbc9e9ec34100cd9501d4704fe8a168d154453dc78989764cc3386313aabd14698eb2503715274c48583a7b1f WHIRLPOOL cc954a4cbe16153ebd30064898a2be6aa273347c770148e674268bdd756cda1b94b11228b7547981e601c191a086b0bd92a788fa0b18b9feec3c6089cc37f5d1
 EBUILD rake-0.8.7-r7.ebuild 1184 SHA256 e786b85513693e071ca496595f420c148c0426b43c5fba24df167a7910966934 SHA512 51966dca60ca9e7419c52d685303b8404046839a5e4ce4a323644b2be8dc6dc50f5d7df6420ebef2c91c77c81a2395ba07c2bf210361161b72c9174c0faa9e0f WHIRLPOOL cd46b5859f638a89a31302c07a91727a765b14d2a347cdbe618e4e7d1faabbc94fe4ea3dd66213048b33e44299d4fb67c7df7d1db6ef9516ff21e2229c513f09
 EBUILD rake-0.9.2.2.ebuild 1779 SHA256 7809fffedd8a0fc9592f6684980889a89b303a7707e7764bf851e12aa87eb768 SHA512 202ac28044d062e6300e974238b3a12f90d1dbfc2b1a278d9471a4959b205ae01feb9cf3dc7db92323088a574af69274153a467b2b82537dbe8d270b4b24c356 WHIRLPOOL f70f1c4d4b4af1c8c8669401f212aa35aa4ffb0f712c96dece76b23defb498f10226d398e7ef7647e844330636c8221552b154f9a5712c5b2dcb485b644b5074
+EBUILD rake-0.9.6-r1.ebuild 2124 SHA256 502c3322d281071cac5d8be0d0d971c66e1e29cede0a55c9d916a8ece3585c8f SHA512 9b655093d654c343d7fe1bb6f077934608432d2cecd7da540e37207be43700c8d9fe3d48c10e679bce75643c3b78018403f841012bdb1d43d2b3ade87e269be2 WHIRLPOOL 50d93ca05b6268f8a19c2e00557a12a1b762da34f0794407e5b6989691c82c2c85e25376bbdb58bd178eaadf58d6f2588a65e65d5bc38126dde87cc7352e8ec1
 EBUILD rake-0.9.6.ebuild 2108 SHA256 508b83702bd5b37bd2472a69e5842e6eba641b53c98290c832c684388fcbb0ae SHA512 1c37938588f902499c50307a4e9f14dafb30d4b6900366d761961cca147da15e0e2ece5a2fadaad8993859f17f7a1c561b1ad89653b9f52eab1706014d8a074c WHIRLPOOL 45443fb4a24336607e9ac55f93d683880f5b35ebd246348907734b272c386a796f432ea86eed93b241d9585238c9c36f929e208215c5cb37c7072b0b424ab058
-MISC ChangeLog 18127 SHA256 a30e8014bdd9f4c136518dfbe0e4460345951838b89c6d5e945cc05a60c1e26c SHA512 c151b861dbd086d34fc736eeda6a09ac42f3041de64f23b9cf699a5461bb46ad21728528ae6789823264c74bf7150932ad6ab5d3ed57a95bcc15a155e5e83f48 WHIRLPOOL 73be1bdd67723148608cc18376a8e9dbd4681dc241b3ef77e0dfc45f95630a65c06cf93ba8f6e410baefd9619f08779c52e67c4e736b25068b02c2b80723894b
+MISC ChangeLog 18258 SHA256 4d1804ecf6b4649833a89df243132b39f899fa88fb9bc365d468e72ee503e9c9 SHA512 3cb08f46541ca65539c2ed4548545c4d9bfaf54a41d7819e081c6cb149ded9a2717c71e922750553739c3f13e773e7d964f964e6fccfd70be02b3adc5f070e3e WHIRLPOOL 3e2cb79f760d3711ccfa7fc206270ef30d56f2764874a3f504b25e6bd3259d16740f6a391fb3abd8e7892fe18ac2f084b48ff784cb3495715f34a01ff0b63972
 MISC metadata.xml 230 SHA256 4b5e14609c578e9b9bf6836a8de9f1ec2f6d826b1bcb85b34c86bdfd973a699d SHA512 16e5b7f7815b9599a30cc4611e544ca244d474508a98320e2804e1dab38a5d942a555d37b112ecc9f15ea4369c16c1d18d6c53ce84951f6c1b25cdb3293ccff5 WHIRLPOOL 35f70ff0ee0cc6ab0f5e81c194c42cd4ebbc803ad3d8620b9d7461d79f142dd3e6db6d5f6150055e6ee5ee3955a3ef8f164d18c667ee31b3b9a77c1b0153e0b1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK0aAoACgkQL46suuyRem0rPQCgqRYi+gQt94CR+fGTcfBdqhNJ
-2IMAn1eFPCIcz0DSaI1xD8QwrsiDqoJI
-=dg1g
+iF4EAREIAAYFAlK79k8ACgkQiIP6VqMIqNcmCAD9G2yYrCv9SAfhgsEW7fK8QavU
+JEf+gu85c+eeKKIjni0A/RxtZcYk5ron3jHQhSkvyMsuPNdB6PrX9ZYXPhqbz+sc
+=ReqS
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rake/rake-0.9.6-r1.ebuild b/dev-ruby/rake/rake-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..3df21b84b032
--- /dev/null
+++ b/dev-ruby/rake/rake-0.9.6-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rake/rake-0.9.6-r1.ebuild,v 1.1 2013/12/26 09:26:38 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ruby20 ruby21 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit bash-completion-r1 ruby-fakegem
+
+DESCRIPTION="Make-like scripting in Ruby"
+HOMEPAGE="http://rake.rubyforge.org/"
+
+LICENSE="MIT"
+SLOT="0"
+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"
+IUSE="doc"
+
+DEPEND="${DEPEND} app-arch/gzip"
+RDEPEND="${RDEPEND}"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )
+	test? ( virtual/ruby-minitest )"
+
+all_ruby_prepare() {
+	# Comment out unimportant test which failes on ruby18 at least.
+	sed -i -e '/def test_classic_namespace/,/^  end/ s:^:#:' test/test_rake_application_options.rb || die
+
+	# Avoid tests which can't work in bootstrapping because the test runs
+	# in a directory that can't access the file being loaded.
+	rm test/test_rake_clean.rb || die
+	sed -i -e '/test_run_code_rake/,/^  end/ s:^:#:' test/test_rake_test_task.rb || die
+
+	# Decompress the file. The compressed version has errors, ignore them.
+	zcat doc/rake.1.gz > doc/rake.1
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*jruby)
+			# Remove failing tests. These are not failures in rake but
+			# in our packaging of jruby. They are already present in
+			# rake 0.9.2.2, so avoid them for now so that we can at
+			# least bump 0.9.6 which is needed for ruby20.
+			rm test/test_rake_{functional,rules}.rb || die
+			;;
+	esac
+}
+
+all_ruby_compile() {
+	if use doc; then
+		ruby -Ilib bin/rake rdoc || die "doc generation failed"
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -S testrb test/test_*.rb || die
+}
+
+all_ruby_install() {
+	ruby_fakegem_binwrapper rake
+
+	if use doc; then
+		pushd html
+		dohtml -r *
+		popd
+	fi
+
+	doman doc/rake.1
+
+	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
+}
diff --git a/dev-ruby/rdoc/ChangeLog b/dev-ruby/rdoc/ChangeLog
index 1c0fdc7e99ab..936eae26af80 100644
--- a/dev-ruby/rdoc/ChangeLog
+++ b/dev-ruby/rdoc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/rdoc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/ChangeLog,v 1.122 2013/12/20 15:54:55 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/ChangeLog,v 1.123 2013/12/26 09:27:13 graaff Exp $
+
+*rdoc-4.0.1-r2 (26 Dec 2013)
+
+  26 Dec 2013; Hans de Graaff <graaff@gentoo.org> +rdoc-4.0.1-r2.ebuild:
+  Add revision for ruby21.
 
   20 Dec 2013; Akinori Hattori <hattya@gentoo.org> rdoc-4.0.1-r1.ebuild:
   ia64 stable wrt bug #483254
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 9454a1d3b93f..7451061d5278 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -8,12 +8,13 @@ DIST rdoc-3.12.2.gem 326144 SHA256 a8e2b78f7e5ec4cc4716cd863975645f2f2377dc6db26
 DIST rdoc-4.0.1.gem 467456 SHA256 b712d56c266a8568362bbebcdc385b102b1494ceea099161c71e02f420d716ba SHA512 11cf6e1700598bd7c414f3ed9d7b75f73bf0f053eb2754d2652bb628e6e47c171646fb420d7b7ee4b589da43fb4b638bc9a2b151ec348c0a20ebaf10f58438c9 WHIRLPOOL 471cd451fd4bc947ad4a29802d66182a21079d444963bb3006fb065175285c71351bfb75c1aaf3d5778e5554c9b5562281037ec38df1c0b159e60dfa368016fd
 EBUILD rdoc-3.12.2.ebuild 2527 SHA256 ceef783c30d2e5f860fac17c1e9880d5c4096745eaf9c093060ea98e95e4b805 SHA512 4c29075ccf44df930519077baa5fb503a55f2c90292364115fd316d802e7ced78e7b95dea8ecbd39ed7add7448fb125b620f103052452a2a40a162a8593f9260 WHIRLPOOL f20b62064ec8489b012b3f2996ed6eddf64b9a0186509e6d6657e62fd5d7eb2b847724e5a4cee5d70ec8839c26a393b3fba85b71c4b9423e8d4752a7fb0bdd5c
 EBUILD rdoc-4.0.1-r1.ebuild 2795 SHA256 fae15ce3761ce55d2dac96e646a758f44fd8cfff13bca79c72df9e25e20c1d49 SHA512 2ceb9308ffb9b712cc47719dd079cd6ee9a0619963a033ae4baec4ae42fed0268fb170e9f353805ba8aea2621f92f81ddb18bdd43e68faf9a7e066f59aed66c4 WHIRLPOOL 8b21244f6b7bf88f1671f13082cad71cdee181d6618b8bcfd164e3485543ee1221f80ef1fe198ffdc8b822f2e3b7fd8c91911c8ae940f3998b7fb08f76496570
-MISC ChangeLog 12837 SHA256 079d27aadf66600c2432d679fc170d157979a2341187422b0244951c6a9ffc84 SHA512 8d4cbdf5e5c57dd8ff166c695603a7ece6907ffc4832df23e8f59bb9f0c99e573b006f0a09a609fbbf3a566ce098fda4199a8296757835f10f54f6c346351858 WHIRLPOOL 614558799542f67f5670af8b963d6100a449412e479e118a4d63df7c06972380cbab882f198805f5889b8e0a48a569811c0e8c36fc09055c3d0f919e82e17ab1
+EBUILD rdoc-4.0.1-r2.ebuild 2706 SHA256 4dd1d5c4c6c3365d498b2a163011411987f9fb5edb7b68c6d5b5b053cc8f380d SHA512 f8619670ae8c5da0f89a07cb1f7a5bb90886ccb1f5ddfd92fa02879dc4d65ddcaccf9188d30b307fc9b028e1a3f256d2a101ce68dad909cf5638f43c4db82e7a WHIRLPOOL 61cd36fdbe66ee8df32556bed457238ec380280101ac301462b9d0c5834e0084e34966efee5c732b9487916b0d03da4e4f324a3bc0165b25471fd5dfd824db06
+MISC ChangeLog 12968 SHA256 7c90f57312ed3cb1ac05712b1f477565a8f031f52387a2c8968ddb8755390a90 SHA512 e0448f2b82e08181c19afcb05237ab0c637939105d96e0b0e10358c6f1c57d0c7c4cacd8b094acde165f25139ce33bf653959075ef7f5f3e2311d4f409510a87 WHIRLPOOL 4ae0830f8fb473a39e77d9ae4500f629d4e828735c4bbb40605be27a564f6f6c50cfe16ad083af6b5ad9b3dfaa082f2f60a5704a48d02356b9d25ab6d569ebe2
 MISC metadata.xml 230 SHA256 a04255553b410ad36340c3a47e4f30304c388b503b27c07c3e6f9bbdc9dbbd54 SHA512 c1c7fd9d06fc087b6bca6119547401ab5c9a752ce6a3981ab8a3531033332bdf4a176cfe455f130c3157f0a9757ab5250cc99bf600151e83f09c201c1a1b4e46 WHIRLPOOL f1aa7788f09e4d730668da22d38c1ccbfb8f72cd601d66c53ca3ca5af779c01578232332d37ffe74fa6529426e5d7517e2612bcc83d46133aea00b86db2f2ad7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK0aF0ACgkQL46suuyRem2e/wCeOmYPb/5+AkeYIdUq0FR8twln
-lIsAnio2vbzwlODoWzmU53w1GSe+nN7g
-=PHV4
+iF4EAREIAAYFAlK79nIACgkQiIP6VqMIqNfzFQD+I0WKJ9AfUZAJCOd2r/JGgpGw
+P5mAKsCypNjpklxRWw4A/2H7d9y3+tCKyMxHO07ZS3TRKiRPWey5CjAT/ZLDgn8M
+=fj/w
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rdoc/rdoc-4.0.1-r2.ebuild b/dev-ruby/rdoc/rdoc-4.0.1-r2.ebuild
new file mode 100644
index 000000000000..59a36160aa2d
--- /dev/null
+++ b/dev-ruby/rdoc/rdoc-4.0.1-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-4.0.1-r2.ebuild,v 1.1 2013/12/26 09:27:13 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ruby20 ruby21 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
+HOMEPAGE="https://github.com/rdoc/rdoc/"
+
+LICENSE="Ruby MIT"
+SLOT="0"
+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"
+IUSE=""
+
+ruby_add_bdepend "
+	dev-ruby/racc
+	test? (
+		>=dev-ruby/minitest-4:0
+	)"
+
+ruby_add_rdepend "=dev-ruby/json-1* >=dev-ruby/json-1.4"
+
+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
+
+	# Remove unavailable and unneeded isolate plugin for Hoe
+	sed -i -e '/isolate/d' Rakefile || die
+
+	# Remove licenses line from Hoe definitions so we also use older versions.
+	sed -i -e '/licenses/ s:^:#:' Rakefile || die
+
+	epatch "${FILESDIR}/${PN}-3.0.1-bin-require.patch"
+
+	# 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
+
+	# Avoid the generate rule since it doesn't work on jruby, see below.
+	sed -i -e '/:generate/d' Rakefile || die
+
+	# Make sure we get the expected version of minitest.
+	echo 'gem "minitest", "~> 4.0"' > test/test_0000.rb || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		ruby -Ilib -S bin/rdoc || die
+	fi
+}
+
+each_ruby_compile() {
+	# Generate the file inline here since the Rakefile confuses jruby
+	# into a circular dependency.
+	for file in lib/rdoc/rd/block_parser lib/rdoc/rd/inline_parser ; do
+		${RUBY} -S racc -l -o ${file}.rb ${file}.ry || die
+	done
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib -S testrb test/test_*.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for bin in rdoc ri; do
+		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
+
+		for version in 19 20 21; do
+			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
+}