fix copyright headers and add new php build

15 files changed, 82 insertions, 25 deletions

diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index cad92af46bca..6c644509c1f0 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,15 @@
 # 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.66 2003/11/16 12:24:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.67 2004/01/08 04:13:44 robbat2 Exp $
+
+*php-4.3.4-r2 (07 Jan 2004)
+
+  07 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> php-4.3.2-r1.ebuild,
+  php-4.3.2-r2.ebuild, php-4.3.2-r3.ebuild, php-4.3.2.ebuild,
+  php-4.3.3-r1.ebuild, php-4.3.3-r2.ebuild, php-4.3.3-r3.ebuild,
+  php-4.3.3.ebuild, php-4.3.4-r1.ebuild, php-4.3.4-r2.ebuild,
+  php-4.3.4.ebuild, php-5.0_beta1-r1.ebuild, php-5.0_beta1.ebuild:
+  fix copyright headers and add new php build
 
 *php-4.3.4-r1 (16 Nov 2003)
 
diff --git a/dev-php/php/files/digest-php-4.3.4-r2 b/dev-php/php/files/digest-php-4.3.4-r2
new file mode 100644
index 000000000000..d65ce9576341
--- /dev/null
+++ b/dev-php/php/files/digest-php-4.3.4-r2
@@ -0,0 +1,2 @@
+MD5 b9dd601863e08e52e3c4d5e02c2627cf php-4.3.4.tar.bz2 3774324
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
diff --git a/dev-php/php/php-4.3.2-r1.ebuild b/dev-php/php/php-4.3.2-r1.ebuild
index 915982bd4344..116599aa21cb 100644
--- a/dev-php/php/php-4.3.2-r1.ebuild
+++ b/dev-php/php/php-4.3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.2-r1.ebuild,v 1.2 2003/09/08 04:45:56 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.2-r1.ebuild,v 1.3 2004/01/08 04:13:44 robbat2 Exp $
 
 PHPSAPI="cli"
 inherit php eutils
diff --git a/dev-php/php/php-4.3.2-r2.ebuild b/dev-php/php/php-4.3.2-r2.ebuild
index 271f6f4b29f2..27cb45ffffb6 100644
--- a/dev-php/php/php-4.3.2-r2.ebuild
+++ b/dev-php/php/php-4.3.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.2-r2.ebuild,v 1.2 2003/09/08 04:45:56 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.2-r2.ebuild,v 1.3 2004/01/08 04:13:44 robbat2 Exp $
 
 PHPSAPI="cli"
 inherit php eutils
diff --git a/dev-php/php/php-4.3.2-r3.ebuild b/dev-php/php/php-4.3.2-r3.ebuild
index 832a70fdb61a..768d0375b06d 100644
--- a/dev-php/php/php-4.3.2-r3.ebuild
+++ b/dev-php/php/php-4.3.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.2-r3.ebuild,v 1.3 2003/09/08 04:45:56 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.2-r3.ebuild,v 1.4 2004/01/08 04:13:44 robbat2 Exp $
 
 PHPSAPI="cli"
 inherit php eutils
diff --git a/dev-php/php/php-4.3.2.ebuild b/dev-php/php/php-4.3.2.ebuild
index f17745b1042b..78f0af588eb0 100644
--- a/dev-php/php/php-4.3.2.ebuild
+++ b/dev-php/php/php-4.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.2.ebuild,v 1.6 2003/09/08 04:49:18 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.2.ebuild,v 1.7 2004/01/08 04:13:44 robbat2 Exp $
 
 PHPSAPI="cli"
 inherit php eutils
diff --git a/dev-php/php/php-4.3.3-r1.ebuild b/dev-php/php/php-4.3.3-r1.ebuild
index 10526050f53b..d198155fca6e 100644
--- a/dev-php/php/php-4.3.3-r1.ebuild
+++ b/dev-php/php/php-4.3.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.3-r1.ebuild,v 1.4 2003/09/17 03:08:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.3-r1.ebuild,v 1.5 2004/01/08 04:13:44 robbat2 Exp $
 
 PHPSAPI="cli"
 inherit php eutils
diff --git a/dev-php/php/php-4.3.3-r2.ebuild b/dev-php/php/php-4.3.3-r2.ebuild
index 9ebafccff263..1e819a70d5dc 100644
--- a/dev-php/php/php-4.3.3-r2.ebuild
+++ b/dev-php/php/php-4.3.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.3-r2.ebuild,v 1.1 2003/10/01 21:05:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.3-r2.ebuild,v 1.2 2004/01/08 04:13:44 robbat2 Exp $
 
 PHPSAPI="cli"
 inherit php eutils
diff --git a/dev-php/php/php-4.3.3-r3.ebuild b/dev-php/php/php-4.3.3-r3.ebuild
index ed7b9254e405..bda97c6d0d59 100644
--- a/dev-php/php/php-4.3.3-r3.ebuild
+++ b/dev-php/php/php-4.3.3-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.3-r3.ebuild,v 1.1 2003/10/23 02:06:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.3-r3.ebuild,v 1.2 2004/01/08 04:13:44 robbat2 Exp $
 
 PHPSAPI="cli"
 inherit php eutils
diff --git a/dev-php/php/php-4.3.3.ebuild b/dev-php/php/php-4.3.3.ebuild
index fc7720f0808d..07964928f33a 100644
--- a/dev-php/php/php-4.3.3.ebuild
+++ b/dev-php/php/php-4.3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.3.ebuild,v 1.3 2003/09/08 04:49:18 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.3.ebuild,v 1.4 2004/01/08 04:13:44 robbat2 Exp $
 
 PHPSAPI="cli"
 inherit php eutils
diff --git a/dev-php/php/php-4.3.4-r1.ebuild b/dev-php/php/php-4.3.4-r1.ebuild
index e8f63d2dbdef..08a6b15e67cd 100644
--- a/dev-php/php/php-4.3.4-r1.ebuild
+++ b/dev-php/php/php-4.3.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.4-r1.ebuild,v 1.1 2003/11/16 12:24:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.4-r1.ebuild,v 1.2 2004/01/08 04:13:44 robbat2 Exp $
 
 PHPSAPI="cli"
 inherit php-2 eutils
diff --git a/dev-php/php/php-4.3.4-r2.ebuild b/dev-php/php/php-4.3.4-r2.ebuild
new file mode 100644
index 000000000000..08d6764fb6f0
--- /dev/null
+++ b/dev-php/php/php-4.3.4-r2.ebuild
@@ -0,0 +1,46 @@
+# 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.4-r2.ebuild,v 1.1 2004/01/08 04:13:44 robbat2 Exp $
+
+PHPSAPI="cli"
+inherit php-sapi eutils
+
+DESCRIPTION="PHP Shell Interpreter"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~mips"
+
+src_compile() {
+	myconf="${myconf} \
+		--disable-cgi \
+		--enable-cli"
+
+	php-sapi_src_compile
+}
+
+
+src_install() {
+	PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-cli install-programs install-pear install-build install-headers"
+	php-sapi_src_install
+
+	einfo "Fixing PEAR cache location"
+	sed "s|${T}/pear/cache|/tmp/pear/cache|" -i ${D}/etc/pear.conf
+	keepdir /tmp/pear/cache
+
+	einfo "Installing manpage"
+	doman sapi/cli/php.1
+}
+
+pkg_postinst() {
+	php-sapi_pkg_postinst
+	einfo "This is a CLI only build."
+	einfo "You cannot use it on a webserver."
+
+	if [ "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
+		einfo "Cleaning up an old PEAR install glitch"
+		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
+	fi
+	
+}
+pkg_preinst() {
+	php-sapi_pkg_preinst
+}
diff --git a/dev-php/php/php-4.3.4.ebuild b/dev-php/php/php-4.3.4.ebuild
index ba9ab6759cbb..95993048e5da 100644
--- a/dev-php/php/php-4.3.4.ebuild
+++ b/dev-php/php/php-4.3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.4.ebuild,v 1.2 2003/11/13 15:44:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.4.ebuild,v 1.3 2004/01/08 04:13:44 robbat2 Exp $
 
 PHPSAPI="cli"
 inherit php eutils
diff --git a/dev-php/php/php-5.0_beta1-r1.ebuild b/dev-php/php/php-5.0_beta1-r1.ebuild
index 64e5a4865516..7225d0cf9afa 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.
+# 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-5.0_beta1-r1.ebuild,v 1.3 2003/10/26 04:16:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-5.0_beta1-r1.ebuild,v 1.4 2004/01/08 04:13:44 robbat2 Exp $
 
 PHPSAPI="cli"
 MY_P="php-5.0.0b1"
diff --git a/dev-php/php/php-5.0_beta1.ebuild b/dev-php/php/php-5.0_beta1.ebuild
index b0a9f21c1ec9..113a2e322920 100644
--- a/dev-php/php/php-5.0_beta1.ebuild
+++ b/dev-php/php/php-5.0_beta1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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-5.0_beta1.ebuild,v 1.2 2003/09/08 04:45:56 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-5.0_beta1.ebuild,v 1.3 2004/01/08 04:13:44 robbat2 Exp $
 
 PHPSAPI="cli"
 MY_P="php-5.0.0b1"