dep on virtual/daemontools - remove old

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

4 files changed, 12 insertions, 65 deletions

diff --git a/www-servers/publicfile/ChangeLog b/www-servers/publicfile/ChangeLog
index 9b3908a134af..70411b7503d6 100644
--- a/www-servers/publicfile/ChangeLog
+++ b/www-servers/publicfile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/publicfile
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/publicfile/ChangeLog,v 1.13 2009/10/14 11:55:10 bangert Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/publicfile/ChangeLog,v 1.14 2011/01/29 23:30:17 bangert Exp $
+
+  29 Jan 2011; Thilo Bangert <bangert@gentoo.org> -publicfile-0.52.ebuild,
+  publicfile-0.52-r1.ebuild, publicfile-0.52-r2.ebuild:
+  dep on virtual/daemontools - remove old
 
 *publicfile-0.52-r2 (14 Oct 2009)
 
diff --git a/www-servers/publicfile/publicfile-0.52-r1.ebuild b/www-servers/publicfile/publicfile-0.52-r1.ebuild
index 8574fd741411..19070437fc38 100644
--- a/www-servers/publicfile/publicfile-0.52-r1.ebuild
+++ b/www-servers/publicfile/publicfile-0.52-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/publicfile/publicfile-0.52-r1.ebuild,v 1.9 2009/01/03 19:48:09 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/publicfile/publicfile-0.52-r1.ebuild,v 1.10 2011/01/29 23:30:17 bangert Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SLOT="0"
 LICENSE="as-is"
 KEYWORDS="~amd64 hppa ppc sparc x86"
 
-RDEPEND=">=sys-process/daemontools-0.70
+RDEPEND="virtual/daemontools
 	>=sys-apps/ucspi-tcp-0.83
 	selinux? ( sec-policy/selinux-publicfile )
 	!net-ftp/netkit-ftpd"
diff --git a/www-servers/publicfile/publicfile-0.52-r2.ebuild b/www-servers/publicfile/publicfile-0.52-r2.ebuild
index a3314d215564..30a6b16f0417 100644
--- a/www-servers/publicfile/publicfile-0.52-r2.ebuild
+++ b/www-servers/publicfile/publicfile-0.52-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/publicfile/publicfile-0.52-r2.ebuild,v 1.1 2009/10/14 11:55:10 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/publicfile/publicfile-0.52-r2.ebuild,v 1.2 2011/01/29 23:30:17 bangert Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ SLOT="0"
 LICENSE="as-is"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 
-RDEPEND=">=sys-process/daemontools-0.70
+RDEPEND="virtual/daemontools
 	>=sys-apps/ucspi-tcp-0.83
 	selinux? ( sec-policy/selinux-publicfile )
 	!net-ftp/netkit-ftpd"
diff --git a/www-servers/publicfile/publicfile-0.52.ebuild b/www-servers/publicfile/publicfile-0.52.ebuild
deleted file mode 100644
index c2d39763a595..000000000000
--- a/www-servers/publicfile/publicfile-0.52.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/publicfile/publicfile-0.52.ebuild,v 1.5 2009/01/03 18:42:40 bangert Exp $
-
-inherit eutils
-
-IUSE="selinux"
-DESCRIPTION="publish files through FTP and HTTP"
-SRC_URI="http://cr.yp.to/publicfile/${P}.tar.gz"
-HOMEPAGE="http://cr.yp.to/publicfile.html"
-KEYWORDS="x86 ppc sparc"
-SLOT="0"
-
-LICENSE="as-is"
-
-RDEPEND=">=sys-process/daemontools-0.70
-	>=sys-apps/ucspi-tcp-0.83
-	selinux? ( sec-policy/selinux-publicfile )
-	!net-ftp/netkit-ftpd"
-
-src_compile() {
-	echo "gcc ${CFLAGS}" > conf-cc
-	echo "gcc" > conf-ld
-	echo "/usr" > conf-home
-
-	# fix for glibc-2.3.2 errno issue
-	mv error.h error.h.orig
-	sed -e 's|extern int errno;|#include <errno.h>|' <error.h.orig >error.h
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe ftpd httpd
-	newexe configure publicfile-conf
-	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
-}
-
-pkg_preinst() {
-	enewgroup nofiles
-	enewuser ftp -1 -1 /home/public nofiles
-	enewuser ftplog -1 -1 /home/public nofiles
-}
-
-pkg_postinst() {
-	/usr/bin/publicfile-conf ftp ftplog /home/public `hostname`
-	echo
-	echo -e "\e[32;01m httpd and ftpd are serving out of /home/public.\033[0m"
-	echo -e "\e[32;01m remember to start the servers with:\033[0m"
-	echo -e "\e[32;01m   ln -s /home/public/httpd /home/public/home/ftpd /service\033[0m"
-	echo
-}
-
-pkg_postrm() {
-	userdel ftplog
-}