diff options
| author |   Peter Volkov <pva@gentoo.org> | 2008-07-15 10:50:21 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2008-07-15 10:50:21 +0000 |
| commit | af178e0a51a22da79b4bfe4916388625dd871d30 (patch) | |
| tree | a59510a55ea749067bf58217426285c0961073bd /www-apps | |
| parent | Add app-text/gnome-doc-utils to DEPEND, drac fails and told me to add it, bug... (diff) | |
| download | gentoo-2-af178e0a51a22da79b4bfe4916388625dd871d30.tar.gz gentoo-2-af178e0a51a22da79b4bfe4916388625dd871d30.tar.bz2 gentoo-2-af178e0a51a22da79b4bfe4916388625dd871d30.zip | |
drupal works with either gd or gd-external in php, fixing php checks. Thank padde for IRC-report.
(Portage version: 2.2_rc1/cvs/Linux 2.6.22-ovz005 i686)
Diffstat (limited to 'www-apps')
| -rw-r--r-- | www-apps/drupal/ChangeLog | 7 | ||||
| -rw-r--r-- | www-apps/drupal/drupal-5.8.ebuild | 10 | ||||
| -rw-r--r-- | www-apps/drupal/drupal-6.3.ebuild | 10 |
3 files changed, 20 insertions, 7 deletions
diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog index da04939275c3..3989c8ae527b 100644 --- a/www-apps/drupal/ChangeLog +++ b/www-apps/drupal/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-apps/drupal # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.47 2008/07/14 11:33:12 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.48 2008/07/15 10:50:21 pva Exp $ + + 15 Jul 2008; Peter Volkov <pva@gentoo.org> drupal-5.8.ebuild, + drupal-6.3.ebuild: + drupal works with either gd or gd-external in php, fixing php checks. + Thank padde for IRC-report. *drupal-6.3 (14 Jul 2008) *drupal-5.8 (14 Jul 2008) diff --git a/www-apps/drupal/drupal-5.8.ebuild b/www-apps/drupal/drupal-5.8.ebuild index 06e7bce67a8e..7a1df108fcce 100644 --- a/www-apps/drupal/drupal-5.8.ebuild +++ b/www-apps/drupal/drupal-5.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-5.8.ebuild,v 1.1 2008/07/14 11:33:12 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-5.8.ebuild,v 1.2 2008/07/15 10:50:21 pva Exp $ inherit webapp eutils depend.php @@ -21,9 +21,13 @@ pkg_setup() { webapp_pkg_setup has_php if [[ ${PHP_VERSION} == "4" ]] ; then - require_php_with_use expat gd + local flags="expat" else - require_php_with_use xml gd + local flags="xml" + fi + if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} \ + || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then + die "Re-install ${PHP_PKG} with ${flags} and either gd or gd-external" fi } diff --git a/www-apps/drupal/drupal-6.3.ebuild b/www-apps/drupal/drupal-6.3.ebuild index a5fb58485ad7..dd803c2c913e 100644 --- a/www-apps/drupal/drupal-6.3.ebuild +++ b/www-apps/drupal/drupal-6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.3.ebuild,v 1.1 2008/07/14 11:33:12 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.3.ebuild,v 1.2 2008/07/15 10:50:21 pva Exp $ inherit webapp eutils depend.php @@ -21,9 +21,13 @@ pkg_setup() { webapp_pkg_setup has_php if [[ ${PHP_VERSION} == "4" ]] ; then - require_php_with_use expat gd + local flags="expat" else - require_php_with_use xml gd + local flags="xml" + fi + if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} \ + || ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then + die "Re-install ${PHP_PKG} with ${flags} and either gd or gd-external" fi } |