fix #201749; use new qmail.eclass; ebuild cleanup

(Portage version: 2.1.4.4)

4 files changed, 73 insertions, 7 deletions

diff --git a/sys-process/daemontools/ChangeLog b/sys-process/daemontools/ChangeLog
index cdc6107459f8..bdfdd7ad8c4d 100644
--- a/sys-process/daemontools/ChangeLog
+++ b/sys-process/daemontools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/daemontools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools/ChangeLog,v 1.6 2008/01/04 22:43:36 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools/ChangeLog,v 1.7 2008/04/06 16:52:40 hollow Exp $
+
+*daemontools-0.76-r6 (06 Apr 2008)
+
+  06 Apr 2008; Benedikt Böhm <hollow@gentoo.org> files/svscan.init,
+  metadata.xml, +daemontools-0.76-r6.ebuild:
+  fix #201749; use new qmail.eclass; ebuild cleanup
 
   04 Jan 2008; Hanno Boeck <hanno@gentoo.org> daemontools-0.76-r5.ebuild:
   Change license to public domain (http://cr.yp.to/distributors.html),
diff --git a/sys-process/daemontools/daemontools-0.76-r6.ebuild b/sys-process/daemontools/daemontools-0.76-r6.ebuild
new file mode 100644
index 000000000000..4925f3c215cd
--- /dev/null
+++ b/sys-process/daemontools/daemontools-0.76-r6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools/daemontools-0.76-r6.ebuild,v 1.1 2008/04/06 16:52:40 hollow Exp $
+
+inherit eutils flag-o-matic qmail
+
+DESCRIPTION="Collection of tools for managing UNIX services"
+HOMEPAGE="http://cr.yp.to/daemontools.html"
+SRC_URI="http://cr.yp.to/daemontools/${P}.tar.gz
+	http://smarden.org/pape/djb/manpages/${P}-man-20020131.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux static"
+
+DEPEND=""
+RDEPEND="selinux? ( sec-policy/selinux-daemontools )
+	!app-doc/daemontools-man"
+
+S="${WORKDIR}"/admin/${P}/src
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PV}-errno.patch
+	epatch "${FILESDIR}"/${PV}-warnings.patch
+	ht_fix_file Makefile print-{cc,ld}.sh
+
+	use static && append-ldflags -static
+	qmail_set_cc
+}
+
+src_compile() {
+	touch home
+	emake || die
+}
+
+src_install() {
+	keepdir /service
+
+	dobin $(<../package/commands) || die
+	dodoc CHANGES ../package/README TODO
+	doman "${WORKDIR}"/${PN}-man/*.8
+
+	newinitd "${FILESDIR}"/svscan.init svscan
+}
+
+pkg_postinst() {
+	einfo
+	einfo "You can run daemontools using the svscan init.d script,"
+	einfo "or you could run it through inittab."
+	einfo "To use inittab, emerge supervise-scripts and run:"
+	einfo "svscan-add-to-inittab"
+	einfo "Then you can hup init with the command telinit q"
+	einfo
+}
diff --git a/sys-process/daemontools/files/svscan.init b/sys-process/daemontools/files/svscan.init
index 8778c74fcdc5..87b347a4f183 100644
--- a/sys-process/daemontools/files/svscan.init
+++ b/sys-process/daemontools/files/svscan.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools/files/svscan.init,v 1.1 2005/12/11 09:49:54 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools/files/svscan.init,v 1.2 2008/04/06 16:52:40 hollow Exp $
 
 depend() {
 	use net
@@ -17,14 +17,16 @@ start() {
 }
 
 stop() {
+	ebegin "Stopping service scan"
+	start-stop-daemon --stop --exec /usr/bin/svscan \
+		--pidfile /var/run/svscan.pid
+	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 $?
-	ebegin "Stopping service scan"
-	start-stop-daemon --stop --exec /usr/bin/svscan \
-		--pidfile /var/run/svscan.pid
-	eend $?
 }
diff --git a/sys-process/daemontools/metadata.xml b/sys-process/daemontools/metadata.xml
index 96a2d586367d..659da0ca93c2 100644
--- a/sys-process/daemontools/metadata.xml
+++ b/sys-process/daemontools/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+	<herd>base-system</herd>
 </pkgmetadata>