Depend on the rubygems virtual with an explicit SLOT now that the specific rubygems versions are listed in virtual/rubygems. This will make the dependencies more explicit and should decrease resolver surprises picking the wrong virtual/rubygems SLOT later on.

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

5 files changed, 21 insertions, 14 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index b1ea2897e0a1..7cd8dc3b8d5c 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.662 2014/08/21 09:20:14 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.663 2014/08/21 09:23:19 graaff Exp $
+
+  21 Aug 2014; Hans de Graaff <graaff@gentoo.org> ruby-1.9.3_p547.ebuild,
+  ruby-2.0.0_p481.ebuild, ruby-2.1.2.ebuild:
+  Depend on the rubygems virtual with an explicit SLOT now that the specific
+  rubygems versions are listed in virtual/rubygems. This will make the
+  dependencies more explicit and should decrease resolver surprises picking the
+  wrong virtual/rubygems SLOT later on.
 
   21 Aug 2014; Hans de Graaff <graaff@gentoo.org> -ruby-1.9.3_p545.ebuild:
   Cleanup.
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 4791162341c8..0fa5a4a377c3 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -12,16 +12,16 @@ DIST ruby-patches-2.0.0_p353.tar.bz2 1929 SHA256 4feee409319dbcac7525fb9c1c76c36
 DIST ruby-patches-2.0.0_p481.tar.bz2 2525 SHA256 9842526b161105af36bf67d22ad578a5c4f82bd1feaf78eee72e674df594d997 SHA512 6c844bd7930ee0d6b62759f5217508f5267c857ed1ff0fc857d6077c17ecb5733d949aa9154fa22e51f8f973719749360a6b821832f2e59c37e65c080fa0c292 WHIRLPOOL 2c302058886d9bc06a5e5febd54e2419a362ca141dd18f70bf7d4c4be65484fc95c9cd432717f6f97f5949f7cf69bb9f5df6e99ae94e14df1802a6f9244a2a7a
 DIST ruby-patches-2.1.2.tar.bz2 2237 SHA256 785c1682ef146d45ae9748c20792fb27de89b32afa84e2463c39e72b226b9ca4 SHA512 73df725134d12f437a9505d8345be8b55887e9b6b75ffaf2e983f375d0e5aff9fcd25624d8df79919256340e097bcf90e8656cb36073f55a00d0e00354fc40d2 WHIRLPOOL cc7d9968a58c9eddb881cf3830dd9c9532c0267c45f802733aa55f6d5c410f78a226e4e5916215bde4c2765b08a93661d5633579cbbd1830dcce89908ac88e94
 EBUILD ruby-1.9.3_p484.ebuild 6125 SHA256 34b0d6bc3ecd8b5517bb3a478a1b7948e3908ab959b3259986fdecf7ebf070c5 SHA512 153a01aa0843d548ccf90ced39cb0d331fcfec8c433b86b2d20debf06c6d7a500568e47398669356342cf4f612b059a3ab869b5eb333fadc8a2d65c235c448e2 WHIRLPOOL aab05acdf893b0d44a5ca4e2402aa8810b353571ff3009ee9ee2f37e326c07218601164c540f408d3f8ff4cb429029ced67454106de6dd8864a3be3eaed68286
-EBUILD ruby-1.9.3_p547.ebuild 6194 SHA256 9d05931c82a624e2c4a6f37272213b389aca5a1e78cf6c6f1d9016cd33995e1a SHA512 0bcd6f67ef2f62c0f97ff50ed9cf56fad3fb696acda5d3dd6084bbdf91e466b88f3c430193190930b68676fcca3a5e7c3804d93adb42076516ea2bb29bdfb85b WHIRLPOOL 49dabd25aa9d2a2308688cce8fa8789bf67cab48869165aeb1a92ac21aa8270ac1f817cb6c6827017d6eb75178c1332d8c424f163a844eea2fbadb617653ade9
+EBUILD ruby-1.9.3_p547.ebuild 6163 SHA256 55be658bb044585112da54f4d91db680c01a9b9dbf5b24ef3328d28d293737cc SHA512 9ebdfecff009f0e1bb277f075b89da428deeb215b152f864df5cecb8d1edebb7853c932fd468c9dc867c924398a866ce854d3f4928c3df9590014dda2fd7939c WHIRLPOOL 43ec56a09874d251488679dcbaf8b06fe2ca39636b14165614ca48bf5291da83e2e35c202b244b2ad2c3f202b62ecf6cdac5d5b0fc73d06abf1bd09bfcc79f6b
 EBUILD ruby-2.0.0_p353.ebuild 6505 SHA256 dd29cdfec77df7e0d811375d6e52deb0e3a9b9a118ab272fd869dab48e82b430 SHA512 7a3e163f81e99646f1eb30605b37a98ea639d4af0525dcd7d103ef816957369b4cfa831555005748b084c029f3f11876b090fd5e329d68055877a6b7bac4da76 WHIRLPOOL 725734370ef5cb4f5fe870e8649bfe759ad94029fef88a33c04e487ae3f7e9573fd873a17691ef6c5069d3f1f5d82dccab177b6093bba4028855863895bd7e1c
-EBUILD ruby-2.0.0_p481.ebuild 6392 SHA256 d1c111ad671b6859c7b2435bc6c79e42a6ee740ecc2882fe2f1b754b0d566b6c SHA512 fef95795135f877c77b703897257f4e7b87ac4d8f1113fd8d8d19e504b9b3322dccbff405f86757dee11c3cf0988185445e81005faf761e2e791f5dede07b9b4 WHIRLPOOL 5ff717c249b665d65ba5a5735dc372dbd78f669bd4c08575feb116d57ab4bf51f92fabedf4a9bae98787fdf1730fd4d1cd26273423cf778a2a8c7a0a4efaad47
-EBUILD ruby-2.1.2.ebuild 6437 SHA256 6ab31dcadf3578260e002b3493ac6bc15fa0cbf05c2fde3ce6ceb3bd33f56a2b SHA512 807305d00e0caeca933300fef154c937e397389898724e5f875d2ce4f97a6424b67637a6d55b6885a9b51a646809b130aa1e5e7b753941acb0135b64f3bf78cf WHIRLPOOL 6789d8ee20702dfdd0405f1ac82d1b0e6886aeaa759e05aedf4d33a2363b714eba943a7cfd34e861cb474e063200dc4b21e73c7b5b17bbe3b81eebbdd234e5ac
-MISC ChangeLog 98845 SHA256 1a77de9565ceefdf2cf1f6bfde17587b1c34afc15c79e1c0a2d1e20f1581a775 SHA512 9d408f1ffadf23760b24809c834c684616ae674bc934f1b1961215a93e3611974a29e6a88e8e23de8694062c441db6e005645356311d7d3cfe70408dbe012311 WHIRLPOOL 5991be8284421eb908bbf86775780da231ee11da7ce41da3afd17a66ee35157c5279f7572f0be722a5ef55b97c58e77b1d43bc8df2f1adab318382e53455f9da
+EBUILD ruby-2.0.0_p481.ebuild 6365 SHA256 f5c256e85c0f94a8404a85e5ea532a0531c5d4fe8b7ed5bb5e19d87b5b3d69ff SHA512 27929ad51c939cd92ccd44eb768431b82702ba80b735a3773e9527f909a090061e61c29e195e51ce6d687b20b4e61540a9a0b568272fe4a19d63f27d2ab254d0 WHIRLPOOL 784ea4f073006451e230ba18a86b26659b3db085a99076ee67eb39ebaf3151753f74ba25671eba267ca35294101b4aacc5f0d2b41ded8d960b73540a6dda2d07
+EBUILD ruby-2.1.2.ebuild 6413 SHA256 dd9b5262aeb99daae4c6b118f14634111c62d23ae24a360d2f703b0d2426dfee SHA512 445109c83d7be28de25f565538fc314ed76feeaaf74bba9b34850d059b9a853ddc505e7682a689d196d5d0e0f47239cad83b1f3470a5f6e28348cc3251f3b17d WHIRLPOOL 871140dab3da4f30901096bcc663828363fee3b275716f7b4e88d3e76de951b1707aa62151bdcaf4fc24e43090ce68e136be72f2c2f2d958d7f7c8ea25528cf5
+MISC ChangeLog 99233 SHA256 68d40be64e39bc2def0ce2bdde75eb05be4daca768b3640acac02c90b4acc99a SHA512 a9e575a0adde44b820df2cecf90796bc75ef39b72f6ca3a66e26a8eaad7b3a61faa4e9e702541816536e03712dfd3eeb5203fb4ee40e8ed0002f7d634bf8e1a5 WHIRLPOOL a0e12a8f55536852625edb391d52739ea5e91780e0761a767338a1b34112d1bdb97332838e80b1e3fd638cd14511c3c2f070ad258e7506e47614245f4a6650a1
 MISC metadata.xml 992 SHA256 dd9e9c8252fc245f4f3c75c901e84faaceebcc1025742244871e49e7090d8a86 SHA512 7894c050d0b4dd875cd380e5db759ad7ed8c23edfff79accb169f4cbb185aed9b65c0d81e1cea3c53ef8f639423614a48de5265b069ec1ea11ef41498b1cd4f4 WHIRLPOOL e651f88aea9f39d9dcd9e6e5547699ec06568c99737948e7bee1554bdb6c45defbd7f98e435ad7c31305763e078d904b14aa14ddce084cd9c5b83dacd47c0402
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlP1uc8ACgkQiIP6VqMIqNen/QD9G/YXWurduczrkYa7MyaQclWh
-dbNT9sI+G1GuY9bnMcoA/itDlgobD1w0UFb9q0EOSaonvcv44/RFSqZN5eMqQaje
-=143S
+iF4EAREIAAYFAlP1uokACgkQiIP6VqMIqNf3kQD/ZJSi4tmG6BD6FgTbPWWbdUAk
+hmczUpOa1XL3g2Ujy18A/RT1JiV8jnuBWGaJyCFBJNUYVvF1RGUFiddQhroeJ2vt
+=iXD+
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-1.9.3_p547.ebuild b/dev-lang/ruby/ruby-1.9.3_p547.ebuild
index fea3eb2e4aa5..14493091d9ba 100644
--- a/dev-lang/ruby/ruby-1.9.3_p547.ebuild
+++ b/dev-lang/ruby/ruby-1.9.3_p547.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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_p547.ebuild,v 1.6 2014/07/27 11:36:13 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p547.ebuild,v 1.7 2014/08/21 09:23:19 graaff Exp $
 
 EAPI=4
 
@@ -58,7 +58,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 PDEPEND="
-	>=dev-ruby/rubygems-1.8.10-r1[ruby_targets_ruby19]
+	virtual/rubygems: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_p481.ebuild b/dev-lang/ruby/ruby-2.0.0_p481.ebuild
index 4411e71c09a9..bd17d23e675d 100644
--- a/dev-lang/ruby/ruby-2.0.0_p481.ebuild
+++ b/dev-lang/ruby/ruby-2.0.0_p481.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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_p481.ebuild,v 1.5 2014/07/27 11:36:13 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p481.ebuild,v 1.6 2014/08/21 09:23:19 graaff Exp $
 
 EAPI=5
 
@@ -52,7 +52,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 PDEPEND="
-	>=dev-ruby/rubygems-2.0.2[ruby_targets_ruby20]
+	virtual/rubygems: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.2.ebuild b/dev-lang/ruby/ruby-2.1.2.ebuild
index 904bdb2cb594..9f698729846a 100644
--- a/dev-lang/ruby/ruby-2.1.2.ebuild
+++ b/dev-lang/ruby/ruby-2.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.1.2.ebuild,v 1.2 2014/06/10 19:31:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.1.2.ebuild,v 1.3 2014/08/21 09:23:19 graaff Exp $
 
 EAPI=5
 
@@ -53,7 +53,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 PDEPEND="
-	>=dev-ruby/rubygems-2.0.14[ruby_targets_ruby21]
+	virtual/rubygems: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] )