From dcbc43341eda8aa75b81c1837f7d9dbc04dc613e Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Tue, 10 Mar 2020 10:55:52 +0100 Subject: [PATCH] net-misc/openssh: no sys-apps/shadow in prefix-guest Closes: https://bugs.gentoo.org/712040 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Michael Haubenwallner --- net-misc/openssh/openssh-7.5_p1-r5.ebuild | 2 +- net-misc/openssh/openssh-7.7_p1-r10.ebuild | 2 +- net-misc/openssh/openssh-7.9_p1-r5.ebuild | 2 +- net-misc/openssh/openssh-8.0_p1-r5.ebuild | 2 +- net-misc/openssh/openssh-8.1_p1-r3.ebuild | 2 +- net-misc/openssh/openssh-8.2_p1-r5.ebuild | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net-misc/openssh/openssh-7.5_p1-r5.ebuild b/net-misc/openssh/openssh-7.5_p1-r5.ebuild index b7cbfffe532d..5e5f120d02c7 100644 --- a/net-misc/openssh/openssh-7.5_p1-r5.ebuild +++ b/net-misc/openssh/openssh-7.5_p1-r5.ebuild @@ -67,7 +67,7 @@ DEPEND="${RDEPEND} sys-devel/autoconf" RDEPEND="${RDEPEND} pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( sys-apps/shadow ) + userland_GNU? ( !prefix-guest? ( sys-apps/shadow ) ) X? ( x11-apps/xauth )" S=${WORKDIR}/${PARCH} diff --git a/net-misc/openssh/openssh-7.7_p1-r10.ebuild b/net-misc/openssh/openssh-7.7_p1-r10.ebuild index 7d0a5204c101..0fa469f8aae7 100644 --- a/net-misc/openssh/openssh-7.7_p1-r10.ebuild +++ b/net-misc/openssh/openssh-7.7_p1-r10.ebuild @@ -66,7 +66,7 @@ DEPEND="${RDEPEND} sys-devel/autoconf" RDEPEND="${RDEPEND} pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( sys-apps/shadow ) + userland_GNU? ( !prefix-guest? ( sys-apps/shadow ) ) X? ( x11-apps/xauth )" S="${WORKDIR}/${PARCH}" diff --git a/net-misc/openssh/openssh-7.9_p1-r5.ebuild b/net-misc/openssh/openssh-7.9_p1-r5.ebuild index b8112d8b26dd..dff08081daae 100644 --- a/net-misc/openssh/openssh-7.9_p1-r5.ebuild +++ b/net-misc/openssh/openssh-7.9_p1-r5.ebuild @@ -78,7 +78,7 @@ DEPEND="${RDEPEND} sys-devel/autoconf" RDEPEND="${RDEPEND} pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( sys-apps/shadow ) + userland_GNU? ( !prefix-guest? ( sys-apps/shadow ) ) X? ( x11-apps/xauth )" S="${WORKDIR}/${PARCH}" diff --git a/net-misc/openssh/openssh-8.0_p1-r5.ebuild b/net-misc/openssh/openssh-8.0_p1-r5.ebuild index be6bd81a689a..486408636fe3 100644 --- a/net-misc/openssh/openssh-8.0_p1-r5.ebuild +++ b/net-misc/openssh/openssh-8.0_p1-r5.ebuild @@ -79,7 +79,7 @@ DEPEND="${RDEPEND} sys-devel/autoconf" RDEPEND="${RDEPEND} pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( sys-apps/shadow ) + userland_GNU? ( !prefix-guest? ( sys-apps/shadow ) ) X? ( x11-apps/xauth )" S="${WORKDIR}/${PARCH}" diff --git a/net-misc/openssh/openssh-8.1_p1-r3.ebuild b/net-misc/openssh/openssh-8.1_p1-r3.ebuild index 0416f497f799..10288d4581ce 100644 --- a/net-misc/openssh/openssh-8.1_p1-r3.ebuild +++ b/net-misc/openssh/openssh-8.1_p1-r3.ebuild @@ -87,7 +87,7 @@ DEPEND="${RDEPEND} " RDEPEND="${RDEPEND} pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( sys-apps/shadow ) + userland_GNU? ( !prefix-guest? ( sys-apps/shadow ) ) X? ( x11-apps/xauth ) " BDEPEND=" diff --git a/net-misc/openssh/openssh-8.2_p1-r5.ebuild b/net-misc/openssh/openssh-8.2_p1-r5.ebuild index 9aad1e38a38f..b2157fa9bfd1 100644 --- a/net-misc/openssh/openssh-8.2_p1-r5.ebuild +++ b/net-misc/openssh/openssh-8.2_p1-r5.ebuild @@ -86,7 +86,7 @@ DEPEND="${RDEPEND} " RDEPEND="${RDEPEND} pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( sys-apps/shadow ) + userland_GNU? ( !prefix-guest? ( sys-apps/shadow ) ) X? ( x11-apps/xauth ) " BDEPEND=" -- 2.26.2