revision bump to fix bug 162478 (dropping usage of AddType apache config directive) and bug 249703 (libxml2-2.7 breakage) and an upstream fix for bug 217392; removing old and unused files

(Portage version: 2.1.6.4/cvs/Linux 2.6.28-gentoo x86_64)

6 files changed, 62 insertions, 45 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 0756da54b50d..ae073b215aa7 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-lang/php
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.308 2008/12/24 18:12:29 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.309 2009/01/11 21:16:32 hoffie Exp $
+
+*php-5.2.8-r2 (11 Jan 2009)
+
+  11 Jan 2009; Christian Hoffmann <hoffie@gentoo.org>
+  -files/70_mod_php.conf-apache2,
+  +files/70_mod_php5_concurr.conf-apache2-r1,
+  +files/70_mod_php5.conf-apache2-r1,
+  -files/70_mod_php_concurr.conf-apache2, -php-5.2.8.ebuild,
+  +php-5.2.8-r2.ebuild:
+  revision bump to fix bug 162478 (dropping usage of AddType apache config
+  directive) and bug 249703 (libxml2-2.7 breakage) and an upstream fix for
+  bug 217392; removing old and unused files
 
   24 Dec 2008; Raúl Porcel <armin76@gentoo.org> php-5.2.8-r1.ebuild:
   alpha/ia64 stable wrt #249875
diff --git a/dev-lang/php/files/70_mod_php.conf-apache2 b/dev-lang/php/files/70_mod_php.conf-apache2
deleted file mode 100644
index 90cabfb02dcd..000000000000
--- a/dev-lang/php/files/70_mod_php.conf-apache2
+++ /dev/null
@@ -1,17 +0,0 @@
-<IfDefine PHP4>
-	# Load the module first
-	<IfModule !sapi_apache2.c>
-		LoadModule php4_module    modules/libphp4.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-source .phps
-	</IfModule>
-
-	DirectoryIndex index.php index.phtml
-</IfDefine>
diff --git a/dev-lang/php/files/70_mod_php5.conf-apache2-r1 b/dev-lang/php/files/70_mod_php5.conf-apache2-r1
new file mode 100644
index 000000000000..50911ad39d9c
--- /dev/null
+++ b/dev-lang/php/files/70_mod_php5.conf-apache2-r1
@@ -0,0 +1,17 @@
+<IfDefine PHP5>
+	# Load the module first
+	<IfModule !mod_php5.c>
+		LoadModule php5_module    modules/libphp5.so
+	</IfModule>
+
+	# Set it to handle the files
+	<FilesMatch "\.ph(p5?|tml)$">
+		SetHandler application/x-httpd-php
+	</FilesMatch>
+
+	<FilesMatch "\.phps$">
+		SetHandler application/x-httpd-php-source
+	</FilesMatch>
+
+	DirectoryIndex index.php index.phtml
+</IfDefine>
diff --git a/dev-lang/php/files/70_mod_php5_concurr.conf-apache2-r1 b/dev-lang/php/files/70_mod_php5_concurr.conf-apache2-r1
new file mode 100644
index 000000000000..cd1c3801edbc
--- /dev/null
+++ b/dev-lang/php/files/70_mod_php5_concurr.conf-apache2-r1
@@ -0,0 +1,17 @@
+<IfDefine PHP5>
+	# Load the module first
+	<IfModule !mod_php5.c>
+		LoadModule php5_module    modules/libphp5.so
+	</IfModule>
+
+	# Set it to handle the files
+	<FilesMatch "\.ph(p5?|tml)$">
+		SetHandler application/x-httpd-php5
+	</FilesMatch>
+
+	<FilesMatch "\.phps$">
+		SetHandler application/x-httpd-php5-source
+	</FilesMatch>
+
+	DirectoryIndex index.php index.phtml
+</IfDefine>
diff --git a/dev-lang/php/files/70_mod_php_concurr.conf-apache2 b/dev-lang/php/files/70_mod_php_concurr.conf-apache2
deleted file mode 100644
index fa73e7685ec1..000000000000
--- a/dev-lang/php/files/70_mod_php_concurr.conf-apache2
+++ /dev/null
@@ -1,14 +0,0 @@
-<IfDefine PHP4>
-	# Load the module first
-	<IfModule !sapi_apache2.c>
-		LoadModule php4_module    modules/libphp4.so
-	</IfModule>
-
-	# Set it to handle the files
-	<IfModule mod_mime.c>
-		AddType application/x-httpd-php4 .php3
-		AddType application/x-httpd-php4 .php4
-	</IfModule>
-
-	DirectoryIndex index.php index.phtml
-</IfDefine>
diff --git a/dev-lang/php/php-5.2.8.ebuild b/dev-lang/php/php-5.2.8-r2.ebuild
index 5276a5c13317..7abc29b0c170 100644
--- a/dev-lang/php/php-5.2.8.ebuild
+++ b/dev-lang/php/php-5.2.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.8.ebuild,v 1.1 2008/12/08 23:30:02 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.8-r2.ebuild,v 1.1 2009/01/11 21:16:32 hoffie Exp $
 
 CGI_SAPI_USE="discard-path force-cgi-redirect"
 APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -21,7 +21,7 @@ PHP_PACKAGE="1"
 
 # php patch settings, general
 PHP_PATCHSET_REV="${PR/r/}"
-SUHOSIN_PATCH="suhosin-patch-5.2.7-0.9.6.3.patch.gz"
+SUHOSIN_PATCH="suhosin-patch-5.2.8-0.9.6.3.patch.gz"
 MULTILIB_PATCH="${MY_PHP_PV}/opt/multilib-search-path.patch"
 # php patch settings, ebuild specific
 FASTBUILD_PATCH="${MY_PHP_PV}/opt/fastbuild.patch"
@@ -32,9 +32,6 @@ KOLAB_PATCH="${MY_PHP_PV}/opt/kolab-imap-annotations.patch"
 
 inherit versionator php5_2-sapi apache-module
 
-SRC_URI="http://home.hoffie.info/php-patchset-${PV}-r${PHP_PATCHSET_REV}.tar.bz2
-	${SRC_URI}"
-
 # Suhosin patch support
 [[ -n "${SUHOSIN_PATCH}" ]] && SRC_URI="${SRC_URI} suhosin? ( http://gentoo.longitekk.com/${SUHOSIN_PATCH} )"
 
@@ -42,7 +39,10 @@ DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs."
 
 DEPEND="app-admin/php-toolkit
 	imap? ( >=virtual/imap-c-client-2006k )
-	pcre? ( >=dev-libs/libpcre-7.8 )"
+	pcre? ( >=dev-libs/libpcre-7.8 )
+	xml? ( >=dev-libs/libxml2-2.7.2-r2 )
+	xmlrpc? ( >=dev-libs/libxml2-2.7.2-r2 virtual/libiconv )"
+
 RDEPEND="${DEPEND}"
 if [[ -n "${KOLAB_PATCH}" ]] ; then
 	IUSE="${IUSE} kolab"
@@ -100,6 +100,11 @@ pkg_setup() {
 		ewarn
 	fi
 
+	if use pcre ; then
+		built_with_use dev-libs/libpcre unicode || \
+			die "Please rebuild dev-libs/libpcre with USE=unicode"
+	fi
+
 	php5_2-sapi_pkg_setup
 }
 
@@ -165,9 +170,6 @@ src_unpack() {
 		sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
 	fi
 
-	# bug 217392 (autconf-2.62 behavior changes)
-	sed s:_GNU_SOURCE:__GLIBC__: -i ext/posix/posix.c
-
 	# try to fix some test cases which fail because of sandbox otherwise
 	sed -e 's:/no/such/:.\0:' -i ext/standard/tests/file/005_error.phpt \
 		ext/standard/tests/file/006_error.phpt \
@@ -424,7 +426,7 @@ src_install() {
 				if use concurrentmodphp ; then
 					einfo "Installing Apache${APACHE_VERSION} config file for PHP5-concurrent (70_mod_php5_concurr.conf)"
 					insinto ${APACHE_MODULES_CONFDIR}
-					newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2" "70_mod_php5_concurr.conf"
+					newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2-r1" "70_mod_php5_concurr.conf"
 
 					# Put the ld version script in the right place so it's always accessible
 					insinto "/var/lib/php-pkg/${CATEGORY}/${PN}-${PVR}/"
@@ -435,7 +437,7 @@ src_install() {
 				else
 					einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
 					insinto ${APACHE_MODULES_CONFDIR}
-					newins "${FILESDIR}/70_mod_php5.conf-apache2" "70_mod_php5.conf"
+					newins "${FILESDIR}/70_mod_php5.conf-apache2-r1" "70_mod_php5.conf"
 				fi
 				php5_2-sapi_install_ini
 				;;