gentoo resync : 23.06.2018

4 files changed, 6 insertions, 74 deletions

diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index 0a8c97d90947..35357f4740d3 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -1,9 +1,5 @@
 DIST net-ssh-git-2.10.0.tgz 172885 BLAKE2B 6b5c9928191fe40afe289fc2639d12e56160522c85553cba13393347c8ef02bbe6206dbefc23b65c04980cf9761b2b40a364d8e3e13e4073950736cf53fbf480 SHA512 f66db6465667baf0c253868cc15aab3261675a8c15ca4b244c3cd587ae5e8b7a273959b97d5fc498ff1b19e1f06f51ea571573d243366a59ef56faf41c2ae347
-DIST net-ssh-git-3.2.0.tgz 178267 BLAKE2B 37d9afe79bb39a714db8c5536ef86bf2a3d7819554d414773e97a0cbc054c40d12320b2a78cb539a66ab46f25e4d4abb69046421a77e8d54eb76b9d4611e97c4 SHA512 2c161e096515e2c9f6fe8ca11725b7b6a92ed1234b591714bfcce5b258a38bf3631fc552b1ef029dd27ba123cc82fee8f2431d61035f1ff99102ecdf26992d5c
-DIST net-ssh-git-4.1.0.tgz 194968 BLAKE2B 58d25601959939e7d7ceb7bdd09d7b5f583513aa73d30763d62b4adfe1b56b9f790a4e853ad5f16505c8ab71d7222db7649f119cceab849e457db8c6fe50eddf SHA512 48ca2a9f26b1dd25ce6ce026eacac73d6032ee4ac8f33f03dc700321f4fa4e2ea397d657db190a85c309c6d80be575218cf36f23cf214d7b1efee4f7d8e6255e
 DIST net-ssh-git-4.2.0.tgz 197417 BLAKE2B 5714185d9b83d3010e6b9baa07ac541e9227379cbfecc3a506d870d8d9fa528f59b605df4ff02ae6bfc16893bfb22734395096a77fcbe19fb939ecc1a343a9b5 SHA512 0a3609590d797a8cb4732e8cf743606a4919f57475b6eb2447a3db0c28f1bd405804fdc47a4062e503acdd4b785a1de9794a6db433cabb884105166eff6a8c5b
 EBUILD net-ssh-2.10.0.ebuild 858 BLAKE2B c2780b2cdb45c313638ef427dbdfd588e121449df679d5f1b7423dc489964681cb440dd7e1b54bd5cc131eb9f40e8dae05095b82a3a73edb1dda884bec2dad3a SHA512 7b5630727ba7547c4a6f86e89547270064b77ec874eff574bb724ec8347994e3e4f38e01d1f981da67b187942e7cf648c09681d6a046b0a4a27fa623f2381087
-EBUILD net-ssh-3.2.0.ebuild 874 BLAKE2B 19728a85a4be488e2dcbdee39202cfd7dfd2bc24fd63fe6edc568bbdb9214c4ed031cc8f835837873b3ae28e18233e3608fe899ac7f968738a3d7c0ca4c8b1ff SHA512 08f06237a9dfc57c2b3c9ae6cd5272b6bac2ff183566447dbba293372023ec1aa949c59f8a8ef17cec0260a23eed1c47f1bb2c798f17b7c353aa2a32e8edb3a2
-EBUILD net-ssh-4.1.0.ebuild 1082 BLAKE2B 7d6ccc6e862be5a220ededc31268a0d9ab48023a58751f83f395ae8c8beb72d3b42b2bc19319b092b042732eda5641870452638ddeaa6bf506c870118bce51e9 SHA512 af75f182c597752cce8b2bb13d8c19d7da52b6ddf6e9cf28509a10bec47d98e2741fbbba4da5b8ae36ed74a2df43698b9015f10c260a68af95065bfc2c7053a6
-EBUILD net-ssh-4.2.0.ebuild 973 BLAKE2B 0472deaa54ee3a474ed54406ad490082f3151a44d4e8042374c516911842459e8b3e0592729547a1dd445f823b10957f1aa95e98cdb029a0862e2af6ec1c84b3 SHA512 ca9031b7c3a3a38d28a23fc68eedf704251bb6d0211bb13de239df45ed66cc49f74eceb376987fc6da29c8be19fcf8f65a5684fe361e0c0a6c8766fa0d6b49a3
+EBUILD net-ssh-4.2.0.ebuild 1106 BLAKE2B 0ec6f872ccd878f9bc2af78098287cc4e918893e88bb8712b16f4fef5a733d5306aa1350190a344048d12aa3a1560b46bad56a5868dc682700c4f825e23b2150 SHA512 17b60cc8f4bc9b615ba95e5200b63f501f2d545ebae1ebd18e29bb5f013afdfc7f97f7e9d031fbef7704d7955dacf5dcaa65c71e282e716cfd630ecd1b20bf85
 MISC metadata.xml 460 BLAKE2B fcbb901a6f9f2c80489e28346a21ea7cf5dcf7eed49c72dcf8cad079fdb2f52969d03b619d4535206c078c9d2d3a6c0492b035919eef89b3eec8207ea7e3ecb6 SHA512 9e66fd4626a890ca908b35e1cba4b5712ceef882fd6dd1f72ef20e6b07ca0b32cd3fd92d84cd0816c38cbc1d3d76152fccdd1e90d901b3d0f8b096b3274b8cf4
diff --git a/dev-ruby/net-ssh/net-ssh-3.2.0.ebuild b/dev-ruby/net-ssh/net-ssh-3.2.0.ebuild
deleted file mode 100644
index 4497d953188f..000000000000
--- a/dev-ruby/net-ssh/net-ssh-3.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ruby24: code is not compatible
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc THANKS.txt"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-interactive SSH processing in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-ssh"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend "virtual/ruby-ssl"
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/test_all.rb || die "Tests failed."
-}
diff --git a/dev-ruby/net-ssh/net-ssh-4.1.0.ebuild b/dev-ruby/net-ssh/net-ssh-4.1.0.ebuild
deleted file mode 100644
index 15323590fc92..000000000000
--- a/dev-ruby/net-ssh/net-ssh-4.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc THANKS.txt"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-interactive SSH processing in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-ssh"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="sodium test"
-
-ruby_add_rdepend "virtual/ruby-ssl sodium? ( dev-ruby/rbnacl:4 dev-ruby/bcrypt_pbkdf )"
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
-
-all_ruby_prepare() {
-	# Don't use a ruby-bundled version of libsodium
-	sed -i -e '/rbnacl\/libsodium/ s:^:#:' lib/net/ssh/authentication/ed25519.rb || die
-
-	# Avoid bundler dependency
-	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/test_all.rb || die "Tests failed."
-}
diff --git a/dev-ruby/net-ssh/net-ssh-4.2.0.ebuild b/dev-ruby/net-ssh/net-ssh-4.2.0.ebuild
index cd46a77e129a..6d01274e11ab 100644
--- a/dev-ruby/net-ssh/net-ssh-4.2.0.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-4.2.0.ebuild
@@ -27,6 +27,11 @@ all_ruby_prepare() {
 	# Don't use a ruby-bundled version of libsodium
 	sed -i -e '/rbnacl\/libsodium/ s:^:#:' lib/net/ssh/authentication/ed25519.rb || die
 
+	# Don' try to use libsodium-related tests with USE=-sodium
+	if ! use sodium ; then
+		rm -f test/authentication/test_ed25519.rb
+	fi
+
 	# Avoid bundler dependency
 	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
 }