From d895932061b6988306e1775f05da30e52e28c0c7 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Fri, 7 Mar 2014 16:05:42 +0100 Subject: dev-lang/ruby: Refresh with upstream Package-Manager: portage-2.2.8-r1 --- dev-lang/ruby/ChangeLog | 9 + dev-lang/ruby/Manifest | 12 +- .../ruby-2.0.0_p353-SVNr39186-asm-volatile.diff | 16 -- .../files/ruby-2.0.0_p353-SVNr40636-asm-ilp32.diff | 13 -- .../ruby-2.0.0_p451-SVNr39186-asm-volatile.diff | 16 ++ .../files/ruby-2.0.0_p451-SVNr40636-asm-ilp32.diff | 13 ++ dev-lang/ruby/ruby-2.0.0_p353-r2.ebuild | 232 -------------------- dev-lang/ruby/ruby-2.0.0_p451.ebuild | 234 +++++++++++++++++++++ 8 files changed, 278 insertions(+), 267 deletions(-) delete mode 100644 dev-lang/ruby/files/ruby-2.0.0_p353-SVNr39186-asm-volatile.diff delete mode 100644 dev-lang/ruby/files/ruby-2.0.0_p353-SVNr40636-asm-ilp32.diff create mode 100644 dev-lang/ruby/files/ruby-2.0.0_p451-SVNr39186-asm-volatile.diff create mode 100644 dev-lang/ruby/files/ruby-2.0.0_p451-SVNr40636-asm-ilp32.diff delete mode 100644 dev-lang/ruby/ruby-2.0.0_p353-r2.ebuild create mode 100644 dev-lang/ruby/ruby-2.0.0_p451.ebuild (limited to 'dev-lang') diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog index 834d822b..d484d004 100644 --- a/dev-lang/ruby/ChangeLog +++ b/dev-lang/ruby/ChangeLog @@ -1,3 +1,12 @@ +*ruby-2.0.0_p451 (07 Mar 2014) + + 07 Mar 2014; Bertrand Jacquin + +files/ruby-2.0.0_p451-SVNr39186-asm-volatile.diff, + +files/ruby-2.0.0_p451-SVNr40636-asm-ilp32.diff, +ruby-2.0.0_p451.ebuild, + -files/ruby-2.0.0_p353-SVNr39186-asm-volatile.diff, + -files/ruby-2.0.0_p353-SVNr40636-asm-ilp32.diff, -ruby-2.0.0_p353-r2.ebuild: + dev-lang/ruby: Refresh with upstream + *ruby-1.9.3_p545 (02 Mar 2014) *ruby-2.0.0_p353-r2 (02 Mar 2014) diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index 4da60849..fde5351d 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -1,11 +1,11 @@ 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 +AUX ruby-2.0.0_p451-SVNr39186-asm-volatile.diff 793 SHA256 cf80e6ec351e063a8dd0e6a86f26314fa6a9535001ec272f052a7fccc07607cc WHIRLPOOL 8b0267b11ffa15eee050fd9282a1b7307e5bd00b8b9d82746cc919ee51df09f9390512125bdc623693e152a78d255ff4bc578f66c371c0450966d492061c3e52 +AUX ruby-2.0.0_p451-SVNr40636-asm-ilp32.diff 617 SHA256 e9cf9ac459601d09a4a6244082456f9c9c45d22bbabcd3afb06e9b378facefa2 WHIRLPOOL 45dac6c5791f6ebbe59b4af6e066f8f3711b3518d1e48be308c546efc83f9c50a058c78129f01a018ad30899ce72e6444e76169be30ce27b976ea9938ae6a058 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-2.0.0-p451.tar.bz2 10725438 SHA256 5bf8a1c7616286b9dbc962912c3f58e67bc3a70306ca90b0882ef0bd442e02f5 WHIRLPOOL c8ee41ffcc5f54541e5b73f3a39d8092922236d7140c004dd312eb62c037f424e177541388047e2b173756a4f78f2ab3fa1acaf27246618fbb2792a784b7fd59 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 +DIST ruby-patches-2.0.0_p451.tar.bz2 2931 SHA256 7ed87d7eae176a7b164a2d11fdcc5ff98acf477f56e8030667c0e5ac3fd68781 WHIRLPOOL 272093c06bd1109bc6ee91c014364373d3af68b4c26afdd90e1f3ce11eb206287655225d60c308e3c7e62070611a7fccbb2d4174d2726ee126ce9494c30cb7dc 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 +EBUILD ruby-2.0.0_p451.ebuild 6717 SHA256 f77154cc394fc9d54a30735d44f3d07e1535bb35654c4a88460b0a788b80c63f WHIRLPOOL f27547ce70fe49dbea303c046c0dbd2efdc97835c5109df4cdcc098a07ecf1dc11a06f2334c6790801c2a9f8bb774d4c8de4edca35ead1a86662266adbe391c6 +MISC ChangeLog 1900 SHA256 e20edc755a0697b08b4eba81f7c8cf439549c0465e0e403ff79001256fb8a6a1 WHIRLPOOL 7bf677572922ca0269840b0f6b3d220a67ef8eec91ead3304d75b3750c55b8315baa0b06f6f9d3341f9f43e2526300306f0e734cfd2abbc88a963248ada2b3a5 MISC metadata.xml 1135 SHA256 4eb2a9282b6a9ec8da39dece1406618a5134adc75bc27bb8b73109ce1bfc4e62 WHIRLPOOL 3aeaa05e3e8f762ba9d6f779165ce9b715e0858cec3b19b73d3c2ecc5236be9f1cd67f6dddfe1fadf9e9bde2b8f1f77e1e9d2400bf8bf8cefdc1dd367ad21342 diff --git a/dev-lang/ruby/files/ruby-2.0.0_p353-SVNr39186-asm-volatile.diff b/dev-lang/ruby/files/ruby-2.0.0_p353-SVNr39186-asm-volatile.diff deleted file mode 100644 index 870dc5bb..00000000 --- a/dev-lang/ruby/files/ruby-2.0.0_p353-SVNr39186-asm-volatile.diff +++ /dev/null @@ -1,16 +0,0 @@ -Index: gc.h -=================================================================== ---- gc.h (revision 39185) -+++ gc.h (revision 39186) -@@ -3,9 +3,9 @@ - #define RUBY_GC_H 1 - - #if defined(__x86_64__) && defined(__GNUC__) && !defined(__native_client__) --#define SET_MACHINE_STACK_END(p) __asm__ volatile ("movq\t%%rsp, %0" : "=r" (*(p))) -+#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))) -+#define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movl\t%%esp, %0" : "=r" (*(p))) - #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_p353-SVNr40636-asm-ilp32.diff b/dev-lang/ruby/files/ruby-2.0.0_p353-SVNr40636-asm-ilp32.diff deleted file mode 100644 index 81b7fe83..00000000 --- a/dev-lang/ruby/files/ruby-2.0.0_p353-SVNr40636-asm-ilp32.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: gc.h -=================================================================== ---- gc.h (revision 40635) -+++ gc.h (revision 40636) -@@ -2,7 +2,7 @@ - #ifndef RUBY_GC_H - #define RUBY_GC_H 1 - --#if defined(__x86_64__) && defined(__GNUC__) && !defined(__native_client__) -+#if defined(__x86_64__) && !defined(_ILP32) && defined(__GNUC__) && !defined(__native_client__) - #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/files/ruby-2.0.0_p451-SVNr39186-asm-volatile.diff b/dev-lang/ruby/files/ruby-2.0.0_p451-SVNr39186-asm-volatile.diff new file mode 100644 index 00000000..870dc5bb --- /dev/null +++ b/dev-lang/ruby/files/ruby-2.0.0_p451-SVNr39186-asm-volatile.diff @@ -0,0 +1,16 @@ +Index: gc.h +=================================================================== +--- gc.h (revision 39185) ++++ gc.h (revision 39186) +@@ -3,9 +3,9 @@ + #define RUBY_GC_H 1 + + #if defined(__x86_64__) && defined(__GNUC__) && !defined(__native_client__) +-#define SET_MACHINE_STACK_END(p) __asm__ volatile ("movq\t%%rsp, %0" : "=r" (*(p))) ++#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))) ++#define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movl\t%%esp, %0" : "=r" (*(p))) + #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_p451-SVNr40636-asm-ilp32.diff b/dev-lang/ruby/files/ruby-2.0.0_p451-SVNr40636-asm-ilp32.diff new file mode 100644 index 00000000..81b7fe83 --- /dev/null +++ b/dev-lang/ruby/files/ruby-2.0.0_p451-SVNr40636-asm-ilp32.diff @@ -0,0 +1,13 @@ +Index: gc.h +=================================================================== +--- gc.h (revision 40635) ++++ gc.h (revision 40636) +@@ -2,7 +2,7 @@ + #ifndef RUBY_GC_H + #define RUBY_GC_H 1 + +-#if defined(__x86_64__) && defined(__GNUC__) && !defined(__native_client__) ++#if defined(__x86_64__) && !defined(_ILP32) && defined(__GNUC__) && !defined(__native_client__) + #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_p353-r2.ebuild b/dev-lang/ruby/ruby-2.0.0_p353-r2.ebuild deleted file mode 100644 index 954fc2aa..00000000 --- a/dev-lang/ruby/ruby-2.0.0_p353-r2.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# 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-r2.ebuild,v 1.1 2014/02/23 10:24:38 graaff Exp $ - -EAPI=5 - -#PATCHSET=1 - -inherit autotools eutils flag-o-matic multilib versionator - -RUBYPL=$(get_version_component_range 4) - -MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}" -S=${WORKDIR}/${MY_P} - -SLOT=$(get_version_component_range 1-2) -MY_SUFFIX=$(delete_version_separator 1 ${SLOT}) -RUBYVERSION=2.0.0 - -if [[ -n ${PATCHSET} ]]; then - if [[ ${PVR} == ${PV} ]]; then - PATCHSET="${PV}-r0.${PATCHSET}" - else - PATCHSET="${PVR}.${PATCHSET}" - fi -else - PATCHSET="${PVR}" -fi - -DESCRIPTION="An object-oriented scripting language" -HOMEPAGE="http://www.ruby-lang.org/" -SRC_URI="mirror://ruby/2.0/${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" -IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline" - -RDEPEND=" - berkdb? ( sys-libs/db ) - gdbm? ( sys-libs/gdbm ) - ssl? ( dev-libs/openssl ) - socks5? ( >=net-proxy/dante-1.1.13 ) - tk? ( - =app-admin/eselect-ruby-20100402 - !