Add ruby22. Add missing coderay (testing) dependency.

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

diff --git a/dev-ruby/rspec-core/ChangeLog b/dev-ruby/rspec-core/ChangeLog
index 87612ef55181353feeb151a0c5582292be2429b4..8ca4ca11c8216c52f4997d2b61a08d1bb49b6507 100644 (file)
--- a/dev-ruby/rspec-core/ChangeLog
+++ b/dev-ruby/rspec-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/rspec-core
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/ChangeLog,v 1.91 2015/02/15 07:12:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/ChangeLog,v 1.92 2015/02/21 09:37:16 graaff Exp $
+
+  21 Feb 2015; Hans de Graaff <graaff@gentoo.org> rspec-core-2.99.2-r1.ebuild,
+  rspec-core-3.2.0.ebuild, metadata.xml:
+  Add ruby22. Add missing coderay (testing) dependency.
 
 *rspec-core-3.2.0 (15 Feb 2015)
 

diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 206b6f39a683e2ea9c65bc5e9eadd7e42106902d..ec7497b906f91062fa0a14911632e6de0a401790 100644 (file)
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -9,15 +9,15 @@ EBUILD rspec-core-2.14.8-r2.ebuild 2748 SHA256 001d27479f30b88f009ad4bc13a8a14ae
 EBUILD rspec-core-2.14.8-r3.ebuild 2764 SHA256 7b56fea7e06d03d7fa0f33d5ba95297a4f61cbb2bef10e9397ebbcb11ec1d671 SHA512 8f52b580944222ddc69207fc5d0c5ce9abcf475ea7ce0469cf0b0a7c1574b7fe61249fd7b06afe1a8c35dcc1d6680acb7a9830886c053377af49c4658769f9f5 WHIRLPOOL d07e7bb349e315e84465a7b55c720ec1956f3a20712fd2f72e40af85bc3b9a07e5ba3082a2339d8ae059988d96d283c3e6ad8764ed8d5a50d9108103e1962702
 EBUILD rspec-core-2.14.8-r4.ebuild 2789 SHA256 05cbdd3bec71118cfe7159ec6115c08b5dd534fc9ad4b95b4e77acfe584adee4 SHA512 e9686b53d8638b73573df9da5b1ac9eedc0e67f7b28dada684cd917384158ed193f9b622e5bd4f5bab1988833bff9507771f1f59910503f5b32f93919d2cae6e WHIRLPOOL b532e1d92b742c783d7d81809687ef961616e6dce6fced33c579972217a7502409388236ca5c88f9fa04330a6a58937b9ef177231ce05197059d445ae05778c3
 EBUILD rspec-core-2.14.8.ebuild 2546 SHA256 93c37ba4215d2012e2b3713236210db8d651760b8372ed332f2d6217ab930b01 SHA512 c0bc2f59dc7003bfa9457654f9374398add77ba7e9808b1485591bd80a941791cac0fedf640c61bea1db2454b548f90191e1b7793a30af94db0dbf269069446e WHIRLPOOL 96332ae0d915b5460ff37079ba746f1a8aaafc7f76a626fca4072aed67ac5a7993d9555d8d5f14558adfadf0de8cf9f6cc5b2e470321cb8f6bcdac0682addd2d
-EBUILD rspec-core-2.99.2-r1.ebuild 2492 SHA256 9fa5f88e3790dab4d53eff65da11a8a59627837b531b49c4d9d9a4fdb9334fbc SHA512 51f71230434fd7faf609a281b322d5e7c7a5539aeae382c790695d8183b72804ed2d0f31cb207d8866a46dc0ce2d353efa907b340b304afbe6f5b2f05d097d3e WHIRLPOOL bd5388d1d6eb26373f2b7b789f167707cfc6c3b6844bcb349bf78794631109ad67a3455ed751739f5289ce2955dca020c4d5dd932880ace88d895e64545db3ab
+EBUILD rspec-core-2.99.2-r1.ebuild 2506 SHA256 3ef2716af3b5bcd642964f1be78282f0134b0c5d2e493eeb9142ca96cd7f2be1 SHA512 9537c739b931a519005a8dabfc77e815147d326306e582ab5745fea446afad29c8b6ff4124bed4f34be344274c0a9c3c177a02ad536272d89ba38a40a6cd8902 WHIRLPOOL e05d61de7e91e65bbcdf9600c30e1e30cd2d5c58d6aac5b70b268567eb52e99e7883690c1bce3460d9411a4505781121d8cf6575e4f9912b1336eb09145f6698
 EBUILD rspec-core-3.1.7.ebuild 2617 SHA256 0bfe6c5e203ee54cf60bc8ded14d4936a855be2a43bb3e3105ea20a718df8558 SHA512 320f15a87a77dacc2f7f09729fd1e3242216f65f677878e0ba3fb8e18a828534ec2c9101a8c83dd6f7775d547ed490fc60c8a663362341ad3f6611a262360315 WHIRLPOOL 4187be8d41094447fbcc295f7523616ffa9885894e46f3012687086b8a11737a14ec1cb27c8368c5f221c7f33a6cfa6707af3c4de2c6dfd3640350dc3050903a
-EBUILD rspec-core-3.2.0.ebuild 2627 SHA256 72a3999fecb1b3f65b7de927216d38645cde387ad3b59f95255cc19b5bf1f75b SHA512 50849e2764524d331e7f17ffbc967b8abf0e702ff48165bcefa746ec6a005a9dd2b54c12fe2015327d9986cecebb04c736fa70056348e60b6419885553b1e901 WHIRLPOOL 3f863dfdf8d87f355537bf98d0cb867bc3d08815482fbd785f96fb0b8b49a2bb01204524e38a1c4d129705c0980fcd1da78a5a5f132e1c50ff492cfae5ee007a
-MISC ChangeLog 11976 SHA256 9be32c0b630fe5e62878c52dcb72875f8eb0f4fbb7fd2558c031e76101a2caec SHA512 8aa080105582916c57f79c7ff69e62c3c3d98169ef4d2ed066101a5e0c46a1617173eb601d6ac46e4c02798c442d4a9018598850ea4e04d597621036d70bf19a WHIRLPOOL df50fd257285df538b9a20341cb6fc454976f8b1ae773851a31c6aca9ac6138887d495122ebfef6ee0e6a0d422ff3d26cc49a9f460284e3e7a3e3bc30f3e5320
-MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+EBUILD rspec-core-3.2.0.ebuild 2964 SHA256 e9b638c70892208f55b6c88311efec95749c6f308ac560e43066542159ba38ca SHA512 5709e799bb6f2ffb6ebf7904f896a0e47d1ed148208c9b57ac5f8cd62d0e3180c57e55e1bb297c60dcde2cedb1561f80c0b0da40cb3978a192f13b418a67a76e WHIRLPOOL 678e7926297a7f9878c5af62ff5a9998505dd10597bfb4510d000ec890b478cc66d99e01be3ad6ed30c2381b94f72245b7162f5c761d93160c917887055a3455
+MISC ChangeLog 12153 SHA256 0e821b9a2159ebebd3d90659e8bbfdb3475d1a4585761b7719ad6265f802a29c SHA512 d288d555e1def337402f1ffc2f3cadd111384f14de2ad545091d865461b319b9690f24915cb6a9f1e9cc806729a6cfe861231441cca617559a3264ac7cd0acd1 WHIRLPOOL cbe9a61434806ab233f5c7c9ff24cffcfb7c83773471e95483f223c6e17534ac7626d1c5a47d3a47c61708f214dd55c3bb6d6aebf7fc914a760655820848c736
+MISC metadata.xml 274 SHA256 af88c358621878fae4b13934ed6d5fe709758d099a1787aac5cc5e8e3b5d2fea SHA512 f8ad1dc6241bf909dd40af45f46718e259021b284ad1c0fd92cc99d1ca68b65ceb1152695669f7ab443f92b2be9619bf9cb2605a5a3fa1ebfba50d160f46aa4a WHIRLPOOL 5edc34e30a715f937ccf8c2a2bd64c5508ab36e0cb0863d204cd6495c84ab32cbab9b18855da9c3a8127835c7e8b6282a9cb918a80018e561fce9846e75c6337
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlTgRtgACgkQiIP6VqMIqNftrwEAjMvl5dYXqxZMLoYHZr9W4dwC
-rsvfpgtmL+9zbltBCPkA/2//ZT+2yp5631H6EfxBj18WBWwbczZJV2f6+kljOv1e
-=m2TS
+iF4EAREIAAYFAlToUc0ACgkQiIP6VqMIqNdS0QD/aTvgwj0aKBNyydDmsq/wt14o
+/eszBM+clJ1N7U0+w/0A/1bhtp10wjvxNk85m7HQOc7DO9s9jCLU2PecH7a9jG4+
+=j54R
 -----END PGP SIGNATURE-----

diff --git a/dev-ruby/rspec-core/metadata.xml b/dev-ruby/rspec-core/metadata.xml
index 852136183369e830f0829a821697c00a64a50a45..be07e6df312e7914e722942b51012e61b74e0465 100644 (file)
--- a/dev-ruby/rspec-core/metadata.xml
+++ b/dev-ruby/rspec-core/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>ruby</herd>
+<use>
+  <flag name="highlight">
+    Enable source code highlighting via <pkg>dev-ruby/coderay</pkg>
+  </flag>
+</use>
 </pkgmetadata>

diff --git a/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild b/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild
index a37f2880eba90639225d571512c393ed088c2344..2bac8b59ead03fa19c7ce6e14c521593d35e41f6 100644 (file)
--- a/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild,v 1.1 2014/12/07 07:32:24 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.99.2-r1.ebuild,v 1.2 2015/02/21 09:37:16 graaff Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_TEST="none"
 RUBY_FAKEGEM_TASK_DOC="none"
@@ -38,7 +38,7 @@ ruby_add_bdepend "test? (
 
 # Skip yard for ruby21 for now since we don't support ruby21 eselected
 # yet and we can't bootstrap otherwise.
-USE_RUBY=${USE_RUBY/ruby21/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
+USE_RUBY=${USE_RUBY/ruby21 ruby22/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
 
 all_ruby_prepare() {
        # Don't set up bundler: it doesn't understand our setup.

diff --git a/dev-ruby/rspec-core/rspec-core-3.2.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.2.0.ebuild
index 3783337897f708c66b6cf7af52d3d438fcbb0632..4083458eeee6c5707631488a1509fa92fc51c5af 100644 (file)
--- a/dev-ruby/rspec-core/rspec-core-3.2.0.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.2.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-3.2.0.ebuild,v 1.1 2015/02/15 07:12:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-3.2.0.ebuild,v 1.2 2015/02/21 09:37:16 graaff Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_TEST="none"
 RUBY_FAKEGEM_TASK_DOC="none"
@@ -24,17 +24,19 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 LICENSE="MIT"
 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=""
+IUSE="highlight"
 
 SUBVERSION="$(get_version_component_range 1-2)"
 
 ruby_add_rdepend "
        =dev-ruby/rspec-support-${SUBVERSION}*
        !!<dev-ruby/rspec-core-2.14.8-r4
+       highlight? ( >=dev-ruby/coderay-1.0.9 )
 "
 
 ruby_add_bdepend "test? (
                >=dev-ruby/nokogiri-1.5.2
+               >=dev-ruby/coderay-1.0.9
                dev-ruby/syntax
                >=dev-ruby/zentest-4.6.2
                >=dev-ruby/rspec-expectations-3.0.0:3
@@ -43,7 +45,7 @@ ruby_add_bdepend "test? (
 
 # Skip yard for ruby21 for now since we don't support ruby21 eselected
 # yet and we can't bootstrap otherwise.
-USE_RUBY=${USE_RUBY/ruby21/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
+USE_RUBY=${USE_RUBY/ruby21 ruby22/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
 
 all_ruby_prepare() {
        # Don't set up bundler: it doesn't understand our setup.
@@ -62,11 +64,18 @@ all_ruby_prepare() {
 
        # Avoid aruba dependency so that we don't end up in dependency hell.
        sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-       rm spec/integration/{filtering,order}_spec.rb || die
+       rm spec/integration/{filtering,order}_spec.rb spec/support/aruba_support.rb || die
 }
 
 each_ruby_prepare() {
        sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+
+       case ${RUBY} in
+               *ruby22)
+                       # The rubygems version bundled with ruby 2.2 causes warnings.
+                       sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
+                       ;;
+       esac
 }
 
 all_ruby_compile() {