Use newinitd and newconfd (#174266)

Package-Manager: portage-2.1.2.5

4 files changed, 62 insertions, 59 deletions

diff --git a/sys-block/partimage/ChangeLog b/sys-block/partimage/ChangeLog
index 5c4bea05acd7..ee818dd6369c 100644
--- a/sys-block/partimage/ChangeLog
+++ b/sys-block/partimage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-block/partimage
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.27 2007/01/05 07:12:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.28 2007/04/28 13:10:38 tove Exp $
+
+  28 Apr 2007; Torsten Veller <tove@gentoo.org> partimage-0.6.4-r3.ebuild,
+  partimage-0.6.4-r4.ebuild:
+  Use newinitd and newconfd (#174266)
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   partimage-0.6.4-r3.ebuild:
diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest
index 03a26d7dd264..de0ca4b3f28b 100644
--- a/sys-block/partimage/Manifest
+++ b/sys-block/partimage/Manifest
@@ -95,18 +95,18 @@ RMD160 8786b07466c5330254eb96e1de6f754e8a68e77f files/servercert.cnf 1096
 SHA256 9a9cae8cd6c7bbc6f71cd619829b7a6a47d6aae34831cc44a6cc3bf3e7917953 files/servercert.cnf 1096
 DIST partimage-0.6.4-1.tar.bz2 706438 RMD160 cc452f064d7b26d10ffde7b196f6121ade2a619b SHA1 baf1b20a29d8f0977e16e4c559c2d8486357ab4c SHA256 180c443d85def5bbc02fe21fb31014799259d026c820633246c92c536397fba7
 DIST partimage-0.6.4.tar.bz2 654707 RMD160 9de0195c0bc2a83088b054be63102d6ac2350428 SHA1 3e451478a4ced960aa73048d3a19c2bd595ef890 SHA256 e4741d383edb59359b565f6623fc773c704735e65b85a5a378efc922205f14d3
-EBUILD partimage-0.6.4-r3.ebuild 4335 RMD160 5bb02157e877c419bdd944a46cb72eecc34bd890 SHA1 752a09406a9047cb6c7f2322ecc51071898e7284 SHA256 83aee7b3e26dc02c6a987d05e5a8e9cf14489ee9de9a6bb3f3e82484e212cd09
-MD5 c703813e962a57306ffb12eeabfe6f75 partimage-0.6.4-r3.ebuild 4335
-RMD160 5bb02157e877c419bdd944a46cb72eecc34bd890 partimage-0.6.4-r3.ebuild 4335
-SHA256 83aee7b3e26dc02c6a987d05e5a8e9cf14489ee9de9a6bb3f3e82484e212cd09 partimage-0.6.4-r3.ebuild 4335
-EBUILD partimage-0.6.4-r4.ebuild 5335 RMD160 3e10417fbb85bad04b44a2945115b8ef577dc9b1 SHA1 9fe49ae8f9b10e485a2b126e796541fc84a1bee0 SHA256 cd1ed24e39c9979a126400253ac2703a5bdf3642a01143c93f8e8ec8b8fb6e19
-MD5 ce1e2d049f16b9f6b20ac2374e9dde1e partimage-0.6.4-r4.ebuild 5335
-RMD160 3e10417fbb85bad04b44a2945115b8ef577dc9b1 partimage-0.6.4-r4.ebuild 5335
-SHA256 cd1ed24e39c9979a126400253ac2703a5bdf3642a01143c93f8e8ec8b8fb6e19 partimage-0.6.4-r4.ebuild 5335
-MISC ChangeLog 9006 RMD160 2a74aee67e20e8026c2c53ef229521019515c88d SHA1 09a3115ab6a18108ea5c8fc07c010fd4cadabd13 SHA256 1a295435bdf0e30fadeb8a7b1b355c843798279376a9ec99a8341de28c63ceb9
-MD5 b3650a0759838dd7307eaf414bca47da ChangeLog 9006
-RMD160 2a74aee67e20e8026c2c53ef229521019515c88d ChangeLog 9006
-SHA256 1a295435bdf0e30fadeb8a7b1b355c843798279376a9ec99a8341de28c63ceb9 ChangeLog 9006
+EBUILD partimage-0.6.4-r3.ebuild 4301 RMD160 4f422d70e841973bbbfc4a450427c481590e8b00 SHA1 a8d3697b66b22286e8755765760a7add125daf16 SHA256 f7b4438cfce4cf22302e61be43ce9e638339a52d22edeb967c79c48b4fbc1cc9
+MD5 c5501dc2852d9524fd7f2eecbed5e2a4 partimage-0.6.4-r3.ebuild 4301
+RMD160 4f422d70e841973bbbfc4a450427c481590e8b00 partimage-0.6.4-r3.ebuild 4301
+SHA256 f7b4438cfce4cf22302e61be43ce9e638339a52d22edeb967c79c48b4fbc1cc9 partimage-0.6.4-r3.ebuild 4301
+EBUILD partimage-0.6.4-r4.ebuild 5338 RMD160 0af5d72c6aeef608a4f9a8ee2eae75a1789b3eda SHA1 7cd0e70193f689e05cce6facf80b7c02e7ae0ce6 SHA256 ef1f954e602aca07837928d21e474502528f17d4c9bfbffe3acee76f9051c5cb
+MD5 4dde110745bf66a6aafbf440d0463bc5 partimage-0.6.4-r4.ebuild 5338
+RMD160 0af5d72c6aeef608a4f9a8ee2eae75a1789b3eda partimage-0.6.4-r4.ebuild 5338
+SHA256 ef1f954e602aca07837928d21e474502528f17d4c9bfbffe3acee76f9051c5cb partimage-0.6.4-r4.ebuild 5338
+MISC ChangeLog 9144 RMD160 a492029714dc9f84ed678385237d5cc7fc4afd75 SHA1 45328122019266afd01cb9fa07198b39e4f384ff SHA256 24c06541d03e321be6abd8e2f7acaa15a554f8c2ba16e55d75714d65c92c7102
+MD5 56ec9430332e103a07c87c7d8c4eac4d ChangeLog 9144
+RMD160 a492029714dc9f84ed678385237d5cc7fc4afd75 ChangeLog 9144
+SHA256 24c06541d03e321be6abd8e2f7acaa15a554f8c2ba16e55d75714d65c92c7102 ChangeLog 9144
 MISC metadata.xml 300 RMD160 1b8d549b3e7475c26f605a1a36fcab59722f51ab SHA1 7a58ba664a8a3385b8c3a16d7f0168ed656aed67 SHA256 a7042ab513648c05514689f1c2b7c1e6cbf1d339ca3aaa1a45de08ea5cfb152c
 MD5 6b4c83400b7b7a44afb53e1a7ac388af metadata.xml 300
 RMD160 1b8d549b3e7475c26f605a1a36fcab59722f51ab metadata.xml 300
@@ -118,9 +118,9 @@ MD5 ed4863df9e68fc649231a53a1c50f1cc files/digest-partimage-0.6.4-r4 256
 RMD160 cb6567c9350bb74968dd46d64bf27575c37dff72 files/digest-partimage-0.6.4-r4 256
 SHA256 146cc2a404bd7b52e0a99bb3bd1bdbca10c3a139780cf2a2eb3cb7c8557b83d3 files/digest-partimage-0.6.4-r4 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFnfpaAiZjviIA2XgRAibWAKCtCpMavp/0M72v8Fvj5ejJ6NmPIACeLkbO
-jt9Wx3UsBW4xxVWBgP1xNlw=
-=sqXV
+iD8DBQFGM0fXV3J2n04EauwRAt1JAKCaY85k8emjsFH87V3wghUuqfge3wCdG+UY
+5xJ1dxd10yTaOKS5Z66QP7w=
+=8ZxA
 -----END PGP SIGNATURE-----
diff --git a/sys-block/partimage/partimage-0.6.4-r3.ebuild b/sys-block/partimage/partimage-0.6.4-r3.ebuild
index 2901283c32cb..166d28b9d0aa 100644
--- a/sys-block/partimage/partimage-0.6.4-r3.ebuild
+++ b/sys-block/partimage/partimage-0.6.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r3.ebuild,v 1.20 2007/01/05 07:12:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r3.ebuild,v 1.21 2007/04/28 13:10:38 tove Exp $
 
 WANT_AUTOMAKE="1.8"
 
@@ -39,19 +39,19 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# we can do better security ourselves
-	epatch ${FILESDIR}/${P}-nodumbpermchecks.diff || die
-	epatch ${FILESDIR}/${P}-chown.patch || die
-	epatch ${FILESDIR}/${P}-not_install_info.patch || die
-	epatch ${FILESDIR}/${P}-fixserverargs.diff || die
-	epatch ${FILESDIR}/${P}-lib64.patch || die
-	epatch ${FILESDIR}/${P}-fflush-before-re-read-partition-table.patch || die
-	epatch ${FILESDIR}/${P}-LP64-fixes.patch || die
-	epatch ${FILESDIR}/${P}-save_all_and_rest_all_actions.patch || die
-	epatch ${FILESDIR}/${P}-datadir-path.patch || die
-	epatch ${FILESDIR}/${P}-gui.diff || die
+	epatch "${FILESDIR}"/${P}-nodumbpermchecks.diff || die
+	epatch "${FILESDIR}"/${P}-chown.patch || die
+	epatch "${FILESDIR}"/${P}-not_install_info.patch || die
+	epatch "${FILESDIR}"/${P}-fixserverargs.diff || die
+	epatch "${FILESDIR}"/${P}-lib64.patch || die
+	epatch "${FILESDIR}"/${P}-fflush-before-re-read-partition-table.patch || die
+	epatch "${FILESDIR}"/${P}-LP64-fixes.patch || die
+	epatch "${FILESDIR}"/${P}-save_all_and_rest_all_actions.patch || die
+	epatch "${FILESDIR}"/${P}-datadir-path.patch || die
+	epatch "${FILESDIR}"/${P}-gui.diff || die
 }
 
 src_compile() {
@@ -76,13 +76,12 @@ src_install() {
 
 	keepdir /var/log/partimage
 
-	insinto /etc/partimaged; doins ${FILESDIR}/servercert.cnf || die
+	insinto /etc/partimaged; doins "${FILESDIR}"/servercert.cnf || die
 
-	# init.d / conf.d
-	exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}d.init ${PN}d || die
-	insinto /etc/conf.d ; newins ${FILESDIR}/${PN}d.conf ${PN}d || die
+	newinitd "${FILESDIR}"/${PN}d.init ${PN}d || die
+	newconfd "${FILESDIR}"/${PN}d.conf ${PN}d || die
 
-	doman debian/partimage.1 debian/partimaged.8 ${FILESDIR}/partimagedusers.5 || die
+	doman debian/partimage.1 debian/partimaged.8 "${FILESDIR}"/partimagedusers.5 || die
 	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL README* TODO partimage.lsm
 }
 
diff --git a/sys-block/partimage/partimage-0.6.4-r4.ebuild b/sys-block/partimage/partimage-0.6.4-r4.ebuild
index bc503d4be93a..8592aa98f977 100644
--- a/sys-block/partimage/partimage-0.6.4-r4.ebuild
+++ b/sys-block/partimage/partimage-0.6.4-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r4.ebuild,v 1.14 2006/10/14 22:45:43 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r4.ebuild,v 1.15 2007/04/28 13:10:38 tove Exp $
 
 WANT_AUTOMAKE="1.8"
 
@@ -52,25 +52,25 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# we can do better security ourselves
-	epatch ${FILESDIR}/${P}-nodumbpermchecks.diff || die
-	epatch ${FILESDIR}/${P}-chown.patch || die
-	epatch ${FILESDIR}/${P}-not_install_info.patch || die
-	epatch ${FILESDIR}/${P}-fixserverargs.diff || die
-	epatch ${FILESDIR}/${P}-1-lib64.patch
-	epatch ${FILESDIR}/${P}-fflush-before-re-read-partition-table.patch || die
-	epatch ${FILESDIR}/${P}-save_all_and_rest_all_actions.patch || die
-	epatch ${FILESDIR}/${P}-datadir-path.patch || die
-	epatch ${FILESDIR}/${P}-dont-discard-error-message-in-batch-mode.patch || die
-	epatch ${FILESDIR}/${P}-save_file_and_rest_file_actions.patch || die
-	epatch ${FILESDIR}/${P}-varargs.patch || die
-	epatch ${FILESDIR}/${P}-gui.diff || die
-	epatch ${FILESDIR}/${P}-empty-salt.patch || die
-	epatch ${FILESDIR}/${P}-help.patch || die
-	epatch ${FILESDIR}/${P}-xfs.patch || die
-	epatch ${FILESDIR}/${P}-port.patch || die
+	epatch "${FILESDIR}"/${P}-nodumbpermchecks.diff || die
+	epatch "${FILESDIR}"/${P}-chown.patch || die
+	epatch "${FILESDIR}"/${P}-not_install_info.patch || die
+	epatch "${FILESDIR}"/${P}-fixserverargs.diff || die
+	epatch "${FILESDIR}"/${P}-1-lib64.patch
+	epatch "${FILESDIR}"/${P}-fflush-before-re-read-partition-table.patch || die
+	epatch "${FILESDIR}"/${P}-save_all_and_rest_all_actions.patch || die
+	epatch "${FILESDIR}"/${P}-datadir-path.patch || die
+	epatch "${FILESDIR}"/${P}-dont-discard-error-message-in-batch-mode.patch || die
+	epatch "${FILESDIR}"/${P}-save_file_and_rest_file_actions.patch || die
+	epatch "${FILESDIR}"/${P}-varargs.patch || die
+	epatch "${FILESDIR}"/${P}-gui.diff || die
+	epatch "${FILESDIR}"/${P}-empty-salt.patch || die
+	epatch "${FILESDIR}"/${P}-help.patch || die
+	epatch "${FILESDIR}"/${P}-xfs.patch || die
+	epatch "${FILESDIR}"/${P}-port.patch || die
 }
 
 src_compile() {
@@ -101,24 +101,24 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} \
+	emake DESTDIR="${D}" \
 		MKINSTALLDIRS=/usr/share/automake-1.8/mkinstalldirs install || die
 
 	keepdir /var/log/partimage
 
-	insinto /etc/partimaged; doins ${FILESDIR}/servercert.cnf || die
+	insinto /etc/partimaged; doins "${FILESDIR}"/servercert.cnf || die
 
 	# init.d / conf.d
-	exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}d.init ${PN}d || die
-	insinto /etc/conf.d ; newins ${FILESDIR}/${PN}d.conf ${PN}d || die
+	newinitd "${FILESDIR}"/${PN}d.init ${PN}d || die
+	newconfd "${FILESDIR}"/${PN}d.conf ${PN}d || die
 
-	doman debian/partimage.1 debian/partimaged.8 ${FILESDIR}/partimagedusers.5 || die
+	doman debian/partimage.1 debian/partimaged.8 "${FILESDIR}"/partimagedusers.5 || die
 	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL README* TODO partimage.lsm
 
 	# pam
 	if use pam
 	then
-		newpamd ${FILESDIR}/partimaged.pam partimaged || die
+		newpamd "${FILESDIR}"/partimaged.pam partimaged || die
 	fi
 }