Revision bump to avoid installing the ruby_parse binary and thus create a file collision between slots.

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

4 files changed, 57 insertions, 8 deletions

diff --git a/dev-ruby/ruby_parser/ChangeLog b/dev-ruby/ruby_parser/ChangeLog
index 27c79c747f7f..2459e1c4a790 100644
--- a/dev-ruby/ruby_parser/ChangeLog
+++ b/dev-ruby/ruby_parser/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/ruby_parser
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ChangeLog,v 1.42 2013/05/31 17:57:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ChangeLog,v 1.43 2013/05/31 18:14:48 graaff Exp $
+
+*ruby_parser-2.3.1-r1 (31 May 2013)
+
+  31 May 2013; Hans de Graaff <graaff@gentoo.org> +ruby_parser-2.3.1-r1.ebuild,
+  ruby_parser-3.1.3.ebuild:
+  Revision bump to avoid installing the ruby_parse binary and thus create a
+  file collision between slots.
 
   31 May 2013; Hans de Graaff <graaff@gentoo.org> ruby_parser-3.1.3.ebuild:
   Add ~arm keyword.
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index ee810c1c4e17..41f63d7551ef 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -7,14 +7,15 @@ DIST ruby_parser-2.3.1.gem 80384 SHA256 d9a4daeb41da89db62c6ba4d31facedac7b181fa
 DIST ruby_parser-3.1.3.gem 141824 SHA256 602b23bfde88e1cdcef113fd013ebf3735b06454372b3c9b5a5c14a5b161fa34 SHA512 e7e5649966a3d5e5f29b018b53d36dd8c33b9d5c14daa695995ed153a01cae90854e7bf6a2164b6b40f17e0e52391a9653f204b74ae9cc155b4c6c55a07c9b83 WHIRLPOOL b421a7696dafcdf7dfacd11bc933010190c3d6ce47b3ddbe8c9817c1f0557d0892d6bcd5fc575236eae43c13523e0163766ad6df31f3941874053a3f6296a84a
 EBUILD ruby_parser-2.0.5.ebuild 847 SHA256 8a15b39ac0469829274c2d5ad51b71c8d6f24a05092f87b26635fdc6c35d092f SHA512 c0c3743be01c3183757a2438ae3c08a997311e5255596a99b58575e29355f7324671e959669bc6a7bbb9e7b0009f946d835cc3927f9c65e5d18b59ddd7908186 WHIRLPOOL 573ae89de7f9bb8129d7de4e4f26641562eb9fac94d5f438bc506720a5dac45175666d6c193f937d9da5b0048b18b6cce4090a3cb9512ff219caf3c15dbba9b9
 EBUILD ruby_parser-2.3.0.ebuild 1013 SHA256 1e28dbdc4a254221a2253b469cb498ea92503880b3f50e8cc03f4779f0367a0f SHA512 7efacc4bdecdbc089e02fe8b7d8927b171ec03a422209d0a506e8b563e14bc22fd978756057e865abcd1ddaa5137217f7c149923a40dedbbc7632c01ebf4c7df WHIRLPOOL a9951019200074a7bf5e90995b75dd2b1825ff7788c321664463347ed0dd242856924d32fec3da7d299817f145b5482e72bbe80bbdcafbc8bf1ac1e8ca7e35a8
+EBUILD ruby_parser-2.3.1-r1.ebuild 1324 SHA256 d1682582ff618057d01d1b9c6e141fe73369ab0dd4f2907139ea0a9ebd48b8fe SHA512 5b510f0f61e39bf8cc4d9229269f03117f87d1bcc3216e65a608d741e30deea934ef506da9139705cf25f9c042d752f10f024ba09cd3ba657695e1eff0a78d7f WHIRLPOOL c981828f0493e691b109360b3fd8cfe469d8f697642516558c81fcab91c5a9280398e09c23c88c30fc27013f76b7e60edb2d13a8fbc220b5128848c994112941
 EBUILD ruby_parser-2.3.1.ebuild 1196 SHA256 0f907400ea5ea794439d2c26d894665f31a2bb782968a2e8dddaddb1de30ec34 SHA512 f809d338d5aa9235f4886a29972206d8fd657632e0656772e9885b1468f964b8f3ccc085d53feb7725e91510e4793abdf2b6218da04e01e18a8f4a7a9fa1e7a5 WHIRLPOOL 172149aa1ce6d59befe3fc501d1cf236bb862438a822e9a92df71ee7924b9bcf130669eefd3fa3990f609a1caf54ab7cc025f50943e1070d0db1446b749f9236
-EBUILD ruby_parser-3.1.3.ebuild 1309 SHA256 80c293254416ea78d7d85f5d5b4d9a07d654386ddb483d9994ec6c0652fe0f66 SHA512 11f1d3567a7b1936031346b2d1d09f073b795a7d8a8dbe7e161691902758c3237b7947cdd6de7028c78b7763e4b11283e32aabc6af8c4bab697b9f6d52b7d030 WHIRLPOOL 8bc4ab7a2b56369015157263621d09dbe1b46c32adaad3d88e00f4f10f831c27d1424f38d25ed2b84e3ad59475e0127a4a2eba252f481941b436feb5e4c057c7
-MISC ChangeLog 5548 SHA256 437574426abfe352da04a67e37c0bacfde08370a87ead3af0f1e8d08f8c7ea4f SHA512 27c07db17b95ed808a4eadea05516f99aef1bf388c9b306ea36b59bba396c9baf583585bd960b7f87ae26c56510b03e83f3d3cf45d8b526f093d1e3905f64798 WHIRLPOOL 6a0bf7086ec225e97d55234bc29befcd707f5f9b54b576ce195e2f429127d411bd601a31216a5823510fa0e17c650963653058c9911c5f711b777dde3ca13342
+EBUILD ruby_parser-3.1.3.ebuild 1342 SHA256 5077cf6af5fd124114bc6415a6e887750e0740f73dd4050748efc196acc480ab SHA512 f2216b109255e8c1fa65c170e97a06e5950bd6b3807f82b6854cf100a2727b59f6f093c9207cdc289345018aa231ed1f64f7e618ec1b179ac445216e3bfd146d WHIRLPOOL 6f27727e8f4e7544b7e1aae43e6361ffeeec4c0e52f68099934b1eea2a7b18ac78b9a7561c5ec41478e1e8b97edc8b913ee2ddda4727588502e52bc4ab03894e
+MISC ChangeLog 5802 SHA256 df502b3c4c5ac60f362209b3fdd2b2b54b4b80fd963309eb76b813a51f26ae2c SHA512 926a3dbf494ee24ad384179cca6bef9a692304cd5577514484ff03ff264114afb2b1659dad01927a1c775f11e0fb348b5b4ea2b700eb3186cadfd26551aad061 WHIRLPOOL 3612906a70afd33db25075e8fb96747827de459c983261a7e1e54f1e137a726244567417c00145eb3f1c729595450ba566ec0ff160f6b2a625575f53ffb6b49c
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlGo5H0ACgkQiIP6VqMIqNd4aQD+OjpD9r+qDmq16I9t+/U0rhVX
-rwRmzmit5bybasYaZ/oA+wX4hs6+yXzNd42V6VuOvGbHgKp4UxU8OvZy8dV8q6hB
-=0WbI
+iF4EAREIAAYFAlGo6JkACgkQiIP6VqMIqNcsgQD+Kid+5SQ3n7/NxIl2Ns/PgTiW
+A8NJq/VxcYjzZpM2ESwA/RJQ4jaEvFjHtwF9FAYeh9FcLNRBm/0ZGjkt7nOO8ErU
+=wFna
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby_parser/ruby_parser-2.3.1-r1.ebuild b/dev-ruby/ruby_parser/ruby_parser-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..3fa73e144fc9
--- /dev/null
+++ b/dev-ruby/ruby_parser/ruby_parser-2.3.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-2.3.1-r1.ebuild,v 1.1 2013/05/31 18:14:48 graaff Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby parser written in pure ruby."
+HOMEPAGE="http://parsetree.rubyforge.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Restrict tests because the test case does not load the right version
+# of sexp_processor.
+RESTRICT="test"
+
+# The sexp-processor dependency is needed to make tests pass for ruby 1.9.
+ruby_add_rdepend ">=dev-ruby/sexp_processor-3.0.9"
+ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
+ruby_add_bdepend "test? ( virtual/ruby-test-unit >=dev-ruby/sexp_processor-3.0.6 )"
+
+all_ruby_prepare() {
+	# Remove reference to perforce method that is not in a released
+	# version of hoe-seattlerb.
+	sed -i -e '/perforce/d' Rakefile || die
+
+	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild
index e0173dc73cde..8ca3254d8967 100644
--- a/dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild,v 1.2 2013/05/31 17:57:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild,v 1.3 2013/05/31 18:14:48 graaff Exp $
 
 EAPI=5
 
@@ -20,7 +20,8 @@ SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/sexp_processor-4.1:4"
+ruby_add_rdepend ">=dev-ruby/sexp_processor-4.1:4
+	!<dev-ruby/ruby_parser-2.3.1-r1"
 
 ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-4.3 )"