summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz N Tiram <oz.tiram@gmail.com>2018-05-15 03:50:34 +0200
committerMichał Górny <mgorny@gentoo.org>2018-05-16 10:34:46 +0200
commit116ec623eab06dac9459e536db2db58ccad0cb94 (patch)
treee4ec628057ea29ba4c1a9f08aac9bbc8b91f889e /net-ftp
parentRevert "net-misc/tigervnc: Drop hppa" (diff)
downloadgentoo-116ec623eab06dac9459e536db2db58ccad0cb94.tar.gz
gentoo-116ec623eab06dac9459e536db2db58ccad0cb94.tar.bz2
gentoo-116ec623eab06dac9459e536db2db58ccad0cb94.zip
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
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/atftp/atftp-0.7-r3.ebuild1
-rw-r--r--net-ftp/atftp/atftp-0.7-r5.ebuild1
2 files changed, 2 insertions, 0 deletions
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=(