diff options
| author |   Martin Holzer <mholzer@gentoo.org> | 2004-03-02 16:59:31 +0000 |
|---|---|---|
| committer | Martin Holzer <mholzer@gentoo.org> | 2004-03-02 16:59:31 +0000 |
| commit | 621cc47a2131f9471920797434400d4813997d76 (patch) | |
| tree | 279648edd7d17e77221f668db46a82049ecb45ca /net-www/tikiwiki | |
| parent | adding initial s390 support (diff) | |
| download | gentoo-2-621cc47a2131f9471920797434400d4813997d76.tar.gz gentoo-2-621cc47a2131f9471920797434400d4813997d76.tar.bz2 gentoo-2-621cc47a2131f9471920797434400d4813997d76.zip | |
moving webapp-detect inside functions.
Diffstat (limited to 'net-www/tikiwiki')
| -rw-r--r-- | net-www/tikiwiki/ChangeLog | 6 | ||||
| -rw-r--r-- | net-www/tikiwiki/tikiwiki-1.7.4.ebuild | 8 | ||||
| -rw-r--r-- | net-www/tikiwiki/tikiwiki-1.7.5.ebuild | 6 |
3 files changed, 12 insertions, 8 deletions
diff --git a/net-www/tikiwiki/ChangeLog b/net-www/tikiwiki/ChangeLog index c234cb9c0f4c..3573b065b5ff 100644 --- a/net-www/tikiwiki/ChangeLog +++ b/net-www/tikiwiki/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-www/tikiwiki # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/tikiwiki/ChangeLog,v 1.2 2004/01/27 21:54:39 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/tikiwiki/ChangeLog,v 1.3 2004/03/02 16:59:31 mholzer Exp $ + + 02 Mar 2004; Martin Holzer <mholzer@gentoo.org> tikiwiki-1.7.4.ebuild, + tikiwiki-1.7.5.ebuild: + moving webapp-detect inside functions. *tikiwiki-1.7.5 (27 Jan 2004) diff --git a/net-www/tikiwiki/tikiwiki-1.7.4.ebuild b/net-www/tikiwiki/tikiwiki-1.7.4.ebuild index 7412d54dc090..aa2da19796ef 100644 --- a/net-www/tikiwiki/tikiwiki-1.7.4.ebuild +++ b/net-www/tikiwiki/tikiwiki-1.7.4.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/net-www/tikiwiki/tikiwiki-1.7.4.ebuild,v 1.2 2004/01/27 23:19:42 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/tikiwiki/tikiwiki-1.7.4.ebuild,v 1.3 2004/03/02 16:59:31 mholzer Exp $ inherit webapp-apache @@ -17,9 +17,8 @@ RDEPEND="virtual/php media-gfx/graphviz dev-db/mysql" -webapp-detect || NO_WEBSERVER=1 - pkg_setup() { + webapp-detect || NO_WEBSERVER=1 webapp-pkg_setup "${NO_WEBSERVER}" einfo "Installing for ${WEBAPP_SERVER}" } @@ -31,6 +30,7 @@ src_unpack() { src_install() { + webapp-detect || NO_WEBSERVER=1 webapp-mkdirs local DocumentRoot=${HTTPD_ROOT} diff --git a/net-www/tikiwiki/tikiwiki-1.7.5.ebuild b/net-www/tikiwiki/tikiwiki-1.7.5.ebuild index 6c69f59b009e..6a671d393030 100644 --- a/net-www/tikiwiki/tikiwiki-1.7.5.ebuild +++ b/net-www/tikiwiki/tikiwiki-1.7.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/tikiwiki/tikiwiki-1.7.5.ebuild,v 1.2 2004/01/27 23:19:42 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/tikiwiki/tikiwiki-1.7.5.ebuild,v 1.3 2004/03/02 16:59:31 mholzer Exp $ inherit webapp-apache @@ -17,9 +17,8 @@ RDEPEND="virtual/php media-gfx/graphviz dev-db/mysql" -webapp-detect || NO_WEBSERVER=1 - pkg_setup() { + webapp-detect || NO_WEBSERVER=1 webapp-pkg_setup "${NO_WEBSERVER}" einfo "Installing for ${WEBAPP_SERVER}" } @@ -31,6 +30,7 @@ src_unpack() { src_install() { + webapp-detect || NO_WEBSERVER=1 webapp-mkdirs local DocumentRoot=${HTTPD_ROOT} |