From 2c212f8054356b5b45b1255f1111156c9def2290 Mon Sep 17 00:00:00 2001 From: Justin Lecher <jlec@gentoo.org> Date: Sun, 3 Apr 2016 12:29:59 +0200 Subject: virtual/ssh: Add lcaol USE description for minimal Bump to EAPI=6 Package-Manager: portage-2.2.28 Signed-off-by: Justin Lecher <jlec@gentoo.org> --- virtual/ssh/metadata.xml | 21 +++++++++++++-------- virtual/ssh/ssh-0.ebuild | 8 +++++--- 2 files changed, 18 insertions(+), 11 deletions(-) (limited to 'virtual') diff --git a/virtual/ssh/metadata.xml b/virtual/ssh/metadata.xml index eb93e99a3d93..ffc7aff5d5cc 100644 --- a/virtual/ssh/metadata.xml +++ b/virtual/ssh/metadata.xml @@ -1,12 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> -<maintainer type="project"> - <email>embedded@gentoo.org</email> - <name>Embedded Gentoo</name> -</maintainer> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <maintainer type="project"> + <email>embedded@gentoo.org</email> + <name>Embedded Gentoo</name> + </maintainer> + <use> + <flag name="minimal"> + Prefer <pkg>net-misc/dropbear</pkg> over <pkg>net-misc/openssh</pkg> + </flag> + </use> </pkgmetadata> diff --git a/virtual/ssh/ssh-0.ebuild b/virtual/ssh/ssh-0.ebuild index b16f73f943ca..778e620a4776 100644 --- a/virtual/ssh/ssh-0.ebuild +++ b/virtual/ssh/ssh-0.ebuild @@ -1,15 +1,17 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -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" IUSE="minimal" -RDEPEND="minimal? ( +RDEPEND=" + minimal? ( || ( net-misc/dropbear net-misc/openssh ) ) !minimal? ( -- cgit v1.2.3-65-gdbad