Update USE=server dependency to just builder. There is no indication that this only works with ruby 1.8, and no specific builder version is required in the source code. Fixes bug 476326.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 13 insertions, 9 deletions

diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index 80a69adf402b..be1a5b99650f 100644
--- a/dev-ruby/rubygems/ChangeLog
+++ b/dev-ruby/rubygems/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/rubygems
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.207 2013/07/07 08:05:21 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.208 2013/07/16 07:21:56 graaff Exp $
+
+  16 Jul 2013; Hans de Graaff <graaff@gentoo.org> rubygems-2.0.3.ebuild:
+  Update USE=server dependency to just builder. There is no indication that
+  this only works with ruby 1.8, and no specific builder version is required in
+  the source code. Fixes bug 476326.
 
   07 Jul 2013; Hans de Graaff <graaff@gentoo.org> rubygems-2.0.3.ebuild:
   Add ruby20 support.
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index c9d868f865cf..c7c73fd4329b 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -21,13 +21,13 @@ EBUILD rubygems-1.3.7-r5.ebuild 3747 SHA256 cf302064dc8c48da252d8e33dc0b8c920090
 EBUILD rubygems-1.3.7.ebuild 2995 SHA256 8047192b5e43b59eeaa0f9ee07f319b3bda6451c1d205cc3740b4385dca9cb73 SHA512 55560cd0d8d316a281dd4c04334b85ca66ecf360c06bfa1baad22b7d9a8be2819ccaf72eab03ad9adff5a34509457a62f7e93792f311de50e5f04b1693f222ae WHIRLPOOL 543e49ce74a4eb53b44381584c8bb9691760797ff02ce1eb27f7d53b42a2a5d1584f90eea7e619b3886ec7ca096f7d1db8cf3a684f5b51cfd4091cd9ec31e62e
 EBUILD rubygems-1.8.24.ebuild 3737 SHA256 4ad6a67f5a55e14a9b5f6a2008d4c1aade125e4db56026e1472c4ca973e8ba5d SHA512 d7983d0e9b58ac29fb89dac8c8c35376c03e49d6a01a5f8a2f0ea38d727ec89f9ec062098effbcc55d1012a207c346dadd72d5cadab04fc2af9b2e11d843487b WHIRLPOOL 21a5f76990635355f406637ab78c4f5ae53f117b4d5b958291452d5313749f7212deff4a24f3f92fbeca4438eecdbc65ffbe5ad2a521df7053e164eb9d473030
 EBUILD rubygems-1.8.25.ebuild 3743 SHA256 decc4a8f804777ccf230e7f3f98e0bd8e7130fdaa7e73019984cebf3d0e7dece SHA512 b0711999f316bdde6092565d0ffc5da7b048e348a98037e38bb68857ea8b6ecd48dec4dbeb98cb7753e9ce759ffd30fb34e339f7b250753367aa18702eafa22a WHIRLPOOL 9c078386430c0ca04ce52b3e850647e0d9fd5cf21cfd22fc7ad68caf63a1ecaacc0107245833ee8b88d09d7b10e171fd9a5e4d3b1fa721008abef99fb1895a77
-EBUILD rubygems-2.0.3.ebuild 4967 SHA256 1c34418f2aa65ec77df1c27381ef2d61fe4c4d643e29f58296f6e4a563f2351f SHA512 63e23ca46337136aae1f52d95f966f728029f18972e15f178b08a6bcab96c9edcaa33d057f5ab93af09bd686b79abb267e6744884afcc67582629227d2e743d6 WHIRLPOOL dd88a55144889d72ec77c4b9173a0d31aa04b13e216ef1075ce63401df8707ecc19c109632e721936401640f24f0afa0ef4acb6775e0be5b32c65bbddbbcdef7
-MISC ChangeLog 32246 SHA256 628f9ff9a843c1462e34fc2bf4724b2810e4bf054b5882b59cfdf90297d809a6 SHA512 5a119edaa2b3ffc91133c3ca39a194426236ffce27f057eede96a568a14adf3774f9a6e992489261c43637386795ea30202649e9cbff4400d4d5d94b34f95243 WHIRLPOOL 4c3d5a33f3114e6cf20f6930b7d3562f049ba10dfe56e880aa86994ab5b1bd89f19f9bc8a62e22d469d0f6e014ef64d3233be6bd1509c6b57a0a1392942e7adb
+EBUILD rubygems-2.0.3.ebuild 4926 SHA256 7071dd33007e906b7579584393fe9fbece538113bf4a4cc55529dda3feab0938 SHA512 5c14f9266588fa280f2a22eac734c239a6e15f1598ffdc4125748a7ad87c1db6b4618209ce5374b074185bde13bd86cbd6813ba3e7c6cdfcf33a95f98aeafb7b WHIRLPOOL 008477fa4dcef29137a6a61e3494572687809c3b67aa4f885f87f86b991784d00b30435a27204e145b8142d8cd435d555231e71707c5c255c179c70646723890
+MISC ChangeLog 32513 SHA256 b567e6a7a4e33fdb6ceffca3fbd54969ccdf5fbb8ccea30e7bc0b837291a1b6b SHA512 f756364548c7a99d2197dd687f357498f918fcab8a4e6381ae38827c73ccc2b7eeb337d8b8baea5cc8cbfeed1814dfc6779d47ee789899283db40d7ccdb860f9 WHIRLPOOL b32256d983017c6a70d373b12ade193640ac68757da726c53ee09a5ea05fa7142895779ff6c9ca3b93f802abb2370d74e75d3e716562060a67b5f3605cb86aa7
 MISC metadata.xml 318 SHA256 6e5f2eec30e8b7f9b678daf799db43ea56cc4566ca70635677d2cf5f60ebd3dc SHA512 a8036da4d9fd5c22fd71ab1eee6de35c25737616e9cf443786f0a6d9c2ebf1e5f3791f19ebe7693635eeb0bc793931e935ed0f7011fd37b764f7b26c59fde8a4 WHIRLPOOL 4aa04bfa68b9ac28debd59f64629806e100583b05a80edab02f917e9bb7f3b5afd7f0b35b05731580f895a531dcabf8dedf6ce21c43dd1cf44df66a21be6ae26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHZIUIACgkQiIP6VqMIqNeivAD/RD7c1b3p58G2XAFrJEKnnAX9
-uupBi41QKlYlko5gE+0A/iJuWL/0z/834aPlZNyyRS56JrVGqOTLWgue4GuyaZQ5
-=JEEJ
+iF4EAREIAAYFAlHk9JUACgkQiIP6VqMIqNe8pAEAhuNWwSkGhOc4RKe4DFALiIDi
+PI8fmu5LdZIoK68olzgA/ikuDgPQ48p03hYTXn1IIgnZYoe4lShoAUZbtri05spY
+=COKj
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rubygems/rubygems-2.0.3.ebuild b/dev-ruby/rubygems/rubygems-2.0.3.ebuild
index 0408e4e8976f..257c5dfe119c 100644
--- a/dev-ruby/rubygems/rubygems-2.0.3.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.0.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/rubygems/rubygems-2.0.3.ebuild,v 1.2 2013/07/07 08:05:21 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.0.3.ebuild,v 1.3 2013/07/16 07:21:56 graaff Exp $
 
 EAPI=5
 
@@ -22,8 +22,7 @@ RDEPEND="
 	ruby_targets_jruby? ( >=dev-java/jruby-1.5.6-r1 )
 	ruby_targets_ruby19? ( >=dev-lang/ruby-1.9.3_rc1 )"
 
-# index_gem_repository.rb
-PDEPEND="server? ( dev-ruby/builder[ruby_targets_ruby18] )"
+PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
 
 ruby_add_bdepend "
 	test? (