gentoo resync : 25.08.2020

4 files changed, 9 insertions, 55 deletions

diff --git a/dev-ruby/net-scp/Manifest b/dev-ruby/net-scp/Manifest
index 9630905508d7..afd18697f5ac 100644
--- a/dev-ruby/net-scp/Manifest
+++ b/dev-ruby/net-scp/Manifest
@@ -6,9 +6,7 @@ AUX net-scp-1.2.1-fix-upload_tests.patch 562 BLAKE2B d6f6aaad4dca5c54158219f1a36
 AUX net-scp-1.2.1-raise-correct-errors-net-ssh-4.0-compat.patch 1230 BLAKE2B 52d3657f71b06a5561e44e8d408127fefc83bf1e05097f835522719bdab0bec1139fa3332fa55d23d386ae4528318f8cded62222a8ddf39dfe216369e510839c SHA512 45b93d1a197776ee6afde01292e9b87d24d66685a72fc5311fbd504ca429f0cfb14fb9fc1f21dd9092024de17e78e26d71e8928448bdeed279eba14393949c26
 AUX net-scp-1.2.1-raise-correct-errors.patch 3046 BLAKE2B aa0e36edfdc85c944d3ba34d351abe93a7ade694e81240c47956b5767ac6491b954755ea05de27dfaaefa7ea1d628c632aeaaef6061f8017e9b2c114d923382b SHA512 0ff40b546aff5d0bec7245325d5e076de06f719512e51aadfd2f3b66f727c97164629e37b85fc0073eb7134cee3de43b4a0287e965012758c5fd997eebf9ec6e
 DIST net-scp-1.2.1.gem 32768 BLAKE2B 67abf0b66aa6e8f28bdfa314a20f594eedafc5aeaf5d0ae8884cb7e27203699a791623968da98aaebda1630d47bf5859cc3e38875fe17dc8c7ce7926b50848a5 SHA512 64645a4517d6e408e3acfdb24576c8ded3b6ff981035ca10a2e081f9e3ab093f97b4848da4acca03ade364483766677e31296d09a31db4c81eb40123fc966829
-DIST net-scp-2.0.0.tar.gz 27835 BLAKE2B 2f5c9504ade26226a31fd766869f4deef3b344e99e71f780f184361efc75cad880c0dd266779d7f2550f176a86e89740edf27943c9ed81691378e5c3bf3241f0 SHA512 cd3470dfb2afba91911c429828d158e97e4feb17e211807abb05ab251622dc066e392521de250a8f2d4cf9d53c79598d636ef70c559b6aca7e1e7aa59ea3b36e
 DIST net-scp-3.0.0.tar.gz 27947 BLAKE2B 78a1100b7602b9c09c8f06228b6e564fce15133c6cf8c9816613cb56b1d3805d9393700eb66c3710e482771e4116beae393c12ad12963b85428e21e7cf105218 SHA512 6d68b75124ccd2d387983f6d66a8b0e040132ba17d942631c806e899dff757ffae7a031a27ea0988166bf56e803c1a6175199845a848b92c7064388564e0ac79
-EBUILD net-scp-1.2.1-r1.ebuild 1127 BLAKE2B 09ef4de63e9204224eaca6a35fbe1718f2e72e94290c497681413358589897e18a15c5e3f06b38b04fc300fd5772c81e85996e52b3f8e5af4845931ace31e34b SHA512 20bf82aecc0a1c23f24026695ee1b8b0dc4271d1eae5af68ad4d945369ac2af96d26e856dcd520260a21ce8922e77fe5e105182ea07cd8de5c175aa9cf86e1f4
-EBUILD net-scp-2.0.0.ebuild 1128 BLAKE2B 66b805e501c4799fe7d6b1a6d1161b896a78eed58fb8d54539c5feef8632edcd5306d5395b336cd3b3969899ef7285ab32aee6c5c127d19ca238b3c7a324f9ed SHA512 b4ee431b74a2df0dd91d77e9fb2224914eabe1e1250e65f38c6e1890c2edba808caa23c41f31a4e0839c70426f70ab6a0af689857f67b4e000b43e41a1074036
-EBUILD net-scp-3.0.0.ebuild 1116 BLAKE2B db0252494d9234466cfa3b0bc39a7d77d4821f45fb9ad87b391e551a174cdfce7bf090f82a00659b5475db397c960dad38f2a3d99d4deea915dc191a8c1a9f87 SHA512 5dbfa21c451fc1f2bde6e932358f71ea108f34797dcbdaca49c404582636eea66da8b8abb210d31367e4996bc304fc23c905e4afe4182f0285bfad1eb46ebf79
+EBUILD net-scp-1.2.1-r1.ebuild 1049 BLAKE2B 4fc89439a3aee87f978af30430f3647745cb6e07ff23de29509bb1c946a2a2dde9ceda0631db9ef87f73f448874b2ace4209dbeff742a50860f8ce4747e88c73 SHA512 6c6451ac9388c5dd229c66d6360bee5aa8d5187c9b1ff25251be391aeef28028ea96dabc2d14e9ebb5ec46a28b4cee8d2021edb0fd5af47d7d401cdd114b66b4
+EBUILD net-scp-3.0.0.ebuild 1059 BLAKE2B 2c66a545770c1d42256c642ea2571f521419a16a1a8c49d6b9c38fc4dd7302ce716c06003db43cb1ccac883bc83ff8dc09473b063beee03553cdb8e5dad63410 SHA512 8fd94ca329feed6e295d74e35371f3d5a3bf848886ca63ce3257ea862a9de8a0c66a5baf2d529b7b2cd0aa39a97ca0a26876f79c2baf123675e8dc62de9f2526
 MISC metadata.xml 341 BLAKE2B aec6f820a216a818e7f6a82ffe48f73a01cc662d9a5e10a5dee98885f564560644e377158ccd5c4cb6e914205fa5aa6753aaf5dcd52e1849437955553f3c268c SHA512 bbb71a6668f329ca9b1f5636aa71720a8234a7683fe374b2fde4113ff56d3a5c2242bcba7e3023090a7955870715e0040d990326942def6d3be7e31d5f07d39c
diff --git a/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild b/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild
index d717fa4a1aa6..d55e7f25496d 100644
--- a/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild
+++ b/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -30,13 +30,13 @@ RUBY_PATCHES=(
 	)
 
 ruby_add_bdepend "
-	doc? ( || ( dev-ruby/net-ssh:5 dev-ruby/net-ssh:4 ) )
+	doc? ( dev-ruby/net-ssh:5 )
 	test? (
-		|| ( dev-ruby/net-ssh:5 dev-ruby/net-ssh:4 )
+		dev-ruby/net-ssh:5
 		dev-ruby/mocha
 	)"
 
-ruby_add_rdepend "|| ( dev-ruby/net-ssh:5 dev-ruby/net-ssh:4 )"
+ruby_add_rdepend "dev-ruby/net-ssh:5"
 
 all_ruby_prepare() {
 	sed -i -e 's/>= 2.0.0/~> 2.0/' test/common.rb || die
diff --git a/dev-ruby/net-scp/net-scp-2.0.0.ebuild b/dev-ruby/net-scp/net-scp-2.0.0.ebuild
deleted file mode 100644
index 8c3e84358cc6..000000000000
--- a/dev-ruby/net-scp/net-scp-2.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby implementation of the SCP client protocol"
-HOMEPAGE="https://github.com/net-ssh/net-scp"
-SRC_URI="https://github.com/net-ssh/net-scp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_PATCHES=(
-	${P}-raise-correct-errors.patch
-	${P}-fix-common.path
-	${P}-fix-download_test.patch
-	${P}-fix-download_test_2.patch
-	${P}-fix-download_test_3.patch
-	${P}-fix-upload_tests.patch
-	${P}-raise-correct-errors-net-ssh-4.0-compat.patch
-	)
-
-ruby_add_bdepend "
-	doc? ( || ( dev-ruby/net-ssh:5 dev-ruby/net-ssh:4 ) )
-	test? (
-		|| ( dev-ruby/net-ssh:5 dev-ruby/net-ssh:4 )
-		dev-ruby/mocha
-	)"
-
-ruby_add_rdepend "|| ( dev-ruby/net-ssh:5 dev-ruby/net-ssh:4 )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/test_all.rb || die
-}
diff --git a/dev-ruby/net-scp/net-scp-3.0.0.ebuild b/dev-ruby/net-scp/net-scp-3.0.0.ebuild
index 78ae6a9954b5..b1666cda478e 100644
--- a/dev-ruby/net-scp/net-scp-3.0.0.ebuild
+++ b/dev-ruby/net-scp/net-scp-3.0.0.ebuild
@@ -23,13 +23,13 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 IUSE=""
 
 ruby_add_bdepend "
-	doc? ( || ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 dev-ruby/net-ssh:4 ) )
+	doc? ( || ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 ) )
 	test? (
-		|| ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 dev-ruby/net-ssh:4 )
+		|| ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 )
 		dev-ruby/mocha
 	)"
 
-ruby_add_rdepend "|| ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 dev-ruby/net-ssh:4 )"
+ruby_add_rdepend "|| ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 )"
 
 all_ruby_prepare() {
 	sed -e "s:_relative ': './:" \