From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A3BC81382C5 for ; Wed, 16 May 2018 08:34:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6A18E08F5; Wed, 16 May 2018 08:34:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 93877E08F5 for ; Wed, 16 May 2018 08:34:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16364335C5C for ; Wed, 16 May 2018 08:34:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ADAA827B for ; Wed, 16 May 2018 08:34:50 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1526459686.116ec623eab06dac9459e536db2db58ccad0cb94.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/atftp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-ftp/atftp/atftp-0.7-r3.ebuild net-ftp/atftp/atftp-0.7-r5.ebuild X-VCS-Directories: net-ftp/atftp/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 116ec623eab06dac9459e536db2db58ccad0cb94 X-VCS-Branch: master Date: Wed, 16 May 2018 08:34:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 16e4d0d0-0d79-41bf-9782-b46f7c55b0cc X-Archives-Hash: 7cdb307b0262cb7b069a5fe133111ce7 commit: 116ec623eab06dac9459e536db2db58ccad0cb94 Author: Oz N Tiram gmail com> AuthorDate: Tue May 15 01:50:34 2018 +0000 Commit: Michał Górny gentoo 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=(