Merge updates from master

20 files changed, 110 insertions, 383 deletions

diff --git a/dev-ruby/aws-s3/aws-s3-0.6.3.ebuild b/dev-ruby/aws-s3/aws-s3-0.6.3.ebuild
index ed5224097140..e913cbfe5787 100644
--- a/dev-ruby/aws-s3/aws-s3-0.6.3.ebuild
+++ b/dev-ruby/aws-s3/aws-s3-0.6.3.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"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -25,7 +25,7 @@ IUSE=""
 
 ruby_add_rdepend "dev-ruby/xml-simple
 				dev-ruby/builder
-				dev-ruby/mime-types
+				dev-ruby/mime-types:*
 				virtual/ruby-ssl"
 ruby_add_bdepend "test? ( dev-ruby/flexmock )"
 
diff --git a/dev-ruby/aws-sdk-core/Manifest b/dev-ruby/aws-sdk-core/Manifest
index 2ee61d7fcf7d..94027826c6c3 100644
--- a/dev-ruby/aws-sdk-core/Manifest
+++ b/dev-ruby/aws-sdk-core/Manifest
@@ -2,6 +2,3 @@ DIST aws-sdk-ruby-2.10.100.tar.gz 3618410 BLAKE2B 00ed6a1061901d9574f0f426dde30b
 DIST aws-sdk-ruby-2.10.134.tar.gz 3673818 BLAKE2B ae99578cfb4b0723213b24070f3b06f05407c74930c09be4b331ce3981dab36d8dd449e79d3dca777f4fe57fffe962739becb34bedda4090937e2468734d32fb SHA512 403e4a00a3fb6e39f3a0641dc2c26cbbccc841c7ed49a261747edf1f1a0223e7809b460c5e08f8e22972fbd3f7ae160be4447e633692f555ad2999cf5304b170
 DIST aws-sdk-ruby-2.10.37.tar.gz 3215615 BLAKE2B 2c7fafb4e7226d4e1f149b9aeac0f1afa20711d52619a7adfc356d4b17b8a84a8224bef5993765c32fbaf80e5866bd57ed28bd3454fe4b85b23193f3ec951198 SHA512 987697dfac653035056b96de150e5db209b6db1224fa200913d60a239de0509b48d2a6f32e65b0ccce4195324874fa102b93a4181ffb4e9d4660cd9101fc2500
 DIST aws-sdk-ruby-2.10.74.tar.gz 3276717 BLAKE2B b78b2fcb84baf00475270da941d9a66da75893e74a2c6712553625c549c504d433e827e155ce3389b0e9324936fde36bdeaf905fb91082d823886d93ee9f6f68 SHA512 844fc20aefd11ce06e64ad80576a9467baad3e02b6e26864fde4e7e99bbfa90985ec93a154c6a4bc55d809beec0e5dd505288e664309bdfb59a68f17f1b4b254
-DIST aws-sdk-ruby-2.6.50.tar.gz 2794854 BLAKE2B c91d73a5d9bbf49650961ecc0130b6071e2928e8a05f9822cc890bda781006e417e2ee706549070b8be7f921a4090dd8bd43ecd57520a0b699ead94581fc1a4c SHA512 3b592e25a135b369c67ddfd8d3c33db3b25faaac3161feeb5aa3feb1fdb6cfb5ca44cadc688dcfc8d456a398d94242f7ebc2922a82547b9b767249f4c9bdc0bc
-DIST aws-sdk-ruby-2.8.14.tar.gz 2925334 BLAKE2B 28724d1ea0d25eb4e5ec0e5e64150cd2b796051aa6ab804ff6caf4aff79df5823fa9424b1702ec1e0a0d39f3bf30c1c2e52d2a016f27fde2b46f0e98ede1afdc SHA512 d45e98acb924163dd0ee555ecb45729247f5bd4b788e6c22f5e95c02102945b9b67c5451958eaa2aa2195a773a49e6359405a89242cd1e283971c6065bc3de61
-DIST aws-sdk-ruby-2.9.44.tar.gz 3084191 BLAKE2B 8fab4b1147b881963c6349a9831c899a75e332c3bdc4b8dc1e6c221fd70c8defbe43017a96972dccf96dcce855b4f58233ed77fbc695f649016b86c8d276219d SHA512 b2ef48a821143fed624f348a30774ca9fd65af432a09a1699af84d4a757bb7026439fa07e29c43813e504baa9383285434fe72912265ef9ad50f3c2ec3f26176
diff --git a/dev-ruby/aws-sdk-core/aws-sdk-core-2.6.50.ebuild b/dev-ruby/aws-sdk-core/aws-sdk-core-2.6.50.ebuild
deleted file mode 100644
index 5cb373b0a184..000000000000
--- a/dev-ruby/aws-sdk-core/aws-sdk-core-2.6.50.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="apis ca-bundle.crt endpoints.json"
-
-GITHUB_USER="aws"
-GITHUB_PROJECT="aws-sdk-ruby"
-RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="http://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/aws-sigv4 dev-ruby/jmespath:1"
-
-ruby_add_bdepend "test? ( dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid spec that gets confused by our directory names
-	sed -i -e '/requires prefixes from plugin names when loading/,/end/ s:^:#:' \
-		spec/seahorse/client/plugin_list_spec.rb || die
-}
diff --git a/dev-ruby/aws-sdk-core/aws-sdk-core-2.8.14.ebuild b/dev-ruby/aws-sdk-core/aws-sdk-core-2.8.14.ebuild
deleted file mode 100644
index 607216ccc089..000000000000
--- a/dev-ruby/aws-sdk-core/aws-sdk-core-2.8.14.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="apis ca-bundle.crt endpoints.json"
-
-GITHUB_USER="aws"
-GITHUB_PROJECT="aws-sdk-ruby"
-RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="https://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/aws-sigv4 dev-ruby/jmespath:1"
-
-ruby_add_bdepend "test? ( dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid spec that gets confused by our directory names
-	sed -i -e '/requires prefixes from plugin names when loading/,/end/ s:^:#:' \
-		spec/seahorse/client/plugin_list_spec.rb || die
-}
diff --git a/dev-ruby/aws-sdk-core/aws-sdk-core-2.9.44.ebuild b/dev-ruby/aws-sdk-core/aws-sdk-core-2.9.44.ebuild
deleted file mode 100644
index ffd54271934e..000000000000
--- a/dev-ruby/aws-sdk-core/aws-sdk-core-2.9.44.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="apis ca-bundle.crt endpoints.json"
-
-GITHUB_USER="aws"
-GITHUB_PROJECT="aws-sdk-ruby"
-RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="https://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/aws-sigv4 dev-ruby/jmespath:1"
-
-ruby_add_bdepend "test? ( dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid spec that gets confused by our directory names
-	sed -i -e '/requires prefixes from plugin names when loading/,/end/ s:^:#:' \
-		spec/seahorse/client/plugin_list_spec.rb || die
-}
diff --git a/dev-ruby/aws-sdk-resources/Manifest b/dev-ruby/aws-sdk-resources/Manifest
index 2ee61d7fcf7d..94027826c6c3 100644
--- a/dev-ruby/aws-sdk-resources/Manifest
+++ b/dev-ruby/aws-sdk-resources/Manifest
@@ -2,6 +2,3 @@ DIST aws-sdk-ruby-2.10.100.tar.gz 3618410 BLAKE2B 00ed6a1061901d9574f0f426dde30b
 DIST aws-sdk-ruby-2.10.134.tar.gz 3673818 BLAKE2B ae99578cfb4b0723213b24070f3b06f05407c74930c09be4b331ce3981dab36d8dd449e79d3dca777f4fe57fffe962739becb34bedda4090937e2468734d32fb SHA512 403e4a00a3fb6e39f3a0641dc2c26cbbccc841c7ed49a261747edf1f1a0223e7809b460c5e08f8e22972fbd3f7ae160be4447e633692f555ad2999cf5304b170
 DIST aws-sdk-ruby-2.10.37.tar.gz 3215615 BLAKE2B 2c7fafb4e7226d4e1f149b9aeac0f1afa20711d52619a7adfc356d4b17b8a84a8224bef5993765c32fbaf80e5866bd57ed28bd3454fe4b85b23193f3ec951198 SHA512 987697dfac653035056b96de150e5db209b6db1224fa200913d60a239de0509b48d2a6f32e65b0ccce4195324874fa102b93a4181ffb4e9d4660cd9101fc2500
 DIST aws-sdk-ruby-2.10.74.tar.gz 3276717 BLAKE2B b78b2fcb84baf00475270da941d9a66da75893e74a2c6712553625c549c504d433e827e155ce3389b0e9324936fde36bdeaf905fb91082d823886d93ee9f6f68 SHA512 844fc20aefd11ce06e64ad80576a9467baad3e02b6e26864fde4e7e99bbfa90985ec93a154c6a4bc55d809beec0e5dd505288e664309bdfb59a68f17f1b4b254
-DIST aws-sdk-ruby-2.6.50.tar.gz 2794854 BLAKE2B c91d73a5d9bbf49650961ecc0130b6071e2928e8a05f9822cc890bda781006e417e2ee706549070b8be7f921a4090dd8bd43ecd57520a0b699ead94581fc1a4c SHA512 3b592e25a135b369c67ddfd8d3c33db3b25faaac3161feeb5aa3feb1fdb6cfb5ca44cadc688dcfc8d456a398d94242f7ebc2922a82547b9b767249f4c9bdc0bc
-DIST aws-sdk-ruby-2.8.14.tar.gz 2925334 BLAKE2B 28724d1ea0d25eb4e5ec0e5e64150cd2b796051aa6ab804ff6caf4aff79df5823fa9424b1702ec1e0a0d39f3bf30c1c2e52d2a016f27fde2b46f0e98ede1afdc SHA512 d45e98acb924163dd0ee555ecb45729247f5bd4b788e6c22f5e95c02102945b9b67c5451958eaa2aa2195a773a49e6359405a89242cd1e283971c6065bc3de61
-DIST aws-sdk-ruby-2.9.44.tar.gz 3084191 BLAKE2B 8fab4b1147b881963c6349a9831c899a75e332c3bdc4b8dc1e6c221fd70c8defbe43017a96972dccf96dcce855b4f58233ed77fbc695f649016b86c8d276219d SHA512 b2ef48a821143fed624f348a30774ca9fd65af432a09a1699af84d4a757bb7026439fa07e29c43813e504baa9383285434fe72912265ef9ad50f3c2ec3f26176
diff --git a/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.6.50.ebuild b/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.6.50.ebuild
deleted file mode 100644
index 920f9ae3a4d4..000000000000
--- a/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.6.50.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="resources.schema.json"
-
-GITHUB_USER="aws"
-GITHUB_PROJECT="aws-sdk-ruby"
-RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="http://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "~dev-ruby/aws-sdk-core-${PV}"
-
-ruby_add_bdepend "dev-ruby/webmock"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.8.14.ebuild b/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.8.14.ebuild
deleted file mode 100644
index ac1757cf28b1..000000000000
--- a/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.8.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="resources.schema.json"
-
-GITHUB_USER="aws"
-GITHUB_PROJECT="aws-sdk-ruby"
-RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="https://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "~dev-ruby/aws-sdk-core-${PV}"
-
-ruby_add_bdepend "dev-ruby/webmock"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.9.44.ebuild b/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.9.44.ebuild
deleted file mode 100644
index 6a081786dc61..000000000000
--- a/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.9.44.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="resources.schema.json"
-
-GITHUB_USER="aws"
-GITHUB_PROJECT="aws-sdk-ruby"
-RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="https://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "~dev-ruby/aws-sdk-core-${PV}"
-
-ruby_add_bdepend "dev-ruby/webmock"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/aws-sdk/Manifest b/dev-ruby/aws-sdk/Manifest
index 2ee61d7fcf7d..94027826c6c3 100644
--- a/dev-ruby/aws-sdk/Manifest
+++ b/dev-ruby/aws-sdk/Manifest
@@ -2,6 +2,3 @@ DIST aws-sdk-ruby-2.10.100.tar.gz 3618410 BLAKE2B 00ed6a1061901d9574f0f426dde30b
 DIST aws-sdk-ruby-2.10.134.tar.gz 3673818 BLAKE2B ae99578cfb4b0723213b24070f3b06f05407c74930c09be4b331ce3981dab36d8dd449e79d3dca777f4fe57fffe962739becb34bedda4090937e2468734d32fb SHA512 403e4a00a3fb6e39f3a0641dc2c26cbbccc841c7ed49a261747edf1f1a0223e7809b460c5e08f8e22972fbd3f7ae160be4447e633692f555ad2999cf5304b170
 DIST aws-sdk-ruby-2.10.37.tar.gz 3215615 BLAKE2B 2c7fafb4e7226d4e1f149b9aeac0f1afa20711d52619a7adfc356d4b17b8a84a8224bef5993765c32fbaf80e5866bd57ed28bd3454fe4b85b23193f3ec951198 SHA512 987697dfac653035056b96de150e5db209b6db1224fa200913d60a239de0509b48d2a6f32e65b0ccce4195324874fa102b93a4181ffb4e9d4660cd9101fc2500
 DIST aws-sdk-ruby-2.10.74.tar.gz 3276717 BLAKE2B b78b2fcb84baf00475270da941d9a66da75893e74a2c6712553625c549c504d433e827e155ce3389b0e9324936fde36bdeaf905fb91082d823886d93ee9f6f68 SHA512 844fc20aefd11ce06e64ad80576a9467baad3e02b6e26864fde4e7e99bbfa90985ec93a154c6a4bc55d809beec0e5dd505288e664309bdfb59a68f17f1b4b254
-DIST aws-sdk-ruby-2.6.50.tar.gz 2794854 BLAKE2B c91d73a5d9bbf49650961ecc0130b6071e2928e8a05f9822cc890bda781006e417e2ee706549070b8be7f921a4090dd8bd43ecd57520a0b699ead94581fc1a4c SHA512 3b592e25a135b369c67ddfd8d3c33db3b25faaac3161feeb5aa3feb1fdb6cfb5ca44cadc688dcfc8d456a398d94242f7ebc2922a82547b9b767249f4c9bdc0bc
-DIST aws-sdk-ruby-2.8.14.tar.gz 2925334 BLAKE2B 28724d1ea0d25eb4e5ec0e5e64150cd2b796051aa6ab804ff6caf4aff79df5823fa9424b1702ec1e0a0d39f3bf30c1c2e52d2a016f27fde2b46f0e98ede1afdc SHA512 d45e98acb924163dd0ee555ecb45729247f5bd4b788e6c22f5e95c02102945b9b67c5451958eaa2aa2195a773a49e6359405a89242cd1e283971c6065bc3de61
-DIST aws-sdk-ruby-2.9.44.tar.gz 3084191 BLAKE2B 8fab4b1147b881963c6349a9831c899a75e332c3bdc4b8dc1e6c221fd70c8defbe43017a96972dccf96dcce855b4f58233ed77fbc695f649016b86c8d276219d SHA512 b2ef48a821143fed624f348a30774ca9fd65af432a09a1699af84d4a757bb7026439fa07e29c43813e504baa9383285434fe72912265ef9ad50f3c2ec3f26176
diff --git a/dev-ruby/aws-sdk/aws-sdk-2.6.50.ebuild b/dev-ruby/aws-sdk/aws-sdk-2.6.50.ebuild
deleted file mode 100644
index 00d0c2b5a411..000000000000
--- a/dev-ruby/aws-sdk/aws-sdk-2.6.50.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST=""
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="../CHANGELOG.md ../MIGRATING.md ../README.md ../UPGRADING.md"
-
-GITHUB_USER="aws"
-GITHUB_PROJECT="${PN}-ruby"
-RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="http://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl
-	~dev-ruby/aws-sdk-resources-${PV}"
diff --git a/dev-ruby/aws-sdk/aws-sdk-2.8.14.ebuild b/dev-ruby/aws-sdk/aws-sdk-2.8.14.ebuild
deleted file mode 100644
index b4f706d0400d..000000000000
--- a/dev-ruby/aws-sdk/aws-sdk-2.8.14.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST=""
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="../CHANGELOG.md ../MIGRATING.md ../README.md ../UPGRADING.md"
-
-GITHUB_USER="aws"
-GITHUB_PROJECT="${PN}-ruby"
-RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="https://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl
-	~dev-ruby/aws-sdk-resources-${PV}"
diff --git a/dev-ruby/aws-sdk/aws-sdk-2.9.44.ebuild b/dev-ruby/aws-sdk/aws-sdk-2.9.44.ebuild
deleted file mode 100644
index 55262ff19a73..000000000000
--- a/dev-ruby/aws-sdk/aws-sdk-2.9.44.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST=""
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="../CHANGELOG.md ../MIGRATING.md ../README.md ../UPGRADING.md"
-
-GITHUB_USER="aws"
-GITHUB_PROJECT="${PN}-ruby"
-RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="https://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl
-	~dev-ruby/aws-sdk-resources-${PV}"
diff --git a/dev-ruby/best_in_place/best_in_place-3.1.1.ebuild b/dev-ruby/best_in_place/best_in_place-3.1.1.ebuild
index ec12f4326dc1..e79597b0417a 100644
--- a/dev-ruby/best_in_place/best_in_place-3.1.1.ebuild
+++ b/dev-ruby/best_in_place/best_in_place-3.1.1.ebuild
@@ -1,8 +1,8 @@
-# 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"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/bundler-audit/bundler-audit-0.6.0.ebuild b/dev-ruby/bundler-audit/bundler-audit-0.6.0.ebuild
index 03ab87eaa10d..56e93e5a0a42 100644
--- a/dev-ruby/bundler-audit/bundler-audit-0.6.0.ebuild
+++ b/dev-ruby/bundler-audit/bundler-audit-0.6.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=6
 
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index f71689366a9f..543a1d0df301 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -2,5 +2,4 @@ DIST capistrano-2.15.5.gem 132096 BLAKE2B bbaa6bd482cf9bbe7aa01540aa5dab3f32401f
 DIST capistrano-3.10.0.gem 77824 BLAKE2B 5d361a0d249959b28354e627ff7659d5f48d66a73997a1da58f6aaf33690f593042595ff0f73d29885df5c8771e49c8659363f584239af657baa022ffd8b1791 SHA512 5408d0feb813af2be37e7527b56fd3569ac69ec27e02b52438de4c1433358521c2c7d9c2fa619ba714a5f14415b8e3b589a9e2baf54d81d4e31a6ac267e07953
 DIST capistrano-3.10.1.gem 77824 BLAKE2B 548c86c0740703a5b0b92890806411221ea7a9942776d88fc999ce998e3cf5842d809e293d05111ce44cb849719900c7335c43d3795d7147688d48d53a19a133 SHA512 6f3f11498d26c426da740873022767ded44e1be1aeadddd01772d1a5c43dcf2589d5cf2279625470e2e2733d60d3ec865a39640ad4a14b2ef9a64b3da2da579b
 DIST capistrano-3.10.2.gem 78336 BLAKE2B 782cf09f810fd91f4878e126c12d57d19b75c1ccdf3dfee7b2078904743bf51047d1f948e64e6c41460fdaf0a3a9e5a2b646bd6a797f8ce97bc29fab9ca9c533 SHA512 a7eadcd0b949baab2d6ad09c2243f71ec803f85b5c3cf455068d3b0889be30d0f6bbee4ef0bdf90b9c7ec6c3e01886d350fd8a70824366383f7dcc49f0a8c92e
-DIST capistrano-3.4.1.gem 46080 BLAKE2B 0e02a401b04733e7c55dae4397486ddeb518ba91fd9b543cb86c0398524471f1b8f00a41fb7ebae64e69bff806f1267fcd8a634c76f944dfccc10eb4118360cf SHA512 ef3b8735aa91137234937b5704a74b965be729581e71df9794324303dba60eacb91c66c1b38f8154f315cd4d17f98e8ab6f491cd1634b59b51b320f2244f6ae1
 DIST capistrano-3.9.1.gem 77312 BLAKE2B 1aedc4739451fb028fa0d91f1bb1c1501c373f971c6ae7f8e15f7cd3ee13483b7d8d05ee967a96f3efcf3021d112be40ccb562f0bccde273cc7b5e4bb78cada1 SHA512 b9dcb21c43ee03cb250a5d740a3fb1ccced720efecf5168a394e8dc0ea56130fd77255f0ead260a7b221d222d34361e99ee68f29cbf498e599e6e5c73c099907
diff --git a/dev-ruby/capistrano/capistrano-3.4.1.ebuild b/dev-ruby/capistrano/capistrano-3.4.1.ebuild
deleted file mode 100644
index e272053f97be..000000000000
--- a/dev-ruby/capistrano/capistrano-3.4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A distributed application deployment system"
-HOMEPAGE="http://capistranorb.com/"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/sshkit-1.3:0
-	>=dev-ruby/rake-10.0.0
-	dev-ruby/i18n:*
-	!!<dev-ruby/capistrano-2.15.5-r2"
-ruby_add_bdepend "
-	test? (	dev-ruby/mocha:0.14 )"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "mocha", "~>0.14.0"' spec/spec_helper.rb || die
-}
-
-pkg_postinst() {
-	einfo "Capistrano 3.1 has some breaking changes. Please check the CHANGELOG: http://goo.gl/SxB0lr"
-	einfo "If you're upgrading Capistrano from 2.x, we recommend to read the upgrade guide: http://goo.gl/4536kB"
-	einfo "The 'deploy:restart' hook for passenger applications is now in a separate gem called capistrano-passenger.  Just add it to your Gemfile and require it in your Capfile."
-}
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 5d4a63cedc1b..4b4ed07a000a 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1 +1,2 @@
 DIST gerbera-1.1.0.tar.gz 1308827 BLAKE2B bb8d59702fef7b1048cc11d19d5de73ad5d5ca92908831b3c0d7d075c2a3c00d94a6a6bb5f5ba45a6cf0ef688294d041e1b71ac98e19235bce0f050928a5f873 SHA512 975b6f2f5d7538d94eec55ef76467be6b2c94e78cc1735c364053f1cc08dc3b59f8d1c8987dbef3b8fc82896c433f69228d713f03addce5f3ddc643fe4c05d8b
+DIST gerbera-1.2.0.tar.gz 2910704 BLAKE2B b0d0f52dcfbcefe09d96e6b63a73005fb069176fb42af16cf9a4729742988d5c5a0b68109ab50b93ba65ec604c3ced7a827fb75300d6c3409bdde77e18346589 SHA512 5472136b0605e4cc9645219ab9fbe9ae4240a4b80f52fc611456cef0336a7eac8136448132f30fab04655d4bdb0f85f5a37e92e2830ec976f71c6b294935e1dc
diff --git a/net-misc/gerbera/gerbera-1.2.0.ebuild b/net-misc/gerbera/gerbera-1.2.0.ebuild
new file mode 100644
index 000000000000..50806deadb0c
--- /dev/null
+++ b/net-misc/gerbera/gerbera-1.2.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils linux-info systemd tmpfiles user
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
+	KEYWORDS=""
+	SRC_URI=""
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${P}"
+fi
+
+DESCRIPTION="UPnP Media Server (Based on MediaTomb)"
+HOMEPAGE="https://github.com/gerbera/gerbera"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
+
+DEPEND="
+	!!net-misc/mediatomb
+	net-libs/libupnp:1.8[ipv6,reuseaddr]
+	>=dev-db/sqlite-3
+	dev-libs/expat
+	mysql? ( virtual/mysql )
+	javascript? ( dev-lang/duktape )
+	taglib? ( >=media-libs/taglib-1.11 )
+	lastfm? ( >=media-libs/lastfmlib-0.4 )
+	exif? ( media-libs/libexif )
+	exiv2? ( media-gfx/exiv2 )
+	ffmpeg? (
+		libav? ( >=media-video/libav-10:0= )
+		!libav? ( >=media-video/ffmpeg-2.2:0= )
+	)
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	curl? ( net-misc/curl net-misc/youtube-dl )
+	magic? ( sys-apps/file )
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libiconv
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CURL="$(usex curl)" \
+		-DWITH_DEBUG="$(usex debug)" \
+		-DWITH_EXIF="$(usex exif)" \
+		-DWITH_EXIV2="$(usex exiv2)" \
+		-DWITH_AVCODEC="$(usex ffmpeg)" \
+		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
+		-DWITH_JS="$(usex javascript)" \
+		-DWITH_LASTFM="$(usex lastfm)" \
+		-DWITH_MAGIC="$(usex magic)" \
+		-DWITH_MYSQL="$(usex mysql)"
+		-DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \
+		-DWITH_SYSTEMD="$(usex systemd)" \
+		-DWITH_TAGLIB="$(usex taglib)" \
+		-DWITH_INOTIFY=1
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
+
+	insinto /etc/${PN}
+	newins "${FILESDIR}/${PN}-1.0.0.config" config.xml
+	fperms 0640 /etc/${PN}/config.xml
+	fowners root:gerbera /etc/${PN}/config.xml
+
+	keepdir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN}
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog "Gerbera has been built with MySQL support and needs"
+		elog "to be configured before being started. By default"
+		elog "SQLite will be used."
+	fi
+}
diff --git a/www-servers/lighttpd/lighttpd-9999.ebuild b/www-servers/lighttpd/lighttpd-9999.ebuild
index c567f487647d..4c0d54541a2c 100644
--- a/www-servers/lighttpd/lighttpd-9999.ebuild
+++ b/www-servers/lighttpd/lighttpd-9999.ebuild
@@ -22,7 +22,7 @@ CDEPEND="
 	ldap?     ( >=net-nds/openldap-2.1.26 )
 	libev?    ( >=dev-libs/libev-4.01 )
 	lua?      ( >=dev-lang/lua-5.1:= )
-	memcached? ( dev-libs/libmemcache )
+	memcached? ( dev-libs/libmemcached )
 	mysql?    ( >=virtual/mysql-4.0 )
 	pcre?     ( >=dev-libs/libpcre-3.1 )
 	php?      ( dev-lang/php:*[cgi] )