commit:     116ec623eab06dac9459e536db2db58ccad0cb94
Author:     Oz N Tiram <oz.tiram <AT> gmail <DOT> com>
AuthorDate: Tue May 15 01:50:34 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 16 08:34:46 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=116ec623

net-ftp/atftp: fix collision with net-ftp/uftpd

Closes: https://bugs.gentoo.org/648984
Closes: https://github.com/gentoo/gentoo/pull/8413
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-ftp/atftp/atftp-0.7-r3.ebuild | 1 +
 net-ftp/atftp/atftp-0.7-r5.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/net-ftp/atftp/atftp-0.7-r3.ebuild 
b/net-ftp/atftp/atftp-0.7-r3.ebuild
index 839def958f8..785ff81f7e8 100644
--- a/net-ftp/atftp/atftp-0.7-r3.ebuild
+++ b/net-ftp/atftp/atftp-0.7-r3.ebuild
@@ -23,6 +23,7 @@ DEPEND="tcpd? ( sys-apps/tcp-wrappers )
 RDEPEND="${DEPEND}
        !net-ftp/netkit-tftp
        !net-ftp/tftp-hpa
+       !net-ftp/uftpd
        selinux? ( sec-policy/selinux-tftp )"
 
 src_prepare() {

diff --git a/net-ftp/atftp/atftp-0.7-r5.ebuild 
b/net-ftp/atftp/atftp-0.7-r5.ebuild
index dae8d5d1d6d..98408a1a501 100644
--- a/net-ftp/atftp/atftp-0.7-r5.ebuild
+++ b/net-ftp/atftp/atftp-0.7-r5.ebuild
@@ -23,6 +23,7 @@ DEPEND="tcpd? ( sys-apps/tcp-wrappers )
 RDEPEND="${DEPEND}
        !net-ftp/netkit-tftp
        !net-ftp/tftp-hpa
+       !net-ftp/uftpd
        selinux? ( sec-policy/selinux-tftp )"
 
 PATCHES=(

Reply via email to