Don't die on USE=-*, ebuild part.

(Portage version: 2.1_pre7-r5)

8 files changed, 51 insertions, 34 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 1e559e267ac8..c60b47ec219c 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.84 2006/04/13 20:28:58 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.85 2006/04/20 12:35:08 chtekk Exp $
+
+  20 Apr 2006; Luca Longinotti <chtekk@gentoo.org> php-4.3.11-r5.ebuild,
+  php-4.4.2.ebuild, php-4.4.2-r1.ebuild, php-5.0.5-r5.ebuild,
+  php-5.1.2.ebuild, php-5.1.2-r1.ebuild:
+  Don't die on USE=-*, ebuild part.
 
 *php-5.1.2-r1 (13 Apr 2006)
 *php-4.4.2-r1 (13 Apr 2006)
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index f0ef53f226a4..0fb6f97b0944 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,6 +1,6 @@
-MD5 1ed2752973a8b5f40be1da1edadade0b ChangeLog 19564
-RMD160 ca802c50df231fb43ded5de07d5ffeb6433ac38b ChangeLog 19564
-SHA256 f9f747cdaedc25faf1d0325c43bcfdaaf1840033ef45580962329bdbf51dc94b ChangeLog 19564
+MD5 f9580dc561c0639f17894a745cb95595 ChangeLog 19777
+RMD160 086a555b626b348411e3e5f678f2511f433b5048 ChangeLog 19777
+SHA256 82439d7b7493876c90de7f4085d5074f944a4c39c02d10db331e862adb59e4db ChangeLog 19777
 MD5 6171c7aa95f69b8a54b0f29bd1056d2b files/70_mod_php.conf-apache1 454
 RMD160 869b5c225782690889bdfa5227a8f46c33ac71d3 files/70_mod_php.conf-apache1 454
 SHA256 9e6227e508f0c297f48c667e2135c7692f7943b3d0cd2ffdbdcca0bad5220343 files/70_mod_php.conf-apache1 454
@@ -34,21 +34,21 @@ SHA256 3426b8d138536259ef8d1aea8e9dce2efc2fb74fbb63f7ead789ffba6a8175ff files/di
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata.xml 157
-MD5 8d639a24545e5cec6bbb0855461cba4e php-4.3.11-r5.ebuild 8596
-RMD160 e884c2a76818ba099bc01813533a799ebbcda055 php-4.3.11-r5.ebuild 8596
-SHA256 eb3bfd2a2bee65e92968219ae08565a6177f8d17b7f65edb6197f66d6725cc09 php-4.3.11-r5.ebuild 8596
-MD5 3690c266812ba4e4fab90c1eacbe957f php-4.4.2-r1.ebuild 7890
-RMD160 e7db207485518dd5f6c3e0a379a865ad02c043f0 php-4.4.2-r1.ebuild 7890
-SHA256 49a5086da1320be9d55869daa47179914c5ffae1fddde3a61fde65416c0dd324 php-4.4.2-r1.ebuild 7890
-MD5 23ab9184edeac381bab4e607dc87c913 php-4.4.2.ebuild 7877
-RMD160 33cb6ac393af6a647c61ba3874944296f7b08004 php-4.4.2.ebuild 7877
-SHA256 3d60fd1a5c6ba285b56682e242933bf800f473880ee889a00b069930b7d818cf php-4.4.2.ebuild 7877
-MD5 071fdedf08f25a01dac858c60512a7e6 php-5.0.5-r5.ebuild 4693
-RMD160 37277caf9a703194491db55b2a935f8da035a238 php-5.0.5-r5.ebuild 4693
-SHA256 3cb3df6f867552d0ea91e58bf14ec78b22970b8392d9279a8e967115f388641c php-5.0.5-r5.ebuild 4693
-MD5 537f4b487f6727608f16329794a033db php-5.1.2-r1.ebuild 7898
-RMD160 1422cce35682819a31f8a5d8816ea2b78a57eb16 php-5.1.2-r1.ebuild 7898
-SHA256 3acec3cdc6ddee5e6c713e405a96210522efd74dd923575cb27c158b27245b90 php-5.1.2-r1.ebuild 7898
-MD5 90339398d6e2e0fd30a76454b216334c php-5.1.2.ebuild 7885
-RMD160 ba6a5c308dd8910c3fdecdee7fee59eeb7b652bd php-5.1.2.ebuild 7885
-SHA256 415407baa44e53a78493230f0432ca15dd26b0b1ebdc3baf708ebe846479331b php-5.1.2.ebuild 7885
+MD5 f5843108da8ce5178638c7c1cc5510cf php-4.3.11-r5.ebuild 8652
+RMD160 39e60d2ffb2483586d70844017d69b2d63312c4f php-4.3.11-r5.ebuild 8652
+SHA256 628b62bb27bc06daeded3485ef406266fb34b21dcca9576181746eb05b17dfe2 php-4.3.11-r5.ebuild 8652
+MD5 9956ab3027d12223f6aa2fc612b60de8 php-4.4.2-r1.ebuild 7946
+RMD160 a60e54f06cfba9015132a7b931c28bda2eb5e450 php-4.4.2-r1.ebuild 7946
+SHA256 b4a456834b9aaddda2641133625613a77aab6ff0fc39beee5c6a843912a8d987 php-4.4.2-r1.ebuild 7946
+MD5 54518fb616c89184f6fcd0ba01676ab1 php-4.4.2.ebuild 7933
+RMD160 7a8f5c5f47fe9898e880ed0bc8579d3e328324df php-4.4.2.ebuild 7933
+SHA256 782fd28b5761ec03ea9744a82c06784ba736d4ffef87ec158ace56682e6a97fe php-4.4.2.ebuild 7933
+MD5 b40c2dcbec5b463a8b048b1ee98545d8 php-5.0.5-r5.ebuild 4749
+RMD160 454d6fc736c839408d98ce30de9f92739458b022 php-5.0.5-r5.ebuild 4749
+SHA256 1e240ca8947aaf68d350ec3df274a70460f045531131c18aaf7647df72e2ad39 php-5.0.5-r5.ebuild 4749
+MD5 becebae8df9c1ae786b983f3f711018b php-5.1.2-r1.ebuild 7954
+RMD160 46eaa8e0eba93d34951fe841b58abe3d580e05f4 php-5.1.2-r1.ebuild 7954
+SHA256 b1dc72377b122e2b11cb17415b5d71a0393c835d34765c5094d4e324a5a1dfc2 php-5.1.2-r1.ebuild 7954
+MD5 97554c622845c0f19f7889ef024d76b1 php-5.1.2.ebuild 7941
+RMD160 d79ddd2f5601bfb6ffed077090e3496619de00dc php-5.1.2.ebuild 7941
+SHA256 a7a8af98c4672a7dae337c00ccde321312c8b25313b5824e81a0f8feba03110c php-5.1.2.ebuild 7941
diff --git a/dev-lang/php/php-4.3.11-r5.ebuild b/dev-lang/php/php-4.3.11-r5.ebuild
index dca430732d7e..045efffd9488 100644
--- a/dev-lang/php/php-4.3.11-r5.ebuild
+++ b/dev-lang/php/php-4.3.11-r5.ebuild
@@ -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/dev-lang/php/php-4.3.11-r5.ebuild,v 1.10 2006/03/24 23:04:27 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.3.11-r5.ebuild,v 1.11 2006/04/20 12:35:09 chtekk Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="~alpha arm ia64 ~ppc s390 sh sparc x86"
@@ -41,6 +41,8 @@ SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP
 SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-pcrelib-new-secpatch.tar.bz2"
 
 pkg_setup() {
+	PHPCONFUTILS_AUTO_USE=""
+
 	# make sure the user has specified a SAPI
 	einfo "Determining SAPI(s) to build"
 	phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
@@ -103,7 +105,7 @@ php_determine_sapis() {
 	# holds the list of sapis that we want to build
 	PHPSAPIS=
 
-	if useq cli ; then
+	if useq cli || phpconfutils_usecheck cli ; then
 		PHPSAPIS="${PHPSAPIS} cli"
 	fi
 
diff --git a/dev-lang/php/php-4.4.2-r1.ebuild b/dev-lang/php/php-4.4.2-r1.ebuild
index b827e30f7ea9..dde23089bf5f 100644
--- a/dev-lang/php/php-4.4.2-r1.ebuild
+++ b/dev-lang/php/php-4.4.2-r1.ebuild
@@ -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/dev-lang/php/php-4.4.2-r1.ebuild,v 1.1 2006/04/13 20:28:58 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.2-r1.ebuild,v 1.2 2006/04/20 12:35:09 chtekk Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
@@ -38,6 +38,8 @@ SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP
 [[ -n "${HARDENEDPHP_PATCH}" ]] && SRC_URI="${SRC_URI} hardenedphp? ( http://gentoo.longitekk.com/${HARDENEDPHP_PATCH} )"
 
 pkg_setup() {
+	PHPCONFUTILS_AUTO_USE=""
+
 	# make sure the user has specified a SAPI
 	einfo "Determining SAPI(s) to build"
 	phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
@@ -81,7 +83,7 @@ php_determine_sapis() {
 	# holds the list of sapis that we want to build
 	PHPSAPIS=
 
-	if useq cli ; then
+	if useq cli || phpconfutils_usecheck cli ; then
 		PHPSAPIS="${PHPSAPIS} cli"
 	fi
 
diff --git a/dev-lang/php/php-4.4.2.ebuild b/dev-lang/php/php-4.4.2.ebuild
index 62132e6e5358..a7e68e1c7016 100644
--- a/dev-lang/php/php-4.4.2.ebuild
+++ b/dev-lang/php/php-4.4.2.ebuild
@@ -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/dev-lang/php/php-4.4.2.ebuild,v 1.10 2006/03/24 23:04:27 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.2.ebuild,v 1.11 2006/04/20 12:35:09 chtekk Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
@@ -38,6 +38,8 @@ SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP
 [[ -n "${HARDENEDPHP_PATCH}" ]] && SRC_URI="${SRC_URI} hardenedphp? ( http://gentoo.longitekk.com/${HARDENEDPHP_PATCH} )"
 
 pkg_setup() {
+	PHPCONFUTILS_AUTO_USE=""
+
 	# make sure the user has specified a SAPI
 	einfo "Determining SAPI(s) to build"
 	phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
@@ -81,7 +83,7 @@ php_determine_sapis() {
 	# holds the list of sapis that we want to build
 	PHPSAPIS=
 
-	if useq cli ; then
+	if useq cli || phpconfutils_usecheck cli ; then
 		PHPSAPIS="${PHPSAPIS} cli"
 	fi
 
diff --git a/dev-lang/php/php-5.0.5-r5.ebuild b/dev-lang/php/php-5.0.5-r5.ebuild
index a5b03c210c28..f52af8006e29 100644
--- a/dev-lang/php/php-5.0.5-r5.ebuild
+++ b/dev-lang/php/php-5.0.5-r5.ebuild
@@ -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/dev-lang/php/php-5.0.5-r5.ebuild,v 1.13 2006/03/24 23:04:27 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.0.5-r5.ebuild,v 1.14 2006/04/20 12:35:09 chtekk Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
@@ -37,6 +37,8 @@ SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP
 [[ -n "${HARDENEDPHP_PATCH}" ]] && SRC_URI="${SRC_URI} hardenedphp? ( http://gentoo.longitekk.com/${HARDENEDPHP_PATCH} )"
 
 pkg_setup() {
+	PHPCONFUTILS_AUTO_USE=""
+
 	# make sure the user has specified a SAPI
 	einfo "Determining SAPI(s) to build"
 	phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
@@ -69,7 +71,7 @@ php_determine_sapis() {
 	# holds the list of sapis that we want to build
 	PHPSAPIS=
 
-	if useq cli ; then
+	if useq cli || phpconfutils_usecheck cli ; then
 		PHPSAPIS="${PHPSAPIS} cli"
 	fi
 
diff --git a/dev-lang/php/php-5.1.2-r1.ebuild b/dev-lang/php/php-5.1.2-r1.ebuild
index 3b7dbb122f23..20208e0b56c6 100644
--- a/dev-lang/php/php-5.1.2-r1.ebuild
+++ b/dev-lang/php/php-5.1.2-r1.ebuild
@@ -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/dev-lang/php/php-5.1.2-r1.ebuild,v 1.1 2006/04/13 20:28:58 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.2-r1.ebuild,v 1.2 2006/04/20 12:35:09 chtekk Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
@@ -38,6 +38,8 @@ SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP
 [[ -n "${HARDENEDPHP_PATCH}" ]] && SRC_URI="${SRC_URI} hardenedphp? ( http://gentoo.longitekk.com/${HARDENEDPHP_PATCH} )"
 
 pkg_setup() {
+	PHPCONFUTILS_AUTO_USE=""
+
 	# make sure the user has specified a SAPI
 	einfo "Determining SAPI(s) to build"
 	phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
@@ -81,7 +83,7 @@ php_determine_sapis() {
 	# holds the list of sapis that we want to build
 	PHPSAPIS=
 
-	if useq cli ; then
+	if useq cli || phpconfutils_usecheck cli ; then
 		PHPSAPIS="${PHPSAPIS} cli"
 	fi
 
diff --git a/dev-lang/php/php-5.1.2.ebuild b/dev-lang/php/php-5.1.2.ebuild
index 1e88d5fadcc0..66ed5f9c90d2 100644
--- a/dev-lang/php/php-5.1.2.ebuild
+++ b/dev-lang/php/php-5.1.2.ebuild
@@ -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/dev-lang/php/php-5.1.2.ebuild,v 1.10 2006/03/24 23:04:27 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.2.ebuild,v 1.11 2006/04/20 12:35:09 chtekk Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
@@ -38,6 +38,8 @@ SRC_URI="${SRC_URI} http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP
 [[ -n "${HARDENEDPHP_PATCH}" ]] && SRC_URI="${SRC_URI} hardenedphp? ( http://gentoo.longitekk.com/${HARDENEDPHP_PATCH} )"
 
 pkg_setup() {
+	PHPCONFUTILS_AUTO_USE=""
+
 	# make sure the user has specified a SAPI
 	einfo "Determining SAPI(s) to build"
 	phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
@@ -81,7 +83,7 @@ php_determine_sapis() {
 	# holds the list of sapis that we want to build
 	PHPSAPIS=
 
-	if useq cli ; then
+	if useq cli || phpconfutils_usecheck cli ; then
 		PHPSAPIS="${PHPSAPIS} cli"
 	fi