security version bump, remove old

(Portage version: 2.2.0_alpha11/cvs/Linux x86_64)

4 files changed, 15 insertions, 7 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 7cb208184348..2bbc6afff3db 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,14 @@
 # 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.455 2011/01/05 12:35:18 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.456 2011/01/06 23:35:43 mabi Exp $
+
+*php-5.3.5 (06 Jan 2011)
+*php-5.2.17 (06 Jan 2011)
+
+  06 Jan 2011; Matti Bickel <mabi@gentoo.org>
+  files/eblits/pkg_postinst-v2.eblit, -php-5.2.16-r1.ebuild,
+  +php-5.2.17.ebuild, -php-5.3.4-r1.ebuild, +php-5.3.5.ebuild:
+  security version bump, remove old
 
   05 Jan 2011; Matti Bickel <mabi@gentoo.org> php-5.2.16-r1.ebuild,
   php-5.3.4-r1.ebuild:
diff --git a/dev-lang/php/files/eblits/pkg_postinst-v2.eblit b/dev-lang/php/files/eblits/pkg_postinst-v2.eblit
index b54c609c90ba..bf273f456bf7 100644
--- a/dev-lang/php/files/eblits/pkg_postinst-v2.eblit
+++ b/dev-lang/php/files/eblits/pkg_postinst-v2.eblit
@@ -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/files/eblits/pkg_postinst-v2.eblit,v 1.9 2011/01/05 11:23:16 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit,v 1.10 2011/01/06 23:35:43 mabi Exp $
 
 eblit-php-pkg_postinst() {
 	# Output some general info to the user
@@ -47,7 +47,7 @@ eblit-php-pkg_postinst() {
 	ls "${ROOT}"/etc/php/*-php5 &>/dev/null
 	if [[ $? -eq 0 ]]; then
 		ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config"
-		ewarn "files are now kept at ${ROOT}/etc/php/\$SAPI-php${SLOT}"
+		ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x"
 	fi
 	ewarn
 	ewarn "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
diff --git a/dev-lang/php/php-5.2.16-r1.ebuild b/dev-lang/php/php-5.2.17.ebuild
index 0913884a1115..88410fa3ca8b 100644
--- a/dev-lang/php/php-5.2.16-r1.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.16-r1.ebuild,v 1.2 2011/01/05 12:35:18 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.17.ebuild,v 1.1 2011/01/06 23:35:43 mabi Exp $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ interbase msql oci8 sapdb solid"
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
 
 #SUHOSIN_VERSION="$PV-0.9.7"
-SUHOSIN_VERSION=""
+SUHOSIN_VERSION="5.2.16-0.9.7"
 EXPECTED_TEST_FAILURES=""
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
diff --git a/dev-lang/php/php-5.3.4-r1.ebuild b/dev-lang/php/php-5.3.5.ebuild
index 9704173ef7aa..2b1fbccd47d0 100644
--- a/dev-lang/php/php-5.3.4-r1.ebuild
+++ b/dev-lang/php/php-5.3.5.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.4-r1.ebuild,v 1.2 2011/01/05 12:35:18 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.5.ebuild,v 1.1 2011/01/06 23:35:43 mabi Exp $
 
 EAPI=2
 
@@ -8,7 +8,7 @@ PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
 
-SUHOSIN_VERSION="${PV}-0.9.10"
+SUHOSIN_VERSION="5.3.4-0.9.10"
 FPM_VERSION="builtin"
 EXPECTED_TEST_FAILURES=""