conflict fixo

2 files changed, 65 insertions, 105 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index be52dd6b1143..19b6a284f8b7 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,158 +1,126 @@
 # ChangeLog for dev-lang/php
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.15 2002/09/02 16:47:00 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.16 2002/09/02 16:57:07 drobbins Exp $
 
-*mod_php-4.2.2-r1 (18 Aug 2002)
-
-  1 Sep 2002; Brandon Low <lostlogic@gentoo.org> mod_php-4.2.2-r1.ebuild :
+  02 Sep 2002; Daniel Robbins <drobbins@gentoo.org> mod_php-4.2.2-r1.ebuild :
+  rphillips' gmp fix broke the ebuild, fixing... (no rev bump)
 
+  02 Sep 2002; Brandon Low <lostlogic@gentoo.org> mod_php-4.2.2-r1.ebuild :
   Test your ebuilds, you can't just comment in the middle like that, then
   the next thing becomes a separate funky command.
 
-  1 Sep 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.2-r1.ebuild :
+*mod_php-4.2.2-r1 (18 Aug 2002)
 
-  Users have had trouble compiling with gmp support... Disabled for know
+  01 Sep 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.2-r1.ebuild :
+  Users have had trouble compiling with gmp support... Disabled for now
 
   30 Aug 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.2-r1.ebuild :
-
   Fixed xml dependency bug
 
   26 Aug 2002; Donny Davies <woodchip@gentoo.org> mod_php-4.2.2-r1.ebuild :
-
   Clarified/cleaned pkg_postinst, cosmetic-only fix.
 
   26 Aug 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.2-r1.ebuild :
-
-  Added support for multibyte strings. Fixes #6747
-  Submitted by Ryan Shaw
+  Added support for multibyte strings. Fixes #6747 Submitted by Ryan Shaw
 
   18 Aug 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.2-r1.ebuild :
-
   Should fix pdflib/jpeg/tiff/java bug... #2708
 
 *mod_php-4.2.2 (22 Jul 2002)
   
-  22 Jul 2002; Daniel Ahlberg <aliz@gentoo.org>
-  
-  Security update, no other changes.
+  22 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> Security update, no other
+  changes.
 
 *mod_php-4.2.1-r5 (12 Jul 2002)
 
-  26 Aug 2002; Ryan Phillips <rphillips@gentoo.org>
-
-  Added --enable-exif
+  26 Aug 2002; Ryan Phillips <rphillips@gentoo.org> Added --enable-exif
 
-  15 Jul 2002; Owen Stampflee <owen@gentoo.org>
+  15 Jul 2002; Owen Stampflee <owen@gentoo.org> Added KEYWORDS="x86 ppc" for
+  all versions of the mod_php ebuild
 
-  Added KEYWORDS="x86 ppc" for all versions of the mod_php ebuild
+  27 Apr 2002; Ryan Phillips <rphillips@gentoo.org> : There is a compilation
+  problem with the --with-gettext variable being passed to configure from
+  within portage.
 
-  27 Apr 2002; Ryan Phillips <rphillips@gentoo.org> :
-
-  There is a compilation problem with the --with-gettext 
-  variable being passed to configure from within portage.
-
-  25 Apr 2002; Donny Davies <woodchip@gentoo.org> :
-
-  Clarify the pkg_postinst() message.
-
-  16 Apr 2002; Seemant Kulleen <seemant@gentoo.org> :
-  
-  I caused the gettext bug.  The configure options do not like --with-gettext
-  set.  They only like --without-gettext set.  Who knew?
-
-  Hmm, and I did not edit the ChangeLog for some reason to say that the mhash
-  and mcrypt flags are encapsulated by the crypt flag now.
+  25 Apr 2002; Donny Davies <woodchip@gentoo.org> : Clarify the pkg_postinst()
+  message.
 
+  16 Apr 2002; Seemant Kulleen <seemant@gentoo.org> : I caused the gettext bug.
+  The configure options do not like --with-gettext set.  They only like
+  --without-gettext set.  Who knew?  Hmm, and I did not edit the ChangeLog for
+  some reason to say that the mhash and mcrypt flags are encapsulated by the
+  crypt flag now.
 
   16 Jul 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.1-r5.ebuild :
-
   Added libwww depedency to xml use var
 
   16 Jul 2002; Ryan Phillips <rphillips@gentoo.org> mod_php-4.2.1-r5.ebuild :
-
   Now provides virtual support
 
-  12 Jul 2002; Roman Weber <gentoo@gonzo.ch> mod_php-4.2.1-r5.ebuild :
-    
-	  Fixed compile error with sablotron 0.95
-	    Fixed weird uname bug. (Bug #4913)   
+  12 Jul 2002; Roman Weber <gentoo@gonzo.ch> mod_php-4.2.1-r5.ebuild : Fixed
+  compile error with sablotron 0.95 Fixed weird uname bug. (Bug #4913)   
 		
 *mod_php-4.2.1-r4 (09 Jul 2002)
 
-  09 Jul 2002; Roman Weber <gentoo@gonzo.ch>
-
-    Changed dependency from >=net-www/apache-1.3.24-r1 to
-	  >=net-www/apache-1.3.26-r2 (Apache 1.3.26 includes a fix for the
-	  "chunked encoding" issue). Closes bug #4677.
-	added oci8 use variable to support Oracle databases
+  09 Jul 2002; Roman Weber <gentoo@gonzo.ch> Changed dependency from
+  >=net-www/apache-1.3.24-r1 to >=net-www/apache-1.3.26-r2 (Apache 1.3.26
+  >includes a fix for the "chunked encoding" issue). Closes bug #4677.  added
+  >oci8 use variable to support Oracle databases
 
 *mod_php-4.2.1-r3 (02 Jul 2002) 
-  02 Jul 2002; Owen Stampflee <owen@gentoo.org>
-  Fixed syntax errors in use vars freetype, jpeg, tiff, png, and gd
+
+  02 Jul 2002; Owen Stampflee <owen@gentoo.org> Fixed syntax errors in use vars
+  freetype, jpeg, tiff, png, and gd
 
 *mod_php-4.2.1-r2 (26 June 2002) 
+  
   26 June 2002; Roman Weber <gentoo@gonzo.ch> mod_php-4.2.1-r2.ebuild : 
-   
   Added 'use' variables: freetype, jpeg, tiff, png and gd (Bug #3900)   
 
 *mod_php-4.2.1-r1 (17 June 2002) 
  
-  17 June 2002; Roman Weber <gentoo@gonzo.ch> mod_php-4.2.1-r1.ebuild : 
-   
-  Fixed 'use nls' issue. (Bug #2895)  
+  17 June 2002; Roman Weber <gentoo@gonzo.ch> mod_php-4.2.1-r1.ebuild : Fixed
+  'use nls' issue. (Bug #2895)  
  
 *php-4.2.1-r1 (21 May 2002)
 
-  5 June 2002; Ryan Phillips <rphillips@gentoo.org> php-4.2.1-r1.ebuild :
-
+  05 June 2002; Ryan Phillips <rphillips@gentoo.org> php-4.2.1-r1.ebuild :
   Added support for firebird
 
-  21 May 2002; Roman Weber <gentoo@gonzo.ch> php-4.2.1-r1.ebuild :
-    
-  Added XSLT sablotron to XML USE variable. Bug #2863 
-  Fixed symlink to extensions directory. Bug #2886
+  21 May 2002; Roman Weber <gentoo@gonzo.ch> php-4.2.1-r1.ebuild : Added XSLT
+  sablotron to XML USE variable. Bug #2863 Fixed symlink to extensions
+  directory. Bug #2886
 
 *php-4.2.1 (17 May 2002)
 
-  19 May 2002; Ryan Phillips <rphillips@gentoo.org> php-4.2.1.ebuild:
-
-  Changed --with-png-dir=/usr/lib \   to
-  --with-png-dir=/usr \
+  19 May 2002; Ryan Phillips <rphillips@gentoo.org> php-4.2.1.ebuild: Changed
+  --with-png-dir=/usr/lib \   to --with-png-dir=/usr \
 
-  17 May 2002; Roman Weber <gentoo@gonzo.ch> php-4.2.1.ebuild :
-
-  New release
-  Fixed flash ming issue. Bug #2707
-  Fixed mysql issue. Bug #2711
-  Set register_globals = On in php.ini. Lower security but more
-    compatibility. See http://www.php.net/release_4_1_2.php
-  Readded curl/snmp/bz2/ssl. Tnx Todd
-  Symlinked php.ini to old place. Tnx Todd.
-  Disabled Java in ebuild. I'm not glad about it but it's imho the only
-    way to fix a nasty bug. Perhaps it will work with an extra ebuild
-    for the java extension. Bug #2708  
+  17 May 2002; Roman Weber <gentoo@gonzo.ch> php-4.2.1.ebuild : New release
+  Fixed flash ming issue. Bug #2707 Fixed mysql issue. Bug #2711 Set
+  register_globals = On in php.ini. Lower security but more compatibility. See
+  http://www.php.net/release_4_1_2.php Readded curl/snmp/bz2/ssl. Tnx Todd
+  Symlinked php.ini to old place. Tnx Todd.  Disabled Java in ebuild. I'm not
+  glad about it but it's imho the only way to fix a nasty bug. Perhaps it will
+  work with an extra ebuild for the java extension. Bug #2708  
 		
 *php-4.2.0 (12 May 2002)
 
   12 May 2002; Ryan Phillips <rphillips@gentoo.org> php-4.2.0.ebuild :
-
   Added a message to warn the user that setting the register_globals
   option to off may break compatibility with some scripts.
   
   8 May 2002; Ryan Phillips <rphillips@gentoo.org> php-4.2.0.ebuild :
-
   New release
 
 *php-4.1.2-r9 (5 May 2002)
 
   5 May 2002; Ryan Phillips <rphillips@gentoo.org> php-4.1.2-r9.ebuild :
-
   Added support for SSL, snmp, curl, and bzip2 to package.  Fixes #2468
 
 *php-4.1.2-r8 (28 Apr 2002)
 
   27 Apr 2002; Ryan Phillips <rphillips@gentoo.org> php-4.1.2-r7.ebuild :
-
   for some reason --with-gettext doesn't find the libraries it needs. 
   ./configure --with-gettext from the commandline works fine.  reopening
   bug report.
@@ -160,50 +128,42 @@
 *php-4.1.2-r8 (27 Apr 2002)
 
   27 Apr 2002; Ryan Phillips <rphillips@gentoo.org> php-4.1.2-r7.ebuild :
-
   Tweaked ebuild to include --with-gettext support.  This fixes #2106, but
   does it break anything else?
 
 *php-4.1.2-r7 (15 Apr 2002)
 
-  15 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org> php-4.1.2-r7.ebuild :
-  
-  Fixed php to check for imap with ssl support when compiling the imap
-  extension. Bug #1254
-  Fixed bug where php couldn't find path to javac. Bug #1401
-  Modified the ebuild so it DEPENDs on net-mail/uw-imap instead of
-  the old virtual/imapUW
+  15 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org> php-4.1.2-r7.ebuild : Fixed
+  php to check for imap with ssl support when compiling the imap extension. Bug
+  #1254 Fixed bug where php couldn't find path to javac. Bug #1401 Modified the
+  ebuild so it DEPENDs on net-mail/uw-imap instead of the old virtual/imapUW
 	
 *php-4.1.2-r6 (12 Apr 2002) 
 
-  12 Apr 2002; Spider <spider@gentoo.org>
-
-  update -r to force rebuild with updated libpng
+  12 Apr 2002; Spider <spider@gentoo.org> update -r to force rebuild with
+  updated libpng
   
 *php-4.1.2-r5 php-4.1.1-r5 (12 Apr 2002)
 
   12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> php-4.1.2-r5.ebuild,
-  php-4.1.1-r5.ebuild :
-
-  Changed the "gettext" USE flag to "nls" since that is the same thing.
+  php-4.1.1-r5.ebuild : Changed the "gettext" USE flag to "nls" since that is
+  the same thing.
 
 *php-4.1.2-r5 (10 Apr 2002)
 
   10 Apr 2002; Donny Davies <woodchip@gentoo.org> php-4.1.2-r5.ebuild,
-  files/mod_php.conf :
-
-  Added a mod_php.conf file, which installs into the apache addon-modules config
-  directory.  This eliminates the need to "sed" the apache config file in order
-  to "turn on" the php mime types.  Removed some stale ebuilds/digests.
+  files/mod_php.conf : Added a mod_php.conf file, which installs into the
+  apache addon-modules config directory.  This eliminates the need to "sed" the
+  apache config file in order to "turn on" the php mime types.  Removed some
+  stale ebuilds/digests.
 
   Ooops, round two for today: fix the php.ini location with a symlink.
   Keeps things tidy.
 
 *php-4.1.2-r4 (9 Apr 2002)
 
-  9 Apr 2002; Donny Davies <woodchip@gentoo.org> :
-
-  Small updates to fit in with the reworked apache package.
+  9 Apr 2002; Donny Davies <woodchip@gentoo.org> : Small updates to fit in with
+  the reworked apache package.
 
 *php-4.1.2-r3 (13 Mar 2002)
 
diff --git a/dev-php/mod_php/mod_php-4.2.2-r1.ebuild b/dev-php/mod_php/mod_php-4.2.2-r1.ebuild
index 967094a897ff..e2003c7842b5 100644
--- a/dev-php/mod_php/mod_php-4.2.2-r1.ebuild
+++ b/dev-php/mod_php/mod_php-4.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 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.2.2-r1.ebuild,v 1.8 2002/09/02 16:47:00 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.2.2-r1.ebuild,v 1.9 2002/09/02 16:57:07 drobbins Exp $
 
 MY_P=php-${PV}
 S=${WORKDIR}/${MY_P}
@@ -162,14 +162,14 @@ src_compile() {
 		myconf="${myconf} --with-xpm-dir=/usr/X11R6"
 		LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
 	fi
-    
+
 	# this needed moving to prevent b0rkage
 	# Please test your ebuilds!
 	# --with-gmp \
 
 	./configure \
 		--prefix=/usr \
-                --with-bz2 \
+		--with-bz2 \
 		--enable-ftp \
 		--enable-dbase \
 		--with-zlib=yes \