[gentoo-commits] repo/gentoo:master commit in: net-ftp/tftp-hpa/

[Sam James]

commit:     cb6c02fd20c75955c7f9b21b528b3db2b91f75a5
Author:     Oz N Tiram <oz.tiram <AT> gmail <DOT> com>
AuthorDate: Fri Sep  4 07:37:38 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 20:37:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb6c02fd

net-ftp/tftp-hpa: fix collision with uftpd

tftp-hpa client can still be installed along side with uftpd.

Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Oz Tiram <oz.tiram <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
index 3381ec42a76..b242ee02119 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
@@ -22,8 +22,10 @@ DEPEND="
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-tftp )
 	!net-ftp/atftp
-	!net-ftp/uftpd
-	server? ( !net-misc/iputils[tftpd(+)] )
+	server? (
+		!net-misc/iputils[tftpd(+)]
+		!net-ftp/uftpd
+	)
 "
 
 PATCHES=(