summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2011-04-06 05:29:17 +0000
committerUlrich Müller <ulm@gentoo.org>2011-04-06 05:29:17 +0000
commit10fc9a23dc10365538e1b62b3835749198828b0d (patch)
treeddef69f394ec975116bb6b8807ac497f65987ea1 /net-ftp/tftp-hpa
parentBump to newest release candidates as EAPI=4; add a bunch of patches to 1.8.1 ... (diff)
downloadhistorical-10fc9a23dc10365538e1b62b3835749198828b0d.tar.gz
historical-10fc9a23dc10365538e1b62b3835749198828b0d.tar.bz2
historical-10fc9a23dc10365538e1b62b3835749198828b0d.zip
Add blocker against atftp too.
Package-Manager: portage-2.1.9.45/cvs/Linux x86_64
Diffstat (limited to 'net-ftp/tftp-hpa')
-rw-r--r--net-ftp/tftp-hpa/ChangeLog6
-rw-r--r--net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild3
-rw-r--r--net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild3
3 files changed, 9 insertions, 3 deletions
diff --git a/net-ftp/tftp-hpa/ChangeLog b/net-ftp/tftp-hpa/ChangeLog
index 70363e0a9012..1db9b0797d03 100644
--- a/net-ftp/tftp-hpa/ChangeLog
+++ b/net-ftp/tftp-hpa/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-ftp/tftp-hpa
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/ChangeLog,v 1.47 2011/03/22 20:53:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/ChangeLog,v 1.48 2011/04/06 05:29:17 ulm Exp $
+
+ 06 Apr 2011; Ulrich Mueller <ulm@gentoo.org> tftp-hpa-0.49-r1.ebuild,
+ tftp-hpa-5.0.ebuild:
+ Add blocker against atftp too.
22 Mar 2011; Ulrich Mueller <ulm@gentoo.org> tftp-hpa-0.49-r1.ebuild,
tftp-hpa-5.0.ebuild:
diff --git a/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild
index 37308d08656d..01187f534bef 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild,v 1.10 2011/03/22 20:53:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild,v 1.11 2011/04/06 05:29:17 ulm Exp $
DESCRIPTION="port of the OpenBSD TFTP server"
HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
@@ -12,6 +12,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
IUSE="ipv6 readline selinux tcpd"
RDEPEND="selinux? ( sec-policy/selinux-tftpd )
+ !net-ftp/atftp
!net-ftp/netkit-tftp"
DEPEND="${RDEPEND}
readline? ( sys-libs/readline )
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild
index 196edcb7c2e3..18ac60c0fd56 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild,v 1.4 2011/03/22 20:53:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild,v 1.5 2011/04/06 05:29:17 ulm Exp $
DESCRIPTION="port of the OpenBSD TFTP server"
HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
@@ -12,6 +12,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
IUSE="ipv6 readline selinux tcpd"
RDEPEND="selinux? ( sec-policy/selinux-tftpd )
+ !net-ftp/atftp
!net-ftp/netkit-tftp"
DEPEND="${RDEPEND}
readline? ( sys-libs/readline )