Use newconfd/newinitd for #174266; Properly quote variables.

Package-Manager: portage-2.1.2.4

4 files changed, 44 insertions, 37 deletions

diff --git a/sys-cluster/saru/ChangeLog b/sys-cluster/saru/ChangeLog
index 7e4880d288f6..0098a71ff6bc 100644
--- a/sys-cluster/saru/ChangeLog
+++ b/sys-cluster/saru/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/saru
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/saru/ChangeLog,v 1.7 2007/02/22 00:54:50 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/saru/ChangeLog,v 1.8 2007/04/22 17:11:19 phreak Exp $
+
+  22 Apr 2007; Christian Heim <phreak@gentoo.org> metadata.xml,
+  saru-0.0.1.ebuild:
+  Use newconfd/newinitd for #174266; Properly quote variables.
+
+  22 Apr 2007; Christian Heim <phreak@gentoo.org> metadata.xml,
+  saru-0.0.1.ebuild:
+  Use newconfd/newinitd for #174266; Properly quote variables.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/sys-cluster/saru/Manifest b/sys-cluster/saru/Manifest
index 9126aec29999..728a6edba55a 100644
--- a/sys-cluster/saru/Manifest
+++ b/sys-cluster/saru/Manifest
@@ -10,25 +10,25 @@ MD5 c5e666d281f435e2d695c302b5716503 files/saru.init 904
 RMD160 af3dd250e19e5e79378031342d71461a127e0d7c files/saru.init 904
 SHA256 478729a51061fad00d2c6832e73148407afbc1e4b5643a23422884e2b314f018 files/saru.init 904
 DIST saru-0.0.1.tar.gz 242850 RMD160 e40c04d88e8a23a28b3bd4034e93d495fdae739b SHA1 8abd665b1e71735a382134cddaa6356618da8b5b SHA256 51ab01e7179bb4e3a5fa69230819f8e593ca3f2d644c41a8f5495da2cde8a4ae
-EBUILD saru-0.0.1.ebuild 2590 RMD160 d700e4fc5867e1785cf5b1677aac02145ffe4917 SHA1 efc342e2bb9a265b4c3277214f60a18f48d8abe7 SHA256 f729cb8916d41bcb2d35f291d6eaf54b8c38172509395eb577c2deb13af33225
-MD5 7eb14932d89c22efa32ca052bf98f7ed saru-0.0.1.ebuild 2590
-RMD160 d700e4fc5867e1785cf5b1677aac02145ffe4917 saru-0.0.1.ebuild 2590
-SHA256 f729cb8916d41bcb2d35f291d6eaf54b8c38172509395eb577c2deb13af33225 saru-0.0.1.ebuild 2590
-MISC ChangeLog 927 RMD160 21e442de84ef3ad4cb3e2cfdd77d1f8f14ab348f SHA1 792a540efd62be4668fa9fdaf00607392b4c72b1 SHA256 29bbdd28799fe903f15d2d42bfc26ef6df314216668cbcff06b4caf8480516e4
-MD5 4481e4380c317a98f6ada3f433054ee5 ChangeLog 927
-RMD160 21e442de84ef3ad4cb3e2cfdd77d1f8f14ab348f ChangeLog 927
-SHA256 29bbdd28799fe903f15d2d42bfc26ef6df314216668cbcff06b4caf8480516e4 ChangeLog 927
-MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
-MD5 c667f921ee8d48ce17ebef0f8d601ea4 metadata.xml 210
-RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 metadata.xml 210
-SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 metadata.xml 210
+EBUILD saru-0.0.1.ebuild 2478 RMD160 3f7a32cf9df859ebf930f474e89166208c1f1474 SHA1 163c9b4004aac320bd19a2161afbd557b9cf69dc SHA256 12b75182742dc569bd78d7291b6a128fb0cb51433dffb0d788d36c0a2967d6be
+MD5 d34067272284964cb1557aacaa26b067 saru-0.0.1.ebuild 2478
+RMD160 3f7a32cf9df859ebf930f474e89166208c1f1474 saru-0.0.1.ebuild 2478
+SHA256 12b75182742dc569bd78d7291b6a128fb0cb51433dffb0d788d36c0a2967d6be saru-0.0.1.ebuild 2478
+MISC ChangeLog 1226 RMD160 24fecf1b2fa13da988b45607fe9f28419f00bdf3 SHA1 9a80e6cd93945dd2c727331d548916c4dc1d3622 SHA256 70cf01cd6e66351f3d8797f404a5a6c8d6e412544fe36599a04731a310f468c3
+MD5 4acadd3acc0e3ecf12f7f795697c064e ChangeLog 1226
+RMD160 24fecf1b2fa13da988b45607fe9f28419f00bdf3 ChangeLog 1226
+SHA256 70cf01cd6e66351f3d8797f404a5a6c8d6e412544fe36599a04731a310f468c3 ChangeLog 1226
+MISC metadata.xml 211 RMD160 f0c4ad6ccb0152d62a300bc77956ea3bf7c170a2 SHA1 6f46be7ecc51754f0679bc5a779c151e1b701016 SHA256 84ff2341253cdd21a6782e14ebc076a8bcae11428aacfe2454f4b32165504727
+MD5 7bf5617a69fe84657ebae118d8f9716c metadata.xml 211
+RMD160 f0c4ad6ccb0152d62a300bc77956ea3bf7c170a2 metadata.xml 211
+SHA256 84ff2341253cdd21a6782e14ebc076a8bcae11428aacfe2454f4b32165504727 metadata.xml 211
 MD5 8011663bc503e5ed6809c61e6406757f files/digest-saru-0.0.1 232
 RMD160 281b0ffc2abf45ab65991806e58df306625c0f4b files/digest-saru-0.0.1 232
 SHA256 cc0d921e3692e515b3a6019bd92080dfdc7d8888822d32d818fa08375ca57eda files/digest-saru-0.0.1 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF3Olyz974XjDVpbkRAgvGAKCfSAz4HIFFVbAfWMBDwfv/EUKtegCfYHKd
-mYJaSEop/0CXxgHmWTUyb44=
-=PsXP
+iD8DBQFGK5dAyuNVb5qfaOYRAsw4AKDK9UzB4tVHQL78AWtz9VddozkUlwCgtLyo
+VOdo83d8E4xxVWWUyi07cbw=
+=sZhm
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/saru/metadata.xml b/sys-cluster/saru/metadata.xml
index d9cd2cad66c2..a40624fba8f0 100644
--- a/sys-cluster/saru/metadata.xml
+++ b/sys-cluster/saru/metadata.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-<email>maintainer-needed@gentoo.org</email>
+	<email>maintainer-needed@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/saru/saru-0.0.1.ebuild b/sys-cluster/saru/saru-0.0.1.ebuild
index 0f6b57e56f87..a2641e5e32e5 100644
--- a/sys-cluster/saru/saru-0.0.1.ebuild
+++ b/sys-cluster/saru/saru-0.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/saru/saru-0.0.1.ebuild,v 1.6 2004/09/20 20:59:49 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/saru/saru-0.0.1.ebuild,v 1.7 2007/04/22 17:11:19 phreak Exp $
 
 inherit eutils
 
@@ -26,8 +26,8 @@ src_compile() {
 	econf \
 	--with-iptables-lib=/lib/iptables \
 	--with-heartbeat-lib=/usr/lib/heartbeat \
-	--with-heartbeat-fifo=/var/lib/heartbeat/api || die "econf failed"
-	emake || die "emake failed"
+	--with-heartbeat-fifo=/var/lib/heartbeat/api || die "econf failed!"
+	emake || die "emake failed!"
 }
 
 src_install() {
@@ -49,23 +49,22 @@ src_install() {
 	insinto /lib/modules/${KV}/kernel/net/ipv4/netfilter
 	doins iptables/kernel/ipt_saru.o || die "doins failed"
 
-	dodir /etc/init.d /etc/conf.d /etc/saru
-	insinto /etc/conf.d
-	newins  ${FILESDIR}/saru.conf saru || die "newins failed"
+	dodir /etc/saru
+	newconfd "${FILESDIR}"/saru.conf saru
 
 	insinto /etc/saru
 	doins etc/saru/saru.conf || die "doins failed"
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/saru.init saru || die "newexe failed"
+	newinitd "${FILESDIR}"/saru.init saru
 
 	doman saru/saru.8 || die "doman failed"
 
 	dodir /var/lib/heartbeat/api
-	mknod -m 200 ${D}/var/lib/heartbeat/api/saru_1.req p || die "mknod failed"
-	fowners 65:65 /var/lib/heartbeat/api/saru_1.req || die "fowners failed"
-	mknod -m 600 ${D}/var/lib/heartbeat/api/saru_1.rsp p || die "mknod failed"
-	fowners 65:65 /var/lib/heartbeat/api/saru_1.rsp || die "fowners failed"
+	mknod -m 200 "${D}"/var/lib/heartbeat/api/saru_1.req p || die "mknod -m 200 failed!"
+	mknod -m 600 "${D}"/var/lib/heartbeat/api/saru_1.rsp p || die "mknod -m 600 failed!"
+
+	fowners 65:65 /var/lib/heartbeat/api/saru_1.req \
+		/var/lib/heartbeat/api/saru_1.rsp || die "fowners failed!"
 
 	dodoc ChangeLog README INSTALL TODO NEWS AUTHORS \
 		patches/linux-2.4.20-outgoing_mac.hidden.patch \
@@ -74,11 +73,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo
-	einfo "upgrading module dependencies ... "
-	/sbin/depmod -a -F ${ROOT}/lib/modules/${KV}/build/System.map
-	einfo "... done"
-	einfo
+	echo
+	ebegin "Updating module dependencies ... "
+	/sbin/depmod -a -F ${ROOT}/lib/modules/${KV}/build/System.map > /dev/null 2>&1
+	eend $?
+	echo
 	einfo "Please remember to re-emerge saru when you upgrade your kernel!"
-	einfo
+	echo
 }