Fix *initd, *envd and *confd calls, bug #173884.

(Portage version: 2.1.2.5)

7 files changed, 31 insertions, 37 deletions

diff --git a/sys-apps/hotplug/ChangeLog b/sys-apps/hotplug/ChangeLog
index cb046b3775ac..b1adf23270c2 100644
--- a/sys-apps/hotplug/ChangeLog
+++ b/sys-apps/hotplug/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/hotplug
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/ChangeLog,v 1.68 2007/02/22 01:11:53 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/ChangeLog,v 1.69 2007/04/28 16:27:15 swegener Exp $
+
+  28 Apr 2007; Sven Wegener <swegener@gentoo.org>
+  hotplug-20030805-r2.ebuild, hotplug-20030805-r3.ebuild,
+  hotplug-20040105.ebuild, hotplug-20040401.ebuild, hotplug-20040920.ebuild,
+  hotplug-20040923.ebuild:
+  Fix *initd, *envd and *confd calls, bug #173884.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/sys-apps/hotplug/hotplug-20030805-r2.ebuild b/sys-apps/hotplug/hotplug-20030805-r2.ebuild
index cf20c32e3740..ea83dca85bc3 100644
--- a/sys-apps/hotplug/hotplug-20030805-r2.ebuild
+++ b/sys-apps/hotplug/hotplug-20030805-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030805-r2.ebuild,v 1.8 2005/01/02 23:22:19 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030805-r2.ebuild,v 1.9 2007/04/28 16:27:15 swegener Exp $
 
 inherit eutils
 
@@ -51,11 +51,9 @@ src_install() {
 	exeinto /etc/hotplug.d/default
 	doexe default.hotplug
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/hotplug.rc hotplug
+	newinitd ${FILESDIR}/hotplug.rc hotplug
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/usb.confd usb
+	newconfd ${FILESDIR}/usb.confd usb
 	dodir /var/run/usb
 }
 
diff --git a/sys-apps/hotplug/hotplug-20030805-r3.ebuild b/sys-apps/hotplug/hotplug-20030805-r3.ebuild
index 28f4f216aa3a..daf449243ba5 100644
--- a/sys-apps/hotplug/hotplug-20030805-r3.ebuild
+++ b/sys-apps/hotplug/hotplug-20030805-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030805-r3.ebuild,v 1.7 2005/01/02 23:22:19 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030805-r3.ebuild,v 1.8 2007/04/28 16:27:15 swegener Exp $
 
 inherit eutils
 
@@ -52,11 +52,9 @@ src_install() {
 	exeinto /etc/hotplug.d/default
 	doexe default.hotplug
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/hotplug.rc hotplug
+	newinitd ${FILESDIR}/hotplug.rc hotplug
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/usb.confd usb
+	newconfd ${FILESDIR}/usb.confd usb
 	dodir /var/run/usb
 }
 
diff --git a/sys-apps/hotplug/hotplug-20040105.ebuild b/sys-apps/hotplug/hotplug-20040105.ebuild
index 0a2914d9d71d..663d49fc8794 100644
--- a/sys-apps/hotplug/hotplug-20040105.ebuild
+++ b/sys-apps/hotplug/hotplug-20040105.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040105.ebuild,v 1.9 2005/01/02 23:22:19 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040105.ebuild,v 1.10 2007/04/28 16:27:15 swegener Exp $
 
 inherit eutils
 
@@ -47,11 +47,9 @@ src_install() {
 	exeinto /etc/hotplug.d/default
 	doexe default.hotplug
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/hotplug.rc hotplug
+	newinitd ${FILESDIR}/hotplug.rc hotplug
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/usb.confd usb
+	newconfd ${FILESDIR}/usb.confd usb
 	dodir /var/run/usb
 }
 
diff --git a/sys-apps/hotplug/hotplug-20040401.ebuild b/sys-apps/hotplug/hotplug-20040401.ebuild
index 3e504ea709d6..68dd42a86de3 100644
--- a/sys-apps/hotplug/hotplug-20040401.ebuild
+++ b/sys-apps/hotplug/hotplug-20040401.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040401.ebuild,v 1.11 2005/01/02 23:22:19 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040401.ebuild,v 1.12 2007/04/28 16:27:15 swegener Exp $
 
 inherit eutils
 
@@ -45,11 +45,9 @@ src_install() {
 	exeinto /etc/hotplug.d/default
 	doexe default.hotplug
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/hotplug.rc hotplug
+	newinitd ${FILESDIR}/hotplug.rc hotplug
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/usb.confd usb
+	newconfd ${FILESDIR}/usb.confd usb
 	dodir /var/run/usb
 }
 
diff --git a/sys-apps/hotplug/hotplug-20040920.ebuild b/sys-apps/hotplug/hotplug-20040920.ebuild
index 718215bb690e..92a926be2876 100644
--- a/sys-apps/hotplug/hotplug-20040920.ebuild
+++ b/sys-apps/hotplug/hotplug-20040920.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040920.ebuild,v 1.2 2005/01/02 23:22:19 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040920.ebuild,v 1.3 2007/04/28 16:27:15 swegener Exp $
 
 inherit eutils
 
@@ -45,11 +45,9 @@ src_install() {
 	exeinto /etc/hotplug.d/default
 	doexe default.hotplug
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/hotplug.rc.empty hotplug
+	newinitd ${FILESDIR}/hotplug.rc.empty hotplug
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/usb.confd usb
+	newconfd ${FILESDIR}/usb.confd usb
 	dodir /var/run/usb
 }
 
diff --git a/sys-apps/hotplug/hotplug-20040923.ebuild b/sys-apps/hotplug/hotplug-20040923.ebuild
index e11bc1895875..008b08e463d1 100644
--- a/sys-apps/hotplug/hotplug-20040923.ebuild
+++ b/sys-apps/hotplug/hotplug-20040923.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040923.ebuild,v 1.13 2005/02/05 17:20:25 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20040923.ebuild,v 1.14 2007/04/28 16:27:15 swegener Exp $
 
 inherit eutils
 
@@ -49,11 +49,9 @@ src_install() {
 	exeinto /etc/hotplug.d/default
 	doexe default.hotplug
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/hotplug.rc.empty hotplug
+	newinitd ${FILESDIR}/hotplug.rc.empty hotplug
 
-	insinto /etc/conf.d
-	newins ${FILESDIR}/usb.confd usb
+	newconfd ${FILESDIR}/usb.confd usb
 	dodir /var/run/usb
 }