Fixed amd64-specific patch, bug 46260

diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index b635c5f513b1b5af14634dc69fc7aa7d41dbdf6b..b6815f43f91a01df213086375e49ac78e96c4d5a 100644 (file)
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.78 2004/03/29 00:06:12 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.79 2004/03/30 19:28:58 avenj Exp $
+
+  30 Mar 2004; Jon Portnoy <avenj@gentoo.org> php-4.3.5.ebuild :
+  Fixed path for amd64 patch. Bug #46260.
 
   29 Mar 2004; Stuart Herbert <stuart@gentoo.org> php-4.3.5.ebuild:
   Fix for 'make install_modules' failing if no shared modules are built

diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 875773b4a3ccb09711ec02d9fe61bbc6271d401d..f64cf831e1cd78699a322938a96ef21b670585fc 100644 (file)
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,36 +1,36 @@
-MD5 b2e03c90ac8671fbd669d028538136ca php-4.3.4-r2.ebuild 1136
-MD5 bcd91247964caa0747b672f519b2b9a5 php-5.0_beta1-r1.ebuild 1285
+MD5 f70b50071cab07e79e28af55c09c2845 ChangeLog 12272
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 02828b6fa75a43b15d78d0966e1d8400 php-4.3.2-r1.ebuild 979
+MD5 91f4a7fde0f3e06d7e7cfa4bb3f914c2 php-4.3.2-r2.ebuild 1171
 MD5 71a3e4aa0b406c4cb3282bb61b633376 php-4.3.2-r3.ebuild 1129
-MD5 791de6564dbf283f21abce7146c3012e php-4.3.4-r4.ebuild 1379
-MD5 402def0cf0a5834644497f8d6cf82f6c php-4.3.3-r2.ebuild 1199
 MD5 fbe255ea8c0fba329faf947ec54b3d17 php-4.3.2.ebuild 2407
-MD5 893f66078eb2f71dea369863548f3207 php-4.3.5.ebuild 1298
-MD5 2fe52c31a29123ad2f6d31dc864b4d7d php-4.3.4-r1.ebuild 1284
-MD5 91f4a7fde0f3e06d7e7cfa4bb3f914c2 php-4.3.2-r2.ebuild 1171
-MD5 09136ad03063a7b74db16d9be9c651dc php-4.3.4.ebuild 1205
-MD5 11a9e9b747effeeab1fd5a7e8d4ea7c7 php-4.3.4-r3.ebuild 1259
 MD5 139eb871907b545773766aa53589df9e php-4.3.3-r1.ebuild 1198
-MD5 f4e4ff3a27d459b6d1fe3b0477639e7b php-5.0_beta1.ebuild 1165
-MD5 8b02ad1e306115594e5c59c28072ffff ChangeLog 12165
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 402def0cf0a5834644497f8d6cf82f6c php-4.3.3-r2.ebuild 1199
 MD5 4e31b0c66c87e0c0fb4e0f01105f1873 php-4.3.3-r3.ebuild 1208
-MD5 02828b6fa75a43b15d78d0966e1d8400 php-4.3.2-r1.ebuild 979
 MD5 2a544714659ee2a1c457d445d16e24b3 php-4.3.3.ebuild 1199
+MD5 2fe52c31a29123ad2f6d31dc864b4d7d php-4.3.4-r1.ebuild 1284
+MD5 09136ad03063a7b74db16d9be9c651dc php-4.3.4.ebuild 1205
+MD5 bcd91247964caa0747b672f519b2b9a5 php-5.0_beta1-r1.ebuild 1285
+MD5 f4e4ff3a27d459b6d1fe3b0477639e7b php-5.0_beta1.ebuild 1165
+MD5 b2e03c90ac8671fbd669d028538136ca php-4.3.4-r2.ebuild 1136
+MD5 11a9e9b747effeeab1fd5a7e8d4ea7c7 php-4.3.4-r3.ebuild 1259
+MD5 791de6564dbf283f21abce7146c3012e php-4.3.4-r4.ebuild 1379
+MD5 30ef8eb0fa16fc2891a99661c2cde7f4 php-4.3.5.ebuild 1302
+MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2 137
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2-r1 137
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2-r2 137
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2-r3 137
+MD5 e007fc4a17373504abd024180c0d0b3f files/digest-php-4.3.3 137
 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-php-4.3.3-r1 137
 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-php-4.3.3-r2 137
 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-php-4.3.3-r3 137
+MD5 85d30f5e2707a53bd35b201a29371f05 files/digest-php-4.3.4 208
 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-php-4.3.4-r1 137
+MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1 65
+MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1-r1 65
+MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-php-4.3.4-r2 137
 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-php-4.3.4-r3 137
 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-php-4.3.4-r4 137
-MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1-r1 65
-MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
-MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2 137
-MD5 e007fc4a17373504abd024180c0d0b3f files/digest-php-4.3.3 137
-MD5 85d30f5e2707a53bd35b201a29371f05 files/digest-php-4.3.4 208
-MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1 65
-MD5 f01872db97526bff1bd647bfb1a55b57 files/digest-php-4.3.5 63
 MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
+MD5 f01872db97526bff1bd647bfb1a55b57 files/digest-php-4.3.5 63

diff --git a/dev-php/php/php-4.3.5.ebuild b/dev-php/php/php-4.3.5.ebuild
index 8ebd3d5339cf30a05be6e4a5fd521296b2f09e67..09dcafa9f2c9130daf77c9ed4a0862e2f007fcea 100644 (file)
--- a/dev-php/php/php-4.3.5.ebuild
+++ b/dev-php/php/php-4.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.5.ebuild,v 1.2 2004/03/29 00:06:12 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.5.ebuild,v 1.3 2004/03/30 19:28:58 avenj Exp $
 
 PHPSAPI="cli"
 inherit php-sapi eutils
@@ -12,7 +12,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
 src_unpack() {
        php-sapi_src_unpack
        if [ "${ARCH}" == "amd64" ] ; then
-               epatch ${FILESDIR}/${P}-amd64hack.diff
+               epatch ${FILESDIR}/php-4.3.4-amd64hack.diff
        fi
 }