summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Longinotti <chtekk@gentoo.org>2006-05-13 15:39:11 +0000
committerLuca Longinotti <chtekk@gentoo.org>2006-05-13 15:39:11 +0000
commitc1636e90468ee06df161f7cceeb58864ea0bea6d (patch)
treebd3a69761bb7dc160056b6d2ebf8a3c2f1e4231b /eclass/depend.php.eclass
parentStable on ppc. bug 133137 (diff)
downloadgentoo-2-c1636e90468ee06df161f7cceeb58864ea0bea6d.tar.gz
gentoo-2-c1636e90468ee06df161f7cceeb58864ea0bea6d.tar.bz2
gentoo-2-c1636e90468ee06df161f7cceeb58864ea0bea6d.zip
Add PHPCHECKNODIE option for the require_php_with_*use checks.
Diffstat (limited to 'eclass/depend.php.eclass')
-rw-r--r--eclass/depend.php.eclass54
1 files changed, 35 insertions, 19 deletions
diff --git a/eclass/depend.php.eclass b/eclass/depend.php.eclass
index 86502e851ccb..c917b41a8f27 100644
--- a/eclass/depend.php.eclass
+++ b/eclass/depend.php.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.14 2006/05/05 21:42:16 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.15 2006/05/13 15:39:11 chtekk Exp $
#
# ========================================================================
#
@@ -204,17 +204,25 @@ require_php_with_use() {
fi
done
- if [[ -z ${missing_use} ]] ; then
- return
+ if [[ -z "${missing_use}" ]] ; then
+ if [[ -z "${PHPCHECKNODIE}" ]] ; then
+ return
+ else
+ return 0
+ fi
fi
- eerror
- eerror "${PHP_PKG} needs to be re-installed with all of the following"
- eerror "USE flags enabled:"
- eerror
- eerror " $@"
- eerror
- die "Missing PHP USE flags found"
+ if [[ -z "${PHPCHECKNODIE}" ]] ; then
+ eerror
+ eerror "${PHP_PKG} needs to be re-installed with all of the following"
+ eerror "USE flags enabled:"
+ eerror
+ eerror " $@"
+ eerror
+ die "Missing PHP USE flags found"
+ else
+ return 1
+ fi
}
# Call this function from pkg_setup if your package requires PHP compiled
@@ -242,17 +250,25 @@ require_php_with_any_use() {
fi
done
- if [[ -z ${missing_use} ]] ; then
- return
+ if [[ -z "${missing_use}" ]] ; then
+ if [[ -z "${PHPCHECKNODIE}" ]] ; then
+ return
+ else
+ return 0
+ fi
fi
- eerror
- eerror "${PHP_PKG} needs to be re-installed with any of the following"
- eerror "USE flags enabled:"
- eerror
- eerror " $@"
- eerror
- die "Missing PHP USE flags found"
+ if [[ -z "${PHPCHECKNODIE}" ]] ; then
+ eerror
+ eerror "${PHP_PKG} needs to be re-installed with any of the following"
+ eerror "USE flags enabled:"
+ eerror
+ eerror " $@"
+ eerror
+ die "Missing PHP USE flags found"
+ else
+ return 1
+ fi
}
# ========================================================================