From 276f1d420c1e72eacde5d4ab33a4e0b476623f80 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Thu, 7 Dec 2006 08:47:47 +0000 Subject: [PATCH] Require dev-libs/libedit for libedit support, as it's going to be removed from freebsd-lib in favour of a merged dev-libs/libedit ebuild. --- eclass/php4_4-sapi.eclass | 4 ++-- eclass/php5_0-sapi.eclass | 4 ++-- eclass/php5_1-sapi.eclass | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eclass/php4_4-sapi.eclass b/eclass/php4_4-sapi.eclass index 6f7a3af79d65..5fe44522d4ea 100644 --- a/eclass/php4_4-sapi.eclass +++ b/eclass/php4_4-sapi.eclass @@ -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/eclass/php4_4-sapi.eclass,v 1.30 2006/11/23 14:02:50 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.31 2006/12/07 08:47:47 flameeyes Exp $ # # ######################################################################## # @@ -67,7 +67,7 @@ DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 ) java-internal? ( >=virtual/jdk-1.4.2 dev-java/java-config !dev-php4/php-java-bridge ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + libedit? ( dev-libs/libedit ) mcal? ( dev-libs/libmcal !=dev-libs/libmcal-0.7-r2 ) mcve? ( net-libs/libmonetra >=dev-libs/openssl-0.9.7 ) mhash? ( app-crypt/mhash ) diff --git a/eclass/php5_0-sapi.eclass b/eclass/php5_0-sapi.eclass index 79f768a78127..21880068ae1c 100644 --- a/eclass/php5_0-sapi.eclass +++ b/eclass/php5_0-sapi.eclass @@ -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/eclass/php5_0-sapi.eclass,v 1.29 2006/11/23 14:02:50 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5_0-sapi.eclass,v 1.30 2006/12/07 08:47:47 flameeyes Exp $ # # ######################################################################## # @@ -66,7 +66,7 @@ DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 ) iodbc? ( dev-db/libiodbc >=dev-db/unixODBC-1.8.13 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + libedit? ( dev-libs/libedit ) mcve? ( >=dev-libs/openssl-0.9.7 ) mhash? ( app-crypt/mhash ) ming? ( media-libs/ming ) diff --git a/eclass/php5_1-sapi.eclass b/eclass/php5_1-sapi.eclass index 28a6fe900a29..0c61e899e24c 100644 --- a/eclass/php5_1-sapi.eclass +++ b/eclass/php5_1-sapi.eclass @@ -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/eclass/php5_1-sapi.eclass,v 1.35 2006/11/23 14:02:50 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.36 2006/12/07 08:47:47 flameeyes Exp $ # # ######################################################################## # @@ -66,7 +66,7 @@ DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 ) iodbc? ( dev-db/libiodbc >=dev-db/unixODBC-1.8.13 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + libedit? ( dev-libs/libedit ) mcve? ( >=dev-libs/openssl-0.9.7 ) mhash? ( app-crypt/mhash ) ming? ( media-libs/ming ) -- 2.26.2