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

Package-Manager: portage-2.1.2.5

18 files changed, 106 insertions, 99 deletions

diff --git a/app-admin/bastille/ChangeLog b/app-admin/bastille/ChangeLog
index 2d693c64c3ef..4e7d8c7f1034 100644
--- a/app-admin/bastille/ChangeLog
+++ b/app-admin/bastille/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/bastille
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/ChangeLog,v 1.19 2007/01/24 13:57:14 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/ChangeLog,v 1.20 2007/04/28 17:02:54 tove Exp $
+
+  28 Apr 2007; Torsten Veller <tove@gentoo.org> bastille-3.0.2.ebuild:
+  Fix *initd, *confd and *envd calls (#17388, #174266)
 
   24 Jan 2007; Marius Mauch <genone@gentoo.org> bastille-2.1.1-r1.ebuild,
   bastille-2.1.1-r2.ebuild, bastille-2.1.1-r3.ebuild, bastille-3.0.2.ebuild:
diff --git a/app-admin/bastille/bastille-3.0.2.ebuild b/app-admin/bastille/bastille-3.0.2.ebuild
index bd1d8efb3f25..4d2338ebabc8 100644
--- a/app-admin/bastille/bastille-3.0.2.ebuild
+++ b/app-admin/bastille/bastille-3.0.2.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/app-admin/bastille/bastille-3.0.2.ebuild,v 1.3 2007/01/24 13:57:14 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/bastille-3.0.2.ebuild,v 1.4 2007/04/28 17:02:54 tove Exp $
 
 inherit eutils
 
@@ -26,27 +26,27 @@ RDEPEND="net-firewall/iptables
 
 src_unpack() {
 	unpack ${A}
-	epatch ${WORKDIR}/${P}-gentoo-${PATCHVER}.patch
+	epatch "${WORKDIR}"/${P}-gentoo-${PATCHVER}.patch
 
-	cd ${S}
-	cp ${FILESDIR}/bastille-${PV}-firewall.init ./bastille-firewall
+	cd "${S}"
+	cp "${FILESDIR}"/bastille-${PV}-firewall.init ./bastille-firewall
 	chmod a+x Install.sh bastille-ipchains bastille-netfilter
 }
 
 src_install() {
 
-	cd ${S}
-	DESTDIR=${D} ./Install.sh
+	cd "${S}"
+	DESTDIR="${D}" ./Install.sh
 
 	# Example configs
-	cd ${S}
+	cd "${S}"
 	insinto /usr/share/Bastille
 	doins *.config
 
-	exeinto /etc/init.d && newexe ${FILESDIR}/${P}-firewall.init ${PN}-firewall
+	newinitd "${FILESDIR}"/${P}-firewall.init ${PN}-firewall
 
 	# Documentation
-	cd ${S}
+	cd "${S}"
 	dodoc *.txt BUGS Change* README*
 }
 
diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index 0f75d17bc903..1ceadcdb1de6 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/gkrellm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.141 2007/04/07 15:54:33 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.142 2007/04/28 16:59:11 tove Exp $
+
+  28 Apr 2007; Torsten Veller <tove@gentoo.org> gkrellm-2.2.5.ebuild:
+  Fix *initd, *confd and *envd calls (#17388, #174266)
 
   07 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
   gkrellm-2.2.10.ebuild:
diff --git a/app-admin/gkrellm/gkrellm-2.2.5.ebuild b/app-admin/gkrellm/gkrellm-2.2.5.ebuild
index aac6c581f95e..a56fb62f80c8 100644
--- a/app-admin/gkrellm/gkrellm-2.2.5.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.2.5.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/app-admin/gkrellm/gkrellm-2.2.5.ebuild,v 1.12 2005/08/12 13:49:52 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.2.5.ebuild,v 1.13 2007/04/28 16:59:11 tove Exp $
 
 inherit eutils
 
@@ -41,7 +41,7 @@ src_compile() {
 	use ssl || myconf="without-ssl=yes"
 		PREFIX=/usr emake ${myconf} || die
 	else
-		cd ${S}/server
+		cd "${S}"/server
 		emake glib12=1 || die
 	fi
 }
@@ -54,31 +54,30 @@ src_install() {
 		keepdir /usr/share/gkrellm2/themes
 		keepdir /usr/$(get_libdir)/gkrellm2/plugins
 
-		make DESTDIR=${D} install \
-			INSTALLDIR=${D}/usr/bin \
-			MANDIR=${D}/usr/share/man/man1 \
-			INCLUDEDIR=${D}/usr/include \
-			LOCALEDIR=${D}/usr/share/locale \
-			PKGCONFIGDIR=${D}/usr/$(get_libdir)/pkgconfig
+		make DESTDIR="${D}" install \
+			INSTALLDIR="${D}"/usr/bin \
+			MANDIR="${D}"/usr/share/man/man1 \
+			INCLUDEDIR="${D}"/usr/include \
+			LOCALEDIR="${D}"/usr/share/locale \
+			PKGCONFIGDIR="${D}"/usr/$(get_libdir)/pkgconfig
 
-		cd ${S}
+		cd "${S}"
 		mv gkrellm.1 gkrellm2.1
 
 		mv src/gkrellm src/gkrellm2
 		dobin src/gkrellm2
-		rm -f ${D}/usr/bin/gkrellm
+		rm -f "${D}"/usr/bin/gkrellm
 	else
-		cd ${S}/server
+		cd "${S}"/server
 		dobin gkrellmd
-		cd ${S}
+		cd "${S}"
 		rm gkrellm.1
 	fi
 
-	rm -f ${D}/usr/share/man/man1/*
+	rm -f "${D}"/usr/share/man/man1/*
 	doman *.1
 
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/gkrellmd
+	doinitd "${FILESDIR}"/gkrellmd
 
 	insinto /etc
 	doins server/gkrellmd.conf
diff --git a/app-admin/gps/ChangeLog b/app-admin/gps/ChangeLog
index 9a6095af423e..987305c399fa 100644
--- a/app-admin/gps/ChangeLog
+++ b/app-admin/gps/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/gps
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gps/ChangeLog,v 1.16 2007/02/04 00:24:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gps/ChangeLog,v 1.17 2007/04/28 17:07:20 tove Exp $
+
+  28 Apr 2007; Torsten Veller <tove@gentoo.org> gps-1.1.0-r1.ebuild:
+  Fix *initd, *confd and *envd calls (#17388, #174266)
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/app-admin/gps/gps-1.1.0-r1.ebuild b/app-admin/gps/gps-1.1.0-r1.ebuild
index eac28a6bb718..e72df9c88f30 100644
--- a/app-admin/gps/gps-1.1.0-r1.ebuild
+++ b/app-admin/gps/gps-1.1.0-r1.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/app-admin/gps/gps-1.1.0-r1.ebuild,v 1.9 2005/10/31 13:06:36 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gps/gps-1.1.0-r1.ebuild,v 1.10 2007/04/28 17:07:20 tove Exp $
 
 inherit eutils
 
@@ -20,14 +20,13 @@ RESTRICT="nouserpriv"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${WORKDIR}/${P}-gentoo
+	epatch "${WORKDIR}"/${P}-gentoo
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/rgpsp
+	doinitd "${FILESDIR}"/rgpsp
 
 	dodoc TODO README* CHANGELOG
 
@@ -38,8 +37,8 @@ src_install() {
 	insinto /etc
 	newins rgpsp/sample.rgpsp.conf rgpsp.conf
 
-	rm -rf ${D}/usr/man ${D}/usr/doc ${D}/etc/rc.d
-	rm -f ${D}/usr/bin/rgpsp
+	rm -rf "${D}"/usr/man "${D}"/usr/doc "${D}"/etc/rc.d
+	rm -f "${D}"/usr/bin/rgpsp
 
 	dosym /usr/bin/rgpsp_linux /usr/bin/rgpsp
 }
diff --git a/app-admin/mon/ChangeLog b/app-admin/mon/ChangeLog
index e427e16140e1..e43525e8b66e 100644
--- a/app-admin/mon/ChangeLog
+++ b/app-admin/mon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/mon
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/mon/ChangeLog,v 1.23 2006/08/12 12:32:30 mcummings Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mon/ChangeLog,v 1.24 2007/04/28 17:05:28 tove Exp $
+
+  28 Apr 2007; Torsten Veller <tove@gentoo.org> mon-0.99.2-r2.ebuild,
+  mon-0.99.2-r4.ebuild:
+  Fix *initd, *confd and *envd calls (#17388, #174266)
 
 *mon-0.99.2-r4 (12 Aug 2006)
 
diff --git a/app-admin/mon/mon-0.99.2-r2.ebuild b/app-admin/mon/mon-0.99.2-r2.ebuild
index a54fc715ca83..748335a72189 100644
--- a/app-admin/mon/mon-0.99.2-r2.ebuild
+++ b/app-admin/mon/mon-0.99.2-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/app-admin/mon/mon-0.99.2-r2.ebuild,v 1.2 2006/02/11 20:58:08 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mon/mon-0.99.2-r2.ebuild,v 1.3 2007/04/28 17:05:28 tove Exp $
 
 inherit toolchain-funcs
 
@@ -43,8 +43,7 @@ src_install() {
 	docinto etc ; dodoc etc/*
 	newdoc ${FILESDIR}/mon.cf mon.cf.sample
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mon.rc6 mon
+	newinitd ${FILESDIR}/mon.rc6 mon
 	insinto /etc/mon
 	newins ${FILESDIR}/mon.cf mon.cf.sample
 }
diff --git a/app-admin/mon/mon-0.99.2-r4.ebuild b/app-admin/mon/mon-0.99.2-r4.ebuild
index f600b3a6e458..191335c1ca17 100644
--- a/app-admin/mon/mon-0.99.2-r4.ebuild
+++ b/app-admin/mon/mon-0.99.2-r4.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/app-admin/mon/mon-0.99.2-r4.ebuild,v 1.1 2006/08/12 12:32:30 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mon/mon-0.99.2-r4.ebuild,v 1.2 2007/04/28 17:05:28 tove Exp $
 
 inherit toolchain-funcs eutils multilib
 
@@ -26,11 +26,11 @@ DEPEND=">=dev-perl/Mon-0.9
 
 src_unpack() {
 	unpack ${A}
-	cd ${S} && epatch ${FILESDIR}/alertafter.patch
+	cd "${S}" && epatch "${FILESDIR}"/alertafter.patch
 }
 
 src_compile() {
-	cd ${S}/mon.d
+	cd "${S}"/mon.d
 	make CC="$(tc-getCC) $CFLAGS" || die
 }
 
@@ -53,10 +53,9 @@ src_install() {
 	dodoc mon.lsm README TODO VERSION
 	docinto txt ; dodoc doc/README*
 	docinto etc ; dodoc etc/*
-	newdoc ${FILESDIR}/mon.cf mon.cf.sample
+	newdoc "${FILESDIR}"/mon.cf mon.cf.sample
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mon.rc6 mon
+	newinitd "${FILESDIR}"/mon.rc6 mon
 	insinto /etc/mon
-	newins ${FILESDIR}/mon.cf mon.cf.sample
+	newins "${FILESDIR}"/mon.cf mon.cf.sample
 }
diff --git a/app-admin/tenshi/ChangeLog b/app-admin/tenshi/ChangeLog
index 56667dfdbef2..35cb001e11b9 100644
--- a/app-admin/tenshi/ChangeLog
+++ b/app-admin/tenshi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/tenshi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/ChangeLog,v 1.29 2007/04/10 07:52:44 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/ChangeLog,v 1.30 2007/04/28 16:55:17 tove Exp $
+
+  28 Apr 2007; Torsten Veller <tove@gentoo.org> tenshi-0.3.3.ebuild,
+  tenshi-0.3.4.ebuild, tenshi-0.4.ebuild, tenshi-0.5.ebuild,
+  tenshi-0.5.1.ebuild, tenshi-0.6.ebuild, tenshi-0.7.ebuild:
+  Fix *initd, *confd and *envd calls (#17388, #174266)
 
   10 Apr 2007; Christian Faulhammer <opfer@gentoo.org> tenshi-0.6.ebuild:
   stable amd64, bug 171685
diff --git a/app-admin/tenshi/tenshi-0.3.3.ebuild b/app-admin/tenshi/tenshi-0.3.3.ebuild
index 467f02ee2f02..960ec400df9e 100644
--- a/app-admin/tenshi/tenshi-0.3.3.ebuild
+++ b/app-admin/tenshi/tenshi-0.3.3.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/app-admin/tenshi/tenshi-0.3.3.ebuild,v 1.5 2007/01/24 15:03:16 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/tenshi-0.3.3.ebuild,v 1.6 2007/04/28 16:55:17 tove Exp $
 
 inherit eutils
 
@@ -24,12 +24,11 @@ pkg_setup() {
 
 src_install() {
 	sed -i -e "s:-o tenshi::" Makefile
-	emake DESTDIR=${D} install
+	emake DESTDIR="${D}" install
 	fowners tenshi:root /etc/tenshi/tenshi.conf
 	fowners tenshi:root /var/lib/tenshi
 	doman tenshi.8
-	exeinto /etc/init.d
-	newexe tenshi.gentoo-init tenshi
+	newinitd tenshi.gentoo-init tenshi
 	keepdir /var/lib/tenshi
 }
 
diff --git a/app-admin/tenshi/tenshi-0.3.4.ebuild b/app-admin/tenshi/tenshi-0.3.4.ebuild
index d96047a17c18..1e68a9a2f9f6 100644
--- a/app-admin/tenshi/tenshi-0.3.4.ebuild
+++ b/app-admin/tenshi/tenshi-0.3.4.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/app-admin/tenshi/tenshi-0.3.4.ebuild,v 1.4 2006/02/27 16:35:20 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/tenshi-0.3.4.ebuild,v 1.5 2007/04/28 16:55:17 tove Exp $
 
 inherit eutils
 
@@ -24,11 +24,10 @@ pkg_setup() {
 
 src_install() {
 	sed -i -e "s:-o tenshi::" Makefile
-	emake DESTDIR=${D} install
+	emake DESTDIR="${D}" install
 	fowners tenshi:root /etc/tenshi/tenshi.conf
 	fowners tenshi:root /var/lib/tenshi
 	doman tenshi.8
-	exeinto /etc/init.d
-	newexe tenshi.gentoo-init tenshi
+	newinitd tenshi.gentoo-init tenshi
 	keepdir /var/lib/tenshi
 }
diff --git a/app-admin/tenshi/tenshi-0.4.ebuild b/app-admin/tenshi/tenshi-0.4.ebuild
index 4d6744a140c7..17819a7be30f 100644
--- a/app-admin/tenshi/tenshi-0.4.ebuild
+++ b/app-admin/tenshi/tenshi-0.4.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/app-admin/tenshi/tenshi-0.4.ebuild,v 1.5 2006/06/12 19:52:25 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/tenshi-0.4.ebuild,v 1.6 2007/04/28 16:55:17 tove Exp $
 
 inherit eutils
 
@@ -23,11 +23,10 @@ pkg_setup() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install
+	emake DESTDIR="${D}" install
 	fowners tenshi:root /etc/tenshi/tenshi.conf
 	fowners tenshi:root /var/lib/tenshi
 	doman tenshi.8
-	exeinto /etc/init.d
-	newexe tenshi.gentoo-init tenshi
+	newinitd tenshi.gentoo-init tenshi
 	keepdir /var/lib/tenshi
 }
diff --git a/app-admin/tenshi/tenshi-0.5.1.ebuild b/app-admin/tenshi/tenshi-0.5.1.ebuild
index 9787179afb75..8af493c7350a 100644
--- a/app-admin/tenshi/tenshi-0.5.1.ebuild
+++ b/app-admin/tenshi/tenshi-0.5.1.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/app-admin/tenshi/tenshi-0.5.1.ebuild,v 1.1 2006/06/19 10:34:58 lcars Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/tenshi-0.5.1.ebuild,v 1.2 2007/04/28 16:55:17 tove Exp $
 
 inherit eutils
 
@@ -23,11 +23,10 @@ pkg_setup() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install
+	emake DESTDIR="${D}" install
 	fowners tenshi:root /etc/tenshi/tenshi.conf
 	fowners tenshi:root /var/lib/tenshi
 	doman tenshi.8
-	exeinto /etc/init.d
-	newexe tenshi.gentoo-init tenshi
+	newinitd tenshi.gentoo-init tenshi
 	keepdir /var/lib/tenshi
 }
diff --git a/app-admin/tenshi/tenshi-0.5.ebuild b/app-admin/tenshi/tenshi-0.5.ebuild
index 30903d00b64e..6909fa2da463 100644
--- a/app-admin/tenshi/tenshi-0.5.ebuild
+++ b/app-admin/tenshi/tenshi-0.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/app-admin/tenshi/tenshi-0.5.ebuild,v 1.3 2006/06/17 09:41:25 lcars Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/tenshi-0.5.ebuild,v 1.4 2007/04/28 16:55:17 tove Exp $
 
 inherit eutils
 
@@ -23,11 +23,10 @@ pkg_setup() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install
+	emake DESTDIR="${D}" install
 	fowners tenshi:root /etc/tenshi/tenshi.conf
 	fowners tenshi:root /var/lib/tenshi
 	doman tenshi.8
-	exeinto /etc/init.d
-	newexe tenshi.gentoo-init tenshi
+	newinitd tenshi.gentoo-init tenshi
 	keepdir /var/lib/tenshi
 }
diff --git a/app-admin/tenshi/tenshi-0.6.ebuild b/app-admin/tenshi/tenshi-0.6.ebuild
index 67513d28dfd4..a5f744e71811 100644
--- a/app-admin/tenshi/tenshi-0.6.ebuild
+++ b/app-admin/tenshi/tenshi-0.6.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/app-admin/tenshi/tenshi-0.6.ebuild,v 1.5 2007/04/10 07:52:44 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/tenshi-0.6.ebuild,v 1.6 2007/04/28 16:55:17 tove Exp $
 
 inherit eutils
 
@@ -23,11 +23,10 @@ pkg_setup() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install
+	emake DESTDIR="${D}" install
 	fowners tenshi:root /etc/tenshi/tenshi.conf
 	fowners tenshi:root /var/lib/tenshi
 	doman tenshi.8
-	exeinto /etc/init.d
-	newexe tenshi.gentoo-init tenshi
+	newinitd tenshi.gentoo-init tenshi
 	keepdir /var/lib/tenshi
 }
diff --git a/app-admin/tenshi/tenshi-0.7.ebuild b/app-admin/tenshi/tenshi-0.7.ebuild
index a327bb6eecdc..63ee39db89c8 100644
--- a/app-admin/tenshi/tenshi-0.7.ebuild
+++ b/app-admin/tenshi/tenshi-0.7.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/app-admin/tenshi/tenshi-0.7.ebuild,v 1.1 2007/03/14 13:37:59 lcars Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/tenshi-0.7.ebuild,v 1.2 2007/04/28 16:55:17 tove Exp $
 
 inherit eutils
 
@@ -23,11 +23,10 @@ pkg_setup() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install
+	emake DESTDIR="${D}" install
 	fowners tenshi:root /etc/tenshi/tenshi.conf
 	fowners tenshi:root /var/lib/tenshi
 	doman tenshi.8
-	exeinto /etc/init.d
-	newexe tenshi.gentoo-init tenshi
+	newinitd tenshi.gentoo-init tenshi
 	keepdir /var/lib/tenshi
 }
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 1f551dd57b68..201504708865 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -23,18 +23,18 @@ RMD160 40c38db24ef5917794b4994f8b86db344c6f9eb9 files/ulogd-1.23-gcc41.patch 848
 SHA256 9453360a7c1e189df892e87f0f553a156eaea462641ade3e5db328c5fd208819 files/ulogd-1.23-gcc41.patch 848
 DIST ulogd-1.23.tar.bz2 143608 RMD160 c4b95caeffab03afa192d165e4b6432b348537c6 SHA1 aef1789ed960128e0dc08684b0260baf5c73882e SHA256 78fda62a39e5ebccbd3277d723eb0a0087a6972c6350d987e454f8fa17546341
 DIST ulogd-1.24.tar.bz2 177398 RMD160 e46c886af5bcec96775ec3516ae5a45d77e9bdb9 SHA1 2d767d71a6a96bd40caa0020bbca2ddb09301ae3 SHA256 63a6069d9b537d8a6d6a4d99beeb4ccc0a853717414da3a6e0ce230a34d0e057
-EBUILD ulogd-1.23-r1.ebuild 1466 RMD160 53325181e496b3c041b34abb3dd18803ac891f1a SHA1 e599b4d348a2de860dd99fe51bef97ca1d90a54a SHA256 278e4a6b03186eb0c200778591be20b287c13872f571ed04657f0f27f42ca8f4
-MD5 0a348c7d7ba57d90bac853339cfaaa38 ulogd-1.23-r1.ebuild 1466
-RMD160 53325181e496b3c041b34abb3dd18803ac891f1a ulogd-1.23-r1.ebuild 1466
-SHA256 278e4a6b03186eb0c200778591be20b287c13872f571ed04657f0f27f42ca8f4 ulogd-1.23-r1.ebuild 1466
-EBUILD ulogd-1.24.ebuild 1655 RMD160 88bea4435f3430e2104693b6a4e56363acffa73f SHA1 b88862062505dbc5a6afd3a08d6435aff285e298 SHA256 1410a0f409e95670a16980ccbb509f52a60224bb3d8c98c0748902df2c39be4c
-MD5 8be9679a477ae0ced868e5d1d67c4ac3 ulogd-1.24.ebuild 1655
-RMD160 88bea4435f3430e2104693b6a4e56363acffa73f ulogd-1.24.ebuild 1655
-SHA256 1410a0f409e95670a16980ccbb509f52a60224bb3d8c98c0748902df2c39be4c ulogd-1.24.ebuild 1655
-MISC ChangeLog 5541 RMD160 4fa82fc1370e18d8a14ad132ba3f3d373e7cac3e SHA1 ae816147410c98b93fe238ebce3654c9ab003e57 SHA256 cb06fec55b6913487295bd8bd48ce360d7da0ad956e360e576670f79d71dc35d
-MD5 7181fced7f6489df613f2bf50aa355ac ChangeLog 5541
-RMD160 4fa82fc1370e18d8a14ad132ba3f3d373e7cac3e ChangeLog 5541
-SHA256 cb06fec55b6913487295bd8bd48ce360d7da0ad956e360e576670f79d71dc35d ChangeLog 5541
+EBUILD ulogd-1.23-r1.ebuild 1443 RMD160 547368d78c951fbac919570fd538285ec44e4f3a SHA1 bceca284f62bdefe14b8be0ec6de4502de86f874 SHA256 905fcbc7c061e4e4e3a8862603fd07de23d118e1194986fb922670a9e8505cf8
+MD5 05ad474c3f604cd7020e99ca88f6b2f9 ulogd-1.23-r1.ebuild 1443
+RMD160 547368d78c951fbac919570fd538285ec44e4f3a ulogd-1.23-r1.ebuild 1443
+SHA256 905fcbc7c061e4e4e3a8862603fd07de23d118e1194986fb922670a9e8505cf8 ulogd-1.23-r1.ebuild 1443
+EBUILD ulogd-1.24.ebuild 1632 RMD160 933b4e889403714f28ce4bae59a746ac88ccdf91 SHA1 f4e34dd9ed666697eea8fe42ef81c027566b9f7e SHA256 d37032b700572fbc628ca50ac4baff3c4bc26665ead2621876f87aad68b6f21b
+MD5 8376b32f3f757630961844ca8acfe35d ulogd-1.24.ebuild 1632
+RMD160 933b4e889403714f28ce4bae59a746ac88ccdf91 ulogd-1.24.ebuild 1632
+SHA256 d37032b700572fbc628ca50ac4baff3c4bc26665ead2621876f87aad68b6f21b ulogd-1.24.ebuild 1632
+MISC ChangeLog 5682 RMD160 6b02443c44a5c48aad424ca2c3deec82ce99c0f9 SHA1 29389c5a4041243c1f6f2dfc03ec60fe7acc4539 SHA256 d57b1e6e9362593f5e5853696128fcc7ab61c98123ca95710c972d000d978ac7
+MD5 3b1e684f381a34c15d781e451aba84ec ChangeLog 5682
+RMD160 6b02443c44a5c48aad424ca2c3deec82ce99c0f9 ChangeLog 5682
+SHA256 d57b1e6e9362593f5e5853696128fcc7ab61c98123ca95710c972d000d978ac7 ChangeLog 5682
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
@@ -46,9 +46,9 @@ MD5 070acc4f66d59da70dcf1ba76d96d435 files/digest-ulogd-1.24 235
 RMD160 9c02348c3b699afa07b1c172c1cf3b8f85d6c3c5 files/digest-ulogd-1.24 235
 SHA256 dc1493b9bfc85441932b5d39ccec186432aaba7664253ea6556640c130419f34 files/digest-ulogd-1.24 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFyZhjmdTrptrqvGERAjbpAKCWO1dD5rht9DzWkOVVFGuWGrlZ5gCfT5XG
-oCyyT25o7F59Y/EGh9JA/qk=
-=RLlZ
+iD8DBQFGM3/TV3J2n04EauwRAuY4AJ4lG1GgONYlkwxwR3Q9ykbIY+2H9gCdFMPR
+Ejz11fJwiTmpXtifStL/xoI=
+=XP0y
 -----END PGP SIGNATURE-----