fix bug #25326 hopefully

6 files changed, 31 insertions, 22 deletions

diff --git a/dev-php/php-cvs/ChangeLog b/dev-php/php-cvs/ChangeLog
index de54d5a3ab37..afed85e42731 100644
--- a/dev-php/php-cvs/ChangeLog
+++ b/dev-php/php-cvs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-php/php-cvs
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cvs/ChangeLog,v 1.5 2003/10/08 19:06:51 coredumb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cvs/ChangeLog,v 1.6 2003/10/26 04:16:28 robbat2 Exp $
+
+  25 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> php-cvs-5.0-r2.ebuild:
+  fix bug #25326 hopefully
 
 *php-cvs-5.0-r2 (08 Oct 2003)
 
diff --git a/dev-php/php-cvs/Manifest b/dev-php/php-cvs/Manifest
index 11b593db6e44..201d8b7a4732 100644
--- a/dev-php/php-cvs/Manifest
+++ b/dev-php/php-cvs/Manifest
@@ -1,7 +1,7 @@
-MD5 041752d75da39d0d71463c5bd60e59f7 php-cvs-5.0.ebuild 1359
-MD5 29b64452e34b0e59ecfab59f2237779e ChangeLog 1012
-MD5 d170f1a802a4ddb4925e535f1669ad9c php-cvs-5.0-r1.ebuild 1011
-MD5 fa1f03e66a19041f4b5522cfe48221a2 php-cvs-5.0-r2.ebuild 1058
+MD5 2049011d811764d16ab6722a408ccce2 php-cvs-5.0-r2.ebuild 1098
+MD5 d9115512be55b2530308a5be786e15b1 php-cvs-5.0-r1.ebuild 1010
+MD5 eadd0fec63b134f60a077cbcd0d2ee8c php-cvs-5.0.ebuild 1358
+MD5 dc5cf66626fc84feaaf64680569b5b8a ChangeLog 1114
 MD5 90addd9e0cd39bebc1ca9eef0185f6fd metadata.xml 268
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-php-cvs-5.0 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-php-cvs-5.0-r1 0
diff --git a/dev-php/php-cvs/php-cvs-5.0-r2.ebuild b/dev-php/php-cvs/php-cvs-5.0-r2.ebuild
index 479ce17aeafe..4188a17c175a 100644
--- a/dev-php/php-cvs/php-cvs-5.0-r2.ebuild
+++ b/dev-php/php-cvs/php-cvs-5.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cvs/php-cvs-5.0-r2.ebuild,v 1.1 2003/10/08 19:06:51 coredumb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cvs/php-cvs-5.0-r2.ebuild,v 1.2 2003/10/26 04:16:28 robbat2 Exp $
 
 ECVS_SERVER="cvs.php.net:/repository"
 ECVS_MODULE="php-src"
@@ -20,7 +20,9 @@ SRC_URI=""
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc"
 DEPEND="${DEPEND}
-	>=dev-util/re2c-0.9.1"
+	>=dev-util/re2c-0.9.1
+	truetype? ( >=media-libs/t1lib-5.0.0 )
+	"
 
 src_unpack() {
 	cvs_src_unpack
diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index ad87339bf6d5..9815ba6a3529 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.62 2003/10/23 02:06:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.63 2003/10/26 04:16:12 robbat2 Exp $
+
+  25 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> php-5.0_beta1-r1.ebuild:
+  fix bug #25326 hopefully
 
 *php-4.3.3-r3 (22 Oct 2003)
 
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 0143ab8a2d1e..765e13458365 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,4 +1,15 @@
-MD5 e33deca0ed1064a23f9337cfc0b71c2b php-5.0_beta1-r1.ebuild 1258
+MD5 49677578b21e86c1db7a1561d04f754a php-5.0_beta1-r1.ebuild 1295
+MD5 0d9585a857a06f4d336cf647dd8728d4 php-4.3.2-r3.ebuild 1140
+MD5 c8cc2dc8ab39618308726f1749d14d61 php-4.3.3-r2.ebuild 1207
+MD5 25f97fc9df6d134f3da1b4e5c1414830 php-4.3.2.ebuild 2418
+MD5 3eeafc4e390ffd783e014a5ec877e820 php-4.3.2-r2.ebuild 1182
+MD5 f1385520cac897796eeae1ad974ac15c php-4.3.3-r1.ebuild 1208
+MD5 ff00712ef064fedea5c310204c367b1a php-5.0_beta1.ebuild 1176
+MD5 9751be17197a00183a15d02ff78ebe8a ChangeLog 9667
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 db16022e0ec00d919b30ab222f073577 php-4.3.3-r3.ebuild 1218
+MD5 ce0950f7facac1bcd6c3f99321f4648a php-4.3.2-r1.ebuild 990
+MD5 bc498859e45cdd2924f64ae5ef806239 php-4.3.3.ebuild 1210
 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
@@ -10,14 +21,3 @@ 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 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1 65
-MD5 9960c1a7ed72f9fdedce49456bd805a2 php-4.3.2-r3.ebuild 1141
-MD5 66ce848fd56119473b2d66722f59316b php-4.3.3-r2.ebuild 1208
-MD5 f09650e6c25eea6768304c608e96fac6 php-4.3.2.ebuild 2419
-MD5 fb73db8354092f57ac65bf17eb9b5ba9 php-4.3.2-r2.ebuild 1183
-MD5 5d0eff803459486b748cd3b47da21c39 php-4.3.3-r1.ebuild 1209
-MD5 02965cb9de4d44841d680156e18c96b2 php-5.0_beta1.ebuild 1177
-MD5 4a93a55241caa69f5dc2d63e9baf4c32 ChangeLog 9562
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 4853c60510825040397e1510f17f3077 php-4.3.3-r3.ebuild 1219
-MD5 fb86d5617b1f16c5db4b2d8408f149ba php-4.3.2-r1.ebuild 991
-MD5 641b63b1b80eb8d2cf90d557ee48edaa php-4.3.3.ebuild 1211
diff --git a/dev-php/php/php-5.0_beta1-r1.ebuild b/dev-php/php/php-5.0_beta1-r1.ebuild
index 1e0bb8c4dab1..64e5a4865516 100644
--- a/dev-php/php/php-5.0_beta1-r1.ebuild
+++ b/dev-php/php/php-5.0_beta1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-5.0_beta1-r1.ebuild,v 1.2 2003/09/08 04:45:56 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-5.0_beta1-r1.ebuild,v 1.3 2003/10/26 04:16:12 robbat2 Exp $
 
 PHPSAPI="cli"
 MY_P="php-5.0.0b1"
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~mips"
 
 DEPEND="${DEPEND}
-	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) "
+	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
+	truetype? ( >=media-libs/t1lib-5.0.0 )"
 
 RDEPEND="${RDEPEND}"