Dropped cjk from IUSE. Now mbstring and mbregex are always enabled.

8 files changed, 245 insertions, 8 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 43a7fd579037..420b6f617dc8 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.92 2003/07/22 12:04:40 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.93 2003/07/30 08:50:42 coredumb Exp $
+
+*mod-php-4.3.2-r5 (30 Jul 2003)
+  30 Jul 2003; Tal Peer <coredumb@gentoo.org> mod_php-4.3.2-r5.ebuild:
+  Dropped cjk from IUSE. Now mbstring and mbregex are always enabled.
+
+mod-php-4.3.2-r4 (21 Jul 2003)
 
   22 Jul 2003; Christian Birchinger <joker@gentoo.org>
   mod_php-4.3.2-r4.ebuild:
@@ -10,11 +16,11 @@
   files/digest-mod_php-4.3.2-r4:
   Add in URL fopen security fix.
 
+*mod_php-4.3.2-r3 (30 Jun 2003)
+
   12 Jul 2003; Donny Davies <woodchip@gentoo.org> mod_php-4.3.2-r3.ebuild:
   Marked `x86' keyword.
 
-*mod_php-4.3.2-r3 (30 Jun 2003)
-
   1 July 2003; 30 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r3.ebuild:
   Fix a typo in the ebuild sed script that updates the apache[2] config file.
 
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 60e8ff0316ab..cdcecc7538f9 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,10 +1,10 @@
-MD5 359f3cf39adf90f915a30e44f6d36d71 ChangeLog 20021
+MD5 34d399ccee17bf18ccbd8c2cc079fd05 ChangeLog 20024
 MD5 30523caae78779b8ac8b02844a27ae72 mod_php-4.3.2-r3.ebuild 4904
 MD5 56b21e01e2acc6dd42c92b4f39a5929a mod_php-4.3.2.ebuild 3352
 MD5 627ca6f172f72bfd3dc9f3a7f5a9062d mod_php-4.3.2-r1.ebuild 2721
 MD5 2eadcb1db702c01d2dfadc4b199c4811 mod_php-4.3.2-r2.ebuild 3658
 MD5 f87f178f238f179602b944749cd2693b mod_php-4.3.2-r4.ebuild 4942
-MD5 1bd05b5c4b280d0f234cc0d65419f63c mod_php-4.3.2-r5.ebuild 4944
+MD5 4710918ad5ed0b61d5a051f81615bec9 mod_php-4.3.2-r5.ebuild 4947
 MD5 c0f86a4fc233945f1db33bd39abe22ab files/70_mod_php.conf 1065
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2-r3 137
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2-r4 137
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.2-r5 b/dev-php/mod_php/files/digest-mod_php-4.3.2-r5
new file mode 100644
index 000000000000..b16a849236e0
--- /dev/null
+++ b/dev-php/mod_php/files/digest-mod_php-4.3.2-r5
@@ -0,0 +1,2 @@
+MD5 8aec1bb2dbcca1c92835c71e2e30d9c5 php-4.3.2.tar.bz2 3697581
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
diff --git a/dev-php/mod_php/mod_php-4.3.2-r5.ebuild b/dev-php/mod_php/mod_php-4.3.2-r5.ebuild
new file mode 100644
index 000000000000..e248c891476a
--- /dev/null
+++ b/dev-php/mod_php/mod_php-4.3.2-r5.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2003 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.2-r5.ebuild,v 1.1 2003/07/30 08:50:42 coredumb Exp $
+
+IUSE="${IUSE} apache2"
+
+DESCRIPTION="Apache module for PHP"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa ~arm"
+EXCLUDE_DB4_FIX=1
+EXCLUDE_PEAR_FIX=1
+
+DEPEND="${DEPEND}
+	>=net-www/apache-1.3.26-r2
+	apache2? ( >=net-www/apache-2.0.43-r1 ) "
+
+detectapache() {
+	local domsg=
+	[ -n "$1" ] && domsg=1
+	HAVE_APACHE1=
+	HAVE_APACHE2=
+	has_version '=net-www/apache-1*' && HAVE_APACHE1=1
+	has_version '=net-www/apache-2*' && HAVE_APACHE2=1
+
+	[ -n "${HAVE_APACHE1}" ] && APACHEVER=1
+	[ -n "${HAVE_APACHE2}" ] && APACHEVER=2
+	[ -n "${HAVE_APACHE1}" ] && [ -n "${HAVE_APACHE2}" ] && APACHEVER='both'
+
+	case "${APACHEVER}" in
+	1) [ -n "${domsg}" ] && einfo 'Apache1 only detected' ;;
+	2) [ -n "${domsg}" ] && einfo 'Apache2 only detected';;
+	both) 
+		if [ "`use apache2`" ]; then
+			[ -n "${domsg}" ] && einfo "Multiple Apache versions detected, using Apache2 (USE=apache2)"
+			APACHEVER=2
+		else
+			[ -n "${domsg}" ] && einfo 'Multiple Apache versions detected, using Apache1 (USE=-apache2)'
+			APACHEVER=1
+		fi ;;
+	*) if [ -n "${domsg}" ]; then
+			MSG="Unknown Apache version!"; eerror $MSG ; die $MSG
+	   else
+			APACHEVER=0
+	   fi; ;;
+	esac
+}
+
+detectapache
+
+SLOT="${APACHEVER}"
+[ "${APACHEVER}" -eq '2' ] && USE_APACHE2='2' || USE_APACHE2='' 
+
+PHPSAPI="apache${APACHEVER}"
+
+inherit php eutils
+
+src_unpack() {
+	php_securityupgrade
+	multiinstwarn
+	detectapache domsg
+	php_src_unpack
+}
+
+src_compile() {
+	#no readline on server SAPI
+	myconf="${myconf} --without-readline"
+
+	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
+	if [ -n "${USE_APACHE2}" ]; then
+		APACHE2_MPM="`apache2 -l |egrep 'worker|prechild|leader|threadpool|prefork'|xargs|cut -d. -f1`"
+		case "${APACHE2_MPM}" in
+			prefork) ;;
+			*) myconf="${myconf} --enable-experimental-zts" ;;
+		esac;
+	fi
+
+	# optional support for apache2
+	#&& myconf="${myconf} --with-apxs2=/usr/sbin/apxs2" \
+	#|| myconf="${myconf} --with-apxs=/usr/sbin/apxs"
+
+	#use apache2 \
+	myconf="${myconf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
+
+	#php CGI stuff
+	#--enable-discard-path --enable-force-cgi-redirect
+
+	php_src_compile
+}
+
+ 
+src_install() {
+	php_src_install
+	einfo "Adding extra symlink to php.ini for Apache${USE_APACHE2}"
+	dodir /etc/apache${USE_APACHE2}/conf/
+	dodir ${PHPINIDIRECTORY}
+	dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} /etc/apache${USE_APACHE2}/conf/${PHPINIFILENAME}
+
+	einfo "Adding extra symlink to Apache${USE_APACHE2} extramodules for PHP"
+	dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHPINIDIRECTORY}/lib
+	exeinto /usr/lib/apache${USE_APACHE2}-extramodules
+	einfo "Installing mod_php shared object now"
+	doexe .libs/libphp4.so
+
+	if [ -n "${USE_APACHE2}" ] ; then
+		einfo "Installing a Apache2 config for PHP (70_mod_php.conf)"
+		insinto /etc/apache2/conf/modules.d
+		doins ${FILESDIR}/70_mod_php.conf
+	else
+		einfo "Installing a Apache config for PHP (mod_php.conf)"
+		insinto /etc/apache/conf/addon-modules
+		doins ${FILESDIR}/mod_php.conf
+		dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} /etc/apache/conf/addon-modules/${PHPINIFILENAME}
+	fi
+}
+
+apache2msg() {
+	einfo "Edit /etc/conf.d/apache2 and add \"-D PHP4\""
+	ewarn "This is a CHANGE from previous behavior, which was \"-D PHP\""
+	ewarn "This is for the upcoming PHP5 support. The ebuild will attempt"
+	ewarn "to make this update between PHP and PHP4 automatically"
+}
+
+multiinstwarn() {
+	ewarn "Due to some previous bloopers with PHP and slotting, you may have"
+	ewarn "multiple copies of mod_php installed. Please look at the autoclean"
+	ewarn "output at the end of the emerge and unmerge all but relevant"
+	ewarn "copies."
+}
+
+apache2fix() {
+	einfo "Attemping to update /etc/conf.d/apache2 automatically for the PHP/PHP4 change."
+	local oldfile="/etc/conf.d/apache2.old.`date +%Y%m%d%H%M%S`"
+	cp /etc/conf.d/apache2 ${oldfile}
+	sed -re 's,-D PHP\>,-D PHP4,g' ${oldfile}  <${oldfile} >/etc/conf.d/apache2
+}
+
+
+pkg_preinst() {
+	multiinstwarn
+	[ "${APACHEVER}" -eq '2' ] && apache2fix
+	php_pkg_preinst
+}
+
+pkg_postinst() {
+	php_pkg_postinst
+	php_securityupgrade
+	multiinstwarn
+	einfo "To have Apache run php programs, please do the following:"
+	if [ "`use apache2`" ] ; then
+		apache2msg
+	else
+		einfo "1. Execute the command:"
+		einfo " \"ebuild /var/db/pkg/dev-php/${PF}/${PF}.ebuild config\""
+		einfo "2. Edit /etc/conf.d/apache and add \"-D PHP4\""
+		einfo "That will include the php mime types in your configuration"
+		einfo "automagically and setup Apache to load php when it starts."
+	fi
+}
+
+pkg_config() {
+	multiinstwarn
+	if [ -n "${USE_APACHE2}" ] ; then
+		apache2msg
+	else
+		${ROOT}/usr/sbin/apacheaddmod \
+			${ROOT}/etc/apache/conf/apache.conf \
+			extramodules/libphp4.so mod_php4.c php4_module \
+			before=perl define=PHP4 addconf=conf/addon-modules/mod_php.conf 
+			:;
+	fi
+}
diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index a748618c747c..37e28124601c 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,10 @@
 # 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.53 2003/07/21 07:28:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.54 2003/07/30 08:53:20 coredumb Exp $
+
+*php-4.3.2-r3 (30 Jul 2003)
+  30 Jul 2003; Tal Peer <coredumb@gentoo.org> php-4.3.2-r3.ebuild:
+  Dropped cjk from IUSE. Now mbstring and mbregex are always enabled.
 
 *php-5.0_beta1 (14 Jul 2003)
 
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 95b5f789261e..5202886ef32a 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,9 +1,9 @@
-MD5 9bf044a23a650a784726eb9e54a3a185 ChangeLog 8261
+MD5 43f420b888f3e948ee14feccb76ce540 ChangeLog 8428
 MD5 7588d047b95d706759df29bdafceb4cf php-4.3.2-r1.ebuild 992
 MD5 0ad96393a56530df42b3aca284635593 php-5.0_beta1.ebuild 1179
 MD5 5541cf4177bfcf205012ed0da4cd38c0 php-4.3.2.ebuild 2423
 MD5 8893110f384462d0082e4171222ad880 php-4.3.2-r2.ebuild 1185
-MD5 8902689455e15cd8a48519a75d11dcde php-4.3.2-r3.ebuild 1186
+MD5 e81b32f1d8bfc1d5ab5e0d4ca26360e0 php-4.3.2-r3.ebuild 1187
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2-r1 137
 MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1 65
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2-r2 137
diff --git a/dev-php/php/files/digest-php-4.3.2-r3 b/dev-php/php/files/digest-php-4.3.2-r3
new file mode 100644
index 000000000000..b16a849236e0
--- /dev/null
+++ b/dev-php/php/files/digest-php-4.3.2-r3
@@ -0,0 +1,2 @@
+MD5 8aec1bb2dbcca1c92835c71e2e30d9c5 php-4.3.2.tar.bz2 3697581
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
diff --git a/dev-php/php/php-4.3.2-r3.ebuild b/dev-php/php/php-4.3.2-r3.ebuild
new file mode 100644
index 000000000000..d102c6e1aaea
--- /dev/null
+++ b/dev-php/php/php-4.3.2-r3.ebuild
@@ -0,0 +1,53 @@
+# 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-4.3.2-r3.ebuild,v 1.1 2003/07/30 08:53:20 coredumb Exp $
+
+PHPSAPI="cli"
+inherit php eutils
+
+IUSE="${IUSE} readline"
+
+DESCRIPTION="PHP Shell Interpreter"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~mips"
+
+DEPEND="${DEPEND}
+	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) 
+	ncurses? ( >=sys-libs/ncurses-5.1 )"
+
+RDEPEND="${RDEPEND}"
+
+src_compile() {
+	php_securityupgrade
+	
+	# Readline and Ncurses are CLI PHP only
+	use ncurses || use readline && use_ncurses="--with-" || use_ncurses="--without-"
+	myconf="${myconf} `use_with readline`"
+	myconf="${myconf} ${use_ncurses}-ncurses"
+
+	myconf="${myconf} \
+		--disable-cgi \
+		--enable-cli"
+	
+	php_src_compile
+}
+
+
+src_install() {
+	installtargets="${installtargets} install-cli"
+	php_src_install
+
+	# php executable is located in ./sapi/cli/
+	exeinto /usr/bin
+	doexe sapi/cli/php
+}
+
+pkg_postinst() {
+	php_pkg_postinst
+	php_securityupgrade
+	einfo "This is a CLI only build."
+	einfo "You can not use it on a webserver."
+}
+pkg_preinst() {
+	php_pkg_preinst
+}