Added epatch_user. #357637

Package-Manager: portage-2.1.9.41/cvs/Linux x86_64

4 files changed, 83 insertions, 5 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 6673322bb1a2..d0a0b095d120 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.473 2011/03/10 18:58:47 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.474 2011/03/13 09:48:06 olemarkus Exp $
+
+  13 Mar 2011; <olemarkus@gentoo.org> +files/eblits/src_prepare-v3.eblit,
+  php-5.3.6_rc3.ebuild:
+  Added epatch_user. #357637
 
 *php-5.3.6_rc3 (10 Mar 2011)
 
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 4f5b73839138..569c05f73778 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -18,6 +18,7 @@ AUX eblits/src_install-v1.eblit 5146 RMD160 24127823735939101dcb00585a5ed69adedf
 AUX eblits/src_install-v2.eblit 4986 RMD160 b5f409b505212d20058c6ba9e817a67878bef20e SHA1 31253a50f89f7a082bae99a3f47e435610cd1c69 SHA256 22a135acec8b7cc0f5521f2354617471e245b2300e99b39768e8785dee10c4ee
 AUX eblits/src_prepare-v1.eblit 2616 RMD160 ccff64d09cc90ada1ea5d1311457cf9a05f12f8e SHA1 7db40d0ca7ef01e5b61962f261511803f768f1bc SHA256 915b9755a37f7670f6e436fe5072dae8f5e6b437ccdfbff835e26bb2f9d22b1e
 AUX eblits/src_prepare-v2.eblit 2604 RMD160 379dbca3e2ae8c1f09f608220ec9c98d099cb792 SHA1 42afae4e07633535ecea49817f5badd559f10ff1 SHA256 fe7534260fb81a012b8021b5d555756ce8733ad192bf51cedd94f12963811790
+AUX eblits/src_prepare-v3.eblit 2649 RMD160 5f01f42eef528535866c3b5ade0ded592d1ffd48 SHA1 1bdc640ab548f4e8b78acc305fdd6ceab225daf8 SHA256 7ea3a5351fabeb050161e64c09b98ff945bbdb8b4d1a7fb83d6b4645f277b486
 AUX eblits/src_test-v1.eblit 1530 RMD160 10031a5128dab729106c6fbfe4e899b1583818cb SHA1 0f1abf995913c2c381e2496b8670ea4f6e97964b SHA256 67501925cfdaf9043e4985d0f1c797e62fb42bf47e6863b5ffdecb104888e82c
 AUX php-5.2.10-pdo_dblib.patch 559 RMD160 062604e291113b2bb86044b5eeffb72fad210fbc SHA1 d59d26e6557dac86e582e1a6ed7bb4795cf150c6 SHA256 0548d63d7379cd19f7ade6ca1222b1b577f684b142ff6b0e8e23742b1f7f9794
 AUX php-5.2.12-libpng14.patch 222 RMD160 d63bd712d077d9606a02d6620c7084bca7197c01 SHA1 a25a47386d625a47698094fc4825208c6ec8f2a4 SHA256 af94a9c2a104dcb037aa059dd46b6f534adb939ea44ad4cb9e3a0a7c49b64fab
@@ -53,6 +54,6 @@ EBUILD php-5.3.3-r1.ebuild 9476 RMD160 85c12c9010df014ec40590ad82251205dbd59ce0
 EBUILD php-5.3.4.ebuild 9884 RMD160 db528694043e91c768be90a52f7859a6503dd265 SHA1 89cfa02e98539df7fe006407428c52231e88d5a7 SHA256 989994d4450cf8ff9d54fcf30f333fc6dea10f19e5149158c5e9315743ecfc56
 EBUILD php-5.3.5-r1.ebuild 9933 RMD160 6e48885c668620e3a1b3a0545a1734047b16bed8 SHA1 cf069ae24f07461d00ba9536544abc36a8a4ff67 SHA256 bab021a98aac63d49bc1351bf032c718637181a3562421aff1475b00d0f70f63
 EBUILD php-5.3.5.ebuild 9885 RMD160 aff975b485dbfa19d9122b961f303c8973aba55d SHA1 01416fee8225f13a1880cba41f792f0d93bebded SHA256 3d7a70399bdba558b8b63e18b287987d85bb5643dd409941d52825d895e2e05a
-EBUILD php-5.3.6_rc3.ebuild 9987 RMD160 e3d23b395f6586e50b45766362ed8976432bcc6e SHA1 eaadb2b6939de92472d6cd3f0503baf2577fe004 SHA256 dc8cf1480e3f9146d0569e641e51827961d1625d01f613023d634bfde2c0f4ab
-MISC ChangeLog 80636 RMD160 5770fbf271ad5e42109842ea3de4df5750b5ba8e SHA1 6fefba0963a298d016a0c036b763014537b65364 SHA256 f1e97d12e6ec790f3033f5cc8861974a4734e3d15c2fc040432a51485f814706
+EBUILD php-5.3.6_rc3.ebuild 9987 RMD160 4ae2c165223f0ec621357f1a8108b93b27ad8e23 SHA1 66cad0d0aa4550ee389ac800d53f81c59e6ecebb SHA256 9c79e9749c7b9d0eb7ff3d16121fe277ee7a164f6c42799cc252171716697cc9
+MISC ChangeLog 80764 RMD160 00b0543dc57393810765fe0c061318f62ccff3d7 SHA1 244507a95eafe68dc7286b65700a24fcb875b847 SHA256 4ce270a3b01122422258f187ea7585924d102cb2be828fd88d90946a6d1ca736
 MISC metadata.xml 2212 RMD160 e26ea7f6831acb23854f018fe6d00c213bf62e5a SHA1 25500969d6ef6c1918a8e6abbb04e0553806dee2 SHA256 6fdbba214ce15fae4a1e2eb086586008377fff85e67e38b1e2232a9745432674
diff --git a/dev-lang/php/files/eblits/src_prepare-v3.eblit b/dev-lang/php/files/eblits/src_prepare-v3.eblit
new file mode 100644
index 000000000000..7e270f97d27c
--- /dev/null
+++ b/dev-lang/php/files/eblits/src_prepare-v3.eblit
@@ -0,0 +1,73 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_prepare-v3.eblit,v 1.1 2011/03/13 09:48:06 olemarkus Exp $
+
+eblit-php-src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# kolab support (support for imap annotations)
+	use kolab && epatch "${WORKDIR}/${PV}/opt/imap-kolab-annotations.patch"
+
+	# Change PHP branding
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1${PHP_EXTRA_BRANDING}-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Apply generic PHP patches
+	EPATCH_SOURCE="${WORKDIR}/${PV}/generic" EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	# Suhosin support
+	if [[ -n $SUHOSIN_VERSION ]] ; then
+		if use suhosin ; then
+			epatch "${WORKDIR}/${SUHOSIN_PATCH}"
+		fi
+	else
+		ewarn "Please note that this version of PHP does not yet come with a suhosin patch"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	# rebuild the whole autotools stuff as we are heavily patching it
+	# (suhosin, fastbuild, ...)
+
+	# eaclocal doesn't accept --force, so we try to force re-generation
+	# this way
+	rm aclocal.m4
+
+	# work around divert() issues with newer autoconf, bug #281697
+	if has_version '>=sys-devel/autoconf-2.64' ; then
+		sed -i -r \
+			-e 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
+			$(grep -l divert $(find . -name '*.m4') configure.in) || die
+	fi
+	eautoreconf --force -W no-cross
+}
+
+
diff --git a/dev-lang/php/php-5.3.6_rc3.ebuild b/dev-lang/php/php-5.3.6_rc3.ebuild
index 797161e0ef5b..93a6f43f6116 100644
--- a/dev-lang/php/php-5.3.6_rc3.ebuild
+++ b/dev-lang/php/php-5.3.6_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.6_rc3.ebuild,v 1.1 2011/03/10 18:58:47 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.6_rc3.ebuild,v 1.2 2011/03/13 09:48:06 olemarkus Exp $
 
 EAPI=2
 
@@ -346,7 +346,7 @@ eblit-pkg() {
 
 eblit-pkg pkg_setup v2
 
-src_prepare() { eblit-run src_prepare v2 ; }
+src_prepare() { eblit-run src_prepare v3 ; }
 src_configure() { eblit-run src_configure v2 ; }
 src_compile() { eblit-run src_compile v1 ; }
 src_install() { eblit-run src_install v2 ; }