From e92e1e7f81f81cc1f835826fd23131f7200462ea Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 16 Feb 2022 12:21:18 +0100 Subject: [PATCH] virtual/ssh: Sync with gentoo It's from gentoo commit 38b155fa1bf907617067c98eb4ba3a5d0790eb1a. --- .../portage-stable/virtual/ssh/ChangeLog | 23 ------------------- .../portage-stable/virtual/ssh/Manifest | 20 ---------------- .../portage-stable/virtual/ssh/metadata.xml | 16 ++++++++++--- .../portage-stable/virtual/ssh/ssh-0.ebuild | 11 +++++---- 4 files changed, 19 insertions(+), 51 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/ssh/ChangeLog delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/ssh/Manifest diff --git a/sdk_container/src/third_party/portage-stable/virtual/ssh/ChangeLog b/sdk_container/src/third_party/portage-stable/virtual/ssh/ChangeLog deleted file mode 100644 index 51d95d8d44..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/ssh/ChangeLog +++ /dev/null @@ -1,23 +0,0 @@ -# ChangeLog for virtual/ssh -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/ssh/ChangeLog,v 1.6 2014/03/31 20:31:02 ulm Exp $ - - 31 Mar 2014; Ulrich Müller ssh-0.ebuild: - Update to EAPI 5. Remove empty variable assignments. - - 18 Jan 2014; Mike Frysinger ssh-0.ebuild: - Add arm64 love. - - 19 Feb 2013; Zac Medico ssh-0.ebuild: - Add ~arm-linux keyword. - - 29 May 2012; Alexis Ballier ssh-0.ebuild: - keyword ~amd64-fbsd - - 25 Sep 2011; Ulrich Mueller metadata.xml: - Remove myself as maintainer. - -*ssh-0 (16 Apr 2011) - - 16 Apr 2011; Ulrich Mueller +ssh-0.ebuild, +metadata.xml: - Initial import, bug 361121. diff --git a/sdk_container/src/third_party/portage-stable/virtual/ssh/Manifest b/sdk_container/src/third_party/portage-stable/virtual/ssh/Manifest deleted file mode 100644 index ec9bf28ca8..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/ssh/Manifest +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -EBUILD ssh-0.ebuild 748 SHA256 4b77dee202dee9a70257cb94aeb87289e805679ea8f3db822ec7b463fc2cab48 SHA512 648914f1e2822a3a65cd1976240665431729aa06b77e554e21b23b9a50e49140a1936d16cac19414f899db3c3b67a186ad660ac1c449de7cbb44d6ccb3a4f087 WHIRLPOOL aeeac5f18e0ae444c9065b8721514883f8115348bb0c6f7e83e4881ff41a30b2dd19d11dfe97deac40cef16ea4539cd30754c5d9bb3fd2bfb7d354ee55fa88e1 -MISC ChangeLog 791 SHA256 3baac70df299e281f7f6cd40654646437f880966c379e573660265ee5dd6f4be SHA512 e484e58a1ade30bd8d732d422ff2d428c120d549568c33f2fdc0a17886904730ab8a93b099733ffa445e8d8a02ea1ac3b70e007f09a847586b72db10a2541175 WHIRLPOOL 82c367417fe1486fbceb830c6db200dacf1666eadee5e28fe08b5189e3a17fd5558ddff7210de191b0f4328c1b11af8231942b885414727cd9147a5e21a97f3b -MISC metadata.xml 186 SHA256 04373079c085973d487fc4ef7d09068120b2c7a77ac582723926778c466fbdc0 SHA512 246e166ef2beb8ba1a6409f5f712583f72a5914160fdcd7d70d66007a81857462f2a29b1ee843c3018989ec72497919baa5f43339bec1ac8991152551ce7a4e4 WHIRLPOOL a07f2881788e80ed8005d6ac95d5cde132c8a51a405b18964ea02f16c14393c2d4e94de80af57b2c788e8d533421f21db8a65f3bedcd091038c9d19d1080eeca ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQGcBAEBCAAGBQJTOdIpAAoJEJQzkH1pP7W42VYMAISjA0s5Mjd+Im68jsH0Oivk -JSQiSwKzkwq68M6vcF/TzVC2dMtX+HaBAVSqudz2QlqEiV9+QCtUsymsP1ryGHZx -CPeg1sR7nVzBlQMSE3K0vK8DuEiE2MpcjRpEsE8KvH5Gtg2yS/wOPEdZ+eiCpuxY -Qw1cF5I1AB+ZuYRuAKPVzGEWBe3HCAgFmAadG0Uml4fhUQUhB6iPmAdVahmEIYuT -3fGRweHHfZFkr1+chLZUQcY9t1AZqAwHuYSAWOkplySkKBHK0FcJlMigLgpcDfT5 -YI/6DMg9Wlwj8eKnHF4i+vBCYP1aCNqtV5xpwWL6U5aC95QQlzmjqnWHgVa7LgJ+ -lIKaeduJe0pOiy80LeJd8fYz5Q0HHN7KvNU358xFdqqUjyRugwa7IIYZzLLPDx/2 -G9vewz9xwjlYNHLrGNwbborUrRQynIz+fK16BI57Y9MfzfknFsbbqLHWPATzT6n3 -JzHGEjmqHb+X9Opywn2uTpyobzlUXmmkdDfYcMZ+dA== -=l9Ss ------END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/virtual/ssh/metadata.xml b/sdk_container/src/third_party/portage-stable/virtual/ssh/metadata.xml index 810ac9554f..eb3803ed83 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/ssh/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/virtual/ssh/metadata.xml @@ -1,6 +1,16 @@ - + -base-system -embedded + + base-system@gentoo.org + Gentoo Base System + + + embedded@gentoo.org + Embedded Gentoo + + + Prefer net-misc/dropbear over net-misc/openssh + + diff --git a/sdk_container/src/third_party/portage-stable/virtual/ssh/ssh-0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/ssh/ssh-0.ebuild index fd5a3b7b20..d1ff1e609e 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/ssh/ssh-0.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/ssh/ssh-0.ebuild @@ -1,15 +1,16 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/ssh/ssh-0.ebuild,v 1.5 2014/03/31 20:31:02 ulm Exp $ -EAPI=5 +EAPI=6 DESCRIPTION="Virtual for SSH client and server" + SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="minimal" -RDEPEND="minimal? ( +RDEPEND=" + minimal? ( || ( net-misc/dropbear net-misc/openssh ) ) !minimal? (