Disable installing suhosin extension on use suhosin for 5.2.17. Should always be installed manually. Same behaviour as all other versions of php

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

4 files changed, 20 insertions, 11 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index b74cfe92a93d..75a2e6e914c9 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,11 @@
 # 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.502 2011/08/21 14:06:56 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.503 2011/08/22 13:42:39 olemarkus Exp $
+
+  22 Aug 2011; Ole Markus With <olemarkus@gentoo.org>
+  files/eblits/pkg_postinst-v1.eblit, php-5.2.17.ebuild:
+  Disable installing suhosin extension on use suhosin for 5.2.17. Should always
+  be installed manually. Same behaviour as all other versions of php
 
   21 Aug 2011; Ole Markus With <olemarkus@gentoo.org> -php-5.3.7_rc2.ebuild,
   -php-5.3.7_rc3.ebuild, -php-5.3.7.ebuild, -php-5.4.0_alpha1.ebuild,
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 175e551e2001..131a83183858 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -5,7 +5,7 @@ AUX 70_mod_php5_concurr.conf-apache2 348 RMD160 9f3f49a52ebf92c2650501c5ceb6f95c
 AUX 70_mod_php5_concurr.conf-apache2-r1 376 RMD160 4f7de5c0784b6191450b5c1a7de7ad941620e199 SHA1 c42a23bd7a1d3e8c7e0ac906f50f180116349f76 SHA256 c05f499d9c8927391c586b94716a9f59d63767165552ea527ec7ff63c36eaa40
 AUX eblits/common-v1.eblit 379 RMD160 60b526e9a736553f6e4883c9fb9525464192bde2 SHA1 97c4e1c9475d73227f26cbef80640f43d838af6f SHA256 65c909a6d0501a6746518f539c4a4021426469cbf20b2a212fb0d60b48da5362
 AUX eblits/common-v2.eblit 379 RMD160 595fd6c6be1e0ac15012ea78497a4d2c287c6754 SHA1 98e28261e32bda53c7dfef88def615f633af7c44 SHA256 8c15442b04b0216342ef6f2b8565cb3510f6850fe67745d5697861e2f7759194
-AUX eblits/pkg_postinst-v1.eblit 2406 RMD160 3a01007b2e98d210aca1f9925b31e04251416a0b SHA1 06da28413cdfe111946e53b3ace75fe32561eac5 SHA256 2cad6bf864ea0ad9464642ad9f0fa0e90262771edb2a588cd48ef54d7848e729
+AUX eblits/pkg_postinst-v1.eblit 2637 RMD160 bc8aa3cf6a4df484395499f97a638d7e54eb4956 SHA1 ed906bac5f7e7b4c54732b8ee260f173113b86b6 SHA256 a9a323ed29f81252928fed49b2f010288d519233f15092648335e2615b7fe78d
 AUX eblits/pkg_postinst-v2.eblit 2224 RMD160 766ba5a45b59cb328072d8e030219b9cbc01499e SHA1 e59eec1a1661a34dd45ee3fc751d11fcd3c2f909 SHA256 50c68ceb6a8f53dbac66cba9766882bfdad1aaf453593aeee693179f55c1ffb8
 AUX eblits/pkg_setup-v1.eblit 648 RMD160 ff9606a7a1d264d74346bfb32224b2f2301e6fbc SHA1 55931051c1f2622e8264427a0791dc9f769f1665 SHA256 6a3cb75ca657b521320b124bac77586026be826ae1947a2d988137212f3f3d6a
 AUX eblits/pkg_setup-v2.eblit 393 RMD160 430ab1f0227011172d422886862bd59d3886034a SHA1 2fdb587135cd0fe84ea51bfee8cf4ea9fd67dcb5 SHA256 17f9316065960ff0ca56aeec918c2c9e6c80ffdf951a238f7271a589753e320c
@@ -44,10 +44,10 @@ DIST php-patchset-5.3.6-r0.tar.bz2 10033 RMD160 352290d674cfc3bb76c4ee44b90e3ef7
 DIST php-patchset-5.3.7_rc5-r0.tar.bz2 7519 RMD160 ec76e0b1d60d2f8f48c835e1bf9e3d3fd912688f SHA1 2a672db9d742330f6a3b122ad170a7ab6282a9eb SHA256 8faf9573fd0a255413ead940323e11c439e3a74eb9eb4bad71959334a81e2da1
 DIST php-patchset-5.4.0_alpha3-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea
 DIST suhosin-patch-5.2.16-0.9.7.patch.gz 23069 RMD160 b28b70faf136b3e04c5b483da0f4c2279378f43a SHA1 fec10b2b81582d06bb0d0a96ea55c525afc8ab29 SHA256 aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91
-EBUILD php-5.2.17.ebuild 9485 RMD160 3c6079bff58c1cb97302a03a207dfe1d0ad5a64f SHA1 56d7b3d08d1c08385bf1e4e783380bb1ef3357b5 SHA256 117bbe4abb70de4b2b3e4bafd1c8c5b76e8f5d9a16e25e3c78326e53350535ab
+EBUILD php-5.2.17.ebuild 9357 RMD160 0b58506aa7df24546ecbcf8fce42a6ce7f5cc2f2 SHA1 7d4055e988d1cc7ac4932ce82543bcece76a4ba5 SHA256 8c9f0ba52b7e8297b0ecdbcc1ad5bde40e5d4d602cb70ed2f5d0262032cc393b
 EBUILD php-5.3.6-r1.ebuild 9538 RMD160 e7365ce71f94f06b5732d497b9fc94b93f12945d SHA1 ccdd5c0fdcd169b4819d924ff0f5f5a6caaf934b SHA256 97ffbe697c6d607b748b89044baed1b4a91fc7a09790d0abfce6acc47ca45703
 EBUILD php-5.3.6.ebuild 9794 RMD160 9be2d19b4cfc93aa0f6920958f7868198b254427 SHA1 ab4f7dfd77ce61441901e4ae6834c6563a1bf96c SHA256 f97847b13e3f5a09f686006401f816ba823850541da4d2ab58a9c7289651809e
 EBUILD php-5.3.7_rc5.ebuild 9586 RMD160 11d58a882bf84a1774972c681e966843be5b9848 SHA1 0ff0dd39b93d07a0f71d9f5347b71a4924469a50 SHA256 36254b1d768560550d4a38b5d24c7ddfe7a1c3ff5376a4de8bfc3e2a63e35a02
 EBUILD php-5.4.0_alpha3.ebuild 8532 RMD160 ce493599d94ac424c07a7969b70effacced85811 SHA1 69ac3e3419877599be62f2117f0915c0a27990ff SHA256 7a070e5e99d1d14f6cac93c986574f4fdaac9ce16b2fb4c9d6133634b32a7b68
-MISC ChangeLog 85731 RMD160 33a7efcce5962eb68b9cd6bf9e1f787bef6bf939 SHA1 5558e3b63e95d3903e0cafee29fba1ebf7a18c42 SHA256 06297e9560f4d09f563cab3c527393cb90f01be98d98c91cb94982a77142f226
+MISC ChangeLog 85992 RMD160 c4e0ab3d2e9318b65fec747a8bb06cf931bf67c0 SHA1 40d6015f2dcf2413dc47e6a1a8db77ebce762633 SHA256 4e7d10e69cdb96aa09f7f8513278ead48c45998c01262822288c25bc4079edf4
 MISC metadata.xml 2212 RMD160 e26ea7f6831acb23854f018fe6d00c213bf62e5a SHA1 25500969d6ef6c1918a8e6abbb04e0553806dee2 SHA256 6fdbba214ce15fae4a1e2eb086586008377fff85e67e38b1e2232a9745432674
diff --git a/dev-lang/php/files/eblits/pkg_postinst-v1.eblit b/dev-lang/php/files/eblits/pkg_postinst-v1.eblit
index c19dd9a452e7..6a4bf86b1999 100644
--- a/dev-lang/php/files/eblits/pkg_postinst-v1.eblit
+++ b/dev-lang/php/files/eblits/pkg_postinst-v1.eblit
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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/pkg_postinst-v1.eblit,v 1.4 2011/02/16 08:12:28 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v1.eblit,v 1.5 2011/08/22 13:42:39 olemarkus Exp $
 
 eblit-php-pkg_postinst() {
 	# Output some general info to the user
@@ -71,6 +71,13 @@ eblit-php-pkg_postinst() {
 	ewarn 
 	ewarn "Please read the upgrade guide: http://www.gentoo.org/proj/en/php/php-upgrading.xml"
 	ewarn
+
+	if ( [[ -z SUHOSIN_VERSION ]] && use suhosin ) ; then
+		ewarn "The suhosin USE flag now only installs the suhosin patch!"
+		ewarn "If you want the suhosin extension, make sure you install"
+		ewarn " dev-php5/suhosin"
+		ewarn
+	fi
 }
 
 
diff --git a/dev-lang/php/php-5.2.17.ebuild b/dev-lang/php/php-5.2.17.ebuild
index d080444ca881..73d495220a8e 100644
--- a/dev-lang/php/php-5.2.17.ebuild
+++ b/dev-lang/php/php-5.2.17.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.2.17.ebuild,v 1.13 2011/04/19 16:44:56 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.17.ebuild,v 1.14 2011/08/22 13:42:39 olemarkus Exp $
 
 EAPI=2
 
@@ -236,10 +236,7 @@ DEPEND="${DEPEND}
 	>=sys-devel/libtool-1.5.18"
 
 # They are in PDEPEND because we need PHP installed first!
-PDEPEND="doc? ( app-doc/php-docs )
-	suhosin? ( dev-php${PHP_MV}/suhosin )"
-
-[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
+PDEPEND="doc? ( app-doc/php-docs )"
 
 SLOT="$(get_version_component_range 1-2)"
 S="${WORKDIR}/${PHP_P}"