summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2015-01-14 06:45:24 +0000
committerHans de Graaff <graaff@gentoo.org>2015-01-14 06:45:24 +0000
commited1fa80d22c903776e629c41aa00c7219a0e8abd (patch)
tree8365bd0dcb31eab25f220ab39b7bb0b67fd31ec8 /dev-lang/ruby
parentOld. (diff)
downloadgentoo-2-ed1fa80d22c903776e629c41aa00c7219a0e8abd.tar.gz
gentoo-2-ed1fa80d22c903776e629c41aa00c7219a0e8abd.tar.bz2
gentoo-2-ed1fa80d22c903776e629c41aa00c7219a0e8abd.zip
The broken sse2 detection code is gone, so skip this patch unconditionally for now, fixing bug 535804.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'dev-lang/ruby')
-rw-r--r--dev-lang/ruby/ChangeLog8
-rw-r--r--dev-lang/ruby/ruby-2.2.0.ebuild10
2 files changed, 10 insertions, 8 deletions
diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 231156f72379..a292cf64ed14 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/ruby
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.696 2015/01/01 14:46:11 dilfridge Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.697 2015/01/14 06:45:24 graaff Exp $
+
+ 14 Jan 2015; Hans de Graaff <graaff@gentoo.org> ruby-2.2.0.ebuild:
+ The broken sse2 detection code is gone, so skip this patch unconditionally
+ for now, fixing bug 535804.
01 Jan 2015; Andreas K. Huettel <dilfridge@gentoo.org> +ChangeLog-2014,
ChangeLog: Split ChangeLog
diff --git a/dev-lang/ruby/ruby-2.2.0.ebuild b/dev-lang/ruby/ruby-2.2.0.ebuild
index b5f228b612c1..08f439a6cacc 100644
--- a/dev-lang/ruby/ruby-2.2.0.ebuild
+++ b/dev-lang/ruby/ruby-2.2.0.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.2.0.ebuild,v 1.1 2014/12/27 21:02:19 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.2.0.ebuild,v 1.2 2015/01/14 06:45:24 graaff Exp $
EAPI=5
@@ -32,7 +32,7 @@ SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
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 jemalloc +rdoc rubytests socks5 ssl xemacs ncurses +readline sse2"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc +rdoc rubytests socks5 ssl xemacs ncurses +readline"
RDEPEND="
berkdb? ( sys-libs/db )
@@ -58,9 +58,7 @@ PDEPEND="
xemacs? ( app-xemacs/ruby-modes )"
src_prepare() {
- if use sse2 ; then
- excluded_patches="012_no_forced_sse2.patch"
- fi
+ excluded_patches="012_no_forced_sse2.patch"
EPATCH_EXCLUDE="${excluded_patches}" EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
epatch "${WORKDIR}/patches"