[gentoo-commits] gentoo-x86 commit in dev-lang/php/files/eblits: src_install-v3.eblit src_configure-v1.eblit src_configure-snapshots.eblit src_install-v1.eblit pkg_postinst-v1.eblit src_prepare-snapshots.eblit pkg_setup-v1.eblit

[gentoo-commits] gentoo-x86 commit in dev-lang/php/files/eblits: src_install-v3.eblit src_configure-v1.eblit src_configure-snapshots.eblit src_install-v1.eblit pkg_postinst-v1.eblit src_prepare-snapshots.eblit pkg_setup-v1.eblit

[Ole Markus With (olemarkus)]

olemarkus    11/11/08 18:14:09

  Modified:             src_install-v3.eblit
  Removed:              src_configure-v1.eblit
                        src_configure-snapshots.eblit src_install-v1.eblit
                        pkg_postinst-v1.eblit src_prepare-snapshots.eblit
                        pkg_setup-v1.eblit
  Log:
  Major cleanup of the ./files. Hopefully I did not break anything
  
  (Portage version: 2.2.0_alpha71/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  dev-lang/php/files/eblits/src_install-v3.eblit

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

Index: src_install-v3.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- src_install-v3.eblit	31 Oct 2011 16:18:04 -0000	1.4
+++ src_install-v3.eblit	8 Nov 2011 18:14:08 -0000	1.5
@@ -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-v3.eblit,v 1.4 2011/10/31 16:18:04 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit,v 1.5 2011/11/08 18:14:08 olemarkus Exp $
 
 eblit-php-src_install() {
 	# see bug #324739 for what happens when we don't have that
@@ -132,12 +132,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)