diff options
| author |   Benda Xu <heroxbd@gentoo.org> | 2012-05-18 17:36:48 +0900 |
|---|---|---|
| committer | Benda Xu <heroxbd@gentoo.org> | 2012-05-18 17:36:48 +0900 |
| commit | fb26a5c2df5e1fde31491ebeff69112712008353 (patch) | |
| tree | 2f8414516404877c9df8e29df0c2b2536ab2bd5c /dev-lang | |
| download | android-fb26a5c2df5e1fde31491ebeff69112712008353.tar.gz android-fb26a5c2df5e1fde31491ebeff69112712008353.tar.bz2 android-fb26a5c2df5e1fde31491ebeff69112712008353.zip | |
initial commit
Diffstat (limited to 'dev-lang')
49 files changed, 11385 insertions, 0 deletions
diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog new file mode 100644 index 0000000..3d665ed --- /dev/null +++ b/dev-lang/R/ChangeLog @@ -0,0 +1,745 @@ +# ChangeLog for dev-lang/R +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.182 2011/01/04 20:51:10 bicatali Exp $ + + 04 Jan 2011; Sébastien Fabbro <bicatali@gentoo.org> R-2.12.1.ebuild: + Profiling is now turn on with a use flag + +*R-2.12.1 (22 Dec 2010) + + 22 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org> -R-2.12.0.ebuild, + +R-2.12.1.ebuild, +files/R-2.12.1-ldflags.patch: + Version bump. This fix some test failures as well + + 08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> R-2.10.1.ebuild, + -R-2.11.1.ebuild, R-2.12.0.ebuild: + media-libs/jpeg -> virtual/jpeg. Drop old. + +*R-2.12.0 (25 Oct 2010) + + 25 Oct 2010; Sébastien Fabbro <bicatali@gentoo.org> +R-2.12.0.ebuild: + Version bump + + 16 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org> -R-2.11.0.ebuild, + R-2.11.1.ebuild, +files/R-2.11.1-parallel.patch: + Fix occasional failures with parallel install, bug #322965 + +*R-2.11.1 (01 Jun 2010) + + 01 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org> +R-2.11.1.ebuild: + Version bump + + 25 May 2010; Sébastien Fabbro <bicatali@gentoo.org> + -files/R-2.7.1-test-fix.patch, -R-2.9.2.ebuild, -files/R-javareconf.patch: + Removed old, does not access docs, fixing bug #305641 + + 23 May 2010; Pacho Ramos <pacho@gentoo.org> R-2.10.1.ebuild: + stable amd64, bug 306747 + + 13 May 2010; Joseph Jezak <josejx@gentoo.org> R-2.10.1.ebuild: + Marked ppc stable for bug #306747. + +*R-2.11.0 (28 Apr 2010) + + 28 Apr 2010; Sébastien Fabbro <bicatali@gentoo.org> -R-2.7.2.ebuild, + -R-2.8.1.ebuild, -R-2.10.0.ebuild, +R-2.11.0.ebuild: + Version bump + + 16 Apr 2010; Raúl Porcel <armin76@gentoo.org> R-2.10.1.ebuild: + alpha/ia64/sparc stable wrt #306747 + + 02 Apr 2010; Jeroen Roovers <jer@gentoo.org> R-2.10.1.ebuild: + Stable for HPPA (bug #306747). + + 23 Mar 2010; Brent Baude <ranger@gentoo.org> R-2.10.1.ebuild: + stable ppc64, bug 306747 + + 21 Mar 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> R-2.10.1.ebuild: + x86 stable wrt bug #306747 + + 18 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org> R-2.10.1.ebuild: + Restricting test when minimal flag is on (upstream recommendation), some + ebuild cleaning + + 26 Dec 2009; Peter Volkov <pva@gentoo.org> R-2.7.2.ebuild, R-2.8.1.ebuild, + R-2.9.2.ebuild, R-2.10.0.ebuild, R-2.10.1.ebuild: + virtual/ghostscript->app-text/ghostscript-gpl: ghostscript-gpl is the only + implementation left in the tree. + +*R-2.10.1 (14 Dec 2009) + + 14 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org> -R-2.9.1.ebuild, + +R-2.10.1.ebuild: + Version bump + + 18 Nov 2009; Brent Baude <ranger@gentoo.org> R-2.9.2.ebuild: + Marking R-2.9.2 ppc64 for bug 289381 + +*R-2.10.0 (03 Nov 2009) + + 03 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org> +R-2.10.0.ebuild: + Version bump + + 03 Nov 2009; Raúl Porcel <armin76@gentoo.org> R-2.9.2.ebuild: + ia64 stable wrt #289381 + + 29 Oct 2009; Markus Meier <maekke@gentoo.org> R-2.9.2.ebuild: + amd64/x86 stable, bug #289381 + + 27 Oct 2009; Tobias Klausmann <klausman@gentoo.org> R-2.9.2.ebuild: + Stable on alpha, bug #289381 + + 26 Oct 2009; Jeroen Roovers <jer@gentoo.org> R-2.9.2.ebuild: + Stable for SPARC (bug #289381). + + 25 Oct 2009; Jeroen Roovers <jer@gentoo.org> R-2.9.2.ebuild: + Stable for HPPA (bug #289381). + + 24 Oct 2009; nixnut <nixnut@gentoo.org> R-2.9.2.ebuild: + ppc stable #289381 + +*R-2.9.2 (08 Sep 2009) + + 08 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org> +R-2.9.2.ebuild: + Version bump + + 07 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org> R-2.7.2.ebuild, + R-2.8.1.ebuild, -R-2.9.0.ebuild, -files/R-2.9.0-without-x.patch, + R-2.9.1.ebuild: + Fixed perl 5 path, thanks to Guenther Brunthaler, closing bug #278258 + + 16 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org> R-2.9.1.ebuild: + Added symlinking for docs, thanks to Martin von Gagern, closing bug + #273957 + +*R-2.9.1 (07 Jul 2009) + + 07 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org> R-2.9.0.ebuild, + +files/R-2.9.0-without-x.patch, +R-2.9.1.ebuild: + Bump and fixed bug #268362 (thanks Andrew Savchenko) and bug #269511 + + 30 May 2009; Ulrich Mueller <ulm@gentoo.org> R-2.7.2.ebuild, + R-2.8.1.ebuild, R-2.9.0.ebuild: + Remove app-text/tetex from dependencies, bug 227443. + + 23 Apr 2009; Raúl Porcel <armin76@gentoo.org> R-2.8.1.ebuild: + ia64 stable wrt #265338 + +*R-2.9.0 (21 Apr 2009) + + 21 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org> -R-2.7.1.ebuild, + +R-2.9.0.ebuild: + Bump + + 18 Apr 2009; Markus Meier <maekke@gentoo.org> R-2.8.1: + amd64/x86 stable, bug #265338 + + 15 Apr 2009; Brent Baude <ranger@gentoo.org> R-2.7.2.ebuild, + R-2.8.1.ebuild: + Marking R-2.7.2 | 2.8.1 ppc64 stable for bugs 244621 and 265338 respectively + + 12 Apr 2009; Tobias Klausmann <klausman@gentoo.org> R-2.8.1.ebuild: + Stable on alpha, bug #265338 + + 11 Apr 2009; nixnut <nixnut@gentoo.org> R-2.8.1.ebuild: + ppc stable #265338 + + 10 Apr 2009; Jeroen Roovers <jer@gentoo.org> R-2.8.1.ebuild: + Stable for HPPA (bug #265338). + + 07 Apr 2009; Ferris McCormick <fmccor@gentoo.org> R-2.8.1.ebuild: + Sparc stable, Bug #265338. + + 29 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> + -files/R-2.8.0-without-X.patch, R-2.7.2.ebuild, -R-2.8.0.ebuild, + R-2.8.1.ebuild: + Move 2.7.2 to EAPI=2 and close bug #252661 + +*R-2.8.1 (02 Jan 2009) + + 02 Jan 2009; Markus Dittrich <markusle@gentoo.org> +R-2.8.1.ebuild: + Version bump (fixes bug #253117). + + 09 Nov 2008; nixnut <nixnut@gentoo.org> R-2.7.2.ebuild: + Stable on ppc wrt bug 244621 + + 31 Oct 2008; Markus Dittrich <markusle@gentoo.org> + +files/R-2.8.0-without-X.patch, R-2.8.0.ebuild: + Fixed bug in source code preventing building with USE="-X" (see bug + #245027). Thanks much to Andrew Savchenko for his patch. + + 30 Oct 2008; Raúl Porcel <armin76@gentoo.org> R-2.7.2.ebuild: + alpha/ia64 stable #244621 + + 28 Oct 2008; Jeroen Roovers <jer@gentoo.org> R-2.7.2.ebuild: + Stable for HPPA (bug #244621). + + 27 Oct 2008; Markus Meier <maekke@gentoo.org> R-2.7.2.ebuild: + amd64/x86 stable, bug #244621 + + 27 Oct 2008; Ferris McCormick <fmccor@gentoo.org> R-2.7.2.ebuild: + Sparc stable --- Bug #244621 --- has been around for 2 months. + +*R-2.8.0 (27 Oct 2008) + + 27 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org> R-2.7.1.ebuild, + R-2.7.2.ebuild, +R-2.8.0.ebuild: + Version bump and get rid of virtual/tetex + + 07 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml, + -R-2.2.1-r1.ebuild, -R-2.6.1-r1.ebuild, R-2.7.2.ebuild: + Added soname to libRmath, closing bug #235830. Changed herd from sci to + sci-mathematics. Removed older versions. + + 06 Sep 2008; Tobias Scherbaum <dertobi123@gentoo.org> R-2.7.1.ebuild: + ppc stable, bug #235822 + + 02 Sep 2008; Tobias Heinlein <keytoaster@gentoo.org> R-2.7.1.ebuild: + amd64 stable wrt security bug #235822 + + 02 Sep 2008; Jeroen Roovers <jer@gentoo.org> R-2.7.1.ebuild: + Stable for HPPA (bug #235822). + + 01 Sep 2008; Raúl Porcel <armin76@gentoo.org> R-2.7.1.ebuild: + alpha/ia64/x86 stable wrt #235822 + + 01 Sep 2008; Markus Rothe <corsair@gentoo.org> R-2.7.1.ebuild: + Stable on ppc64; bug #235822 + + 31 Aug 2008; Ferris McCormick <fmccor@gentoo.org> R-2.7.1.ebuild: + Sparc stable, security Bug #235822. + + 31 Aug 2008; Markus Dittrich <markusle@gentoo.org> + files/R-javareconf.patch: + Re-added R-javareconf.patch description. + + 31 Aug 2008; Markus Dittrich <markusle@gentoo.org> + files/R-javareconf.patch: + Added further enhancements to R-javareconf.patch (see bug #235822). + +*R-2.7.2 (27 Aug 2008) + + 27 Aug 2008; Markus Dittrich <markusle@gentoo.org> + +files/R-javareconf.patch, +files/R-2.7.1-test-fix.patch, + -2.6.1-r1.ebuild, -R-2.6.2.ebuild, -R-2.7.0.ebuild, + R-2.7.1.ebuild, +R-2.7.2.ebuild: + Added patch from Debian to fix insecure tempfile handling in + javareconf (fixes bug #235822). NOTE: R-2.2.1-r1.ebuild is not + vulnerable since it does not include the javereconf script. + Also removed old ebuilds and removed two tests from the test + suite since they fail with portage. + + 18 Jul 2008; Markus Dittrich <markusle@gentoo.org> R-2.7.1.ebuild: + Added missing cairo use flag (see bug #231970). + +*R-2.7.1 (10 Jul 2008) + + 10 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org> +R-2.7.1.ebuild: + Version bump. Removed std=gnu99, added upstream. + + 10 May 2008; Markus Dittrich <markusle@gentoo.org> R-2.7.0.ebuild: + Fixed improper binary path in Rscript (see bug #221061). + +*R-2.7.0 (23 Apr 2008) + + 23 Apr 2008; Markus Dittrich <markusle@gentoo.org> +R-2.7.0.ebuild: + Version bump. + + 15 Apr 2008; Raúl Porcel <armin76@gentoo.org> R-2.6.1-r1.ebuild: + alpha stable + + 26 Feb 2008; Sébastien Fabbro <bicatali@gentoo.org> +R-2.2.1-r1.ebuild: + Re-add old R-2.2.1-r1.ebuild for old rpy dependency until rpy-1.0.1 is stable + + 26 Feb 2008; Sébastien Fabbro <bicatali@gentoo.org> -R-2.2.1-r1.ebuild, + -R-2.6.1.ebuild, R-2.6.1-r1.ebuild, R-2.6.2.ebuild: + Removed older versions, and duplicate license files (see bug #211534) + + 19 Feb 2008; Brent Baude <ranger@gentoo.org> R-2.6.1-r1.ebuild: + stable ppc64, bug 210229 + + 19 Feb 2008; Markus Dittrich <markusle@gentoo.org> R-2.6.1-r1.ebuild: + Added -mminimal-toc on ppc64 to fix linking errors (see bug #210229). + + 17 Feb 2008; Raúl Porcel <armin76@gentoo.org> R-2.6.1-r1.ebuild: + ia64 stable wrt #210229 + + 16 Feb 2008; Markus Meier <maekke@gentoo.org> R-2.6.1-r1.ebuild: + x86 stable, bug #210229 + + 15 Feb 2008; nixnut <nixnut@gentoo.org> R-2.6.1-r1.ebuild: + Stable on ppc wrt bug 210229 + + 15 Feb 2008; Jeroen Roovers <jer@gentoo.org> R-2.6.1-r1.ebuild: + Stable for HPPA (bug #210229). + + 15 Feb 2008; Santiago M. Mola <coldwind@gentoo.org> R-2.6.1-r1.ebuild: + amd64 stable wrt bug #210229 + + 15 Feb 2008; Ferris McCormick <fmccor@gentoo.org> R-2.6.1-r1.ebuild: + Sparc stable, Bug #210229. Working since 18 January. + +*R-2.6.2 (13 Feb 2008) + + 13 Feb 2008; Markus Dittrich <markusle@gentoo.org> +R-2.6.2.ebuild: + Version bump (fixes bug #209648). + + 11 Feb 2008; Sébastien Fabbro <bicatali@gentoo.org> -R-2.6.0-r1.ebuild, + -R-2.6.0-r2.ebuild, R-2.6.1-r1.ebuild: + Removed old versions. Added R_HOME environment variable + +*R-2.6.1-r1 (17 Jan 2008) + + 17 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> +R-2.6.1-r1.ebuild: + Added bash-completion, also install standalone math library, added zip/unzip + run dependencies to build R packages, and really fixed docs directory, bug + #205103. + + 16 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml, + R-2.6.1.ebuild: + Forced blas dependency (bug #176755), fixed documentation directory (bug + #205103), more concise descriptions + +*R-2.6.1 (26 Nov 2007) + + 26 Nov 2007; Markus Dittrich <markusle@gentoo.org> +R-2.6.1.ebuild: + Version bump. + +*R-2.6.0-r2 (21 Nov 2007) + + 21 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org> -R-2.2.1.ebuild, + -R-2.6.0.ebuild, +R-2.6.0-r2.ebuild: + Major cleaning of dependencies and ebuild in general, add/remove USE flags + making more sense, export pdf and html viewers with xdg-open + + 21 Nov 2007; Joe Peterson <lavajoe@gentoo.org> R-2.6.0-r1.ebuild: + Add elibtoolize + + 21 Nov 2007; Joe Peterson <lavajoe@gentoo.org> R-2.6.0-r1.ebuild: + Added ~x86-fbsd keyword (bug #199368) + + 21 Nov 2007; Raúl Porcel <armin76@gentoo.org> R-2.6.0-r1.ebuild: + Add ~alpha/~ia64 wrt #199368 + + 20 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> R-2.2.1-r1.ebuild: + Stable on amd64 wrt bug #198976. + + 18 Nov 2007; Jeroen Roovers <jer@gentoo.org> R-2.6.0-r1.ebuild: + Marked ~hppa (bug #199368). + + 18 Nov 2007; Tobias Scherbaum <dertobi123@gentoo.org> R-2.2.1-r1.ebuild: + ppc stable, bug #198976 + + 18 Nov 2007; Markus Rothe <corsair@gentoo.org> R-2.2.1-r1.ebuild: + Stable on ppc64; bug #198976 + + 17 Nov 2007; Raúl Porcel <armin76@gentoo.org> R-2.2.1-r1.ebuild: + ia64 stable wrt security #198976 + + 17 Nov 2007; Markus Meier <maekke@gentoo.org> R-2.2.1-r1.ebuild: + x86 stable, security bug #198976 + + 15 Nov 2007; Ferris McCormick <fmccor@gentoo.org> R-2.2.1-r1.ebuild: + Sparc stable, security bug #198976. + + 15 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org> R-2.2.1-r1.ebuild: + Oops, reverting to unstable + +*R-2.6.0-r1 (15 Nov 2007) +*R-2.2.1-r1 (15 Nov 2007) + + 15 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org> -files/R.desktop, + -files/R-logo.png, metadata.xml, +R-2.2.1-r1.ebuild, -R-2.5.1.ebuild, + +R-2.6.0-r1.ebuild: + Security fix with pcre (bug #198385), now use system libs. New ebuild on + soon to be commited. + +*R-2.6.0 (06 Oct 2007) + + 06 Oct 2007; Markus Dittrich <markusle@gentoo.org> -R-2.4.1.ebuild, -R-2.5.0.ebuild, -files/R-2.4.0-as-needed-gentoo.patch, -files/R-2.4.1-as-needed-gentoo.patch, -files/R-2.2.0-ifc-configure.patch, +R-2.6.0.ebuild: + Version bump (fixes bug #194767). Also removed obsolete versions + and patches. + + 11 Sep 2007; Markus Dittrich <markusle@gentoo.org> R-2.5.1.ebuild: + Fixed messed up paths in libR.pc pkgconfig file (see bug #191986). + + 22 Jul 2007; Hans de Graaff <graaff@gentoo.org> R-2.2.1.ebuild, + R-2.4.1.ebuild, R-2.5.0.ebuild, R-2.5.1.ebuild: + Drop virtual/x11 references. + +*R-2.5.1 (30 Jun 2007) + + 30 Jun 2007; Markus Dittrich <markusle@gentoo.org> +R-2.5.1.ebuild: + Version bump. + + 11 May 2007; Markus Dittrich <markusle@gentoo.org> R-2.5.0.ebuild: + Added gd useflag to allow users to install the GDD module (this + fixes bug #177846). Thanks much to Neil <nshephard@gmail.com> + for bringing this to our attention. + + 30 Apr 2007; Markus Dittrich <markusle@gentoo.org> R-2.5.0.ebuild: + Fixed improper path in Rscript (closes bug #176546). + + 27 Apr 2007; Danny van Dyk <kugelfang@gentoo.org> R-2.5.0.ebuild: + Forgot to copy ebuild after final testing. Sandbox violations is fixed now. + +*R-2.5.0 (27 Apr 2007) + + 27 Apr 2007; Danny van Dyk <kugelfang@gentoo.org> +R-2.5.0.ebuild: + New version. As-needed patches have been applied upstream. This version + can't be build in parallel anymore. + + 13 Jan 2007; Markus Dittrich <markusle@gentoo.org> -R-2.1.1.ebuild, + -R-2.2.0-r1.ebuild, R-2.2.1.ebuild, -R-2.3.0.ebuild, -R-2.3.1.ebuild, + -R-2.4.0.ebuild: + Removed obsolete ebuilds and finally got rid of the tcltk flag + in R-2.2.1 (see bug #17808). + +*R-2.4.1 (19 Dec 2006) + + 19 Dec 2006; Markus Dittrich <markusle@gentoo.org> + +files/R-2.4.1-as-needed-gentoo.patch, +R-2.4.1.ebuild: + New version (fixes bug #158346). + + 24 Oct 2006; Markus Dittrich <markusle@gentoo.org> + +files/R-2.4.0-as-needed-gentoo.patch, R-2.4.0.ebuild: + Fixed linking problems with as-needed. See bug #151908. + + 22 Oct 2006; Markus Dittrich <markusle@gentoo.org> R-2.4.0.ebuild: + Append -std=gnu99 to CFLAGS since it is needed to compile + several additional R packages via its custom makefile + (this fixes bug #152379). Thanks to Aarre Laakso <aarre@pair.com> + for pointing this out. + +*R-2.4.0 (05 Oct 2006) + + 05 Oct 2006; Danny van Dyk <kugelfang@gentoo.org> +R-2.4.0.ebuild: + Added 2.4.0 release. + + 07 Aug 2006; Ferris McCormick <fmccor@gentoo.org> R-2.2.1.ebuild: + Stable on sparc --- Bug #135318 --- has been running fine since last January. + (But note that on some systems, FEATURES=test fails: Compare Comments 5, 8, + 9, 10, and 11.) + + 28 Jun 2006; Luca Barbato <lu_zero@gentoo.org> R-2.3.1.ebuild: + Made it use -fPIC instead of -fpic + + 17 Jun 2006; Danny van Dyk <kugelfang@gentoo.org> R-2.2.1.ebuild: + Marked stable on ia64. + + 10 Jun 2006; Michael Hanselmann <hansmi@gentoo.org> R-2.2.1.ebuild: + Stable on ppc. + + 07 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> R-2.2.1.ebuild: + Stable on x86 wrt bug #135318. + + 06 Jun 2006; Markus Rothe <corsair@gentoo.org> R-2.2.1.ebuild: + Stable on ppc64; bug #135318 + + 02 Jun 2006; Danny van Dyk <kugelfang@gentoo.org> R-2.1.1.ebuild, + R-2.2.0-r1.ebuild, R-2.2.1.ebuild, R-2.3.0.ebuild, R-2.3.1.ebuild: + Added inheritance of flag-o-matic for filter-ldflags calls. + +*R-2.3.1 (02 Jun 2006) + + 02 Jun 2006; Danny van Dyk <kugelfang@gentoo.org> R-2.2.1.ebuild, + +R-2.3.1.ebuild: + Added R-2.3.1. Marked R-2.2.1 stable on amd64. + +*R-2.3.0 (10 May 2006) + + 10 May 2006; Danny van Dyk <kugelfang@gentoo.org> R-2.1.1.ebuild, + R-2.2.0-r1.ebuild, R-2.2.1.ebuild, +R-2.3.0.ebuild: + Added version 2.3.0: Fixes bug #127818. Added filter for -Bdirect LDFLAG: + Fixes bug #122465. + + 01 Apr 2006; Aron Griffis <agriffis@gentoo.org> R-2.2.1.ebuild: + Mark 2.2.1 ~ia64 + + 16 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> R-2.2.1.ebuild: + Ported deps for modular X. + + 16 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> R-2.2.1.ebuild: + Add gfortran to the list of allowed Fortran compilers, closes bug 118147. + +*R-2.2.1 (03 Jan 2006) + + 03 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> +R-2.2.1.ebuild: + Version bump, closes bug 115304. + +*R-2.2.0-r1 (12 Dec 2005) + + 12 Dec 2005; Marcus D. Hanwell <cryos@gentoo.org> -R-2.1.0-r1.ebuild, + -R-2.2.0.ebuild, +R-2.2.0-r1.ebuild: + Added some extra seds to get rid of temp paths, closes bug 115140. Pruned + old versions. + + 23 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> files/digest-R-2.2.0, + Manifest: + Fixed bad digest, closes bug 113319. + +*R-2.2.0 (22 Nov 2005) + + 22 Nov 2005; Danny van Dyk <kugelfang@gentoo.org> + +files/R-2.2.0-ifc-configure.patch, R-2.1.0-r1.ebuild, R-2.1.1.ebuild, + +R-2.2.0.ebuild: + Added version 2.2.0 with support for compilation with Intel(R) Fortran + Compiler. Removed obsolete version 2.0.1. Fixed stale file Bug by running + 64bit test in ${T} now. + + 03 Sep 2005; Markus Rothe <corsair@gentoo.org> R-2.1.1.ebuild: + Stable on ppc64 + + 02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> R-2.1.1.ebuild: + Stable on ppc. + + 22 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> R-2.1.1.ebuild: + Stable on sparc + + 22 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> -R-2.0.1.ebuild, + R-2.1.1.ebuild: + Removed old version. Stable on amd64 and x86. + + 13 Aug 2005; Danny van Dyk <kugelfang@gentoo.org> R-2.0.1.ebuild, + R-2.1.0-r1.ebuild, R-2.1.1.ebuild: + Changed SRC_URI to new 'cran' thirdparty mirror. + +*R-2.1.1 (01 Jul 2005) + + 01 Jul 2005; Danny van Dyk <kugelfang@gentoo.org> R-2.0.1.ebuild, + R-2.1.0-r1.ebuild, +R-2.1.1.ebuild: + Moved 64bit check to pkg_setup() to make fortran.eclass work again. Bumped + to version 2.1.1 + + 18 Jun 2005; Markus Rothe <corsair@gentoo.org> R-2.1.0-r1.ebuild: + Stable on ppc64 + + 17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> R-2.1.0-r1.ebuild: + Stable on ppc. + + 13 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> R-2.1.0-r1.ebuild: + Stable on sparc + + 12 Jun 2005; Marcus D. Hanwell <cryos@gentoo.org> -R-1.9.0-r1.ebuild: + Removing old version. Closes bug 91512. + + 11 Jun 2005; Marcus D. Hanwell <cryos@gentoo.org> R-2.1.0-r1.ebuild: + Stable on amd64 and x86. + + 07 Jun 2005; Patrick Kursawe <phosphan@gentoo.org> R-2.0.1.ebuild, + R-2.1.0-r1.ebuild: + Added LDPATH to R libs, bug #90601 + + 01 Jun 2005; Mike Frysinger <vapier@gentoo.org> R-1.9.0-r1.ebuild, + R-2.0.1.ebuild: + Change USE=bzlib to USE=bzip2. + +*R-1.9.0-r1 (25 May 2005) + + 25 May 2005; Marcus D. Hanwell <cryos@gentoo.org> +R-1.9.0-r1.ebuild: + Bring back R-1.9.0-r1 until <=dev-python/rpy-0.3.5-r1 are removed from + portage. + + 25 May 2005; Marcus D. Hanwell <cryos@gentoo.org> -R-1.9.0-r1.ebuild: + Removed old version. + + 25 May 2005; Luca Barbato <lu_zero@gentoo.org> R-2.0.1.ebuild: + Marked ppc + + 24 May 2005; Marcus D. Hanwell <cryos@gentoo.org> R-2.0.1.ebuild: + Updated 64 bit detection code. + + 10 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> R-2.0.1.ebuild: + Stable on sparc + + 08 May 2005; Marcus D. Hanwell <cryos@gentoo.org> -R-1.9.1.ebuild, + -R-2.0.0.ebuild, R-2.0.1.ebuild, -R-2.1.0.ebuild, R-2.1.0-r1.ebuild: + Marked 2.0.1 stable on amd64 and x86, cleaned out old ebuilds. Added new 64 + bit detection code to 2.1.0-r1 as per bug 91512. + +*R-2.1.0-r1 (29 Apr 2005) + + 29 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> +R-2.1.0-r1.ebuild: + Get rid of obsolete USE flags, tidy up deps a little. Thanks to MATSUU + Takuto <matsuu@gentoo.org> in bug 67834 for the patch. + + 21 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> R-2.1.0.ebuild: + Update deps to reflect new USE flags. + +*R-2.1.0 (20 Apr 2005) + + 20 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> +R-2.1.0.ebuild: + Version bump, ebuild cleanups and some additional USE flags. Thanks to + matsuu for some of the suggestions in bug 67834. + +*R-2.0.1 (21 Feb 2005) + + 21 Feb 2005; Danny van Dyk <kugelfang@gentoo.org> R-2.0.0.ebuild, + +R-2.0.1.ebuild: + Fixed a sandbox violation in R-2.0.0 (BUG #79004) and marked stabled on + amd64. Added R-2.0.1 (BUG #72313). + + 17 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> R-1.9.1.ebuild: + ~alpha keyword. + + 02 Feb 2005; Danny van Dyk <kugelfang@gentoo.org> R-2.0.0.ebuild: + GNU Fortran 77 profile name changed to g77 in fortran.eclass + + 17 Nov 2004; Markus Rothe <corsair@gentoo.org> R-2.0.0.ebuild: + stable on ppc64 + + 10 Oct 2004; Danny van Dyk <kugelfang@gentoo.org> -R-1.8.1.ebuild, + R-1.9.0-r1.ebuild, R-2.0.0.ebuild: + R-2.0.0 now in testing on x86,sparc,amd64,ppc and ppc64; using new + fortran.eclass. R-1.9.0-r1 stable on all arches. Removed obsolete R-1.8.1. + +*R-2.0.0 (07 Oct 2004) + + 07 Oct 2004; George Shapovalov <george@gentoo.org> R-2.0.0 : + new version, masked with KEYWORDS="-*" to get a bit more testing + + 30 Sep 2004; Ferris McCormick <fmccor@gentoo.org> R-1.9.0-r1.ebuild: + Stable for sparc. + + 12 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> R-1.9.0-r1.ebuild, + R-1.9.1.ebuild: + Removed f2c support for dev-lang/R on 64-bit arches. This is entirely R's + fault. f2c works perfectly right. Future versions of dev-lang/R will check for + this in ./configure. For R-1.9.{0,1} the ebuild checks for it. Fixes BUG + #61042. + +*R-1.9.1 (22 Aug 2004) + + 09 Sep 2004; Philippe Trottier <tchiwam@gentoo.org> R-1.9.1.ebuild, + marked ~ppc64 + + 22 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> -R-1.9.0.ebuild, + +R-1.9.1.ebuild: + Version bump to 1.9.1 (current stable). Removed obsolete 1.9.0. + + 06 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> R-1.9.0-r1.ebuild: + Marked stable on amd64. + + 11 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> R-1.8.1.ebuild, + R-1.9.0-r1.ebuild, R-1.9.0.ebuild: + Fixed BUG #56616. Tidied up g77/f2c check in >=R-1.9.0. Added f2c USE flag. + + 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> R-1.8.1.ebuild, + R-1.9.0-r1.ebuild, R-1.9.0.ebuild: + virtual/glibc -> virtual/libc + + 01 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> R-1.8.1.ebuild, + R-1.9.0-r1.ebuild, R-1.9.0.ebuild: + Fixed BUG #55386 for amd64. Pending for rest of arches. + +*R-1.9.0-r1 (05 Jun 2004) + + 05 Jun 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.9.0-r1.ebuild: + Added a few USE flags according to suggestions by Leo Chen <lcheu@cs.sfu.ca> + + 28 May 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.9.0.ebuild: + Removing the f77 USE flag check - just giving a hint when no g77 found. + + 17 May 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.9.0.ebuild: + adding f77 to IUSE + + 11 May 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.9.0.ebuild: + pkg_setup checks for g77 presence now. + + 20 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.9.0.ebuild: + Changed dependency - works also with current libglade, see bug #47825 + +*R-1.9.0 (13 Apr 2004) + + 13 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.8.1.ebuild, + R-1.9.0.ebuild: + Version bump, added write permission for /var/cache/fonts + + 01 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.8.0.ebuild, + R-1.8.1.ebuild: + 1.8.1 is stable + + 22 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.8.1.ebuild: + Fixing bug #40100 (problems with newer Xfree) + + 25 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.4.1-r1.ebuild, + R-1.4.1.ebuild, R-1.5.1.ebuild, R-1.6.1.ebuild, R-1.6.2.ebuild, + R-1.7.0.ebuild, R-1.7.1.ebuild, R-1.8.0.ebuild, files/R-1.5.1-tcltk.diff: + Big cleanup, marking 1.8.0 as stable + +*R-1.8.1 (17 Feb 2004) + + 17 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> R-1.8.1.ebuild: + Version bump + + 21 Oct 2003; David Holm <dholm@gentoo.org> R-1.8.0.ebuild: + Added to ~ppc. + +*R-1.8.0 (16 Oct 2003) + + 16 Oct 2003; George Shapovalov <george@gentoo.org> R-1.8.0 : + new version (#30784), fixes gnome? dependencies + thanks to kdh <bolter111@hotmail.com> for an update + +*R-1.7.1 (19 Jun 2003) + + 19 Jun 2003; George Shapovalov <george@gentoo.org> R-1.7.1 : + new version (#23012), now correctly builds tcltk support + fix and update by Tristan Henderson <T.Henderson@cs.ucl.ac.uk> + +*R-1.7.0 (29 May 2003) + + 29 May 2003; Grant Goodyear <g2boojum@gentoo.org> R-1.7.0.ebuild: + Version update. Thanks to Stuart Luppescu for the heads-up. + +*R-1.6.2 (12 Apr 2003) + + 12 Apr 2003; Grant Goodyear <g2boojum@gentoo.org> Manifest, R-1.6.2.ebuild: + Version bump + +*R-1.6.1 (12 Dec 2002) + + 12 Dec 2002; George Shapovalov <george@gentoo.org> R-1.6.1.ebuild : + + version update, patching is unnecessary now. + Update subitted by Sam Wouters <sam.wouters@esat.kuleuven.ac.be>, see #11313 + +* Autoupdate keywords (12-6-02) + 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords + +*R-1.5.1 (11 July 2002) + + 09 Aug 2002; George Shapovalov <george@gentoo.org> R-1.5.1.ebuild : + + fixed the wrappers: + R installs two identical wrappers (R that invoke R.bin) under /usr/bin and + /usr/lib/R/bin/. Only one of these was modified to have correct R_HOME_DIR + Changed ebuild to modify R under /usr/lib/R/bin and symlink it into /usr/bin + + 11 July 2002; George Shapovalov <george@gentoo.org> R-1.5.1.ebuild, files/digest-R-1.5.1 : + + upped version + new version submitted by Tristan Henderson <T.Henderson@cs.ucl.ac.uk> + +*R-1.4.1-r1 (11 Apr 2002) + 11 Apr 2002; Spider <spider@gentoo.org> + Forcing an upgrade due to libpng upgrade. + + +*R-1.4.1 (19 Feb 2002) + + 19 Feb 2002; T.Neidt <tod@gentoo.org> ChangeLog, R-1.4.1.ebuild : + + Initial commit. R is GNU S - A language and environment for statistical + computing and graphics. Gnome and tcltk gui's are available if in USE. + + If gnome, a rudimentary menu entry is made under Applications. + However, it has the annoying tendency to pop up a terminal window to start + the gui. (todo 1) + + Also, the html files are not accessible from the toolbar menu entry unless + you happen to be running netscape. (todo 2) + + This ebuild makes use of a new USE variable, 'atlas', which will compile + R using the auto-tuned blas libraries provided by atlas. NOTE: atlas ebuild + currently only provides static libraries. Shared libraries are in the works. diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest new file mode 100644 index 0000000..3fd32b5 --- /dev/null +++ b/dev-lang/R/Manifest @@ -0,0 +1,10 @@ +AUX R-2.11.1-parallel.patch 488 RMD160 d693776b4650bc151f977f7c75234e582ad379c1 SHA1 02ea92a7ef3c2b87a9b1f3c929cb8eb828cd06db SHA256 d17c52fcda732908954aa4bbf690085402a4027ef905bc456e5101602e2bcf4f +AUX R-2.12.1-ldflags.patch 526 RMD160 d54e94d5c1d621821d5b0ff5d8ea789a153259eb SHA1 5cfbec92afaa164aa28fc28def531b26b2e8e428 SHA256 1af5dcdba86a915b7f6dc67d81afb71959adeca1a305890c3b7e0666b7537546 +AUX R-2.13.1-zlib_header_fix.patch 383 RMD160 a90c76bd42a86d972ba59e38b98e60222aa5e807 SHA1 1a10ce2ff0d357b9b2eb7c6512a0a12a954aec4c SHA256 e9ebeebcffbef51219537dd18a57d2764099a01999336c5a9e76030d17d1c72e +DIST R-2.12.1.tar.gz 20806432 RMD160 a083689dc6785cd8072461f30ce4a7969fc7ec91 SHA1 41f443cd646f7773bd824c41ea53cac3102b428d SHA256 74475d73f145d25c1e121dac9e4f18eaa077510b9e58d514cc6ae523382dee3f +DIST R-2.14.0.tar.gz 22675106 RMD160 f2f2805c8660d58050be1d11abf376843dbb40ea SHA1 0f46bf75a7c150350b1142c29a98e7994d2b4bef SHA256 036204f56f8128e633a5d2fe56ebe0ba5a5e8501abe2056736d12a99bf69b910 +DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85 +EBUILD R-2.12.1.ebuild 4516 RMD160 21e0933cf320e335b2cbe39394001c323aa6b567 SHA1 65324123354ef3cec4e35c9d80af2d7109dcabb7 SHA256 d56f841e1abfafac60964cea009d7ab5579325aa07506a9b4773c49c0f054557 +EBUILD R-2.14.0.ebuild 5162 RMD160 92f77b95434af5cef3f35110c58055c850ae9aec SHA1 8368b856ea30265e932898b2803a64267f2db66d SHA256 bd859ff4de8a8092746e367894ff8c8fc3abeb898831fc5e0ed3557170d0b652 +MISC ChangeLog 26350 RMD160 8bdee2c1cf07536e2607916c99e6e062f98e71df SHA1 22043ad0a0b3b223a4303ecb40467e6deb71025f SHA256 5b1f8cbcc5a6f332f7d486c5a15d910765c5019d5bf31fee9622047926dea55d +MISC metadata.xml 1031 RMD160 375436b81f2969a32b673a47fdcd7a8ddadb6fa3 SHA1 fefc629218f970fc24f6b4e30c482112ea6e6129 SHA256 6f692bb80f78dfd8987ae3f70c12c40924ef5e0596267d928953f37f44223968 diff --git a/dev-lang/R/R-2.12.1.ebuild b/dev-lang/R/R-2.12.1.ebuild new file mode 100644 index 0000000..868f6d9 --- /dev/null +++ b/dev-lang/R/R-2.12.1.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.12.1.ebuild,v 1.2 2011/01/04 20:51:10 bicatali Exp $ + +EAPI=2 +inherit eutils flag-o-matic bash-completion versionator + +DESCRIPTION="Language and environment for statistical computing and graphics" +HOMEPAGE="http://www.r-project.org/" +SRC_URI="mirror://cran/src/base/R-2/${P}.tar.gz + bash-completion? ( mirror://gentoo/R.bash_completion.bz2 )" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~x86-freebsd ~amd64-linux ~x86-linux" + +IUSE="doc java jpeg lapack minimal nls perl png profile readline static-libs threads tk X cairo" + +# common depends +CDEPEND="dev-libs/libpcre + app-arch/bzip2 + virtual/blas + app-text/ghostscript-gpl + cairo? ( x11-libs/cairo[X] + || ( >=x11-libs/pango-1.20[X] <x11-libs/pango-1.20 ) ) + jpeg? ( virtual/jpeg ) + lapack? ( virtual/lapack ) + perl? ( dev-lang/perl ) + png? ( media-libs/libpng ) + readline? ( sys-libs/readline ) + tk? ( dev-lang/tk ) + X? ( x11-libs/libXmu x11-misc/xdg-utils )" + +DEPEND="${CDEPEND} + dev-util/pkgconfig + doc? ( virtual/latex-base + || ( dev-texlive/texlive-fontsrecommended + app-text/ptex ) )" + +RDEPEND="${CDEPEND} + app-arch/unzip + app-arch/zip + java? ( >=virtual/jre-1.5 )" + +RESTRICT="minimal? ( test )" + +R_DIR="${EPREFIX}"/usr/$(get_libdir)/${PN} + +pkg_setup() { + filter-ldflags -Wl,-Bdirect -Bdirect + # avoid using existing R installation + unset R_HOME +} + +src_prepare() { + # fix ocasional failure with parallel install (bug #322965) + epatch "${FILESDIR}"/${PN}-2.11.1-parallel.patch + # respect ldflags on rscript + epatch "${FILESDIR}"/${PN}-2.12.1-ldflags.patch + + # fix packages.html for doc (bug #205103) + # check in later versions if fixed + sed -i \ + -e "s:../../library:../../../../$(get_libdir)/R/library:g" \ + src/library/tools/R/packageshtml.R \ + || die "sed failed" + + # fix Rscript + sed -i \ + -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \ + src/unix/Makefile.in || die "sed unix Makefile failed" + + # fix HTML links to manual (bug #273957) + sed -i -e 's:\.\./manual/:manual/:g' $(grep -Flr ../manual/ doc) \ + || die "sed for HTML links to manual failed" + + use lapack && \ + export LAPACK_LIBS="$(pkg-config --libs lapack)" + + if use X; then + export R_BROWSER="$(type -p xdg-open)" + export R_PDFVIEWER="$(type -p xdg-open)" + fi + use perl && \ + export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" +} + +src_configure() { + use tk && \ + EXTRA_ECONF="${EXTRA_ECONF} --with-tk-config=${EPREFIX}/usr/lib/tkConfig.sh \ + --with-tcl-config=${EPREFIX}/usr/lib/tclConfig.sh" + econf \ + --enable-R-shlib \ + --with-system-zlib \ + --with-system-bzlib \ + --with-system-pcre \ + --with-blas="$(pkg-config --libs blas)" \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + rdocdir="${EPREFIX}"/usr/share/doc/${PF} \ + $(use_enable nls) \ + $(use_enable profile R-profiling) \ + $(use_enable profile memory-profiling) \ + $(use_enable static-libs static) \ + $(use_enable static-libs R-static-lib) \ + $(use_enable threads) \ + $(use_with lapack) \ + $(use_with tk tcltk) \ + $(use_with jpeg jpeglib) \ + $(use_with !minimal recommended-packages) \ + $(use_with png libpng) \ + $(use_with readline) \ + $(use_with cairo) \ + $(use_with X x) +} + +src_compile(){ + export VARTEXFONTS="${T}/fonts" + emake || die "emake failed" + RMATH_V=0.0.0 + emake -C src/nmath/standalone \ + libRmath_la_LDFLAGS=-Wl,-soname,libRmath.so.${RMATH_V} \ + || die "emake math library failed" + if use doc; then + emake info pdf || die "emake docs failed" + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + if use doc; then + emake DESTDIR="${D}" \ + install-info install-pdf || die "emake install docs failed" + dosym /usr/share/doc/${PF}/manual /usr/share/doc/${PF}/html/manual + fi + + # standalone math lib install (-j1 basically harmless) + emake \ + -C src/nmath/standalone \ + DESTDIR="${D}" install \ + || die "emake install math library failed" + + local mv=$(get_major_version ${RMATH_V}) + mv "${ED}"/usr/$(get_libdir)/libRmath.so \ + "${ED}"/usr/$(get_libdir)/libRmath.so.${RMATH_V} + dosym libRmath.so.${RMATH_V} /usr/$(get_libdir)/libRmath.so.${mv} + dosym libRmath.so.${mv} /usr/$(get_libdir)/libRmath.so + + # env file + cat > 99R <<-EOF + LDPATH=${R_DIR}/lib + R_HOME=${R_DIR} + EOF + doenvd 99R || die "doenvd failed" + dobashcompletion "${WORKDIR}"/R.bash_completion +} + +pkg_postinst() { + if use java; then + einfo "Re-initializing java paths for ${P}" + R CMD javareconf + fi +} diff --git a/dev-lang/R/R-2.14.0.ebuild b/dev-lang/R/R-2.14.0.ebuild new file mode 100644 index 0000000..ff285ea --- /dev/null +++ b/dev-lang/R/R-2.14.0.ebuild @@ -0,0 +1,182 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.14.0.ebuild,v 1.1 2011/11/21 16:22:52 jlec Exp $ + +EAPI=4 + +inherit bash-completion-r1 eutils flag-o-matic fortran-2 versionator + +DESCRIPTION="Language and environment for statistical computing and graphics" +HOMEPAGE="http://www.r-project.org/" +SRC_URI=" + mirror://cran/src/base/R-2/${P}.tar.gz + bash-completion? ( mirror://gentoo/R.bash_completion.bz2 )" + +LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64-linux" +IUSE="bash-completion cairo doc java jpeg lapack minimal nls openmp perl png profile readline static-libs tk X" + +# common depends +CDEPEND=" + app-arch/bzip2 + app-text/ghostscript-gpl + dev-libs/libpcre + || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 sys-freebsd/freebsd-lib ) + virtual/blas + cairo? ( x11-libs/cairo[X] ) + jpeg? ( virtual/jpeg ) + lapack? ( virtual/lapack ) + perl? ( dev-lang/perl ) + png? ( media-libs/libpng ) + readline? ( sys-libs/readline ) + tk? ( dev-lang/tk ) + X? ( x11-libs/libXmu x11-misc/xdg-utils )" + +DEPEND="${CDEPEND} + dev-util/pkgconfig + doc? ( + virtual/latex-base + dev-texlive/texlive-fontsrecommended + )" + +RDEPEND="${CDEPEND} + ( || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] ) ) + app-arch/xz-utils + java? ( >=virtual/jre-1.5 )" + +RESTRICT="minimal? ( test )" + +R_DIR="${EPREFIX}/usr/$(get_libdir)/${PN}" + +pkg_setup() { + if use openmp; then + FORTRAN_NEED_OPENMP=1 + tc-has-openmp || die "Please enable openmp support in your compiler" + fi + fortran-2_pkg_setup + filter-ldflags -Wl,-Bdirect -Bdirect + # avoid using existing R installation + unset R_HOME +} + +src_prepare() { + # fix ocasional failure with parallel install (bug #322965) + # upstream in R-2.13? + # https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14505 + epatch "${FILESDIR}"/${PN}-2.11.1-parallel.patch + # respect ldflags on rscript + # upstream does not want it, no reasons given + # https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14506 + epatch "${FILESDIR}"/${PN}-2.12.1-ldflags.patch + # update for zlib header changes (see bug #383431) + epatch "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch + + # glibc 2.14 removed rpc + if has_version '>=net-libs/libtirpc-0.2.2-r1'; then + append-cppflags $($(tc-getPKG_CONFIG) libtirpc --cflags) + export LIBS+=" $($(tc-getPKG_CONFIG) libtirpc --libs)" + # patching configure.ac would cause way too much work + # ugly hack on configure and let upstream do the job + sed -i -e "s/'' nsl;/'' tirpc;/" configure || die + fi + + # fix packages.html for doc (bug #205103) + # check in later versions if fixed + sed -i \ + -e "s:../../library:../../../../$(get_libdir)/R/library:g" \ + src/library/tools/R/Rd.R \ + || die "sed failed" + + # fix Rscript + sed -i \ + -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \ + src/unix/Makefile.in || die "sed unix Makefile failed" + + # fix HTML links to manual (bug #273957) + sed -i -e 's:\.\./manual/:manual/:g' $(grep -Flr ../manual/ doc) \ + || die "sed for HTML links to manual failed" + + use lapack && \ + export LAPACK_LIBS="$(pkg-config --libs lapack)" + + if use X; then + export R_BROWSER="$(type -p xdg-open)" + export R_PDFVIEWER="$(type -p xdg-open)" + fi + use perl && \ + export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" +} + +src_configure() { + econf \ + --enable-byte-compiled-packages \ + --enable-R-shlib \ + --with-system-zlib \ + --with-system-bzlib \ + --with-system-pcre \ + --with-system-xz \ + --with-blas="$(pkg-config --libs blas)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + rdocdir="${EPREFIX}/usr/share/doc/${PF}" \ + $(use_enable openmp) \ + $(use_enable nls) \ + $(use_enable profile R-profiling) \ + $(use_enable profile memory-profiling) \ + $(use_enable static-libs static) \ + $(use_enable static-libs R-static-lib) \ + $(use_with lapack) \ + $(use_with tk tcltk) \ + $(use_with jpeg jpeglib) \ + $(use_with !minimal recommended-packages) \ + $(use_with png libpng) \ + $(use_with readline) \ + $(use_with cairo) \ + $(use_with X x) +} + +src_compile(){ + export VARTEXFONTS="${T}/fonts" + emake + RMATH_V=0.0.0 + emake -C src/nmath/standalone \ + libRmath_la_LDFLAGS="-Wl,-soname,libRmath.so.${RMATH_V}" \ + libRmath_la_LIBADD="\$(LIBM)" \ + shared $(use static-libs && echo static) + use doc && emake info pdf +} + +src_install() { + default + if use doc; then + emake DESTDIR="${D}" install-info install-pdf + dosym ../manual /usr/share/doc/${PF}/html/manual + fi + + # standalone math lib install (-j1 basically harmless) + emake \ + -C src/nmath/standalone \ + DESTDIR="${ED}" install + + local mv=$(get_major_version ${RMATH_V}) + mv "${ED}"/usr/$(get_libdir)/libRmath.so \ + "${ED}"/usr/$(get_libdir)/libRmath.so.${RMATH_V} + dosym libRmath.so.${RMATH_V} /usr/$(get_libdir)/libRmath.so.${mv} + dosym libRmath.so.${mv} /usr/$(get_libdir)/libRmath.so + + # env file + cat > 99R <<-EOF + LDPATH=${R_DIR}/lib + R_HOME=${R_DIR} + EOF + doenvd 99R + use bash-completion && dobashcomp "${WORKDIR}"/R.bash_completion +} + +pkg_postinst() { + if use java; then + einfo "Re-initializing java paths for ${P}" + R CMD javareconf + fi + bash-completion-r1_pkg_postinst +} diff --git a/dev-lang/R/files/R-2.11.1-parallel.patch b/dev-lang/R/files/R-2.11.1-parallel.patch new file mode 100644 index 0000000..92b187e --- /dev/null +++ b/dev-lang/R/files/R-2.11.1-parallel.patch @@ -0,0 +1,11 @@ +--- src/include/Makefile.in.orig 2010-06-15 18:18:54.000000000 +0000 ++++ src/include/Makefile.in 2010-06-15 18:19:48.000000000 +0000 +@@ -81,7 +81,7 @@ + Rmath.h0: $(srcdir)/Rmath.h0.in $(top_builddir)/config.status + @cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +-install: installdirs install-intl-@USE_INCLUDED_LIBINTL@ ++install: $(OBJ_HEADERS) installdirs install-intl-@USE_INCLUDED_LIBINTL@ + @for d in $(SUBDIRS); do \ + (cd $${d} && $(MAKE) $@) || exit 1; \ + done diff --git a/dev-lang/R/files/R-2.12.1-ldflags.patch b/dev-lang/R/files/R-2.12.1-ldflags.patch new file mode 100644 index 0000000..6296d03 --- /dev/null +++ b/dev-lang/R/files/R-2.12.1-ldflags.patch @@ -0,0 +1,11 @@ +--- src/unix/Makefile.in.orig 2010-12-22 16:58:19.000000000 +0000 ++++ src/unix/Makefile.in 2010-12-22 16:54:16.000000000 +0000 +@@ -66,7 +66,7 @@ + + ## we need to build at install time to capture the correct 'rhome' + install-Rscript: +- $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DR_HOME='"$(rhome)"' -o Rscript \ ++ $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(LDFLAGS) -DR_HOME='"$(rhome)"' -o Rscript \ + $(srcdir)/Rscript.c + @$(MKINSTALLDIRS) "$(DESTDIR)$(Rexecbindir)" + @$(INSTALL_PROGRAM) Rscript "$(DESTDIR)$(Rexecbindir)/Rscript" diff --git a/dev-lang/R/files/R-2.13.1-zlib_header_fix.patch b/dev-lang/R/files/R-2.13.1-zlib_header_fix.patch new file mode 100644 index 0000000..0e1482e --- /dev/null +++ b/dev-lang/R/files/R-2.13.1-zlib_header_fix.patch @@ -0,0 +1,13 @@ +--- src/main/unzip.h.orig 2011-09-24 19:35:53.000000000 -0700 ++++ src/main/unzip.h 2011-09-24 19:37:06.000000000 -0700 +@@ -58,6 +58,10 @@ + #define ZLIB_FILEFUNC_SEEK_END (2) + #define ZLIB_FILEFUNC_SEEK_SET (0) + ++#ifndef OF ++#define OF(x) x ++#endif ++ + #define ZLIB_FILEFUNC_MODE_READ (1) + #define ZLIB_FILEFUNC_MODE_WRITE (2) + #define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3) diff --git a/dev-lang/R/metadata.xml b/dev-lang/R/metadata.xml new file mode 100644 index 0000000..ec8fee5 --- /dev/null +++ b/dev-lang/R/metadata.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>sci-mathematics</herd> +<longdescription lang="en"> + R is GNU S, a system for statistical computation and graphics. It + consists of a language plus a run-time environment with graphics, a + debugger, access to certain system functions, and the ability to run + programs stored in script files. + + The core of R is an interpreted computer language which allows + branching and looping as well as modular programming using functions. + The R distribution contains functionality for a large number of + statistical procedures such as: linear and generalized linear + models, nonlinear regression models, time series analysis, classical + parametric and nonparametric tests, clustering, smoothing and + graphical data representations. Additional modules ("add-on + packages") are available for a variety of specific purposes but are + not distributed with this package. +</longdescription> +</pkgmetadata> diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog new file mode 100644 index 0000000..8b2fa86 --- /dev/null +++ b/dev-lang/ocaml/ChangeLog @@ -0,0 +1,852 @@ +# ChangeLog for dev-lang/ocaml +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.201 2011/11/06 13:41:53 ranger Exp $ + + 06 Nov 2011; Brent Baude <ranger@gentoo.org> ocaml-3.12.1.ebuild: + Marking ocaml-3.12.1 ppc for bug 361767 + + 17 Oct 2011; Jeroen Roovers <jer@gentoo.org> ocaml-3.12.1.ebuild: + Stable for HPPA (bug #361767). + + 09 Oct 2011; Raúl Porcel <armin76@gentoo.org> ocaml-3.12.1.ebuild: + alpha/ia64/sparc stable wrt #361767 + + 20 Sep 2011; Tony Vroon <chainsaw@gentoo.org> ocaml-3.12.1.ebuild: + Marked stable on AMD64 based on arch testing by Ian "idella4" Delaney & + Agostino "ago" Sarubbo in bug #361767. + + 19 Sep 2011; Markus Meier <maekke@gentoo.org> ocaml-3.12.1.ebuild: + arm stable, bug #361767 + + 18 Sep 2011; Andreas Schuerch <nativemad@gentoo.org> ocaml-3.12.1.ebuild: + x86 stable, thanks JD, bug 361767 + + 06 Sep 2011; Alexis Ballier <aballier@gentoo.org> ocaml-3.12.1.ebuild: + suggest how to rebuild ocaml packages without the set + + 11 Jul 2011; Matt Turner <mattst88@gentoo.org> ocaml-3.12.1.ebuild: + Added ~mips, bug 319649 + + 06 Jul 2011; Alexis Ballier <aballier@gentoo.org> -ocaml-3.12.0.ebuild, + -ocaml-3.12.0-r1.ebuild, -ocaml-3.12.1_rc1.ebuild: + remove old + +*ocaml-3.12.1 (04 Jul 2011) + + 04 Jul 2011; Alexis Ballier <aballier@gentoo.org> +ocaml-3.12.1.ebuild: + bump to 3.12.1 + +*ocaml-3.12.1_rc1 (26 Jun 2011) + + 26 Jun 2011; Alexis Ballier <aballier@gentoo.org> +ocaml-3.12.1_rc1.ebuild: + bump to rc + +*ocaml-3.12.0-r1 (11 Jun 2011) + + 11 Jun 2011; Alexis Ballier <aballier@gentoo.org> +ocaml-3.12.0-r1.ebuild, + +files/ocaml.conf: + Install a portage set for @ocaml-rebuild to replace ocaml-rebuild.sh + + 27 Feb 2011; Alexis Ballier <aballier@gentoo.org> ocaml-3.12.0.ebuild: + Add a patch to pass libs as last argument to the linker when linking, fixes + our as-needed problems: bug #331377 and bug #331075 + + 24 Jan 2011; Alexis Ballier <aballier@gentoo.org> + -files/ocaml-3.10.0-automagic.patch, + -files/ocaml-3.10.0-call-ld-with-proper-ldflags.patch, + -files/ocaml-3.10.0-configure.patch, + -files/ocaml-3.10.0-exec-stack-fixes.patch, -ocaml-3.10.2.ebuild, + -files/ocaml-3.10.2-tk85.patch: + remove old + + 22 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> ocaml-3.11.2.ebuild: + ppc/ppc64 stable wrt #343751 + + 04 Dec 2010; Raúl Porcel <armin76@gentoo.org> ocaml-3.11.2.ebuild: + alpha/ia64/sparc stable wrt #343751 + + 15 Nov 2010; Thomas Kahle <tomka@gentoo.org> ocaml-3.11.2.ebuild: + x86 stable per bug 343751 + + 06 Nov 2010; Markus Meier <maekke@gentoo.org> ocaml-3.11.2.ebuild: + arm stable, bug #343751 + + 05 Nov 2010; Markos Chandras <hwoarang@gentoo.org> ocaml-3.11.2.ebuild: + Stable on amd64 wrt bug #343751 + + 05 Nov 2010; Jeroen Roovers <jer@gentoo.org> ocaml-3.11.2.ebuild: + Stable for HPPA (bug #343751). + + 04 Aug 2010; Alexis Ballier <aballier@gentoo.org> files/ocaml-rebuild.sh: + exit nicely if no ocaml package is installed in ocaml-rebuild.sh, by Diego + E. 'Flameeyes' Pettenò <flameeyes@gentoo.org>, bug #319553 + +*ocaml-3.12.0 (02 Aug 2010) + + 02 Aug 2010; Alexis Ballier <aballier@gentoo.org> + -ocaml-3.12.0_rc1.ebuild, +ocaml-3.12.0.ebuild: + version bump + +*ocaml-3.12.0_rc1 (25 Jul 2010) + + 25 Jul 2010; Alexis Ballier <aballier@gentoo.org> + -ocaml-3.12.0_beta1.ebuild, +ocaml-3.12.0_rc1.ebuild: + bump to rc1 + +*ocaml-3.12.0_beta1 (17 Jun 2010) + + 17 Jun 2010; Alexis Ballier <aballier@gentoo.org> + +ocaml-3.12.0_beta1.ebuild: + Add the first beta of ocaml 3.12 + + 19 Apr 2010; Raúl Porcel <armin76@gentoo.org> ocaml-3.10.2.ebuild, + ocaml-3.11.2.ebuild: + Force -O0 on arm + + 12 Apr 2010; Alexis Ballier <aballier@gentoo.org> -ocaml-3.11.1.ebuild: + remove old + +*ocaml-3.11.2 (20 Jan 2010) + + 20 Jan 2010; Alexis Ballier <aballier@gentoo.org> + -ocaml-3.11.2_rc1.ebuild, +ocaml-3.11.2.ebuild: + bump to final release + +*ocaml-3.11.2_rc1 (03 Jan 2010) + + 03 Jan 2010; Alexis Ballier <aballier@gentoo.org> + +ocaml-3.11.2_rc1.ebuild: + bump to 3.11.2_rc1 + + 12 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org> ocaml-3.11.1.ebuild: + Use -j1 for build as per bug #279968. + + 27 Sep 2009; Alexis Ballier <aballier@gentoo.org> ocaml-3.11.1.ebuild: + Filter mfpmath=sse, it causes ocamlc.opt to segfault. Bug #285993 + + 19 Sep 2009; Alexis Ballier <aballier@gentoo.org> ocaml-3.11.1.ebuild: + Filter fomit-frame-pointer, ocaml builds some programs with -pg which + causes build failures with fomit-frame-pointer, bug #270920 + + 02 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org> ocaml-3.10.2.ebuild: + Use serial make everywhere until fixed. + + 01 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org> ocaml-3.10.2.ebuild: + Use -j1 for make. Bug #279968. + + 20 Jun 2009; Alexis Ballier <aballier@gentoo.org> ocaml-3.11.1.ebuild: + use CHOST prefixed toolchain for building, this does not give us cross + compile support though + + 20 Jun 2009; Alexis Ballier <aballier@gentoo.org> + -files/ocaml-3.11.0_beta1-configure.patch, + -files/ocaml-3.11.0_beta1-exec-stack-fixes.patch, + -files/ocaml-3.11.0_beta1-yaccldflags.patch, ocaml-3.11.1.ebuild: + Make a tarball from the various patches + + 19 Jun 2009; Alexis Ballier <aballier@gentoo.org> -ocaml-3.11.0.ebuild: + remove old + +*ocaml-3.11.1 (15 Jun 2009) + + 15 Jun 2009; Alexis Ballier <aballier@gentoo.org> + -ocaml-3.11.1_rc1.ebuild, +ocaml-3.11.1.ebuild: + bump to final 3.11.1 + + 03 Jun 2009; Alexis Ballier <aballier@gentoo.org> -ocaml-3.08.4.ebuild: + remove old + +*ocaml-3.11.1_rc1 (03 Jun 2009) + + 03 Jun 2009; Alexis Ballier <aballier@gentoo.org> + -ocaml-3.11.1_rc0.ebuild, +ocaml-3.11.1_rc1.ebuild: + version bump + +*ocaml-3.11.1_rc0 (19 May 2009) + + 19 May 2009; Alexis Ballier <aballier@gentoo.org> ocaml-3.10.2.ebuild, + ocaml-3.11.0.ebuild, +ocaml-3.11.1_rc0.ebuild: + bump to 3.11.1rc0 and define eapi before inherit + + 09 Apr 2009; Raúl Porcel <armin76@gentoo.org> ocaml-3.10.2.ebuild: + arm stable + + 20 Jan 2009; Alexis Ballier <aballier@gentoo.org> ocaml-3.08.4.ebuild, + ocaml-3.10.2.ebuild, ocaml-3.11.0.ebuild: + explicitly set RDEPEND to DEPEND + + 20 Jan 2009; Alexis Ballier <aballier@gentoo.org> + files/ocaml-3.11.0_beta1-yaccldflags.patch: + include upstream bug report link in the patch + + 20 Jan 2009; Alexis Ballier <aballier@gentoo.org> ocaml-3.10.2.ebuild, + ocaml-3.11.0.ebuild: + Set LC_ALL to C because there are many a-z A-Z regexps that may cause + build failures, bug #255379 + + 11 Dec 2008; Alexis Ballier <aballier@gentoo.org> files/ocaml-rebuild.sh: + Simplify ocaml-rebuild.sh: dont clean first and let portage handle the + deps, use --oneshot to not pollute world file, bug #250192 + +*ocaml-3.11.0 (08 Dec 2008) + + 08 Dec 2008; Alexis Ballier <aballier@gentoo.org> + -ocaml-3.11.0_rc1.ebuild, +ocaml-3.11.0.ebuild: + bump to final 3.11.0 + + 27 Nov 2008; Alexis Ballier <aballier@gentoo.org> ocaml-3.11.0_rc1.ebuild: + Dont try to install native code compiler libs when not building native + code, reported by Jeroen Roovers <jer@gentoo.org> in bug #248929 + +*ocaml-3.11.0_rc1 (25 Nov 2008) + + 25 Nov 2008; Alexis Ballier <aballier@gentoo.org> + -ocaml-3.11.0_beta1.ebuild, +ocaml-3.11.0_rc1.ebuild: + bump to rc1 + + 14 Nov 2008; Alexis Ballier <aballier@gentoo.org> + files/ocaml-3.11.0_beta1-configure.patch: + respect ldflags when building shared libs too + + 14 Nov 2008; Alexis Ballier <aballier@gentoo.org> + +files/ocaml-3.11.0_beta1-yaccldflags.patch, ocaml-3.11.0_beta1.ebuild: + respect ldflags for ocamlyacc + + 07 Nov 2008; Alexis Ballier <aballier@gentoo.org> + -files/ocaml-3.11.0_beta1-call-ld-with-proper-ldflags.patch, + files/ocaml-3.11.0_beta1-configure.patch, ocaml-3.11.0_beta1.ebuild: + merge similar patches and make it honour better ldflags + +*ocaml-3.11.0_beta1 (15 Oct 2008) + + 15 Oct 2008; Alexis Ballier <aballier@gentoo.org> + +files/ocaml-3.11.0_beta1-call-ld-with-proper-ldflags.patch, + +files/ocaml-3.11.0_beta1-configure.patch, + +files/ocaml-3.11.0_beta1-exec-stack-fixes.patch, + +ocaml-3.11.0_beta1.ebuild: + New upstream beta release + + 22 Sep 2008; Raúl Porcel <armin76@gentoo.org> ocaml-3.10.2.ebuild: + Re-add ~arm wrt #178256 + + 16 Jun 2008; Alexis Ballier <aballier@gentoo.org> ocaml-3.08.4.ebuild, + ocaml-3.10.2.ebuild: + shorten description to please repoman + + 16 Jun 2008; Alexis Ballier <aballier@gentoo.org> + -files/ocaml-3.09.3-Makefile.patch, -files/ocaml-3.09.3-automagic.patch, + -files/ocaml-3.09.3-call_ld_with_proper_flags.patch, + -files/ocaml-3.09.3-configure.patch, + -files/ocaml-3.09.3-exec-stack-fixes.patch, + -files/ocaml-3.09.3-execheap.patch, + -files/ocaml-3.09.3-hppa-optimize-for-size-ocamlp4.patch, + -ocaml-3.09.3-r1.ebuild: + remove old version + + 09 Jun 2008; Raúl Porcel <armin76@gentoo.org> ocaml-3.10.2.ebuild: + alpha/ia64/sparc stable wrt #224893 + + 08 Jun 2008; Kenneth Prugh <ken69267@gentoo.org> ocaml-3.10.2.ebuild: + amd64 stable, bug #224893 + + 07 Jun 2008; Alexis Ballier <aballier@gentoo.org> files/ocaml-rebuild.sh: + Tune up a bit ocaml-rebuild.sh so that it does not give syntax errors on + non integer slots. + + 07 Jun 2008; nixnut <nixnut@gentoo.org> ocaml-3.10.2.ebuild: + Stable on ppc wrt bug 224893 + + 07 Jun 2008; Jeroen Roovers <jer@gentoo.org> ocaml-3.10.2.ebuild: + Stable for HPPA (bug #224893). + + 05 Jun 2008; Christian Faulhammer <opfer@gentoo.org> ocaml-3.10.2.ebuild: + stable x86, bug 224893 + + 04 Jun 2008; Markus Rothe <corsair@gentoo.org> ocaml-3.10.2.ebuild: + Stable on ppc64; bug #224893 + + 09 Mar 2008; Alexis Ballier <aballier@gentoo.org> -ocaml-3.09.3-r2.ebuild, + -ocaml-3.10.1.ebuild: + remove unused versions + + 09 Mar 2008; Alexis Ballier <aballier@gentoo.org> + +files/ocaml-3.10.2-tk85.patch, ocaml-3.10.2.ebuild: + Add a patch initially from mandriva modified by me to handle tk up to 8.5 + +*ocaml-3.10.2 (29 Feb 2008) + + 29 Feb 2008; Alexis Ballier <aballier@gentoo.org> + -ocaml-3.10.2_rc1.ebuild, +ocaml-3.10.2.ebuild: + bump to release 3.10.2, remove the rc + +*ocaml-3.10.2_rc1 (24 Feb 2008) + + 24 Feb 2008; Alexis Ballier <aballier@gentoo.org> + +ocaml-3.10.2_rc1.ebuild: + bump release candidate under pmask + + 24 Feb 2008; Alexis Ballier <aballier@gentoo.org> -ocaml-3.09.2.ebuild, + -ocaml-3.09.3.ebuild, -ocaml-3.10.0.ebuild: + remove unused versions + +*ocaml-3.10.1 (11 Jan 2008) + + 11 Jan 2008; Alexis Ballier <aballier@gentoo.org> + -ocaml-3.10.1_rc2.ebuild, +ocaml-3.10.1.ebuild: + bump to final 3.10.1 + + 03 Jan 2008; Alexis Ballier <aballier@gentoo.org> ocaml-3.10.0.ebuild, + ocaml-3.10.1_rc2.ebuild: + Allow to disable ocamlopt via an useflag + + 02 Jan 2008; Alexis Ballier <aballier@gentoo.org> ocaml-3.08.4.ebuild, + ocaml-3.09.2.ebuild, ocaml-3.09.3.ebuild: + Please repoman warnings, thanks to zmedico for the hint + +*ocaml-3.10.1_rc2 (02 Jan 2008) + + 02 Jan 2008; Alexis Ballier <aballier@gentoo.org> + -ocaml-3.10.1_rc1.ebuild, +ocaml-3.10.1_rc2.ebuild: + bump to rc2 + + 20 Dec 2007; Alexis Ballier <aballier@gentoo.org> + -files/ocaml-3.10.0-execheap.patch, ocaml-3.10.0.ebuild, + ocaml-3.10.1_rc1.ebuild: + clean up unused patch + +*ocaml-3.10.1_rc1 (20 Dec 2007) + + 20 Dec 2007; Alexis Ballier <aballier@gentoo.org> + +ocaml-3.10.1_rc1.ebuild: + Add ocaml 3.10.1 release candidate 1, for testing purposes + + 19 Dec 2007; Alexis Ballier <aballier@gentoo.org> ocaml-3.10.0.ebuild: + make the information about the need to run ocaml-rebuild.sh a warning + because it is really needed to run it after an upgrade + + 19 Dec 2007; Alexis Ballier <aballier@gentoo.org> ocaml-3.08.4.ebuild, + ocaml-3.09.2.ebuild, ocaml-3.09.3.ebuild: + quote directory variables + + 19 Dec 2007; Alexis Ballier <aballier@gentoo.org> ocaml-3.08.4.ebuild, + ocaml-3.09.2.ebuild, ocaml-3.09.3.ebuild, ocaml-3.09.3-r1.ebuild, + ocaml-3.09.3-r2.ebuild, ocaml-3.10.0.ebuild: + no need to dodoc the license + + 19 Dec 2007; Alexis Ballier <aballier@gentoo.org> + files/ocaml-3.10.0-exec-stack-fixes.patch, ocaml-3.10.0.ebuild: + Fix hardenend build by telling gcc to not generate PIE executables with + ocaml objects; remove again exec stacks due to some variables renaming in + the build system + +*ocaml-3.09.3-r2 (29 Oct 2007) + + 29 Oct 2007; Ulrich Mueller <ulm@gentoo.org> +ocaml-3.09.3-r2.ebuild, + ocaml-3.10.0.ebuild: + Add app-emacs/ocaml-mode and app-xemacs/ocaml to PDEPEND, bug #43128. + + 15 Oct 2007; Markus Rothe <corsair@gentoo.org> ocaml-3.09.3-r1.ebuild: + Stable on ppc64 + + 12 Sep 2007; Raúl Porcel <armin76@gentoo.org> ocaml-3.09.3-r1.ebuild: + Re-add forced LDFLAGS for alpha, since it still needs it + + 10 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org> + ocaml-3.09.3-r1.ebuild: + Marked stable on amd64 as requested by aballier. + + 23 Aug 2007; Alexis Ballier <aballier@gentoo.org> files/ocaml-rebuild.sh: + fix usage of deprecated emerge unmerge in ocaml-rebuild.sh, thanks to Jack + Kelly <weldingmaskman@hotmail.com>, bug #189032 + + 13 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> + ocaml-3.09.3-r1.ebuild: + ppc. stable + + 22 Jul 2007; Jeroen Roovers <jer@gentoo.org> ocaml-3.09.3-r1.ebuild: + Stable for HPPA too. + + 12 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org> + ocaml-3.09.3-r1.ebuild: + Stable on sparc + + 11 Jul 2007; Raúl Porcel <armin76@gentoo.org> ocaml-3.09.3-r1.ebuild: + alpha/ia64/x86 stable and drop append-ldflags for alpha, not needed anymore + + 26 May 2007; Raúl Porcel <armin76@gentoo.org> ocaml-3.09.3-r1.ebuild, + ocaml-3.10.0.ebuild: + Add no-relax to LDFLAGS for alpha, and keyword latest version ~alpha + + 26 May 2007; Raúl Porcel <armin76@gentoo.org> ocaml-3.09.3-r1.ebuild: + Readd ~alpha wrt #178256 + + 26 May 2007; Alexis Ballier <aballier@gentoo.org> + +files/ocaml-3.10.0-execheap.patch, ocaml-3.10.0.ebuild: + merge paxmarking of the compilers and makefile patch to replace multiple + occurences of @compiler@ in ocamlcomp.sh.in that allows building with an + hardened kernel + +*ocaml-3.10.0 (26 May 2007) + + 26 May 2007; Alexis Ballier <aballier@gentoo.org> + +files/ocaml-3.10.0-automagic.patch, + +files/ocaml-3.10.0-call-ld-with-proper-ldflags.patch, + +files/ocaml-3.10.0-configure.patch, + +files/ocaml-3.10.0-exec-stack-fixes.patch, +ocaml-3.10.0.ebuild: + New upstream release + + 15 May 2007; Jeroen Roovers <jer@gentoo.org> ocaml-3.09.3-r1.ebuild: + Marked ~hppa (bug #178256). + + 15 May 2007; Alexis Ballier <aballier@gentoo.org> + +files/ocaml-3.09.3-hppa-optimize-for-size-ocamlp4.patch, + ocaml-3.09.3-r1.ebuild: + Optimize ocamlp4 for size on hppa, bug #178256 + + 14 May 2007; Alexis Ballier <aballier@gentoo.org> + +files/ocaml-3.09.3-call_ld_with_proper_flags.patch, + ocaml-3.09.3-r1.ebuild: + Call ld with proper flags to prevent compilation failures of some other + ocaml packages + + 14 May 2007; Jeroen Roovers <jer@gentoo.org> ocaml-3.09.3-r1.ebuild: + Reverting ~hppa keywording due to build failure. + + 14 May 2007; Jeroen Roovers <jer@gentoo.org> ocaml-3.09.3-r1.ebuild: + Marked ~hppa (bug #178256). + + 13 May 2007; Raúl Porcel <armin76@gentoo.org> ocaml-3.09.3-r1.ebuild: + Readd ~ia64 wrt bug 178256 + + 12 May 2007; Alexis Ballier <aballier@gentoo.org> + +files/ocaml-3.09.3-automagic.patch, ocaml-3.09.3-r1.ebuild: + Fix X and gdbm automagics + + 12 May 2007; Alexis Ballier <aballier@gentoo.org> ocaml-3.09.3-r1.ebuild: + Add ncurses useflag (was automagic) + + 12 May 2007; Alexis Ballier <aballier@gentoo.org> + files/ocaml-3.09.3-configure.patch: + Do not ignore cflags/ldflags for native compiler + + 12 May 2007; Alexis Ballier <aballier@gentoo.org> ocaml-3.09.3-r1.ebuild: + Install ocaml-rebuild.sh in /usr/sbin rather than keeping it in PORTDIR, fix + bug #175668 + + 11 May 2007; Alexis Ballier <aballier@gentoo.org> ocaml-3.09.3.ebuild, + ocaml-3.09.3-r1.ebuild: + Dont run make bootstrap for src_test, it deletes ocamlopt, upstream does not + provide a clean test suite, if we want one we definitely should not use make + bootstrap, closes bug #159237 and bug #177706 + + 11 May 2007; Alexis Ballier <aballier@gentoo.org> + -files/ocaml-3.08.3-gcc4.patch, -ocaml-3.08.3.ebuild, ocaml-3.08.4.ebuild, + ocaml-3.09.2.ebuild, ocaml-3.09.3.ebuild, ocaml-3.09.3-r1.ebuild: + Fix bug #135641 again, remove unused version, drop virtual/libc dep as it is + in system anyway + + 22 Apr 2007; Christian Heim <phreak@gentoo.org> ocaml-3.09.3-r1.ebuild: + Restricting FEATURES=test for now, make bootstrap deletes the *.opt files + (thanks Matti); Removing the QA_TEXTREL definition, which is only intended + for binary packages; Provide a way to compile ocaml on AMD64/hardened. + +*ocaml-3.09.3-r1 (22 Apr 2007) + + 22 Apr 2007; Christian Heim <phreak@gentoo.org> + +files/ocaml-3.09.3-Makefile.patch, +files/ocaml-3.09.3-configure.patch, + +files/ocaml-3.09.3-exec-stack-fixes.patch, + +files/ocaml-3.09.3-execheap.patch, +ocaml-3.09.3-r1.ebuild: + Revision bump, fixing #153382 (ocaml produces binaries contain executable + stacks), #134403 (dev-lang/ocaml-3.08.4 emerge failed on hardened amd64) and + #110541 (ERROR: dev-lang/ocaml-3.08.3 failed.) - this makes dev-lang/ocaml + "useable" on hardened boxes. + + 15 Apr 2007; Markus Rothe <corsair@gentoo.org> ocaml-3.09.3.ebuild: + Stable on ppc64 + + 13 Mar 2007; Raúl Porcel <armin76@gentoo.org> ocaml-3.09.3.ebuild: + x86 stable + + 17 Feb 2007; Fabian Groffen <grobian@gentoo.org> ocaml-3.08.3.ebuild, + ocaml-3.08.4.ebuild: + Dropped ppc-macos keyword, see you in prefix + + 06 Feb 2007; Marius Mauch <genone@gentoo.org> ocaml-3.08.3.ebuild, + ocaml-3.08.4.ebuild, ocaml-3.09.2.ebuild, ocaml-3.09.3.ebuild: + Replacing einfo with elog + + 14 Dec 2006; Timothy Redaelli <drizzt@gentoo.org> ocaml-3.09.3.ebuild: + Add ~x86-fbsd keyword + + 03 Dec 2006; Markus Rothe <corsair@gentoo.org> ocaml-3.09.2.ebuild: + Stable on ppc64 + + 07 Nov 2006; Alexandre Buisse <nattfodd@gentoo.org> ocaml-3.08.3.ebuild, + ocaml-3.08.4.ebuild, ocaml-3.09.2.ebuild, ocaml-3.09.3.ebuild: + Disable native code generation on ppc64 (and probably hppa soon), see bug + #149014. + + 05 Nov 2006; Danny van Dyk <kugelfang@gentoo.org> ocaml-3.09.2.ebuild: + Marked stable on amd64. + + 04 Nov 2006; Christian Faulhammer <opfer@gentoo.org> ocaml-3.09.2.ebuild: + stabled x86, bug #153506 + + 03 Nov 2006; Alexandre Buisse <nattfodd@gentoo.org> ocaml-3.08.3.ebuild, + ocaml-3.08.4.ebuild, ocaml-3.09.2.ebuild, ocaml-3.09.3.ebuild: + Change tcltk USE to tk (bug #17808). + + 02 Nov 2006; Alexandre Buisse <nattfodd@gentoo.org> ocaml-3.09.3.ebuild: + Fix stupid quoting problem which was deleting the -host switch to configure + (bug #153738). + + 31 Oct 2006; Chris White <chriswhite@gentoo.org> ocaml-3.09.2.ebuild: + PPC stable for bug #153506. + + 20 Sep 2006; Alexandre Buisse <nattfodd@gentoo.org> ocaml-3.09.3.ebuild: + Add fix for finding correct arch in cases where kernel_arch != system_arch + (bug #135641). + + 14 Sep 2006; Matthieu Sozeau <mattam@gentoo.org> files/ocaml-rebuild.sh: + Add a test for slots + + 12 Jul 2006; Gustavo Zacarias <gustavoz@gentoo.org> ocaml-3.09.2.ebuild: + Fast track stable on sparc since it fixes obvious issues + + 05 Jul 2006; Gustavo Zacarias <gustavoz@gentoo.org> ocaml-3.09.2.ebuild: + Keyworded ~sparc wrt #139014 + + 16 Jun 2006; Scott Stoddard <deltacow@gentoo.org> ocaml-3.09.2.ebuild: + Added ~amd64 re bug #126724 + + 21 May 2006; Markus Rothe <corsair@gentoo.org> ocaml-3.08.3.ebuild: + Stable on ppc64 + +*ocaml-3.09.2 (27 Apr 2006) + + 27 Apr 2006; Matthieu Sozeau <mattam@gentoo.org> +ocaml-3.09.2.ebuild: + Bug fix release 3.09.2. + + 18 Mar 2006; Markus Rothe <corsair@gentoo.org> ocaml-3.08.3.ebuild, + ocaml-3.08.4.ebuild, ocaml-3.09.1.ebuild: + Added ~ppc64 + + 06 Feb 2006; Aron Griffis <agriffis@gentoo.org> ocaml-3.08.4.ebuild: + Mark 3.08.4 stable on ia64 + + 04 Feb 2006; Aron Griffis <agriffis@gentoo.org> ocaml-3.08.4.ebuild: + Mark 3.08.4 stable on alpha + + 04 Feb 2006; Matthieu Sozeau <mattam@gentoo.org> + -files/ocaml-3.06-sparc-configure.patch, + -files/ocaml-3.06-tcltk-8.4compat-patch.bz2, -files/ocaml-3.07-hppa.patch, + -ocaml-3.06-r2.ebuild, -ocaml-3.07-r1.ebuild, -ocaml-3.08.1.ebuild: + Remove old, no longer used versions. + +*ocaml-3.09.1 (04 Feb 2006) + + 04 Feb 2006; Matthieu Sozeau <mattam@gentoo.org> -ocaml-3.09.0.ebuild, + +ocaml-3.09.1.ebuild: + Bumped to 3.09.1, bugfix release of 3.09.0 which i removed. All ocaml packages + should support it from now. + + 21 Dec 2005; Marcus D. Hanwell <cryos@gentoo.org> ocaml-3.08.4.ebuild: + Stable on amd64, bug 106837. + + 19 Nov 2005; Rene Nussbaumer <killerfox@gentoo.org> ocaml-3.08.4.ebuild: + Stable on hppa. + +*ocaml-3.09.0 (10 Nov 2005) + + 10 Nov 2005; Matthieu Sozeau <mattam@gentoo.org> +ocaml-3.09.0.ebuild: + Version bump, marked -* as it breaks some packages in gentoo which i'm trying + to get up-to-date , but the ebuild can be useful as it is for experienced + people. + + 09 Nov 2005; Jason Wever <weeve@gentoo.org> ocaml-3.08.4.ebuild: + Marked stable on SPARC wrt bug #106837. + + 16 Oct 2005; Rene Nussbaumer <killerfox@gentoo.org> ocaml-3.08.3.ebuild: + Stable on hppa. + + 27 Sep 2005; Jason Wever <weeve@gentoo.org> ocaml-3.08.3.ebuild: + Stable on SPARC. + +*ocaml-3.08.4 (21 Sep 2005) + + 21 Sep 2005; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.08.3.ebuild, + +ocaml-3.08.4.ebuild, -ocaml-3.08.ebuild: + Add latest version, remove unused one. Version .3 is stable on x86 and + amd64. + + 17 Sep 2005; Aron Griffis <agriffis@gentoo.org> ocaml-3.08.3.ebuild: + Mark 3.08.3 stable on ia64 + + 10 Sep 2005; Aron Griffis <agriffis@gentoo.org> ocaml-3.08.3.ebuild: + Mark 3.08.3 stable on alpha + + 26 Jul 2005; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.08.3.ebuild: + Added gcc4 patch, thanks to Peter Hjalmarsson <xake@telia.com> (fixes bug + #97186). + + 06 Jul 2005; Herbie Hopkins <herbs@gentoo.org> ocaml-3.08.3.ebuild: + Multilib fixes. + + 11 May 2005; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.08.3.ebuild: + Stable on ppc. + + 01 Apr 2005; Simon Stelling <blubb@gentoo.org> ocaml-3.08.1.ebuild: + stable on amd64 + + 01 Apr 2005; Aron Griffis <agriffis@gentoo.org> ocaml-3.08.1.ebuild: + stable on ia64 + +*ocaml-3.08 (19 Mar 2005) +*ocaml-3.07-r1 (19 Mar 2005) + + 19 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org> + +files/ocaml-3.07-hppa.patch, +ocaml-3.07-r1.ebuild, +ocaml-3.08.ebuild: + resurrect versions to fix dep breakage + + 18 Mar 2005; Matthieu Sozeau <mattam@gentoo.org> + -files/ocaml-3.07-hppa.patch, files/ocaml-rebuild.sh, -ocaml-3.07-r1.ebuild, + -ocaml-3.08.2.ebuild, -ocaml-3.08.ebuild, +ocaml-3.08.3.ebuild: + Adding latest version. It's a bugfix release, hence i keeped the ~ flags. I + cleaned up the dir, keeping the most stable versions. I reworked the rebuild + script a little, it should not miss any package now. I tested the last version + of ocaml and the script with all ocaml packages on x86 and ppc. + + 07 Feb 2005; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.08.1.ebuild: + Stable on ppc. + + 04 Jan 2005; Guy Martin <gmsoft@gentoo.org> ocaml-3.08.1.ebuild: + Stable on hppa. + + 02 Jan 2005; Lina Pezzella <j4rg0n@gentoo.org> ocaml-3.08.1.ebuild: + Stable ppc-macos + + 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : + Change encoding to UTF-8 for GLEP 31 compliance + + 20 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> ocaml-3.08.1.ebuild: + Stable on alpha. + + 07 Dec 2004; Jason Wever <weeve@gentoo.org> ocaml-3.08.1.ebuild: + Stable on sparc. + +*ocaml-3.08.2 (29 Nov 2004) + + 29 Nov 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.08.1.ebuild, + +ocaml-3.08.2.ebuild: + Move 3.08.1 to x86 and add 3.08.2 release. + + 20 Oct 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.07-r1.ebuild, + ocaml-3.08.1.ebuild, ocaml-3.08.ebuild: + Changed strip-flags to replace-flags, as advised by Carsten Tschense in bug + #65327. + + 12 Oct 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.07-r1.ebuild, + ocaml-3.08.1.ebuild, ocaml-3.08.ebuild: + Add strip-flags to remove -O3 and other unsupported ones etc.. + + 22 Aug 2004; Travis Tilley <lv@gentoo.org> ocaml-3.08.ebuild: + stable on amd64 + +*ocaml-3.08.1 (19 Aug 2004) + + 19 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> +ocaml-3.08.1.ebuild: + Version bump. + + 18 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.07-r1.ebuild, + ocaml-3.08.ebuild: + Add handling of CFLAGS, use with care! + + 16 Aug 2004; Guy Martin <gmsoft@gentoo.org> ocaml-3.08.ebuild: + Yay, my port to hppa-linux is in the mainstream ! Marking stable ! + + 13 Aug 2004; Jason Wever <weeve@gentoo.org> ocaml-3.07-r1.ebuild: + Stable on sparc. + + 08 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.07-r1.ebuild: + Move 3.07 to stable on ppc. + + 08 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.06-r2.ebuild, + ocaml-3.07-r1.ebuild, ocaml-3.08.ebuild: + Add support for ocamldoc and latex via a new use flag. + +*ocaml-3.08 (08 Aug 2004) + + 08 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> +ocaml-3.08.ebuild: + Version bump. + + 21 Jul 2004; Matthieu Sozeau <mattam@gentoo.org> files/ocaml-rebuild.sh, + ocaml-3.07-r1.ebuild: + Yet a little more robustness in the rebuild script. + + 21 Jul 2004; Matthieu Sozeau <mattam@gentoo.org> files/ocaml-rebuild.sh: + Fixed bug in the rebuild script. see #56597. + + 13 Jul 2004; Travis Tilley <lv@gentoo.org> ocaml-3.07-r1.ebuild: + adding back ~amd64 keyword + + 06 Jul 2004; Matthieu Sozeau <mattam@gentoo.org> -ocaml-3.06-r1.ebuild, + ocaml-3.06-r2.ebuild, -ocaml-3.06.ebuild, -ocaml-3.07.ebuild, + -ocaml-3.07_beta2.ebuild: + remove old, no longer needed versions. + + 06 Jul 2004; Matthieu Sozeau <mattam@gentoo.org> +files/ocaml-rebuild.sh, + ocaml-3.07-r1.ebuild: + Move to stable on x86, adding a rebuilding script. + + 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ocaml-3.06-r1.ebuild, + ocaml-3.06-r2.ebuild, ocaml-3.06.ebuild, ocaml-3.07-r1.ebuild, + ocaml-3.07.ebuild, ocaml-3.07_beta2.ebuild: + virtual/glibc -> virtual/libc + + 27 Jun 2004; Alexander Plank <alexander@gentoo.org> ocaml-3.07-r1.ebuild + change keyword from macos to ~macos (because of ranlib work) + + 26 Jun 2004; Alexander Plank <alexander@gentoo.org> ocaml-3.07-r1.ebuild + add ranlib bit to ebuild and rekeyword macos (i tested it with unison) (thanks + Philippe Bouamriou for bug #57917 )) + + 25 Jun 2004; Alexander Plank <alexander@gentoo.org> ocaml-3.07-r1.ebuild + ~macos keyword (unison fails and cites ocaml problems) + + 25 Jun 2004; Alexander Plank <alexander@gentoo.org> ocaml-3.07-r1.ebuild + add macos keyword + + 28 May 2004; Danny van Dyk <kugelfang@gentoo.org> ocaml-3.07-r1.ebuild, + ocaml-3.07.ebuild, ocaml-3.07_beta2.ebuild: + Marked ocaml -amd64. Produces bad object code that causes segfaults under + certain conditions. This happens only on amd64. + + 15 May 2004; Bryan Østergaard <kloeri@gentoo.org> ocaml-3.07-r1.ebuild: + Stable on alpha. + + 11 May 2004; Guy Martin <gmsoft@gentoo.org> ocaml-3.07-r1.ebuild: + Marked stable on hppa. + + 08 May 2004; Guy Martin <gmsoft@gentoo.org> ocaml-3.07-r1.ebuild: + Added support for native hppa compiler. Marked ~hppa. + + 22 Apr 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.07-r1.ebuild: + Fix unpacking of patch file (bug #48485). + + 19 Apr 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.07-r1.ebuild: + Add fix for bug #46703 + + 17 Apr 2004; Travis Tilley <lv@gentoo.org> ocaml-3.07-r1.ebuild, + ocaml-3.07.ebuild: + added missing ~amd64 keyword + + 27 Feb 2004; Seemant Kulleen <seemant@gentoo.org> ocaml-3.06-r1.ebuild, + ocaml-3.06-r2.ebuild, ocaml-3.06.ebuild, ocaml-3.07-r1.ebuild, + ocaml-3.07.ebuild, ocaml-3.07_beta2.ebuild: + move the filter-flags statement into src_compile + + 17 Feb 2004; Aron Griffis <agriffis@gentoo.org> ocaml-3.07-r1.ebuild: + add ~ia64 + + 03 Feb 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.06-r2.ebuild: + Mark stable/tested on ppc. + +*ocaml-3.07-r1 (17 Oct 2003) + + 17 Oct 2003; Martin Holzer <mholzer@gentoo.org> ocaml-3.07-r1.ebuild: + Adding patch. Closes #31265. + + 06 Oct 2003; Jason Wever <weeve@gentoo.org> ocaml-3.07.ebuild: + Fixed up sparc specific parts as the patch is no longer needed in the new rev, + but the -host arg is. + +*ocaml-3.07 (06 Oct 2003) + + 06 Oct 2003; George Shapovalov <george@gentoo.org> ocaml-3.07.ebuild : + 3.07 is out, this outdates the beta that was fixing #28025 + + 02 Oct 2003; Aron Griffis <agriffis@gentoo.org> ocaml-3.06-r2.ebuild, + ocaml-3.07_beta2.ebuild: + 3.06-r2 is stable; 3.07_beta2 is testing on alpha + +*ocaml-3.07_beta2 (11 Sep 2003) + + 11 Sep 2003; George Shapovalov <george@gentoo.org> ocaml-3.07_beta2.ebuild : + added new beta as it seems to fix some rare problem in #28025 + +*ocaml-3.06-r2 (09 Sep 2003) + + 09 Sep 2003; George Shapovalov <george@gentoo.org> ocaml-3.06-r2.ebuild, metadata.xml : + ocaml was using uotdated "head -1" construct throughout. Changed this to "head -n 1", + see #27835 for details. Also added metadata.xml + + 06 Sep 2003; Jason Wever <weeve@gentoo.org> ocaml-3.06-r1.ebuild, + ocaml-3.06.ebuild, files/ocaml-3.06-sparc-configure.patch: + Added patch and myconf fix to fix bug #23767. + +*ocaml-3.06-r1 (01 May 2003) + + 01 May 2003; George Shapovalov <george@gentoo.org> ocaml-3.06-r1.ebuild : + updated the ebuild to incorporate the fix for tk-8.4 necessary for lablgl. + Thanks to Rick Harris <rickharris@mightylegends.zapto.org> for the note and the patch. + +*ocaml-3.06 (28 Jan 2003) + + 11 Apr 2003; Joshua Brindle <method@gentoo.org> ocaml-3.04-r1.ebuild, + ocaml-3.06.ebuild: + added filter-flags -fstack-protector + + 28 Jan 2003; Jon Nall <nall@gentoo.org> ocaml-3.06 : + who made this build? i didn't. i just added ~ppc to it. + + 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords + +*ocaml-3.05 (07 Aug 2002) + + 06 Aug 2002; George Shapovalov <george@gentoo.org> ocaml-3.04-r2.ebuild, files/digest-ocaml-3.05 : + + new version + removed ppc patch as it was supposed to be unnecessary + ebuild is masked now, please test, especially ppc people. + tk dependency is optional, should build now without tcltk or X + + related ebuild submissions: + Bardur Arantsson <bardur-gta@odense.kollegienet.dk>, bug#5786 + ?Larry Cow <larrycow@free.fr>, bug# 5799 + +*ocaml-3.04-r2 (01 Aug 2002) + + 02 Aug 2002; George Shapovalov <george@gentoo.org> ocaml-3.04-r2.ebuild : + + tk dependence is reported (by Tim Hobbs <rectrix@rectrix.cx>) to be optional, + made it depend on tcltk use flag. + Created and masked new revision to give this some testing without interuption + to the working package. + Core devs (cvs access people): please do not unmask it on server! Instead please + let me know that it tested Ok. I will do necessary modifications to the -r1 + and delete -r2. This way we will not force everybody to rebuild perfectly + working package. + +*ocaml-3.04-r1 (24 Jun 2002) + + 24 Jun 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ocaml-3.04-r1.ebuild files/digest-ocaml-3.04-r1: + + ocaml library paths are now properly added to /etc/ld.so.conf. + + Removed ocaml-3.04.ebuild files/digest-ocaml-3.04 + +*ocaml-3.04 ( 7 Feb 2002 ) + + 7 June 2002; David Chamberlain <daybird@gentoo.org> Changelog + ocaml-3.04.ebuild files/ocaml-3.04-ppc.diff: + + Added patch from cvs so that ocaml will build on ppc. Closes out bug #2984 + + 7 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ChangeLog ocaml-3.04.ebuild files/digest-ocaml-3.04 : + + Objective Caml is a fast modern type-inferring functional programming + language descended from the ML (Meta Language) family. + + This builds a runtime environment and native compiler for ocaml. + + Submitted by Sean Mitchell. diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest new file mode 100644 index 0000000..1f96939 --- /dev/null +++ b/dev-lang/ocaml/Manifest @@ -0,0 +1,6 @@ +AUX ocaml.conf 177 RMD160 3a0d91eabe02ccf823931bb3256322c15f38b38a SHA1 603ac7177e01542c74bb95e836fd341cef5dfe2c SHA256 b7f7ad0ff15bec096dcb87265d87f9b0ce8f946d4a2676dd7638ca0e14bb05c1 +DIST ocaml-3.12.1.tar.bz2 2949124 RMD160 61d38c0785491c8790ac02ab78fb2f26ea490fc1 SHA1 29b44117b116b1a5bc54a8b4514af483793a769f SHA256 edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d +DIST ocaml-patches-3.tar.bz2 4101 RMD160 f830b0be28a96f8892776d0372fa10fb56a605ee SHA1 f165b9fce29cc4d96a81abbc7edbde35e33b4c0c SHA256 c4ceb604f4480c78d1cf4f848b0903c8d37798d9761f582d8d1643d4e38b8658 +EBUILD ocaml-3.12.1.ebuild 4201 RMD160 8a6a2e40157ef8f9d50b2ef3d48f6964ce239594 SHA1 d7ec421cfbdbaaebabfe738deda04ca723bfc814 SHA256 8756df78e3d2c5ff0fb0ba467f8cb59185feb7b96371ec761f8abcd9fc673862 +MISC ChangeLog 31294 RMD160 95b6a21498fdd96f279d0a35a272607c8eead248 SHA1 c94b28f7a3e154fa3a847be29c83e500b3fe40f7 SHA256 869132631cdd223e11bf47fb8387e82686f4798ad1c35a8d92e45253eec1645f +MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 diff --git a/dev-lang/ocaml/files/ocaml.conf b/dev-lang/ocaml/files/ocaml.conf new file mode 100644 index 0000000..083b8ce --- /dev/null +++ b/dev-lang/ocaml/files/ocaml.conf @@ -0,0 +1,5 @@ +# Rebuild all ocaml modules (must be rebuilt after each ocaml upgrade) +[ocaml-rebuild] +class = portage.sets.dbapi.OwnerSet +files = /usr/lib/ocaml +exclude-files = /usr/bin/ocaml diff --git a/dev-lang/ocaml/metadata.xml b/dev-lang/ocaml/metadata.xml new file mode 100644 index 0000000..2193d77 --- /dev/null +++ b/dev-lang/ocaml/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ml</herd> +</pkgmetadata> diff --git a/dev-lang/ocaml/ocaml-3.12.1.ebuild b/dev-lang/ocaml/ocaml-3.12.1.ebuild new file mode 100644 index 0000000..bb17cd6 --- /dev/null +++ b/dev-lang/ocaml/ocaml-3.12.1.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.12.0.ebuild,v 1.2 2011/02/27 13:09:10 aballier Exp $ + +EAPI="1" + +inherit flag-o-matic eutils multilib versionator toolchain-funcs + +PATCHLEVEL="3" +MY_P="${P/_/+}" +DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family" +HOMEPAGE="http://www.ocaml.org/" +SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/cristal/ocaml/ocaml-$(get_version_component_range 1-2)/${MY_P}.tar.bz2 + mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2" + +LICENSE="QPL-1.0 LGPL-2" +SLOT="0" +KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="emacs gdbm latex ncurses +ocamlopt tk X xemacs" + +DEPEND="tk? ( >=dev-lang/tk-3.3.3 ) + ncurses? ( sys-libs/ncurses ) + X? ( x11-libs/libX11 x11-proto/xproto ) + gdbm? ( sys-libs/gdbm )" +RDEPEND="${DEPEND}" + +PDEPEND="emacs? ( app-emacs/ocaml-mode ) + xemacs? ( app-xemacs/ocaml )" + +S="${WORKDIR}/${MY_P}" +pkg_setup() { + # dev-lang/ocaml creates its own objects but calls gcc for linking, which will + # results in relocations if gcc wants to create a PIE executable + if gcc-specs-pie ; then + append-ldflags -nopie + ewarn "Ocaml generates its own native asm, you're using a PIE compiler" + ewarn "We have appended -nopie to ocaml build options" + ewarn "because linking an executable with pie while the objects are not pic will not work" + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" +} + +src_compile() { + export LC_ALL=C + local myconf="" + + # Causes build failures because it builds some programs with -pg, + # bug #270920 + filter-flags -fomit-frame-pointer + # Bug #285993 + filter-mfpmath sse + + # It doesn't compile on alpha without this LDFLAGS + use alpha && append-ldflags "-Wl,--no-relax" + # Fails to build on arm if >O0 is used + use arm && replace-flags "-O?" -O0 + + use tk || myconf="${myconf} -no-tk" + use ncurses || myconf="${myconf} -no-curses" + use X || myconf="${myconf} -no-graph" + use gdbm || myconf="${myconf} -no-dbm" + + # ocaml uses a home-brewn configure script, preventing it to use econf. + RAW_LDFLAGS="$(raw-ldflags)" ./configure -prefix "${EPREFIX}"/usr \ + -bindir "${EPREFIX}"/usr/bin \ + -libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \ + -mandir "${EPREFIX}"/usr/share/man \ + -host "${CHOST}" \ + -cc "$(tc-getCC)" \ + -as "$(tc-getAS)" \ + -aspp "$(tc-getCC) -c" \ + -partialld "$(tc-getLD) -r" \ + --with-pthread ${myconf} || die "configure failed!" + + emake -j1 world || die "make world failed!" + + # Native code generation can be disabled now + if use ocamlopt ; then + # bug #279968 + emake -j1 opt || die "make opt failed!" + emake -j1 opt.opt || die "make opt.opt failed!" + fi +} + +src_install() { + make BINDIR="${ED}"/usr/bin \ + LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \ + MANDIR="${ED}"/usr/share/man \ + install || die "make install failed!" + + # Install the compiler libs + dodir /usr/$(get_libdir)/ocaml/compiler-libs + insinto /usr/$(get_libdir)/ocaml/compiler-libs + doins {utils,typing,parsing}/*.{mli,cmi,cmo} + use ocamlopt && doins {utils,typing,parsing}/*.{cmx,o} + + # Symlink the headers to the right place + dodir /usr/include + dosym /usr/$(get_libdir)/ocaml/caml /usr/include/ + + # Remove ${D} from ld.conf, as the buildsystem isn't $(DESTDIR) aware + dosed "s:${D}::g" /usr/$(get_libdir)/ocaml/ld.conf + + dodoc Changes INSTALL README Upgrading + + # Create and envd entry for latex input files (this definitely belongs into + # CONTENT and not in pkg_postinst. + if use latex ; then + echo "TEXINPUTS=${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc + doenvd "${T}"/99ocamldoc + fi + + # Install ocaml-rebuild.sh script rather than keeping it in $PORTDIR + dosbin "${FILESDIR}/ocaml-rebuild.sh" +} + +pkg_postinst() { + echo + ewarn "OCaml is not binary compatible from version to version, so you" + ewarn "need to rebuild all packages depending on it, that are actually" + ewarn "installed on your system. To do so, you can run:" + ewarn "/usr/sbin/ocaml-rebuild.sh [-h | emerge options]" + ewarn "Which will call emerge on all old packages with the given options" + echo +} diff --git a/dev-lang/ocaml/ocaml-3.12.1.ebuild.old b/dev-lang/ocaml/ocaml-3.12.1.ebuild.old new file mode 120000 index 0000000..45bbdaf --- /dev/null +++ b/dev-lang/ocaml/ocaml-3.12.1.ebuild.old @@ -0,0 +1 @@ +/usr/portage/dev-lang/ocaml/ocaml-3.12.1.ebuild
\ No newline at end of file diff --git a/dev-lang/php-5.4.0_rc7.ebuild b/dev-lang/php-5.4.0_rc7.ebuild new file mode 100644 index 0000000..2ff9c54 --- /dev/null +++ b/dev-lang/php-5.4.0_rc7.ebuild @@ -0,0 +1,398 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_rc7.ebuild,v 1.2 2012/02/06 13:41:27 olemarkus Exp $ + +EAPI=4 + +inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool prefix + +SUHOSIN_VERSION="" +FPM_VERSION="builtin" +EXPECTED_TEST_FAILURES="" + +KEYWORDS="~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +function php_get_uri () +{ + case "${1}" in + "php-stas") + echo "http://downloads.php.net/stas/${2}" + ;; + "php-pre") + echo "http://downloads.php.net/johannes/${2}" + ;; + "php") + echo "http://www.php.net/distributions/${2}" + ;; + "suhosin") + echo "http://download.suhosin.org/${2}" + ;; + "olemarkus") + echo "http://olemarkus.org/~olemarkus/gentoo/${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_PV="${PHP_PV/_alpha/alpha}" +PHP_PV="${PHP_PV/_beta/beta}" +PHP_RELEASE="php-stas" +PHP_P="${PN}-${PHP_PV}" + +PHP_PATCHSET_LOC="olemarkus" + +PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" + +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.) + SUHOSIN_TYPE="gentoo" +else + SUHOSIN_TYPE="suhosin" +fi + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; + SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" +fi + +SRC_URI=" + ${PHP_SRC_URI} + ${PHP_PATCHSET_URI}" + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SRC_URI="${SRC_URI} + suhosin? ( ${SUHOSIN_URI} )" +fi + +DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." +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="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} + threads" + +IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk + crypt +ctype curl curlwrappers debug doc + enchant exif frontbase +fileinfo +filter firebird + flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash + mssql mysql mysqlnd mysqli nls + oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm + readline recode +session sharedmem + +simplexml snmp soap sockets spell sqlite3 ssl + sybase-ct sysvipc tidy +tokenizer truetype unicode wddx + +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" + +# Enable suhosin if available +[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" + +DEPEND="!dev-lang/php:5 + >=app-admin/eselect-php-0.6.2 + >=dev-libs/libpcre-8.12[unicode] + <dev-libs/libpcre-8.30[unicode] + apache2? ( www-servers/apache[threads=] ) + berkdb? ( =sys-libs/db-4* ) + bzip2? ( app-arch/bzip2 ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + cjk? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + crypt? ( >=dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + gmp? ( >=dev-libs/gmp-4.1.2 ) + iconv? ( virtual/libiconv ) + imap? ( virtual/imap-c-client[ssl=] ) + intl? ( dev-libs/icu ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + kolab? ( >=net-libs/c-client-2004g-r1 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + mssql? ( dev-db/freetds[mssql] ) + !mysqlnd? ( + mysql? ( virtual/mysql ) + mysqli? ( >=virtual/mysql-4.1 ) + ) + 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 ) + 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 ) + spell? ( >=app-text/aspell-0.50 ) + sqlite3? ( >=dev-db/sqlite-3.7.6.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? ( + virtual/jpeg media-libs/libpng sys-libs/zlib ) + ) + unicode? ( dev-libs/oniguruma ) + 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}" + +REQUIRED_USE=" + truetype? ( gd ) + cjk? ( gd ) + exif? ( gd ) + + xpm? ( gd ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xsl? ( xml ) + ldap-sasl? ( ldap ) + kolab? ( imap ) + mhash? ( hash ) + phar? ( hash ) + mysqlnd? ( || ( + mysql + mysqli + pdo + ) ) + + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysql !mysqli ) + sharedmem? ( !threads ) + + !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" + +DEPEND="${DEPEND} + enchant? ( !dev-php/pecl-enchant ) + fileinfo? ( !<dev-php/pecl-fileinfo-1.0.4-r2 ) + filter? ( !dev-php/pecl-filter ) + json? ( !dev-php/pecl-json ) + phar? ( !dev-php/pecl-phar ) + zip? ( !dev-php/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 )" + +# 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" + +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 v2 + 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 v3 + +src_prepare() { + eblit-run src_prepare v4 ; + + if [[ ${CHOST} == *-darwin* ]] ; then + # http://bugs.php.net/bug.php?id=48795, bug #343481 + sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die + fi +} +src_configure() { eblit-run src_configure v54 ; } +src_compile() { eblit-run src_compile v2 ; } +src_install() { eblit-run src_install v3 ; } +src_test() { eblit-run src_test v1 ; } + +#Do not use eblit for this because it will not get sourced when installing from +#binary package (bug #380845) +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + APACHE2_MOD_DEFINE="PHP5" + APACHE2_MOD_CONF="70_mod_php5" + apache-module_pkg_postinst + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order" + elog "to compile extensions for the ${SLOT} ABI" + elog + if ! use readline && use cli ; then + ewarn "Note that in order to use php interactivly, you need to enable" + ewarn "the readline USE flag or php -a will hang" + fi + elog + elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." + elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" + elog "'production' or 'development' in ${EPREFIX}/etc/make.conf" + ewarn "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}" + + # check for not yet migrated old style config dirs + ls "${EROOT}"/etc/php/*-php5 &>/dev/null + if [[ $? -eq 0 ]]; then + ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" + ewarn "files are now kept at ${EROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" + fi + elog + elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" + elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" + elog + + if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then + ewarn "The suhosin USE flag now only installs the suhosin patch!" + ewarn "If you want the suhosin extension, make sure you install" + ewarn " dev-php/suhosin" + ewarn + fi +} diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog new file mode 100644 index 0000000..9d5089f --- /dev/null +++ b/dev-lang/php/ChangeLog @@ -0,0 +1,2603 @@ +# ChangeLog for dev-lang/php +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.583 2012/05/03 20:27:33 maekke Exp $ + + 03 May 2012; Markus Meier <maekke@gentoo.org> php-5.3.11.ebuild: + arm stable, bug #410957 + +*php-5.3.12 (03 May 2012) +*php-5.4.2 (03 May 2012) + + 03 May 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.3.12.ebuild, + +php-5.4.2.ebuild: + Version bump. Fixes recently found security issue with the CGI SAPI + + 01 May 2012; Jeroen Roovers <jer@gentoo.org> php-5.3.11.ebuild: + Stable for HPPA (bug #410957). + + 30 Apr 2012; Agostino Sarubbo <ago@gentoo.org> php-5.3.11.ebuild: + Stable for amd64, wrt bug #410957 + + 29 Apr 2012; Andreas Schuerch <nativemad@gentoo.org> php-5.3.11.ebuild: + x86 stable, see bug 410857 + + 28 Apr 2012; Matti Bickel <mabi@gentoo.org> php-5.3.11.ebuild: + custom suhosin patch no longer needed, revert back to upstream one (fixes + #413785) + +*php-5.4.1 (26 Apr 2012) + + 26 Apr 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.4.1.ebuild: + Version bump of PHP 5.4 + +*php-5.3.11 (26 Apr 2012) + + 26 Apr 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.3.11.ebuild: + Version bump of PHP 5.3.11 + + 24 Apr 2012; Matti Bickel <mabi@gentoo.org> php-5.3.11_rc2.ebuild: + current suhosin patch misapplies in 5.3.11; use a custom patch with changed + offsets to fix this (based on and fixes #411935) + +*php-5.4.1_rc2 (13 Apr 2012) +*php-5.3.11_rc2 (13 Apr 2012) + + 13 Apr 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.3.11_rc2.ebuild, + +php-5.4.1_rc2.ebuild: + Bumping rc versions + + 30 Mar 2012; Ole Markus With <olemarkus@gentoo.org> Manifest: + Manifest fix + + 06 Mar 2012; Ole Markus With <olemarkus@gentoo.org> php-5.3.10-r2.ebuild, + php-5.3.10.ebuild, php-5.4.0.ebuild: + Changing patchset location. Bug #405823 + + 03 Mar 2012; Ole Markus With <olemarkus@gentoo.org> -php-5.3.9.ebuild, + -php-5.4.0_rc8.ebuild: + Removed older versions + + 03 Mar 2012; Brent Baude <ranger@gentoo.org> php-5.3.10.ebuild: + Marking php-5.3.10 ppc64 for bug 401997 + + 02 Mar 2012; Ole Markus With <olemarkus@gentoo.org> + files/eblits/src_configure-v53.eblit, php-5.4.0.ebuild: + Adding runtime dependencies + +*php-5.4.0 (01 Mar 2012) + + 01 Mar 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0.ebuild, + files/eblits/src_configure-v53.eblit: + PHP 5.4 final released + + 28 Feb 2012; Ole Markus With <olemarkus@gentoo.org> + files/eblits/src_configure-v53.eblit, files/eblits/src_configure-v54.eblit: + Fixed another bad mabi. Issue 406107 + + 28 Feb 2012; Matti Bickel <mabi@gentoo.org> + files/eblits/src_configure-v53.eblit: + fix typo in src_configure-v53.eblit (bug #406107), thanks to Matthew for + catching this + + 27 Feb 2012; Matti Bickel <mabi@gentoo.org> + files/eblits/src_configure-v53.eblit, files/eblits/src_configure-v54.eblit: + rely on /etc/env.d/50oracle-instantclient-basic to provide oci configuration + for php (bug #380581) + + 18 Feb 2012; Raúl Porcel <armin76@gentoo.org> php-5.3.10.ebuild: + ia64/s390/sh/sparc stable wrt #401997 + + 18 Feb 2012; Ole Markus With <olemarkus@gentoo.org> -php-5.4.0_rc7-r1.ebuild, + -php-5.4.0_rc7.ebuild, metadata.xml: + Cleaned up metadata.xml and removed some old versions + + 17 Feb 2012; Tobias Klausmann <klausman@gentoo.org> php-5.3.10.ebuild: + Stable on alpha, bug #401997 + + 17 Feb 2012; Ole Markus With <olemarkus@gentoo.org> php-5.4.0_rc8.ebuild: + Remove rc8 dep on <libpcre-8.30 + +*php-5.4.0_rc8 (16 Feb 2012) + + 16 Feb 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_rc8.ebuild, + php-5.3.10-r2.ebuild: + Bumping RC + + 13 Feb 2012; Markus Meier <maekke@gentoo.org> php-5.3.10.ebuild: + arm stable, bug #401997 + +*php-5.4.0_rc7-r1 (09 Feb 2012) + + 09 Feb 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_rc7-r1.ebuild, + php-5.3.10.ebuild, php-5.4.0_rc7.ebuild: + Revbump making php build against libpcre-8.30 + + 09 Feb 2012; Thomas Kahle <tomka@gentoo.org> php-5.3.10.ebuild: + marked x86 per bug 401997 + +*php-5.3.10-r2 (06 Feb 2012) + + 06 Feb 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.3.10-r2.ebuild, + -php-5.3.10-r1.ebuild: + Another fix for bug 402357. Should be somewhat safer than the previous fix + + 06 Feb 2012; Brent Baude <ranger@gentoo.org> php-5.3.10.ebuild: + Marking php-5.3.10 ppc for bug 401997 + + 06 Feb 2012; Ole Markus With <olemarkus@gentoo.org> + files/eblits/src_test-v1.eblit: + Fixed FEATURES="test", which apparently has not been working for a while. + +*php-5.3.10-r1 (06 Feb 2012) + + 06 Feb 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.3.10-r1.ebuild, + -php-5.4.0_rc6.ebuild, php-5.3.10.ebuild, php-5.3.9.ebuild, + php-5.4.0_rc7.ebuild: + Fixed compile fail against libpcre. Bug 402357 Non-fixed versions block + libpcre-8.30+ + + 06 Feb 2012; Jeroen Roovers <jer@gentoo.org> php-5.3.10.ebuild: + Stable for HPPA (bug #401997). + + 03 Feb 2012; Agostino Sarubbo <ago@gentoo.org> php-5.3.10.ebuild: + Stable for AMD64, wrt security bug #401997 + +*php-5.4.0_rc7 (03 Feb 2012) + + 03 Feb 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_rc7.ebuild: + RC version bump + + 02 Feb 2012; Matti Bickel <mabi@gentoo.org> php-5.3.10.ebuild: + use upstream suhosin patch instead of our own with php-5.3.10 + +*php-5.3.10 (02 Feb 2012) + + 02 Feb 2012; Matti Bickel <mabi@gentoo.org> +php-5.3.10.ebuild: + security bump, this closes a remote code execution possibility (see #401997); + this version can still use unchanged gentoo patchset/suhosin from php-5.3.9 + + 26 Jan 2012; Ole Markus With <olemarkus@gentoo.org> -php-5.3.8.ebuild, + -php-5.3.9_rc1.ebuild, -php-5.3.9_rc2.ebuild, -php-5.3.9_rc3.ebuild, + -php-5.3.9_rc4.ebuild, -php-5.4.0_rc3.ebuild, -php-5.4.0_rc4.ebuild, + -php-5.4.0_rc5.ebuild: + Removed older versions + + 21 Jan 2012; Ole Markus With <olemarkus@gentoo.org> -php-5.2.17.ebuild: + Removing PHP 5.2. Bye bye + +*php-5.4.0_rc6 (20 Jan 2012) + + 20 Jan 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_rc6.ebuild: + Bump of 5.4 RC + + 17 Jan 2012; Jeroen Roovers <jer@gentoo.org> php-5.3.9.ebuild: + Stable for HPPA (bug #384301). + + 16 Jan 2012; Mark Loeser <halcy0n@gentoo.org> php-5.3.9.ebuild: + Stable for ppc/ppc64; bug #384301 + + 14 Jan 2012; Raúl Porcel <armin76@gentoo.org> php-5.3.9.ebuild: + alpha/arm/ia64/s390/sh/sparc stable wrt #384301 + + 12 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> php-5.3.9.ebuild: + x86 stable wrt bug #384301 + + 11 Jan 2012; Agostino Sarubbo <ago@gentoo.org> php-5.3.9.ebuild: + Stable for AMD64, wrt security bug #384301 + + 11 Jan 2012; Ole Markus With <olemarkus@gentoo.org> php-5.3.9.ebuild: + Added support for suhosin again. Thanks a bunch to Hanno Boeck (bug 398495) + + 11 Jan 2012; Ole Markus With <olemarkus@gentoo.org> php-5.3.9.ebuild: + Removed suhosin for 5.3.9 as it has not been released yet (bug #398495) + +*php-5.3.9 (11 Jan 2012) + + 11 Jan 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.3.9.ebuild: + Version bump + +*php-5.4.0_rc5 (06 Jan 2012) + + 06 Jan 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_rc5.ebuild: + Added 5.4.0 RC5 + +*php-5.4.0_rc4 (24 Dec 2011) +*php-5.3.9_rc4 (24 Dec 2011) + + 24 Dec 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.3.9_rc4.ebuild, + +php-5.4.0_rc4.ebuild: + Bumping php release candidates + + 23 Dec 2011; Ole Markus With <olemarkus@gentoo.org> + files/eblits/src_configure-v53.eblit: + Fixed a typo leading to bug 395725 + + 18 Dec 2011; Ole Markus With <olemarkus@gentoo.org> + +files/eblits/src_configure-v54.eblit, -files/eblits/src_configure-v3.eblit, + php-5.4.0_rc3.ebuild: + Changed src_config eblit versions to make it easier to figure out which eblit + is used where + + 17 Dec 2011; Ole Markus With <olemarkus@gentoo.org> php-5.3.9_rc3.ebuild: + Removed other REQUIRED_USE entries referencing USE flags not in IUSE + + 17 Dec 2011; Zac Medico <zmedico@gentoo.org> php-5.3.9_rc3.ebuild: + Bug #394995 - Remove invalid birdstep? conditionals from RDEPEND and + REQUIRED_USE, since the birdstep flag is no longer listed in IUSE. + +*php-5.3.9_rc3 (16 Dec 2011) + + 16 Dec 2011; Ole Markus With <olemarkus@gentoo.org> + +files/eblits/src_configure-v53.eblit, files/eblits/src_install-v2.eblit, + +php-5.3.9_rc3.ebuild, php-5.4.0_rc3.ebuild: + Bumping rc of 5.3.9. Contains a bunch of fixes backported from the 5.4 + ebuilds. + + 14 Dec 2011; Matti Bickel <mabi@gentoo.org> php-5.2.17.ebuild, + php-5.3.8.ebuild, php-5.3.9_rc1.ebuild, php-5.3.9_rc2.ebuild, + php-5.4.0_rc3.ebuild: + Merging categories dev-php5 and dev-php (bug #324665) + + 09 Dec 2011; Ole Markus With <olemarkus@gentoo.org> + -files/eblits/pkg_postinst-v2.eblit, php-5.2.17.ebuild, php-5.3.8.ebuild, + -php-5.4.0_rc1.ebuild, -php-5.4.0_rc2.ebuild, php-5.4.0_rc3.ebuild: + Removed pkg_postinst and all references due to bug #380845 + + 09 Dec 2011; Ole Markus With <olemarkus@gentoo.org> + -files/eblits/common-v1.eblit, php-5.2.17.ebuild, php-5.3.8.ebuild, + php-5.3.9_rc1.ebuild, php-5.3.9_rc2.ebuild: + Remove referenes to common v1 eblit + +*php-5.4.0_rc3 (09 Dec 2011) + + 09 Dec 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_rc3.ebuild: + Version bump of 5.4 RC. 5.3 will follow, but I want to backport some ebuild + changes first + + 06 Dec 2011; Ole Markus With <olemarkus@gentoo.org> -files/php-fpm.init, + files/php-fpm-r4.init: + Migrated changes from issue 390307 + +*php-5.4.0_rc2 (25 Nov 2011) +*php-5.3.9_rc2 (25 Nov 2011) + + 25 Nov 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.3.9_rc2.ebuild, + +php-5.4.0_rc2.ebuild: + Bump of the release candidates + + 18 Nov 2011; Ole Markus With <olemarkus@gentoo.org> files/php-fpm.init: + Fixed init script for multislotting. Bug 390307. Thanks to Guillaume + Castagnino and Piotr Karbowski for input + + 11 Nov 2011; Ole Markus With <olemarkus@gentoo.org> -php-5.4.0_beta2.ebuild: + Removed beta of 5.4 + +*php-5.4.0_rc1 (11 Nov 2011) + + 11 Nov 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_rc1.ebuild: + Added php 5.4 RC1 + + 08 Nov 2011; Ole Markus With <olemarkus@gentoo.org> + -files/70_mod_php5.conf-apache2-r1, -files/eblits/src_install-v1.eblit, + php-5.4.0_beta2.ebuild, -files/eblits/pkg_postinst-v1.eblit, + -files/eblits/pkg_setup-v1.eblit, -files/php-fpm-gentooified-5.3.4.patch, + -php-5.4.0_beta1.ebuild, -files/eblits/src_configure-snapshots.eblit, + -files/eblits/src_configure-v1.eblit, + -files/eblits/src_prepare-snapshots.eblit, -files/php-fpm.conf, + -files/php-fpm-gentooified.patch, -files/php-fpm-r0.conf, + -files/php-fpm-r3.init, files/eblits/src_install-v3.eblit: + Major cleanup of the ./files. Hopefully I did not break anything + +*php-5.3.9_rc1 (04 Nov 2011) + + 04 Nov 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.3.9_rc1.ebuild: + Added 5.3.9 RC1. The PHP release candidates are now released directly to + ~arch + + 31 Oct 2011; Matti Bickel <mabi@gentoo.org> + +files/eblits/src_compile-v2.eblit, files/eblits/src_install-v3.eblit, + php-5.4.0_beta2.ebuild: + Simplify src_compile and grab binaries/apache modules directly from + sapis-build directory, circumventing make install-sapi to fix bug #351266 + +*php-5.4.0_beta2 (20 Oct 2011) + + 20 Oct 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_beta2.ebuild: + Bump beta version of 5.4.0 + + 22 Sep 2011; Ole Markus With <olemarkus@gentoo.org> php-5.3.8.ebuild: + Enabling xml USE flag by default + + 16 Sep 2011; Ole Markus With <olemarkus@gentoo.org> -php-5.3.6.ebuild, + -php-5.3.6-r1.ebuild, -php-5.3.7_rc5.ebuild, -php-5.4.0_alpha3.ebuild: + Removed older versions + +*php-5.4.0_beta1 (16 Sep 2011) + + 16 Sep 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_beta1.ebuild: + Bump 5.4 to beta1 + + 16 Sep 2011; Ole Markus With <olemarkus@gentoo.org> + files/eblits/src_configure-v3.eblit, files/eblits/src_install-v3.eblit, + php-5.4.0_alpha3.ebuild: + Remove deps on phpconfutils and php-common-r1 + + 03 Sep 2011; Raúl Porcel <armin76@gentoo.org> php-5.3.8.ebuild: + alpha/ia64/s390/sh/sparc stable wrt #372745 + + 28 Aug 2011; Markus Meier <maekke@gentoo.org> php-5.3.8.ebuild: + arm stable, bug #372745 + + 26 Aug 2011; Markos Chandras <hwoarang@gentoo.org> php-5.3.8.ebuild: + Stable on amd64 wrt bug #372745 + + 26 Aug 2011; Ole Markus With <olemarkus@gentoo.org> metadata.xml: + Removed older versions + + 26 Aug 2011; Thomas Kahle <tomka@gentoo.org> php-5.3.8.ebuild: + x86 stable per bug 372745 + + 25 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> php-5.3.8.ebuild: + ppc/ppc64 stable wrt #372745 + + 25 Aug 2011; Jeroen Roovers <jer@gentoo.org> php-5.3.8.ebuild: + Stable for HPPA (bug #372745). + +*php-5.3.8 (24 Aug 2011) + + 24 Aug 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.3.8.ebuild: + Version bump + + 22 Aug 2011; Ole Markus With <olemarkus@gentoo.org> + files/eblits/pkg_postinst-v1.eblit, php-5.2.17.ebuild: + Disable installing suhosin extension on use suhosin for 5.2.17. Should always + be installed manually. Same behaviour as all other versions of php + + 21 Aug 2011; Ole Markus With <olemarkus@gentoo.org> -php-5.3.7_rc2.ebuild, + -php-5.3.7_rc3.ebuild, -php-5.3.7.ebuild, -php-5.4.0_alpha1.ebuild, + -php-5.5.0_pre201105211430.ebuild: + Removed older alphas and rcs + + 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) + + 12 Aug 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.3.7_rc5.ebuild: + Bumped RC for 5.3.7 + +*php-5.4.0_alpha3 (08 Aug 2011) + + 08 Aug 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_alpha3.ebuild: + Bumping 5.4 to alpha3 + + 26 Jul 2011; <olemarkus@gentoo.org> files/eblits/pkg_postinst-v2.eblit: + Removed some unnecessary warnings + +*php-5.3.7_rc3 (23 Jul 2011) + + 23 Jul 2011; Ole Markus With <olemarkus@gentoo.org> +files/php-fpm-r0.conf, + +files/php-fpm-r1.conf, +files/php-fpm-r4.init, + files/eblits/src_install-v2.eblit, +php-5.3.7_rc3.ebuild: + New rc. Includes new init script with better pid handling + + 20 Jul 2011; <olemarkus@gentoo.org> files/eblits/src_install-v3.eblit: + Removed some 'security' fixes for php.ini. + + 02 Jul 2011; Ole Markus With <olemarkus@gentoo.org> + +files/eblits/pkg_setup-v3.eblit, files/eblits/src_configure-v3.eblit, + php-5.4.0_alpha1.ebuild: + Removed call to silly phpconfutils_init. Added addpredict to src_configure + (also silly) + +*php-5.3.7_rc2 (01 Jul 2011) + + 01 Jul 2011; Ole Markus With <olemarkus@gentoo.org> -php-5.3.7_rc1.ebuild, + +php-5.3.7_rc2.ebuild: + Bumped 5.3.7 rc version + + 29 Jun 2011; Ole Markus With <olemarkus@gentoo.org> -php-5.3.5.ebuild, + -php-5.3.5-r1.ebuild, -php-5.4.0_pre201105211430.ebuild: + Removed older versions + +*php-5.4.0_alpha1 (29 Jun 2011) + + 29 Jun 2011; Ole Markus With <olemarkus@gentoo.org> + +files/eblits/src_configure-v3.eblit, +files/eblits/src_prepare-v4.eblit, + +php-5.4.0_alpha1.ebuild: + Added php 5.4 alpha 1 + +*php-5.3.7_rc1 (17 Jun 2011) + + 17 Jun 2011; Ole Markus With <olemarkus@gentoo.org> + files/eblits/src_install-v2.eblit, +php-5.3.7_rc1.ebuild: + Added php-5.3.7_rc1 + Fixed bug 359905 + +*php-5.5.0_pre201105211430 (22 May 2011) +*php-5.4.0_pre201105211430 (22 May 2011) + + 22 May 2011; Ole Markus With <olemarkus@gentoo.org> + -php-5.4.0_pre201105151030.ebuild, +php-5.4.0_pre201105211430.ebuild, + +php-5.5.0_pre201105211430.ebuild: + Bumped snapshot versions and added a snapshot from the 5.4 branch (5.5 being + trunk now) + +*php-5.4.0_pre201105151030 (15 May 2011) + + 15 May 2011; <olemarkus@gentoo.org> -php-5.4.0_pre201104301030.ebuild, + +php-5.4.0_pre201105151030.ebuild, + +files/eblits/src_configure-snapshots.eblit: + Bumped the php snapshot version + + 08 May 2011; <olemarkus@gentoo.org> php-5.4.0_pre201104301030.ebuild, + +files/eblits/src_configure-snapshots.eblit: + Remove sqlite2 support and the sqlite3 USE flag. sqlite USE flag now enabled + sqlite3 + +*php-5.4.0_pre201104301030 (01 May 2011) + + 01 May 2011; <olemarkus@gentoo.org> +php-5.4.0_pre201104301030.ebuild, + +files/eblits/src_prepare-snapshots.eblit: + Added SVN snapshot ebuild + +*php-5.3.6-r1 (19 Apr 2011) + + 19 Apr 2011; <olemarkus@gentoo.org> php-5.2.14.ebuild, php-5.2.17.ebuild, + +php-5.3.6-r1.ebuild: + Added an EAPI4 version + + 09 Apr 2011; Raúl Porcel <armin76@gentoo.org> php-5.3.6.ebuild: + alpha/ia64/s390/sh/sparc stable wrt #358791 + + 05 Apr 2011; Markus Meier <maekke@gentoo.org> php-5.3.6.ebuild: + arm stable, bug #358791 + + 02 Apr 2011; Christoph Mende <angelos@gentoo.org> php-5.3.6.ebuild: + Stable on amd64 wrt bug #358791 + + 02 Apr 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> php-5.3.6.ebuild: + x86 stable wrt security bug #358791 + + 02 Apr 2011; Jeroen Roovers <jer@gentoo.org> php-5.3.6.ebuild: + Stable for HPPA (bug #358791). + + 01 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org> php-5.3.6.ebuild: + ppc/ppc64 stable wrt #358791 + + 20 Mar 2011; <olemarkus@gentoo.org> -php-5.3.6_rc3.ebuild: + Removed RC as PHP 5.3.6 is now released + + 18 Mar 2011; <olemarkus@gentoo.org> +php-5.2.14.ebuild: + Readded 5.2.14 to unbreak a few neglected packages + +*php-5.3.6 (17 Mar 2011) + + 17 Mar 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.3.6.ebuild: + Version bump + + 17 Mar 2011; Ole Markus With <olemarkus@gentoo.org> + files/eblits/pkg_setup-v1.eblit, php-5.2.17.ebuild, php-5.3.3-r1.ebuild, + php-5.3.5.ebuild, php-5.3.5-r1.ebuild, files/eblits/pkg_setup-v2.eblit, + php-5.3.6_rc3.ebuild: + Removed use of php_check_imap. #359221 + + 17 Mar 2011; Ole Markus With <olemarkus@gentoo.org> -php-5.2.14.ebuild, + -php-5.2.16.ebuild, -php-5.3.4.ebuild: + Removed older versions + + 16 Mar 2011; <olemarkus@gentoo.org> php-5.3.6_rc3.ebuild: + Reordered the SAPIs so that embed is always the first sapi to be built if + selected. Fixes #358687 + + 13 Mar 2011; <olemarkus@gentoo.org> +files/eblits/src_prepare-v3.eblit, + php-5.3.6_rc3.ebuild: + Added epatch_user. #357637 + +*php-5.3.6_rc3 (10 Mar 2011) + + 10 Mar 2011; <olemarkus@gentoo.org> -php-5.3.6_rc1.ebuild, + -php-5.3.6_rc2.ebuild, +php-5.3.6_rc3.ebuild: + Another RC added + +*php-5.3.6_rc2 (03 Mar 2011) + + 03 Mar 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.3.6_rc2.ebuild: + New 5.3.6 RC2 + + 25 Feb 2011; Kevin McCarthy <signals@gentoo.org> php-5.2.14.ebuild, + php-5.2.16.ebuild, php-5.2.17.ebuild, php-5.3.3-r1.ebuild: + Updated depends from media-libs/jpeg to virtual/jpeg + + 25 Feb 2011; Ole Markus With <olemarkus@gentoo.org> php-5.3.5.ebuild, + php-5.3.6_rc1.ebuild: + Remove dependency on libevent + + 17 Feb 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.3.6_rc1.ebuild, + metadata.xml: + Added an ebuild for 5.3.6 RC1 + The suhosin USE flag no longer installs the extension, only the suhosin + patch + +*php-5.3.6_rc1 (17 Feb 2011) + + 30 Jan 2011; Raúl Porcel <armin76@gentoo.org> php-5.2.16.ebuild, + php-5.2.17.ebuild, php-5.3.3-r1.ebuild, php-5.3.4.ebuild, php-5.3.5.ebuild, + php-5.3.5-r1.ebuild: + alpha/ia64/s390/sh/sparc stable + +*php-5.3.5-r1 (29 Jan 2011) + + 29 Jan 2011; Matti Bickel <mabi@gentoo.org> php-5.2.17.ebuild, + +php-5.3.5-r1.ebuild: + fixed bugs #327049 (phar locale failure), #348567 (crypt_r typo), #352560 + (suhosin caused circular dep), #329071 (disable phpize autoconf checks) + + 11 Jan 2011; Jeroen Roovers <jer@gentoo.org> php-5.2.17.ebuild, + php-5.3.5.ebuild: + Stable for HPPA (bug #350908). + + 10 Jan 2011; Kacper Kowalik <xarthisius.kk@gmail.com> php-5.2.17.ebuild, + php-5.3.5.ebuild: + ppc64 stable wrt #350908 + + 09 Jan 2011; Brent Baude <ranger@gentoo.org> php-5.3.5.ebuild: + Marking php-5.3.5 ppc for bug 350908 + + 08 Jan 2011; Markus Meier <maekke@gentoo.org> php-5.3.5.ebuild: + arm stable, bug #350908 + + 08 Jan 2011; Markus Meier <maekke@gentoo.org> php-5.2.17.ebuild: + arm stable, bug #350908 + + 08 Jan 2011; Brent Baude <ranger@gentoo.org> php-5.3.5.ebuild: + Marking php-5.3.5 ~ppc for bug 349659 + + 08 Jan 2011; Brent Baude <ranger@gentoo.org> php-5.2.17.ebuild: + Marking php-5.2.17 ppc for bug 350908 + + 07 Jan 2011; Christian Faulhammer <fauli@gentoo.org> php-5.3.5.ebuild: + stable x86, security bug 350908 + + 07 Jan 2011; Christian Faulhammer <fauli@gentoo.org> php-5.2.17.ebuild: + stable x86, security bug 350908 + + 07 Jan 2011; Markos Chandras <hwoarang@gentoo.org> php-5.2.17.ebuild, + php-5.3.5.ebuild: + Stable on amd64 wrt bug #350908 + +*php-5.3.5 (06 Jan 2011) +*php-5.2.17 (06 Jan 2011) + + 06 Jan 2011; Matti Bickel <mabi@gentoo.org> + files/eblits/pkg_postinst-v2.eblit, -php-5.2.16-r1.ebuild, + +php-5.2.17.ebuild, -php-5.3.4-r1.ebuild, +php-5.3.5.ebuild: + security version bump, remove old + + 05 Jan 2011; Matti Bickel <mabi@gentoo.org> php-5.2.16-r1.ebuild, + php-5.3.4-r1.ebuild: + restore ~alpha and ~ppc64 keywords + +*php-5.3.4-r1 (05 Jan 2011) +*php-5.2.16-r1 (05 Jan 2011) + + 05 Jan 2011; Matti Bickel <mabi@gentoo.org> + files/eblits/pkg_postinst-v2.eblit, +php-5.2.16-r1.ebuild, + files/eblits/src_configure-v2.eblit, +php-5.3.4-r1.ebuild, + files/eblits/src_prepare-v2.eblit: + now includes new suhosin patch, mhash is usable again, interbase/firebird + configure fixed, now includes a warning about stale config dirs + + 02 Jan 2011; Tobias Klausmann <klausman@gentoo.org> php-5.2.16.ebuild: + Stable on alpha, bug #340807 + + 02 Jan 2011; Tobias Klausmann <klausman@gentoo.org> php-5.3.4.ebuild: + Stable on alpha, bug #340807 + + 28 Dec 2010; Brent Baude <ranger@gentoo.org> php-5.2.16.ebuild, + php-5.3.4.ebuild: + Marking -5.2.16 and -5.3.4 ppc64 for bug 340807 + + 27 Dec 2010; <olemarkus@gentoo.org> -php-5.2.14-r2.ebuild, + -php-5.3.3-r3.ebuild: + Removed vulnerable versions from 5.2 and 5.3 slots + + 27 Dec 2010; <olemarkus@gentoo.org> php-5.2.16.ebuild, php-5.3.4.ebuild: + Readded some keywords that was dropped without reason + + 25 Dec 2010; Jeroen Roovers <jer@gentoo.org> php-5.2.16.ebuild, + php-5.3.4.ebuild: + Stable for HPPA (bug #340807). + + 25 Dec 2010; <olemarkus@gentoo.org> php-5.3.4.ebuild: + Prevented the fpm sapi from force-enabling the cli sapi (bug 349122) + + 21 Dec 2010; Matti Bickel <mabi@gentoo.org> +files/php-fpm.conf, + files/eblits/src_configure-v2.eblit, files/php-fpm-r3.init: + fixed missing php-fpm.conf (bug #349179), removed unused configure option, + simplified php-fpm path (you need to use eselect php set php-fpm php5.3 + before starting!) + + 20 Dec 2010; Brent Baude <ranger@gentoo.org> php-5.2.14-r2.ebuild, + php-5.3.3-r3.ebuild: + Marking -5.3.3-r3 and -5.2.14-r2 ~ppc64 for bug 343597 + + 20 Dec 2010; Markos Chandras <hwoarang@gentoo.org> php-5.2.16.ebuild, + php-5.3.4.ebuild: + Stable on amd64 wrt bug #340807 + + 19 Dec 2010; Matti Bickel <mabi@gentoo.org> + +files/php-fpm-gentooified-5.3.4.patch, +files/php-fpm-r3.init, + -files/php-fpm-r1.init, files/eblits/src_install-v2.eblit: + somehow managed to miss the fpm part of the src_install update: new init/conf + files fix bugs #343649, #348507 + + 19 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> php-5.2.16.ebuild, + php-5.3.4.ebuild: + x86 stable wrt security bug #340807 + +*php-5.3.4 (19 Dec 2010) +*php-5.2.16 (19 Dec 2010) + + 19 Dec 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_install-v2.eblit, files/eblits/src_prepare-v2.eblit, + +php-5.2.16.ebuild, +php-5.3.4.ebuild: + new upstream version with security fixes (bug #340807), also provide complete + fpm config/init file instead of patching upstream (thanks to Ole Markus) + + 22 Nov 2010; Ole Markus With <olemarkus@gentoo.org> + files/eblits/pkg_postinst-v1.eblit, files/eblits/pkg_postinst-v2.eblit: + Added link to upgrade guide + + 09 Nov 2010; Jeroen Roovers <jer@gentoo.org> php-5.2.14-r2.ebuild, + php-5.3.3-r3.ebuild: + Marked ~hppa (bug #343597). + + 05 Nov 2010; Markus Meier <maekke@gentoo.org> php-5.2.14-r2.ebuild: + add ~arm, bug #343597 + + 05 Nov 2010; Markus Meier <maekke@gentoo.org> php-5.3.3-r3.ebuild: + add ~arm, bug #343597 + + 05 Nov 2010; Jeroen Roovers <jer@gentoo.org> php-5.3.3-r1.ebuild: + Stable for HPPA (bug #336869). + + 04 Nov 2010; Matti Bickel <mabi@gentoo.org> php-5.3.3-r3.ebuild: + do not block versions of pecl-fileinfo supporting minor version slotting + + 02 Nov 2010; <olemarkus@gentoo.org> files/eblits/pkg_postinst-v2.eblit, + files/eblits/src_install-v2.eblit: + Added abit more information to postinst + + 01 Nov 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/pkg_postinst-v2.eblit: + fix typo causing skip of eselect (bug #343723) + +*php-5.3.3-r3 (31 Oct 2010) +*php-5.2.14-r2 (31 Oct 2010) + + 31 Oct 2010; <olemarkus@gentoo.org> -php-5.2.14-r1.ebuild, + +php-5.2.14-r2.ebuild, -php-5.3.3-r2.ebuild, +php-5.3.3-r3.ebuild: + Revbumping with a new patchset (bug 342397) + + 31 Oct 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_configure-v2.eblit: + properly fix bug #281316 (thanks to Alex Kiesel for noticing) + + 31 Oct 2010; <olemarkus@gentoo.org> files/eblits/pkg_postinst-v2.eblit: + Fixed a QA issue related to nonexisting SAPIs + + 30 Oct 2010; <olemarkus@gentoo.org> files/eblits/pkg_postinst-v2.eblit, + php-5.2.14-r1.ebuild, files/eblits/src_install-v2.eblit, + php-5.3.3-r2.ebuild: + Changed ebuild to use php.ini-development by default + Also made ebuilds add symlink to php-cgi if the cgi SAPI is installed + + 27 Oct 2010; <olemarkus@gentoo.org> files/eblits/src_install-v1.eblit, + files/eblits/src_install-v2.eblit: + Corrected typo in the src_install eblit (#342769) + + 24 Oct 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_install-v2.eblit: + install apache module config file into standard directory + + 24 Oct 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_configure-v1.eblit, files/eblits/src_configure-v2.eblit: + enable pdo-sqlite via USE="sqlite3" not USE="sqlite" + + 21 Oct 2010; <olemarkus@gentoo.org> files/eblits/pkg_postinst-v1.eblit: + Added an additional warning about extension_dir to pkg_postinst + + 20 Oct 2010; Markos Chandras <hwoarang@gentoo.org> php-5.3.3-r1.ebuild: + Stable on amd64 wrt bug #336869 + + 19 Oct 2010; <olemarkus@gentoo.org> -php-5.2.13.ebuild: + Removing old version + + 19 Oct 2010; <olemarkus@gentoo.org> files/eblits/src_install-v2.eblit, + +files/php-fpm-r1.init: + Added new fpm.init script that works with minor version slotting + + 17 Oct 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_install-v1.eblit, files/eblits/src_install-v2.eblit: + change allow_url_fopen back to Off (bug #332763) + + 14 Oct 2010; Christian Faulhammer <fauli@gentoo.org> php-5.3.3-r1.ebuild: + x86 stable, bug 336869 + +*php-5.3.3-r2 (06 Oct 2010) +*php-5.2.14-r1 (06 Oct 2010) + + 06 Oct 2010; <olemarkus@gentoo.org> +php-5.2.14-r1.ebuild, + +php-5.3.3-r2.ebuild: + Added PHP ebuilds with minor version slotting support + + 19 Sep 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_configure-v1.eblit, files/eblits/src_configure-v52.eblit: + fix building against IBM DB2, you now can use your DB2_HOME env variable + again (bug #337512, thanks reavertm for the patch) + + 07 Sep 2010; Matti Bickel <mabi@gentoo.org> php-5.2.14.ebuild: + enable spl and reflection by default, following upstream (bug #310383) + + 22 Aug 2010; Mark Loeser <halcy0n@gentoo.org> php-5.3.3-r1.ebuild: + Add back ~arm. It was dropped during the bump + + 16 Aug 2010; Jeroen Roovers <jer@gentoo.org> php-5.2.14.ebuild: + Stable for HPPA (bug #332039). + + 14 Aug 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_compile-v1.eblit: + snmp causes sandbox errors in src_compile, too (bug #324739) + + 14 Aug 2010; Raúl Porcel <armin76@gentoo.org> php-5.2.14.ebuild: + alpha/arm/ia64/s390/sh/sparc stable wrt #332039 + + 12 Aug 2010; Matti Bickel <mabi@gentoo.org> php-5.2.14.ebuild: + patch tarball now includes the correctly named kolab patch (bug #332423) + + 11 Aug 2010; Joseph Jezak <josejx@gentoo.org> php-5.2.14.ebuild, + php-5.3.3-r1.ebuild: + Marked ppc/ppc64 stable for bug #332039. Marked ~ppc/~ppc64 for bug + #321743. + + 11 Aug 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_configure-v52.eblit, php-5.3.3-r1.ebuild: + 5.3 does not need flex; also fix a compile error with + -Wimplicit-function-declaration (bug #332273) + + 11 Aug 2010; Matti Bickel <mabi@gentoo.org> -php-5.3.2.ebuild: + remove php-5.3.2 due to security issues (bug #332039) + + 11 Aug 2010; Matti Bickel <mabi@gentoo.org> php-5.2.14.ebuild, + php-5.3.3-r1.ebuild: + enable xml, xmlreader and xmlwriter per default, as upstream does, too + (bug #332311) + + 11 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> php-5.2.14.ebuild: + x86 stable wrt security bug #332039 + + 10 Aug 2010; Markos Chandras <hwoarang@gentoo.org> php-5.2.14.ebuild: + Stable on amd64 wrt bug #332039 + + 09 Aug 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_configure-v1.eblit, files/eblits/src_configure-v52.eblit: + configure sapi build dirs in 5.2, too (bug #331751); use proper path for + libevent, fix sharedext, fpm config file install (bug #331735) + + 09 Aug 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_test-v1.eblit: + run from cli sapi build dir (bug #330023) + + 09 Aug 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_install-v1.eblit: + cd to sapi dirs to make fpm config patches apply again (bug #331735) + +*php-5.3.3-r1 (08 Aug 2010) + + 08 Aug 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_compile-v1.eblit, -php-5.3.3.ebuild, + files/eblits/src_configure-v1.eblit, files/eblits/src_install-v1.eblit, + +php-5.3.3-r1.ebuild: + fix QA warnings by building each SAPI in its own dir, add patch to fix bug + #327589 (thanks to Martin von Gagern) + + 03 Aug 2010; Matti Bickel <mabi@gentoo.org> php-5.2.14.ebuild: + added missing mhash in IUSE + +*php-5.2.14 (02 Aug 2010) + + 02 Aug 2010; Matti Bickel <mabi@gentoo.org> + +files/eblits/src_configure-v52.eblit, +php-5.2.14.ebuild: + version bump; this is a security update - see + http://www.php.net/archive/2010.php#id2010-07-22-1 for details + + 29 Jul 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_install-v1.eblit: + use /tmp for session.save_path (bug #282768) + + 29 Jul 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_install-v1.eblit: + add addpredict to work-around bug #324739 + + 28 Jul 2010; Markus Meier <maekke@gentoo.org> php-5.3.3.ebuild: + add ~arm, bug #321743 + + 26 Jul 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_compile-v1.eblit, files/eblits/src_configure-v1.eblit, + files/eblits/src_install-v1.eblit, +files/php-fpm.init, + +files/php-fpm-gentooified.patch, metadata.xml: + update fpm description, actually support fpm in the eblits + +*php-5.3.3 (26 Jul 2010) + + 26 Jul 2010; Matti Bickel <mabi@gentoo.org> php-5.3.2.ebuild, + +php-5.3.3.ebuild, metadata.xml: + version bump, simplify postgres deps (bug #326967), fixes strict aliasing + issues (#329753), version bump is a security update + + 25 Jul 2010; Tobias Klausmann <klausman@gentoo.org> php-5.3.2.ebuild: + Keyworded on alpha, bug #321743 + + 19 Jul 2010; Jeroen Roovers <jer@gentoo.org> php-5.3.2.ebuild: + Marked ~hppa (bug #321743). + + 08 Jul 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/pkg_setup-v1.eblit, php-5.3.2.ebuild: + can not have use-deps on old style virtuals + + 05 Jul 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_configure-v1.eblit: + fix compilation on x64 systems (bug #327025) + + 05 Jul 2010; Matti Bickel <mabi@gentoo.org> php-5.2.13.ebuild: + introduced new style virtual httpd-php (bug #319623) + + 05 Jul 2010; Matti Bickel <mabi@gentoo.org> -php-5.2.9-r2.ebuild, + -php-5.2.10.ebuild, -php-5.2.10-r1.ebuild, -php-5.2.10-r2.ebuild, + -php-5.2.11.ebuild, -php-5.2.11-r1.ebuild, -php-5.2.12.ebuild: + remove old + + 05 Jul 2010; Matti Bickel <mabi@gentoo.org> php-5.3.2.ebuild: + introduced new style virtual httpd-php (bug #319623) + + 04 Jul 2010; Matti Bickel <mabi@gentoo.org> php-5.3.2.ebuild: + include patch to compile with gmp-5* (bug #322303) + + 14 Jun 2010; <mabi@gentoo.org> files/eblits/src_install-v1.eblit, + php-5.3.2.ebuild: + sync with overlay: repair apache2 USE dep, cli SAPI on by default (bug + #310383), show all SAPIs in php-config (bug #278439) + + 12 Jun 2010; <mabi@gentoo.org> php-5.3.2.ebuild, metadata.xml: + USE="mbstring" already covered by USE="unicode"; set USE-defaults to match + upstream defaults (bug #285816) + + 11 Jun 2010; <mabi@gentoo.org> files/eblits/src_compile-v1.eblit, + php-5.3.2.ebuild, files/eblits/src_configure-v1.eblit: + make USE="iodbc" independant from USE="odbc", fix embed SAPI compile + failure + + 01 Jun 2010; <mabi@gentoo.org> -files/eblits/common-v2.eblit, + -files/eblits/src_compile-v2.eblit, -files/eblits/src_install-v2.eblit, + files/eblits/src_prepare-v1.eblit, php-5.3.2.ebuild, metadata.xml: + align more closely with original php-5.3 work from hoffie@gentoo.org, fix + missing mbstring use description, remove unneeded -v2 eblits, remove + dangling mcve references + + 30 May 2010; <mabi@gentoo.org> -files/20php4-envd, php-5.3.2.ebuild, + -files/php4-ldvs: + fix iodbc USE dep (bug #285419), remove unneeded php4 files + + 28 May 2010; <mabi@gentoo.org> php-5.3.2.ebuild: + add flex dependency (bug #221357) + + 28 May 2010; <mabi@gentoo.org> files/eblits/src_prepare-v1.eblit: + use portable find command (bug #321781) + +*php-5.3.2 (27 May 2010) + + 27 May 2010; <mabi@gentoo.org> files/70_mod_php5_concurr.conf-apache2, + files/70_mod_php5.conf-apache2, +files/eblits/common-v1.eblit, + +files/eblits/common-v2.eblit, +files/eblits/pkg_postinst-v1.eblit, + +files/eblits/pkg_setup-v1.eblit, +files/eblits/src_compile-v1.eblit, + +files/eblits/src_compile-v2.eblit, +files/eblits/src_configure-v1.eblit, + +files/eblits/src_install-v1.eblit, +files/eblits/src_install-v2.eblit, + +files/eblits/src_prepare-v1.eblit, +files/eblits/src_test-v1.eblit, + +php-5.3.2.ebuild: + version bump (bug #274512, #312775); see + http://www.php.net/ChangeLog-5.php#5.3.2 for a list of changes and the + migration guide for an update from 5.2: + http://www.php.net/manual/en/migration53.php; expect more bumps as we fix + open bugs + thanks to GiDis and olemarkus for providing patches and a lot of testing + + 29 Mar 2010; Markus Meier <maekke@gentoo.org> php-5.2.13.ebuild: + amd64 stable, bug #306939 + + 26 Mar 2010; Raúl Porcel <armin76@gentoo.org> php-5.2.13.ebuild: + alpha/arm/ia64/s390/sh/sparc stable wrt #306939 + + 24 Mar 2010; Jeroen Roovers <jer@gentoo.org> php-5.2.13.ebuild: + Stable for HPPA (bug #306939). + + 23 Mar 2010; Brent Baude <ranger@gentoo.org> php-5.2.13.ebuild: + Marking php-5.2.13 ppc for bug 306939 + + 22 Mar 2010; Christian Faulhammer <fauli@gentoo.org> php-5.2.13.ebuild: + stable x86, security bug 306939 + + 21 Mar 2010; Brent Baude <ranger@gentoo.org> php-5.2.13.ebuild: + Marking php-5.2.13 ppc64 for bug 306939 + +*php-5.2.13 (20 Mar 2010) + + 20 Mar 2010; Tobias Heinlein <keytoaster@gentoo.org> +php-5.2.13.ebuild: + Non-maintainer commit; Version bump, security bug #306939, patch by Bernd + Lommerzheim + + 13 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> php-5.2.12.ebuild, + +files/php-5.2.12-libpng14.patch: + Fix building with libpng14. + + 31 Jan 2010; Torsten Veller <tove@gentoo.org> php-5.2.9-r2.ebuild, + php-5.2.10.ebuild, php-5.2.10-r1.ebuild, php-5.2.10-r2.ebuild, + php-5.2.11.ebuild, php-5.2.11-r1.ebuild, php-5.2.12.ebuild: + Change vecho to echo + + 05 Jan 2010; Raúl Porcel <armin76@gentoo.org> php-5.2.12.ebuild: + ia64/s390/sh/sparc stable wrt #293888 + + 05 Jan 2010; Joseph Jezak <josejx@gentoo.org> php-5.2.12.ebuild: + Marked ppc stable for bug #293888. + + 01 Jan 2010; Tobias Klausmann <klausman@gentoo.org> php-5.2.12.ebuild: + Stable on alpha, bug #293888 + + 31 Dec 2009; Markus Meier <maekke@gentoo.org> php-5.2.12.ebuild: + amd64/arm stable, bug #293888 + + 31 Dec 2009; Christian Faulhammer <fauli@gentoo.org> php-5.2.12.ebuild: + stable x86, security bug 293888 + + 31 Dec 2009; Jeroen Roovers <jer@gentoo.org> php-5.2.12.ebuild: + Stable for HPPA (bug #293888). + + 31 Dec 2009; Brent Baude <ranger@gentoo.org> php-5.2.12.ebuild: + Marking php-5.2.12 ppc64 for bug 293888 + +*php-5.2.12 (30 Dec 2009) + + 30 Dec 2009; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.12.ebuild: + version bump to 5.2.12 wrt security bug 297399, please note that + USE=concurrentmodphp is broken (but should not be needed at the moment + anyway), bug 298969 + + 16 Dec 2009; Christian Hoffmann <hoffie@gentoo.org> php-5.2.11.ebuild, + php-5.2.11-r1.ebuild: + trying to fix the circular dependency we are seeing with suhosin since + 5.2.11 (where I added a version dependency without much thinking), bug + 295871, thanks to Oleg Gawriloff <barzog@telecom.by> + + 21 Nov 2009; nixnut <nixnut@gentoo.org> php-5.2.11-r1.ebuild: + ppc stable #292132 + + 17 Nov 2009; Raúl Porcel <armin76@gentoo.org> php-5.2.11-r1.ebuild: + alpha/ia64/s390/sh/sparc stable wrt #292132 + + 17 Nov 2009; Brent Baude <ranger@gentoo.org> php-5.2.11-r1.ebuild: + Marking php-5.2.11-r1 ppc64 for bug 292132 + + 15 Nov 2009; Jeroen Roovers <jer@gentoo.org> php-5.2.11-r1.ebuild: + Stable for HPPA (bug #292132). + + 14 Nov 2009; Markus Meier <maekke@gentoo.org> php-5.2.11-r1.ebuild: + arm stable, bug #292132 + + 14 Nov 2009; Markus Meier <maekke@gentoo.org> php-5.2.11-r1.ebuild: + amd64/x86 stable, bug #292132 + +*php-5.2.11-r1 (13 Nov 2009) + + 13 Nov 2009; Dawid Węgliński <cla@gentoo.org> +php-5.2.11-r1.ebuild: + Revision bump with fix for gdMaxColors (security bug #292132) + + 19 Oct 2009; Mounir Lamouri <volkmar@gentoo.org> php-5.2.11.ebuild: + Stabilizing for ppc, bug 285434 (also fixing bug 278064) + + 18 Oct 2009; Brent Baude <ranger@gentoo.org> php-5.2.11.ebuild: + Marking php-5.2.11 ppc64 for bug 285434 + + 09 Oct 2009; Christian Hoffmann <hoffie@gentoo.org> php-5.2.11.ebuild: + adding dependency on recent enough suhosin per bug 276583 + + 07 Oct 2009; <chainsaw@gentoo.org> php-5.2.11.ebuild: + Marked stable on AMD64 as requested by Bernd Marienfeldt in security bug + #285434. Tested with USE="apache2 berkdb bzip2 calendar cgi cli crypt + ctype curl gd iconv imap ipv6 mhash mysql ncurses nls pcre pic posix + readline session snmp spl ssl threads tokenizer truetype unicode xml + xmlrpc zlib" serving www.linx.net on hardened AMD64 non-multilib system. + + 07 Oct 2009; Raúl Porcel <armin76@gentoo.org> php-5.2.11.ebuild: + alpha/arm/ia64/s390/sh/sparc stable wrt #285434 + + 07 Oct 2009; Jeroen Roovers <jer@gentoo.org> php-5.2.11.ebuild: + Stable for HPPA (bug #285434). + + 06 Oct 2009; Christian Faulhammer <fauli@gentoo.org> php-5.2.11.ebuild: + stable x86, security bug 285434 + +*php-5.2.11 (29 Sep 2009) + + 29 Sep 2009; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.11.ebuild: + version bump per bug 285434 (security) + +*php-5.2.10-r2 (24 Sep 2009) + + 24 Sep 2009; Dawid Węgliński <cla@gentoo.org> +php-5.2.10-r2.ebuild, + +files/php-5.2.10-pdo_dblib.patch: + Add quick fix for bug #279576 and remove tests/lang/bug45392.phpt which is + not included in 5.2.10 + +*php-5.2.10-r1 (05 Jul 2009) + + 05 Jul 2009; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.10-r1.ebuild: + revbump with the latest suhosin patch (might fix suhosin-related + segfaults, reported in bug 276583), also fixing a curl regression, both + might be the reason for bug 276135 + + 30 Jun 2009; Raúl Porcel <armin76@gentoo.org> php-5.2.10.ebuild: + arm/ia64/s390/sh/sparc stable wrt #274670 + + 27 Jun 2009; Brent Baude <ranger@gentoo.org> php-5.2.10.ebuild: + Marking php-5.2.10 ppc64 and ppc for bug 274670 + + 26 Jun 2009; Tobias Klausmann <klausman@gentoo.org> php-5.2.10.ebuild: + Stable on alpha, bug #274670 + + 26 Jun 2009; Tobias Heinlein <keytoaster@gentoo.org> php-5.2.10.ebuild: + amd64 stable, security bug #274670 + + 25 Jun 2009; Christian Faulhammer <fauli@gentoo.org> php-5.2.10.ebuild: + stable x86, security bug 274670 + + 24 Jun 2009; Christian Hoffmann <hoffie@gentoo.org> metadata.xml: + restoring metadata.xml with zip-external description, somehow repoman + complains otherwise + + 23 Jun 2009; Jeroen Roovers <jer@gentoo.org> php-5.2.10.ebuild, + metadata.xml: + Stable for HPPA (bug #274670). + + 21 Jun 2009; Christian Hoffmann <hoffie@gentoo.org> metadata.xml: + removing traces of USE=zip-external + +*php-5.2.10 (19 Jun 2009) + + 19 Jun 2009; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.10.ebuild: + version bump per security bug 274670, fixes at least one security problem + (DoS) and introduces getopt long support for Gentoo users as requested + + 19 Jun 2009; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.8-r2.ebuild, + -php-5.2.9.ebuild, -php-5.2.9-r1.ebuild: + clean up old and vulnerable + + 26 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + ChangeLog: + Call depend.apache_pkg_setup() in pkg_setup() (bug #268371). + + 26 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + php-5.2.8-r2.ebuild, php-5.2.9.ebuild, php-5.2.9-r1.ebuild, + php-5.2.9-r2.ebuild: + Call depend.apache_pkg_setup() in pkg_setup() (bug #268371). + + 20 Apr 2009; Raúl Porcel <armin76@gentoo.org> php-5.2.9-r2.ebuild: + arm/ia64/s390/sh/sparc stable wrt #260576 + + 18 Apr 2009; Tobias Klausmann <klausman@gentoo.org> php-5.2.9-r2.ebuild: + Stable on alpha, bug #260576 + + 18 Apr 2009; Brent Baude <ranger@gentoo.org> php-5.2.9-r2.ebuild: + Marking php-5.2.9-r2 ppc64 for bug 260576 + + 18 Apr 2009; Markus Meier <maekke@gentoo.org> php-5.2.9-r2.ebuild: + x86 stable, bug #260576 + + 18 Apr 2009; nixnut <nixnut@gentoo.org> php-5.2.9-r2.ebuild: + ppc stable #260576 + + 17 Apr 2009; Jeroen Roovers <jer@gentoo.org> php-5.2.9-r2.ebuild: + Stable for HPPA (bug #260576). + + 17 Apr 2009; Tobias Heinlein <keytoaster@gentoo.org> php-5.2.9-r2.ebuild: + amd64 stable wrt security bug #260576 + +*php-5.2.9-r2 (16 Apr 2009) + + 16 Apr 2009; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.6-r7.ebuild, + -php-5.2.8-r1.ebuild, +php-5.2.9-r2.ebuild: + cleaning old; revision bump to fix yet three possible security issues, see + bug 260576 for details + +*php-5.2.9-r1 (10 Apr 2009) +*php-5.2.9 (10 Apr 2009) + + 10 Apr 2009; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.9.ebuild, + +php-5.2.9-r1.ebuild: + version bump to fix several possible security issues, details to follow, + bug 260576 (5.2.9 is more or less vanilla php, 5.2.9-r1 has lots of + additional backported patches) + + 07 Apr 2009; Christian Faulhammer <fauli@gentoo.org> php-5.2.8-r1.ebuild, + php-5.2.8-r2.ebuild: + revert from EAPI 2 to 0 again, see bug 265245 + + 18 Mar 2009; Raúl Porcel <armin76@gentoo.org> php-5.2.8-r1.ebuild, + php-5.2.8-r2.ebuild: + arm/ia64/s390/sh stable + + 07 Mar 2009; Christian Faulhammer <fauli@gentoo.org> php-5.2.8-r1.ebuild, + php-5.2.8-r2.ebuild: + use EAPI 2 for USE flag check + + 02 Feb 2009; Mike Frysinger <vapier@gentoo.org> metadata.xml: + Document local USE=pic flag. + + 01 Feb 2009; Tobias Klausmann <klausman@gentoo.org> php-5.2.8-r2.ebuild: + Stable on alpha, bug #249703 + + 31 Jan 2009; Tiago Cunha <tcunha@gentoo.org> php-5.2.8-r2.ebuild: + stable sparc, bug 249703 + + 25 Jan 2009; Markus Meier <maekke@gentoo.org> php-5.2.8-r2.ebuild: + x86 stable, bug #249703 + + 24 Jan 2009; Tobias Scherbaum <dertobi123@gentoo.org> php-5.2.8-r2.ebuild: + ppc stable, bug #249703 + + 23 Jan 2009; Brent Baude <ranger@gentoo.org> php-5.2.8-r2.ebuild: + Marking php-5.2.8-r2 ppc64 for bug 249703 + + 20 Jan 2009; Tobias Heinlein <keytoaster@gentoo.org> php-5.2.8-r2.ebuild: + amd64 stable wrt security bug 249703 + + 20 Jan 2009; Jeroen Roovers <jer@gentoo.org> php-5.2.8-r2.ebuild: + Stable for HPPA (bug #249703). + +*php-5.2.8-r2 (11 Jan 2009) + + 11 Jan 2009; Christian Hoffmann <hoffie@gentoo.org> + -files/70_mod_php.conf-apache2, + +files/70_mod_php5_concurr.conf-apache2-r1, + +files/70_mod_php5.conf-apache2-r1, + -files/70_mod_php_concurr.conf-apache2, -php-5.2.8.ebuild, + +php-5.2.8-r2.ebuild: + revision bump to fix bug 162478 (dropping usage of AddType apache config + directive) and bug 249703 (libxml2-2.7 breakage) and an upstream fix for + bug 217392; removing old and unused files + + 24 Dec 2008; Raúl Porcel <armin76@gentoo.org> php-5.2.8-r1.ebuild: + alpha/ia64 stable wrt #249875 + + 23 Dec 2008; Friedrich Oslage <bluebird@gentoo.org> php-5.2.8-r1.ebuild: + Stable on sparc, security bug #249875 + + 22 Dec 2008; Jeroen Roovers <jer@gentoo.org> php-5.2.8-r1.ebuild: + Stable for HPPA (bug #249875). + + 21 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org> php-5.2.8-r1.ebuild: + ppc stable, bug #249875 + + 20 Dec 2008; Markus Meier <maekke@gentoo.org> php-5.2.8-r1.ebuild: + amd64/x86 stable, bug #249875 + + 19 Dec 2008; Brent Baude <ranger@gentoo.org> php-5.2.8-r1.ebuild: + Marking php-5.2.8-r1 ppc64 for bug 249875 + + 19 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org> php-5.2.8-r1.ebuild: + Fix die message when libpcre is not built with unicode support. + +*php-5.2.8-r1 (18 Dec 2008) + + 18 Dec 2008; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.8-r1.ebuild: + revbump for security bug 249875, shipping several new security fixes; + incorporate suggestion from Bernd Lommerzheim <bernd@lommerzheim.com> in + bug 238127 to check libpcre for USE=unicode; adding patch for interbase + precision improvements as suggested by Viesturs <viesturs@dps.lv> in bug + 250640 + +*php-5.2.8 (08 Dec 2008) + + 08 Dec 2008; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.8.ebuild: + version bump wrt security bug 249875; also attempting to make the build + failure fix for bug 217392 more portable; using system pcre now to avoid + problems with apache/mod_php (bug 238127) + + 10 Nov 2008; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.5-r1.ebuild, + -php-5.2.6-r6.ebuild: + dropping old and vulnerable + + 22 Sep 2008; Jeroen Roovers <jer@gentoo.org> php-5.2.6-r7.ebuild: + Stable for HPPA (bug #231528). + + 21 Sep 2008; Raúl Porcel <armin76@gentoo.org> php-5.2.6-r7.ebuild: + alpha/ia64/sparc stable wrt #231528 + + 20 Sep 2008; Markus Meier <maekke@gentoo.org> php-5.2.6-r7.ebuild: + x86 stable, bug #231528 + + 16 Sep 2008; Brent Baude <ranger@gentoo.org> php-5.2.6-r7.ebuild: + Marking php-5.2.6-r7 ppc64 and ppc for bug 231528 + + 16 Sep 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r7.ebuild: + stable on amd64 wrt bug 231528 + +*php-5.2.6-r7 (06 Sep 2008) + + 06 Sep 2008; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.6.ebuild, + -php-5.2.6-r2.ebuild, +php-5.2.6-r7.ebuild: + importing -r7 (patchset: r8) from php-testing overlay, including the snmp + memory leak fix from bug 231528; no need to upgrade for users with + USE=-snmp + + 23 Aug 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml: + Add GLEP 56 USE flag descriptions. + + 15 Aug 2008; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.6.ebuild, + -php-5.2.6-r2.ebuild: + removing old and vulnerable + + 09 Aug 2008; Christian Hoffmann <hoffie@gentoo.org> -php-4.4.8.ebuild: + Removing php-4 (bug 189172); use the php-4 (layman) overlay instead, if + you really insist on keeping it installed + + 08 Aug 2008; Tobias Scherbaum <dertobi123@gentoo.org> php-5.2.6-r6.ebuild: + ppc stable, bug #234102 + + 08 Aug 2008; Raúl Porcel <armin76@gentoo.org> php-5.2.6-r6.ebuild: + alpha/ia64/sparc stable wrt #234102 + + 07 Aug 2008; Jeroen Roovers <jer@gentoo.org> php-5.2.6-r6.ebuild: + Stable for HPPA (bug #234102). + + 07 Aug 2008; Markus Meier <maekke@gentoo.org> php-5.2.6-r6.ebuild: + x86 stable, bug #234102 + + 07 Aug 2008; Markus Rothe <corsair@gentoo.org> php-5.2.6-r6.ebuild: + Stable on ppc64; bug #234102 + + 07 Aug 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r6.ebuild: + stable on amd64 wrt security bug 234102 + + 07 Aug 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r6.ebuild: + patchset bump (without rev bump) which changes the new-memory-corruption + patch to fix a build issue (it used to contain the bison-generated .c + version of zend_language_parser.y, we now rely on configure to invoke + bison, which seems to work better) + +*php-5.2.6-r6 (07 Aug 2008) + + 07 Aug 2008; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.6_rc4.ebuild, + -php-5.2.6-r1.ebuild, -php-5.2.6-r5.ebuild, +php-5.2.6-r6.ebuild: + lots of new security/crash fixes, bug 234102 (CVE-2008-2665, CVE-2008-2666 + and other issues); dropping old + + 24 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r2.ebuild, + php-5.2.6-r5.ebuild: + changing explicit depend on c-client back to the virtual, now that a + recent enough uw-imap version is in the tree; stable dependencies are + still broken in case of uw-imap, as the needed version is not stable + + 20 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r5.ebuild: + previous commit replaced CXXFLAGS by CFLAGS by accident, thanks to Rafał + Mużyło <galtgendo@o2.pl> in bug 230809 + + 20 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r5.ebuild: + yet another attempt at fixing _GNU_SOURCE-related build problems + (configure screws up FFLAGS which isn't used at all, so we stop + manipulating it now), bug 230809 + + 19 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r5.ebuild: + build-time-specific (no revbump): fixing warnings (which sometimes seem to + be fatal) regarding to missing function prototypes because of _GNU_SOURCE + being defined too late (bug 230809) + +*php-5.2.6-r5 (17 Jul 2008) + + 17 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.6-r5.ebuild: + Fixing USE=suhosin on sparc and maybe other 'exotic' archs (gave SIGBUS, + bug 209501), adding >=freetds-0.82 compatibility patch for ext/mssql and + ext/pdo_dblib (thanks to matthias@dsx.at in bug 223891); other users don't + need to update [imported from php-testing overlay] + + 11 Jul 2008; Jeroen Roovers <jer@gentoo.org> php-5.2.6-r2.ebuild: + Stable for HPPA (bug #230575). + + 10 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r2.ebuild: + d'oh, the DEPEND on c-client was supposed to only show up for USE=imap, + thanks to Cardoe for noticing that + + 10 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r2.ebuild: + the ext/imap security patch introduced in php-5.2.6-r2 raises the + dependency on c-client to version 2006k, fixing DEPEND accordingly, bug + 231258 + + 08 Jul 2008; Raúl Porcel <armin76@gentoo.org> php-5.2.6-r2.ebuild: + alpha/ia64/sparc stable wrt security #230575 + + 07 Jul 2008; Markus Meier <maekke@gentoo.org> php-5.2.6-r2.ebuild: + x86 stable, bug #230575 + + 07 Jul 2008; Thomas Anderson <gentoofan23@gentoo.org> php-5.2.6-r2.ebuild: + stable amd64, security bug 230575 + + 07 Jul 2008; Brent Baude <ranger@gentoo.org> php-5.2.6-r2.ebuild: + Marking php-5.2.6-r2 ppc64 and ppc for bug 230575 + +*php-5.2.6-r2 (02 Jul 2008) + + 02 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.6-r2.ebuild: + revbump to include newer patchset, employing lots of security/crash fixes, + bug 230575 + +*php-5.2.6-r1 (05 May 2008) + + 05 May 2008; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.6-r1.ebuild: + using official suhosin for version 5.2.6 now, adding patch to fix bug + 212679 (ext/ldap build failure with --as-needed, thanks to Peter Volkov) + + 01 May 2008; Christian Hoffmann <hoffie@gentoo.org> + -php-4.4.8_pre20070816.ebuild: + removing php-4.4.8_pre, 4.4.8 still left; yes, it was latest stable for + all arches, but php-4* and everything depending on it are hardmasked + anyway and one shouldn't continue using it either... + + 01 May 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6.ebuild: + only try to fix the open_basedir test cases when suhosin is enabled, + otherwise it breaks for non-suhosin + +*php-5.2.6 (01 May 2008) + + 01 May 2008; Christian Hoffmann <hoffie@gentoo.org> + -php-5.2.6_rc1-r1.ebuild, -php-5.2.6_rc3.ebuild, -php-5.2.6_rc3-r1.ebuild, + +php-5.2.6.ebuild: + version bump to 5.2.6, including kolab support (bug 210977, thanks to + wrobel and jakub), fixing bug 215623 in the same go; removing + old/vulnerable + + 16 Apr 2008; Tobias Scherbaum <dertobi123@gentoo.org> + php-5.2.6_rc4.ebuild: + ppc stable, bug #215266 + + 16 Apr 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6_rc4.ebuild: + workaround autoconf-2.62 behavior change which made build fail w/ + USE=posix (bug 217392), no revbump + + 15 Apr 2008; Jeroen Roovers <jer@gentoo.org> php-5.2.6_rc4.ebuild: + Stable for HPPA (bug #215266). + + 15 Apr 2008; Raúl Porcel <armin76@gentoo.org> php-5.2.6_rc4.ebuild: + alpha/ia64/sparc stable wrt security #215266 + + 14 Apr 2008; Markus Meier <maekke@gentoo.org> php-5.2.6_rc4.ebuild: + amd64/x86 stable, security bug #215266 + + 14 Apr 2008; Markus Rothe <corsair@gentoo.org> php-5.2.6_rc4.ebuild: + Stable on ppc64; bug #215266 + +*php-5.2.6_rc4 (05 Apr 2008) + + 05 Apr 2008; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.6_rc4.ebuild: + bump to rc4 to address even more possible security issues (stack overflow + in fastcgi handling, several imap-related crashes) + +*php-5.2.6_rc3-r1 (30 Mar 2008) + + 30 Mar 2008; Christian Hoffmann <hoffie@gentoo.org> + +php-5.2.6_rc3-r1.ebuild: + revbump with a patch to fix a regression in escapeshell{arg,cmd}() + functions in regards to multi-byte handling, phpbug 44564 + + 29 Mar 2008; Markus Meier <maekke@gentoo.org> php-5.2.6_rc3.ebuild: + x86 stable, security bug #215266 + + 29 Mar 2008; Raúl Porcel <armin76@gentoo.org> php-5.2.6_rc3.ebuild: + alpha/ia64/sparc stable wrt security #215266 + + 29 Mar 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6_rc3.ebuild: + stable on amd64, bug 215266 + + 29 Mar 2008; Jeroen Roovers <jer@gentoo.org> php-5.2.6_rc3.ebuild: + Stable for HPPA (bug #215266). + + 29 Mar 2008; Brent Baude <ranger@gentoo.org> php-5.2.6_rc3.ebuild: + Marking php-5.2.6_rc3 ppc64 and ppc for bug 215266 + +*php-5.2.6_rc3 (28 Mar 2008) + + 28 Mar 2008; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.6_rc3.ebuild: + bump, mainly to address the issues listed in security bug 215266 + + 23 Mar 2008; Benedikt Böhm <hollow@gentoo.org> + php-4.4.8_pre20070816.ebuild, php-4.4.8.ebuild, php-5.2.5-r1.ebuild, + php-5.2.6_rc1-r1.ebuild: + fix depend.apache usage wrt #208033 + + 19 Mar 2008; Christian Hoffmann <hoffie@gentoo.org> + -php-5.2.4_pre200708051230-r2.ebuild, -php-5.2.5_p20080206-r3.ebuild, + -php-5.2.6_rc1.ebuild: + removing old and/or vulnerable versions + + 09 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org> + php-5.2.6_rc1-r1.ebuild: + ppc stable, bug #212211 + + 08 Mar 2008; <pva@gentoo.org> php-5.2.6_rc1-r1.ebuild: + amd64 stable, security bug #212211. + + 07 Mar 2008; Dawid Węgliński <cla@gentoo.org> php-5.2.6_rc1-r1.ebuild: + Stable on x86 (bug #212211) + + 06 Mar 2008; Raúl Porcel <armin76@gentoo.org> php-5.2.6_rc1-r1.ebuild: + alpha/ia64/sparc stable wrt #212211 + + 06 Mar 2008; Jeroen Roovers <jer@gentoo.org> php-5.2.6_rc1-r1.ebuild: + Stable for HPPA (bug #212211). + + 06 Mar 2008; Brent Baude <ranger@gentoo.org> php-5.2.6_rc1-r1.ebuild: + Marking php-5.2.6_rc1-r1 ppc64 for bug 212211 + +*php-5.2.6_rc1-r1 (05 Mar 2008) + + 05 Mar 2008; Christian Hoffmann <hoffie@gentoo.org> + +php-5.2.6_rc1-r1.ebuild: + revbump to -r1 to include new patchset which fixes a mysql_(p)connect crash + (introduced in >5.2.5-r1), several memory corruption issues, a crash in the + soap extension and several test failures + + 04 Mar 2008; Markus Rothe <corsair@gentoo.org> php-5.2.6_rc1.ebuild: + Stable on ppc64; bug #212211 + + 04 Mar 2008; Raúl Porcel <armin76@gentoo.org> php-5.2.6_rc1.ebuild: + alpha/ia64/sparc stable wrt security #212211 + + 03 Mar 2008; Jeroen Roovers <jer@gentoo.org> php-5.2.6_rc1.ebuild: + Stable for HPPA (bug #212211). + + 03 Mar 2008; Markus Meier <maekke@gentoo.org> php-5.2.6_rc1.ebuild: + x86 stable, security bug #212211 + +*php-5.2.6_rc1 (03 Mar 2008) + + 03 Mar 2008; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.6_rc1.ebuild: + bump to 5.2.6_rc1 + + 03 Mar 2008; Christian Hoffmann <hoffie@gentoo.org> + -php-5.2.5_p20080206.ebuild, -php-5.2.5_p20080206-r2.ebuild: + removing old + + 28 Feb 2008; Steve Dibb <beandog@gentoo.org> + php-5.2.5_p20080206-r3.ebuild: + amd64 stable, bug 209148 + + 24 Feb 2008; Brent Baude <ranger@gentoo.org> + php-5.2.5_p20080206-r3.ebuild: + Marking php-5.2.5_p20080206-r3 ppc64 for bug 209148 + + 24 Feb 2008; Raúl Porcel <armin76@gentoo.org> + php-5.2.5_p20080206-r3.ebuild: + alpha/ia64/sparc stable wrt security #209148 + + 22 Feb 2008; Tobias Scherbaum <dertobi123@gentoo.org> + php-5.2.5_p20080206-r3.ebuild: + ppc stable, bug #209148 + + 21 Feb 2008; Markus Meier <maekke@gentoo.org> + php-5.2.5_p20080206-r3.ebuild: + x86 stable, security bug #209148 + + 21 Feb 2008; Jeroen Roovers <jer@gentoo.org> + php-5.2.5_p20080206-r3.ebuild: + Stable for HPPA (bug #209148). + + 13 Feb 2008; Christian Hoffmann <hoffie@gentoo.org> + php-5.2.5_p20080206-r3.ebuild: + yet another attempt at fixing src_test (no revbump) + +*php-5.2.5_p20080206-r3 (12 Feb 2008) + + 12 Feb 2008; Christian Hoffmann <hoffie@gentoo.org> + +php-5.2.5_p20080206-r3.ebuild: + hopefully improved upstream patch for bug #209606 + +*php-5.2.5_p20080206-r2 (12 Feb 2008) + + 12 Feb 2008; Christian Hoffmann <hoffie@gentoo.org> + +php-5.2.5_p20080206-r2.ebuild: + revbump to fix a pretty severe crash problem: fixes bug #209606 and maybe + bug #209501; also reworking src_test so that it works more reliable + (hopefully) + + 08 Feb 2008; Raúl Porcel <armin76@gentoo.org> php-5.2.5_p20080206.ebuild: + alpha/ia64/sparc stable wrt security #209148 + + 08 Feb 2008; Jeroen Roovers <jer@gentoo.org> php-5.2.5_p20080206.ebuild: + Stable for HPPA (bug #209148). + + 08 Feb 2008; Tobias Scherbaum <dertobi123@gentoo.org> + php-5.2.5_p20080206.ebuild: + ppc stable, bug #209148 + + 08 Feb 2008; Brent Baude <ranger@gentoo.org> php-5.2.5_p20080206.ebuild: + Marking php-5.2.5_p20080206 ppc64 for bug 209148 + + 07 Feb 2008; Dawid Węgliński <cla@gentoo.org> + php-5.2.5_p20080206.ebuild: + Stable on x86 (bug #209148) + +*php-5.2.5_p20080206 (06 Feb 2008) + + 06 Feb 2008; Christian Hoffmann <hoffie@gentoo.org> + +php-5.2.5_p20080206.ebuild: + adding new snapshot 5.2.5_p20080206 for security bug 209148 + + 31 Jan 2008; Christian Hoffmann <hoffie@gentoo.org> + files/70_mod_php.conf-apache2, files/70_mod_php5_concurr.conf-apache2, + files/70_mod_php5.conf-apache2, files/70_mod_php_concurr.conf-apache2: + changing AddDirectoryIndex to DirectoryIndex in apache configs per bug 139451 + +*php-4.4.8 (08 Jan 2008) + + 08 Jan 2008; Christian Hoffmann <hoffie@gentoo.org> +php-4.4.8.ebuild: + bumping to 4.4.8 by user request; completely untested except quick compile + test (it's hardmasked anyway, you should really switch to php-5*) + + 08 Jan 2008; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.5.ebuild: + removing php-5.2.5, -r1 is more secure and has same KEYWORDS + + 15 Dec 2007; <welp@gentoo.org> php-5.2.5-r1.ebuild: + Stable on amd64; bug 201885 + + 12 Dec 2007; Brent Baude <ranger@gentoo.org> php-5.2.5-r1.ebuild: + Marked php-5.2.5-r1 ppc & ppc64 stable for bug 201885 + + 11 Dec 2007; Jeroen Roovers <jer@gentoo.org> php-5.2.5-r1.ebuild: + Stable for HPPA (bug #201885). + + 11 Dec 2007; Raúl Porcel <armin76@gentoo.org> php-5.2.5-r1.ebuild: + alpha/ia64/sparc stable wrt security #201885 + + 11 Dec 2007; Dawid Węgliński <cla@gentoo.org> php-5.2.5-r1.ebuild: + Stable on x86 (bug #201885) + +*php-5.2.5-r1 (08 Dec 2007) + + 08 Dec 2007; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.5-r1.ebuild: + revision bump w/ updated patchset to fix most of the security issues listed + in bug 199156 + + 15 Nov 2007; Christian Hoffmann <hoffie@gentoo.org> -php-4.4.7.ebuild, + -php-5.2.4.ebuild, -php-5.2.4_p20070914-r2.ebuild: + removing old/vulnerable versions 4.4.7, 5.2.4 and 5.2.4_p20070914-r2 + + 14 Nov 2007; Alex Howells <astinus@gentoo.org> php-5.2.5.ebuild: + changing ~amd64 -> amd64 with regard to #198650 + + 13 Nov 2007; Tobias Scherbaum <dertobi123@gentoo.org> php-5.2.5.ebuild: + ppc stable, bug #198650 + + 12 Nov 2007; Markus Rothe <corsair@gentoo.org> php-5.2.5.ebuild: + Stable on ppc64; bug #198650 + + 12 Nov 2007; Jeroen Roovers <jer@gentoo.org> php-5.2.5.ebuild: + Stable for HPPA (bug #198650 ). + + 12 Nov 2007; Raúl Porcel <armin76@gentoo.org> php-5.2.5.ebuild: + alpha/ia64/sparc stable wrt #198650 + + 11 Nov 2007; Dawid Węgliński <cla@gentoo.org> php-5.2.5.ebuild: + Stable on x86 (bug #198650) + +*php-5.2.5 (09 Nov 2007) + + 09 Nov 2007; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.5.ebuild: + bump to php-5.2.5, http://www.php.net/ChangeLog-5.php#5.2.5 + Gentoo-wise improvements: zero or very little expected test failures, depending + on the USE flags + + 03 Nov 2007; Christian Hoffmann <hoffie@gentoo.org> -php-5.1.6-r11.ebuild: + removing php-5.1* + + 21 Oct 2007; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.2-r1.ebuild, + -php-5.2.4_p20070914.ebuild: + cleanup old + + 25 Sep 2007; Raúl Porcel <armin76@gentoo.org> + php-5.2.4_p20070914-r2.ebuild: + sparc stable wrt security #191034 + + 22 Sep 2007; Raúl Porcel <armin76@gentoo.org> + php-5.2.4_p20070914-r2.ebuild: + alpha/ia64 stable wrt security #191034 + + 20 Sep 2007; Brent Baude <ranger@gentoo.org> + php-5.2.4_p20070914-r2.ebuild: + MArking php-5.2.4_p20070914-r2 ppc64 stable for 191034 + + 20 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> + php-5.2.4_p20070914-r2.ebuild: + Stable on amd64/x86 wrt bug #191034. + + 20 Sep 2007; Tobias Scherbaum <dertobi123@gentoo.org> + php-5.2.4_p20070914-r2.ebuild: + ppc stable, bug #191034 + + 20 Sep 2007; Jeroen Roovers <jer@gentoo.org> + php-5.2.4_p20070914-r2.ebuild: + Stable for HPPA (bug #191034). + +*php-5.2.4_p20070914-r2 (19 Sep 2007) + + 19 Sep 2007; Christian Hoffmann <hoffie@gentoo.org> + +php-5.2.4_p20070914-r2.ebuild: + adding php-5.2.4_p20070914-r2 as per bug 191034 + * fix CVE-2007-4887 (dl() segfault with very long filenames) + * fix CVE-2007-4783, CVE-2007-4840 (segfault in iconv functions with very + long charset parameters); + * use almost-official suhosin again (based on the patch for 5.2.4) + * fix crashes in xmlrpc + +*php-5.2.4_p20070914 (14 Sep 2007) + + 14 Sep 2007; Christian Hoffmann <hoffie@gentoo.org> + +php-5.2.4_p20070914.ebuild: + adding php-5.2.4_p20070914, bug 191034 + +*php-5.2.4 (08 Sep 2007) + + 08 Sep 2007; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.3-r3.ebuild, + +php-5.2.4.ebuild: + adding php-5.2.4, bug 191034; removing broken php-5.2.3* + + 29 Aug 2007; Markus Rothe <corsair@gentoo.org> + php-4.4.8_pre20070816.ebuild: + Stable on ppc64; bug #189172 + + 24 Aug 2007; Raúl Porcel <armin76@gentoo.org> + php-4.4.8_pre20070816.ebuild: + alpha/ia64 stable wrt security #189172 + + 23 Aug 2007; Christoph Mende <angelos@gentoo.org> + php-4.4.8_pre20070816.ebuild: + Stable on amd64 wrt security bug #189172 + + 22 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> + php-4.4.8_pre20070816.ebuild: + ppc stable, bug #189172 + + 21 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org> + php-4.4.8_pre20070816.ebuild: + Stable on sparc wrt security #189172 + + 20 Aug 2007; Markus Ullmann <jokey@gentoo.org> + php-4.4.8_pre20070816.ebuild: + Stable on x86 wrt security bug #189172 + + 19 Aug 2007; Jeroen Roovers <jer@gentoo.org> php-4.4.8_pre20070816.ebuild: + Stable for HPPA (bug #189172). + +*php-4.4.8_pre20070816 (18 Aug 2007) + + 18 Aug 2007; Christian Hoffmann <hoffie@gentoo.org> + +php-4.4.8_pre20070816.ebuild: + version bump to fix several security issues, see bug 189172 + + 15 Aug 2007; Jeroen Roovers <jer@gentoo.org> + php-5.2.4_pre200708051230-r2.ebuild: + Stable for HPPA (bug #180556). + + 14 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> + php-5.2.4_pre200708051230-r2.ebuild: + ppc stable, bug #180556 + + 14 Aug 2007; Markus Rothe <corsair@gentoo.org> + php-5.2.4_pre200708051230-r2.ebuild: + Stable on ppc64; bug #180556 + + 13 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org> + php-5.2.4_pre200708051230-r2.ebuild: + Stable on sparc wrt #180556 + + 12 Aug 2007; Steve Dibb <beandog@gentoo.org> + php-5.2.4_pre200708051230-r2.ebuild: + amd64 stable, bug 180556 + + 11 Aug 2007; Raúl Porcel <armin76@gentoo.org> + php-5.2.4_pre200708051230-r2.ebuild: + alpha/ia64/x86 stable wrt #180556 + +*php-5.2.4_pre200708051230-r2 (09 Aug 2007) + + 09 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> + +php-5.2.4_pre200708051230-r2.ebuild: + Import from the php-testing overlay wrt security bug #180556, thanks to + Christian Hoffmann! + + 30 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org> php-5.2.3-r3.ebuild: + Stable on sparc wrt security #180556 + + 30 Jul 2007; Markus Rothe <corsair@gentoo.org> php-5.2.3-r3.ebuild: + Stable on ppc64; bug #180556 + + 28 Jul 2007; Jeroen Roovers <jer@gentoo.org> php-5.2.3-r3.ebuild: + Stable for HPPA (bug #180556). + + 28 Jul 2007; Steve Dibb <beandog@gentoo.org> php-5.2.3-r3.ebuild: + amd64 stable, security bug 180556 + + 28 Jul 2007; Raúl Porcel <armin76@gentoo.org> php-5.2.3-r3.ebuild: + alpha/ia64/x86 stable wrt #180556 + + 28 Jul 2007; Tobias Scherbaum <dertobi123@gentoo.org> php-5.2.3-r3.ebuild: + ppc stable, bug #180556 + +*php-5.2.3-r3 (22 Jul 2007) + + 22 Jul 2007; Tobias Scherbaum <dertobi123@gentoo.org> + +php-5.2.3-r3.ebuild: + Import php-5.2.3-r3 from the php-experimental overlay wrt security bug + #180556, thanks to Christian Hoffmann! + + 30 Jun 2007; Luca Longinotti <chtekk@gentoo.org> -php-4.4.6.ebuild, + -php-5.2.1-r3.ebuild: + Remove old versions. + + 12 May 2007; Markus Rothe <corsair@gentoo.org> php-4.4.7.ebuild, + php-5.2.2-r1.ebuild: + Stable on ppc64; bug #169372 + + 12 May 2007; Luca Longinotti <chtekk@gentoo.org> + files/70_mod_php.conf-apache2, files/70_mod_php5_concurr.conf-apache2, + -files/70_mod_php5.conf-apache1, files/70_mod_php5.conf-apache2, + files/20php4-envd, files/20php5-envd, -files/70_mod_php.conf-apache1, + files/70_mod_php_concurr.conf-apache2, php-4.4.6.ebuild, php-4.4.7.ebuild, + php-5.1.6-r11.ebuild, php-5.2.1-r3.ebuild, php-5.2.2-r1.ebuild: + Apache 1.X masking (fix ebuilds to not require apache-1*). + + 10 May 2007; Jeroen Roovers <jer@gentoo.org> php-4.4.7.ebuild, + php-5.2.2-r1.ebuild: + Stable for HPPA (bug #169372). + + 10 May 2007; Jose Luis Rivero <yoswink@gentoo.org> php-5.2.2-r1.ebuild: + Stable on alpha wrt security bug #169372 + + 09 May 2007; Luca Longinotti <chtekk@gentoo.org> php-4.4.7.ebuild, + php-5.2.2-r1.ebuild: + AMD64 stable for security bug #169372. + + 09 May 2007; Jose Luis Rivero <yoswink@gentoo.org> php-4.4.7.ebuild: + Stable on alpha wrt security bug #169372 + + 08 May 2007; Raúl Porcel <armin76@gentoo.org> php-4.4.7.ebuild, + php-5.2.2-r1.ebuild: + ia64 + x86 stable wrt security bug 169372 + + 08 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> php-4.4.7.ebuild, + php-5.2.2-r1.ebuild: + Stable on sparc wrt security #169372 + + 08 May 2007; Tobias Scherbaum <dertobi123@gentoo.org> php-4.4.7.ebuild, + php-5.2.2-r1.ebuild: + ppc stable, bug #169372 + +*php-5.2.2-r1 (07 May 2007) +*php-4.4.7 (07 May 2007) + + 07 May 2007; Luca Longinotti <chtekk@gentoo.org> +php-4.4.7.ebuild, + +php-5.2.2-r1.ebuild: + PHP 4.4.7 and 5.2.2, fixes various security issues, see bug #169372. + + 04 May 2007; Luca Longinotti <chtekk@gentoo.org> -php-4.3.11-r5.ebuild, + -php-4.4.4-r6.ebuild, php-4.4.6.ebuild, -php-5.0.5-r5.ebuild, + -php-5.1.6-r6.ebuild, php-5.1.6-r11.ebuild: + Remove 4.3 and 5.0 and old versions. + + 31 Mar 2007; Raúl Porcel <armin76@gentoo.org> php-4.4.6.ebuild, + php-5.1.6-r11.ebuild, php-5.2.1-r3.ebuild: + ia64 stable wrt bug 153911 + + 31 Mar 2007; Raúl Porcel <armin76@gentoo.org> php-4.4.6.ebuild, + php-5.1.6-r11.ebuild, php-5.2.1-r3.ebuild: + ia64 stable wrt security bug 153911 + + 10 Mar 2007; Jose Luis Rivero <yoswink@gentoo.org> php-4.4.6.ebuild, + php-5.1.6-r11.ebuild, php-5.2.1-r3.ebuild: + Stable on alpha wrt security #153911 + + 08 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> php-4.4.6.ebuild, + php-5.1.6-r11.ebuild, php-5.2.1-r3.ebuild: + Stable on sparc wrt security #153911 + + 06 Mar 2007; René Nussbaumer <killerfox@gentoo.org> php-5.1.6-r11.ebuild: + Stable on hppa. See bug #153911. + + 06 Mar 2007; Tobias Scherbaum <dertobi123@gentoo.org> php-4.4.6.ebuild, + php-5.1.6-r11.ebuild, php-5.2.1-r3.ebuild: + Stable on ppc wrt bug #153911. + + 06 Mar 2007; Christian Faulhammer <opfer@gentoo.org> php-4.4.6.ebuild, + php-5.1.6-r11.ebuild, php-5.2.1-r3.ebuild: + stable x86; security bug 153911 + + 06 Mar 2007; Jeroen Roovers <jer@gentoo.org> php-5.2.1-r3.ebuild: + Stable for HPPA (bug #153911). + + 06 Mar 2007; Markus Rothe <corsair@gentoo.org> php-4.4.6.ebuild, + php-5.1.6-r11.ebuild, php-5.2.1-r3.ebuild: + Stable on ppc64; bug #153911 + + 06 Mar 2007; Jeroen Roovers <jer@gentoo.org> php-4.4.6.ebuild: + Stable for HPPA (bug #153911). + + 05 Mar 2007; Luca Longinotti <chtekk@gentoo.org> php-4.4.6.ebuild, + php-5.1.6-r11.ebuild, php-5.2.1-r3.ebuild: + Keyword on amd64 wrt bug #153911. + +*php-5.2.1-r3 (05 Mar 2007) +*php-5.1.6-r11 (05 Mar 2007) +*php-4.4.6 (05 Mar 2007) + + 05 Mar 2007; Luca Longinotti <chtekk@gentoo.org> +files/20php4-envd, + +files/20php5-envd, -php-4.4.4-r8.ebuild, +php-4.4.6.ebuild, + -php-5.1.6-r8.ebuild, +php-5.1.6-r11.ebuild, +php-5.2.1-r3.ebuild: + New PHP versions, fix lots of bugs, add Suhosin support. + + 26 Nov 2006; Luca Longinotti <chtekk@gentoo.org> -php-4.4.3-r1.ebuild, + -php-4.4.4-r4.ebuild, -php-5.1.4-r6.ebuild, -php-5.1.6-r4.ebuild: + Cleanup old versions, thanks arch-teams! + + 29 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> php-4.4.4-r6.ebuild: + Stable on ia64, bug 150261. + +*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: + Stable x86; bug #150261 + + 15 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org> php-4.4.4-r6.ebuild, + php-5.1.6-r6.ebuild: + hppa stable, bug #150261 + + 14 Oct 2006; Aron Griffis <agriffis@gentoo.org> php-5.1.6-r6.ebuild: + Mark 5.1.6-r6 stable on ia64. #150261 + + 11 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> php-4.4.4-r6.ebuild, + php-5.1.6-r6.ebuild: + Stable on alpha as per security bug #150261 + + 11 Oct 2006; Markus Rothe <corsair@gentoo.org> php-4.4.4-r6.ebuild, + php-5.1.6-r6.ebuild: + Stable on ppc64; bug #150261 + + 11 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> php-4.4.4-r6.ebuild, + php-5.1.6-r6.ebuild: + Stable on sparc wrt security #150261 + + 11 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org> php-4.4.4-r6.ebuild, + php-5.1.6-r6.ebuild: + ppc stable, bug #150261 + +*php-5.1.6-r6 (07 Oct 2006) +*php-4.4.4-r6 (07 Oct 2006) + + 07 Oct 2006; Luca Longinotti <chtekk@gentoo.org> +php-4.4.4-r6.ebuild, + +php-5.1.6-r6.ebuild: + Fix security bug #150261, amd64 stable. + + 16 Sep 2006; Rene Nussbaumer <killerfox@gentoo.org> php-4.4.4-r4.ebuild, + php-5.1.6-r4.ebuild: + Stable on hppa. See bug #147061. + + 14 Sep 2006; Bryan Østergaard <kloeri@gentoo.org> php-4.4.4-r4.ebuild, + php-5.1.6-r4.ebuild: + Stable on ia64, bug 147061. + + 11 Sep 2006; Tobias Scherbaum <dertobi123@gentoo.org> php-4.4.4-r4.ebuild, + php-5.1.6-r4.ebuild: + ppc stable, bug #147061 + + 11 Sep 2006; Thomas Cort <tcort@gentoo.org> php-4.4.4-r4.ebuild, + php-5.1.6-r4.ebuild: + Stable on alpha and amd64 wrt security Bug #147061. + + 11 Sep 2006; Markus Rothe <corsair@gentoo.org> php-4.4.4-r4.ebuild, + php-5.1.6-r4.ebuild: + Stable on ppc64; bug #147061 + + 11 Sep 2006; Jason Wever <weeve@gentoo.org> php-4.4.4-r4.ebuild, + php-5.1.6-r4.ebuild: + Stable on SPARC wrt security bug #147061. + + 10 Sep 2006; <ticho@gentoo.org> php-4.4.4-r4.ebuild, php-5.1.6-r4.ebuild: + Stable on x86, security bug #147061. + +*php-5.1.6-r4 (10 Sep 2006) +*php-4.4.4-r4 (10 Sep 2006) + + 10 Sep 2006; Luca Longinotti <chtekk@gentoo.org> -php-4.4.4-r2.ebuild, + +php-4.4.4-r4.ebuild, -php-5.1.6-r2.ebuild, +php-5.1.6-r4.ebuild: + Revision bump to fix INI restore issue and other bugs, updates Hardened-PHP + to 0.4.15. Cleanup old versions. + + 10 Sep 2006; Luca Longinotti <chtekk@gentoo.org> -php-4.4.2.ebuild, + -php-4.4.2-r2.ebuild, -php-4.4.2-r6.ebuild: + Remove old versions. + + 08 Sep 2006; Bryan Østergaard <kloeri@gentoo.org> php-4.4.3-r1.ebuild: + Stable on ia64. + + 05 Sep 2006; Luca Longinotti <chtekk@gentoo.org> -php-5.1.4.ebuild, + -php-5.1.4-r4.ebuild: + Remove old versions. + + 03 Sep 2006; Bryan Østergaard <kloeri@gentoo.org> php-5.1.4-r6.ebuild: + Stable on ia64. + +*php-5.1.6-r2 (30 Aug 2006) +*php-4.4.4-r2 (30 Aug 2006) + + 30 Aug 2006; Luca Longinotti <chtekk@gentoo.org> -php-4.4.4-r1.ebuild, + +php-4.4.4-r2.ebuild, -php-5.1.6-r1.ebuild, +php-5.1.6-r2.ebuild: + Revbump to force upgrading because of missing mbstring headers which can + break extension compiles. + +*php-5.1.6-r1 (29 Aug 2006) +*php-4.4.4-r1 (29 Aug 2006) + + 29 Aug 2006; Luca Longinotti <chtekk@gentoo.org> -php-4.4.4.ebuild, + +php-4.4.4-r1.ebuild, -php-5.1.6.ebuild, +php-5.1.6-r1.ebuild: + Revbump to force reverting back to bundled libpcre, the external one can + result is strange brokenness in PHP, see bug #145220 for more info. + +*php-5.1.6 (29 Aug 2006) +*php-4.4.4 (29 Aug 2006) + + 29 Aug 2006; Luca Longinotti <chtekk@gentoo.org> +php-4.4.4.ebuild, + +php-5.1.6.ebuild: + Version bump, add PHP 4.4.4 and PHP 5.1.6 with Hardened-PHP 0.4.14, fixes + bug #144297. Also switch the eclasses to use external libraries for PCRE and + SQLite support, fixes bug #145220. + + 15 Aug 2006; Joshua Jackson <tsunam@gentoo.org> php-4.4.3-r1.ebuild, + php-5.1.4-r6.ebuild: + See below for the security bug that makes this x86 stable + + 14 Aug 2006; Jose Luis Rivero <yoswink@gentoo.org> php-4.4.3-r1.ebuild, + php-5.1.4-r6.ebuild: + Stable on alpha wrt security bug #143126 + + 12 Aug 2006; Jason Wever <weeve@gentoo.org> php-4.4.3-r1.ebuild: + Updated the patchset for php-4.4.3-r1 to fix bug #143508 (with permission + from jakub). + + 12 Aug 2006; Rene Nussbaumer <killerfox@gentoo.org> php-4.4.3-r1.ebuild, + php-5.1.4-r6.ebuild: + Stable on hppa. See bug #143126. + + 12 Aug 2006; Markus Rothe <corsair@gentoo.org> php-4.4.3-r1.ebuild, + php-5.1.4-r6.ebuild: + Stable on ppc64; bug #143126 + + 10 Aug 2006; Luca Longinotti <chtekk@gentoo.org> php-4.4.3-r1.ebuild: + Retry with manually diffed patch, works here now, hopefully out there too. ;) + + 10 Aug 2006; Luca Longinotti <chtekk@gentoo.org> php-4.4.3-r1.ebuild: + Revert, now it got even worse, fails on some of my systems too. :S + + 10 Aug 2006; Luca Longinotti <chtekk@gentoo.org> php-4.4.3-r1.ebuild: + Update patchset for PHP 4.4.3, it seems one of the patches randomly failed + to apply on some systems, probably due to bad line-endings. + + 10 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org> php-4.4.3-r1.ebuild, + php-5.1.4-r6.ebuild: + Stable on sparc wrt security #143126 + + 10 Aug 2006; Tobias Scherbaum <dertobi123@gentoo.org> php-4.4.3-r1.ebuild, + php-5.1.4-r6.ebuild: + ppc stable, bug #143126 + +*php-5.1.4-r6 (10 Aug 2006) +*php-4.4.3-r1 (10 Aug 2006) + + 10 Aug 2006; Luca Longinotti <chtekk@gentoo.org> +php-4.4.3-r1.ebuild, + +php-5.1.4-r6.ebuild: + Version/revision bump, fixes security bug #143126. Add support for the PHP + test suite, activated by FEATURES="test". + + 20 Jul 2006; Luca Longinotti <chtekk@gentoo.org> php-4.3.11-r5.ebuild, + php-4.4.2.ebuild, php-4.4.2-r2.ebuild, php-4.4.2-r6.ebuild, + php-5.0.5-r5.ebuild, php-5.1.4.ebuild, php-5.1.4-r4.ebuild: + Fix bug #141098. + + 18 Jul 2006; Luca Longinotti <chtekk@gentoo.org> php-4.4.2-r6.ebuild, + php-5.1.4-r4.ebuild: + Stable on amd64 wrt bug #133524. + + 18 Jul 2006; Joshua Jackson <tsunam@gentoo.org> php-4.4.2-r6.ebuild, + php-5.1.4-r4.ebuild: + Stable x86; security bug #133524 + + 18 Jul 2006; Thomas Cort <tcort@gentoo.org> php-4.4.2-r6.ebuild, + php-5.1.4-r4.ebuild: + Stable on alpha wrt security Bug #133524. + + 17 Jul 2006; Markus Rothe <corsair@gentoo.org> php-4.4.2-r6.ebuild, + php-5.1.4-r4.ebuild: + Stable on ppc64; bug #133524 + + 17 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org> php-4.4.2-r6.ebuild, + php-5.1.4-r4.ebuild: + ppc stable, bug #133524 + + 16 Jul 2006; Jason Wever <weeve@gentoo.org> php-4.4.2-r6.ebuild, + php-5.1.4-r4.ebuild: + Stable on SPARC wrt security bug #133524. + +*php-5.1.4-r4 (14 Jul 2006) +*php-4.4.2-r6 (14 Jul 2006) + + 14 Jul 2006; Luca Longinotti <chtekk@gentoo.org> + +files/70_mod_php5_concurr.conf-apache2, + +files/70_mod_php_concurr.conf-apache2, +files/php4-ldvs, + +files/php5-ldvs, php-4.3.11-r5.ebuild, php-4.4.2.ebuild, + php-4.4.2-r2.ebuild, -php-4.4.2-r5.ebuild, +php-4.4.2-r6.ebuild, + php-5.0.5-r5.ebuild, php-5.1.4.ebuild, -php-5.1.4-r3.ebuild, + +php-5.1.4-r4.ebuild: + Restructure PHP ebuilds and eclasses to accomodate for future expansion and + new features, cleaner separation between eclasses and ebuilds. Fixes + security related bugs #133524, #136566, #138180, #135860 and bugs #137568, + #134171, #138665. + + 13 Jul 2006; Luca Longinotti <chtekk@gentoo.org> -php-5.1.2.ebuild: + Remove PHP 5.1.2. + +*php-5.1.4-r3 (20 Jun 2006) +*php-4.4.2-r5 (20 Jun 2006) + + 20 Jun 2006; Luca Longinotti <chtekk@gentoo.org> -php-4.4.2-r3.ebuild, + +php-4.4.2-r5.ebuild, -php-5.1.4-r1.ebuild, +php-5.1.4-r3.ebuild: + Revision bumps. Fix bug #105489 and add a couple of other fixes for various + bugs. + + 18 Jun 2006; Bryan Østergaard <kloeri@gentoo.org> php-4.4.2-r2.ebuild, + php-5.1.4.ebuild: + Stable on ia64, bug 131135. + +*php-5.1.4-r1 (29 May 2006) +*php-4.4.2-r3 (29 May 2006) + + 29 May 2006; Luca Longinotti <chtekk@gentoo.org> +php-4.4.2-r3.ebuild, + +php-5.1.4-r1.ebuild: + New revisions, fix a couple of bugs, and update Hardened-PHP patch to 0.4.11. + + 18 May 2006; Diego Pettenò <flameeyes@gentoo.org> php-4.4.2-r2.ebuild: + Add ~x86-fbsd keyword to 4.4 version. + + 06 May 2006; Jason Wever <weeve@gentoo.org> php-4.4.2-r2.ebuild: + Stable on SPARC wrt security bug #131135. + + 06 May 2006; Markus Rothe <corsair@gentoo.org> php-4.4.2-r2.ebuild, + php-5.1.4.ebuild: + Stable on ppc64; bug #131135 + + 06 May 2006; Mark Loeser <halcy0n@gentoo.org> php-4.4.2-r2.ebuild, + php-5.1.4.ebuild: + Stable on x86; bug #131135 + + 05 May 2006; <tcort@gentoo.org> php-4.4.2-r2.ebuild, php-5.1.4.ebuild: + Stable on alpha wrt security Bug #131135. + + 05 May 2006; Rene Nussbaumer <killerfox@gentoo.org> php-4.4.2-r2.ebuild, + php-5.1.4.ebuild: + Stable on hppa. See bug #131135. + + 05 May 2006; Tobias Scherbaum <dertobi123@gentoo.org> php-4.4.2-r2.ebuild, + php-5.1.4.ebuild: + ppc stable, bug #131135 + + 05 May 2006; Gustavo Zacarias <gustavoz@gentoo.org> php-5.1.4.ebuild: + Stable on sparc wrt security #131135 + + 05 May 2006; Luca Longinotti <chtekk@gentoo.org> php-5.1.4.ebuild: + Readd ~x86-fbsd keyword to PHP 5.1.4 which I dropped accidentally, sorry! + Update digests to reflect the fixed patchset, please make sure you have the + php-patchset-4.4.2-r3.tar.bz2 with the md5sum of + eac1d9e4aa78195953e33e566a1f39ce, thanks, and sorry again. ;) + + 05 May 2006; Jon Hood <squinky86@gentoo.org> php-5.1.4.ebuild, + php-4.4.2-r2.ebuild: + Stable on amd64, #131135. + +*php-5.1.4 (05 May 2006) +*php-4.4.2-r2 (05 May 2006) + + 05 May 2006; Luca Longinotti <chtekk@gentoo.org> -php-4.4.2-r1.ebuild, + +php-4.4.2-r2.ebuild, -php-5.1.2-r1.ebuild, +php-5.1.4.ebuild: + Sync with PHP overlay, fixes various bugs and security bugs, see bug #131135 + for more details. + + 23 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> php-5.1.2-r1.ebuild: + Add ~x86-fbsd keyword. + + 20 Apr 2006; Luca Longinotti <chtekk@gentoo.org> php-4.3.11-r5.ebuild, + php-4.4.2.ebuild, php-4.4.2-r1.ebuild, php-5.0.5-r5.ebuild, + php-5.1.2.ebuild, php-5.1.2-r1.ebuild: + Don't die on USE=-*, ebuild part. + +*php-5.1.2-r1 (13 Apr 2006) +*php-4.4.2-r1 (13 Apr 2006) + + 13 Apr 2006; Luca Longinotti <chtekk@gentoo.org> +php-4.4.2-r1.ebuild, + +php-5.1.2-r1.ebuild: + Add new revisions to fix an issue with the MySQL charsets. + See bug #129761 about it. + + 28 Mar 2006; Luca Longinotti <chtekk@gentoo.org> + files/70_mod_php.conf-apache1, files/70_mod_php.conf-apache2, + files/70_mod_php5.conf-apache1, files/70_mod_php5.conf-apache2: + Revert config changes for bug #127645. + + 28 Mar 2006; Luca Longinotti <chtekk@gentoo.org> + files/70_mod_php.conf-apache1, files/70_mod_php.conf-apache2, + files/70_mod_php5.conf-apache1, files/70_mod_php5.conf-apache2: + Change config files to fix bug #127645. + + 24 Mar 2006; Luca Longinotti <chtekk@gentoo.org> + files/70_mod_php.conf-apache1, files/70_mod_php5.conf-apache1, + files/70_mod_php5.conf-apache2, php-4.3.11-r5.ebuild, + -php-4.4.1-r3.ebuild, php-4.4.2.ebuild, php-5.0.5-r5.ebuild, + php-5.1.2.ebuild: + Introduce usage of phpconfutils eclass to handle USE flag dependencies + automatically, allowing to build dev-lang/php without intervention on + default USE flags, solves bug #120088. Fix bug #122379. + + 14 Mar 2006; Joshua Jackson <tsunam@gentoo.org> php-4.4.2.ebuild, + php-5.1.2.ebuild: + Stable php-4.4.2 and 5.1.2 for x86; bug #125878 + + 13 Mar 2006; Rene Nussbaumer <killerfox@gentoo.org> php-4.4.2.ebuild, + php-5.1.2.ebuild: + Stable on hppa. See bug #125878. + + 12 Mar 2006; Markus Rothe <corsair@gentoo.org> php-4.4.2.ebuild, + php-5.1.2.ebuild: + Stable on ppc64; bug #125878 + + 12 Mar 2006; Tobias Scherbaum <dertobi123@gentoo.org> php-4.4.2.ebuild, + php-5.1.2.ebuild: + ppc stable, bug #125878 + + 12 Mar 2006; Jason Wever <weeve@gentoo.org> php-4.4.2.ebuild, + php-5.1.2.ebuild: + Stable on SPARC wrt security bug #125878. + + 12 Mar 2006; Fernando J. Pereda <ferdy@gentoo.org> php-5.1.2.ebuild: + Stable on alpha wrt security bug #125878 + + 12 Mar 2006; Simon Stelling <blubb@gentoo.org> php-4.4.2.ebuild, + php-5.1.2.ebuild: + stable on amd64 wrt bug 125878 + + 12 Mar 2006; Fernando J. Pereda <ferdy@gentoo.org> php-4.4.2.ebuild: + Stable on alpha wrt security bug #125878 + +*php-5.1.2 (12 Mar 2006) +*php-4.4.2 (12 Mar 2006) + + 12 Mar 2006; Luca Longinotti <chtekk@gentoo.org> + -files/4-any/php4-fastbuild.patch, -files/4-any/php4-imap-symlink.diff, + -files/4-any/php4-iodbc-config.diff, +files/70_mod_php.conf-apache1, + +files/70_mod_php.conf-apache2, -files/4-any/php4-libtool-1.5.patch, + -files/4-any/php4-uClibc-have_dn_skipname.patch, + -files/4-any/php4-with-iodbc.diff, +files/70_mod_php5.conf-apache1, + +files/70_mod_php5.conf-apache2, -files/4-any/apache-1.3/70_mod_php.conf, + -files/4-any/apache-2.0/70_mod_php.conf, + -files/5.0-any/php5-imap-symlink.diff, + -files/5.0-any/php5-iodbc-config.diff, + -files/5.0-any/php5-libtool-1.5.patch, -files/5.0-any/php5-prefork.patch, + -files/5.0-any/php5-soap_persistence_session.diff, + -files/5.0-any/php5-with-iodbc.diff, + -files/5.0-any/apache-1.3/70_mod_php5.conf, + -files/5.0-any/apache-2.0/70_mod_php5.conf, + -files/5.1-any/php5-fastbuild.patch, + -files/5.1-any/php5-imap-symlink.diff, + -files/5.1-any/php5-iodbc-config.diff, -files/5.1-any/php5-prefork.patch, + -files/5.1-any/php5-soap_persistence_session.diff, + -files/5.1-any/php5-with-iodbc.diff, + -files/5.1-any/apache-1.3/70_mod_php5.conf, + -files/5.1-any/apache-2.0/70_mod_php5.conf, php-4.3.11-r5.ebuild, + php-4.4.1-r3.ebuild, +php-4.4.2.ebuild, php-5.0.5-r5.ebuild, + -php-5.1.1.ebuild, +php-5.1.2.ebuild: + Sync with PHP Overlay: reworked ebuilds, eclasses and patchsets to be easier + to maintain. Add PHP 4.4.2 and PHP 5.1.2 to the tree, fixing bugs #125878 + and #118846. Fix too bugs #120908, #123376, #122724 and #121190. + + 24 Feb 2006; Jeroen Roovers <jer@gentoo.org> php-5.0.5-r5.ebuild: + Stable on hppa (preparation for bug #119461). + + 21 Feb 2006; Jeroen Roovers <jer@gentoo.org> php-5.0.5-r5.ebuild: + Marked ~hppa. + + 26 Jan 2006; Jeroen Roovers <jer@gentoo.org> php-4.4.1-r3.ebuild: + Marked stable on hppa (bug #102649). + + 26 Jan 2006; Jeroen Roovers <jer@gentoo.org> php-5.1.1.ebuild: + Marked ~hppa (bug #119461). + + 25 Jan 2006; Bryan Østergaard <kloeri@gentoo.org php-4.4.1-r3.ebuild, + php-5.0.5-r5.ebuild: + Stable on alpha. + + 22 Jan 2006; Simon Stelling <blubb@gentoo.org> php-4.3.11-r5.ebuild, + php-4.4.1-r3.ebuild: + stable on amd64 + + 22 Jan 2006; Simon Stelling <blubb@gentoo.org> php-5.0.5-r5.ebuild: + stable on amd64 + + 22 Jan 2006; <nixnut@gentoo.org> php-4.3.11-r5.ebuild: + Added ~ppc keyword to php-4.3.11-r5 + + 21 Jan 2006; Jason Wever <weeve@gentoo.org> php-4.3.11-r5.ebuild, + php-4.4.1-r3.ebuild, php-5.0.5-r5.ebuild: + Stable on SPARC wrt bug #119461. + + 21 Jan 2006; <nixnut@gentoo.org> php-5.0.5-r5.ebuild: + Added ppc keyword to php-4.4.1-r3, php-5.0.5-r5. bug 119461 + + 19 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> php-4.3.11-r5.ebuild, + php-4.4.1-r3.ebuild, php-5.0.5-r5.ebuild: + Stable on x86. + + 18 Jan 2006; Markus Rothe <corsair@gentoo.org> php-4.4.1-r3.ebuild, + php-5.0.5-r5.ebuild: + Stable on ppc64; bug #119461 + + 10 Jan 2006; Luca Longinotti <chtekk@gentoo.org> + -files/4.3.11/php4.3.11-apache2sapi.patch, + -files/4.3.11/php4.3.11-apachesapi.patch, + -files/4.3.11/php4.3.11-curl-open_basedir.patch, + -files/4.3.11/php4.3.11-fopen_wrappers.patch, + -files/4.3.11/php4.3.11-gd-safe_mode.patch, + -files/4.3.11/php4.3.11-globals_overwrite.patch, + -files/4.3.11/php4.3.11-mbstring-header_inj.patch, + -files/4.3.11/php4.3.11-multilib-search-path.patch, + -files/4.3.11/php4.3.11-pcre-security.patch, + -files/4.3.11/php4.3.11-phpinfo_xss.patch, + -files/4.3.11/php4.3.11-pspell-ext-segf.patch, + -files/4.4.1/php4.4.1-apache2sapi.patch, + -files/4.4.1/php4.4.1-curl-open_basedir.patch, + -files/4.4.1/php4.4.1-current_key_by_reference.patch, + -files/4.4.1/php4.4.1-gd-safe_mode.patch, + -files/4.4.1/php4.4.1-mbstring-header_inj.patch, + -files/4.4.1/php4.4.1-multilib-search-path.patch, + -files/5.0.5/php5.0.5-apache2sapi.patch, + -files/5.0.5/php5.0.5-curl-open_basedir.patch, + -files/5.0.5/php5.0.5-fopen_wrappers.patch, + -files/5.0.5/php5.0.5-gd-safe_mode.patch, + -files/5.0.5/php5.0.5-globals_overwrite.patch, + -files/5.0.5/php5.0.5-mbstring-header_inj.patch, + -files/5.0.5/php5.0.5-multilib-search-path.patch, + -files/5.0.5/php5.0.5-obj-serialize.patch, + -files/5.0.5/php5.0.5-pspell-ext-segf.patch, + -files/5.0.5/php5.0.5-tsrm-gcc4.patch, + -files/5.1.1/php5.1.1-curl-gcry_threads.patch, + -files/5.1.1/php5.1.1-ming-config.patch, + -files/5.1.1/php5.1.1-multilib-search-path.patch, php-4.3.11-r5.ebuild, + php-4.4.1-r3.ebuild, php-5.0.5-r5.ebuild, php-5.1.1.ebuild: + Move version-specific patches into external tarballs. + + 05 Jan 2006; Luca Longinotti <chtekk@gentoo.org> + +files/5.1.1/php5.1.1-curl-gcry_threads.patch, php-5.1.1.ebuild: + Fix bug #117767. + +*php-5.1.1 (28 Dec 2005) +*php-5.0.5-r5 (28 Dec 2005) +*php-4.4.1-r3 (28 Dec 2005) +*php-4.3.11-r5 (28 Dec 2005) + + 28 Dec 2005; Luca Longinotti <chtekk@gentoo.org> + files/4-any/php4-imap-symlink.diff, files/4-any/php4-iodbc-config.diff, + +files/4.3.11/php4.3.11-apache2sapi.patch, + +files/4.3.11/php4.3.11-apachesapi.patch, + +files/4.3.11/php4.3.11-curl-open_basedir.patch, + -files/4.3.11/php4.3.11-curl_safemode.patch, + +files/4.3.11/php4.3.11-gd-safe_mode.patch, + -files/4.3.11/php4.3.11-gd_safe_mode.patch, + +files/4.3.11/php4.3.11-mbstring-header_inj.patch, + +files/4.3.11/php4.3.11-multilib-search-path.patch, + -files/4.3.11/php4.3.11-session_save_path-segf.patch, + -files/4.4.0/php4.4.0-curl_safemode.patch, + -files/4.4.0/php4.4.0-fopen_wrappers.patch, + -files/4.4.0/php4.4.0-gd_safe_mode.patch, + -files/4.4.0/php4.4.0-globals_overwrite.patch, + -files/4.4.0/php4.4.0-pcre-security.patch, + -files/4.4.0/php4.4.0-phpinfo_xss.patch, + -files/4.4.0/php4.4.0-pspell-ext-segf.patch, + -files/4.4.0/php4.4.0-session_save_path-segf.patch, + +files/4.4.1/php4.4.1-apache2sapi.patch, + +files/4.4.1/php4.4.1-curl-open_basedir.patch, + +files/4.4.1/php4.4.1-gd-safe_mode.patch, + +files/4.4.1/php4.4.1-mbstring-header_inj.patch, + -files/4.4.1/php4.4.1-mod_rewrite-crash.patch, + +files/4.4.1/php4.4.1-multilib-search-path.patch, + files/5.0-any/php5-iodbc-config.diff, + -files/5.0.4/php5.0.4-curl_safemode.patch, + -files/5.0.4/php5.0.4-fopen_wrappers.patch, + -files/5.0.4/php5.0.4-gd_safe_mode.patch, + -files/5.0.4/php5.0.4-globals_overwrite.patch, + -files/5.0.4/php5.0.4-pcre-security.patch, + -files/5.0.4/php5.0.4-phpinfo_xss.patch, + -files/5.0.4/php5.0.4-pspell-ext-segf.patch, + -files/5.0.4/php5.0.4-session_save_path-segf.patch, + -files/5.0.4/php5.0.4-xmlrcp-ccode.diff, + +files/5.0.5/php5.0.5-apache2sapi.patch, + +files/5.0.5/php5.0.5-curl-open_basedir.patch, + -files/5.0.5/php5.0.5-curl_safemode.patch, + +files/5.0.5/php5.0.5-gd-safe_mode.patch, + -files/5.0.5/php5.0.5-gd_safe_mode.patch, + +files/5.0.5/php5.0.5-mbstring-header_inj.patch, + +files/5.0.5/php5.0.5-multilib-search-path.patch, + -files/5.0.5/php5.0.5-session_save_path-segf.patch, + +files/5.0.5/php5.0.5-tsrm-gcc4.patch, + files/5.1-any/php5-iodbc-config.diff, + +files/5.1.1/php5.1.1-ming-config.patch, + +files/5.1.1/php5.1.1-multilib-search-path.patch, -php-4.3.11-r4.ebuild, + +php-4.3.11-r5.ebuild, -php-4.4.0-r4.ebuild, -php-4.4.1-r2.ebuild, + +php-4.4.1-r3.ebuild, -php-5.0.4-r4.ebuild, -php-5.0.5-r4.ebuild, + +php-5.0.5-r5.ebuild, +php-5.1.1.ebuild: + Sync with PHP Overlay. Delete PHP 4.4.0 and PHP 5.0.4, add PHP 5.1.1. Update + a lot of patches, update Hardened-PHP patches, add lib64 patch for multilib + systems. Fixes many bugs. + + 19 Nov 2005; Markus Rothe <corsair@gentoo.org> php-4.4.1-r2.ebuild, + php-5.0.5-r4.ebuild: + Added ~ppc64 keywords; bug #102649 + + 10 Nov 2005; Jason Wever <weeve@gentoo.org> php-4.4.1-r2.ebuild: + Added ~sparc keyword as all arches but ~x86 were dropped from the 4.4.1 + ebuilds. + +*php-5.0.5-r4 (04 Nov 2005) +*php-5.0.4-r4 (04 Nov 2005) +*php-4.4.1-r2 (04 Nov 2005) +*php-4.4.0-r4 (04 Nov 2005) +*php-4.3.11-r4 (04 Nov 2005) + + 04 Nov 2005; Luca Longinotti <chtekk@gentoo.org> + files/4.3.11/php4.3.11-session_save_path-segf.patch, + files/5.0.4/php5.0.4-session_save_path-segf.patch, + files/4.4.0/php4.4.0-session_save_path-segf.patch, + files/5.0.5/php5.0.5-session_save_path-segf.patch, -php-4.3.11-r3.ebuild, + +php-4.3.11-r4.ebuild, -php-4.4.0-r3.ebuild, +php-4.4.0-r4.ebuild, + -php-4.4.1-r1.ebuild, +php-4.4.1-r2.ebuild, -php-5.0.4-r3.ebuild, + +php-5.0.4-r4.ebuild, -php-5.0.5-r3.ebuild, +php-5.0.5-r4.ebuild: + Revbump to fix a bug in the Apache2 SAPI and a bug with key() and current(). + + 04 Nov 2005; Luca Longinotti <chtekk@gentoo.org> + files/4.3.11/php4.3.11-globals_overwrite.patch, + files/4.4.0/php4.4.0-globals_overwrite.patch, + +files/4.4.1/php4.4.1-current_key_by_reference.patch, + files/5.0.4/php5.0.4-globals_overwrite.patch, + files/5.0.5/php5.0.5-globals_overwrite.patch, php-4.4.1-r1.ebuild: + Fix for http://bugs.php.net/bug.php?id=35067. + +*php-4.4.1-r1 (03 Nov 2005) + + 03 Nov 2005; Luca Longinotti <chtekk@gentoo.org> + +files/4.4.1/php4.4.1-mod_rewrite-crash.patch, -php-4.4.1.ebuild, + +php-4.4.1-r1.ebuild: + Update Hardened-PHP to latest version for PHP 4.4.1 and 5.0.5, fix bug in + the Apache2 SAPI of PHP 4.4.1 (mentioned in bug #111032). + +*php-5.0.5-r3 (02 Nov 2005) +*php-5.0.4-r3 (02 Nov 2005) +*php-4.4.1 (02 Nov 2005) +*php-4.4.0-r3 (02 Nov 2005) +*php-4.3.11-r3 (02 Nov 2005) + + 02 Nov 2005; Luca Longinotti <chtekk@gentoo.org> + +files/4.3.11/php4.3.11-curl_safemode.patch, + +files/4.3.11/php4.3.11-globals_overwrite.patch, + +files/4.3.11/php4.3.11-phpinfo_xss.patch, + +files/4.4.0/php4.4.0-curl_safemode.patch, + +files/4.4.0/php4.4.0-globals_overwrite.patch, + +files/4.4.0/php4.4.0-phpinfo_xss.patch, + +files/5.0.4/php5.0.4-curl_safemode.patch, + +files/5.0.4/php5.0.4-globals_overwrite.patch, + +files/5.0.4/php5.0.4-phpinfo_xss.patch, + +files/5.0.5/php5.0.5-curl_safemode.patch, + +files/5.0.5/php5.0.5-globals_overwrite.patch, -php-4.3.11-r2.ebuild, + +php-4.3.11-r3.ebuild, -php-4.4.0-r2.ebuild, +php-4.4.0-r3.ebuild, + +php-4.4.1.ebuild, -php-5.0.4-r2.ebuild, +php-5.0.4-r3.ebuild, + -php-5.0.5-r2.ebuild, +php-5.0.5-r3.ebuild: + Security-update: fix bugs #111032, #111015, #111011 and bug #111014. Also + add PHP 4.4.1 to the tree, wich fixes those vulnerabilities. + +*php-5.0.5-r2 (31 Oct 2005) +*php-5.0.4-r2 (31 Oct 2005) +*php-4.4.0-r2 (31 Oct 2005) +*php-4.3.11-r2 (31 Oct 2005) + + 31 Oct 2005; Luca Longinotti <chtekk@gentoo.org> + -files/4.4.0/php4.3.11-pcre-security.patch, + +files/4.4.0/php4.4.0-fopen_wrappers.patch, + +files/4.4.0/php4.4.0-gd_safe_mode.patch, + files/4.4.0/php4.4.0-pcre-security.patch, + +files/4.4.0/php4.4.0-pspell-ext-segf.patch, + +files/4.4.0/php4.4.0-session_save_path-segf.patch, + -files/4.4.0/apache-1.3/70_mod_php.conf, + -files/4.4.0/apache-2.0/70_mod_php.conf, + +files/4-any/php4-fastbuild.patch, +files/4-any/php4-imap-symlink.diff, + +files/4-any/php4-iodbc-config.diff, + +files/5.0-any/php5-imap-symlink.diff, + +files/4-any/php4-libtool-1.5.patch, + +files/4-any/php4-uClibc-have_dn_skipname.patch, + +files/4-any/php4-with-iodbc.diff, +files/5.0-any/php5-iodbc-config.diff, + +files/4-any/apache-1.3/70_mod_php.conf, + +files/5.0-any/php5-libtool-1.5.patch, + +files/4-any/apache-2.0/70_mod_php.conf, + +files/4.3.11/php4.3.11-fopen_wrappers.patch, + +files/4.3.11/php4.3.11-gd_safe_mode.patch, + +files/4.3.11/php4.3.11-pcre-security.patch, + +files/4.3.11/php4.3.11-pspell-ext-segf.patch, + +files/4.3.11/php4.3.11-session_save_path-segf.patch, + -files/4.4.0/fastbuild.patch, -files/4.4.0/php4-imap-symlink.diff, + -files/4.4.0/php4-iodbc-config.diff, -files/4.4.0/php4-libtool-1.5.patch, + -files/4.4.0/php4-with-iodbc.diff, +files/5.0-any/php5-prefork.patch, + +files/5.0-any/php5-soap_persistence_session.diff, + +files/5.0-any/php5-with-iodbc.diff, + +files/5.0-any/apache-1.3/70_mod_php5.conf, + +files/5.0-any/apache-2.0/70_mod_php5.conf, + -files/5.0.0/php5-imap-symlink.diff, -files/5.0.0/php5-iodbc-config.diff, + -files/5.0.0/php5-libtool-1.5.patch, + -files/5.0.0/php5.0.4-pcre-security.patch, + -files/5.0.0/php5.0.4-xmlrcp-ccode.diff, + -files/5.0.0/php5.0.5-obj-serialize.patch, + +files/5.0.4/php5.0.4-fopen_wrappers.patch, + +files/5.0.4/php5.0.4-gd_safe_mode.patch, + +files/5.0.4/php5.0.4-pcre-security.patch, + +files/5.0.4/php5.0.4-pspell-ext-segf.patch, + +files/5.0.4/php5.0.4-session_save_path-segf.patch, + +files/5.0.4/php5.0.4-xmlrcp-ccode.diff, + +files/5.0.5/php5.0.5-fopen_wrappers.patch, + +files/5.0.5/php5.0.5-gd_safe_mode.patch, + +files/5.0.5/php5.0.5-obj-serialize.patch, + +files/5.0.5/php5.0.5-pspell-ext-segf.patch, + +files/5.0.5/php5.0.5-session_save_path-segf.patch, + +files/5.1-any/php5-fastbuild.patch, + +files/5.1-any/php5-imap-symlink.diff, + +files/5.1-any/php5-iodbc-config.diff, +files/5.1-any/php5-prefork.patch, + +files/5.1-any/php5-soap_persistence_session.diff, + +files/5.1-any/php5-with-iodbc.diff, + +files/5.1-any/apache-1.3/70_mod_php5.conf, + +files/5.1-any/apache-2.0/70_mod_php5.conf, + -files/5.1.0/php5-imap-symlink.diff, -files/5.1.0/php5-iodbc-config.diff, + -files/5.1.0/php5-prefork.patch, -files/5.1.0/php5-with-iodbc.diff, + -files/5.1.0/php5_soap_persistence_session.diff, + -files/5.1.0/apache-1.3/70_mod_php5.conf, + -files/5.1.0/apache-2.0/70_mod_php5.conf, -php-4.3.11-r1.ebuild, + +php-4.3.11-r2.ebuild, -php-4.4.0-r1.ebuild, +php-4.4.0-r2.ebuild, + -php-5.0.4-r1.ebuild, +php-5.0.4-r2.ebuild, -php-5.0.5-r1.ebuild, + +php-5.0.5-r2.ebuild: + New-style PHP update: fix quotation of some vars, change URI of a mirror, + change ordering of patches in the files/ directory, add 'mnogosearch' USE + flag, add 'oci8-instant-client' USE flag, add 'pic' USE flag, add 'cjk' USE + flag, delete 'png' and 'jpeg' USE flags now directly controlled by 'gd' USE + flag, change PHP extensions enabling/disabling system, fix a bug with + Apache1 + fastbuild, fix elibtoolize call (bug #106176) and fix bugs #99312, + #109669, #102943, #107602, #99225, #108834. + + 24 Sep 2005; Jason Wever <weeve@gentoo.org> php-5.0.5-r1.ebuild: + Added ~sparc keyword. + +*php-5.0.5-r1 (18 Sep 2005) +*php-5.0.4-r1 (18 Sep 2005) +*php-4.4.0-r1 (18 Sep 2005) +*php-4.3.11-r1 (18 Sep 2005) + + 18 Sep 2005; Benedikt Boehm <hollow@gentoo.org> + +files/4.4.0/php4-libtool-1.5.patch, +files/5.0.0/php5-libtool-1.5.patch, + +files/4.4.0/php4.3.11-pcre-security.patch, + +files/4.4.0/php4.4.0-pcre-security.patch, + +files/5.0.0/php5.0.4-pcre-security.patch, + +files/5.0.0/php5.0.4-xmlrcp-ccode.diff, + +files/5.0.0/php5.0.5-obj-serialize.patch, files/4.4.0/fastbuild.patch, + -files/5.0.0/php5-hphp-acinclude.patch, + -files/4.4.0/php4-hphp-acinclude.patch, -php-4.3.11.ebuild, + +php-4.3.11-r1.ebuild, -php-4.4.0.ebuild, +php-4.4.0-r1.ebuild, + -php-5.0.4.ebuild, +php-5.0.4-r1.ebuild, -php-5.0.5.ebuild, + +php-5.0.5-r1.ebuild: + Fix security issue in bundled PCRE lib for PHP 4.3.11, 4.4.0 and 5.0.4, bug #102373. + Fix object serialization bug in PHP 5.0.5, bug #105374. + Fix Hardened-PHP support for all PHP releases. + Various compilation fixes for all PHP releases. + Various dependency fixes for all PHP releases. + Deleted 'dbm' USE flag from all PHP ebuilds, it's not supported upstream. + Changed 'java' USE flag to 'java-internal' USE flag for PHP4. + + 17 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> php-5.0.4.ebuild: + Fixed up the remaining deps, tested here and looks good. Marking ~amd64, bug + 102649. + + 17 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> php-4.4.0.ebuild: + Fixed up the remaining deps, tested here and looks good. Marking ~amd64, bug + 102649. + + 17 Sep 2005; Brian Harring <ferringb@gentoo.org> php-4.4.0.ebuild, + php-5.0.4.ebuild: + Backed out ~amd64 keywording. bad deps. + + 16 Sep 2005; Christian Parpart <trapni@gentoo.org> php-4.4.0.ebuild, + php-5.0.4.ebuild: + added to ~amd64 + + 14 Sep 2005; Joseph Jezak <josejx@gentoo.org> php-5.0.4.ebuild: + Marked ~ppc for bug #105673. + + 14 Sep 2005; Joseph Jezak <josejx@gentoo.org> php-4.4.0.ebuild, + php-5.0.5.ebuild: + Marked ~ppc for bug #105673. + +*php-4.3.11 (11 Sep 2005) + + 11 Sep 2005; Benedikt Boehm <hollow@gentoo.org> +php-4.3.11.ebuild: + add 4.3.11, b/c 4.4.0 breaks compatibility + remove some archs, get your deps tested! + + 09 Sep 2005; Jason Wever <weeve@gentoo.org> php-4.4.0.ebuild, + php-5.0.4.ebuild: + Added ~sparc keyword to help fix the broken dependencies of + dev-php/PEAR-Date-1.4.3-r1. + +*php-4.4.0 (08 Sep 2005) + + 08 Sep 2005; Stuart Herbert <stuart@gentoo.org> + +files/4.4.0/php4-hphp-acinclude.patch, + +files/5.0.0/php5-hphp-acinclude.patch, php-4.4.0.ebuild, php-5.0.4.ebuild, + php-5.0.5.ebuild: + Hardened-PHP fix from the overlay + Slight change to symlink creation behaviour + + 07 Sep 2005; Konstantin Arkhipov <voxus@gentoo.org> php-5.0.4.ebuild, + php-5.0.5.ebuild: + Added to ~amd64. + +*php-5.0.5 (06 Sep 2005) + + 06 Sep 2005; Sebastian Bergmann <sebastian@gentoo.org> +php-5.0.5.ebuild: + Version bump. + + 04 Sep 2005; Stuart Herbert <stuart@gentoo.org> + +files/5.1.0/php5-imap-symlink.diff, +files/5.1.0/php5-iodbc-config.diff, + +files/5.1.0/php5-prefork.patch, +files/5.1.0/php5-with-iodbc.diff, + +files/5.1.0/php5_soap_persistence_session.diff: + Added missing patch files for PHP 5.0 from the overlay + + 05 Sep 2005; <stuart@gentoo.org> ChangeLog: + Initial version; replaces older dev-php/* packages + + diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest new file mode 100644 index 0000000..1ae8ec0 --- /dev/null +++ b/dev-lang/php/Manifest @@ -0,0 +1,51 @@ +AUX 20php5-envd 145 RMD160 8c81fb7dc1d1ddf16fd956d748514db3bcb27603 SHA1 f1cef57c0def8e2c5422aaf136f40b4ff47801d2 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4 +AUX 70_mod_php5.conf-apache2 348 RMD160 9f3f49a52ebf92c2650501c5ceb6f95ce4bb2e76 SHA1 62992e793446b4a9a64900d1ecba7bae06873382 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c +AUX eblits/common-v2.eblit 389 RMD160 10a23452d6f55dfccb9625a8e92899b5f339a7be SHA1 34be294b26c2e4118c6beb2b84d19c4faf426278 SHA256 bf6e4b7ddc7d884e5039df47bd754e6289844faa7a03cc3095ee6aa552c7a39c +AUX eblits/pkg_setup-v2.eblit 393 RMD160 430ab1f0227011172d422886862bd59d3886034a SHA1 2fdb587135cd0fe84ea51bfee8cf4ea9fd67dcb5 SHA256 17f9316065960ff0ca56aeec918c2c9e6c80ffdf951a238f7271a589753e320c +AUX eblits/pkg_setup-v3.eblit 283 RMD160 f1b8307ad0c1f05e6acdd38fb70cec2c65e47cf8 SHA1 97361e7542a3dc3bb6d803ddab2a150f40ba8531 SHA256 5905eb3e6d984a9f8fe49e088adad99db7249f62a957c19f0ae4bf3f56ecaecd +AUX eblits/src_compile-v1.eblit 1283 RMD160 83fbb374e2dfaa9d164e6b32b57c268ed06bf519 SHA1 09124cbc9008bfb72eb24cd24b2319d22df52c2c SHA256 5ec76ae24304c5f803a615a98394c219018da1b1ce2018f92f6ac8c5becf6c99 +AUX eblits/src_compile-v2.eblit 515 RMD160 566e373f081d0310768753cde2320966ec5809a5 SHA1 af5d50abc74decb1c3f084d6d5b56dde1afe88d8 SHA256 60fe1529591f7531ad4af37fab1a52e2ffe197f27a19f269b3b62fdbc044261c +AUX eblits/src_configure-v2.eblit 10855 RMD160 27c70744216912e79707c6861bc7d00a379d690a SHA1 7629d985421b756aa57bcce51d378ff14db675c8 SHA256 cd3002b6c9bd91dc9d7471e416cc631247fb2ad9d7b68981b26a3f83f84c916a +AUX eblits/src_configure-v521.eblit 10844 RMD160 90513f59b5f17d680004d3e74581d9eedc8af490 SHA1 a369e2cf7816799f7e2bead8b6eccc2115d0ecdc SHA256 ad875ca45e9ad975c0d7a3cbedc27c5035aa048d7aa935221a15e47cbca63c3d +AUX eblits/src_configure-v53.eblit 6468 RMD160 b1cd05f6cc4ecbf90d9db075156aecc46cd87a93 SHA1 5e2a86355b5cab42e4d59a288223b165476281e2 SHA256 95f0a22481b07155f9615ee38919f0f0c814142e2cf3fcd632b4f0cf84a73232 +AUX eblits/src_configure-v54.eblit 7370 RMD160 316ebe25e04a0e0298a3016fb716f995b222765b SHA1 de8a84cb8d747f16b873249ffdfd97625cf143e8 SHA256 bb5f1c965e18d9edbe4d48e1687b003b09a82e1692a6ccda11169c10107a31f3 +AUX eblits/src_install-v2.eblit 5428 RMD160 16576daadfb29143a64ad4290df0486ba37fd0cd SHA1 9fd26ae714507bdfbfd1a5239ab6ffa67aca4953 SHA256 b40477e008fdab54d0716e1bb0b487ff9346dc9febaba9c089da450e1716b043 +AUX eblits/src_install-v3.eblit 4857 RMD160 fcd7ad250639a20e9e2dc0d5d96ece28a8b16b0e SHA1 b8756d62af95e27b75ecce3006dcd77228337a36 SHA256 a837364615c5aedf8d42733639ab3ed527114a46870505b452dd0d42c45eb542 +AUX eblits/src_install.patch 5490 RMD160 cb0df2032b855c717b36b5a65c6ec7c184090787 SHA1 3623d59894f344d5afcb340da3125824f3143159 SHA256 5e47f138054f77f3417309b35a4164ec2d7d9da9d12473df9b4f8d842f286b61 +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 eblits/src_test-v1.eblit 1557 RMD160 2afc2b505f2b4bd786635e5b7e997248e93009c3 SHA1 070c2b58b55fc2cec939d7a333057506413e8e99 SHA256 81e9ecf94793377e42508d9e57cd7ab3faff78bce722b84b63999a23bdb2098a +AUX php-fpm-r1.conf 12966 RMD160 2710840ccbd847f74af0486929b6b9af87bf2c51 SHA1 4f0cca8cf24936012c9ee5cb2eaa1a0b391e77b3 SHA256 c4308a92ade93812c6579b74a72cd1f3e1a35f7e63289722f461771d5702448c +AUX php-fpm-r4.init 1157 RMD160 19b129c9254efcbba39d4bf3f77745681497a34d SHA1 0b4b5ba0f10ca1dedc2ea6143781b3bc6fa5915c SHA256 37e34461babfb5881169f9729fbdde7d4aba533f123e2c480fe25ac3b863d3e7 +AUX php5-ldvs 22 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 SHA1 592398c92575adb14ec972847ce2aca28a7b9c2c SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79 +DIST php-5.3.10.tar.bz2 11707402 RMD160 acab30a19b340f21a64e06b524906f2b064dd1c9 SHA1 689d8463b5d9e24b9bf297e35826f2ebdb69afda SHA256 339157af2b386534597d287da292f2545e81d9b452e8b3fe525fb2c534ff344a +DIST php-5.3.11.tar.bz2 11396215 RMD160 cdad550e94cb911fa68b99acba2a5925d0848cf3 SHA1 b7df71d926643b97a08ba0b103d010cbac01d5a1 SHA256 b4174c97ca8d8bcf4b52b8b9ef2c2f35e1b611a5a660e02d7cd3edf263a6bd5d +DIST php-5.3.11RC2.tar.bz2 11269745 RMD160 5126bfce7f2adc4f5098ed50902fa56f47025a6d SHA1 1ccf52990e1cc456296aa05d99c0632f8147917b SHA256 ce0297adc6a81bb38114928703dc052e709cc9847fe21d309b1c2735c4f4d1d9 +DIST php-5.3.12.tar.bz2 11394871 RMD160 5d91c2d16b54632aa123677f63776b312872997c SHA1 1aef7c01207637671299e3eb2d74eb81dd6a8f83 SHA256 91659fd645b03011e1620134fa2457fade1e502499111cef8c4e23f428ad16ac +DIST php-5.4.0.tar.bz2 11439508 RMD160 7842f4f2b0aa064e10c82b5702cb8333bcb97f24 SHA1 c7411438f10ba483ea865f7fe70efe586d67cef1 SHA256 5a6402b53aeebaccdb28d314121a68c3962a46d43457c82249bc9f4aaf516a9d +DIST php-5.4.1.tar.bz2 11145742 RMD160 9d2f0b9c43eba65ca0882d72f44d3613f2a3ecc7 SHA1 3f94f06665c80ddae286feb3bd3c80009efe38f7 SHA256 0b191b9e5466e99b3094aefdd1fbe9b21947ccc5be461f20eb20d9052f2a12ea +DIST php-5.4.1RC1.tar.bz2 11145942 RMD160 213a172122c08fe38a0577a369a9c9b599e55782 SHA1 1716f172292c74293d6de95c6e9f027eafa3aac0 SHA256 1f274b2fe4fc431a8ddf5d5be71270273b339f137567825f76278cad9b3f415e +DIST php-5.4.1RC2.tar.bz2 11147699 RMD160 0f48076bfb98540b0e248ed3f2e315d8f40f2fa7 SHA1 cf0735f64813a9cb8d487c2f4fd21c6af497b523 SHA256 f3138f8d151d19e8c26adb95e47063d710c91bdbe735ada24b6477900a79c387 +DIST php-5.4.2.tar.bz2 11450091 RMD160 b4e88bf65d9ed6488f9b9baa7ea597c47b60c7da SHA1 c25699b2b7454ac1cf481ecba6df90de13d0f3ec SHA256 7f4c13f3b8c7e217b5d0fa04d4dd5bb5d86654f8dc79f49feeffe13e510ad7ce +DIST php-patchset-5.3.10-r0.tar.bz2 7522 RMD160 84165162d1374557a297890ea546cd53a732ad22 SHA1 1dbcb722a21e4f2e0a5159403849c329c76f282d SHA256 6c12c61525095b3672fe821ae4835fe4792a498af62cc38afa624ec5ddbc554f +DIST php-patchset-5.3.10-r2.tar.bz2 7981 RMD160 e17e9ea671e2583a0422361bb80f9d7b1fde5ea7 SHA1 25f6ad8a7cbd3d1d4c3ad4d726e8bbd28c508371 SHA256 f22cef3b678eb7cc548ffce93087e85eba1d01a363c72de2b037bec967980fd0 +DIST php-patchset-5.3.11-r0.tar.bz2 7349 RMD160 403218e70b327c4ab73b713cfea4d7e05c542106 SHA1 e807b6df4049dd5aaf5068ed733bfa6b96d81060 SHA256 47f9ef1bbf9e7adfb0057b840b373980547c8ce400784da1e5f3d7f56b5385ae +DIST php-patchset-5.3.11_rc2-r0.tar.bz2 7363 RMD160 dee5776e8ad40bf727a8a71827e7f5f8bf4c521e SHA1 1a26f55317b689ee3f4f7570f08ab6fdd02b5161 SHA256 a27e7250448cde95e8d031d80d5f4aaf3a2b1579af0da8e2c88e4a28aa118791 +DIST php-patchset-5.3.12-r0.tar.bz2 7349 RMD160 c361241ce8d1f480e6906cf7d0b0e2071e44712c SHA1 8062cd7fd9a6575f3aed855936ff3e70a3ca243a SHA256 3203cda7ab2ae687a89dee35a9523a22d4fe0e223e1311550a35843129625b65 +DIST php-patchset-5.4-1.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea +DIST php-patchset-5.4-2.tar.bz2 5824 RMD160 9a83b507c92babe3a4403841a9a63bb361cf96d2 SHA1 2b6037bb544aa3e62c9116478f350b22325ef9e7 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef +DIST suhosin-patch-5.3.9-0.9.10-gentoo.patch.gz 40949 RMD160 f9a0aa13344f066a161959978d7555796b142ac9 SHA1 8cf4c81d219a6f03a314ba736a900945eeee3a15 SHA256 3c41881e529ff070de1911fcbbda8bfcf04433e3ecbf737bafd525f015791866 +DIST suhosin-patch-5.3.9-0.9.10.patch.gz 40967 RMD160 ce43921fd9b183b154713ecda98294f6c68d5f22 SHA1 7b9ef5c3e0831154df0d6290aba0989ca90138ed SHA256 4438caeab0a10c6c94aee9f7eaa703f5799f97d4e0579f43a947bb7314e38317 +EBUILD php-5.3.10-r2.ebuild 10728 RMD160 6efa2579731ac875f7a66cc1cbf3158664d80eaf SHA1 56be71155d20d8ef7dcf22b6a79e664904486628 SHA256 96ac9ece0c03ad3e96c56a9f9a208575a76c0adb05da9f5b0643870033fb7131 +EBUILD php-5.3.10.ebuild 10717 RMD160 a0f3b9fb238ba8d08266355715b4da9daf9c475f SHA1 7a48defb26df39024ec96a04b8e6ce53d9bbbad7 SHA256 0c3497b0b0bfdd7c6d65e9ada0c3f26bd9e87607121bb381fa121a32eb141fbe +EBUILD php-5.3.11.ebuild 10718 RMD160 dc0ee3de476b2f5b1347e1b82d0de7d6e4c4d0e4 SHA1 f0962b89e7412ebbcbabe1cd319f2440f4d907a2 SHA256 6615ecd42f2812e2c462041b37711863810d380fa45d03424c5371550c8998dc +EBUILD php-5.3.11_rc2.ebuild 10735 RMD160 c71f16c312a996e38c4fe4291fed2d97505044d3 SHA1 1f3f7270a4e38ebbac0bc5c9d83ac8684954619e SHA256 aad078b004cfdd5600cafb82e3e3cf38c81c9bdc57d8ef4851eb42131f0c3815 +EBUILD php-5.3.12.ebuild 10725 RMD160 d11d9d40a650b778a4d75a11ca78d69f4623d484 SHA1 1dcb8af708deaa3a00c19c44b73cb32e0f43765a SHA256 240778782551730773274e6f7fe79101d60ead976fe3ec6bcd82132f36394107 +EBUILD php-5.4.0.ebuild 10383 RMD160 197db3ea01b2f4f08e184865a27461c1180eff14 SHA1 f44a034f7c712d76ca56153469d0b951ca4c97c0 SHA256 ad3bd3ab26b4f2f0e27a779dad9936605638bb7b7981b63f6f88f3f6b61cde7c +EBUILD php-5.4.1.ebuild 10383 RMD160 2bce8d2805a1a1ed039fcc64231d3fe21dc9c1bd SHA1 38d2e47bb5e7f87a88681d2356181768c2db9503 SHA256 8b792da02290617c02900e4a557441ee72eb9ccb5cf4afa5c334db229cf63ee8 +EBUILD php-5.4.1_rc1.ebuild 10392 RMD160 d68eff9dfbff6989288980758165affd2932bbb5 SHA1 5b0e0e968cf0967832c6a5bd5d573353ae8ba620 SHA256 300d446e3b116ba13cf5c51a6b9baacfa3d2df8921d22f46c63020da6ccb49a6 +EBUILD php-5.4.1_rc2.ebuild 10392 RMD160 463f249001785d73845dadd486b80cea2b3ddc15 SHA1 b9f1676429dc5548ecd1edc19c9ce58a8b8f18f4 SHA256 bd576d24805b82b2c4c530fc95e5332291d22d29648f881b3ff8aa3043a767c2 +EBUILD php-5.4.2.ebuild 10496 RMD160 56472f5cffa77f7fd09034d1a2856d69af38052f SHA1 648a1b78f259f4684664fd24b592cf9ad3983d10 SHA256 f536347f081062a6ccc7a27f225c7188854b3204f1be3aa6333d724c534e92e8 +MISC ChangeLog 98418 RMD160 c190169fff2693743c7fa481bb26fa658ab26e0b SHA1 a3b2f5ef51097ad1363d2e87c91792111e139a98 SHA256 8159c70c52dc488ccf4d5aa1680a45295366a3adda017c887b5554dc0ce0cc04 +MISC metadata.xml 1497 RMD160 36fa3f3676c4105cb869d88f02a5c0e5aeed991c SHA1 69cbd4cdc604044e270b350945a3d02ba723d075 SHA256 3d6a278c7a85c8b478ca03860b80a8ceda5f3a5ddc64e2d41ab9ca686e7162df diff --git a/dev-lang/php/files/20php5-envd b/dev-lang/php/files/20php5-envd new file mode 100644 index 0000000..f6033ae --- /dev/null +++ b/dev-lang/php/files/20php5-envd @@ -0,0 +1,2 @@ +MANPATH="/usr/lib/php5/man/" +CONFIG_PROTECT_MASK="/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/apache2-php5/ext-active/" diff --git a/dev-lang/php/files/70_mod_php5.conf-apache2 b/dev-lang/php/files/70_mod_php5.conf-apache2 new file mode 100644 index 0000000..7ec8739 --- /dev/null +++ b/dev-lang/php/files/70_mod_php5.conf-apache2 @@ -0,0 +1,14 @@ +<IfDefine PHP5> + # Load the module first + <IfModule !mod_php5.c> + LoadModule php5_module modules/libphp5.so + </IfModule> + + # Set it to handle the files + <IfModule mod_mime.c> + AddHandler application/x-httpd-php .php .php5 .phtml + AddHandler application/x-httpd-php-source .phps + </IfModule> + + DirectoryIndex index.php index.phtml +</IfDefine> diff --git a/dev-lang/php/files/eblits/common-v2.eblit b/dev-lang/php/files/eblits/common-v2.eblit new file mode 100644 index 0000000..b733299 --- /dev/null +++ b/dev-lang/php/files/eblits/common-v2.eblit @@ -0,0 +1,9 @@ +# 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/common-v2.eblit,v 1.3 2010/10/08 18:25:10 olemarkus Exp $ + +php_set_ini_dir() { + PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" + PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" + PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" +} diff --git a/dev-lang/php/files/eblits/pkg_setup-v2.eblit b/dev-lang/php/files/eblits/pkg_setup-v2.eblit new file mode 100644 index 0000000..a5218b3 --- /dev/null +++ b/dev-lang/php/files/eblits/pkg_setup-v2.eblit @@ -0,0 +1,16 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_setup-v2.eblit,v 1.2 2011/03/17 16:34:47 olemarkus Exp $ + +eblit-php-pkg_setup() { + # Mail support + php_check_mta + + # Oracle support + php_check_oracle_8 + + phpconfutils_warn_about_external_deps + depend.apache_pkg_setup +} + + diff --git a/dev-lang/php/files/eblits/pkg_setup-v3.eblit b/dev-lang/php/files/eblits/pkg_setup-v3.eblit new file mode 100644 index 0000000..ca81906 --- /dev/null +++ b/dev-lang/php/files/eblits/pkg_setup-v3.eblit @@ -0,0 +1,9 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_setup-v3.eblit,v 1.1 2011/07/02 15:14:41 olemarkus Exp $ + +eblit-php-pkg_setup() { + depend.apache_pkg_setup +} + + diff --git a/dev-lang/php/files/eblits/src_compile-v1.eblit b/dev-lang/php/files/eblits/src_compile-v1.eblit new file mode 100644 index 0000000..cb0d56c --- /dev/null +++ b/dev-lang/php/files/eblits/src_compile-v1.eblit @@ -0,0 +1,60 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_compile-v1.eblit,v 1.6 2010/08/14 19:37:31 mabi Exp $ + +eblit-php-src_compile() { + # snmp seems to run during src_compile, too (bug #324739) + addpredict /usr/share/snmp/mibs/.index + + SAPI_DIR="${WORKDIR}/sapis" + + for sapi in ${SAPIS} ; do + use "${sapi}" || continue + + php_sapi_build "${sapi}" + php_sapi_copy "${sapi}" + done +} + +php_sapi_build() { + mkdir -p "${SAPI_DIR}/$1" + + cd "${WORKDIR}/sapis-build/$1" + emake || die "emake failed" +} + +php_sapi_copy() { + local sapi="$1" + local source="" + + case "$sapi" in + cli) + source="sapi/cli/php" + ;; + cgi) + source="sapi/cgi/php-cgi" + ;; + fpm) + source="sapi/fpm/php-fpm" + ;; + embed) + source="libs/libphp${PHP_MV}.so" + ;; + + apache2) + # apache2 is a special case; the necessary files + # (yes, multiple) are copied by make install, not + # by the ebuild; that's the reason, why apache2 has + # to be the last sapi + emake INSTALL_ROOT="${SAPI_DIR}/${sapi}/" install-sapi + ;; + + *) + die "unhandled sapi in php_sapi_copy" + ;; + esac + + if [[ "${source}" ]] ; then + cp "$source" "${SAPI_DIR}/$sapi" || die "Unable to copy ${sapi} SAPI" + fi +} diff --git a/dev-lang/php/files/eblits/src_compile-v2.eblit b/dev-lang/php/files/eblits/src_compile-v2.eblit new file mode 100644 index 0000000..6e3d277 --- /dev/null +++ b/dev-lang/php/files/eblits/src_compile-v2.eblit @@ -0,0 +1,17 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_compile-v2.eblit,v 1.3 2011/10/31 16:18:04 mabi Exp $ + +eblit-php-src_compile() { + # snmp seems to run during src_compile, too (bug #324739) + addpredict /usr/share/snmp/mibs/.index + + for sapi in ${SAPIS} ; do + use "${sapi}" && php_sapi_build "${sapi}" + done +} + +php_sapi_build() { + cd "${WORKDIR}/sapis-build/$1" + emake || die "emake failed" +} diff --git a/dev-lang/php/files/eblits/src_configure-v2.eblit b/dev-lang/php/files/eblits/src_configure-v2.eblit new file mode 100644 index 0000000..ab09832 --- /dev/null +++ b/dev-lang/php/files/eblits/src_configure-v2.eblit @@ -0,0 +1,276 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v2.eblit,v 1.5 2011/01/05 11:23:16 mabi Exp $ + +eblit-php-src_configure() { + 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... + # for --with-libdir see bug #327025 + 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_disable "dom" "xml" 0 + phpconfutils_extension_with "enchant" "enchant" 1 "/usr" + phpconfutils_extension_enable "exif" "exif" 1 + phpconfutils_extension_disable "fileinfo" "fileinfo" 1 + 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_with "mhash" "mhash" 0 + phpconfutils_extension_without "iconv" "iconv" 0 + phpconfutils_extension_enable "intl" "intl" 1 + 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 "mssql" "mssql" 1 + phpconfutils_extension_with "onig" "unicode" 0 "/usr" + phpconfutils_extension_with "openssl" "ssl" 0 + phpconfutils_extension_with "openssl-dir" "ssl" 0 "/usr" + phpconfutils_extension_enable "pcntl" "pcntl" 1 + phpconfutils_extension_disable "phar" "phar" 1 + 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 "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_without "sqlite3" "sqlite3" 1 "/usr" + phpconfutils_extension_with "sybase-ct" "sybase-ct" 1 "/usr" + 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 + + # Interbase/firebird support + if use interbase ; then + phpconfutils_extension_with "interbase" "interbase" 0 "/opt" + fi + + if use firebird ; then + phpconfutils_extension_with "interbase" "firebird" 0 "/usr" + fi + + # 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 + if use mysqlnd ; then + phpconfutils_extension_with "mysql" "mysql" 1 "mysqlnd" + else + phpconfutils_extension_with "mysql" "mysql" 1 "/usr" + fi + phpconfutils_extension_with "mysql-sock" "mysql" 0 "/var/run/mysqld/mysqld.sock" + fi + + # MySQLi support + if use mysqlnd ; then + phpconfutils_extension_with "mysqli" "mysqli" 1 "mysqlnd" + else + phpconfutils_extension_with "mysqli" "mysqli" 1 "/usr/bin/mysql_config" + fi + + # 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 + if use mysqlnd ; then + phpconfutils_extension_with "pdo-mysql" "mysql" 1 "mysqlnd" + else + phpconfutils_extension_with "pdo-mysql" "mysql" 1 "/usr" + fi + phpconfutils_extension_with "pdo-pgsql" "postgres" 1 + phpconfutils_extension_with "pdo-sqlite" "sqlite3" 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 + my_conf="${my_conf} --with-pcre-regex=/usr --with-pcre-dir=/usr" + + # 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 + + 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|cgi|embed|fpm) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf="${sapi_conf} --enable-${sapi}" + else + sapi_conf="${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 +} diff --git a/dev-lang/php/files/eblits/src_configure-v521.eblit b/dev-lang/php/files/eblits/src_configure-v521.eblit new file mode 100644 index 0000000..61e6389 --- /dev/null +++ b/dev-lang/php/files/eblits/src_configure-v521.eblit @@ -0,0 +1,273 @@ +# 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-v521.eblit,v 1.1 2010/10/08 18:25:10 olemarkus 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 + + 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 +} diff --git a/dev-lang/php/files/eblits/src_configure-v53.eblit b/dev-lang/php/files/eblits/src_configure-v53.eblit new file mode 100644 index 0000000..04bc455 --- /dev/null +++ b/dev-lang/php/files/eblits/src_configure-v53.eblit @@ -0,0 +1,258 @@ +# Copyright 1999-2012 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-v53.eblit,v 1.4 2012/02/28 10:59:13 mabi Exp $ + +eblit-php-src_configure() { + addpredict /usr/share/snmp/mibs/.index + + 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... + # for --with-libdir see bug #327025 + 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)" + + # extension USE flag shared + my_conf+=" + $(use_enable bcmath bcmath ) + $(use_with bzip2 bz2 ) + $(use_enable calendar calendar ) + $(use_enable ctype ctype ) + $(use_with curl curl ) + $(use_with curlwrappers curlwrappers ) + $(use_enable xml dom ) + $(use_with enchant enchant /usr) + $(use_enable exif exif ) + $(use_enable fileinfo fileinfo ) + $(use_enable filter filter ) + $(use_enable ftp ftp ) + $(use_with nls gettext ) + $(use_with gmp gmp ) + $(use_enable hash hash ) + $(use_with mhash mhash ) + $(use_with iconv iconv ) + $(use_enable intl intl ) + $(use_enable ipv6 ipv6 ) + $(use_enable json json ) + $(use_with kerberos kerberos /usr) + $(use_enable xml libxml ) + $(use_enable unicode mbstring ) + $(use_with crypt mcrypt ) + $(use_with mssql mssql ) + $(use_with unicode onig /usr) + $(use_with ssl openssl ) + $(use_with ssl openssl-dir /usr) + $(use_enable pcntl pcntl ) + $(use_enable phar phar ) + $(use_enable pdo pdo ) + $(use_with postgres pgsql ) + $(use_enable posix posix ) + $(use_with spell pspell ) + $(use_with recode recode ) + $(use_enable simplexml simplexml ) + $(use_enable sharedmem shmop ) + $(use_with snmp snmp ) + $(use_enable soap soap ) + $(use_enable sockets sockets ) + $(use_with sqlite sqlite /usr)" + use sqlite && my_conf+=" $(use_enable unicode sqlite-utf8)" + my_conf+=" + $(use_with sqlite3 sqlite3 /usr) + $(use_with sybase-ct sybase-ct /usr) + $(use_enable sysvipc sysvmsg ) + $(use_enable sysvipc sysvsem ) + $(use_enable sysvipc sysvshm ) + $(use_with tidy tidy ) + $(use_enable tokenizer tokenizer ) + $(use_enable wddx wddx ) + $(use_enable xml xml ) + $(use_enable xmlreader xmlreader ) + $(use_enable xmlwriter xmlwriter ) + $(use_with xmlrpc xmlrpc ) + $(use_with xsl xsl ) + $(use_enable zip zip ) + $(use_with zlib zlib ) + $(use_enable debug debug )" + + # 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 + my_conf+=" + $(use_with cdb cdb ) + $(use_with berkdb db4 ) + $(use_enable flatfile flatfile ) + $(use_with gdbm gdbm ) + $(use_enable inifile inifile ) + $(use_with qdbm qdbm )" + + # Support for the GD graphics library + my_conf+=" + $(use_with truetype freetype-dir /usr) + $(use_with truetype t1lib /usr) + $(use_enable cjk gd-jis-conv ) + $(use_with gd jpeg-dir /usr) + $(use_with gd png-dir /usr) + $(use_with xpm xpm-dir /usr)" + # enable gd last, so configure can pick up the previous settings + my_conf+=" + $(use_with gd gd )" + + # IMAP support + if use imap ; then + my_conf+=" + $(use_with imap imap ) + $(use_with ssl imap-ssl )" + fi + + # Interbase/firebird support + + if use firebird ; then + my_conf+=" + $(use_with firebird interbase /usr)" + fi + + # LDAP support + if use ldap ; then + my_conf+=" + $(use_with ldap ldap ) + $(use_with ldap-sasl ldap-sasl )" + fi + + # MySQL support + if use mysql ; then + if use mysqlnd ; then + my_conf+=" + $(use_with mysql mysql mysqlnd)" + else + my_conf+=" + $(use_with mysql mysql /usr)" + fi + my_conf+=" + $(use_with mysql mysql-sock /var/run/mysqld/mysqld.sock)" + fi + + # MySQLi support + if use mysqlnd ; then + my_conf+=" + $(use_with mysqli mysqli mysqlnd)" + else + my_conf+=" + $(use_with mysqli mysqli /usr/bin/mysql_config)" + fi + + # ODBC support + if use odbc ; then + my_conf+=" + $(use_with odbc unixODBC /usr)" + fi + + if use iodbc ; then + my_conf+=" + $(use_with iodbc iodbc /usr)" + fi + + # Oracle support + if use oci8-instant-client ; then + my_conf+=" + $(use_with oci8-instant-client oci8)" + fi + + # PDO support + if use pdo ; then + my_conf+=" + $(use_with mssql pdo-dblib )" + if use mysqlnd ; then + my_conf+=" + $(use_with mysql pdo-mysql mysqlnd)" + else + my_conf+=" + $(use_with mysql pdo-mysql /usr)" + fi + my_conf+=" + $(use_with postgres pdo-pgsql ) + $(use_with sqlite3 pdo-sqlite /usr) + $(use_with odbc pdo-odbc unixODBC,/usr)" + if use oci8-instant-client ; then + my_conf+=" + $(use_with oci8-instant-client pdo-oci)" + fi + fi + + # readline/libedit support + my_conf+=" + $(use_with readline readline ) + $(use_with libedit libedit )" + + # Session support + if use session ; then + my_conf+=" + $(use_with sharedmem mm )" + else + my_conf+=" + $(use_enable session session )" + 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 + my_conf="${my_conf} --with-pcre-regex=/usr --with-pcre-dir=/usr" + + # Catch CFLAGS problems + # Fixes bug #14067. + # Changed order to run it in reverse for bug #32022 and #12021. + replace-cpu-flags "k6*" "i586" + + # 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 + + 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|cgi|embed|fpm) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf="${sapi_conf} --enable-${sapi}" + else + sapi_conf="${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 +} diff --git a/dev-lang/php/files/eblits/src_configure-v54.eblit b/dev-lang/php/files/eblits/src_configure-v54.eblit new file mode 100644 index 0000000..7ca5ab2 --- /dev/null +++ b/dev-lang/php/files/eblits/src_configure-v54.eblit @@ -0,0 +1,261 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v54.eblit,v 1.1 2011/12/18 09:00:26 olemarkus Exp $ + +eblit-php-src_configure() { + addpredict /usr/share/snmp/mibs/.index + + PHP_DESTDIR="${EPREFIX}/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... + # for --with-libdir see bug #327025 + 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)" + + # extension USE flag shared + my_conf+=" + $(use_enable bcmath bcmath ) + $(use_with bzip2 bz2 "${EPREFIX}"/usr) + $(use_enable calendar calendar ) + $(use_enable ctype ctype ) + $(use_with curl curl "${EPREFIX}"/usr) + $(use_with curlwrappers curlwrappers "${EPREFIX}"/usr) + $(use_enable xml dom ) + $(use_with enchant enchant "${EPREFIX}"/usr) + $(use_enable exif exif ) + $(use_enable fileinfo fileinfo ) + $(use_enable filter filter ) + $(use_enable ftp ftp ) + $(use_with nls gettext "${EPREFIX}"/usr) + $(use_with gmp gmp "${EPREFIX}"/usr) + $(use_enable hash hash ) + $(use_with mhash mhash "${EPREFIX}"/usr) + $(use_with iconv iconv ) + $(use_enable intl intl ) + $(use_enable ipv6 ipv6 ) + $(use_enable json json ) + $(use_with kerberos kerberos "${EPREFIX}"/usr) + $(use_enable xml libxml ) + $(use_with xml libxml-dir "${EPREFIX}"/usr) + $(use_enable unicode mbstring ) + $(use_with crypt mcrypt "${EPREFIX}"/usr) + $(use_with mssql mssql "${EPREFIX}"/usr) + $(use_with unicode onig "${EPREFIX}"/usr) + $(use_with ssl openssl "${EPREFIX}"/usr) + $(use_with ssl openssl-dir "${EPREFIX}"/usr) + $(use_enable pcntl pcntl ) + $(use_enable phar phar ) + $(use_enable pdo pdo ) + $(use_with postgres pgsql "${EPREFIX}"/usr) + $(use_enable posix posix ) + $(use_with spell pspell "${EPREFIX}"/usr) + $(use_with recode recode "${EPREFIX}"/usr) + $(use_enable simplexml simplexml ) + $(use_enable sharedmem shmop ) + $(use_with snmp snmp "${EPREFIX}"/usr) + $(use_enable soap soap ) + $(use_enable sockets sockets ) + $(use_with sqlite3 sqlite3 "${EPREFIX}"/usr) + $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr) + $(use_enable sysvipc sysvmsg ) + $(use_enable sysvipc sysvsem ) + $(use_enable sysvipc sysvshm ) + $(use_with tidy tidy "${EPREFIX}"/usr) + $(use_enable tokenizer tokenizer ) + $(use_enable wddx wddx ) + $(use_enable xml xml ) + $(use_enable xmlreader xmlreader ) + $(use_enable xmlwriter xmlwriter ) + $(use_with xmlrpc xmlrpc "${EPREFIX}"/usr) + $(use_with xsl xsl "${EPREFIX}"/usr) + $(use_enable zip zip ) + $(use_with zlib zlib "${EPREFIX}"/usr) + $(use_enable debug debug )" + + # 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 + my_conf+=" + $(use_with cdb cdb ${EPREFIX}/usr) + $(use_with berkdb db4 ${EPREFIX}/usr) + $(use_enable flatfile flatfile ) + $(use_with gdbm gdbm ${EPREFIX}/usr) + $(use_enable inifile inifile ) + $(use_with qdbm qdbm ${EPREFIX}/usr)" + + # Support for the GD graphics library + my_conf+=" + $(use_with truetype freetype-dir ${EPREFIX}/usr) + $(use_with truetype t1lib ${EPREFIX}/usr) + $(use_enable cjk gd-jis-conv ) + $(use_with gd jpeg-dir ${EPREFIX}/usr) + $(use_with gd png-dir ${EPREFIX}/usr) + $(use_with xpm xpm-dir ${EPREFIX}/usr)" + # enable gd last, so configure can pick up the previous settings + my_conf+=" + $(use_with gd gd ${EPREFIX}/usr)" + + # IMAP support + if use imap ; then + my_conf+=" + $(use_with imap imap ${EPREFIX}/usr) + $(use_with ssl imap-ssl ${EPREFIX}/usr)" + fi + + # Interbase/firebird support + + if use firebird ; then + my_conf+=" + $(use_with firebird interbase ${EPREFIX}/usr)" + fi + + # LDAP support + if use ldap ; then + my_conf+=" + $(use_with ldap ldap ${EPREFIX}/usr) + $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)" + fi + + # MySQL support + if use mysql ; then + if use mysqlnd ; then + my_conf+=" + $(use_with mysql mysql mysqlnd)" + else + my_conf+=" + $(use_with mysql mysql ${EPREFIX}/usr)" + fi + my_conf+=" + $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)" + fi + + # MySQLi support + if use mysqlnd ; then + my_conf+=" + $(use_with mysqli mysqli mysqlnd)" + else + my_conf+=" + $(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)" + fi + + # ODBC support + if use odbc ; then + my_conf+=" + $(use_with odbc unixODBC ${EPREFIX}/usr)" + fi + + if use iodbc ; then + my_conf+=" + $(use_with iodbc iodbc ${EPREFIX}/usr)" + fi + + # Oracle support + 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')" + + my_conf+=" + $(use_with oci8-instant-client oci8 instantclient,${EPREFIX}/usr/lib/oracle/${OCI8IC_PKG}/client/lib)" + fi + + # PDO support + if use pdo ; then + my_conf+=" + $(use_with mssql pdo-dblib )" + if use mysqlnd ; then + my_conf+=" + $(use_with mysql pdo-mysql mysqlnd)" + else + my_conf+=" + $(use_with mysql pdo-mysql ${EPREFIX}/usr)" + fi + my_conf+=" + $(use_with postgres pdo-pgsql ) + $(use_with sqlite3 pdo-sqlite ${EPREFIX}/usr) + $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)" + if use oci8-instant-client ; then + my_conf+=" + $(use_with oci8-instant-client pdo-oci instantclient,${EPREFIX}/usr,${OCI8IC_PKG} )" + fi + fi + + # readline/libedit support + my_conf+=" + $(use_with readline readline ${EPREFIX}/usr) + $(use_with libedit libedit ${EPREFIX}/usr)" + + # Session support + if use session ; then + my_conf+=" + $(use_with sharedmem mm ${EPREFIX}/usr)" + else + my_conf+=" + $(use_enable session session )" + 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 + my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" + + # Catch CFLAGS problems + # Fixes bug #14067. + # Changed order to run it in reverse for bug #32022 and #12021. + replace-cpu-flags "k6*" "i586" + + # 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 + + 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|cgi|embed|fpm) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf="${sapi_conf} --enable-${sapi}" + else + sapi_conf="${sapi_conf} --disable-${sapi}" + fi + ;; + + apache2) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs" + else + sapi_conf="${sapi_conf} --without-apxs2" + fi + ;; + esac + done + + econf ${sapi_conf} + done +} diff --git a/dev-lang/php/files/eblits/src_install-v2.eblit b/dev-lang/php/files/eblits/src_install-v2.eblit new file mode 100644 index 0000000..7fcbbed --- /dev/null +++ b/dev-lang/php/files/eblits/src_install-v2.eblit @@ -0,0 +1,163 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v 1.14 2011/12/16 09:02:43 olemarkus Exp $ + +eblit-php-src_install() { + # see bug #324739 for what happens when we don't have that + addpredict /usr/share/snmp/mibs/.index + + # grab the first SAPI that got built and install common files from there + local first_sapi="" + for sapi in $SAPIS ; do + if use $sapi ; then + first_sapi=$sapi + break + fi + done + + # Makefile forgets to create this before trying to write to it... + dodir "${PHP_DESTDIR#${EPREFIX}}/bin" + + # Install php environment (without any sapis) + cd "${WORKDIR}/sapis-build/$first_sapi" + emake INSTALL_ROOT="${D}" \ + install-build install-headers install-programs \ + || die "emake install failed" + + local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" + + # And install the modules to it + if use sharedext ; then + insinto "${extension_dir#${EPREFIX}}" + doins "${WORKDIR}/sapis-build/${first_sapi}/modules/"*$(get_modname) + fi + + # Create the directory where we'll put version-specific php scripts + keepdir /usr/share/php${PHP_MV} + + local sapi="", file="" + local sapi_list="" + + for sapi in ${SAPIS}; do + if use "${sapi}" ; then + einfo "Installing SAPI: ${sapi}" + cd "${WORKDIR}/sapis-build/${sapi}" + # needed each time, php_install_ini would reset it + into "${PHP_DESTDIR#${EPREFIX}}" + file=$(find "${SAPI_DIR}/${sapi}/" -type f | head -n 1) + + if [[ "${file: -3}" == ".so" ]]; then + if [[ "${sapi}" == "apache2" ]]; then + insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" + newins "${file}" "${file/*\/}" + keepdir "/usr/$(get_libdir)/apache2/modules" + else + dolib.so "${file}" || die "Unable to install ${sapi} sapi" + fi + else + dobin "${file}" || die "Unable to install ${sapi} sapi" + fi + + php_install_ini "${sapi}" + + # construct correct SAPI string for php-config + # thanks to ferringb for the bash voodoo + if [[ "${sapi}" == "apache2" ]]; then + sapi_list="${sapi_list:+${sapi_list} }apache2handler" + else + sapi_list="${sapi_list:+${sapi_list} }${sapi}" + fi + fi + done + + # Install env.d files + newenvd "${FILESDIR}/20php${PHP_MV}-envd" \ + "20php${SLOT}" + eprefixify "${ED}/etc/env.d/20php${SLOT}" + sed -e "s|/lib/|/$(get_libdir)/|g" -i \ + "${ED}/etc/env.d/20php${SLOT}" + sed -e "s|php5|php${SLOT}|g" -i \ + "${ED}/etc/env.d/20php${SLOT}" + + # set php-config variable correctly (bug #278439) + sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ + "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" +} + +php_install_ini() { + local phpsapi="${1}" + + # work out where we are installing the ini file + php_set_ini_dir "${phpsapi}" + + local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" + cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" + + # default to allow_url_open=Off, bug 332763 + sed -e 's|^allow_url_fopen .*|allow_url_fopen = Off|g' -i "${phpinisrc}" + + # default to expose_php=Off, bug 300695 + sed -e 's|^expose_php .*|expose_php = Off|g' -i "${phpinisrc}" + + # default to /tmp for save_path, bug #282768 + sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" + + # Set the extension dir + sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" + + # Set the include path to point to where we want to find PEAR packages + sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" + + dodir "${PHP_INI_DIR#${EPREFIX}}" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${phpinisrc}" "${PHP_INI_FILE}" + + elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" + elog + + dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" + dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" + + # Install any extensions built as shared objects + if use sharedext ; then + insinto "${PHP_EXT_INI_DIR#${EPREFIX}}" + for extension in "${ED}/${extension_dir#${EPREFIX}}/"*$(get_modname) ; do + extension="${extension##*/}" + inifilename="${extension/$(get_modname)/.ini}" + echo "extension=${extension}" > "${WORKDIR}/sapis-build/${phpsapi}/modules/$inifilename" + doins "${WORKDIR}/sapis-build/${phpsapi}/modules/$inifilename" + dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/${inifilename}" + done + fi + + # SAPI-specific handling + if [[ "${sapi}" == "apache2" ]] ; then + insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}" + newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \ + "70_mod_php${PHP_MV}.conf" + fi + + if [[ "${sapi}" == "fpm" ]] ; then + [[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3 + [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 + einfo "Installing FPM CGI config file php-fpm.conf" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf + dodir "/etc/init.d" + insinto "/etc/init.d" + newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm" +# dosym "${PHP_DESTDIR#${EPREFIX}}/bin/php-fpm" "/usr/bin/php-fpm" + fi + + # Install PHP ini files into /usr/share/php + if [[ ${SLOT} == '5.2' ]]; then + newdoc php.ini-dist php.ini-development + newdoc php.ini-recommended php.ini-production + fi + + if [[ ${SLOT} == '5.3' ]]; then + dodoc php.ini-development + dodoc php.ini-production + fi + +} diff --git a/dev-lang/php/files/eblits/src_install-v3.eblit b/dev-lang/php/files/eblits/src_install-v3.eblit new file mode 100644 index 0000000..836ba0c --- /dev/null +++ b/dev-lang/php/files/eblits/src_install-v3.eblit @@ -0,0 +1,158 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit,v 1.5 2011/11/08 18:14:08 olemarkus Exp $ + +eblit-php-src_install() { + # see bug #324739 for what happens when we don't have that + addpredict /usr/share/snmp/mibs/.index + + # grab the first SAPI that got built and install common files from there + local first_sapi="" + for sapi in $SAPIS ; do + if use $sapi ; then + first_sapi=$sapi + break + fi + done + + # Makefile forgets to create this before trying to write to it... + dodir "${PHP_DESTDIR#${EPREFIX}}/bin" + + # Install php environment (without any sapis) + cd "${WORKDIR}/sapis-build/$first_sapi" + emake INSTALL_ROOT="${D}" \ + install-build install-headers install-programs \ + || die "emake install failed" + + local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" + + # Create the directory where we'll put version-specific php scripts + keepdir /usr/share/php${PHP_MV} + + local sapi="", file="" + local sapi_list="" + + for sapi in ${SAPIS}; do + if use "${sapi}" ; then + einfo "Installing SAPI: ${sapi}" + cd "${WORKDIR}/sapis-build/${sapi}" + + if [[ "${sapi}" == "apache2" ]] ; then + # We're specifically not using emake install-sapi as libtool + # may cause unnecessary relink failures (see bug #351266) + insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" + newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)" + keepdir "/usr/$(get_libdir)/apache2/modules" + else + # needed each time, php_install_ini would reset it + into "${PHP_DESTDIR#${EPREFIX}}" + case "$sapi" in + cli) + source="sapi/cli/php" + ;; + cgi) + source="sapi/cgi/php-cgi" + ;; + fpm) + source="sapi/fpm/php-fpm" + ;; + embed) + source="libs/libphp${PHP_MV}$(get_libname)" + ;; + *) + die "unhandled sapi in src_install" + ;; + esac + + if [[ "${source}" == *"$(get_libname)" ]]; then + dolib.so "${source}" || die "Unable to install ${sapi} sapi" + else + dobin "${source}" || die "Unable to install ${sapi} sapi" + fi + fi + + php_install_ini "${sapi}" + + # construct correct SAPI string for php-config + # thanks to ferringb for the bash voodoo + if [[ "${sapi}" == "apache2" ]]; then + sapi_list="${sapi_list:+${sapi_list} }apache2handler" + else + sapi_list="${sapi_list:+${sapi_list} }${sapi}" + fi + fi + done + + # Install env.d files + newenvd "${FILESDIR}/20php${PHP_MV}-envd" \ + "20php${SLOT}" + eprefixify "${ED}/etc/env.d/20php${SLOT}" + sed -e "s|/lib/|/$(get_libdir)/|g" -i \ + "${ED}/etc/env.d/20php${SLOT}" + sed -e "s|php5|php${SLOT}|g" -i \ + "${ED}/etc/env.d/20php${SLOT}" + + # set php-config variable correctly (bug #278439) + sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ + "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" +} + +php_install_ini() { + local phpsapi="${1}" + + # work out where we are installing the ini file + php_set_ini_dir "${phpsapi}" + + local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" + cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" + + # default to /tmp for save_path, bug #282768 + sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" + + # Set the extension dir + sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" + + # Set the include path to point to where we want to find PEAR packages + sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" + + dodir "${PHP_INI_DIR#${EPREFIX}}" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${phpinisrc}" "${PHP_INI_FILE}" + + elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" + elog + + dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" + dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" + + # SAPI-specific handling + if [[ "${sapi}" == "apache2" ]] ; then + insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}" + newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \ + "70_mod_php${PHP_MV}.conf" + fi + + if [[ "${sapi}" == "fpm" ]] ; then + [[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3 + [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 + einfo "Installing FPM CGI config file php-fpm.conf" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf + dodir "/etc/init.d" + insinto "/etc/init.d" + newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm" + # dosym "${PHP_DESTDIR#${EPREFIX}}/bin/php-fpm" "/usr/bin/php-fpm" + fi + + # Install PHP ini files into /usr/share/php + if [[ ${SLOT} == '5.2' ]]; then + newdoc php.ini-dist php.ini-development + newdoc php.ini-recommended php.ini-production + fi + + if [[ ${SLOT} == '5.3' ]]; then + dodoc php.ini-development + dodoc php.ini-production + fi + +} diff --git a/dev-lang/php/files/eblits/src_install.patch b/dev-lang/php/files/eblits/src_install.patch new file mode 100644 index 0000000..400de12 --- /dev/null +++ b/dev-lang/php/files/eblits/src_install.patch @@ -0,0 +1,138 @@ +--- src_install-v3.eblit 2012-05-05 11:20:31.000000000 +0900 ++++ /gentoo/usr/portage/dev-lang/php/files/eblits/src_install-v3.eblit 2012-05-05 12:29:49.927983645 +0900 +@@ -1,4 +1,4 @@ +-# Copyright 1999-2011 Gentoo Foundation ++# Copyright 1999-2010 Gentoo Foundation + # Distributed under the terms of the GNU General Public License v2 + # $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit,v 1.5 2011/11/08 18:14:08 olemarkus Exp $ + +@@ -16,7 +16,7 @@ eblit-php-src_install() { + done + + # Makefile forgets to create this before trying to write to it... +- dodir "${PHP_DESTDIR}/bin" ++ dodir "${PHP_DESTDIR#${EPREFIX}}/bin" + + # Install php environment (without any sapis) + cd "${WORKDIR}/sapis-build/$first_sapi" +@@ -24,7 +24,7 @@ eblit-php-src_install() { + install-build install-headers install-programs \ + || die "emake install failed" + +- local extension_dir="$("${D}/${PHP_DESTDIR}/bin/php-config" --extension-dir)" ++ local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" + + # Create the directory where we'll put version-specific php scripts + keepdir /usr/share/php${PHP_MV} +@@ -41,7 +41,7 @@ eblit-php-src_install() { + # We're specifically not using emake install-sapi as libtool + # may cause unnecessary relink failures (see bug #351266) + insinto "${PHP_DESTDIR}/apache2/" +- newins ".libs/libphp5.so" "libphp${PHP_MV}.so" ++ newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)" + keepdir "/usr/$(get_libdir)/apache2/modules" + else + # needed each time, php_install_ini would reset it +@@ -57,14 +57,14 @@ eblit-php-src_install() { + source="sapi/fpm/php-fpm" + ;; + embed) +- source="libs/libphp${PHP_MV}.so" ++ source="libs/libphp${PHP_MV}$(get_libname)" + ;; + *) + die "unhandled sapi in src_install" + ;; + esac + +- if [[ "${source: -3}" == ".so" ]]; then ++ if [[ "${source}" == *"$(get_libname)" ]]; then + dolib.so "${source}" || die "Unable to install ${sapi} sapi" + else + dobin "${source}" || die "Unable to install ${sapi} sapi" +@@ -84,16 +84,17 @@ eblit-php-src_install() { + done + + # Install env.d files +- newenvd "${FILESDIR}/20php5-envd" \ ++ newenvd "${FILESDIR}/20php${PHP_MV}-envd" \ + "20php${SLOT}" ++ eprefixify "${ED}/etc/env.d/20php${SLOT}" + sed -e "s|/lib/|/$(get_libdir)/|g" -i \ +- "${D}/etc/env.d/20php${SLOT}" ++ "${ED}/etc/env.d/20php${SLOT}" + sed -e "s|php5|php${SLOT}|g" -i \ +- "${D}/etc/env.d/20php${SLOT}" ++ "${ED}/etc/env.d/20php${SLOT}" + + # set php-config variable correctly (bug #278439) + sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ +- "${D}/usr/$(get_libdir)/php${SLOT}/bin/php-config" ++ "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" + } + + php_install_ini() { +@@ -106,47 +107,44 @@ php_install_ini() { + cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" + + # default to /tmp for save_path, bug #282768 +- sed -e 's|^;session.save_path .*$|session.save_path = "/tmp"|g' -i "${phpinisrc}" ++ sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" + + # Set the extension dir + sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" + + # Set the include path to point to where we want to find PEAR packages +- sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:/usr/share/php'${PHP_MV}':/usr/share/php"|' -i "${phpinisrc}" +- +- dodir "${PHP_INI_DIR}" +- insinto "${PHP_INI_DIR}" ++ sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" ++ ++ dodir "${PHP_INI_DIR#${EPREFIX}}" ++ insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${phpinisrc}" "${PHP_INI_FILE}" + +- elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR}" ++ elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" + elog + +- dodir "${PHP_EXT_INI_DIR}" +- dodir "${PHP_EXT_INI_DIR_ACTIVE}" ++ dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" ++ dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" + + # SAPI-specific handling + if [[ "${sapi}" == "apache2" ]] ; then +- insinto "${APACHE_MODULES_CONFDIR}" +- newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \ +- "70_mod_php${PHP_MV}.conf" ++ insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}" ++ newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \ ++ "70_mod_php${PHP_MV}.conf" + fi + + if [[ "${sapi}" == "fpm" ]] ; then +- [[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3 +- [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 ++ [[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3 ++ [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 + einfo "Installing FPM CGI config file php-fpm.conf" +- insinto ${PHP_INI_DIR} ++ insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf + dodir "/etc/init.d" + insinto "/etc/init.d" + newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm" +- #dosym "${PHP_DESTDIR}/bin/php-fpm" "/usr/bin/php-fpm" +- +- # Remove bogus /etc/php-fpm.conf.default (bug 359906) +- [[ -f "${D}/etc/php-fpm.conf.default" ]] && rm "${D}/etc/php-fpm.conf.default" ++ # dosym "${PHP_DESTDIR#${EPREFIX}}/bin/php-fpm" "/usr/bin/php-fpm" + fi + +- # Install PHP ini files into /usr/share/php ++ # Install PHP ini files into /usr/share/php + if [[ ${SLOT} == '5.2' ]]; then + newdoc php.ini-dist php.ini-development + newdoc php.ini-recommended php.ini-production diff --git a/dev-lang/php/files/eblits/src_prepare-v2.eblit b/dev-lang/php/files/eblits/src_prepare-v2.eblit new file mode 100644 index 0000000..b6bd72e --- /dev/null +++ b/dev-lang/php/files/eblits/src_prepare-v2.eblit @@ -0,0 +1,71 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_prepare-v2.eblit,v 1.3 2011/01/05 11:23:16 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 + + # 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 [[ -n $SUHOSIN_VERSION ]] ; then + if use suhosin ; then + epatch "${WORKDIR}/${SUHOSIN_PATCH}" + fi + else + ewarn "Please note that this version of PHP does not yet come with a 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 +} + + diff --git a/dev-lang/php/files/eblits/src_prepare-v3.eblit b/dev-lang/php/files/eblits/src_prepare-v3.eblit new file mode 100644 index 0000000..7e270f9 --- /dev/null +++ b/dev-lang/php/files/eblits/src_prepare-v3.eblit @@ -0,0 +1,73 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_prepare-v3.eblit,v 1.1 2011/03/13 09:48:06 olemarkus 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 + + # 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 [[ -n $SUHOSIN_VERSION ]] ; then + if use suhosin ; then + epatch "${WORKDIR}/${SUHOSIN_PATCH}" + fi + else + ewarn "Please note that this version of PHP does not yet come with a suhosin patch" + fi + + #Add user patches #357637 + epatch_user + + # 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 +} + + diff --git a/dev-lang/php/files/eblits/src_prepare-v4.eblit b/dev-lang/php/files/eblits/src_prepare-v4.eblit new file mode 100644 index 0000000..cab740f --- /dev/null +++ b/dev-lang/php/files/eblits/src_prepare-v4.eblit @@ -0,0 +1,62 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_prepare-v4.eblit,v 1.1 2011/06/29 06:38:38 olemarkus 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 + + # kolab support (support for imap annotations) + use kolab && epatch "${WORKDIR}/patches/opt/imap-kolab-annotations.patch" + + # Change PHP branding + # Get the alpha/beta/rc version + local ver=$(get_version_component_range 4) + sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1${PHP_EXTRA_BRANDING}-${ver}-pl${PR/r/}-gentoo\2|g" \ + -i configure.in || die "Unable to change PHP branding" + + # Apply generic PHP patches + EPATCH_SOURCE="${WORKDIR}/patches/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 [[ -n $SUHOSIN_VERSION ]] ; then + if use suhosin ; then + epatch "${WORKDIR}/${SUHOSIN_PATCH}" + fi + else + ewarn "Please note that this version of PHP does not yet come with a suhosin patch" + fi + + #Add user patches #357637 + epatch_user + + #force rebuilding aclocal.m4 + rm aclocal.m4 + eautoreconf +} diff --git a/dev-lang/php/files/eblits/src_test-v1.eblit b/dev-lang/php/files/eblits/src_test-v1.eblit new file mode 100644 index 0000000..07f8d6f --- /dev/null +++ b/dev-lang/php/files/eblits/src_test-v1.eblit @@ -0,0 +1,54 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_test-v1.eblit,v 1.3 2012/02/06 13:53:17 olemarkus Exp $ + +eblit-php-src_test() { + vecho ">>> Test phase [test]: ${CATEGORY}/${PF}" + PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" + if [[ ! -x "${PHP_BIN}" ]] ; then + ewarn "Test phase requires USE=cli, skipping" + return + else + export TEST_PHP_EXECUTABLE="${PHP_BIN}" + fi + + if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then + export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" + fi + + + REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \ + "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}" + + for name in ${EXPECTED_TEST_FAILURES}; do + mv "${name}.out" "${name}.out.orig" 2>/dev/null + done + + local failed="$(find -name '*.out')" + if [[ ${failed} != "" ]] ; then + ewarn "The following test cases failed unexpectedly:" + for name in ${failed}; do + ewarn " ${name/.out/}" + done + else + einfo "No unexpected test failures, all fine" + fi + + if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then + local passed="" + for name in ${EXPECTED_TEST_FAILURES}; do + [[ -f "${name}.diff" ]] && continue + passed="${passed} ${name}" + done + if [[ ${passed} != "" ]] ; then + einfo "The following test cases passed unexpectedly:" + for name in ${passed}; do + ewarn " ${passed}" + done + else + einfo "None of the known-to-fail tests passed, all fine" + fi + fi +} + + diff --git a/dev-lang/php/files/php-fpm-r1.conf b/dev-lang/php/files/php-fpm-r1.conf new file mode 100644 index 0000000..0b0a7f8 --- /dev/null +++ b/dev-lang/php/files/php-fpm-r1.conf @@ -0,0 +1,311 @@ +;;;;;;;;;;;;;;;;;;;;; +; FPM Configuration ; +;;;;;;;;;;;;;;;;;;;;; + +; All relative paths in this configuration file are relative to PHP's install +; prefix (/usr/lib/php5.3). This prefix can be dynamicaly changed by using the +; '-p' argument from the command line. + +; Include one or more files. If glob(3) exists, it is used to include a bunch of +; files from a glob(3) pattern. This directive can be used everywhere in the +; file. +; Relative path can also be used. They will be prefixed by: +; - the global prefix if it's been set (-p arguement) +; - /usr/lib/php5.3 otherwise +;include=/etc/php/fpm-php5.3/fpm.d/*.conf + +;;;;;;;;;;;;;;;;;; +; Global Options ; +;;;;;;;;;;;;;;;;;; + +[global] +; Pid file +; Note: the default prefix is /var/lib +; Default Value: none +; Warning: pid file is overriden by the Gentoo init script. +; FPM will refuse to start if you uncomment this settingi and make use of the +; init script. +; pid = /var/run/php-fpm.pid + +; Error log file +; Note: the default prefix is /var/lib +; Default Value: log/php-fpm.log +error_log = /var/log/php-fpm.log + +; Log level +; Possible Values: alert, error, warning, notice, debug +; Default Value: notice +;log_level = notice + +; If this number of child processes exit with SIGSEGV or SIGBUS within the time +; interval set by emergency_restart_interval then FPM will restart. A value +; of '0' means 'Off'. +; Default Value: 0 +;emergency_restart_threshold = 0 + +; Interval of time used by emergency_restart_interval to determine when +; a graceful restart will be initiated. This can be useful to work around +; accidental corruptions in an accelerator's shared memory. +; Available Units: s(econds), m(inutes), h(ours), or d(ays) +; Default Unit: seconds +; Default Value: 0 +;emergency_restart_interval = 0 + +; Time limit for child processes to wait for a reaction on signals from master. +; Available units: s(econds), m(inutes), h(ours), or d(ays) +; Default Unit: seconds +; Default Value: 0 +;process_control_timeout = 0 + +; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging. +; Default Value: yes +;daemonize = yes + +;;;;;;;;;;;;;;;;;;;; +; Pool Definitions ; +;;;;;;;;;;;;;;;;;;;; + +; Multiple pools of child processes may be started with different listening +; ports and different management options. The name of the pool will be +; used in logs and stats. There is no limitation on the number of pools which +; FPM can handle. Your system will tell you anyway :) + +; Start a new pool named 'www'. +; the variable $pool can we used in any directive and will be replaced by the +; pool name ('www' here) +[www] + +; Per pool prefix +; It only applies on the following directives: +; - 'slowlog' +; - 'listen' (unixsocket) +; - 'chroot' +; - 'chdir' +; - 'php_values' +; - 'php_admin_values' +; When not set, the global prefix (or /usr/lib/php5.3) applies instead. +; Note: This directive can also be relative to the global prefix. +; Default Value: none +;prefix = /path/to/pools/$pool + +; The address on which to accept FastCGI requests. +; Valid syntaxes are: +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses on a +; specific port; +; '/path/to/unix/socket' - to listen on a unix socket. +; Note: This value is mandatory. +listen = 127.0.0.1:9000 + +; Set listen(2) backlog. A value of '-1' means unlimited. +; Default Value: 128 (-1 on FreeBSD and OpenBSD) +;listen.backlog = -1 + +; List of ipv4 addresses of FastCGI clients which are allowed to connect. +; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address +; must be separated by a comma. If this value is left blank, connections will be +; accepted from any ip address. +; Default Value: any +;listen.allowed_clients = 127.0.0.1 + +; Set permissions for unix socket, if one is used. In Linux, read/write +; permissions must be set in order to allow connections from a web server. Many +; BSD-derived systems allow connections regardless of permissions. +; Default Values: user and group are set as the running user +; mode is set to 0666 +;listen.owner = nobody +;listen.group = nobody +;listen.mode = 0666 + +; Unix user/group of processes +; Note: The user is mandatory. If the group is not set, the default user's group +; will be used. +user = nobody +group = nobody + +; Choose how the process manager will control the number of child processes. +; Possible Values: +; static - a fixed number (pm.max_children) of child processes; +; dynamic - the number of child processes are set dynamically based on the +; following directives: +; pm.max_children - the maximum number of children that can +; be alive at the same time. +; pm.start_servers - the number of children created on startup. +; pm.min_spare_servers - the minimum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is less than this +; number then some children will be created. +; pm.max_spare_servers - the maximum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is greater than this +; number then some children will be killed. +; Note: This value is mandatory. +pm = dynamic + +; The number of child processes to be created when pm is set to 'static' and the +; maximum number of child processes to be created when pm is set to 'dynamic'. +; This value sets the limit on the number of simultaneous requests that will be +; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. +; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP +; CGI. +; Note: Used when pm is set to either 'static' or 'dynamic' +; Note: This value is mandatory. +pm.max_children = 50 + +; The number of child processes created on startup. +; Note: Used only when pm is set to 'dynamic' +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +;pm.start_servers = 20 + +; The desired minimum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.min_spare_servers = 5 + +; The desired maximum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.max_spare_servers = 35 + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. For +; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default Value: 0 +;pm.max_requests = 500 + +; The URI to view the FPM status page. If this value is not set, no URI will be +; recognized as a status page. By default, the status page shows the following +; information: +; accepted conn - the number of request accepted by the pool; +; pool - the name of the pool; +; process manager - static or dynamic; +; idle processes - the number of idle processes; +; active processes - the number of active processes; +; total processes - the number of idle + active processes. +; max children reached - number of times, the process limit has been reached, +; when pm tries to start more children (works only for +; pm 'dynamic') +; The values of 'idle processes', 'active processes' and 'total processes' are +; updated each second. The value of 'accepted conn' is updated in real time. +; Example output: +; accepted conn: 12073 +; pool: www +; process manager: static +; idle processes: 35 +; active processes: 65 +; total processes: 100 +; max children reached: 1 +; By default the status page output is formatted as text/plain. Passing either +; 'html' or 'json' as a query string will return the corresponding output +; syntax. Example: +; http://www.foo.bar/status +; http://www.foo.bar/status?json +; http://www.foo.bar/status?html +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;pm.status_path = /status + +; The ping URI to call the monitoring page of FPM. If this value is not set, no +; URI will be recognized as a ping page. This could be used to test from outside +; that FPM is alive and responding, or to +; - create a graph of FPM availability (rrd or such); +; - remove a server from a group if it is not responding (load balancing); +; - trigger alerts for the operating team (24/7). +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;ping.path = /ping + +; This directive may be used to customize the response of a ping request. The +; response is formatted as text/plain with a 200 response code. +; Default Value: pong +;ping.response = pong + +; The timeout for serving a single request after which the worker process will +; be killed. This option should be used when the 'max_execution_time' ini option +; does not stop script execution for some reason. A value of '0' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_terminate_timeout = 0 + +; The timeout for serving a single request after which a PHP backtrace will be +; dumped to the 'slowlog' file. A value of '0s' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_slowlog_timeout = 0 + +; The log file for slow requests +; Default Value: not set +; Note: slowlog is mandatory if request_slowlog_timeout is set +;slowlog = /var/log/php-fpm-$pool.log.slow + +; Set open file descriptor rlimit. +; Default Value: system defined value +;rlimit_files = 1024 + +; Set max core size rlimit. +; Possible Values: 'unlimited' or an integer greater or equal to 0 +; Default Value: system defined value +;rlimit_core = 0 + +; Chroot to this directory at the start. This value must be defined as an +; absolute path. When this value is not set, chroot is not used. +; Note: you can prefix with '$prefix' to chroot to the pool prefix or one +; of its subdirectories. If the pool prefix is not set, the global prefix +; will be used instead. +; Note: chrooting is a great security feature and should be used whenever +; possible. However, all PHP paths will be relative to the chroot +; (error_log, sessions.save_path, ...). +; Default Value: not set +;chroot = + +; Chdir to this directory at the start. +; Note: relative path can be used. +; Default Value: current directory or / when chroot +;chdir = /var/www + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +;catch_workers_output = yes + +; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from +; the current environment. +; Default Value: clean env +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /tmp +;env[TMPDIR] = /tmp +;env[TEMP] = /tmp + +; Additional php.ini defines, specific to this pool of workers. These settings +; overwrite the values previously defined in the php.ini. The directives are the +; same as the PHP SAPI: +; php_value/php_flag - you can set classic ini defines which can +; be overwritten from PHP call 'ini_set'. +; php_admin_value/php_admin_flag - these directives won't be overwritten by +; PHP call 'ini_set' +; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. + +; Defining 'extension' will load the corresponding shared extension from +; extension_dir. Defining 'disable_functions' or 'disable_classes' will not +; overwrite previously defined php.ini values, but will append the new value +; instead. + +; Note: path INI options can be relative and will be expanded with the prefix +; (pool, global or /usr/lib/php5.3) + +; Default Value: nothing is defined by default except the values in php.ini and +; specified at startup with the -d argument +;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com +;php_flag[display_errors] = off +;php_admin_value[error_log] = /var/log/fpm-php.www.log +;php_admin_flag[log_errors] = on +;php_admin_value[memory_limit] = 32M diff --git a/dev-lang/php/files/php-fpm-r4.init b/dev-lang/php/files/php-fpm-r4.init new file mode 100755 index 0000000..a186d83 --- /dev/null +++ b/dev-lang/php/files/php-fpm-r4.init @@ -0,0 +1,47 @@ +#!/sbin/runscript + +set_phpvars() { + PHPSLOT=${SVCNAME#php-fpm-} + [ ${PHPSLOT} = 'php-fpm' ] && PHPSLOT="$(eselect php show fpm)" + + PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf" + PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid" +} + +extra_commands="depend" +extra_started_commands="reload" + +depend() { + need net + use apache2 lighttpd nginx +} + +start() { + ebegin "Starting PHP FastCGI Process Manager" + set_phpvars + start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \ + /usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}" + local i=0 + local timeout=5 + while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do + sleep 1 + i=$(($i + 1)) + done + + [ $timeout -gt $i ] + eend $? +} + +stop() { + ebegin "Stopping PHP FastCGI Process Manager" + set_phpvars + start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID} + eend $? +} + +reload() { + ebegin "Reloading PHP FastCGI Process Manager" + set_phpvars + [ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID}) + eend $? +} diff --git a/dev-lang/php/files/php5-ldvs b/dev-lang/php/files/php5-ldvs new file mode 100644 index 0000000..783b0f6 --- /dev/null +++ b/dev-lang/php/files/php5-ldvs @@ -0,0 +1 @@ +PHP_5 { global: *; }; diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml new file mode 100644 index 0000000..cbeb509 --- /dev/null +++ b/dev-lang/php/metadata.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>php</herd> + <use> + <flag name='cli'>Enable CLI SAPI</flag> + <flag name='embed'>Enable embed SAPI</flag> + <flag name='enchant'>Add supports Enchant spelling library.</flag> + <flag name='fileinfo'>Add fileinfo extension support</flag> + <flag name='filter'>Add filter extension support</flag> + <flag name='fpm'>Enable the FastCGI Process Manager SAPI</flag> + <flag name='hash'>Enable the hash extension</flag> + <flag name='json'>Enable JSON support</flag> + <flag name='ldap-sasl'>Add SASL support for the PHP LDAP extension</flag> + <flag name='mysqlnd'>Use native driver for mysql, mysqli, PDO_Mysql</flag> + <flag name='intl'>Enables the intl extension for extended internalization support</flag> + <flag name='pic'>Force shared modules to build as PIC on x86 (speed tradeoff with memory usage)</flag> + <flag name='pdo'>Enable the bundled PDO extensions</flag> + <flag name='phar'>Enables the phar extension to provide phar archive support</flag> + <flag name='suhosin'>Add Suhosin support (patch and extension from http://www.suhosin.org/)</flag> + <flag restrict=">=dev-lang/php-5.3.6_rc1" name='suhosin'>Add the Suhosin patch from http://www.suhosin.org/)</flag> + <flag name='xmlreader'>Enable XMLReader support</flag> + <flag name='xmlwriter'>Enable XMLWriter support</flag> + <flag name='zip'>Enable ZIP file support</flag> + </use> +</pkgmetadata> diff --git a/dev-lang/php/php-5.3.10-r2.ebuild b/dev-lang/php/php-5.3.10-r2.ebuild new file mode 100644 index 0000000..095f22d --- /dev/null +++ b/dev-lang/php/php-5.3.10-r2.ebuild @@ -0,0 +1,392 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.10-r2.ebuild,v 1.3 2012/03/06 08:05:46 olemarkus Exp $ + +EAPI=4 + +PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid" + +RESTRICT="mirror" + +inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool + +SUHOSIN_VERSION="5.3.9-0.9.10" +FPM_VERSION="builtin" +EXPECTED_TEST_FAILURES="" + +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}" + ;; + "php") + echo "http://www.php.net/distributions/${2}" + ;; + "suhosin") + echo "http://download.suhosin.org/${2}" + ;; + "olemarkus") + echo "http://dev.gentoo.org/~olemarkus/php/${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_PATCHSET_LOC="olemarkus" + +PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" + +PHP_PATCHSET="2" +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.) + SUHOSIN_TYPE="olemarkus" +else + SUHOSIN_TYPE="suhosin" +fi + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; + SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" +fi + +SRC_URI=" + ${PHP_SRC_URI} + ${PHP_PATCHSET_URI}" + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SRC_URI="${SRC_URI} + suhosin? ( ${SUHOSIN_URI} )" +fi + +DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." +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="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} + threads" + +IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk + crypt +ctype curl curlwrappers debug doc + enchant exif frontbase +fileinfo +filter firebird + flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash + mssql mysql mysqlnd mysqli nls + oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm + readline recode +session sharedmem + +simplexml snmp soap sockets spell sqlite sqlite3 ssl + sybase-ct sysvipc tidy +tokenizer truetype unicode wddx + +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" + +# Enable suhosin if available +[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" + +DEPEND="!dev-lang/php:5 + >=app-admin/eselect-php-0.6.2 + >=dev-libs/libpcre-8.12[unicode] + apache2? ( www-servers/apache[threads=] ) + berkdb? ( =sys-libs/db-4* ) + bzip2? ( app-arch/bzip2 ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + cjk? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + crypt? ( >=dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + gmp? ( >=dev-libs/gmp-4.1.2 ) + iconv? ( virtual/libiconv ) + imap? ( virtual/imap-c-client[ssl=] ) + intl? ( dev-libs/icu ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + kolab? ( >=net-libs/c-client-2004g-r1 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + mssql? ( dev-db/freetds[mssql] ) + !mysqlnd? ( + mysql? ( virtual/mysql ) + mysqli? ( >=virtual/mysql-4.1 ) + ) + 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 ) + 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 ) + spell? ( >=app-text/aspell-0.50 ) + 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 ) + truetype? ( + =media-libs/freetype-2* + >=media-libs/t1lib-5.0.0 + !gd? ( + virtual/jpeg media-libs/libpng sys-libs/zlib ) + ) + unicode? ( dev-libs/oniguruma ) + 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}" + +REQUIRED_USE=" + truetype? ( gd ) + cjk? ( gd ) + exif? ( gd ) + + xpm? ( gd ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xsl? ( xml ) + ldap-sasl? ( ldap ) + kolab? ( imap ) + mhash? ( hash ) + phar? ( hash ) + mysqlnd? ( || ( + mysql + mysqli + pdo + ) ) + + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysql !mysqli ) + sharedmem? ( !threads ) + + !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( 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 )" + +[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( +=${CATEGORY}/${PN}-${SLOT}*[unicode] )" + +RDEPEND="${DEPEND}" + +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 )" + +# 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" + +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 "v2" + 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 v3 + +src_prepare() { eblit-run src_prepare v3 ; } +src_configure() { eblit-run src_configure v53 ; } +src_compile() { eblit-run src_compile v1 ; } +src_install() { eblit-run src_install v3 ; } +src_test() { eblit-run src_test v1 ; } + +#Do not use eblit for this because it will not get sourced when installing from +#binary package (bug #380845) +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + APACHE2_MOD_DEFINE="PHP5" + APACHE2_MOD_CONF="70_mod_php5" + apache-module_pkg_postinst + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" + elog "to compile extensions for the ${SLOT} ABI" + elog + if ! use readline && use cli ; then + ewarn "Note that in order to use php interactivly, you need to enable" + ewarn "the readline USE flag or php -a will hang" + fi + elog + elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." + elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" + elog "'production' or 'development' in /etc/make.conf" + ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" + + # check for not yet migrated old style config dirs + ls "${ROOT}"/etc/php/*-php5 &>/dev/null + if [[ $? -eq 0 ]]; then + ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" + ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" + fi + elog + elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" + elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" + elog + + if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then + ewarn "The suhosin USE flag now only installs the suhosin patch!" + ewarn "If you want the suhosin extension, make sure you install" + ewarn " dev-php5/suhosin" + ewarn + fi +} diff --git a/dev-lang/php/php-5.3.10.ebuild b/dev-lang/php/php-5.3.10.ebuild new file mode 100644 index 0000000..b64c88c --- /dev/null +++ b/dev-lang/php/php-5.3.10.ebuild @@ -0,0 +1,391 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.10.ebuild,v 1.13 2012/03/06 08:05:46 olemarkus Exp $ + +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 libtool + +SUHOSIN_VERSION="5.3.9-0.9.10" +FPM_VERSION="builtin" +EXPECTED_TEST_FAILURES="" + +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}" + ;; + "php") + echo "http://www.php.net/distributions/${2}" + ;; + "suhosin") + echo "http://download.suhosin.org/${2}" + ;; + "olemarkus") + echo "http://dev.gentoo.org/~olemarkus/php/${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_PATCHSET_LOC="gentoo" + +PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" + +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.) + SUHOSIN_TYPE="olemarkus" +else + SUHOSIN_TYPE="suhosin" +fi + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; + SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" +fi + +SRC_URI=" + ${PHP_SRC_URI} + ${PHP_PATCHSET_URI}" + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SRC_URI="${SRC_URI} + suhosin? ( ${SUHOSIN_URI} )" +fi + +DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." +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="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} + threads" + +IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk + crypt +ctype curl curlwrappers debug doc + enchant exif frontbase +fileinfo +filter firebird + flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash + mssql mysql mysqlnd mysqli nls + oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm + readline recode +session sharedmem + +simplexml snmp soap sockets spell sqlite sqlite3 ssl + sybase-ct sysvipc tidy +tokenizer truetype unicode wddx + +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" + +# Enable suhosin if available +[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" + +DEPEND="!dev-lang/php:5 + >=app-admin/eselect-php-0.6.2 + >=dev-libs/libpcre-8.12[unicode] + <dev-libs/libpcre-8.30 + apache2? ( www-servers/apache[threads=] ) + berkdb? ( =sys-libs/db-4* ) + bzip2? ( app-arch/bzip2 ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + cjk? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + crypt? ( >=dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + gmp? ( >=dev-libs/gmp-4.1.2 ) + iconv? ( virtual/libiconv ) + imap? ( virtual/imap-c-client[ssl=] ) + intl? ( dev-libs/icu ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + kolab? ( >=net-libs/c-client-2004g-r1 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + mssql? ( dev-db/freetds[mssql] ) + !mysqlnd? ( + mysql? ( virtual/mysql ) + mysqli? ( >=virtual/mysql-4.1 ) + ) + 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 ) + 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 ) + spell? ( >=app-text/aspell-0.50 ) + 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 ) + truetype? ( + =media-libs/freetype-2* + >=media-libs/t1lib-5.0.0 + !gd? ( + virtual/jpeg media-libs/libpng sys-libs/zlib ) + ) + unicode? ( dev-libs/oniguruma ) + 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}" + +REQUIRED_USE=" + truetype? ( gd ) + cjk? ( gd ) + exif? ( gd ) + + xpm? ( gd ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xsl? ( xml ) + ldap-sasl? ( ldap ) + kolab? ( imap ) + mhash? ( hash ) + phar? ( hash ) + mysqlnd? ( || ( + mysql + mysqli + pdo + ) ) + + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysql !mysqli ) + sharedmem? ( !threads ) + + !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( 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 )" + +[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( +=${CATEGORY}/${PN}-${SLOT}*[unicode] )" + +RDEPEND="${DEPEND}" + +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 )" + +# 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" + +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 "v2" + 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 v3 + +src_prepare() { eblit-run src_prepare v3 ; } +src_configure() { eblit-run src_configure v53 ; } +src_compile() { eblit-run src_compile v1 ; } +src_install() { eblit-run src_install v3 ; } +src_test() { eblit-run src_test v1 ; } + +#Do not use eblit for this because it will not get sourced when installing from +#binary package (bug #380845) +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + APACHE2_MOD_DEFINE="PHP5" + APACHE2_MOD_CONF="70_mod_php5" + apache-module_pkg_postinst + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" + elog "to compile extensions for the ${SLOT} ABI" + elog + if ! use readline && use cli ; then + ewarn "Note that in order to use php interactivly, you need to enable" + ewarn "the readline USE flag or php -a will hang" + fi + elog + elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." + elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" + elog "'production' or 'development' in /etc/make.conf" + ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" + + # check for not yet migrated old style config dirs + ls "${ROOT}"/etc/php/*-php5 &>/dev/null + if [[ $? -eq 0 ]]; then + ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" + ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" + fi + elog + elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" + elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" + elog + + if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then + ewarn "The suhosin USE flag now only installs the suhosin patch!" + ewarn "If you want the suhosin extension, make sure you install" + ewarn " dev-php5/suhosin" + ewarn + fi +} diff --git a/dev-lang/php/php-5.3.11.ebuild b/dev-lang/php/php-5.3.11.ebuild new file mode 100644 index 0000000..0872dfd --- /dev/null +++ b/dev-lang/php/php-5.3.11.ebuild @@ -0,0 +1,392 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.11.ebuild,v 1.6 2012/05/03 20:27:33 maekke Exp $ + +EAPI=4 + +PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid" + +RESTRICT="mirror" + +inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool + +SUHOSIN_VERSION="5.3.9-0.9.10" +FPM_VERSION="builtin" +EXPECTED_TEST_FAILURES="" + +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}" + ;; + "php") + echo "http://www.php.net/distributions/${2}" + ;; + "suhosin") + echo "http://download.suhosin.org/${2}" + ;; + "olemarkus") + echo "http://dev.gentoo.org/~olemarkus/php/${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_PATCHSET_LOC="olemarkus" + +PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" + +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.) + SUHOSIN_TYPE="olemarkus" +else + SUHOSIN_TYPE="suhosin" +fi + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; + SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" +fi + +SRC_URI=" + ${PHP_SRC_URI} + ${PHP_PATCHSET_URI}" + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SRC_URI="${SRC_URI} + suhosin? ( ${SUHOSIN_URI} )" +fi + +DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." +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="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} + threads" + +IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk + crypt +ctype curl curlwrappers debug doc + enchant exif frontbase +fileinfo +filter firebird + flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash + mssql mysql mysqlnd mysqli nls + oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm + readline recode +session sharedmem + +simplexml snmp soap sockets spell sqlite sqlite3 ssl + sybase-ct sysvipc tidy +tokenizer truetype unicode wddx + +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" + +# Enable suhosin if available +[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" + +DEPEND="!dev-lang/php:5 + >=app-admin/eselect-php-0.6.2 + >=dev-libs/libpcre-8.12[unicode] + apache2? ( www-servers/apache[threads=] ) + berkdb? ( =sys-libs/db-4* ) + bzip2? ( app-arch/bzip2 ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + cjk? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + crypt? ( >=dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + gmp? ( >=dev-libs/gmp-4.1.2 ) + iconv? ( virtual/libiconv ) + imap? ( virtual/imap-c-client[ssl=] ) + intl? ( dev-libs/icu ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + kolab? ( >=net-libs/c-client-2004g-r1 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + mssql? ( dev-db/freetds[mssql] ) + !mysqlnd? ( + mysql? ( virtual/mysql ) + mysqli? ( >=virtual/mysql-4.1 ) + ) + 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 ) + 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 ) + spell? ( >=app-text/aspell-0.50 ) + 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 ) + truetype? ( + =media-libs/freetype-2* + >=media-libs/t1lib-5.0.0 + !gd? ( + virtual/jpeg media-libs/libpng sys-libs/zlib ) + ) + unicode? ( dev-libs/oniguruma ) + 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}" + +REQUIRED_USE=" + truetype? ( gd ) + cjk? ( gd ) + exif? ( gd ) + + xpm? ( gd ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xsl? ( xml ) + ldap-sasl? ( ldap ) + kolab? ( imap ) + mhash? ( hash ) + phar? ( hash ) + mysqlnd? ( || ( + mysql + mysqli + pdo + ) ) + + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysql !mysqli ) + sharedmem? ( !threads ) + + !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( 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 )" + +[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( +=${CATEGORY}/${PN}-${SLOT}*[unicode] )" + +RDEPEND="${DEPEND}" + +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 )" + +# 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" + +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 "v2" + 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 v3 + +src_prepare() { eblit-run src_prepare v3 ; } +src_configure() { eblit-run src_configure v53 ; } +src_compile() { eblit-run src_compile v1 ; } +src_install() { eblit-run src_install v3 ; } +src_test() { eblit-run src_test v1 ; } + +#Do not use eblit for this because it will not get sourced when installing from +#binary package (bug #380845) +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + APACHE2_MOD_DEFINE="PHP5" + APACHE2_MOD_CONF="70_mod_php5" + apache-module_pkg_postinst + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" + elog "to compile extensions for the ${SLOT} ABI" + elog + if ! use readline && use cli ; then + ewarn "Note that in order to use php interactivly, you need to enable" + ewarn "the readline USE flag or php -a will hang" + fi + elog + elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." + elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" + elog "'production' or 'development' in /etc/make.conf" + ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" + + # check for not yet migrated old style config dirs + ls "${ROOT}"/etc/php/*-php5 &>/dev/null + if [[ $? -eq 0 ]]; then + ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" + ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" + fi + elog + elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" + elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" + elog + + if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then + ewarn "The suhosin USE flag now only installs the suhosin patch!" + ewarn "If you want the suhosin extension, make sure you install" + ewarn " dev-php5/suhosin" + ewarn + fi +} diff --git a/dev-lang/php/php-5.3.11_rc2.ebuild b/dev-lang/php/php-5.3.11_rc2.ebuild new file mode 100644 index 0000000..2165892 --- /dev/null +++ b/dev-lang/php/php-5.3.11_rc2.ebuild @@ -0,0 +1,392 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.11_rc2.ebuild,v 1.2 2012/04/24 14:16:26 mabi Exp $ + +EAPI=4 + +PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid" + +RESTRICT="mirror" + +inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool + +SUHOSIN_VERSION="5.3.9-0.9.10-gentoo" +FPM_VERSION="builtin" +EXPECTED_TEST_FAILURES="" + +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}" + ;; + "php") + echo "http://www.php.net/distributions/${2}" + ;; + "suhosin") + echo "http://download.suhosin.org/${2}" + ;; + "olemarkus") + echo "http://dev.gentoo.org/~olemarkus/php/${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-pre" +PHP_P="${PN}-${PHP_PV}" + +PHP_PATCHSET_LOC="olemarkus" + +PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" + +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.) + SUHOSIN_TYPE="olemarkus" +else + SUHOSIN_TYPE="suhosin" +fi + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; + SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" +fi + +SRC_URI=" + ${PHP_SRC_URI} + ${PHP_PATCHSET_URI}" + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SRC_URI="${SRC_URI} + suhosin? ( ${SUHOSIN_URI} )" +fi + +DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." +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="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} + threads" + +IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk + crypt +ctype curl curlwrappers debug doc + enchant exif frontbase +fileinfo +filter firebird + flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash + mssql mysql mysqlnd mysqli nls + oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm + readline recode +session sharedmem + +simplexml snmp soap sockets spell sqlite sqlite3 ssl + sybase-ct sysvipc tidy +tokenizer truetype unicode wddx + +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" + +# Enable suhosin if available +[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" + +DEPEND="!dev-lang/php:5 + >=app-admin/eselect-php-0.6.2 + >=dev-libs/libpcre-8.12[unicode] + apache2? ( www-servers/apache[threads=] ) + berkdb? ( =sys-libs/db-4* ) + bzip2? ( app-arch/bzip2 ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + cjk? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + crypt? ( >=dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + gmp? ( >=dev-libs/gmp-4.1.2 ) + iconv? ( virtual/libiconv ) + imap? ( virtual/imap-c-client[ssl=] ) + intl? ( dev-libs/icu ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + kolab? ( >=net-libs/c-client-2004g-r1 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + mssql? ( dev-db/freetds[mssql] ) + !mysqlnd? ( + mysql? ( virtual/mysql ) + mysqli? ( >=virtual/mysql-4.1 ) + ) + 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 ) + 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 ) + spell? ( >=app-text/aspell-0.50 ) + 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 ) + truetype? ( + =media-libs/freetype-2* + >=media-libs/t1lib-5.0.0 + !gd? ( + virtual/jpeg media-libs/libpng sys-libs/zlib ) + ) + unicode? ( dev-libs/oniguruma ) + 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}" + +REQUIRED_USE=" + truetype? ( gd ) + cjk? ( gd ) + exif? ( gd ) + + xpm? ( gd ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xsl? ( xml ) + ldap-sasl? ( ldap ) + kolab? ( imap ) + mhash? ( hash ) + phar? ( hash ) + mysqlnd? ( || ( + mysql + mysqli + pdo + ) ) + + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysql !mysqli ) + sharedmem? ( !threads ) + + !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( 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 )" + +[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( +=${CATEGORY}/${PN}-${SLOT}*[unicode] )" + +RDEPEND="${DEPEND}" + +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 )" + +# 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" + +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 "v2" + 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 v3 + +src_prepare() { eblit-run src_prepare v3 ; } +src_configure() { eblit-run src_configure v53 ; } +src_compile() { eblit-run src_compile v1 ; } +src_install() { eblit-run src_install v3 ; } +src_test() { eblit-run src_test v1 ; } + +#Do not use eblit for this because it will not get sourced when installing from +#binary package (bug #380845) +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + APACHE2_MOD_DEFINE="PHP5" + APACHE2_MOD_CONF="70_mod_php5" + apache-module_pkg_postinst + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" + elog "to compile extensions for the ${SLOT} ABI" + elog + if ! use readline && use cli ; then + ewarn "Note that in order to use php interactivly, you need to enable" + ewarn "the readline USE flag or php -a will hang" + fi + elog + elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." + elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" + elog "'production' or 'development' in /etc/make.conf" + ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" + + # check for not yet migrated old style config dirs + ls "${ROOT}"/etc/php/*-php5 &>/dev/null + if [[ $? -eq 0 ]]; then + ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" + ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" + fi + elog + elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" + elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" + elog + + if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then + ewarn "The suhosin USE flag now only installs the suhosin patch!" + ewarn "If you want the suhosin extension, make sure you install" + ewarn " dev-php5/suhosin" + ewarn + fi +} diff --git a/dev-lang/php/php-5.3.12.ebuild b/dev-lang/php/php-5.3.12.ebuild new file mode 100644 index 0000000..023bfe0 --- /dev/null +++ b/dev-lang/php/php-5.3.12.ebuild @@ -0,0 +1,392 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.12.ebuild,v 1.1 2012/05/03 20:15:23 olemarkus Exp $ + +EAPI=4 + +PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid" + +RESTRICT="mirror" + +inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool + +SUHOSIN_VERSION="5.3.9-0.9.10" +FPM_VERSION="builtin" +EXPECTED_TEST_FAILURES="" + +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}" + ;; + "php") + echo "http://www.php.net/distributions/${2}" + ;; + "suhosin") + echo "http://download.suhosin.org/${2}" + ;; + "olemarkus") + echo "http://dev.gentoo.org/~olemarkus/php/${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_PATCHSET_LOC="olemarkus" + +PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" + +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.) + SUHOSIN_TYPE="olemarkus" +else + SUHOSIN_TYPE="suhosin" +fi + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; + SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" +fi + +SRC_URI=" + ${PHP_SRC_URI} + ${PHP_PATCHSET_URI}" + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SRC_URI="${SRC_URI} + suhosin? ( ${SUHOSIN_URI} )" +fi + +DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." +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="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} + threads" + +IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk + crypt +ctype curl curlwrappers debug doc + enchant exif frontbase +fileinfo +filter firebird + flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash + mssql mysql mysqlnd mysqli nls + oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm + readline recode +session sharedmem + +simplexml snmp soap sockets spell sqlite sqlite3 ssl + sybase-ct sysvipc tidy +tokenizer truetype unicode wddx + +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" + +# Enable suhosin if available +[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" + +DEPEND="!dev-lang/php:5 + >=app-admin/eselect-php-0.6.2 + >=dev-libs/libpcre-8.12[unicode] + apache2? ( www-servers/apache[threads=] ) + berkdb? ( =sys-libs/db-4* ) + bzip2? ( app-arch/bzip2 ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + cjk? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + crypt? ( >=dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + gmp? ( >=dev-libs/gmp-4.1.2 ) + iconv? ( virtual/libiconv ) + imap? ( virtual/imap-c-client[ssl=] ) + intl? ( dev-libs/icu ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + kolab? ( >=net-libs/c-client-2004g-r1 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + mssql? ( dev-db/freetds[mssql] ) + !mysqlnd? ( + mysql? ( virtual/mysql ) + mysqli? ( >=virtual/mysql-4.1 ) + ) + 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 ) + 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 ) + spell? ( >=app-text/aspell-0.50 ) + 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 ) + truetype? ( + =media-libs/freetype-2* + >=media-libs/t1lib-5.0.0 + !gd? ( + virtual/jpeg media-libs/libpng sys-libs/zlib ) + ) + unicode? ( dev-libs/oniguruma ) + 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}" + +REQUIRED_USE=" + truetype? ( gd ) + cjk? ( gd ) + exif? ( gd ) + + xpm? ( gd ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xsl? ( xml ) + ldap-sasl? ( ldap ) + kolab? ( imap ) + mhash? ( hash ) + phar? ( hash ) + mysqlnd? ( || ( + mysql + mysqli + pdo + ) ) + + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysql !mysqli ) + sharedmem? ( !threads ) + + !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( 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 )" + +[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( +=${CATEGORY}/${PN}-${SLOT}*[unicode] )" + +RDEPEND="${DEPEND}" + +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 )" + +# 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" + +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 "v2" + 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 v3 + +src_prepare() { eblit-run src_prepare v3 ; } +src_configure() { eblit-run src_configure v53 ; } +src_compile() { eblit-run src_compile v1 ; } +src_install() { eblit-run src_install v3 ; } +src_test() { eblit-run src_test v1 ; } + +#Do not use eblit for this because it will not get sourced when installing from +#binary package (bug #380845) +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + APACHE2_MOD_DEFINE="PHP5" + APACHE2_MOD_CONF="70_mod_php5" + apache-module_pkg_postinst + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" + elog "to compile extensions for the ${SLOT} ABI" + elog + if ! use readline && use cli ; then + ewarn "Note that in order to use php interactivly, you need to enable" + ewarn "the readline USE flag or php -a will hang" + fi + elog + elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." + elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" + elog "'production' or 'development' in /etc/make.conf" + ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" + + # check for not yet migrated old style config dirs + ls "${ROOT}"/etc/php/*-php5 &>/dev/null + if [[ $? -eq 0 ]]; then + ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" + ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" + fi + elog + elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" + elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" + elog + + if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then + ewarn "The suhosin USE flag now only installs the suhosin patch!" + ewarn "If you want the suhosin extension, make sure you install" + ewarn " dev-php5/suhosin" + ewarn + fi +} diff --git a/dev-lang/php/php-5.4.0.ebuild b/dev-lang/php/php-5.4.0.ebuild new file mode 100644 index 0000000..0c21370 --- /dev/null +++ b/dev-lang/php/php-5.4.0.ebuild @@ -0,0 +1,384 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0.ebuild,v 1.3 2012/03/06 08:05:46 olemarkus Exp $ + +EAPI=4 + +inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool + +SUHOSIN_VERSION="" +FPM_VERSION="builtin" +EXPECTED_TEST_FAILURES="" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + +function php_get_uri () +{ + case "${1}" in + "php-stas") + echo "http://downloads.php.net/stas/${2}" + ;; + "php-pre") + echo "http://downloads.php.net/johannes/${2}" + ;; + "php") + echo "http://www.php.net/distributions/${2}" + ;; + "suhosin") + echo "http://download.suhosin.org/${2}" + ;; + "olemarkus") + echo "http://dev.gentoo.org/~olemarkus/php/${2}" + ;; + "gentoo") + echo "mirror://gentoo/${2}" + ;; + *) + die "unhandled case in php_get_uri" + ;; + esac +} + +PHP_MV="$(get_major_version)" +SLOT="$(get_version_component_range 1-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_PV="${PHP_PV/_alpha/alpha}" +PHP_PV="${PHP_PV/_beta/beta}" +PHP_RELEASE="php" +PHP_P="${PN}-${PHP_PV}" + +PHP_PATCHSET_LOC="olemarkus" + +PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" + +PHP_PATCHSET="1" +PHP_PATCHSET_URI=" + $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-$SLOT-${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.) + SUHOSIN_TYPE="gentoo" +else + SUHOSIN_TYPE="suhosin" +fi + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; + SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" +fi + +SRC_URI=" + ${PHP_SRC_URI} + ${PHP_PATCHSET_URI}" + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SRC_URI="${SRC_URI} + suhosin? ( ${SUHOSIN_URI} )" +fi + +DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." +HOMEPAGE="http://php.net/" +LICENSE="PHP-3" + +S="${WORKDIR}/${PHP_P}" + +# We can build the following SAPIs in the given order +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} + threads" + +IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk + crypt +ctype curl curlwrappers debug doc + enchant exif frontbase +fileinfo +filter firebird + flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash + mssql mysql mysqlnd mysqli nls + oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm + readline recode +session sharedmem + +simplexml snmp soap sockets spell sqlite3 ssl + sybase-ct sysvipc tidy +tokenizer truetype unicode wddx + +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" + +# Enable suhosin if available +[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" + +DEPEND=" + >=app-admin/eselect-php-0.6.2 + >=dev-libs/libpcre-8.12[unicode] + apache2? ( www-servers/apache[threads=] ) + berkdb? ( =sys-libs/db-4* ) + bzip2? ( app-arch/bzip2 ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + cjk? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + crypt? ( >=dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + gmp? ( >=dev-libs/gmp-4.1.2 ) + iconv? ( virtual/libiconv ) + imap? ( virtual/imap-c-client[ssl=] ) + intl? ( dev-libs/icu ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + kolab? ( >=net-libs/c-client-2004g-r1 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + mssql? ( dev-db/freetds[mssql] ) + !mysqlnd? ( + mysql? ( virtual/mysql ) + mysqli? ( >=virtual/mysql-4.1 ) + ) + 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 ) + 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 ) + spell? ( >=app-text/aspell-0.50 ) + sqlite3? ( >=dev-db/sqlite-3.7.6.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? ( + virtual/jpeg media-libs/libpng sys-libs/zlib ) + ) + unicode? ( dev-libs/oniguruma ) + 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}" + +REQUIRED_USE=" + truetype? ( gd ) + cjk? ( gd ) + exif? ( gd ) + + xpm? ( gd ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xsl? ( xml ) + ldap-sasl? ( ldap ) + kolab? ( imap ) + mhash? ( hash ) + phar? ( hash ) + mysqlnd? ( || ( + mysql + mysqli + pdo + ) ) + + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysql !mysqli ) + sharedmem? ( !threads ) + + !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" + +RDEPEND="${DEPEND}" + +[[ -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 )" + +# 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" + +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 v2 + 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 v3 + +src_prepare() { eblit-run src_prepare v4 ; } +src_configure() { eblit-run src_configure v54 ; } +src_compile() { eblit-run src_compile v2 ; } +src_install() { eblit-run src_install v3 ; } +src_test() { eblit-run src_test v1 ; } + +#Do not use eblit for this because it will not get sourced when installing from +#binary package (bug #380845) +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + APACHE2_MOD_DEFINE="PHP5" + APACHE2_MOD_CONF="70_mod_php5" + apache-module_pkg_postinst + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" + elog "to compile extensions for the ${SLOT} ABI" + elog + if ! use readline && use cli ; then + ewarn "Note that in order to use php interactivly, you need to enable" + ewarn "the readline USE flag or php -a will hang" + fi + elog + elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." + elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" + elog "'production' or 'development' in /etc/make.conf" + ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" + + # check for not yet migrated old style config dirs + ls "${ROOT}"/etc/php/*-php5 &>/dev/null + if [[ $? -eq 0 ]]; then + ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" + ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" + fi + elog + elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" + elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" + elog + + if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then + ewarn "The suhosin USE flag now only installs the suhosin patch!" + ewarn "If you want the suhosin extension, make sure you install" + ewarn " dev-php/suhosin" + ewarn + fi +} diff --git a/dev-lang/php/php-5.4.1.ebuild b/dev-lang/php/php-5.4.1.ebuild new file mode 100644 index 0000000..8b0be47 --- /dev/null +++ b/dev-lang/php/php-5.4.1.ebuild @@ -0,0 +1,384 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.1.ebuild,v 1.1 2012/04/26 11:33:41 olemarkus Exp $ + +EAPI=4 + +inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool + +SUHOSIN_VERSION="" +FPM_VERSION="builtin" +EXPECTED_TEST_FAILURES="" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + +function php_get_uri () +{ + case "${1}" in + "php-stas") + echo "http://downloads.php.net/stas/${2}" + ;; + "php-pre") + echo "http://downloads.php.net/johannes/${2}" + ;; + "php") + echo "http://www.php.net/distributions/${2}" + ;; + "suhosin") + echo "http://download.suhosin.org/${2}" + ;; + "olemarkus") + echo "http://dev.gentoo.org/~olemarkus/php/${2}" + ;; + "gentoo") + echo "mirror://gentoo/${2}" + ;; + *) + die "unhandled case in php_get_uri" + ;; + esac +} + +PHP_MV="$(get_major_version)" +SLOT="$(get_version_component_range 1-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_PV="${PHP_PV/_alpha/alpha}" +PHP_PV="${PHP_PV/_beta/beta}" +PHP_RELEASE="php" +PHP_P="${PN}-${PHP_PV}" + +PHP_PATCHSET_LOC="olemarkus" + +PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" + +PHP_PATCHSET="2" +PHP_PATCHSET_URI=" + $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-$SLOT-${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.) + SUHOSIN_TYPE="gentoo" +else + SUHOSIN_TYPE="suhosin" +fi + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; + SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" +fi + +SRC_URI=" + ${PHP_SRC_URI} + ${PHP_PATCHSET_URI}" + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SRC_URI="${SRC_URI} + suhosin? ( ${SUHOSIN_URI} )" +fi + +DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." +HOMEPAGE="http://php.net/" +LICENSE="PHP-3" + +S="${WORKDIR}/${PHP_P}" + +# We can build the following SAPIs in the given order +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} + threads" + +IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk + crypt +ctype curl curlwrappers debug doc + enchant exif frontbase +fileinfo +filter firebird + flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash + mssql mysql mysqlnd mysqli nls + oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm + readline recode +session sharedmem + +simplexml snmp soap sockets spell sqlite3 ssl + sybase-ct sysvipc tidy +tokenizer truetype unicode wddx + +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" + +# Enable suhosin if available +[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" + +DEPEND=" + >=app-admin/eselect-php-0.6.2 + >=dev-libs/libpcre-8.12[unicode] + apache2? ( www-servers/apache[threads=] ) + berkdb? ( =sys-libs/db-4* ) + bzip2? ( app-arch/bzip2 ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + cjk? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + crypt? ( >=dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + gmp? ( >=dev-libs/gmp-4.1.2 ) + iconv? ( virtual/libiconv ) + imap? ( virtual/imap-c-client[ssl=] ) + intl? ( dev-libs/icu ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + kolab? ( >=net-libs/c-client-2004g-r1 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + mssql? ( dev-db/freetds[mssql] ) + !mysqlnd? ( + mysql? ( virtual/mysql ) + mysqli? ( >=virtual/mysql-4.1 ) + ) + 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 ) + 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 ) + spell? ( >=app-text/aspell-0.50 ) + sqlite3? ( >=dev-db/sqlite-3.7.6.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? ( + virtual/jpeg media-libs/libpng sys-libs/zlib ) + ) + unicode? ( dev-libs/oniguruma ) + 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}" + +REQUIRED_USE=" + truetype? ( gd ) + cjk? ( gd ) + exif? ( gd ) + + xpm? ( gd ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xsl? ( xml ) + ldap-sasl? ( ldap ) + kolab? ( imap ) + mhash? ( hash ) + phar? ( hash ) + mysqlnd? ( || ( + mysql + mysqli + pdo + ) ) + + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysql !mysqli ) + sharedmem? ( !threads ) + + !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" + +RDEPEND="${DEPEND}" + +[[ -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 )" + +# 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" + +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 v2 + 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 v3 + +src_prepare() { eblit-run src_prepare v4 ; } +src_configure() { eblit-run src_configure v54 ; } +src_compile() { eblit-run src_compile v2 ; } +src_install() { eblit-run src_install v3 ; } +src_test() { eblit-run src_test v1 ; } + +#Do not use eblit for this because it will not get sourced when installing from +#binary package (bug #380845) +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + APACHE2_MOD_DEFINE="PHP5" + APACHE2_MOD_CONF="70_mod_php5" + apache-module_pkg_postinst + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" + elog "to compile extensions for the ${SLOT} ABI" + elog + if ! use readline && use cli ; then + ewarn "Note that in order to use php interactivly, you need to enable" + ewarn "the readline USE flag or php -a will hang" + fi + elog + elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." + elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" + elog "'production' or 'development' in /etc/make.conf" + ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" + + # check for not yet migrated old style config dirs + ls "${ROOT}"/etc/php/*-php5 &>/dev/null + if [[ $? -eq 0 ]]; then + ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" + ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" + fi + elog + elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" + elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" + elog + + if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then + ewarn "The suhosin USE flag now only installs the suhosin patch!" + ewarn "If you want the suhosin extension, make sure you install" + ewarn " dev-php/suhosin" + ewarn + fi +} diff --git a/dev-lang/php/php-5.4.1_rc1.ebuild b/dev-lang/php/php-5.4.1_rc1.ebuild new file mode 100644 index 0000000..4db162e --- /dev/null +++ b/dev-lang/php/php-5.4.1_rc1.ebuild @@ -0,0 +1,384 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.1_rc1.ebuild,v 1.1 2012/03/30 11:23:07 olemarkus Exp $ + +EAPI=4 + +inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool + +SUHOSIN_VERSION="" +FPM_VERSION="builtin" +EXPECTED_TEST_FAILURES="" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + +function php_get_uri () +{ + case "${1}" in + "php-stas") + echo "http://downloads.php.net/stas/${2}" + ;; + "php-pre") + echo "http://downloads.php.net/johannes/${2}" + ;; + "php") + echo "http://www.php.net/distributions/${2}" + ;; + "suhosin") + echo "http://download.suhosin.org/${2}" + ;; + "olemarkus") + echo "http://dev.gentoo.org/~olemarkus/php/${2}" + ;; + "gentoo") + echo "mirror://gentoo/${2}" + ;; + *) + die "unhandled case in php_get_uri" + ;; + esac +} + +PHP_MV="$(get_major_version)" +SLOT="$(get_version_component_range 1-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_PV="${PHP_PV/_alpha/alpha}" +PHP_PV="${PHP_PV/_beta/beta}" +PHP_RELEASE="php-stas" +PHP_P="${PN}-${PHP_PV}" + +PHP_PATCHSET_LOC="olemarkus" + +PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" + +PHP_PATCHSET="2" +PHP_PATCHSET_URI=" + $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-$SLOT-${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.) + SUHOSIN_TYPE="gentoo" +else + SUHOSIN_TYPE="suhosin" +fi + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; + SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" +fi + +SRC_URI=" + ${PHP_SRC_URI} + ${PHP_PATCHSET_URI}" + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SRC_URI="${SRC_URI} + suhosin? ( ${SUHOSIN_URI} )" +fi + +DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." +HOMEPAGE="http://php.net/" +LICENSE="PHP-3" + +S="${WORKDIR}/${PHP_P}" + +# We can build the following SAPIs in the given order +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} + threads" + +IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk + crypt +ctype curl curlwrappers debug doc + enchant exif frontbase +fileinfo +filter firebird + flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash + mssql mysql mysqlnd mysqli nls + oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm + readline recode +session sharedmem + +simplexml snmp soap sockets spell sqlite3 ssl + sybase-ct sysvipc tidy +tokenizer truetype unicode wddx + +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" + +# Enable suhosin if available +[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" + +DEPEND=" + >=app-admin/eselect-php-0.6.2 + >=dev-libs/libpcre-8.12[unicode] + apache2? ( www-servers/apache[threads=] ) + berkdb? ( =sys-libs/db-4* ) + bzip2? ( app-arch/bzip2 ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + cjk? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + crypt? ( >=dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + gmp? ( >=dev-libs/gmp-4.1.2 ) + iconv? ( virtual/libiconv ) + imap? ( virtual/imap-c-client[ssl=] ) + intl? ( dev-libs/icu ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + kolab? ( >=net-libs/c-client-2004g-r1 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + mssql? ( dev-db/freetds[mssql] ) + !mysqlnd? ( + mysql? ( virtual/mysql ) + mysqli? ( >=virtual/mysql-4.1 ) + ) + 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 ) + 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 ) + spell? ( >=app-text/aspell-0.50 ) + sqlite3? ( >=dev-db/sqlite-3.7.6.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? ( + virtual/jpeg media-libs/libpng sys-libs/zlib ) + ) + unicode? ( dev-libs/oniguruma ) + 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}" + +REQUIRED_USE=" + truetype? ( gd ) + cjk? ( gd ) + exif? ( gd ) + + xpm? ( gd ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xsl? ( xml ) + ldap-sasl? ( ldap ) + kolab? ( imap ) + mhash? ( hash ) + phar? ( hash ) + mysqlnd? ( || ( + mysql + mysqli + pdo + ) ) + + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysql !mysqli ) + sharedmem? ( !threads ) + + !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" + +RDEPEND="${DEPEND}" + +[[ -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 )" + +# 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" + +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 v2 + 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 v3 + +src_prepare() { eblit-run src_prepare v4 ; } +src_configure() { eblit-run src_configure v54 ; } +src_compile() { eblit-run src_compile v2 ; } +src_install() { eblit-run src_install v3 ; } +src_test() { eblit-run src_test v1 ; } + +#Do not use eblit for this because it will not get sourced when installing from +#binary package (bug #380845) +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + APACHE2_MOD_DEFINE="PHP5" + APACHE2_MOD_CONF="70_mod_php5" + apache-module_pkg_postinst + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" + elog "to compile extensions for the ${SLOT} ABI" + elog + if ! use readline && use cli ; then + ewarn "Note that in order to use php interactivly, you need to enable" + ewarn "the readline USE flag or php -a will hang" + fi + elog + elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." + elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" + elog "'production' or 'development' in /etc/make.conf" + ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" + + # check for not yet migrated old style config dirs + ls "${ROOT}"/etc/php/*-php5 &>/dev/null + if [[ $? -eq 0 ]]; then + ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" + ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" + fi + elog + elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" + elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" + elog + + if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then + ewarn "The suhosin USE flag now only installs the suhosin patch!" + ewarn "If you want the suhosin extension, make sure you install" + ewarn " dev-php/suhosin" + ewarn + fi +} diff --git a/dev-lang/php/php-5.4.1_rc2.ebuild b/dev-lang/php/php-5.4.1_rc2.ebuild new file mode 100644 index 0000000..a08b88a --- /dev/null +++ b/dev-lang/php/php-5.4.1_rc2.ebuild @@ -0,0 +1,384 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.1_rc2.ebuild,v 1.1 2012/04/13 06:43:50 olemarkus Exp $ + +EAPI=4 + +inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool + +SUHOSIN_VERSION="" +FPM_VERSION="builtin" +EXPECTED_TEST_FAILURES="" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + +function php_get_uri () +{ + case "${1}" in + "php-stas") + echo "http://downloads.php.net/stas/${2}" + ;; + "php-pre") + echo "http://downloads.php.net/johannes/${2}" + ;; + "php") + echo "http://www.php.net/distributions/${2}" + ;; + "suhosin") + echo "http://download.suhosin.org/${2}" + ;; + "olemarkus") + echo "http://dev.gentoo.org/~olemarkus/php/${2}" + ;; + "gentoo") + echo "mirror://gentoo/${2}" + ;; + *) + die "unhandled case in php_get_uri" + ;; + esac +} + +PHP_MV="$(get_major_version)" +SLOT="$(get_version_component_range 1-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_PV="${PHP_PV/_alpha/alpha}" +PHP_PV="${PHP_PV/_beta/beta}" +PHP_RELEASE="php-stas" +PHP_P="${PN}-${PHP_PV}" + +PHP_PATCHSET_LOC="olemarkus" + +PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" + +PHP_PATCHSET="2" +PHP_PATCHSET_URI=" + $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-$SLOT-${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.) + SUHOSIN_TYPE="gentoo" +else + SUHOSIN_TYPE="suhosin" +fi + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; + SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" +fi + +SRC_URI=" + ${PHP_SRC_URI} + ${PHP_PATCHSET_URI}" + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SRC_URI="${SRC_URI} + suhosin? ( ${SUHOSIN_URI} )" +fi + +DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." +HOMEPAGE="http://php.net/" +LICENSE="PHP-3" + +S="${WORKDIR}/${PHP_P}" + +# We can build the following SAPIs in the given order +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} + threads" + +IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk + crypt +ctype curl curlwrappers debug doc + enchant exif frontbase +fileinfo +filter firebird + flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash + mssql mysql mysqlnd mysqli nls + oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm + readline recode +session sharedmem + +simplexml snmp soap sockets spell sqlite3 ssl + sybase-ct sysvipc tidy +tokenizer truetype unicode wddx + +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" + +# Enable suhosin if available +[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" + +DEPEND=" + >=app-admin/eselect-php-0.6.2 + >=dev-libs/libpcre-8.12[unicode] + apache2? ( www-servers/apache[threads=] ) + berkdb? ( =sys-libs/db-4* ) + bzip2? ( app-arch/bzip2 ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + cjk? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + crypt? ( >=dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + gmp? ( >=dev-libs/gmp-4.1.2 ) + iconv? ( virtual/libiconv ) + imap? ( virtual/imap-c-client[ssl=] ) + intl? ( dev-libs/icu ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + kolab? ( >=net-libs/c-client-2004g-r1 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + mssql? ( dev-db/freetds[mssql] ) + !mysqlnd? ( + mysql? ( virtual/mysql ) + mysqli? ( >=virtual/mysql-4.1 ) + ) + 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 ) + 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 ) + spell? ( >=app-text/aspell-0.50 ) + sqlite3? ( >=dev-db/sqlite-3.7.6.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? ( + virtual/jpeg media-libs/libpng sys-libs/zlib ) + ) + unicode? ( dev-libs/oniguruma ) + 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}" + +REQUIRED_USE=" + truetype? ( gd ) + cjk? ( gd ) + exif? ( gd ) + + xpm? ( gd ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xsl? ( xml ) + ldap-sasl? ( ldap ) + kolab? ( imap ) + mhash? ( hash ) + phar? ( hash ) + mysqlnd? ( || ( + mysql + mysqli + pdo + ) ) + + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysql !mysqli ) + sharedmem? ( !threads ) + + !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" + +RDEPEND="${DEPEND}" + +[[ -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 )" + +# 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" + +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 v2 + 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 v3 + +src_prepare() { eblit-run src_prepare v4 ; } +src_configure() { eblit-run src_configure v54 ; } +src_compile() { eblit-run src_compile v2 ; } +src_install() { eblit-run src_install v3 ; } +src_test() { eblit-run src_test v1 ; } + +#Do not use eblit for this because it will not get sourced when installing from +#binary package (bug #380845) +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + APACHE2_MOD_DEFINE="PHP5" + APACHE2_MOD_CONF="70_mod_php5" + apache-module_pkg_postinst + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" + elog "to compile extensions for the ${SLOT} ABI" + elog + if ! use readline && use cli ; then + ewarn "Note that in order to use php interactivly, you need to enable" + ewarn "the readline USE flag or php -a will hang" + fi + elog + elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." + elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" + elog "'production' or 'development' in /etc/make.conf" + ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" + + # check for not yet migrated old style config dirs + ls "${ROOT}"/etc/php/*-php5 &>/dev/null + if [[ $? -eq 0 ]]; then + ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" + ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" + fi + elog + elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" + elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" + elog + + if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then + ewarn "The suhosin USE flag now only installs the suhosin patch!" + ewarn "If you want the suhosin extension, make sure you install" + ewarn " dev-php/suhosin" + ewarn + fi +} diff --git a/dev-lang/php/php-5.4.2.ebuild b/dev-lang/php/php-5.4.2.ebuild new file mode 100644 index 0000000..48196a3 --- /dev/null +++ b/dev-lang/php/php-5.4.2.ebuild @@ -0,0 +1,384 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.2.ebuild,v 1.1 2012/05/03 20:15:23 olemarkus Exp $ + +EAPI=4 + +inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool + +SUHOSIN_VERSION="" +FPM_VERSION="builtin" +EXPECTED_TEST_FAILURES="" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +function php_get_uri () +{ + case "${1}" in + "php-stas") + echo "http://downloads.php.net/stas/${2}" + ;; + "php-pre") + echo "http://downloads.php.net/johannes/${2}" + ;; + "php") + echo "http://www.php.net/distributions/${2}" + ;; + "suhosin") + echo "http://download.suhosin.org/${2}" + ;; + "olemarkus") + echo "http://dev.gentoo.org/~olemarkus/php/${2}" + ;; + "gentoo") + echo "mirror://gentoo/${2}" + ;; + *) + die "unhandled case in php_get_uri" + ;; + esac +} + +PHP_MV="$(get_major_version)" +SLOT="$(get_version_component_range 1-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_PV="${PHP_PV/_alpha/alpha}" +PHP_PV="${PHP_PV/_beta/beta}" +PHP_RELEASE="php" +PHP_P="${PN}-${PHP_PV}" + +PHP_PATCHSET_LOC="olemarkus" + +PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" + +PHP_PATCHSET="2" +PHP_PATCHSET_URI=" + $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-$SLOT-${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.) + SUHOSIN_TYPE="gentoo" +else + SUHOSIN_TYPE="suhosin" +fi + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; + SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" +fi + +SRC_URI=" + ${PHP_SRC_URI} + ${PHP_PATCHSET_URI}" + +if [[ -n ${SUHOSIN_VERSION} ]]; then + SRC_URI="${SRC_URI} + suhosin? ( ${SUHOSIN_URI} )" +fi + +DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." +HOMEPAGE="http://php.net/" +LICENSE="PHP-3" + +S="${WORKDIR}/${PHP_P}" + +# We can build the following SAPIs in the given order +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} + threads" + +IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk + crypt +ctype curl curlwrappers debug doc + enchant exif frontbase +fileinfo +filter firebird + flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash + mssql mysql mysqlnd mysqli nls + oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm + readline recode +session sharedmem + +simplexml snmp soap sockets spell sqlite3 ssl + sybase-ct sysvipc tidy +tokenizer truetype unicode wddx + +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" + +# Enable suhosin if available +[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" + +DEPEND=" + >=app-admin/eselect-php-0.6.2 + >=dev-libs/libpcre-8.12[unicode] + apache2? ( www-servers/apache[threads=] ) + berkdb? ( =sys-libs/db-4* ) + bzip2? ( app-arch/bzip2 ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + cjk? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + crypt? ( >=dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg + media-libs/libpng + sys-libs/zlib + ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + gmp? ( >=dev-libs/gmp-4.1.2 ) + iconv? ( virtual/libiconv ) + imap? ( virtual/imap-c-client[ssl=] ) + intl? ( dev-libs/icu ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + kolab? ( >=net-libs/c-client-2004g-r1 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + mssql? ( dev-db/freetds[mssql] ) + !mysqlnd? ( + mysql? ( virtual/mysql ) + mysqli? ( >=virtual/mysql-4.1 ) + ) + 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 ) + 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 ) + spell? ( >=app-text/aspell-0.50 ) + sqlite3? ( >=dev-db/sqlite-3.7.6.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? ( + virtual/jpeg media-libs/libpng sys-libs/zlib ) + ) + unicode? ( dev-libs/oniguruma ) + 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}" + +REQUIRED_USE=" + truetype? ( gd ) + cjk? ( gd ) + exif? ( gd ) + + xpm? ( gd ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xsl? ( xml ) + ldap-sasl? ( ldap ) + kolab? ( imap ) + mhash? ( hash ) + phar? ( hash ) + mysqlnd? ( || ( + mysql + mysqli + pdo + ) ) + + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysql !mysqli ) + sharedmem? ( !threads ) + + !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" + +RDEPEND="${DEPEND}" + +[[ -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 )" + +# 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" + +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 v2 + 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 v3 + +src_prepare() { eblit-run src_prepare v4 ; } +src_configure() { eblit-run src_configure v54 ; } +src_compile() { eblit-run src_compile v2 ; } +src_install() { eblit-run src_install v3 ; } +src_test() { eblit-run src_test v1 ; } + +#Do not use eblit for this because it will not get sourced when installing from +#binary package (bug #380845) +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + APACHE2_MOD_DEFINE="PHP5" + APACHE2_MOD_CONF="70_mod_php5" + apache-module_pkg_postinst + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order" + elog "to compile extensions for the ${SLOT} ABI" + elog + if ! use readline && use cli ; then + ewarn "Note that in order to use php interactivly, you need to enable" + ewarn "the readline USE flag or php -a will hang" + fi + elog + elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." + elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" + elog "'production' or 'development' in ${EPREFIX}/etc/make.conf" + ewarn "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}" + + # check for not yet migrated old style config dirs + ls "${EROOT}"etc/php/*-php5 &>/dev/null + if [[ $? -eq 0 ]]; then + ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" + ewarn "files are now kept at ${EROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" + fi + elog + elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" + elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" + elog + + if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then + ewarn "The suhosin USE flag now only installs the suhosin patch!" + ewarn "If you want the suhosin extension, make sure you install" + ewarn " dev-php/suhosin" + ewarn + fi +} |