Mark dev-lang/ruby stable on x86, bug 615818

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/app-emacs/ruby-mode/ruby-mode-2.2.2.ebuild b/app-emacs/ruby-mode/ruby-mode-2.2.2.ebuild
index b7700f8a42dafb6746d6d24f0cf1c589ea405463..7423e7d3ef70afba821582bab859bdd29d3596cc 100644 (file)
--- a/app-emacs/ruby-mode/ruby-mode-2.2.2.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://ruby/ruby-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 S="${WORKDIR}/ruby-${PV}/misc"
 DOCS="README"

diff --git a/app-eselect/eselect-ruby/eselect-ruby-20161226.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20161226.ebuild
index 2e1d85881b8309f2d2d1fa6cda8901f172769eba..d7d10359cc5b4501825d9e9a052fe4fb3e9577ba 100644 (file)
--- a/app-eselect/eselect-ruby/eselect-ruby-20161226.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20161226.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~flameeyes/ruby-team/ruby.eselect-${PVR}.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.2"

diff --git a/dev-lang/ruby/ruby-2.2.6.ebuild b/dev-lang/ruby/ruby-2.2.6.ebuild
index b15ed7b5687687c8c3b5cf11d7b69c4b7608e7ae..b00ff47998f837f94e626a851a67504546bc7a48 100644 (file)
--- a/dev-lang/ruby/ruby-2.2.6.ebuild
+++ b/dev-lang/ruby/ruby-2.2.6.ebuild
@@ -30,7 +30,7 @@ SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
                 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
 
 RDEPEND="

diff --git a/dev-ruby/json/json-1.8.3.ebuild b/dev-ruby/json/json-1.8.3.ebuild
index 5889d582002c3ebfa04f720834c16f05ddcfdb59..f886689e3848533025d9aa43b10242e4796faae0 100644 (file)
--- a/dev-ruby/json/json-1.8.3.ebuild
+++ b/dev-ruby/json/json-1.8.3.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
 HOMEPAGE="https://github.com/flori/json"
 LICENSE="|| ( Ruby GPL-2 )"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 

diff --git a/dev-ruby/minitest/minitest-4.7.5-r2.ebuild b/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
index eda75c2e68b8e0464c6d14c8d79b451cae34c09a..eefaad92df2c1a8c038aaac3d87068e2a08bd468 100644 (file)
--- a/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
+++ b/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 each_ruby_prepare() {

diff --git a/dev-ruby/power_assert/power_assert-0.3.1.ebuild b/dev-ruby/power_assert/power_assert-0.3.1.ebuild
index 52f5e13dccca221e7c870d9d98d129e9d8af3f1b..4f548320bbcc6763880dcf6a0421ec6064acf30f 100644 (file)
--- a/dev-ruby/power_assert/power_assert-0.3.1.ebuild
+++ b/dev-ruby/power_assert/power_assert-0.3.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Shows each value of variables and method calls in the expression"
 HOMEPAGE="https://github.com/k-tsj/power_assert"
 LICENSE="|| ( Ruby BSD-2 )"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 SLOT="0"
 IUSE=""

diff --git a/dev-ruby/test-unit/test-unit-3.1.9.ebuild b/dev-ruby/test-unit/test-unit-3.1.9.ebuild
index 7f91a61f20d22a67a215f3962d7d8252d349f60f..ec17cf66ff27997366562b928800d472516f30e4 100644 (file)
--- a/dev-ruby/test-unit/test-unit-3.1.9.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.1.9.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://rubygems.org/gems/test-unit"
 
 LICENSE="|| ( Ruby GPL-2 ) PSF-2"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "dev-ruby/power_assert"

diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index 0709d43356a1d08e9b9f7662c8faf4af06b8a39e..f3347ce31a71c8a97662697bc4f45d990f42a451 100644 (file)
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -42,7 +42,3 @@ IUSE_IMPLICIT="abi_x86_32"
 # Michał Górny <mgorny@gentoo.org> (01 Jul 2014)
 # Default to abi_x86_32 for packages that don't have it forced.
 ABI_X86="32"
-
-# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
-# Temporary entry to support stable bug 615818
-RUBY_TARGETS="ruby21"

diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 91ad036540077ea46c968cba013ce00c2881334c..3a096d726fc72b290f7dcca949420e65d39f0619 100644 (file)
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -4,10 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
-# Temporary mask to support stable bug 615818
-ruby_targets_ruby22
-
 # Mike Gilbert <floppym@gentoo.org> (19 Oct 2014)
 # sys-libs/libapparmor
 apparmor

diff --git a/virtual/rubygems/rubygems-11.ebuild b/virtual/rubygems/rubygems-11.ebuild
index 9944841d8d8d29e296d827b8345601676267c2aa..ff314b0319b14a4f40c7ea3ca76349672299c2cb 100644 (file)
--- a/virtual/rubygems/rubygems-11.ebuild
+++ b/virtual/rubygems/rubygems-11.ebuild
@@ -8,7 +8,7 @@ inherit ruby-ng
 
 DESCRIPTION="Virtual ebuild for rubygems"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
        ruby_targets_rbx? ( dev-lang/rubinius )