diff options
| author |   Martin Holzer <mholzer@gentoo.org> | 2004-03-03 10:57:51 +0000 |
|---|---|---|
| committer | Martin Holzer <mholzer@gentoo.org> | 2004-03-03 10:57:51 +0000 |
| commit | fbc951a2288e8aff00cce02465f178233e00426d (patch) | |
| tree | 4f5e463a5df3177c1caaf764001df6a0c7fa4134 /dev-db | |
| parent | Version bumpe.d (Manifest recommit) (diff) | |
| download | gentoo-2-fbc951a2288e8aff00cce02465f178233e00426d.tar.gz gentoo-2-fbc951a2288e8aff00cce02465f178233e00426d.tar.bz2 gentoo-2-fbc951a2288e8aff00cce02465f178233e00426d.zip | |
moving webapp-detect into functions
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/phppgadmin/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-db/phppgadmin/phppgadmin-3.1.ebuild | 11 | ||||
| -rw-r--r-- | dev-db/phppgadmin/phppgadmin-3.2.1.ebuild | 11 |
3 files changed, 16 insertions, 14 deletions
diff --git a/dev-db/phppgadmin/ChangeLog b/dev-db/phppgadmin/ChangeLog index 1a9669f1f9c1..8e0be00b9b10 100644 --- a/dev-db/phppgadmin/ChangeLog +++ b/dev-db/phppgadmin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/phppgadmin -# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/ChangeLog,v 1.16 2004/03/02 11:28:27 aliz Exp $ +# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/ChangeLog,v 1.17 2004/03/03 10:57:51 mholzer Exp $ + + 03 Mar 2004; Martin Holzer <mholzer@gentoo.org> phppgadmin-3.1.ebuild, + phppgadmin-3.2.1.ebuild: + moving webapp-detect into functions *phppgadmin-3.2 (22 Dec 2003) *phppgadmin-3.2.1 (22 Dec 2003) diff --git a/dev-db/phppgadmin/phppgadmin-3.1.ebuild b/dev-db/phppgadmin/phppgadmin-3.1.ebuild index b9ec724c2349..e94046b8080c 100644 --- a/dev-db/phppgadmin/phppgadmin-3.1.ebuild +++ b/dev-db/phppgadmin/phppgadmin-3.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/phppgadmin-3.1.ebuild,v 1.4 2003/12/15 20:16:35 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/phppgadmin-3.1.ebuild,v 1.5 2004/03/03 10:57:51 mholzer Exp $ inherit eutils inherit webapp-apache @@ -24,12 +24,10 @@ SLOT="0" DEPEND=">=dev-db/postgresql-7.0.0 >=dev-php/mod_php-4.1" -webapp-detect || NO_WEBSERVER=1 - pkg_setup() { - echo "${NO_WEBSERVER}" + webapp-detect || NO_WEBSERVER=1 webapp-pkg_setup "${NO_WEBSERVER}" - einfo "Installing into ${D}${HTTPD_ROOT}." + einfo "Installing into ${ROOT}${HTTPD_ROOT}." } src_compile() { @@ -42,6 +40,7 @@ src_compile() { } src_install() { + webapp-detect || NO_WEBSERVER=1 webapp-mkdirs for doc in DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS \ diff --git a/dev-db/phppgadmin/phppgadmin-3.2.1.ebuild b/dev-db/phppgadmin/phppgadmin-3.2.1.ebuild index e2bda0c78f9d..72513087ae5e 100644 --- a/dev-db/phppgadmin/phppgadmin-3.2.1.ebuild +++ b/dev-db/phppgadmin/phppgadmin-3.2.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/phppgadmin-3.2.1.ebuild,v 1.1 2003/12/22 02:16:17 nakano Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/phppgadmin-3.2.1.ebuild,v 1.2 2004/03/03 10:57:51 mholzer Exp $ inherit eutils inherit webapp-apache @@ -24,12 +24,10 @@ SLOT="0" DEPEND=">=dev-db/postgresql-7.0.0 >=dev-php/mod_php-4.1" -webapp-detect || NO_WEBSERVER=1 - pkg_setup() { - echo "${NO_WEBSERVER}" + webapp-detect || NO_WEBSERVER=1 webapp-pkg_setup "${NO_WEBSERVER}" - einfo "Installing into ${D}${HTTPD_ROOT}." + einfo "Installing into ${ROOT}${HTTPD_ROOT}." } src_compile() { @@ -42,6 +40,7 @@ src_compile() { } src_install() { + webapp-detect || NO_WEBSERVER=1 webapp-mkdirs for doc in DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS \ |