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

(Portage version: 2.1.2.5)

9 files changed, 38 insertions, 47 deletions

diff --git a/net-misc/memcached/ChangeLog b/net-misc/memcached/ChangeLog
index 94aba8725fdf..1fc56c4d0d7b 100644
--- a/net-misc/memcached/ChangeLog
+++ b/net-misc/memcached/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/memcached
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.42 2007/04/22 21:52:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/ChangeLog,v 1.43 2007/04/28 16:57:21 swegener Exp $
+
+  28 Apr 2007; Sven Wegener <swegener@gentoo.org> memcached-1.1.11.ebuild,
+  memcached-1.1.12.ebuild, memcached-1.1.12-r1.ebuild,
+  memcached-1.1.12-r2.ebuild, memcached-1.1.12-r3.ebuild,
+  memcached-1.1.13_pre.ebuild, memcached-1.1.13.ebuild,
+  memcached-1.2.1.ebuild:
+  Fix *initd, *confd and *envd calls (#17388, #174266)
 
   22 Apr 2007; Raúl Porcel <armin76@gentoo.org> memcached-1.2.1-r1.ebuild:
   ia64 + x86 stable and fix typo
diff --git a/net-misc/memcached/memcached-1.1.11.ebuild b/net-misc/memcached/memcached-1.1.11.ebuild
index 06ac92e2d3a6..980feb3c2147 100644
--- a/net-misc/memcached/memcached-1.1.11.ebuild
+++ b/net-misc/memcached/memcached-1.1.11.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/net-misc/memcached/memcached-1.1.11.ebuild,v 1.8 2006/01/02 11:07:06 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.1.11.ebuild,v 1.9 2007/04/28 16:57:21 swegener Exp $
 
 DESCRIPTION="memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load."
 
@@ -31,9 +31,7 @@ src_install() {
 	dobin ${S}/memcached
 	dodoc ${S}/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
 
-	insinto /etc/conf.d
-	newins "${FILESDIR}/conf" memcached
+	newconfd "${FILESDIR}/conf" memcached
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/init" memcached
+	newinitd "${FILESDIR}/init" memcached
 }
diff --git a/net-misc/memcached/memcached-1.1.12-r1.ebuild b/net-misc/memcached/memcached-1.1.12-r1.ebuild
index 67d059521e3a..f8ec0bbfa186 100644
--- a/net-misc/memcached/memcached-1.1.12-r1.ebuild
+++ b/net-misc/memcached/memcached-1.1.12-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/net-misc/memcached/memcached-1.1.12-r1.ebuild,v 1.3 2006/01/02 11:07:06 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.1.12-r1.ebuild,v 1.4 2007/04/28 16:57:21 swegener Exp $
 
 DESCRIPTION="memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load."
 
@@ -28,11 +28,9 @@ src_install() {
 	dobin ${S}/memcached
 	dodoc ${S}/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
 
-	insinto /etc/conf.d
-	newins "${FILESDIR}/${PV}/conf" memcached
+	newconfd "${FILESDIR}/${PV}/conf" memcached
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/${PV}/init" memcached
+	newinitd "${FILESDIR}/${PV}/init" memcached
 
 	doman ${S}/doc/memcached.1
 
diff --git a/net-misc/memcached/memcached-1.1.12-r2.ebuild b/net-misc/memcached/memcached-1.1.12-r2.ebuild
index 800684700b27..04163d865f13 100644
--- a/net-misc/memcached/memcached-1.1.12-r2.ebuild
+++ b/net-misc/memcached/memcached-1.1.12-r2.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/net-misc/memcached/memcached-1.1.12-r2.ebuild,v 1.8 2006/11/23 19:51:55 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.1.12-r2.ebuild,v 1.9 2007/04/28 16:57:21 swegener Exp $
 
 inherit eutils
 
@@ -30,11 +30,9 @@ src_install() {
 	dobin ${S}/memcached
 	dodoc ${S}/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
 
-	insinto /etc/conf.d
-	newins "${FILESDIR}/${PV}/conf" memcached
+	newconfd "${FILESDIR}/${PV}/conf" memcached
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/${PV}/init" memcached
+	newinitd "${FILESDIR}/${PV}/init" memcached
 
 	doman ${S}/doc/memcached.1
 
diff --git a/net-misc/memcached/memcached-1.1.12-r3.ebuild b/net-misc/memcached/memcached-1.1.12-r3.ebuild
index db07f58bfed0..48005b66ddc0 100644
--- a/net-misc/memcached/memcached-1.1.12-r3.ebuild
+++ b/net-misc/memcached/memcached-1.1.12-r3.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/net-misc/memcached/memcached-1.1.12-r3.ebuild,v 1.2 2006/11/12 03:41:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.1.12-r3.ebuild,v 1.3 2007/04/28 16:57:21 swegener Exp $
 
 inherit eutils
 
@@ -30,11 +30,9 @@ src_install() {
 	dobin ${S}/memcached
 	dodoc ${S}/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
 
-	insinto /etc/conf.d
-	newins "${FILESDIR}/${PV}/conf" memcached
+	newconfd "${FILESDIR}/${PV}/conf" memcached
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/${PV}/init" memcached
+	newinitd "${FILESDIR}/${PV}/init" memcached
 
 	doman ${S}/doc/memcached.1
 
diff --git a/net-misc/memcached/memcached-1.1.12.ebuild b/net-misc/memcached/memcached-1.1.12.ebuild
index ac7580889e00..80af4f34b9c1 100644
--- a/net-misc/memcached/memcached-1.1.12.ebuild
+++ b/net-misc/memcached/memcached-1.1.12.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/net-misc/memcached/memcached-1.1.12.ebuild,v 1.8 2006/01/02 11:07:06 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.1.12.ebuild,v 1.9 2007/04/28 16:57:21 swegener Exp $
 
 DESCRIPTION="memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load."
 
@@ -28,9 +28,7 @@ src_install() {
 	dobin ${S}/memcached
 	dodoc ${S}/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
 
-	insinto /etc/conf.d
-	newins "${FILESDIR}/${PV}/conf" memcached
+	newconfd "${FILESDIR}/${PV}/conf" memcached
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/${PV}/init" memcached
+	newinitd "${FILESDIR}/${PV}/init" memcached
 }
diff --git a/net-misc/memcached/memcached-1.1.13.ebuild b/net-misc/memcached/memcached-1.1.13.ebuild
index a2c06036f0ea..cbb77812194f 100644
--- a/net-misc/memcached/memcached-1.1.13.ebuild
+++ b/net-misc/memcached/memcached-1.1.13.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/net-misc/memcached/memcached-1.1.13.ebuild,v 1.8 2007/04/16 07:58:25 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.1.13.ebuild,v 1.9 2007/04/28 16:57:21 swegener Exp $
 
 inherit eutils
 
@@ -33,11 +33,9 @@ src_install() {
 	dobin ${S}/memcached
 	dodoc ${S}/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
 
-	insinto /etc/conf.d
-	newins "${FILESDIR}/1.1.12/conf" memcached
+	newconfd "${FILESDIR}/1.1.12/conf" memcached
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/1.1.12/init" memcached
+	newinitd "${FILESDIR}/1.1.12/init" memcached
 
 	doman ${S}/doc/memcached.1
 
diff --git a/net-misc/memcached/memcached-1.1.13_pre.ebuild b/net-misc/memcached/memcached-1.1.13_pre.ebuild
index edff2b7ef0b5..49684ebfe247 100644
--- a/net-misc/memcached/memcached-1.1.13_pre.ebuild
+++ b/net-misc/memcached/memcached-1.1.13_pre.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/net-misc/memcached/memcached-1.1.13_pre.ebuild,v 1.5 2006/11/12 03:41:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.1.13_pre.ebuild,v 1.6 2007/04/28 16:57:21 swegener Exp $
 
 inherit eutils
 
@@ -33,11 +33,9 @@ src_install() {
 	dobin ${S}/memcached
 	dodoc ${S}/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
 
-	insinto /etc/conf.d
-	newins "${FILESDIR}/1.1.12/conf" memcached
+	newconfd "${FILESDIR}/1.1.12/conf" memcached
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/1.1.12/init" memcached
+	newinitd "${FILESDIR}/1.1.12/init" memcached
 
 	doman ${S}/doc/memcached.1
 
diff --git a/net-misc/memcached/memcached-1.2.1.ebuild b/net-misc/memcached/memcached-1.2.1.ebuild
index 3c3e5ae1d4f0..81cc07e56498 100644
--- a/net-misc/memcached/memcached-1.2.1.ebuild
+++ b/net-misc/memcached/memcached-1.2.1.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/net-misc/memcached/memcached-1.2.1.ebuild,v 1.3 2007/03/22 18:32:06 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.2.1.ebuild,v 1.4 2007/04/28 16:57:21 swegener Exp $
 
 inherit eutils
 
@@ -31,11 +31,9 @@ src_install() {
 	dobin ${S}/memcached
 	dodoc ${S}/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
 
-	insinto /etc/conf.d
-	newins "${FILESDIR}/1.1.12/conf" memcached
+	newconfd "${FILESDIR}/1.1.12/conf" memcached
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/1.1.12/init" memcached
+	newinitd "${FILESDIR}/1.1.12/init" memcached
 
 	doman ${S}/doc/memcached.1