Version bump. Removed old. Added rewritten init script

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 63 insertions, 16 deletions

diff --git a/sys-process/daemontools-encore/ChangeLog b/sys-process/daemontools-encore/ChangeLog
index ecb37331e38e..a62fa89c9e6c 100644
--- a/sys-process/daemontools-encore/ChangeLog
+++ b/sys-process/daemontools-encore/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-process/daemontools-encore
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools-encore/ChangeLog,v 1.6 2013/10/18 09:26:46 chainsaw Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools-encore/ChangeLog,v 1.7 2014/09/22 08:36:38 polynomial-c Exp $
+
+*daemontools-encore-1.10 (22 Sep 2014)
+
+  22 Sep 2014; Lars Wendler <polynomial-c@gentoo.org>
+  -daemontools-encore-1.05.ebuild, +daemontools-encore-1.10.ebuild,
+  +files/svscan.init-2:
+  Version bump. Removed old. Added rewritten init script.
 
 *daemontools-encore-1.06 (18 Oct 2013)
 
diff --git a/sys-process/daemontools-encore/Manifest b/sys-process/daemontools-encore/Manifest
index a4e82b60a307..ef77c37257ae 100644
--- a/sys-process/daemontools-encore/Manifest
+++ b/sys-process/daemontools-encore/Manifest
@@ -2,16 +2,27 @@
 Hash: SHA256
 
 AUX svscan.init-1.02 816 SHA256 f046a8e1a6b56f335ba3759ad9482bdc0fdf53919fc80f944a19a8e83960d155 SHA512 8d13eb1619bef2e3d325ce51346eff0ea2cb99881c2f853e8048a399e8beb1150484aa045407b3ace92671bf12ee67037daf08c3ba4d1c11a7aaae4cc236dd75 WHIRLPOOL c0d6fa5abfc4d9c3dc2deed86226b44c43b451eaccc425dc50624ad14a2b222bc590d8576b3f9481453a978aaa09beb94a2bb723fd6f03aac6c6bee49a9e2514
-DIST daemontools-encore-1.05.tar.gz 78974 SHA256 8b26bf012ae601aa5f0f43c2a3102b5d314bfaec8823f2fe9a79d40cf55530a5 SHA512 00f324710a4220aa174623ecfed009a39ed1a9e1db8d93c80dc75afc3b16e9791a93a4d4d1ef9b90a060c69a75a88df705328e260096c8f71959c7c040a61b9d WHIRLPOOL a9f5d85205a294afe2238e91270bf46f033566e7271e553ccf4fd35b219e22d70d917bcd76d7996923f0f0c3721786ccf406ae43a950da3faf2e69aa67053de7
+AUX svscan.init-2 722 SHA256 5a5e411d9b09978acdcd49b4796f8edf4c6ebffa45a71eed288a5099c445d711 SHA512 1c30614d582e48d894be23b5fd9d3d3688b9add8c09225bedbc6ace087586b11116917397ee5a03add413758e61ed6a6436d49f45787666c39a39efaa1fe0181 WHIRLPOOL 160eb6537b6ed11e1400cd25a6a1ad8e2c3da6ebb0f17829ee1857c1cb72a68bba2492f3da10df215eeb02eb67439329d44cb18140a372494115ccc25e1ac6e4
 DIST daemontools-encore-1.06.tar.gz 81717 SHA256 c4176cfa6ee368170f91f0b6c4006f26f2c3c30a5d2179e92ff316d2227367e6 SHA512 76d87fb4656f8687e733598866a9f83f37b751ed5326a59184400276eb45ff21e596a4820b018264089535c1b360d9c8a7b508b4fb03c7f1837c03cd0b36b120 WHIRLPOOL f66875f008177c959031c2b97c53b60cd71c3ad32071393951832c8c4968d5af3de5fbf78caaac366eed52efd3280999f64e3b83d0fbb4ff84d14deb603512ce
-EBUILD daemontools-encore-1.05.ebuild 1261 SHA256 8bed540be3594a964d333a79ab0f66184530c7f888fb63b5cd6c7c311a0fe4f8 SHA512 85ac98c32666e888ce1d3c69879b5468c2d384ad1b38a067ace66d305572e4e442ffcc454c325f4e874b3b4421f0f121233ddb4099915284ba21649ba2c61edd WHIRLPOOL e863e4ba4aaae3bb73d294ffdb395da64670dba5f541dc73ad1056a00692269b3c40629b621c26ffd060da134be2c65f3bbd94da00a01974125e5a296396e924
+DIST daemontools-encore-1.10.tar.gz 87096 SHA256 9f48f3c6cdd3f2b0202532e87f9ff46ea86777ca31ebda3a96bed618104bbd31 SHA512 569030fb9941186f167644740d0424987105b7a818d5a3cdb4e90ced5530a16938b7205141ca2f198f83362269f9cc28eb5acafe9cd7f985c8e56d307f706767 WHIRLPOOL d4ad3bebb8467dbfb5b9d8a40020c50822ca14cfb9ebc1ff44b3563a93e3083061f7b16a137a6c7df6898df6349ee380b6453c299ee098286924ba92b6b279ac
 EBUILD daemontools-encore-1.06.ebuild 1262 SHA256 04b35f517f8c801aabb080d5ed276d55be13196980ee7549f922c1c503efdff5 SHA512 d14551405436042ac7c8a3f768df7683a53fbdbad41dcfbdb124914928100cbfebd6f3bea43211517944ad1bbf116115bf3f2c63fad2df053b68078719be61f5 WHIRLPOOL f4383deeee610d35e0c12a78e85951044cadca4a011e371f261ee817144e1eeab0f24b4afc8516c33d05d26f5696df71303caa29b604386adeea4a38bac70cfe
-MISC ChangeLog 1212 SHA256 33b49a5488fc3d97e5c2a39e0c9641a296fa2c4ed9929ca49ff98108f4e59728 SHA512 48d24881aa10fa3123fe131a00c1150bb831275505d1b86ead3d67db9fdbd72db9d8d86ab5c6f36f2d4d71f8d981f70c7a6c9679ea8eda9be2bad08bc73ba7e1 WHIRLPOOL e1de83a0ae516abde0a89dd2667f035b24fd24db3a5fbf79f67f6134e6ee2ff37f4a3193a8cc8598f822c90a64cf690f40e11b836f0d9905ec4f8e9b0e58695a
+EBUILD daemontools-encore-1.10.ebuild 1271 SHA256 e6bf73f6f33a6fef52e4b3dcbe2402423758b27201ad1a1755dbcedad07569b1 SHA512 c522cc5970614d17ab3befd1637ba5679d1b440297c56f986b81e3d27b6dd71449d644fbb77f33420932fd69f1ee708d818d7912337da8e800ae0aa1a4eb3007 WHIRLPOOL 29e770f88736b73bee4258574594ae8d58b783cb241d71c2a256216543d64293158c380408f695844ef92b92ed3a8157c3c5093d112047b4fbaaa1da58a9be3f
+MISC ChangeLog 1461 SHA256 0399376f550db5880e213e9798715448a26b1512805a332e199db4d76571d0a3 SHA512 d396521599fe4bc553aab2f8b5052564d2150710554e405e17edf9f0b05416b5eca1d98e696bb875bf38d6e31049346b6fec322a05fbac40fc2254b5659d2d28 WHIRLPOOL 5c2b5cf57e77507043ec3ce71f8ef3160dbdf35f9c04b7f26cb19ca701a269a55bfd99e51c00cbffdc4f2b7e1bfbf86814e0688276cea73d1ea495821c69a6fc
 MISC metadata.xml 578 SHA256 780c7af95e3be497a73dd6c01f4c60951c791e6b8b32b6635249a1c8ab040001 SHA512 fc4239ea459b7e405999728e63dcab56926ce33c094ebe713c0df9ba60c4d6901264871c92509b4cafda8332b4f46378837d420b6f522eae6f0b45ed944e2467 WHIRLPOOL 9fdc37ff61ca45245eaaf1f74cff26aeb38bfd27d3a4da4c5264dab123bed3c4abbf727f9f4d2951aa6e7222f69e807dc8523f0e1904ca0e92458d87fb9ecd8c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlJg/tUACgkQp5vW4rUFj5qGBgCfXh4WsB9N5nSzFloUJAIs6OZV
-OCUAoJD54z2eShvJEuOr9Cs1BcLNZMmU
-=Mwy+
+iQIcBAEBCAAGBQJUH9+YAAoJEPiazRVxLXTFHZkP/Ag+2N2g3hVd0EZ9hgUht8zm
+oibWukejNgwy9RyZeZxHawAO2OTZ4hIEAgZ3LqUEt76m3+9ro8C4F9V4AGLMzq8F
+sL2ev/4qyQwQL8bf6ZTcXOpovVtKldmUucOpaSH2YFXorMWTzDcSD3TcwaxW7jCa
+wExeQp2rB0oPxlfanxONcyRwSfTdkIN4DigUllIxEeuzNHkNN1zbLAVuLeBEJ+Zs
+TZHfy2D48XUHxUQLPNhmT9MrCbQEG3cm4ForQ6fRU9q1nXz3Tj4UVcL7cFmr+qTj
+Asi4jOp9LThx8SxRNLz2l277vshM7E8XK2IfuLBMJivJg2k2ZRl8YTkIrRph9KTd
+tlpzLmkafItWiq3F6/E81ZqliTwegC7plM53Ou8ma0y4Zqu4ELlHKMjvcfVsHY37
+pUleQW16l1qrIlNWYZw/mk5OEbOGnchiHHQnKqG7lk9qdc93WPA6a5gSVCjc2cwS
+gQEKnUTmjmQGLltJ0i5dEWh2fRXxoZT3+sbCjBSKWHLmBxJY7iKFuOtz8SS1wC74
+L2eQxGZm78xEiE+fyJ39FG/iaegF+KxWxLTs4wrXNwCvKzjErsZkapoA1W6MPGNM
+N5pfs+Gpo6eBgu1EOSNUHgEMT3Tn8LWrnZe9M8tOJamyO8rjhfNi2Up8CIlqs6L/
+NDN96qRvXgs9xBKXQy2A
+=dFy+
 -----END PGP SIGNATURE-----
diff --git a/sys-process/daemontools-encore/daemontools-encore-1.05.ebuild b/sys-process/daemontools-encore/daemontools-encore-1.10.ebuild
index 8081b909502d..4802fc7bc872 100644
--- a/sys-process/daemontools-encore/daemontools-encore-1.05.ebuild
+++ b/sys-process/daemontools-encore/daemontools-encore-1.10.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools-encore/daemontools-encore-1.05.ebuild,v 1.1 2011/01/28 22:11:08 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools-encore/daemontools-encore-1.10.ebuild,v 1.1 2014/09/22 08:36:39 polynomial-c Exp $
 
-EAPI=3
+EAPI=5
 
 inherit flag-o-matic qmail
 
 DESCRIPTION="Collection of tools for managing UNIX services"
 HOMEPAGE="http://untroubled.org/daemontools-encore/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+SRC_URI="http://untroubled.org/daemontools-encore/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -23,7 +23,7 @@ RDEPEND="selinux? ( sec-policy/selinux-daemontools )
 src_compile() {
 	use static && append-ldflags -static
 	qmail_set_cc
-	emake || die
+	emake
 }
 
 src_install() {
@@ -33,11 +33,11 @@ src_install() {
 	echo ${D}/usr/share/man >conf-man
 	dodir /usr/bin
 	dodir /usr/share/man
-	emake install || die
+	emake install
 
 	dodoc ChangeLog CHANGES CHANGES.djb README TODO
 
-	newinitd "${FILESDIR}"/svscan.init-1.02 svscan || die
+	newinitd "${FILESDIR}"/svscan.init-2 svscan
 }
 
 pkg_postinst() {
diff --git a/sys-process/daemontools-encore/files/svscan.init-2 b/sys-process/daemontools-encore/files/svscan.init-2
new file mode 100644
index 000000000000..30da4719d970
--- /dev/null
+++ b/sys-process/daemontools-encore/files/svscan.init-2
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools-encore/files/svscan.init-2,v 1.1 2014/09/22 08:36:39 polynomial-c Exp $
+
+pidfile="/var/run/svscan.pid"
+command="/usr/bin/svscan"
+command_args="/service"
+command_background="true"
+
+depend() {
+	use net
+	before ntpd ntp-client spamd apache apache2
+}
+
+stop() {
+	ebegin "Stopping service scan"
+	start-stop-daemon --stop --exec ${command} \
+		--pidfile ${pidfile}
+	eend $?
+
+	ebegin "Stopping service scan services"
+	svc -dx /service/* 2>/dev/null
+	eend $?
+
+	ebegin "Stopping service scan logging"
+	svc -dx /service/*/log 2>/dev/null
+	eend $?
+}