dev-lang/ruby: Refresh with upstream

Package-Manager: portage-2.2.8-r1

5 files changed, 27 insertions, 14 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index ad416fb0..834d822b 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,3 +1,12 @@
+*ruby-1.9.3_p545 (02 Mar 2014)
+*ruby-2.0.0_p353-r2 (02 Mar 2014)
+
+  02 Mar 2014; Bertrand Jacquin <beber@meleeweb.net>
+  +files/ruby-1.9.3_p545-asm-ilp32+volatile.diff, +ruby-1.9.3_p545.ebuild,
+  +ruby-2.0.0_p353-r2.ebuild, -files/ruby-1.9.3_p484-asm-ilp32+volatile.diff,
+  -ruby-1.9.3_p484.ebuild, -ruby-2.0.0_p353-r1.ebuild:
+  dev-lang/ruby: Refresh with upstream
+
 *ruby-2.0.0_p353-r1 (05 Jan 2014)
 
   05 Jan 2014; Bertrand Jacquin <beber@meleeweb.net> +ruby-2.0.0_p353-r1.ebuild,
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index c0fa985b..4da60849 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,11 +1,11 @@
-AUX ruby-1.9.3_p484-asm-ilp32+volatile.diff 811 SHA256 59a0dcb93c9d9d937d2a64bf38ea3edb03070b4a2658023dee0c31eabf230dc9 WHIRLPOOL 68c29419065843908ca109cda3c4e36d2ea8ec823f4fff481113776ffc552a5a1e8393299709c672774b5f72aa158d49a9497ca41d40000da6eab7205d98f9cb
+AUX ruby-1.9.3_p545-asm-ilp32+volatile.diff 811 SHA256 59a0dcb93c9d9d937d2a64bf38ea3edb03070b4a2658023dee0c31eabf230dc9 WHIRLPOOL 68c29419065843908ca109cda3c4e36d2ea8ec823f4fff481113776ffc552a5a1e8393299709c672774b5f72aa158d49a9497ca41d40000da6eab7205d98f9cb
 AUX ruby-2.0.0_p353-SVNr39186-asm-volatile.diff 793 SHA256 cf80e6ec351e063a8dd0e6a86f26314fa6a9535001ec272f052a7fccc07607cc WHIRLPOOL 8b0267b11ffa15eee050fd9282a1b7307e5bd00b8b9d82746cc919ee51df09f9390512125bdc623693e152a78d255ff4bc578f66c371c0450966d492061c3e52
 AUX ruby-2.0.0_p353-SVNr40636-asm-ilp32.diff 617 SHA256 e9cf9ac459601d09a4a6244082456f9c9c45d22bbabcd3afb06e9b378facefa2 WHIRLPOOL 45dac6c5791f6ebbe59b4af6e066f8f3711b3518d1e48be308c546efc83f9c50a058c78129f01a018ad30899ce72e6444e76169be30ce27b976ea9938ae6a058
-DIST ruby-1.9.3-p484.tar.bz2 10041514 SHA256 0fdc6e860d0023ba7b94c7a0cf1f7d32908b65b526246de9dfd5bb39d0d7922b WHIRLPOOL 1b1174e012bff8d047db2da654dcf535486bfd1593b8e2f6fc888603c8ed6b41bd72625ff4eeaaa645ae01a81f7edbf62f0345b61eeda02d73743572af3f6b85
+DIST ruby-1.9.3-p545.tar.bz2 10038164 SHA256 2533de9f56d62f11c06a02dd32b5ab6d22a8f268c94b8e1e1ade6536adfd1aab WHIRLPOOL 9da723998cc64b55fb3ea6df922d75997f47f1c89f1f3154c893389d4403f0e590597d1e724a6adf9f2545f0645cb6312f58717af0cec4f59a2ce710bd6b46ed
 DIST ruby-2.0.0-p353.tar.bz2 10730412 SHA256 3de4e4d9aff4682fa4f8ed2b70bd0d746fae17452fc3d3a8e8f505ead9105ad9 WHIRLPOOL 8d3b616838290095ab389d32caa48941e9146676730975f2868d42cf43dd5f6ff6a26bb6ca1499a164a5c743e4f5c3ad122c1bed18556d85da98b821d66caf89
-DIST ruby-patches-1.9.3_p484.tar.bz2 2154 SHA256 c1c40f2b1f186a05774fd15c3566d722a5ab1af5b93a7c73f2d3c247d604fd73 WHIRLPOOL 422b7bfcbdb564fd89ae9536c15d78442ad5597c7728f84f2523a751a862807a92a77779cfdd42fcdd20569726f401e391e33c1666b0455432ddff228ea674fc
-DIST ruby-patches-2.0.0_p353-r1.tar.bz2 1929 SHA256 4feee409319dbcac7525fb9c1c76c36888a62ee0623c117ae532bf765845f0f9 WHIRLPOOL 869055dd0e14af0dc285a11d95a891ab4686e1d16960d46728ddf680eee58d42570f64d058b88d30805b732b082c354a36dac5a816a7ce5f3034d1b22237aa5a
-EBUILD ruby-1.9.3_p484.ebuild 6148 SHA256 e0c867c7a13ed35b26caf8a84b508f876e91064ef3a61b75c6d47fa92ad92a71 WHIRLPOOL a0c306426a82e8ca94e9c10270fa9eb660bba2d140d201ceb96221f5bb51c25fedfbed030d671e9259f1eab90ae2b9b1979e5daa636885453a1e39140408f317
-EBUILD ruby-2.0.0_p353-r1.ebuild 6667 SHA256 61db37b39a6d63522e70c1cf5af4a0b24e195fd3aca289856e2ecf1ec9d7d5a1 WHIRLPOOL 5edd09897eb7054914eed6b4d5cd572e8ff3b2143cab0e914e0878cf53a0444fcebd385f8977e189ba8a0712c85ce2f4aed05cfacd057a44a35ae51ffb9ec18d
-MISC ChangeLog 1145 SHA256 7f20550e5069602c2515b66b5ff8c139f82fddd8097f25b9c940609ee15770a1 WHIRLPOOL b40bfe6cb75b7a0a9407c7d7a6cbf538426af1cb0c4ce66c356f5996fa1ffb7c4fc1aee8f2b7f3bbc8ce68b23925676f3fbdd9da530cb00c713cacd8fa6cf525
+DIST ruby-patches-1.9.3_p545.tar.bz2 2154 SHA256 c1c40f2b1f186a05774fd15c3566d722a5ab1af5b93a7c73f2d3c247d604fd73 WHIRLPOOL 422b7bfcbdb564fd89ae9536c15d78442ad5597c7728f84f2523a751a862807a92a77779cfdd42fcdd20569726f401e391e33c1666b0455432ddff228ea674fc
+DIST ruby-patches-2.0.0_p353-r2.tar.bz2 2540 SHA256 016270a6128aa4354bcc13ebca039595bd12abad123bc1a7339d8d8ae636567c WHIRLPOOL 9ff5f67be16e70dc285c6c35a8d50b59447257112f0e87f319326fc4e45ee6a5534fb515d0adda8d197755e13c4105482860588456c55565a5855383f7d9fc7e
+EBUILD ruby-1.9.3_p545.ebuild 6247 SHA256 fb7ea472d0632099af34a04fa8f04a967c595f445695bc1dd9591f647d10d9d8 WHIRLPOOL 9bc6952e2a36c0e981ad7418149f6f78698dc03eaf4a6967e6f88ca076149ff72a6d76711d1d2e4a7daace032e0992202e920844ef1a988a93da8b5820260398
+EBUILD ruby-2.0.0_p353-r2.ebuild 6704 SHA256 ed755dfc1ddd059a356597362db6f2f6cfa5c3f82bc837b6530ac33e4f032634 WHIRLPOOL 435e6ddae1d727faa5bca95fdbd67748a81c7276279e973d86c85c7d7f2ec1530ed2a6d827798adac1f16634f01e7d202488e1adbe8c30570837d12dbf369da0
+MISC ChangeLog 1512 SHA256 64f4ba5ade5f6ef37801f324ea9f79db714bc888b627f5c83deb585fe13f2765 WHIRLPOOL 454de5a17a55c49b778268940b8d9f351465a65095911b72d4b7cd10d823c8c936dd56181b2b38cd16c4467b304da36099f719f2d6b867dea733bb499c65a4bc
 MISC metadata.xml 1135 SHA256 4eb2a9282b6a9ec8da39dece1406618a5134adc75bc27bb8b73109ce1bfc4e62 WHIRLPOOL 3aeaa05e3e8f762ba9d6f779165ce9b715e0858cec3b19b73d3c2ecc5236be9f1cd67f6dddfe1fadf9e9bde2b8f1f77e1e9d2400bf8bf8cefdc1dd367ad21342
diff --git a/dev-lang/ruby/files/ruby-1.9.3_p484-asm-ilp32+volatile.diff b/dev-lang/ruby/files/ruby-1.9.3_p545-asm-ilp32+volatile.diff
index 05fc2001..05fc2001 100644
--- a/dev-lang/ruby/files/ruby-1.9.3_p484-asm-ilp32+volatile.diff
+++ b/dev-lang/ruby/files/ruby-1.9.3_p545-asm-ilp32+volatile.diff
diff --git a/dev-lang/ruby/ruby-1.9.3_p484.ebuild b/dev-lang/ruby/ruby-1.9.3_p545.ebuild
index 652bea49..1d0765bf 100644
--- a/dev-lang/ruby/ruby-1.9.3_p484.ebuild
+++ b/dev-lang/ruby/ruby-1.9.3_p545.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.1 2013/11/22 19:22:39 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p545.ebuild,v 1.1 2014/02/26 14:20:28 graaff Exp $
 
 EAPI=4
 
@@ -35,7 +35,7 @@ SRC_URI="mirror://ruby/1.9/${MY_P}.tar.bz2
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline +yaml" #libedit
+IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline +yaml" #libedit
 
 # libedit support is removed everywhere because of this upstream bug:
 # http://redmine.ruby-lang.org/issues/show/3698
@@ -45,7 +45,6 @@ RDEPEND="
 	gdbm? ( sys-libs/gdbm )
 	ssl? ( dev-libs/openssl )
 	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? ( dev-lang/tk[threads] )
 	ncurses? ( sys-libs/ncurses )
 	readline?  ( sys-libs/readline )
 	yaml? ( dev-libs/libyaml )
@@ -121,11 +120,14 @@ src_configure() {
 #	fi
 	myconf="${myconf} $(use_with readline)"
 
+	# Always disable tk because the module is no longer compatible with
+	# stable tcl/tk: https://bugs.gentoo.org/show_bug.cgi?id=500894
 	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
 		--program-suffix=${MY_SUFFIX} \
 		--with-soname=ruby${MY_SUFFIX} \
 		--enable-shared \
 		--enable-pthread \
+		--without-tk \
 		$(use_enable socks5 socks) \
 		$(use_enable doc install-doc) \
 		--enable-ipv6 \
@@ -133,7 +135,6 @@ src_configure() {
 		$(use_with berkdb dbm) \
 		$(use_with gdbm) \
 		$(use_with ssl openssl) \
-		$(use_with tk) \
 		$(use_with ncurses curses) \
 		$(use_with yaml psych) \
 		${myconf} \
diff --git a/dev-lang/ruby/ruby-2.0.0_p353-r1.ebuild b/dev-lang/ruby/ruby-2.0.0_p353-r2.ebuild
index 57c27b76..954fc2aa 100644
--- a/dev-lang/ruby/ruby-2.0.0_p353-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.0.0_p353-r2.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.1 2014/01/03 07:31:54 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p353-r2.ebuild,v 1.1 2014/02/23 10:24:38 graaff 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[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