summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2011-03-22 20:56:27 +0000
committerUlrich Müller <ulm@gentoo.org>2011-03-22 20:56:27 +0000
commit7b064dd18d3460fa58509fc594c6a335d0370aa6 (patch)
tree7c8c1aff886527b6fece95553846106ce38d5e88 /net-ftp/atftp
parentold (diff)
downloadgentoo-2-7b064dd18d3460fa58509fc594c6a335d0370aa6.tar.gz
gentoo-2-7b064dd18d3460fa58509fc594c6a335d0370aa6.tar.bz2
gentoo-2-7b064dd18d3460fa58509fc594c6a335d0370aa6.zip
Drop PROVIDE=virtual/tftp and update blocker, bug 359125.
(Portage version: 2.1.9.44/cvs/Linux x86_64)
Diffstat (limited to 'net-ftp/atftp')
-rw-r--r--net-ftp/atftp/ChangeLog7
-rw-r--r--net-ftp/atftp/atftp-0.7-r1.ebuild18
2 files changed, 14 insertions, 11 deletions
diff --git a/net-ftp/atftp/ChangeLog b/net-ftp/atftp/ChangeLog
index de33e9a5a6ab..12c5d3e20495 100644
--- a/net-ftp/atftp/ChangeLog
+++ b/net-ftp/atftp/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-ftp/atftp
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/atftp/ChangeLog,v 1.23 2009/08/26 22:36:15 vostorga Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/atftp/ChangeLog,v 1.24 2011/03/22 20:56:27 ulm Exp $
+
+ 22 Mar 2011; Ulrich Mueller <ulm@gentoo.org> atftp-0.7-r1.ebuild:
+ Drop PROVIDE=virtual/tftp and update blocker, bug 359125.
26 Aug 2009; Víctor Ostorga <vostorga@gentoo.org>
-files/atftp-0.6-security.patch, -files/atftp-0.7-gcc.patch:
diff --git a/net-ftp/atftp/atftp-0.7-r1.ebuild b/net-ftp/atftp/atftp-0.7-r1.ebuild
index 016237d91105..91bd63a0a275 100644
--- a/net-ftp/atftp/atftp-0.7-r1.ebuild
+++ b/net-ftp/atftp/atftp-0.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/atftp/atftp-0.7-r1.ebuild,v 1.9 2008/11/26 22:11:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/atftp/atftp-0.7-r1.ebuild,v 1.10 2011/03/22 20:56:27 ulm Exp $
inherit eutils flag-o-matic
@@ -17,13 +17,13 @@ SLOT="0"
KEYWORDS="amd64 arm ppc ppc64 sparc x86 ~s390"
IUSE="selinux tcpd readline pcre"
-RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
selinux? ( sec-policy/selinux-tftpd )
readline? ( sys-libs/readline )
pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
- !virtual/tftp"
-PROVIDE="virtual/tftp"
+RDEPEND="${DEPEND}
+ !net-ftp/netkit-tftp
+ !net-ftp/tftp-hpa"
src_unpack() {
unpack ${P}.tar.gz
@@ -36,7 +36,7 @@ src_unpack() {
# remove upstream's broken CFLAGS
sed -i.orig -e \
'/^CFLAGS="-g -Wall -D_REENTRANT"/s,".*","",g' \
- ${S}/configure
+ "${S}"/configure
}
src_compile() {
@@ -56,9 +56,9 @@ src_install() {
newconfd "${FILESDIR}"/atftp.confd atftp
dodoc README* BUGS FAQ Changelog INSTALL TODO
- dodoc ${S}/docs/*
+ dodoc "${S}"/docs/*
docinto test
- cd ${S}/test
+ cd "${S}"/test
dodoc load.sh mtftp.conf pcre_pattern.txt test.sh test_suite.txt
}