Version bump with fix for CVE-2013-0256.

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

3 files changed, 97 insertions, 5 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/Manifest b/dev-ruby/rdoc/Manifest
index 0a029126a381..5246ff216b72 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -4,18 +4,20 @@ Hash: SHA256
 AUX rdoc-2.5.6-ruby19.patch 959 SHA256 2c81c17d99f896182805b737e64c353045b4505acd693a19cd1f0adcff7e040d SHA512 6bb0e21ccf0d26d0162a8db7e66b7aacc6030c9737ad3d638d877269a11bb7ef3f2dba4ba2b5a8c1b75c1af73f5c12ec8d47d6a7d413d1b8b21cdf9388e5e87e WHIRLPOOL 5f0884c07dea94242850e9d6717c8d9ba6046331a811a3c92d877533c8b426ac4aaa1da15316a371d10d41c6bbea6e32d2ecadb348c9c9bf1756d515c3bc07f5
 AUX rdoc-3.0.1-bin-require.patch 632 SHA256 5b8468ba10d6767620ee6ecad9719f213744c6de207ecab078dd48f96147ad50 SHA512 d8840d320582f1b744597a4a48008508dfcfe7537b24570e977f7e10f1bc6e5955cf9319182d2546db23d96fa31a55320bf54f49d127623c9d9cac9d639c572f WHIRLPOOL d716e4c6ea8da7c52ab20cf52146fd7128f5071f390f25fc66012770c59fa283473fdb9214b942cad789be8df2ed66286617d8f9dd4e3c8d82ffd91d757cc8a7
 AUX rdoc-fix-hash-ordering-tests.patch 3124 SHA256 e28b0f19d7c954f5d49a783a1a8db087256be0523fccd5f5887582ae891d5f45 SHA512 7589a32a0ab1e887feeaa4fc88b21a1cd33bb397a2a9eb64105164783ef9371a75e8a828bb97c0eff9c1b612c4eaecddb61144da43f2844cd4511b669041487f WHIRLPOOL d31b2e9fc096a9f377ec2031826e93c4ce40d3b781f5d686e350df1d20721efeab9f51dd003efcdeb7785c94741be37bebb4932b882211890edd47745756c71f
+DIST rdoc-3.12.1.gem 325120 SHA256 8ffc43aa68671ff20615b77eb3e0339204b6a297e148de261add53b0057fd4c1 SHA512 3faef3b7d99e7fb73cf0beabdbdac856603d4f23544f3763b03f257520b61532daf3ed510787241eff7877cfa9a89907d380552ce6cf2c3d0191c187955f05b9 WHIRLPOOL 1f5d810eb7f517f9cf0b1523a14d74db38ecccaf687282d82d5677f934f14ace8eae5517a0ca2870979f69858d1faeccb4c4e8418b5eb01576568966fa5f4f49
 DIST rdoc-3.12.gem 315904 SHA256 77b6deba13ca090fb4608c218ec5d5c05d78e841cb0b53cb31f91fb56686a431 SHA512 4bab3bcd4e11c176c50762d87cfb78547a55bb92bbfce584200087db2233d0a66399f0842f8ab4977bf8a7dc3b161d219cad7704492c7c78b9852f902d5c340e WHIRLPOOL 2c8542d506068feba552cfee7ab298dcccb1fdccc0eb31f040dd6c00c05032574db4d6e0c64ccdb0c4df12e0c8ad911b99f509a103717145d816b5cc9a0b29f6
 DIST rdoc-3.5.1.gem 230400 SHA256 d7385cd97461114942403ff597641ea02095c7ecfbbed67a673f8188c88a9457 SHA512 af719f24036d059f3568319c147c9b85c0bf61f9ea2975fe5120ed63a1bd75f1c136bbe35e686b3f0194e8a8ea9c67fc8e4804ceb0935ee28f76b3b61a87d089 WHIRLPOOL bb36c89fb45b92c597686d4cb73e625c2f8d3f552f0f7b7cfa62f796eb8161d49e423a35a1e899bf5d49d822ac05268dcd6b491330f9b4e1aa2b27ab73f653dc
 DIST rdoc-3.6.1.gem 235520 SHA256 05dd4662a6ef0008de3b13368b6a705a418b53925142e0dcde0cadc168378f43 SHA512 939cfc72bf24319fc0e57a187f0096f96b392d0afd46bef89f66b6a42c8969dd4af508e60ef61a955fb949d22c5100086823026dca28f561a5b7f4fb5fc4360d WHIRLPOOL 3393d51681df494f23faea8b652bb01a8652ba890150250642d840bdd72db5becb030262d69e76406ba5b83313046636b7c60c5fa02b4ec16264976a02c9d852
+EBUILD rdoc-3.12.1.ebuild 2546 SHA256 2132eb02d458177fc13775780e6059854c8338454239745119e6431e9368aa8d SHA512 5d82e299e3ccd01e79ba349202d09e44c1c1b7f4398a407292d34bd168878de1964267fd01d48118fbf555f3148554d17b3d9af22a87bd0917770f83c1cb086d WHIRLPOOL d11d15aefc8e673203227f7f0bb1195257861462aa7e0d8aecc843a3b822b933a86c5c698ce3517742f913c91b1c942fd3a5641ba2fa5b6226fb3252e1bec875
 EBUILD rdoc-3.12.ebuild 2536 SHA256 56b4773fb8d78f47ab5a80b0bf7fd656e990a9a5ac943c441f14be3b1a3107e5 SHA512 0d2775bf3949d55d575f46e97b456a0444f163b8e36badcb8bad6cc8a78dd57f75f6d7a39246a72b91bb2a9f8118a9cde0b1bec8f917c303c034d3ea0d9180c5 WHIRLPOOL 9d48771268c7d9d8de2be342ff3cbc3b6bc7381f68ccacbd45c67082824ba77d59cbe5302409d4e804c573d4f132bbd8a3ee5e7240f5b739f4a462c0b2ce65ce
 EBUILD rdoc-3.5.1.ebuild 1682 SHA256 f8ac88024fc708aa53245f5be3dc8b16a6f0b4f45f094cef50e6814992125f38 SHA512 e0a66f07a8fa87865cc27fb435492a166bc587a4fc7fa26ec3af850caa296e674e3d85a3b07d20e8c7def719c237bb7f7d5c2ccf43f1a2246819b21552c8d8d3 WHIRLPOOL 86452ae1391d6040a2d5c1b4ec80e5e86f4bd591b9fbb62b73f2bee0849a437146cb8dcc289de594bef906af5a06ab24159b5c8c34e0d53dc970abfec1a68057
 EBUILD rdoc-3.6.1.ebuild 1978 SHA256 1993142695deab247bc821304b4a3c895bddab30e03dbc2c0f736825ae0b31f4 SHA512 2eb1dd1c0778975fc1ca6d7ee972c532b059055a2ff0720db23c75a0455d9dec1369f4590635f5560ea424eb5dae80c937d3b6de78b9f850a7411177ab8564e4 WHIRLPOOL 9aaa379e6db137b996e394fb1cb2acc1f672fcff2da5afd979f7a451cabe63f7cb3d4257bc77a07d4acd410f20eff3a82c22424c71a38cfd2cb3b410b470b787
-MISC ChangeLog 8925 SHA256 b7350b9477ccf55aa2cf309036f76c7c27e8771a9d26f69be9ac4b261078fafc SHA512 231f1fcf9ec5ea1b0b3746fd829beb24515a73e2b5d15e249b30d3f1ac859deb34b502170f9e7639b0ac49ba9514f8cc82fe9da6b789f4a07ee9eb7519e1ed09 WHIRLPOOL 54bb895b4c1b40211f216429e3fec3c251bf747e667b846830bedd984966c854c4ed2b756a4f9b6476c662f88e2b4a9d3371acbd284efed1fbcfe58f37332402
+MISC ChangeLog 9066 SHA256 905493513862a6f4154b04a9d33df51f9808579b3a6023c44e0fe57bc26cf874 SHA512 61375555d96e6e81ce7708d87d90c0341e86b44d8a938808775a2debf39d0948314a1b80b15035c07e75d70df1448b4c4f231e83c5b7f1e3ea22d00634d416d4 WHIRLPOOL bacc954b0960f52ccfb82ae21646c2d3f9ac752630e083d6b1e8ead33020b7246c440d65e3d2d4bab2352612d6cc57eab7c27123717bc94a1f0927d66c51aede
 MISC metadata.xml 230 SHA256 a04255553b410ad36340c3a47e4f30304c388b503b27c07c3e6f9bbdc9dbbd54 SHA512 c1c7fd9d06fc087b6bca6119547401ab5c9a752ce6a3981ab8a3531033332bdf4a176cfe455f130c3157f0a9757ab5250cc99bf600151e83f09c201c1a1b4e46 WHIRLPOOL f1aa7788f09e4d730668da22d38c1ccbfb8f72cd601d66c53ca3ca5af779c01578232332d37ffe74fa6529426e5d7517e2612bcc83d46133aea00b86db2f2ad7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEGll8ACgkQvFcC4BYPU0q9bQCgtbm4/iCwkLOttpkO2fol4IxX
-cJcAoKqEbNFqeEdtHXqjOJQdssMCy/lD
-=VVA9
+iF4EAREIAAYFAlEU9fcACgkQiIP6VqMIqNcAwwD+OUnV84Sxy79TE4Sl71mZUon+
+gII3sY8jcUGp5iiXzYIA/0FLelOd2t8w3PbaSAmzMRR2clQbxL3N8epLr2y7vjSp
+=9fhC
 -----END PGP SIGNATURE-----
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
+}