remove old version - init script creates a pidfile

(Portage version: 2.1.2.7)

4 files changed, 8 insertions, 40 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index f7b62bff9c87..10cee54ab7ce 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/varnish
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.8 2007/05/21 07:14:09 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.9 2007/06/11 22:59:25 bangert Exp $
+
+  11 Jun 2007; Thilo Bangert <bangert@gentoo.org> files/varnishd.initd,
+  -varnish-1.0.3.ebuild:
+  remove old version - init script creates a pidfile
 
 *varnish-1.0.4 (21 May 2007)
 
diff --git a/www-servers/varnish/files/digest-varnish-1.0.3 b/www-servers/varnish/files/digest-varnish-1.0.3
deleted file mode 100644
index b7fcc18145fd..000000000000
--- a/www-servers/varnish/files/digest-varnish-1.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f942bfa029be8a9af9692a43bd04158c varnish-1.0.3.tar.gz 541822
-RMD160 f7c827a497c50a2d3e51915b4e007e16c9cad5d6 varnish-1.0.3.tar.gz 541822
-SHA256 15c2efdb3e70b3eccc17145f5b24c315d6301e169a5008de8987ab9d437f75e5 varnish-1.0.3.tar.gz 541822
diff --git a/www-servers/varnish/files/varnishd.initd b/www-servers/varnish/files/varnishd.initd
index 0bcbbb26dcb4..61b450ba6782 100755
--- a/www-servers/varnish/files/varnishd.initd
+++ b/www-servers/varnish/files/varnishd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/files/varnishd.initd,v 1.3 2007/05/19 12:00:41 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/files/varnishd.initd,v 1.4 2007/06/11 22:59:25 bangert Exp $
 
 depend() {
 	need net
@@ -9,12 +9,12 @@ depend() {
 
 start() {
 	ebegin "Starting varnish"
-	start-stop-daemon --quiet --start --exec /usr/sbin/varnishd -- ${VARNISHD_OPTS} &> /dev/null
+	start-stop-daemon --quiet --start --pidfile /var/run/varnishd.pid --exec /usr/sbin/varnishd -- -P /var/run/varnishd.pid ${VARNISHD_OPTS} &> /dev/null
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping varnish"
-	start-stop-daemon --quiet --stop --name varnishd
+	start-stop-daemon --quiet --stop --pidfile /var/run/varnishd.pid
 	eend $?
 }
diff --git a/www-servers/varnish/varnish-1.0.3.ebuild b/www-servers/varnish/varnish-1.0.3.ebuild
deleted file mode 100644
index 98cfa351bcb1..000000000000
--- a/www-servers/varnish/varnish-1.0.3.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/www-servers/varnish/varnish-1.0.3.ebuild,v 1.2 2007/02/22 16:10:56 bangert Exp $
-
-inherit eutils
-DESCRIPTION="Varnish is an HTTP accelerator"
-HOMEPAGE="http://varnish.linpro.no/"
-SRC_URI="mirror://sourceforge/varnish/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd ${FILESDIR}/varnishd.initd varnishd || die
-	newconfd ${FILESDIR}/varnishd.confd varnishd || die
-}
-
-pkg_postinst () {
-	elog "No demo-/sample-configfile is included in the distribution -"
-	elog "please read the man-page for more info."
-	elog "A sample (localhost:8080 -> localhost:80) for gentoo is given in"
-	elog "   /etc/conf.d/varnishd"
-	echo
-}
-