Merge updates from master

14 files changed, 16 insertions, 84 deletions

diff --git a/dev-db/couchdb/couchdb-1.7.2.ebuild b/dev-db/couchdb/couchdb-1.7.2.ebuild
index 8f033f12687b..85ea96ed35b8 100644
--- a/dev-db/couchdb/couchdb-1.7.2.ebuild
+++ b/dev-db/couchdb/couchdb-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/couchdb/source/${PV}/apache-${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="libressl selinux test"
 
 RDEPEND=">=dev-libs/icu-4.3.1:=
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.2.6.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.2.6.ebuild
index c4f4758fd095..f6c5705e54bd 100644
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.2.6.ebuild
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-7.2.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/axiom-types/axiom-types-0.1.1.ebuild b/dev-ruby/axiom-types/axiom-types-0.1.1.ebuild
index ee5ffa99775b..e809adc5795c 100644
--- a/dev-ruby/axiom-types/axiom-types-0.1.1.ebuild
+++ b/dev-ruby/axiom-types/axiom-types-0.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/bogus/bogus-0.1.6.ebuild b/dev-ruby/bogus/bogus-0.1.6.ebuild
index 91b7a6b75e09..2ccdc47cba2e 100644
--- a/dev-ruby/bogus/bogus-0.1.6.ebuild
+++ b/dev-ruby/bogus/bogus-0.1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/bunny/Manifest b/dev-ruby/bunny/Manifest
index d2e358cc2a15..1704a73d27d7 100644
--- a/dev-ruby/bunny/Manifest
+++ b/dev-ruby/bunny/Manifest
@@ -1,5 +1,3 @@
 DIST bunny-2.10.0.gem 202240 BLAKE2B 7651c904b851930d044c240d83942aa1afd20c5a1e4c97e50dd1c3e40991de916c0435bf28769c6bd4a49202c2d58bb9b7be92a19413f0188472bc1e1ff7ef5b SHA512 af8f5d8b78efffa32824007c3aa472a2492b563767e7d00616feb86b5d350a4bcda0258ecbace02a3e81b5f552476d3b71ef742117c13e6d14a6b352cc4dcd89
 DIST bunny-2.11.0.gem 202240 BLAKE2B 29cfa68c4aeb04e3b826f02afb083dc479f851ae24c285963f56aa81e64b532577d20f10649fdc339d4b3ede6fc2619a03f35a3cc8a8bb75e3d57a1a6ebcbeb4 SHA512 540636337b5af36cee691e61677fc381be26d57b1e5dd175fa0dcb7f1fe8f531412ad1b1c5812d5ca9af1b2f83b09f37c2cfb1456643fb7872d4e6cf9de6b011
-DIST bunny-2.8.1.gem 200704 BLAKE2B 6692bf5e16975193ef2c56992b542258f2dea5f013f0e744f8a7c1537fd3f1496ac1e566d314c65e198aafb096bd20378afd773a2074d1c14526153302ec6459 SHA512 024aa4d8e13dfb6cda0cdb2f3f12d3d2c7bb62b8bb28e7c580214db34aea4a6c88d07ff2fb01f0bf2b679bf2208c6e71b358bf67d55a52b3c8a38ffd61e2e8e9
-DIST bunny-2.9.1.gem 201216 BLAKE2B 008c308484fccd42761f237a57d244a0843b3eaffa04d826a04fae73712aa8b1fce407359905040164a10ff7ca06141951206f5975b3f23a394e2e44ed2949e8 SHA512 56a44c4ca6269c3a120a8e77cb370e008b81d2e072c7637d812b501f7e8793573a7f1fcbccd62a95b677348e8996b156477e9519ed8f6c73104996fe805a4600
 DIST bunny-2.9.2.gem 201216 BLAKE2B c885364558c7833f77f3154765468f1c4d2f3f75c34a14f9c3dc64aacb1f8f048ff1f688914de5831f0f924975facd259e2f55667d58e468aae410f3db9da61c SHA512 24e329fe2cb84a0789ac53d5cd406a999f0b415439dfbce75dc36646e53c5a138d20980489fc1dcc6741026082fc268f9adb00370478d99accf0f42a4e05ad12
diff --git a/dev-ruby/bunny/bunny-2.8.1.ebuild b/dev-ruby/bunny/bunny-2.8.1.ebuild
deleted file mode 100644
index fab30742e0a7..000000000000
--- a/dev-ruby/bunny/bunny-2.8.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-# Tests require a live AMQP server.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Another synchronous Ruby AMQP client"
-HOMEPAGE="https://github.com/celldee/bunny"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/amq-protocol-2.2.0:2"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples || die
-}
diff --git a/dev-ruby/bunny/bunny-2.9.1.ebuild b/dev-ruby/bunny/bunny-2.9.1.ebuild
deleted file mode 100644
index 18136f36d42f..000000000000
--- a/dev-ruby/bunny/bunny-2.9.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-# Tests require a live AMQP server.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Another synchronous Ruby AMQP client"
-HOMEPAGE="https://github.com/celldee/bunny"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/amq-protocol-2.3.0:2"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples || die
-}
diff --git a/dev-ruby/bunny/bunny-2.9.2.ebuild b/dev-ruby/bunny/bunny-2.9.2.ebuild
index 18136f36d42f..973c02b1ffe4 100644
--- a/dev-ruby/bunny/bunny-2.9.2.ebuild
+++ b/dev-ruby/bunny/bunny-2.9.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/coercible/coercible-1.0.0.ebuild b/dev-ruby/coercible/coercible-1.0.0.ebuild
index c343fc51b8c4..aba4fc8fcacc 100644
--- a/dev-ruby/coercible/coercible-1.0.0.ebuild
+++ b/dev-ruby/coercible/coercible-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="README.md Changelog.md"
 
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.12.2.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-0.12.2.ebuild
index 86278ad3138b..ba2e99f5d3bd 100644
--- a/dev-ruby/faraday_middleware/faraday_middleware-0.12.2.ebuild
+++ b/dev-ruby/faraday_middleware/faraday_middleware-0.12.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/ice_nine/ice_nine-0.11.2.ebuild b/dev-ruby/ice_nine/ice_nine-0.11.2.ebuild
index f9bc9a374f6c..8accfc601a78 100644
--- a/dev-ruby/ice_nine/ice_nine-0.11.2.ebuild
+++ b/dev-ruby/ice_nine/ice_nine-0.11.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="README.md TODO CONTRIBUTING.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/oauth/oauth-0.5.4.ebuild b/dev-ruby/oauth/oauth-0.5.4.ebuild
index 1b883606f567..fd90e9faa800 100644
--- a/dev-ruby/oauth/oauth-0.5.4.ebuild
+++ b/dev-ruby/oauth/oauth-0.5.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
@@ -25,12 +25,12 @@ ruby_add_bdepend "test? (
 	dev-ruby/mocha:1.0
 	dev-ruby/webmock
 	dev-ruby/rack
-	dev-ruby/actionpack:5.1
+	dev-ruby/actionpack:5.2
 )"
 
 all_ruby_prepare() {
 	# Require a compatible version of mocha
-	sed -i -e '1igem "mocha", "~> 1.0"; gem "actionpack", "~>5.1.0"' \
+	sed -i -e '1igem "mocha", "~> 1.0"; gem "actionpack", "~>5.2.0"' \
 		-e '2i gem "test-unit"; require "test/unit"' \
 		-e '/\(byebug\|minitest_helpers\|simplecov\)/I s:^:#:' test/test_helper.rb || die
 }
diff --git a/dev-ruby/virtus/virtus-1.0.5.ebuild b/dev-ruby/virtus/virtus-1.0.5.ebuild
index 33a923897c78..630526e81364 100644
--- a/dev-ruby/virtus/virtus-1.0.5.ebuild
+++ b/dev-ruby/virtus/virtus-1.0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="Changelog.md CONTRIBUTING.md README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/media-sound/sox/sox-14.4.2-r1.ebuild b/media-sound/sox/sox-14.4.2-r1.ebuild
index 8f7f7227ebc1..71356a701013 100644
--- a/media-sound/sox/sox-14.4.2-r1.ebuild
+++ b/media-sound/sox/sox-14.4.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack"
 
 RDEPEND="