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

Package-Manager: portage-2.1.4.4

5 files changed, 88 insertions, 10 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/Manifest b/sys-process/daemontools/Manifest
index 951d83f780de..df1b30353249 100644
--- a/sys-process/daemontools/Manifest
+++ b/sys-process/daemontools/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.76-errno.patch 246 RMD160 be7d0b13dac87a0f9a40de3b97aec20cb6c7b665 SHA1 95af96e1da3042fff1cd0f64e8c304983dec96b0 SHA256 1afaa3b5a26e7382cfe1c9880ddf3910fde4ded6fa815440ef087506543a3947
 AUX 0.76-head-1.patch 791 RMD160 70c7cf62931178d28a134f2baec7247bcb97412c SHA1 420db4f5e83ac39df522c1f0d2a172fa20e21e09 SHA256 e444e85cb751b3df45eaa0569c45fd4ff03faf8b351d8f8cb7cfc9589943ba7b
 AUX 0.76-warnings.patch 1305 RMD160 3b2f56931712fa5c087b6b4e0a36545999535829 SHA1 9c08d9d92cdeb648f928ae6c153ecc30c82dbe6b SHA256 42bfcc27660ef6459d39fbaaa9f1852313baadf7b96201872e4deb12804f4833
-AUX svscan.init 796 RMD160 e6c688c40ae5d806757af554a9e3a10e4c817420 SHA1 0b11838d68dafcf5482bef698179505beeec1bb3 SHA256 2ae51e0ea3e5c2aee24228e437d89d571618cb806da117127b232e3c0102f717
+AUX svscan.init 796 RMD160 3bedcabb000a97b270cdb0b1284cbcdfb9eeb65a SHA1 075034e307867377067b79d59069b79012526054 SHA256 23add71f193900147d2b454cda011ec4df0d2759a3744c292834d9d4cd357813
+DIST daemontools-0.76-man-20020131.tar.gz 8005 RMD160 d82f0bad55f0751fdfadfa0f3bf2883740fa65d9 SHA1 28e167def0e457f2be10aa90504c402fa08723ab SHA256 1b4d77afe0878a0df587672531a3f7bbe0feb7ad0e9acf50395426e3c434600a
 DIST daemontools-0.76.tar.gz 36975 RMD160 9819dae18b3f15a366e49fea81ecef76d5b4f53f SHA1 70a1be67e7dbe0192a887905846acc99ad5ce5b7 SHA256 a55535012b2be7a52dcd9eccabb9a198b13be50d0384143bd3b32b8710df4c1f
 EBUILD daemontools-0.76-r5.ebuild 1647 RMD160 d334067ab4b81961d9ff983402e4f25aa249836e SHA1 30301ee0f9e5ea29dc55c080cbfd22d763bf46fc SHA256 36be7d2110386ba91ddfdfa5fa59f79a8db4e32f747b6b7f701f6bed2ff5f808
-MISC ChangeLog 4708 RMD160 7de328a577f0d43572e9d5995380f26ecd3ed763 SHA1 97985d496809430fe68540849155afd013939078 SHA256 854f6666cd1ad2d06ad793a4b072377c7545dca750e46eaafab8028ce38b7a82
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+EBUILD daemontools-0.76-r6.ebuild 1500 RMD160 8b689af79fd4c1b0c175afb6a535185f8823dfc2 SHA1 40a8cf8f7ff012a2c6a4486b7392b8f3b5bc759e SHA256 74e80b52ecb9a2344d913ae2ae7d57717e0d9c6f24a24044398caa09046a3d2a
+MISC ChangeLog 4912 RMD160 138533375286cb7c06e0c609682167fceba7c897 SHA1 8a5fa27677605a39bfc4ff37120af87db9bd7e2c SHA256 025ce1f57ecbf7da4b5e68331786ea9a83ab142ab0662261999c057e445aff76
+MISC metadata.xml 165 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 SHA1 c7b83ef947fe7e8273cc512fee9bba06586a58f9 SHA256 23a8851c12bd4cf7cf0528250ad5605be6b0780bbec0c51331d6d2c618c13f6a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH+P/mmPFBzbX68WERAvX2AJ9nQ8rcI/Pn+Rmtv9icbLVuQsiHCgCfXfPn
+n/hNaTfuGN4qPgBTLaerAto=
+=+UQv
+-----END PGP SIGNATURE-----
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>