From 4dd382acc17666f1e85a71bd9e684ecd0a1750aa Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 30 Jun 2004 17:24:12 +0000 Subject: libgd -> gd --- eclass/php-2.eclass | 8 ++++---- eclass/php-sapi.eclass | 8 ++++---- eclass/php.eclass | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'eclass') diff --git a/eclass/php-2.eclass b/eclass/php-2.eclass index 9aadf9ec03ad..68408070466e 100644 --- a/eclass/php-2.eclass +++ b/eclass/php-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-2.eclass,v 1.15 2004/06/25 00:39:48 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-2.eclass,v 1.16 2004/06/30 17:24:12 vapier Exp $ # Author: Robin H. Johnson inherit eutils flag-o-matic @@ -57,7 +57,7 @@ RDEPEND=" curl? ( >=net-misc/curl-7.10.2 ) x86? ( firebird? ( >=dev-db/firebird-1.0 ) ) freetds? ( >=dev-db/freetds-0.53 ) - gd-external? ( media-libs/libgd >=media-libs/jpeg-6b + gd-external? ( media-libs/gd >=media-libs/jpeg-6b >=media-libs/libpng-1.2.5 ) gd? ( >=media-libs/jpeg-6b >=media-libs/libpng-1.2.5 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) @@ -252,8 +252,8 @@ php_src_compile() { if use gd-external; then myconf="${myconf} --with-gd=/usr" REQUIREPNG=1 - if has_version '>=media-libs/libgd-2.0.17'; then - einfo "Fixing PHP for libgd function name changes" + if has_version '>=media-libs/gd-2.0.17'; then + einfo "Fixing PHP for gd function name changes" sed -i 's:gdFreeFontCache:gdFontCacheShutdown:' ${S}/ext/gd/gd.c fi elif use gd; then diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass index cb257a3bb130..4866d77d48fa 100644 --- a/eclass/php-sapi.eclass +++ b/eclass/php-sapi.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.38 2004/06/28 00:08:18 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.39 2004/06/30 17:24:12 vapier Exp $ # Author: Robin H. Johnson inherit eutils flag-o-matic @@ -82,7 +82,7 @@ RDEPEND="${RDEPEND} curl? ( >=net-misc/curl-7.10.2 ) x86? ( firebird? ( >=dev-db/firebird-1.0 ) ) freetds? ( >=dev-db/freetds-0.53 ) - gd-external? ( media-libs/libgd >=media-libs/jpeg-6b + gd-external? ( media-libs/gd >=media-libs/jpeg-6b >=media-libs/libpng-1.2.5 ) gd? ( >=media-libs/jpeg-6b >=media-libs/libpng-1.2.5 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) @@ -332,8 +332,8 @@ php-sapi_src_compile() { if use gd-external; then myconf="${myconf} --with-gd=/usr" REQUIREPNG=1 - if has_version '>=media-libs/libgd-2.0.17'; then - einfo "Fixing PHP for libgd function name changes" + if has_version '>=media-libs/gd-2.0.17'; then + einfo "Fixing PHP for gd function name changes" sed -i 's:gdFreeFontCache:gdFontCacheShutdown:' ${S}/ext/gd/gd.c fi elif use gd; then diff --git a/eclass/php.eclass b/eclass/php.eclass index 2d574cd418d7..bc5347524601 100644 --- a/eclass/php.eclass +++ b/eclass/php.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php.eclass,v 1.100 2004/06/29 15:16:23 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php.eclass,v 1.101 2004/06/30 17:24:12 vapier Exp $ # Author: Robin H. Johnson # This eclass is the old style of php, that was used before php-core was @@ -63,7 +63,7 @@ RDEPEND=" curl? ( >=net-misc/curl-7.10.2 ) x86? ( firebird? ( >=dev-db/firebird-1.0 ) ) freetds? ( >=dev-db/freetds-0.53 ) - gd-external? ( media-libs/libgd >=media-libs/jpeg-6b + gd-external? ( media-libs/gd >=media-libs/jpeg-6b >=media-libs/libpng-1.2.5 ) gd? ( >=media-libs/jpeg-6b >=media-libs/libpng-1.2.5 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) -- cgit v1.2.3-65-gdbad