From: Benda Xu Date: Mon, 16 Mar 2020 12:40:20 +0000 (+0800) Subject: net-misc/openssh: no sys-apps/shadow in prefix. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=846c38951ad42771f83af7db9e4d66c6fa31294c;p=gentoo.git net-misc/openssh: no sys-apps/shadow in prefix. Closes: https://bugs.gentoo.org/712040 Package-Manager: Portage-2.3.88, Repoman-2.3.18 Signed-off-by: Benda Xu --- diff --git a/net-misc/openssh/openssh-7.5_p1-r5.ebuild b/net-misc/openssh/openssh-7.5_p1-r5.ebuild index 5e5f120d02c7..863231391d32 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? ( !prefix-guest? ( sys-apps/shadow ) ) + userland_GNU? ( !prefix? ( 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 0fa469f8aae7..75d4fbb38af5 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? ( !prefix-guest? ( sys-apps/shadow ) ) + userland_GNU? ( !prefix? ( 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 dff08081daae..cebcb4d0ee35 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? ( !prefix-guest? ( sys-apps/shadow ) ) + userland_GNU? ( !prefix? ( 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 486408636fe3..bbf251ac7e75 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? ( !prefix-guest? ( sys-apps/shadow ) ) + userland_GNU? ( !prefix? ( 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 d29a0e5bfc4f..7521d3e20cd9 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? ( !prefix-guest? ( sys-apps/shadow ) ) + userland_GNU? ( !prefix? ( 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 b2157fa9bfd1..de7168fcee1a 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? ( !prefix-guest? ( sys-apps/shadow ) ) + userland_GNU? ( !prefix? ( sys-apps/shadow ) ) X? ( x11-apps/xauth ) " BDEPEND="