virtual/tftp

6 files changed, 25 insertions, 44 deletions

diff --git a/net-misc/atftp/ChangeLog b/net-misc/atftp/ChangeLog
index f2b16ae20d53..d8aba500cece 100644
--- a/net-misc/atftp/ChangeLog
+++ b/net-misc/atftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/atftp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/atftp/ChangeLog,v 1.4 2003/08/28 22:59:10 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/atftp/ChangeLog,v 1.5 2003/10/30 17:11:15 lanius Exp $
+
+  30 Oct 2003; Heinrich Wendel <lanius@gentoo.org> atftp-0.6-r1.ebuild,
+  atftp-0.6.ebuild:
+  added virtual/tftp
 
 *atftp-0.6-r1 (29 Aug 2003)
 
diff --git a/net-misc/atftp/Manifest b/net-misc/atftp/Manifest
index 1574fb6504ff..c9351d5322df 100644
--- a/net-misc/atftp/Manifest
+++ b/net-misc/atftp/Manifest
@@ -1,8 +1,6 @@
-MD5 b373e806adb750603089517d09429902 ChangeLog 983
-MD5 aa6a5bb722b019156d5ba4130ec1d6ca atftp-0.6-r1.ebuild 868
+MD5 b03933a0f81f8565062eddfa2bd92bcc atftp-0.6-r3.ebuild 987
 MD5 6a791122efed0994827d3febbbe34608 atftp-0.6-r2.ebuild 965
-MD5 765392dc63557140fec21143c8cb50f5 atftp-0.6.ebuild 760
-MD5 ef1244d13cccdfbe2dff44442e0c3d1f files/atftp-0.6-security.patch 1019
-MD5 6edbe26f81fbd488b6fbffd1bbd27ca9 files/digest-atftp-0.6 61
-MD5 6edbe26f81fbd488b6fbffd1bbd27ca9 files/digest-atftp-0.6-r1 61
+MD5 75514f80a31e4a09d26affb2bdc52a3f ChangeLog 1096
 MD5 6edbe26f81fbd488b6fbffd1bbd27ca9 files/digest-atftp-0.6-r2 61
+MD5 6edbe26f81fbd488b6fbffd1bbd27ca9 files/digest-atftp-0.6-r3 61
+MD5 ef1244d13cccdfbe2dff44442e0c3d1f files/atftp-0.6-security.patch 1019
diff --git a/net-misc/atftp/atftp-0.6-r1.ebuild b/net-misc/atftp/atftp-0.6-r3.ebuild
index a3c301884564..0298074a45c1 100644
--- a/net-misc/atftp/atftp-0.6-r1.ebuild
+++ b/net-misc/atftp/atftp-0.6-r3.ebuild
@@ -1,15 +1,26 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/atftp/atftp-0.6-r1.ebuild,v 1.1 2003/08/28 22:58:27 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/atftp/atftp-0.6-r3.ebuild,v 1.1 2003/10/30 17:11:15 lanius Exp $
+
+inherit eutils
 
 DESCRIPTION="Advanced TFTP implementation client/server"
 HOMEPAGE="ftp://ftp.mamalinux.com/pub/atftp/"
+SRC_URI="ftp://ftp.mamalinux.com/pub/atftp/${P}.tar.gz"
 LICENSE="GPL-2"
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
+
+KEYWORDS="~x86"
 SLOT="0"
-KEYWORDS="x86"
-SRC_URI="ftp://ftp.mamalinux.com/pub/atftp/${P}.tar.gz"
-S=${WORKDIR}/${P}
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	!virtual/tftp"
+
+PROVIDE="virtual/tfp"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/${P}-security.patch
+}
 
 src_compile () {
 	myconf=""
diff --git a/net-misc/atftp/atftp-0.6.ebuild b/net-misc/atftp/atftp-0.6.ebuild
deleted file mode 100644
index 8f11fb550848..000000000000
--- a/net-misc/atftp/atftp-0.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/atftp/atftp-0.6.ebuild,v 1.4 2003/08/28 22:58:27 mholzer Exp $
-
-DESCRIPTION="Advanced TFTP implementation client/server"
-HOMEPAGE="ftp://ftp.mamalinux.com/pub/atftp/"
-LICENSE="GPL-2"
-DEPEND=""
-SLOT="0"
-KEYWORDS="x86"
-SRC_URI="ftp://ftp.mamalinux.com/pub/atftp/${P}.tar.gz"
-S=${WORKDIR}/${P}
-
-src_unpack () {
-	unpack ${A}
-	cd ${S}
-
-}
-
-src_compile () {
-	econf || die "./configure failed"
-
-	cp Makefile Makefile.orig
-	sed "s:CFLAGS = -g -Wall -D_REENTRANT -O2:CFLAGS = -g -Wall -D_REENTRANT ${CFLAGS}:" Makefile.orig >Makefile
-
-	emake || die
-}
-
-src_install () {
-	einstall || die "Installation failed"
-}
diff --git a/net-misc/atftp/files/digest-atftp-0.6-r1 b/net-misc/atftp/files/digest-atftp-0.6-r1
deleted file mode 100644
index 5cfcb463e4a5..000000000000
--- a/net-misc/atftp/files/digest-atftp-0.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fcbc9118b02fa2090046be987b1e1aec atftp-0.6.tar.gz 119898
diff --git a/net-misc/atftp/files/digest-atftp-0.6 b/net-misc/atftp/files/digest-atftp-0.6-r3
index 5cfcb463e4a5..5cfcb463e4a5 100644
--- a/net-misc/atftp/files/digest-atftp-0.6
+++ b/net-misc/atftp/files/digest-atftp-0.6-r3