Prefer php-fpm over apache2 as default

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

4 files changed, 56 insertions, 5 deletions

diff --git a/virtual/httpd-php/ChangeLog b/virtual/httpd-php/ChangeLog
index 6269c2e48f69..ccc44a9c7cde 100644
--- a/virtual/httpd-php/ChangeLog
+++ b/virtual/httpd-php/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for virtual/httpd-php
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/httpd-php/ChangeLog,v 1.26 2012/10/21 09:18:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/httpd-php/ChangeLog,v 1.27 2012/11/04 08:08:30 olemarkus Exp $
+
+*httpd-php-5.3-r1 (04 Nov 2012)
+*httpd-php-5.4-r2 (04 Nov 2012)
+
+  04 Nov 2012; Ole Markus With <olemarkus@gentoo.org> +httpd-php-5.3-r1.ebuild,
+  +httpd-php-5.4-r2.ebuild:
+  Prefer php-fpm over apache2 as default
 
   21 Oct 2012; Markus Meier <maekke@gentoo.org> httpd-php-5.4-r1.ebuild:
   x86 stable, bug #432994
diff --git a/virtual/httpd-php/Manifest b/virtual/httpd-php/Manifest
index e9bfa43978de..d54bb78faff5 100644
--- a/virtual/httpd-php/Manifest
+++ b/virtual/httpd-php/Manifest
@@ -1,14 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+EBUILD httpd-php-5.3-r1.ebuild 625 SHA256 3a9b0e017cbe27b5d34129173f0f5c25a3d57767f0601ec1b64d4c1a24fd3985 SHA512 04ff655237d3fcdb23b1b6c34280140ffdfc3fe7270405baf48ec7e294480873a9e8aebb35f4189cab5cc9c44ba829a217048e24f9fc87a1c7c3f1607717193f WHIRLPOOL 047ae531f78e6bbce74b32a9c1d74016d158c2ac35c723e779a4bb0228e05e242b98cc68afb5f72890c1caa4616e3cef6a840fccf6d7f5c4f6573bb4a08867c5
 EBUILD httpd-php-5.3.ebuild 611 SHA256 0b38ab356ec95d4b06da9134be9c704e7763ab03e9934bc7410a9f8df6e1f73e SHA512 4272c3e29eab9e336a61db3c5dd31ee464346ac16f8c057032cfa9839e4b41308c98d32dc644ae22dfa5b7001e624bf7eadb005408f0517fd7952a8c4c73f2ae WHIRLPOOL c717aab5dc6fa25f6777d756a233463c7358cea9eb454250b5d29597f692f1653be036bbf7edd1b65596f58c3d0d9263d2d470615dbfed246f366075bab28f4d
 EBUILD httpd-php-5.4-r1.ebuild 624 SHA256 3201abec300c3ba6f814f1cf7eb537b674abb39e5b23456fa77cad75f5cc036a SHA512 672dc8087689f3d19128c9714578b527c9453a72e459245b40bf21c52217c5ac39ae99963ea72918fdaf4120ec2d8b3d7dba356b3bdf444a98375698a0335a8b WHIRLPOOL 7c1f075a8fa66ea0683f00abfb69c535132f652573b597cd0df23dc2be49322617a573f4b2b49bdec026dbc696fa95d9c73a562f2be3e42042660213a39b35a0
-MISC ChangeLog 3141 SHA256 19486887715b119974ccfe01d2cd2b3baa4af12d7ff2ee5d0d95d8e4a73b267a SHA512 3f7dfb799cfb78a1e59e20d58372d73bc2e13cc90886b8a5fd5499e42c901ff64821039d2ccaa97d48ddc98fcb90c34a4d46cf4fbad1653eac4eb59e24aa7891 WHIRLPOOL 10fb9547161a63de3f9bbb932e3455976471c5880c357ae378e9f34ee2f473ec887baf1abd5a25be73e918da028edfdc899744c8fa634184904b5ced8bb996fb
+EBUILD httpd-php-5.4-r2.ebuild 633 SHA256 38574d52c721e09e76f89297aab3da82feaf79a12fc5e9d7540cd0d91fc61470 SHA512 1d4b3fea6bfa8aae67900bac0aa95ed7da525f76ec5a5678d8018d4b77f282ef8212659038d32142c94c1f4aa2cdecd47e252af06574baa5f6a1024bdcfe1cd1 WHIRLPOOL 8e4ef647edcaa765fc496157c88fbfb13dcaef64a1341a003bffba4079eae401c3dcb9dceedc0fbfe894bd843d97b7a31ae4b76f600cd5d778d735b8bb6f0215
+MISC ChangeLog 3359 SHA256 e8b4ac74a1eba9bb2e03f003f5bb19edbdeeaf2dbfe3bf7d316d3dee0a98bfce SHA512 bfe7508e061d2aede2e2b2e4d71127b94e8df0243d2db03f22aacb6df7c9e68e45e7b04165a9128dfb435202951c30da5d2774f45c88834c041bc6bffa3ff907 WHIRLPOOL cd63776ff438d93ab3c8efd1e96fcc7b4d41e744f9abcad3b2c43da46167b0e4422d45ac012acbb0585f013342f6c3c82bf5b1974e818089a72afb3c9041f7a0
 MISC metadata.xml 156 SHA256 f6d70434415ff7294f2a64e7870f32318c5fab9153fe63a58841b12d897da6ba SHA512 c15813e9ecae01488222d09140617eaf0e6e9b9b9d40412e1cda7838e64c8fb8c73c030dc90d723aea571acadddb76941c9a620fc4e554ba052ace1cc6b0ef79 WHIRLPOOL 1b1513674a388e3e95e09cfd70996bc98fc058ca0e0e7c5dc63e0b3389bedeb4dc16b55245b92a8ded7390cca0dc481e418f236a236ded9afcc2ef3845b25130
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCDvsEACgkQkKaRLQcq0GIiNgCdE25DdcjW1MN36/BUH4cNGhi3
-EXcAoI8uLe6dmyvf8vBRXkQ2bNoAnc7e
-=i0E/
+iQEcBAEBCAAGBQJQliKCAAoJEGurSuXEqSv1NskH/jrB+u2uF8ss+r6RQo1DZpZt
+i+Zi+jnWBpRTn4Mt8ccfqdWe2c7M8+f+ts6hDh0/t+/VrSV1I7gHdqfgSlAzrG2Y
++KQ6onX4ozAvuH/CBgBzQ2oYe+aRf7wH0sw59WHTmkXVKWwHhaOQXvvRIjW7kj6G
++bFozIzgKMJeA76KmrxfeZryczETEi2crceos7tAB+vJiynGfnze9EaHtNPzhnzF
+bUDl4+ddLwDh37+J1kkjU/8/8JpcdU3Z54ulGNhHiyQ5DClcp45N9dTbKavG+69U
+Z2xlYGm8hvibaUxyFUFmGz3BreU1IYiDY+hEDhTG9qWUwJAN6SNsu+XtpA2mQFc=
+=xpi+
 -----END PGP SIGNATURE-----
diff --git a/virtual/httpd-php/httpd-php-5.3-r1.ebuild b/virtual/httpd-php/httpd-php-5.3-r1.ebuild
new file mode 100644
index 000000000000..d3c40d35c229
--- /dev/null
+++ b/virtual/httpd-php/httpd-php-5.3-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/httpd-php/httpd-php-5.3-r1.ebuild,v 1.1 2012/11/04 08:08:30 olemarkus Exp $
+
+EAPI="2"
+
+DESCRIPTION="Virtual to provide PHP-enabled webservers"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="5.3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="|| ( =dev-lang/php-5.3*[fpm]
+			  =dev-lang/php-5.3*[apache2]
+			  =dev-lang/php-5.3*[cgi] )"
+DEPEND=""
diff --git a/virtual/httpd-php/httpd-php-5.4-r2.ebuild b/virtual/httpd-php/httpd-php-5.4-r2.ebuild
new file mode 100644
index 000000000000..9ab0c898ca7e
--- /dev/null
+++ b/virtual/httpd-php/httpd-php-5.4-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/httpd-php/httpd-php-5.4-r2.ebuild,v 1.1 2012/11/04 08:08:30 olemarkus Exp $
+
+EAPI="4"
+
+DESCRIPTION="Virtual to provide PHP-enabled webservers"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
+			  dev-lang/php:${SLOT}[apache2]
+			  dev-lang/php:${SLOT}[cgi] )"
+DEPEND=""