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 <haubi@gentoo.org>

diff --git a/net-misc/openssh/openssh-7.5_p1-r5.ebuild b/net-misc/openssh/openssh-7.5_p1-r5.ebuild
index b7cbfffe532dfd36bf1d5d38fc706c178a95b9c8..5e5f120d02c75a4b0d3f70e257053ab1b3165842 100644 (file)
--- 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 7d0a5204c101473a1951fd870f6811890a206661..0fa469f8aae7dc80091ec6fa6987844cc03f32f8 100644 (file)
--- 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 b8112d8b26dd499b5a2239bdf080b6ed93e6212b..dff08081daae3899f68238c2c67ce5166bbf6269 100644 (file)
--- 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 be6bd81a689ac870e9149f254084f260a3b7c4b9..486408636fe3067a2dc4bdeb8485a6b34c0dceac 100644 (file)
--- 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 0416f497f799d3c7f836635c10ca0f1ff655e1c5..10288d4581cece764402015e76490e266a9f25a3 100644 (file)
--- 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 9aad1e38a38f987a11d2e55bd6fd80243a92b22f..b2157fa9bfd1eecea17a8e5c54afcad5304f7026 100644 (file)
--- 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="