From cc8869e8522dec081b49bda90d04be40e339dee5 Mon Sep 17 00:00:00 2001 From: Wulf Krueger Date: Sat, 21 Apr 2007 23:05:01 +0000 Subject: [PATCH] Use doinitd instead of other methods. Package-Manager: portage-2.1.2.4 --- kde-base/kdenetwork/ChangeLog | 7 ++++++- kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild | 5 ++--- kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild | 5 ++--- kde-base/kdenetwork/kdenetwork-3.5.6.ebuild | 5 ++--- kde-base/lisa/ChangeLog | 6 +++++- kde-base/lisa/lisa-3.5.5.ebuild | 9 ++++----- kde-base/lisa/lisa-3.5.6.ebuild | 9 ++++----- 7 files changed, 25 insertions(+), 21 deletions(-) diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog index a81851cfad14..c916bf0b2a55 100644 --- a/kde-base/kdenetwork/ChangeLog +++ b/kde-base/kdenetwork/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdenetwork # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.254 2007/04/21 22:35:06 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.255 2007/04/21 23:03:46 philantrop Exp $ + + 21 Apr 2007; Wulf C. Krueger + kdenetwork-3.5.5-r1.ebuild, kdenetwork-3.5.5-r2.ebuild, + kdenetwork-3.5.6.ebuild: + Use doinitd instead of other methods. 21 Apr 2007; Wulf C. Krueger kdenetwork-3.5.5-r1.ebuild, kdenetwork-3.5.5-r2.ebuild, diff --git a/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild index e836f2a4de38..31bf813eb363 100644 --- a/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild +++ b/kde-base/kdenetwork/kdenetwork-3.5.5-r1.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/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild,v 1.15 2007/04/21 22:35:06 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild,v 1.16 2007/04/21 23:03:46 philantrop Exp $ inherit kde-dist eutils flag-o-matic @@ -80,8 +80,7 @@ src_install() { # lisa, reslisa initscripts sed -e "s:_KDEDIR_:${KDEDIR}:g" "${WORKDIR}/patches/lisa" > "${T}/lisa" sed -e "s:_KDEDIR_:${KDEDIR}:g" "${WORKDIR}/patches/reslisa" > "${T}/reslisa" - exeinto /etc/init.d - doexe "${T}/lisa" "${T}/reslisa" + doinitd "${T}/lisa" "${T}/reslisa" newconfd "${WORKDIR}/patches/lisa.conf" lisa newconfd "${WORKDIR}/patches/reslisa.conf" reslisa diff --git a/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild index 439cfcc5bc5f..30b884fb1350 100644 --- a/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild +++ b/kde-base/kdenetwork/kdenetwork-3.5.5-r2.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/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild,v 1.11 2007/04/21 22:35:06 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.5-r2.ebuild,v 1.12 2007/04/21 23:03:46 philantrop Exp $ inherit kde-dist eutils flag-o-matic @@ -80,8 +80,7 @@ src_install() { # lisa, reslisa initscripts sed -e "s:_KDEDIR_:${KDEDIR}:g" "${WORKDIR}/patches/lisa" > "${T}/lisa" sed -e "s:_KDEDIR_:${KDEDIR}:g" "${WORKDIR}/patches/reslisa" > "${T}/reslisa" - exeinto /etc/init.d - doexe "${T}/lisa" "${T}/reslisa" + doinitd "${T}/lisa" "${T}/reslisa" newconfd "${WORKDIR}/patches/lisa.conf" lisa newconfd "${WORKDIR}/patches/reslisa.conf" reslisa diff --git a/kde-base/kdenetwork/kdenetwork-3.5.6.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.6.ebuild index 33a7377102f7..a6defc45d25b 100644 --- a/kde-base/kdenetwork/kdenetwork-3.5.6.ebuild +++ b/kde-base/kdenetwork/kdenetwork-3.5.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/kde-base/kdenetwork/kdenetwork-3.5.6.ebuild,v 1.7 2007/04/21 22:35:06 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.6.ebuild,v 1.8 2007/04/21 23:03:46 philantrop Exp $ inherit kde-dist eutils flag-o-matic @@ -81,8 +81,7 @@ src_install() { # lisa, reslisa initscripts sed -e "s:_KDEDIR_:${KDEDIR}:g" "${WORKDIR}/patches/lisa" > "${T}/lisa" sed -e "s:_KDEDIR_:${KDEDIR}:g" "${WORKDIR}/patches/reslisa" > "${T}/reslisa" - exeinto /etc/init.d - doexe "${T}/lisa" "${T}/reslisa" + doinitd "${T}/lisa" "${T}/reslisa" newconfd "${WORKDIR}/patches/lisa.conf" lisa newconfd "${WORKDIR}/patches/reslisa.conf" reslisa diff --git a/kde-base/lisa/ChangeLog b/kde-base/lisa/ChangeLog index 65b8c7ceba09..6b8c6790ef48 100644 --- a/kde-base/lisa/ChangeLog +++ b/kde-base/lisa/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/lisa # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/ChangeLog,v 1.66 2007/04/21 22:06:56 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/ChangeLog,v 1.67 2007/04/21 23:05:01 philantrop Exp $ + + 21 Apr 2007; Wulf C. Krueger lisa-3.5.5.ebuild, + lisa-3.5.6.ebuild: + Use doinitd instead of other methods. 21 Apr 2007; Wulf C. Krueger lisa-3.5.5.ebuild, lisa-3.5.6.ebuild: diff --git a/kde-base/lisa/lisa-3.5.5.ebuild b/kde-base/lisa/lisa-3.5.5.ebuild index 9fa1ecaf9a57..b159e1d123c2 100644 --- a/kde-base/lisa/lisa-3.5.5.ebuild +++ b/kde-base/lisa/lisa-3.5.5.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/kde-base/lisa/lisa-3.5.5.ebuild,v 1.10 2007/04/21 22:06:56 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/lisa-3.5.5.ebuild,v 1.11 2007/04/21 23:05:01 philantrop Exp $ KMNAME=kdenetwork KMMODULE=lanbrowsing @@ -27,10 +27,9 @@ src_install() { chmod u+s ${D}/${KDEDIR}/bin/reslisa # lisa, reslisa initscripts - dodir /etc/init.d - sed -e "s:_KDEDIR_:${KDEDIR}:g" ${WORKDIR}/patches/lisa > ${D}/etc/init.d/lisa - sed -e "s:_KDEDIR_:${KDEDIR}:g" ${WORKDIR}/patches/reslisa > ${D}/etc/init.d/reslisa - chmod +x ${D}/etc/init.d/* + sed -e "s:_KDEDIR_:${KDEDIR}:g" ${WORKDIR}/patches/lisa > ${T}/lisa + sed -e "s:_KDEDIR_:${KDEDIR}:g" ${WORKDIR}/patches/reslisa > ${T}/reslisa + doinitd "${T}/lisa" "${T}/reslisa" newconfd ${WORKDIR}/patches/lisa.conf lisa newconfd ${WORKDIR}/patches/reslisa.conf reslisa diff --git a/kde-base/lisa/lisa-3.5.6.ebuild b/kde-base/lisa/lisa-3.5.6.ebuild index 1824d9df4148..cbc2991fb17b 100644 --- a/kde-base/lisa/lisa-3.5.6.ebuild +++ b/kde-base/lisa/lisa-3.5.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/kde-base/lisa/lisa-3.5.6.ebuild,v 1.2 2007/04/21 22:06:56 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/lisa-3.5.6.ebuild,v 1.3 2007/04/21 23:05:01 philantrop Exp $ KMNAME=kdenetwork KMMODULE=lanbrowsing @@ -27,10 +27,9 @@ src_install() { chmod u+s ${D}/${KDEDIR}/bin/reslisa # lisa, reslisa initscripts - dodir /etc/init.d - sed -e "s:_KDEDIR_:${KDEDIR}:g" ${WORKDIR}/patches/lisa > ${D}/etc/init.d/lisa - sed -e "s:_KDEDIR_:${KDEDIR}:g" ${WORKDIR}/patches/reslisa > ${D}/etc/init.d/reslisa - chmod +x ${D}/etc/init.d/* + sed -e "s:_KDEDIR_:${KDEDIR}:g" ${WORKDIR}/patches/lisa > ${T}/lisa + sed -e "s:_KDEDIR_:${KDEDIR}:g" ${WORKDIR}/patches/reslisa > ${T}/reslisa + doinitd "${T}/lisa" "${T}/reslisa" newconfd ${WORKDIR}/patches/lisa.conf lisa newconfd ${WORKDIR}/patches/reslisa.conf reslisa -- 2.26.2