Version bump with fix for CVE-2013-0256.

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)

2 files changed, 91 insertions, 1 deletions

diff --git a/dev-ruby/rdoc/ChangeLog b/dev-ruby/rdoc/ChangeLog
index 130692cb02a0..e050df6a6643 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.86 2013/01/28 15:16:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/ChangeLog,v 1.87 2013/02/08 12:56:16 graaff Exp $
+
+*rdoc-3.12.1 (08 Feb 2013)
+
+  08 Feb 2013; Hans de Graaff <graaff@gentoo.org> +rdoc-3.12.1.ebuild:
+  Version bump with fix for CVE-2013-0256.
 
   28 Jan 2013; Alexis Ballier <aballier@gentoo.org> rdoc-3.12.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-ruby/rdoc/rdoc-3.12.1.ebuild b/dev-ruby/rdoc/rdoc-3.12.1.ebuild
new file mode 100644
index 000000000000..c534f85c105f
--- /dev/null
+++ b/dev-ruby/rdoc/rdoc-3.12.1.ebuild
@@ -0,0 +1,85 @@
+# 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-3.12.1.ebuild,v 1.1 2013/02/08 12:56:16 graaff Exp $
+
+EAPI=3
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+
+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
+	doc? ( >=dev-ruby/hoe-2.7.0 )
+	test? (
+		>=dev-ruby/hoe-2.7.0
+		dev-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
+
+	epatch "${FILESDIR}/${PN}-3.0.1-bin-require.patch"
+	epatch "${FILESDIR}/${PN}-fix-hash-ordering-tests.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
+}
+
+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
+}
+
+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
+}