gentoo resync : 21.07.2018

3 files changed, 4 insertions, 50 deletions

diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 959685343914..751a2fee8ba8 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,15 +1,13 @@
 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.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
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
 EBUILD activemodel-4.2.10.ebuild 1499 BLAKE2B 7cc5ec14bca05ddbe528396c7f721f28015d711dcefdaa2e45addb1887473cc4b9ca2f34859ef22f8b40c8dcb697588531e6dbdcb719d9a9a8c5d19ee9640ed7 SHA512 8b01a0317dd860a4196a70d44630924a02caecc09c8fbaa787a66f4f794975e2722cf886d107d42e4060e4d71cff133512cebc3d1e211ec035a5740578b297b8
-EBUILD activemodel-5.0.6.ebuild 1049 BLAKE2B c9c18543ca2671932e46098cd7baf12b29059ad74e3785a0c174296c93a693e9e09b5955c71e7d7b1f3f67dd92f2025df337dfad31eee953fd738324fad547ce SHA512 3c6c3121f4eeb2f5770366924883dc312d0413ddba3de490d4eb44822d7cd6d2e5f815ab93b38992ba48de2e9ce6e4a681c9e98ef7cf33031a07c5bbfc510d50
 EBUILD activemodel-5.0.7.ebuild 1049 BLAKE2B c9c18543ca2671932e46098cd7baf12b29059ad74e3785a0c174296c93a693e9e09b5955c71e7d7b1f3f67dd92f2025df337dfad31eee953fd738324fad547ce SHA512 3c6c3121f4eeb2f5770366924883dc312d0413ddba3de490d4eb44822d7cd6d2e5f815ab93b38992ba48de2e9ce6e4a681c9e98ef7cf33031a07c5bbfc510d50
 EBUILD activemodel-5.1.4.ebuild 1072 BLAKE2B dee7ef7b1c90455a737cde502105ec1a9b5b4b6362dc115d4f5fa2f4057bd19bf2ba2c79ccd1ce81cf5fe74a3399efd9e511a3e60034bc20f8d04321a7392080 SHA512 d39122a4323f0ad9ac1ddbebfd5c7c579c216682e7676f5f3025ab11a44d8a9366671c2c7f860bef1ed721a630a36a37fb0649897c6b7e9935eb61707151490b
 EBUILD activemodel-5.1.5.ebuild 1073 BLAKE2B 2f5781d6165bdd88e801cd598dbcfb123f99bbfbc68428fe3aac48b5dba83d4a4e7820c2ce588ae2452dca2db0d4e40fb02b41a133bb00ad5b84989759acca06 SHA512 afb9244e7d717cf10c681ca2a3b62fae982d58b91f0dcf60be9854b580e7ad787bff501c52adf7cb27e72969bef2fc2574aa61c468f727f1b2641ac13790036a
-EBUILD activemodel-5.1.6.ebuild 1073 BLAKE2B 2f5781d6165bdd88e801cd598dbcfb123f99bbfbc68428fe3aac48b5dba83d4a4e7820c2ce588ae2452dca2db0d4e40fb02b41a133bb00ad5b84989759acca06 SHA512 afb9244e7d717cf10c681ca2a3b62fae982d58b91f0dcf60be9854b580e7ad787bff501c52adf7cb27e72969bef2fc2574aa61c468f727f1b2641ac13790036a
+EBUILD activemodel-5.1.6.ebuild 1128 BLAKE2B 2fc63660f837f86752d5f00f61232e76ab31e62a8848ae49bdfa02895fad2f72371b4874993389299adbd8f5c68dcb722e6692a5e003b9beab58ab74dfd3a035 SHA512 2b180c4ba579b11fb455495f97eef341d5b7757207b153ac8459f5a44a1f3ffb8e2cc3b3e42e014c8ab4c979a6717f4a8642f5bb528c05a5e50596b3d616097b
 EBUILD activemodel-5.2.0.ebuild 1059 BLAKE2B 70b0fc0b667b918a04486d26eacd0b46a6797b9ab50396752ab35d7de908a348638d66e5519f711f12676aeb61cbfb1534fa95c2557ddd8012ec57c68ca09f17 SHA512 8e17729197e212eaf4efd6f56e1ae1d350be6560f36677d8f417db63fbc4a47421c0cd36186e2f18f469cddfe2a5c10e5cdcf8a7380d967e3a38f7550d82837a
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activemodel/activemodel-5.0.6.ebuild b/dev-ruby/activemodel/activemodel-5.0.6.ebuild
deleted file mode 100644
index a7adb554db31..000000000000
--- a/dev-ruby/activemodel/activemodel-5.0.6.ebuild
+++ /dev/null
@@ -1,44 +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_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 ~hppa ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/railties:5.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-		>=dev-ruby/bcrypt-ruby-3.1.7
-		dev-ruby/bundler
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "activesupport", "~>5.0.0"; gem "railties", "~>5.0.0"' test/cases/helper.rb || die
-}
diff --git a/dev-ruby/activemodel/activemodel-5.1.6.ebuild b/dev-ruby/activemodel/activemodel-5.1.6.ebuild
index a0b573ba9df5..b9653e5377c3 100644
--- a/dev-ruby/activemodel/activemodel-5.1.6.ebuild
+++ b/dev-ruby/activemodel/activemodel-5.1.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
@@ -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 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -40,5 +40,5 @@ ruby_add_bdepend "
 
 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"
+	sed -i -e '/load_paths/d ; 1igem "activesupport", "~>5.1.6" ; gem "railties", "~>5.1.6"' test/cases/helper.rb || die "Unable to remove load paths"
 }