Remove masked jruby 1.6 version.

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

12 files changed, 40 insertions, 202 deletions

diff --git a/virtual/ruby-rdoc/ChangeLog b/virtual/ruby-rdoc/ChangeLog
index 0d09a033e572..99b86bbb5430 100644
--- a/virtual/ruby-rdoc/ChangeLog
+++ b/virtual/ruby-rdoc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for virtual/ruby-rdoc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-rdoc/ChangeLog,v 1.30 2014/04/19 03:03:46 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-rdoc/ChangeLog,v 1.31 2014/10/10 09:03:19 graaff Exp $
+
+  10 Oct 2014; Hans de Graaff <graaff@gentoo.org> -ruby-rdoc-2.ebuild:
+  Remove masked jruby 1.6 version.
 
   19 Apr 2014; Manuel Rüger <mrueg@gentoo.org> -ruby-rdoc-0.ebuild:
   Remove ruby18 ruby-rdoc virtual. See bug #434064.
diff --git a/virtual/ruby-rdoc/Manifest b/virtual/ruby-rdoc/Manifest
index e652648c7116..8ebea0c65a24 100644
--- a/virtual/ruby-rdoc/Manifest
+++ b/virtual/ruby-rdoc/Manifest
@@ -1,6 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 EBUILD ruby-rdoc-1.ebuild 1374 SHA256 d7edd2c3a9db585814ff10646d0525789aee93edfaef7081420398b98c34c957 SHA512 179b30216ff351401192cd4ee987e17f422a544a1a6c405a6feb5eb7e0381bbd4cf0142bd8116be50993517ef77b2f64180a52d7701b394568af999af68204e4 WHIRLPOOL ec458c5d9c4f32ed5b1d045c5fa094a9dda79c4d83479bb5e3d4815d041fb7f5b67500b13902f63663a91d4d172082946fb1145e7c41ac62e43ad8a86e9b4499
-EBUILD ruby-rdoc-2.ebuild 1280 SHA256 a65930c00f9d2b84f57a1424c3bd46c5e3ea507670114a7b7ed80d200a7bb64c SHA512 0e8e60418193f6b25ca4eb3788541dfa6d6f50bbdfedb93cd13013fdde825fe5eb32ffe3ce5e1406cf7bedc2bf778916e10a1d0fe78d2a4e23ab39d2730835a8 WHIRLPOOL ab7303f193b176c10b452c0047316ea0543fa22b308b1644840321d885462febcbcf1869e3c14be6c0f8da85635ebf831b1c55e5ecd101f6875ce59f9dccbc66
 EBUILD ruby-rdoc-3.ebuild 1339 SHA256 b9cd152e6b16446683b2ec56ea658d1ec20f474aa7db8475d926d1730f36337b SHA512 e69fe08155489fe4baddb11a82f6fddd7cd965dd4eee6fd3f89944f7cb43b8f0fc9ab6c3ae7be3ab6c5b2c40476efe66acda34e1f3b217d5afa0928baa7842a2 WHIRLPOOL c8f2ff631aa9be1ff49ff9860ad34b84853bebb7b1a6c6f7375375bccadc57c199be2d2e1b9cd26dde8cd2dd2dbf38ef8cb5cf05a8f01636e9ac048e08436efe
 EBUILD ruby-rdoc-4.ebuild 1350 SHA256 45af838295e854c3e096017b998cb0fb507d6d89ea772f0ec9a95c78f4664ca7 SHA512 b098793b5be130ec15b815885f41aee2eb77e3b67b3bccd3358b481d782f2f6b1530d77c0f51f9a983cc1983ddf07744fa661801caafef7edcb37a2506503698 WHIRLPOOL 8c55a97a7d8b8c99a93c767983c5facd750e2163d30ebcb2120546054c21bce3b2ac5c332612a4575f2fa5e12147bee33fb8d587ba00f318dcd0334ac3c008c3
-MISC ChangeLog 3764 SHA256 19677ac973192353e529b2ba0168bde0b876a7d1597750ad60fc8c9ee09e6fa0 SHA512 31fc0da3a7587bc680cc5182c608ae4fcf29a13b8de22d47e5f57cf4363807a133348b7ba5f6bcceba161d2f213789e478e5655b6b293840d28b5ed0869bac87 WHIRLPOOL 194a4972ab44216096cd462f69334d9337d785545f409202f4e9e7325644b18fc377ba5a38f1aa7d3d1ad6f3a3dded301bf6e05b3ea172d00f48da86b97628a2
+MISC ChangeLog 3872 SHA256 bcc748826a1b35e6ef6510b50dce179348d033669b40f20ce5492aa5f925007b SHA512 5df33208694c1ff222c441ed39f7ba2e2c27d58033d4a4d6065d681db34e77a73f4ad083342192fb0ebfd39b6686c90b77c3bbc76081108b06b7e4381cee23db WHIRLPOOL 133d8d82278bca77a64adb9ea732923566c357e55c356021ff2da520436dd4b61e466c547254c1a116faea1cf93a5ddaafb059fd66e32d53da6332449c35e7eb
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlQ3oNgACgkQiIP6VqMIqNdtoQD/VAe/+f2i+nxl4zPlb21ne96U
++a6ptOcA+AjfSX+ndQoA/iQGOteA5RglH5NSYx9FJTDqvxMtq+Uluycxh88l7aGw
+=Uj1r
+-----END PGP SIGNATURE-----
diff --git a/virtual/ruby-rdoc/ruby-rdoc-2.ebuild b/virtual/ruby-rdoc/ruby-rdoc-2.ebuild
deleted file mode 100644
index 79154ceba594..000000000000
--- a/virtual/ruby-rdoc/ruby-rdoc-2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-rdoc/ruby-rdoc-2.ebuild,v 1.3 2012/06/21 18:31:26 graaff Exp $
-
-EAPI=2
-USE_RUBY="jruby"
-
-inherit ruby-ng
-
-DESCRIPTION="Virtual ebuild for bundled and unbundled RDoc"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="${USE_RUBY}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="|| ( dev-ruby/rdoc[ruby_targets_jruby] dev-java/jruby )"
-
-pkg_setup() { :; }
-src_unpack() { :; }
-src_prepare() { :; }
-src_compile() { :; }
-src_install() { :; }
-pkg_preinst() { :; }
-pkg_postinst() { :; }
-
-# DEVELOPERS' NOTE!
-#
-# This virtual has multiple version that ties one-by-one with the Ruby
-# implementation they provide the value for; this is to simplify
-# keywording practise that has been shown to be very messy for other
-# virtuals.
-#
-# Make sure that you DO NOT change the version of the virtual's
-# ebuilds unless you're adding a new implementation; instead simply
-# revision-bump it.
-#
-# A reference to ~${PV} for each of the version has to be added to
-# profiles/base/package.use.force to make sure that they are always
-# used with their own implementation.
-#
-# ruby_add_[br]depend will take care of depending on multiple versions
-# without any frown.
diff --git a/virtual/ruby-ssl/ChangeLog b/virtual/ruby-ssl/ChangeLog
index e5284db4f9bf..e2e597cc92b5 100644
--- a/virtual/ruby-ssl/ChangeLog
+++ b/virtual/ruby-ssl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for virtual/ruby-ssl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-ssl/ChangeLog,v 1.30 2014/04/22 18:54:01 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-ssl/ChangeLog,v 1.31 2014/10/10 09:02:44 graaff Exp $
+
+  10 Oct 2014; Hans de Graaff <graaff@gentoo.org> -ruby-ssl-2.ebuild:
+  Remove masked jruby 1.6 version.
 
   22 Apr 2014; Hans de Graaff <graaff@gentoo.org> ruby-ssl-3.ebuild:
   Add keywords since the underlying implementation is already stable.
diff --git a/virtual/ruby-ssl/Manifest b/virtual/ruby-ssl/Manifest
index 9453d28f8f09..5ca8eab15419 100644
--- a/virtual/ruby-ssl/Manifest
+++ b/virtual/ruby-ssl/Manifest
@@ -2,15 +2,14 @@
 Hash: SHA256
 
 EBUILD ruby-ssl-1.ebuild 1435 SHA256 78c93132211cdbfd225a1e0f1938242e6a1637691ae6b4f4fb50f60efd5620a8 SHA512 d593a48a27c3a5d9a7869a9b47b9f385d876549e706baa92c98247bfe6d324cdf7381664dfc9b8b3f9a52726fbb5ddffcf1a3d60496fb14de4d66ba82e132e02 WHIRLPOOL c1cba24de101766d392179f7720c9685826b1fa8f3b6176173476ca9246401adab3962fdd12e2b65084aef8ca01a8a91f85de2a06a8fe81f8bfe1fdd53ff553b
-EBUILD ruby-ssl-2.ebuild 1244 SHA256 59b3c06d3487301a827245a64be9cff1725f5c3f300ac8fa94eaed99da1121bd SHA512 022f397078ef330bfc3a9bf86972f3539bad87a8a3cf3240e5b141aa78ea79c73e60e3913b8d86298c9d2cf2972de4fde8d0d9ed881657cba25d30a4695a9db4 WHIRLPOOL a0e9b0b31f82b4557cafed49c39042fcc0b187285ce2cc2713ed30202aba876291d62a595a866152a7d097272366b7dd17520f81fc571d135c94d0c943d82ee1
 EBUILD ruby-ssl-3.ebuild 1435 SHA256 472d99c5d0701674cd2e296317e4132b3df6db1fc3066e653be43ec9d888795c SHA512 b6d0e014e7b0ab338b817706b23311c6ea52a818286d3d9ceeaa6f382d8246a8eb879893f953ae129a1b2ebadc3160a6ab7263324b72e5e4f88dac218599b686 WHIRLPOOL afd4ff71047bb632811f2c58687f6c4e88f037e905368f6897377fdbd79339ff3a744848a7f94c1d20d3a57c002b2993d653c6e1b72f5f8ade7118ae80b8cdbf
 EBUILD ruby-ssl-4.ebuild 1443 SHA256 068b37a52d1c6fe8be232d3ee1148ecd1729dfbb2c13bf128bb2224f973b0b30 SHA512 d2a9b8af85324be5d7103b0b0415a0e23ae0c14c4366792269cc20389677d754525745c5410186fab190e67d037e0bd4177fead8d715e07142d3d13df9b62d4b WHIRLPOOL 43c3909900adfdf4ef3f12cf1cef61110f32a332e2233fbe336a253552b4d5251c0486db556a3f0353fdddac6b62d2909f49b7dda390aef85130b9ca613f294d
-MISC ChangeLog 3852 SHA256 1455dccb63d29f7a2602e6fd250e144350f85302163fab8a7dbc3d93bee33212 SHA512 66bd0c91874b3e679ff7e6e5e7a0e6b751bd6bfda2c3a4a81e13dc09237dbddfb72505147c2268171939535e1e2352d6dea4e0afc53d49647261c5a3d8868edf WHIRLPOOL ce39e3354f0adc53fac08c38dd74b1e5fb66f85d74f37c62d99aeb368fb21157ea69b33b53b9269bc032c6ff7e7b11d6c46af3ca71a6f5329f61fbb930125392
+MISC ChangeLog 3958 SHA256 3a7025033a8870cd8ad6bb26ecf0182e2a10e6e8ee8e55436e4468d4cbac36b9 SHA512 6f5fffe0e4c8fc1b2f1ec80c12a8cc070af6154e5638d9f39034e6bea02a37fd02babc1cd1352b635bfb02774d522413dd41e63c6b418bfd4dfc343aa7ec162c WHIRLPOOL 5c58babee25989dd3c09e62205ae2affc569790aad612764a70dad85f6575120e87c50ed170208c00025dbbe75850bdf38319784c0dae77b3fa98fe067b0c4ab
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlNWusoACgkQiIP6VqMIqNfOawD9F2kFzYOiPG6WjF0uS3iS+IaC
-QfvcFgaQ/yu5tbU7FHoBAJAmB/b2ZGZINinWpuS6lbPWcdvH++lVackyWBA4Ct1/
-=GJMy
+iF4EAREIAAYFAlQ3oLUACgkQiIP6VqMIqNdUWQEAinOpD4d7kDP3/8AaqO5r4xLi
+gYF9BHTJauZ7tTWl/PQA/iTnM1aYNZm9K8WT5UDm8DADi19DkjFNoAIuXwg9lO4Z
+=2P0+
 -----END PGP SIGNATURE-----
diff --git a/virtual/ruby-ssl/ruby-ssl-2.ebuild b/virtual/ruby-ssl/ruby-ssl-2.ebuild
deleted file mode 100644
index 625ae8768d4e..000000000000
--- a/virtual/ruby-ssl/ruby-ssl-2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-ssl/ruby-ssl-2.ebuild,v 1.2 2011/12/15 09:55:27 graaff Exp $
-
-EAPI=2
-USE_RUBY="jruby"
-
-inherit ruby-ng
-
-DESCRIPTION="Virtual ebuild for the Ruby OpenSSL bindings"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="${USE_RUBY}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-ruby/jruby-openssl"
-
-pkg_setup() { :; }
-src_unpack() { :; }
-src_prepare() { :; }
-src_compile() { :; }
-src_install() { :; }
-pkg_preinst() { :; }
-pkg_postinst() { :; }
-
-# DEVELOPERS' NOTE!
-#
-# This virtual has multiple version that ties one-by-one with the Ruby
-# implementation they provide the value for; this is to simplify
-# keywording practise that has been shown to be very messy for other
-# virtuals.
-#
-# Make sure that you DO NOT change the version of the virtual's
-# ebuilds unless you're adding a new implementation; instead simply
-# revision-bump it.
-#
-# A reference to ~${PV} for each of the version has to be added to
-# profiles/base/package.use.force to make sure that they are always
-# used with their own implementation.
-#
-# ruby_add_[br]depend will take care of depending on multiple versions
-# without any frown.
diff --git a/virtual/ruby-threads/ChangeLog b/virtual/ruby-threads/ChangeLog
index fc5bf71a96fc..3f6b2358f9bd 100644
--- a/virtual/ruby-threads/ChangeLog
+++ b/virtual/ruby-threads/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for virtual/ruby-threads
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-threads/ChangeLog,v 1.34 2014/08/10 20:11:50 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-threads/ChangeLog,v 1.35 2014/10/10 09:02:07 graaff Exp $
+
+  10 Oct 2014; Hans de Graaff <graaff@gentoo.org> -ruby-threads-2.ebuild:
+  Remove masked jruby 1.6 version.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> ruby-threads-1.ebuild,
   ruby-threads-2.ebuild, ruby-threads-4.ebuild, ruby-threads-5.ebuild:
diff --git a/virtual/ruby-threads/Manifest b/virtual/ruby-threads/Manifest
index 642d4676611b..dfac977316ec 100644
--- a/virtual/ruby-threads/Manifest
+++ b/virtual/ruby-threads/Manifest
@@ -2,15 +2,14 @@
 Hash: SHA256
 
 EBUILD ruby-threads-1.ebuild 1338 SHA256 1e2bf6eb3645ed0e803936338b956039f6f2fd6714aca5e12f5e7d4a083ab236 SHA512 7a81f5bec978f2c6f41e94e0ecd226e498868128b6496df1dbb96a3c4a7d6c43501f01ef0ed632efbad2ba92df0592dd9b78188a2b9cf0e644b5fc5b3f2a0f73 WHIRLPOOL 037cf062ff3df8e0129527816df7b9aab9e73d9240dc92ebc4007862470933d6d0fb8305bfe4ea9790355fada6112b679c6cdb1dbc5bfec99b42ef9372d7da53
-EBUILD ruby-threads-2.ebuild 1260 SHA256 acf9b373b3ebdf9fb39096de4370e189f50b2fdf03aec9e96938110b19d742c1 SHA512 35beb63c66decc777efe2a638a7454a4893cc88e0831742db577d15b836f087d89e4fea58627b46af7d276f82f41b46b110f051aa63a71e3cd33732941eb9152 WHIRLPOOL 0c281d73ba90aea5cdf510c03d6ae70b9a287a273f19e5678b5bb565cddfb0783f6ce30d7ffc917fb229d847f67c89aa33e709efe00612c76629a086e80d7e2e
 EBUILD ruby-threads-4.ebuild 1337 SHA256 d74c091ef2b67731ec7c695e5bcbfc9fe012370468c5528dff1b42e4456c095b SHA512 ce68a38feaba90a70f24ced0d3215384cecbc44a5622ed034fec42c662ae133f67461e719d58389c522d9589afadc072c26de68e0c622e630e77e0af34278a08 WHIRLPOOL 3f285e6da4c3e45d6a854d39331f49ea31a21c5225df267cee33f057c6a57a2a11fa7abeed6713ef9298a5c47f85248b666aa907e1cb208af38206cc2552fc7d
 EBUILD ruby-threads-5.ebuild 1346 SHA256 e592c76f321cfce45f82ca007cc8cd8134b0918796af803b5ac9755256a3a33a SHA512 d8d815e330dc8f0065e5ae06673e27d662e34b1435c6ecf56969cf773e3fef930040c609082e834aea015673fe665745da7d8ee5cb9a3190887dfe3be2468e36 WHIRLPOOL c49c7f73a0f2c7a32e77efbc3c5102a2c2c1819b6ad95aeb9cdb8b7284bda3a1024600985c7be7e0c0a6f0b3b6e02d233a712f299a3ef714ec7590a407b8e64c
-MISC ChangeLog 4414 SHA256 552f14d3f470d7c8cf4d8181fa1c73c397f508a1c53cd0ff47655814976f9c96 SHA512 459b2eb9bc84ace2f84a4e15800f62c81028e93de5da865578655736479ec9e5048ba1fb4f59f07dc80e6ac707de79220feae7f5538c48a8afc6c504cf03b41e WHIRLPOOL 8003479a606207ce3e3503a9b693f866cc180dc3a415e6f413ff611aeab208ac5ad9ce4e8a3c10a8bd8f1c81cebdb023a062da3a2ddafa156cad5cf56df6b601
+MISC ChangeLog 4524 SHA256 02fab4e76cfcb3cfbead18133f12c1cb46d8917a72e6fd172444f4fafad1a2c0 SHA512 2c329423f835428616918ac64f2ea07db164fa3d614302c82c690102ca474b11eb07fefd6608fb58e712706181d6164c5f32ad931683b18ff3e9b3152d69e950 WHIRLPOOL ccf22b7d2b2f1f63acc6d9718aa36c3226acf1a81527c1ddd4c96c86a518885605e28ee1f0669d6ebe6af5e81715e3c9c96953551eecbc034bfbd0b0792af291
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn0gcACgkQcaHudmEf86qm6gCfTgTvgi82vlak2yx3UhHJ9ejk
-kjAAn2AJJs5cRgPOXyY6SlIh53qhvKFy
-=CSfr
+iF4EAREIAAYFAlQ3oJUACgkQiIP6VqMIqNee5gEAhDetTbhstgC4BcTnPTobLQ8c
+d4ygGJaGrOi81wMOVYUA/17+D/noOAxwH4mUMgm1sr1nowtAGqpeGWJnw9p9quMS
+=XFEv
 -----END PGP SIGNATURE-----
diff --git a/virtual/ruby-threads/ruby-threads-2.ebuild b/virtual/ruby-threads/ruby-threads-2.ebuild
deleted file mode 100644
index 09144bdc90d2..000000000000
--- a/virtual/ruby-threads/ruby-threads-2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-threads/ruby-threads-2.ebuild,v 1.4 2014/08/10 20:11:50 slyfox Exp $
-
-EAPI=2
-USE_RUBY="jruby"
-
-inherit ruby-ng
-
-DESCRIPTION="Virtual ebuild for a ruby interpreter with threading enabled"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="${USE_RUBY}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-java/jruby"
-
-pkg_setup() { :; }
-src_unpack() { :; }
-src_prepare() { :; }
-src_compile() { :; }
-src_install() { :; }
-pkg_preinst() { :; }
-pkg_postinst() { :; }
-
-# DEVELOPERS' NOTE!
-#
-# This virtual has multiple version that ties one-by-one with the Ruby
-# implementation they provide the value for; this is to simplify
-# keywording practise that has been shown to be very messy for other
-# virtuals.
-#
-# Make sure that you DO NOT change the version of the virtual's
-# ebuilds unless you're adding a new implementation; instead simply
-# revision-bump it.
-#
-# A reference to ~${PV} for each of the version has to be added to
-# profiles/base/package.use.force to make sure that they are always
-# used with their own implementation.
-#
-# ruby_add_[br]depend will take care of depending on multiple versions
-# without any frown.
diff --git a/virtual/rubygems/ChangeLog b/virtual/rubygems/ChangeLog
index 9ce9f201adcb..b87efbd9c9ed 100644
--- a/virtual/rubygems/ChangeLog
+++ b/virtual/rubygems/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for virtual/rubygems
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/rubygems/ChangeLog,v 1.61 2014/08/21 09:19:32 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/rubygems/ChangeLog,v 1.62 2014/10/10 09:04:10 graaff Exp $
+
+  10 Oct 2014; Hans de Graaff <graaff@gentoo.org> -rubygems-2.ebuild:
+  Remove masked jruby 1.6 version.
 
   21 Aug 2014; Hans de Graaff <graaff@gentoo.org> rubygems-4.ebuild,
   rubygems-6.ebuild, rubygems-7.ebuild:
diff --git a/virtual/rubygems/Manifest b/virtual/rubygems/Manifest
index 6ca46257db13..2e2dfeb61464 100644
--- a/virtual/rubygems/Manifest
+++ b/virtual/rubygems/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD rubygems-2.ebuild 1242 SHA256 0c1d57e373c42e9a0199598d35258ef925fe6561c64bfce1cce3fb31d5139926 SHA512 c04165adedfbad0d52f62fc53d2d0a2cb954087325f18c6c3f0ecffaaa399dd7eb5e7c45abf254d86f0640b5b29e23e00d4f861cb3e7fb2973e0747b583fe9c1 WHIRLPOOL 6cceb6acc14345a8f9fc2bcd2935e4290f9d74917fe5e4f8f25a1cbcc82d501eb221082a03b6e300a0e7bd45827a273dc16376bc57566d37bd7f36662f699d39
 EBUILD rubygems-4.ebuild 1459 SHA256 99dc895f35ba6afbceb3f87f1e5f23b0c491a22755e3ad335e5351152e9379c8 SHA512 c5773fe15fe10e1c5ee002a3fbfc74e206e865b3dab8ce936f2c49c67a4f47cbb7d1783dc1b0161068d6aeb99f0c01c08c5528acccab07d3ac94f9e124a15264 WHIRLPOOL 5f65e032e510baa21adce436ea52827d2d328ac1804ef661a9b379cb764084831297fb922fe1f4c24ff356613747bdf6b06ae3baa1674baaffd6651a456caaa6
 EBUILD rubygems-5.ebuild 1217 SHA256 272badfcf18002df513ad9894b775b2138c75efda973c20bb79d2ad48031e631 SHA512 0f0d41acad08b1f0cd1bc1fc075e53c3410a3bc3cf3ea617e4c2388d3378354652f3829d16f12db6c75d990094e4653ccdbf573ebf19405d6031f6b069986aca WHIRLPOOL d0e28b866400c772d453e9f641262f38bb2aecb6d7ff83a024f6fd658577d8ca668e2f8aab3f1e591878f6e9ef8e3ba0a1f6fd7e1219af3026a107c26641ebd7
 EBUILD rubygems-6.ebuild 1488 SHA256 4017661e151ce67736a73180fd27147465662b59fa918407281874de0777b810 SHA512 c103d2d0e2d216ad3f357f65310b5d921e5bf27d5dd218d26d3b0e1d93ea8d3a08b55703c7447152e23499b84843fc00dab6b3fb3a8c1272b11b84484f6cfc84 WHIRLPOOL bf42c34df7e3597b99a20a72ffd92399ecb3f86cf0ef05849ef12678034013135ed98e53bf76c2cdb25916a97c648c332fb8691b01865fcd17a65e20e6a433c0
 EBUILD rubygems-7.ebuild 1497 SHA256 f498bd576bb1a39e38122374f630efe5705207461252c8c8dfd7c7a8a1ff5180 SHA512 b6849d9ee509f6a8cb416a1726944e5f6e771ff06f342945d4557f9417c70d867502ecabe97b0622fc771d6055051a4d88e75584b9e9a072a04da1cc3bccf5bb WHIRLPOOL 7c5dd83d6348d6b2a66610061624ad45066e5237f85bdf6d3cb480061bef3e71dfff0accaabd2b45f4e8bd0f2f3edfff9201f295a38dfcd9fc82571ec1f8c22a
-MISC ChangeLog 4661 SHA256 41499a23b905c39566453ee57ba5715126e5ae6f61e558ef6d6b384460d1d6fb SHA512 3cb8227600e60045643e0a41d1bff69c3cd1552ae8109ae225e8d5e5e2b0bc034e02647eaed50b55b711afa3211a66e9a98669373c099f80ba579841b6097e77 WHIRLPOOL 8d765e46c835180f89ee8f85235350726d1f24b4710de0ba1ed61c57aabfaeddf940cec4e32501283eb53052424116dbb0a9516508aa1272a88e3e63df195345
+MISC ChangeLog 4767 SHA256 0421f8a2d4498e803e572214606dae14d2bd4a9cf140e53d95456e0a13efa04c SHA512 529cb2c17632391ea7c7d23de1454b6bfbf3be25629a8be290e868a803b7348017ab00aa6af677137b35af0972d0d91f3ccafccd5de6e585e51ca9b955f3abcf WHIRLPOOL 60c43868d6a65dfba30e9ff50f202a58b47bfb95fcda6440d9e4f8dc4aa1bf87b71bc8ff3d38add723e8ba8a27f2ecb06a2e9b3dca14e32ba2a9aaaa922963bb
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlP1uasACgkQiIP6VqMIqNf3DwD+MjpL+YQY9jYiOcQojwOk5OyU
-coqvV4O+BuPy817Y5FwBAJezhxtEsTL4qr/wSldzDO12HKydH8jxGN26hMip46Tf
-=iUuE
+iF4EAREIAAYFAlQ3oQsACgkQiIP6VqMIqNcWbwD9GT7fGagoWj0D/rRdMTGDI6Vb
+zCVhuu3x6Yyui8MkNRwA/RhqaeQbGECm7rrAlvpAX3oDj2CoC4VzQLTfNl4aCJe2
+=XglI
 -----END PGP SIGNATURE-----
diff --git a/virtual/rubygems/rubygems-2.ebuild b/virtual/rubygems/rubygems-2.ebuild
deleted file mode 100644
index ff8ba4c598ef..000000000000
--- a/virtual/rubygems/rubygems-2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/rubygems/rubygems-2.ebuild,v 1.2 2011/10/21 06:02:48 graaff Exp $
-
-EAPI=2
-USE_RUBY="jruby"
-
-inherit ruby-ng
-
-DESCRIPTION="Virtual ebuild for rubygems"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="${USE_RUBY}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-ruby/rubygems[ruby_targets_jruby]"
-
-pkg_setup() { :; }
-src_unpack() { :; }
-src_prepare() { :; }
-src_compile() { :; }
-src_install() { :; }
-pkg_preinst() { :; }
-pkg_postinst() { :; }
-
-# DEVELOPERS' NOTE!
-#
-# This virtual has multiple version that ties one-by-one with the Ruby
-# implementation they provide the value for; this is to simplify
-# keywording practise that has been shown to be very messy for other
-# virtuals.
-#
-# Make sure that you DO NOT change the version of the virtual's
-# ebuilds unless you're adding a new implementation; instead simply
-# revision-bump it.
-#
-# A reference to ~${PV} for each of the version has to be added to
-# profiles/base/package.use.force to make sure that they are always
-# used with their own implementation.
-#
-# ruby_add_[br]depend will take care of depending on multiple versions
-# without any frown.