From: Torsten Veller Date: Sat, 28 Apr 2007 22:07:02 +0000 (+0000) Subject: Fix *initd, *confd and *envd calls (#173884, #174266) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d8116e9fd48f2498a6c5f75c3306c7fe90591022;p=gentoo.git Fix *initd, *confd and *envd calls (#173884, #174266) Package-Manager: portage-2.1.2.5 --- diff --git a/dev-db/monetdb/ChangeLog b/dev-db/monetdb/ChangeLog index ca7575282678..7b81d95cdb7a 100644 --- a/dev-db/monetdb/ChangeLog +++ b/dev-db/monetdb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/monetdb # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/ChangeLog,v 1.13 2007/02/11 14:12:38 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/ChangeLog,v 1.14 2007/04/28 22:07:02 tove Exp $ + + 28 Apr 2007; Torsten Veller monetdb-4.10.2.ebuild, + monetdb-4.12.0.ebuild: + Fix *initd, *confd and *envd calls (#173884, #174266) 11 Feb 2007; Fabian Groffen -files/monetdb-4.10.0-darwin.patch, diff --git a/dev-db/monetdb/monetdb-4.10.2.ebuild b/dev-db/monetdb/monetdb-4.10.2.ebuild index 2cc35a713f0f..ba75cc844d29 100644 --- a/dev-db/monetdb/monetdb-4.10.2.ebuild +++ b/dev-db/monetdb/monetdb-4.10.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/dev-db/monetdb/monetdb-4.10.2.ebuild,v 1.8 2007/02/11 14:12:38 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/monetdb-4.10.2.ebuild,v 1.9 2007/04/28 22:07:02 tove Exp $ inherit flag-o-matic eutils @@ -152,11 +152,8 @@ src_install() { cd "${WORKDIR}/pathfinder-${PV_XQ}" emake -j1 DESTDIR="${D}" install || die "failed to install xquery" - exeinto /etc/init.d/ - newexe "${FILESDIR}/${PN}.init-4.8.2" monetdb || die "init.d script" - - insinto /etc/conf.d/ - newins "${FILESDIR}/${PN}.conf-4.8.2" monetdb || die "conf.d file" + newinitd "${FILESDIR}/${PN}.init-4.8.2" monetdb || die "init.d script" + newconfd "${FILESDIR}/${PN}.conf-4.8.2" monetdb || die "conf.d file" diropts -m750 dodir "${DATA_DIR}" "/var/log/${PN}" diff --git a/dev-db/monetdb/monetdb-4.12.0.ebuild b/dev-db/monetdb/monetdb-4.12.0.ebuild index 9497570a6b5e..9a07524ca677 100644 --- a/dev-db/monetdb/monetdb-4.12.0.ebuild +++ b/dev-db/monetdb/monetdb-4.12.0.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/dev-db/monetdb/monetdb-4.12.0.ebuild,v 1.4 2007/02/11 14:12:38 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/monetdb-4.12.0.ebuild,v 1.5 2007/04/28 22:07:02 tove Exp $ inherit flag-o-matic eutils @@ -152,11 +152,8 @@ src_install() { cd "${WORKDIR}/pathfinder-${PV_XQ}" emake -j1 DESTDIR="${D}" install || die "failed to install xquery" - exeinto /etc/init.d/ - newexe "${FILESDIR}/${PN}.init-4.8.2" monetdb || die "init.d script" - - insinto /etc/conf.d/ - newins "${FILESDIR}/${PN}.conf-4.8.2" monetdb || die "conf.d file" + newinitd "${FILESDIR}/${PN}.init-4.8.2" monetdb || die "init.d script" + newconfd "${FILESDIR}/${PN}.conf-4.8.2" monetdb || die "conf.d file" diropts -m750 dodir "${DATA_DIR}" "/var/log/${PN}" diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog index 6dd36f5222b2..c2af7782749c 100644 --- a/dev-db/postgresql/ChangeLog +++ b/dev-db/postgresql/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/postgresql # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.330 2007/03/04 11:14:50 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.331 2007/04/28 22:04:20 tove Exp $ + + 28 Apr 2007; Torsten Veller postgresql-7.3.15-r1.ebuild, + postgresql-7.4.13.ebuild, postgresql-8.0.8.ebuild: + Fix *initd, *confd and *envd calls (#173884, #174266) 04 Mar 2007; Simon Stelling postgresql-7.4.16.ebuild, postgresql-8.0.12.ebuild: diff --git a/dev-db/postgresql/postgresql-7.3.15-r1.ebuild b/dev-db/postgresql/postgresql-7.3.15-r1.ebuild index 25c0e5cf2aea..3cb3c86367e2 100644 --- a/dev-db/postgresql/postgresql-7.3.15-r1.ebuild +++ b/dev-db/postgresql/postgresql-7.3.15-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/dev-db/postgresql/postgresql-7.3.15-r1.ebuild,v 1.12 2006/11/09 18:35:25 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.15-r1.ebuild,v 1.13 2007/04/28 22:04:20 tove Exp $ inherit eutils gnuconfig flag-o-matic java-pkg multilib @@ -172,11 +172,8 @@ src_install() { fi cd ${S} - exeinto /etc/init.d/ - newexe "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die - - insinto /etc/conf.d/ - newins "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die + newinitd "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die + newconfd "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die keepdir /var/lib/postgresql } diff --git a/dev-db/postgresql/postgresql-7.4.13.ebuild b/dev-db/postgresql/postgresql-7.4.13.ebuild index 2d670da7e254..4ceb6cab589d 100644 --- a/dev-db/postgresql/postgresql-7.4.13.ebuild +++ b/dev-db/postgresql/postgresql-7.4.13.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/dev-db/postgresql/postgresql-7.4.13.ebuild,v 1.13 2006/11/09 18:35:25 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.13.ebuild,v 1.14 2007/04/28 22:04:20 tove Exp $ inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs @@ -201,14 +201,12 @@ src_install() { fi cd ${S} - exeinto /etc/init.d/ - newexe "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die - newexe "${FILESDIR}/pg_autovacuum.init-${PV%.*}" pg_autovacuum || die + newinitd "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die + newinitd "${FILESDIR}/pg_autovacuum.init-${PV%.*}" pg_autovacuum || die dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum - insinto /etc/conf.d/ - newins "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die - newins "${FILESDIR}/pg_autovacuum.conf-${PV%.*}" pg_autovacuum || die + newconfd "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die + newconfd "${FILESDIR}/pg_autovacuum.conf-${PV%.*}" pg_autovacuum || die } pkg_postinst() { diff --git a/dev-db/postgresql/postgresql-8.0.8.ebuild b/dev-db/postgresql/postgresql-8.0.8.ebuild index 6c58ae6029f8..f3bd51c43792 100644 --- a/dev-db/postgresql/postgresql-8.0.8.ebuild +++ b/dev-db/postgresql/postgresql-8.0.8.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/dev-db/postgresql/postgresql-8.0.8.ebuild,v 1.13 2006/11/09 18:35:25 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.8.ebuild,v 1.14 2007/04/28 22:04:20 tove Exp $ inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs @@ -156,14 +156,12 @@ src_install() { fi cd ${S} - exeinto /etc/init.d/ - newexe "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die - newexe "${FILESDIR}/pg_autovacuum.init-${PV%.*}" pg_autovacuum || die + newinitd "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die + newinitd "${FILESDIR}/pg_autovacuum.init-${PV%.*}" pg_autovacuum || die dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum - insinto /etc/conf.d/ - newins "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die - newins "${FILESDIR}/pg_autovacuum.conf-${PV%.*}" pg_autovacuum || die + newconfd "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die + newconfd "${FILESDIR}/pg_autovacuum.conf-${PV%.*}" pg_autovacuum || die rm ${D}/usr/include/postgres_ext.h }