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

Package-Manager: portage-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..611aea66d10c 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 a049fa8ff2b24e5c21c0f3c5e7908664 ChangeLog 19777
+RMD160 f5e6a0fe5798a7c443e27285f0df7f55a0a1c778 ChangeLog 19777
+SHA256 ee0f69bb47d3f61905f0ff187cb9969cf13badd470cc01974efda58b920f9a6a 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 3e824764c60fef03dbed55f3ca841099 php-4.3.11-r5.ebuild 8652
+RMD160 e6558c2497d4b1f445cd2f7b89a5478ff2f9e8c3 php-4.3.11-r5.ebuild 8652
+SHA256 c905511bc92efa27b7ab8a90e12afb6b9805535886e3d98ef60ce4b630d333c3 php-4.3.11-r5.ebuild 8652
+MD5 e8d9c526749b6b372a5c34244aa33910 php-4.4.2-r1.ebuild 7946
+RMD160 47de25f1906ad30a29ff6758f02b91305a7a67f1 php-4.4.2-r1.ebuild 7946
+SHA256 37583e197256e41fdfd3119c231980cbe08b79dc037dcb510c61ec98265457bd php-4.4.2-r1.ebuild 7946
+MD5 9e8c6aef09379d067a45c2789144d2b3 php-4.4.2.ebuild 7933
+RMD160 9d30635459a6a92fd23004a199af951b60f55ee7 php-4.4.2.ebuild 7933
+SHA256 df5e713f9b0594e3eb502b35f8e9a1dacaaa8f57ae283d6e501cba402e698688 php-4.4.2.ebuild 7933
+MD5 46a04ed25ecd9fd3893a08b42c11a04f php-5.0.5-r5.ebuild 4749
+RMD160 aa88aa4ab830a5020e0768e3dfd78655c44acc56 php-5.0.5-r5.ebuild 4749
+SHA256 c585546685722ce6c76d1257cf8fb5a066c04f8d7d3e88382d78d9c3d754bc3c php-5.0.5-r5.ebuild 4749
+MD5 271b40513f33e7e0bf4ebb197c3d39b7 php-5.1.2-r1.ebuild 7954
+RMD160 1a6b1b991e4e2c9497ce65ef08d414b829faaa7f php-5.1.2-r1.ebuild 7954
+SHA256 c42130eac67c1d12934500c1f4d269464a305702142df2e100434bf531ff1c51 php-5.1.2-r1.ebuild 7954
+MD5 133bfa02abd39422a466bb2519bcb564 php-5.1.2.ebuild 7941
+RMD160 ca893e8e99d26ace3c0c49a70c252422ae387d73 php-5.1.2.ebuild 7941
+SHA256 11bafdf5f54be4e9f9f5fc8a6a787752fb3b4478552bec8494754314afa4a071 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