Merge updates from master

24 files changed, 680 insertions, 1 deletions

diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
new file mode 100644
index 000000000000..e57237569a23
--- /dev/null
+++ b/dev-ruby/actioncable/Manifest
@@ -0,0 +1 @@
+DIST rails-5.0.0.1.tgz 6139334 SHA256 3cbbe71d80c2813dde0d2bfa61aea57c8e6a1a3b2a81e6b211dbf2f2a4be2add SHA512 8e820f26543e8ad05b01a75e4e4df1adb229b5d90cfccd1b63d77a6ab25f232d24a875cd5630648e58c6598d741a3d35b2a76fd7e99a0f06971f84ee63ada56f WHIRLPOOL 9aed4fab1c8ea06185de5320ed85d6d51ed0babf6143c3d70df352adea5721c3074bb80c351b395752b2d8c60f5fcb8982b086e507836b9867d6597f2d72df4c
diff --git a/dev-ruby/actioncable/actioncable-5.0.0.1.ebuild b/dev-ruby/actioncable/actioncable-5.0.0.1.ebuild
new file mode 100644
index 000000000000..abebc2d5146a
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-5.0.0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Structure many real-time application concerns into channels over a single WebSocket connection"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# Tests require many new dependencies, skipping for now
+RESTRICT="test"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	>=dev-ruby/nio4r-1.2:0
+	>=dev-ruby/websocket-driver-0.6.1:0 =dev-ruby/websocket-driver-0.6*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+	)"
diff --git a/dev-ruby/actioncable/metadata.xml b/dev-ruby/actioncable/metadata.xml
new file mode 100644
index 000000000000..42d41e33d990
--- /dev/null
+++ b/dev-ruby/actioncable/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">rails/rails</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 9a8dc6373db0..814621c4fc26 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -4,3 +4,4 @@ DIST rails-4.1.16.tgz 3730763 SHA256 fd17ccacee3a61c17d2cfa36db36f583ed3d05eac50
 DIST rails-4.2.6.tgz 4179056 SHA256 68bf40c27e0ee75b26c7b48fbe357f024b8d6d322a4ecf5c3427b4d6ef959fef SHA512 040599aa1c6a09ca569f377b1f49a4404d9516599d16d6909f93ffd2e387dfb20835a2842980cc5c119aaef411985e47f55ec8907041ff633b8f98ea101a42d0 WHIRLPOOL 1aef2ff5790fa94f1003fa6acdcad26b7bcb6a6a02f075e41a6ba5a5b77790420afa57ea64d3192e92de595161ba3741e7e7f8be7dbac6871ba5137a53f81efe
 DIST rails-4.2.7.1.tgz 4181681 SHA256 bfa7854f1b35e449b78db2af83fe660f17b101a487728fcfc6fb623967fb4783 SHA512 b926b59822ddd0837a402d798a7f2c9152d9916805153d3cad081d47e692992cdf3c7aaf8af47b061e3d78f8f23357674c5a9ed6c945b082e2d8c909281f5527 WHIRLPOOL da253d85bdc93c500a220b7688597dcb86c192226f5532619d8bb081440326e4dba8cc78f3bf946f16fe67e28beae0274649533aaf966177295daff7c4bf1188
 DIST rails-4.2.7.tgz 4181136 SHA256 31005bc5892ef4d478016f4ef66c7708d0bfc440d917dac8a5e84a461fa2a980 SHA512 89df542cac1cf31be376fff3d919860168ce5df0dcd51035411a7f82a59a6fc27d8aecdd92dc20dee59831745ecab1ff8e404756dbc85a1ec08c3f2c1721e7dc WHIRLPOOL 15653098db0702b5e76e6fc4eba0f4fa6eaf73b30a23d1bf10e08cd999452608325ebba25c87b85d790ab49cf8ba216f40ee4dc25bd072cc8be89546af378542
+DIST rails-5.0.0.1.tgz 6139334 SHA256 3cbbe71d80c2813dde0d2bfa61aea57c8e6a1a3b2a81e6b211dbf2f2a4be2add SHA512 8e820f26543e8ad05b01a75e4e4df1adb229b5d90cfccd1b63d77a6ab25f232d24a875cd5630648e58c6598d741a3d35b2a76fd7e99a0f06971f84ee63ada56f WHIRLPOOL 9aed4fab1c8ea06185de5320ed85d6d51ed0babf6143c3d70df352adea5721c3074bb80c351b395752b2d8c60f5fcb8982b086e507836b9867d6597f2d72df4c
diff --git a/dev-ruby/actionmailer/actionmailer-5.0.0.1.ebuild b/dev-ruby/actionmailer/actionmailer-5.0.0.1.ebuild
new file mode 100644
index 000000000000..f3a3dff9e3c8
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-5.0.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~amd64-linux"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+	dev-ruby/rails-dom-testing:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha:0.14
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid a test failing only on attachment ordering, since this is a
+	# security release.
+	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
+}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 9a8dc6373db0..814621c4fc26 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -4,3 +4,4 @@ DIST rails-4.1.16.tgz 3730763 SHA256 fd17ccacee3a61c17d2cfa36db36f583ed3d05eac50
 DIST rails-4.2.6.tgz 4179056 SHA256 68bf40c27e0ee75b26c7b48fbe357f024b8d6d322a4ecf5c3427b4d6ef959fef SHA512 040599aa1c6a09ca569f377b1f49a4404d9516599d16d6909f93ffd2e387dfb20835a2842980cc5c119aaef411985e47f55ec8907041ff633b8f98ea101a42d0 WHIRLPOOL 1aef2ff5790fa94f1003fa6acdcad26b7bcb6a6a02f075e41a6ba5a5b77790420afa57ea64d3192e92de595161ba3741e7e7f8be7dbac6871ba5137a53f81efe
 DIST rails-4.2.7.1.tgz 4181681 SHA256 bfa7854f1b35e449b78db2af83fe660f17b101a487728fcfc6fb623967fb4783 SHA512 b926b59822ddd0837a402d798a7f2c9152d9916805153d3cad081d47e692992cdf3c7aaf8af47b061e3d78f8f23357674c5a9ed6c945b082e2d8c909281f5527 WHIRLPOOL da253d85bdc93c500a220b7688597dcb86c192226f5532619d8bb081440326e4dba8cc78f3bf946f16fe67e28beae0274649533aaf966177295daff7c4bf1188
 DIST rails-4.2.7.tgz 4181136 SHA256 31005bc5892ef4d478016f4ef66c7708d0bfc440d917dac8a5e84a461fa2a980 SHA512 89df542cac1cf31be376fff3d919860168ce5df0dcd51035411a7f82a59a6fc27d8aecdd92dc20dee59831745ecab1ff8e404756dbc85a1ec08c3f2c1721e7dc WHIRLPOOL 15653098db0702b5e76e6fc4eba0f4fa6eaf73b30a23d1bf10e08cd999452608325ebba25c87b85d790ab49cf8ba216f40ee4dc25bd072cc8be89546af378542
+DIST rails-5.0.0.1.tgz 6139334 SHA256 3cbbe71d80c2813dde0d2bfa61aea57c8e6a1a3b2a81e6b211dbf2f2a4be2add SHA512 8e820f26543e8ad05b01a75e4e4df1adb229b5d90cfccd1b63d77a6ab25f232d24a875cd5630648e58c6598d741a3d35b2a76fd7e99a0f06971f84ee63ada56f WHIRLPOOL 9aed4fab1c8ea06185de5320ed85d6d51ed0babf6143c3d70df352adea5721c3074bb80c351b395752b2d8c60f5fcb8982b086e507836b9867d6597f2d72df4c
diff --git a/dev-ruby/actionpack/actionpack-5.0.0.1.ebuild b/dev-ruby/actionpack/actionpack-5.0.0.1.ebuild
new file mode 100644
index 000000000000..cc890a93dff1
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-5.0.0.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~amd64-linux"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionview-${PV}
+	dev-ruby/rack:2.0
+	>=dev-ruby/rack-test-0.6.3:0.6
+	>=dev-ruby/rails-html-sanitizer-1.0.2:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		dev-ruby/bundler
+		~dev-ruby/activemodel-${PV}
+		>=dev-ruby/rack-cache-1.2:1.2
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Skip a failing test related to security updates in 4.2.5.1. Let's
+	# assume that this is not a bug but a test lagging a security
+	# measure.
+	sed -i -e '/test_dynamic_render_with_file/,/^  end/ s:^:#:' \
+		test/controller/render_test.rb || die
+
+	# Skip brittle test depending on mime type registration order (fixed upstream)
+	sed -i -e '/parse application with trailing star/,/^  end/ s:^:#:' \
+		test/dispatch/mime_type_test.rb
+}
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 955e962ab6f0..6a545276f3fc 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -3,3 +3,4 @@ DIST rails-4.1.16.tgz 3730763 SHA256 fd17ccacee3a61c17d2cfa36db36f583ed3d05eac50
 DIST rails-4.2.6.tgz 4179056 SHA256 68bf40c27e0ee75b26c7b48fbe357f024b8d6d322a4ecf5c3427b4d6ef959fef SHA512 040599aa1c6a09ca569f377b1f49a4404d9516599d16d6909f93ffd2e387dfb20835a2842980cc5c119aaef411985e47f55ec8907041ff633b8f98ea101a42d0 WHIRLPOOL 1aef2ff5790fa94f1003fa6acdcad26b7bcb6a6a02f075e41a6ba5a5b77790420afa57ea64d3192e92de595161ba3741e7e7f8be7dbac6871ba5137a53f81efe
 DIST rails-4.2.7.1.tgz 4181681 SHA256 bfa7854f1b35e449b78db2af83fe660f17b101a487728fcfc6fb623967fb4783 SHA512 b926b59822ddd0837a402d798a7f2c9152d9916805153d3cad081d47e692992cdf3c7aaf8af47b061e3d78f8f23357674c5a9ed6c945b082e2d8c909281f5527 WHIRLPOOL da253d85bdc93c500a220b7688597dcb86c192226f5532619d8bb081440326e4dba8cc78f3bf946f16fe67e28beae0274649533aaf966177295daff7c4bf1188
 DIST rails-4.2.7.tgz 4181136 SHA256 31005bc5892ef4d478016f4ef66c7708d0bfc440d917dac8a5e84a461fa2a980 SHA512 89df542cac1cf31be376fff3d919860168ce5df0dcd51035411a7f82a59a6fc27d8aecdd92dc20dee59831745ecab1ff8e404756dbc85a1ec08c3f2c1721e7dc WHIRLPOOL 15653098db0702b5e76e6fc4eba0f4fa6eaf73b30a23d1bf10e08cd999452608325ebba25c87b85d790ab49cf8ba216f40ee4dc25bd072cc8be89546af378542
+DIST rails-5.0.0.1.tgz 6139334 SHA256 3cbbe71d80c2813dde0d2bfa61aea57c8e6a1a3b2a81e6b211dbf2f2a4be2add SHA512 8e820f26543e8ad05b01a75e4e4df1adb229b5d90cfccd1b63d77a6ab25f232d24a875cd5630648e58c6598d741a3d35b2a76fd7e99a0f06971f84ee63ada56f WHIRLPOOL 9aed4fab1c8ea06185de5320ed85d6d51ed0babf6143c3d70df352adea5721c3074bb80c351b395752b2d8c60f5fcb8982b086e507836b9867d6597f2d72df4c
diff --git a/dev-ruby/actionview/actionview-5.0.0.1.ebuild b/dev-ruby/actionview/actionview-5.0.0.1.ebuild
new file mode 100644
index 000000000000..fae35cbc561e
--- /dev/null
+++ b/dev-ruby/actionview/actionview-5.0.0.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~amd64-linux"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+	>=dev-ruby/erubis-2.7.0
+	>=dev-ruby/rails-html-sanitizer-1.0.2:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/activemodel-${PV}
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid tests failing due to missing logger setup in activerecord,
+	# most likely related to test environment setup.
+	rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
+}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index db4da0d5b246..912d840e66fb 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,3 +1,4 @@
 DIST rails-4.2.6.tgz 4179056 SHA256 68bf40c27e0ee75b26c7b48fbe357f024b8d6d322a4ecf5c3427b4d6ef959fef SHA512 040599aa1c6a09ca569f377b1f49a4404d9516599d16d6909f93ffd2e387dfb20835a2842980cc5c119aaef411985e47f55ec8907041ff633b8f98ea101a42d0 WHIRLPOOL 1aef2ff5790fa94f1003fa6acdcad26b7bcb6a6a02f075e41a6ba5a5b77790420afa57ea64d3192e92de595161ba3741e7e7f8be7dbac6871ba5137a53f81efe
 DIST rails-4.2.7.1.tgz 4181681 SHA256 bfa7854f1b35e449b78db2af83fe660f17b101a487728fcfc6fb623967fb4783 SHA512 b926b59822ddd0837a402d798a7f2c9152d9916805153d3cad081d47e692992cdf3c7aaf8af47b061e3d78f8f23357674c5a9ed6c945b082e2d8c909281f5527 WHIRLPOOL da253d85bdc93c500a220b7688597dcb86c192226f5532619d8bb081440326e4dba8cc78f3bf946f16fe67e28beae0274649533aaf966177295daff7c4bf1188
 DIST rails-4.2.7.tgz 4181136 SHA256 31005bc5892ef4d478016f4ef66c7708d0bfc440d917dac8a5e84a461fa2a980 SHA512 89df542cac1cf31be376fff3d919860168ce5df0dcd51035411a7f82a59a6fc27d8aecdd92dc20dee59831745ecab1ff8e404756dbc85a1ec08c3f2c1721e7dc WHIRLPOOL 15653098db0702b5e76e6fc4eba0f4fa6eaf73b30a23d1bf10e08cd999452608325ebba25c87b85d790ab49cf8ba216f40ee4dc25bd072cc8be89546af378542
+DIST rails-5.0.0.1.tgz 6139334 SHA256 3cbbe71d80c2813dde0d2bfa61aea57c8e6a1a3b2a81e6b211dbf2f2a4be2add SHA512 8e820f26543e8ad05b01a75e4e4df1adb229b5d90cfccd1b63d77a6ab25f232d24a875cd5630648e58c6598d741a3d35b2a76fd7e99a0f06971f84ee63ada56f WHIRLPOOL 9aed4fab1c8ea06185de5320ed85d6d51ed0babf6143c3d70df352adea5721c3074bb80c351b395752b2d8c60f5fcb8982b086e507836b9867d6597f2d72df4c
diff --git a/dev-ruby/activejob/activejob-5.0.0.1.ebuild b/dev-ruby/activejob/activejob-5.0.0.1.ebuild
new file mode 100644
index 000000000000..1a8f080adfdc
--- /dev/null
+++ b/dev-ruby/activejob/activejob-5.0.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Job framework with pluggable queues"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~amd64-linux"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.3.6
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/mocha-0.14.0:0.14
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
+
+	# Remove all currently unpackaged queues.
+	sed -i -e 's/delayed_job qu que queue_classic resque sidekiq sneakers sucker_punch backburner//' Rakefile || die
+}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 9a8dc6373db0..814621c4fc26 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -4,3 +4,4 @@ DIST rails-4.1.16.tgz 3730763 SHA256 fd17ccacee3a61c17d2cfa36db36f583ed3d05eac50
 DIST rails-4.2.6.tgz 4179056 SHA256 68bf40c27e0ee75b26c7b48fbe357f024b8d6d322a4ecf5c3427b4d6ef959fef SHA512 040599aa1c6a09ca569f377b1f49a4404d9516599d16d6909f93ffd2e387dfb20835a2842980cc5c119aaef411985e47f55ec8907041ff633b8f98ea101a42d0 WHIRLPOOL 1aef2ff5790fa94f1003fa6acdcad26b7bcb6a6a02f075e41a6ba5a5b77790420afa57ea64d3192e92de595161ba3741e7e7f8be7dbac6871ba5137a53f81efe
 DIST rails-4.2.7.1.tgz 4181681 SHA256 bfa7854f1b35e449b78db2af83fe660f17b101a487728fcfc6fb623967fb4783 SHA512 b926b59822ddd0837a402d798a7f2c9152d9916805153d3cad081d47e692992cdf3c7aaf8af47b061e3d78f8f23357674c5a9ed6c945b082e2d8c909281f5527 WHIRLPOOL da253d85bdc93c500a220b7688597dcb86c192226f5532619d8bb081440326e4dba8cc78f3bf946f16fe67e28beae0274649533aaf966177295daff7c4bf1188
 DIST rails-4.2.7.tgz 4181136 SHA256 31005bc5892ef4d478016f4ef66c7708d0bfc440d917dac8a5e84a461fa2a980 SHA512 89df542cac1cf31be376fff3d919860168ce5df0dcd51035411a7f82a59a6fc27d8aecdd92dc20dee59831745ecab1ff8e404756dbc85a1ec08c3f2c1721e7dc WHIRLPOOL 15653098db0702b5e76e6fc4eba0f4fa6eaf73b30a23d1bf10e08cd999452608325ebba25c87b85d790ab49cf8ba216f40ee4dc25bd072cc8be89546af378542
+DIST rails-5.0.0.1.tgz 6139334 SHA256 3cbbe71d80c2813dde0d2bfa61aea57c8e6a1a3b2a81e6b211dbf2f2a4be2add SHA512 8e820f26543e8ad05b01a75e4e4df1adb229b5d90cfccd1b63d77a6ab25f232d24a875cd5630648e58c6598d741a3d35b2a76fd7e99a0f06971f84ee63ada56f WHIRLPOOL 9aed4fab1c8ea06185de5320ed85d6d51ed0babf6143c3d70df352adea5721c3074bb80c351b395752b2d8c60f5fcb8982b086e507836b9867d6597f2d72df4c
diff --git a/dev-ruby/activemodel/activemodel-5.0.0.1.ebuild b/dev-ruby/activemodel/activemodel-5.0.0.1.ebuild
new file mode 100644
index 000000000000..f4c5d2aec788
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-5.0.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~amd64-linux"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+		>=dev-ruby/bcrypt-ruby-3.1.7
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 9a8dc6373db0..814621c4fc26 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -4,3 +4,4 @@ DIST rails-4.1.16.tgz 3730763 SHA256 fd17ccacee3a61c17d2cfa36db36f583ed3d05eac50
 DIST rails-4.2.6.tgz 4179056 SHA256 68bf40c27e0ee75b26c7b48fbe357f024b8d6d322a4ecf5c3427b4d6ef959fef SHA512 040599aa1c6a09ca569f377b1f49a4404d9516599d16d6909f93ffd2e387dfb20835a2842980cc5c119aaef411985e47f55ec8907041ff633b8f98ea101a42d0 WHIRLPOOL 1aef2ff5790fa94f1003fa6acdcad26b7bcb6a6a02f075e41a6ba5a5b77790420afa57ea64d3192e92de595161ba3741e7e7f8be7dbac6871ba5137a53f81efe
 DIST rails-4.2.7.1.tgz 4181681 SHA256 bfa7854f1b35e449b78db2af83fe660f17b101a487728fcfc6fb623967fb4783 SHA512 b926b59822ddd0837a402d798a7f2c9152d9916805153d3cad081d47e692992cdf3c7aaf8af47b061e3d78f8f23357674c5a9ed6c945b082e2d8c909281f5527 WHIRLPOOL da253d85bdc93c500a220b7688597dcb86c192226f5532619d8bb081440326e4dba8cc78f3bf946f16fe67e28beae0274649533aaf966177295daff7c4bf1188
 DIST rails-4.2.7.tgz 4181136 SHA256 31005bc5892ef4d478016f4ef66c7708d0bfc440d917dac8a5e84a461fa2a980 SHA512 89df542cac1cf31be376fff3d919860168ce5df0dcd51035411a7f82a59a6fc27d8aecdd92dc20dee59831745ecab1ff8e404756dbc85a1ec08c3f2c1721e7dc WHIRLPOOL 15653098db0702b5e76e6fc4eba0f4fa6eaf73b30a23d1bf10e08cd999452608325ebba25c87b85d790ab49cf8ba216f40ee4dc25bd072cc8be89546af378542
+DIST rails-5.0.0.1.tgz 6139334 SHA256 3cbbe71d80c2813dde0d2bfa61aea57c8e6a1a3b2a81e6b211dbf2f2a4be2add SHA512 8e820f26543e8ad05b01a75e4e4df1adb229b5d90cfccd1b63d77a6ab25f232d24a875cd5630648e58c6598d741a3d35b2a76fd7e99a0f06971f84ee63ada56f WHIRLPOOL 9aed4fab1c8ea06185de5320ed85d6d51ed0babf6143c3d70df352adea5721c3074bb80c351b395752b2d8c60f5fcb8982b086e507836b9867d6597f2d72df4c
diff --git a/dev-ruby/activerecord/activerecord-5.0.0.1.ebuild b/dev-ruby/activerecord/activerecord-5.0.0.1.ebuild
new file mode 100644
index 000000000000..0ec98a57ef8f
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-5.0.0.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby22 ruby23"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~amd64-linux"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	dev-ruby/arel:7.0
+	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
+	mysql? ( || ( dev-ruby/mysql2:0.4 >=dev-ruby/mysql2-0.3.18:0.3 ) )
+	postgres? ( >=dev-ruby/pg-0.18.0 )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/actionmailer-${PV}
+		>=dev-ruby/sqlite3-1.3.6
+		dev-ruby/mocha:0.14
+		<dev-ruby/minitest-5.4:5
+	)"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	rm ../Gemfile.lock || die
+	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	# Avoid test depending on mysql adapter which we don't support for
+	# this Rails version to simplify our dependencies.
+	rm test/cases/connection_specification/resolver_test.rb || die
+
+	# Avoid single test using mysql dependencies.
+	rm test/cases/invalid_connection_test.rb || die
+
+	# Avoid failing test that makes bad assumptions on database state.
+	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
+		test/cases/associations/has_many_associations_test.rb
+}
+
+each_ruby_test() {
+	if use sqlite; then
+		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+	fi
+}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 9a8dc6373db0..814621c4fc26 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -4,3 +4,4 @@ DIST rails-4.1.16.tgz 3730763 SHA256 fd17ccacee3a61c17d2cfa36db36f583ed3d05eac50
 DIST rails-4.2.6.tgz 4179056 SHA256 68bf40c27e0ee75b26c7b48fbe357f024b8d6d322a4ecf5c3427b4d6ef959fef SHA512 040599aa1c6a09ca569f377b1f49a4404d9516599d16d6909f93ffd2e387dfb20835a2842980cc5c119aaef411985e47f55ec8907041ff633b8f98ea101a42d0 WHIRLPOOL 1aef2ff5790fa94f1003fa6acdcad26b7bcb6a6a02f075e41a6ba5a5b77790420afa57ea64d3192e92de595161ba3741e7e7f8be7dbac6871ba5137a53f81efe
 DIST rails-4.2.7.1.tgz 4181681 SHA256 bfa7854f1b35e449b78db2af83fe660f17b101a487728fcfc6fb623967fb4783 SHA512 b926b59822ddd0837a402d798a7f2c9152d9916805153d3cad081d47e692992cdf3c7aaf8af47b061e3d78f8f23357674c5a9ed6c945b082e2d8c909281f5527 WHIRLPOOL da253d85bdc93c500a220b7688597dcb86c192226f5532619d8bb081440326e4dba8cc78f3bf946f16fe67e28beae0274649533aaf966177295daff7c4bf1188
 DIST rails-4.2.7.tgz 4181136 SHA256 31005bc5892ef4d478016f4ef66c7708d0bfc440d917dac8a5e84a461fa2a980 SHA512 89df542cac1cf31be376fff3d919860168ce5df0dcd51035411a7f82a59a6fc27d8aecdd92dc20dee59831745ecab1ff8e404756dbc85a1ec08c3f2c1721e7dc WHIRLPOOL 15653098db0702b5e76e6fc4eba0f4fa6eaf73b30a23d1bf10e08cd999452608325ebba25c87b85d790ab49cf8ba216f40ee4dc25bd072cc8be89546af378542
+DIST rails-5.0.0.1.tgz 6139334 SHA256 3cbbe71d80c2813dde0d2bfa61aea57c8e6a1a3b2a81e6b211dbf2f2a4be2add SHA512 8e820f26543e8ad05b01a75e4e4df1adb229b5d90cfccd1b63d77a6ab25f232d24a875cd5630648e58c6598d741a3d35b2a76fd7e99a0f06971f84ee63ada56f WHIRLPOOL 9aed4fab1c8ea06185de5320ed85d6d51ed0babf6143c3d70df352adea5721c3074bb80c351b395752b2d8c60f5fcb8982b086e507836b9867d6597f2d72df4c
diff --git a/dev-ruby/activesupport/activesupport-5.0.0.1.ebuild b/dev-ruby/activesupport/activesupport-5.0.0.1.ebuild
new file mode 100644
index 000000000000..715807174558
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-5.0.0.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm  ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	>=dev-ruby/i18n-0.7:0.7
+	>=dev-ruby/tzinfo-1.1:1
+	>=dev-ruby/minitest-5.1:5
+	>=dev-ruby/thread_safe-0.3.4:0"
+
+# memcache-client, nokogiri, and builder are not strictly
+# needed, but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-2.2.1
+	>=dev-ruby/nokogiri-1.4.5
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.0.5:3
+	dev-ruby/rack
+	dev-ruby/mocha:0.14
+	<dev-ruby/minitest-5.4
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"; gem "rack"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid test not working within portage
+	sed -i -e '/test_messing_with_either_encrypted_values_causes_failure/askip "gentoo"' test/message_encryptor_test.rb || die
+
+	# Avoid tests failing since test_order cattr is also seen as a test
+	# method
+	rm -f test/xml_mini/libxml{,sax}_engine_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions. This might be
+	# fixed upstream in 7bd41994480c17db71fdc07e3447ade929eaa386
+	rm -f test/evented_file_update_checker_test.rb || die
+}
diff --git a/dev-ruby/backports/backports-3.6.8.ebuild b/dev-ruby/backports/backports-3.6.8.ebuild
index 9292ddbbea83..3faede1a7160 100644
--- a/dev-ruby/backports/backports-3.6.8.ebuild
+++ b/dev-ruby/backports/backports-3.6.8.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_TASK_TEST="test"
 
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 3b4c64ba4991..4ad1ffe536ad 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -4,3 +4,4 @@ DIST rails-4.1.16.gem 1438208 SHA256 a19899f82c0a03a08cd2629636b75b582e0a64d908b
 DIST rails-4.2.6.gem 1475584 SHA256 a199258c0d2bae09993a6932c49df254fd66428899d1823b8c5285de02e5bc33 SHA512 80556b380f0ce9b960afe015ddcab02d5ab8abd2a1376ca35b24665644bb86f6d01d76744cbb0cb86fdc388180922ce507506afda062b7bbd6a772de06f1c34b WHIRLPOOL 65a4f4b80b70fe77f990a4c27482cf77b032a6b87bf80379e627db090aa7978070440bec16a50d1cec68b5ea83d76dfe95585bea74e7c17558b54802f6a4ca58
 DIST rails-4.2.7.1.gem 1475584 SHA256 9414bef218365d548c5e42080e70364ad2809d6263856f591ba2e393a3096dab SHA512 efd9ec3e712a055b92c7409b3ae184e7133065d4ce50955af58d52bcd9410e744026bdb286bf75151ac0ec16a9fac1b7cbfb9a22fd837181799b0cd247e93a90 WHIRLPOOL 53166853626031f24b4d7bdf98f7d858ac97360d68fe4d5534eb1e775069a7d2b782cac22ae1d4a1fec690602865b1079da79732f1c4028e4cce252bb404f9fa
 DIST rails-4.2.7.gem 1475584 SHA256 76dbbc22ac7fc20edb2fb653a9517590537073ef57669c2da8f3d32ff1767c0c SHA512 17a0deb902063a9dee2ec51c43370667d8a1bd7592287627726b1b24941472c6365dadcb027129935d539fb2563cc41dea8b816474215dbaaa9af7dafead3211 WHIRLPOOL e30fbb5e03bfb8b0fe51e61e3286d74b32df4d3e9c29ef13d42522f33964f050b6f0553ceba05c5230b808753d36f2fb80bed8f98e229a6c22ec8036a3845532
+DIST rails-5.0.0.1.gem 6144 SHA256 b51cf641a376e16166587cfe41f46e37bd3a510c13a8b79f0682985c1603e4d8 SHA512 6e6860a4e0bf1386458921bbc3851d0b1a41792875b4f9c5068d1890df9e0420cc161d4399b79c1512630e719f374692102bd04d6397988b3d645be8103527f5 WHIRLPOOL a2b3906b7676bbf9767d390c032c2462cbc10f5d634dd24a109625cff972994a17931a6a822c66d84f843a6ae6398701e3363dc27941ddea05c5eb74e3fe7d95
diff --git a/dev-ruby/rails/rails-5.0.0.1.ebuild b/dev-ruby/rails/rails-5.0.0.1.ebuild
new file mode 100644
index 000000000000..8752b5cc5cb4
--- /dev/null
+++ b/dev-ruby/rails/rails-5.0.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby22 ruby23"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="http://www.rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~amd64-linux"
+
+IUSE="+asset-pipeline"
+
+ruby_add_rdepend "
+	~dev-ruby/actioncable-${PV}
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/railties-${PV}
+	>=dev-ruby/bundler-1.3 =dev-ruby/bundler-1*
+	>=dev-ruby/sprockets-rails-2.0.0:*
+	asset-pipeline? (
+		dev-ruby/jquery-rails:*
+		>=dev-ruby/sass-rails-5.0:5.0
+		>=dev-ruby/uglifier-1.3.0:*
+		>=dev-ruby/coffee-rails-4.1.0:*
+	)"
+
+# also: turbolinks, >=jbuilder-1.2:1
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 9a8dc6373db0..814621c4fc26 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -4,3 +4,4 @@ DIST rails-4.1.16.tgz 3730763 SHA256 fd17ccacee3a61c17d2cfa36db36f583ed3d05eac50
 DIST rails-4.2.6.tgz 4179056 SHA256 68bf40c27e0ee75b26c7b48fbe357f024b8d6d322a4ecf5c3427b4d6ef959fef SHA512 040599aa1c6a09ca569f377b1f49a4404d9516599d16d6909f93ffd2e387dfb20835a2842980cc5c119aaef411985e47f55ec8907041ff633b8f98ea101a42d0 WHIRLPOOL 1aef2ff5790fa94f1003fa6acdcad26b7bcb6a6a02f075e41a6ba5a5b77790420afa57ea64d3192e92de595161ba3741e7e7f8be7dbac6871ba5137a53f81efe
 DIST rails-4.2.7.1.tgz 4181681 SHA256 bfa7854f1b35e449b78db2af83fe660f17b101a487728fcfc6fb623967fb4783 SHA512 b926b59822ddd0837a402d798a7f2c9152d9916805153d3cad081d47e692992cdf3c7aaf8af47b061e3d78f8f23357674c5a9ed6c945b082e2d8c909281f5527 WHIRLPOOL da253d85bdc93c500a220b7688597dcb86c192226f5532619d8bb081440326e4dba8cc78f3bf946f16fe67e28beae0274649533aaf966177295daff7c4bf1188
 DIST rails-4.2.7.tgz 4181136 SHA256 31005bc5892ef4d478016f4ef66c7708d0bfc440d917dac8a5e84a461fa2a980 SHA512 89df542cac1cf31be376fff3d919860168ce5df0dcd51035411a7f82a59a6fc27d8aecdd92dc20dee59831745ecab1ff8e404756dbc85a1ec08c3f2c1721e7dc WHIRLPOOL 15653098db0702b5e76e6fc4eba0f4fa6eaf73b30a23d1bf10e08cd999452608325ebba25c87b85d790ab49cf8ba216f40ee4dc25bd072cc8be89546af378542
+DIST rails-5.0.0.1.tgz 6139334 SHA256 3cbbe71d80c2813dde0d2bfa61aea57c8e6a1a3b2a81e6b211dbf2f2a4be2add SHA512 8e820f26543e8ad05b01a75e4e4df1adb229b5d90cfccd1b63d77a6ab25f232d24a875cd5630648e58c6598d741a3d35b2a76fd7e99a0f06971f84ee63ada56f WHIRLPOOL 9aed4fab1c8ea06185de5320ed85d6d51ed0babf6143c3d70df352adea5721c3074bb80c351b395752b2d8c60f5fcb8982b086e507836b9867d6597f2d72df4c
diff --git a/dev-ruby/railties/railties-5.0.0.1.ebuild b/dev-ruby/railties/railties-5.0.0.1.ebuild
new file mode 100644
index 000000000000..c4f6bf86bad5
--- /dev/null
+++ b/dev-ruby/railties/railties-5.0.0.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~amd64-linux"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=">=app-eselect/eselect-rails-0.22"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	>=dev-ruby/thor-0.18.1
+	>=dev-ruby/rake-0.8.7
+	dev-ruby/method_source
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/actionview-${PV}
+		dev-ruby/mocha:0.14
+	)"
+
+all_ruby_prepare() {
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+
+	# Also allow rdoc 4.x
+	sed -i -e 's/~> 3.4/>= 3.4/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+	elog "To select between slots of rails, use:"
+	elog "\teselect rails"
+
+	eselect rails update
+}
+
+pkg_postrm() {
+	eselect rails update
+}
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 5f7083f7fe80..8ec437880072 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,2 +1,3 @@
+DIST gtk-gnutella-1.1.10.tar.bz2 19827825 SHA256 95e2a030124e7cc05e19e351eebc16f40f4520381b7bb306e8b940ed4e2e6409 SHA512 33afdd8a98ff57f4fb5b91ba365921b8dbf72cc04431f95ff0d8162d37213861ea796f3b43d4fec257939d7a42822ab3e1ed80d49c9b93a1626024ee7ca7a13a WHIRLPOOL bbef0a0c2a05a8268e06a08d9c1f02136b81afb9a8b2a845242960a9abb88c6314072f793203c854d50b7493fa356cf234cadcde8bac4c2c0458955c279a5ec0
 DIST gtk-gnutella-1.1.8.tar.bz2 19690815 SHA256 271aadb6da4a807dd98094d7f2fa42a2215e273cdc799c188e68594896586079 SHA512 f1b0130a660d41690fb0555eae157c35c73bdd541ab7cce43acd3a0cc4fcb0fb00dc51947065c227df516062af944cc7267437c09f67bfb0dfa9b3dbf96bce2f WHIRLPOOL 568651daa74fb9b71f228a25d6f8086ec26646c521f8161ae85e5524d22c42d618017252dabe77d87468a4c3280754c1279a6d2c526cd7f805177e18e8614f16
 DIST gtk-gnutella-1.1.9.tar.bz2 19766381 SHA256 3b2e913969834a57edd93d22733646037b2a141172d5d4a240f5d6a9f56b6aff SHA512 45ea6a5d51592879e19c61e728a60c77352e7d9b0c92ef1ac5c4fa52db122d70fdcc3f724b8da36f5dab3cea3170ba214db2552c31a156ea71e45e3a0048940c WHIRLPOOL e528c00bff42642fe3e949a3a4d1b2dfb70fbc8e408a2e90926689d30b185ec6042807841921aa013d07064a9c5fe7a3f027d67f0ccac40bf4c2588175af2192
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.10.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.10.ebuild
new file mode 100644
index 000000000000..be3536464461
--- /dev/null
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.10.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+IUSE="nls dbus ssl +gtk"
+
+DESCRIPTION="A GTK+ Gnutella client"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-libs/zlib
+	gtk? ( >=x11-libs/gtk+-2.2.1:2 )
+	dbus? ( >=sys-apps/dbus-0.35.2 )
+	ssl? ( >=net-libs/gnutls-2.2.5 )
+	nls? ( >=sys-devel/gettext-0.11.5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	strip-linguas -i po
+
+	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
+	for ling in ${LINGUAS}; do
+		echo $ling >> po/LINGUAS
+	done
+
+	default
+}
+
+src_configure() {
+	# There is no option to turn off optimization through the build.sh
+	# script.
+	sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh || die
+
+	# The build script does not support the equivalent --enable
+	# options so we must construct the configuration by hand.
+
+	local myconf
+
+	if ! use nls; then
+		myconf="${myconf} --disable-nls"
+	fi
+
+	if ! use dbus; then
+		myconf="${myconf} --disable-dbus"
+	fi
+
+	if ! use ssl; then
+		myconf="${myconf} --disable-gnutls"
+	fi
+
+	if use gtk; then
+		myconf="${myconf} --gtk2"
+	else
+		myconf="${myconf} --topless"
+	fi
+
+	./build.sh \
+		--configure-only \
+		--prefix="/usr" \
+		--cc=$(tc-getCC) \
+		${myconf}
+}
+
+src_compile() {
+	# Build system is not parallel-safe, bug 500760
+	emake -j1
+}
+
+src_install() {
+	dodir /usr/bin
+	emake INSTALL_PREFIX="${D}" install || die "Install failed"
+	dodoc AUTHORS ChangeLog README TODO
+
+	# Touch the symbols file into the future to avoid warnings from
+	# gtk-gnutella later on, since we will most likely strip the binary.
+	touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die
+}