diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2008-02-03 17:08:49 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2008-02-03 17:08:49 +0000 |
| commit | ac61c3898d45686dc120e3d0eaab8086f3e5bf3b (patch) | |
| tree | aee672541f1cbb97492550d7f1016d5cff232417 /www-apps/mambo | |
| parent | stable x86, bug 208763 (diff) | |
| download | historical-ac61c3898d45686dc120e3d0eaab8086f3e5bf3b.tar.gz historical-ac61c3898d45686dc120e3d0eaab8086f3e5bf3b.tar.bz2 historical-ac61c3898d45686dc120e3d0eaab8086f3e5bf3b.zip | |
merge from webapps overlay wrt #208584
Package-Manager: portage-2.1.4
Diffstat (limited to 'www-apps/mambo')
| -rw-r--r-- | www-apps/mambo/ChangeLog | 8 | ||||
| -rw-r--r-- | www-apps/mambo/mambo-4.6.3-r1.ebuild | 14 |
2 files changed, 15 insertions, 7 deletions
diff --git a/www-apps/mambo/ChangeLog b/www-apps/mambo/ChangeLog index aff400300de1..c7836fe7e557 100644 --- a/www-apps/mambo/ChangeLog +++ b/www-apps/mambo/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-apps/mambo # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/ChangeLog,v 1.34 2008/01/27 20:41:44 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/ChangeLog,v 1.35 2008/02/03 17:08:49 hollow Exp $ + + 03 Feb 2008; Benedikt Böhm <hollow@gentoo.org> mambo-4.6.3-r1.ebuild: + merge from webapps overlay wrt #208584 + + 02 Feb 2008; Jakub Moc <jakub@gentoo.org> mambo-4.6.3-r1.ebuild: + Fix apache dependency wrt Bug 208584 and improve checks for PHP features. *mambo-4.6.3-r1 (27 Jan 2008) diff --git a/www-apps/mambo/mambo-4.6.3-r1.ebuild b/www-apps/mambo/mambo-4.6.3-r1.ebuild index ac11ca9e31f6..91701a359ce8 100644 --- a/www-apps/mambo/mambo-4.6.3-r1.ebuild +++ b/www-apps/mambo/mambo-4.6.3-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/mambo-4.6.3-r1.ebuild,v 1.1 2008/01/27 20:41:44 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/mambo-4.6.3-r1.ebuild,v 1.2 2008/02/03 17:08:49 hollow Exp $ -inherit webapp depend.php +inherit webapp depend.php depend.apache MY_PN="${PN/m/M}" DESCRIPTION="Mambo is a dynamic portal engine and content management system" @@ -16,13 +16,15 @@ S=${WORKDIR} IUSE="" -RDEPEND=" - virtual/httpd-php - www-servers/apache" +need_php +need_apache pkg_setup () { webapp_pkg_setup - require_php_with_use mysql zlib + if ! PHPCHECKNODIE="yes" require_php_with_use mysql zlib || \ + ! PHPCHECKNODIE="yes" require_php_with_any_use apache2 cgi ; then + die "Re-install ${PHP_PKG} with mysql zlib and at least one of apache2 or cgi USE flags." + fi } src_unpack() { |