Add ruby22.

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

4 files changed, 25 insertions, 12 deletions

diff --git a/dev-ruby/rspec-expectations/ChangeLog b/dev-ruby/rspec-expectations/ChangeLog
index a1c40068fc26..edc56c45c15c 100644
--- a/dev-ruby/rspec-expectations/ChangeLog
+++ b/dev-ruby/rspec-expectations/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/rspec-expectations
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/ChangeLog,v 1.86 2015/02/15 07:12:21 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/ChangeLog,v 1.87 2015/02/21 09:37:48 graaff Exp $
+
+  21 Feb 2015; Hans de Graaff <graaff@gentoo.org>
+  rspec-expectations-2.99.2.ebuild, rspec-expectations-3.2.0.ebuild:
+  Add ruby22.
 
 *rspec-expectations-3.2.0 (15 Feb 2015)
 
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 0afb8f9e896b..33d617793bef 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -7,15 +7,15 @@ DIST rspec-expectations-3.1.2-git.tgz 148364 SHA256 ad50e3a305d9c5ac8939d7e1f612
 DIST rspec-expectations-3.2.0-git.tgz 157134 SHA256 a7196fad1cd851ed84a4725c90335c211b282e312ac4983fdc9ea62bbc0fa09b SHA512 de3111ded0b4138527e1cff170d059dd4725b10cc770019c84efc7583332a76c8ef115fdb675cab5ae7068a73f55e9583db3b05b70565760e80bdf8b9645afe6 WHIRLPOOL 3cb43ee930bce097d2c43eabf2d1939a35a8a593a9f5e271a137d14a3f2bfdbb096c89b4f1327b1242920eac62da23537b194c35fac297ad79679b62e5853bb1
 EBUILD rspec-expectations-2.14.5-r1.ebuild 1442 SHA256 98d3b08651bd7b5d98c90b2747639c4cb5e9463ed3d035f81c9e8f78d06b4d97 SHA512 7676fb8d067dda71aefe897d6eb78602fbd000fc9a1b76cac4dc03a898753bee14607005a0a4ff462857bdae7d42f1f4e62108ce85ae62febe2f54efd11ec905 WHIRLPOOL 6ce834874fe42d961fc62c9e2ba2c95027f2f4debd9c094c8ff6ca09d34787bc8f28ee5884e2a54f4c58c7cfd7f7e4574d377c4b7e934f9dea631ee188242258
 EBUILD rspec-expectations-2.14.5.ebuild 1424 SHA256 c5f3b4f9ec663dcc231ebc0d2ae7269c71713b8e3b960e0f9ce2a05712ee73ec SHA512 e55c543c088fd62432080f02440307d50c90c3772710ad379a10f76f603aef3514b04bd39d6a3fbc9bdd452f90b1f47d3c9e250ff5f6fc65f63f9752b183a82c WHIRLPOOL 688707446c09f232466986b9ffffd173e2c185804501683c835d169df9406031286595d89a21f4872306b7c1352c22a4de2ae409066e2b9a99cbbe313904e326
-EBUILD rspec-expectations-2.99.2.ebuild 1612 SHA256 0484e8a0ed74b67e3461a3695244caffe374b627b61f1a4a5f4b4b153534b23f SHA512 05b1a5129b869cf3e1c6eca4b4ab6697951c9f044cd4b8aefea5e775a0c85d2cfd77155ba7aae142e71fc8f0580c518828e21a9cd6926d1624ba4af8c5702694 WHIRLPOOL d6b899481f38943af975959a2a7c374485e517f08d5bc7f77cc31c0bdc91254dfe8b20d0e9ae96643dc0b67d92749bd1d31045609395d80c188d597104df4f99
+EBUILD rspec-expectations-2.99.2.ebuild 1620 SHA256 e5515142825e6225078ba1cefb86c4043b559e8bc0837485e3d89795d6306e64 SHA512 731337cb81aff56572ce941f74deac626732632983dc823cc1ed8c3da6205d9dc6007031923001d2253638d6c54443219f6e5067445c290eba3aab1fd31f28ba WHIRLPOOL 5575f54049c7bf6e479642301f5f89e1c0e8cc0c16564eacf5b6f85e8aca3af7fcc4d27890ae11b53caeadba8231df86eb6cd0229c6d5434ae99ad0a5b13d0ea
 EBUILD rspec-expectations-3.1.2.ebuild 1681 SHA256 1e1055a82da8c49614ac58ae8bdfc237e3a84d686256d3f7d91e81c1035acb03 SHA512 01a4a0484b343f0b3cbaf1f23fa3f2f7d1a534feaead06e5954e441376c65823fc9b05f499c47fcbba540bb9794019b1938fffa74faa14732dd7856cfd8f263c WHIRLPOOL 2288dd8ea6fdb29f000a5563735e7bfc1aa8366e9fba8a8cb9a7a0646b8c55fb7f489d20697e589d7989196f57ab7677ddfe506246412828d5765568b9de95a6
-EBUILD rspec-expectations-3.2.0.ebuild 1681 SHA256 4bccc1738c83133d4d7ef42877d0cb20fd18cf402bb8688b0dc692ddfe50d95a SHA512 8c11a97b5924f6b512d844810d9a030923bd8e65daf746d7eadb2a6c2004285e9b66e6508603b5b409d6c8a5458cf7743ab515ebbafb790ab580ae3c99ca9d68 WHIRLPOOL 06492498e60f0041f1eab1b2c947a1e30ed12270cd3f4c11fb1e189ac7285ea69bdd3e481da0365eb30d089eba1edeb88f5a6d5bc3906319e4ce66796a80b7c3
-MISC ChangeLog 12193 SHA256 c6cb44015319291ea61cd73915ecfdd0e9e6b5c66dd235b95237b8e261d0e414 SHA512 af1e23b5b0a1e9364d71e58a30b0269e8ca84a275c778d0c6ec311e4d1d718a453137c721d0b4f1ffeee039fe01ddbbd66f60532c84cfe1a88ecff61fb21c048 WHIRLPOOL d8dd4671aea701a37cec5905be91fc55e19b04fbed90d57f932dfa6147abd84f133863358eb87b67bc6d3769c021b04879f6be4b55a02c332e90d4ab3ed05d30
+EBUILD rspec-expectations-3.2.0.ebuild 1936 SHA256 347af159c51c2293562f531c4f72e4482ed39ad7c77d8d12a239dfc3306b420b SHA512 e2532c2567a7db4baff3cf08fdc7807955c3a4ab7a4e35215fed34e880edede166e99d73303be042fda75297148c911b624365272cfea0679c191c7f5e39a4d1 WHIRLPOOL 08a1f1e754c5ca2273324b35a1b3cedc80c29250c3305cd0ad1ed7065b6c6633562e62c018c945fa621f5399362cdb270b4c8a422a6b50efbbd38c74a05e7a90
+MISC ChangeLog 12327 SHA256 44ef318c8262d54f0564f0e03b73f6baa154fe26a82c6b9a11355797820b63a5 SHA512 9b3a5e382c23d912027b6660e2985fcf1450d2fc1f9b0dbaba0f1d4b19cb4b59a8b7c6a2ff667dc2e077afe0e8ed0ed29078e2ca3a6f1975126fd7f7eff3ff1b WHIRLPOOL 2e303a5c27ec579c206caba76257982033ea993dec4847e97733aa6b9132d128df94a872f8ddc117265868b07d8e13537fa6691e1963a10e2e90b0dbb74c66f0
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlTgRtYACgkQiIP6VqMIqNesZgD+O7Ld16HHlqDV4VDW3te2V3Ss
-fE0V16uC6hJh66SR5doA/0di8miNH1+dAQg3xIIxkzbxsstt0wC52AlrRIPMWyCb
-=aUN8
+iF4EAREIAAYFAlToUe0ACgkQiIP6VqMIqNeJuAD9Fr82MeEyTPxK1RyO2e1S7sk5
+FTymXtmQXlSUYZkrdboBAJcEWcInhCxUxx6qSEi1uPXiVFocj+M73EtF0LUfOZqp
+=GraL
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
index bf22b9393de6..d9a7a0518947 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.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-expectations/rspec-expectations-2.99.2.ebuild,v 1.4 2014/11/25 11:35:56 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild,v 1.5 2015/02/21 09:37:48 graaff Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.2.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.2.0.ebuild
index 1e63067191a2..e8ef0fd52424 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.2.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-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-expectations/rspec-expectations-3.2.0.ebuild,v 1.1 2015/02/15 07:12:21 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-3.2.0.ebuild,v 1.2 2015/02/21 09:37:48 graaff Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -51,3 +51,12 @@ all_ruby_prepare() {
 	# Avoid a weird, and failing, test testing already installed code.
 	sed -e '/has an up-to-date caller_filter file/,/end/ s:^:#:' -i spec/rspec/expectations_spec.rb || die
 }
+
+each_ruby_prepare() {
+	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/expectations_spec.rb || die
+			;;
+	esac
+}