gentoo resync : 25.08.2020

7 files changed, 3 insertions, 180 deletions

diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index 4b1d0213b26e..75a6289082bd 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -1,12 +1,5 @@
-DIST net-ssh-git-4.2.0.tgz 197417 BLAKE2B 5714185d9b83d3010e6b9baa07ac541e9227379cbfecc3a506d870d8d9fa528f59b605df4ff02ae6bfc16893bfb22734395096a77fcbe19fb939ecc1a343a9b5 SHA512 0a3609590d797a8cb4732e8cf743606a4919f57475b6eb2447a3db0c28f1bd405804fdc47a4062e503acdd4b785a1de9794a6db433cabb884105166eff6a8c5b
 DIST net-ssh-git-5.2.0.tgz 209986 BLAKE2B 6a1bc97da733420607c6ebe69a01f42d58998297a12394a29c9b4f5af425781d6b1b3535cecef21a0918eefc2e032f519fce9c5691c0a735c7810452f468d780 SHA512 cf2fa9817b124f0f35115abef51a4865073b3126b94d66cd307994bba06745513aaab1c1bcf64907a7b3bbce793b272b3f521cfa93f9339ca78ec8cef09cbeeb
-DIST net-ssh-git-6.0.0.tgz 218503 BLAKE2B 5cd2126513233eaf169fd0eab4876e7c0c4b61f7cb3df19d7e369403fbba39ee68f4ade61ec58ed9124c460af5d39bc93ccf32a320ea19d02fc3d34bb8413f37 SHA512 18dd1f694e6b57f6f22c356a0726f5eb8aff9921f097b50f072c2829c4bda8fa697c5e71a49da862beca59a703a3146b29b80f8b5dfed3a3b661e05bc68b3387
-DIST net-ssh-git-6.0.2.tgz 219657 BLAKE2B c514237e6edf4a9f7581850a1a5ecce352fd5f56c633587ddc26571c6bff06172f177168d8e55d053615050fff5d7f0946c4aafc0e31890ea630b741c99b27ee SHA512 f6fa4ab3b009429e08d76bf412bb0a93083c17d58ad6e24cef7d4152915dca2d335a533223ff57b65c9053a7ed5df4905e3231d50b0d52ea03f6403a6c1cdec4
 DIST net-ssh-git-6.1.0.tgz 220190 BLAKE2B a5ae0f15cf3dac8934de0b3216541415cc947214ea33d57770b5f2bf2594fa5b29b8dd9a417233de0ed243a12cdc547e5e87861767c5bbc65adb90cdbe58a484 SHA512 1d92ad19cb8bf80aec4ada23c49b91588c722551695cb0dd7b2954001fd71b4b4c030f8317b86766451847273c6116baa041c03e2415df2b0f81b20551dd8566
-EBUILD net-ssh-4.2.0.ebuild 1111 BLAKE2B 46f70eafbe7498c6ffcd621e3d7a4f0543bb91d0d52ece3a9ca55ec2888428d8ee728993ff326c205fa2dc0a0514cf8a7ca3c444b8b13f07f3ec40527af97de5 SHA512 0c076ea6e44ee5697428c7d2cec3780f1c7f522008abf0267cac9be1aa0868faca8aace807fb811e5917511f083dcb0b757a3996a9070bd1d72c9fa77e4a7e07
 EBUILD net-ssh-5.2.0.ebuild 1032 BLAKE2B e19af0235144a5bbfa6e15c3a94789cfa6116a77a56b64e70040546849a06f8072632dff3fcb55e29576317438ac48c715aedb9d093933775b4759426e020d71 SHA512 03ef7ae6bd2ae1537c11ca88f250dbf0eb79f3d0a9db1dc30f386cfa165b6f4d1095e848da9c156cc31185fa8b5374c739c289558fdea3e06a06507106852b12
-EBUILD net-ssh-6.0.0.ebuild 1219 BLAKE2B 134cd76dc5ec6be617b7a051e4798829e7f5fd6fe1d719c7f8382eb76dd7ea933cd845b9f91f44d130375226cab06eb05c62ddebcf4c7358e82dd4f1ed66139e SHA512 aec9e65566a6f64dfae1ff4fa44e41ec8e5b519e28a592815696393a4e348b7ffe712913be0efe390cb5425042b83e65419571427e9864460deaa6c2ced2265e
-EBUILD net-ssh-6.0.2.ebuild 1219 BLAKE2B 134cd76dc5ec6be617b7a051e4798829e7f5fd6fe1d719c7f8382eb76dd7ea933cd845b9f91f44d130375226cab06eb05c62ddebcf4c7358e82dd4f1ed66139e SHA512 aec9e65566a6f64dfae1ff4fa44e41ec8e5b519e28a592815696393a4e348b7ffe712913be0efe390cb5425042b83e65419571427e9864460deaa6c2ced2265e
-EBUILD net-ssh-6.1.0-r1.ebuild 1213 BLAKE2B 1d624e35251dba60eb578e0d2c06b31ac85d9640c2294b8a68b3025ee97eb15408c9290b71567393c5ec426538159adcd178cc84d28b8357e3f9ced03e7fe5f4 SHA512 a84c088cbca94b4b7b52424c60ceca842fc25b23c27ca28d01c8fd8b59b9b28312dedecaa8571eb2aea8a5a8afa2dc4ef772c1089659ea65a4cba435e8e4526c
-EBUILD net-ssh-6.1.0.ebuild 1219 BLAKE2B 134cd76dc5ec6be617b7a051e4798829e7f5fd6fe1d719c7f8382eb76dd7ea933cd845b9f91f44d130375226cab06eb05c62ddebcf4c7358e82dd4f1ed66139e SHA512 aec9e65566a6f64dfae1ff4fa44e41ec8e5b519e28a592815696393a4e348b7ffe712913be0efe390cb5425042b83e65419571427e9864460deaa6c2ced2265e
-MISC metadata.xml 542 BLAKE2B 0afb600fb7668a66e39bfe556157fa6a91eaf67299ba7560a550d041fced876a66ffc83700983fa4f3249a35785e93a7d980ff0940365df1fac626f22189a863 SHA512 f350079143da9f4e43f9da43556d343c01b88782a3d4fe8bdc08a7c901308f352fc9cfd0f998bd4471bed923ccbee0fd1d6112cfe91fa7b71ce9f39a665bcd60
+EBUILD net-ssh-6.1.0-r1.ebuild 1231 BLAKE2B 56e31d1a651b9ae9b5db8b1933d06e07bd17bef7623d99b88ba085c3ca0cd55cc5706c05225b02b140e2916670143f9eb187e3475fbd1f0590b05929fcadf928 SHA512 7892cf258a259135d913b0cd0f0585cb1f0545119f58f9d78bc7063f0a2ebe0fec0f235ef89e70441b9fc71dad0a8a02f686d174eca73042e1d6d76ae75a63e0
+MISC metadata.xml 428 BLAKE2B 3dcb89f3a919b176d290976f356a0ccd824e269e275833a5efa11af6ef0aec7de60ae16e317dc2b701a38ca04a63c09703b4966ecb1ae6c0c57a6c0b2ba89d01 SHA512 b1cd707db456ee3fb06baecf055ae472d37e1e46e923f538341e3ad441042ccc68b45d4267dcb2c58423e8f3b243bbe101a89332881f9cbb3932fa72d3c228b3
diff --git a/dev-ruby/net-ssh/metadata.xml b/dev-ruby/net-ssh/metadata.xml
index b6f4d7853048..44662ed6731e 100644
--- a/dev-ruby/net-ssh/metadata.xml
+++ b/dev-ruby/net-ssh/metadata.xml
@@ -10,6 +10,5 @@
 	</upstream>
 	<use>
 		<flag name="ed25519">Use <pkg>dev-ruby/ed25519</pkg> for Ed25519 support</flag>
-		<flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> via <pkg>dev-ruby/rbnacl</pkg> for Ed25519 support</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-ruby/net-ssh/net-ssh-4.2.0.ebuild b/dev-ruby/net-ssh/net-ssh-4.2.0.ebuild
deleted file mode 100644
index a1cd8e45c46a..000000000000
--- a/dev-ruby/net-ssh/net-ssh-4.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-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 ~arm 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
-
-	# 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
-}
diff --git a/dev-ruby/net-ssh/net-ssh-6.0.0.ebuild b/dev-ruby/net-ssh/net-ssh-6.0.0.ebuild
deleted file mode 100644
index 124bde4b5785..000000000000
--- a/dev-ruby/net-ssh/net-ssh-6.0.0.ebuild
+++ /dev/null
@@ -1,44 +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 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.md THANKS.txt"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-RUBY_FAKEGEM_GEMSPEC="net-ssh.gemspec"
-
-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="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="ed25519 test"
-
-ruby_add_rdepend "virtual/ruby-ssl ed25519? ( >=dev-ruby/ed25519-1.2:1 dev-ruby/bcrypt_pbkdf:1 )"
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
-
-all_ruby_prepare() {
-	# Avoid bundler dependency
-	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
-
-	sed -e "s:require_relative ':require './:" \
-		-e 's/git ls-files -z/find -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-src_test() {
-	# prevent tests from trying to connect to ssh-agent socket and failing
-	unset SSH_AUTH_SOCK
-	if ! use ed25519; then
-		export NET_SSH_NO_ED25519=true
-	fi
-	ruby-ng_src_test
-}
diff --git a/dev-ruby/net-ssh/net-ssh-6.0.2.ebuild b/dev-ruby/net-ssh/net-ssh-6.0.2.ebuild
deleted file mode 100644
index 124bde4b5785..000000000000
--- a/dev-ruby/net-ssh/net-ssh-6.0.2.ebuild
+++ /dev/null
@@ -1,44 +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 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.md THANKS.txt"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-RUBY_FAKEGEM_GEMSPEC="net-ssh.gemspec"
-
-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="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="ed25519 test"
-
-ruby_add_rdepend "virtual/ruby-ssl ed25519? ( >=dev-ruby/ed25519-1.2:1 dev-ruby/bcrypt_pbkdf:1 )"
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
-
-all_ruby_prepare() {
-	# Avoid bundler dependency
-	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
-
-	sed -e "s:require_relative ':require './:" \
-		-e 's/git ls-files -z/find -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-src_test() {
-	# prevent tests from trying to connect to ssh-agent socket and failing
-	unset SSH_AUTH_SOCK
-	if ! use ed25519; then
-		export NET_SSH_NO_ED25519=true
-	fi
-	ruby-ng_src_test
-}
diff --git a/dev-ruby/net-ssh/net-ssh-6.1.0-r1.ebuild b/dev-ruby/net-ssh/net-ssh-6.1.0-r1.ebuild
index e99cacb26708..dccb52657443 100644
--- a/dev-ruby/net-ssh/net-ssh-6.1.0-r1.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-6.1.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${P
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="ed25519 test"
 
 ruby_add_rdepend "virtual/ruby-ssl ed25519? ( >=dev-ruby/ed25519-1.2:1 dev-ruby/x25519 dev-ruby/bcrypt_pbkdf:1 )"
diff --git a/dev-ruby/net-ssh/net-ssh-6.1.0.ebuild b/dev-ruby/net-ssh/net-ssh-6.1.0.ebuild
deleted file mode 100644
index 124bde4b5785..000000000000
--- a/dev-ruby/net-ssh/net-ssh-6.1.0.ebuild
+++ /dev/null
@@ -1,44 +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 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.md THANKS.txt"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-RUBY_FAKEGEM_GEMSPEC="net-ssh.gemspec"
-
-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="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="ed25519 test"
-
-ruby_add_rdepend "virtual/ruby-ssl ed25519? ( >=dev-ruby/ed25519-1.2:1 dev-ruby/bcrypt_pbkdf:1 )"
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
-
-all_ruby_prepare() {
-	# Avoid bundler dependency
-	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
-
-	sed -e "s:require_relative ':require './:" \
-		-e 's/git ls-files -z/find -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-src_test() {
-	# prevent tests from trying to connect to ssh-agent socket and failing
-	unset SSH_AUTH_SOCK
-	if ! use ed25519; then
-		export NET_SSH_NO_ED25519=true
-	fi
-	ruby-ng_src_test
-}