Switch to CPU_FLAGS_X86.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 116476b4169aaa44ff4fa94e49a2245051c327bf..289503655234ee1cee484c7784fe6d0f04010430 100644 (file)
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.698 2015/01/19 20:07:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.699 2015/01/28 19:26:41 mgorny Exp $
+
+  28 Jan 2015; Michał Górny <mgorny@gentoo.org> ruby-2.0.0_p598.ebuild,
+  ruby-2.1.5.ebuild:
+  Switch to CPU_FLAGS_X86.
 
   19 Jan 2015; Hans de Graaff <graaff@gentoo.org> ruby-1.9.3_p551.ebuild,
   ruby-2.0.0_p598.ebuild, ruby-2.1.5.ebuild, ruby-2.2.0.ebuild:

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index ce0012b19f226a528adf57a248bbcec7d8898e23..4f4016145cfa858527105b2611ac233195ea3e9c 100644 (file)
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -10,16 +10,28 @@ DIST ruby-patches-2.0.0_p598.tar.bz2 2947 SHA256 dc173fe94af215fd2c1823f46140e4f
 DIST ruby-patches-2.1.5.tar.bz2 2310 SHA256 1743dc0cec0adc1a0b5d90b0ed7908f888b8251b7a414049a57e6e32e01e4ad6 SHA512 b695621d210a7afc6704dd480bf3e7fc559174ebf240d2287338d60537ba45e5bf0f5defac6b254064d4b28077e2b97ef23b7eadc1bfa1a6bf2c616e828f937c WHIRLPOOL e9fde062fc04e4e22aec2dc55250f9007c64b07c7d03875b4073c19af9cfb0ae735d6dcb2b65bd1465a457cf0ff0602866600b5af1d520df3efc8a418763ab5b
 DIST ruby-patches-2.2.0.tar.bz2 2310 SHA256 1743dc0cec0adc1a0b5d90b0ed7908f888b8251b7a414049a57e6e32e01e4ad6 SHA512 b695621d210a7afc6704dd480bf3e7fc559174ebf240d2287338d60537ba45e5bf0f5defac6b254064d4b28077e2b97ef23b7eadc1bfa1a6bf2c616e828f937c WHIRLPOOL e9fde062fc04e4e22aec2dc55250f9007c64b07c7d03875b4073c19af9cfb0ae735d6dcb2b65bd1465a457cf0ff0602866600b5af1d520df3efc8a418763ab5b
 EBUILD ruby-1.9.3_p551.ebuild 6174 SHA256 59d120ad59634d7b30160cd8f6c50d06f767d6250fefddf7bc24c5749a388327 SHA512 ebcbc9a738ddf15ee25e9ead6d0582802e149b07cac5c9e8560525a388aa34fa23f362a26b04bace5c47b0b92a66b060a8f76bad57eb06091f91065ad8196b77 WHIRLPOOL 7065873cd0c935a7cde4170adcd2b521958aab44a994f9e90d7b504dc3117923eecc0c2bce89fd67a12718898ac2072494b33ee48da71225abb0392882f939f0
-EBUILD ruby-2.0.0_p598.ebuild 6487 SHA256 92f3fb1c27f810edbae3444cb5564ae943074d708a9f600b21bf0232edb3d392 SHA512 f0686dcfa9e6d4800c265ab6060ffc9aa0c1ace2791909409affa6fe2eac1a757cc9a95d5cfa85a248e7e9c772f934ee7d249f5b76109b9694005290941ecb1f WHIRLPOOL 46107233de9cd9127d4a7e59fdaca240e937068d02a8549d7f7014d5185fe0d682c472d3542e5dbdd4e21f2e519f14a479f90907d4605f7e3e348c264f39d356
-EBUILD ruby-2.1.5.ebuild 6539 SHA256 73cabe2ba01f6d4dcef5cd74e1b0e25b917daf7f354c9d323185a659d8b2b2fe SHA512 0f55638c9f0be9c3f5972fa4045966f08fb965b83a49c3108caf85d49b02b9da85fcb878be185a27d8ca702b0451a94dc9e2d8a941dc986d1dfe6530e13dfa6e WHIRLPOOL c924acd2edfcde6fa5af378039492aa922fcaffcee3ed725cabc9bf5a759305902d64738b29b9b3c6744fcd6996c640547cfa5ef14c8e739571bb393e895ffed
+EBUILD ruby-2.0.0_p598.ebuild 6515 SHA256 8757f1a5bfc2d71f3a91b5dbc36f8a4944f18fc65d4f131cd5ba883c84b62bc8 SHA512 80b540600cba0245ccf67544243ce44e0980f82a88f5443d611f25f6f9debfcf1ecbf4376fd227d1b827f1f8b75a3f2198353124ad43fb8cabad23de6de41a71 WHIRLPOOL 7122d74e5ea58810a27691d25f0c7f79d6c7f9804610a7e20f30538d5ee7357a3469fc1d82a29c9b4ede9db5edb04f65d4bf759ec87ba0c608b3ff703cc85973
+EBUILD ruby-2.1.5.ebuild 6567 SHA256 8007fde9e07aadc9b7908eef8b76503531d694a665832fc4885506b03a6a19ac SHA512 4ea916b7a9e9042acecba9ea4f82c242caba4f3e34b623402ea5c3254e291e960e6b97cf3dcbba9773f14ed18030c3827757bf3494d31a632f18c8f6d5626533 WHIRLPOOL c55e9ecf2f059fdbd6293e8c3c35cb52f02eb22cdc6638355c4a46527e88cadf956ab3ee2cac872476fab7740b4c5e52ee3a179c8f0df04079e3e944601b9d0d
 EBUILD ruby-2.2.0.ebuild 6484 SHA256 60adf5a6c713b85e0fd29989b3bbbf181def7990d84e3427e899efddece78940 SHA512 5f894a267a0a616a5e716aefd06aceea9d39f444bc6a3a6562ba48a9a03a6f8f57c7589a51d8646164ac8f697039b571802f5bd66211b961dc6f114fcf929a71 WHIRLPOOL 9c15b68ea7caffc6213c6380483662809cadf5a89c2edad98ed6713f7673e270af2f1d56c80f9b1d7c4e70747fc380d0c4bec4121d808834be5eceb2aad2ded2
-MISC ChangeLog 798 SHA256 371229f42446eaf86334ed6db06a4983e42e17e01d05e0e481778e93fa68350e SHA512 2e80b2b1e6d636a1403b55f208941bb27505ab1ea86e41eb474da9892ed13c14682dcd7ba9a24a56bebad0e33a9ddcd4df53879d03e21bd51ef1619ab93e4460 WHIRLPOOL ab98aec699482c486e748b8315a692dae6d2792a94b5b37894953ca752081f089ddc38d558e9ddf580bc93ee4647b17c536b50e712a317cb0e7ac28ed327cad7
+MISC ChangeLog 921 SHA256 bc791c01e98a6332bb807f37d85c5ffc0be0e97c43019baa3b19be35e53fd0a3 SHA512 c5a0b5a344d04076f9859c3f81ea1ee3995c81f1c6007e055509ec84dc6919fa15f3d7d69d72e93afc0c120ed2c8ea8d668de948c16ae073df58dea29558a22c WHIRLPOOL 4651a18716de1a519e74f10914199370c3bc25891add60ae3725578aabee62ebca6573190d81224249ef0e60f5b3f89af5e46be0dc325e834fec3fd8aab3eaaa
 MISC ChangeLog-2014 104250 SHA256 6587f8f101dc832a9f0c01b77a9d448b6a7b1c3c7befd1368e297bbe3dc41f1c SHA512 89ffec2164a619bbb418ecf43ecb0893a3f6a4846ff1ac403980e68d85efa7d502fa2f7338c80f8fcf12b56a1ed791c7d6d1bfc607f80fa88c1a88c3c6f93a85 WHIRLPOOL 47ced91b8df722e42d33773a243f89e57ca49f8942418d19321a1ed041fd9dabad747ff640fbb1f0de73220c23cd37778eedc44a14b8883b8220ee512089a823
 MISC metadata.xml 1084 SHA256 77b5afe4fc85576b9f4758b1cc1e9ad7021e40bdc341ca8a7932f54dba63a77b SHA512 3341c4c2bac3f5088827470ffaa842196c190d8732425fc0876cace29878602f62b4e0857e1eb52e8a2370df283735ed54da8d72802f8d09c9a513fe97e3e6ba WHIRLPOOL 481ca1b6f1bed13b2cdafe644f5478af62d29aa66374b5f2be55f5474a044d15894708dc1226f612c748d165cd1a26be5b0d307f290b74bca6a3c564a12e162a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlS9Y/gACgkQiIP6VqMIqNd5VwD/VOX505sDv2TQk3UL/BzbCnH8
-FseM3BGyivd1TZk0/68A/3exypb8cMTB0/cKQO3Cm99h3/4aDmT+d4bUdjhX6Ho8
-=McFQ
+iQJ8BAEBCABmBQJUyTfyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO4j4QAIDzAz+3zaEdUBCFE9Vhlc4a
+zg6p//1/5rOvZyLO3c3KF/H6J2nH4Pv+DF3GQxSSKzmXYsi7NjGyFW9ABSq5vs2A
+O4hp8bR6zSfccbEAYzREcrjNu9eXfYKpmFuMp9ne4GgxuZ93b23WqBZF5tsvKBSW
+n3m7tAKUDynRAYTn5KS0xjXW7NsgdFQQt4Ew8KghzO1dvoTsg7YwhJA+ZKmEdx4F
+s02DRfUaSnmWlP7cXTYgZ4BUVkxVKAHL07R4u0Y23pKYCf/8K7S5TVpfgehN6WmK
+s5glZOkpsWT23dMWZj7IU+0+dvv19u4WScLz08vGyXtmuTf5jQrSl8DpFld+lmZ7
+7SkllCium68ZCJhfk0Gy/aZF9Qkg7TgxO7GOqPh11j78aOvK/4sI6292WFhR/0o7
+Q5sC0uF/UsqJN4t0hm+fAniILdFOOzhL0RItrx1bUT626TYN+yZxQNcUStx5wQ2G
+npLNQ+Ncyxr8o8gIiHg7sjsiDIE+tT4Wlhu77O1lfv5ftaYuQd3GGyVpyBYj+fm/
+DgiGdDNvHXQ9DMDgXV9jSm9RqBmr1sepwTSrMMMwdh43Dxw8U1eG5zU18cofNrVt
+gFSDvXToSH2TUSQK8yZCLYl53LIyCmg7h/5zwxlZdoRBGhSJWmgx1D+ggPnPOado
+y1PvgjkmjXwZk/xgbeum
+=nhRS
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/ruby/ruby-2.0.0_p598.ebuild b/dev-lang/ruby/ruby-2.0.0_p598.ebuild
index 17e732c97fab6fa1d997471731a69284281190ec..8835954ab4e0fc0946ed1a2009237f760efc39db 100644 (file)
--- a/dev-lang/ruby/ruby-2.0.0_p598.ebuild
+++ b/dev-lang/ruby/ruby-2.0.0_p598.ebuild
@@ -1,6 +1,6 @@
 # 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_p598.ebuild,v 1.11 2015/01/19 20:07:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p598.ebuild,v 1.12 2015/01/28 19:26:41 mgorny Exp $
 
 EAPI=5
 
@@ -34,7 +34,7 @@ SRC_URI="mirror://ruby/2.0/${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 +rdoc rubytests socks5 ssl xemacs ncurses +readline sse2"
+IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline cpu_flags_x86_sse2"
 
 RDEPEND="
        berkdb? ( sys-libs/db )
@@ -59,7 +59,7 @@ PDEPEND="
        xemacs? ( app-xemacs/ruby-modes )"
 
 src_prepare() {
-       if use sse2 ; then
+       if use cpu_flags_x86_sse2 ; then
                excluded_patches="012_no_forced_sse2.patch"
        fi
 

diff --git a/dev-lang/ruby/ruby-2.1.5.ebuild b/dev-lang/ruby/ruby-2.1.5.ebuild
index d9e34c5ee484b7229178170c154bbb72c5d9c04b..cb4d2b58d8b5e4c9ecbf7156469084b5bf98c7e0 100644 (file)
--- a/dev-lang/ruby/ruby-2.1.5.ebuild
+++ b/dev-lang/ruby/ruby-2.1.5.ebuild
@@ -1,6 +1,6 @@
 # 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.1.5.ebuild,v 1.2 2015/01/19 20:07:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.1.5.ebuild,v 1.3 2015/01/28 19:26:41 mgorny Exp $
 
 EAPI=5
 
@@ -35,7 +35,7 @@ SRC_URI="mirror://ruby/2.1/${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 +rdoc rubytests socks5 ssl xemacs ncurses +readline sse2"
+IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline cpu_flags_x86_sse2"
 
 RDEPEND="
        berkdb? ( sys-libs/db )
@@ -60,7 +60,7 @@ PDEPEND="
        xemacs? ( app-xemacs/ruby-modes )"
 
 src_prepare() {
-       if use sse2 ; then
+       if use cpu_flags_x86_sse2 ; then
                excluded_patches="012_no_forced_sse2.patch"
        fi