From: Matti Bickel <mabi@gentoo.org>
Date: Wed, 9 Jun 2010 16:11:28 +0000 (+0000)
Subject: fixed not-committed src_install
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e9c7875762457ae5c7b5a80495382aeb52471b48;p=gentoo.git

fixed not-committed src_install
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
---

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index c008b683d559..a8a2ab5e1e40 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -8,7 +8,7 @@ AUX eblits/pkg_postinst-v1.eblit 2184 RMD160 ce65ba811eab10862d067c7e2b4bdc8d2b0
 AUX eblits/pkg_setup-v1.eblit 643 RMD160 b0ac84af7c2cddaca058ca0562306cdc8ddff108 SHA1 88572e5da2d10b2bcbfa3f35a2d39366cbabb364 SHA256 6b7181294ce309d5cdee68e1f7e7c9365910c940db4391ae1ca62e0d6eb9b27e
 AUX eblits/src_compile-v1.eblit 1863 RMD160 8ae0d633076f7dcf83bb725206e4501af55a1506 SHA1 bcbce68218f654c8273ca370a2dd74c76b5adf8b SHA256 0a7a0a350e81b8ac4b3a8185b4b379784c6e2e17db1c6e0cfcea5f4c7cb10ca9
 AUX eblits/src_configure-v1.eblit 9827 RMD160 272b8c5720b4a8f3f9deb601bfd68cc26273adab SHA1 dbfca765215b9539c88767389b6b615a07604146 SHA256 8947ca3957ecf8592db09c71862d4274f866005552a453ad15e842288079fd46
-AUX eblits/src_install-v1.eblit 3584 RMD160 3296864c3393fcef3fd70c8f43d0a5a7c3c1760c SHA1 b7eb10bd944caceec0826b948b3e237bd67a7440 SHA256 093ef7303cf6415b7e141918e2382f5624450dc377c32dbbebcb1a926466051d
+AUX eblits/src_install-v1.eblit 3584 RMD160 26ff6c2ce3c586a23f1ca7997aa94e0d6efc7083 SHA1 e6b98320877d8fbe5d7359190d774c16cd782c81 SHA256 86a8e9028eef946e770e26ec74b0a13edbe7934fa34365c1f6532061221faff0
 AUX eblits/src_prepare-v1.eblit 2616 RMD160 ccff64d09cc90ada1ea5d1311457cf9a05f12f8e SHA1 7db40d0ca7ef01e5b61962f261511803f768f1bc SHA256 915b9755a37f7670f6e436fe5072dae8f5e6b437ccdfbff835e26bb2f9d22b1e
 AUX eblits/src_test-v1.eblit 1480 RMD160 68ef731042ef236efee923649b318239c0219d52 SHA1 81c047f180e43eb1e6b0309ee8d6751950ce1b97 SHA256 ddc836ca2e7b2abac20450fc6eb8c7d30277c567d23051016b903ece1d07a6b2
 AUX php-5.2.10-pdo_dblib.patch 559 RMD160 062604e291113b2bb86044b5eeffb72fad210fbc SHA1 d59d26e6557dac86e582e1a6ed7bb4795cf150c6 SHA256 0548d63d7379cd19f7ade6ca1222b1b577f684b142ff6b0e8e23742b1f7f9794
diff --git a/dev-lang/php/files/eblits/src_install-v1.eblit b/dev-lang/php/files/eblits/src_install-v1.eblit
index 6ee2bf86f418..ce0ca97e4902 100644
--- a/dev-lang/php/files/eblits/src_install-v1.eblit
+++ b/dev-lang/php/files/eblits/src_install-v1.eblit
@@ -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-v1.eblit,v 1.1 2010/05/27 23:05:04 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit,v 1.2 2010/06/09 16:11:28 mabi Exp $
 
 eblit-php-src_install() {
 	# Makefile forgets to create this before trying to write to it...
@@ -25,53 +25,29 @@ eblit-php-src_install() {
 	# Create the directory where we'll put version-specific php scripts
 	keepdir /usr/share/php${PHP_MV}
 
-	if use cli ; then
-		einfo "Installing SAPI: cli"
-		into "${PHP_DESTDIR}"
-		dobin "${SAPIS}"/cli/php \
-			|| die "Unable to install cli sapi"
-		php_install_ini cli
-	fi
-
-	if use cgi ; then
-		einfo "Installing SAPI: cgi"
-		into "${PHP_DESTDIR}" # needed each time, php_install_ini would reset it
-		dobin "${SAPIS}"/cgi/php-cgi \
-			|| die "Unable to install cgi sapi"
-		php_install_ini cgi
-	fi
-
-	if use embed ; then
-		einfo "Installing SAPI: embed"
-		into "${PHP_DESTDIR}"
-		dolib.so "${SAPIS}"/embed/libphp5.so \
-			|| die "Unable to install embed sapi"
-		php_install_ini embed
-	fi
-
-	if use apache2 ; then
-		einfo "Installing SAPI: apache2"
-		emake INSTALL_ROOT="${D}" install-sapi || \
-			die "Unable to install apache2 SAPI"
-
-		if use concurrentmodphp ; then
-			einfo "Installing Apache2 config file 70_mod_php${PHP_MV}_concurr.conf"
-			insinto "${APACHE_MODULES_CONFDIR}"
-			newins "${FILESDIR}/70_mod_php${PHP_MV}_concurr.conf-apache2" \
-				"70_mod_php${PHP_MV}_concurr.conf"
-
-			# Put the ld version script in the right place so it's alwayas
-			# accessible
-			insinto "/var/lib/php-pkg/${CATEGORY}/${PN}-${PVR}/"
-			doins "${FILESDIR}/php${PHP_MV}-ldvs"
-		else
-			einfo "Installing Apache2 config 70_mod_php${PHP_MV}.conf)"
-			insinto ${APACHE_MODULES_CONFDIR}
-			newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
-				"70_mod_php${PHP_MV}.conf"
+	local sapi="", file=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			# needed each time, php_install_ini would reset it
+			into "${PHP_DESTDIR}"
+			file=$(find "${SAPI_DIR}/${sapi}/" -type f | head -n 1)
+
+			if [[ "${file: -3}" == ".so" ]]; then 
+				if [[ "${sapi}" == "apache2" ]]; then
+					insinto "${PHP_DESTDIR}/../apache2/modules/"
+					newins "${file}" "${file/*\/}"
+				else
+					dolib.so "${file}" || die "Unable to install ${sapi} sapi"
+				fi
+			else
+				dobin "${file}" || die "Unable to install ${sapi} sapi"
+			fi
+
+			php_install_ini "${sapi}"
 		fi
-		php_install_ini apache2
-	fi
+	done
 
 	# Install env.d files
 	newenvd "${FILESDIR}/20php${PHP_MV}-envd" \
@@ -98,12 +74,12 @@ php_install_ini() {
 	# Set the include path to point to where we want to find PEAR packages
 	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:/usr/share/php'${PHP_MV}':/usr/share/php"|' -i "${phpinisrc}"
 
-	dodir ${PHP_INI_DIR}
-	insinto ${PHP_INI_DIR}
-	newins "${phpinisrc}" ${PHP_INI_FILE}
+	dodir "${PHP_INI_DIR}"
+	insinto "${PHP_INI_DIR}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
 
-	dodir ${PHP_EXT_INI_DIR}
-	dodir ${PHP_EXT_INI_DIR_ACTIVE}
+	dodir "${PHP_EXT_INI_DIR}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE}"
 
 	# Install any extensions built as shared objects
 	if use sharedext ; then
@@ -116,6 +92,24 @@ php_install_ini() {
 			dosym "${PHP_EXT_INI_DIR}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE}/${inifilename}"
 		done
 	fi
-}
 
+	# SAPI-specific handling
+	if [[ "${sapi}" == "apache2" ]] ; then
+		if use concurrentmodphp ; then
+			einfo "Installing Apache2 config file 70_mod_php${PHP_MV}_concurr.conf"
+			insinto "${APACHE_MODULES_CONFDIR}"
+			newins "${FILESDIR}/70_mod_php${PHP_MV}_concurr.conf-apache2" \
+				"70_mod_php${PHP_MV}_concurr.conf"
 
+			# Put the ld version script in the right place so
+			# it's always accessible
+			insinto "/var/lib/php-pkg/${CATEGORY}/${PN}-${PVR}/"
+			doins "${FILESDIR}/php${PHP_MV}-ldvs"
+		else
+			einfo "Installing Apache2 config 70_mod_php${PHP_MV}.conf)"
+			insinto ${APACHE_MODULES_CONFDIR}
+			newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
+				"70_mod_php${PHP_MV}.conf"
+		fi
+	fi
+}