Version bump. Removed old. Added rewritten init script

(Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 45 insertions, 9 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/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 $?
+}