From 5b268b4b2e8dad4c0b10397a76a8061fab0d605e Mon Sep 17 00:00:00 2001
From: Christoph Mende <mende.christoph@gmail.com>
Date: Fri, 20 Jul 2012 14:41:14 +0200
Subject: [PATCH] phpmp: Sync with gentoo

(Portage version: 2.2.0_alpha120/git/Linux x86_64, signed Manifest commit with key 84F20B43)
---
 www-apps/phpmp/Manifest          | 52 ++++++++++------------------------------
 www-apps/phpmp/phpmp-9999.ebuild | 15 ++++++------
 2 files changed, 20 insertions(+), 47 deletions(-)
 rewrite www-apps/phpmp/Manifest (94%)

diff --git a/www-apps/phpmp/Manifest b/www-apps/phpmp/Manifest
dissimilarity index 94%
index eef1def..c57fef7 100644
--- a/www-apps/phpmp/Manifest
+++ b/www-apps/phpmp/Manifest
@@ -1,39 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-- -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-- - -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX postinstall-en.txt 33 RMD160 efe4c0fe002dce8f29cb94269d0d0c6b01fa6d89 SHA1 5cd6e61f35ea434e36720c9dd6922585dff9cc67 SHA256 c5c688eb7c8da48d82cc9fd5e062e7f02880b58f7d293b4af97c23d5884974da
-EBUILD phpmp-9999.ebuild 786 RMD160 82d0e04adc4b6b3d5d05d8f2c831b15c8041ed71 SHA1 389fe6204791ede66bf95bf71eac6c9260d2a64e SHA256 52e65caf5bed317f5bfb61af1a70de49fee9931c8beb5cca0c4d8ec9379969ed
-MISC metadata.xml 252 RMD160 ef9baa26fc67986bef22a7a65e64dde3cf17e575 SHA1 47206697675a26d3b77f5d5c7e980a5a475d767e SHA256 916d18cb8bafdf85a72e4b4458e41cebf214bed0eed8be1bb364aa6a4d42d2c6
-- - -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk3De1EACgkQL4/Hh348YDlgpAP/QE7SqE6BuBras7q6vEQpolJD
-n58sFa1VKwzC8yqrOYYMsXibdrXjstrsbjZh5fknXSAwgWKdola/zaqqT6gp4afa
-M3JDr/DN9yApDLZGFyXLECQGnApQc+1y6MQ5N6Nosn+MTnUj8yT0AeCkS5AQQROn
-6awRdFOCUwUMfNGvSlM=
-=9UCp
-- - -----END PGP SIGNATURE-----
-- -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk3DohgACgkQL4/Hh348YDmpOwP+JFwR+f0dNhqPkqDAgFONX4ae
-t7p1pQ9z4WD9sPV/ZL1Orp0Bhro+OZ3kmsu857k14NPy0lQyOXbM29BXZ6N8fQuV
-hy0inalIu+rWurYbu9OAByPR5BNFr0EZLgYJW2DoZiK78yO/TO/ILJXK4NuZ3fu7
-9T3CWQ33LoU1VUo8oU8=
-=uF2i
-- -----END PGP SIGNATURE-----
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk3DptYACgkQL4/Hh348YDnaqgP+McYmwJo0pBS390fxVYE7Wa4h
-CD7HO2BhZ5/8q5g8Ru3QrbO0L00CXULin4cFWZkgo01VBzCJnU49n61ysC1EGUrT
-tNpG6k6KU5nr/5Pxep61KICoqdaU3O2Jy0CE92EckZ4C41wnaCb9G+LyqRZSJXUt
-b3AdTEWMcEzD6wlCgp8=
-=0Sbg
------END PGP SIGNATURE-----
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX postinstall-en.txt 33 SHA256 c5c688eb7c8da48d82cc9fd5e062e7f02880b58f7d293b4af97c23d5884974da SHA512 2fed8859caf849a060c11bd07d029fce8f44794b42dce9bf7bc00437561bec47ce8a031258d78582bd742fb9b4912d13ba8b518e88d6a11cd01c8e67a3f86aa4 WHIRLPOOL 4d7e2754698cae369bf300894c64f86fe2af5a7f7e87e92590ecb843e42cb09e9aec3b098a911124554ef433ccff082b1edb11d95ddb2ae70762b44857523072
+EBUILD phpmp-9999.ebuild 788 SHA256 042c90740c31fc55f043ff66550d952c7ac17ccd09a73c806f78c75aacfaa2df SHA512 d6f4f3253cd2928e973067533f33f50689ee43b3d0331bc078cf5cd717cb18f0efe51c322c2826496ce7c0cc868312c8cb01cd4fc9fac62cc730454cbbdfdffb WHIRLPOOL 614509bc20ea1e0d4b7c1a76aebd0df727596d853ef99b4352281fedaa6658353ce923f9ddf670ff65c2708eb5ded12243239a97485c7b1fe2ebd1e393577d16
+MISC metadata.xml 252 SHA256 916d18cb8bafdf85a72e4b4458e41cebf214bed0eed8be1bb364aa6a4d42d2c6 SHA512 3f68ce08cea120c99c965e29d1e1b21bd6dc0c4d17c577d54340a56615a7b760688e66c9b73281166c122aa4266b02292b259c60bae3f7e7257ca4cf4c73957a WHIRLPOOL fe59e3782002def26590d684d13c7cff4c3729d085f9efb524edd0403097bb854d14464c3a2230318e2a310413e1c398cb44548765e22f1c66e9224143919056
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlAJUeoACgkQmWq1bYTyC0O/HgEAr+sXzrT3+6/LNC6/S7nUxZGt
+zQnp4AurUpf+WJcS+XMBAKj5J2TKlggKa21NrUERfi5A5u1EqQca0K2d0Lf99c5e
+=fioR
+-----END PGP SIGNATURE-----
diff --git a/www-apps/phpmp/phpmp-9999.ebuild b/www-apps/phpmp/phpmp-9999.ebuild
index 04b22aa..32abb24 100644
--- a/www-apps/phpmp/phpmp-9999.ebuild
+++ b/www-apps/phpmp/phpmp-9999.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit webapp depend.php git-2
+EAPI="2"
+
+inherit webapp git-2
 
 MY_PN="phpMp"
 MY_P="${MY_PN}-${PV}"
@@ -15,16 +17,13 @@ LICENSE="GPL-2"
 KEYWORDS=""
 IUSE=""
 
+RDEPEND="virtual/httpd-php
+	|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
+
 need_httpd_cgi
-need_php_httpd
 
 S="${WORKDIR}"/${MY_P}
 
-pkg_setup() {
-	webapp_pkg_setup
-	require_php_with_use pcre
-}
-
 src_install() {
 	webapp_src_preinst
 
-- 
2.11.4.GIT