projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1e9b340)
net-ftp/atftp: fix collision with net-ftp/uftpd
authorOz N Tiram <oz.tiram@gmail.com>
Tue, 15 May 2018 01:50:34 +0000 (03:50 +0200)
committerMichał Górny <mgorny@gentoo.org>
Wed, 16 May 2018 08:34:46 +0000 (10:34 +0200)
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 patch | blob | history
net-ftp/atftp/atftp-0.7-r5.ebuild patch | blob | history

diff --git a/net-ftp/atftp/atftp-0.7-r3.ebuild b/net-ftp/atftp/atftp-0.7-r3.ebuild
index 839def958f8eee64141c1937e5aebca4de34045f..785ff81f7e82e0b6552b24fd194ad9e6300dc7fc 100644 (file)
--- 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 dae8d5d1d6d08154a07f51ec00d908e91db695c2..98408a1a5019af9a5b77b23cfba81c2d803522d7 100644 (file)
--- 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=(
Unnamed repository; edit this file 'description' to name the repository.