* [gentoo-commits] gentoo-x86 commit in dev-lang/php/files/eblits: src_install-v2.eblit
@ 2010-10-19 20:07 Ole Markus With (olemarkus)
0 siblings, 0 replies; 5+ messages in thread
From: Ole Markus With (olemarkus) @ 2010-10-19 20:07 UTC (permalink / raw
To: gentoo-commits
olemarkus 10/10/19 20:07:25
Modified: src_install-v2.eblit
Log:
Added fpm init script that works with slotting
(Portage version: 2.1.9.11/cvs/Linux x86_64)
Revision Changes Path
1.5 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.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?r1=1.4&r2=1.5
Index: src_install-v2.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- src_install-v2.eblit 17 Oct 2010 19:23:35 -0000 1.4
+++ src_install-v2.eblit 19 Oct 2010 20:07:25 -0000 1.5
@@ -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.4 2010/10/17 19:23:35 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v 1.5 2010/10/19 20:07:25 olemarkus Exp $
eblit-php-src_install() {
# see bug #324739 for what happens when we don't have that
@@ -143,8 +143,7 @@
doins "${WORKDIR}/sapis-build/fpm/sapi/fpm/php-fpm.conf"
dodir "/etc/init.d"
insinto "/etc/init.d"
- newins "${FILESDIR}/php-fpm.init" "php-fpm"
- fperms 755 "/etc/init.d/php-fpm"
+ newinitd "${FILESDIR}/php-fpm-r1.init" "php-fpm"
# dosym "${PHP_DESTDIR}/bin/php-fpm" "/usr/bin/php-fpm"
fi
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/php/files/eblits: src_install-v2.eblit
@ 2010-10-24 12:17 Matti Bickel (mabi)
0 siblings, 0 replies; 5+ messages in thread
From: Matti Bickel (mabi) @ 2010-10-24 12:17 UTC (permalink / raw
To: gentoo-commits
mabi 10/10/24 12:17:01
Modified: src_install-v2.eblit
Log:
install apache module config file into standard directory
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.6 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.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?r1=1.5&r2=1.6
Index: src_install-v2.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- src_install-v2.eblit 19 Oct 2010 20:07:25 -0000 1.5
+++ src_install-v2.eblit 24 Oct 2010 12:17:01 -0000 1.6
@@ -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.5 2010/10/19 20:07:25 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v 1.6 2010/10/24 12:17:01 mabi Exp $
eblit-php-src_install() {
# see bug #324739 for what happens when we don't have that
@@ -130,8 +130,7 @@
# SAPI-specific handling
if [[ "${sapi}" == "apache2" ]] ; then
- einfo "Installing Apache2 config 70_mod_php${PHP_MV}.conf (${PHP_DESTDIR})"
- insinto ${PHP_DESTDIR}/apache2
+ insinto "${APACHE_MODULES_CONFDIR}"
newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
"70_mod_php${PHP_MV}.conf"
fi
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/php/files/eblits: src_install-v2.eblit
@ 2010-12-19 22:45 Matti Bickel (mabi)
0 siblings, 0 replies; 5+ messages in thread
From: Matti Bickel (mabi) @ 2010-12-19 22:45 UTC (permalink / raw
To: gentoo-commits
mabi 10/12/19 22:45:22
Modified: src_install-v2.eblit
Log:
somehow managed to miss the fpm part of the src_install update: new init/conf files fix bugs #343649, #348507
(Portage version: 2.1.9.24/cvs/Linux x86_64)
Revision Changes Path
1.11 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.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?r1=1.10&r2=1.11
Index: src_install-v2.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- src_install-v2.eblit 19 Dec 2010 14:24:49 -0000 1.10
+++ src_install-v2.eblit 19 Dec 2010 22:45:22 -0000 1.11
@@ -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.10 2010/12/19 14:24:49 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v 1.11 2010/12/19 22:45:22 mabi Exp $
eblit-php-src_install() {
# see bug #324739 for what happens when we don't have that
@@ -53,6 +53,7 @@
if [[ "${sapi}" == "apache2" ]]; then
insinto "${PHP_DESTDIR}/apache2/"
newins "${file}" "${file/*\/}"
+ keepdir "/usr/$(get_libdir)/apache2/modules"
else
dolib.so "${file}" || die "Unable to install ${sapi} sapi"
fi
@@ -140,12 +141,11 @@
if [[ "${sapi}" == "fpm" ]] ; then
einfo "Installing FPM CGI config file php-fpm.conf"
- epatch "${FILESDIR}/php-fpm-gentooified-${PV}.patch"
insinto ${PHP_INI_DIR}
- doins "${WORKDIR}/sapis-build/fpm/sapi/fpm/php-fpm.conf"
+ doins "${FILESDIR}/php-fpm.conf"
dodir "/etc/init.d"
insinto "/etc/init.d"
- newinitd "${FILESDIR}/php-fpm-r1.init" "php-fpm"
+ newinitd "${FILESDIR}/php-fpm-r3.init" "php-fpm"
# dosym "${PHP_DESTDIR}/bin/php-fpm" "/usr/bin/php-fpm"
fi
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/php/files/eblits: src_install-v2.eblit
@ 2011-06-17 10:03 Ole Markus With (olemarkus)
0 siblings, 0 replies; 5+ messages in thread
From: Ole Markus With (olemarkus) @ 2011-06-17 10:03 UTC (permalink / raw
To: gentoo-commits
olemarkus 11/06/17 10:03:02
Modified: src_install-v2.eblit
Log:
Added php-5.3.7_rc1
Fixed bug 359905
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Revision Changes Path
1.12 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.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?r1=1.11&r2=1.12
Index: src_install-v2.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- src_install-v2.eblit 19 Dec 2010 22:45:22 -0000 1.11
+++ src_install-v2.eblit 17 Jun 2011 10:03:02 -0000 1.12
@@ -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_install-v2.eblit,v 1.11 2010/12/19 22:45:22 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v 1.12 2011/06/17 10:03:02 olemarkus Exp $
eblit-php-src_install() {
# see bug #324739 for what happens when we don't have that
@@ -146,7 +146,10 @@
dodir "/etc/init.d"
insinto "/etc/init.d"
newinitd "${FILESDIR}/php-fpm-r3.init" "php-fpm"
-# dosym "${PHP_DESTDIR}/bin/php-fpm" "/usr/bin/php-fpm"
+ #dosym "${PHP_DESTDIR}/bin/php-fpm" "/usr/bin/php-fpm"
+
+ # Remove bogus /etc/php-fpm.conf.default (bug 359906)
+ [[ -f "${D}/etc/php-fpm.conf.default" ]] && rm "${D}/etc/php-fpm.conf.default"
fi
# Install PHP ini files into /usr/share/php
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/php/files/eblits: src_install-v2.eblit
@ 2011-07-23 10:14 Ole Markus With (olemarkus)
0 siblings, 0 replies; 5+ messages in thread
From: Ole Markus With (olemarkus) @ 2011-07-23 10:14 UTC (permalink / raw
To: gentoo-commits
olemarkus 11/07/23 10:14:46
Modified: src_install-v2.eblit
Log:
New rc. Includes new init script with better pid handling
(Portage version: 2.1.10.6/cvs/Linux x86_64)
Revision Changes Path
1.13 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.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit?r1=1.12&r2=1.13
Index: src_install-v2.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- src_install-v2.eblit 17 Jun 2011 10:03:02 -0000 1.12
+++ src_install-v2.eblit 23 Jul 2011 10:14:46 -0000 1.13
@@ -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/src_install-v2.eblit,v 1.12 2011/06/17 10:03:02 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v 1.13 2011/07/23 10:14:46 olemarkus Exp $
eblit-php-src_install() {
# see bug #324739 for what happens when we don't have that
@@ -140,12 +140,14 @@
fi
if [[ "${sapi}" == "fpm" ]] ; then
+ [[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3
+ [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
einfo "Installing FPM CGI config file php-fpm.conf"
insinto ${PHP_INI_DIR}
- doins "${FILESDIR}/php-fpm.conf"
+ newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
dodir "/etc/init.d"
insinto "/etc/init.d"
- newinitd "${FILESDIR}/php-fpm-r3.init" "php-fpm"
+ newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm"
#dosym "${PHP_DESTDIR}/bin/php-fpm" "/usr/bin/php-fpm"
# Remove bogus /etc/php-fpm.conf.default (bug 359906)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-07-23 10:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-19 22:45 [gentoo-commits] gentoo-x86 commit in dev-lang/php/files/eblits: src_install-v2.eblit Matti Bickel (mabi)
-- strict thread matches above, loose matches on Subject: below --
2011-07-23 10:14 Ole Markus With (olemarkus)
2011-06-17 10:03 Ole Markus With (olemarkus)
2010-10-24 12:17 Matti Bickel (mabi)
2010-10-19 20:07 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