fix on stable x86

3 files changed, 24 insertions, 18 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 7e697f663570..470941ac38dc 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.117 2004/01/10 18:24:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.118 2004/01/10 20:58:12 brad_mssw Exp $
+
+  10 Jan 2004; Brad House <brad_mssw@gentoo.org> mod_php-4.3.4-r2.ebuild:
+  reverse change made by robbat2, as it messed up stable x86
 
   10 Jan 2004; Aron Griffis <agriffis@gentoo.org> mod_php-4.3.3-r3.ebuild,
   mod_php-4.3.4-r2.ebuild:
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 2a0d74373045..5bfccc0ae011 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,31 +1,31 @@
-MD5 2e1f01023203c35b3e2f9e72befa4d4a ChangeLog 24192
+MD5 ea7ebb6614b43cbb26434e64ccb2f1cc ChangeLog 24329
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 88dbd3f2adfe7f1c09fbee26bb20e5c7 mod_php-4.3.2-r1.ebuild 2759
+MD5 28148a26446e58d9d8fb427fe2f2c936 mod_php-4.3.2-r2.ebuild 3696
 MD5 f72efb54e1262a9401817b6034bfd00c mod_php-4.3.2-r3.ebuild 4939
 MD5 c786ba6c1893384cab60c3c8c44321b8 mod_php-4.3.2-r4.ebuild 4978
 MD5 475406c417d82d6dc0ea6e13afdf7910 mod_php-4.3.2-r5.ebuild 5109
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 d601c3fbb04d9ee67d7590d457a86885 mod_php-4.3.3_rc3.ebuild 5133
-MD5 1d82562876ca9bdbcafaa426655c310a mod_php-4.3.3.ebuild 4898
 MD5 233ba34538a697386c6bb4d278cb9c0f mod_php-4.3.2.ebuild 3392
-MD5 88dbd3f2adfe7f1c09fbee26bb20e5c7 mod_php-4.3.2-r1.ebuild 2759
-MD5 28148a26446e58d9d8fb427fe2f2c936 mod_php-4.3.2-r2.ebuild 3696
 MD5 54a58c74b5ae50d78eac503c57b365a0 mod_php-4.3.3-r1.ebuild 4937
+MD5 1d82562876ca9bdbcafaa426655c310a mod_php-4.3.3.ebuild 4898
+MD5 d601c3fbb04d9ee67d7590d457a86885 mod_php-4.3.3_rc3.ebuild 5133
 MD5 c705db7e296c11431002f2f2683a42fe mod_php-4.3.3-r2.ebuild 4978
 MD5 61a824c543e99cdb42650f4995b62859 mod_php-4.3.3-r3.ebuild 4985
 MD5 316ca7cc4b59a17862a00e05d52c03d3 mod_php-4.3.4.ebuild 4980
 MD5 ffbd5bb5e64ee85336fe4aec2282acbb mod_php-4.3.4-r1.ebuild 5058
-MD5 871c87bfe45c5316334f3e115ffddf79 mod_php-4.3.4-r2.ebuild 5153
+MD5 816a08a3f1e5bd38f924015673d421ae mod_php-4.3.4-r2.ebuild 5332
 MD5 c0f86a4fc233945f1db33bd39abe22ab files/70_mod_php.conf 1065
-MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
+MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2 137
+MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2-r1 137
+MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2-r2 137
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2-r3 137
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2-r4 137
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2-r5 137
-MD5 bc61d89af9d65e3a482d9b2ffea4fcaf files/digest-mod_php-4.3.3_rc3 140
 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-mod_php-4.3.3 137
-MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
-MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2 137
-MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2-r1 137
-MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2-r2 137
 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-mod_php-4.3.3-r1 137
+MD5 bc61d89af9d65e3a482d9b2ffea4fcaf files/digest-mod_php-4.3.3_rc3 140
+MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
+MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-mod_php-4.3.3-r2 137
 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-mod_php-4.3.3-r3 137
 MD5 85d30f5e2707a53bd35b201a29371f05 files/digest-mod_php-4.3.4 208
diff --git a/dev-php/mod_php/mod_php-4.3.4-r2.ebuild b/dev-php/mod_php/mod_php-4.3.4-r2.ebuild
index 59c1b17e1f5a..33d814559cfb 100644
--- a/dev-php/mod_php/mod_php-4.3.4-r2.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.4-r2.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/mod_php/mod_php-4.3.4-r2.ebuild,v 1.4 2004/01/10 18:24:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.4-r2.ebuild,v 1.5 2004/01/10 20:58:12 brad_mssw Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -56,9 +56,12 @@ DEPEND_EXTRA=">=net-www/apache-1.3.26-r2
 DEPEND="${DEPEND} ${DEPEND_EXTRA}"
 RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
 
-pkg_setup() {
-	use debug && einfo "Installing in SLOT=${SLOT}"
-}
+# Remove pkg_setup as it caused failures on stable x86 when trying to
+# install.  This part was just committed today by robbat2
+# Brad House <brad_mssw@gentoo.org> 01/10/2004
+#pkg_setup() {
+#	use debug && einfo "Installing in SLOT=${SLOT}"
+#}
 
 src_unpack() {
 	multiinstwarn