Use newinitd and newconfd (#174266)

(Portage version: 2.1.2.5)

3 files changed, 46 insertions, 43 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/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
 }