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

Package-Manager: portage-2.1.2.5

2 files changed, 19 insertions, 17 deletions

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