dep on virtual/daemontools - remove old

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

5 files changed, 15 insertions, 69 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/Manifest b/www-servers/publicfile/Manifest
index a8953135b0ad..9df400018193 100644
--- a/www-servers/publicfile/Manifest
+++ b/www-servers/publicfile/Manifest
@@ -1,8 +1,7 @@
 DIST ftp-ls-patch 3280 RMD160 2685dbc4d91a3140eb635383b1b47ee674aaae01 SHA1 1316ca53aa14dafbcad4dcf31971348fa156c07c SHA256 801c44bb6f92dbfb6b6943337c2fb02e3ee2419b0e8514e265696e28d908d04d
 DIST publicfile-0.52-filetype-diff 1101 RMD160 e11c38d40d184bbc2046446b3d13aee2b05f8381 SHA1 4a67c20dcf1d93bf8ce62e39eb9c7676b5c5446a SHA256 451f70a2817943b5be0a09941cab9f2473991933097bc21ceb368d68ada414b6
 DIST publicfile-0.52.tar.gz 34892 RMD160 02d2bff245e9d474f26ac29a96775c8eeed0799c SHA1 067e5a0c57bf8ac04c578cac47bd80c2d88eddeb SHA256 3f9fcf737bfe48910812cc357a31bf1f2e3da2490dbd175ce535830f251c08ef
-EBUILD publicfile-0.52-r1.ebuild 1642 RMD160 fcafdc4f18dc58591e10d4fbd90268b9e4361eeb SHA1 9a0c99dbee9c979d3d057468ad7f3dd76511cc1d SHA256 742dd8a8f1b5553b28d5e58d5fe764c64c28c0b9e7bbb25b3b4289e0b25dbafd
-EBUILD publicfile-0.52-r2.ebuild 1995 RMD160 129cd8614fa24ef26d9f9874684cccc54be428e8 SHA1 7dc76388270d8bd121357ef5d7b49581f6c80f87 SHA256 a213b1287e2f064e8c94a2bae6defdd28afcc48bca628d917d0445f69398ba80
-EBUILD publicfile-0.52.ebuild 1472 RMD160 0b9a6fc7a6e413f842b62a1b3539aeadacb8b734 SHA1 2d312b2ae51ff8e035990a8d2cda1826c73a4516 SHA256 70a40fe08199a2aead8c6434c1fa07a8502edfe14015fac7f6611171fbd5247b
-MISC ChangeLog 3310 RMD160 a717dee6e400b1cecadc8c1c50eea7a56b1005bc SHA1 b4891b005ff25226cfc519efd7ed3742aefc3066 SHA256 45e9bcf2bae441dc9d565d0115773a0c5486a7a1e10dc20ca091d62bebc5e7be
+EBUILD publicfile-0.52-r1.ebuild 1632 RMD160 357e3b011a74e30f836433609f65c8a72a130970 SHA1 d0398466011f8130335ed68290db0d1b3c202e4b SHA256 5d6dea9ad63f424f4220e280132324f02bcf42498f7d58648da7b7bbf5ea17c9
+EBUILD publicfile-0.52-r2.ebuild 1984 RMD160 f96ac3cf9909fa8ba050cbf1c8e3a3d27d5c7abe SHA1 4f461cd8cf5b1e6b6a87198f09d2cfc90c4c5cbd SHA256 5cceab8e286035fccf67f87f23e7607b4602ba5669927d3a7b7575be4339c6b4
+MISC ChangeLog 3484 RMD160 1ee04a8b4649af0cadfbdf9adec24376f247acfa SHA1 458d33ad88d3575f42cebf983670671790a69a5d SHA256 94c2e2e812efd61e0c256072945c51366177e4b5ffe8d234e700ed56c03cb357
 MISC metadata.xml 166 RMD160 cd7b5b3e4e4943d69bae98184debdf0a6f9bab9d SHA1 b57962de7999732b1690e79d2e462f8a6f1b121b SHA256 80accb0cd0be4f5ddbc51eaa01a2e74901a5f4a0e86a27b94e4eaee6d0b54b9b
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
-}