diff options
| author |   Ole Markus With <olemarkus@gentoo.org> | 2010-10-31 09:26:32 +0000 |
|---|---|---|
| committer | Ole Markus With <olemarkus@gentoo.org> | 2010-10-31 09:26:32 +0000 |
| commit | f672f18b49afd4ecab6553160897a47875f4f65e (patch) | |
| tree | 2d621c8aecd6bba1819522d73fb0ed3a49b0c396 /dev-lang | |
| parent | Version bump (diff) | |
| download | historical-f672f18b49afd4ecab6553160897a47875f4f65e.tar.gz historical-f672f18b49afd4ecab6553160897a47875f4f65e.tar.bz2 historical-f672f18b49afd4ecab6553160897a47875f4f65e.zip | |
Fixed a QA issue related to nonexisting SAPIs
Package-Manager: portage-2.1.9.11/cvs/Linux x86_64
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/php/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/php/Manifest | 4 | ||||
| -rw-r--r-- | dev-lang/php/files/eblits/pkg_postinst-v2.eblit | 10 |
3 files changed, 12 insertions, 7 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index 74d119aad786..f35cd2292364 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/php # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.429 2010/10/30 21:41:10 olemarkus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.430 2010/10/31 09:26:32 olemarkus Exp $ + + 31 Oct 2010; <olemarkus@gentoo.org> files/eblits/pkg_postinst-v2.eblit: + Fixed a QA issue related to nonexisting SAPIs 30 Oct 2010; <olemarkus@gentoo.org> files/eblits/pkg_postinst-v2.eblit, php-5.2.14-r1.ebuild, files/eblits/src_install-v2.eblit, diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 8ec1b2acf076..9f245b7fc8e0 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -6,7 +6,7 @@ AUX 70_mod_php5_concurr.conf-apache2-r1 376 RMD160 4f7de5c0784b6191450b5c1a7de7a AUX eblits/common-v1.eblit 379 RMD160 60b526e9a736553f6e4883c9fb9525464192bde2 SHA1 97c4e1c9475d73227f26cbef80640f43d838af6f SHA256 65c909a6d0501a6746518f539c4a4021426469cbf20b2a212fb0d60b48da5362 AUX eblits/common-v2.eblit 379 RMD160 595fd6c6be1e0ac15012ea78497a4d2c287c6754 SHA1 98e28261e32bda53c7dfef88def615f633af7c44 SHA256 8c15442b04b0216342ef6f2b8565cb3510f6850fe67745d5697861e2f7759194 AUX eblits/pkg_postinst-v1.eblit 2306 RMD160 856f8b1145c6afe71b671a0800ff1a805acf477a SHA1 48ee33a91e4f08d91f47f6976fde63cde40fa948 SHA256 62f3b1463b82fdf779344df335b0a8b78207543652c13c30a830e99e649c3147 -AUX eblits/pkg_postinst-v2.eblit 1448 RMD160 941e624927f0724d911c931bb7bd59f481fd7945 SHA1 4c276591a542cad0d198664e1d3821d58287bc3f SHA256 a8894f9050e2387b3527e894d4e43824ea1862073c53f1aeab17913a7c37c5f3 +AUX eblits/pkg_postinst-v2.eblit 1500 RMD160 22359dba258c9e9dde78de7ae0873ce91ad92ce8 SHA1 a374eb8f2d4c93319832ee227a29c3a12a693ae9 SHA256 cc6c03091a6fb888cde455cf193495610f9ce3c4f604e83239e498793822511c AUX eblits/pkg_setup-v1.eblit 777 RMD160 aa63e7ab1bae34feffbbfaae902f11c6e797ba9d SHA1 f7334a4750b1a1bb2f24021dff884733a88ac347 SHA256 2613f51ee9e3a258dbab38ff2df724f2971a50a5ad8c097cb5a4e3744df5fc8a AUX eblits/pkg_setup-v2.eblit 527 RMD160 c8700795e0c3a38538622a02d2dd7d5a34438783 SHA1 affda60b6e4501fb2bc0d50f6d63b6bc78cd6205 SHA256 f7dca5b41844d87cbbcf06d3f46952d892ff0edf58a8b0fc7ba79459180596b5 AUX eblits/src_compile-v1.eblit 1283 RMD160 83fbb374e2dfaa9d164e6b32b57c268ed06bf519 SHA1 09124cbc9008bfb72eb24cd24b2319d22df52c2c SHA256 5ec76ae24304c5f803a615a98394c219018da1b1ce2018f92f6ac8c5becf6c99 @@ -35,5 +35,5 @@ EBUILD php-5.2.14-r1.ebuild 9417 RMD160 0e05131fdcbdc00ecec7a266bf91fecfad7656fd EBUILD php-5.2.14.ebuild 9164 RMD160 893778d74f25ee5a0f1310be970499152102c7f6 SHA1 4f82548143854bcb759eda79a040b40d160408c3 SHA256 0c91e2a72176d103d377f328af20f759fd087ebb00e761b28d3fc372dfb09a59 EBUILD php-5.3.3-r1.ebuild 9494 RMD160 ecc97c2d06e736f6a7e0e991b19669508c5f3ab0 SHA1 2083da14f8466d3231eed46604039e6bc4864cff SHA256 df33c39b610bbbc1e46ac3da97817205b7a57238f7bbaca72c10ff5dd30eec05 EBUILD php-5.3.3-r2.ebuild 9732 RMD160 753f43f314443837bff80ce53af8ebb80da636a9 SHA1 e334e153a7e3c9f0bffbc1c702d797a6af4f8631 SHA256 3e5fc48c2ab1cfdefbb2367585dddbd70497fc1256ea1001c4a617e8e249bfa3 -MISC ChangeLog 73697 RMD160 a4605c592f8450f62a0d616a125d3c7924b72bd9 SHA1 2845e3efe3d99048dfde13a827fcb95cda931cbf SHA256 1bd0fe7e863f32fd67b174ec24bb82d4b83b6a22a2dfa0313518d4ad81233966 +MISC ChangeLog 73820 RMD160 22f366a6c7ed03dd60f9ceddf2c2083eac5c4935 SHA1 2d5ea4b5709d00a20bc3323c22058c8449f599b2 SHA256 ad08a34a5c363d5e95cdc7b86bdc811619706dac4349635ec4d7379ea0cab1e7 MISC metadata.xml 2090 RMD160 5e8fc242c6035f8f3f12bd2ce2f77a5621398ac5 SHA1 3726febbe532141d65abccd6d6573ece6a3682c7 SHA256 0ba00cbf8509c6d9d21bf5d92759b32d5259051b4ed044fed71a4164460c65d8 diff --git a/dev-lang/php/files/eblits/pkg_postinst-v2.eblit b/dev-lang/php/files/eblits/pkg_postinst-v2.eblit index f2c2a14da09b..f6ecdf319627 100644 --- a/dev-lang/php/files/eblits/pkg_postinst-v2.eblit +++ b/dev-lang/php/files/eblits/pkg_postinst-v2.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit,v 1.4 2010/10/30 21:41:10 olemarkus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit,v 1.5 2010/10/31 09:26:32 olemarkus Exp $ eblit-php-pkg_postinst() { # Output some general info to the user @@ -12,14 +12,16 @@ eblit-php-pkg_postinst() { # Create the symlinks for php - local m modules="cli apache2 fpm cgi" - for m in $modules; do + for m in ${SAPI}; do + [[ ${m} == 'embed' ]] && continue; if use $m ; then local ci=$(eselect php show $m) if [[ -z $ci ]]; then eselect php set $m php${SLOT} + einfo "Switched ${m} to use php:${SLOT}" + einfo elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php-${SLOT}, run" + elog "To switch $m to use php:${SLOT}, run" elog " eselect php set $m php${SLOT}" elog fi |