Drop PROVIDE=virtual/tftp, bug #359125, thank Ulrich Müller for report. Drop old.

(Portage version: 2.1.9.44/cvs/Linux x86_64)

3 files changed, 9 insertions, 61 deletions

diff --git a/net-ftp/netkit-tftp/ChangeLog b/net-ftp/netkit-tftp/ChangeLog
index bfb834dc4c17..671798dc6dac 100644
--- a/net-ftp/netkit-tftp/ChangeLog
+++ b/net-ftp/netkit-tftp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/netkit-tftp
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/ChangeLog,v 1.21 2008/09/24 05:13:27 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/ChangeLog,v 1.22 2011/03/22 14:52:50 pva Exp $
+
+  22 Mar 2011; Peter Volkov <pva@gentoo.org> -netkit-tftp-0.17-r6.ebuild,
+  netkit-tftp-0.17-r7.ebuild:
+  Drop PROVIDE=virtual/tftp, bug #359125, thank Ulrich Müller for report.
+  Drop old.
 
   24 Sep 2008; Jeroen Roovers <jer@gentoo.org> netkit-tftp-0.17-r7.ebuild:
   Stable for HPPA (bug #237821).
diff --git a/net-ftp/netkit-tftp/netkit-tftp-0.17-r6.ebuild b/net-ftp/netkit-tftp/netkit-tftp-0.17-r6.ebuild
deleted file mode 100644
index c99504a1374f..000000000000
--- a/net-ftp/netkit-tftp/netkit-tftp-0.17-r6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/netkit-tftp-0.17-r6.ebuild,v 1.1 2008/03/29 02:33:27 vapier Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="the tftp server included in netkit"
-HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-0.17.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="!virtual/tftp
-	virtual/inetd"
-PROVIDE="virtual/tftp"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Change default man directory
-	sed -i \
-		-e 's:MANDIR="$PREFIX/man":MANDIR="$PREFIX/share/man":' \
-		-e 's:^LDFLAGS=::' \
-		configure
-
-	# don't prestrip binaries
-	find . -name Makefile -print0 | xargs -0 sed -i -e 's:install -s:install:'
-
-	# Solve QA warning by including string.h
-	epatch "${FILESDIR}"/memset.patch
-	epatch "${FILESDIR}"/${P}-tftp-connect-segfault.patch
-	epatch "${FILESDIR}"/${P}-tftp-manpage-typo.patch
-	epatch "${FILESDIR}"/${P}-tftp-fix-put-zero-size.diff
-}
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--installroot="${D}" \
-		--with-c-compiler="$(tc-getCC)" \
-		|| die
-	emake || die
-}
-
-src_install() {
-	dodir /usr/bin /usr/sbin /usr/share/man/man{1,8}
-	emake install || die
-	rm -f "${D}"/usr/share/man/man8/tftpd.8
-	insinto /etc/xinetd.d
-	doins "${FILESDIR}"/{tftp-dgram,tftp-stream}
-	dodoc BUGS ChangeLog README
-}
diff --git a/net-ftp/netkit-tftp/netkit-tftp-0.17-r7.ebuild b/net-ftp/netkit-tftp/netkit-tftp-0.17-r7.ebuild
index b6d105eb611d..5c1c84016bb6 100644
--- a/net-ftp/netkit-tftp/netkit-tftp-0.17-r7.ebuild
+++ b/net-ftp/netkit-tftp/netkit-tftp-0.17-r7.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/netkit-tftp/netkit-tftp-0.17-r7.ebuild,v 1.7 2008/09/24 05:13:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/netkit-tftp-0.17-r7.ebuild,v 1.8 2011/03/22 14:52:50 pva Exp $
 
 inherit eutils toolchain-funcs
 
@@ -15,7 +15,6 @@ IUSE=""
 
 DEPEND="!virtual/tftp
 	virtual/inetd"
-PROVIDE="virtual/tftp"
 
 src_unpack() {
 	unpack ${A}