Merge category dev-php5 into dev-php (bug #324665)

diff --git a/eclass/depend.php.eclass b/eclass/depend.php.eclass
index 5447adb2548b695d9785aeb79ec30739530e2db5..66dbd897e3384e26fbd85a4988a489c2c80613de 100644 (file)
--- a/eclass/depend.php.eclass
+++ b/eclass/depend.php.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.30 2011/08/22 04:46:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.31 2011/12/14 23:10:51 mabi Exp $
 
 # @ECLASS: depend.php.eclass
 # @MAINTAINER:
@@ -106,7 +106,6 @@ need_php() {
 need_php_by_category() {
        case "${CATEGORY}" in
                dev-php) need_php ;;
-               dev-php5) need_php5 ;;
                *) die "Version of PHP required by packages in category ${CATEGORY} unknown"
        esac
 }

diff --git a/eclass/php-ezc.eclass b/eclass/php-ezc.eclass
index 6d50a90465a4d130a5c6890d052ae8f83d37a10c..eb27114440c3f91b7fc3c49afd9e642b958d7764 100644 (file)
--- a/eclass/php-ezc.eclass
+++ b/eclass/php-ezc.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ezc.eclass,v 1.5 2008/01/13 15:28:38 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ezc.eclass,v 1.6 2011/12/14 23:10:51 mabi Exp $
 
 # @ECLASS: php-ezc.eclass
 # @MAINTAINER:
@@ -37,12 +37,12 @@ DEPEND=">=dev-lang/php-5.1.2
 
 # @ECLASS-VARIABLE: EZC_BASE_MIN
 # @DESCRIPTION:
-# Minimal dev-php5/ezc-Base version required for given eZ component version.
+# Minimal dev-php/ezc-Base version required for given eZ component version.
 # Set in ebuild before inherit.
 [[ -z "${EZC_BASE_MIN}" ]] && EZC_BASE_MIN="1.0"
 
 if [[ "${PN}" != "ezc-Base" ]] ; then
-       RDEPEND="${DEPEND} >=dev-php5/ezc-Base-${EZC_BASE_MIN}"
+       RDEPEND="${DEPEND} >=dev-php/ezc-Base-${EZC_BASE_MIN}"
 else
        RDEPEND="${DEPEND}"
 fi