4 files changed, 11 insertions, 71 deletions
diff --git a/net-dns/totd/ChangeLog b/net-dns/totd/ChangeLog
index 5337d26480bf..92f2872414c7 100644
--- a/net-dns/totd/ChangeLog
+++ b/net-dns/totd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/totd
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/totd/ChangeLog,v 1.8 2008/04/21 17:49:39 phreak Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/totd/ChangeLog,v 1.9 2009/05/15 21:48:46 halcy0n Exp $
+
+  15 May 2009; Mark Loeser <halcy0n@gentoo.org> -totd-1.3.ebuild,
+  -totd-1.5.ebuild, totd-1.5.1.ebuild:
+  Fix elog statement for bug #260790
 
   21 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Fix up metadata.xml. If there's no maintainer for the package, the metadata
diff --git a/net-dns/totd/totd-1.3.ebuild b/net-dns/totd/totd-1.3.ebuild
deleted file mode 100644
index 64d64a927aac..000000000000
--- a/net-dns/totd/totd-1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/totd/totd-1.3.ebuild,v 1.3 2007/05/06 09:24:36 genone Exp $
-
-DESCRIPTION="Trick Or Treat Daemon, a DNS proxy for 6to4"
-HOMEPAGE="http://www.vermicelli.pasta.cs.uit.no/ipv6/software.html"
-SRC_URI="ftp://ftp.pasta.cs.uit.no/pub/Vermicelli/${P}.tar.gz"
-LICENSE="BSD as-is"
-
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=""
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	dosbin totd
-	doman totd.8
-	dodoc totd.conf.sample README INSTALL
-
-	doinitd ${FILESDIR}/totd
-}
-
-pkg_postinst() {
-	elog "/usr/share/doc/${P}/totd.conf.sample.gz contains"
-	elog "a sample config file for totd. Make sure you create"
-	elog "/etc/totd.conf with the necessary configurations"
-}
diff --git a/net-dns/totd/totd-1.5.1.ebuild b/net-dns/totd/totd-1.5.1.ebuild
index 9d67f1fbf6d3..dceee216923d 100644
--- a/net-dns/totd/totd-1.5.1.ebuild
+++ b/net-dns/totd/totd-1.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/totd/totd-1.5.1.ebuild,v 1.4 2007/10/06 15:23:21 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/totd/totd-1.5.1.ebuild,v 1.5 2009/05/15 21:48:46 halcy0n Exp $
 
 inherit eutils
 
@@ -13,6 +13,7 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 DEPEND=""
+RDEPEND=""
 
 src_unpack() {
 	unpack ${A}
@@ -31,11 +32,11 @@ src_install() {
 	doman totd.8
 	dodoc totd.conf.sample README INSTALL
 
-	doinitd ${FILESDIR}/totd
+	doinitd "${FILESDIR}"/totd
 }
 
 pkg_postinst() {
-	elog "/usr/share/doc/${P}/totd.conf.sample.gz contains"
+	elog "The totd.conf.sample file in /usr/share/doc/${P}/ contains"
 	elog "a sample config file for totd. Make sure you create"
 	elog "/etc/totd.conf with the necessary configurations"
 }
diff --git a/net-dns/totd/totd-1.5.ebuild b/net-dns/totd/totd-1.5.ebuild
deleted file mode 100644
index ad57979c3f29..000000000000
--- a/net-dns/totd/totd-1.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/totd/totd-1.5.ebuild,v 1.3 2007/05/06 09:24:36 genone Exp $
-
-DESCRIPTION="Trick Or Treat Daemon, a DNS proxy for 6to4"
-HOMEPAGE="http://www.vermicelli.pasta.cs.uit.no/ipv6/software.html"
-SRC_URI="ftp://ftp.pasta.cs.uit.no/pub/Vermicelli/${P}.tar.gz"
-LICENSE="BSD as-is"
-
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=""
-
-src_compile() {
-	econf --enable-ipv4 --enable-ipv6 --enable-stf \
-		--enable-scoped-rewrite --disable-http-server || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	dosbin totd
-	doman totd.8
-	dodoc totd.conf.sample README INSTALL
-
-	doinitd ${FILESDIR}/totd
-}
-
-pkg_postinst() {
-	elog "/usr/share/doc/${P}/totd.conf.sample.gz contains"
-	elog "a sample config file for totd. Make sure you create"
-	elog "/etc/totd.conf with the necessary configurations"
-}