diff options
| author |   Oz N Tiram <oz.tiram@gmail.com> | 2020-09-04 09:37:38 +0200 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2020-09-29 20:37:12 +0000 |
| commit | cb6c02fd20c75955c7f9b21b528b3db2b91f75a5 (patch) | |
| tree | 677c0c579e24134875cb3019f846dbe29290abf5 /net-ftp | |
| parent | dev-qt: Drop Qt 5.15.0 (diff) | |
| download | gentoo-cb6c02fd20c75955c7f9b21b528b3db2b91f75a5.tar.gz gentoo-cb6c02fd20c75955c7f9b21b528b3db2b91f75a5.tar.bz2 gentoo-cb6c02fd20c75955c7f9b21b528b3db2b91f75a5.zip | |
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@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-ftp')
| -rw-r--r-- | net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild | 6 |
1 files 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 3381ec42a76b..b242ee021199 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=( |