summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2017-04-28 08:00:30 +0200
committerHans de Graaff <graaff@gentoo.org>2017-04-28 08:24:00 +0200
commit5ef24b36c49c77555729bb4daeb728004eab5709 (patch)
tree5082f4ab9e562a455849878beef8ec5c31be6e52
parentdev-ruby/minitest-bonus-assertions: add 3.0 (diff)
downloadgentoo-5ef24b36c49c77555729bb4daeb728004eab5709.tar.gz
gentoo-5ef24b36c49c77555729bb4daeb728004eab5709.tar.bz2
gentoo-5ef24b36c49c77555729bb4daeb728004eab5709.zip
mark dev-lang/ruby stable on amd64, bug 615818
Package-Manager: Portage-2.3.3, Repoman-2.3.1
-rw-r--r--app-emacs/ruby-mode/ruby-mode-2.2.2.ebuild2
-rw-r--r--app-eselect/eselect-ruby/eselect-ruby-20161226.ebuild2
-rw-r--r--dev-lang/ruby/ruby-2.2.6.ebuild2
-rw-r--r--dev-ruby/json/json-1.8.3.ebuild2
-rw-r--r--dev-ruby/minitest/minitest-4.7.5-r2.ebuild2
-rw-r--r--dev-ruby/power_assert/power_assert-0.3.1.ebuild2
-rw-r--r--dev-ruby/test-unit/test-unit-3.1.9.ebuild2
-rw-r--r--profiles/arch/amd64/make.defaults4
-rw-r--r--profiles/arch/amd64/use.stable.mask4
-rw-r--r--virtual/rubygems/rubygems-11.ebuild2
10 files changed, 8 insertions, 16 deletions
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 4be6794b43c..b7700f8a42d 100644
--- 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 816235e6a87..2e1d85881b8 100644
--- 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 1c059eb657a..b15ed7b5687 100644
--- 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 2d89ebeb7fb..5889d582002 100644
--- 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 b9c85f8f917..eda75c2e68b 100644
--- 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 8607c33f6b4..52f5e13dccc 100644
--- 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 c646c48d0ca..7f91a61f20d 100644
--- 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/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index 897169d6b16..a9d2cc0549d 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -63,7 +63,3 @@ USE_EXPAND_HIDDEN="-ABI_X86 -CPU_FLAGS_X86"
# Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied
# by non-multilib ebuilds when non-native ABIs are disabled.
IUSE_IMPLICIT="abi_x86_64"
-
-# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
-# Temporary entry to support stable bug 615818
-RUBY_TARGETS="ruby21"
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index d4d153d53c1..f61ff941c45 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/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 c5861919234..9944841d8d8 100644
--- 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 )