dev-lang/ruby: Version bump, sync with upstream

Package-Manager: portage-2.2.14

7 files changed, 38 insertions, 21 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index e60660b3..22ec5d8d 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,3 +1,16 @@
+*ruby-1.9.3_p551 (25 Jan 2015)
+*ruby-2.0.0_p598 (25 Jan 2015)
+
+  25 Jan 2015; Bertrand Jacquin <bertrand@jacquin.bzh>
+  +files/ruby-1.9.3_p551-asm-ilp32+volatile.diff,
+  +files/ruby-2.0.0_p598-SVNr39186-asm-volatile.diff,
+  +files/ruby-2.0.0_p598-SVNr40636-asm-ilp32.diff, +ruby-1.9.3_p551.ebuild,
+  +ruby-2.0.0_p598.ebuild, -files/ruby-1.9.3_p547-asm-ilp32+volatile.diff,
+  -files/ruby-2.0.0_p576-SVNr39186-asm-volatile.diff,
+  -files/ruby-2.0.0_p576-SVNr40636-asm-ilp32.diff, -ruby-1.9.3_p547.ebuild,
+  -ruby-2.0.0_p576.ebuild:
+  dev-lang/ruby: Version bump, sync with upstream
+
 *ruby-2.0.0_p576 (28 Sep 2014)
 
   28 Sep 2014; Bertrand Jacquin <beber@meleeweb.net>
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index d68b1613..5a6705fc 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,11 +1,11 @@
-AUX ruby-1.9.3_p547-asm-ilp32+volatile.diff 811 SHA256 59a0dcb93c9d9d937d2a64bf38ea3edb03070b4a2658023dee0c31eabf230dc9 WHIRLPOOL 68c29419065843908ca109cda3c4e36d2ea8ec823f4fff481113776ffc552a5a1e8393299709c672774b5f72aa158d49a9497ca41d40000da6eab7205d98f9cb
-AUX ruby-2.0.0_p576-SVNr39186-asm-volatile.diff 793 SHA256 cf80e6ec351e063a8dd0e6a86f26314fa6a9535001ec272f052a7fccc07607cc WHIRLPOOL 8b0267b11ffa15eee050fd9282a1b7307e5bd00b8b9d82746cc919ee51df09f9390512125bdc623693e152a78d255ff4bc578f66c371c0450966d492061c3e52
-AUX ruby-2.0.0_p576-SVNr40636-asm-ilp32.diff 617 SHA256 e9cf9ac459601d09a4a6244082456f9c9c45d22bbabcd3afb06e9b378facefa2 WHIRLPOOL 45dac6c5791f6ebbe59b4af6e066f8f3711b3518d1e48be308c546efc83f9c50a058c78129f01a018ad30899ce72e6444e76169be30ce27b976ea9938ae6a058
-DIST ruby-1.9.3-p547.tar.bz2 10036828 SHA256 ef588ed3ff53009b4c1833c83187ae252dd6c20db45e21a326cd4a16a102ef4c WHIRLPOOL 0e69db57ee41e0ce05ab9f487aab33ebde2401af5f45ddbb4cb7a4afe0dd7928f083380b4a69be2afca21db727cd01ca0f3f5ac5ea8157503e5f068a62822963
-DIST ruby-2.0.0-p576.tar.bz2 10753403 SHA256 8cfdbffc81cebd1d25304225ffadc7dcb612a500c81ba6f5f95c5296dfa62059 WHIRLPOOL fab1a10ed8473edd214a8975af45801df885b97ee0a9f366b07343d3e96e0d67d1ea1ddfca9f701105acff355d0b677b8141dba39e98dfb02047bc6e9e9e662c
-DIST ruby-patches-1.9.3_p547.tar.bz2 2154 SHA256 c1c40f2b1f186a05774fd15c3566d722a5ab1af5b93a7c73f2d3c247d604fd73 WHIRLPOOL 422b7bfcbdb564fd89ae9536c15d78442ad5597c7728f84f2523a751a862807a92a77779cfdd42fcdd20569726f401e391e33c1666b0455432ddff228ea674fc
-DIST ruby-patches-2.0.0_p576.tar.bz2 2525 SHA256 9842526b161105af36bf67d22ad578a5c4f82bd1feaf78eee72e674df594d997 WHIRLPOOL 2c302058886d9bc06a5e5febd54e2419a362ca141dd18f70bf7d4c4be65484fc95c9cd432717f6f97f5949f7cf69bb9f5df6e99ae94e14df1802a6f9244a2a7a
-EBUILD ruby-1.9.3_p547.ebuild 6247 SHA256 e734020a49ce28fb69a4997cc389f2e8307de4e32eb98a7f6dca7e63158145f3 WHIRLPOOL 5b7ce334d120d74e20cf1b7a9a26316e8444c8e512ac3fd1965d9a20ed4419808e38943bd5554f8131320f333f3423a91541550c31f124ef2473e955040a8543
-EBUILD ruby-2.0.0_p576.ebuild 6477 SHA256 fc351ba4c493953acaeb95293dc0b5ebe2e913b58b6265383dbdb8237c29fa61 WHIRLPOOL fa0d94436b7e9760e123047de0cf8f90f68ebe0b44bf60b7d5dd4a10365ad6a9b28f0592c2bd82b1d5ff840c4ef836a0bb525a7dbf40606b03a94b90b2dd19c3
-MISC ChangeLog 2765 SHA256 b31bc85fc4a37c1b857b73d92edfb31b16aa9542518230666330faa16a8d4360 WHIRLPOOL 16b4b9daba628ea0a55381ac3893d4847fc9bc92f0dc5bd4da11bbb502a5ecd17fe49e9ba302cf345b49c549124a0e7a63d18f7f1d3341f9933ecc383a13f58d
+AUX ruby-1.9.3_p551-asm-ilp32+volatile.diff 811 SHA256 59a0dcb93c9d9d937d2a64bf38ea3edb03070b4a2658023dee0c31eabf230dc9 WHIRLPOOL 68c29419065843908ca109cda3c4e36d2ea8ec823f4fff481113776ffc552a5a1e8393299709c672774b5f72aa158d49a9497ca41d40000da6eab7205d98f9cb
+AUX ruby-2.0.0_p598-SVNr39186-asm-volatile.diff 793 SHA256 cf80e6ec351e063a8dd0e6a86f26314fa6a9535001ec272f052a7fccc07607cc WHIRLPOOL 8b0267b11ffa15eee050fd9282a1b7307e5bd00b8b9d82746cc919ee51df09f9390512125bdc623693e152a78d255ff4bc578f66c371c0450966d492061c3e52
+AUX ruby-2.0.0_p598-SVNr40636-asm-ilp32.diff 617 SHA256 e9cf9ac459601d09a4a6244082456f9c9c45d22bbabcd3afb06e9b378facefa2 WHIRLPOOL 45dac6c5791f6ebbe59b4af6e066f8f3711b3518d1e48be308c546efc83f9c50a058c78129f01a018ad30899ce72e6444e76169be30ce27b976ea9938ae6a058
+DIST ruby-1.9.3-p551.tar.bz2 10049332 SHA256 b0c5e37e3431d58613a160504b39542ec687d473de1d4da983dabcf3c5de771e WHIRLPOOL a4de6b7300e1f1cb22b01b1fbe0a73928baf6e5b1d083e8eb239e7696703e13774fdcb52bbb7f4253ea75b597663c43a8fbea2df7b77ed95f3fd8b2512ff1f1e
+DIST ruby-2.0.0-p598.tar.xz 8316092 SHA256 9dccf4c30e1bb004b18cb1129d9daac3c0ec510a671f4f4f13a2747897ffab35 WHIRLPOOL 1c60cb96a1c5d75d157b281182e5caf16f8479d52c8eb61748c63884d9dbf020f6e79ccabdc50b6f35bba1eb994c04ade5cdda550902dd6135c3838263445d12
+DIST ruby-patches-1.9.3_p551.tar.bz2 2154 SHA256 c1c40f2b1f186a05774fd15c3566d722a5ab1af5b93a7c73f2d3c247d604fd73 WHIRLPOOL 422b7bfcbdb564fd89ae9536c15d78442ad5597c7728f84f2523a751a862807a92a77779cfdd42fcdd20569726f401e391e33c1666b0455432ddff228ea674fc
+DIST ruby-patches-2.0.0_p598.tar.bz2 2947 SHA256 dc173fe94af215fd2c1823f46140e4f11892dec59ce55b10ffad26b622bb6e4e WHIRLPOOL 9c728e95cf01abdb48afc2ff008dc73d341096b253c664297b6780b32821c1ec406c388ce5860b5dd2ce2de862fb80b2ae45d03750045aaf13c371743f97c92e
+EBUILD ruby-1.9.3_p551.ebuild 6226 SHA256 6bd04d37bc141f529929f0b88664169c304d5d381316ef1e5177550a7004737f WHIRLPOOL ec93d2f0889b30293d541049d7616a7f3bacc07b8393df971a8cb5207a26b2bcdc67523882dd97d37124e81685187d0cc84ffefd89fb3141a3441ac3c5500bac
+EBUILD ruby-2.0.0_p598.ebuild 6595 SHA256 0ef5bbebb79b9912dd6e03d0f7ba0e459184233e91745f768d26396eed0d4586 WHIRLPOOL 3cbe69786ec7adb5be6e59cf60478d1ece098063b5ac831dce55e24cdc84a4b4241e75bfbddd955d17c61aab7579037dae403466084b318b3f4a14495a2ebac3
+MISC ChangeLog 3346 SHA256 4c97cec392d97f09d941a6d300fffb8921f36b4d879401095e15fb7ebcc1fa7f WHIRLPOOL 65b82fd6b316e7fc1d5be9af54b588db95f82f695f5e995ea7fa75ae060792eac5bdc47bf861d8b074faa2a20867e3999506296662c6fc3c94b2c0c998c318b9
 MISC metadata.xml 1135 SHA256 4eb2a9282b6a9ec8da39dece1406618a5134adc75bc27bb8b73109ce1bfc4e62 WHIRLPOOL 3aeaa05e3e8f762ba9d6f779165ce9b715e0858cec3b19b73d3c2ecc5236be9f1cd67f6dddfe1fadf9e9bde2b8f1f77e1e9d2400bf8bf8cefdc1dd367ad21342
diff --git a/dev-lang/ruby/files/ruby-1.9.3_p547-asm-ilp32+volatile.diff b/dev-lang/ruby/files/ruby-1.9.3_p551-asm-ilp32+volatile.diff
index 05fc2001..05fc2001 100644
--- a/dev-lang/ruby/files/ruby-1.9.3_p547-asm-ilp32+volatile.diff
+++ b/dev-lang/ruby/files/ruby-1.9.3_p551-asm-ilp32+volatile.diff
diff --git a/dev-lang/ruby/files/ruby-2.0.0_p576-SVNr39186-asm-volatile.diff b/dev-lang/ruby/files/ruby-2.0.0_p598-SVNr39186-asm-volatile.diff
index 870dc5bb..870dc5bb 100644
--- a/dev-lang/ruby/files/ruby-2.0.0_p576-SVNr39186-asm-volatile.diff
+++ b/dev-lang/ruby/files/ruby-2.0.0_p598-SVNr39186-asm-volatile.diff
diff --git a/dev-lang/ruby/files/ruby-2.0.0_p576-SVNr40636-asm-ilp32.diff b/dev-lang/ruby/files/ruby-2.0.0_p598-SVNr40636-asm-ilp32.diff
index 81b7fe83..81b7fe83 100644
--- a/dev-lang/ruby/files/ruby-2.0.0_p576-SVNr40636-asm-ilp32.diff
+++ b/dev-lang/ruby/files/ruby-2.0.0_p598-SVNr40636-asm-ilp32.diff
diff --git a/dev-lang/ruby/ruby-1.9.3_p547.ebuild b/dev-lang/ruby/ruby-1.9.3_p551.ebuild
index 168939c2..0aeb0829 100644
--- a/dev-lang/ruby/ruby-1.9.3_p547.ebuild
+++ b/dev-lang/ruby/ruby-1.9.3_p551.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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_p547.ebuild,v 1.1 2014/05/17 06:53:22 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p551.ebuild,v 1.11 2015/01/19 20:07:18 graaff Exp $
 
 EAPI=4
 
@@ -34,7 +34,7 @@ SRC_URI="mirror://ruby/1.9/${MY_P}.tar.bz2
 		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+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 xemacs ncurses +readline +yaml" #libedit
 
 # libedit support is removed everywhere because of this upstream bug:
@@ -58,7 +58,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 PDEPEND="
-	>=dev-ruby/rubygems-1.8.10-r1[ruby_targets_ruby19]
+	virtual/rubygems[ruby_targets_ruby19]
 	rdoc? ( >=dev-ruby/rdoc-3.9.4[ruby_targets_ruby19] )
 	xemacs? ( app-xemacs/ruby-modes )"
 
diff --git a/dev-lang/ruby/ruby-2.0.0_p576.ebuild b/dev-lang/ruby/ruby-2.0.0_p598.ebuild
index c10b1d55..7fcbaeb0 100644
--- a/dev-lang/ruby/ruby-2.0.0_p576.ebuild
+++ b/dev-lang/ruby/ruby-2.0.0_p598.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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_p576.ebuild,v 1.1 2014/09/20 06:47:39 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p598.ebuild,v 1.11 2015/01/19 20:07:18 graaff Exp $
 
 EAPI=5
 
@@ -29,12 +29,12 @@ fi
 
 DESCRIPTION="An object-oriented scripting language"
 HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/2.0/${MY_P}.tar.bz2
+SRC_URI="mirror://ruby/2.0/${MY_P}.tar.xz
 		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.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 xemacs ncurses +readline"
+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 xemacs ncurses +readline sse2"
 
 RDEPEND="
 	berkdb? ( sys-libs/db )
@@ -52,14 +52,18 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 PDEPEND="
-	virtual/rubygems:ruby20
+	virtual/rubygems[ruby_targets_ruby20]
 	>=dev-ruby/json-1.7.7[ruby_targets_ruby20]
 	>=dev-ruby/rake-0.9.6[ruby_targets_ruby20]
 	rdoc? ( >=dev-ruby/rdoc-4.0.0[ruby_targets_ruby20] )
 	xemacs? ( app-xemacs/ruby-modes )"
 
 src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+	if use sse2 ; then
+		excluded_patches="012_no_forced_sse2.patch"
+	fi
+
+	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
 		epatch "${WORKDIR}/patches"
 
 	epatch "${FILESDIR}/${P}-SVNr39186-asm-volatile.diff"