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

(Portage version: 2.1.2.2)

3 files changed, 16 insertions, 15 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/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
 }