3 files changed, 88 insertions, 5 deletions
diff --git a/dev-ruby/rdoc/ChangeLog b/dev-ruby/rdoc/ChangeLog
index a55ed5b6845c..1edf5038d3a6 100644
--- a/dev-ruby/rdoc/ChangeLog
+++ b/dev-ruby/rdoc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/rdoc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/ChangeLog,v 1.59 2011/05/15 05:43:17 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/ChangeLog,v 1.60 2011/05/17 17:05:36 graaff Exp $
+
+*rdoc-3.6.1 (17 May 2011)
+
+  17 May 2011; Hans de Graaff <graaff@gentoo.org> +rdoc-3.6.1.ebuild:
+  Version bump.
 
 *rdoc-3.6 (15 May 2011)
 
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 218ca43bc0be..72b64a582ba4 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -6,17 +6,19 @@ AUX rdoc-3.0.1-bin-require.patch 632 RMD160 1210d1fc3b92bc37c21988fc6d94d70d0ca4
 DIST rdoc-2.5.11.tgz 180539 RMD160 beeddf048e3ef489fe1e8b0f436432f4dc195256 SHA1 5dece89968bbc8647cb02e0eed7287ec0cf28757 SHA256 7c11da5950d07d35875aa5de056f6b93baec4240779d8a5287eaa6073e495cda
 DIST rdoc-3.5.1.gem 230400 RMD160 27439d449af5de3635735436522a6f311253274b SHA1 b3ec65d571e1b889143d91898ac4375184b78e7c SHA256 d7385cd97461114942403ff597641ea02095c7ecfbbed67a673f8188c88a9457
 DIST rdoc-3.5.3.gem 233472 RMD160 e4830b992023366a2bb2f0227018f2adc06d131f SHA1 a140e866c02b4b2bbddf73457b899b07bd5c5c63 SHA256 c1f3580cab4089d8327c2893d68abb76498ee10e2e8a20456a185f3c6a937140
+DIST rdoc-3.6.1.gem 235520 RMD160 6528e3019d9d5968489267a61dc942c6b0890d41 SHA1 8e4ae75c72674f84a126bca04535063bc568fbc3 SHA256 05dd4662a6ef0008de3b13368b6a705a418b53925142e0dcde0cadc168378f43
 DIST rdoc-3.6.gem 235008 RMD160 5e222a148fff0161ca1c1af1cfd923132b48d9a8 SHA1 bb6561e33c25ff4a4110bb37e67f18952651651f SHA256 900a50e9fadce88c8af441fb348baa3fb5e74bb7eb79c5acf0311e42b4da46dd
 EBUILD rdoc-2.5.11.ebuild 1158 RMD160 f11c1cce0bae168c642c724dde462b4c70dbb199 SHA1 f55aca992176a43e779a1a6e349bd5a43961acfd SHA256 125b677f11f96f62afc55879fe2cac6460556f77cdc36c0ae5292a170e226e24
 EBUILD rdoc-3.5.1.ebuild 1907 RMD160 5440c02fa07a753eb9dd8d33cf7b6ae4632de0d8 SHA1 91c453e583e2b0c32a2c752ca04bdbbd1e1eda33 SHA256 817ad5d0e139a8f45f3a04f09435c735644e47ba42d4bf7082dfdd6b9cbf4fff
 EBUILD rdoc-3.5.3.ebuild 1919 RMD160 3f1cf89628471213b73f6bfb3cd7a1c2c79ad6cd SHA1 f3df0e35be06f75678184a55ad96bb8f6d6cce27 SHA256 546eb7c17f857e5b3b3ff308ce73b26e7d0a194d2a23e410344fdc301c2a1554
+EBUILD rdoc-3.6.1.ebuild 1918 RMD160 2d32dee01b17993815c9d2e3bf06285e4b31d6d3 SHA1 a0c412bed3e4390c1054b5df1405ea1aaabd046f SHA256 85f6092c8a51769fdac75b9f8734a7a8d2be824eb96e5fb68a05ce3f541e3090
 EBUILD rdoc-3.6.ebuild 1916 RMD160 56abc26aad579d54e33c7b4082c2265ea9178226 SHA1 9f00af3057bcf08f1220adfc8b86348863f440e1 SHA256 36c96348860ff459f0aafe803137f625badab26a2006d86da9fb1a21de6809d7
-MISC ChangeLog 6082 RMD160 f93972f74a588db011db71ada8377baf3ad57a82 SHA1 f4de41b04f33e474e4d41b81fbd4bf5b700f9b2f SHA256 12a483b756b6422177b61be45e1e8c8aa92f78152a00f58d9656b726d7a4fdba
+MISC ChangeLog 6196 RMD160 4c3722e32db0590181eef9a1e4c9b90926c31a38 SHA1 77508ee8397f6f1dee52e373da5b8cbf7abe1817 SHA256 915cc93061f4084eee5bad2c86234f5f28b2d52f8e9ba2fe19874284cded3b54
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3PaAQACgkQrnu0mw69Jkr/cAD/enP2FF/Oe8IkoHC+P9YA4d+N
-fzFXVDcF4yo798XpgAwA/iXxFqeYE3gAgf3gJD8tpjVc/u7kcQSsBc0mQvdzpc+f
-=R73l
+iF4EAREIAAYFAk3SqusACgkQrnu0mw69JkptBgD9FSBP+Ac/2j6ubaDTPEuzPeKR
+GnHosPTPP0xpmmCw5+EA/3mVkclyArvdIx2Hpk+Dc3YR9X9cd/yRNK66wkgTMom/
+=tPHJ
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rdoc/rdoc-3.6.1.ebuild b/dev-ruby/rdoc/rdoc-3.6.1.ebuild
new file mode 100644
index 000000000000..89d8a2b9d5bf
--- /dev/null
+++ b/dev-ruby/rdoc/rdoc-3.6.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-3.6.1.ebuild,v 1.1 2011/05/17 17:05:36 graaff Exp $
+
+EAPI=3
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.txt RI.txt"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
+HOMEPAGE="http://rubyforge.org/projects/rdoc/"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	doc? ( >=dev-ruby/hoe-2.7.0 )
+	test? (
+		>=dev-ruby/hoe-2.7.0
+		dev-ruby/minitest
+	)"
+
+# 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
+
+	epatch "${FILESDIR}/${PN}-3.0.1-bin-require.patch"
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*jruby)
+			# Remove tests that will fail due to a bug in JRuby affecting
+			# Dir.mktmpdir: http://jira.codehaus.org/browse/JRUBY-4082
+			rm test/test_rdoc_options.rb || die
+			;;
+		*)
+			;;
+	esac
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for bin in rdoc ri; do
+		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
+
+		if use ruby_targets_ruby19; then
+			ruby_fakegem_binwrapper $bin /usr/bin/${bin}19
+			sed -i -e "1s/env ruby/ruby19/" \
+				"${ED}/usr/bin/${bin}19" || die
+		fi
+	done
+}