Add new PHP revisions, fix a few issues, improve a open_basedir check.
authorLuca Longinotti <chtekk@gentoo.org>
Fri, 27 Oct 2006 12:17:35 +0000 (12:17 +0000)
committerLuca Longinotti <chtekk@gentoo.org>
Fri, 27 Oct 2006 12:17:35 +0000 (12:17 +0000)
Package-Manager: portage-2.1.2_pre3-r4

dev-lang/php/ChangeLog
dev-lang/php/Manifest
dev-lang/php/files/digest-php-4.4.4-r8 [new file with mode: 0644]
dev-lang/php/files/digest-php-5.1.6-r8 [new file with mode: 0644]
dev-lang/php/php-4.4.4-r8.ebuild [new file with mode: 0644]
dev-lang/php/php-5.1.6-r8.ebuild [new file with mode: 0644]

index 26e768e033aa4300209dd7de012740d5e1bd852f..23ac24f93edc14e45885dc250d85b025ffb413fc 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.145 2006/10/24 02:41:59 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.146 2006/10/27 12:17:35 chtekk Exp $
+
+*php-5.1.6-r8 (27 Oct 2006)
+*php-4.4.4-r8 (27 Oct 2006)
+
+  27 Oct 2006; Luca Longinotti <chtekk@gentoo.org> +php-4.4.4-r8.ebuild,
+  +php-5.1.6-r8.ebuild:
+  Add new PHP revisions, fix a few issues, improve a open_basedir check.
 
   24 Oct 2006; Joshua Jackson <tsunam@gentoo.org> php-4.4.4-r6.ebuild,
   php-5.1.6-r6.ebuild:
index 2d98256a4912e87e72a4e3795a06c4223c6c02dc..7c05025ca65cc27e3aa6a5fef8e3383b7ba46aed 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 70_mod_php.conf-apache1 454 RMD160 869b5c225782690889bdfa5227a8f46c33ac71d3 SHA1 27e7fc24e1793bacef9b9735102d335b1a5d21ff SHA256 9e6227e508f0c297f48c667e2135c7692f7943b3d0cd2ffdbdcca0bad5220343
 MD5 6171c7aa95f69b8a54b0f29bd1056d2b files/70_mod_php.conf-apache1 454
 RMD160 869b5c225782690889bdfa5227a8f46c33ac71d3 files/70_mod_php.conf-apache1 454
@@ -50,10 +47,12 @@ DIST php-patchset-4.3.11-r3.tar.bz2 27977 RMD160 a99c2eecca8e6e51cdb2f66e7da2d0a
 DIST php-patchset-4.4.3-r3.tar.bz2 22764 RMD160 e9ec6ffcdebb696f13c177e57ad8d78763df439a SHA1 6e2961f3743f9b1d6fdd333639342287cba24bf8 SHA256 457f003521d930be27068cce80f4adfdedcb715789e1677b47b4dfbb86559819
 DIST php-patchset-4.4.4-r2.tar.bz2 20349 RMD160 3449835b81db81a99d2046d6933ae6ac51c3eb47 SHA1 4c59ac9c6834e221cc1384b7548d71a63bc42089 SHA256 360fd167822644e9a84baeea04b34f92ea5a96f678c5616d4889541503eecc5d
 DIST php-patchset-4.4.4-r3.tar.bz2 21530 RMD160 79afbba7947b9e6e94f8dcbcda19997b3ff7d462 SHA1 2d7b8f122ed0454e0d69ada37c60fec98f92aef1 SHA256 c49244a01e67c60f8c984efc9fdcca0154c9a80124788a16ef63e645dca97cb2
+DIST php-patchset-4.4.4-r4.tar.bz2 21579 RMD160 6a46f412185b9775dc2b1a1bb0801248b3702ea1 SHA1 4f9c744331fed9ac46c59082cf9ccf75b1d094e4 SHA256 62c63d3d04d5cfd856ee8c74e6617089235b1abe4df4baf450c5888945acfa20
 DIST php-patchset-5.0.5-r3.tar.bz2 20910 RMD160 0f78808e3fe15568d5670ad852ed218589949aea SHA1 54d9edc8e8becc1b0822f30b784f029eb5417db3 SHA256 b4df50e7a857eea4072c0b7cde1585409eaebec8f64474d6c1611c5b9869c7f2
 DIST php-patchset-5.1.4-r6.tar.bz2 29925 RMD160 06e4cc0d2937786ac64446db9954897af2bd15c6 SHA1 e5b9f97e80c798078f7e39a05af2c50e4ace1bd9 SHA256 9a29de8dba649f91057d7c2f1b853dc81228936c78d0fb787287531eaf316b39
 DIST php-patchset-5.1.6-r2.tar.bz2 22693 RMD160 aebcfb0cd1685512dd86e1a92d77ff91ca5b83f7 SHA1 694a2adb9c69c75f00656f37a071637580fd6564 SHA256 06e6526388464c1f2e1b953e49b0463c6dfdda461fed889cb632aef855cd49cb
 DIST php-patchset-5.1.6-r3.tar.bz2 25666 RMD160 77bcca9e95e828bc73320c978d323eeda87a54f0 SHA1 71f2037f08db23dd682f4f7f7bdf0df9483f59c3 SHA256 afacb3ba0cac6b796c828106082da105cb7c34ef7c5f094cd139a1b3c31f1989
+DIST php-patchset-5.1.6-r4.tar.bz2 26474 RMD160 fa1ac197d9f9a97e053f20b64babdfeec371dbb3 SHA1 d0242a65e8ac7eef96f2237d6361fbaf1873bf04 SHA256 c90c724072b3f826e474c646eb907202c0166df472b64538863263b7bf9c028d
 DIST php-pcrelib-new-secpatch.tar.bz2 357619 RMD160 1748ef9837f3f5ce7ad81f0dd751b430c8c2c6f6 SHA1 040bf3344d68fff3eb1829a2a02586499de5c2ee SHA256 7c49aa2c6be704b576720673fa123febdddc541d8152ccacea5cb2c9d1560a19
 EBUILD php-4.3.11-r5.ebuild 14932 RMD160 496b57fd984931f17edb7c00521988fd0b04c893 SHA1 1097ac9cdfd25179203032ed482574bf6021b773 SHA256 a48ab17f67dfbb3c4a598a02ef059a5320c15063fa2863c16f23e1ac936176c0
 MD5 73dadb37690226c70f1f1be9eec1e3b5 php-4.3.11-r5.ebuild 14932
@@ -71,6 +70,10 @@ EBUILD php-4.4.4-r6.ebuild 15382 RMD160 08129162a7230e27fa2e81f23ef2d1735090aaa2
 MD5 bb7cda9a48fff978d3097941ecd86a3b php-4.4.4-r6.ebuild 15382
 RMD160 08129162a7230e27fa2e81f23ef2d1735090aaa2 php-4.4.4-r6.ebuild 15382
 SHA256 da5d2e7d1540b415570bbdc4fbdb18291b51947ede7f9056d777cd0def10c6dc php-4.4.4-r6.ebuild 15382
+EBUILD php-4.4.4-r8.ebuild 15389 RMD160 234b4cb83fec10c6a46b46a2ce502916f207e05a SHA1 97a21c8785a8517e0b2f1112c51b49860cfe220f SHA256 d231535be8afc8dd2f1a5dfaa6469ea9391e0ac3ca8435b2a13ddb844aa816a6
+MD5 8b0c51997b9701f360e4906e55003432 php-4.4.4-r8.ebuild 15389
+RMD160 234b4cb83fec10c6a46b46a2ce502916f207e05a php-4.4.4-r8.ebuild 15389
+SHA256 d231535be8afc8dd2f1a5dfaa6469ea9391e0ac3ca8435b2a13ddb844aa816a6 php-4.4.4-r8.ebuild 15389
 EBUILD php-5.0.5-r5.ebuild 10457 RMD160 d862476c6c06944317cc3f417005f93a652c8996 SHA1 1d0b97da8e1cdeefacffd9e68dec94a94eb040db SHA256 d7a9d73e51e332e8d78624072a1e8972554a8789a0ed7112760ea2b9625b6bbb
 MD5 a78424ab5677e3d6ec0588295fd480b7 php-5.0.5-r5.ebuild 10457
 RMD160 d862476c6c06944317cc3f417005f93a652c8996 php-5.0.5-r5.ebuild 10457
@@ -87,10 +90,14 @@ EBUILD php-5.1.6-r6.ebuild 15392 RMD160 c431e21f8d86deb1f8085474020abf4465a508d2
 MD5 2b06795405e416fe60b67a09808d5df6 php-5.1.6-r6.ebuild 15392
 RMD160 c431e21f8d86deb1f8085474020abf4465a508d2 php-5.1.6-r6.ebuild 15392
 SHA256 b3acdf405c83e69517b084f86fc9c0c032b26bbed257452895c4f01d0593d19e php-5.1.6-r6.ebuild 15392
-MISC ChangeLog 29483 RMD160 2832d621e7e8e47d9f966ff41771a83d74a7ede7 SHA1 f48d41db5b294544ab308de30618bc2ec14b7e5e SHA256 60e1b18cfd71ec854e9fde7ff2ee28bd0be08f914b8a5ccdcbbd31cbc052312e
-MD5 2f929c3c381eaa9f7e2d219986b51327 ChangeLog 29483
-RMD160 2832d621e7e8e47d9f966ff41771a83d74a7ede7 ChangeLog 29483
-SHA256 60e1b18cfd71ec854e9fde7ff2ee28bd0be08f914b8a5ccdcbbd31cbc052312e ChangeLog 29483
+EBUILD php-5.1.6-r8.ebuild 15400 RMD160 1799267170bc55e1f1fe582f64c920d42bcdf75f SHA1 4f3b31ee90ef7464a2da617b88518c1111fe21b9 SHA256 5248ae93e28d5ab07217b487c3724f5290646f1fcf1c39f89995b3baced77247
+MD5 6da2cc2fa9489819ddbe65955d92fe90 php-5.1.6-r8.ebuild 15400
+RMD160 1799267170bc55e1f1fe582f64c920d42bcdf75f php-5.1.6-r8.ebuild 15400
+SHA256 5248ae93e28d5ab07217b487c3724f5290646f1fcf1c39f89995b3baced77247 php-5.1.6-r8.ebuild 15400
+MISC ChangeLog 29711 RMD160 d976406594192f13b8fecd6548183618be261a30 SHA1 d9c01ead5e4cc273ee12de14cbbd5b8f75691d4f SHA256 089a4d71e6f4c6d2359deca28b267c5a2bf7be322e0867359da80abaaac92904
+MD5 2deda080a1b1cefbb1a61320b1ff2d5c ChangeLog 29711
+RMD160 d976406594192f13b8fecd6548183618be261a30 ChangeLog 29711
+SHA256 089a4d71e6f4c6d2359deca28b267c5a2bf7be322e0867359da80abaaac92904 ChangeLog 29711
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
@@ -107,6 +114,9 @@ SHA256 1726a087810ecd1e432e190b3ad83d0f330a7dfbb4d4ef9bbccfb55365f62019 files/di
 MD5 32917bf2094e1f6e00b1432246fdb94e files/digest-php-4.4.4-r6 810
 RMD160 491170e5698444d7f88923a557739cac1056cfdc files/digest-php-4.4.4-r6 810
 SHA256 8e161a83f594dc6b009a7f7e1a6fabeee11527ad701007fea05eb1c557a7b668 files/digest-php-4.4.4-r6 810
+MD5 b1176642c360f5833c4694319a86bf4f files/digest-php-4.4.4-r8 810
+RMD160 745d8a0250671ba3a70bd3d1e891a80e5b5f80f8 files/digest-php-4.4.4-r8 810
+SHA256 825e28de1736d2eab0b63d78a80ce1577683507f4843451d0a50758a5e18ac27 files/digest-php-4.4.4-r8 810
 MD5 049755680b7454329c4332c92e1aa83e files/digest-php-5.0.5-r5 807
 RMD160 351460cebfa761c8570dfa2b8e3d096c6d0c6df9 files/digest-php-5.0.5-r5 807
 SHA256 f647a2e0bc16efd18e6f216a0abd64b2b47a4bb95159a2199255d104a2720a9b files/digest-php-5.0.5-r5 807
@@ -119,10 +129,6 @@ SHA256 b98ac6c203fd363ab5f759f970d1d301e8ef014f88d7868a9d8f232ddda6a5d9 files/di
 MD5 b53913a66452ca7377a612efb35e1bbc files/digest-php-5.1.6-r6 819
 RMD160 51ba2b521f5fa11d37a98099825f165bcf0ac5d1 files/digest-php-5.1.6-r6 819
 SHA256 93217749d45ce9f46ddfd7b44de1bbea584cbb5fc87ef1d96c64867ec1fd0a0b files/digest-php-5.1.6-r6 819
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFPX2U2ZWR0Jhg/EsRAhx3AJ0e+CscXvojFG7C5c/ucDNeoJd3swCfWKz6
-xnf+oZUiAri7C0srMqRQ+Ak=
-=Y37K
------END PGP SIGNATURE-----
+MD5 06742bb6848bfacefe65069fc7ae3212 files/digest-php-5.1.6-r8 819
+RMD160 9c2f6496be5119e65f6b28a2e6da8c43da717dc0 files/digest-php-5.1.6-r8 819
+SHA256 4c82cb6278c45636fc70f24a13c9364fd90d43b96c7e0a8fd707777bb1fa29c1 files/digest-php-5.1.6-r8 819
diff --git a/dev-lang/php/files/digest-php-4.4.4-r8 b/dev-lang/php/files/digest-php-4.4.4-r8
new file mode 100644 (file)
index 0000000..68f8fb3
--- /dev/null
@@ -0,0 +1,9 @@
+MD5 55220bd02880e8981455fe83bafa0c8d hardening-patch-4.4.4-0.4.15-gentoo.patch.gz 61351
+RMD160 4c7b02b6a86005136ed6eb751ba549fe1ea275b0 hardening-patch-4.4.4-0.4.15-gentoo.patch.gz 61351
+SHA256 3885d9dba28e8a689d26d1d1889ecd1b8c8289bb25c337d472084c809daba291 hardening-patch-4.4.4-0.4.15-gentoo.patch.gz 61351
+MD5 bc6fa8908e2ac36e93bab9f7d42cda3a php-4.4.4.tar.bz2 4478698
+RMD160 02fd7d5135a9e5ce11d905a4a474a5d42b8441f3 php-4.4.4.tar.bz2 4478698
+SHA256 9f0742fce014a255f8453c1264afee5de289a9e9dcd57c448c77b46978f6a76b php-4.4.4.tar.bz2 4478698
+MD5 81ed636101b3b3dabd513633db8654f5 php-patchset-4.4.4-r4.tar.bz2 21579
+RMD160 6a46f412185b9775dc2b1a1bb0801248b3702ea1 php-patchset-4.4.4-r4.tar.bz2 21579
+SHA256 62c63d3d04d5cfd856ee8c74e6617089235b1abe4df4baf450c5888945acfa20 php-patchset-4.4.4-r4.tar.bz2 21579
diff --git a/dev-lang/php/files/digest-php-5.1.6-r8 b/dev-lang/php/files/digest-php-5.1.6-r8
new file mode 100644 (file)
index 0000000..675b8ce
--- /dev/null
@@ -0,0 +1,9 @@
+MD5 ba5d540574209a683dd8cf8d564e3b61 hardening-patch-5.1.6-0.4.15-gentoo-r1.patch.gz 61476
+RMD160 5185bf7b2282b3bed2f6a06a8314cfab7b5b8cbc hardening-patch-5.1.6-0.4.15-gentoo-r1.patch.gz 61476
+SHA256 836416114d4408377d04ee5b704dde0bd74511c0f114fe02602dab12e9e4902c hardening-patch-5.1.6-0.4.15-gentoo-r1.patch.gz 61476
+MD5 08e423aa314369d4392a36b3f7246afc php-5.1.6.tar.bz2 6454408
+RMD160 7ac52f4674532397c982f6ced594b70dd17522af php-5.1.6.tar.bz2 6454408
+SHA256 3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996 php-5.1.6.tar.bz2 6454408
+MD5 af5dc2be4f0d265a73e4fdc1be1b5b0f php-patchset-5.1.6-r4.tar.bz2 26474
+RMD160 fa1ac197d9f9a97e053f20b64babdfeec371dbb3 php-patchset-5.1.6-r4.tar.bz2 26474
+SHA256 c90c724072b3f826e474c646eb907202c0166df472b64538863263b7bf9c028d php-patchset-5.1.6-r4.tar.bz2 26474
diff --git a/dev-lang/php/php-4.4.4-r8.ebuild b/dev-lang/php/php-4.4.4-r8.ebuild
new file mode 100644 (file)
index 0000000..71bfeb6
--- /dev/null
@@ -0,0 +1,512 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.4.4-r8.ebuild,v 1.1 2006/10/27 12:17:35 chtekk Exp $
+
+CGI_SAPI_USE="discard-path force-cgi-redirect"
+APACHE2_SAPI_USE="concurrentmodphp threads"
+IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+# NOTE: Portage doesn't support setting PROVIDE based on the USE flags
+#              that have been enabled, so we have to PROVIDE everything for now
+#              and hope for the best
+PROVIDE="virtual/php virtual/httpd-php"
+
+# php package settings
+SLOT="4"
+MY_PHP_PV="${PV}"
+MY_PHP_P="php-${MY_PHP_PV}"
+PHP_PACKAGE="1"
+
+# php patch settings, general
+PHP_PATCHSET_REV="4"
+HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.15-gentoo.patch.gz"
+MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch"
+# php patch settings, ebuild specific
+FASTBUILD_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-fastbuild.patch"
+CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-concurrent_apache_modules.patch"
+
+inherit php4_4-sapi apache-module
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache SAPIs."
+
+DEPEND="app-admin/php-toolkit"
+RDEPEND="${DEPEND}"
+
+want_apache
+
+pkg_setup() {
+       PHPCONFUTILS_AUTO_USE=""
+
+       # Make sure the user has specified at least one SAPI
+       einfo "Determining SAPI(s) to build"
+       phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
+
+       # Threaded Apache2 support
+       if useq apache2 ; then
+               if [[ "${APACHE_VERSION}" != "0" ]] ; then
+                       if ! useq threads ; then
+                               APACHE2_SAFE_MPMS="itk peruser prefork"
+                       else
+                               APACHE2_SAFE_MPMS="event leader metuxmpm perchild threadpool worker"
+                       fi
+
+                       ewarn
+                       ewarn "If this package fails with a fatal error about Apache2 not having"
+                       ewarn "been compiled with a compatible MPM, this is normally because you"
+                       ewarn "need to toggle the 'threads' USE flag."
+                       ewarn
+                       ewarn "If 'threads' is off, try switching it on."
+                       ewarn "If 'threads' is on, try switching it off."
+                       ewarn
+
+                       apache-module_pkg_setup
+               fi
+       fi
+
+       # Concurrent PHP Apache2 modules support
+       if useq apache2 ; then
+               if [[ "${APACHE_VERSION}" != "0" ]] ; then
+                       if useq concurrentmodphp ; then
+                               ewarn
+                               ewarn "'concurrentmodphp' makes it possible to load multiple, differently"
+                               ewarn "versioned mod_php's into the same Apache instance. This is done with"
+                               ewarn "a few linker tricks and workarounds, and is not guaranteed to always"
+                               ewarn "work correctly, so use it at your own risk. Especially, do not use"
+                               ewarn "this in conjunction with PHP modules (PECL, ...) other than the ones"
+                               ewarn "you may find in the Portage tree or the PHP Overlay!"
+                               ewarn "This is an experimental feature, so please rebuild PHP"
+                               ewarn "without the 'concurrentmodphp' USE flag if you experience"
+                               ewarn "any problems, and then reproduce any bugs before filing"
+                               ewarn "them in Gentoo's Bugzilla or bugs.php.net."
+                               ewarn "If you have conclusive evidence that a bug directly"
+                               ewarn "derives from 'concurrentmodphp', please file a bug in"
+                               ewarn "Gentoo's Bugzilla only."
+                               ewarn
+                               ebeep 5
+                       fi
+               fi
+       fi
+
+       # fastbuild support
+       if useq fastbuild ; then
+               ewarn
+               ewarn "'fastbuild' attempts to build all SAPIs in a single pass."
+               ewarn "This is an experimental feature, so please rebuild PHP"
+               ewarn "without the 'fastbuild' USE flag if you experience"
+               ewarn "any problems, and then reproduce any bugs before filing"
+               ewarn "them in Gentoo's Bugzilla or bugs.php.net."
+               ewarn "If you have conclusive evidence that a bug directly"
+               ewarn "derives from 'fastbuild', please file a bug in"
+               ewarn "Gentoo's Bugzilla only."
+               ewarn
+       fi
+
+       php4_4-sapi_pkg_setup
+}
+
+php_determine_sapis() {
+       # holds the list of sapis that we want to build
+       PHPSAPIS=
+
+       if useq cli || phpconfutils_usecheck cli ; then
+               PHPSAPIS="${PHPSAPIS} cli"
+       fi
+
+       if useq cgi ; then
+               PHPSAPIS="${PHPSAPIS} cgi"
+       fi
+
+       # note - we can only build one apache sapi for now
+       # note - apache SAPI comes after the simpler cli/cgi sapis
+       if useq apache || useq apache2 ; then
+               if [[ "${APACHE_VERSION}" != "0" ]] ; then
+                       PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
+               fi
+       fi
+}
+
+src_unpack() {
+       if [[ "${PHP_PACKAGE}" == 1 ]] ; then
+               unpack ${A}
+       fi
+
+       cd "${S}"
+
+       # Concurrent PHP Apache2 modules support
+       if useq apache2 ; then
+               if [[ "${APACHE_VERSION}" != "0" ]] ; then
+                       if useq concurrentmodphp ; then
+                               if [[ -n "${CONCURRENTMODPHP_PATCH}" ]] && [[ -f "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" ]] ; then
+                                       epatch "${WORKDIR}/${CONCURRENTMODPHP_PATCH}"
+                               else
+                                       ewarn "There is no concurrent mod_php patch available for this PHP release yet!"
+                               fi
+                       fi
+               fi
+       fi
+
+       # fastbuild support
+       if useq fastbuild ; then
+               if [[ -n "${FASTBUILD_PATCH}" ]] && [[ -f "${WORKDIR}/${FASTBUILD_PATCH}" ]] ; then
+                       epatch "${WORKDIR}/${FASTBUILD_PATCH}"
+               else
+                       ewarn "There is no fastbuild patch available for this PHP release yet!"
+               fi
+       fi
+
+       # Now let the eclass do the rest and regenerate the configure
+       php4_4-sapi_src_unpack
+
+       # Fix Makefile.global:test to consider the CGI SAPI if present
+       if useq cgi ; then
+               sed -e "s|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\"|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\" \&\& test \! -z \"\$(top_builddir)/php-cgi\" \&\& test -x \"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
+               sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
+       fi
+}
+
+src_compile() {
+       if useq fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then
+               src_compile_fastbuild
+       else
+               src_compile_normal
+       fi
+}
+
+src_compile_fastbuild() {
+       php_determine_sapis
+
+       build_cli=0
+       build_cgi=0
+       build_apache1=0
+       build_apache2=0
+       my_conf=""
+
+       for x in ${PHPSAPIS} ; do
+               case ${x} in
+                       cli)
+                               build_cli=1
+                               ;;
+                       cgi)
+                               build_cgi=1
+                               ;;
+                       apache1)
+                               build_apache1=1
+                               ;;
+                       apache2)
+                               build_apache2=1
+                               ;;
+               esac
+       done
+
+       if [[ ${build_cli} = 1 ]] ; then
+               my_conf="${my_conf} --enable-cli"
+       else
+               my_conf="${my_conf} --disable-cli"
+       fi
+
+       if [[ ${build_cgi} = 1 ]] ; then
+               my_conf="${my_conf} --enable-cgi --enable-fastcgi"
+               phpconfutils_extension_enable "discard-path" "discard-path" 0
+               phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
+       else
+               my_conf="${my_conf} --disable-cgi"
+       fi
+
+       if [[ ${build_apache1} = 1 ]] ; then
+               my_conf="${my_conf} --with-apxs=/usr/sbin/apxs"
+       fi
+
+       if [[ ${build_apache2} = 1 ]] ; then
+               my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
+
+               # Threaded Apache2 support
+               if useq threads ; then
+                       my_conf="${my_conf} --enable-experimental-zts"
+                       ewarn "Enabling ZTS for Apache2 MPM"
+               fi
+
+               # Concurrent PHP Apache2 modules support
+               if useq concurrentmodphp ; then
+                       append-ldflags "-Wl,--version-script=${FILESDIR}/php4-ldvs"
+               fi
+       fi
+
+       # Now we know what we are building, build it
+       php4_4-sapi_src_compile
+
+       # To keep the separate php.ini files for each SAPI, we change the
+       # build-defs.h and recompile
+
+       if [[ ${build_cli} = 1 ]] ; then
+               einfo
+               einfo "Building CLI SAPI"
+               einfo
+
+               sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cli-php4"|g;' -i main/build-defs.h
+               sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cli-php4/ext-active"|g;' -i main/build-defs.h
+               for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
+                       [[ -f ${x} ]] && rm -f ${x}
+               done
+               make sapi/cli/php || die "Unable to make CLI SAPI"
+               cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
+       fi
+
+       if [[ ${build_cgi} = 1 ]] ; then
+               einfo
+               einfo "Building CGI SAPI"
+               einfo
+
+               sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cgi-php4"|g;' -i main/build-defs.h
+               sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cgi-php4/ext-active"|g;' -i main/build-defs.h
+               for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
+                       [[ -f ${x} ]] && rm -f ${x}
+               done
+               make sapi/cgi/php || die "Unable to make CGI SAPI"
+               cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
+       fi
+
+       if [[ ${build_apache1} = 1 ]] || [[ ${build_apache2} = 1 ]] ; then
+               einfo
+               einfo "Building apache${APACHE_VERSION} SAPI"
+               einfo
+
+               sed -e "s|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH \"/etc/php/apache${APACHE_VERSION}-php4\"|g;" -i main/build-defs.h
+               sed -e "s|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR \"/etc/php/apache${APACHE_VERSION}-php4/ext-active\"|g;" -i main/build-defs.h
+               for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
+                       [[ -f ${x} ]] && rm -f ${x}
+               done
+               make || die "Unable to make apache${APACHE_VERSION} SAPI"
+       fi
+}
+
+src_compile_normal() {
+       php_determine_sapis
+
+       CLEAN_REQUIRED=0
+       my_conf=""
+
+       # Support the Apache2 extras, they must be set globally for all
+       # SAPIs to work correctly, especially for external PHP extensions
+       if useq apache2 ; then
+               if [[ "${APACHE_VERSION}" != "0" ]] ; then
+                       # Concurrent PHP Apache2 modules support
+                       if useq concurrentmodphp ; then
+                               append-ldflags "-Wl,--version-script=${FILESDIR}/php4-ldvs"
+                       fi
+               fi
+       fi
+
+       for x in ${PHPSAPIS} ; do
+               # Support the Apache2 extras, they must be set globally for all
+               # SAPIs to work correctly, especially for external PHP extensions
+               if useq apache2 ; then
+                       if [[ "${APACHE_VERSION}" != "0" ]] ; then
+                               # Threaded Apache2 support
+                               if useq threads ; then
+                                       my_conf="${my_conf} --enable-experimental-zts"
+                                       ewarn "Enabling ZTS for Apache2 MPM"
+                               fi
+                       fi
+               fi
+
+               if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then
+                       make clean
+               fi
+
+               PHPSAPI="${x}"
+
+               case ${x} in
+                       cli)
+                               my_conf="${my_conf} --enable-cli --disable-cgi"
+                               php4_4-sapi_src_compile
+                               cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
+                               ;;
+                       cgi)
+                               my_conf="${my_conf} --disable-cli --enable-cgi --enable-fastcgi"
+                               phpconfutils_extension_enable "discard-path" "discard-path" 0
+                               phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
+                               php4_4-sapi_src_compile
+                               cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
+                               ;;
+                       apache1)
+                               my_conf="${my_conf} --disable-cli --with-apxs=/usr/sbin/apxs"
+                               php4_4-sapi_src_compile
+                               ;;
+                       apache2)
+                               my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
+                               php4_4-sapi_src_compile
+                               ;;
+               esac
+
+               CLEAN_REQUIRED=1
+               my_conf=""
+       done
+}
+
+src_install() {
+       php_determine_sapis
+
+       destdir=/usr/$(get_libdir)/php4
+
+       # Let the eclass do the common work
+       php4_4-sapi_src_install
+
+       einfo
+       einfo "Installing SAPI(s) ${PHPSAPIS}"
+       einfo
+
+       for x in ${PHPSAPIS} ; do
+
+               PHPSAPI="${x}"
+
+               case ${x} in
+                       cli)
+                               einfo "Installing CLI SAPI"
+                               into ${destdir}
+                               newbin php-cli php || die "Unable to install ${x} sapi"
+                               php4_4-sapi_install_ini
+                               ;;
+                       cgi)
+                               einfo "Installing CGI SAPI"
+                               into ${destdir}
+                               dobin php-cgi || die "Unable to install ${x} sapi"
+                               php4_4-sapi_install_ini
+                               ;;
+                       apache1)
+                               einfo "Installing Apache${APACHE_VERSION} SAPI"
+                               make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
+                               einfo "Installing Apache${APACHE_VERSION} config file for PHP4 (70_mod_php.conf)"
+                               insinto ${APACHE_MODULES_CONFDIR}
+                               newins "${FILESDIR}/70_mod_php.conf-apache1" "70_mod_php.conf"
+                               php4_4-sapi_install_ini
+                               ;;
+                       apache2)
+                               einfo "Installing Apache${APACHE_VERSION} SAPI"
+                               make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
+                               if useq concurrentmodphp ; then
+                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP4-concurrent (70_mod_php_concurr.conf)"
+                                       insinto ${APACHE_MODULES_CONFDIR}
+                                       newins "${FILESDIR}/70_mod_php_concurr.conf-apache2" "70_mod_php_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}/php4-ldvs"
+
+                                       # Redefine the extension dir to have the modphp suffix
+                                       PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`-versioned"
+                               else
+                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP4 (70_mod_php.conf)"
+                                       insinto ${APACHE_MODULES_CONFDIR}
+                                       newins "${FILESDIR}/70_mod_php.conf-apache2" "70_mod_php.conf"
+                               fi
+                               php4_4-sapi_install_ini
+                               ;;
+               esac
+       done
+}
+
+pkg_postinst() {
+       # Output some general info to the user
+       if useq apache || useq apache2 ; then
+               APACHE1_MOD_DEFINE="PHP4"
+               APACHE1_MOD_CONF="70_mod_php"
+               APACHE2_MOD_DEFINE="PHP4"
+               if useq concurrentmodphp ; then
+                       APACHE2_MOD_CONF="70_mod_php_concurr"
+               else
+                       APACHE2_MOD_CONF="70_mod_php"
+               fi
+               apache-module_pkg_postinst
+       fi
+
+       # Update Apache1 to use mod_php
+       if useq apache ; then
+               "${ROOT}/usr/sbin/php-select" -t apache1 php4 > /dev/null 2>&1
+               exitStatus=$?
+               if [[ ${exitStatus} == 2 ]] ; then
+                       php-select apache1 php4
+               elif [[ ${exitStatus} == 4 ]] ; then
+                       ewarn
+                       ewarn "Apache1 is configured to load a different version of PHP."
+                       ewarn "To make Apache1 use PHP v4, use php-select:"
+                       ewarn
+                       ewarn "    php-select apache1 php4"
+                       ewarn
+               fi
+       fi
+
+       # Update Apache2 to use mod_php
+       if useq apache2 ; then
+               "${ROOT}/usr/sbin/php-select" -t apache2 php4 > /dev/null 2>&1
+               exitStatus=$?
+               if [[ ${exitStatus} == 2 ]] ; then
+                       php-select apache2 php4
+               elif [[ ${exitStatus} == 4 ]] ; then
+                       ewarn
+                       ewarn "Apache2 is configured to load a different version of PHP."
+                       ewarn "To make Apache2 use PHP v4, use php-select:"
+                       ewarn
+                       ewarn "    php-select apache2 php4"
+                       ewarn
+               fi
+       fi
+
+       # Create the symlinks for php-cli
+       if useq cli || phpconfutils_usecheck cli ; then
+               "${ROOT}/usr/sbin/php-select" -t php php4 > /dev/null 2>&1
+               exitStatus=$?
+               if [[ ${exitStatus} == 5 ]] ; then
+                       php-select php php4
+               elif [[ ${exitStatus} == 4 ]] ; then
+                       ewarn
+                       ewarn "/usr/bin/php links to a different version of PHP."
+                       ewarn "To make /usr/bin/php point to PHP v4, use php-select:"
+                       ewarn
+                       ewarn "    php-select php php4"
+                       ewarn
+               fi
+       fi
+
+       # Create the symlinks for php-cgi
+       if useq cgi ; then
+               "${ROOT}/usr/sbin/php-select" -t php-cgi php4 > /dev/null 2>&1
+               exitStatus=$?
+               if [[ ${exitStatus} == 5 ]] ; then
+                       php-select php-cgi php4
+               elif [[ ${exitStatus} == 4 ]] ; then
+                       ewarn
+                       ewarn "/usr/bin/php-cgi links to a different version of PHP."
+                       ewarn "To make /usr/bin/php-cgi point to PHP v4, use php-select:"
+                       ewarn
+                       ewarn "    php-select php-cgi php4"
+                       ewarn
+               fi
+       fi
+
+       # Create the symlinks for php-devel
+       "${ROOT}/usr/sbin/php-select" -t php-devel php4 > /dev/null 2>&1
+       exitStatus=$?
+       if [[ $exitStatus == 5 ]] ; then
+               php-select php-devel php4
+       elif [[ $exitStatus == 4 ]] ; then
+               ewarn
+               ewarn "/usr/bin/php-config and/or /usr/bin/phpize are linked to a"
+               ewarn "different version of PHP. To make them point to PHP v4, use"
+               ewarn "php-select:"
+               ewarn
+               ewarn "    php-select php-devel php4"
+               ewarn
+       fi
+
+       php4_4-sapi_pkg_postinst
+}
+
+src_test() {
+       einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+       if ! emake -j1 test ; then
+               hasq test ${FEATURES} && die "Make test failed. See above for details."
+               hasq test ${FEATURES} || eerror "Make test failed. See above for details."
+       fi
+}
diff --git a/dev-lang/php/php-5.1.6-r8.ebuild b/dev-lang/php/php-5.1.6-r8.ebuild
new file mode 100644 (file)
index 0000000..ae97fe2
--- /dev/null
@@ -0,0 +1,512 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.6-r8.ebuild,v 1.1 2006/10/27 12:17:35 chtekk Exp $
+
+CGI_SAPI_USE="discard-path force-cgi-redirect"
+APACHE2_SAPI_USE="concurrentmodphp threads"
+IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+# NOTE: Portage doesn't support setting PROVIDE based on the USE flags
+#              that have been enabled, so we have to PROVIDE everything for now
+#              and hope for the best
+PROVIDE="virtual/php virtual/httpd-php"
+
+# php package settings
+SLOT="5"
+MY_PHP_PV="${PV}"
+MY_PHP_P="php-${MY_PHP_PV}"
+PHP_PACKAGE="1"
+
+# php patch settings, general
+PHP_PATCHSET_REV="4"
+HARDENEDPHP_PATCH="hardening-patch-${MY_PHP_PV}-0.4.15-gentoo-r1.patch.gz"
+MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch"
+# php patch settings, ebuild specific
+FASTBUILD_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-fastbuild.patch"
+CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-concurrent_apache_modules.patch"
+
+inherit php5_1-sapi apache-module
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache SAPIs."
+
+DEPEND="app-admin/php-toolkit"
+RDEPEND="${DEPEND}"
+
+want_apache
+
+pkg_setup() {
+       PHPCONFUTILS_AUTO_USE=""
+
+       # Make sure the user has specified at least one SAPI
+       einfo "Determining SAPI(s) to build"
+       phpconfutils_require_any "  Enabled  SAPI:" "  Disabled SAPI:" cli cgi apache apache2
+
+       # Threaded Apache2 support
+       if useq apache2 ; then
+               if [[ "${APACHE_VERSION}" != "0" ]] ; then
+                       if ! useq threads ; then
+                               APACHE2_SAFE_MPMS="itk peruser prefork"
+                       else
+                               APACHE2_SAFE_MPMS="event leader metuxmpm perchild threadpool worker"
+                       fi
+
+                       ewarn
+                       ewarn "If this package fails with a fatal error about Apache2 not having"
+                       ewarn "been compiled with a compatible MPM, this is normally because you"
+                       ewarn "need to toggle the 'threads' USE flag."
+                       ewarn
+                       ewarn "If 'threads' is off, try switching it on."
+                       ewarn "If 'threads' is on, try switching it off."
+                       ewarn
+
+                       apache-module_pkg_setup
+               fi
+       fi
+
+       # Concurrent PHP Apache2 modules support
+       if useq apache2 ; then
+               if [[ "${APACHE_VERSION}" != "0" ]] ; then
+                       if useq concurrentmodphp ; then
+                               ewarn
+                               ewarn "'concurrentmodphp' makes it possible to load multiple, differently"
+                               ewarn "versioned mod_php's into the same Apache instance. This is done with"
+                               ewarn "a few linker tricks and workarounds, and is not guaranteed to always"
+                               ewarn "work correctly, so use it at your own risk. Especially, do not use"
+                               ewarn "this in conjunction with PHP modules (PECL, ...) other than the ones"
+                               ewarn "you may find in the Portage tree or the PHP Overlay!"
+                               ewarn "This is an experimental feature, so please rebuild PHP"
+                               ewarn "without the 'concurrentmodphp' USE flag if you experience"
+                               ewarn "any problems, and then reproduce any bugs before filing"
+                               ewarn "them in Gentoo's Bugzilla or bugs.php.net."
+                               ewarn "If you have conclusive evidence that a bug directly"
+                               ewarn "derives from 'concurrentmodphp', please file a bug in"
+                               ewarn "Gentoo's Bugzilla only."
+                               ewarn
+                               ebeep 5
+                       fi
+               fi
+       fi
+
+       # fastbuild support
+       if useq fastbuild ; then
+               ewarn
+               ewarn "'fastbuild' attempts to build all SAPIs in a single pass."
+               ewarn "This is an experimental feature, so please rebuild PHP"
+               ewarn "without the 'fastbuild' USE flag if you experience"
+               ewarn "any problems, and then reproduce any bugs before filing"
+               ewarn "them in Gentoo's Bugzilla or bugs.php.net."
+               ewarn "If you have conclusive evidence that a bug directly"
+               ewarn "derives from 'fastbuild', please file a bug in"
+               ewarn "Gentoo's Bugzilla only."
+               ewarn
+       fi
+
+       php5_1-sapi_pkg_setup
+}
+
+php_determine_sapis() {
+       # holds the list of sapis that we want to build
+       PHPSAPIS=
+
+       if useq cli || phpconfutils_usecheck cli ; then
+               PHPSAPIS="${PHPSAPIS} cli"
+       fi
+
+       if useq cgi ; then
+               PHPSAPIS="${PHPSAPIS} cgi"
+       fi
+
+       # note - we can only build one apache sapi for now
+       # note - apache SAPI comes after the simpler cli/cgi sapis
+       if useq apache || useq apache2 ; then
+               if [[ "${APACHE_VERSION}" != "0" ]] ; then
+                       PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}"
+               fi
+       fi
+}
+
+src_unpack() {
+       if [[ "${PHP_PACKAGE}" == 1 ]] ; then
+               unpack ${A}
+       fi
+
+       cd "${S}"
+
+       # Concurrent PHP Apache2 modules support
+       if useq apache2 ; then
+               if [[ "${APACHE_VERSION}" != "0" ]] ; then
+                       if useq concurrentmodphp ; then
+                               if [[ -n "${CONCURRENTMODPHP_PATCH}" ]] && [[ -f "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" ]] ; then
+                                       epatch "${WORKDIR}/${CONCURRENTMODPHP_PATCH}"
+                               else
+                                       ewarn "There is no concurrent mod_php patch available for this PHP release yet!"
+                               fi
+                       fi
+               fi
+       fi
+
+       # fastbuild support
+       if useq fastbuild ; then
+               if [[ -n "${FASTBUILD_PATCH}" ]] && [[ -f "${WORKDIR}/${FASTBUILD_PATCH}" ]] ; then
+                       epatch "${WORKDIR}/${FASTBUILD_PATCH}"
+               else
+                       ewarn "There is no fastbuild patch available for this PHP release yet!"
+               fi
+       fi
+
+       # Now let the eclass do the rest and regenerate the configure
+       php5_1-sapi_src_unpack
+
+       # Fix Makefile.global:test to consider the CGI SAPI if present
+       if useq cgi ; then
+               sed -e "s|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\"|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\" \&\& test \! -z \"\$(top_builddir)/php-cgi\" \&\& test -x \"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
+               sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global
+       fi
+}
+
+src_compile() {
+       if useq fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then
+               src_compile_fastbuild
+       else
+               src_compile_normal
+       fi
+}
+
+src_compile_fastbuild() {
+       php_determine_sapis
+
+       build_cli=0
+       build_cgi=0
+       build_apache1=0
+       build_apache2=0
+       my_conf=""
+
+       for x in ${PHPSAPIS} ; do
+               case ${x} in
+                       cli)
+                               build_cli=1
+                               ;;
+                       cgi)
+                               build_cgi=1
+                               ;;
+                       apache1)
+                               build_apache1=1
+                               ;;
+                       apache2)
+                               build_apache2=1
+                               ;;
+               esac
+       done
+
+       if [[ ${build_cli} = 1 ]] ; then
+               my_conf="${my_conf} --enable-cli"
+       else
+               my_conf="${my_conf} --disable-cli"
+       fi
+
+       if [[ ${build_cgi} = 1 ]] ; then
+               my_conf="${my_conf} --enable-cgi --enable-fastcgi"
+               phpconfutils_extension_enable "discard-path" "discard-path" 0
+               phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
+       else
+               my_conf="${my_conf} --disable-cgi"
+       fi
+
+       if [[ ${build_apache1} = 1 ]] ; then
+               my_conf="${my_conf} --with-apxs=/usr/sbin/apxs"
+       fi
+
+       if [[ ${build_apache2} = 1 ]] ; then
+               my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2"
+
+               # Threaded Apache2 support
+               if useq threads ; then
+                       my_conf="${my_conf} --enable-maintainer-zts"
+                       ewarn "Enabling ZTS for Apache2 MPM"
+               fi
+
+               # Concurrent PHP Apache2 modules support
+               if useq concurrentmodphp ; then
+                       append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
+               fi
+       fi
+
+       # Now we know what we are building, build it
+       php5_1-sapi_src_compile
+
+       # To keep the separate php.ini files for each SAPI, we change the
+       # build-defs.h and recompile
+
+       if [[ ${build_cli} = 1 ]] ; then
+               einfo
+               einfo "Building CLI SAPI"
+               einfo
+
+               sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cli-php5"|g;' -i main/build-defs.h
+               sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cli-php5/ext-active"|g;' -i main/build-defs.h
+               for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
+                       [[ -f ${x} ]] && rm -f ${x}
+               done
+               make sapi/cli/php || die "Unable to make CLI SAPI"
+               cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
+       fi
+
+       if [[ ${build_cgi} = 1 ]] ; then
+               einfo
+               einfo "Building CGI SAPI"
+               einfo
+
+               sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cgi-php5"|g;' -i main/build-defs.h
+               sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cgi-php5/ext-active"|g;' -i main/build-defs.h
+               for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
+                       [[ -f ${x} ]] && rm -f ${x}
+               done
+               make sapi/cgi/php || die "Unable to make CGI SAPI"
+               cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
+       fi
+
+       if [[ ${build_apache1} = 1 ]] || [[ ${build_apache2} = 1 ]] ; then
+               einfo
+               einfo "Building apache${APACHE_VERSION} SAPI"
+               einfo
+
+               sed -e "s|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH \"/etc/php/apache${APACHE_VERSION}-php5\"|g;" -i main/build-defs.h
+               sed -e "s|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR \"/etc/php/apache${APACHE_VERSION}-php5/ext-active\"|g;" -i main/build-defs.h
+               for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
+                       [[ -f ${x} ]] && rm -f ${x}
+               done
+               make || die "Unable to make apache${APACHE_VERSION} SAPI"
+       fi
+}
+
+src_compile_normal() {
+       php_determine_sapis
+
+       CLEAN_REQUIRED=0
+       my_conf=""
+
+       # Support the Apache2 extras, they must be set globally for all
+       # SAPIs to work correctly, especially for external PHP extensions
+       if useq apache2 ; then
+               if [[ "${APACHE_VERSION}" != "0" ]] ; then
+                       # Concurrent PHP Apache2 modules support
+                       if useq concurrentmodphp ; then
+                               append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs"
+                       fi
+               fi
+       fi
+
+       for x in ${PHPSAPIS} ; do
+               # Support the Apache2 extras, they must be set globally for all
+               # SAPIs to work correctly, especially for external PHP extensions
+               if useq apache2 ; then
+                       if [[ "${APACHE_VERSION}" != "0" ]] ; then
+                               # Threaded Apache2 support
+                               if useq threads ; then
+                                       my_conf="${my_conf} --enable-maintainer-zts"
+                                       ewarn "Enabling ZTS for Apache2 MPM"
+                               fi
+                       fi
+               fi
+
+               if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then
+                       make clean
+               fi
+
+               PHPSAPI="${x}"
+
+               case ${x} in
+                       cli)
+                               my_conf="${my_conf} --enable-cli --disable-cgi"
+                               php5_1-sapi_src_compile
+                               cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI"
+                               ;;
+                       cgi)
+                               my_conf="${my_conf} --disable-cli --enable-cgi --enable-fastcgi"
+                               phpconfutils_extension_enable "discard-path" "discard-path" 0
+                               phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
+                               php5_1-sapi_src_compile
+                               cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
+                               ;;
+                       apache1)
+                               my_conf="${my_conf} --disable-cli --with-apxs=/usr/sbin/apxs"
+                               php5_1-sapi_src_compile
+                               ;;
+                       apache2)
+                               my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
+                               php5_1-sapi_src_compile
+                               ;;
+               esac
+
+               CLEAN_REQUIRED=1
+               my_conf=""
+       done
+}
+
+src_install() {
+       php_determine_sapis
+
+       destdir=/usr/$(get_libdir)/php5
+
+       # Let the eclass do the common work
+       php5_1-sapi_src_install
+
+       einfo
+       einfo "Installing SAPI(s) ${PHPSAPIS}"
+       einfo
+
+       for x in ${PHPSAPIS} ; do
+
+               PHPSAPI="${x}"
+
+               case ${x} in
+                       cli)
+                               einfo "Installing CLI SAPI"
+                               into ${destdir}
+                               newbin php-cli php || die "Unable to install ${x} sapi"
+                               php5_1-sapi_install_ini
+                               ;;
+                       cgi)
+                               einfo "Installing CGI SAPI"
+                               into ${destdir}
+                               dobin php-cgi || die "Unable to install ${x} sapi"
+                               php5_1-sapi_install_ini
+                               ;;
+                       apache1)
+                               einfo "Installing Apache${APACHE_VERSION} SAPI"
+                               make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
+                               einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
+                               insinto ${APACHE_MODULES_CONFDIR}
+                               newins "${FILESDIR}/70_mod_php5.conf-apache1" "70_mod_php5.conf"
+                               php5_1-sapi_install_ini
+                               ;;
+                       apache2)
+                               einfo "Installing Apache${APACHE_VERSION} SAPI"
+                               make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI"
+                               if useq concurrentmodphp ; then
+                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP5-concurrent (70_mod_php5_concurr.conf)"
+                                       insinto ${APACHE_MODULES_CONFDIR}
+                                       newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2" "70_mod_php5_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}/php5-ldvs"
+
+                                       # Redefine the extension dir to have the modphp suffix
+                                       PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`-versioned"
+                               else
+                                       einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)"
+                                       insinto ${APACHE_MODULES_CONFDIR}
+                                       newins "${FILESDIR}/70_mod_php5.conf-apache2" "70_mod_php5.conf"
+                               fi
+                               php5_1-sapi_install_ini
+                               ;;
+               esac
+       done
+}
+
+pkg_postinst() {
+       # Output some general info to the user
+       if useq apache || useq apache2 ; then
+               APACHE1_MOD_DEFINE="PHP5"
+               APACHE1_MOD_CONF="70_mod_php5"
+               APACHE2_MOD_DEFINE="PHP5"
+               if useq concurrentmodphp ; then
+                       APACHE2_MOD_CONF="70_mod_php5_concurr"
+               else
+                       APACHE2_MOD_CONF="70_mod_php5"
+               fi
+               apache-module_pkg_postinst
+       fi
+
+       # Update Apache1 to use mod_php
+       if useq apache ; then
+               "${ROOT}/usr/sbin/php-select" -t apache1 php5 > /dev/null 2>&1
+               exitStatus=$?
+               if [[ ${exitStatus} == 2 ]] ; then
+                       php-select apache1 php5
+               elif [[ ${exitStatus} == 4 ]] ; then
+                       ewarn
+                       ewarn "Apache1 is configured to load a different version of PHP."
+                       ewarn "To make Apache1 use PHP v5, use php-select:"
+                       ewarn
+                       ewarn "    php-select apache1 php5"
+                       ewarn
+               fi
+       fi
+
+       # Update Apache2 to use mod_php
+       if useq apache2 ; then
+               "${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1
+               exitStatus=$?
+               if [[ ${exitStatus} == 2 ]] ; then
+                       php-select apache2 php5
+               elif [[ ${exitStatus} == 4 ]] ; then
+                       ewarn
+                       ewarn "Apache2 is configured to load a different version of PHP."
+                       ewarn "To make Apache2 use PHP v5, use php-select:"
+                       ewarn
+                       ewarn "    php-select apache2 php5"
+                       ewarn
+               fi
+       fi
+
+       # Create the symlinks for php-cli
+       if useq cli || phpconfutils_usecheck cli ; then
+               "${ROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1
+               exitStatus=$?
+               if [[ ${exitStatus} == 5 ]] ; then
+                       php-select php php5
+               elif [[ ${exitStatus} == 4 ]] ; then
+                       ewarn
+                       ewarn "/usr/bin/php links to a different version of PHP."
+                       ewarn "To make /usr/bin/php point to PHP v5, use php-select:"
+                       ewarn
+                       ewarn "    php-select php php5"
+                       ewarn
+               fi
+       fi
+
+       # Create the symlinks for php-cgi
+       if useq cgi ; then
+               "${ROOT}/usr/sbin/php-select" -t php-cgi php5 > /dev/null 2>&1
+               exitStatus=$?
+               if [[ ${exitStatus} == 5 ]] ; then
+                       php-select php-cgi php5
+               elif [[ ${exitStatus} == 4 ]] ; then
+                       ewarn
+                       ewarn "/usr/bin/php-cgi links to a different version of PHP."
+                       ewarn "To make /usr/bin/php-cgi point to PHP v5, use php-select:"
+                       ewarn
+                       ewarn "    php-select php-cgi php5"
+                       ewarn
+               fi
+       fi
+
+       # Create the symlinks for php-devel
+       "${ROOT}/usr/sbin/php-select" -t php-devel php5 > /dev/null 2>&1
+       exitStatus=$?
+       if [[ $exitStatus == 5 ]] ; then
+               php-select php-devel php5
+       elif [[ $exitStatus == 4 ]] ; then
+               ewarn
+               ewarn "/usr/bin/php-config and/or /usr/bin/phpize are linked to a"
+               ewarn "different version of PHP. To make them point to PHP v5, use"
+               ewarn "php-select:"
+               ewarn
+               ewarn "    php-select php-devel php5"
+               ewarn
+       fi
+
+       php5_1-sapi_pkg_postinst
+}
+
+src_test() {
+       einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+       if ! emake -j1 test ; then
+               hasq test ${FEATURES} && die "Make test failed. See above for details."
+               hasq test ${FEATURES} || eerror "Make test failed. See above for details."
+       fi
+}