commit: bc7e580c572da852c9f09607c4b1035ad926a66b
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 12 01:07:04 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 01:07:04 2015 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=bc7e580c
dev-lang/ruby: update to versions in tree.
dev-lang/ruby/Manifest | 13 ++--
dev-lang/ruby/files/ruby-uclibc-isnan-isinf.patch | 24 -------
...1.9.3_p484.ebuild => ruby-1.9.3_p551-r1.ebuild} | 24 ++++---
...by-2.0.0_p353.ebuild => ruby-2.0.0_p645.ebuild} | 73 +++++++++++-----------
4 files changed, 55 insertions(+), 79 deletions(-)
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 1e2c57c..96899fa 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,10 +1,9 @@
AUX ruby-1.9.3_p484-add-asm_ioctl_h.patch 320 SHA256
d9f2357a68dfee36e5c3b428dce82234d4bcd42cf134b24d01150946e1af8c9d SHA512
8f55b2749ca63ff1b3f3b0dd0ac548f7de29bc470871637ffb666a534910b089c4290b71df57108a380b22fd92c9c230c65354d0dbad81e70a654b4a94134d89
WHIRLPOOL
b4c2aff2ce64ede5cdd0b2c70180067b0c9a8300d6d7d88ca9c3bb3645053c27229c27ed9ea67b243598c7671465e1d5ab5d2e3bec85977fac7eb421733ea8a7
AUX ruby-add-asm_ioctl_h.patch 338 SHA256
82fa2b35c1a1ae05aaf7e849bd7b6068951f65609a35de1f88fcf83f254666f2 SHA512
eba8f362cda01fed4d38515a1ce03e4c462ddb6adf686de76b3d91bc5d5484661b7be5a9080624a9fa87fffff27b65c746d7ec94d4e27dbef2f9b321fc286be1
WHIRLPOOL
9c1ac98344cd44a3f9523e7dc723ab6dceab3c1c569d2656d03fdbe7677207bbe52ed5436dcd405c33c16d623333219aa6492dcb76d94b0cf833305589312ae2
-AUX ruby-uclibc-isnan-isinf.patch 720 SHA256
5e49c26f78079c1252cafee1cd91707a051f0d3c88e78900cfed05e159b25385 SHA512
ded0075f00121ba7ad3f9927534f870a61d8270d145d603a32c6cb60160a66d8afe7257904a1f787fe8af33a459c51679dbb87a3a1a16681eda434a386300750
WHIRLPOOL
ab4eab44b70d5cea0f26a585b5d57ce9461bb273059107121aaa96eaa00bb507d89bc3c17aed24f1909d4ce1bee9fbb185f4f0a789c42ecdd79a96693308b05b
-DIST ruby-1.9.3-p484.tar.bz2 10041514 SHA256
0fdc6e860d0023ba7b94c7a0cf1f7d32908b65b526246de9dfd5bb39d0d7922b SHA512
2c3ef8b6022027d444bd709b1a5db96a7a692e2e3aa895df4fceae101f9689a31f02583703bb0483d80659bbd4555fbb4b9b57ceb2351508fab8cd10ff28f14d
WHIRLPOOL
1b1174e012bff8d047db2da654dcf535486bfd1593b8e2f6fc888603c8ed6b41bd72625ff4eeaaa645ae01a81f7edbf62f0345b61eeda02d73743572af3f6b85
-DIST ruby-2.0.0-p353.tar.bz2 10730412 SHA256
3de4e4d9aff4682fa4f8ed2b70bd0d746fae17452fc3d3a8e8f505ead9105ad9 SHA512
52aa64c5991e61cc49c2062672554353bc88ab563da93a1d1591257153c2f6d8de02417a33d7a585eb0102f1079a993e46671fb6c97c62eac8615de567b575f2
WHIRLPOOL
8d3b616838290095ab389d32caa48941e9146676730975f2868d42cf43dd5f6ff6a26bb6ca1499a164a5c743e4f5c3ad122c1bed18556d85da98b821d66caf89
-DIST ruby-patches-1.9.3_p484.tar.bz2 2154 SHA256
c1c40f2b1f186a05774fd15c3566d722a5ab1af5b93a7c73f2d3c247d604fd73 SHA512
fdb07393439dfcc97e5d4ecd12059ef69983b23588079e1292cec1c93544524a67265e4f61f75d20ac540ee9f9ace730a584462f94bea4919124a3264e6f0ae1
WHIRLPOOL
422b7bfcbdb564fd89ae9536c15d78442ad5597c7728f84f2523a751a862807a92a77779cfdd42fcdd20569726f401e391e33c1666b0455432ddff228ea674fc
-DIST ruby-patches-2.0.0_p353.tar.bz2 1929 SHA256
4feee409319dbcac7525fb9c1c76c36888a62ee0623c117ae532bf765845f0f9 SHA512
95cf20e26e43a1515843d74c558e3344ae33b7383362c1742a115c1b3e6d09e1ed947df8ab7fee6275e96c920bd0ef880647da70165ddccd40d0995ff43aae64
WHIRLPOOL
869055dd0e14af0dc285a11d95a891ab4686e1d16960d46728ddf680eee58d42570f64d058b88d30805b732b082c354a36dac5a816a7ce5f3034d1b22237aa5a
-EBUILD ruby-1.9.3_p484.ebuild 6114 SHA256
e49b4636f44f156aeb7d3b62e29400d4513438826b99a7256e85a6a2317f9423 SHA512
a2cfc5448ed98f7471e3b204a1756f0825866ab3ff317590887be1c193699cbbd9ba038da0c6ab7637a382494b9ec159dc9eaad744b7ff7f5315f18c3b067142
WHIRLPOOL
17a52f969ecb0883a30c84611cf7e7e69887d67eead030de08b837785452471c989b401348d2cc66f99cf8b27e672523d3b330ee0b243f6c4fb4146d71465111
-EBUILD ruby-2.0.0_p353.ebuild 6547 SHA256
7c4861a783a86c578aedad435ec5d0946743fcdfc2a38f4435f19328dcc700c3 SHA512
87311b5499308f23dadbcf592f9f4b7b7cd0e4e3e21912276165daeb882e4f8f0707fecc077f0d7c4e2eb818bc1528845d9d3341669a352ca0b84dbe5ac34058
WHIRLPOOL
b5ff381030b0e2fc89e717c6bce42bfa99d31d7304d5dd31791a87e9acd0b0564603e500ac552d46a125dfadd5ea66ba1b3e90d21b0a33ef7164ded542ec882c
+DIST ruby-1.9.3-p551.tar.bz2 10049332 SHA256
b0c5e37e3431d58613a160504b39542ec687d473de1d4da983dabcf3c5de771e SHA512
5ea40f8c40cf116030ffdedbe436c1fdbf9a50b7bb44bc890845c9c2a885c34da711bc1a9e9694788c2f4710f7e6e0adc4410aec1ab18a25a27168f25ac3d68c
WHIRLPOOL
a4de6b7300e1f1cb22b01b1fbe0a73928baf6e5b1d083e8eb239e7696703e13774fdcb52bbb7f4253ea75b597663c43a8fbea2df7b77ed95f3fd8b2512ff1f1e
+DIST ruby-2.0.0-p645.tar.xz 8295192 SHA256
875be4f57bdbb2d2be0d64bfd8fc5022f004d55261ead8fd0cdc2e9e415e9f7b SHA512
440f8ea50f51c53f90e42a8dfd7cd41f806b290d5c12c09f84d9159ab9c95e19b036cd8a5dc788844da501b9fcd1fa8ad8352ef7417998debc1b43a61a4ea4dc
WHIRLPOOL
6201a39976f793dd3702ba580aafb881ba6e9f5cbc9d544bdddf508ca86dc14fc2970451a386ba495d16f2f68724197ef089ba02e7d1a9423870a0fa5c39cbc8
+DIST ruby-patches-1.9.3_p551-r1.tar.bz2 3685 SHA256
362d94b77c3408d200c42855868ebb5ddbee287d66bbed8e269255f9cb63418a SHA512
646a1979c1b879ef46cb195204bdcea83215f6407331f92d8caed910e03d1f426bfb203629f4bea307740742757877edae22bf9978b55cbda03921a0c25b8409
WHIRLPOOL
3001b1c6189a882a45125d04b6264e22e0bf2b773c249bf00c2cfc98dec3392ae422913d278aae289767db0aaf8782e1a7dd44e94965aa02893833d5737ad494
+DIST ruby-patches-2.0.0_p645.tar.bz2 2947 SHA256
dc173fe94af215fd2c1823f46140e4f11892dec59ce55b10ffad26b622bb6e4e SHA512
423a4fddfc8d7fd4f5b041989da343bc96ce0c3f22a448cab8cec47d4c458f4deeb83b167a0a3ae71d3be57df9b41151d1cafadd191bd3d3e9b08b32732e36cd
WHIRLPOOL
9c728e95cf01abdb48afc2ff008dc73d341096b253c664297b6780b32821c1ec406c388ce5860b5dd2ce2de862fb80b2ae45d03750045aaf13c371743f97c92e
+EBUILD ruby-1.9.3_p551-r1.ebuild 6239 SHA256
b1862a66d21f017abb64593cb0a198c2b072fb1b64f4009e02da492384f2ca47 SHA512
c8a4a57bf68a1960d57ff96b90427c743da71957c2382f9aee749fb82f6487d7fca8df57dd2b1067204a61b17be92d43ab3b18ac26cfdd77e880c9fa8f9fae8f
WHIRLPOOL
ac7f0986397e5483ebebd10503ad28c21754929cc42d322cc5d5be6b8d59e742a441a8ddd22d7384a7b70efe619756d86f6b161ae43a1e75e8795baf9d02ae1e
+EBUILD ruby-2.0.0_p645.ebuild 6570 SHA256
cef456c8f84457d5676c1a0cf6a5baa6135b7bd8fa644e6dca208436f22c3152 SHA512
ac72f539eb5d96ea1338dca6d4227fe85c942b13909ddff57cfd2027a51bf73cad101eed7acbbe9b8632e9eeb200a1f4111653003eb47f731a88e39d5201a218
WHIRLPOOL
f5d824c21cc385889cf7c1df5769e596eb121e16d5af1fce0aabdb1dad9c6a9a4a08356b76e1aad9b3820f9c36d3fb9045f1f82c87957b205c2410605cbedde5
MISC metadata.xml 995 SHA256
b802a8c15353181ea4a0f93666e89dbf1cc3f01947311ef9a8cb1663281f257a SHA512
d9aac8c61fcec88cb5ab856bc9f2f16b5e428d8df610b5d56edc6f908ad178790423c1fdebd23e3ff3b210d78389e775b684e9c2a973d86cd701dafa81b51442
WHIRLPOOL
2a28317957c87d390479e4a6ac8ab121200dbaa2bd7de98f58031c17e670c8f096a2c8d9909cc2ca0d02b437ca0b1c61a789a66b39b32ffd731454c2a6e4b65e
diff --git a/dev-lang/ruby/files/ruby-uclibc-isnan-isinf.patch
b/dev-lang/ruby/files/ruby-uclibc-isnan-isinf.patch
deleted file mode 100644
index 47ecb2f..0000000
--- a/dev-lang/ruby/files/ruby-uclibc-isnan-isinf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur ruby-2.0.0-p247.orig/missing/isinf.c ruby-2.0.0-p247/missing/isinf.c
---- ruby-2.0.0-p247.orig/missing/isinf.c 2011-05-15 07:55:52.000000000
-0400
-+++ ruby-2.0.0-p247/missing/isinf.c 2013-09-09 15:28:47.750452951 -0400
-@@ -52,6 +52,8 @@
- static double one (void) { return 1.0; }
- static double inf (void) { return one() / zero(); }
-
-+#undef isinf
-+
- int
- isinf(double n)
- {
-diff -Naur ruby-2.0.0-p247.orig/missing/isnan.c ruby-2.0.0-p247/missing/isnan.c
---- ruby-2.0.0-p247.orig/missing/isnan.c 2010-07-28 04:12:01.000000000
-0400
-+++ ruby-2.0.0-p247/missing/isnan.c 2013-09-09 15:28:32.791451837 -0400
-@@ -4,6 +4,8 @@
-
- static int double_ne(double n1, double n2);
-
-+#undef isnan
-+
- int
- isnan(double n)
- {
diff --git a/dev-lang/ruby/ruby-1.9.3_p484.ebuild
b/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild
similarity index 90%
rename from dev-lang/ruby/ruby-1.9.3_p484.ebuild
rename to dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild
index d860a04..4e27b1d 100644
--- a/dev-lang/ruby/ruby-1.9.3_p484.ebuild
+++ b/dev-lang/ruby/ruby-1.9.3_p551-r1.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_p484.ebuild,v 1.12
2014/01/26 09:27:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild,v
1.11 2015/05/27 13:05:51 ago Exp $
EAPI=4
@@ -34,8 +34,8 @@ 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="amd64 arm ~mips ppc x86"
-IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs
ncurses +readline +yaml" #libedit
+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:
# http://redmine.ruby-lang.org/issues/show/3698
@@ -43,12 +43,8 @@ IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests
socks5 ssl tk xemacs n
RDEPEND="
berkdb? ( sys-libs/db )
gdbm? ( sys-libs/gdbm )
- ssl? ( dev-libs/openssl )
+ ssl? ( dev-libs/openssl:0 )
socks5? ( >=net-proxy/dante-1.1.13 )
- tk? (
- <dev-lang/tcl-8.6[threads]
- <dev-lang/tk-8.6[threads]
- )
ncurses? ( sys-libs/ncurses )
readline? ( sys-libs/readline )
yaml? ( dev-libs/libyaml )
@@ -62,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 )"
@@ -70,7 +66,7 @@ src_prepare() {
EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
epatch "${WORKDIR}/patches"
- epatch "${FILESDIR}"/${P}-add-asm_ioctl_h.patch
+ epatch "${FILESDIR}"/${PN}-1.9.3_p484-add-asm_ioctl_h.patch
einfo "Unbundling gems..."
cd "$S"
rm -r \
@@ -123,11 +119,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 \
@@ -135,7 +134,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} \
@@ -211,7 +209,7 @@ pkg_postinst() {
elog
elog "To switch between available Ruby profiles, execute as root:"
- elog "\teselect ruby set ruby(18|19|...)"
+ elog "\teselect ruby set ruby(19|20|...)"
elog
}
diff --git a/dev-lang/ruby/ruby-2.0.0_p353.ebuild
b/dev-lang/ruby/ruby-2.0.0_p645.ebuild
similarity index 80%
rename from dev-lang/ruby/ruby-2.0.0_p353.ebuild
rename to dev-lang/ruby/ruby-2.0.0_p645.ebuild
index abdcc8e..5e22ea3 100644
--- a/dev-lang/ruby/ruby-2.0.0_p353.ebuild
+++ b/dev-lang/ruby/ruby-2.0.0_p645.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 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_p353.ebuild,v 1.6
2013/12/15 17:44:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p645.ebuild,v 1.12
2015/05/27 13:05:51 ago Exp $
EAPI=5
@@ -29,21 +29,20 @@ 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="amd64 arm ~mips ppc x86"
-IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk 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 cpu_flags_x86_sse2"
RDEPEND="
- berkdb? ( sys-libs/db )
+ berkdb? ( sys-libs/db:= )
gdbm? ( sys-libs/gdbm )
- ssl? ( dev-libs/openssl )
+ ssl? ( dev-libs/openssl:0 )
socks5? ( >=net-proxy/dante-1.1.13 )
- tk? ( dev-lang/tk[threads] )
ncurses? ( sys-libs/ncurses )
- readline? ( sys-libs/readline )
+ readline? ( sys-libs/readline:0 )
dev-libs/libyaml
virtual/libffi
sys-libs/zlib
@@ -53,19 +52,21 @@ RDEPEND="
DEPEND="${RDEPEND}"
PDEPEND="
- >=dev-ruby/rubygems-2.0.2[ruby_targets_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 cpu_flags_x86_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}"/${PN}-uclibc-isnan-isinf.patch
epatch "${FILESDIR}"/${PN}-add-asm_ioctl_h.patch
-
# We can no longer unbundle all of rake because rubygems now depends
# on this. We leave the actual rake code around to bootstrap
# rubygems, but remove the bits that would cause a file collision.
@@ -85,6 +86,11 @@ src_prepare() {
src_configure() {
local myconf=
+ # The Tk module can no longer be built because the module code is no
+ # longer compatible with newer stable versions.
+ # https://bugs.gentoo.org/show_bug.cgi?id=500894
+ local modules="tk"
+
# -fomit-frame-pointer makes ruby segfault, see bug #150413.
filter-flags -fomit-frame-pointer
# In many places aliasing rules are broken; play it safe
@@ -109,33 +115,35 @@ src_configure() {
# ipv6 hack, bug 168939. Needs --enable-ipv6.
use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-# if use libedit; then
-# einfo "Using libedit to provide readline extension"
-# myconf="${myconf} --enable-libedit --with-readline"
-# elif use readline; then
-# einfo "Using readline to provide readline extension"
-# myconf="${myconf} --with-readline"
-# else
-# myconf="${myconf} --without-readline"
-# fi
- myconf="${myconf} $(use_with readline)"
+ # Determine which modules *not* to build depending in the USE flags.
+ if ! use readline ; then
+ modules="${modules},readline"
+ fi
+ if ! use berkdb ; then
+ modules="${modules},dbm"
+ fi
+ if ! use gdbm ; then
+ modules="${modules},gdbm"
+ fi
+ if ! use ssl ; then
+ modules="${modules},openssl"
+ fi
+ if ! use ncurses ; then
+ modules="${modules},curses"
+ fi
INSTALL="${EPREFIX}/usr/bin/install -c" econf \
--program-suffix=${MY_SUFFIX} \
--with-soname=ruby${MY_SUFFIX} \
+ --docdir=${EPREFIX}/usr/share/doc/${P} \
--enable-shared \
--enable-pthread \
- --enable-psych \
--disable-rpath \
+ --with-out-ext="${modules}" \
$(use_enable socks5 socks) \
$(use_enable doc install-doc) \
--enable-ipv6 \
$(use_enable debug) \
- $(use_with berkdb dbm) \
- $(use_with gdbm) \
- $(use_with ssl openssl) \
- $(use_with tk) \
- $(use_with ncurses curses) \
${myconf} \
--enable-option-checking=no \
|| die "econf failed"
@@ -197,11 +205,6 @@ src_install() {
doins -r sample
fi
- dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
- "/usr/$(get_libdir)/libruby$(get_libname ${PV%.*})"
- dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
- "/usr/$(get_libdir)/libruby$(get_libname ${PV%_*})"
-
dodoc ChangeLog NEWS doc/NEWS* README* || die
if use rubytests; then
@@ -219,7 +222,7 @@ pkg_postinst() {
elog
elog "To switch between available Ruby profiles, execute as root:"
- elog "\teselect ruby set ruby(18|19|...)"
+ elog "\teselect ruby set ruby(19|20|...)"
elog
}
