yet another attempt at fixing src_test (no revbump)

Package-Manager: portage-2.1.4.3

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index f7365939f763512bec34273be4fcc34e1e97ace9..bad9254ab901090c6fd9cac9e5049d865e70f356 100644 (file)
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.229 2008/02/12 21:58:56 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.230 2008/02/13 15:53:26 hoffie Exp $
+
+  13 Feb 2008; Christian Hoffmann <hoffie@gentoo.org>
+  php-5.2.5_p20080206-r3.ebuild:
+  yet another attempt at fixing src_test (no revbump)
 
 *php-5.2.5_p20080206-r3 (12 Feb 2008)
 

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 0889850d18766d891b305217f8b68e2893717e7e..35360357e1690ce2a58c1f07fafd52aa8734f8c9 100644 (file)
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -31,14 +31,14 @@ EBUILD php-4.4.8_pre20070816.ebuild 14614 RMD160 55e737bce305755656fc278ebbfb3b1
 EBUILD php-5.2.4_pre200708051230-r2.ebuild 14984 RMD160 2917bce24b7fa4fcf3030dfa9eae3858b0c76560 SHA1 8dc8fd9aaa61aad943ec7ff3f86e0e66d4baac2d SHA256 311806499c903291760652261c8bb7c8b129e5169e7e1d78076f81c39eed1ba5
 EBUILD php-5.2.5-r1.ebuild 14835 RMD160 cdcb33968c89bcc49746a9b0e1127aa0df41207b SHA1 726ee774a6b930af9160402f9f75de78f1cea981 SHA256 a256cb31564e9b0c1cf34ec480a84405de5f76cc4371b28bc8ebd4c32042173e
 EBUILD php-5.2.5_p20080206-r2.ebuild 15320 RMD160 46f9964e534d1ac40f206fb591f187eeeaeed566 SHA1 90e3637cd8532ab55b8f4a22cf6948f3743e79bd SHA256 31ec98845130010af7a5216416c637f20467d08142f81b00d60ff9a5cc537907
-EBUILD php-5.2.5_p20080206-r3.ebuild 15320 RMD160 653855b5d9e8e192315bee288a3668a8173fbbaf SHA1 6ad55f3de7021fa5e77cb1614a9bf85b52984ab7 SHA256 dc3db5fa444b97bc4f48b31dfc6303aa8232cc5d47f420aed0b1952521a309d5
+EBUILD php-5.2.5_p20080206-r3.ebuild 15315 RMD160 72b6ddfee9a7cfb3cd31f456357e6ccf03bf64b6 SHA1 8ebb6786a34d8c42ab5290a84b358029c919db13 SHA256 d919025db0285743ea209948927661d274281ed84ea4a94dcac69c50b0e9d9a1
 EBUILD php-5.2.5_p20080206.ebuild 15232 RMD160 ff5bad88186d2cef7531922761a137afeabd1597 SHA1 c1046478ae42d6a5d8a240cd1273a3ff104e11d4 SHA256 cb60b9cc20d3f2493c7ba9185cb5fec239427a004ec6319763802d8246676c42
-MISC ChangeLog 42224 RMD160 bda9cd565ea676f9a8b6fbb5da2241d6516fbbfa SHA1 ae64efa5cef40fa2805ed9265bba7438ae12b463 SHA256 37ea7eae37bc5661497160a367a6d3fccba12fa5884f59cae9595efebea6ea96
+MISC ChangeLog 42366 RMD160 2d069e519fab744cf9167aeb0f12c61ca91db9d4 SHA1 05c3daf458e97f3fb18cb13e8a7f2f7fba04d7bf SHA256 fb61fb434a1b5360609db1ac56f7340b8d71cb635eeae1dc2a48133554520a8a
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHshavJ9KLJlGHWYIRAuUkAKDlGGz1q+x+AUvy5wd9j0SpvPLAnACfQZJL
-Ag+gTg3k5uWMQ+nnFZa0tLw=
-=aM97
+iD8DBQFHsxKAJ9KLJlGHWYIRAjGDAJ9uts+XRn146/KcVhln1fn7AdDgwACg4HRI
+M9cEGlTcrrkeJcpb3X7/2wk=
+=0BSZ
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/php/php-5.2.5_p20080206-r3.ebuild b/dev-lang/php/php-5.2.5_p20080206-r3.ebuild
index 7478e07b1da23b351bc2fbfdd5963aac3cf13f51..669be7fc11fc56a9cbb3c97defaf020b8433457d 100644 (file)
--- a/dev-lang/php/php-5.2.5_p20080206-r3.ebuild
+++ b/dev-lang/php/php-5.2.5_p20080206-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.5_p20080206-r3.ebuild,v 1.1 2008/02/12 21:58:56 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.5_p20080206-r3.ebuild,v 1.2 2008/02/13 15:53:26 hoffie Exp $
 
 CGI_SAPI_USE="discard-path force-cgi-redirect"
 APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -501,7 +501,7 @@ src_test() {
        if [[ -x "${S}"/php-cgi ]]; then
                export TEST_PHP_CGI_EXECUTABLE="${S}"/php-cgi
        fi
-       REPORT_EXIT_STATUS=1 "${S}"/sapi/cli/php -n "${S}"/run-tests.php -n
+       REPORT_EXIT_STATUS=1 "${S}"/php-cli -n "${S}"/run-tests.php -n
 
        if [[ $? != 0 ]] ; then
                eerror "Not all tests were successful!"