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

(Portage version: 2.1.2.5)

5 files changed, 16 insertions, 15 deletions

diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index fb4c2fe0d9a3..5f489fefe3fb 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/heartbeat
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.65 2007/04/26 06:40:26 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.66 2007/04/28 17:46:56 swegener Exp $
+
+  28 Apr 2007; Sven Wegener <swegener@gentoo.org> heartbeat-1.2.5.ebuild,
+  heartbeat-1.2.5-r1.ebuild, heartbeat-2.0.7-r2.ebuild,
+  heartbeat-2.0.8.ebuild:
+  Fix *initd, *confd and *envd calls (#173884, #174266)
 
   26 Apr 2007; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml:
   Update for cluster herd split to hp-cluster and ha-cluster.
diff --git a/sys-cluster/heartbeat/heartbeat-1.2.5-r1.ebuild b/sys-cluster/heartbeat/heartbeat-1.2.5-r1.ebuild
index 2f6c6688befe..b3f5ec59346a 100644
--- a/sys-cluster/heartbeat/heartbeat-1.2.5-r1.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-1.2.5-r1.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-cluster/heartbeat/heartbeat-1.2.5-r1.ebuild,v 1.2 2006/09/25 23:57:35 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.2.5-r1.ebuild,v 1.3 2007/04/28 17:46:56 swegener Exp $
 
 inherit flag-o-matic
 
@@ -69,6 +69,5 @@ src_install() {
 		rm ${D}/etc/ha.d/resource.d/ldirectord
 	fi
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/heartbeat-init heartbeat
+	newinitd ${FILESDIR}/heartbeat-init heartbeat
 }
diff --git a/sys-cluster/heartbeat/heartbeat-1.2.5.ebuild b/sys-cluster/heartbeat/heartbeat-1.2.5.ebuild
index 2b1e29e5939b..0f3883c335b6 100644
--- a/sys-cluster/heartbeat/heartbeat-1.2.5.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-1.2.5.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-cluster/heartbeat/heartbeat-1.2.5.ebuild,v 1.2 2006/08/18 10:37:58 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.2.5.ebuild,v 1.3 2007/04/28 17:46:56 swegener Exp $
 
 inherit flag-o-matic
 
@@ -68,6 +68,5 @@ src_install() {
 		rm ${D}/etc/ha.d/resource.d/ldirectord
 	fi
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/heartbeat-init heartbeat
+	newinitd ${FILESDIR}/heartbeat-init heartbeat
 }
diff --git a/sys-cluster/heartbeat/heartbeat-2.0.7-r2.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.7-r2.ebuild
index bbc086e74b04..7a1c740d4890 100644
--- a/sys-cluster/heartbeat/heartbeat-2.0.7-r2.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-2.0.7-r2.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-cluster/heartbeat/heartbeat-2.0.7-r2.ebuild,v 1.4 2007/03/01 00:51:27 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.7-r2.ebuild,v 1.5 2007/04/28 17:46:56 swegener Exp $
 
 inherit flag-o-matic eutils
 
@@ -112,8 +112,7 @@ src_install() {
 
 	dodir /var/lib/heartbeat/cores/cluster
 	keepdir /var/lib/heartbeat/cores/cluster
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/heartbeat-init heartbeat
+	newinitd ${FILESDIR}/heartbeat-init heartbeat
 
 	dodoc ldirectord/ldirectord.cf doc/*.cf doc/haresources doc/authkeys || die
 	if use doc ; then
diff --git a/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild
index 0804191696a3..e994f519b5bd 100644
--- a/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-2.0.8.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-cluster/heartbeat/heartbeat-2.0.8.ebuild,v 1.3 2007/03/21 13:25:47 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild,v 1.4 2007/04/28 17:46:56 swegener Exp $
 
 inherit flag-o-matic eutils
 
@@ -113,8 +113,7 @@ src_install() {
 
 	dodir /var/lib/heartbeat/cores/cluster
 	keepdir /var/lib/heartbeat/cores/cluster
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/heartbeat-init heartbeat
+	newinitd ${FILESDIR}/heartbeat-init heartbeat
 
 	dodoc ldirectord/ldirectord.cf doc/*.cf doc/haresources doc/authkeys || die
 	if use doc ; then