From b7c2306139bb5766cfa66c2523ed66e7abf47820 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sat, 28 Apr 2007 17:29:39 +0000 Subject: [PATCH] Fix *initd, *confd and *envd calls (#173884, #174266) Package-Manager: portage-2.1.2.5 --- www-servers/aolserver/ChangeLog | 7 +++++-- www-servers/aolserver/aolserver-4.0.10.ebuild | 7 +++---- www-servers/boa/ChangeLog | 5 ++++- www-servers/boa/boa-0.94.13-r1.ebuild | 8 +++----- www-servers/jboss/ChangeLog | 6 +++++- www-servers/jboss/jboss-3.2.3.ebuild | 7 +++---- www-servers/jboss/jboss-3.2.5.ebuild | 7 +++---- www-servers/plb/ChangeLog | 7 +++++-- www-servers/plb/plb-0.3.ebuild | 7 +++---- www-servers/skunkweb/ChangeLog | 6 +++++- www-servers/skunkweb/skunkweb-3.4.0-r1.ebuild | 7 +++---- www-servers/skunkweb/skunkweb-3.4.1.ebuild | 7 +++---- www-servers/skunkweb/skunkweb-3.4.3.ebuild | 7 +++---- 13 files changed, 48 insertions(+), 40 deletions(-) diff --git a/www-servers/aolserver/ChangeLog b/www-servers/aolserver/ChangeLog index 7d0f0ac6af35..3cab57253ed3 100644 --- a/www-servers/aolserver/ChangeLog +++ b/www-servers/aolserver/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-servers/aolserver -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/aolserver/ChangeLog,v 1.12 2006/12/27 04:19:48 dirtyepic Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/aolserver/ChangeLog,v 1.13 2007/04/28 17:27:59 swegener Exp $ + + 28 Apr 2007; Sven Wegener aolserver-4.0.10.ebuild: + Fix *initd, *confd and *envd calls (#173884, #174266) 27 Dec 2006; Ryan Hill -files/4.0.9/Makefile.global, -files/4.0.9/aolserver.init, diff --git a/www-servers/aolserver/aolserver-4.0.10.ebuild b/www-servers/aolserver/aolserver-4.0.10.ebuild index 4c0e3099fbc8..304e6f613874 100644 --- a/www-servers/aolserver/aolserver-4.0.10.ebuild +++ b/www-servers/aolserver/aolserver-4.0.10.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/www-servers/aolserver/aolserver-4.0.10.ebuild,v 1.7 2006/12/27 04:19:48 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/aolserver/aolserver-4.0.10.ebuild,v 1.8 2007/04/28 17:27:59 swegener Exp $ inherit eutils @@ -185,8 +185,7 @@ src_install () { insinto ${ns_etc} newins ${FILESDIR}/${PV}/config.tcl aolserver.tcl - exeinto /etc/init.d - newexe ${FILESDIR}/${PV}/aolserver.init aolserver + newinitd ${FILESDIR}/${PV}/aolserver.init aolserver chmod 750 ${D}/etc/init.d/aolserver } diff --git a/www-servers/boa/ChangeLog b/www-servers/boa/ChangeLog index 9157c7e755c4..f052b999a869 100644 --- a/www-servers/boa/ChangeLog +++ b/www-servers/boa/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-servers/boa # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/boa/ChangeLog,v 1.10 2007/04/24 13:29:49 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/boa/ChangeLog,v 1.11 2007/04/28 17:28:19 swegener Exp $ + + 28 Apr 2007; Sven Wegener boa-0.94.13-r1.ebuild: + Fix *initd, *confd and *envd calls (#173884, #174266) 24 Apr 2007; Thilo Bangert boa-0.94.13.ebuild, boa-0.94.14_alpha20.ebuild: diff --git a/www-servers/boa/boa-0.94.13-r1.ebuild b/www-servers/boa/boa-0.94.13-r1.ebuild index aa371d54b19c..2a815c2ab6e5 100644 --- a/www-servers/boa/boa-0.94.13-r1.ebuild +++ b/www-servers/boa/boa-0.94.13-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/www-servers/boa/boa-0.94.13-r1.ebuild,v 1.5 2007/03/13 14:44:14 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/boa/boa-0.94.13-r1.ebuild,v 1.6 2007/04/28 17:28:19 swegener Exp $ inherit eutils @@ -54,14 +54,12 @@ src_install() { dodir /var/www/localhost/cgi-bin || die dodir /var/www/localhost/icons || die - insinto /etc/conf.d - doins ${FILESDIR}/boa.conf.d + doconfd ${FILESDIR}/boa.conf.d exeinto /usr/lib/boa doexe src/boa_indexer || die - exeinto /etc/init.d - newexe ${FILESDIR}/boa.rc6 boa || die + newinitd ${FILESDIR}/boa.rc6 boa || die insinto /etc/boa insopts -m700 diff --git a/www-servers/jboss/ChangeLog b/www-servers/jboss/ChangeLog index 3e0b57614292..63d4ca2434d9 100644 --- a/www-servers/jboss/ChangeLog +++ b/www-servers/jboss/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/jboss # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/jboss/ChangeLog,v 1.17 2007/03/19 11:49:03 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/jboss/ChangeLog,v 1.18 2007/04/28 17:28:43 swegener Exp $ + + 28 Apr 2007; Sven Wegener jboss-3.2.3.ebuild, + jboss-3.2.5.ebuild: + Fix *initd, *confd and *envd calls (#173884, #174266) 19 Mar 2007; Bryan Østergaard metadata.xml: Remove mkennedy from metadata.xml due to retirement. diff --git a/www-servers/jboss/jboss-3.2.3.ebuild b/www-servers/jboss/jboss-3.2.3.ebuild index 181f22b821de..51e3e7d940c6 100644 --- a/www-servers/jboss/jboss-3.2.3.ebuild +++ b/www-servers/jboss/jboss-3.2.3.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/www-servers/jboss/jboss-3.2.3.ebuild,v 1.7 2006/10/05 14:54:34 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/jboss/jboss-3.2.3.ebuild,v 1.8 2007/04/28 17:28:43 swegener Exp $ inherit eutils java-pkg @@ -46,8 +46,7 @@ src_install() { cp build/output/${P}/bin/${f} ${D}/${INSTALL_DIR}/bin done - exeinto /etc/init.d - doexe ${FILESDIR}/${PV}/init.d/jboss + doinitd ${FILESDIR}/${PV}/init.d/jboss dodir /etc/conf.d cp ${FILESDIR}/${PV}/conf.d/jboss ${D}/etc/conf.d dodir /etc/env.d diff --git a/www-servers/jboss/jboss-3.2.5.ebuild b/www-servers/jboss/jboss-3.2.5.ebuild index 5082f6bd2257..d20e3f2e6180 100644 --- a/www-servers/jboss/jboss-3.2.5.ebuild +++ b/www-servers/jboss/jboss-3.2.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/www-servers/jboss/jboss-3.2.5.ebuild,v 1.12 2006/10/05 14:54:34 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/jboss/jboss-3.2.5.ebuild,v 1.13 2007/04/28 17:28:43 swegener Exp $ inherit eutils java-pkg @@ -41,8 +41,7 @@ src_install() { cp build/output/${P}/bin/${f} ${D}/${INSTALL_DIR}/bin || die "failed" done - exeinto /etc/init.d - doexe ${FILESDIR}/${PV}/init.d/jboss + doinitd ${FILESDIR}/${PV}/init.d/jboss dodir /etc/conf.d cp ${FILESDIR}/${PV}/conf.d/jboss ${D}/etc/conf.d dodir /etc/env.d diff --git a/www-servers/plb/ChangeLog b/www-servers/plb/ChangeLog index e7e48fb0f0e4..7df9c1374d1c 100644 --- a/www-servers/plb/ChangeLog +++ b/www-servers/plb/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-servers/plb -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/plb/ChangeLog,v 1.4 2004/12/29 01:55:11 ciaranm Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/plb/ChangeLog,v 1.5 2007/04/28 17:29:15 swegener Exp $ + + 28 Apr 2007; Sven Wegener plb-0.3.ebuild: + Fix *initd, *confd and *envd calls (#173884, #174266) 29 Dec 2004; Ciaran McCreesh : Change encoding to UTF-8 for GLEP 31 compliance diff --git a/www-servers/plb/plb-0.3.ebuild b/www-servers/plb/plb-0.3.ebuild index e5952c238115..8dd2c8aad8ad 100644 --- a/www-servers/plb/plb-0.3.ebuild +++ b/www-servers/plb/plb-0.3.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/www-servers/plb/plb-0.3.ebuild,v 1.3 2006/10/13 21:25:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/plb/plb-0.3.ebuild,v 1.4 2007/04/28 17:29:15 swegener Exp $ DESCRIPTION="A free high-performance HTTP load balancer" HOMEPAGE="http://plb.sunsite.dk/" @@ -20,8 +20,7 @@ src_install() { insinto /etc/ doins ${FILESDIR}/plb.conf - exeinto /etc/init.d - newexe ${FILESDIR}/plb.rc6 plb + newinitd ${FILESDIR}/plb.rc6 plb } pkg_postinst() { diff --git a/www-servers/skunkweb/ChangeLog b/www-servers/skunkweb/ChangeLog index be759d7508e7..044edd0bf6b4 100644 --- a/www-servers/skunkweb/ChangeLog +++ b/www-servers/skunkweb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/skunkweb # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/ChangeLog,v 1.15 2007/02/22 00:28:53 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/ChangeLog,v 1.16 2007/04/28 17:29:39 swegener Exp $ + + 28 Apr 2007; Sven Wegener skunkweb-3.4.0-r1.ebuild, + skunkweb-3.4.1.ebuild, skunkweb-3.4.3.ebuild: + Fix *initd, *confd and *envd calls (#173884, #174266) 22 Feb 2007; Markus Ullmann ChangeLog: Redigest for Manifest2 diff --git a/www-servers/skunkweb/skunkweb-3.4.0-r1.ebuild b/www-servers/skunkweb/skunkweb-3.4.0-r1.ebuild index 3111f4843456..e0c0086d26bf 100644 --- a/www-servers/skunkweb/skunkweb-3.4.0-r1.ebuild +++ b/www-servers/skunkweb/skunkweb-3.4.0-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/www-servers/skunkweb/skunkweb-3.4.0-r1.ebuild,v 1.6 2006/06/04 19:10:13 vericgar Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.0-r1.ebuild,v 1.7 2007/04/28 17:29:39 swegener Exp $ inherit eutils apache-module @@ -64,8 +64,7 @@ src_install() { keepdir /var/lib/${PN}/run chown -R skunkweb:skunkweb ${D}/var/{lib,log}/${PN} # scripts------------------------------------------------------------ - exeinto /etc/init.d - newexe ${FILESDIR}/skunkweb-init skunkweb + newinitd ${FILESDIR}/skunkweb-init skunkweb exeinto /etc/cron.daily newexe ${FILESDIR}/skunkweb-cron-cache_cleaner skunkweb-cache_cleaner # docs -------------------------------------------------------------- diff --git a/www-servers/skunkweb/skunkweb-3.4.1.ebuild b/www-servers/skunkweb/skunkweb-3.4.1.ebuild index 1e736652e162..0b8d0f260758 100644 --- a/www-servers/skunkweb/skunkweb-3.4.1.ebuild +++ b/www-servers/skunkweb/skunkweb-3.4.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/www-servers/skunkweb/skunkweb-3.4.1.ebuild,v 1.2 2006/06/04 19:10:13 vericgar Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.1.ebuild,v 1.3 2007/04/28 17:29:39 swegener Exp $ inherit eutils apache-module @@ -64,8 +64,7 @@ src_install() { keepdir /var/lib/${PN}/run chown -R skunkweb:skunkweb ${D}/var/{lib,log}/${PN} # scripts------------------------------------------------------------ - exeinto /etc/init.d - newexe ${FILESDIR}/skunkweb-init skunkweb + newinitd ${FILESDIR}/skunkweb-init skunkweb exeinto /etc/cron.daily newexe ${FILESDIR}/skunkweb-cron-cache_cleaner skunkweb-cache_cleaner # docs -------------------------------------------------------------- diff --git a/www-servers/skunkweb/skunkweb-3.4.3.ebuild b/www-servers/skunkweb/skunkweb-3.4.3.ebuild index 51889e15b2b1..2a2fb82b11fe 100644 --- a/www-servers/skunkweb/skunkweb-3.4.3.ebuild +++ b/www-servers/skunkweb/skunkweb-3.4.3.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/www-servers/skunkweb/skunkweb-3.4.3.ebuild,v 1.3 2006/10/16 19:49:13 malc Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/skunkweb/skunkweb-3.4.3.ebuild,v 1.4 2007/04/28 17:29:39 swegener Exp $ inherit eutils apache-module @@ -64,8 +64,7 @@ src_install() { keepdir /var/lib/${PN}/run chown -R skunkweb:skunkweb ${D}/var/{lib,log}/${PN} # scripts------------------------------------------------------------ - exeinto /etc/init.d - newexe ${FILESDIR}/skunkweb-init skunkweb + newinitd ${FILESDIR}/skunkweb-init skunkweb exeinto /etc/cron.daily newexe ${FILESDIR}/skunkweb-cron-cache_cleaner skunkweb-cache_cleaner # docs -------------------------------------------------------------- -- 2.26.2