bug 83325

(Portage version: 2.0.51.22-r2)

7 files changed, 13 insertions, 69 deletions

diff --git a/net-ftp/tftp-hpa/ChangeLog b/net-ftp/tftp-hpa/ChangeLog
index 7bdb33ae19e9..f0a726ebf9ad 100644
--- a/net-ftp/tftp-hpa/ChangeLog
+++ b/net-ftp/tftp-hpa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/tftp-hpa
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/ChangeLog,v 1.4 2005/02/27 22:31:41 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/ChangeLog,v 1.5 2005/07/29 22:05:36 vanquirius Exp $
+
+  29 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> -tftp-hpa-0.33.ebuild,
+  -tftp-hpa-0.40.ebuild, tftp-hpa-0.40-r1.ebuild:
+  Really fix bug 83325. Thanks to Dan Eisenhut <daniel.eisenhut@med.ge.com>.
 
 *tftp-hpa-0.40-r1 (27 Feb 2005)
 
diff --git a/net-ftp/tftp-hpa/Manifest b/net-ftp/tftp-hpa/Manifest
index 82bb7b0eac71..0d39d1281b50 100644
--- a/net-ftp/tftp-hpa/Manifest
+++ b/net-ftp/tftp-hpa/Manifest
@@ -1,12 +1,8 @@
-MD5 bbb2dabd5573cec702e04fb6252d3357 ChangeLog 3208
-MD5 8d010dca53d84511f9dc2a727b9ac161 tftp-hpa-0.33.ebuild 734
 MD5 6beaaff025cc211c3776bf3c633e4c1f tftp-hpa-0.34-r1.ebuild 766
-MD5 fd4cc1839b1cad8038dc215ed1db9ef0 tftp-hpa-0.40.ebuild 772
+MD5 bbb2dabd5573cec702e04fb6252d3357 ChangeLog 3208
+MD5 1332eda2af2286cd6809b24026fd0204 tftp-hpa-0.40-r1.ebuild 835
 MD5 f0b3c514a598fdff8dffc93723f41068 metadata.xml 300
-MD5 6327076dc3eb6d97a584fa9b8416fe5b tftp-hpa-0.40-r1.ebuild 793
-MD5 2518048af53fc9da3ae6e3be5a244e8b files/digest-tftp-hpa-0.33 65
-MD5 2f7c453cd0fde112ffac93387966fad3 files/digest-tftp-hpa-0.34-r1 65
-MD5 64b89cea2b9b468a4c4068b0ec5382a4 files/digest-tftp-hpa-0.40 65
-MD5 4cf3b73c8361f35562a6933865d78e5f files/in.tftpd.confd 138
 MD5 b528d4bed168103c99134196bee5b274 files/in.tftpd.rc6 515
+MD5 4cf3b73c8361f35562a6933865d78e5f files/in.tftpd.confd 138
+MD5 2f7c453cd0fde112ffac93387966fad3 files/digest-tftp-hpa-0.34-r1 65
 MD5 64b89cea2b9b468a4c4068b0ec5382a4 files/digest-tftp-hpa-0.40-r1 65
diff --git a/net-ftp/tftp-hpa/files/digest-tftp-hpa-0.33 b/net-ftp/tftp-hpa/files/digest-tftp-hpa-0.33
deleted file mode 100644
index 8cea187c53bf..000000000000
--- a/net-ftp/tftp-hpa/files/digest-tftp-hpa-0.33
+++ /dev/null
@@ -1 +0,0 @@
-MD5 502238535a2362c7e65454c7b27c701c tftp-hpa-0.33.tar.bz2 75138
diff --git a/net-ftp/tftp-hpa/files/digest-tftp-hpa-0.40 b/net-ftp/tftp-hpa/files/digest-tftp-hpa-0.40
deleted file mode 100644
index 22a8e1e12057..000000000000
--- a/net-ftp/tftp-hpa/files/digest-tftp-hpa-0.40
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bfcdd49bf94900e610f2cc937d8980ef tftp-hpa-0.40.tar.bz2 82442
diff --git a/net-ftp/tftp-hpa/tftp-hpa-0.33.ebuild b/net-ftp/tftp-hpa/tftp-hpa-0.33.ebuild
deleted file mode 100644
index 30c8af4a094a..000000000000
--- a/net-ftp/tftp-hpa/tftp-hpa-0.33.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 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.33.ebuild,v 1.2 2005/02/27 22:31:41 squinky86 Exp $
-
-IUSE=""
-DESCRIPTION="port of the OpenBSD TFTP server"
-SRC_URI="mirror://kernel/software/network/tftp/${P}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="x86 ppc sparc"
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	econf || die
-	make || die
-}
-
-src_install() {
-	make INSTALLROOT=${D} install || die
-	dodoc README* CHANGES INSTALL*
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/in.tftpd.confd in.tftpd
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/in.tftpd.rc6 in.tftpd
-}
diff --git a/net-ftp/tftp-hpa/tftp-hpa-0.40-r1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-0.40-r1.ebuild
index a79057bb57e3..365244df2605 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-0.40-r1.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-0.40-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2005 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.40-r1.ebuild,v 1.2 2005/04/28 01:36:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-0.40-r1.ebuild,v 1.3 2005/07/29 22:05:36 vanquirius Exp $
 
 DESCRIPTION="port of the OpenBSD TFTP server"
-SRC_URI="mirror://kernel/software/network/tftp/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
-
+SRC_URI="mirror://kernel/software/network/tftp/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~s390"
@@ -13,6 +12,8 @@ IUSE=""
 
 DEPEND="!virtual/tftp"
 PROVIDE="virtual/tftp"
+RDEPEND="${DEPEND}
+	sys-apps/tcp-wrappers"
 
 src_install() {
 	make INSTALLROOT="${D}" install || die
diff --git a/net-ftp/tftp-hpa/tftp-hpa-0.40.ebuild b/net-ftp/tftp-hpa/tftp-hpa-0.40.ebuild
deleted file mode 100644
index 989c4af31643..000000000000
--- a/net-ftp/tftp-hpa/tftp-hpa-0.40.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 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.40.ebuild,v 1.1 2004/12/09 20:56:37 squinky86 Exp $
-
-DESCRIPTION="port of the OpenBSD TFTP server"
-SRC_URI="mirror://kernel/software/network/tftp/${P}.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~s390"
-IUSE=""
-
-DEPEND="virtual/libc
-	!virtual/tftp"
-PROVIDE="virtual/tftp"
-
-src_install() {
-	make INSTALLROOT=${D} install || die
-	dodoc README* CHANGES INSTALL*
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/in.tftpd.confd in.tftpd
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/in.tftpd.rc6 in.tftpd
-}