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

Package-Manager: portage-2.2.20.1

6 files changed, 52 insertions, 11 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 7862111b..2b607693 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,3 +1,12 @@
+*ruby-2.0.0_p647 (22 Aug 2015)
+
+  22 Aug 2015; Bertrand Jacquin <bertrand@jacquin.bzh>
+  +files/ruby-2.0.0_p647-SVNr39186-asm-volatile.diff,
+  +files/ruby-2.0.0_p647-SVNr40636-asm-ilp32.diff, +ruby-2.0.0_p647.ebuild,
+  -files/ruby-2.0.0_p645-SVNr39186-asm-volatile.diff,
+  -files/ruby-2.0.0_p645-SVNr40636-asm-ilp32.diff, -ruby-2.0.0_p645.ebuild:
+  dev-lang/ruby: Version bump and sync with upstream
+
   15 Aug 2015; Bertrand Jacquin <bertrand@jacquin.bzh>
   ruby-1.9.3_p551-r1.ebuild, ruby-2.0.0_p645.ebuild:
   dev-lang/ruby: Sync with upstream
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 50638eb7..8a62b206 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,11 +1,11 @@
-AUX ruby-1.9.3_p551-asm-ilp32+volatile.diff 811 SHA256 59a0dcb93c9d9d937d2a64bf38ea3edb03070b4a2658023dee0c31eabf230dc9 WHIRLPOOL 68c29419065843908ca109cda3c4e36d2ea8ec823f4fff481113776ffc552a5a1e8393299709c672774b5f72aa158d49a9497ca41d40000da6eab7205d98f9cb
-AUX ruby-2.0.0_p645-SVNr39186-asm-volatile.diff 793 SHA256 cf80e6ec351e063a8dd0e6a86f26314fa6a9535001ec272f052a7fccc07607cc WHIRLPOOL 8b0267b11ffa15eee050fd9282a1b7307e5bd00b8b9d82746cc919ee51df09f9390512125bdc623693e152a78d255ff4bc578f66c371c0450966d492061c3e52
-AUX ruby-2.0.0_p645-SVNr40636-asm-ilp32.diff 617 SHA256 e9cf9ac459601d09a4a6244082456f9c9c45d22bbabcd3afb06e9b378facefa2 WHIRLPOOL 45dac6c5791f6ebbe59b4af6e066f8f3711b3518d1e48be308c546efc83f9c50a058c78129f01a018ad30899ce72e6444e76169be30ce27b976ea9938ae6a058
+AUX ruby-1.9.3_p551-asm-ilp32+volatile.diff 1439 SHA256 302b737a014a68be1f7aea3d53fb7bdf6fb74c248d29c15e79ec32581b42cf2a WHIRLPOOL 23658e01a36afd77decc9f0b280b7d0fa04a92f737f5bbc4c38072a966a9e115a7d852db80c859ca21f09ca4287559fb7c12b06409712a2905811ea8a8697ee4
+AUX ruby-2.0.0_p647-SVNr39186-asm-volatile.diff 1084 SHA256 018db4d702d43c3020be470f5ae262c6e433023988b7522aef4051c6a10dfb12 WHIRLPOOL d9155e0e3dd688889d70d0484219e0ee4a15fe48f92f191bbabf60b58c846bd563ebe6549b9f6351c71936085af06359f6fed917011edbb821055cf009c1bfe7
+AUX ruby-2.0.0_p647-SVNr40636-asm-ilp32.diff 990 SHA256 90739a6c3502f12f2d79d69920676d218776f50816b7d0f107192ff664ad88be WHIRLPOOL 83c9866bade1c90cb0de3b99b86174cc5bddca8b1f1371fe7a59a829c92378734b8af4ade9538743fb3d3f2359f9e4696f2b7b005114e14c34a1fe3469f6df72
 DIST ruby-1.9.3-p551.tar.bz2 10049332 SHA256 b0c5e37e3431d58613a160504b39542ec687d473de1d4da983dabcf3c5de771e WHIRLPOOL a4de6b7300e1f1cb22b01b1fbe0a73928baf6e5b1d083e8eb239e7696703e13774fdcb52bbb7f4253ea75b597663c43a8fbea2df7b77ed95f3fd8b2512ff1f1e
-DIST ruby-2.0.0-p645.tar.xz 8295192 SHA256 875be4f57bdbb2d2be0d64bfd8fc5022f004d55261ead8fd0cdc2e9e415e9f7b WHIRLPOOL 6201a39976f793dd3702ba580aafb881ba6e9f5cbc9d544bdddf508ca86dc14fc2970451a386ba495d16f2f68724197ef089ba02e7d1a9423870a0fa5c39cbc8
+DIST ruby-2.0.0-p647.tar.xz 8301008 SHA256 9f793880df1209ea4e5c10ee9d8ef79caa0e73ee769f745f1c191505255e2847 WHIRLPOOL c8ec19ed900e6578f1f6e08d1e2a5c015cfa6e81379fb0437a1167ffb8bc56561d02b4b5b35a674039f7adcd2c43b222b89e139cb0ea702e8bfec886872c8e6a
 DIST ruby-patches-1.9.3_p551-r1.tar.bz2 3685 SHA256 362d94b77c3408d200c42855868ebb5ddbee287d66bbed8e269255f9cb63418a WHIRLPOOL 3001b1c6189a882a45125d04b6264e22e0bf2b773c249bf00c2cfc98dec3392ae422913d278aae289767db0aaf8782e1a7dd44e94965aa02893833d5737ad494
-DIST ruby-patches-2.0.0_p645.tar.bz2 2947 SHA256 dc173fe94af215fd2c1823f46140e4f11892dec59ce55b10ffad26b622bb6e4e WHIRLPOOL 9c728e95cf01abdb48afc2ff008dc73d341096b253c664297b6780b32821c1ec406c388ce5860b5dd2ce2de862fb80b2ae45d03750045aaf13c371743f97c92e
+DIST ruby-patches-2.0.0_p647.tar.bz2 2947 SHA256 dc173fe94af215fd2c1823f46140e4f11892dec59ce55b10ffad26b622bb6e4e WHIRLPOOL 9c728e95cf01abdb48afc2ff008dc73d341096b253c664297b6780b32821c1ec406c388ce5860b5dd2ce2de862fb80b2ae45d03750045aaf13c371743f97c92e
 EBUILD ruby-1.9.3_p551-r1.ebuild 6125 SHA256 719bf1f618f087b8736a7ee11a1a87740c7f44b505bd458c0f15e34900927f49 WHIRLPOOL 542726412e801317313a5b24b04790210e17b8d04caab1d8d479614e3cd44607b21f52d044d1aadf855de2eba5ec26682c96a0d04cac3564dd2c9efc1b3583c8
-EBUILD ruby-2.0.0_p645.ebuild 6526 SHA256 db4cef2374cf11a7deb4a8ae266372bfebd54d21de1313c0592691f5cdbac8cb WHIRLPOOL 4e9acb03650c122adf6edf71ca2ff9e8dfefacab323c0eb84106c1fc62d1af6309408a5024d0aae0e5f71a33ef141905de3d9d1f77429d475fdb334f20979a25
-MISC ChangeLog 4246 SHA256 f729bdc254d3d93cee9817038e3731fd97506e0a8f222f798b536488ae0d6091 WHIRLPOOL d466e7265ed4a22299b661a3123a4e7e83ad33186adf8290ac9bde64c8a7b5f6b610bb03ee0b7e9358b2498161e06e13b8de45c85a6c6dbd9b71d829dfb3fa87
+EBUILD ruby-2.0.0_p647.ebuild 6538 SHA256 2e9c9faee892f822a173b1563b7a3e40385deffbaa6bcfc5c4e8dd4055936fe8 WHIRLPOOL 756ec67eb043be263a6846668a140a32560f42981aeaaa5c3ac10a851c3d806205d70ae91c2578c39a511ee36cc5efe01a0eb4aca7575053e877534608beed7f
+MISC ChangeLog 4647 SHA256 c39ad30e1d931d7c1fe167191d26f9643feaa62a2b63301e9d62592ba5e511c4 WHIRLPOOL 2d612af26807bb512f14d61ce44c0af82da86ba394ba20987bcfb7801b9cf3123dd993e9029579f7066cd0184b6d9af924d9e4485234cd037884976bfd7a72b0
 MISC metadata.xml 1135 SHA256 4eb2a9282b6a9ec8da39dece1406618a5134adc75bc27bb8b73109ce1bfc4e62 WHIRLPOOL 3aeaa05e3e8f762ba9d6f779165ce9b715e0858cec3b19b73d3c2ecc5236be9f1cd67f6dddfe1fadf9e9bde2b8f1f77e1e9d2400bf8bf8cefdc1dd367ad21342
diff --git a/dev-lang/ruby/files/ruby-1.9.3_p551-asm-ilp32+volatile.diff b/dev-lang/ruby/files/ruby-1.9.3_p551-asm-ilp32+volatile.diff
index 05fc2001..bd4b32b7 100644
--- a/dev-lang/ruby/files/ruby-1.9.3_p551-asm-ilp32+volatile.diff
+++ b/dev-lang/ruby/files/ruby-1.9.3_p551-asm-ilp32+volatile.diff
@@ -1,5 +1,19 @@
---- gc.h.ori	2013-08-09 14:48:58.177005287 +0200
-+++ gc.h	2013-08-09 15:21:01.602376807 +0200
+------------------------------------------------------------------------
+r39186 | kosaki | 2013-02-10 06:41:01 +0100 (Sun, 10 Feb 2013) | 1 line
+
+* gc.h (SET_MACHINE_STACK_END): use __volatile__ instead of volatile.
+
+------------------------------------------------------------------------
+r40636 | akr | 2013-05-10 17:49:56 +0200 (Fri, 10 May 2013) | 5 lines
+
+* gc.h (SET_MACHINE_STACK_END): Add !defined(_ILP32) to a defining
+  condition to avoid compilation error on x32.
+  https://sites.google.com/site/x32abi/
+
+Index: gc.h
+===================================================================
+--- gc.h	(revision 39185)
++++ gc.h	(revision 40636)
 @@ -2,10 +2,10 @@
  #ifndef RUBY_GC_H
  #define RUBY_GC_H 1
@@ -14,3 +28,5 @@
  #else
  NOINLINE(void rb_gc_set_stack_end(VALUE **stack_end_p));
  #define SET_MACHINE_STACK_END(p) rb_gc_set_stack_end(p)
+
+------------------------------------------------------------------------
diff --git a/dev-lang/ruby/files/ruby-2.0.0_p645-SVNr39186-asm-volatile.diff b/dev-lang/ruby/files/ruby-2.0.0_p647-SVNr39186-asm-volatile.diff
index 870dc5bb..2c192a9d 100644
--- a/dev-lang/ruby/files/ruby-2.0.0_p645-SVNr39186-asm-volatile.diff
+++ b/dev-lang/ruby/files/ruby-2.0.0_p647-SVNr39186-asm-volatile.diff
@@ -1,3 +1,8 @@
+------------------------------------------------------------------------
+r39186 | kosaki | 2013-02-10 06:41:01 +0100 (Sun, 10 Feb 2013) | 1 line
+
+* gc.h (SET_MACHINE_STACK_END): use __volatile__ instead of volatile.
+
 Index: gc.h
 ===================================================================
 --- gc.h	(revision 39185)
@@ -14,3 +19,5 @@ Index: gc.h
  #else
  NOINLINE(void rb_gc_set_stack_end(VALUE **stack_end_p));
  #define SET_MACHINE_STACK_END(p) rb_gc_set_stack_end(p)
+
+------------------------------------------------------------------------
diff --git a/dev-lang/ruby/files/ruby-2.0.0_p645-SVNr40636-asm-ilp32.diff b/dev-lang/ruby/files/ruby-2.0.0_p647-SVNr40636-asm-ilp32.diff
index 81b7fe83..8384f473 100644
--- a/dev-lang/ruby/files/ruby-2.0.0_p645-SVNr40636-asm-ilp32.diff
+++ b/dev-lang/ruby/files/ruby-2.0.0_p647-SVNr40636-asm-ilp32.diff
@@ -1,3 +1,10 @@
+------------------------------------------------------------------------
+r40636 | akr | 2013-05-10 17:49:56 +0200 (Fri, 10 May 2013) | 5 lines
+
+* gc.h (SET_MACHINE_STACK_END): Add !defined(_ILP32) to a defining
+  condition to avoid compilation error on x32.
+  https://sites.google.com/site/x32abi/
+
 Index: gc.h
 ===================================================================
 --- gc.h	(revision 40635)
@@ -11,3 +18,5 @@ Index: gc.h
  #define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movq\t%%rsp, %0" : "=r" (*(p)))
  #elif defined(__i386) && defined(__GNUC__) && !defined(__native_client__)
  #define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movl\t%%esp, %0" : "=r" (*(p)))
+
+------------------------------------------------------------------------
diff --git a/dev-lang/ruby/ruby-2.0.0_p645.ebuild b/dev-lang/ruby/ruby-2.0.0_p647.ebuild
index 3dc0bd23..edf21285 100644
--- a/dev-lang/ruby/ruby-2.0.0_p645.ebuild
+++ b/dev-lang/ruby/ruby-2.0.0_p647.ebuild
@@ -33,7 +33,7 @@ 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"
+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 cpu_flags_x86_sse2"
 
 RDEPEND="
@@ -41,7 +41,7 @@ RDEPEND="
 	gdbm? ( sys-libs/gdbm )
 	ssl? ( dev-libs/openssl:0 )
 	socks5? ( >=net-proxy/dante-1.1.13 )
-	ncurses? ( sys-libs/ncurses )
+	ncurses? ( sys-libs/ncurses:5= )
 	readline?  ( sys-libs/readline:0 )
 	dev-libs/libyaml
 	virtual/libffi