remove php4 left-overs

diff --git a/eclass/depend.php.eclass b/eclass/depend.php.eclass
index 003ac46a4129f2b8bc8a2ce2ef03f1fc1afcdc61..8e6d4fc0b5c7af760cb315524c6a15a47a9ac4d6 100644 (file)
--- a/eclass/depend.php.eclass
+++ b/eclass/depend.php.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/depend.php.eclass,v 1.25 2008/02/26 16:26:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.26 2010/07/13 23:48:46 mabi Exp $
 
 # Author: Stuart Herbert <stuart@gentoo.org>
 # Author: Luca Longinotti <chtekk@gentoo.org>
@@ -9,66 +9,15 @@
 # @ECLASS: depend.php.eclass
 # @MAINTAINER:
 # Gentoo PHP team <php-bugs@gentoo.org>
-# @BLURB: Functions to allow ebuilds to depend on php[45] and check for specific features.
+# @BLURB: Functions to allow ebuilds to depend on php5 and check for specific features.
 # @DESCRIPTION:
-# This eclass provides functions that allow ebuilds to depend on php[45] and check
+# This eclass provides functions that allow ebuilds to depend on php5 and check
 # for specific PHP features, SAPIs etc. Also provides dodoc-php wrapper to install
 # documentation for PHP packages to php-specific location.
 
 
 inherit eutils phpconfutils
 
-# PHP4-only depend functions
-
-# @FUNCTION: need_php4_cli
-# @DESCRIPTION:
-# Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP4
-# with cli SAPI.
-need_php4_cli() {
-       DEPEND="${DEPEND} =virtual/php-4*"
-       RDEPEND="${RDEPEND} =virtual/php-4*"
-       PHP_VERSION="4"
-}
-
-# @FUNCTION: need_php4_httpd
-# @DESCRIPTION:
-# Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP4
-# with either cgi or apache2 SAPI.
-need_php4_httpd() {
-       DEPEND="${DEPEND} =virtual/httpd-php-4*"
-       RDEPEND="${RDEPEND} =virtual/httpd-php-4*"
-       PHP_VERSION="4"
-}
-
-# @FUNCTION: need_php4
-# @DESCRIPTION:
-# Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP4
-# (with any SAPI).
-need_php4() {
-       DEPEND="${DEPEND} =dev-lang/php-4*"
-       RDEPEND="${RDEPEND} =dev-lang/php-4*"
-       PHP_VERSION="4"
-       PHP_SHARED_CAT="php4"
-}
-
-# common settings go in here
-uses_php4() {
-       # cache this
-       libdir=$(get_libdir)
-
-       PHPIZE="/usr/${libdir}/php4/bin/phpize"
-       PHPCONFIG="/usr/${libdir}/php4/bin/php-config"
-       PHPCLI="/usr/${libdir}/php4/bin/php"
-       PHPCGI="/usr/${libdir}/php4/bin/php-cgi"
-       PHP_PKG="$(best_version =dev-lang/php-4*)"
-       PHPPREFIX="/usr/${libdir}/php4"
-       EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)"
-
-       einfo
-       einfo "Using ${PHP_PKG}"
-       einfo
-}
-
 # PHP5-only depend functions
 
 # @FUNCTION: need_php5_cli
@@ -153,12 +102,11 @@ need_php() {
 # @FUNCTION: need_php_by_category
 # @DESCRIPTION:
 # Set this after setting DEPEND/RDEPEND in your ebuild to depend on PHP version
-# determined by ${CATEGORY} - any PHP version, PHP4 or PHP5 for dev-php, dev-php4 and
+# determined by ${CATEGORY} - any PHP version or PHP5 for dev-php or
 # dev-php5, respectively.
 need_php_by_category() {
        case "${CATEGORY}" in
                dev-php) need_php ;;
-               dev-php4) need_php4 ;;
                dev-php5) need_php5 ;;
                *) die "Version of PHP required by packages in category ${CATEGORY} unknown"
        esac
@@ -174,8 +122,6 @@ has_php() {
        # Detect which PHP version we have installed
        if has_version '=dev-lang/php-5*' ; then
                PHP_VERSION="5"
-       elif has_version '=dev-lang/php-4*' ; then
-               PHP_VERSION="4"
        else
                die "Unable to find an installed dev-lang/php package"
        fi
@@ -396,17 +342,6 @@ has_concurrentmodphp() {
 require_pdo() {
        has_php
 
-       # Do we have PHP5 installed?
-       if [[ "${PHP_VERSION}" == "4" ]] ; then
-               eerror
-               eerror "This package requires PDO."
-               eerror "PDO is only available for PHP 5."
-               eerror "You must install >=dev-lang/php-5.1 with USE=\"pdo\"."
-               eerror "pdo USE flags turned on."
-               eerror
-               die "PHP 5 not installed"
-       fi
-
        # Was PHP5 compiled with internal PDO support?
        if built_with_use =${PHP_PKG} pdo || phpconfutils_built_with_use =${PHP_PKG} pdo ; then
                return
@@ -436,15 +371,6 @@ require_php_cli() {
 
        local PHP_PACKAGE_FOUND=""
 
-       # Detect which PHP version we have installed
-       if has_version '=dev-lang/php-4*' ; then
-               PHP_PACKAGE_FOUND="1"
-               pkg="$(best_version '=dev-lang/php-4*')"
-               if built_with_use =${pkg} cli || phpconfutils_built_with_use =${pkg} cli ; then
-                       PHP_VERSION="4"
-               fi
-       fi
-
        if has_version '=dev-lang/php-5*' ; then
                PHP_PACKAGE_FOUND="1"
                pkg="$(best_version '=dev-lang/php-5*')"
@@ -480,15 +406,6 @@ require_php_cgi() {
 
        local PHP_PACKAGE_FOUND=""
 
-       # Detect which PHP version we have installed
-       if has_version '=dev-lang/php-4*' ; then
-               PHP_PACKAGE_FOUND="1"
-               pkg="$(best_version '=dev-lang/php-4*')"
-               if built_with_use =${pkg} cgi || phpconfutils_built_with_use =${pkg} cgi ; then
-                       PHP_VERSION="4"
-               fi
-       fi
-
        if has_version '=dev-lang/php-5*' ; then
                PHP_PACKAGE_FOUND="1"
                pkg="$(best_version '=dev-lang/php-5*')"
@@ -522,13 +439,6 @@ require_sqlite() {
                return
        fi
 
-       # Do we have pecl-sqlite installed for PHP4?
-       if [[ "${PHP_VERSION}" == "4" ]] ; then
-               if has_version 'dev-php4/pecl-sqlite' ; then
-                       return
-               fi
-       fi
-
        # If we get here, then we don't have any SQLite support for PHP installed
        eerror
        eerror "No SQLite extension for PHP found."

diff --git a/eclass/php-pear-lib-r1.eclass b/eclass/php-pear-lib-r1.eclass
index d1947da81ee7c420ee41c868e16954f1d0156487..8c3ecdf8bfc61a82efa1558591815d0906d8069c 100644 (file)
--- a/eclass/php-pear-lib-r1.eclass
+++ b/eclass/php-pear-lib-r1.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-pear-lib-r1.eclass,v 1.17 2010/07/12 17:48:32 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.18 2010/07/13 23:48:46 mabi Exp $
 #
 # Author: Luca Longinotti <chtekk@gentoo.org>
 
@@ -33,17 +33,7 @@ php-pear-lib-r1_src_install() {
        addpredict /var/lib/net-snmp/
        addpredict /session_mm_cli0.sem
 
-       case "${CATEGORY}" in
-               dev-php)
-                       if has_version '=dev-lang/php-5*' ; then
-                               PHP_BIN="/usr/$(get_libdir)/php5/bin/php"
-                       else
-                               PHP_BIN="/usr/$(get_libdir)/php4/bin/php"
-                       fi ;;
-               dev-php4) PHP_BIN="/usr/$(get_libdir)/php4/bin/php" ;;
-               dev-php5) PHP_BIN="/usr/$(get_libdir)/php5/bin/php" ;;
-               *) die "Version of PHP required by packages in category ${CATEGORY} unknown"
-       esac
+       PHP_BIN="/usr/$(get_libdir)/php5/bin/php"
 
        cd "${S}"
 

diff --git a/eclass/php-pear-r1.eclass b/eclass/php-pear-r1.eclass
index f1b1c552b92c9a841c7b9f4579b214312567ad00..472b0bba43eca5cef78d9b2122d99785a81f40b1 100644 (file)
--- a/eclass/php-pear-r1.eclass
+++ b/eclass/php-pear-r1.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-pear-r1.eclass,v 1.24 2010/03/31 20:37:56 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.25 2010/07/13 23:48:47 mabi Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Luca Longinotti <chtekk@gentoo.org>
@@ -60,17 +60,7 @@ php-pear-r1_src_install() {
        addpredict /var/lib/net-snmp/
        addpredict /session_mm_cli0.sem
 
-       case "${CATEGORY}" in
-               dev-php)
-                       if has_version '=dev-lang/php-5*' ; then
-                               PHP_BIN="/usr/$(get_libdir)/php5/bin/php"
-                       else
-                               PHP_BIN="/usr/$(get_libdir)/php4/bin/php"
-                       fi ;;
-               dev-php4) PHP_BIN="/usr/$(get_libdir)/php4/bin/php" ;;
-               dev-php5) PHP_BIN="/usr/$(get_libdir)/php5/bin/php" ;;
-               *) die "Version of PHP required by packages in category ${CATEGORY} unknown"
-       esac
+       PHP_BIN="/usr/$(get_libdir)/php5/bin/php" ;;
 
        cd "${S}"