remove old version - init script creates a pidfile

Package-Manager: portage-2.1.2.7

5 files changed, 16 insertions, 56 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/Manifest b/www-servers/varnish/Manifest
index 3248ec46114f..fbc0d27d1f85 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -2,31 +2,23 @@ AUX varnishd.confd 166 RMD160 ce275968c702f547f6b0db2de24fc1abd3488b04 SHA1 29f4
 MD5 4b33e512c21e9a716d3a43a4d7fecbde files/varnishd.confd 166
 RMD160 ce275968c702f547f6b0db2de24fc1abd3488b04 files/varnishd.confd 166
 SHA256 f98389902b477307b1bf4856c4ce744b4c57c88869fffcf0b47217d6b24c24a6 files/varnishd.confd 166
-AUX varnishd.initd 506 RMD160 146cc05d6d09eaabcdfa0785dfab690600b11f39 SHA1 40d0f0c64bdfbf54c0f74e980b145a21c087e4c9 SHA256 0f76477c219aa730d53c1d0f58b6879f0a0b50d21558bf5ed1aefe126e4d420e
-MD5 07f7873381fe87314ea04d2949e13696 files/varnishd.initd 506
-RMD160 146cc05d6d09eaabcdfa0785dfab690600b11f39 files/varnishd.initd 506
-SHA256 0f76477c219aa730d53c1d0f58b6879f0a0b50d21558bf5ed1aefe126e4d420e files/varnishd.initd 506
-DIST varnish-1.0.3.tar.gz 541822 RMD160 f7c827a497c50a2d3e51915b4e007e16c9cad5d6 SHA1 f9c34cf635a1f58178bee25e7042eba6f72376a0 SHA256 15c2efdb3e70b3eccc17145f5b24c315d6301e169a5008de8987ab9d437f75e5
+AUX varnishd.initd 579 RMD160 0b2a92c1f86498e067ed6cf8565a8f73de70fc95 SHA1 2449cee3af4c1957d8e5bfadd045070a8dcdd876 SHA256 88eceb80437e23d36bc456fc0b928f0a0a3ed7f16116e18f7862f6ad463cd165
+MD5 090e171dc2b5d69810cd3b7c1b74d651 files/varnishd.initd 579
+RMD160 0b2a92c1f86498e067ed6cf8565a8f73de70fc95 files/varnishd.initd 579
+SHA256 88eceb80437e23d36bc456fc0b928f0a0a3ed7f16116e18f7862f6ad463cd165 files/varnishd.initd 579
 DIST varnish-1.0.4.tar.gz 533057 RMD160 e6613a585382735c00ffb64f9df57be282339da3 SHA1 121e6a195e27d553b27cf288922b0fde99363e9a SHA256 f9f8f121cdea87133b7923b92ea08cac90ab08ffdc325166ccea22449114b2ea
-EBUILD varnish-1.0.3.ebuild 934 RMD160 fd256778789f209fbe38451c582454f7fb20ba27 SHA1 971026080775ebfd7be9708be2a73f2844e1f57d SHA256 3c321c6a58a81761cf64cb42b462e0cdba764bde1a5c846fc4c8f29852a5d2e7
-MD5 912597030da10bae9c2ff2f3e2ad7636 varnish-1.0.3.ebuild 934
-RMD160 fd256778789f209fbe38451c582454f7fb20ba27 varnish-1.0.3.ebuild 934
-SHA256 3c321c6a58a81761cf64cb42b462e0cdba764bde1a5c846fc4c8f29852a5d2e7 varnish-1.0.3.ebuild 934
 EBUILD varnish-1.0.4.ebuild 934 RMD160 9a8e492f7b8fcd04b7fb44fe987a4495e4b7e39b SHA1 9f19ed317cbb7eac43a5dc85e0c1505e0123e93a SHA256 cd76a5408a37206734cc07d38bdaaadfd176c35e593bcd019a4be11dbde41ce6
 MD5 433f5c3bd4f9d70b42663ebbd05bdb18 varnish-1.0.4.ebuild 934
 RMD160 9a8e492f7b8fcd04b7fb44fe987a4495e4b7e39b varnish-1.0.4.ebuild 934
 SHA256 cd76a5408a37206734cc07d38bdaaadfd176c35e593bcd019a4be11dbde41ce6 varnish-1.0.4.ebuild 934
-MISC ChangeLog 1190 RMD160 a74ca0cbf478bdc440c43da3f331b18acfb13990 SHA1 7501b9ff96a226d3c434c64c5aa983a7203bb74c SHA256 a7dfb24f3c50c8451bfdfa27ca99a79dc2dbea2594be3cb4ee11eb4148cff82e
-MD5 d3f3f2c7cb5e7ef18089f7bc6034682e ChangeLog 1190
-RMD160 a74ca0cbf478bdc440c43da3f331b18acfb13990 ChangeLog 1190
-SHA256 a7dfb24f3c50c8451bfdfa27ca99a79dc2dbea2594be3cb4ee11eb4148cff82e ChangeLog 1190
+MISC ChangeLog 1341 RMD160 b5a41942c98e2004d2ad8b690a2793a8fec42116 SHA1 01cdc0240df07dba4fff5ffb11f579e8853be7d3 SHA256 eafdd4e8e4df92f6eb42ef1e524a6819b3c78732db32bdb113efb0a3cefd135a
+MD5 7ba6f024316b0697af9c5688cdd69f12 ChangeLog 1341
+RMD160 b5a41942c98e2004d2ad8b690a2793a8fec42116 ChangeLog 1341
+SHA256 eafdd4e8e4df92f6eb42ef1e524a6819b3c78732db32bdb113efb0a3cefd135a ChangeLog 1341
 MISC metadata.xml 1026 RMD160 e7e9f2813e22bea7b993644082badd89460d3d7f SHA1 3bd5b7b70bb6904df77374f7df74f6cedf074d08 SHA256 fda15c7ee0557ab9d595e3e98caa18bc7b3da81875bbac233f312b32eb4d84f5
 MD5 5b5862eddb733f2186c7af857505458d metadata.xml 1026
 RMD160 e7e9f2813e22bea7b993644082badd89460d3d7f metadata.xml 1026
 SHA256 fda15c7ee0557ab9d595e3e98caa18bc7b3da81875bbac233f312b32eb4d84f5 metadata.xml 1026
-MD5 ba4576d4447a1a01f666af3634a76c56 files/digest-varnish-1.0.3 241
-RMD160 971780f948c7557d647c38ea01a932263b6d4a9b files/digest-varnish-1.0.3 241
-SHA256 973e663f68aa74de2ac391e458fccae3bce1b6897d5f1c366d5666a8479ccd92 files/digest-varnish-1.0.3 241
 MD5 7739325a5e558ffd117dc082cca8a705 files/digest-varnish-1.0.4 241
 RMD160 a726c4b99978f5ef15a3d114a40c07f84d6e4fa2 files/digest-varnish-1.0.4 241
 SHA256 998aed218590050a9d340cfae8c18635f8a8d4de8d3e11246097c8abc5cec9a7 files/digest-varnish-1.0.4 241
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
-}
-