Use do{conf,init}d, bug #174266.

Package-Manager: portage-2.1.2.2

5 files changed, 35 insertions, 50 deletions

diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog
index 0473ed3a6298..8cd80787f694 100644
--- a/net-analyzer/ntop/ChangeLog
+++ b/net-analyzer/ntop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/ntop
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.50 2007/03/27 20:55:11 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.51 2007/04/22 08:44:14 pva Exp $
+
+  22 Apr 2007; <pva@gentoo.org> ntop-3.0.ebuild, ntop-3.1.ebuild:
+  Use do{conf,init}d, bug #174266.
 
 *ntop-3.2-r3 (27 Mar 2007)
 
diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest
index 2093aa2742fb..de15ca9a7271 100644
--- a/net-analyzer/ntop/Manifest
+++ b/net-analyzer/ntop/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX globals-core.c.diff 536 RMD160 33d049b6c5143f42294bce9a7bf366e69e98d329 SHA1 7e59696252d26bef817210b016b16aa3b3f19754 SHA256 47077ead74ec2f10d9b65ee26ff3ea6f2c2d30908a151e1417e797a9c780d828
 MD5 d1e896708a98eaca02f55c44ae517768 files/globals-core.c.diff 536
 RMD160 33d049b6c5143f42294bce9a7bf366e69e98d329 files/globals-core.c.diff 536
@@ -32,14 +29,14 @@ SHA256 9b1c22b2b1ffeafbcb982b7544a4bc0376864369ed80e6aedba77406760c623e files/nt
 DIST ntop-3.0.tgz 2990872 RMD160 73753d43cb2e215fd0e32f46dd9014e0ccee4109 SHA1 12ba47e664f21755327b1e2d14858a50089e8a29 SHA256 c50cdf2c6cf7309f88c7ec0a56158eca76c80532502b36f3378eeca433423d83
 DIST ntop-3.1.tgz 3286596 RMD160 636bf513ec956362f505a005ab757bc5c0e63eac SHA1 2aaae2f6f5a343d480eed7284db187b53f598b31 SHA256 468ae3db679466623078a356b32201fcb8740ee88c4d542a6b875a9d14a0ea92
 DIST ntop-3.2.tgz 3910593 RMD160 18ea4b535826e6d7bdf56c071c271869653cba8d SHA1 ab17e871890bc490746fe03f171523073b54e1e8 SHA256 5b639dbcb3c8bf77824cf8aaed168864f69730b2ef41dc68d2db22b205c586d8
-EBUILD ntop-3.0.ebuild 1527 RMD160 49b0e61198055c3a0b0f496c3519e05b9aa0aebb SHA1 15eb8fd2c5e0cf0a97b2b519c3550dad56077421 SHA256 bf6447d2d14ca180e8565a74a3e0f54573a934292cacb5b56a521db5a15a5d96
-MD5 28eb6ff61a27760c7f5fdf9969fb1853 ntop-3.0.ebuild 1527
-RMD160 49b0e61198055c3a0b0f496c3519e05b9aa0aebb ntop-3.0.ebuild 1527
-SHA256 bf6447d2d14ca180e8565a74a3e0f54573a934292cacb5b56a521db5a15a5d96 ntop-3.0.ebuild 1527
-EBUILD ntop-3.1.ebuild 2372 RMD160 8b055c1dba4a6755e2baa39b41475ac0ec2e308f SHA1 9d378d79f7b14d043b4348e8fa89146a1a84906a SHA256 6ae9bdf07a4c1de750b5276cab99bf2e15969908be8d6030c17a5fdc0368b9b3
-MD5 c5342fe2b5645d1ea2ea7d96dd3df376 ntop-3.1.ebuild 2372
-RMD160 8b055c1dba4a6755e2baa39b41475ac0ec2e308f ntop-3.1.ebuild 2372
-SHA256 6ae9bdf07a4c1de750b5276cab99bf2e15969908be8d6030c17a5fdc0368b9b3 ntop-3.1.ebuild 2372
+EBUILD ntop-3.0.ebuild 1489 RMD160 6f27d484c3376878b5e57900140574556f45030c SHA1 1179eea8c4df9e14a63f92c12ba866e6c0c058a7 SHA256 a90bdb2a90b581687a7f145436b853ec5ee4114724a01ff8460b28d059b75096
+MD5 ea497cd171abedfa2c1a70d74148adaf ntop-3.0.ebuild 1489
+RMD160 6f27d484c3376878b5e57900140574556f45030c ntop-3.0.ebuild 1489
+SHA256 a90bdb2a90b581687a7f145436b853ec5ee4114724a01ff8460b28d059b75096 ntop-3.0.ebuild 1489
+EBUILD ntop-3.1.ebuild 2348 RMD160 7a1fd22b619727f2f645578c1fd8b9251146df23 SHA1 560331494f58d8ac5ab686931ad08d95ae718e90 SHA256 81eab596a990995969ce5cc40b952b322e0c98fffd0f73d3f387c4b6137ff2ac
+MD5 87ecaa9615f282b0e5c57a01321d54ed ntop-3.1.ebuild 2348
+RMD160 7a1fd22b619727f2f645578c1fd8b9251146df23 ntop-3.1.ebuild 2348
+SHA256 81eab596a990995969ce5cc40b952b322e0c98fffd0f73d3f387c4b6137ff2ac ntop-3.1.ebuild 2348
 EBUILD ntop-3.2-r1.ebuild 2776 RMD160 dbc500860ddbf9bcc383eba6c1231bc07ffc521c SHA1 2b97d4d54cdabb02127017b400889483cd5a6767 SHA256 2d8184177729a7fd1ddd8e7bb763e69daa8158742ea89536bfc9d0e856003c77
 MD5 e308d459087fe1f20282e28afbc24310 ntop-3.2-r1.ebuild 2776
 RMD160 dbc500860ddbf9bcc383eba6c1231bc07ffc521c ntop-3.2-r1.ebuild 2776
@@ -52,10 +49,10 @@ EBUILD ntop-3.2-r3.ebuild 2990 RMD160 0d9027da5581efa4b6ec0c659bc9920571cf5960 S
 MD5 133f848b8aa72b083493df7d29dd6817 ntop-3.2-r3.ebuild 2990
 RMD160 0d9027da5581efa4b6ec0c659bc9920571cf5960 ntop-3.2-r3.ebuild 2990
 SHA256 e036d5668eda988ff107be2eae17182ef3dd509759e4c5b75e15fa2980986507 ntop-3.2-r3.ebuild 2990
-MISC ChangeLog 6683 RMD160 fd34785a63ed7f938d0361f54db5471255eceb74 SHA1 7228d2aa8fd3dbeca4a05d5f1c588e0ce94c7a25 SHA256 dcb5734cea1c68be036225d967352f897467f38afe37052cdc6c939bbaa5922b
-MD5 a2f70c46cbcd9710df493ff74a7e2a28 ChangeLog 6683
-RMD160 fd34785a63ed7f938d0361f54db5471255eceb74 ChangeLog 6683
-SHA256 dcb5734cea1c68be036225d967352f897467f38afe37052cdc6c939bbaa5922b ChangeLog 6683
+MISC ChangeLog 6783 RMD160 ddb68ecf3487bc89dfb6fdb2fa41eb7ccf3ac58c SHA1 c88000d79c73dcff1f81bb868daba8c7cbbcd90a SHA256 e158686aeeb4e9184f298709406b757c337961bc45c5cd97dc22866277ee2563
+MD5 e869cef2f1b185197829ff59efecc300 ChangeLog 6783
+RMD160 ddb68ecf3487bc89dfb6fdb2fa41eb7ccf3ac58c ChangeLog 6783
+SHA256 e158686aeeb4e9184f298709406b757c337961bc45c5cd97dc22866277ee2563 ChangeLog 6783
 MISC metadata.xml 233 RMD160 a40e5be287eb28adcd2008eb2de7a786bfd688c6 SHA1 4e1973fdf61e686516552955669fd6a845a66a27 SHA256 1cd97d0616d391c2639822aa603b9ae39e60796da9e21f498a8e856d317e0a0b
 MD5 846e7479e3e9df4363f2721b7fb47320 metadata.xml 233
 RMD160 a40e5be287eb28adcd2008eb2de7a786bfd688c6 metadata.xml 233
@@ -75,10 +72,3 @@ SHA256 fec72a84051cd908bd49dab5802bd22225c8a697f8ef28bcb8d65c2832396b36 files/di
 MD5 c9b1d854b1ac5779d7f28125bd89d238 files/digest-ntop-3.2-r3 220
 RMD160 d5ca25fd1bd9eec83de29bd893369b8a000fed6d files/digest-ntop-3.2-r3 220
 SHA256 fec72a84051cd908bd49dab5802bd22225c8a697f8ef28bcb8d65c2832396b36 files/digest-ntop-3.2-r3 220
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGCYUFz974XjDVpbkRAi2PAJoDSxRFxNrOLJJRzXStzf89MO9wbACgkNeG
-uYa1HEu9NLzJzpU74oxIGlc=
-=uhjC
------END PGP SIGNATURE-----
diff --git a/net-analyzer/ntop/ntop-3.0.ebuild b/net-analyzer/ntop/ntop-3.0.ebuild
index 7a872d43c386..66e22fea8113 100644
--- a/net-analyzer/ntop/ntop-3.0.ebuild
+++ b/net-analyzer/ntop/ntop-3.0.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/net-analyzer/ntop/ntop-3.0.ebuild,v 1.20 2007/01/05 08:39:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.0.ebuild,v 1.21 2007/04/22 08:44:14 pva Exp $
 
 
 DESCRIPTION="tool that shows network usage like top"
@@ -32,7 +32,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "install problem"
+	make DESTDIR="${D}" install || die "install problem"
 
 	# fixme: bad handling of plugins (in /usr/lib with unsuggestive names)
 	# (don't know if there is a clean way to handle it)
@@ -45,10 +45,10 @@ src_install() {
 	dohtml ntop.html
 
 	keepdir /var/lib/ntop
-	chown -R nobody:nobody ${D}/var/lib/ntop
+	chown -R nobody:nobody "${D}"/var/lib/ntop
 
-	exeinto /etc/init.d ; newexe ${FILESDIR}/ntop-init ntop
-	insinto /etc/conf.d ; newins ${FILESDIR}/ntop-confd ntop
+	newinitd "${FILESDIR}"/ntop-init ntop
+	newconfd "${FILESDIR}"/ntop-confd ntop
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/ntop/ntop-3.1.ebuild b/net-analyzer/ntop/ntop-3.1.ebuild
index ad37c5061ccb..33a60f32cee3 100644
--- a/net-analyzer/ntop/ntop-3.1.ebuild
+++ b/net-analyzer/ntop/ntop-3.1.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/net-analyzer/ntop/ntop-3.1.ebuild,v 1.10 2007/01/05 08:39:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.1.ebuild,v 1.11 2007/04/22 08:44:14 pva Exp $
 
 inherit eutils
 
@@ -35,9 +35,9 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	mv ${WORKDIR}/ntop ${WORKDIR}/ntop-3.1
-	cd ${S}
-	epatch ${FILESDIR}/globals-core.c.diff
+	mv "${WORKDIR}"/ntop "${WORKDIR}"/ntop-3.1
+	cd "${S}"
+	epatch "${FILESDIR}"/globals-core.c.diff
 }
 
 src_compile() {
@@ -63,7 +63,7 @@ src_compile() {
 
 src_install() {
 	sed -i Makefile -e 's;mkdir -p $(CFG_DBFILE_DIR);mkdir -p $(DESTDIR)$(CFG_DBFILE_DIR);'
-	make DESTDIR=${D} install || die "install problem"
+	make DESTDIR="${D}" install || die "install problem"
 
 	# fixme: bad handling of plugins (in /usr/lib with unsuggestive names)
 	# (don't know if there is a clean way to handle it)
@@ -73,8 +73,8 @@ src_install() {
 	dodoc AUTHORS CONTENTS ChangeLog MANIFESTO NEWS
 	dodoc PORTING README SUPPORT_NTOP.txt THANKS docs/*
 
-	chown -R root:0 ${D}/etc/ntop ${D}/usr/share/${PN}/html \
-		${D}/usr/lib/ntop
+	chown -R root:0 "${D}"/etc/ntop "${D}"/usr/share/${PN}/html \
+		"${D}"/usr/lib/ntop
 
 	dohtml ntop.html
 
@@ -82,9 +82,9 @@ src_install() {
 	fowner ntop:ntop /var/lib/ntop
 	fperms 750 /var/lib/ntop
 
-	exeinto /etc/init.d ; newexe ${FILESDIR}/ntop-init ntop
-	insinto /etc/conf.d ; newins ${FILESDIR}/ntop-confd ntop
+	newinitd "${FILESDIR}"/ntop-init ntop
+	newconfd "${FILESDIR}"/ntop-confd ntop
 
-	echo 'NTOP_OPTS="-u ntop -P /var/lib/ntop"' >> ${D}/etc/conf.d/ntop
+	echo 'NTOP_OPTS="-u ntop -P /var/lib/ntop"' >> "${D}"/etc/conf.d/ntop
 }
 
diff --git a/net-analyzer/trafd/Manifest b/net-analyzer/trafd/Manifest
index e699ceb9586d..0b486c9cc16f 100644
--- a/net-analyzer/trafd/Manifest
+++ b/net-analyzer/trafd/Manifest
@@ -11,27 +11,19 @@ MD5 c2b0836d9970f7abca0fb4e4150574f7 files/trafd.init 485
 RMD160 0d961113b08ef137f1884fbd7533f29db26f0785 files/trafd.init 485
 SHA256 9216ded23d8d0526fe5174b78b7cc2e2a5b3800a170bb21a8fe3f58872a74de9 files/trafd.init 485
 DIST tcpdump-richard-1.7.tar.gz 198587 RMD160 1a1d9adc6bee35eeab84d34f807f12dafa43f6c1 SHA1 89dd27c67673ff61d3c185e2e5b45e36fff92f37 SHA256 572a6544182fa57ec7c89e5093f0fd972be751a0145bfd13b93ef4063168c99a
-DIST trafd-3.0.1-gentoo.tar.bz2 2618 RMD160 4399242036aa3c6e1196bd6070eeb5c6653729b0 SHA1 ee6d809ada06a7cffce6deed2ea505fa491e970e SHA256 45904e1251772e703da24b7e51f298f6cfbb4c84bb4dc0f812da5f3a01ca26db
 DIST trafd-3.0.1.tgz 35365 RMD160 65ac4b09cbb6f014ce6e643f3607a280d13dcd7f SHA1 729bd2a21cb88aec9d78a34617995cd63c473270 SHA256 29164f69e6fcfeeefa6fe7f3bb07f415de03a45fa7985cfc76a99c423bc39db9
 EBUILD trafd-3.0.1-r1.ebuild 1211 RMD160 def4067fecd2e8fa171c0ed78a6ab0897a1af52a SHA1 c02337e19e00fb0ef78ccdc99863327bf396a72f SHA256 9676ad7da2eaa77616b6b77d9bf23859e4925a0d7748b01f8863c27647f9cf47
 MD5 5905dbbb2928b5c850d5d0566d10cc28 trafd-3.0.1-r1.ebuild 1211
 RMD160 def4067fecd2e8fa171c0ed78a6ab0897a1af52a trafd-3.0.1-r1.ebuild 1211
 SHA256 9676ad7da2eaa77616b6b77d9bf23859e4925a0d7748b01f8863c27647f9cf47 trafd-3.0.1-r1.ebuild 1211
-EBUILD trafd-3.0.1.ebuild 1289 RMD160 6df6f4b34f609d5d9c6e9e32f9147df28353fb9a SHA1 61e2454b995e11564e2c1c877276bdf8e7912474 SHA256 76e8e3b574be2b998acb64a05b2a7194fb882c5c4980f0fbced14b11c200a6a9
-MD5 4d7eb9e8e3375668cfa18c11b6313da5 trafd-3.0.1.ebuild 1289
-RMD160 6df6f4b34f609d5d9c6e9e32f9147df28353fb9a trafd-3.0.1.ebuild 1289
-SHA256 76e8e3b574be2b998acb64a05b2a7194fb882c5c4980f0fbced14b11c200a6a9 trafd-3.0.1.ebuild 1289
-MISC ChangeLog 1533 RMD160 78161cdd170e55aded1848f157d0f9261e56f0dd SHA1 375b33d4b717f5efdc2057f46274a92a2e9746e0 SHA256 5d1e57a07a80e1a72e25635aaafa61e45b17974816dde1d624d35763baa822c4
-MD5 b369e62654a9ce54969c53ec54045c18 ChangeLog 1533
-RMD160 78161cdd170e55aded1848f157d0f9261e56f0dd ChangeLog 1533
-SHA256 5d1e57a07a80e1a72e25635aaafa61e45b17974816dde1d624d35763baa822c4 ChangeLog 1533
+MISC ChangeLog 1630 RMD160 955c205ab486ca7777bad5b31c3baed023aa4efd SHA1 002965e6c0d89fb9fcfb39e8b6ff5f919a042b6b SHA256 f87b8e850e0fef469f5076ed3e73c8afdccffdd1412557c901fe8ff4a0336d36
+MD5 0e4484afbd4e1f1f7e3750e738893a3f ChangeLog 1630
+RMD160 955c205ab486ca7777bad5b31c3baed023aa4efd ChangeLog 1630
+SHA256 f87b8e850e0fef469f5076ed3e73c8afdccffdd1412557c901fe8ff4a0336d36 ChangeLog 1630
 MISC metadata.xml 220 RMD160 f7c01782f5cbc1de4faf7a38972be07e939fd710 SHA1 d283aed4760423ca755bd2a92b3512d68e1b8b68 SHA256 f76ea89f0c19f325e6d893b73a9fefd441c7debc1399713dbd96fb2727aa6668
 MD5 a76a71fdeb3c4668250f466c21a19183 metadata.xml 220
 RMD160 f7c01782f5cbc1de4faf7a38972be07e939fd710 metadata.xml 220
 SHA256 f76ea89f0c19f325e6d893b73a9fefd441c7debc1399713dbd96fb2727aa6668 metadata.xml 220
-MD5 eaaaea086cca225aeddf2415cf5abf5e files/digest-trafd-3.0.1 735
-RMD160 4374c5dcc8e806de3d2ea0f19b134d001647f2ef files/digest-trafd-3.0.1 735
-SHA256 af27c06d2854750c20e270e552e803ac2a846c49975e93e10a960dd6488b3aa4 files/digest-trafd-3.0.1 735
 MD5 86d9e338f8f917410627000b6e91dadc files/digest-trafd-3.0.1-r1 482
 RMD160 ac8f0e50d7b1730e885811bb3eeb6e6a4e9b327f files/digest-trafd-3.0.1-r1 482
 SHA256 94cf41931ca3622f5b154ab434fcec3d6747fe5c759cc03527ba7f79789c6f10 files/digest-trafd-3.0.1-r1 482