Install rdoc20 wrapper needed for eselecting ruby. Fixes bug 476694. Thanks to cmuelle8 for the initial patch.

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

3 files changed, 110 insertions, 5 deletions

diff --git a/dev-ruby/rdoc/ChangeLog b/dev-ruby/rdoc/ChangeLog
index a67b1732c83d..6b02ac98f3bf 100644
--- a/dev-ruby/rdoc/ChangeLog
+++ b/dev-ruby/rdoc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.113 2013/07/07 08:09:52 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/ChangeLog,v 1.114 2013/07/14 09:26:34 graaff Exp $
+
+*rdoc-4.0.1-r1 (14 Jul 2013)
+
+  14 Jul 2013; Hans de Graaff <graaff@gentoo.org> +rdoc-4.0.1-r1.ebuild:
+  Install rdoc20 wrapper needed for eselecting ruby. Fixes bug 476694. Thanks
+  to cmuelle8 for the initial patch.
 
   07 Jul 2013; Hans de Graaff <graaff@gentoo.org> rdoc-4.0.1.ebuild:
   Add ruby20 support.
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 66c6aaf3f32a..10d184393c61 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -9,13 +9,14 @@ 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.1.ebuild 2533 SHA256 e14443c5087ceac17a949a67d77bf1d04ca4aaf096a0e4cdb0c06ee23dec08df SHA512 a658118dcb72780cfcc5da6cf5721295765deae4481ace19e8da54ddd1d433ab89b13a8f67194149ae08f24eee48c1ad31fc9da8f9ef9e72f1a9c40b8b72c881 WHIRLPOOL d04c2cea964893defb403c91120b65bab09dfb62d6c2785f0e501955432e6452d396e96dc7797c1ec434de781f48f9e7fc46deb3698b78bbd4e846ffc772e569
 EBUILD rdoc-3.12.2.ebuild 2527 SHA256 ceef783c30d2e5f860fac17c1e9880d5c4096745eaf9c093060ea98e95e4b805 SHA512 4c29075ccf44df930519077baa5fb503a55f2c90292364115fd316d802e7ced78e7b95dea8ecbd39ed7add7448fb125b620f103052452a2a40a162a8593f9260 WHIRLPOOL f20b62064ec8489b012b3f2996ed6eddf64b9a0186509e6d6657e62fd5d7eb2b847724e5a4cee5d70ec8839c26a393b3fba85b71c4b9423e8d4752a7fb0bdd5c
+EBUILD rdoc-4.0.1-r1.ebuild 2801 SHA256 1e185d587ba0d3ddb2bdfbbf7c0ee7079894a3ab4f059de407388a6cdf500cb8 SHA512 5793913c2a7343f8ca7547e5cb72be8406f176803c67fdb4843a5b1b1769193e22011a8c129fed3a3703f45c2d0dd5ca5369bd1cb28deff660c40707fbc00440 WHIRLPOOL 4b1f018fce58ea4e70242565891e4a92ea54349a55debfa5397dbef6b4d29f04d60fa1b49f139e05cff85dba9b5f29d4b6d59f5a76d840bdc0a8cac62cd67874
 EBUILD rdoc-4.0.1.ebuild 2727 SHA256 adc0d177185da8ed34c5ccb301da19c04e86e2fd94140fccc36920ed87423477 SHA512 7f3d526bc7a4797f727f75e7e7760aa5c658560b3aec95d9e09d74ccce8ca76d516658e7c9598093e47ea661283ba52a026c18e603409881f1e97ede34bc6bb7 WHIRLPOOL e6269432ce0cdfc73b5749e164f2b101268f3c3de93ddf441fa4c389d24d25950592d9c252b30d50aaa20970a40af2c4bdfd6726415e742131350408097bd339
-MISC ChangeLog 11816 SHA256 e0c1317c6f6b1bfebe04a7881b0967fcf1aca71a4751ee6b383a204d348b0444 SHA512 ba4c64dc178c4c76002501d4a2f6f1818dc49d7cc34256e1879620838fb3e7e0434725229cca2b9cf238471b8a54b7f5c8de3ca3e1b0a5a97685e0bcdc18030d WHIRLPOOL 2901441dd5a958ec39de64d34c4b3e2a0e9ffe29ae64dba8479e0dc64fe67deaa865895a6dbdb60b6237e949777796955155fd379fc25238ae05df7eff182feb
+MISC ChangeLog 12035 SHA256 c9f3cefa4069ac665f359e2c66d44b3b69d3c7307bddbded442f9c52c290f9c6 SHA512 14cf9762a4bbd9ede9b2f7587798be02d0100247d64ab9561bc333c78d0c604157c6ca9eb3dd610283039d83f0d5f5050c84036b3ad1c43ae4315c1bb5bdcece WHIRLPOOL 9563f8746e50255d47528fd4e384381f3a018325ca4051773504201f9b376760f3bbdcc31bc5521cc766372186730a83d1e1b0c9407b149a011aeae486518a69
 MISC metadata.xml 230 SHA256 a04255553b410ad36340c3a47e4f30304c388b503b27c07c3e6f9bbdc9dbbd54 SHA512 c1c7fd9d06fc087b6bca6119547401ab5c9a752ce6a3981ab8a3531033332bdf4a176cfe455f130c3157f0a9757ab5250cc99bf600151e83f09c201c1a1b4e46 WHIRLPOOL f1aa7788f09e4d730668da22d38c1ccbfb8f72cd601d66c53ca3ca5af779c01578232332d37ffe74fa6529426e5d7517e2612bcc83d46133aea00b86db2f2ad7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHZIlEACgkQiIP6VqMIqNdfnAD/Q/OhKq/nSsDpjpjgFiTvq2TE
-1FLCKmxLYCnACS7HPPYA/2M5nBfSbxvW8QttSmAeyXEq1S4dzKYYmvddJB0fk92d
-=8uFd
+iF4EAREIAAYFAlHibtEACgkQiIP6VqMIqNdKmwD/X9kJOBIwVqtFIbRAm5Q9uy0b
+YKxh6Ie/Aav1oN3M6VEA/jtOMPDw3+jPD0mRLkM5SFm7kLgEK8YSXsMYS04OWefj
+=lgAp
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rdoc/rdoc-4.0.1-r1.ebuild b/dev-ruby/rdoc/rdoc-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..7da4054d9745
--- /dev/null
+++ b/dev-ruby/rdoc/rdoc-4.0.1-r1.ebuild
@@ -0,0 +1,98 @@
+# 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-r1.ebuild,v 1.1 2013/07/14 09:26:34 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ruby20 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? (
+		virtual/ruby-minitest
+	)"
+
+ruby_add_rdepend "=dev-ruby/json-1* >=dev-ruby/json-1.4"
+
+# This ebuild replaces rdoc in ruby-1.9.2 and later.
+# ruby 1.8.6 is no longer supported.
+RDEPEND="${RDEPEND}
+	ruby_targets_ruby19? (
+		>=dev-lang/ruby-1.9.2:1.9
+	)
+	ruby_targets_ruby18? (
+		>=dev-lang/ruby-1.8.7:1.8
+	)"
+
+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
+}
+
+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; 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
+}