Fix *initd, *confd and *envd calls (#17388, #174266)

(Portage version: 2.1.2.5)

7 files changed, 24 insertions, 31 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index 5290be3f96f5..9047b412a27f 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/exim
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.87 2007/04/21 20:57:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.88 2007/04/28 16:52:41 swegener Exp $
+
+  28 Apr 2007; Sven Wegener <swegener@gentoo.org> exim-4.60-r1.ebuild,
+  exim-4.61.ebuild, exim-4.62.ebuild, exim-4.63.ebuild, exim-4.66.ebuild,
+  exim-4.67.ebuild:
+  Fix *initd, *confd and *envd calls (#17388, #174266)
 
   21 Apr 2007; Raúl Porcel <armin76@gentoo.org> exim-4.62.ebuild:
   ia64 stable
diff --git a/mail-mta/exim/exim-4.60-r1.ebuild b/mail-mta/exim/exim-4.60-r1.ebuild
index a8571b982313..f6e3f92c3618 100644
--- a/mail-mta/exim/exim-4.60-r1.ebuild
+++ b/mail-mta/exim/exim-4.60-r1.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/mail-mta/exim/exim-4.60-r1.ebuild,v 1.13 2007/04/07 16:10:31 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.60-r1.ebuild,v 1.14 2007/04/28 16:52:41 swegener Exp $
 
 inherit eutils
 
@@ -278,11 +278,9 @@ src_install () {
 		newins ${FILESDIR}/pam.d-exim exim
 	fi
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/exim.rc6 exim
+	newinitd ${FILESDIR}/exim.rc6 exim
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/exim.confd exim
+	newconfd ${FILESDIR}/exim.confd exim
 
 	DIROPTIONS="--mode=0750 --owner=mail --group=mail"
 	dodir /var/log/${PN}
diff --git a/mail-mta/exim/exim-4.61.ebuild b/mail-mta/exim/exim-4.61.ebuild
index 549089fda7ee..a7aa7f3c7c7a 100644
--- a/mail-mta/exim/exim-4.61.ebuild
+++ b/mail-mta/exim/exim-4.61.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/mail-mta/exim/exim-4.61.ebuild,v 1.4 2007/04/07 16:10:31 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.61.ebuild,v 1.5 2007/04/28 16:52:41 swegener Exp $
 
 inherit eutils
 
@@ -278,11 +278,9 @@ src_install () {
 		newins ${FILESDIR}/pam.d-exim exim
 	fi
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/exim.rc6 exim
+	newinitd ${FILESDIR}/exim.rc6 exim
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/exim.confd exim
+	newconfd ${FILESDIR}/exim.confd exim
 
 	DIROPTIONS="--mode=0750 --owner=mail --group=mail"
 	dodir /var/log/${PN}
diff --git a/mail-mta/exim/exim-4.62.ebuild b/mail-mta/exim/exim-4.62.ebuild
index 6b30f6d22f66..63562d990d7f 100644
--- a/mail-mta/exim/exim-4.62.ebuild
+++ b/mail-mta/exim/exim-4.62.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/mail-mta/exim/exim-4.62.ebuild,v 1.9 2007/04/21 20:57:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.62.ebuild,v 1.10 2007/04/28 16:52:41 swegener Exp $
 
 inherit eutils
 
@@ -278,11 +278,9 @@ src_install () {
 		newins ${FILESDIR}/pam.d-exim exim
 	fi
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/exim.rc6 exim
+	newinitd ${FILESDIR}/exim.rc6 exim
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/exim.confd exim
+	newconfd ${FILESDIR}/exim.confd exim
 
 	DIROPTIONS="--mode=0750 --owner=mail --group=mail"
 	dodir /var/log/${PN}
diff --git a/mail-mta/exim/exim-4.63.ebuild b/mail-mta/exim/exim-4.63.ebuild
index 8f5f1f766d0d..9640137272c9 100644
--- a/mail-mta/exim/exim-4.63.ebuild
+++ b/mail-mta/exim/exim-4.63.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/mail-mta/exim/exim-4.63.ebuild,v 1.4 2007/04/07 16:10:31 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.63.ebuild,v 1.5 2007/04/28 16:52:41 swegener Exp $
 
 inherit eutils
 
@@ -278,11 +278,9 @@ src_install () {
 		newins ${FILESDIR}/pam.d-exim exim
 	fi
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/exim.rc6 exim
+	newinitd ${FILESDIR}/exim.rc6 exim
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/exim.confd exim
+	newconfd ${FILESDIR}/exim.confd exim
 
 	DIROPTIONS="--mode=0750 --owner=mail --group=mail"
 	dodir /var/log/${PN}
diff --git a/mail-mta/exim/exim-4.66.ebuild b/mail-mta/exim/exim-4.66.ebuild
index 8c00a0c20285..23ca22ec2f71 100644
--- a/mail-mta/exim/exim-4.66.ebuild
+++ b/mail-mta/exim/exim-4.66.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/mail-mta/exim/exim-4.66.ebuild,v 1.1 2007/03/18 20:35:59 peitolm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.66.ebuild,v 1.2 2007/04/28 16:52:41 swegener Exp $
 
 inherit eutils
 
@@ -284,11 +284,9 @@ src_install () {
 		newins ${FILESDIR}/pam.d-exim exim
 	fi
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/exim.rc6 exim
+	newinitd ${FILESDIR}/exim.rc6 exim
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/exim.confd exim
+	newconfd ${FILESDIR}/exim.confd exim
 
 	DIROPTIONS="--mode=0750 --owner=mail --group=mail"
 	dodir /var/log/${PN}
diff --git a/mail-mta/exim/exim-4.67.ebuild b/mail-mta/exim/exim-4.67.ebuild
index de0fcd281b39..312d315553e3 100644
--- a/mail-mta/exim/exim-4.67.ebuild
+++ b/mail-mta/exim/exim-4.67.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/mail-mta/exim/exim-4.67.ebuild,v 1.1 2007/04/18 23:23:36 peitolm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.67.ebuild,v 1.2 2007/04/28 16:52:41 swegener Exp $
 
 inherit eutils
 
@@ -295,11 +295,9 @@ src_install () {
 		newins ${FILESDIR}/pam.d-exim exim
 	fi
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/exim.rc6 exim
+	newinitd ${FILESDIR}/exim.rc6 exim
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/exim.confd exim
+	newconfd ${FILESDIR}/exim.confd exim
 
 	DIROPTIONS="--mode=0750 --owner=mail --group=mail"
 	dodir /var/log/${PN}