diff options
| author |   Renat Lumpau <rl03@gentoo.org> | 2006-07-24 22:14:32 +0000 |
|---|---|---|
| committer | Renat Lumpau <rl03@gentoo.org> | 2006-07-24 22:14:32 +0000 |
| commit | 1cc461172196156796944d0d4466112ddd50f9cd (patch) | |
| tree | 4f6dd16ed5fe57e08dc31b6705a27c0206950b4f /www-apps | |
| parent | Added media-sound/mpd-svn:fifo and media-sound/mpd-svn:pulseaudio (diff) | |
| download | gentoo-2-1cc461172196156796944d0d4466112ddd50f9cd.tar.gz gentoo-2-1cc461172196156796944d0d4466112ddd50f9cd.tar.bz2 gentoo-2-1cc461172196156796944d0d4466112ddd50f9cd.zip | |
Better detect PHP use flags when USE="gd" (bug #141343).
(Portage version: 2.1.1_pre2-r6)
Diffstat (limited to 'www-apps')
| -rw-r--r-- | www-apps/gallery/ChangeLog | 5 | ||||
| -rw-r--r-- | www-apps/gallery/gallery-2.1.1a.ebuild | 29 |
2 files changed, 30 insertions, 4 deletions
diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog index 9974bf7bf094..a91c312e2787 100644 --- a/www-apps/gallery/ChangeLog +++ b/www-apps/gallery/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-apps/gallery # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.95 2006/07/09 21:55:17 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.96 2006/07/24 22:14:32 rl03 Exp $ + + 24 Jul 2006; Renat Lumpau <rl03@gentoo.org> gallery-2.1.1a.ebuild: + Better detect PHP use flags when USE="gd" (bug #141343). 09 Jul 2006; Renat Lumpau <rl03@gentoo.org> gallery-2.1.1a.ebuild: Add php checking from bug #137490. diff --git a/www-apps/gallery/gallery-2.1.1a.ebuild b/www-apps/gallery/gallery-2.1.1a.ebuild index 67752c35ba06..2da79189f187 100644 --- a/www-apps/gallery/gallery-2.1.1a.ebuild +++ b/www-apps/gallery/gallery-2.1.1a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.1.1a.ebuild,v 1.3 2006/07/09 21:55:17 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.1.1a.ebuild,v 1.4 2006/07/24 22:14:32 rl03 Exp $ inherit webapp eutils depend.php @@ -31,12 +31,35 @@ pkg_setup() { webapp_pkg_setup local php_flags="session" + local DIE= - use gd && php_flags="${php_flags} gd" use mysql && php_flags="${php_flags} mysql" use postgres && php_flags="${php_flags} postgres" - require_php_with_use ${php_flags} + if ! PHPCHECKNODIE="yes" require_php_with_use ${php_flags}; then + DIE="yes" + fi + if use gd; then + if ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then + DIE="yes" + fi + fi + + if [[ ${DIE} == "yes" ]]; then + eerror + eerror "${PHP_PKG} needs to be re-installed with all of the following" + eerror "USE flags enabled:" + eerror + eerror "${php_flags}" + eerror + if use gd; then + eerror "as well as any of the following USE flags enabled:" + eerror + eerror "gd gd-external" + eerror + fi + die "Re-install ${PHP_PKG}" + fi } src_install() { |