Add revision for ruby21.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 102 insertions, 5 deletions

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
+}