src_compile-v1.eblit not committed with previous change

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

2 files changed, 67 insertions, 54 deletions

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 7d6cbfc02aa5..c008b683d559 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 20php5-envd 145 RMD160 8c81fb7dc1d1ddf16fd956d748514db3bcb27603 SHA1 f1cef57c0def8e2c5422aaf136f40b4ff47801d2 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4
 AUX 70_mod_php5.conf-apache2 348 RMD160 9f3f49a52ebf92c2650501c5ceb6f95ce4bb2e76 SHA1 62992e793446b4a9a64900d1ecba7bae06873382 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c
 AUX 70_mod_php5.conf-apache2-r1 374 RMD160 ca06cdc9d1a3dc4129a60c938ee3a1b542497fbb SHA1 4733066b6324c5870e716485484c44c7c26a9ff1 SHA256 815c1ca23c9afe8479568ceaac4057eb91ea5444fbd863866b29adb4eea2c82b
@@ -9,9 +6,9 @@ AUX 70_mod_php5_concurr.conf-apache2-r1 376 RMD160 4f7de5c0784b6191450b5c1a7de7a
 AUX eblits/common-v1.eblit 376 RMD160 524d38035ef01b215c6dc06699c41550c246de9d SHA1 b85091f9e56b20217e5c2d3e25cef055642cd088 SHA256 d395752919fe05fa64a0e09deaf690e008a04f2c580f42233b5a854a1012045e
 AUX eblits/pkg_postinst-v1.eblit 2184 RMD160 ce65ba811eab10862d067c7e2b4bdc8d2b0aee56 SHA1 11c14f2235041cfb08e33cf2550bebef2037e92b SHA256 9e1cd81be4f051f3156de0ce5398a338b2ab6f8e73047c5983beda47f2f762b0
 AUX eblits/pkg_setup-v1.eblit 643 RMD160 b0ac84af7c2cddaca058ca0562306cdc8ddff108 SHA1 88572e5da2d10b2bcbfa3f35a2d39366cbabb364 SHA256 6b7181294ce309d5cdee68e1f7e7c9365910c940db4391ae1ca62e0d6eb9b27e
-AUX eblits/src_compile-v1.eblit 1590 RMD160 432774abcac37ebbe9f1ae6e37ca219e83a0205d SHA1 fef7bd6415b59fd0af7f3755efa600b53056ad80 SHA256 c432b5e41489db6bfe1df4f03d77294a0b15dd1a33ad8281ef21a5257ab7f32d
+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 3646 RMD160 1e7eaea9a769b4c7e324eab4e3eae3f6e12d65b4 SHA1 2e4e84f4ee39b49b9c07c4332553b9c3ea6796bf SHA256 fe673568b92064c63932752c2a599e0577488988e3c56bb4448107cbe0dd5619
+AUX eblits/src_install-v1.eblit 3584 RMD160 3296864c3393fcef3fd70c8f43d0a5a7c3c1760c SHA1 b7eb10bd944caceec0826b948b3e237bd67a7440 SHA256 093ef7303cf6415b7e141918e2382f5624450dc377c32dbbebcb1a926466051d
 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
@@ -47,10 +44,3 @@ EBUILD php-5.2.9-r2.ebuild 16727 RMD160 aa0e1af3e50b550111c3d1490adc9e8ed2432b34
 EBUILD php-5.3.2.ebuild 9379 RMD160 1858cc318c381f956e68a7cb215dda200c0b15b4 SHA1 726a6468111f36f4107d71239c18bb897e953c40 SHA256 681d51da472e131baec3b818987af8060a9e6931ddf0d0c68c017a2a4e1f7a7a
 MISC ChangeLog 66243 RMD160 caba27460aa1e15656528617319dfc95a5e4b703 SHA1 813272eb7024271e059485ecef023432d633f7dc SHA256 e3c7c0bdb7298328aead72a2c231125a939c466db3f9ef09b8c5ce23644c84ad
 MISC metadata.xml 2264 RMD160 82c0da8dfb32f6747d25e1fcd228e7ff87661195 SHA1 1fdbe39bbc372da83fa44d620d087a11f075e20d SHA256 dfbbbf2fb81666c8051408f2e0f4695b3a5f38940ba2adbd0f7f53785ed9338e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwGAucACgkQ/ejvha5XGaPIJgCg0WGPmgBKbGNO+vrh2B/DRdYu
-ZoYAn1aoJ6cODqbzMb3tsCQyyJJBs7MF
-=uJC+
------END PGP SIGNATURE-----
diff --git a/dev-lang/php/files/eblits/src_compile-v1.eblit b/dev-lang/php/files/eblits/src_compile-v1.eblit
index dbbba43eca02..796fc8e45cab 100644
--- a/dev-lang/php/files/eblits/src_compile-v1.eblit
+++ b/dev-lang/php/files/eblits/src_compile-v1.eblit
@@ -1,64 +1,87 @@
 # 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_compile-v1.eblit,v 1.1 2010/05/27 23:05:04 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_compile-v1.eblit,v 1.2 2010/06/09 08:52:07 mabi Exp $
 
 eblit-php-src_compile() {
-	SAPIS="${WORKDIR}/sapis"
+	SAPI_DIR="${WORKDIR}/sapis"
+	local is_first_sapi=1
 
-	if use cli ; then
-		php_sapi_build cli
-		cp sapi/cli/php "${SAPIS}/cli/" \
-			|| die "Unable to copy cli SAPI"
-	fi
-
-	if use cgi ; then
-		php_sapi_build cgi
-		cp sapi/cgi/php-cgi "${SAPIS}/cgi/" \
-			|| die "Unable to copy cgi SAPI"
-	fi
-
-	if use embed ; then
-		php_sapi_build embed
-		cp libs/libphp${PHP_MV}.so "${SAPIS}"/embed \
-			|| die "Unable to copy embed SAPI"
-	fi
+	for sapi in ${SAPIS} ; do
+		use "${sapi}" || continue
+		if [[ ${is_first_sapi} == 1 ]]; then
+			is_first_sapi=0
+		else
+			emake clean
+		fi
 
-	if use apache2 ; then
-		php_sapi_build apache2
-		# apache2 is a special case; the necessary files (yes, multiple)
-		# are copied by make install, not by the ebuild; that's the reason,
-		# why apache2 has to be the last sapi
-	fi
+		php_sapi_build "${sapi}"
+		php_sapi_copy "${sapi}"
+	done
 }
 
 php_sapi_build() {
 	local sapi="$1"
-	php_set_ini_dir ${sapi}
+	php_set_ini_dir "${sapi}"
 
-	mkdir -p "${SAPIS}/${sapi}"
+	mkdir -p "${SAPI_DIR}/${sapi}"
 
 	sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
 		--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
 
-	for available_sapi in cli cgi embed ; do
-		if [[ $sapi == $available_sapi ]] ; then
-			sapi_conf="${sapi_conf} --enable-${available_sapi}"
-		else
-			sapi_conf="${sapi_conf} --disable-${available_sapi}"
-		fi
-	done
+	for one_sapi in $SAPIS ; do
+		case "$one_sapi" in
+			cli|cgi|embed)
+				if [[ "${one_sapi}" == "${sapi}" ]] ; then
+					sapi_conf="${sapi_conf} --enable-${available_sapi}"
+				else
+					sapi_conf="${sapi_conf} --disable-${available_sapi}"
+				fi
+				;;
 
-	if [[ $sapi == "apache2" ]] ; then
-		sapi_conf="${sapi_conf} --with-apxs2=/usr/sbin/apxs"
-	else
-		sapi_conf="${sapi_conf} --without-apxs2"
-	fi
+			apache2)
+				if [[ "${one_sapi}" == "${sapi}" ]] ; then
+					sapi_conf="${sapi_conf} --with-apxs2=/usr/sbin/apxs"
+				else
+					sapi_conf="${sapi_conf} --without-apxs2"
+				fi
+				;;
+
+		esac
+	done
 
 	econf ${sapi_conf}
 	emake || die "emake failed"
-
-	rm -f main/main.o main/main.lo main/php_ini.o \
-		main/php_ini.lo 2>/dev/null
 }
 
+php_sapi_copy() {
+	local sapi="$1"
+	local source=""
 
+	case "$sapi" in
+		cli)
+			source="sapi/cli/php"
+			;;
+		cgi)
+			source="sapi/cgi/php-cgi"
+			;;
+		embed)
+			source="libs/libphp${PHP_MV}.so"
+			;;
+
+		apache2)
+			# apache2 is a special case; the necessary files
+			# (yes, multiple) are copied by make install, not
+			# by the ebuild; that's the reason, why apache2 has
+			# to be the last sapi
+			emake INSTALL_ROOT="${SAPI_DIR}/${sapi}/" install-sapi
+			;;
+
+		*)
+			die "unhandled sapi in php_sapi_copy"
+			;;
+	esac
+
+	if [[ "${source}" ]] ; then
+		cp "$source" "${SAPI_DIR}/$sapi" || die "Unable to copy ${sapi} SAPI"
+	fi
+}