[gentoo-commits] gentoo-x86 commit in dev-lang/ruby: ChangeLog metadata.xml ruby-2.1.0.ebuild ruby-2.0.0_p353-r1.ebuild ruby-1.9.3_p484.ebuild

[Justin Lecher (jlec)]

jlec        14/01/26 09:27:14

  Modified:             ChangeLog metadata.xml ruby-2.1.0.ebuild
                        ruby-2.0.0_p353-r1.ebuild ruby-1.9.3_p484.ebuild
  Log:
  dev-lang/ruby: Fix slot conflicts, #498970
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.637                dev-lang/ruby/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/ChangeLog?rev=1.637&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/ChangeLog?rev=1.637&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/ChangeLog?r1=1.636&r2=1.637

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v
retrieving revision 1.636
retrieving revision 1.637
diff -u -r1.636 -r1.637
--- ChangeLog	22 Jan 2014 19:34:07 -0000	1.636
+++ ChangeLog	26 Jan 2014 09:27:14 -0000	1.637
@@ -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@g.o> 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@g.o> ruby-1.9.3_p484.ebuild,
   ruby-2.0.0_p353-r1.ebuild, ruby-2.1.0.ebuild:



1.6                  dev-lang/ruby/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/metadata.xml?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/metadata.xml?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/metadata.xml?r1=1.5&r2=1.6

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ruby/metadata.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metadata.xml	24 Aug 2010 18:08:09 -0000	1.5
+++ metadata.xml	26 Jan 2014 09:27:14 -0000	1.6
@@ -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>



1.4                  dev-lang/ruby/ruby-2.1.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/ruby-2.1.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/ruby-2.1.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/ruby-2.1.0.ebuild?r1=1.3&r2=1.4

Index: ruby-2.1.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.1.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ruby-2.1.0.ebuild	22 Jan 2014 19:34:07 -0000	1.3
+++ ruby-2.1.0.ebuild	26 Jan 2014 09:27:14 -0000	1.4
@@ -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 @@
 	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



1.3                  dev-lang/ruby/ruby-2.0.0_p353-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p353-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p353-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p353-r1.ebuild?r1=1.2&r2=1.3

Index: ruby-2.0.0_p353-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p353-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ruby-2.0.0_p353-r1.ebuild	22 Jan 2014 19:34:07 -0000	1.2
+++ ruby-2.0.0_p353-r1.ebuild	26 Jan 2014 09:27:14 -0000	1.3
@@ -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 @@
 	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



1.12                 dev-lang/ruby/ruby-1.9.3_p484.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p484.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p484.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p484.ebuild?r1=1.11&r2=1.12

Index: ruby-1.9.3_p484.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p484.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ruby-1.9.3_p484.ebuild	22 Jan 2014 19:34:07 -0000	1.11
+++ ruby-1.9.3_p484.ebuild	26 Jan 2014 09:27:14 -0000	1.12
@@ -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 @@
 	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 )