diff options
author | Martin Holzer <mholzer@gentoo.org> | 2004-04-21 19:01:43 +0000 |
---|---|---|
committer | Martin Holzer <mholzer@gentoo.org> | 2004-04-21 19:01:43 +0000 |
commit | ca96ab82da4a1ce4795758f98c6a0864cd7754c1 (patch) | |
tree | 851364da8b73b1f69c03690ade0d9ee05681494e /net-www/moinmoin | |
parent | moving webapp-detect into pkg_setup. closes 44780 and 48380. (Manifest recommit) (diff) | |
download | gentoo-2-ca96ab82da4a1ce4795758f98c6a0864cd7754c1.tar.gz gentoo-2-ca96ab82da4a1ce4795758f98c6a0864cd7754c1.tar.bz2 gentoo-2-ca96ab82da4a1ce4795758f98c6a0864cd7754c1.zip |
moving webapp-detect into pkg_setup. closes 48356
Diffstat (limited to 'net-www/moinmoin')
-rw-r--r-- | net-www/moinmoin/ChangeLog | 6 | ||||
-rw-r--r-- | net-www/moinmoin/moinmoin-1.0.ebuild | 5 | ||||
-rw-r--r-- | net-www/moinmoin/moinmoin-1.2.1.ebuild | 7 |
3 files changed, 8 insertions, 10 deletions
diff --git a/net-www/moinmoin/ChangeLog b/net-www/moinmoin/ChangeLog index 03e5827f8836..c5c8f258d6d0 100644 --- a/net-www/moinmoin/ChangeLog +++ b/net-www/moinmoin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-www/moinmoin # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/moinmoin/ChangeLog,v 1.11 2004/03/30 13:03:09 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/moinmoin/ChangeLog,v 1.12 2004/04/21 19:01:43 mholzer Exp $ + + 21 Apr 2004; Martin Holzer <mholzer@gentoo.org> moinmoin-1.0.ebuild, + moinmoin-1.2.1.ebuild: + moving webapp-detect into pkg_setup. closes 48356 30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> moinmoin-1.2.1.ebuild: Adding amd64 keyword. Closing #45757. diff --git a/net-www/moinmoin/moinmoin-1.0.ebuild b/net-www/moinmoin/moinmoin-1.0.ebuild index 11349c0c7021..c8d7f500bdea 100644 --- a/net-www/moinmoin/moinmoin-1.0.ebuild +++ b/net-www/moinmoin/moinmoin-1.0.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/moinmoin/moinmoin-1.0.ebuild,v 1.11 2004/03/16 01:17:32 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/moinmoin/moinmoin-1.0.ebuild,v 1.12 2004/04/21 19:01:43 mholzer Exp $ inherit webapp-apache @@ -18,9 +18,6 @@ DEPEND=">=dev-lang/python-2.2" pkg_setup() { webapp-detect || NO_WEBSERVER=1 - HTTPD_USER="apache" - HTTPD_GROUP="apache" - webapp-pkg_setup "${NO_WEBSERVER}" einfo "Installing into ${ROOT}${HTTPD_ROOT}." } diff --git a/net-www/moinmoin/moinmoin-1.2.1.ebuild b/net-www/moinmoin/moinmoin-1.2.1.ebuild index f926b229b765..ea5363978db7 100644 --- a/net-www/moinmoin/moinmoin-1.2.1.ebuild +++ b/net-www/moinmoin/moinmoin-1.2.1.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/moinmoin/moinmoin-1.2.1.ebuild,v 1.2 2004/03/30 13:03:09 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/moinmoin/moinmoin-1.2.1.ebuild,v 1.3 2004/04/21 19:01:43 mholzer Exp $ inherit webapp-apache @@ -16,11 +16,8 @@ LICENSE="GPL-2" DEPEND=">=dev-lang/python-2.2" -webapp-detect || NO_WEBSERVER=1 -HTTPD_USER="apache" -HTTPD_GROUP="apache" - pkg_setup() { + webapp-detect || NO_WEBSERVER=1 webapp-pkg_setup "${NO_WEBSERVER}" einfo "Installing into ${ROOT}${HTTPD_ROOT}." } |