diff options
22 files changed, 30 insertions, 1174 deletions
diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog index 4e248ea72b15..b5dd7a5c7f09 100644 --- a/dev-php/mod_php/ChangeLog +++ b/dev-php/mod_php/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-php/mod_php # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.234 2005/05/31 21:41:43 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.235 2005/06/11 08:53:33 stuart Exp $ + + 11 Jun 2005; Stuart Herbert <stuart@gentoo.org> + -files/mod_php-5.0.3-missing-arches.patch, + -files/php-5.0.0-httpauthfix.patch, -files/5.0.2-r1/70_mod_php5.conf, + -mod_php-5.0.0-r1.ebuild, -mod_php-5.0.0.ebuild, -mod_php-5.0.1.ebuild, + -mod_php-5.0.2-r1.ebuild, -mod_php-5.0.2.ebuild, -mod_php-5.0.3-r1.ebuild, + -mod_php-5.0.3-r2.ebuild, -mod_php-5.0.3.ebuild, mod_php-5.0.4.ebuild: + Removed old files & patches 31 May 2005; Stuart Herbert <stuart@gentoo.org> +files/with-iodbc.diff: Added patch to support iodbc database library diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest index cce8679ad9a9..becab175665d 100644 --- a/dev-php/mod_php/Manifest +++ b/dev-php/mod_php/Manifest @@ -1,53 +1,34 @@ -MD5 ba882cb0792fc39245006caf7e655443 ChangeLog 40866 +MD5 4c064a273343d6ff01a67da38d37d20d ChangeLog 41166 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384 -MD5 e4b18e01eaf5163e6236425277b965b3 mod_php-4.3.8.ebuild 5963 -MD5 490f9e2ff2635eae30c20d16861e6f6d mod_php-4.3.9.ebuild 6068 MD5 93f24cd45f23a55e8f9c85b4c7cfa4d8 mod_php-4.3.9_rc1.ebuild 6066 -MD5 7fa3534b809e0a9ac6164d1af55fe3fb mod_php-5.0.0-r1.ebuild 4169 -MD5 0590fbcb37577564c35284d34693a369 mod_php-5.0.0.ebuild 3991 -MD5 f88cfb59bb6302175e2ebffe5365bf51 mod_php-5.0.1.ebuild 4234 -MD5 f4349201e2fd2d03677964aca3cd68d9 mod_php-5.0.2.ebuild 4247 +MD5 a389c58e779719800bb2fdcfadaed655 mod_php-5.0.4.ebuild 2396 +MD5 490f9e2ff2635eae30c20d16861e6f6d mod_php-4.3.9.ebuild 6068 MD5 bf3e266fc7fbc08f3b079effce2c7086 mod_php-4.3.10.ebuild 6128 -MD5 541613fee6206a59402e87102a5dc853 mod_php-5.0.3.ebuild 4367 MD5 acc16e417db750b0a6f65eb6120469ff mod_php-4.3.10-r1.ebuild 6346 -MD5 8b7b68cdbf3f1b0166be3c1c3ab17a1a mod_php-5.0.2-r1.ebuild 4166 -MD5 f95d27f25ea999ac96095db4f8870eaa mod_php-5.0.3-r1.ebuild 4285 -MD5 d9c6c1ccdb4c59e334d094d71d1fcfd5 mod_php-5.0.3-r2.ebuild 2046 +MD5 e4b18e01eaf5163e6236425277b965b3 mod_php-4.3.8.ebuild 5963 +MD5 de26e4f44bfecb1636b35257ba6f3f46 mod_php-4.3.11.ebuild 6205 MD5 001341d164c4e4431c2bd07227c2e328 mod_php-4.3.11-r1.ebuild 6422 MD5 8a5a40024d86195720f12c9b65ae19c6 mod_php-4.3.11-r2.ebuild 6422 -MD5 de26e4f44bfecb1636b35257ba6f3f46 mod_php-4.3.11.ebuild 6205 -MD5 3bb00217dc1ac7589ec1d33fc29ddb7a mod_php-5.0.4.ebuild 2095 -MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022 MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484 -MD5 390a659097a43447e44ab5bdd59378b5 files/digest-mod_php-4.3.8 282 -MD5 24b9b19a4420d27906e4aface78ed963 files/digest-mod_php-4.3.9 282 +MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022 MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-mod_php-4.3.9_rc1 208 -MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0 63 -MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0-r1 63 -MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-mod_php-5.0.1 63 -MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-mod_php-5.0.2 63 +MD5 24b9b19a4420d27906e4aface78ed963 files/digest-mod_php-4.3.9 282 +MD5 7304d443039ee9ef328e98a346f3056e files/digest-mod_php-4.3.10 284 MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028 MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148 -MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518 -MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976 -MD5 7304d443039ee9ef328e98a346f3056e files/digest-mod_php-4.3.10 284 -MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3 63 MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358 +MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976 +MD5 390a659097a43447e44ab5bdd59378b5 files/digest-mod_php-4.3.8 282 MD5 7304d443039ee9ef328e98a346f3056e files/digest-mod_php-4.3.10-r1 284 -MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-mod_php-5.0.2-r1 63 -MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3-r1 63 -MD5 f7a7898637874593f519c336db79fa45 files/mod_php-5.0.3-missing-arches.patch 524 -MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3-r2 63 MD5 058042718bc876bf27ab902673919ca9 files/php5-prefork.patch 850 MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-mod_php-4.3.11 284 MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-mod_php-4.3.11-r1 284 MD5 b2c4209d0ddcd0a3debef249ffd2d8d2 files/digest-mod_php-4.3.11-r2 284 MD5 457955f18cb41f31bab803aac779573c files/digest-mod_php-5.0.4 140 +MD5 07529a6c32d73282c53d2936ed8ea9bd files/with-iodbc.diff 444 MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694 MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925 -MD5 07529a6c32d73282c53d2936ed8ea9bd files/with-iodbc.diff 444 MD5 158cb07377a3e2a0028947b0aeb505cb files/4.3.10-r1/70_mod_php.conf 1017 -MD5 80c45eef4f54629e893249f869cff5c6 files/5.0.2-r1/70_mod_php5.conf 484 MD5 2dfe55aa49dbca0c3316e859f8bebcb1 files/4.3.11-r2/70_mod_php.conf 1125 MD5 60cfe0c621237790195bafe595ddcbee files/5.0.4/70_mod_php5.conf 536 diff --git a/dev-php/mod_php/files/5.0.2-r1/70_mod_php5.conf b/dev-php/mod_php/files/5.0.2-r1/70_mod_php5.conf deleted file mode 100644 index 37a8e41c88a7..000000000000 --- a/dev-php/mod_php/files/5.0.2-r1/70_mod_php5.conf +++ /dev/null @@ -1,19 +0,0 @@ -# vim: ft=apache sw=4 ts=4 -<IfDefine PHP5> - - # Load the module first - <IfModule !sapi_apache2.c> - LoadModule php5_module modules/libphp5.so - </IfModule> - - # Set it to handle the files - <IfModule mod_mime.c> - AddType application/x-httpd-php .php - AddType application/x-httpd-php .phtml - AddType application/x-httpd-php .php3 - AddType application/x-httpd-php .php4 - AddType application/x-httpd-php .php5 - AddType application/x-httpd-php-source .phps - </IfModule> - -</IfDefine> diff --git a/dev-php/mod_php/files/digest-mod_php-5.0.0 b/dev-php/mod_php/files/digest-mod_php-5.0.0 deleted file mode 100644 index 6c4e3a2e19be..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-5.0.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 562b7ad1e903248bbe77884cb904b8b7 php-5.0.0.tar.bz2 4554054 diff --git a/dev-php/mod_php/files/digest-mod_php-5.0.0-r1 b/dev-php/mod_php/files/digest-mod_php-5.0.0-r1 deleted file mode 100644 index 6c4e3a2e19be..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-5.0.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 562b7ad1e903248bbe77884cb904b8b7 php-5.0.0.tar.bz2 4554054 diff --git a/dev-php/mod_php/files/digest-mod_php-5.0.1 b/dev-php/mod_php/files/digest-mod_php-5.0.1 deleted file mode 100644 index cbad23e72d02..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-5.0.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 b12042826ddba29fba3ae5a2eac3c391 php-5.0.1.tar.bz2 4569781 diff --git a/dev-php/mod_php/files/digest-mod_php-5.0.2 b/dev-php/mod_php/files/digest-mod_php-5.0.2 deleted file mode 100644 index 18677de1aedb..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-5.0.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 579f82f3d6a61b669183b2ebce357a1e php-5.0.2.tar.bz2 4577974 diff --git a/dev-php/mod_php/files/digest-mod_php-5.0.2-r1 b/dev-php/mod_php/files/digest-mod_php-5.0.2-r1 deleted file mode 100644 index 18677de1aedb..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-5.0.2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 579f82f3d6a61b669183b2ebce357a1e php-5.0.2.tar.bz2 4577974 diff --git a/dev-php/mod_php/files/digest-mod_php-5.0.3 b/dev-php/mod_php/files/digest-mod_php-5.0.3 deleted file mode 100644 index eb20872d0cc2..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-5.0.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 fd26455febdddee0977ce226b9108d9c php-5.0.3.tar.bz2 4607759 diff --git a/dev-php/mod_php/files/digest-mod_php-5.0.3-r1 b/dev-php/mod_php/files/digest-mod_php-5.0.3-r1 deleted file mode 100644 index eb20872d0cc2..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-5.0.3-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 fd26455febdddee0977ce226b9108d9c php-5.0.3.tar.bz2 4607759 diff --git a/dev-php/mod_php/files/digest-mod_php-5.0.3-r2 b/dev-php/mod_php/files/digest-mod_php-5.0.3-r2 deleted file mode 100644 index eb20872d0cc2..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-5.0.3-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 fd26455febdddee0977ce226b9108d9c php-5.0.3.tar.bz2 4607759 diff --git a/dev-php/mod_php/files/mod_php-5.0.3-missing-arches.patch b/dev-php/mod_php/files/mod_php-5.0.3-missing-arches.patch deleted file mode 100644 index 86c5e067401e..000000000000 --- a/dev-php/mod_php/files/mod_php-5.0.3-missing-arches.patch +++ /dev/null @@ -1,13 +0,0 @@ -Silly php devs forgot about poor old ia64/s390 :( - ---- php-5.0.3/Zend/zend_strtod.c -+++ php-5.0.3/Zend/zend_strtod.c -@@ -99,7 +99,7 @@ - defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \ - defined(__powerpc__) || defined(__ppc__) || defined(__m88k__) || \ - defined(__hppa__) || defined(__x86_64__) || (defined(__arm__) && \ -- defined(__VFP_FP__)) -+ defined(__VFP_FP__)) || defined(__ia64__) || defined(__s390__) - #include <sys/types.h> - #if BYTE_ORDER == BIG_ENDIAN - #define IEEE_BIG_ENDIAN diff --git a/dev-php/mod_php/files/php-5.0.0-httpauthfix.patch b/dev-php/mod_php/files/php-5.0.0-httpauthfix.patch deleted file mode 100644 index 7b3687c72aff..000000000000 --- a/dev-php/mod_php/files/php-5.0.0-httpauthfix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- php-5.0.0/sapi/apache/mod_php5.c 2004-07-10 09:46:09.000000000 +0200 -+++ php-5.0.0.1/sapi/apache/mod_php5.c 2004-08-08 11:32:52.824203512 +0200 -@@ -485,7 +485,7 @@ - tmp = uudecode(r->pool, authorization); - SG(request_info).auth_user = NULL; - tmp_user = getword_nulls_nc(r->pool, &tmp, ':'); -- if (SG(request_info).auth_user) { -+ if (tmp_user) { - r->connection->user = pstrdup(r->connection->pool, tmp_user); - r->connection->ap_auth_type = "Basic"; - SG(request_info).auth_user = estrdup(tmp_user); diff --git a/dev-php/mod_php/mod_php-5.0.0-r1.ebuild b/dev-php/mod_php/mod_php-5.0.0-r1.ebuild deleted file mode 100644 index 62415a37e341..000000000000 --- a/dev-php/mod_php/mod_php-5.0.0-r1.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.0-r1.ebuild,v 1.6 2005/05/19 20:23:05 robbat2 Exp $ - -IUSE="${IUSE} apache2" - -KEYWORDS="~x86" -PROVIDE="virtual/php virtual/httpd-php" - -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}" -MY_P="php-${PV}" - -# 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 php5-sapi eutils - -DESCRIPTION="Apache module for PHP 5" - -# provides all base PHP extras (eg PEAR, extension building stuff) -DEPEND_EXTRA=">=${PHP_PROVIDER_PKG}-5.0.0-r1 - >=net-www/apache-1.3.26-r2 - apache2? ( >=net-www/apache-2.0.50 ) - || ( >=net-www/apache-1.3.26-r2 >=net-www/apache-2.0.50 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -IUSE="${IUSE} debug" - -# Add a 'return 0' as we DON'T want the return code checked -pkg_setup() { - use debug && einfo "Installing in SLOT=${SLOT}" - return 0 -} - -src_unpack() { - detectapache domsg - - php5-sapi_src_unpack -} - -src_compile() { - # Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety - if [ -n "${USE_APACHE2}" ]; then - APACHE2_MPM="`/usr/sbin/apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - einfo "Apache2 MPM: ${APACHE2_MPM}" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) my_conf="${my_conf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;; - esac; - fi - - #use apache2 \ - my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" - - php5-sapi_src_compile -} - - -src_install() { - PHP_INSTALLTARGETS="install" - php5-sapi_src_install - - einfo "Adding extra symlink to Apache${USE_APACHE2} extramodules for PHP" - dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHP_INI_DIR}/lib - - if [ -n "${USE_APACHE2}" ] ; then - einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)" - insinto /etc/apache2/conf/modules.d - doins ${FILESDIR}/70_mod_php5.conf - else - einfo "Installing a Apache config for PHP (mod_php5.conf)" - insinto /etc/apache/conf/addon-modules - doins ${FILESDIR}/mod_php5.conf - dosym ${PHP_INI_DIR}/${PHP_INI_FILE} /etc/apache/conf/addon-modules/${PHP_INI_FILE} - fi -} - -apache2msg() { - einfo "Edit /etc/conf.d/apache2 and add \"-D PHP5\" to APACHE2_OPTS" - ewarn "This is a change from before!" -} - -pkg_postinst() { - einfo "To have Apache run php programs, please do the following:" - if [ -n "${USE_APACHE2}" ]; then - apache2msg - else - einfo "1. Execute the command:" - einfo " \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\"" - einfo "2. Edit /etc/conf.d/apache and add \"-D PHP5\" 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() { - if [ -n "${USE_APACHE2}" ]; then - apache2msg - else - ${ROOT}/usr/sbin/apacheaddmod \ - ${ROOT}/etc/apache/conf/apache.conf \ - extramodules/libphp5.so mod_php5.c php5_module \ - before=perl define=PHP5 addconf=conf/addon-modules/mod_php.conf - :; - fi -} diff --git a/dev-php/mod_php/mod_php-5.0.0.ebuild b/dev-php/mod_php/mod_php-5.0.0.ebuild deleted file mode 100644 index 3e4783a17cf0..000000000000 --- a/dev-php/mod_php/mod_php-5.0.0.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.0.ebuild,v 1.6 2005/05/19 20:23:05 robbat2 Exp $ - -IUSE="${IUSE} apache2" - -KEYWORDS="-x86 -ppc -sparc -alpha -hppa -ia64 -amd64 -s390" -PROVIDE="virtual/php" - -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="5${APACHEVER}" -[ "${APACHEVER}" -eq '2' ] && USE_APACHE2='2' || USE_APACHE2='' - -PHPSAPI="apache${APACHEVER}" -MY_P="php-${PV}" - -# 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 php5-sapi eutils - -DESCRIPTION="Apache module for PHP 5" - -DEPEND_EXTRA=">=net-www/apache-1.3.26-r2 - apache2? ( >=net-www/apache-2.0.43-r1 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -IUSE="${IUSE} debug" - -# Add a 'return 0' as we DON'T want the return code checked -pkg_setup() { - use debug && einfo "Installing in SLOT=${SLOT}" - return 0 -} - -src_unpack() { - detectapache domsg - - php5-sapi_src_unpack -} - -src_compile() { - # Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety - if [ -n "${USE_APACHE2}" ]; then - APACHE2_MPM="`/usr/sbin/apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - einfo "Apache2 MPM: ${APACHE2_MPM}" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) my_conf="${my_conf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;; - esac; - fi - - #use apache2 \ - my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" - - php5-sapi_src_compile -} - - -src_install() { - PHP_INSTALLTARGETS="install" - php5-sapi_src_install - - einfo "Adding extra symlink to Apache${USE_APACHE2} extramodules for PHP" - dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHP_INI_DIR}/lib - - if [ -n "${USE_APACHE2}" ] ; then - einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)" - insinto /etc/apache2/conf/modules.d - doins ${FILESDIR}/70_mod_php5.conf - else - einfo "Installing a Apache config for PHP (mod_php5.conf)" - insinto /etc/apache/conf/addon-modules - doins ${FILESDIR}/mod_php5.conf - dosym ${PHP_INI_DIR}/${PHP_INI_FILE} /etc/apache/conf/addon-modules/${PHP_INI_FILE} - fi -} - -apache2msg() { - einfo "Edit /etc/conf.d/apache2 and add \"-D PHP5\" to APACHE2_OPTS" -} - -pkg_postinst() { - einfo "To have Apache run php programs, please do the following:" - if [ -n "${USE_APACHE2}" ]; then - apache2msg - else - einfo "1. Execute the command:" - einfo " \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\"" - einfo "2. Edit /etc/conf.d/apache and add \"-D PHP5\" 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() { - if [ -n "${USE_APACHE2}" ]; then - apache2msg - else - ${ROOT}/usr/sbin/apacheaddmod \ - ${ROOT}/etc/apache/conf/apache.conf \ - extramodules/libphp5.so mod_php5.c php5_module \ - before=perl define=PHP5 addconf=conf/addon-modules/mod_php.conf - :; - fi -} diff --git a/dev-php/mod_php/mod_php-5.0.1.ebuild b/dev-php/mod_php/mod_php-5.0.1.ebuild deleted file mode 100644 index 04ea69cc5667..000000000000 --- a/dev-php/mod_php/mod_php-5.0.1.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.1.ebuild,v 1.6 2005/05/19 20:23:05 robbat2 Exp $ - -IUSE="${IUSE} apache2" - -KEYWORDS="~x86 ~ppc" -PROVIDE="virtual/php virtual/httpd-php" - -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}" -MY_P="php-${PV}" - -# 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 php5-sapi eutils - -DESCRIPTION="Apache module for PHP 5" - -# provides all base PHP extras (eg PEAR, extension building stuff) -DEPEND_EXTRA=">=${PHP_PROVIDER_PKG}-5.0.1 - >=net-www/apache-1.3.26-r2 - apache2? ( >=net-www/apache-2.0.50 ) - || ( >=net-www/apache-1.3.26-r2 >=net-www/apache-2.0.50 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -IUSE="${IUSE} debug" - -# Add a 'return 0' as we DON'T want the return code checked -pkg_setup() { - use debug && einfo "Installing in SLOT=${SLOT}" - return 0 -} - -src_unpack() { - detectapache domsg - - php5-sapi_src_unpack -} - -src_compile() { - # Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety - if [ -n "${USE_APACHE2}" ]; then - APACHE2_MPM="`/usr/sbin/apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - einfo "Apache2 MPM: ${APACHE2_MPM}" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) my_conf="${my_conf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;; - esac; - fi - - #use apache2 \ - my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" - - php5-sapi_src_compile -} - - -src_install() { - PHP_INSTALLTARGETS="install" - php5-sapi_src_install - - einfo "Adding extra symlink to Apache${USE_APACHE2} extramodules for PHP" - dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHP_INI_DIR}/lib - - if [ -n "${USE_APACHE2}" ] ; then - einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)" - insinto /etc/apache2/conf/modules.d - doins ${FILESDIR}/70_mod_php5.conf - else - einfo "Installing a Apache config for PHP (mod_php5.conf)" - insinto /etc/apache/conf/addon-modules - doins ${FILESDIR}/mod_php5.conf - dosym ${PHP_INI_DIR}/${PHP_INI_FILE} /etc/apache/conf/addon-modules/${PHP_INI_FILE} - fi -} - -apache2msg() { - einfo "Edit /etc/conf.d/apache2 and add \"-D PHP5\" to APACHE2_OPTS" - ewarn "This is a change from the old \"-D PHP4\"!" -} - -pkg_postinst() { - einfo "To have Apache run php programs, please do the following:" - if [ -n "${USE_APACHE2}" ]; then - apache2msg - else - einfo "1. Execute the command:" - einfo " \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\"" - einfo "2. Edit /etc/conf.d/apache and add \"-D PHP5\" 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." - ewarn "This is a change from the old \"-D PHP4\"!" - fi -} - -pkg_config() { - if [ -n "${USE_APACHE2}" ]; then - apache2msg - else - ${ROOT}/usr/sbin/apacheaddmod \ - ${ROOT}/etc/apache/conf/apache.conf \ - extramodules/libphp5.so mod_php5.c php5_module \ - before=perl define=PHP5 addconf=conf/addon-modules/mod_php.conf - :; - fi -} diff --git a/dev-php/mod_php/mod_php-5.0.2-r1.ebuild b/dev-php/mod_php/mod_php-5.0.2-r1.ebuild deleted file mode 100644 index eba40492965e..000000000000 --- a/dev-php/mod_php/mod_php-5.0.2-r1.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.2-r1.ebuild,v 1.3 2005/05/19 20:23:05 robbat2 Exp $ - -IUSE="${IUSE} apache2" - -KEYWORDS="~x86" -PROVIDE="virtual/php virtual/httpd-php" - -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}" -MY_P="php-${PV}" - -# 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 php5-sapi eutils apache-module - -DESCRIPTION="Apache module for PHP 5" - -# provides all base PHP extras (eg PEAR, extension building stuff) -DEPEND_EXTRA=">=${PHP_PROVIDER_PKG}-5.0.2 - >=net-www/apache-1.3.26-r2 - apache2? ( >=net-www/apache-2.0.50 ) - || ( >=net-www/apache-1.3.26-r2 >=net-www/apache-2.0.50 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -IUSE="${IUSE} debug" - -# Add a 'return 0' as we DON'T want the return code checked -pkg_setup() { - use debug && einfo "Installing in SLOT=${SLOT}" - return 0 -} - -src_unpack() { - detectapache domsg - - php5-sapi_src_unpack -} - -src_compile() { - # Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety - if [ -n "${USE_APACHE2}" ]; then - APACHE2_MPM="`/usr/sbin/apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - einfo "Apache2 MPM: ${APACHE2_MPM}" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) my_conf="${my_conf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;; - esac; - fi - - #use apache2 \ - my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" - - php5-sapi_src_compile -} - - -src_install() { - PHP_INSTALLTARGETS="install" - php5-sapi_src_install - -# einfo "Adding extra symlink to Apache${USE_APACHE2} extramodules for PHP" -# dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHP_INI_DIR}/lib - - if [ -n "${USE_APACHE2}" ] ; then - einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)" - insinto ${APACHE2_MODULES_CONFDIR} - doins "${FILESDIR}/5.0.2-r170_mod_php5.conf" - else - einfo "Installing a Apache config for PHP (mod_php5.conf)" - insinto ${APACHE_MODULES_CONFDIR} - doins ${FILESDIR}/mod_php5.conf - fi -} - -apache2msg() { - einfo "Edit /etc/conf.d/apache2 and add \"-D PHP5\" to APACHE2_OPTS" - ewarn "This is a change from the old \"-D PHP4\"!" -} - -pkg_postinst() { - einfo "To have Apache run php programs, please do the following:" - if [ -n "${USE_APACHE2}" ]; then - apache2msg - else - einfo "1. Execute the command:" - einfo " \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\"" - einfo "2. Edit /etc/conf.d/apache and add \"-D PHP5\" 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." - ewarn "This is a change from the old \"-D PHP4\"!" - fi -} - -pkg_config() { - if [ -n "${USE_APACHE2}" ]; then - apache2msg - else - ${ROOT}/usr/sbin/apacheaddmod \ - ${ROOT}/etc/apache/conf/apache.conf \ - extramodules/libphp5.so mod_php5.c php5_module \ - before=perl define=PHP5 addconf=conf/addon-modules/mod_php.conf - :; - fi -} diff --git a/dev-php/mod_php/mod_php-5.0.2.ebuild b/dev-php/mod_php/mod_php-5.0.2.ebuild deleted file mode 100644 index 16008c67b8b6..000000000000 --- a/dev-php/mod_php/mod_php-5.0.2.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.2.ebuild,v 1.7 2005/05/19 20:23:05 robbat2 Exp $ - -IUSE="${IUSE} apache2" - -KEYWORDS="~ia64 ~ppc ~x86 ~ppc64" -PROVIDE="virtual/php virtual/httpd-php" - -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}" -MY_P="php-${PV}" - -# 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 php5-sapi eutils - -DESCRIPTION="Apache module for PHP 5" - -# provides all base PHP extras (eg PEAR, extension building stuff) -DEPEND_EXTRA=">=${PHP_PROVIDER_PKG}-5.0.2 - >=net-www/apache-1.3.26-r2 - apache2? ( >=net-www/apache-2.0.50 ) - || ( >=net-www/apache-1.3.26-r2 >=net-www/apache-2.0.50 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -IUSE="${IUSE} debug" - -# Add a 'return 0' as we DON'T want the return code checked -pkg_setup() { - use debug && einfo "Installing in SLOT=${SLOT}" - return 0 -} - -src_unpack() { - detectapache domsg - - php5-sapi_src_unpack -} - -src_compile() { - # Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety - if [ -n "${USE_APACHE2}" ]; then - APACHE2_MPM="`/usr/sbin/apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - einfo "Apache2 MPM: ${APACHE2_MPM}" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) my_conf="${my_conf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;; - esac; - fi - - #use apache2 \ - my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" - - php5-sapi_src_compile -} - - -src_install() { - PHP_INSTALLTARGETS="install" - php5-sapi_src_install - - einfo "Adding extra symlink to Apache${USE_APACHE2} extramodules for PHP" - dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHP_INI_DIR}/lib - - if [ -n "${USE_APACHE2}" ] ; then - einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)" - insinto /etc/apache2/conf/modules.d - doins ${FILESDIR}/70_mod_php5.conf - else - einfo "Installing a Apache config for PHP (mod_php5.conf)" - insinto /etc/apache/conf/addon-modules - doins ${FILESDIR}/mod_php5.conf - dosym ${PHP_INI_DIR}/${PHP_INI_FILE} /etc/apache/conf/addon-modules/${PHP_INI_FILE} - fi -} - -apache2msg() { - einfo "Edit /etc/conf.d/apache2 and add \"-D PHP5\" to APACHE2_OPTS" - ewarn "This is a change from the old \"-D PHP4\"!" -} - -pkg_postinst() { - einfo "To have Apache run php programs, please do the following:" - if [ -n "${USE_APACHE2}" ]; then - apache2msg - else - einfo "1. Execute the command:" - einfo " \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\"" - einfo "2. Edit /etc/conf.d/apache and add \"-D PHP5\" 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." - ewarn "This is a change from the old \"-D PHP4\"!" - fi -} - -pkg_config() { - if [ -n "${USE_APACHE2}" ]; then - apache2msg - else - ${ROOT}/usr/sbin/apacheaddmod \ - ${ROOT}/etc/apache/conf/apache.conf \ - extramodules/libphp5.so mod_php5.c php5_module \ - before=perl define=PHP5 addconf=conf/addon-modules/mod_php.conf - :; - fi -} diff --git a/dev-php/mod_php/mod_php-5.0.3-r1.ebuild b/dev-php/mod_php/mod_php-5.0.3-r1.ebuild deleted file mode 100644 index 9493d11f41bc..000000000000 --- a/dev-php/mod_php/mod_php-5.0.3-r1.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.3-r1.ebuild,v 1.8 2005/05/19 20:23:05 robbat2 Exp $ - -IUSE="${IUSE} apache2" - -KEYWORDS="~x86 ~amd64 ~ppc" -PROVIDE="virtual/php virtual/httpd-php" - -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}" -MY_P="php-${PV}" - -# 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 php5-sapi eutils apache-module - -DESCRIPTION="Apache module for PHP 5" - -# provides all base PHP extras (eg PEAR, extension building stuff) -DEPEND_EXTRA=">=${PHP_PROVIDER_PKG}-5.0.3 - >=net-www/apache-1.3.26-r2 - apache2? ( >=net-www/apache-2.0.50 ) - || ( >=net-www/apache-1.3.26-r2 >=net-www/apache-2.0.50 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -IUSE="${IUSE} debug" - -# Add a 'return 0' as we DON'T want the return code checked -pkg_setup() { - use debug && einfo "Installing in SLOT=${SLOT}" - return 0 -} - -src_unpack() { - detectapache domsg - - php5-sapi_src_unpack - [ "${ARCH}" == "sparc" ] && epatch ${FILESDIR}/stdint.diff - epatch ${FILESDIR}/${P}-missing-arches.patch -} - -src_compile() { - # Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety - if [ -n "${USE_APACHE2}" ]; then - APACHE2_MPM="`/usr/sbin/apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - einfo "Apache2 MPM: ${APACHE2_MPM}" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) my_conf="${my_conf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;; - esac; - fi - - #use apache2 \ - my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" - - php5-sapi_src_compile -} - - -src_install() { - PHP_INSTALLTARGETS="install" - php5-sapi_src_install - -# einfo "Adding extra symlink to Apache${USE_APACHE2} extramodules for PHP" -# dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHP_INI_DIR}/lib - - if [ -n "${USE_APACHE2}" ] ; then - einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)" - insinto ${APACHE2_MODULES_CONFDIR} - doins "${FILESDIR}/5.0.2-r1/70_mod_php5.conf" - else - einfo "Installing a Apache config for PHP (mod_php5.conf)" - insinto ${APACHE_MODULES_CONFDIR} - doins ${FILESDIR}/mod_php5.conf - fi -} - -apache2msg() { - einfo "Edit /etc/conf.d/apache2 and add \"-D PHP5\" to APACHE2_OPTS" - ewarn "This is a change from the old \"-D PHP4\"!" -} - -pkg_postinst() { - einfo "To have Apache run php programs, please do the following:" - if [ -n "${USE_APACHE2}" ]; then - apache2msg - else - einfo "1. Execute the command:" - einfo " \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\"" - einfo "2. Edit /etc/conf.d/apache and add \"-D PHP5\" 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." - ewarn "This is a change from the old \"-D PHP4\"!" - fi -} - -pkg_config() { - if [ -n "${USE_APACHE2}" ]; then - apache2msg - else - ${ROOT}/usr/sbin/apacheaddmod \ - ${ROOT}/etc/apache/conf/apache.conf \ - extramodules/libphp5.so mod_php5.c php5_module \ - before=perl define=PHP5 addconf=conf/addon-modules/mod_php.conf - :; - fi -} diff --git a/dev-php/mod_php/mod_php-5.0.3-r2.ebuild b/dev-php/mod_php/mod_php-5.0.3-r2.ebuild deleted file mode 100644 index 174b9b0ba815..000000000000 --- a/dev-php/mod_php/mod_php-5.0.3-r2.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.3-r2.ebuild,v 1.3 2005/05/19 20:23:05 robbat2 Exp $ - -IUSE="${IUSE} apache2" - -# this duplicates the code from depend.apache.eclass, but it's the -# only way to do this here - -if useq apache2 ; then - APACHE_VERSION=2 -else - APACHE_VERSION=1 -fi - -KEYWORDS="~x86 ~amd64" -PROVIDE="virtual/httpd-php" - -SLOT="${APACHE_VERSION}" - -PHPSAPI="apache${APACHE_VERSION}" -MY_P="php-${PV}" - -# BIG FAT WARNING! -# the php eclass requires the PHPSAPI setting! -inherit eutils php5-sapi-r1 apache-module - -need_apache - -DESCRIPTION="Apache module for PHP 5" - -pkg_setup() { - - # the list of safe MPM's may need revising - if ! useq threads ; then - APACHE2_SAFE_MPMS="prefork" - else - APACHE2_SAFE_MPMS="event metuxmpm peruser worker threadpool" - fi - - apache-module_pkg_setup - php5-sapi_pkg_setup -} - -src_unpack() { - php5-sapi_src_unpack - - # if we're not using threads, we need to force them to be switched - # off by patching php's configure script - cd ${S} - if ! useq threads ; then - epatch ${FILESDIR}/php5-prefork.patch || die "Unable to patch for prefork support" - einfo "Rebuilding configure script" - WANT_AUTOCONF=2.5 \ - autoconf -W no-cross || die "Unable to regenerate configure script" - uclibctoolize - fi -} - -src_compile() { - if [ "${APACHE_VERSION}" = "2" ]; then - if useq threads ; then - my_conf="${my_conf} --enable-experimental-zts" - ewarn "Enabling ZTS for Apache2 MPM" - fi - fi - - my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" - - php5-sapi_src_compile -} - -src_install() { - PHP_INSTALLTARGETS="install" - php5-sapi_src_install - - if [ -n "${USE_APACHE2}" ] ; then - einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)" - insinto ${APACHE_MODULES_CONFDIR} - doins "${FILESDIR}/5.0.2-r1/70_mod_php5.conf" - else - einfo "Installing a Apache config for PHP (mod_php5.conf)" - insinto ${APACHE_MODULES_CONFDIR} - doins ${FILESDIR}/mod_php5.conf - fi -} diff --git a/dev-php/mod_php/mod_php-5.0.3.ebuild b/dev-php/mod_php/mod_php-5.0.3.ebuild deleted file mode 100644 index be2c185d1083..000000000000 --- a/dev-php/mod_php/mod_php-5.0.3.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.3.ebuild,v 1.5 2005/05/19 20:23:05 robbat2 Exp $ - -IUSE="${IUSE} apache2" - -KEYWORDS="~ia64 ~ppc ~x86 ~ppc64 ~sparc ~amd64" -PROVIDE="virtual/php virtual/httpd-php" - -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}" -MY_P="php-${PV}" - -# 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 php5-sapi eutils - -DESCRIPTION="Apache module for PHP 5" - -# provides all base PHP extras (eg PEAR, extension building stuff) -DEPEND_EXTRA=">=${PHP_PROVIDER_PKG}-5.0.3 - >=net-www/apache-1.3.26-r2 - apache2? ( >=net-www/apache-2.0.50 ) - || ( >=net-www/apache-1.3.26-r2 >=net-www/apache-2.0.50 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" -IUSE="${IUSE} debug" - -# Add a 'return 0' as we DON'T want the return code checked -pkg_setup() { - use debug && einfo "Installing in SLOT=${SLOT}" - return 0 -} - -src_unpack() { - detectapache domsg - - php5-sapi_src_unpack - [ "${ARCH}" == "sparc" ] && epatch ${FILESDIR}/stdint.diff - epatch ${FILESDIR}/${P}-missing-arches.patch -} - -src_compile() { - # Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety - if [ -n "${USE_APACHE2}" ]; then - APACHE2_MPM="`/usr/sbin/apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - einfo "Apache2 MPM: ${APACHE2_MPM}" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) my_conf="${my_conf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;; - esac; - fi - - #use apache2 \ - my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" - - php5-sapi_src_compile -} - - -src_install() { - PHP_INSTALLTARGETS="install" - php5-sapi_src_install - - einfo "Adding extra symlink to Apache${USE_APACHE2} extramodules for PHP" - dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHP_INI_DIR}/lib - - if [ -n "${USE_APACHE2}" ] ; then - einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)" - insinto /etc/apache2/conf/modules.d - doins ${FILESDIR}/70_mod_php5.conf - else - einfo "Installing a Apache config for PHP (mod_php5.conf)" - insinto /etc/apache/conf/addon-modules - doins ${FILESDIR}/mod_php5.conf - dosym ${PHP_INI_DIR}/${PHP_INI_FILE} /etc/apache/conf/addon-modules/${PHP_INI_FILE} - fi -} - -apache2msg() { - einfo "Edit /etc/conf.d/apache2 and add \"-D PHP5\" to APACHE2_OPTS" - ewarn "This is a change from the old \"-D PHP4\"!" -} - -pkg_postinst() { - einfo "To have Apache run php programs, please do the following:" - if [ -n "${USE_APACHE2}" ]; then - apache2msg - else - einfo "1. Execute the command:" - einfo " \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\"" - einfo "2. Edit /etc/conf.d/apache and add \"-D PHP5\" 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." - ewarn "This is a change from the old \"-D PHP4\"!" - fi -} - -pkg_config() { - if [ -n "${USE_APACHE2}" ]; then - apache2msg - else - ${ROOT}/usr/sbin/apacheaddmod \ - ${ROOT}/etc/apache/conf/apache.conf \ - extramodules/libphp5.so mod_php5.c php5_module \ - before=perl define=PHP5 addconf=conf/addon-modules/mod_php.conf - :; - fi -} diff --git a/dev-php/mod_php/mod_php-5.0.4.ebuild b/dev-php/mod_php/mod_php-5.0.4.ebuild index 702b60278217..40696d95a7c9 100644 --- a/dev-php/mod_php/mod_php-5.0.4.ebuild +++ b/dev-php/mod_php/mod_php-5.0.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.4.ebuild,v 1.3 2005/05/19 20:23:05 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.4.ebuild,v 1.4 2005/06/11 08:53:33 stuart Exp $ IUSE="${IUSE} apache2" @@ -50,13 +50,21 @@ src_unpack() { # if we're not using threads, we need to force them to be switched # off by patching php's configure script cd ${S} - pwd if ! useq threads ; then epatch ${FILESDIR}/php5-prefork.patch || die "Unable to patch for prefork support" einfo "Rebuilding configure script" WANT_AUTOCONF=2.5 \ autoconf -W no-cross || die "Unable to regenerate configure script" fi + + ######################################################################### + # DO NOT ADD PATCHES HERE UNLESS THEY ARE UNIQUE TO MOD_PHP + # + # Please add your patches to the eclass, where they belong ;-) + # + # Best regards, + # Stu + ######################################################################### } src_compile() { |