Fix include path for script, thanks for James le Cuirot for the patch.

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

4 files changed, 107 insertions, 5 deletions

diff --git a/dev-ruby/rdoc/ChangeLog b/dev-ruby/rdoc/ChangeLog
index 3e4a407459f2..0c7822a06b75 100644
--- a/dev-ruby/rdoc/ChangeLog
+++ b/dev-ruby/rdoc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/rdoc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/ChangeLog,v 1.40 2010/12/27 18:38:05 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/ChangeLog,v 1.41 2010/12/28 07:40:47 graaff Exp $
+
+*rdoc-3.0.1-r1 (28 Dec 2010)
+
+  28 Dec 2010; Hans de Graaff <graaff@gentoo.org> +rdoc-3.0.1-r1.ebuild,
+  +files/rdoc-3.0.1-bin-require.patch:
+  Fix include path for script, thanks for James le Cuirot for the patch.
 
   27 Dec 2010; Hans de Graaff <graaff@gentoo.org> rdoc-2.5.11.ebuild:
   Drop ruby19 support to create a stable candidate.
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index ea7d8f3ac792..ffe6e82810e9 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -2,16 +2,18 @@
 Hash: SHA256
 
 AUX rdoc-2.5.6-ruby19.patch 959 RMD160 951cd3c166dab07f0afcdb46112001b58fbdd05a SHA1 4b94a9a235f909651ce8a9acbbb418fe3754d1ff SHA256 2c81c17d99f896182805b737e64c353045b4505acd693a19cd1f0adcff7e040d
+AUX rdoc-3.0.1-bin-require.patch 632 RMD160 1210d1fc3b92bc37c21988fc6d94d70d0ca43e10 SHA1 243a783b95b47d78758fe1c6f439718655a52c90 SHA256 5b8468ba10d6767620ee6ecad9719f213744c6de207ecab078dd48f96147ad50
 DIST rdoc-2.5.11.tgz 180539 RMD160 beeddf048e3ef489fe1e8b0f436432f4dc195256 SHA1 5dece89968bbc8647cb02e0eed7287ec0cf28757 SHA256 7c11da5950d07d35875aa5de056f6b93baec4240779d8a5287eaa6073e495cda
 DIST rdoc-3.0.1.tgz 210059 RMD160 ce912abb020f693f09c1c95950e372b7a56997bb SHA1 ec3db0024c9b288dc82100eb297df3c4ec557d33 SHA256 d7609e5a487248deceaefcb61175024739f062878788bb90b85adde8ba04a7c0
 EBUILD rdoc-2.5.11.ebuild 1135 RMD160 b4336ec402af25b226931873a64e5648e34aa099 SHA1 2909c97c0c5efaee70022d35a36ab0566df8ebcd SHA256 3d924d7d3cc255ea79a261b72c29efed8b3b591b949eb4fd286005c200ffbedf
+EBUILD rdoc-3.0.1-r1.ebuild 1839 RMD160 b57264d29560ef7aecdbb8677d009e0fcf3fdff0 SHA1 418a8f2e451774fc26ce1c3afb7231b898b40a18 SHA256 c20ef3069a7d0a632bbe0bbe581995baa377998de0fbba13549fe922e91a3055
 EBUILD rdoc-3.0.1.ebuild 1790 RMD160 d25359befb5fff1cac1727e30527fefabc0bebb2 SHA1 44b2a3d9df9417af925fc3920c678d8de2f5c6fb SHA256 82fd767abf0693bea5a1c6b03cf2e0f1bb363402071ba3e6cd45c49c4713ed6e
-MISC ChangeLog 3784 RMD160 6290019333f15f976a0a6da53f57eec91e666a3b SHA1 90ce2957919e8c04a4a626afa0798d173422254a SHA256 c62c1cd9afdb1bf76b64f565d3922731308d03910b860cd6bbfc8a0e15a6f15a
+MISC ChangeLog 4000 RMD160 8c5ad6052a7cb8b5eae6e47a1d7e69aff63da46b SHA1 58f9646d61ea3cbb7da0847eec6cc56f838d8ce9 SHA256 9ec76a3f79dc4f5fa97ac87371f54e1895ea3179f106e8c0ad7b89cb5bef6034
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAk0Y3RIACgkQrnu0mw69JkqLPQD9F8UORpNb+LDrMmW3uYAwF4Dh
-RmdU54ag5AZysQSW0aYA/id+yCzOadEOa0aOMxMmwMHPui9AE7djWQcuunqOpw1G
-=8J6x
+iF4EAREIAAYFAk0ZlIsACgkQrnu0mw69JkrR0AD9EyMHNqB4OX7UcCPOsRUIZW8w
+JVQZsVh4T9ZKbepHwU0A/2yGNXozrSoNO7WmO/G4WA2fKW/xhMhV3MZiMksJKNhO
+=joX4
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rdoc/files/rdoc-3.0.1-bin-require.patch b/dev-ruby/rdoc/files/rdoc-3.0.1-bin-require.patch
new file mode 100644
index 000000000000..5159125c85fa
--- /dev/null
+++ b/dev-ruby/rdoc/files/rdoc-3.0.1-bin-require.patch
@@ -0,0 +1,20 @@
+Make sure the right version of the code is loaded. Without this the
+rdoc version bundled with ruby is always loaded instead. Reported
+upstream but won't be fixed because rubygems has slightly different
+behavior.
+
+http://rubyforge.org/tracker/index.php?func=detail&aid=28758&group_id=627&atid=2472
+
+
+Index: trunk/bin/rdoc
+===================================================================
+--- trunk/bin/rdoc	(revision 650)
++++ trunk/bin/rdoc	(working copy)
+@@ -8,6 +8,7 @@
+ #
+ #  $Revision: 1.1 $
+ 
++$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+ require 'rdoc/rdoc'
+ 
+ begin
diff --git a/dev-ruby/rdoc/rdoc-3.0.1-r1.ebuild b/dev-ruby/rdoc/rdoc-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..361be1d949cd
--- /dev/null
+++ b/dev-ruby/rdoc/rdoc-3.0.1-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-3.0.1-r1.ebuild,v 1.1 2010/12/28 07:40:47 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/"
+SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	doc? ( >=dev-ruby/hoe-2.5.0 )
+	test? (
+		>=dev-ruby/hoe-2.5.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
+	)
+	ruby_targets_ruby18? (
+		>=dev-lang/ruby-1.8.7
+	)"
+
+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
+
+	epatch "${FILESDIR}/${P}-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 test/test_rdoc_rdoc.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
+}