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

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

4 files changed, 11 insertions, 64 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/Manifest b/net-ftp/netkit-tftp/Manifest
index 40d4e0d30011..c925307d1b60 100644
--- a/net-ftp/netkit-tftp/Manifest
+++ b/net-ftp/netkit-tftp/Manifest
@@ -7,7 +7,6 @@ AUX netkit-tftp-0.17-tftpd-put-fixes.patch 1050 RMD160 4d61969cde547a75c0645a19f
 AUX tftp-dgram 246 RMD160 adfcba66b4db0afbb6372ff701ec8da310963f77 SHA1 e0afb619d6e4b2665be04ed2016836668a619ffd SHA256 b79af85531e4e300da30731ed0b761d0325ad091c6ae7e9c75bf67806b9e1009
 AUX tftp-stream 246 RMD160 b1075084b89ac25cbcebdaa69152f42a032c57a5 SHA1 2378f5976cfae1c63e3ac96d6df417165dab8d17 SHA256 861a2d955c1d84d7268c3348ef53c33f44ce73453eda96c36b3750bba6f1f836
 DIST netkit-tftp-0.17.tar.gz 23620 RMD160 18fa9eaa4e31ec9579a8ba8a486a2f0da0b22747 SHA1 d3d661d6462f1989a69b37acba4006be5ae112bc SHA256 3a43c0010d4e61f412563fd83769d4667d8b8e82903526d21cb9205fe55ad14d
-EBUILD netkit-tftp-0.17-r6.ebuild 1484 RMD160 121276fcc6dcca2ba625cf76a24009bb7dcbcb60 SHA1 0d1432e1fc4ddade9acd1415c5bee95dfe9399b5 SHA256 c40658e331c43419632025142062570559b9122cb0582fce9f04330a1752148a
-EBUILD netkit-tftp-0.17-r7.ebuild 1624 RMD160 3647220dc157e14c32505f8a3a22bf35a9b69365 SHA1 9573c3dba83f8c614457ad2f260181ffc4b1bd2e SHA256 d316867afdf332d5740ea6b528fcdcf55c0eb25e117475a263bdbfb519696e8b
-MISC ChangeLog 4552 RMD160 5614140397fd63c326522508fdcb3116321564a1 SHA1 eb362637eeecfd3c47e108e1d6e77477f99537a3 SHA256 65bceebc91d194d118b20db969433d756aca0495bb81f22da7eea8f53ef7e923
+EBUILD netkit-tftp-0.17-r7.ebuild 1601 RMD160 961727090c570675890a40ae43fb44bb52989862 SHA1 e21d38a3e17344e422480d7a91db0e526f3c1dc0 SHA256 70e9582093c8e138226ba0e10de07638b37efe6b011d1042bf2cc97468354cf6
+MISC ChangeLog 4744 RMD160 4f8d6c208303479c8e565e128bebccbbc15e6698 SHA1 d8f8eaf301fb4dc1c0749f2f50c7eef8ab44f7c7 SHA256 222b073c2ffb996f82310312008d58bc80ba0f492ac71a355d52c423b5d75414
 MISC metadata.xml 799 RMD160 8f94b4bf878b4bc1c81977707abe311e34b21780 SHA1 14a84369d0cbb5deca5b938f13c6c6fa7c1b5623 SHA256 6fc447069710464408b1e3c22512a9ec36f59f9226bae0918e36267780e6ef4a
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}