gentoo resync : 22.05.2021

5 files changed, 9 insertions, 9 deletions

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index bdb772016305..e9f2167e6b32 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -49,8 +49,8 @@ DIST openssh-8_4_P1-hpn-PeakTput-15.1.diff 2429 BLAKE2B fc2140f4036ef57b70936966
 DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a019996d275655b04997301e247f5c4dd7fad35d12b3b7c25afb1b078d915ef2a4ae02f736f0aec9ba2a8c56a405d7ca303bcadf7 SHA512 4c2dbf99a9b5953fdb955f700272bbaeaa025f108a8860d2190197962b849f8385327af82c4d6a3a130a7fba35a74a8ec9437d642867601acb29817c49632a8f
 DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241 SHA512 2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a
 DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c7777258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1 SHA512 c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914
-EBUILD openssh-8.4_p1-r3.ebuild 17690 BLAKE2B 4a4da9135299252827c3d7069add541c3b94c2bf83a090453779e648636b4c6aeb6795463e0a3800eb26e9182b3c3bd22a70a9a728d6230578b8cd21c9bba2cd SHA512 4cbd311dc5ecac80a71c51b55668bc5f92d071cce7adf44c1d7afe0789c43213a726e0b52649b88046253d65e44669c501618fd0d234fe8c9ed9c2e7b0a22dc6
-EBUILD openssh-8.5_p1-r1.ebuild 17581 BLAKE2B 37b5478e20633a7dc673f5ec6b502642ff8a43383c3f33f562f3b9e94ec0084efe0fb8cf55384c9dc5a84065e613749058efff5e80984659dcef323e3a007334 SHA512 30cffed24dd1479ba8b09ffe402ac9de304f318b1a33ec68481fe2753a706bc1b3b88760a5706e2fa40d7c3305caaa25ccfc97353920155c46b03062350b1a59
-EBUILD openssh-8.5_p1.ebuild 17596 BLAKE2B 169bc9eeb353595865df78455edfdb503ef83922bc81154f91618b45185c9f867d362466b11c344c89faa9efe353f1df63ce37f9559c690c2656dd387b65bcd9 SHA512 3a33fbdfd98564676ac66e17c34cc0143e7bfd69b7f1f9609340d0b91ca14d4737937b9efb4691116746aca29897a8f4f87bc1025020d9b74e37564e3627ce6a
-EBUILD openssh-8.6_p1-r1.ebuild 17662 BLAKE2B 9e3f543f66fcc30763f0f4f13b4393b962af3093f12fd545d360c0d69de0b9421641e4cce9de190f98991e87ae76326e8561a2d8e8301964fa0310d420d8ab1e SHA512 bb9481cc63f7b1f3e6224ddfcb999acc4950e4a305d100acc0435f8d83a42fe82a366f680d7b289f256dbc44f22a33e12ef66b78b6b3e93e52f0403a824d401c
+EBUILD openssh-8.4_p1-r3.ebuild 17681 BLAKE2B e3c13a7180491d36b97c3eafd3ded74b2535b065fd84fde9cbe2d9d0ca2183b2e22e659aaf9ae746346bd9be88f6531dd25fa3d1937f6a06761ce312f01ec8b6 SHA512 e66fa10dc28713a9e7fb8a3d5b3303973e9acc33b89c589bbab09c9bee8a29ab2a80791a31a371b6b5224ff9fa09de389432e4ecefb93f8c4ac2bc5c1181ec6a
+EBUILD openssh-8.5_p1-r1.ebuild 17572 BLAKE2B 8d25dca2f0af588bc56ced2b452f9b136514dec2e4dd270594c3c123eb07fecd4d51988bd23aa51d10350950c3f3856d4e4efd8f3fb43bae08127f38ea052f7f SHA512 15536c564e4855885d6a4aee15d1634666b15d827cb6aa8f5a98bc98cf39b1a62810120a10005eb8e8a5ecd855491359499a83bfb845ea67a92289237aa1378f
+EBUILD openssh-8.5_p1.ebuild 17587 BLAKE2B 0b69f26bb8917d041c08bac69401dbf45ab60bec22e552b619126dc0f73a70a49d8deabe152b890bae9e9776a05b238ff73ea144d27a5016cc1a47e58c3c7957 SHA512 a7813cdb227e57b39ce538268faaa9361ceab1c3e005d01027995e7c29ad293ec29344de2efd7e300d7389a1a2e0e5b0bb6993c360bceeb7a9d1002955ce8a12
+EBUILD openssh-8.6_p1-r1.ebuild 17654 BLAKE2B 39539eecb1ffb9c8e5c01a6c5063812fc2d90a06f231258148bbb9160b0e35473e7e1e020be300e87c803b577db872c1022aafd8c9d3efcf55ef03fd4511666e SHA512 a9f9bf2d3aa91eb083b3c488894ebbfbe107f6bd8afad26cf64be5250c9abc1d9104d22aff9d19ea6a1aeaebe80c224299b04058d9602afa3a3c4e850e30baf3
 MISC metadata.xml 2101 BLAKE2B fabe0e83b78f80666415646d7b85b296c8026f5e7465705555d03237a289208238e182919e75bec29d1113a5b7483a66b53a421e8881533af5d25c79521d9a08 SHA512 b9eb68f11fa10e763f529da88e252a94ccd89b41e857f39bf7c887ddc38c1bfd4aa9e9383a69c506080531f396ad5fdd9e1f811529a04864447a7b3e833c0e9f
diff --git a/net-misc/openssh/openssh-8.4_p1-r3.ebuild b/net-misc/openssh/openssh-8.4_p1-r3.ebuild
index ef43e0aa2027..bc42f87054e4 100644
--- a/net-misc/openssh/openssh-8.4_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-8.4_p1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
+inherit user-info flag-o-matic autotools pam systemd toolchain-funcs
 
 # Make it more portable between straight releases
 # and _p? releases.
diff --git a/net-misc/openssh/openssh-8.5_p1-r1.ebuild b/net-misc/openssh/openssh-8.5_p1-r1.ebuild
index b440e7aa4ae8..8aea025ac78a 100644
--- a/net-misc/openssh/openssh-8.5_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-8.5_p1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
+inherit user-info flag-o-matic autotools pam systemd toolchain-funcs
 
 # Make it more portable between straight releases
 # and _p? releases.
diff --git a/net-misc/openssh/openssh-8.5_p1.ebuild b/net-misc/openssh/openssh-8.5_p1.ebuild
index 1d37aa2af6c1..340080016b33 100644
--- a/net-misc/openssh/openssh-8.5_p1.ebuild
+++ b/net-misc/openssh/openssh-8.5_p1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
+inherit user-info flag-o-matic autotools pam systemd toolchain-funcs
 
 # Make it more portable between straight releases
 # and _p? releases.
diff --git a/net-misc/openssh/openssh-8.6_p1-r1.ebuild b/net-misc/openssh/openssh-8.6_p1-r1.ebuild
index bda61266ca34..ca2ff312f1a5 100644
--- a/net-misc/openssh/openssh-8.6_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-8.6_p1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
+inherit user-info flag-o-matic autotools pam systemd toolchain-funcs
 
 # Make it more portable between straight releases
 # and _p? releases.
@@ -50,7 +50,7 @@ REQUIRED_USE="
 "
 
 # tests currently fail with XMSS
-REQUIRED_USE="test? ( !xmss )"
+REQUIRED_USE+="test? ( !xmss )"
 
 LIB_DEPEND="
 	audit? ( sys-process/audit[static-libs(+)] )