gentoo resync : 02.04.2018

3 files changed, 15 insertions, 8 deletions

diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index fcea87ca35bf..8759a6ffe56c 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,15 +1,15 @@
 DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
 DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
+DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651df49be3866e2df989d464a23ac5865081d243e6c6525837fb33099c46b6009cc667d0e03444cbcf9631588 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f
-DIST rails-5.1.2.tgz 6124489 BLAKE2B a7d71b99f1b9eb33e76c7941909407be0a3b086581bf3ddb4fe811a6b91bb129edb504c6fe3593a3b347ab035f7325e8e497b926a24b699a56725f89161e942e SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872
-DIST rails-5.1.3.tgz 6130089 BLAKE2B f61c016af6f5336726127372c1dd3d85088e11c0b58998ce40155b09087dcdb341a15d3ff57692d744538b571337a2e1e278542590d82077a35dc1e336539f85 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
+DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 EBUILD railties-4.2.10.ebuild 1717 BLAKE2B 3ff657f26f860f75d7c34be0410e06cf68f3a1ee79f6c3317af9cd75ac2f68d2ee43ace1c9ced96f7c8cd6c4339317dca56ae0808fb39c5600bb9c5802244287 SHA512 aecb917e4204cc2d7dd8948bcbebfcb9f4f01022d5c691f0aa4878e74b3ee3a7ee0044f54e0878db398a6af873e793b4c648d3d7a269b9f144288bb52bbeaf1d
 EBUILD railties-5.0.6.ebuild 1847 BLAKE2B cde912bbfe97eb8897785c6e7d1767b3ee6132bf2160c292f1c7e1dc9b273a09f67f5e807bc0801a685094ac11eb915b6a024550a3dc33746b5848089585eca6 SHA512 920393642215f96bf98b0d2ba3a18a5d323dd1cb109e9780f39e8de43d287b793d160c519f9d9cbc23cf031ace33fe283632d57941d8a30921fc0201bae54d2f
+EBUILD railties-5.0.7.ebuild 1847 BLAKE2B cde912bbfe97eb8897785c6e7d1767b3ee6132bf2160c292f1c7e1dc9b273a09f67f5e807bc0801a685094ac11eb915b6a024550a3dc33746b5848089585eca6 SHA512 920393642215f96bf98b0d2ba3a18a5d323dd1cb109e9780f39e8de43d287b793d160c519f9d9cbc23cf031ace33fe283632d57941d8a30921fc0201bae54d2f
 EBUILD railties-5.1.1.ebuild 1657 BLAKE2B c2e9911388c7a86b44a338a6def27f1facfbfde67ce6ad9e441c1197b868196c34dc75e12bf5e8d46f8d8179963beeb8a7d98f68f1dfb9bef4ff8acde2a2ffc4 SHA512 12288eb333550596cc1ba9de9eabc2cfd1fdb0f032a59725e6e507b3053db53d0feb06adbc2e6c1eb64e7cd58ce68848263b66b3f3e592c8112836afaaaca79b
-EBUILD railties-5.1.2.ebuild 1659 BLAKE2B 6766874a3ef38abcaf6836e24ea7f061c2bbdbe1e25cb9c8773cfc9c89d6754a65f904209e212f8e749f8b6af7b783e1ca45c7398b2c5b50d127749a4312fc14 SHA512 b4e966412bb95c62aa1aeab4e73a63d5942c0e3c4496a4b024ca7f99632c383cfa0c298399fcf22a0b04635bc12b084fec9782325ea14847c3db7d39a3339069
-EBUILD railties-5.1.3.ebuild 1659 BLAKE2B 6766874a3ef38abcaf6836e24ea7f061c2bbdbe1e25cb9c8773cfc9c89d6754a65f904209e212f8e749f8b6af7b783e1ca45c7398b2c5b50d127749a4312fc14 SHA512 b4e966412bb95c62aa1aeab4e73a63d5942c0e3c4496a4b024ca7f99632c383cfa0c298399fcf22a0b04635bc12b084fec9782325ea14847c3db7d39a3339069
 EBUILD railties-5.1.4.ebuild 1670 BLAKE2B 7d953780b258c60f033f5bd5c6e6b453687aca3de51805a745f08c032d2386a6b06af4cac2d2169aff145cf64ed2ef35057b0e466684cf878f1ae2b20b90ec81 SHA512 add35da11cf530b55e60d7382b0129ef43c75794b586e0c9b42a7e19a34969ab233672727b4d3397bcb67f44c969a409833ce6408e71f4626ceb2ef91148080f
 EBUILD railties-5.1.5.ebuild 1671 BLAKE2B 89d54e60f7fc09216c7c31cb44221a5e126e75ace5c6e2eec2a094328355044c09e764c6ed395b3058e4473fec24b89c101b555ed3af0d28024850d6ff35acae SHA512 10b0a2da5a63d928e84653dd50561ea9a7421f2cd8f0ab2f192c5d423441954ab9c17cd5d11d39f41a195ff2f7751b156f3e21c3eed3ec93ee745e06d064326e
+EBUILD railties-5.1.6.ebuild 1671 BLAKE2B 89d54e60f7fc09216c7c31cb44221a5e126e75ace5c6e2eec2a094328355044c09e764c6ed395b3058e4473fec24b89c101b555ed3af0d28024850d6ff35acae SHA512 10b0a2da5a63d928e84653dd50561ea9a7421f2cd8f0ab2f192c5d423441954ab9c17cd5d11d39f41a195ff2f7751b156f3e21c3eed3ec93ee745e06d064326e
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/railties/railties-5.1.3.ebuild b/dev-ruby/railties/railties-5.0.7.ebuild
index 1d5fa5c75186..82547a65b623 100644
--- a/dev-ruby/railties/railties-5.1.3.ebuild
+++ b/dev-ruby/railties/railties-5.0.7.ebuild
@@ -10,8 +10,8 @@ RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
 RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
 
-RUBY_FAKEGEM_BINDIR="exe"
 RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
 
 inherit ruby-fakegem versionator
 
@@ -21,7 +21,7 @@ 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 ~arm64 ~hppa ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -31,7 +31,7 @@ RUBY_S="rails-${PV}/${PN}"
 # investigation.
 RESTRICT="test"
 
-RDEPEND+=">=app-eselect/eselect-rails-0.23"
+RDEPEND+=">=app-eselect/eselect-rails-0.22"
 
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
@@ -51,6 +51,13 @@ 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
+
+	# Also install rails in bin to let our binwrapper work
+	mkdir bin || die
+	cp -f exe/rails bin/ || die
 }
 
 all_ruby_install() {
diff --git a/dev-ruby/railties/railties-5.1.2.ebuild b/dev-ruby/railties/railties-5.1.6.ebuild
index 1d5fa5c75186..45ce9539c7b0 100644
--- a/dev-ruby/railties/railties-5.1.2.ebuild
+++ b/dev-ruby/railties/railties-5.1.6.ebuild
@@ -21,7 +21,7 @@ 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 ~arm64 ~hppa ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"