Change the virtual/rubygems dependency to refer to the RUBY_TARGET in preparation...

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

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index a292cf64ed14bc1477e32f2c3afb8c6c16a1fdee..116476b4169aaa44ff4fa94e49a2245051c327bf 100644 (file)
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.697 2015/01/14 06:45:24 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.698 2015/01/19 20:07:18 graaff Exp $
+
+  19 Jan 2015; Hans de Graaff <graaff@gentoo.org> ruby-1.9.3_p551.ebuild,
+  ruby-2.0.0_p598.ebuild, ruby-2.1.5.ebuild, ruby-2.2.0.ebuild:
+  Change the virtual/rubygems dependency to refer to the RUBY_TARGET in
+  preparation of removing the version-specific slots.
 
   14 Jan 2015; Hans de Graaff <graaff@gentoo.org> ruby-2.2.0.ebuild:
   The broken sse2 detection code is gone, so skip this patch unconditionally

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 9449015023a8ab11d476ca34a7712fc244d5d36c..ce0012b19f226a528adf57a248bbcec7d8898e23 100644 (file)
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -9,17 +9,17 @@ DIST ruby-patches-1.9.3_p551.tar.bz2 2154 SHA256 c1c40f2b1f186a05774fd15c3566d72
 DIST ruby-patches-2.0.0_p598.tar.bz2 2947 SHA256 dc173fe94af215fd2c1823f46140e4f11892dec59ce55b10ffad26b622bb6e4e SHA512 423a4fddfc8d7fd4f5b041989da343bc96ce0c3f22a448cab8cec47d4c458f4deeb83b167a0a3ae71d3be57df9b41151d1cafadd191bd3d3e9b08b32732e36cd WHIRLPOOL 9c728e95cf01abdb48afc2ff008dc73d341096b253c664297b6780b32821c1ec406c388ce5860b5dd2ce2de862fb80b2ae45d03750045aaf13c371743f97c92e
 DIST ruby-patches-2.1.5.tar.bz2 2310 SHA256 1743dc0cec0adc1a0b5d90b0ed7908f888b8251b7a414049a57e6e32e01e4ad6 SHA512 b695621d210a7afc6704dd480bf3e7fc559174ebf240d2287338d60537ba45e5bf0f5defac6b254064d4b28077e2b97ef23b7eadc1bfa1a6bf2c616e828f937c WHIRLPOOL e9fde062fc04e4e22aec2dc55250f9007c64b07c7d03875b4073c19af9cfb0ae735d6dcb2b65bd1465a457cf0ff0602866600b5af1d520df3efc8a418763ab5b
 DIST ruby-patches-2.2.0.tar.bz2 2310 SHA256 1743dc0cec0adc1a0b5d90b0ed7908f888b8251b7a414049a57e6e32e01e4ad6 SHA512 b695621d210a7afc6704dd480bf3e7fc559174ebf240d2287338d60537ba45e5bf0f5defac6b254064d4b28077e2b97ef23b7eadc1bfa1a6bf2c616e828f937c WHIRLPOOL e9fde062fc04e4e22aec2dc55250f9007c64b07c7d03875b4073c19af9cfb0ae735d6dcb2b65bd1465a457cf0ff0602866600b5af1d520df3efc8a418763ab5b
-EBUILD ruby-1.9.3_p551.ebuild 6157 SHA256 c4313a3df51f41b9754c0faf6f07c09c72ac38aa82db57aca337c6ba146098a6 SHA512 d2a27edcd370d5ea20929aa588a9b84fadf3c76d0b5432fca96e6823f1212e97d89b99ee172f382193d29196e868aea16af41ff269538a5d19fda284591c12f5 WHIRLPOOL e863de6f1cb79a7dad8cb08df3b74ac208985a662efd080a1cc98a7c523d6e7462426814af966a1075122975cf8d48440c12e9dbd1c542cd68bdf08134fb866c
-EBUILD ruby-2.0.0_p598.ebuild 6470 SHA256 d3dd22c788424bbb4ecc71a9ddf68939bce8f70a46579357760b6dcfb9f996dc SHA512 0a1ad26d4d0765cf602532ed615d5f232b93f0ad10eb9051659537d3ca0be2c0ca390e36d325e0f674e76022cdcf7e2ec818b975b479cd95c9baf155fb816f20 WHIRLPOOL 88ad285301e7226eb1c8af2955d81a3229110b9d922a1999b0f8d4358fb82b8c5ebd9704dd0bc04a03d1892bdeb09b63d54e91ed7a5f73dbc45bce7d20935f47
-EBUILD ruby-2.1.5.ebuild 6525 SHA256 cc4d5640d616a10448d19aff0b0f69798ca62452139e50d51a7d2ae21175e316 SHA512 3d09da2f240c4c15215d4cdba0d3916f4e7b60d910d852453a479b84d69359edbdab525cbb32dba2de39ed36c1d52ae81f9cbe459a38f2a1a1e3f27fa8c53a21 WHIRLPOOL 2fbe0765389e6074a737a0195d4f1be550c6c54adf16da5279b5d3738750766d560a3731a9279c63c8e662f46907ce2cb73ce2f318355b85ba8bbfcb73b8255d
-EBUILD ruby-2.2.0.ebuild 6470 SHA256 5ad1be27c5c9c391e78dd152d25f47080fc0ece295f18c7e95fa1eb42e9074e9 SHA512 ad8b260bd64926718c684043873ed155e1c21936af590e0c5d3c8248b897cac1513b4035316d7eadc02ffec9321b619a7e3742a8118e5fbe110f947be649cac3 WHIRLPOOL 5558db9d9eccd81a2ef4250dcc8ee50baf64870686cef6a9780798f74522f3ee5ed7aa8fd378c2d7a780a415175aed9ef1ca6d3b508dfaeb0706e159f64879c1
-MISC ChangeLog 533 SHA256 99c72cf88571d51128928e807c4752f25c39043bbd555aa09c4177c37114b1d9 SHA512 161c658d82044245277b63162af8a88e8f0c7c6cef7ad85bf6cdd42b1fe19294530b2f450b0b01e0789da20675e46fa167ffeabcc85fdd2f438c74fa9ea7fe04 WHIRLPOOL 97cfb861664e2e364400b56b180bc3fd2af0d920fba5ff157a4012cb72b789ea9bde0cd860aeeb97a0a6e35db6b2547ee612b76dd70144134757ecd507a6ad22
+EBUILD ruby-1.9.3_p551.ebuild 6174 SHA256 59d120ad59634d7b30160cd8f6c50d06f767d6250fefddf7bc24c5749a388327 SHA512 ebcbc9a738ddf15ee25e9ead6d0582802e149b07cac5c9e8560525a388aa34fa23f362a26b04bace5c47b0b92a66b060a8f76bad57eb06091f91065ad8196b77 WHIRLPOOL 7065873cd0c935a7cde4170adcd2b521958aab44a994f9e90d7b504dc3117923eecc0c2bce89fd67a12718898ac2072494b33ee48da71225abb0392882f939f0
+EBUILD ruby-2.0.0_p598.ebuild 6487 SHA256 92f3fb1c27f810edbae3444cb5564ae943074d708a9f600b21bf0232edb3d392 SHA512 f0686dcfa9e6d4800c265ab6060ffc9aa0c1ace2791909409affa6fe2eac1a757cc9a95d5cfa85a248e7e9c772f934ee7d249f5b76109b9694005290941ecb1f WHIRLPOOL 46107233de9cd9127d4a7e59fdaca240e937068d02a8549d7f7014d5185fe0d682c472d3542e5dbdd4e21f2e519f14a479f90907d4605f7e3e348c264f39d356
+EBUILD ruby-2.1.5.ebuild 6539 SHA256 73cabe2ba01f6d4dcef5cd74e1b0e25b917daf7f354c9d323185a659d8b2b2fe SHA512 0f55638c9f0be9c3f5972fa4045966f08fb965b83a49c3108caf85d49b02b9da85fcb878be185a27d8ca702b0451a94dc9e2d8a941dc986d1dfe6530e13dfa6e WHIRLPOOL c924acd2edfcde6fa5af378039492aa922fcaffcee3ed725cabc9bf5a759305902d64738b29b9b3c6744fcd6996c640547cfa5ef14c8e739571bb393e895ffed
+EBUILD ruby-2.2.0.ebuild 6484 SHA256 60adf5a6c713b85e0fd29989b3bbbf181def7990d84e3427e899efddece78940 SHA512 5f894a267a0a616a5e716aefd06aceea9d39f444bc6a3a6562ba48a9a03a6f8f57c7589a51d8646164ac8f697039b571802f5bd66211b961dc6f114fcf929a71 WHIRLPOOL 9c15b68ea7caffc6213c6380483662809cadf5a89c2edad98ed6713f7673e270af2f1d56c80f9b1d7c4e70747fc380d0c4bec4121d808834be5eceb2aad2ded2
+MISC ChangeLog 798 SHA256 371229f42446eaf86334ed6db06a4983e42e17e01d05e0e481778e93fa68350e SHA512 2e80b2b1e6d636a1403b55f208941bb27505ab1ea86e41eb474da9892ed13c14682dcd7ba9a24a56bebad0e33a9ddcd4df53879d03e21bd51ef1619ab93e4460 WHIRLPOOL ab98aec699482c486e748b8315a692dae6d2792a94b5b37894953ca752081f089ddc38d558e9ddf580bc93ee4647b17c536b50e712a317cb0e7ac28ed327cad7
 MISC ChangeLog-2014 104250 SHA256 6587f8f101dc832a9f0c01b77a9d448b6a7b1c3c7befd1368e297bbe3dc41f1c SHA512 89ffec2164a619bbb418ecf43ecb0893a3f6a4846ff1ac403980e68d85efa7d502fa2f7338c80f8fcf12b56a1ed791c7d6d1bfc607f80fa88c1a88c3c6f93a85 WHIRLPOOL 47ced91b8df722e42d33773a243f89e57ca49f8942418d19321a1ed041fd9dabad747ff640fbb1f0de73220c23cd37778eedc44a14b8883b8220ee512089a823
 MISC metadata.xml 1084 SHA256 77b5afe4fc85576b9f4758b1cc1e9ad7021e40bdc341ca8a7932f54dba63a77b SHA512 3341c4c2bac3f5088827470ffaa842196c190d8732425fc0876cace29878602f62b4e0857e1eb52e8a2370df283735ed54da8d72802f8d09c9a513fe97e3e6ba WHIRLPOOL 481ca1b6f1bed13b2cdafe644f5478af62d29aa66374b5f2be55f5474a044d15894708dc1226f612c748d165cd1a26be5b0d307f290b74bca6a3c564a12e162a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlS2EIUACgkQiIP6VqMIqNe08wD/YOp3917IdqaxLKStcBAni4A1
-WxSpT7iP2VP3L+yDa9cA/RC6g+4wLKhBUyXeO0wqrLnhUrMYEmQgPeb5Yz7BRE21
-=kKF0
+iF4EAREIAAYFAlS9Y/gACgkQiIP6VqMIqNd5VwD/VOX505sDv2TQk3UL/BzbCnH8
+FseM3BGyivd1TZk0/68A/3exypb8cMTB0/cKQO3Cm99h3/4aDmT+d4bUdjhX6Ho8
+=McFQ
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/ruby/ruby-1.9.3_p551.ebuild b/dev-lang/ruby/ruby-1.9.3_p551.ebuild
index 7c9ad922009ee0ac9561289c57c7fea12030497e..137ac684a46517b1b6f325c60376ffdd5631f9f1 100644 (file)
--- a/dev-lang/ruby/ruby-1.9.3_p551.ebuild
+++ b/dev-lang/ruby/ruby-1.9.3_p551.ebuild
@@ -1,6 +1,6 @@
-# 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-lang/ruby/ruby-1.9.3_p551.ebuild,v 1.10 2014/12/06 16:51:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p551.ebuild,v 1.11 2015/01/19 20:07:18 graaff Exp $
 
 EAPI=4
 
@@ -58,7 +58,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 PDEPEND="
-       virtual/rubygems:ruby19
+       virtual/rubygems[ruby_targets_ruby19]
        rdoc? ( >=dev-ruby/rdoc-3.9.4[ruby_targets_ruby19] )
        xemacs? ( app-xemacs/ruby-modes )"
 

diff --git a/dev-lang/ruby/ruby-2.0.0_p598.ebuild b/dev-lang/ruby/ruby-2.0.0_p598.ebuild
index 8ef5e02c76d02e31a3d8a4ea1bf0f1ba19f5d074..17e732c97fab6fa1d997471731a69284281190ec 100644 (file)
--- a/dev-lang/ruby/ruby-2.0.0_p598.ebuild
+++ b/dev-lang/ruby/ruby-2.0.0_p598.ebuild
@@ -1,6 +1,6 @@
-# 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-lang/ruby/ruby-2.0.0_p598.ebuild,v 1.10 2014/12/06 16:51:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p598.ebuild,v 1.11 2015/01/19 20:07:18 graaff Exp $
 
 EAPI=5
 
@@ -52,7 +52,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 PDEPEND="
-       virtual/rubygems:ruby20
+       virtual/rubygems[ruby_targets_ruby20]
        >=dev-ruby/json-1.7.7[ruby_targets_ruby20]
        >=dev-ruby/rake-0.9.6[ruby_targets_ruby20]
        rdoc? ( >=dev-ruby/rdoc-4.0.0[ruby_targets_ruby20] )

diff --git a/dev-lang/ruby/ruby-2.1.5.ebuild b/dev-lang/ruby/ruby-2.1.5.ebuild
index 3fa1f2c46f1b88a300425a66f270285b26343eb8..d9e34c5ee484b7229178170c154bbb72c5d9c04b 100644 (file)
--- a/dev-lang/ruby/ruby-2.1.5.ebuild
+++ b/dev-lang/ruby/ruby-2.1.5.ebuild
@@ -1,6 +1,6 @@
-# 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-lang/ruby/ruby-2.1.5.ebuild,v 1.1 2014/11/14 06:53:31 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.1.5.ebuild,v 1.2 2015/01/19 20:07:18 graaff Exp $
 
 EAPI=5
 
@@ -53,7 +53,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 PDEPEND="
-       virtual/rubygems:ruby21
+       virtual/rubygems[ruby_targets_ruby21]
        >=dev-ruby/json-1.8.1[ruby_targets_ruby21]
        >=dev-ruby/rake-0.9.6[ruby_targets_ruby21]
        rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby21] )

diff --git a/dev-lang/ruby/ruby-2.2.0.ebuild b/dev-lang/ruby/ruby-2.2.0.ebuild
index 08f439a6cacc196c9ae549d5e68cd75d16aeca6b..499e768ce48f9933947fadc34e22a1f63563b6d2 100644 (file)
--- a/dev-lang/ruby/ruby-2.2.0.ebuild
+++ b/dev-lang/ruby/ruby-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.2.0.ebuild,v 1.2 2015/01/14 06:45:24 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.2.0.ebuild,v 1.3 2015/01/19 20:07:18 graaff Exp $
 
 EAPI=5
 
@@ -51,7 +51,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 PDEPEND="
-       virtual/rubygems:ruby22
+       virtual/rubygems[ruby_targets_ruby22]
        >=dev-ruby/json-1.8.1[ruby_targets_ruby22]
        >=dev-ruby/rake-0.9.6[ruby_targets_ruby22]
        rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] )