From e82b1547639dc1f77b57db190f7bbb20e7210657 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Sun, 28 Sep 2014 12:23:09 +0200 Subject: dev-lang/ruby: Version bump, stick to upstream Package-Manager: portage-2.2.14_rc1 --- dev-lang/ruby/ChangeLog | 9 + dev-lang/ruby/Manifest | 12 +- .../ruby-2.0.0_p481-SVNr39186-asm-volatile.diff | 16 -- .../files/ruby-2.0.0_p481-SVNr40636-asm-ilp32.diff | 13 -- .../ruby-2.0.0_p576-SVNr39186-asm-volatile.diff | 16 ++ .../files/ruby-2.0.0_p576-SVNr40636-asm-ilp32.diff | 13 ++ dev-lang/ruby/ruby-2.0.0_p481.ebuild | 229 --------------------- dev-lang/ruby/ruby-2.0.0_p576.ebuild | 229 +++++++++++++++++++++ 8 files changed, 273 insertions(+), 264 deletions(-) delete mode 100644 dev-lang/ruby/files/ruby-2.0.0_p481-SVNr39186-asm-volatile.diff delete mode 100644 dev-lang/ruby/files/ruby-2.0.0_p481-SVNr40636-asm-ilp32.diff create mode 100644 dev-lang/ruby/files/ruby-2.0.0_p576-SVNr39186-asm-volatile.diff create mode 100644 dev-lang/ruby/files/ruby-2.0.0_p576-SVNr40636-asm-ilp32.diff delete mode 100644 dev-lang/ruby/ruby-2.0.0_p481.ebuild create mode 100644 dev-lang/ruby/ruby-2.0.0_p576.ebuild (limited to 'dev-lang') diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog index 6ba727af..e60660b3 100644 --- a/dev-lang/ruby/ChangeLog +++ b/dev-lang/ruby/ChangeLog @@ -1,3 +1,12 @@ +*ruby-2.0.0_p576 (28 Sep 2014) + + 28 Sep 2014; Bertrand Jacquin + +files/ruby-2.0.0_p576-SVNr39186-asm-volatile.diff, + +files/ruby-2.0.0_p576-SVNr40636-asm-ilp32.diff, +ruby-2.0.0_p576.ebuild, + -files/ruby-2.0.0_p481-SVNr39186-asm-volatile.diff, + -files/ruby-2.0.0_p481-SVNr40636-asm-ilp32.diff, -ruby-2.0.0_p481.ebuild: + dev-lang/ruby: Version bump, stick to upstream + *ruby-1.9.3_p547 (19 May 2014) 19 May 2014; Bertrand Jacquin diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index 158c40b9..d68b1613 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_p481-SVNr39186-asm-volatile.diff 793 SHA256 cf80e6ec351e063a8dd0e6a86f26314fa6a9535001ec272f052a7fccc07607cc WHIRLPOOL 8b0267b11ffa15eee050fd9282a1b7307e5bd00b8b9d82746cc919ee51df09f9390512125bdc623693e152a78d255ff4bc578f66c371c0450966d492061c3e52 -AUX ruby-2.0.0_p481-SVNr40636-asm-ilp32.diff 617 SHA256 e9cf9ac459601d09a4a6244082456f9c9c45d22bbabcd3afb06e9b378facefa2 WHIRLPOOL 45dac6c5791f6ebbe59b4af6e066f8f3711b3518d1e48be308c546efc83f9c50a058c78129f01a018ad30899ce72e6444e76169be30ce27b976ea9938ae6a058 +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-p481.tar.bz2 10727244 SHA256 0762dad7e96d8091bdf33b3e3176c2066fbf3dc09dfe85fbf40e74e83c63d8e2 WHIRLPOOL 5d9a408c7f67e416dffda84283ea50f92baee5197f00486a84a25c0da9c173d00aaad762487dcea31bca34713e2798262e64588005bbb7abd23ba3127c394d87 +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_p481.tar.bz2 2525 SHA256 9842526b161105af36bf67d22ad578a5c4f82bd1feaf78eee72e674df594d997 WHIRLPOOL 2c302058886d9bc06a5e5febd54e2419a362ca141dd18f70bf7d4c4be65484fc95c9cd432717f6f97f5949f7cf69bb9f5df6e99ae94e14df1802a6f9244a2a7a +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_p481.ebuild 6500 SHA256 a92fed2ad74fa04d816a1176e425deeecf040b0c2c6c375ef4b05652577caca7 WHIRLPOOL ace5f1da769eee095c4aae206b1df07b914b33acac0667458f136581854dcd29d8db02f11bfa0f0db6642d7dd764c08bdb5dfcf8ce703c4accc03ac2fbd43935 -MISC ChangeLog 2370 SHA256 4f3c20b8a7ede830cad29161ddae37195f1852a238c48afe6cb9dd19430cd9e3 WHIRLPOOL 4de08e5d43760eccf48974b30ac7319bf1b2f185af0383fcf85601110a1adc4da06f185e1227eb6b4d0bf8f8ba7e5542b4ff3c17eac4985c228f790674ae8eef +EBUILD ruby-2.0.0_p576.ebuild 6477 SHA256 fc351ba4c493953acaeb95293dc0b5ebe2e913b58b6265383dbdb8237c29fa61 WHIRLPOOL fa0d94436b7e9760e123047de0cf8f90f68ebe0b44bf60b7d5dd4a10365ad6a9b28f0592c2bd82b1d5ff840c4ef836a0bb525a7dbf40606b03a94b90b2dd19c3 +MISC ChangeLog 2765 SHA256 b31bc85fc4a37c1b857b73d92edfb31b16aa9542518230666330faa16a8d4360 WHIRLPOOL 16b4b9daba628ea0a55381ac3893d4847fc9bc92f0dc5bd4da11bbb502a5ecd17fe49e9ba302cf345b49c549124a0e7a63d18f7f1d3341f9933ecc383a13f58d MISC metadata.xml 1135 SHA256 4eb2a9282b6a9ec8da39dece1406618a5134adc75bc27bb8b73109ce1bfc4e62 WHIRLPOOL 3aeaa05e3e8f762ba9d6f779165ce9b715e0858cec3b19b73d3c2ecc5236be9f1cd67f6dddfe1fadf9e9bde2b8f1f77e1e9d2400bf8bf8cefdc1dd367ad21342 diff --git a/dev-lang/ruby/files/ruby-2.0.0_p481-SVNr39186-asm-volatile.diff b/dev-lang/ruby/files/ruby-2.0.0_p481-SVNr39186-asm-volatile.diff deleted file mode 100644 index 870dc5bb..00000000 --- a/dev-lang/ruby/files/ruby-2.0.0_p481-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_p481-SVNr40636-asm-ilp32.diff b/dev-lang/ruby/files/ruby-2.0.0_p481-SVNr40636-asm-ilp32.diff deleted file mode 100644 index 81b7fe83..00000000 --- a/dev-lang/ruby/files/ruby-2.0.0_p481-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_p576-SVNr39186-asm-volatile.diff b/dev-lang/ruby/files/ruby-2.0.0_p576-SVNr39186-asm-volatile.diff new file mode 100644 index 00000000..870dc5bb --- /dev/null +++ b/dev-lang/ruby/files/ruby-2.0.0_p576-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_p576-SVNr40636-asm-ilp32.diff b/dev-lang/ruby/files/ruby-2.0.0_p576-SVNr40636-asm-ilp32.diff new file mode 100644 index 00000000..81b7fe83 --- /dev/null +++ b/dev-lang/ruby/files/ruby-2.0.0_p576-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_p481.ebuild b/dev-lang/ruby/ruby-2.0.0_p481.ebuild deleted file mode 100644 index d47e8446..00000000 --- a/dev-lang/ruby/ruby-2.0.0_p481.ebuild +++ /dev/null @@ -1,229 +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_p451.ebuild,v 1.3 2014/04/21 12:55:35 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 xemacs ncurses +readline" - -RDEPEND=" - berkdb? ( sys-libs/db ) - gdbm? ( sys-libs/gdbm ) - ssl? ( dev-libs/openssl ) - socks5? ( >=net-proxy/dante-1.1.13 ) - ncurses? ( sys-libs/ncurses ) - readline? ( sys-libs/readline ) - dev-libs/libyaml - virtual/libffi - sys-libs/zlib - >=app-admin/eselect-ruby-20100402 - !