* [gentoo-commits] gentoo-x86 commit in dev-lang/php/files/eblits: pkg_postinst-v2.eblit src_install-v2.eblit
@ 2010-10-30 21:41 Ole Markus With (olemarkus)
0 siblings, 0 replies; 2+ messages in thread
From: Ole Markus With (olemarkus) @ 2010-10-30 21:41 UTC (permalink / raw
To: gentoo-commits
olemarkus 10/10/30 21:41:10
Modified: pkg_postinst-v2.eblit src_install-v2.eblit
Log:
Added cgi support to minor version slotted ebuilds and made it possible to chose which version of php.ini to use
(Portage version: 2.1.9.11/cvs/Linux x86_64)
Revision Changes Path
1.4 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.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit?r1=1.3&r2=1.4
Index: pkg_postinst-v2.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pkg_postinst-v2.eblit 19 Oct 2010 06:20:34 -0000 1.3
+++ pkg_postinst-v2.eblit 30 Oct 2010 21:41:10 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.3 2010/10/19 06:20:34 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit,v 1.4 2010/10/30 21:41:10 olemarkus Exp $
eblit-php-pkg_postinst() {
# Output some general info to the user
@@ -12,20 +12,22 @@
# Create the symlinks for php
- local m modules="cli apache2 fpm"
+ local m modules="cli apache2 fpm cgi"
for m in $modules; do
if use $m ; then
local ci=$(eselect php show $m)
if [[ -z $ci ]]; then
eselect php set $m php${SLOT}
elif [[ $ci != "php${SLOT}" ]] ; then
- ewarn "To switch $m to use php-${SLOT}, run"
- ewarn " eselect php set $m php${SLOT}"
- ewarn
+ elog "To switch $m to use php-${SLOT}, run"
+ elog " eselect php set $m php${SLOT}"
+ elog
fi
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)"
if ! use readline && use cli ; then
@@ -33,5 +35,9 @@
ewarn "the readline USE flag or php -a will hang"
fi
ewarn
+ ewarn "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+ 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}"
}
1.8 dev-lang/php/files/eblits/src_install-v2.eblit
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?r1=1.7&r2=1.8
Index: src_install-v2.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- src_install-v2.eblit 27 Oct 2010 10:33:18 -0000 1.7
+++ src_install-v2.eblit 30 Oct 2010 21:41:10 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v 1.7 2010/10/27 10:33:18 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v 1.8 2010/10/30 21:41:10 olemarkus Exp $
eblit-php-src_install() {
# see bug #324739 for what happens when we don't have that
@@ -145,4 +145,16 @@
newinitd "${FILESDIR}/php-fpm-r1.init" "php-fpm"
# dosym "${PHP_DESTDIR}/bin/php-fpm" "/usr/bin/php-fpm"
fi
+
+ # Install PHP ini files into /usr/share/php
+ if [[ ${SLOT} == '5.2' ]]; then
+ newdoc php.ini-dist php.ini-development
+ newdoc php.ini-recommended php.ini-production
+ fi
+
+ if [[ ${SLOT} == '5.3' ]]; then
+ dodoc php.ini-development
+ dodoc php.ini-production
+ fi
+
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/php/files/eblits: pkg_postinst-v2.eblit src_install-v2.eblit
@ 2010-11-02 17:12 Ole Markus With (olemarkus)
0 siblings, 0 replies; 2+ messages in thread
From: Ole Markus With (olemarkus) @ 2010-11-02 17:12 UTC (permalink / raw
To: gentoo-commits
olemarkus 10/11/02 17:12:42
Modified: pkg_postinst-v2.eblit src_install-v2.eblit
Log:
Added abit more information to postinst
(Portage version: 2.1.8.3/cvs/Linux i686)
Revision Changes Path
1.7 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.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit?r1=1.6&r2=1.7
Index: pkg_postinst-v2.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pkg_postinst-v2.eblit 1 Nov 2010 18:26:06 -0000 1.6
+++ pkg_postinst-v2.eblit 2 Nov 2010 17:12:42 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.6 2010/11/01 18:26:06 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_postinst-v2.eblit,v 1.7 2010/11/02 17:12:42 olemarkus Exp $
eblit-php-pkg_postinst() {
# Output some general info to the user
@@ -32,6 +32,9 @@
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"
+ ewarn "to compile extensions for the ${SLOT} ABI"
+ ewarn
if ! use readline && use cli ; then
ewarn "Note that in order to use php interactivly, you need to enable"
ewarn "the readline USE flag or php -a will hang"
1.9 dev-lang/php/files/eblits/src_install-v2.eblit
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?r1=1.8&r2=1.9
Index: src_install-v2.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- src_install-v2.eblit 30 Oct 2010 21:41:10 -0000 1.8
+++ src_install-v2.eblit 2 Nov 2010 17:12:42 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v 1.8 2010/10/30 21:41:10 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v 1.9 2010/11/02 17:12:42 olemarkus Exp $
eblit-php-src_install() {
# see bug #324739 for what happens when we don't have that
@@ -113,6 +113,9 @@
insinto "${PHP_INI_DIR}"
newins "${phpinisrc}" "${PHP_INI_FILE}"
+ elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR}"
+ elog
+
dodir "${PHP_EXT_INI_DIR}"
dodir "${PHP_EXT_INI_DIR_ACTIVE}"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-11-02 17:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-30 21:41 [gentoo-commits] gentoo-x86 commit in dev-lang/php/files/eblits: pkg_postinst-v2.eblit src_install-v2.eblit Ole Markus With (olemarkus)
-- strict thread matches above, loose matches on Subject: below --
2010-11-02 17:12 Ole Markus With (olemarkus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox