gentoo resync : 08.07.2021

6 files changed, 51 insertions, 119 deletions

diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index 7cff055ea948..a5d0187bf8c7 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -1,14 +1,9 @@
 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.13.0.gem 69120 BLAKE2B 394f60d9a3acfef44eacef356908d10d5c7f64010d644fbae988e399b1b8cdd07c1d93b4a6a4894816dc94bcf61180a2bd5f4663b1f014a64ae07ffb82252a90 SHA512 fe7cba9ecfe54d9f8c557dd4e1f8b1ed1269c7aa1e8c687d55fb035b3666ff92ee93895610f0582d139dec56a78c84754208e2aa99d6fc3f4f46c3d45142e2d9
-DIST capistrano-3.14.0.gem 69120 BLAKE2B e9c503a43cdb5f943c84882cc728cf4004afae194a94de763872c8f20eec80a9b6fc05c723cbab0e5ee41d87cfca8947ea62a28ca1d32e6bd2b86f52d1ea859c SHA512 5f117a6efec1a35a188f1ea57f1738bc41bdf3614b77a61ca2e941480d36d74e392400543948a55c054871beb88563489115bb69fb34bfb9f0c32a371966cd42
-DIST capistrano-3.14.1.gem 69120 BLAKE2B 33e351a98aea540a5903f68be6fbdde8c104be5ca66de707963f0a3b5c3460a086b5656fbc1cf98e37bed1507fb98856821a0633c2b86694112f5d357dfe8186 SHA512 10071c5b2ccadfd41ca321f21731dca8bafcc8efbcbdaf8099c562188d1cf802bc8c3845644c3ba301e4d9954fd8ab2c9022ee734f580a8be55b6dd8918cf11b
-DIST capistrano-3.15.0.gem 69120 BLAKE2B 07887b773b9ec3570d9103a35880fe84b1205ce7a53b15584c98b0ea38e236816d68ccae261e35e4d79b09f7f6fe48d1f4fa9b2daf41350cb119345c7ff597c0 SHA512 087825839239f66f004c2c079a3b1d3553465c2ca4da8bc67e737fcfadf22b618ff70542ba5c255cc47e2047245aa5b57148432a68afcf48dedbe96e0257931c
 DIST capistrano-3.16.0.gem 69120 BLAKE2B 3e1c4f639c2d5cd36ae305746f53e68350d5eee39fbd5c5ec828ea5b69f47a3a5f8b4e6f4b65de2e24717f71cf4a9443879fc3d076474ab020e2023372085180 SHA512 ec5aa465065cd115f0a1b7db06b7c68f2034e81feb3b814b730a6aca464756e545fd5c065ea941a3076bb637448e2a0f04aeb56de2578cdf22a6f208d27a2219
 EBUILD capistrano-2.15.5-r2.ebuild 1233 BLAKE2B 224bd9e8f1429a7857c2d00fcd49ce5c4a5938926f718e676687437b15990d2437752f974e3967ad3562d4f49b2da1c57cdc44f60eeaa453f956478e3971edcc SHA512 5c8278e6fa7ccd6fdc8db10478396b6dc00aac73f36d37229d3773a5df43c4b79982390bc44aa7ac0ad7f32280d41f00c2c4b0cc5a045c393ee37062fc9c51cd
+EBUILD capistrano-2.15.5-r3.ebuild 1243 BLAKE2B 3fdd7e2c2b26a39b2f590b82fa5018d2d95276892fe8a7479d790ec5beaf27c864bb4e4e627059bcdb51c8b184dbec15edd0bfb9570d6f56f4cbd04b22913ab5 SHA512 260ad225666f8229de86fc34f3b69414e9235fd44c80933feaafa4ac5dc1f85e3c7eff574c6a0246b2ab525c79b6ad4c0475588373060bbe30897472d59a616e
 EBUILD capistrano-3.13.0.ebuild 925 BLAKE2B 4646005c51f55dacc6142c68f5fa35c6a9b35fd5cacb4f10f5c7d1bf662f2a005d53caa97d7c2d859145f5c0d79ca1a6c2e3d043edecc8a59dfc0a100be07112 SHA512 e5a5475335242113c096e4945ba74b9667d84ce0146f605aca880d4317b770fa1f2ea4773aeb22504cd7be9cdb394f9dacd056f6ed477980d9a9e575acc8561d
-EBUILD capistrano-3.14.0.ebuild 926 BLAKE2B a4d7e28359be35573c458107ba17d05e6470f367dc1c71bcdb5809be0e128ceb6129775850353cb8f7ee0a22d992c9158fa6888aa7a474113e7c58f5e12f6e30 SHA512 4d64494fe679729de181bd24d508f9689a3479e18d726960e87599ccdc4b8b8a89cef120aeea24ed9dbfe3fb1e37fb628a78a614d7ef48045e84fd8cabea8360
-EBUILD capistrano-3.14.1.ebuild 926 BLAKE2B 221720b5ff0b5e60d376cebb57cc5ed8b52f1fa0e1745e32e79160d1d848e8ff0a94ea61cf75e58426e48b5dd45a72eec1e99f733bc8a8bec50ba7ae92c93bf5 SHA512 e510204b30df795c1954d1b645d5f6b7b7708f72af2868659d4ca33b7053240ddcb63c2de163000223ff13f2582b1ef2c65b25d10198c0aa26df8dd919b83e88
-EBUILD capistrano-3.15.0.ebuild 926 BLAKE2B 45f336d61b7a2273384f424ec80b1d299c7d217a2d0aa6397da9300ae952b46cd23783e2784e60a537b669af4c89524ea9b69d59fbf8928a0c954acd863cf3d9 SHA512 e9dff6c2b92578982aad9588b870234fccdd7b51c53aafbfbb8ea3e52b7c5b1c584558cd6a9a19eb992e37c162bc5bca6a6cd54e97caf67d6045d9339f937720
-EBUILD capistrano-3.16.0.ebuild 926 BLAKE2B 45f336d61b7a2273384f424ec80b1d299c7d217a2d0aa6397da9300ae952b46cd23783e2784e60a537b669af4c89524ea9b69d59fbf8928a0c954acd863cf3d9 SHA512 e9dff6c2b92578982aad9588b870234fccdd7b51c53aafbfbb8ea3e52b7c5b1c584558cd6a9a19eb992e37c162bc5bca6a6cd54e97caf67d6045d9339f937720
+EBUILD capistrano-3.16.0.ebuild 925 BLAKE2B bc050c047edfae2e35d848149c247626aab342d588798355d85ec1cb17b60aaa0fc015468a0ad0c1d8264db412e6c963592aabbdef393ff5e0e218efd9e614a2 SHA512 3ec663167b9bab9dfef3cf44ffe55b3ee210d1e8f4bbbfef339211016993183167af5c13b5af13ef3fb987c7b735a629c358d8249f4ae4d4ba6a9070d0fb6215
 MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/capistrano/capistrano-2.15.5-r3.ebuild b/dev-ruby/capistrano/capistrano-2.15.5-r3.ebuild
new file mode 100644
index 000000000000..6beebd2f0210
--- /dev/null
+++ b/dev-ruby/capistrano/capistrano-2.15.5-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A distributed application deployment system"
+HOMEPAGE="https://capistranorb.com/"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/net-ssh-2.0.14:*
+	>=dev-ruby/net-sftp-2.0.2
+	>=dev-ruby/net-scp-1.0.2
+	>=dev-ruby/net-ssh-gateway-1.1.0:*
+	>=dev-ruby/highline-1.2.7"
+ruby_add_bdepend "
+	test? (	dev-ruby/mocha:0.14 )"
+
+PATCHES=( "${FILESDIR}/${P}-sudo-cleanup.patch" )
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile test/utils.rb || die
+	sed -i -e '/pry/ s:^:#:' -e '4igem "mocha", "~>0.14.0"' test/utils.rb || die
+
+	# Avoid copy strategy tests since these fail in some cases due to
+	# complicated (aka unknown) interactions with other parts of the
+	# test suite.
+	rm test/deploy/strategy/copy_test.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper cap /usr/bin/cap-2 'gem "capistrano", "~>2.0"'
+}
diff --git a/dev-ruby/capistrano/capistrano-3.14.0.ebuild b/dev-ruby/capistrano/capistrano-3.14.0.ebuild
deleted file mode 100644
index 8fbec0f004ec..000000000000
--- a/dev-ruby/capistrano/capistrano-3.14.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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
-}
diff --git a/dev-ruby/capistrano/capistrano-3.14.1.ebuild b/dev-ruby/capistrano/capistrano-3.14.1.ebuild
deleted file mode 100644
index d927d910300a..000000000000
--- a/dev-ruby/capistrano/capistrano-3.14.1.ebuild
+++ /dev/null
@@ -1,37 +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_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
-}
diff --git a/dev-ruby/capistrano/capistrano-3.15.0.ebuild b/dev-ruby/capistrano/capistrano-3.15.0.ebuild
deleted file mode 100644
index 5972f35d3692..000000000000
--- a/dev-ruby/capistrano/capistrano-3.15.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-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
-}
diff --git a/dev-ruby/capistrano/capistrano-3.16.0.ebuild b/dev-ruby/capistrano/capistrano-3.16.0.ebuild
index 5972f35d3692..c6f673eacd24 100644
--- a/dev-ruby/capistrano/capistrano-3.16.0.ebuild
+++ b/dev-ruby/capistrano/capistrano-3.16.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://capistranorb.com/"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 ruby_add_rdepend "