# ChangeLog for dev-lang/php
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.500 2011/08/12 07:40:09 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.501 2011/08/21 13:58:36 olemarkus Exp $
+
+ 21 Aug 2011; Ole Markus With <olemarkus@gentoo.org>
+ -files/eblits/src_configure-v52.eblit, -php-5.2.14.ebuild,
+ -php-5.3.3-r1.ebuild, +php-5.3.7.ebuild, -files/eblits/src_prepare-v1.eblit:
+ Removed all php:5 ebuilds (bug 363809)
+
+*php-5.3.7 (18 Aug 2011)
+
+ 18 Aug 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.3.7.ebuild:
+ Version bump
*php-5.3.7_rc5 (12 Aug 2011)
AUX eblits/src_configure-v1.eblit 10979 RMD160 c20ce6476380cf1b355f1c957f8e0bfdf166e220 SHA1 bd2f51283e01bf838bbb1946a9879ac337c6e90c SHA256 dc769b7c5846248fdd5d1a930a3e9b614d550bfcc78f09ecd1c08607796f0206
AUX eblits/src_configure-v2.eblit 10855 RMD160 27c70744216912e79707c6861bc7d00a379d690a SHA1 7629d985421b756aa57bcce51d378ff14db675c8 SHA256 cd3002b6c9bd91dc9d7471e416cc631247fb2ad9d7b68981b26a3f83f84c916a
AUX eblits/src_configure-v3.eblit 9393 RMD160 a2ed939df5ac9051dc3dcccd7c43732fb2c02db3 SHA1 6bddcaab3506ea781f1324f9025ab8ede5c427df SHA256 df8aff916e7c9b41e7f2504de7b48734df520d59746ce891b1dc89685b8404d3
-AUX eblits/src_configure-v52.eblit 11017 RMD160 4a804e4b021d2454c81c33644a744b72eec1e65d SHA1 f30392f1727592ad5de79934042d9d0b09c4ba41 SHA256 784ec5482362cc8f0725ca30a186e08958d7e8e752a238af043cfa8c7a68ed85
AUX eblits/src_configure-v521.eblit 10844 RMD160 90513f59b5f17d680004d3e74581d9eedc8af490 SHA1 a369e2cf7816799f7e2bead8b6eccc2115d0ecdc SHA256 ad875ca45e9ad975c0d7a3cbedc27c5035aa048d7aa935221a15e47cbca63c3d
AUX eblits/src_install-v1.eblit 5146 RMD160 24127823735939101dcb00585a5ed69adedffed2 SHA1 36ab2648abaae12d1a86c97db82cd2ea86497b2d SHA256 3bddd375764b0ed00cb30e65036c67f96c56ea0ebfd70bcdc61b7465d1500d36
AUX eblits/src_install-v2.eblit 5302 RMD160 a6e89565235f6baf14ee38326f94a0ed39f54183 SHA1 83b461036b1fd7170e3966399f4110a2e9363f41 SHA256 466e7350126a2c27814c693c7c7fcc45ee53eb4d267846d5b27a02c377b5407d
AUX eblits/src_install-v3.eblit 4264 RMD160 42860228c8b3bd46593d3ece4346137fa5e00757 SHA1 83b8544b75b18a0a9c780019ebdb11299605959f SHA256 41a044474b486196502182257273d50b278e91588186802186555b86fe9b8d61
AUX eblits/src_prepare-snapshots.eblit 2238 RMD160 d82ee01ee6cc6bae7b7199296e32bcac093f2fae SHA1 deebebf641b935e4fdcda63f3f9ce9df01bdb037 SHA256 411ce9d56008461da4592dcf623fcff40c33aac479d13544f84cc974c5c232ea
-AUX eblits/src_prepare-v1.eblit 2616 RMD160 ccff64d09cc90ada1ea5d1311457cf9a05f12f8e SHA1 7db40d0ca7ef01e5b61962f261511803f768f1bc SHA256 915b9755a37f7670f6e436fe5072dae8f5e6b437ccdfbff835e26bb2f9d22b1e
AUX eblits/src_prepare-v2.eblit 2604 RMD160 379dbca3e2ae8c1f09f608220ec9c98d099cb792 SHA1 42afae4e07633535ecea49817f5badd559f10ff1 SHA256 fe7534260fb81a012b8021b5d555756ce8733ad192bf51cedd94f12963811790
AUX eblits/src_prepare-v3.eblit 2649 RMD160 5f01f42eef528535866c3b5ade0ded592d1ffd48 SHA1 1bdc640ab548f4e8b78acc305fdd6ceab225daf8 SHA256 7ea3a5351fabeb050161e64c09b98ff945bbdb8b4d1a7fb83d6b4645f277b486
AUX eblits/src_prepare-v4.eblit 2317 RMD160 22833c1caa6f7530230b0809e119eeb2dbba7b27 SHA1 2f7a5fdd113cdf026de5b565fb073e3968db946b SHA256 7c18252a49a6d8e071471d14624f284d7b3ad8b95cad4a001e10e6e521f4c9b1
AUX php-fpm.conf 12898 RMD160 392a60348e233e725232749091f8e93f91ee88e6 SHA1 dff03446838753fcff75f625ccdd9b4cffde8d93 SHA256 8ebd676e058e5b64fbb8b5ed0be693e4da8f6fcedd5e427757afccc13504c48d
AUX php-fpm.init 385 RMD160 0e266738ceb3853ce335db6375b5438bdea597db SHA1 bce556ebbd17e5192250f70ead99e8c70d9529c1 SHA256 baba8dab2cadc8bdf107e6fe5cede2f5faaabff1281781a0a30b3be79964c94e
AUX php5-ldvs 22 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 SHA1 592398c92575adb14ec972847ce2aca28a7b9c2c SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79
-DIST php-5.2.14.tar.bz2 9055945 RMD160 f699488f5b266a1c5e36df570c4d5896dc4e0aea SHA1 311b44b2c0f2eea8ab8dab876d2a6b6e7a55632e SHA256 515b5fd41258798d59b93d86b0d752ab0b03e5738c32af444fba1907763c2bd1
DIST php-5.2.17.tar.bz2 9092312 RMD160 567fa8d718b93fb83a89494c83a8bec224ac99e9 SHA1 d68f3b09f766990d815a3c4c63c157db8dab8095 SHA256 e81beb13ec242ab700e56f366e9da52fd6cf18961d155b23304ca870e53f116c
-DIST php-5.3.3.tar.bz2 10662227 RMD160 9edb51663feac9b787f8382012893f1ac98fec6a SHA1 9f66716b341119e4e4f8fe3d81b7d0a5daf3cbc8 SHA256 f2876750f3c54854a20e26a03ca229f2fbf89b8ee6176b9c0586cb9b2f0b3f9a
DIST php-5.3.6.tar.bz2 10952171 RMD160 619bf96cf24bf6aa0988494186f8914fde94d44d SHA1 0e0b9b4d9117f22080e2204afa9383469eb0dbbd SHA256 30ae880f22e3ee93eccc9b80e3c58b0d6364d139bb4366dcc27f2fab658d3198
+DIST php-5.3.7.tar.bz2 11144328 RMD160 d14c52036f35d79193783b590c0cf131e1cd00c0 SHA1 811e84b75d41ad997c075e3ebc8470f5c26d03ea SHA256 58b490af6f919acfafb6e176957b88e3d814eabee68cc147b4d8d20697d88b96
DIST php-5.3.7RC2.tar.bz2 11135548 RMD160 446f53e0af86dfaaab025869996fff5b82493904 SHA1 c333becfba3da5d5ee45419d8f66bcdc644154f3 SHA256 556fd00b84858ee46e7c19e3d9fdf17fbb03725211dc39d6cbd44e8060dda017
DIST php-5.3.7RC3.tar.bz2 11135642 RMD160 81945143b1ccfa20139c685e1341ed9a8853d7fe SHA1 6c1ddd5ace11cebb4cdce1979780c4413cae3371 SHA256 19d543aba7b6e88390050ce68df99bcfeb10daa6150c8b46347873595abb6f9f
DIST php-5.3.7RC5.tar.bz2 11140021 RMD160 177e483959c9e23e4b12a3c63086ac755d6d67e7 SHA1 675bc619f54414b09c38a9fb0271561892c07baa SHA256 d869ccabe05feb244c795514a3dd769e846b6b54e6ac362008e90c5cd57ea58a
DIST php-5.4.0alpha1.tar.bz2 11015848 RMD160 2f0d10fa22465d984fa584cc62924717e5deb1fc SHA1 40ba6c57ad4e364667170dc0ea448e38e2695ccf SHA256 d06d1b2b598d4a7773b6f90bda64c82ef3028f12cf1bc838f4c4de8bb24c1169
DIST php-5.4.0alpha3.tar.bz2 11112693 RMD160 3b731cf7b2230013b7752c20c8e3dc695877c38e SHA1 400af62e1a5d495fe87d98432a38a692abfd0649 SHA256 263282185d2c50ccb1cd4c051157411c6da05cf0384c64f8bdff71c0d50113e1
-DIST php-patchset-5.2.14-r1.tar.bz2 8381 RMD160 7f562ac7df8f918f6d73f61c4e2096a88759889d SHA1 0453926bccfd5bd8089c311f6e16f1e4a8c08993 SHA256 f49aacef203cee8e7ad038492ed43e7677ed2d22e0fef07dc840195cacc95d34
DIST php-patchset-5.2.17-r0.tar.bz2 8369 RMD160 544af4eb2de8e4478e675810f18a5b494b59709b SHA1 7b3c56437b435f60f72f7af08112e77c01e2f827 SHA256 fb159a02faf5120dd9bc620bd3f3094735f181aa6893273bb7dd29771b8b23b2
-DIST php-patchset-5.3.3-r2.tar.bz2 9796 RMD160 6620cae9768e6a2c415ad6ed1fe9d5665867d216 SHA1 6f582a41c3f8b9c73677124a631cee3c4390e3f1 SHA256 aa331a07d00eb92a6a4d1ba937377e17ec4e3fa099c4295f4ccb5602ee583ae7
DIST php-patchset-5.3.6-r0.tar.bz2 10033 RMD160 352290d674cfc3bb76c4ee44b90e3ef7a231c405 SHA1 cd9e5ae79595adf7ca42d6e2fe81dd275a8b7575 SHA256 544aae373fcff288bf22706a30f06da6bcc29695d0014dc7768585197c80aaeb
+DIST php-patchset-5.3.7-r0.tar.bz2 7525 RMD160 493f2206c490d759d6da8a7976290046946e111b SHA1 c363e4163cd92d6d469eb89efad801ff315cefbb SHA256 e06871054e1c57f0bee0f95e5ad4307abe4d9cec71f8ccdf68e1a2461367acb1
DIST php-patchset-5.3.7_rc2-r0.tar.bz2 9258 RMD160 97c5be732f3b1d0cdd9f6af3e586e273a9941e9a SHA1 d03b80319fac25aaedf2de7f758bff94f7ec018b SHA256 318ccba899b3af78ba10b74da4dcdde7ca5556650bc5d1ea0a7d68957b4b3811
DIST php-patchset-5.3.7_rc3-r0.tar.bz2 7528 RMD160 7f0389d957fa9048aed4d8787650d3162df742fa SHA1 e1c3354a5cd62b0b00f294bf412ae82fabb76610 SHA256 685fd20a301f42493e5c9f490642402e9da291a1a39d440567f4a9775195aed8
DIST php-patchset-5.3.7_rc5-r0.tar.bz2 7519 RMD160 ec76e0b1d60d2f8f48c835e1bf9e3d3fd912688f SHA1 2a672db9d742330f6a3b122ad170a7ab6282a9eb SHA256 8faf9573fd0a255413ead940323e11c439e3a74eb9eb4bad71959334a81e2da1
DIST php-patchset-5.4.0_alpha3-r0.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea
DIST php-patchset-5.5.0_pre201105211430-r0.tar.bz2 9532 RMD160 8ef9cafc7652db45aef4421bafd51928f07dabff SHA1 44d7720208895b00a713e0f9ee777ea40a8fcf8a SHA256 3c348d8e09545beb33971c018ff948f4534766349821a477bd28c1b088b09b65
DIST php-trunk-201105211430.tar.bz2 11158099 RMD160 9df5f2a1336367618a53f49123b6b11660c8bbd6 SHA1 2f986aca0094bd6950867d10c84c1df790c7a6b2 SHA256 77e808a91ea1046f9dd47830d029a5c5a416b741d0955d7097e11e4d795062f1
-DIST suhosin-patch-5.2.14-0.9.7.patch.gz 23057 RMD160 bc7790cd36dc4101322684b754db3ca2d4385ba6 SHA1 0a12d3589f9c26dc7d6b6452ef7987b2e6527a30 SHA256 bd03ade44673f7e6fa116d746350f16c60be7170d6c41816a2d51faaeb5a31ae
DIST suhosin-patch-5.2.16-0.9.7.patch.gz 23069 RMD160 b28b70faf136b3e04c5b483da0f4c2279378f43a SHA1 fec10b2b81582d06bb0d0a96ea55c525afc8ab29 SHA256 aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91
-DIST suhosin-patch-5.3.3-0.9.10.patch.gz 41298 RMD160 8dcd8b51ea0357b6cc51e70e495e18f341c62f7c SHA1 76675242cfdeff763767900213346af622002490 SHA256 f48489ff7d3fd3fc30429f7349f181c84caf2e03e672eb2d2b55b46adf6f602c
-EBUILD php-5.2.14.ebuild 8867 RMD160 c663ad0c3053a38806bea582093e82d676085cfc SHA1 ab7dbd0d799bb4947aa76a6d0ed2ba43aa8c9f7b SHA256 d21ab89bb77072ea0fbf72d83d8e912ffe51c174f6fd3b8134bf806c66b25631
EBUILD php-5.2.17.ebuild 9485 RMD160 3c6079bff58c1cb97302a03a207dfe1d0ad5a64f SHA1 56d7b3d08d1c08385bf1e4e783380bb1ef3357b5 SHA256 117bbe4abb70de4b2b3e4bafd1c8c5b76e8f5d9a16e25e3c78326e53350535ab
-EBUILD php-5.3.3-r1.ebuild 9305 RMD160 34b77045625873db23cd957d180e9d41b4e14d88 SHA1 1d13b4687cc9e8519399f50cb60eb930647a47ce SHA256 9681c7fd5d8460d345ef25e40d2a654898c8995b94f7701a474b749823898ab4
EBUILD php-5.3.6-r1.ebuild 9538 RMD160 e7365ce71f94f06b5732d497b9fc94b93f12945d SHA1 ccdd5c0fdcd169b4819d924ff0f5f5a6caaf934b SHA256 97ffbe697c6d607b748b89044baed1b4a91fc7a09790d0abfce6acc47ca45703
EBUILD php-5.3.6.ebuild 9794 RMD160 9be2d19b4cfc93aa0f6920958f7868198b254427 SHA1 ab4f7dfd77ce61441901e4ae6834c6563a1bf96c SHA256 f97847b13e3f5a09f686006401f816ba823850541da4d2ab58a9c7289651809e
+EBUILD php-5.3.7.ebuild 9586 RMD160 11d58a882bf84a1774972c681e966843be5b9848 SHA1 0ff0dd39b93d07a0f71d9f5347b71a4924469a50 SHA256 36254b1d768560550d4a38b5d24c7ddfe7a1c3ff5376a4de8bfc3e2a63e35a02
EBUILD php-5.3.7_rc2.ebuild 9543 RMD160 88a46bcac38f3ebc873f48406cb124f23f402126 SHA1 2100316c2586e434a97c8a508b1d985b02c74a03 SHA256 659d078fa2399ae800734f701357c9a64fbc787693c04d1908470602797fcf75
EBUILD php-5.3.7_rc3.ebuild 9586 RMD160 59388df6b23c096945bc9a44e570949477c9da0a SHA1 24fe50e43390e12dada7fd87a76b159678bfe63d SHA256 11fff86b394f532fe87be99f2424e0a9f92f990cbee7b924ba63c604f69c9045
EBUILD php-5.3.7_rc5.ebuild 9586 RMD160 11d58a882bf84a1774972c681e966843be5b9848 SHA1 0ff0dd39b93d07a0f71d9f5347b71a4924469a50 SHA256 36254b1d768560550d4a38b5d24c7ddfe7a1c3ff5376a4de8bfc3e2a63e35a02
EBUILD php-5.4.0_alpha1.ebuild 8538 RMD160 194abead36de3e3c7cba14ee4d0191de1fc6003d SHA1 665b74f0b909bac24a331cecc047c6baf58490fe SHA256 5a6c9526d65968cdc50a866ce0a02a1d0e24c826641f6b66e251cfa61c5f67b3
EBUILD php-5.4.0_alpha3.ebuild 8532 RMD160 ce493599d94ac424c07a7969b70effacced85811 SHA1 69ac3e3419877599be62f2117f0915c0a27990ff SHA256 7a070e5e99d1d14f6cac93c986574f4fdaac9ce16b2fb4c9d6133634b32a7b68
EBUILD php-5.5.0_pre201105211430.ebuild 9523 RMD160 ed8fb75cb33d9ac955897bbeffd559e8e91dff3b SHA1 7557061d6f4e0dd38710af7b417f3fa37a8f2214 SHA256 187d2434b926db70e7a2c1f89141a09cc869c431ebb6e0d857913eaa50da7ce2
-MISC ChangeLog 85164 RMD160 d6292f9767b49d11758d7393c44695ec22d55c5f SHA1 8e609a647c9e17ac8ff286d5a629fa4b9955cb62 SHA256 6f8d74794f9f8726c8937319cd14eb01ca53264973471833a036509268c24d61
+MISC ChangeLog 85279 RMD160 fa5b40058212fc23ca498af295677e106c590e5e SHA1 02132bd2b9e6f29c94bb1487d17fd4f17a6b01b9 SHA256 2f3d7b97331a09222bde421d92f83b99820f51e07a871c042f64d26381f9482e
MISC metadata.xml 2212 RMD160 e26ea7f6831acb23854f018fe6d00c213bf62e5a SHA1 25500969d6ef6c1918a8e6abbb04e0553806dee2 SHA256 6fdbba214ce15fae4a1e2eb086586008377fff85e67e38b1e2232a9745432674
+++ /dev/null
-# 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_configure-v52.eblit,v 1.5 2010/09/19 15:15:08 mabi Exp $
-
-eblit-php-src_configure() {
- export CFLAGS="${CFLAGS} -D_GNU_SOURCE"
- PHP_DESTDIR="/usr/$(get_libdir)/php${SLOT}"
-
- # This is a global variable and should be in caps. It isn't because the
- # phpconfutils eclass relies on exactly this name...
- my_conf="
- --prefix="${PHP_DESTDIR}"
- --mandir="${PHP_DESTDIR}"/man
- --infodir="${PHP_DESTDIR}"/info
- --libdir="${PHP_DESTDIR}"/lib
- --with-libdir=$(get_libdir)
- --without-pear
- $(use_enable threads maintainer-zts)"
-
- phpconfutils_init
-
- # extension USE flag shared
- phpconfutils_extension_enable "bcmath" "bcmath" 1
- phpconfutils_extension_with "bz2" "bzip2" 1
- phpconfutils_extension_enable "calendar" "calendar" 1
- phpconfutils_extension_disable "ctype" "ctype" 0
- phpconfutils_extension_with "curl" "curl" 1
- phpconfutils_extension_with "curlwrappers" "curlwrappers" 0
- phpconfutils_extension_enable "dbase" "dbase" 1
- phpconfutils_extension_disable "dom" "xml" 0
- phpconfutils_extension_enable "exif" "exif" 1
- phpconfutils_extension_with "fbsql" "frontbase" 1
- phpconfutils_extension_with "fdftk" "fdftk" 1 "/opt/fdftk-6.0"
- phpconfutils_extension_disable "filter" "filter" 0
- phpconfutils_extension_enable "ftp" "ftp" 1
- phpconfutils_extension_with "gettext" "nls" 1
- phpconfutils_extension_with "gmp" "gmp" 1
- phpconfutils_extension_disable "hash" "hash" 0
- phpconfutils_extension_without "iconv" "iconv" 0
- phpconfutils_extension_disable "ipv6" "ipv6" 0
- phpconfutils_extension_disable "json" "json" 0
- phpconfutils_extension_with "kerberos" "kerberos" 0 "/usr"
- phpconfutils_extension_disable "libxml" "xml" 0
- phpconfutils_extension_enable "mbstring" "unicode" 1
- phpconfutils_extension_with "mcrypt" "crypt" 1
- phpconfutils_extension_with "mhash" "mhash" 1
- phpconfutils_extension_with "msql" "msql" 1
- phpconfutils_extension_with "mssql" "mssql" 1
- phpconfutils_extension_with "ncurses" "ncurses" 1
- phpconfutils_extension_with "openssl" "ssl" 0
- phpconfutils_extension_with "openssl-dir" "ssl" 0 "/usr"
- phpconfutils_extension_enable "pcntl" "pcntl" 1
- phpconfutils_extension_without "pcre-regex" "pcre" 0
- phpconfutils_extension_disable "pdo" "pdo" 0
- phpconfutils_extension_with "pgsql" "postgres" 1
- phpconfutils_extension_disable "posix" "posix" 0
- phpconfutils_extension_with "pspell" "spell" 1
- phpconfutils_extension_with "recode" "recode" 1
- phpconfutils_extension_disable "reflection" "reflection" 0
- phpconfutils_extension_disable "simplexml" "simplexml" 0
- phpconfutils_extension_enable "shmop" "sharedmem" 0
- phpconfutils_extension_with "snmp" "snmp" 1
- phpconfutils_extension_enable "soap" "soap" 1
- phpconfutils_extension_enable "sockets" "sockets" 1
- phpconfutils_extension_disable "spl" "spl" 0
- phpconfutils_extension_with "sybase-ct" "sybase-ct" 1
- phpconfutils_extension_enable "sysvmsg" "sysvipc" 1
- phpconfutils_extension_enable "sysvsem" "sysvipc" 1
- phpconfutils_extension_enable "sysvshm" "sysvipc" 1
- phpconfutils_extension_with "tidy" "tidy" 1
- phpconfutils_extension_disable "tokenizer" "tokenizer" 0
- phpconfutils_extension_enable "wddx" "wddx" 1
- phpconfutils_extension_disable "xml" "xml" 0
- phpconfutils_extension_disable "xmlreader" "xmlreader" 0
- phpconfutils_extension_disable "xmlwriter" "xmlwriter" 0
- phpconfutils_extension_with "xmlrpc" "xmlrpc" 1
- phpconfutils_extension_with "xsl" "xsl" 1
- phpconfutils_extension_enable "zip" "zip" 1
- phpconfutils_extension_with "zlib" "zlib" 1
- phpconfutils_extension_enable "debug" "debug" 0
-
- # DBA support
- if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
- || use qdbm ; then
- my_conf="${my_conf} --enable-dba${shared}"
- fi
-
- # DBA drivers support
- phpconfutils_extension_with "cdb" "cdb" 0
- phpconfutils_extension_with "db4" "berkdb" 0
- phpconfutils_extension_enable "flatfile" "flatfile" 0
- phpconfutils_extension_with "gdbm" "gdbm" 0
- phpconfutils_extension_enable "inifile" "inifile" 0
- phpconfutils_extension_with "qdbm" "qdbm" 0
-
- # Support for the GD graphics library
- if use gd-external ; then
- phpconfutils_extension_with "freetype-dir" "truetype" 0 "/usr"
- phpconfutils_extension_with "t1lib" "truetype" 0 "/usr"
- phpconfutils_extension_enable "gd-jis-conv" "cjk" 0
- phpconfutils_extension_with "gd" "gd-external" 1 "/usr"
- else
- phpconfutils_extension_with "freetype-dir" "truetype" 0 "/usr"
- phpconfutils_extension_with "t1lib" "truetype" 0 "/usr"
- phpconfutils_extension_enable "gd-jis-conv" "cjk" 0
- phpconfutils_extension_with "jpeg-dir" "gd" 0 "/usr"
- phpconfutils_extension_with "png-dir" "gd" 0 "/usr"
- phpconfutils_extension_with "xpm-dir" "xpm" 0 "/usr"
- # enable gd last, so configure can pick up the previous settings
- phpconfutils_extension_with "gd" "gd" 0
- fi
-
- # IMAP support
- if use imap ; then
- phpconfutils_extension_with "imap" "imap" 1
- phpconfutils_extension_with "imap-ssl" "ssl" 0
- fi
-
- phpconfutils_extension_with "interbase" "interbase" 0 "/opt"
- phpconfutils_extension_with "interbase" "firebird" 0 "/usr"
-
- # LDAP support
- if use ldap ; then
- if use oci8 ; then
- phpconfutils_extension_with "ldap" "ldap" 1 "${ORACLE_HOME}"
- else
- phpconfutils_extension_with "ldap" "ldap" 1
- phpconfutils_extension_with "ldap-sasl" "ldap-sasl" 0
- fi
- fi
-
- # MySQL support
- if use mysql ; then
- phpconfutils_extension_with "mysql" "mysql" 1 "/usr"
- phpconfutils_extension_with "mysql-sock" "mysql" 0 "/var/run/mysqld/mysqld.sock"
- fi
-
- # MySQLi support
- phpconfutils_extension_with "mysqli" "mysqli" 1 "/usr/bin/mysql_config"
-
- # ODBC support
- if use odbc ; then
- phpconfutils_extension_with "unixODBC" "odbc" 1 "/usr"
- phpconfutils_extension_with "adabas" "adabas" 1
- phpconfutils_extension_with "birdstep" "birdstep" 1
- phpconfutils_extension_with "dbmaker" "dbmaker" 1
- phpconfutils_extension_with "empress" "empress" 1
- if use empress ; then
- phpconfutils_extension_with "empress-bcs" "empress-bcs" 0
- fi
- phpconfutils_extension_with "esoob" "esoob" 1
- # Needed to run conftest for IBM DB2
- [[ -n ${DB2_HOME} ]] && export LD_LIBRARY_PATH="${DB2_HOME}/`get_libdir`"
- phpconfutils_extension_with "ibm-db2" "db2" 1 "${DB2_HOME}"
- phpconfutils_extension_with "sapdb" "sapdb" 1
- phpconfutils_extension_with "solid" "solid" 1
- fi
-
- if use iodbc ; then
- phpconfutils_extension_with "iodbc" "iodbc" 1 "/usr"
- fi
-
- # Oracle support
- phpconfutils_extension_with "oci8" "oci8" 1
- if use oci8-instant-client ; then
- OCI8IC_PKG="$(best_version dev-db/oracle-instantclient-basic | \
- sed -e 's|dev-db/oracle-instantclient-basic-||g' | \
- sed -e 's|-r.*||g')"
-
- phpconfutils_extension_with "oci8" "oci8-instant-client" 1 \
- "instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib"
- fi
-
- # PDO support
- if use pdo ; then
- phpconfutils_extension_with "pdo-dblib" "mssql" 1
- phpconfutils_extension_with "pdo-mysql" "mysql" 1 "/usr"
- phpconfutils_extension_with "pdo-pgsql" "postgres" 1
- phpconfutils_extension_with "pdo-sqlite" "sqlite" 1 "/usr"
- phpconfutils_extension_with "pdo-odbc" "odbc" 1 "unixODBC,/usr"
- if use oci8 ; then
- phpconfutils_extension_with "pdo-oci" "oci8" 1
- fi
- if use oci8-instant-client ; then
- phpconfutils_extension_with "pdo-oci" "oci8-instant-client" 1 \
- "instantclient,/usr,${OCI8IC_PKG}"
- fi
- fi
-
- # readline/libedit support
- phpconfutils_extension_with "readline" "readline" 0
- phpconfutils_extension_with "libedit" "libedit" 0
-
- # Session support
- if use session ; then
- phpconfutils_extension_with "mm" "sharedmem" 0
- else
- phpconfutils_extension_disable "session" "session" 0
- fi
-
- # SQLite support
- if use sqlite ; then
- phpconfutils_extension_with "sqlite" "sqlite" 0 "/usr"
- phpconfutils_extension_enable "sqlite-utf8" "unicode" 0
- else
- phpconfutils_extension_without "sqlite" "sqlite" 0
- fi
-
- if use pic ; then
- my_conf="${my_conf} --with-pic"
- fi
-
-
- # we use the system copy of pcre
- # --with-pcre-regex affects ext/pcre
- # --with-pcre-dir affects ext/filter and ext/zip
- if use pcre ; then
- my_conf="${my_conf} --with-pcre-regex=/usr --with-pcre-dir=/usr"
- fi
-
- # Catch CFLAGS problems
- php_check_cflags
-
- # Support user-passed configuration parameters
- my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
- # Support the Apache2 extras, they must be set globally for all
- # SAPIs to work correctly, especially for external PHP extensions
- if use apache2 ; then
- # Concurrent PHP Apache2 modules support
- if use concurrentmodphp ; then
- append-ldflags "-Wl,--version-script=${FILESDIR}/php${PHP_MV}-ldvs"
- fi
- fi
-
- mkdir -p "${WORKDIR}/sapis-build"
- for one_sapi in $SAPIS ; do
- use "${one_sapi}" || continue
- php_set_ini_dir "${one_sapi}"
-
- cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
- cd "${WORKDIR}/sapis-build/${one_sapi}"
-
- sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
- --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
- for sapi in $SAPIS ; do
- case "$sapi" in
- cli|embed)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf="${sapi_conf} --enable-${sapi}"
- else
- sapi_conf="${sapi_conf} --disable-${sapi}"
- fi
- ;;
-
- cgi)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=" --enable-cgi --enable-fastcgi"
- use discard-path && sapi_conf+=" --enable-discard-path"
- use force-cgi-redirect && sapi_conf+=" --enable-force-cgi-redirect"
- else
- sapi_conf+=" --disable-${sapi}"
- 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}
- done
-}
+++ /dev/null
-# 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_prepare-v1.eblit,v 1.3 2010/06/01 16:17:05 mabi Exp $
-
-eblit-php-src_prepare() {
- # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
- # ([empty session.save_path]/session_mm_[sapi][gid].sem)
- # there is no easy way to circumvent that, all php calls during
- # install use -n, so no php.ini file will be used.
- # As such, this is the easiest way to get around
- addpredict /session_mm_cli250.sem
- addpredict /session_mm_cli0.sem
-
- # Concurrent PHP Apache2 modules support
- use apache2 && use concurrentmodphp && \
- epatch "${WORKDIR}/${PV}/opt/concurrent_apache_modules.patch"
-
- # kolab support (support for imap annotations)
- use kolab && epatch "${WORKDIR}/${PV}/opt/imap-kolab-annotations.patch"
-
- # Change PHP branding
- sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1${PHP_EXTRA_BRANDING}-pl${PR/r/}-gentoo\2|g" \
- -i configure.in || die "Unable to change PHP branding"
-
- # Apply generic PHP patches
- EPATCH_SOURCE="${WORKDIR}/${PV}/generic" EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch
-
- # Patch PHP to show Gentoo as the server platform
- sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
- -i configure.in || die "Failed to fix server platform name"
-
- # Prevent PHP from activating the Apache config,
- # as we will do that ourselves
- sed -i \
- -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
- -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
- configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
- # Patch PHP to support heimdal instead of mit-krb5
- if has_version "app-crypt/heimdal" ; then
- sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
- || die "Failed to fix heimdal libname"
- sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
- || die "Failed to fix heimdal crypt library reference"
- fi
-
- # Suhosin support
- if use suhosin ; then
- epatch "${WORKDIR}/${SUHOSIN_PATCH}"
- fi
-
- # rebuild the whole autotools stuff as we are heavily patching it
- # (suhosin, fastbuild, ...)
-
- # eaclocal doesn't accept --force, so we try to force re-generation
- # this way
- rm aclocal.m4
-
- # work around divert() issues with newer autoconf, bug #281697
- if has_version '>=sys-devel/autoconf-2.64' ; then
- sed -i -r \
- -e 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
- $(grep -l divert $(find . -name '*.m4') configure.in) || die
- fi
- eautoreconf --force -W no-cross
-}
-
-
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.14.ebuild,v 1.16 2011/04/19 16:44:56 olemarkus Exp $
-
-EAPI=2
-
-PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob
-interbase msql oci8 sapdb solid"
-
-# inherit autotools, because we call eautoreconf in the eblits
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
-
-PHP_PATCHSET="1"
-SUHOSIN_VERSION="$PV-0.9.7"
-EXPECTED_TEST_FAILURES=""
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-function php_get_uri ()
-{
- case "${1}" in
- "php-pre")
- echo "http://downloads.php.net/johannes/${2}"
- ;;
- "php")
- echo "http://www.php.net/distributions/${2}"
- ;;
- "suhosin")
- echo "http://download.suhosin.org/${2}"
- ;;
- "gentoo")
- echo "mirror://gentoo/${2}"
- ;;
- *)
- die "unhandled case in php_get_uri"
- ;;
- esac
-}
-
-PHP_MV="$(get_major_version)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_RELEASE="php"
-PHP_P="${PN}-${PHP_PV}"
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_PATCHSET="${PHP_PATCHSET:-${PR/r/}}"
-PHP_PATCHSET_URI="
- $(php_get_uri gentoo "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")"
-
-if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
- # in some cases we use our own suhosin patch (very recent version,
- # patch conflicts, etc.)
- SUHOSIN_TYPE="gentoo"
-else
- SUHOSIN_TYPE="suhosin"
-fi
-
-SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"
-SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
-
-SRC_URI="
- ${PHP_SRC_URI}
- ${PHP_PATCHSET_URI}
- suhosin? ( ${SUHOSIN_URI} )"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, Apache2 and embed SAPIs."
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-# We can build the following SAPIs in the given order
-SAPIS="cli cgi embed apache2"
-
-# Gentoo-specific, common features
-IUSE="kolab"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
- ${SAPIS/cli/+cli}
- discard-path force-cgi-redirect
- concurrentmodphp threads"
-
-IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk
- crypt +ctype curl curlwrappers db2 dbase dbmaker debug doc empress
- empress-bcs esoob exif fdftk frontbase +filter firebird
- flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile
- interbase iodbc ipv6 +json kerberos ldap ldap-sasl libedit
- mhash msql mssql mysql mysqli ncurses nls oci8
- oci8-instant-client odbc pcntl +pcre pdo pic +posix postgres qdbm
- readline recode +reflection sapdb +session sharedext sharedmem
- +simplexml snmp soap sockets solid spell +spl sqlite ssl suhosin
- sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
- +xml +xmlreader +xmlwriter xmlrpc xpm xsl zip zlib"
-
-DEPEND="app-admin/php-toolkit
- pcre? ( >=dev-libs/libpcre-7.9[unicode] )
- adabas? ( >=dev-db/unixODBC-1.8.13 )
- apache2? ( www-servers/apache[threads=] )
- berkdb? ( =sys-libs/db-4* )
- birdstep? ( >=dev-db/unixODBC-1.8.13 )
- bzip2? ( app-arch/bzip2 )
- cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
- cjk? ( !gd? ( !gd-external? (
- virtual/jpeg
- media-libs/libpng
- sys-libs/zlib
- ) ) )
- crypt? ( >=dev-libs/libmcrypt-2.4 )
- curl? ( >=net-misc/curl-7.10.5 )
- db2? ( >=dev-db/unixODBC-1.8.13 )
- dbmaker? ( >=dev-db/unixODBC-1.8.13 )
- empress? ( >=dev-db/unixODBC-1.8.13 )
- empress-bcs? ( >=dev-db/unixODBC-1.8.13 )
- esoob? ( >=dev-db/unixODBC-1.8.13 )
- exif? ( !gd? ( !gd-external? (
- virtual/jpeg
- media-libs/libpng
- sys-libs/zlib
- ) ) )
- fdftk? ( app-text/fdftk )
- firebird? ( dev-db/firebird )
- gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
- gd-external? ( media-libs/gd )
- gdbm? ( >=sys-libs/gdbm-1.8.0 )
- gmp? ( >=dev-libs/gmp-4.1.2 )
- iconv? ( virtual/libiconv )
- imap? ( virtual/imap-c-client )
- iodbc? ( dev-db/libiodbc )
- kerberos? ( virtual/krb5 )
- kolab? ( >=net-libs/c-client-2004g-r1 )
- ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) )
- ldap-sasl? ( !oci8? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) )
- libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
- mhash? ( app-crypt/mhash )
- mssql? ( dev-db/freetds[mssql] )
- mysql? ( virtual/mysql )
- mysqli? ( >=virtual/mysql-4.1 )
- ncurses? ( sys-libs/ncurses )
- nls? ( sys-devel/gettext )
- oci8-instant-client? ( dev-db/oracle-instantclient-basic )
- odbc? ( >=dev-db/unixODBC-1.8.13 )
- postgres? ( dev-db/postgresql-base )
- qdbm? ( dev-db/qdbm )
- readline? ( sys-libs/readline )
- recode? ( app-text/recode )
- sapdb? ( >=dev-db/unixODBC-1.8.13 )
- sharedmem? ( dev-libs/mm )
- simplexml? ( >=dev-libs/libxml2-2.6.8 )
- snmp? ( >=net-analyzer/net-snmp-5.2 )
- soap? ( >=dev-libs/libxml2-2.6.8 )
- solid? ( >=dev-db/unixODBC-1.8.13 )
- spell? ( >=app-text/aspell-0.50 )
- sqlite? ( =dev-db/sqlite-2* pdo? ( =dev-db/sqlite-3* ) )
- ssl? ( >=dev-libs/openssl-0.9.7 )
- sybase-ct? ( dev-db/freetds )
- tidy? ( app-text/htmltidy )
- truetype? (
- =media-libs/freetype-2*
- >=media-libs/t1lib-5.0.0
- !gd? ( !gd-external? (
- virtual/jpeg media-libs/libpng sys-libs/zlib ) )
- )
- wddx? ( >=dev-libs/libxml2-2.6.8 )
- xml? ( >=dev-libs/libxml2-2.6.8 )
- xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
- xmlreader? ( >=dev-libs/libxml2-2.6.8 )
- xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
- xpm? (
- x11-libs/libXpm
- virtual/jpeg
- media-libs/libpng sys-libs/zlib
- )
- xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
- zip? ( sys-libs/zlib )
- zlib? ( sys-libs/zlib )
- virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-RDEPEND="${DEPEND}
- truetype? ( || ( $php[gd] $php[gd-external] ) )
- cjk? ( || ( $php[gd] $php[gd-external] ) )
- exif? ( || ( $php[gd] $php[gd-external] ) )
-
- xpm? ( $php[gd] )
- gd? ( $php[zlib,-gd-external] )
- gd-external? ( $php[-gd] )
- simplexml? ( $php[xml] )
- soap? ( $php[xml] )
- wddx? ( $php[xml] )
- xmlrpc? ( || ( $php[xml] $php[iconv] ) )
- xmlreader? ( $php[xml] )
- xsl? ( $php[xml] )
- ldap-sasl? ( $php[ldap,-oci8] )
- suhosin? ( $php[unicode] )
- adabas? ( $php[odbc] )
- birdstep? ( $php[odbc] )
- dbmaker? ( $php[odbc] )
- empress-bcs? ( $php[empress] )
- empress? ( $php[odbc] )
- esoob? ( $php[odbc] )
- db2? ( $php[odbc] )
- sapdb? ( $php[odbc] )
- solid? ( $php[odbc] )
- kolab? ( $php[imap] )
-
- oci8? ( $php[-oci8-instant-client,-ldap-sasl] )
- oci8-instant-client? ( $php[-oci8] )
-
- qdbm? ( $php[-gdbm] )
- readline? ( $php[-libedit] )
- recode? ( $php[-imap,-mysql,-mysqli] )
- firebird? ( $php[-interbase] )
- sharedmem? ( $php[-threads] )
-
- !cli? ( !cgi? ( !apache2? ( !embed? ( $php[cli] ) ) ) )
-
- filter? ( !dev-php${PHP_MV}/pecl-filter )
- json? ( !dev-php${PHP_MV}/pecl-json )
- zip? ( !dev-php${PHP_MV}/pecl-zip )"
-
-DEPEND="${DEPEND}
- sys-devel/flex
- >=sys-devel/m4-1.4.3
- >=sys-devel/libtool-1.5.18"
-
-# They are in PDEPEND because we need PHP installed first!
-PDEPEND="doc? ( app-doc/php-docs )
- suhosin? ( dev-php${PHP_MV}/suhosin )"
-
-SLOT="${PHP_MV}"
-S="${WORKDIR}/${PHP_P}"
-
-PHP_INI_FILE="php.ini"
-PHP_INI_UPSTREAM="php.ini-dist"
-
-want_apache
-
-# eblit-core
-# Usage: <function> [version] [eval]
-# Main eblit engine
-eblit-core() {
- [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files"
- local e v func=$1 ver=$2 eval_=$3
- for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
- e="${FILESDIR}/eblits/${func}${v}.eblit"
- if [[ -e ${e} ]] ; then
- . "${e}"
- [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
- return 0
- fi
- done
- return 1
-}
-
-# eblit-include
-# Usage: [--skip] <function> [version]
-# Includes an "eblit" -- a chunk of common code among ebuilds in a given
-# package so that its functions can be sourced and utilized within the
-# ebuild.
-eblit-include() {
- local skipable=false r=0
- [[ $1 == "--skip" ]] && skipable=true && shift
- [[ $1 == pkg_* ]] && skipable=true
-
- [[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
- eblit-core $1 $2
- r="$?"
- ${skipable} && return 0
- [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe
-# Usage: <function>
-# Runs a function if it is defined in an eblit
-eblit-run-maybe() {
- [[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run
-# Usage: <function> [version]
-# Runs a function defined in an eblit
-eblit-run() {
- eblit-include --skip common "${*:2}"
- eblit-include "$@"
- eblit-run-maybe eblit-$1-pre
- eblit-${PN}-$1
- eblit-run-maybe eblit-$1-post
-}
-
-# eblit-pkg
-# Usage: <phase> [version]
-# Includes the given functions AND evals them so they're included in the binpkgs
-eblit-pkg() {
- [[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
- eblit-core $1 $2 1
-}
-
-eblit-pkg pkg_setup v1
-
-src_prepare() { eblit-run src_prepare v1 ; }
-src_configure() { eblit-run src_configure v52 ; }
-src_compile() { eblit-run src_compile v1 ; }
-src_install() { eblit-run src_install v1 ; }
-src_test() { eblit-run src_test v1 ; }
-
-eblit-pkg pkg_postinst v1
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.3-r1.ebuild,v 1.12 2011/03/17 16:34:47 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.7.ebuild,v 1.1 2011/08/21 13:58:36 olemarkus Exp $
-EAPI=2
+EAPI=4
PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid"
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
-PHP_PATCHSET="2"
-SUHOSIN_VERSION="${PV}-0.9.10"
+SUHOSIN_VERSION=""
FPM_VERSION="builtin"
EXPECTED_TEST_FAILURES=""
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
function php_get_uri ()
{
case "${1}" in
"php-pre")
- echo "http://downloads.php.net/johannes/${2}"
+ echo "http://downloads.php.net/ilia/${2}"
;;
"php")
echo "http://www.php.net/distributions/${2}"
"suhosin")
echo "http://download.suhosin.org/${2}"
;;
- "ntnu")
- echo "http://folk.ntnu.no/olemarku/gentoo/${2}"
+ "olemarkus")
+ echo "http://olemarkus.org/~olemarkus/gentoo/${2}"
;;
"gentoo")
echo "mirror://gentoo/${2}"
# alias, so we can handle different types of releases (finals, rcs, alphas,
# betas, ...) w/o changing the whole ebuild
PHP_PV="${PV/_rc/RC}"
-PHP_RELEASE="php"
+PHP_RELEASE="php-pre"
PHP_P="${PN}-${PHP_PV}"
-PHP_PATCHSET_LOC="gentoo"
+PHP_PATCHSET_LOC="olemarkus"
PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-PHP_PATCHSET="${PHP_PATCHSET:-${PR/r/}}"
+PHP_PATCHSET="0"
PHP_PATCHSET_URI="
$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")"
+PHP_FPM_INIT_VER="4"
+PHP_FPM_CONF_VER="1"
+
if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
# in some cases we use our own suhosin patch (very recent version,
# patch conflicts, etc.)
HOMEPAGE="http://php.net/"
LICENSE="PHP-3"
+SLOT="$(get_version_component_range 1-2)"
+S="${WORKDIR}/${PHP_P}"
+
# We can build the following SAPIs in the given order
-SAPIS="cli cgi fpm embed apache2"
+SAPIS="embed cli cgi fpm apache2"
# Gentoo-specific, common features
IUSE="kolab"
# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
IUSE="${IUSE}
${SAPIS/cli/+cli}
- concurrentmodphp threads"
+ threads"
IUSE="${IUSE} adabas bcmath berkdb birdstep bzip2 calendar cdb cjk
crypt +ctype curl curlwrappers db2 dbmaker debug doc empress
empress-bcs enchant esoob exif frontbase +fileinfo +filter firebird
flatfile ftp gd gd-external gdbm gmp +hash +iconv imap inifile
- interbase intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit
+ interbase intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
mssql mysql mysqlnd mysqli nls oci8
oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm
readline recode sapdb +session sharedext sharedmem
- +simplexml snmp soap sockets solid spell sqlite sqlite3 ssl suhosin
+ +simplexml snmp soap sockets solid spell sqlite sqlite3 ssl
sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
- +xml +xmlreader +xmlwriter xmlrpc xpm xsl zip zlib"
+ xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
+
+# Enable suhosin if available
+[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
-DEPEND="app-admin/php-toolkit
- >=dev-libs/libpcre-7.9[unicode]
+DEPEND="!dev-lang/php:5
+ >=app-admin/eselect-php-0.6.2
+ >=dev-libs/libpcre-8.12[unicode]
adabas? ( >=dev-db/unixODBC-1.8.13 )
apache2? ( www-servers/apache[threads=] )
berkdb? ( =sys-libs/db-4* )
sys-libs/zlib
) ) )
firebird? ( dev-db/firebird )
- fpm? ( >=dev-libs/libevent-1.4.12 )
gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
gd-external? ( media-libs/gd )
gdbm? ( >=sys-libs/gdbm-1.8.0 )
soap? ( >=dev-libs/libxml2-2.6.8 )
solid? ( >=dev-db/unixODBC-1.8.13 )
spell? ( >=app-text/aspell-0.50 )
- sqlite? ( =dev-db/sqlite-2* pdo? ( =dev-db/sqlite-3* ) )
- sqlite3? ( =dev-db/sqlite-3* )
+ sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) )
+ sqlite3? ( >=dev-db/sqlite-3.7.7.1 )
ssl? ( >=dev-libs/openssl-0.9.7 )
sybase-ct? ( dev-db/freetds )
tidy? ( app-text/htmltidy )
"
php="=${CATEGORY}/${PF}"
-RDEPEND="${DEPEND}
- truetype? ( || ( $php[gd] $php[gd-external] ) )
- cjk? ( || ( $php[gd] $php[gd-external] ) )
- exif? ( || ( $php[gd] $php[gd-external] ) )
-
- xpm? ( $php[gd] )
- gd? ( $php[zlib,-gd-external] )
- gd-external? ( $php[-gd] )
- simplexml? ( $php[xml] )
- soap? ( $php[xml] )
- wddx? ( $php[xml] )
- xmlrpc? ( || ( $php[xml] $php[iconv] ) )
- xmlreader? ( $php[xml] )
- xsl? ( $php[xml] )
- ldap-sasl? ( $php[ldap,-oci8] )
- suhosin? ( $php[unicode] )
- adabas? ( $php[odbc] )
- birdstep? ( $php[odbc] )
- dbmaker? ( $php[odbc] )
- empress-bcs? ( $php[empress] )
- empress? ( $php[odbc] )
- esoob? ( $php[odbc] )
- db2? ( $php[odbc] )
- sapdb? ( $php[odbc] )
- solid? ( $php[odbc] )
- kolab? ( $php[imap] )
- phar? ( $php[hash] )
+
+REQUIRED_USE="
+ truetype? ( || ( gd gd-external ) )
+ cjk? ( || ( gd gd-external ) )
+ exif? ( || ( gd gd-external ) )
+
+ xpm? ( gd )
+ gd? ( zlib !gd-external )
+ gd-external? ( !gd )
+ simplexml? ( xml )
+ soap? ( xml )
+ wddx? ( xml )
+ xmlrpc? ( || ( xml iconv ) )
+ xmlreader? ( xml )
+ xsl? ( xml )
+ ldap-sasl? ( ldap !oci8 )
+ adabas? ( odbc )
+ birdstep? ( odbc )
+ dbmaker? ( odbc )
+ empress-bcs? ( empress )
+ empress? ( odbc )
+ esoob? ( odbc )
+ db2? ( odbc )
+ sapdb? ( odbc )
+ solid? ( odbc )
+ kolab? ( imap )
+ mhash? ( hash )
+ phar? ( hash )
mysqlnd? ( || (
- $php[mysql]
- $php[mysqli]
- $php[pdo]
+ mysql
+ mysqli
+ pdo
) )
- oci8? ( $php[-oci8-instant-client,-ldap-sasl] )
- oci8-instant-client? ( $php[-oci8] )
+ oci8? ( !oci8-instant-client !ldap-sasl )
+ oci8-instant-client? ( !oci8 )
+
+ qdbm? ( !gdbm )
+ readline? ( !libedit )
+ recode? ( !imap !mysql !mysqli )
+ firebird? ( !interbase )
+ sharedmem? ( !threads )
- qdbm? ( $php[-gdbm] )
- readline? ( $php[-libedit] )
- recode? ( $php[-imap,-mysql,-mysqli] )
- firebird? ( $php[-interbase] )
- sharedmem? ( $php[-threads] )
+ !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
- !cli? ( !cgi? ( !apache2? ( !embed? ( $php[cli] ) ) ) )
+DEPEND="${DEPEND}
+ enchant? ( !dev-php5/pecl-enchant )
+ fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 )
+ filter? ( !dev-php5/pecl-filter )
+ json? ( !dev-php5/pecl-json )
+ phar? ( !dev-php5/pecl-phar )
+ zip? ( !dev-php5/pecl-zip )"
- enchant? ( !dev-php${PHP_MV}/pecl-enchant )
- fileinfo? ( !dev-php${PHP_MV}/pecl-fileinfo )
- filter? ( !dev-php${PHP_MV}/pecl-filter )
- json? ( !dev-php${PHP_MV}/pecl-json )
- phar? ( !dev-php${PHP_MV}/pecl-phar )
- zip? ( !dev-php${PHP_MV}/pecl-zip )"
+[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
+=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
DEPEND="${DEPEND}
+ sys-devel/flex
>=sys-devel/m4-1.4.3
>=sys-devel/libtool-1.5.18"
# They are in PDEPEND because we need PHP installed first!
-PDEPEND="doc? ( app-doc/php-docs )
- suhosin? ( dev-php${PHP_MV}/suhosin )"
+PDEPEND="doc? ( app-doc/php-docs )"
-SLOT="${PHP_MV}"
-S="${WORKDIR}/${PHP_P}"
+# No longer depend on the extension. The suhosin USE flag only installs the
+# patch
+#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+ production|development)
+ ;;
+ *)
+ PHP_INI_VERSION="development"
+ ;;
+esac
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
PHP_INI_FILE="php.ini"
-PHP_INI_UPSTREAM="php.ini-production"
want_apache
eblit-core $1 $2 1
}
-eblit-pkg pkg_setup v1
+eblit-pkg pkg_setup v2
-src_prepare() { eblit-run src_prepare v1 ; }
-src_configure() { eblit-run src_configure v1 ; }
+src_prepare() { eblit-run src_prepare v3 ; }
+src_configure() { eblit-run src_configure v2 ; }
src_compile() { eblit-run src_compile v1 ; }
-src_install() { eblit-run src_install v1 ; }
+src_install() { eblit-run src_install v2 ; }
src_test() { eblit-run src_test v1 ; }
-
-eblit-pkg pkg_postinst v1
+pkg_postinst() { eblit-run pkg_postinst v2 ; }
projects / gentoo.git / commitdiff