gentoo Easter resync : 12.04.2020

4 files changed, 50 insertions, 12 deletions

diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index 178a5792cff5..70eb339ed6b1 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -1,10 +1,12 @@
 AUX capistrano-2.15.5-sudo-cleanup.patch 656 BLAKE2B 06c0d83cf2b20337d7692ca3286a6ab8fb3797d67d81ee3498a5cd49f37d94458d19afda1eebc4904c5209809ab869087cd6568af1a4c89aba1b2a2826226fb5 SHA512 846f9c25b1c7806d082ec73faa2b5b9d4b6be285a33acf1d98dc36b9eddab54d664d915c3bab1da28fa2d86225fb1619fd746354cd605b8e3e8a5d0a05cfb96f
 DIST capistrano-2.15.5.gem 132096 BLAKE2B bbaa6bd482cf9bbe7aa01540aa5dab3f32401ffa1476d9057bb8ad420194f1ab2c32d8e744d7c982ebece5c4b5369133dc8378b7adf54c78732f9cb249db2a9e SHA512 10168080c7481ec6fc6f918ac90a3b1ce8f2b36f77411375e33cc915b02d5196ab061ac47e767edd724c82cffd1c2ad0a23ba1f0519cf1f2aae5b429167b19ff
-DIST capistrano-3.11.0.gem 78336 BLAKE2B f4e3ac2c796aae12ca575e1b5f1e42d993ad13580d790c3cc392322c40486121d8dbd7bf0f0fa75c3ee59396c0dd91164b2112d30b4270b302a9f1556fe866bb SHA512 d8b635de223a0574c17dff6fdfe4007741f823e24f376cc22129b709d40792d02965b72465aeeb54560f22522dafe255f094bde9a23aa259bca9d4933585e212
 DIST capistrano-3.11.2.gem 69120 BLAKE2B 17c31ce8bc78540167c11313bc75d89591041e2471c133cb69c85c4aa14efe670e1614cb132aca60cc4b3a907ea25167591d4f78bd38315a4b643a4d3f3b417f SHA512 727cf5074d1761662230c57c1a12f376358d6a54d9de215857b1782784bc3cb428eeda6ff78fa9fc2a9adfc2f2a490f1c72b86e0ca112039de8172dfe3898b5c
 DIST capistrano-3.12.0.gem 69120 BLAKE2B d7556022025560dd00a89710daea07c40270650f72d37d990dec201c779b1d69f8250b827b25495bfc1055fe4d0ffbdd5d66bd6686405c16645d79f824fdbef9 SHA512 7b90a366a48e4aeef97e9a51d0907a0f5aa27d7c0602ae80b503735496d0a0302bff0208e678f5a4d186caa9f8f02ad81953a6c378e13dd91f160f59f74fcd18
-EBUILD capistrano-2.15.5-r2.ebuild 1243 BLAKE2B 55ddf65a863b97b137f614c2216c098c9db1138c1022df80d6050793e15371320ebfa20bc9dbfc17e4f52c7caf65669c1b7deb476ad79ed42fa92e673afce1dc SHA512 d689d98d6d74a1ebcaed190d751124693c17798fd6ee4a6de96bc06948fc79c09afd19b2d2fb96997d1c3ece1a8f3a318609c8c5dbbc0340492841814b9ec9cd
-EBUILD capistrano-3.11.0.ebuild 960 BLAKE2B 5b176cc70c6c29ce6f2af63f7d9d6a0207af86c44564c988610cbf3a684df033d111a24ab52b24f0b735c55080f60d9c47ce0c51c78b8e060bed9760c8c5e7a2 SHA512 5e1b826fc8c53252cdc5d13e1ca58175a5017a617f710aa12af729d53729522238b86d012c9767cb24f4fb79c1b524b679a47118a4eb70ffae9aa89ba8b4f233
+DIST capistrano-3.12.1.gem 69120 BLAKE2B ba465fc3eca0ed8917d7b8d5aba0b43017f8a6de17e2734ed654c66cfca6072e68cb2db7414b19bc2f60901245207d4cff067dc0e7b82554e118d306816eac73 SHA512 cddbf583f57af2961fecacc59249d43c15393c665e9eaaa493553bd29f88f947d73a449bdabfb589db78caee4bdcc706ab3adc021a75893c31c79c7e0ebb2ee3
+DIST capistrano-3.13.0.gem 69120 BLAKE2B 394f60d9a3acfef44eacef356908d10d5c7f64010d644fbae988e399b1b8cdd07c1d93b4a6a4894816dc94bcf61180a2bd5f4663b1f014a64ae07ffb82252a90 SHA512 fe7cba9ecfe54d9f8c557dd4e1f8b1ed1269c7aa1e8c687d55fb035b3666ff92ee93895610f0582d139dec56a78c84754208e2aa99d6fc3f4f46c3d45142e2d9
+EBUILD capistrano-2.15.5-r2.ebuild 1243 BLAKE2B 8407e666498857250b1413411137ee58a11f37533df500f3929801ad1337e72764dbe7be710eed9615a59c65b4e27dac853249e338c7163965f1aa0d6a3f5069 SHA512 909ba2dd134d225dd8272913845d6d1f80f25bea41f589597b1b9aad18d1957ad5aaa269dd9e39ad2bc27037d1c4d4d96a7fe1213c4c7ad55a1c7bd53c8572a3
 EBUILD capistrano-3.11.2.ebuild 925 BLAKE2B 4646005c51f55dacc6142c68f5fa35c6a9b35fd5cacb4f10f5c7d1bf662f2a005d53caa97d7c2d859145f5c0d79ca1a6c2e3d043edecc8a59dfc0a100be07112 SHA512 e5a5475335242113c096e4945ba74b9667d84ce0146f605aca880d4317b770fa1f2ea4773aeb22504cd7be9cdb394f9dacd056f6ed477980d9a9e575acc8561d
 EBUILD capistrano-3.12.0.ebuild 926 BLAKE2B a4d7e28359be35573c458107ba17d05e6470f367dc1c71bcdb5809be0e128ceb6129775850353cb8f7ee0a22d992c9158fa6888aa7a474113e7c58f5e12f6e30 SHA512 4d64494fe679729de181bd24d508f9689a3479e18d726960e87599ccdc4b8b8a89cef120aeea24ed9dbfe3fb1e37fb628a78a614d7ef48045e84fd8cabea8360
+EBUILD capistrano-3.12.1.ebuild 926 BLAKE2B a4d7e28359be35573c458107ba17d05e6470f367dc1c71bcdb5809be0e128ceb6129775850353cb8f7ee0a22d992c9158fa6888aa7a474113e7c58f5e12f6e30 SHA512 4d64494fe679729de181bd24d508f9689a3479e18d726960e87599ccdc4b8b8a89cef120aeea24ed9dbfe3fb1e37fb628a78a614d7ef48045e84fd8cabea8360
+EBUILD capistrano-3.13.0.ebuild 926 BLAKE2B a4d7e28359be35573c458107ba17d05e6470f367dc1c71bcdb5809be0e128ceb6129775850353cb8f7ee0a22d992c9158fa6888aa7a474113e7c58f5e12f6e30 SHA512 4d64494fe679729de181bd24d508f9689a3479e18d726960e87599ccdc4b8b8a89cef120aeea24ed9dbfe3fb1e37fb628a78a614d7ef48045e84fd8cabea8360
 MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild b/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild
index 59cecde8c10c..a309c7379100 100644
--- a/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild
+++ b/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
diff --git a/dev-ruby/capistrano/capistrano-3.11.0.ebuild b/dev-ruby/capistrano/capistrano-3.12.1.ebuild
index 24a5bb6af1e8..8fbec0f004ec 100644
--- a/dev-ruby/capistrano/capistrano-3.11.0.ebuild
+++ b/dev-ruby/capistrano/capistrano-3.12.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
-RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
 inherit ruby-fakegem
@@ -16,15 +16,14 @@ HOMEPAGE="https://capistranorb.com/"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE=""
 
 ruby_add_rdepend "
 	>=dev-ruby/airbrussh-1.0.0
 	>=dev-ruby/sshkit-1.9:0
 	>=dev-ruby/rake-10.0.0
-	dev-ruby/i18n:*
-	!!<dev-ruby/capistrano-2.15.5-r2"
+	dev-ruby/i18n:*"
 ruby_add_bdepend "
 	test? (	dev-ruby/mocha )"
 
diff --git a/dev-ruby/capistrano/capistrano-3.13.0.ebuild b/dev-ruby/capistrano/capistrano-3.13.0.ebuild
new file mode 100644
index 000000000000..8fbec0f004ec
--- /dev/null
+++ b/dev-ruby/capistrano/capistrano-3.13.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A distributed application deployment system"
+HOMEPAGE="https://capistranorb.com/"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/airbrussh-1.0.0
+	>=dev-ruby/sshkit-1.9:0
+	>=dev-ruby/rake-10.0.0
+	dev-ruby/i18n:*"
+ruby_add_bdepend "
+	test? (	dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	# Avoid specs that depend on capistrano already being installed
+	rm -f spec/lib/capistrano/doctor/gems_doctor_spec.rb || die
+
+	# Avoid specs that require a TTY
+	sed -i -e '/asking for a variable/,/^  end/ s:^:#:' spec/integration/dsl_spec.rb || die
+	rm -f spec/lib/capistrano/configuration/question_spec.rb || die
+}