Fix init script naming

(Portage version: 2.1.4.4)

8 files changed, 27 insertions, 22 deletions

diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog
index e02207b92cf3..77a92bd13055 100644
--- a/net-im/openfire/ChangeLog
+++ b/net-im/openfire/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/openfire
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.17 2008/03/12 20:26:19 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.18 2008/03/12 21:46:13 jokey Exp $
+
+  12 Mar 2008; Markus Ullmann <jokey@gentoo.org> openfire-3.3.2.ebuild,
+  openfire-3.3.3.ebuild, openfire-3.4.1.ebuild, openfire-3.4.3.ebuild,
+  openfire-3.4.4.ebuild, openfire-3.4.5.ebuild, openfire-3.5.0_rc1.ebuild:
+  Fix init script naming
 
 *openfire-3.5.0_rc1 (12 Mar 2008)
 
diff --git a/net-im/openfire/openfire-3.3.2.ebuild b/net-im/openfire/openfire-3.3.2.ebuild
index 5426df4f32d4..7ac23410a3bd 100644
--- a/net-im/openfire/openfire-3.3.2.ebuild
+++ b/net-im/openfire/openfire-3.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.3.2.ebuild,v 1.3 2008/03/12 19:58:04 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.3.2.ebuild,v 1.4 2008/03/12 21:46:13 jokey Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -56,8 +56,8 @@ src_compile() {
 src_install() {
 	dodir /opt/openfire
 
-	doinitd "${FILESDIR}"/openfire-initd
-	doconfd "${FILESDIR}"/openfire-confd
+	newinitd "${FILESDIR}"/openfire-initd openfire
+	newconfd "${FILESDIR}"/openfire-confd openfire
 
 	dodir /opt/openfire/conf
 	insinto /opt/openfire/conf
diff --git a/net-im/openfire/openfire-3.3.3.ebuild b/net-im/openfire/openfire-3.3.3.ebuild
index 144fc214568a..5b1372c2cfb3 100644
--- a/net-im/openfire/openfire-3.3.3.ebuild
+++ b/net-im/openfire/openfire-3.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.3.3.ebuild,v 1.3 2008/03/12 19:58:04 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.3.3.ebuild,v 1.4 2008/03/12 21:46:13 jokey Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -56,8 +56,8 @@ src_compile() {
 src_install() {
 	dodir /opt/openfire
 
-	doinitd "${FILESDIR}"/openfire-initd
-	doconfd "${FILESDIR}"/openfire-confd
+	newinitd "${FILESDIR}"/openfire-initd openfire
+	newconfd "${FILESDIR}"/openfire-confd openfire
 
 	dodir /opt/openfire/conf
 	insinto /opt/openfire/conf
diff --git a/net-im/openfire/openfire-3.4.1.ebuild b/net-im/openfire/openfire-3.4.1.ebuild
index d7219ab2ed7a..8a37ff8053d3 100644
--- a/net-im/openfire/openfire-3.4.1.ebuild
+++ b/net-im/openfire/openfire-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.4.1.ebuild,v 1.3 2008/03/12 19:58:04 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.4.1.ebuild,v 1.4 2008/03/12 21:46:13 jokey Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -56,8 +56,8 @@ src_compile() {
 src_install() {
 	dodir /opt/openfire
 
-	doinitd "${FILESDIR}"/openfire-initd
-	doconfd "${FILESDIR}"/openfire-confd
+	newinitd "${FILESDIR}"/openfire-initd openfire
+	newconfd "${FILESDIR}"/openfire-confd openfire
 
 	dodir /opt/openfire/conf
 	insinto /opt/openfire/conf
diff --git a/net-im/openfire/openfire-3.4.3.ebuild b/net-im/openfire/openfire-3.4.3.ebuild
index b4bd62dcbaa1..29eaa2ac1730 100644
--- a/net-im/openfire/openfire-3.4.3.ebuild
+++ b/net-im/openfire/openfire-3.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.4.3.ebuild,v 1.3 2008/03/12 19:58:04 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.4.3.ebuild,v 1.4 2008/03/12 21:46:13 jokey Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -56,8 +56,8 @@ src_compile() {
 src_install() {
 	dodir /opt/openfire
 
-	doinitd "${FILESDIR}"/openfire-initd
-	doconfd "${FILESDIR}"/openfire-confd
+	newinitd "${FILESDIR}"/openfire-initd openfire
+	newconfd "${FILESDIR}"/openfire-confd openfire
 
 	dodir /opt/openfire/conf
 	insinto /opt/openfire/conf
diff --git a/net-im/openfire/openfire-3.4.4.ebuild b/net-im/openfire/openfire-3.4.4.ebuild
index cc20b13da997..a653c7903cb8 100644
--- a/net-im/openfire/openfire-3.4.4.ebuild
+++ b/net-im/openfire/openfire-3.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.4.4.ebuild,v 1.3 2008/03/12 20:01:12 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.4.4.ebuild,v 1.4 2008/03/12 21:46:13 jokey Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -56,8 +56,8 @@ src_compile() {
 src_install() {
 	dodir /opt/openfire
 
-	doinitd "${FILESDIR}"/openfire-initd
-	doconfd "${FILESDIR}"/openfire-confd
+	newinitd "${FILESDIR}"/openfire-initd openfire
+	newconfd "${FILESDIR}"/openfire-confd openfire
 
 	dodir /opt/openfire/conf
 	insinto /opt/openfire/conf
diff --git a/net-im/openfire/openfire-3.4.5.ebuild b/net-im/openfire/openfire-3.4.5.ebuild
index 8b036e692abf..a4ccc6688a9d 100644
--- a/net-im/openfire/openfire-3.4.5.ebuild
+++ b/net-im/openfire/openfire-3.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.4.5.ebuild,v 1.1 2008/03/12 19:58:04 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.4.5.ebuild,v 1.2 2008/03/12 21:46:13 jokey Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -56,8 +56,8 @@ src_compile() {
 src_install() {
 	dodir /opt/openfire
 
-	doinitd "${FILESDIR}"/openfire-initd
-	doconfd "${FILESDIR}"/openfire-confd
+	newinitd "${FILESDIR}"/openfire-initd openfire
+	newconfd "${FILESDIR}"/openfire-confd openfire
 
 	dodir /opt/openfire/conf
 	insinto /opt/openfire/conf
diff --git a/net-im/openfire/openfire-3.5.0_rc1.ebuild b/net-im/openfire/openfire-3.5.0_rc1.ebuild
index e8dc4b8bec09..82dd2eb6d6eb 100644
--- a/net-im/openfire/openfire-3.5.0_rc1.ebuild
+++ b/net-im/openfire/openfire-3.5.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.5.0_rc1.ebuild,v 1.1 2008/03/12 20:26:19 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.5.0_rc1.ebuild,v 1.2 2008/03/12 21:46:13 jokey Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -57,8 +57,8 @@ src_compile() {
 src_install() {
 	dodir /opt/openfire
 
-	doinitd "${FILESDIR}"/openfire-initd
-	doconfd "${FILESDIR}"/openfire-confd
+	newinitd "${FILESDIR}"/openfire-initd openfire
+	newconfd "${FILESDIR}"/openfire-confd openfire
 
 	dodir /opt/openfire/conf
 	insinto /opt/openfire/conf