| 1 |
hollow 08/02/03 17:08:49 |
| 2 |
|
| 3 |
Modified: mambo-4.6.3-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
merge from webapps overlay wrt #208584 |
| 6 |
(Portage version: 2.1.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 www-apps/mambo/mambo-4.6.3-r1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mambo/mambo-4.6.3-r1.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mambo/mambo-4.6.3-r1.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mambo/mambo-4.6.3-r1.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: mambo-4.6.3-r1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/mambo/mambo-4.6.3-r1.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- mambo-4.6.3-r1.ebuild 27 Jan 2008 20:41:44 -0000 1.1 |
| 22 |
+++ mambo-4.6.3-r1.ebuild 3 Feb 2008 17:08:49 -0000 1.2 |
| 23 |
@@ -1,8 +1,8 @@ |
| 24 |
# Copyright 1999-2008 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $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 $ |
| 27 |
+# $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 $ |
| 28 |
|
| 29 |
-inherit webapp depend.php |
| 30 |
+inherit webapp depend.php depend.apache |
| 31 |
|
| 32 |
MY_PN="${PN/m/M}" |
| 33 |
DESCRIPTION="Mambo is a dynamic portal engine and content management system" |
| 34 |
@@ -16,13 +16,15 @@ |
| 35 |
|
| 36 |
IUSE="" |
| 37 |
|
| 38 |
-RDEPEND=" |
| 39 |
- virtual/httpd-php |
| 40 |
- www-servers/apache" |
| 41 |
+need_php |
| 42 |
+need_apache |
| 43 |
|
| 44 |
pkg_setup () { |
| 45 |
webapp_pkg_setup |
| 46 |
- require_php_with_use mysql zlib |
| 47 |
+ if ! PHPCHECKNODIE="yes" require_php_with_use mysql zlib || \ |
| 48 |
+ ! PHPCHECKNODIE="yes" require_php_with_any_use apache2 cgi ; then |
| 49 |
+ die "Re-install ${PHP_PKG} with mysql zlib and at least one of apache2 or cgi USE flags." |
| 50 |
+ fi |
| 51 |
} |
| 52 |
|
| 53 |
src_unpack() { |
| 54 |
|
| 55 |
|
| 56 |
|
| 57 |
1.35 www-apps/mambo/ChangeLog |
| 58 |
|
| 59 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mambo/ChangeLog?rev=1.35&view=markup |
| 60 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mambo/ChangeLog?rev=1.35&content-type=text/plain |
| 61 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/mambo/ChangeLog?r1=1.34&r2=1.35 |
| 62 |
|
| 63 |
Index: ChangeLog |
| 64 |
=================================================================== |
| 65 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/mambo/ChangeLog,v |
| 66 |
retrieving revision 1.34 |
| 67 |
retrieving revision 1.35 |
| 68 |
diff -u -r1.34 -r1.35 |
| 69 |
--- ChangeLog 27 Jan 2008 20:41:44 -0000 1.34 |
| 70 |
+++ ChangeLog 3 Feb 2008 17:08:49 -0000 1.35 |
| 71 |
@@ -1,6 +1,12 @@ |
| 72 |
# ChangeLog for www-apps/mambo |
| 73 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 74 |
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/ChangeLog,v 1.34 2008/01/27 20:41:44 rl03 Exp $ |
| 75 |
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mambo/ChangeLog,v 1.35 2008/02/03 17:08:49 hollow Exp $ |
| 76 |
+ |
| 77 |
+ 03 Feb 2008; Benedikt Böhm <hollow@g.o> mambo-4.6.3-r1.ebuild: |
| 78 |
+ merge from webapps overlay wrt #208584 |
| 79 |
+ |
| 80 |
+ 02 Feb 2008; Jakub Moc <jakub@g.o> mambo-4.6.3-r1.ebuild: |
| 81 |
+ Fix apache dependency wrt Bug 208584 and improve checks for PHP features. |
| 82 |
|
| 83 |
*mambo-4.6.3-r1 (27 Jan 2008) |
| 84 |
|
| 85 |
|
| 86 |
|
| 87 |
|
| 88 |
-- |
| 89 |
gentoo-commits@l.g.o mailing list |
Archives