gentoo resync : 25.08.2020

6 files changed, 4 insertions, 223 deletions

diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 51191b44a204..4cbb3dbbd5fc 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,11 +1,5 @@
 DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
-EBUILD railties-5.2.4.3.ebuild 1652 BLAKE2B 9af4a3cbbda94f9aa3a4b6093baebeaf228417ea5fc3899be97552a22aa509f83d32996d2b7a0a3268283df90d2f78d012ed4644a7e003f7fa796e4280bcdb8e SHA512 61080f4ffee8ee0acb44ea527d32a422f441c1fa733a0ae64f0c148e9ef4508520cbfd08553a3a8ca4928e09d5df7672d139ddee3405b7b2773965c95f7bb7d0
-EBUILD railties-6.0.2.2.ebuild 1600 BLAKE2B 440c867fa1a1dd8f8f0c4c3c9986b91ce4e7606221cb285d822f9f2d3d168190827405f0a7eeaf681002dc26fcb0ea97ec229030a513cde7b0e561812875ada4 SHA512 b6b45d1170b3cc69c575591ddb54e2d9686fae9293a59e867dc27a0ba51e596871ccdd081dd90c872bd38856892c42eff890b132f781ff4c22c58bf470a86b18
-EBUILD railties-6.0.3.1.ebuild 1607 BLAKE2B a692d83620a1ef55346d5d87fef2e0651edbf40d466865a979b6a14fbd776b71a7dc18b5fcba7304a1617a00c3934e583b8abe80e1ef8a96b323d23b93228894 SHA512 603feb43371a3e811a753d43285ba454235e25ec4128adae5e600fd30ce01dc233aaf2d7d505483bbead30727c2f44fe6a280def8cc1854b521a471e0bca295d
-EBUILD railties-6.0.3.2.ebuild 1607 BLAKE2B a692d83620a1ef55346d5d87fef2e0651edbf40d466865a979b6a14fbd776b71a7dc18b5fcba7304a1617a00c3934e583b8abe80e1ef8a96b323d23b93228894 SHA512 603feb43371a3e811a753d43285ba454235e25ec4128adae5e600fd30ce01dc233aaf2d7d505483bbead30727c2f44fe6a280def8cc1854b521a471e0bca295d
-EBUILD railties-6.0.3.ebuild 1607 BLAKE2B a692d83620a1ef55346d5d87fef2e0651edbf40d466865a979b6a14fbd776b71a7dc18b5fcba7304a1617a00c3934e583b8abe80e1ef8a96b323d23b93228894 SHA512 603feb43371a3e811a753d43285ba454235e25ec4128adae5e600fd30ce01dc233aaf2d7d505483bbead30727c2f44fe6a280def8cc1854b521a471e0bca295d
+EBUILD railties-5.2.4.3.ebuild 1677 BLAKE2B d601f23359cdf576011977ff20c04163a20143a9e24248e56afab2eac46824535f9c22df9b8575e7f9bccecbcda201412032fe70a2a89333e901597c81895564 SHA512 5240fec770a505a3f1748ab74f6edb2abbfae76ab6e0323c715aef497a945162f3c15c84aab1da41a7fe39d319f7c0afca2d136d48dae3ab0751915b0655848e
+EBUILD railties-6.0.3.2.ebuild 1632 BLAKE2B 239aba4d98294c747f6e99f720e69cbb79b9f86233c53a68e13b66c0e7bce9cba9b0f5d6c320e25dfe662fd4a99ed823c8037fc952a8930e3dcd467fd11ceb22 SHA512 037e009be08dc68e7fe952260a52ae1207f3c874696caf5a859e45885e589cec30495c741362703c4e08a8981823a4cd102c91fdf382c1d2446c4e1784eed63e
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/railties/railties-5.2.4.3.ebuild b/dev-ruby/railties/railties-5.2.4.3.ebuild
index 8759d5a09f8a..f63f0925afbc 100644
--- a/dev-ruby/railties/railties-5.2.4.3.ebuild
+++ b/dev-ruby/railties/railties-5.2.4.3.ebuild
@@ -36,7 +36,7 @@ RDEPEND+=">=app-eselect/eselect-rails-0.24"
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	~dev-ruby/actionpack-${PV}
-	>=dev-ruby/thor-0.18.1
+	|| ( dev-ruby/thor:1 >=dev-ruby/thor-0.18.1:0 )
 	>=dev-ruby/rake-0.8.7
 	dev-ruby/method_source
 "
diff --git a/dev-ruby/railties/railties-6.0.2.2.ebuild b/dev-ruby/railties/railties-6.0.2.2.ebuild
deleted file mode 100644
index 965e9f44c026..000000000000
--- a/dev-ruby/railties/railties-6.0.2.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-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="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-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.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	>=dev-ruby/thor-0.20.3
-	>=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
-}
-
-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/dev-ruby/railties/railties-6.0.3.1.ebuild b/dev-ruby/railties/railties-6.0.3.1.ebuild
deleted file mode 100644
index 828467ed5289..000000000000
--- a/dev-ruby/railties/railties-6.0.3.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-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="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-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.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	>=dev-ruby/thor-0.20.3
-	>=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
-}
-
-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/dev-ruby/railties/railties-6.0.3.2.ebuild b/dev-ruby/railties/railties-6.0.3.2.ebuild
index 828467ed5289..ac2c8ddd992c 100644
--- a/dev-ruby/railties/railties-6.0.3.2.ebuild
+++ b/dev-ruby/railties/railties-6.0.3.2.ebuild
@@ -36,7 +36,7 @@ RDEPEND+=">=app-eselect/eselect-rails-0.24"
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	~dev-ruby/actionpack-${PV}
-	>=dev-ruby/thor-0.20.3
+	|| ( dev-ruby/thor:1 >=dev-ruby/thor-0.18.1:0 )
 	>=dev-ruby/rake-0.8.7
 	dev-ruby/method_source
 "
diff --git a/dev-ruby/railties/railties-6.0.3.ebuild b/dev-ruby/railties/railties-6.0.3.ebuild
deleted file mode 100644
index 828467ed5289..000000000000
--- a/dev-ruby/railties/railties-6.0.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-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="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-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.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	>=dev-ruby/thor-0.20.3
-	>=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
-}
-
-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
-}