dep on virtual/daemontools - remove old

(Portage version: 2.2.0_alpha19/cvs/Linux i686)

4 files changed, 9 insertions, 87 deletions

diff --git a/net-ftp/twoftpd/ChangeLog b/net-ftp/twoftpd/ChangeLog
index a855ea6e53ae..9037e8783ea3 100644
--- a/net-ftp/twoftpd/ChangeLog
+++ b/net-ftp/twoftpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/twoftpd
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/twoftpd/ChangeLog,v 1.8 2010/02/12 09:46:37 bangert Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/twoftpd/ChangeLog,v 1.9 2011/01/29 23:18:46 bangert Exp $
+
+  29 Jan 2011; Thilo Bangert <bangert@gentoo.org> -twoftpd-1.21.ebuild,
+  -twoftpd-1.21-r1.ebuild, twoftpd-1.41.ebuild:
+  dep on virtual/daemontools - remove old
 
 *twoftpd-1.41 (12 Feb 2010)
 
diff --git a/net-ftp/twoftpd/twoftpd-1.21-r1.ebuild b/net-ftp/twoftpd/twoftpd-1.21-r1.ebuild
deleted file mode 100644
index 5f5bdf55fc55..000000000000
--- a/net-ftp/twoftpd/twoftpd-1.21-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/twoftpd/twoftpd-1.21-r1.ebuild,v 1.3 2010/02/12 09:46:37 bangert Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Simple secure efficient FTP server by Bruce Guenter"
-HOMEPAGE="http://untroubled.org/twoftpd/"
-SRC_URI="http://untroubled.org/twoftpd/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="breakrfc"
-
-DEPEND=">=dev-libs/bglibs-1.026
-	>=net-libs/cvm-0.32"
-RDEPEND="sys-apps/ucspi-tcp
-	sys-process/daemontools
-	>=net-libs/cvm-0.32"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use breakrfc && epatch "${FILESDIR}"/${P}-disable-TELNET_IAC.patch
-}
-
-src_compile() {
-	echo "/usr/sbin" > conf-bin
-	echo "/usr/share/man" > conf-man
-	echo "$(tc-getCC) ${CFLAGS} -I/usr/include/bglibs" > conf-cc
-	echo "$(tc-getCC) -L/usr/lib/bglibs" > conf-ld
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /usr/sbin
-	dodir /usr/share/man/man1
-
-	emake install install_prefix="${D}" || die "install failed"
-
-	dodoc ANNOUNCEMENT ChangeLog NEWS README TODO VERSION
-	dodoc twoftpd.run twoftpd-log.run
-}
diff --git a/net-ftp/twoftpd/twoftpd-1.21.ebuild b/net-ftp/twoftpd/twoftpd-1.21.ebuild
deleted file mode 100644
index f6ddf3fdd2b1..000000000000
--- a/net-ftp/twoftpd/twoftpd-1.21.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/twoftpd/twoftpd-1.21.ebuild,v 1.7 2010/02/12 09:46:37 bangert Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simple secure efficient FTP server by Bruce Guenter"
-HOMEPAGE="http://untroubled.org/twoftpd/"
-SRC_URI="http://untroubled.org/twoftpd/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/bglibs-1.026
-	>=net-libs/cvm-0.32"
-RDEPEND="sys-apps/ucspi-tcp
-	sys-process/daemontools
-	>=net-libs/cvm-0.32"
-
-src_compile() {
-	echo "/usr/sbin" > conf-bin
-	echo "/usr/share/man" > conf-man
-	echo "$(tc-getCC) ${CFLAGS} -I/usr/include/bglibs" > conf-cc
-	echo "$(tc-getCC) -L/usr/lib/bglibs" > conf-ld
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /usr/sbin
-	dodir /usr/share/man/man1
-
-	emake install install_prefix="${D}" || die "install failed"
-
-	dodoc ANNOUNCEMENT ChangeLog NEWS README TODO VERSION
-	dodoc twoftpd.run twoftpd-log.run
-}
diff --git a/net-ftp/twoftpd/twoftpd-1.41.ebuild b/net-ftp/twoftpd/twoftpd-1.41.ebuild
index cff1817db111..bf2d3060b1ba 100644
--- a/net-ftp/twoftpd/twoftpd-1.41.ebuild
+++ b/net-ftp/twoftpd/twoftpd-1.41.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 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/twoftpd/twoftpd-1.41.ebuild,v 1.1 2010/02/12 09:46:37 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/twoftpd/twoftpd-1.41.ebuild,v 1.2 2011/01/29 23:18:46 bangert Exp $
 
 EAPI="2"
 
@@ -18,7 +18,7 @@ IUSE="breakrfc"
 DEPEND=">=dev-libs/bglibs-1.106
 	>=net-libs/cvm-0.96"
 RDEPEND="sys-apps/ucspi-tcp
-	sys-process/daemontools
+	virtual/daemontools
 	${DEPEND}"
 
 src_prepare() {