dev-lang/ruby: Fix slot conflicts, #498970

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

5 files changed, 25 insertions, 16 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index c2758323847d..c91a2b709ba8 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,10 @@
 # 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.636 2014/01/22 19:34:07 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.637 2014/01/26 09:27:14 jlec Exp $
+
+  26 Jan 2014; Justin Lecher <jlec@gentoo.org> ruby-1.9.3_p484.ebuild,
+  ruby-2.0.0_p353-r1.ebuild, ruby-2.1.0.ebuild, metadata.xml:
+  Fix slot conflicts, #498970
 
   22 Jan 2014; Hans de Graaff <graaff@gentoo.org> ruby-1.9.3_p484.ebuild,
   ruby-2.0.0_p353-r1.ebuild, ruby-2.1.0.ebuild:
diff --git a/dev-lang/ruby/metadata.xml b/dev-lang/ruby/metadata.xml
index 963d76edceeb..ddc3f0a7b0b3 100644
--- a/dev-lang/ruby/metadata.xml
+++ b/dev-lang/ruby/metadata.xml
@@ -3,11 +3,10 @@
 <pkgmetadata>
   <herd>ruby</herd>
   <use>
-    <flag name='rubytests'>
+    <flag name="rubytests">
       Install ruby tests that can only be run after ruby is installed
     </flag>
-
-    <flag name='libedit'>
+    <flag name="libedit">
       Use the <pkg>dev-libs/libedit</pkg> library to provide the
       readline extension, used for instance by the irb tool. This flag
       will take precedence over the readline USE flag.
@@ -16,8 +15,7 @@
       readline extension will not be built (and irb will lose line
       editing functionality).
     </flag>
-
-    <flag name='readline'>
+    <flag name="readline">
       Use the <pkg>sys-libs/readline</pkg> library to provide the
       readline extension, used for instance by the irb tool. This flag
       is meaningful only if the libedit USE flag is disabled.
@@ -26,14 +24,12 @@
       readline extension will not be built (and irb will lose line
       editing functionality).
     </flag>
-
-    <flag name='yaml'>
+    <flag name="yaml">
       Use the <pkg>dev-libs/libyaml</pkg> library to build the psych
       extension, available since Ruby 1.9.2_rc2, in alternative to the
       bundled syck-based parser.
     </flag>
-
-    <flag name='rdoc'>
+    <flag name="rdoc">
       Install <pkg>dev-ruby/rdoc</pkg> after installing Ruby.
     </flag>
   </use>
diff --git a/dev-lang/ruby/ruby-1.9.3_p484.ebuild b/dev-lang/ruby/ruby-1.9.3_p484.ebuild
index 8e8f451b5acf..92ef292a1959 100644
--- a/dev-lang/ruby/ruby-1.9.3_p484.ebuild
+++ b/dev-lang/ruby/ruby-1.9.3_p484.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_p484.ebuild,v 1.11 2014/01/22 19:34:07 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p484.ebuild,v 1.12 2014/01/26 09:27:14 jlec Exp $
 
 EAPI=4
 
@@ -45,7 +45,10 @@ RDEPEND="
 	gdbm? ( sys-libs/gdbm )
 	ssl? ( dev-libs/openssl )
 	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? ( <dev-lang/tk-8.6[threads] )
+	tk? (
+		<dev-lang/tcl-8.6[threads]
+		<dev-lang/tk-8.6[threads]
+	)
 	ncurses? ( sys-libs/ncurses )
 	readline?  ( sys-libs/readline )
 	yaml? ( dev-libs/libyaml )
diff --git a/dev-lang/ruby/ruby-2.0.0_p353-r1.ebuild b/dev-lang/ruby/ruby-2.0.0_p353-r1.ebuild
index 65dac8ff9756..99104f09459a 100644
--- a/dev-lang/ruby/ruby-2.0.0_p353-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.0.0_p353-r1.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_p353-r1.ebuild,v 1.2 2014/01/22 19:34:07 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p353-r1.ebuild,v 1.3 2014/01/26 09:27:14 jlec Exp $
 
 EAPI=5
 
@@ -41,7 +41,10 @@ RDEPEND="
 	gdbm? ( sys-libs/gdbm )
 	ssl? ( dev-libs/openssl )
 	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? ( <dev-lang/tk-8.6[threads] )
+	tk? (
+		<dev-lang/tcl-8.6[threads]
+		<dev-lang/tk-8.6[threads]
+	)
 	ncurses? ( sys-libs/ncurses )
 	readline?  ( sys-libs/readline )
 	dev-libs/libyaml
diff --git a/dev-lang/ruby/ruby-2.1.0.ebuild b/dev-lang/ruby/ruby-2.1.0.ebuild
index 2de1e496adde..2235b4cc7036 100644
--- a/dev-lang/ruby/ruby-2.1.0.ebuild
+++ b/dev-lang/ruby/ruby-2.1.0.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.0.ebuild,v 1.3 2014/01/22 19:34:07 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.1.0.ebuild,v 1.4 2014/01/26 09:27:14 jlec Exp $
 
 EAPI=5
 
@@ -42,7 +42,10 @@ RDEPEND="
 	gdbm? ( sys-libs/gdbm )
 	ssl? ( dev-libs/openssl )
 	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? ( <dev-lang/tk-8.6[threads] )
+	tk? (
+		<dev-lang/tcl-8.6[threads]
+		<dev-lang/tk-8.6[threads]
+	)
 	ncurses? ( sys-libs/ncurses )
 	readline?  ( sys-libs/readline )
 	dev-libs/libyaml