[gentoo-commits] gentoo-x86 commit in dev-lang/php/files/eblits: src_prepare-v2.eblit pkg_postinst-v2.eblit src_configure-v2.eblit

[Matti Bickel (mabi)]

mabi        11/01/05 11:23:16

  Modified:             src_prepare-v2.eblit pkg_postinst-v2.eblit
                        src_configure-v2.eblit
  Log:
  now includes new suhosin patch, mhash is usable again, interbase/firebird configure fixed, now includes a warning about stale config dirs
  
  (Portage version: 2.2.0_alpha11/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  dev-lang/php/files/eblits/src_prepare-v2.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_prepare-v2.eblit?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_prepare-v2.eblit?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_prepare-v2.eblit?r1=1.2&r2=1.3

Index: src_prepare-v2.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_prepare-v2.eblit,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src_prepare-v2.eblit	19 Dec 2010 14:24:49 -0000	1.2
+++ src_prepare-v2.eblit	5 Jan 2011 11:23:16 -0000	1.3
@@ -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/src_prepare-v2.eblit,v 1.2 2010/12/19 14:24:49 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_prepare-v2.eblit,v 1.3 2011/01/05 11:23:16 mabi Exp $
 
 eblit-php-src_prepare() {
 	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
@@ -47,8 +47,11 @@
 		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
 
+
 	# rebuild the whole autotools stuff as we are heavily patching it
 	# (suhosin, fastbuild, ...)
 



1.9                  dev-lang/php/files/eblits/pkg_postinst-v2.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit?r1=1.8&r2=1.9

Index: pkg_postinst-v2.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pkg_postinst-v2.eblit	22 Nov 2010 11:53:15 -0000	1.8
+++ pkg_postinst-v2.eblit	5 Jan 2011 11:23:16 -0000	1.9
@@ -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-v2.eblit,v 1.8 2010/11/22 11:53:15 olemarkus Exp $
+# $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 $
 
 eblit-php-pkg_postinst() {
 	# Output some general info to the user
@@ -28,8 +28,6 @@
 		fi
 	done
 
-  
-
 	ewarn "You may have to recompile third-party extensions now"
 	ewarn "(includes every dev-php5/pecl-* package and probably others in that category)"
 	ewarn "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order"
@@ -44,6 +42,13 @@
 	ewarn "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
 	ewarn "'production' or 'development' in /etc/make.conf"
 	ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}"
+
+	# check for not yet migrated old style config dirs
+	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}"
+	fi
 	ewarn
 	ewarn "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
 	ewarn "http://www.gentoo.org/proj/en/php/php-guide.xml"



1.5                  dev-lang/php/files/eblits/src_configure-v2.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_configure-v2.eblit?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_configure-v2.eblit?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_configure-v2.eblit?r1=1.4&r2=1.5

Index: src_configure-v2.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v2.eblit,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- src_configure-v2.eblit	21 Dec 2010 09:09:17 -0000	1.4
+++ src_configure-v2.eblit	5 Jan 2011 11:23:16 -0000	1.5
@@ -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/src_configure-v2.eblit,v 1.4 2010/12/21 09:09:17 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v2.eblit,v 1.5 2011/01/05 11:23:16 mabi Exp $
 
 eblit-php-src_configure() {
 	PHP_DESTDIR="/usr/$(get_libdir)/php${SLOT}"
@@ -35,6 +35,7 @@
 	phpconfutils_extension_with    "gettext"      "nls"              1
 	phpconfutils_extension_with    "gmp"          "gmp"              1
 	phpconfutils_extension_disable "hash"         "hash"             0
+	phpconfutils_extension_with    "mhash"        "mhash"            0
 	phpconfutils_extension_without "iconv"        "iconv"            0
 	phpconfutils_extension_enable  "intl"         "intl"             1
 	phpconfutils_extension_disable "ipv6"         "ipv6"             0
@@ -113,8 +114,14 @@
 		phpconfutils_extension_with "imap-ssl" "ssl"  0
 	fi
 
-	phpconfutils_extension_with "interbase"	"interbase"	0 "/opt"
-	phpconfutils_extension_with	"interbase"	"firebird"	0 "/usr"
+	# Interbase/firebird support
+	if use interbase ; then
+		phpconfutils_extension_with "interbase"	"interbase"	0 "/opt"
+	fi
+
+	if use firebird ; then
+		phpconfutils_extension_with	"interbase"	"firebird"	0 "/usr"
+	fi
 
 	# LDAP support
 	if use ldap ; then