dep on virtual/daemontools - remove old

Package-Manager: portage-2.2.0_alpha19/cvs/Linux i686

5 files changed, 11 insertions, 92 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/Manifest b/net-ftp/twoftpd/Manifest
index 8b01dd08ae9f..4edc9d404019 100644
--- a/net-ftp/twoftpd/Manifest
+++ b/net-ftp/twoftpd/Manifest
@@ -1,8 +1,5 @@
 AUX twoftpd-1.21-disable-TELNET_IAC.patch 424 RMD160 da1184bff1d6cefb8e19150a8fc61af6fd733f3d SHA1 85c11f12ec5932da42769a115cfbe8816c19088f SHA256 e34cecde652255fa1e63ab821d4f7bf292e54e938c487fa837095347c26c84ac
-DIST twoftpd-1.21.tar.gz 61205 RMD160 b2ac22ce9b7c1f7272110e78ea7daa5517f2723a SHA1 c318ec360c474cecb32193c7c75f5b4336e21034 SHA256 1fc52b20e48d4ef8e18816836b3c2c9a807ef177e6036dd9e1dae102ff48ef29
 DIST twoftpd-1.41.tar.gz 84923 RMD160 e8c462db7f317ff5e0e8ad8eebac915aaccae8db SHA1 4af3bfeb7992c9ed84e81fb29b74505fcb9a2650 SHA256 1b269fdcef6a351ca339aa3516cda593c29c9bb2522eee1233f3815f0f59d683
-EBUILD twoftpd-1.21-r1.ebuild 1156 RMD160 928c6d9cd86d113ad7afd95ca4e4c39543d450a4 SHA1 d7eec0b59acec201a740cca356dd535f6ccf2bc1 SHA256 5c0c19f19657a5280cc303c818737003281b7af5e64adb515aa854bc298ce1c1
-EBUILD twoftpd-1.21.ebuild 1028 RMD160 6655312d4e3df4b470c122b7bbaae531f5a807e5 SHA1 2815e1e1d35531debfc1587b0283213eed999c55 SHA256 af413f9285e963e3821a0571878952673386aec9f0205625a1d77119b235b1bb
-EBUILD twoftpd-1.41.ebuild 1135 RMD160 792f9a6e1ec8b6a9b7e26c2ce48f4df23f4a9097 SHA1 fb63a189ef58e9aa8e4854990fe4f3ba2f973bf8 SHA256 b17178a5b0ddf11574a6eccf2d9a2e5cc7f2a937cf45d3e205adb1148668fff8
-MISC ChangeLog 1351 RMD160 84e943ebfcc62ff5b952a1b4a7b0864f4360f18b SHA1 5a11088693820987ba5c242f26568d2addd1dc63 SHA256 87bb177faad0cbabc34189df910ecfe491ff7e95374fea55afc902486335e4bb
+EBUILD twoftpd-1.41.ebuild 1131 RMD160 a4d33aea8c6296d61c70543bacdd9b509cf3320b SHA1 f6c2621ab84a3967e7e3cf001e79fa54ca188c6d SHA256 47efaa7d4317c8a67f91b519358203b4db31a317c58fc65077b9b2d67c97391a
+MISC ChangeLog 1514 RMD160 4cf71b42121f44e16aca4694d88fb667b9151be5 SHA1 21b3a1d8e9b0efee0a7c871b095c30ee71c2a2a1 SHA256 4e796368bae645260df115f273bb0e849927c86093e6edc35e83d07e9e6f64f8
 MISC metadata.xml 728 RMD160 2a118ebc478868bef0efa9dbb50c892171c38df9 SHA1 bcc9ddfd2d6bab42ad92711661675412a92b84e3 SHA256 08c6e5cefd09ec1f8e795e67e8c73eaf29389bc2a5483db6fb4ab5f893405b5a
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() {