Fixed FEATURES="test", which apparently has not been working for a while.

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

3 files changed, 19 insertions, 15 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 01d0934811ed..c7659646d28f 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.552 2012/02/06 13:41:27 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.553 2012/02/06 13:53:17 olemarkus Exp $
+
+  06 Feb 2012; Ole Markus With <olemarkus@gentoo.org>
+  files/eblits/src_test-v1.eblit:
+  Fixed FEATURES="test", which apparently has not been working for a while.
 
 *php-5.3.10-r1 (06 Feb 2012)
 
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 795c6de8348c..4fb593d6b7ca 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -17,7 +17,7 @@ AUX eblits/src_install-v3.eblit 4744 RMD160 fee820358f16d51ee0a62d0a67b5a9afa431
 AUX eblits/src_prepare-v2.eblit 2604 RMD160 379dbca3e2ae8c1f09f608220ec9c98d099cb792 SHA1 42afae4e07633535ecea49817f5badd559f10ff1 SHA256 fe7534260fb81a012b8021b5d555756ce8733ad192bf51cedd94f12963811790
 AUX eblits/src_prepare-v3.eblit 2649 RMD160 5f01f42eef528535866c3b5ade0ded592d1ffd48 SHA1 1bdc640ab548f4e8b78acc305fdd6ceab225daf8 SHA256 7ea3a5351fabeb050161e64c09b98ff945bbdb8b4d1a7fb83d6b4645f277b486
 AUX eblits/src_prepare-v4.eblit 2317 RMD160 22833c1caa6f7530230b0809e119eeb2dbba7b27 SHA1 2f7a5fdd113cdf026de5b565fb073e3968db946b SHA256 7c18252a49a6d8e071471d14624f284d7b3ad8b95cad4a001e10e6e521f4c9b1
-AUX eblits/src_test-v1.eblit 1530 RMD160 10031a5128dab729106c6fbfe4e899b1583818cb SHA1 0f1abf995913c2c381e2496b8670ea4f6e97964b SHA256 67501925cfdaf9043e4985d0f1c797e62fb42bf47e6863b5ffdecb104888e82c
+AUX eblits/src_test-v1.eblit 1557 RMD160 2afc2b505f2b4bd786635e5b7e997248e93009c3 SHA1 070c2b58b55fc2cec939d7a333057506413e8e99 SHA256 81e9ecf94793377e42508d9e57cd7ab3faff78bce722b84b63999a23bdb2098a
 AUX php-fpm-r1.conf 12966 RMD160 2710840ccbd847f74af0486929b6b9af87bf2c51 SHA1 4f0cca8cf24936012c9ee5cb2eaa1a0b391e77b3 SHA256 c4308a92ade93812c6579b74a72cd1f3e1a35f7e63289722f461771d5702448c
 AUX php-fpm-r4.init 1157 RMD160 19b129c9254efcbba39d4bf3f77745681497a34d SHA1 0b4b5ba0f10ca1dedc2ea6143781b3bc6fa5915c SHA256 37e34461babfb5881169f9729fbdde7d4aba533f123e2c480fe25ac3b863d3e7
 AUX php5-ldvs 22 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 SHA1 592398c92575adb14ec972847ce2aca28a7b9c2c SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79
@@ -34,16 +34,16 @@ EBUILD php-5.3.10-r1.ebuild 10711 RMD160 dc4856dba666ae3924eb3d99c6b630772a827b3
 EBUILD php-5.3.10.ebuild 10736 RMD160 084256a8ce4c11bd909ba5704820afe1e81305a5 SHA1 7e3c133e4c3ecfc9ac17279d037f97e16dbb7acc SHA256 349d0dd41f81bb8a296d1488b16e59d38c7101d8a21caabd0580df43c9836eb0
 EBUILD php-5.3.9.ebuild 10736 RMD160 1c3ce5c53d3e51febdf7db4efeaa251822435523 SHA1 fbe8d92a71679ff761d0335950d23616504f058c SHA256 0c9787be76a3f24d600ea3b5e33d520d5e995d5785b5725e3b91f5ccd05c19f8
 EBUILD php-5.4.0_rc7.ebuild 10648 RMD160 47964c2dcda1e3e47bc78e6f40f694c9d9a0f86f SHA1 c0f7aee605a5f5f72f33d114e7b8ee52485a301b SHA256 a4dd7412719d40f06b7024bb5adbf29fbb9b010616fa672885c609ee6c623351
-MISC ChangeLog 94126 RMD160 65ea1abdd40d5eb476fe356bcef4f89640cee641 SHA1 c50e99c79a900287c39bddc0f3fe91afba17b8b1 SHA256 b36585e573c2d1c09da8b374cd89eb3461440b7791c91268d5edd640ea80211c
+MISC ChangeLog 94291 RMD160 d1c481c9317ec1699b3d5be912fc1a7f247186cc SHA1 188478fb8dc58c620f3d6a20ec80a13609fd58c6 SHA256 5ab62086a06a3506d9d1631ed9e6147fa2994a1f810251841cc4ec19f3d1d538
 MISC metadata.xml 2075 RMD160 e2eb44e39169dc2ff8e099d670a222e7102b1aea SHA1 9cebbc373dc8441aa0374132a3b5d87df6d37ffc SHA256 3d8bc9305be300ef7ef92d18ba5476927ec90a5b6d43c2408936229590ff5ac5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPL9iyAAoJEGurSuXEqSv1G1EH/3r1EydIFJvAgqrhUx7+uK3s
-tP68i9Lshw+dsjblIJNv8ucWPyPg94UTQkVD4lsyt3MKnVVumv7W/42wvqnP8KE4
-Nb6cddSv+RoZVzY4QUgYucuBL4HEaX3/Vtk9QSXjl/v2SmmcjFg6o4LlLDdil9Ft
-YT9o7ybgpv8cjYiFJhYob+Wz7wng8Qlov2KmTRiUMvIcT5CnD1hLl/K1iPgity7O
-77AxkL+sVhqv3jcnYWx6lzqm3MDDLCjqCUHJ8yUn20sviGuddWcO1mVWYoma2bOs
-zsCVX2M0CYWnK9+dU1/+yKZQeEH1hI19CopyJh77jH/VeH7wK/J3IUNpRlitMCE=
-=E32s
+iQEcBAEBAgAGBQJPL9t4AAoJEGurSuXEqSv1hxQH/jalT14//RFwhQp2Rl8Ht/GV
+GEDylriSXe6BX6RIieNChshxBojbKZ1nrYT9nPfkuD/Rwpk28IMAdIZD94E/i6aY
+HqNn+2n06QIVoJfl0r8fhv7+YHcI3ra7H9e/87VRJtjYni9jGhZB8GkqfPzgJTcq
+VpZvpz2cUMfP7ypoEUGAQUN1+Zndv6lzncpu49LCmiL8mQutOnuUEC5XTaBs4C4b
+i01c8yg7pqwHNSNc/6PZ8foOjRjw342LEwvonGlENIrCYQSlKziBMoBjRmGKTCgF
+ZQJ4bzB8Q1NSRwIhBFwMb3ky7kprtH4bvxg/36exp1GJJ2FMTxU9CMatsGcY/bc=
+=DBpt
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/php/files/eblits/src_test-v1.eblit b/dev-lang/php/files/eblits/src_test-v1.eblit
index 95ebc7db1e9d..07f8d6fba5e5 100644
--- a/dev-lang/php/files/eblits/src_test-v1.eblit
+++ b/dev-lang/php/files/eblits/src_test-v1.eblit
@@ -1,15 +1,15 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_test-v1.eblit,v 1.2 2010/08/09 10:47:57 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_test-v1.eblit,v 1.3 2012/02/06 13:53:17 olemarkus Exp $
 
 eblit-php-src_test() {
 	vecho ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-	if [[ ! -x "${WORKDIR}/sapis/cli/php" ]] ; then
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
 		ewarn "Test phase requires USE=cli, skipping"
 		return
 	else
-		export TEST_PHP_EXECUTABLE="${WORKDIR}/sapis/cli/php"
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
 	fi
 
 	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then