added prefix support (bug #433842)

Package-Manager: portage-2.2.0_alpha124/cvs/Linux i686

3 files changed, 26 insertions, 16 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index ef267ed16163..51557ace6deb 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.628 2012/09/04 10:00:01 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.629 2012/09/04 14:47:24 ottxor Exp $
+
+  04 Sep 2012; Christoph Junghans <ottxor@gentoo.org> php-5.4.6-r2.ebuild:
+  added prefix support (bug #433842)
 
   04 Sep 2012; Ole Markus With <olemarkus@gentoo.org> -php-5.3.13.ebuild,
   -php-5.3.14.ebuild, -php-5.3.14_rc2.ebuild, -php-5.3.16.ebuild,
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index c4cb17948453..b6bac6ef3d33 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -32,18 +32,18 @@ DIST suhosin-patch-5.3.9-0.9.10.patch.gz 40967 SHA256 4438caeab0a10c6c94aee9f7ea
 EBUILD php-5.3.15.ebuild 10727 SHA256 a6cdf22245763af064ecad4ff0e9a92cb5a30889fcfb0da494b51eada88e8fb7 SHA512 eb6d09c4a7fb06dbc88d6810331d567832b41ef9c8baed2c2014d5896c6363711a74d4ce355c0caf50416bda61be7fa6d453a768f428103c7b08f8ac77f0bd33 WHIRLPOOL 670d2680d75ba20a63d68fb4408d12aba4635ff50e722159b27b6ae2aaef2fe2b218c00a0a6b6aa34ffb0332085b3304d859a187a00d1a758f84bd42ac4b195b
 EBUILD php-5.3.16-r1.ebuild 10824 SHA256 cf409f4837f042fc1dd30aa18b72678d4d0a7fc0277b5a2419771ae1ab911909 SHA512 e49e72c7adccb674062ad341d20ed33097a668ada3a115829fc9eb4ad1de72c3e09a2f33a9db2f9f6129dfbb623d8eab34f2bf82a6108bb300ab3b55fecb809d WHIRLPOOL f6ea7c18bf3ef3bd00630036d3b18721b09e5cf7873d841de8131e1adbb9452e912fbabf4ec64441f58906d61c61ea3c1be7240eb6e04c7f06693b2ca210f981
 EBUILD php-5.4.5.ebuild 10449 SHA256 fe1ccc25a397885386c27354bf3c39033b0d06c1d53a442eedd06b9c71ca8e4e SHA512 39db961344fac186d5dec534d11d47392f389100e7a9850133065fe0a77077333182f0c4570f3b0c19a639a9a3d41c84fc5c461326431c5d4df6cf53b56947ff WHIRLPOOL 69ca656b6d12e3a14db0d8e9fa79b36f82448e2f1987728f9d342aa10de81ac69c57035467a9b273910896df3f547fc385c748352b094fce1a04ff0f1c5aa730
-EBUILD php-5.4.6-r2.ebuild 10535 SHA256 6ba99f6711730cbc795b591c8a289f61abc483aeca3b4da8090342a4182e0efc SHA512 6b74c0232b2ad8244f9d9751a7d549d34362b5c2bf3c0a28747d94fca46e56a02b865cf0449bc89f4728546734860ad6a053ce9b970cb4b33eb8c44193f1bbee WHIRLPOOL 3aee8a7e2c0b537a83250db61eefa4244c50e3fc254a1b86da7e144026b10de439abe71bdb574544c69fb560dc90cd229d1f10ffb66a7fa8725957ce98a1b8d6
+EBUILD php-5.4.6-r2.ebuild 10802 SHA256 264f1af337a1eaca0c4ec19ba6bdd9ebd242b887cc66d90aef440b612d2777d0 SHA512 fcb6f852266ca8416fc1edc85a4e3cbbd09814e0f2376f5c8b314ae60bea428f164b06ddbda75e18daa867c07e057ac1ceb50e025142a4b652eeb54dc02385ce WHIRLPOOL 2abb47d16a4f5ad5ab3e121d036d136f0c58051b5fd5fc033f58d6fe5e9acb2829ea610bd870cbc0df9b55c1f96925b0787216c2f4a23ed548f46b47c5c65733
 EBUILD php-5.4.6.ebuild 10444 SHA256 1b914ab2075cdc4a320bbb13d2fecad126834a3509c7e14a2785584e77f476ad SHA512 5c6da1a5ba8c69098de9387bfd7689d316e802a4b8eb6b25dae7ad5fff4511764f27e229498fbdde961075a838330ac31ea83c0050ee73b9e2efa99083f69989 WHIRLPOOL 445c72799a602d9ec3012d7a55db79123d7c15fdb1a0b454b339ac118df7d24b1526fdd5f38d37870579d4da10d87ced0bcb94df8da9411b082bc55b77b0accd
-MISC ChangeLog 103869 SHA256 ceb9fe3729d087baee5e97a2bf6e6d2925101558dfe81f6ac3aed998e8e2d992 SHA512 f69762db40ba2dc5d931d67345a9e510197faa65893df519f9a0c0d99d3d1926d21d406c9963c752dddae3a52b5efead84d51040eff338147214e2c3b756b619 WHIRLPOOL fb07bcad2513aab3074c3f8a2a3a0c8d8f026fb0439052eb6f1318aab3d4dda4e25947b28fe015ed57599a0fd44e5189d72da85831818ea9557a192d343d6bbc
+MISC ChangeLog 103979 SHA256 94f53435c61556e28963ebd6f8a9a8476f1d6ac99e7080b3d689dde7e1ebaa69 SHA512 247348d38b23e6d2706da6b9c580188804ffee9fb95f72ed4eb0391df62e2976c2235f06f4ac8d7184eeff049991f28b2bae5e553e9c63b38782b9e7267b57e5 WHIRLPOOL bc3879e60e14ccfb4535f80afb8d1df4585ace27f4983ce7576b5d653912ad5368a682a5228a2fd4d9b9e6783bd0027ef1bdfda3e5ffc6d57e1aec867a17ea1c
 MISC metadata.xml 1497 SHA256 3d6a278c7a85c8b478ca03860b80a8ceda5f3a5ddc64e2d41ab9ca686e7162df SHA512 0f542931aa28d7322feb08ec8514c7d9ae2e8cc1033f6e19bc74d73e76b3828c093d26d7b5801c7cec6716d1f9a05d69325b84739d7d71abc315161950b2902d WHIRLPOOL eaf4534313f10ff26c02d462839259e43d354729e0e707228874614e00e34ea6ae57b4002e062b8f846e8899f8761feb86355583509dbbd6a7f01f913bc25be9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQRdEmAAoJEGurSuXEqSv1oRwH/3iqJtPU7/mpbbB5z/RCda5c
-8VssCFVOZ8+OXfhMOAt4JCt9n7Th1vfEFfvYIJdYb2uopNfUu6VestU2U2rGLLXJ
-NViEEALUpGtLc4srpmOqNJECZWktVE9From4yDaVq9vDY4q4suGJv/i3nLIGkNJg
-Awd5/DPPdN1FJN+Ohc9n628pOnHQLDiXdgWsPgpkRg246IXlj8J7zq/PLJAPZapS
-dgI/K55e9MRQ0NPrVINFVpT4PD6nih2zSc6illYYOXSrk0D1hkig7DID1S3VpjhE
-5av7/h+IAYP7g/jQZrrsCisTphGQR/ghQomqH+GZZhr/OpeIK6+fnWBHBtPJy80=
-=sIDE
+iQEcBAEBCAAGBQJQRhSDAAoJEOeBhlrCAAWG6UsIAKYPfVi0u4nKBLqZ0wWTfD0y
+HrA2VlK2qIhvZdn+LeOUWm9fpdrsDWoK3NdV/8cvupceZybPhVHp41ia9zZHQfZA
+yjRO5YyDfyNeL2/QG8+/7Kq8A66N1/89MjeMd0mz0OIg+3nv4h0gTuhPh8Gal2A6
+2469NO0Oe1GpbwDDpWpImHTlyPuEOlKcAOcM4gACmCALnot5K7X9D+aWJ0mr4lek
+5vLGLnLSQj3xPKdnou6QA0dylY3ZDg+XsipBChp3ynZHN1YK0mAjJ8kFRqhiSbTR
+Jt+zdmWkbRUixxPJXjpEGuAob/siJnd1sujS3JalhWqVAIqbF9cgH+RjdjSIjOc=
+=ihJq
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/php/php-5.4.6-r2.ebuild b/dev-lang/php/php-5.4.6-r2.ebuild
index e02fac850671..5d59da7a7e38 100644
--- a/dev-lang/php/php-5.4.6-r2.ebuild
+++ b/dev-lang/php/php-5.4.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.6-r2.ebuild,v 1.1 2012/08/29 13:12:48 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.6-r2.ebuild,v 1.2 2012/09/04 14:47:24 ottxor Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SUHOSIN_VERSION=""
 FPM_VERSION="builtin"
 EXPECTED_TEST_FAILURES=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {
@@ -321,7 +321,14 @@ eblit-pkg() {
 
 eblit-pkg pkg_setup v3
 
-src_prepare() { eblit-run src_prepare v4 ; }
+src_prepare() {
+	eblit-run src_prepare v4
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
 src_configure() { eblit-run src_configure v54 ; }
 src_compile() { eblit-run src_compile v2 ; }
 src_install() { eblit-run src_install v3 ; }
@@ -354,7 +361,7 @@ pkg_postinst() {
 		fi
 	done
 
-	elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order"
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
 	elog "to compile extensions for the ${SLOT} ABI"
 	elog
 	if ! use readline && use cli ; then
@@ -364,8 +371,8 @@ pkg_postinst() {
 	elog
 	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
 	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in /etc/make.conf"
-	elog "Both versions of php.ini can be found in /usr/share/doc/${PF}"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
 
 	elog
 	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"