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

Package-Manager: portage-2.1.2.2

4 files changed, 28 insertions, 37 deletions

diff --git a/net-analyzer/portsentry/ChangeLog b/net-analyzer/portsentry/ChangeLog
index 7f425b17f169..6d6a523ca7a6 100644
--- a/net-analyzer/portsentry/ChangeLog
+++ b/net-analyzer/portsentry/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/portsentry
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portsentry/ChangeLog,v 1.20 2007/02/09 04:05:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portsentry/ChangeLog,v 1.21 2007/04/22 08:53:44 pva Exp $
+
+  22 Apr 2007; <pva@gentoo.org> portsentry-1.1-r7.ebuild,
+  portsentry-1.2.ebuild:
+  Use do{conf,init}d, bug #174266.
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/net-analyzer/portsentry/Manifest b/net-analyzer/portsentry/Manifest
index de0154bd88c5..d4868078006f 100644
--- a/net-analyzer/portsentry/Manifest
+++ b/net-analyzer/portsentry/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gcc.patch 647 RMD160 70a2fea36076311c6df6eaecabbb5da69bfedff2 SHA1 d1e606995df7d4cb03097af60204057aaf6ac625 SHA256 3f37f0a245b6815aa0d6a030ce3a2635a4b9936d9a54756743abdb018ca77086
 MD5 fa0bf7d77b9fbea4d067bc4045ef0658 files/gcc.patch 647
 RMD160 70a2fea36076311c6df6eaecabbb5da69bfedff2 files/gcc.patch 647
@@ -23,18 +20,18 @@ RMD160 8f030ee8546b9a61e8efb8dba2d5a5e11bcdf3b5 files/portsentry.rc6 962
 SHA256 c3ecd77747258b33431954f8d413f15091924797bc626f87ddc82cabdccdbe30 files/portsentry.rc6 962
 DIST portsentry-1.1.tar.gz 45871 RMD160 07ddd73040834bd700f0d9e03c23a2d0c8872016 SHA1 8fb65a33603c691be953aa6630646712f5834595 SHA256 eb06f3c328614365a9fe61b8878acb76cbf364cb695dda37536a3b0e07a13f1f
 DIST portsentry-1.2.tar.gz 48054 RMD160 8bf4bce18229a7ebff47e7fe50493738ae818085 SHA1 091124db3f9ccc29afae08d6ab1fdd073b789d0a SHA256 dd1edcfcf2d9db7b5722de4f1da36ae45703bf05917af657ab6f7491be7fa52e
-EBUILD portsentry-1.1-r7.ebuild 1732 RMD160 305e05e1d10d39ae66850a1ea89c23a447e10a47 SHA1 d6ae71b23eee463e902d4b24a425239bbae80288 SHA256 9d5250419e7e3f91edb6131f0d20042cec707a14ddf1a50092a221a9b6b5da74
-MD5 2905d917133919be9eca1360e9565ed8 portsentry-1.1-r7.ebuild 1732
-RMD160 305e05e1d10d39ae66850a1ea89c23a447e10a47 portsentry-1.1-r7.ebuild 1732
-SHA256 9d5250419e7e3f91edb6131f0d20042cec707a14ddf1a50092a221a9b6b5da74 portsentry-1.1-r7.ebuild 1732
-EBUILD portsentry-1.2.ebuild 1872 RMD160 158163c859f217d607e6eec0c4cd557041860928 SHA1 663ddeca1dc57b625bb92d6399763201f5f0264b SHA256 ea89c8d213cd5e2407c259bb835a98434abfa0c5946b3bd9df7250777a5ead74
-MD5 77a3c4711758eb06d5831807871898f2 portsentry-1.2.ebuild 1872
-RMD160 158163c859f217d607e6eec0c4cd557041860928 portsentry-1.2.ebuild 1872
-SHA256 ea89c8d213cd5e2407c259bb835a98434abfa0c5946b3bd9df7250777a5ead74 portsentry-1.2.ebuild 1872
-MISC ChangeLog 2753 RMD160 f29dd3180f7798141387e9ec5e4ab98935293392 SHA1 5de46ab71dad3dc4441c3c9ceb5bca77c7ec5278 SHA256 80f46d8b3900d6f53901d6ac857888b2eb7b0e1d515cde2483dbf7fbb4a9aaf4
-MD5 bedadaf149ef6e496a24303a545c070d ChangeLog 2753
-RMD160 f29dd3180f7798141387e9ec5e4ab98935293392 ChangeLog 2753
-SHA256 80f46d8b3900d6f53901d6ac857888b2eb7b0e1d515cde2483dbf7fbb4a9aaf4 ChangeLog 2753
+EBUILD portsentry-1.1-r7.ebuild 1690 RMD160 fa896f942e15d5f7b6c76760c32e784c77481aee SHA1 1cbbc380964b7aac207007342d1ef90d9e2e9321 SHA256 25534df00fdd0c05370731045dcb32e78afd0c18fac1cfd15c7f3afaef952b59
+MD5 9d509f8b059eee37e3f7831cd30bcf31 portsentry-1.1-r7.ebuild 1690
+RMD160 fa896f942e15d5f7b6c76760c32e784c77481aee portsentry-1.1-r7.ebuild 1690
+SHA256 25534df00fdd0c05370731045dcb32e78afd0c18fac1cfd15c7f3afaef952b59 portsentry-1.1-r7.ebuild 1690
+EBUILD portsentry-1.2.ebuild 1836 RMD160 053413f1a2251a5c87bc7311324e7fe6945d6375 SHA1 8c571aeed2aee267dcb17e0a40066ade4eccef55 SHA256 04cab2780b6968f24c509fe8c0a73cc26da744d7da288fcfc607491105477fe8
+MD5 b1a4ad55d9410b5de71edfc5716c5d59 portsentry-1.2.ebuild 1836
+RMD160 053413f1a2251a5c87bc7311324e7fe6945d6375 portsentry-1.2.ebuild 1836
+SHA256 04cab2780b6968f24c509fe8c0a73cc26da744d7da288fcfc607491105477fe8 portsentry-1.2.ebuild 1836
+MISC ChangeLog 2866 RMD160 025d90d547a4cfc691d869ada48cc817775c2589 SHA1 d72f4b5d3890f2eb947e8c013389686f2c7aa9cf SHA256 ebd3d5a527cede036fa7501fd4a0012508c4692bd0624d4311d0064d279a7356
+MD5 b0b4cb53493db7ccd71788043c333727 ChangeLog 2866
+RMD160 025d90d547a4cfc691d869ada48cc817775c2589 ChangeLog 2866
+SHA256 ebd3d5a527cede036fa7501fd4a0012508c4692bd0624d4311d0064d279a7356 ChangeLog 2866
 MISC metadata.xml 241 RMD160 c6c1498fc27b7c70e7994634e1d2f828496aafa6 SHA1 044ad33d601bea6352c09efea422b8acc7a7a810 SHA256 a4f38352bf4850ec5036b33ff7d34ddcb4da36eaf5714633b94a46724e5df8f5
 MD5 820fffc34c138058aa87c6961441319f metadata.xml 241
 RMD160 c6c1498fc27b7c70e7994634e1d2f828496aafa6 metadata.xml 241
@@ -45,10 +42,3 @@ SHA256 799bee22404adf6e8f41bc08926d8f4e2749d4782f506d0f443a547992f4d53c files/di
 MD5 0d16a06b26c76ce9cdf54c496fa5a51c files/digest-portsentry-1.2 241
 RMD160 ece552b0f49c433f5f9dc6762a8518c13cff90d3 files/digest-portsentry-1.2 241
 SHA256 e43abb21f4b897b291442b7b8b97f050b8292af6150599f0f01835bdb79635ef files/digest-portsentry-1.2 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFy/MuAiZjviIA2XgRAjXRAJsEhFrlFvw2WWNcjN/WSMhQrS+4IACg7KAx
-xxoQNjkj3TVeAu5Ug6Qerk0=
-=ydYa
------END PGP SIGNATURE-----
diff --git a/net-analyzer/portsentry/portsentry-1.1-r7.ebuild b/net-analyzer/portsentry/portsentry-1.1-r7.ebuild
index 4882f80f8377..ee586204bd82 100644
--- a/net-analyzer/portsentry/portsentry-1.1-r7.ebuild
+++ b/net-analyzer/portsentry/portsentry-1.1-r7.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/net-analyzer/portsentry/portsentry-1.1-r7.ebuild,v 1.11 2004/10/04 22:56:31 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portsentry/portsentry-1.1-r7.ebuild,v 1.12 2007/04/22 08:53:44 pva Exp $
 
 DESCRIPTION="Automated port scan detector and response tool"
 # Seems like CISCO took the site down?
@@ -15,8 +15,7 @@ IUSE=""
 DEPEND=">=sys-apps/sed-4"
 
 src_unpack() {
-
-	unpack ${A} ; cd ${S}
+	unpack ${A} ; cd "${S}"
 
 	# Setting the portsentry.conf file location
 	sed -i \
@@ -36,12 +35,10 @@ src_unpack() {
 }
 
 src_compile() {
-
 	make CFLAGS="${CFLAGS}" linux || die
 }
 
 src_install() {
-
 	dobin portsentry ignore.csh
 	dodoc README* CHANGES LICENSE CREDITS
 	newdoc portsentry.ignore portsentry.ignore.sample
@@ -51,6 +48,6 @@ src_install() {
 	newins portsentry.ignore portsentry.ignore.sample
 	newins portsentry.conf portsentry.conf.sample
 
-	exeinto /etc/init.d ; newexe ${FILESDIR}/portsentry.rc6 portsentry
-	insinto /etc/conf.d ; newins ${FILESDIR}/portsentry.confd portsentry
+	newinitd "${FILESDIR}"/portsentry.rc6 portsentry
+	newconfd "${FILESDIR}"/portsentry.confd portsentry
 }
diff --git a/net-analyzer/portsentry/portsentry-1.2.ebuild b/net-analyzer/portsentry/portsentry-1.2.ebuild
index 08ecc4d7f577..0b99695e8564 100644
--- a/net-analyzer/portsentry/portsentry-1.2.ebuild
+++ b/net-analyzer/portsentry/portsentry-1.2.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/net-analyzer/portsentry/portsentry-1.2.ebuild,v 1.9 2004/10/04 22:56:31 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portsentry/portsentry-1.2.ebuild,v 1.10 2007/04/22 08:53:44 pva Exp $
 
 inherit eutils
 
@@ -15,10 +15,10 @@ KEYWORDS="x86 ppc sparc ~amd64"
 IUSE=""
 
 DEPEND=">=sys-apps/sed-4"
-S=${WORKDIR}/${PN}_beta
+S="${WORKDIR}"/${PN}_beta
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
+	unpack ${A} ; cd "${S}"
 
 	# Setting the portsentry.conf file location
 	sed -i \
@@ -54,6 +54,6 @@ src_install() {
 	newins portsentry.ignore portsentry.ignore.sample
 	newins portsentry.conf portsentry.conf.sample
 
-	exeinto /etc/init.d ; newexe ${FILESDIR}/portsentry.rc6 portsentry
-	insinto /etc/conf.d ; newins ${FILESDIR}/portsentry.confd portsentry
+	newinitd "${FILESDIR}"/portsentry.rc6 portsentry
+	newconfd "${FILESDIR}"/portsentry.confd portsentry
 }