cleanup ebuild and version bump for eclass changes

8 files changed, 234 insertions, 6 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 874c4fbd5c38..9da73f09e6e3 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,11 @@
 # 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.102 2003/10/10 19:58:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.103 2003/10/23 02:08:18 robbat2 Exp $
+
+*mod_php-4.3.3-r2 (22 Oct 2003)
+
+  22 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.3-r2.ebuild:
+  cleanup ebuild and version bump for eclass changes
 
   10 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.3-r1.ebuild:
   message cleanup thanks to bug #30833
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 0779ecd0e61b..b35a6d27e93b 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,5 +1,5 @@
 MD5 e96cf7d2eaa1f48760b1725719a6a653 mod_php-4.3.2.ebuild 3352
-MD5 09830f095730b14f8477ceee3273500e mod_php-4.3.3-r2.ebuild 4861
+MD5 4021661bedd14c3ee5bd12e1c9ea4722 mod_php-4.3.3-r2.ebuild 4861
 MD5 148116b0723c6f40424e835f0c3ecdb0 mod_php-4.3.2-r5.ebuild 5070
 MD5 276186f14edf377d3381013437498995 mod_php-4.3.3_rc3.ebuild 5089
 MD5 098762e16884a947aab94d4e417598c4 mod_php-4.3.2-r2.ebuild 3656
@@ -7,7 +7,7 @@ MD5 4064cea60265026ae7dee02718ea1025 mod_php-4.3.3-r1.ebuild 4898
 MD5 6728dfa5c738e9c5cf0491925bd8fc4a mod_php-4.3.2-r4.ebuild 4939
 MD5 9c06f053871d03220ef8fbe456734663 mod_php-4.3.3.ebuild 4859
 MD5 3ac28c43c7f5bbfd114c12900959cda9 mod_php-4.3.2-r1.ebuild 2720
-MD5 ec9ab442d8634c286f5fb5a29d5b9397 ChangeLog 21536
+MD5 615ae44aed13c528248286814c292a4c ChangeLog 21536
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 3e26b38544b67a53360f6e07b8fab2a1 mod_php-4.3.2-r3.ebuild 4899
 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.3-r2 b/dev-php/mod_php/files/digest-mod_php-4.3.3-r2
new file mode 100644
index 000000000000..1fecdf01d76d
--- /dev/null
+++ b/dev-php/mod_php/files/digest-mod_php-4.3.3-r2
@@ -0,0 +1,2 @@
+MD5 1171d96104e2ff2cff9e19789a4a1536 php-4.3.3.tar.bz2 3711877
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
diff --git a/dev-php/mod_php/mod_php-4.3.3-r2.ebuild b/dev-php/mod_php/mod_php-4.3.3-r2.ebuild
new file mode 100644
index 000000000000..859424a4750a
--- /dev/null
+++ b/dev-php/mod_php/mod_php-4.3.3-r2.ebuild
@@ -0,0 +1,163 @@
+# 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.3-r2.ebuild,v 1.1 2003/10/23 02:08:18 robbat2 Exp $
+
+IUSE="${IUSE} apache2"
+
+DESCRIPTION="Apache module for PHP"
+KEYWORDS="x86 ~sparc ~ppc ~alpha ~hppa ~arm ~amd64"
+
+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}"
+
+# BIG FAT WARNING!
+# the php eclass requires the PHPSAPI setting!
+# In this case the PHPSAPI setting is dependant on the detectapache function
+# above this point as well!
+inherit php eutils
+
+DEPEND="${DEPEND}
+	>=net-www/apache-1.3.26-r2
+	apache2? ( >=net-www/apache-2.0.43-r1 )"
+
+src_unpack() {
+	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|perchild|leader|threadpool|prefork'|xargs|cut -d. -f1`"
+		case "${APACHE2_MPM}" in
+			prefork) ;;
+			*) myconf="${myconf} --enable-experimental-zts" ;;
+		esac;
+	fi
+
+	#use apache2 \
+	myconf="${myconf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}"
+
+	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\" to APACHE2_OPTS"
+	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
+	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\" to APACHE_OPTS"
+		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 8f413efee046..ad87339bf6d5 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,11 @@
 # 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.61 2003/10/01 21:05:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.62 2003/10/23 02:06:25 robbat2 Exp $
+
+*php-4.3.3-r3 (22 Oct 2003)
+
+  22 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> php-4.3.3-r3.ebuild:
+  cleanup ebuild and version bump for eclass changes
 
 *php-4.3.3-r2 (01 Oct 2003)
 
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 50739b35ae71..a55d7e20bd56 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -5,9 +5,9 @@ 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 b2f257d721a7241e811cbaedfffb64c6 ChangeLog 9561
+MD5 50ce68feb8934b968076e44bb1e6c0e5 ChangeLog 9561
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 f9bf99a40026d535c8201c72cd853704 php-4.3.3-r3.ebuild 1218
+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
diff --git a/dev-php/php/files/digest-php-4.3.3-r3 b/dev-php/php/files/digest-php-4.3.3-r3
new file mode 100644
index 000000000000..1fecdf01d76d
--- /dev/null
+++ b/dev-php/php/files/digest-php-4.3.3-r3
@@ -0,0 +1,2 @@
+MD5 1171d96104e2ff2cff9e19789a4a1536 php-4.3.3.tar.bz2 3711877
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
diff --git a/dev-php/php/php-4.3.3-r3.ebuild b/dev-php/php/php-4.3.3-r3.ebuild
new file mode 100644
index 000000000000..ed7b9254e405
--- /dev/null
+++ b/dev-php/php/php-4.3.3-r3.ebuild
@@ -0,0 +1,51 @@
+# 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.3-r3.ebuild,v 1.1 2003/10/23 02:06:25 robbat2 Exp $
+
+PHPSAPI="cli"
+inherit php eutils
+
+IUSE="${IUSE} readline"
+
+DESCRIPTION="PHP Shell Interpreter"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~mips"
+
+DEPEND_EXTRA="readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
+	ncurses? ( >=sys-libs/ncurses-5.1 )"
+DEPEND="${DEPEND} ${DEPEND_EXTRA}"
+RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
+
+src_compile() {
+	myconf="${myconf} `use_with readline readline /usr`"
+	# Readline and Ncurses are CLI PHP only
+	# readline needs ncurses
+	use ncurses || use readline \
+		&& myconf="${myconf} --with-ncurses=/usr" \
+		|| myconf="${myconf} --without-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
+	einfo "This is a CLI only build."
+	einfo "You can not use it on a webserver."
+}
+pkg_preinst() {
+	php_pkg_preinst
+}