gentoo resync : 21.07.2018

3 files changed, 4 insertions, 60 deletions

diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 88e1feeae480..7ce7acf9a427 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/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 actionview-4.2.10.ebuild 1540 BLAKE2B 0be7bac1a0113b5d07b8f5cf7632c1387177ef615a151b47519353ec6f498d8f7bf930fe841b03b1ef48e96cb3fcc6e2db6f4ea8b8869f2849a8551687d935ff SHA512 6a9cb78813408092737682398c6f909c7be13654f09c555c88293885c5a8f6e9f9e9d60968df27d2054ca18ff9de3009fd8eb884a4eea8cd36cb2fb06168015a
-EBUILD actionview-5.0.6.ebuild 1839 BLAKE2B 766842730ddb8927b3be2fb39382ec1689e558a8df29ad66e5ca9757d5cd822fe5ffa40ab558cd7f2d608c346359966deb61bd9bf10d78f22690d3d2a0320f79 SHA512 5db463c1aeb7c227b2fc260b6f9a053281809541614db067edcaeb192cb5b361aa9297d36f1862770efad3f4b9bffbb10fa6796814d5f1a9800a9b47cf6b95a2
 EBUILD actionview-5.0.7.ebuild 1839 BLAKE2B 766842730ddb8927b3be2fb39382ec1689e558a8df29ad66e5ca9757d5cd822fe5ffa40ab558cd7f2d608c346359966deb61bd9bf10d78f22690d3d2a0320f79 SHA512 5db463c1aeb7c227b2fc260b6f9a053281809541614db067edcaeb192cb5b361aa9297d36f1862770efad3f4b9bffbb10fa6796814d5f1a9800a9b47cf6b95a2
 EBUILD actionview-5.1.4.ebuild 1756 BLAKE2B c154d68ac1efe85f9fe58d4605915ac457d23201447284c070e4e376c8161d81c7f7cde71b8090b88c19efe14d619cce54985ad42374da9ae2f6301a0737c4dc SHA512 7d21a6d903260203b96f7ea725bb2d9a72a25ae90a4ff84d7a5d302f349a4f85c6735bdad874fafa39f7988ce15100cbca634ea73bb7ec80845ea90b7ce7a084
 EBUILD actionview-5.1.5.ebuild 1757 BLAKE2B 186d24cfa202cb32fc97791e9d957c69f09e9af8293fd6ce09dbb70dea96835a337b7eea36f4a5757aaf2900dfa8e6844007f907f1d12dfc144aa404ed20b67a SHA512 45daa6fe7a74262b1aedabcf5280786f3282ddf5d29dc646092c82b6754b05014e1a81f768bde5661f5fbef248ff5c964267e150b85055d78ce3249afa3e3285
-EBUILD actionview-5.1.6.ebuild 1757 BLAKE2B 186d24cfa202cb32fc97791e9d957c69f09e9af8293fd6ce09dbb70dea96835a337b7eea36f4a5757aaf2900dfa8e6844007f907f1d12dfc144aa404ed20b67a SHA512 45daa6fe7a74262b1aedabcf5280786f3282ddf5d29dc646092c82b6754b05014e1a81f768bde5661f5fbef248ff5c964267e150b85055d78ce3249afa3e3285
+EBUILD actionview-5.1.6.ebuild 1887 BLAKE2B 75354ee4950ae9bb6c67b5b878c85c7436b9a5cc462f10eb06178c8a3c5eb8c4ba0c462b06daa71990caaabc486431bee2a05bf54d44d79219b84c89d1664ab0 SHA512 42caafaa2a8b9959383419715d0f1287f22f17a357d1358b2a4b0fe0de6605dffdec6985e3579049f112e6cf8322971590f32d12a66f1a6b0bb99ecca3c9c180
 EBUILD actionview-5.2.0.ebuild 1752 BLAKE2B f5df1ae26919c1671d24396e870ffa22615a082e843794e17be6da618aadac44af1615d4c41e28b13633ce634eabc18e6b67c92a5d94345e51b678f55f4ef0c0 SHA512 b95cfb9bb71c5ed58286b2b4dd0dd19be223c954cf2e689f48117f5c4fd0c1da0e0b4b17b2792542acc0bf883f6564758cde5377d7041cb90e584fd2f274dd52
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionview/actionview-5.0.6.ebuild b/dev-ruby/actionview/actionview-5.0.6.ebuild
deleted file mode 100644
index 671fde0cad4a..000000000000
--- a/dev-ruby/actionview/actionview-5.0.6.ebuild
+++ /dev/null
@@ -1,56 +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="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 ~hppa ~x86 ~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.3:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		~dev-ruby/railties-${PV}
-		~dev-ruby/activerecord-${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 '1igem "railties", "~>5.0.0"; gem "activerecord", "~>5.0.0"' test/abstract_unit.rb || die
-	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/actionview/actionview-5.1.6.ebuild b/dev-ruby/actionview/actionview-5.1.6.ebuild
index a8a2e7bf010c..649b600b5204 100644
--- a/dev-ruby/actionview/actionview-5.1.6.ebuild
+++ b/dev-ruby/actionview/actionview-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 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -52,4 +52,6 @@ all_ruby_prepare() {
 	# 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
+
+	sed -i -e '1igem "activerecord", "~>5.1.0"; gem "actionpack", "~>5.1.0"; gem "railties", "~>5.1.0"' test/abstract_unit.rb || die
 }